blockifier: refactor bouncer weights (#9478)

Author: AvivYossef-starkware

crates/apollo_deployments/resources/app_configs/batcher_config.json

@@ -4,19 +4,19 @@
   "batcher_config.block_builder_config.bouncer_config.block_max_capacity.n_events": 5000,
   "batcher_config.block_builder_config.bouncer_config.block_max_capacity.n_txs": 500,
   "batcher_config.block_builder_config.bouncer_config.block_max_capacity.sierra_gas": 5000000000,
-  "batcher_config.block_builder_config.bouncer_config.block_max_capacity.proving_gas": 5500000000,
+  "batcher_config.block_builder_config.bouncer_config.block_max_capacity.proving_gas": 6000000000,
   "batcher_config.block_builder_config.bouncer_config.block_max_capacity.state_diff_size": 4000,
-  "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.pedersen": 4769,
+  "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.pedersen": 5722,
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.range_check": 70,
-  "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.ecdsa": 1666666,
-  "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.ecop": 714875,
+  "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.ecdsa": 2000000,
+  "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.ecop": 857850,
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.bitwise": 583,
-  "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.keccak": 510707,
-  "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.poseidon": 10000,
-  "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.add_mod": 312,
+  "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.keccak": 600000,
+  "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.poseidon": 11450,
+  "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.add_mod": 360,
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.mul_mod": 604,
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.range_check96": 56,
-  "batcher_config.block_builder_config.bouncer_config.blake_weight": 5263,
+  "batcher_config.block_builder_config.bouncer_config.blake_weight": 6320,
   "batcher_config.block_builder_config.execute_config.n_workers": 28,
   "batcher_config.block_builder_config.execute_config.stack_size": 62914560,
   "batcher_config.block_builder_config.n_concurrent_txs": 100,
@@ -51,4 +51,4 @@
   "batcher_config.storage.mmap_file_config.max_object_size": 1073741824,
   "batcher_config.storage.mmap_file_config.max_size": 1099511627776,
   "batcher_config.storage.scope": "StateOnly"
-}
+}

crates/apollo_node/resources/config_schema.json

@@ -27,7 +27,7 @@
   "batcher_config.block_builder_config.bouncer_config.blake_weight": {
     "description": "blake opcode gas weight.",
     "privacy": "Public",
-    "value": 5263
+    "value": 6320
   },
   "batcher_config.block_builder_config.bouncer_config.block_max_capacity.l1_gas": {
     "description": "An upper bound on the total l1_gas used in a block.",
@@ -52,7 +52,7 @@
   "batcher_config.block_builder_config.bouncer_config.block_max_capacity.proving_gas": {
     "description": "An upper bound on the total builtins and steps gas usage used in a block.",
     "privacy": "Public",
-    "value": 5500000000
+    "value": 6000000000
   },
   "batcher_config.block_builder_config.bouncer_config.block_max_capacity.sierra_gas": {
     "description": "An upper bound on the total sierra_gas used in a block.",
@@ -67,7 +67,7 @@
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.add_mod": {
     "description": "Add_mod gas weight.",
     "privacy": "Public",
-    "value": 312
+    "value": 360
   },
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.bitwise": {
     "description": "Bitwise gas weight.",
@@ -77,17 +77,17 @@
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.ecdsa": {
     "description": "Ecdsa gas weight.",
     "privacy": "Public",
-    "value": 1666666
+    "value": 2000000
   },
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.ecop": {
     "description": "Ec_op gas weight.",
     "privacy": "Public",
-    "value": 714875
+    "value": 857850
   },
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.keccak": {
     "description": "Keccak gas weight.",
     "privacy": "Public",
-    "value": 510707
+    "value": 600000
   },
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.mul_mod": {
     "description": "Mul_mod gas weight.",
@@ -97,12 +97,12 @@
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.pedersen": {
     "description": "Pedersen gas weight.",
     "privacy": "Public",
-    "value": 4769
+    "value": 5722
   },
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.poseidon": {
     "description": "Poseidon gas weight.",
     "privacy": "Public",
-    "value": 10000
+    "value": 11450
   },
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.gas_costs.range_check": {
     "description": "Range_check gas weight.",
@@ -2704,4 +2704,4 @@
     "privacy": "TemporaryValue",
     "value": 1000000
   }
-}
+}

crates/apollo_node_config/src/definitions.rs

@@ -2,7 +2,9 @@ use std::collections::HashMap;
 
 use apollo_config::dumping::{ConfigPointers, Pointers};
 use apollo_config::{ParamPath, SerializedContent, SerializedParam};
-use serde_json::{to_value, Value};
+#[cfg(any(feature = "testing", test))]
+use serde_json::to_value;
+use serde_json::Value;
 
 #[derive(Debug, Clone, Default)]
 pub struct ConfigPointersMap(HashMap<ParamPath, (SerializedParam, Pointers)>);

crates/blockifier/src/bouncer.rs

@@ -76,7 +76,7 @@ impl Default for BouncerConfig {
         Self {
             block_max_capacity: BouncerWeights::default(),
             builtin_weights: BuiltinWeights::default(),
-            blake_weight: 5263,
+            blake_weight: 6320,
         }
     }
 }
@@ -197,7 +197,7 @@ impl Default for BouncerWeights {
             state_diff_size: 4000,
             // NOTE: Must stay in sync with orchestrator_versioned_constants' max_block_size.
             sierra_gas: GasAmount(5000000000),
-            proving_gas: GasAmount(5500000000),
+            proving_gas: GasAmount(6000000000),
         }
     }
 }
@@ -423,14 +423,14 @@ impl Default for BuiltinWeights {
     fn default() -> Self {
         Self {
             gas_costs: BuiltinGasCosts {
-                pedersen: 4769,
+                pedersen: 5722,
                 range_check: 70,
-                ecdsa: 1666666,
-                ecop: 714875,
+                ecdsa: 2000000,
+                ecop: 857850,
                 bitwise: 583,
-                keccak: 510707,
-                poseidon: 10000,
-                add_mod: 312,
+                keccak: 600000,
+                poseidon: 11450,
+                add_mod: 360,
                 mul_mod: 604,
                 range_check96: 56,
             },

crates/blockifier/src/bouncer_test.rs

@@ -744,11 +744,11 @@ fn class_hash_migration_data_from_state(
 
     if should_migrate {
         expect![[r#"
-            89892468
+            93899555
         "#]]
         .assert_debug_eq(&migration_sierra_gas.0);
         expect![[r#"
-            205759633
+            227434970
         "#]]
         .assert_debug_eq(&migration_proving_gas.0);
     } else {