blockifier: add l3 field to ChainInfo

Author: einat-starkware

config/sequencer/default_config.json

@@ -119,6 +119,11 @@
     "pointer_target": "strk_fee_token_address",
     "privacy": "Public"
   },
+  "batcher_config.block_builder_config.chain_info.is_layer_3": {
+    "description": "Whether the chain is a layer 3 chain.",
+    "privacy": "Public",
+    "value": false
+  },
   "batcher_config.block_builder_config.execute_config.n_workers": {
     "description": "Number of parallel transaction execution workers.",
     "privacy": "Public",
@@ -1284,6 +1289,11 @@
     "pointer_target": "strk_fee_token_address",
     "privacy": "Public"
   },
+  "gateway_config.chain_info.is_layer_3": {
+    "description": "Whether the chain is a layer 3 chain.",
+    "privacy": "Public",
+    "value": false
+  },
   "gateway_config.stateful_tx_validator_config.max_allowed_nonce_gap": {
     "description": "The maximum allowed gap between the account nonce and the transaction nonce.",
     "privacy": "Public",

crates/apollo_deployments/resources/base_app_config.json

@@ -19,6 +19,7 @@
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.add_mod": 250,
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.mul_mod": 604,
   "batcher_config.block_builder_config.bouncer_config.builtin_weights.range_check96": 56,
+  "batcher_config.block_builder_config.chain_info.is_layer_3": false,
   "batcher_config.block_builder_config.execute_config.n_workers": 4,
   "batcher_config.block_builder_config.execute_config.stack_size": 62914560,
   "batcher_config.block_builder_config.n_concurrent_txs": 10,
@@ -116,6 +117,7 @@
   "consensus_manager_config.stream_handler_config.max_streams": 100,
   "consensus_manager_config.votes_topic": "consensus_votes",
   "gateway_config.block_declare": false,
+  "gateway_config.chain_info.is_layer_3": false,
   "gateway_config.stateful_tx_validator_config.max_allowed_nonce_gap": 50,
   "gateway_config.stateful_tx_validator_config.max_nonce_for_validation_skip": "0x1",
   "gateway_config.stateful_tx_validator_config.reject_future_declare_txs": true,
@@ -249,4 +251,4 @@
   "versioned_constants_overrides.max_n_events": 1000,
   "versioned_constants_overrides.max_recursion_depth": 50,
   "versioned_constants_overrides.validate_max_n_steps": 1000000
-}
+}

crates/apollo_rpc_execution/src/lib.rs

@@ -394,6 +394,7 @@ fn create_block_context(
             strk_fee_token_address: execution_config.strk_fee_contract_address,
             eth_fee_token_address: execution_config.eth_fee_contract_address,
         },
+        is_layer_3: false,
     };
     let starknet_version = storage_reader
         .begin_ro_txn()?

crates/blockifier/src/context.rs

@@ -200,6 +200,7 @@ impl BlockContext {
 pub struct ChainInfo {
     pub chain_id: ChainId,
     pub fee_token_addresses: FeeTokenAddresses,
+    pub is_layer_3: bool,
 }
 
 impl ChainInfo {
@@ -217,18 +218,27 @@ impl Default for ChainInfo {
             // TODO(guyn): should we remove the default value for chain_id?
             chain_id: ChainId::Other("0x0".to_string()),
             fee_token_addresses: FeeTokenAddresses::default(),
+            is_layer_3: false,
         }
     }
 }
 
 impl SerializeConfig for ChainInfo {
     fn dump(&self) -> BTreeMap<ParamPath, SerializedParam> {
-        let members = BTreeMap::from_iter([ser_param(
-            "chain_id",
-            &self.chain_id,
-            "The chain ID of the StarkNet chain.",
-            ParamPrivacyInput::Public,
-        )]);
+        let members = BTreeMap::from_iter([
+            ser_param(
+                "chain_id",
+                &self.chain_id,
+                "The chain ID of the StarkNet chain.",
+                ParamPrivacyInput::Public,
+            ),
+            ser_param(
+                "is_layer_3",
+                &self.is_layer_3,
+                "Whether the chain is a layer 3 chain.",
+                ParamPrivacyInput::Public,
+            ),
+        ]);
 
         vec![
             members,

crates/blockifier/src/test_utils/struct_impls.rs

@@ -144,6 +144,7 @@ impl ChainInfo {
                 eth_fee_token_address: contract_address!(TEST_ERC20_CONTRACT_ADDRESS),
                 strk_fee_token_address: contract_address!(TEST_ERC20_CONTRACT_ADDRESS2),
             },
+            is_layer_3: false,
         }
     }
 }

crates/blockifier_reexecution/src/state_reader/utils.rs

@@ -67,7 +67,11 @@ pub fn get_rpc_state_reader_config() -> RpcStateReaderConfig {
 
 /// Returns the chain info of mainnet.
 pub fn get_chain_info(chain_id: &ChainId) -> ChainInfo {
-    ChainInfo { chain_id: chain_id.clone(), fee_token_addresses: get_fee_token_addresses(chain_id) }
+    ChainInfo {
+        chain_id: chain_id.clone(),
+        fee_token_addresses: get_fee_token_addresses(chain_id),
+        is_layer_3: false,
+    }
 }
 
 // TODO(Aner): import the following functions instead, to reduce code duplication.

crates/native_blockifier/src/py_block_executor.rs

@@ -454,6 +454,7 @@ impl TryFrom<PyOsConfig> for ChainInfo {
                     py_os_config.fee_token_address.0,
                 )?,
             },
+            is_layer_3: false,
         })
     }
 }