[SIP-45] Make K configurable and increase max gas price for testnet

MystenLabs · Dec 26, 2024 · 7c11e59 · 7c11e59
1 parent 0266df4
commit 7c11e59
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/crates/sui-core/src/consensus_adapter.rs b/crates/sui-core/src/consensus_adapter.rs
@@ -387,8 +387,14 @@ impl ConsensusAdapter {
         let (duration, position, positions_moved, preceding_disconnected) =
             match min_digest_and_gas_price {
                 Some((digest, gas_price)) => {
-                    // TODO: Make this configurable.
-                    let k = 5;
+                    let protocol_config_k = epoch_store.protocol_config().sip_45_k();
+                    let k = if protocol_config_k == 0 {
+                        // Disable amplification if k is not set.
+                        u64::MAX
+                    } else {
+                        protocol_config_k
+                    };
+
                     let multipler = gas_price / epoch_store.reference_gas_price();
                     amplification_factor = if multipler >= k { multipler } else { 0 };
                     self.await_submit_delay_user_transaction(

diff --git a/crates/sui-protocol-config/src/lib.rs b/crates/sui-protocol-config/src/lib.rs
@@ -1327,6 +1327,9 @@ pub struct ProtocolConfig {
     /// Adds an absolute cap on the maximum transaction cost when using TotalGasBudgetWithCap at
     /// the given multiple of the per-commit budget.
     gas_budget_based_txn_cost_absolute_cap_commit_count: Option<u64>,
+
+    /// SIP-45: K in the formula `amplification_factor = max(0, gas_price / reference_gas_price - K)`.
+    sip_45_k: Option<u64>,
 }
 
 // feature flags
@@ -2243,6 +2246,8 @@ impl ProtocolConfig {
             gas_budget_based_txn_cost_cap_factor: None,
 
             gas_budget_based_txn_cost_absolute_cap_commit_count: None,
+
+            sip_45_k: None,
             // When adding a new constant, set it to None in the earliest version, like this:
             // new_constant: None,
         };
@@ -2999,6 +3004,8 @@ impl ProtocolConfig {
                         // Enable probing for accepted rounds in round prober for testnet
                         cfg.feature_flags
                             .consensus_round_prober_probe_accepted_rounds = true;
+                        // [SIP-45] Set max gas price to 1T.
+                        cfg.max_gas_price = Some(1_000_000_000_000);
                     }
 
                     cfg.poseidon_bn254_cost_per_block = Some(388);
@@ -3075,6 +3082,8 @@ impl ProtocolConfig {
                     cfg.group_ops_bls12381_uncompressed_g1_sum_max_terms = Some(1200);
 
                     cfg.validator_validate_metadata_cost_base = Some(20000);
+
+                    cfg.sip_45_k = Some(5);
                 }
                 // Use this template when making changes:
                 //

diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_70.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_70.snap
@@ -1,6 +1,7 @@
 ---
 source: crates/sui-protocol-config/src/lib.rs
 expression: "ProtocolConfig::get_for_version(cur, *chain_id)"
+snapshot_kind: text
 ---
 version: 70
 feature_flags:
@@ -339,4 +340,4 @@ 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_k: 5
diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_70.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_70.snap
@@ -1,6 +1,7 @@
 ---
 source: crates/sui-protocol-config/src/lib.rs
 expression: "ProtocolConfig::get_for_version(cur, *chain_id)"
+snapshot_kind: text
 ---
 version: 70
 feature_flags:
@@ -103,7 +104,7 @@ max_move_object_size: 256000
 max_move_package_size: 102400
 max_publish_or_upgrade_per_ptb: 5
 max_tx_gas: 50000000000
-max_gas_price: 100000
+max_gas_price: 1000000000000
 max_gas_computation_bucket: 5000000
 gas_rounding_step: 1000
 max_loop_depth: 5
@@ -342,4 +343,4 @@ 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_k: 5
diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_70.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_70.snap
@@ -1,6 +1,7 @@
 ---
 source: crates/sui-protocol-config/src/lib.rs
 expression: "ProtocolConfig::get_for_version(cur, *chain_id)"
+snapshot_kind: text
 ---
 version: 70
 feature_flags:
@@ -109,7 +110,7 @@ max_move_object_size: 256000
 max_move_package_size: 102400
 max_publish_or_upgrade_per_ptb: 5
 max_tx_gas: 50000000000
-max_gas_price: 100000
+max_gas_price: 1000000000000
 max_gas_computation_bucket: 5000000
 gas_rounding_step: 1000
 max_loop_depth: 5
@@ -351,4 +352,4 @@ 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_k: 5