refactor: use checked bytecode

See bluealloy/revm#121 (comment)
foundry-rs · Aug 1, 2022 · 3526179 · 3526179
1 parent 2c4cffc
commit 3526179
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/anvil/src/eth/backend/db.rs b/anvil/src/eth/backend/db.rs
@@ -43,7 +43,7 @@ pub trait Db: DatabaseRef + Database + DatabaseCommit + Send + Sync {
             H256::from_slice(&keccak256(code.as_ref())[..])
         };
         info.code_hash = code_hash;
-        info.code = Some(Bytecode::new_raw(code.0));
+        info.code = Some(Bytecode::new_raw(code.0).to_checked());
         self.insert_account(address, info);
     }
 

diff --git a/anvil/src/eth/backend/mem/in_memory_db.rs b/anvil/src/eth/backend/mem/in_memory_db.rs
@@ -62,7 +62,7 @@ impl Db for MemDb {
                     code: if account.code.0.is_empty() {
                         None
                     } else {
-                        Some(Bytecode::new_raw(account.code.0))
+                        Some(Bytecode::new_raw(account.code.0).to_checked())
                     },
                     // use max nonce in case account is imported multiple times with difference
                     // nonces to prevent collisions

diff --git a/evm/src/executor/fork/backend.rs b/evm/src/executor/fork/backend.rs
@@ -282,7 +282,7 @@ where
                             let acc = AccountInfo {
                                 nonce: nonce.as_u64(),
                                 balance,
-                                code: code.map(|bytes| Bytecode::new_raw(bytes)),
+                                code: code.map(|bytes| Bytecode::new_raw(bytes).to_checked()),
                                 code_hash,
                             };
                             pin.db.accounts().write().insert(addr, acc.clone());

diff --git a/evm/src/executor/inspector/cheatcodes/env.rs b/evm/src/executor/inspector/cheatcodes/env.rs
@@ -175,7 +175,7 @@ pub fn apply<DB: Database>(
 
             // TODO: Does this increase gas usage?
             data.subroutine.load_account(inner.0, data.db);
-            data.subroutine.set_code(inner.0, Bytecode::new_raw(code.0), hash);
+            data.subroutine.set_code(inner.0, Bytecode::new_raw(code.0).to_checked(), hash);
             Ok(Bytes::new())
         }
         HEVMCalls::Deal(inner) => {

diff --git a/evm/src/executor/inspector/coverage.rs b/evm/src/executor/inspector/coverage.rs
@@ -61,7 +61,7 @@ where
         if let Some(context) = self.context.last() {
             self.ic_map.insert(
                 *context,
-                build_ic_map(data.env.cfg.spec_id, &interp.contract().bytecode.bytecode()),
+                build_ic_map(data.env.cfg.spec_id, interp.contract().bytecode.bytecode()),
             );
         }
         Return::Continue

diff --git a/evm/src/executor/inspector/debugger.rs b/evm/src/executor/inspector/debugger.rs
@@ -105,7 +105,7 @@ where
         // code given by the interpreter may either be the contract init code, or the runtime code.
         self.ic_map.insert(
             self.context,
-            build_ic_map(data.env.cfg.spec_id, &interp.contract().bytecode.bytecode()),
+            build_ic_map(data.env.cfg.spec_id, interp.contract().bytecode.bytecode()),
         );
         self.previous_gas_block = interp.contract.first_gas_block();
         Return::Continue