Revert "set gas price only for devnet"

This reverts commit d87f830.
MystenLabs · Oct 18, 2024 · 0a17338 · 0a17338
1 parent d458697
commit 0a17338
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/crates/sui-protocol-config/src/lib.rs b/crates/sui-protocol-config/src/lib.rs
@@ -2863,14 +2863,14 @@ impl ProtocolConfig {
                     cfg.feature_flags
                         .consensus_distributed_vote_scoring_strategy = true;
 
+                    cfg.group_ops_bls12381_g1_to_uncompressed_g1_cost = Some(26);
+                    cfg.group_ops_bls12381_uncompressed_g1_to_g1_cost = Some(52);
+                    cfg.group_ops_bls12381_uncompressed_g1_sum_base_cost = Some(26);
+                    cfg.group_ops_bls12381_uncompressed_g1_sum_cost_per_term = Some(13);
+                    cfg.group_ops_bls12381_uncompressed_g1_sum_max_terms = Some(2000);
+
                     if chain != Chain::Mainnet && chain != Chain::Testnet {
                         cfg.feature_flags.uncompressed_g1_group_elements = true;
-
-                        cfg.group_ops_bls12381_g1_to_uncompressed_g1_cost = Some(26);
-                        cfg.group_ops_bls12381_uncompressed_g1_to_g1_cost = Some(52);
-                        cfg.group_ops_bls12381_uncompressed_g1_sum_base_cost = Some(26);
-                        cfg.group_ops_bls12381_uncompressed_g1_sum_cost_per_term = Some(13);
-                        cfg.group_ops_bls12381_uncompressed_g1_sum_max_terms = Some(2000);
                     }
                 }
                 // Use this template when making changes:

diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_64.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_64.snap
@@ -272,6 +272,11 @@ group_ops_bls12381_g1_msm_base_cost_per_input: 52
 group_ops_bls12381_g2_msm_base_cost_per_input: 52
 group_ops_bls12381_msm_max_len: 32
 group_ops_bls12381_pairing_cost: 52
+group_ops_bls12381_g1_to_uncompressed_g1_cost: 26
+group_ops_bls12381_uncompressed_g1_to_g1_cost: 52
+group_ops_bls12381_uncompressed_g1_sum_base_cost: 26
+group_ops_bls12381_uncompressed_g1_sum_cost_per_term: 13
+group_ops_bls12381_uncompressed_g1_sum_max_terms: 2000
 hmac_hmac_sha3_256_cost_base: 52
 hmac_hmac_sha3_256_input_cost_per_byte: 2
 hmac_hmac_sha3_256_input_cost_per_block: 2

diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_64.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_64.snap
@@ -273,6 +273,11 @@ group_ops_bls12381_g1_msm_base_cost_per_input: 52
 group_ops_bls12381_g2_msm_base_cost_per_input: 52
 group_ops_bls12381_msm_max_len: 32
 group_ops_bls12381_pairing_cost: 52
+group_ops_bls12381_g1_to_uncompressed_g1_cost: 26
+group_ops_bls12381_uncompressed_g1_to_g1_cost: 52
+group_ops_bls12381_uncompressed_g1_sum_base_cost: 26
+group_ops_bls12381_uncompressed_g1_sum_cost_per_term: 13
+group_ops_bls12381_uncompressed_g1_sum_max_terms: 2000
 hmac_hmac_sha3_256_cost_base: 52
 hmac_hmac_sha3_256_input_cost_per_byte: 2
 hmac_hmac_sha3_256_input_cost_per_block: 2