Skip to content
This repository was archived by the owner on Apr 18, 2025. It is now read-only.

Explicitly specify mainnet env for evm #1447

Merged
lispc merged 2 commits into from
Nov 21, 2024
Merged

Explicitly specify mainnet env for evm #1447

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73fcce4
fix the evm usage for test contract
noel2004 Nov 21, 2024
474b2a7
more fixs
noel2004 Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions prover/src/utils/evm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, TxEnv, TxKind},
Evm, Handler, InMemoryDB,
};

use snark_verifier::pcs::kzg::{Bdfg21, Kzg};
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
Loading