chore(blockifier): rename BouncerWeights field gas to l1gas

config/sequencer/default_config.json

@@ -49,8 +49,8 @@
     "privacy": "Public",
     "value": 156250
   },
-  "batcher_config.block_builder_config.bouncer_config.block_max_capacity.gas": {
-    "description": "An upper bound on the total gas used in a block.",
+  "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.",
     "privacy": "Public",
     "value": 2500000
   },

crates/blockifier/src/abi/constants.rs

@@ -25,7 +25,6 @@ pub const CONSUMED_MSG_TO_L2_ENCODED_DATA_SIZE: usize =
     (L1_TO_L2_MSG_HEADER_SIZE + 1) - CONSUMED_MSG_TO_L2_N_TOPICS;
 
 // Transaction resource names.
-// TODO(Amos, 1/10/2024): Rename to l1_gas_weight.
 pub const L1_GAS_USAGE: &str = "gas_weight";
 pub const L2_GAS_USAGE: &str = "l2_gas_weight";
 pub const BLOB_GAS_USAGE: &str = "l1_blob_gas_usage";

crates/blockifier/src/bouncer.rs

@@ -93,7 +93,7 @@ impl SerializeConfig for BouncerConfig {
 /// Represents the execution resources counted throughout block creation.
 pub struct BouncerWeights {
     pub builtin_count: BuiltinCount,
-    pub gas: usize,
+    pub l1_gas: usize,
     pub message_segment_length: usize,
     pub n_events: usize,
     pub n_steps: usize,
@@ -103,7 +103,7 @@ pub struct BouncerWeights {
 impl BouncerWeights {
     impl_checked_sub!(
         builtin_count,
-        gas,
+        l1_gas,
         message_segment_length,
         n_events,
         n_steps,
@@ -116,7 +116,7 @@ impl BouncerWeights {
 
     pub fn max() -> Self {
         Self {
-            gas: usize::MAX,
+            l1_gas: usize::MAX,
             n_steps: usize::MAX,
             message_segment_length: usize::MAX,
             state_diff_size: usize::MAX,
@@ -129,7 +129,7 @@ impl BouncerWeights {
         Self {
             n_events: 0,
             builtin_count: BuiltinCount::empty(),
-            gas: 0,
+            l1_gas: 0,
             message_segment_length: 0,
             n_steps: 0,
             state_diff_size: 0,
@@ -141,7 +141,7 @@ impl Default for BouncerWeights {
     // TODO: update the default values once the actual values are known.
     fn default() -> Self {
         Self {
-            gas: 2500000,
+            l1_gas: 2500000,
             n_steps: 2500000,
             message_segment_length: 3700,
             n_events: 5000,
@@ -155,9 +155,9 @@ impl SerializeConfig for BouncerWeights {
     fn dump(&self) -> BTreeMap<ParamPath, SerializedParam> {
         let mut dump = append_sub_config_name(self.builtin_count.dump(), "builtin_count");
         dump.append(&mut BTreeMap::from([ser_param(
-            "gas",
-            &self.gas,
-            "An upper bound on the total gas used in a block.",
+            "l1_gas",
+            &self.l1_gas,
+            "An upper bound on the total l1_gas used in a block.",
             ParamPrivacyInput::Public,
         )]));
         dump.append(&mut BTreeMap::from([ser_param(
@@ -192,9 +192,9 @@ impl std::fmt::Display for BouncerWeights {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
-            "BouncerWeights {{ gas: {}, n_steps: {}, message_segment_length: {}, n_events: {}, \
+            "BouncerWeights {{ l1_gas: {}, n_steps: {}, message_segment_length: {}, n_events: {}, \
              state_diff_size: {}, builtin_count: {} }}",
-            self.gas,
+            self.l1_gas,
             self.n_steps,
             self.message_segment_length,
             self.n_events,
@@ -524,7 +524,7 @@ pub fn get_tx_weights<S: StateReader>(
     state_changes_keys: &StateChangesKeys,
 ) -> TransactionExecutionResult<BouncerWeights> {
     let message_resources = &tx_resources.starknet_resources.messages;
-    let message_starknet_gas = usize_from_u64(message_resources.get_starknet_gas_cost().l1_gas.0)
+    let message_starknet_l1gas = usize_from_u64(message_resources.get_starknet_gas_cost().l1_gas.0)
         .expect("This conversion should not fail as the value is a converted usize.");
     let mut additional_os_resources =
         get_casm_hash_calculation_resources(state_reader, executed_class_hashes)?;
@@ -533,7 +533,7 @@ pub fn get_tx_weights<S: StateReader>(
     let vm_resources = &additional_os_resources + &tx_resources.computation.vm_resources;
 
     Ok(BouncerWeights {
-        gas: message_starknet_gas,
+        l1_gas: message_starknet_l1gas,
         message_segment_length: message_resources.message_segment_length,
         n_events: tx_resources.starknet_resources.archival_data.event_summary.n_events,
         n_steps: vm_resources.total_n_steps(),

crates/blockifier/src/bouncer_test.rs

@@ -37,7 +37,7 @@ fn test_block_weights_has_room() {
             range_check: 10,
             range_check96: 10,
         },
-        gas: 10,
+        l1_gas: 10,
         message_segment_length: 10,
         n_events: 10,
         n_steps: 10,
@@ -57,7 +57,7 @@ fn test_block_weights_has_room() {
             range_check: 10,
             range_check96: 10,
         },
-        gas: 7,
+        l1_gas: 7,
         message_segment_length: 10,
         n_steps: 0,
         n_events: 2,
@@ -79,7 +79,7 @@ fn test_block_weights_has_room() {
             range_check: 5,
             range_check96: 5,
         },
-        gas: 5,
+        l1_gas: 5,
         message_segment_length: 5,
         n_steps: 5,
         n_events: 5,
@@ -114,7 +114,7 @@ fn test_block_weights_has_room() {
             range_check: 10,
             range_check96: 10,
         },
-        gas: 10,
+        l1_gas: 10,
         message_segment_length: 10,
         n_steps: 10,
         n_events: 10,
@@ -144,7 +144,7 @@ fn test_bouncer_update(#[case] initial_bouncer: Bouncer) {
             range_check: 8,
             range_check96: 0,
         },
-        gas: 9,
+        l1_gas: 9,
         message_segment_length: 10,
         n_steps: 0,
         n_events: 1,
@@ -197,7 +197,7 @@ fn test_bouncer_try_update(#[case] added_ecdsa: usize, #[case] scenario: &'stati
             range_check: 20,
             range_check96: 20,
         },
-        gas: 20,
+        l1_gas: 20,
         message_segment_length: 20,
         n_steps: 20,
         n_events: 20,
@@ -218,7 +218,7 @@ fn test_bouncer_try_update(#[case] added_ecdsa: usize, #[case] scenario: &'stati
             range_check: 10,
             range_check96: 10,
         },
-        gas: 10,
+        l1_gas: 10,
         message_segment_length: 10,
         n_steps: 10,
         n_events: 10,

crates/native_blockifier/src/py_objects.rs

@@ -117,7 +117,7 @@ fn hash_map_into_builtin_count(
 fn hash_map_into_bouncer_weights(
     mut data: HashMap<String, usize>,
 ) -> NativeBlockifierResult<BouncerWeights> {
-    let gas = data.remove(constants::L1_GAS_USAGE).expect("gas_weight must be present");
+    let l1_gas = data.remove(constants::L1_GAS_USAGE).expect("gas_weight must be present");
     let n_steps = data.remove(constants::N_STEPS_RESOURCE).expect("n_steps must be present");
     let message_segment_length = data
         .remove(constants::MESSAGE_SEGMENT_LENGTH)
@@ -126,7 +126,7 @@ fn hash_map_into_bouncer_weights(
         data.remove(constants::STATE_DIFF_SIZE).expect("state_diff_size must be present");
     let n_events = data.remove(constants::N_EVENTS).expect("n_events must be present");
     Ok(BouncerWeights {
-        gas,
+        l1_gas,
         n_steps,
         message_segment_length,
         state_diff_size,

crates/starknet_batcher/src/block_builder_test.rs

@@ -51,7 +51,7 @@ fn block_execution_artifacts(
         execution_infos,
         commitment_state_diff: Default::default(),
         visited_segments_mapping: Default::default(),
-        bouncer_weights: BouncerWeights { gas: 100, ..BouncerWeights::empty() },
+        bouncer_weights: BouncerWeights { l1_gas: 100, ..BouncerWeights::empty() },
     }
 }