Merge branch 'main' into feat-jrigada-paymaster-initial-support

matter-labs · Sep 24, 2024 · f222c8f · f222c8f
2 parents e9f47dd + 082b6a3
commit f222c8f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/crates/cheatcodes/src/inspector.rs b/crates/cheatcodes/src/inspector.rs
@@ -942,6 +942,23 @@ impl Cheatcodes {
             return None
         }
 
+        if let Some(CreateScheme::Create) = input.scheme() {
+            let caller = input.caller();
+            let nonce = ecx
+                .inner
+                .journaled_state
+                .load_account(input.caller(), &mut ecx.inner.db)
+                .unwrap()
+                .0
+                .info
+                .nonce;
+            let address = caller.create(nonce);
+            if ecx.db.get_test_contract_address().map(|addr| address == addr).unwrap_or_default() {
+                info!("running create in EVM, instead of zkEVM (Test Contract) {:#?}", address);
+                return None
+            }
+        }
+
         if input.init_code().0 == DEFAULT_CREATE2_DEPLOYER_CODE {
             info!("running create in EVM, instead of zkEVM (DEFAULT_CREATE2_DEPLOYER_CODE)");
             return None

diff --git a/crates/script/src/runner.rs b/crates/script/src/runner.rs
@@ -131,6 +131,7 @@ impl ScriptRunner {
         let address = CALLER.create(self.executor.get_nonce(CALLER)?);
         self.executor.backend_mut().set_test_contract(address);
 
+        self.executor.backend_mut().set_test_contract(address);
         // Set the contracts initial balance before deployment, so it is available during the
         // construction
         self.executor.set_balance(address, self.evm_opts.initial_balance)?;