Pass all Frontier tests (#374)

* Fix EIP-161 and empty create issue in Frontier

* Init code behavior for Frontier

* Run cargo fmt

* Pass all Frontier tests

* Run cargo fmt

* Add non_exhaustive to Error types and Config types to prepare for release

* Set eip7610 to true

Author: sorpaas

interpreter/src/error/exit.rs

@@ -49,6 +49,7 @@ impl fmt::Display for ExitError {
 	derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[non_exhaustive]
 pub enum ExitSucceed {
 	/// Machine encountered an explicit stop.
 	Stopped,
@@ -71,6 +72,7 @@ impl From<ExitSucceed> for ExitResult {
 	derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[non_exhaustive]
 pub enum ExitException {
 	/// Trying to pop from an empty stack.
 	#[cfg_attr(feature = "scale", codec(index = 0))]
@@ -154,6 +156,7 @@ impl From<ExitException> for ExitError {
 	derive(scale_codec::Encode, scale_codec::Decode, scale_info::TypeInfo)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[non_exhaustive]
 pub enum ExitFatal {
 	/// The operation is not supported.
 	NotSupported,

interpreter/src/runtime.rs

@@ -26,6 +26,7 @@ pub struct RuntimeState {
 
 /// Runtime config.
 #[derive(Clone, Debug)]
+#[non_exhaustive]
 pub struct RuntimeConfig {
 	/// EIP-161: new rules about empty accounts.
 	pub eip161_empty_check: bool,
@@ -35,6 +36,32 @@ pub struct RuntimeConfig {
 	pub eip6780_suicide_only_in_same_tx: bool,
 }
 
+impl RuntimeConfig {
+	/// Create a new Runtime config with default settings.
+	pub const fn new() -> Self {
+		Self {
+			eip161_empty_check: true,
+			eip7610_create_check_storage: true,
+			eip6780_suicide_only_in_same_tx: false,
+		}
+	}
+
+	/// Create a new Runtime config with Frontier settings (everything disabled).
+	pub const fn frontier() -> Self {
+		Self {
+			eip161_empty_check: false,
+			eip6780_suicide_only_in_same_tx: false,
+			eip7610_create_check_storage: true,
+		}
+	}
+}
+
+impl Default for RuntimeConfig {
+	fn default() -> Self {
+		Self::new()
+	}
+}
+
 /// Runtime state and config.
 #[derive(Clone, Debug)]
 pub struct RuntimeStateAndConfig<'config> {
@@ -44,11 +71,7 @@ pub struct RuntimeStateAndConfig<'config> {
 	pub config: &'config RuntimeConfig,
 }
 
-static DEFAULT_RUNTIME_CONFIG: RuntimeConfig = RuntimeConfig {
-	eip161_empty_check: true,
-	eip7610_create_check_storage: false,
-	eip6780_suicide_only_in_same_tx: false,
-};
+static DEFAULT_RUNTIME_CONFIG: RuntimeConfig = RuntimeConfig::new();
 
 impl RuntimeStateAndConfig<'static> {
 	/// Used for testing.

jsontests/src/run.rs

@@ -180,7 +180,7 @@ pub fn run_test(
 ) -> Result<(), Error> {
 	let mut config = match test.fork {
 		Fork::Istanbul => Config::istanbul(),
-		// Fork::Frontier => Config::frontier(),
+		Fork::Frontier => Config::frontier(),
 		_ => return Err(Error::UnsupportedFork),
 	};
 	config_change(&mut config);

src/backend/in_memory.rs

@@ -100,10 +100,6 @@ impl InMemoryBackend {
 			}
 		}
 
-		for address in changeset.deletes.clone() {
-			self.state.remove(&address);
-		}
-
 		if changeset.config.eip161_empty_check {
 			for address in changeset.touched.clone() {
 				if self.is_empty(address) {
@@ -114,6 +110,14 @@ impl InMemoryBackend {
 			for address in changeset.touched.clone() {
 				self.state.entry(address).or_default();
 			}
+
+			self.state
+				.entry(self.environment.block_coinbase)
+				.or_default();
+		}
+
+		for address in changeset.deletes.clone() {
+			self.state.remove(&address);
 		}
 	}
 }

src/backend/overlayed.rs

@@ -72,7 +72,7 @@ impl<'config, B> OverlayedBackend<'config, B> {
 
 	/// Deconstruct the current overlayed backend. The change set can then be applied into the actual backend.
 	pub fn deconstruct(mut self) -> (B, OverlayedChangeSet<'config>) {
-		if self.touched_ripemd {
+		if self.config.eip161_empty_check && self.touched_ripemd {
 			self.substate.touched.insert(RIPEMD);
 		}
 

src/standard/config.rs

@@ -2,6 +2,7 @@ use evm_interpreter::runtime::RuntimeConfig;
 
 /// Runtime configuration.
 #[derive(Clone, Debug)]
+#[non_exhaustive]
 pub struct Config {
 	/// Runtime config.
 	pub runtime: RuntimeConfig,
@@ -87,11 +88,7 @@ impl Config {
 	/// Frontier hard fork configuration.
 	pub const fn frontier() -> Config {
 		Config {
-			runtime: RuntimeConfig {
-				eip161_empty_check: false,
-				eip6780_suicide_only_in_same_tx: false,
-				eip7610_create_check_storage: true,
-			},
+			runtime: RuntimeConfig::frontier(),
 			eip2_no_empty_contract: false,
 			eip2_create_transaction_increase: false,
 			eip2200_sstore_gas_metering: false,
@@ -100,7 +97,7 @@ impl Config {
 			eip3529_decrease_clears_refund: false,
 			eip3541_disallow_executable_format: false,
 			eip3651_warm_coinbase_address: false,
-			eip150_no_err_on_call_with_more_gas: true,
+			eip150_no_err_on_call_with_more_gas: false,
 			eip161_create_increase_nonce: false,
 			eip150_call_l64_after_gas: false,
 			eip170_create_contract_limit: false,

src/standard/gasometer/mod.rs

@@ -25,22 +25,6 @@ pub struct GasometerState {
 }
 
 impl GasometerState {
-	/// Perform any operation on the gasometer. Set the gasometer to `OutOfGas`
-	/// if the operation fails.
-	#[inline]
-	pub fn perform<R, F: FnOnce(&mut Self) -> Result<R, ExitError>>(
-		&mut self,
-		f: F,
-	) -> Result<R, ExitError> {
-		match f(self) {
-			Ok(r) => Ok(r),
-			Err(e) => {
-				self.oog();
-				Err(e)
-			}
-		}
-	}
-
 	/// Set the current gasometer to `OutOfGas`.
 	pub fn oog(&mut self) {
 		self.memory_gas = 0;
@@ -89,11 +73,9 @@ impl GasometerState {
 
 	/// Record code deposit gas.
 	pub fn record_codedeposit(&mut self, len: usize) -> Result<(), ExitError> {
-		self.perform(|gasometer| {
-			let cost = len as u64 * consts::G_CODEDEPOSIT;
-			gasometer.record_gas64(cost)?;
-			Ok(())
-		})
+		let cost = len as u64 * consts::G_CODEDEPOSIT;
+		self.record_gas64(cost)?;
+		Ok(())
 	}
 
 	/// Set memory gas usage.

src/standard/invoker/mod.rs

@@ -361,18 +361,28 @@ where
 						let retbuf = exit.retval;
 
 						if let Some(substate) = substate {
-							routines::deploy_create_code(
+							match routines::deploy_create_code(
 								address,
 								retbuf,
 								substate,
 								handler,
 								SetCodeOrigin::Transaction,
-							)?;
-
-							Ok(TransactValueCallCreate::Create {
-								succeed: result,
-								address,
-							})
+							) {
+								Ok(()) => Ok(TransactValueCallCreate::Create {
+									succeed: result,
+									address,
+								}),
+								Err(e)
+									if AsRef::<Config>::as_ref(&substate)
+										.eip2_no_empty_contract =>
+								{
+									Err(e)
+								}
+								Err(_) => Ok(TransactValueCallCreate::Create {
+									succeed: result,
+									address,
+								}),
+							}
 						} else {
 							Err(ExitFatal::Unfinished.into())
 						}
@@ -684,11 +694,18 @@ where
 									retbuf = Vec::new();
 									Ok(address)
 								}
-								Err(err) => {
+								Err(err)
+									if AsRef::<Config>::as_ref(&substate)
+										.eip2_no_empty_contract =>
+								{
 									retbuf = Vec::new();
 									strategy = MergeStrategy::Discard;
 									Err(err)
 								}
+								Err(_) => {
+									retbuf = Vec::new();
+									Ok(address)
+								}
 							}
 						}
 						Err(err) => Err(err),