fix: update and pin foundry

pinkiebell · Oct 3, 2022 · f42c7c5 · f42c7c5
1 parent 7b96201
commit f42c7c5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,7 +31,7 @@ paste = "1.0.7"
 halo2_wrong_ecc = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_09_09", package = "ecc" }
 
 # loader_evm
-foundry_evm = { git = "https://github.com/han0110/foundry", package = "foundry-evm", branch = "fix/pin-revm-to-rev" }
+foundry_evm = { git = "https://github.com/foundry-rs/foundry", package = "foundry-evm", rev = "6b1ee60e" }
 crossterm = { version = "0.22.1" }
 tui = { version = "0.16.0", default-features = false, features = ["crossterm"] }
 

diff --git a/examples/evm-verifier-with-accumulator.rs b/examples/evm-verifier-with-accumulator.rs
@@ -597,7 +597,7 @@ fn evm_verify(deployment_code: Vec<u8>, instances: Vec<Vec<Fr>>, proof: Vec<u8>)
             .call_raw(caller, verifier, calldata.into(), 0.into())
             .unwrap();
 
-        dbg!(result.gas);
+        dbg!(result.gas_used);
 
         !result.reverted
     };

diff --git a/examples/evm-verifier.rs b/examples/evm-verifier.rs
@@ -241,7 +241,7 @@ fn evm_verify(deployment_code: Vec<u8>, instances: Vec<Vec<Fr>>, proof: Vec<u8>)
             .call_raw(caller, verifier, calldata.into(), 0.into())
             .unwrap();
 
-        dbg!(result.gas);
+        dbg!(result.gas_used);
 
         !result.reverted
     };

diff --git a/src/loader/evm/test.rs b/src/loader/evm/test.rs
@@ -52,5 +52,5 @@ pub fn execute(code: Vec<u8>, calldata: Vec<u8>) -> (bool, u64, Vec<u64>) {
         Tui::new(result.debug.unwrap().flatten(0), 0).start();
     }
 
-    (!result.reverted, result.gas, costs)
+    (!result.reverted, result.gas_used, costs)
 }