test(levm,l1): run state tests as if they were blocks instead of transactions

crates/blockchain/blockchain.rs

@@ -1056,7 +1056,7 @@ fn verify_blob_gas_usage(block: &Block, config: &ChainConfig) -> Result<(), Chai
 }
 
 /// Calculates the blob gas required by a transaction
-fn get_total_blob_gas(tx: &EIP4844Transaction) -> u32 {
+pub fn get_total_blob_gas(tx: &EIP4844Transaction) -> u32 {
     GAS_PER_BLOB * tx.blob_versioned_hashes.len() as u32
 }
 

crates/l2/networking/rpc/signer.rs

@@ -191,7 +191,8 @@ impl Signable for LegacyTransaction {
     async fn sign_inplace(&mut self, signer: &Signer) -> Result<(), SignerError> {
         let signature = signer.sign(self.encode_payload_to_vec().into()).await?;
 
-        self.v = U256::from(signature[64]);
+        let recovery_id = U256::from(signature[64]);
+        self.v = recovery_id + 27;
         (self.r, self.s, _) = parse_signature(signature);
 
         Ok(())

crates/vm/backends/levm/mod.rs

@@ -255,16 +255,6 @@ impl LEVM {
             vm_type,
         )?;
 
-        // According to EIP-7002 we need to check if the WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS
-        // has any code after being deployed. If not, the whole block becomes invalid.
-        // https://github.com/ethereum/EIPs/blob/master/EIPS/eip-7002.md
-        let account = db.get_account(*WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS)?;
-        if !account.has_code() {
-            return Err(EvmError::SystemContractEmpty(
-                "WITHDRAWAL_REQUEST_PREDEPLOY".to_string(),
-            ));
-        }
-
         match report.result {
             TxResult::Success => Ok(report),
             // EIP-7002 specifies that a failed system call invalidates the entire block.
@@ -294,16 +284,6 @@ impl LEVM {
             vm_type,
         )?;
 
-        // According to EIP-7251 we need to check if the CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS
-        // has any code after being deployed. If not, the whole block becomes invalid.
-        // https://github.com/ethereum/EIPs/blob/master/EIPS/eip-7251.md
-        let acc = db.get_account(*CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS)?;
-        if !acc.has_code() {
-            return Err(EvmError::SystemContractEmpty(
-                "CONSOLIDATION_REQUEST_PREDEPLOY".to_string(),
-            ));
-        }
-
         match report.result {
             TxResult::Success => Ok(report),
             // EIP-7251 specifies that a failed system call invalidates the entire block.

crates/vm/backends/revm/mod.rs

@@ -18,9 +18,8 @@ use ethrex_levm::constants::{SYS_CALL_GAS_LIMIT, TX_BASE_COST};
 use revm::db::AccountStatus;
 use revm::db::states::bundle_state::BundleRetention;
 
-use revm::{Database, DatabaseCommit};
 use revm::{
-    Evm,
+    DatabaseCommit, Evm,
     primitives::{B256, BlobExcessGasAndPrice, BlockEnv, TxEnv},
 };
 use revm_inspectors::access_list::AccessListInspector;
@@ -157,16 +156,7 @@ impl REVM {
         )?;
         Ok(())
     }
-    fn system_contract_account_info(
-        addr: Address,
-        state: &mut EvmState,
-    ) -> Result<revm_primitives::AccountInfo, EvmError> {
-        let revm_addr = RevmAddress::from_slice(addr.as_bytes());
-        let account_info = state.inner.basic(revm_addr)?.ok_or(EvmError::DB(
-            "System contract address was not found after deployment".to_string(),
-        ))?;
-        Ok(account_info)
-    }
+
     pub(crate) fn read_withdrawal_requests(
         block_header: &BlockHeader,
         state: &mut EvmState,
@@ -179,17 +169,6 @@ impl REVM {
             *SYSTEM_ADDRESS,
         )?;
 
-        // According to EIP-7002 we need to check if the WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS
-        // has any code after being deployed. If not, the whole block becomes invalid.
-        // https://github.com/ethereum/EIPs/blob/master/EIPS/eip-7002.md
-        let account_info =
-            Self::system_contract_account_info(*WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS, state)?;
-        if account_info.is_empty_code_hash() {
-            return Err(EvmError::SystemContractEmpty(
-                "WITHDRAWAL_REQUEST_PREDEPLOY".to_string(),
-            ));
-        }
-
         match tx_result {
             ExecutionResult::Success {
                 gas_used: _,
@@ -224,17 +203,6 @@ impl REVM {
             *SYSTEM_ADDRESS,
         )?;
 
-        // According to EIP-7251 we need to check if the CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS
-        // has any code after being deployed. If not, the whole block becomes invalid.
-        // https://github.com/ethereum/EIPs/blob/master/EIPS/eip-7251.md
-        let account_info =
-            Self::system_contract_account_info(*CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS, state)?;
-        if account_info.is_empty_code_hash() {
-            return Err(EvmError::SystemContractEmpty(
-                "CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS".to_string(),
-            ));
-        }
-
         match tx_result {
             ExecutionResult::Success {
                 gas_used: _,

crates/vm/errors.rs

@@ -25,8 +25,6 @@ pub enum EvmError {
     Custom(String),
     #[error("Invalid deposit request layout")]
     InvalidDepositRequest,
-    #[error("System contract: {0} has no code after deployment")]
-    SystemContractEmpty(String),
     #[error("System call failed: {0}")]
     SystemContractCallFailed(String),
 }

tooling/ef_tests/blockchain/deserialize.rs

@@ -112,11 +112,6 @@ where
                 "BlockException.INVALID_REQUESTS" => BlockChainExpectedException::BlockException(
                     BlockExpectedException::InvalidRequest,
                 ),
-                "BlockException.SYSTEM_CONTRACT_EMPTY" => {
-                    BlockChainExpectedException::BlockException(
-                        BlockExpectedException::SystemContractEmpty,
-                    )
-                }
                 "BlockException.SYSTEM_CONTRACT_CALL_FAILED" => {
                     BlockChainExpectedException::BlockException(
                         BlockExpectedException::SystemContractCallFailed,

tooling/ef_tests/blockchain/test_runner.rs

@@ -212,11 +212,6 @@ fn exception_is_expected(
             ) | (
                 BlockChainExpectedException::BlockException(BlockExpectedException::InvalidRequest),
                 ChainError::InvalidBlock(InvalidBlockError::RequestsHashMismatch)
-            ) | (
-                BlockChainExpectedException::BlockException(
-                    BlockExpectedException::SystemContractEmpty
-                ),
-                ChainError::EvmError(EvmError::SystemContractEmpty(_))
             ) | (
                 BlockChainExpectedException::BlockException(
                     BlockExpectedException::SystemContractCallFailed

tooling/ef_tests/blockchain/tests/all.rs

@@ -4,6 +4,8 @@ use std::path::Path;
 
 const TEST_FOLDER: &str = "vectors/";
 
+const SKIPPED_TESTS: &[&str] = &["system_contract_deployment"];
+
 // If neither `sp1` nor `stateless` is enabled: run with whichever engine
 // the features imply (LEVM if `levm` is on; otherwise REVM).
 #[cfg(not(any(feature = "sp1", feature = "stateless")))]
@@ -14,7 +16,7 @@ fn blockchain_runner(path: &Path) -> datatest_stable::Result<()> {
         EvmEngine::LEVM
     };
 
-    parse_and_execute(path, engine, None, None)
+    parse_and_execute(path, engine, Some(SKIPPED_TESTS), None)
 }
 
 // If `sp1` or `stateless` is enabled: always use LEVM with the appropriate backend.
@@ -25,7 +27,7 @@ fn blockchain_runner(path: &Path) -> datatest_stable::Result<()> {
     #[cfg(feature = "sp1")]
     let backend = Some(ethrex_prover_lib::backends::Backend::SP1);
 
-    parse_and_execute(path, EvmEngine::LEVM, None, backend)
+    parse_and_execute(path, EvmEngine::LEVM, Some(SKIPPED_TESTS), backend)
 }
 
 datatest_stable::harness!(blockchain_runner, TEST_FOLDER, r".*");

tooling/ef_tests/blockchain/types.rs

@@ -544,7 +544,6 @@ pub enum BlockExpectedException {
     IncorrectExcessBlobGas,
     IncorrectBlockFormat,
     InvalidRequest,
-    SystemContractEmpty,
     SystemContractCallFailed,
     Other, //TODO: Implement exceptions
 }

tooling/ef_tests/state_v2/Cargo.toml

@@ -10,7 +10,9 @@ ethrex-storage.workspace = true
 ethrex-rlp.workspace = true
 ethrex-vm.workspace = true
 ethrex-levm.workspace = true
+ethrex-l2-rpc.workspace = true
 
+secp256k1.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 bytes.workspace = true
@@ -30,3 +32,4 @@ hex = "0.4.3"
 default = ["c-kzg", "blst"]
 c-kzg = ["ethrex-vm/c-kzg", "ethrex-levm/c-kzg", "ethrex-common/c-kzg"]
 blst = ["ethrex-vm/blst"]
+block = []

tooling/ef_tests/state_v2/src/main.rs

@@ -1,8 +1,9 @@
+#![allow(clippy::all)]
+
 use clap::Parser;
 use ef_tests_statev2::modules::{
     error::RunnerError,
     parser::{RunnerOptions, parse_tests},
-    runner::run_tests,
 };
 
 #[tokio::main]
@@ -14,7 +15,12 @@ pub async fn main() -> Result<(), RunnerError> {
     let tests = parse_tests(&mut runner_options)?;
 
     println!("\nFinished parsing. Executing tests...");
-    run_tests(tests).await?;
+
+    if cfg!(feature = "block") {
+        ef_tests_statev2::modules::block_runner::run_tests(tests.clone()).await?;
+    } else {
+        ef_tests_statev2::modules::runner::run_tests(tests).await?;
+    }
     println!(
         "\nTests finished running.
     Find successful tests (if any) report at: './success_report.txt'.