diff --git a/crates/sui-protocol-config/src/lib.rs b/crates/sui-protocol-config/src/lib.rs index 6e9e325720823..f058be5028ba3 100644 --- a/crates/sui-protocol-config/src/lib.rs +++ b/crates/sui-protocol-config/src/lib.rs @@ -3160,7 +3160,7 @@ impl ProtocolConfig { 73 => { // Enable new marker table version. cfg.use_object_per_epoch_marker_table_v2 = Some(true); - + if chain != Chain::Mainnet && chain != Chain::Testnet { cfg.consensus_gc_depth = Some(60); cfg.feature_flags.consensus_linearize_subdag_v2 = true; diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_73.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_73.snap index 4408ca08da827..639b8922b505e 100644 --- a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_73.snap +++ b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_73.snap @@ -75,10 +75,7 @@ feature_flags: consensus_smart_ancestor_selection: true consensus_round_prober_probe_accepted_rounds: true native_charging_v2: true -<<<<<<< HEAD -======= consensus_linearize_subdag_v2: true ->>>>>>> 4c0b2b3d6e ([feat] enable gc and new linearizer commit for devnet.) convert_type_argument_error: true variant_nodes: true max_tx_size_bytes: 131072 @@ -356,10 +353,6 @@ max_soft_bundle_size: 5 bridge_should_try_to_finalize_committee: true max_accumulated_txn_cost_per_object_in_mysticeti_commit: 18500000 max_accumulated_randomness_txn_cost_per_object_in_mysticeti_commit: 3700000 -gas_budget_based_txn_cost_cap_factor: 400000 -gas_budget_based_txn_cost_absolute_cap_commit_count: 50 -sip_45_consensus_amplification_threshold: 5 -use_object_per_epoch_marker_table_v2: true consensus_gc_depth: 60 gas_budget_based_txn_cost_cap_factor: 400000 gas_budget_based_txn_cost_absolute_cap_commit_count: 50