Merge branch 'main' into reth-1.1.1

crates/ef-testing/src/evm_sequencer/constants.rs

@@ -132,6 +132,7 @@ pub mod storage_variables {
     pub const KAKAROT_COINBASE: &str = "Kakarot_coinbase";
     pub const KAKAROT_BASE_FEE: &str = "Kakarot_base_fee";
     pub const KAKAROT_BLOCK_GAS_LIMIT: &str = "Kakarot_block_gas_limit";
+    pub const KAKAROT_CHAIN_ID: &str = "Kakarot_chain_id";
     pub const KAKAROT_EVM_TO_STARKNET_ADDRESS: &str = "Kakarot_evm_to_starknet_address";
     pub const KAKAROT_NATIVE_TOKEN_ADDRESS: &str = "Kakarot_native_token_address";
     pub const KAKAROT_UNINITIALIZED_ACCOUNT_CLASS_HASH: &str =

crates/ef-testing/src/evm_sequencer/sequencer/mod.rs

@@ -6,10 +6,10 @@ use crate::evm_sequencer::{
     constants::{
         storage_variables::{
             ACCOUNT_PUBLIC_KEY, ERC20_BALANCES, KAKAROT_ACCOUNT_CONTRACT_CLASS_HASH,
-            KAKAROT_BLOCK_GAS_LIMIT, KAKAROT_NATIVE_TOKEN_ADDRESS,
+            KAKAROT_BLOCK_GAS_LIMIT, KAKAROT_CHAIN_ID, KAKAROT_NATIVE_TOKEN_ADDRESS,
             KAKAROT_UNINITIALIZED_ACCOUNT_CLASS_HASH, OWNABLE_OWNER,
         },
-        ACCOUNT_CONTRACT_CLASS, ACCOUNT_CONTRACT_CLASS_HASH, BLOCK_GAS_LIMIT,
+        ACCOUNT_CONTRACT_CLASS, ACCOUNT_CONTRACT_CLASS_HASH, BLOCK_GAS_LIMIT, CHAIN_ID,
         ETH_FEE_TOKEN_ADDRESS, FEE_TOKEN_CLASS, FEE_TOKEN_CLASS_HASH, KAKAROT_ADDRESS,
         KAKAROT_CLASS, KAKAROT_CLASS_HASH, KAKAROT_OWNER_ADDRESS, OPENZEPPELIN_ACCOUNT_CLASS,
         OPENZEPPELIN_ACCOUNT_CLASS_HASH, RELAYER_ADDRESS, RELAYER_BALANCE, RELAYER_VERIFYING_KEY,
@@ -209,6 +209,7 @@ lazy_static! {
                 (KAKAROT_ACCOUNT_CONTRACT_CLASS_HASH, ACCOUNT_CONTRACT_CLASS_HASH.0),
                 (KAKAROT_BLOCK_GAS_LIMIT, Felt::from(BLOCK_GAS_LIMIT)),
                 (KAKAROT_UNINITIALIZED_ACCOUNT_CLASS_HASH, UNINITIALIZED_ACCOUNT_CLASS_HASH.0),
+                (KAKAROT_CHAIN_ID, Felt::from(CHAIN_ID)),
         ];
 
         // On KakarotZero we rely on the Cairo1 helpers class for unavailable syscalls and precompiles.