Add support both with and without EIP-7610 in jsontests (#372)

* Add support both with and without EIP-7610

* Format and clippy

* Avoid generic

We have several thousands of tests. With generic it will create an instance for
each of them!

Author: sorpaas

docs/development.md

@@ -0,0 +1,10 @@
+# Development
+
+## Config naming conventions
+
+The name for a `Config` feature flag should be of the following format: `eipXXXX_short_description_name`. For example:
+
+```
+eip161_empty_check
+eip7610_create_check_storage
+```

interpreter/src/eval/system.rs

@@ -146,7 +146,7 @@ pub fn extcodehash<
 	handler: &mut H,
 ) -> Control<Tr> {
 	pop_h256!(machine, address);
-	let eip161 = AsRef::<RuntimeConfig>::as_ref(&machine.state).eip161;
+	let eip161 = AsRef::<RuntimeConfig>::as_ref(&machine.state).eip161_empty_check;
 	let is_empty = if eip161 {
 		handler.is_empty(address.into())
 	} else {

interpreter/src/runtime.rs

@@ -28,7 +28,7 @@ pub struct RuntimeState {
 #[derive(Clone, Debug)]
 pub struct RuntimeConfig {
 	/// Whether EIP-161 is enabled.
-	pub eip161: bool,
+	pub eip161_empty_check: bool,
 }
 
 /// Runtime state and config.
@@ -40,7 +40,9 @@ pub struct RuntimeStateAndConfig<'config> {
 	pub config: &'config RuntimeConfig,
 }
 
-static DEFAULT_RUNTIME_CONFIG: RuntimeConfig = RuntimeConfig { eip161: true };
+static DEFAULT_RUNTIME_CONFIG: RuntimeConfig = RuntimeConfig {
+	eip161_empty_check: true,
+};
 
 impl RuntimeStateAndConfig<'static> {
 	/// Used for testing, if you don't care about the config but simply want to

jsontests/proc-macro/src/lib.rs

@@ -11,14 +11,33 @@ use syn::{
 struct Input {
 	prefix: LitStr,
 	folder: LitStr,
+	flags: Vec<Ident>,
 }
 
 impl Parse for Input {
 	fn parse(input: ParseStream) -> syn::Result<Self> {
 		let prefix = input.parse()?;
 		input.parse::<Token![,]>()?;
 		let folder = input.parse()?;
-		Ok(Input { prefix, folder })
+
+		if input.is_empty() {
+			return Ok(Input {
+				prefix,
+				folder,
+				flags: Vec::new(),
+			});
+		}
+
+		input.parse::<Token![;]>()?;
+		let flags = input
+			.parse_terminated(Ident::parse, Token![,])?
+			.into_iter()
+			.collect();
+		Ok(Input {
+			prefix,
+			folder,
+			flags,
+		})
 	}
 }
 
@@ -41,23 +60,37 @@ pub fn statetest_folder(item: TokenStream) -> TokenStream {
 		jsontests::run::collect_test_files(folder.to_str().expect("non-utf8 filename"))
 			.expect("uninitialized submodule");
 
+	let mut disable_eip7610 = false;
+	for flag in input.flags {
+		if flag == "disable_eip7610" {
+			disable_eip7610 = true;
+		} else {
+			panic!("unknown flag");
+		}
+	}
+
 	let mut tests = Vec::new();
 	for (test_file_name, test_file_path) in test_files {
 		let mut name = format!("{prefix:}/{test_file_name:}");
 		name = name.replace("/", "__");
 		let ident = Ident::new(&name, Span::call_site());
+		let modify_config = if disable_eip7610 {
+			quote! { jsontests::run::disable_eip7610 }
+		} else {
+			quote! { jsontests::run::empty_config_change }
+		};
 		tests.push(quote! {
 			#[test]
 			fn #ident() -> Result<(), jsontests::error::Error> {
-				let tests_status = jsontests::run::run_file(#test_file_path, false, None);
+				let tests_status = jsontests::run::run_file(#test_file_path, false, None, #modify_config);
 				match tests_status {
 					Ok(tests_status) => {
 						tests_status.print_total();
 						Ok(())
 					},
 					Err(err) => {
 						// Rerun tests with debug flag.
-						jsontests::run::run_file(#test_file_path, true, Some("failed.json"))?;
+						jsontests::run::run_file(#test_file_path, true, Some("failed.json"), #modify_config)?;
 						Err(err)
 					},
 				}

jsontests/src/main.rs

@@ -19,7 +19,12 @@ fn main() -> Result<(), Error> {
 
 	let mut tests_status = TestCompletionStatus::default();
 	for filename in cli.filenames {
-		tests_status += run::run_single(&filename, cli.debug, cli.write_failed.as_deref())?;
+		tests_status += run::run_single(
+			&filename,
+			cli.debug,
+			cli.write_failed.as_deref(),
+			run::empty_config_change,
+		)?;
 	}
 	tests_status.print_total();
 

jsontests/src/run.rs

@@ -33,11 +33,20 @@ fn get_short_file_name(filename: &str) -> String {
 	short_file_name.clone().to_string()
 }
 
+/// Don't do any config change.
+pub fn empty_config_change(_config: &mut Config) {}
+
+/// Disable EIP-7610.
+pub fn disable_eip7610(config: &mut Config) {
+	config.eip7610_create_check_storage = false;
+}
+
 /// Run tests for specific json file with debug flag
 pub fn run_file(
 	filename: &str,
 	debug: bool,
 	write_failed: Option<&str>,
+	config_change: fn(&mut Config),
 ) -> Result<TestCompletionStatus, Error> {
 	let test_multi: BTreeMap<String, TestMulti> =
 		serde_json::from_reader(BufReader::new(File::open(filename)?))?;
@@ -58,7 +67,14 @@ pub fn run_file(
 					test.fork, short_file_name, test_name, test.index
 				);
 			}
-			match run_test(filename, &test_name, test.clone(), debug, write_failed) {
+			match run_test(
+				filename,
+				&test_name,
+				test.clone(),
+				debug,
+				write_failed,
+				config_change,
+			) {
 				Ok(()) => {
 					tests_status.inc_completed();
 					println!("ok")
@@ -88,6 +104,7 @@ pub fn run_single(
 	filename: &str,
 	debug: bool,
 	write_failed: Option<&str>,
+	config_change: fn(&mut Config),
 ) -> Result<TestCompletionStatus, Error> {
 	if fs::metadata(filename)?.is_dir() {
 		let mut tests_status = TestCompletionStatus::default();
@@ -98,13 +115,13 @@ pub fn run_single(
 
 			if filename.ends_with(".json") {
 				println!("RUN for: {filename}");
-				tests_status += run_file(filename, debug, write_failed)?;
+				tests_status += run_file(filename, debug, write_failed, config_change)?;
 			}
 		}
 		tests_status.print_total_for_dir(filename);
 		Ok(tests_status)
 	} else {
-		run_file(filename, debug, write_failed)
+		run_file(filename, debug, write_failed, config_change)
 	}
 }
 
@@ -159,11 +176,13 @@ pub fn run_test(
 	test: TestData,
 	debug: bool,
 	write_failed: Option<&str>,
+	config_change: fn(&mut Config),
 ) -> Result<(), Error> {
-	let config = match test.fork {
+	let mut config = match test.fork {
 		Fork::Istanbul => Config::istanbul(),
 		_ => return Err(Error::UnsupportedFork),
 	};
+	config_change(&mut config);
 
 	if test.post.expect_exception == Some(TestExpectException::TR_TypeNotSupported) {
 		// The `evm` crate does not understand transaction format, only the `ethereum` crate. So

jsontests/src/types.rs

@@ -211,6 +211,28 @@ pub enum TestExpectException {
 	TR_InitCodeLimitExceeded,
 	IntrinsicGas,
 	SenderNotEOA,
+	#[serde(rename = "TransactionException.INSUFFICIENT_MAX_FEE_PER_BLOB_GAS")]
+	TE_INSUFFICIENT_MAX_FEE_PER_BLOB_GAS,
+	#[serde(rename = "TransactionException.INSUFFICIENT_ACCOUNT_FUNDS")]
+	TE_INSUFFICIENT_ACCOUNT_FUNDS,
+	#[serde(rename = "TransactionException.TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH")]
+	TE_TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH,
+	#[serde(
+		rename = "TransactionException.TYPE_3_TX_PRE_FORK|TransactionException.TYPE_3_TX_ZERO_BLOBS"
+	)]
+	TE_TYPE_3_TX_PER_FORK_OR_TX_ZERO_BLOBS,
+	#[serde(rename = "TransactionException.INSUFFICIENT_MAX_FEE_PER_GAS")]
+	TE_INSUFFICIENT_MAX_FEE_PER_GAS,
+	#[serde(rename = "TransactionException.TYPE_3_TX_ZERO_BLOBS")]
+	TE_TYPE_3_TX_ZERO_BLOBS,
+	#[serde(rename = "TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED")]
+	TE_TYPE_3_TX_BLOB_COUNT_EXCEEDED,
+	#[serde(rename = "TransactionException.TYPE_3_TX_PRE_FORK")]
+	TE_TYPE_3_TX_PER_FORK,
+	#[serde(rename = "TransactionException.INITCODE_SIZE_EXCEEDED")]
+	TE_INITCODE_SIZE_EXCEEDED,
+	#[serde(rename = "TransactionException.INTRINSIC_GAS_TOO_LOW")]
+	TE_INTRINSIC_GAS_TOO_LOW,
 }
 
 #[derive(Clone, Debug, Eq, PartialEq, Deserialize, Serialize)]

jsontests/tests/legacytests.rs

@@ -1,5 +1,11 @@
-// use jsontests_proc_macro::statetest_folder;
-//
-// statetest_folder!("legacytests_constaninople", "../res/legacytests/Constantinople/GeneralStateTests");
+use jsontests_proc_macro::statetest_folder;
+
+statetest_folder!(
+	"legacytests_constaninople",
+	"../res/legacytests/Constantinople/GeneralStateTests"
+);
 // statetest_folder!("legacytests_constaninople_vmtests", "../res/legacytests/Constantinople/VMTests");
-// statetest_folder!("legacytests_cancun", "../res/legacytests/Cancun/GeneralStateTests");
+statetest_folder!(
+	"legacytests_cancun",
+	"../res/legacytests/Cancun/GeneralStateTests"
+);

jsontests/tests/oldethtests.rs

@@ -1,3 +1,3 @@
 use jsontests_proc_macro::statetest_folder;
 
-statetest_folder!("oldethtests", "../res/ethtests/GeneralStateTests");
+statetest_folder!("oldethtests", "../res/ethtests/GeneralStateTests"; disable_eip7610);

src/backend/in_memory.rs

@@ -204,4 +204,16 @@ impl RuntimeBaseBackend for InMemoryBackend {
 			.unwrap_or(Default::default())
 			.nonce
 	}
+
+	fn can_create(&self, address: H160) -> bool {
+		self.nonce(address) == U256::zero()
+			&& self.code_size(address) == U256::zero()
+			&& self
+				.state
+				.get(&address)
+				.cloned()
+				.unwrap_or(Default::default())
+				.storage
+				.is_empty()
+	}
 }