feat: expose evm internal fns

Cargo.toml

@@ -20,6 +20,7 @@ serde = { version = "1.0", default-features = false, features = ["derive"], opti
 codec = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive"], optional = true }
 ethereum = { version = "~0.8", default-features = false }
 environmental = { version = "1.1.2", default-features = false, optional = true }
+auto_impl = "0.4.1"
 
 [dev-dependencies]
 criterion = "0.3"

gasometer/src/lib.rs

@@ -54,7 +54,7 @@ pub struct Snapshot {
 }
 
 /// EVM gasometer.
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct Gasometer<'config> {
 	gas_limit: u64,
 	config: &'config Config,
@@ -674,7 +674,7 @@ pub fn dynamic_opcode_cost<H: Handler>(
 }
 
 /// Holds the gas consumption for a Gasometer instance.
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 struct Inner<'config> {
 	memory_gas: u64,
 	used_gas: u64,

runtime/Cargo.toml

@@ -13,6 +13,7 @@ evm-core = { version = "0.30", path = "../core", default-features = false }
 primitive-types = { version = "0.10", default-features = false }
 sha3 = { version = "0.8", default-features = false }
 environmental = { version = "1.1.2", default-features = false, optional = true}
+auto_impl = "0.4.1"
 
 [features]
 default = ["std"]

runtime/src/handler.rs

@@ -14,6 +14,7 @@ pub struct Transfer {
 }
 
 /// EVM context handler.
+#[auto_impl::auto_impl(&mut, Box)]
 pub trait Handler {
 	/// Type of `CREATE` interrupt.
 	type CreateInterrupt;

src/backend/memory.rs

@@ -65,6 +65,11 @@ impl<'vicinity> MemoryBackend<'vicinity> {
 	pub fn state(&self) -> &BTreeMap<H160, MemoryAccount> {
 		&self.state
 	}
+
+	/// Get a mutable reference to the underlying `BTreeMap` storing the state.
+	pub fn state_mut(&mut self) -> &mut BTreeMap<H160, MemoryAccount> {
+		&mut self.state
+	}
 }
 
 impl<'vicinity> Backend for MemoryBackend<'vicinity> {

src/backend/mod.rs

@@ -47,6 +47,7 @@ pub enum Apply<I> {
 }
 
 /// EVM backend.
+#[auto_impl::auto_impl(&, Arc, Box)]
 pub trait Backend {
 	/// Gas price.
 	fn gas_price(&self) -> U256;

src/executor/mod.rs

@@ -6,6 +6,8 @@
 mod stack;
 
 pub use self::stack::{
-	MemoryStackState, Precompile, PrecompileOutput, StackExecutor, StackExitKind, StackState,
-	StackSubstateMetadata,
+	MemoryStackAccount, MemoryStackState, MemoryStackSubstate, Precompile, PrecompileOutput,
+	StackExecutor, StackExitKind, StackState, StackSubstateMetadata,
 };
+
+pub use ethereum::Log;

src/executor/stack/mod.rs

@@ -1,6 +1,6 @@
 mod state;
 
-pub use self::state::{MemoryStackState, MemoryStackSubstate, StackState};
+pub use self::state::{MemoryStackAccount, MemoryStackState, MemoryStackSubstate, StackState};
 
 use crate::gasometer::{self, Gasometer, StorageTarget};
 use crate::{
@@ -43,18 +43,18 @@ pub enum StackExitKind {
 	Failed,
 }
 
-#[derive(Default)]
+#[derive(Default, Clone, Debug)]
 struct Accessed {
 	accessed_addresses: BTreeSet<H160>,
 	accessed_storage: BTreeSet<(H160, H256)>,
 }
 
 impl Accessed {
-	fn access_address(&mut self, address: H160) {
+	pub fn access_address(&mut self, address: H160) {
 		self.accessed_addresses.insert(address);
 	}
 
-	fn access_addresses<I>(&mut self, addresses: I)
+	pub fn access_addresses<I>(&mut self, addresses: I)
 	where
 		I: Iterator<Item = H160>,
 	{
@@ -63,7 +63,7 @@ impl Accessed {
 		}
 	}
 
-	fn access_storages<I>(&mut self, storages: I)
+	pub fn access_storages<I>(&mut self, storages: I)
 	where
 		I: Iterator<Item = (H160, H256)>,
 	{
@@ -73,6 +73,7 @@ impl Accessed {
 	}
 }
 
+#[derive(Clone, Debug)]
 pub struct StackSubstateMetadata<'config> {
 	gasometer: Gasometer<'config>,
 	is_static: bool,
@@ -152,13 +153,13 @@ impl<'config> StackSubstateMetadata<'config> {
 		self.depth
 	}
 
-	fn access_address(&mut self, address: H160) {
+	pub fn access_address(&mut self, address: H160) {
 		if let Some(accessed) = &mut self.accessed {
 			accessed.access_address(address)
 		}
 	}
 
-	fn access_addresses<I>(&mut self, addresses: I)
+	pub fn access_addresses<I>(&mut self, addresses: I)
 	where
 		I: Iterator<Item = H160>,
 	{
@@ -167,13 +168,13 @@ impl<'config> StackSubstateMetadata<'config> {
 		}
 	}
 
-	fn access_storage(&mut self, address: H160, key: H256) {
+	pub fn access_storage(&mut self, address: H160, key: H256) {
 		if let Some(accessed) = &mut self.accessed {
 			accessed.accessed_storage.insert((address, key));
 		}
 	}
 
-	fn access_storages<I>(&mut self, storages: I)
+	pub fn access_storages<I>(&mut self, storages: I)
 	where
 		I: Iterator<Item = (H160, H256)>,
 	{
@@ -216,6 +217,10 @@ impl<'config, S: StackState<'config>> StackExecutor<'config, S> {
 		self.config
 	}
 
+	pub fn precompile(&self) -> &Precompile {
+		&self.precompile
+	}
+
 	/// Create a new stack-based executor with given precompiles.
 	pub fn new_with_precompile(state: S, config: &'config Config, precompile: Precompile) -> Self {
 		Self {
@@ -471,7 +476,7 @@ impl<'config, S: StackState<'config>> StackExecutor<'config, S> {
 		}
 	}
 
-	fn initialize_with_access_list(&mut self, access_list: Vec<(H160, Vec<H256>)>) {
+	pub fn initialize_with_access_list(&mut self, access_list: Vec<(H160, Vec<H256>)>) {
 		let addresses = access_list.iter().map(|a| a.0);
 		self.state.metadata_mut().access_addresses(addresses);
 

src/executor/stack/state.rs

@@ -10,12 +10,13 @@ use core::mem;
 use primitive_types::{H160, H256, U256};
 
 #[derive(Clone, Debug)]
-struct MemoryStackAccount {
+pub struct MemoryStackAccount {
 	pub basic: Basic,
 	pub code: Option<Vec<u8>>,
 	pub reset: bool,
 }
 
+#[derive(Clone, Debug)]
 pub struct MemoryStackSubstate<'config> {
 	metadata: StackSubstateMetadata<'config>,
 	parent: Option<Box<MemoryStackSubstate<'config>>>,
@@ -37,6 +38,10 @@ impl<'config> MemoryStackSubstate<'config> {
 		}
 	}
 
+	pub fn logs(&self) -> &[Log] {
+		&self.logs
+	}
+
 	pub fn metadata(&self) -> &StackSubstateMetadata<'config> {
 		&self.metadata
 	}
@@ -165,7 +170,7 @@ impl<'config> MemoryStackSubstate<'config> {
 		Ok(())
 	}
 
-	fn known_account(&self, address: H160) -> Option<&MemoryStackAccount> {
+	pub fn known_account(&self, address: H160) -> Option<&MemoryStackAccount> {
 		if let Some(account) = self.accounts.get(&address) {
 			Some(account)
 		} else if let Some(parent) = self.parent.as_ref() {
@@ -384,6 +389,7 @@ impl<'config> MemoryStackSubstate<'config> {
 	}
 }
 
+#[auto_impl::auto_impl(&mut, Box)]
 pub trait StackState<'config>: Backend {
 	fn metadata(&self) -> &StackSubstateMetadata<'config>;
 	fn metadata_mut(&mut self) -> &mut StackSubstateMetadata<'config>;
@@ -409,6 +415,7 @@ pub trait StackState<'config>: Backend {
 	fn touch(&mut self, address: H160);
 }
 
+#[derive(Clone, Debug)]
 pub struct MemoryStackState<'backend, 'config, B> {
 	backend: &'backend B,
 	substate: MemoryStackSubstate<'config>,