External cost recorder

.github/workflows/rust.yml

@@ -24,8 +24,10 @@ jobs:
     - uses: actions/checkout@v2
     - name: Build
       run: cargo build --verbose
-    - name: Build for feature
+    - name: Build for feature (tracing)
       run: cargo build --features tracing --verbose
+    - name: Build for feature (with-substrate)
+      run: cargo build --features with-substrate --verbose
     - name: Run tests
       run: cargo test --verbose
   jsontests:

Cargo.toml

@@ -64,6 +64,7 @@ with-serde = [
 	"evm-core/with-serde",
 	"ethereum/with-serde",
 ]
+with-substrate = []
 tracing = [
 	"environmental",
 	"evm-gasometer/tracing",

gasometer/src/lib.rs

@@ -510,7 +510,7 @@ pub fn dynamic_opcode_cost<H: Handler>(
 				value: U256::from_big_endian(&stack.peek(2)?[..]),
 				gas: U256::from_big_endian(&stack.peek(0)?[..]),
 				target_is_cold: handler.is_cold(target, None)?,
-				target_exists: handler.exists(target),
+				target_exists: handler.exists(target)?,
 			}
 		}
 		Opcode::STATICCALL => {
@@ -519,7 +519,7 @@ pub fn dynamic_opcode_cost<H: Handler>(
 			GasCost::StaticCall {
 				gas: U256::from_big_endian(&stack.peek(0)?[..]),
 				target_is_cold: handler.is_cold(target, None)?,
-				target_exists: handler.exists(target),
+				target_exists: handler.exists(target)?,
 			}
 		}
 		Opcode::SHA3 => GasCost::Sha3 {
@@ -553,7 +553,7 @@ pub fn dynamic_opcode_cost<H: Handler>(
 			GasCost::DelegateCall {
 				gas: U256::from_big_endian(&stack.peek(0)?[..]),
 				target_is_cold: handler.is_cold(target, None)?,
-				target_exists: handler.exists(target),
+				target_exists: handler.exists(target)?,
 			}
 		}
 		Opcode::DELEGATECALL => GasCost::Invalid(opcode),
@@ -606,7 +606,7 @@ pub fn dynamic_opcode_cost<H: Handler>(
 			GasCost::Suicide {
 				value: handler.balance(address),
 				target_is_cold: handler.is_cold(target, None)?,
-				target_exists: handler.exists(target),
+				target_exists: handler.exists(target)?,
 				already_removed: handler.deleted(address),
 			}
 		}
@@ -620,7 +620,7 @@ pub fn dynamic_opcode_cost<H: Handler>(
 				value: U256::from_big_endian(&stack.peek(2)?[..]),
 				gas: U256::from_big_endian(&stack.peek(0)?[..]),
 				target_is_cold: handler.is_cold(target, None)?,
-				target_exists: handler.exists(target),
+				target_exists: handler.exists(target)?,
 			}
 		}
 

runtime/src/eval/system.rs

@@ -90,34 +90,46 @@ pub fn base_fee<H: Handler>(runtime: &mut Runtime, handler: &H) -> Control<H> {
 	Control::Continue
 }
 
-pub fn extcodesize<H: Handler>(runtime: &mut Runtime, handler: &H) -> Control<H> {
+pub fn extcodesize<H: Handler>(runtime: &mut Runtime, handler: &mut H) -> Control<H> {
 	pop!(runtime, address);
-	push_u256!(runtime, handler.code_size(address.into()));
+	let code_size = match handler.code_size(address.into()) {
+		Ok(v) => v,
+		Err(e) => return Control::Exit(e.into()),
+	};
+	push_u256!(runtime, code_size);
 
 	Control::Continue
 }
 
-pub fn extcodehash<H: Handler>(runtime: &mut Runtime, handler: &H) -> Control<H> {
+pub fn extcodehash<H: Handler>(runtime: &mut Runtime, handler: &mut H) -> Control<H> {
 	pop!(runtime, address);
-	push!(runtime, handler.code_hash(address.into()));
+	let code_hash = match handler.code_hash(address.into()) {
+		Ok(v) => v,
+		Err(e) => return Control::Exit(e.into()),
+	};
+	push!(runtime, code_hash);
 
 	Control::Continue
 }
 
-pub fn extcodecopy<H: Handler>(runtime: &mut Runtime, handler: &H) -> Control<H> {
+pub fn extcodecopy<H: Handler>(runtime: &mut Runtime, handler: &mut H) -> Control<H> {
 	pop!(runtime, address);
 	pop_u256!(runtime, memory_offset, code_offset, len);
 
 	try_or_fail!(runtime
 		.machine
 		.memory_mut()
 		.resize_offset(memory_offset, len));
-	match runtime.machine.memory_mut().copy_large(
-		memory_offset,
-		code_offset,
-		len,
-		&handler.code(address.into()),
-	) {
+
+	let code = match handler.code(address.into()) {
+		Ok(code) => code,
+		Err(e) => return Control::Exit(e.into()),
+	};
+	match runtime
+		.machine
+		.memory_mut()
+		.copy_large(memory_offset, code_offset, len, &code)
+	{
 		Ok(()) => (),
 		Err(e) => return Control::Exit(e.into()),
 	};

runtime/src/handler.rs

@@ -28,11 +28,11 @@ pub trait Handler {
 	/// Get balance of address.
 	fn balance(&self, address: H160) -> U256;
 	/// Get code size of address.
-	fn code_size(&self, address: H160) -> U256;
+	fn code_size(&mut self, address: H160) -> Result<U256, ExitError>;
 	/// Get code hash of address.
-	fn code_hash(&self, address: H160) -> H256;
+	fn code_hash(&mut self, address: H160) -> Result<H256, ExitError>;
 	/// Get code of address.
-	fn code(&self, address: H160) -> Vec<u8>;
+	fn code(&mut self, address: H160) -> Result<Vec<u8>, ExitError>;
 	/// Get storage value of address at index.
 	fn storage(&self, address: H160, index: H256) -> H256;
 	/// Get original storage value of address at index.
@@ -64,7 +64,7 @@ pub trait Handler {
 	fn chain_id(&self) -> U256;
 
 	/// Check whether an address exists.
-	fn exists(&self, address: H160) -> bool;
+	fn exists(&mut self, address: H160) -> Result<bool, ExitError>;
 	/// Check whether an address has already been deleted.
 	fn deleted(&self, address: H160) -> bool;
 	/// Checks if the address or (address, index) pair has been previously accessed

src/backend/memory.rs

@@ -1,4 +1,5 @@
 use super::{Apply, ApplyBackend, Backend, Basic, Log};
+use crate::ExitError;
 use alloc::collections::BTreeMap;
 use alloc::vec::Vec;
 use primitive_types::{H160, H256, U256};
@@ -143,11 +144,12 @@ impl<'vicinity> Backend for MemoryBackend<'vicinity> {
 			.unwrap_or_default()
 	}
 
-	fn code(&self, address: H160) -> Vec<u8> {
-		self.state
+	fn code(&mut self, address: H160) -> Result<Vec<u8>, ExitError> {
+		Ok(self
+			.state
 			.get(&address)
 			.map(|v| v.code.clone())
-			.unwrap_or_default()
+			.unwrap_or_default())
 	}
 
 	fn storage(&self, address: H160, index: H256) -> H256 {

src/backend/mod.rs

@@ -5,7 +5,7 @@
 mod memory;
 
 pub use self::memory::{MemoryAccount, MemoryBackend, MemoryVicinity};
-
+use crate::ExitError;
 use alloc::vec::Vec;
 use primitive_types::{H160, H256, U256};
 
@@ -50,7 +50,7 @@ pub enum Apply<I> {
 }
 
 /// EVM backend.
-#[auto_impl::auto_impl(&, Arc, Box)]
+//#[auto_impl::auto_impl(&, Arc, Box)]
 pub trait Backend {
 	/// Gas price. Unused for London.
 	fn gas_price(&self) -> U256;
@@ -80,7 +80,7 @@ pub trait Backend {
 	/// Get basic account information.
 	fn basic(&self, address: H160) -> Basic;
 	/// Get account code.
-	fn code(&self, address: H160) -> Vec<u8>;
+	fn code(&mut self, address: H160) -> Result<Vec<u8>, ExitError>;
 	/// Get storage value of address at index.
 	fn storage(&self, address: H160, index: H256) -> H256;
 	/// Get original storage value of address at index, if available.