New callstack implementation

.github/workflows/rust.yml

@@ -2,9 +2,9 @@ name: Rust
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, next ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, next ]
 
 env:
   CARGO_TERM_COLOR: always
@@ -16,32 +16,11 @@ jobs:
     - uses: actions/checkout@v2
     - name: Rustfmt
       run: cargo fmt --all -- --check
-    - name: Clippy
-      run: cargo clippy --all
   build:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Build
       run: cargo build --verbose
-    - name: Build for feature (tracing)
-      run: cargo build --features tracing --verbose
     - name: Run tests
       run: cargo test --verbose
-  jsontests:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        repository: "rust-blockchain/evm-tests"
-        submodules: recursive
-    - name: Submodules
-      run: |
-        cd evm
-        git remote set-url origin "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY"
-        git fetch origin $GITHUB_SHA
-        git checkout $GITHUB_SHA
-    - name: Run tests
-      run: |
-        cd jsontests
-        cargo test --release --verbose

Cargo.toml

@@ -29,10 +29,6 @@ evm-gasometer = { version = "0.40", path = "gasometer", default-features = false
 criterion = "0.4"
 hex = "0.4"
 
-[[bench]]
-name = "loop"
-harness = false
-
 [features]
 default = ["std"]
 std = [
@@ -67,5 +63,4 @@ with-serde = [
 members = [
 	"interpreter",
 	"gasometer",
-	"fuzzer",
 ]

gasometer/src/lib.rs

@@ -12,7 +12,7 @@ pub use crate::config::Config;
 pub use crate::standard::StandardGasometer;
 
 use core::ops::{Add, AddAssign, Sub, SubAssign};
-use evm_interpreter::{Capture, Control, Etable, ExitError, ExitResult, Machine, Opcode, Trap};
+use evm_interpreter::{Capture, Control, Etable, ExitError, ExitResult, Machine, Opcode};
 use primitive_types::U256;
 
 pub trait Gas:
@@ -32,6 +32,7 @@ impl Gas for U256 {}
 pub enum GasometerMergeStrategy {
 	Commit,
 	Revert,
+	Discard,
 }
 
 pub trait Gasometer<S, H>: Sized {
@@ -50,16 +51,16 @@ pub trait Gasometer<S, H>: Sized {
 	fn merge(&mut self, other: Self, strategy: GasometerMergeStrategy);
 }
 
-pub fn run_with_gasometer<S, H, G, F>(
+pub fn run_with_gasometer<S, H, Tr, G, F>(
 	machine: &mut Machine<S>,
 	gasometer: &mut G,
 	handler: &mut H,
 	is_static: bool,
-	etable: &Etable<S, H, F>,
-) -> Capture<ExitResult, Trap>
+	etable: &Etable<S, H, Tr, F>,
+) -> Capture<ExitResult, Tr>
 where
 	G: Gasometer<S, H>,
-	F: Fn(&mut Machine<S>, &mut H, Opcode, usize) -> Control,
+	F: Fn(&mut Machine<S>, &mut H, Opcode, usize) -> Control<Tr>,
 {
 	loop {
 		match gasometer.record_stepn(&machine, handler, is_static) {

gasometer/src/standard.rs

@@ -131,6 +131,7 @@ impl<'config, H: Handler> Gasometer<RuntimeState, H> for StandardGasometer<'conf
 			GasometerMergeStrategy::Revert => {
 				self.used_gas -= Gasometer::<RuntimeState, H>::gas(&other);
 			}
+			GasometerMergeStrategy::Discard => (),
 		}
 	}
 }

interpreter/src/call_create.rs

@@ -49,6 +49,11 @@ pub struct Transfer {
 	pub value: U256,
 }
 
+pub enum CallCreateTrapData {
+	Call(CallTrapData),
+	Create(CreateTrapData),
+}
+
 pub struct CallTrapData {
 	pub target: H160,
 	pub transfer: Option<Transfer>,

interpreter/src/runtime.rs

@@ -34,9 +34,7 @@ impl CallCreateTrap for Opcode {
 	}
 }
 
-/// EVM context handler.
-#[auto_impl::auto_impl(&mut, Box)]
-pub trait Handler {
+pub trait RuntimeBackend {
 	/// Get balance of address.
 	fn balance(&self, address: H160) -> U256;
 	/// Get code size of address.
@@ -50,12 +48,24 @@ pub trait Handler {
 	/// Get original storage value of address at index.
 	fn original_storage(&self, address: H160, index: H256) -> H256;
 
-	/// Get the gas left value.
-	fn gas_left(&self) -> U256;
-	/// Get the gas price value.
-	fn gas_price(&self) -> U256;
-	/// Get execution origin.
-	fn origin(&self) -> H160;
+	/// Check whether an address exists.
+	fn exists(&self, address: H160) -> bool;
+	/// 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.
+	fn is_cold(&self, address: H160, index: Option<H256>) -> bool;
+	/// Mark an address or (address, index) pair as hot.
+	fn mark_hot(&mut self, address: H160, index: Option<H256>) -> Result<(), ExitError>;
+	/// Set storage value of address at index.
+	fn set_storage(&mut self, address: H160, index: H256, value: H256) -> Result<(), ExitError>;
+
+	/// Create a log owned by address with given topics and data.
+	fn log(&mut self, address: H160, topics: Vec<H256>, data: Vec<u8>) -> Result<(), ExitError>;
+	/// Mark an address to be deleted, with funds transferred to target.
+	fn mark_delete(&mut self, address: H160, target: H160) -> Result<(), ExitError>;
+}
+
+pub trait RuntimeEnvironmentalBackend {
 	/// Get environmental block hash.
 	fn block_hash(&self, number: U256) -> H256;
 	/// Get environmental block number.
@@ -74,20 +84,16 @@ pub trait Handler {
 	fn block_base_fee_per_gas(&self) -> U256;
 	/// Get environmental chain ID.
 	fn chain_id(&self) -> U256;
+	/// Get the gas price value.
+	fn gas_price(&self) -> U256;
+	/// Get execution origin.
+	fn origin(&self) -> H160;
+}
 
-	/// Check whether an address exists.
-	fn exists(&self, address: H160) -> bool;
-	/// 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.
-	fn is_cold(&self, address: H160, index: Option<H256>) -> bool;
-	/// Mark an address or (address, index) pair as hot.
-	fn mark_hot(&mut self, address: H160, index: Option<H256>) -> Result<(), ExitError>;
-
-	/// Set storage value of address at index.
-	fn set_storage(&mut self, address: H160, index: H256, value: H256) -> Result<(), ExitError>;
-	/// Create a log owned by address with given topics and data.
-	fn log(&mut self, address: H160, topics: Vec<H256>, data: Vec<u8>) -> Result<(), ExitError>;
-	/// Mark an address to be deleted, with funds transferred to target.
-	fn mark_delete(&mut self, address: H160, target: H160) -> Result<(), ExitError>;
+pub trait RuntimeGasometerBackend {
+	/// Get the gas left value.
+	fn gas_left(&self) -> U256;
 }
+
+/// EVM context handler.
+pub trait Handler: RuntimeBackend + RuntimeEnvironmentalBackend + RuntimeGasometerBackend {}

src/backend.rs

@@ -0,0 +1,9 @@
+pub enum TransactionalMergeStrategy {
+	Commit,
+	Discard,
+}
+
+pub trait TransactionalBackend {
+	fn push_substate(&mut self);
+	fn pop_substate(&mut self, strategy: TransactionalMergeStrategy);
+}