feat: Update sputnik (#144)

* temp: use patched evm for auto_impl & update lock

rust-ethereum/evm#85

* fix sputnik breaking changes

* fix(dapp): breaking changes

* fix(cli): breaking changes

* cli: default to london

* chore: fmt

Author: 0129general

Diff for: Cargo.lock

@@ -13,3 +13,6 @@ opt-level = "z"
 lto = true
 codegen-units = 1
 panic = "abort"
+
+[patch."https://github.com/rust-blockchain/evm"]
+evm = { git = "https://github.com/gakonst/evm", branch = "feat/auto-impl" }

Diff for: Cargo.toml

@@ -29,5 +29,5 @@ proptest = "1.0.0"
 [dev-dependencies]
 evm-adapters = { path = "./../evm-adapters", features = ["sputnik", "sputnik-helpers", "evmodin", "evmodin-helpers"] }
 evmodin = { git = "https://github.com/vorot93/evmodin", features = ["util"] }
-evm = { version = "0.31" }
+evm = { git = "https://github.com/rust-blockchain/evm" }
 ethers = { git = "https://github.com/gakonst/ethers-rs", features = ["solc-full", "solc-tests"] }

Diff for: dapp/Cargo.toml

@@ -221,7 +221,7 @@ mod tests {
         use evm::Config;
         use evm_adapters::sputnik::{
             helpers::{new_backend, new_vicinity},
-            Executor,
+            Executor, PRECOMPILES_MAP,
         };
 
         #[test]
@@ -231,7 +231,9 @@ mod tests {
             let env = new_vicinity();
             let backend = new_backend(&env, Default::default());
             // important to instantiate the VM with cheatcodes
-            let evm = Executor::new_with_cheatcodes(backend, gas_limit, &config, false);
+            let precompiles = PRECOMPILES_MAP.clone();
+            let evm =
+                Executor::new_with_cheatcodes(backend, gas_limit, &config, &precompiles, false);
 
             let mut runner = runner(evm);
             let results = runner.test(Regex::new(".*").unwrap()).unwrap();
@@ -256,7 +258,8 @@ mod tests {
             let gas_limit = 12_500_000;
             let env = new_vicinity();
             let backend = new_backend(&env, Default::default());
-            let evm = Executor::new(gas_limit, &config, &backend);
+            let precompiles = PRECOMPILES_MAP.clone();
+            let evm = Executor::new(gas_limit, &config, &backend, &precompiles);
             test_multi_runner(evm);
         }
     }

Diff for: dapp/src/multi_runner.rs

@@ -239,7 +239,7 @@ mod tests {
     use crate::test_helpers::COMPILED;
     use ethers::solc::artifacts::CompactContractRef;
     use evm::Config;
-    use std::marker::PhantomData;
+    use evm_adapters::sputnik::PRECOMPILES_MAP;
 
     mod sputnik {
         use std::str::FromStr;
@@ -259,7 +259,8 @@ mod tests {
             let compiled = COMPILED.find("GreeterTest").expect("could not find contract");
             let vicinity = new_vicinity();
             let backend = new_backend(&vicinity, Default::default());
-            let evm = Executor::new(12_000_000, &cfg, &backend);
+            let precompiles = PRECOMPILES_MAP.clone();
+            let evm = Executor::new(12_000_000, &cfg, &backend, &precompiles);
             super::test_runner(evm, compiled);
         }
 
@@ -270,7 +271,8 @@ mod tests {
             let vicinity = new_vicinity();
             let backend = new_backend(&vicinity, Default::default());
 
-            let mut evm = Executor::new(12_000_000, &cfg, &backend);
+            let precompiles = PRECOMPILES_MAP.clone();
+            let mut evm = Executor::new(12_000_000, &cfg, &backend, &precompiles);
             let (addr, _, _, _) =
                 evm.deploy(Address::zero(), compiled.bin.unwrap().clone(), 0.into()).unwrap();
 
@@ -296,7 +298,8 @@ mod tests {
             let vicinity = new_vicinity();
             let backend = new_backend(&vicinity, Default::default());
 
-            let mut evm = Executor::new(u64::MAX, &cfg, &backend);
+            let precompiles = PRECOMPILES_MAP.clone();
+            let mut evm = Executor::new(u64::MAX, &cfg, &backend, &precompiles);
             let (addr, _, _, _) =
                 evm.deploy(Address::zero(), compiled.bin.unwrap().clone(), 0.into()).unwrap();
 
@@ -319,7 +322,8 @@ mod tests {
             let vicinity = new_vicinity();
             let backend = new_backend(&vicinity, Default::default());
 
-            let mut evm = Executor::new(12_000_000, &cfg, &backend);
+            let precompiles = PRECOMPILES_MAP.clone();
+            let mut evm = Executor::new(12_000_000, &cfg, &backend, &precompiles);
             let (addr, _, _, _) =
                 evm.deploy(Address::zero(), compiled.bin.unwrap().clone(), 0.into()).unwrap();
 

Diff for: dapp/src/runner.rs

@@ -27,7 +27,7 @@ tracing = "0.1.26"
 
 ## EVM Implementations
 # evm = { version = "0.30.1" }
-sputnik = { package = "evm", version = "0.31",  optional = true }
+sputnik = { package = "evm", git = "https://github.com/rust-blockchain/evm",  optional = true }
 evmodin = { git = "https://github.com/vorot93/evmodin", optional = true }
 proptest = "1.0.0"
 git2 = "0.13.22"

Diff for: dapptools/Cargo.toml

@@ -3,7 +3,7 @@ use ethers::{
     solc::{remappings::Remapping, ArtifactOutput, Project},
 };
 use evm_adapters::{
-    sputnik::{vicinity, ForkMemoryBackend},
+    sputnik::{vicinity, ForkMemoryBackend, PRECOMPILES_MAP},
     FAUCET_ACCOUNT,
 };
 use regex::Regex;
@@ -98,7 +98,14 @@ fn main() -> eyre::Result<()> {
                     };
                     let backend = Arc::new(backend);
 
-                    let evm = Executor::new_with_cheatcodes(backend, env.gas_limit, &cfg, ffi);
+                    let precompiles = PRECOMPILES_MAP.clone();
+                    let evm = Executor::new_with_cheatcodes(
+                        backend,
+                        env.gas_limit,
+                        &cfg,
+                        &precompiles,
+                        ffi,
+                    );
 
                     test(builder, project, evm, pattern, json, verbosity)?;
                 }