From 73fcce45b7a1ca4c726df88690581fd1f43550f0 Mon Sep 17 00:00:00 2001
From: noelwei <fan@scroll.io>
Date: Thu, 21 Nov 2024 15:03:30 +0800
Subject: [PATCH 1/2] fix the evm usage for test contract

Signed-off-by: noelwei <fan@scroll.io>
---
 prover/src/utils/evm.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/prover/src/utils/evm.rs b/prover/src/utils/evm.rs
index d9030199d1..32dc502483 100644
--- a/prover/src/utils/evm.rs
+++ b/prover/src/utils/evm.rs
@@ -6,8 +6,8 @@ use halo2_proofs::{
     poly::kzg::commitment::ParamsKZG,
 };
 use revm::{
-    primitives::{Env, ExecutionResult, Output, SpecId, TxEnv, TxKind},
-    Evm, InMemoryDB,
+    primitives::{self, Env, ExecutionResult, Output, SpecId, TxEnv, TxKind},
+    Evm, Handler, InMemoryDB,
 };
 
 use snark_verifier::pcs::kzg::{Bdfg21, Kzg};
@@ -63,9 +63,9 @@ pub fn deploy_and_call(deployment_code: Vec<u8>, calldata: Vec<u8>) -> Result<u6
     };
     let mut db = InMemoryDB::default();
     let mut evm = Evm::builder()
-        .with_spec_id(SpecId::CANCUN)
         .with_db(&mut db)
         .with_env(env.clone())
+        .with_handler(Handler::mainnet::<primitives::CancunSpec>())
         .build();
     let result = evm.transact_commit().unwrap();
     let contract = match result {

From 474b2a76d9b006ef19877a49925d56fd3d1ab5e0 Mon Sep 17 00:00:00 2001
From: noelwei <fan@scroll.io>
Date: Thu, 21 Nov 2024 16:30:02 +0800
Subject: [PATCH 2/2] more fixs

Signed-off-by: noelwei <fan@scroll.io>
---
 prover/src/utils/evm.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/prover/src/utils/evm.rs b/prover/src/utils/evm.rs
index 32dc502483..ed27f2948b 100644
--- a/prover/src/utils/evm.rs
+++ b/prover/src/utils/evm.rs
@@ -6,7 +6,7 @@ use halo2_proofs::{
     poly::kzg::commitment::ParamsKZG,
 };
 use revm::{
-    primitives::{self, Env, ExecutionResult, Output, SpecId, TxEnv, TxKind},
+    primitives::{self, Env, ExecutionResult, Output, TxEnv, TxKind},
     Evm, Handler, InMemoryDB,
 };
 
@@ -94,9 +94,9 @@ pub fn deploy_and_call(deployment_code: Vec<u8>, calldata: Vec<u8>) -> Result<u6
         ..Default::default()
     };
     let mut evm = Evm::builder()
-        .with_spec_id(SpecId::CANCUN)
         .with_db(&mut db)
-        .with_env(env)
+        .with_env(env.clone())
+        .with_handler(Handler::mainnet::<primitives::CancunSpec>())
         .build();
     let result = evm.transact_commit().unwrap();
     match result {