Merge pull request #281 from moonbeam-foundation/ahmad-cancun-eip-6780

crystalin · web-flow · commit bb2532e7d746 · 2025-01-13T12:51:35.000+01:00
Cancun self destruct changes (EIP 6780)
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,6 +32,9 @@ sha3 = { version = "0.10", default-features = false }
 
 evm-interpreter = { version = "1.0.0-dev", path = "interpreter", default-features = false }
 
+[dev-dependencies]
+hex = { version = "0.4", features = [ "serde" ] }
+
 [features]
 default = ["std"]
 std = [
diff --git a/interpreter/src/eval/system.rs b/interpreter/src/eval/system.rs
@@ -362,9 +362,7 @@ pub fn suicide<S: AsRef<RuntimeState>, H: RuntimeEnvironment + RuntimeBackend, T
 			value: balance,
 		})?;
 
-		handler.mark_delete(address);
-		handler.reset_balance(address);
-
+		handler.mark_delete_reset(address);
 		Ok(((), ()))
 	}) {
 		Ok(()) => Control::Exit(ExitSucceed::Suicided.into()),
diff --git a/interpreter/src/runtime.rs b/interpreter/src/runtime.rs
@@ -139,6 +139,8 @@ pub trait RuntimeBackend: RuntimeBaseBackend {
 	fn original_storage(&self, address: H160, index: H256) -> H256;
 	/// Check whether an address has already been deleted.
 	fn deleted(&self, address: H160) -> bool;
+	/// Check whether an address has already been created in the transaction.
+	fn created(&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;
 	fn is_hot(&self, address: H160, index: Option<H256>) -> bool {
@@ -158,8 +160,10 @@ pub trait RuntimeBackend: RuntimeBaseBackend {
 	) -> Result<(), ExitError>;
 	/// Create a log owned by address with given topics and data.
 	fn log(&mut self, log: Log) -> Result<(), ExitError>;
-	/// Mark an address to be deleted.
-	fn mark_delete(&mut self, address: H160);
+	/// Mark an address to be deleted and its balance to be reset.
+	fn mark_delete_reset(&mut self, address: H160);
+	// Mark an address as created in the current transaction.
+	fn mark_create(&mut self, address: H160);
 	/// Fully delete storages of an account.
 	fn reset_storage(&mut self, address: H160);
 	/// Set code of an account.
diff --git a/interpreter/tests/usability.rs b/interpreter/tests/usability.rs
@@ -1,5 +1,3 @@
-use std::rc::Rc;
-
 use evm_interpreter::{
 	error::{CallCreateTrap, Capture, ExitError, ExitSucceed},
 	etable::{Control, Etable},
@@ -12,6 +10,7 @@ use evm_interpreter::{
 	EtableInterpreter, RunInterpreter,
 };
 use primitive_types::{H160, H256, U256};
+use std::rc::Rc;
 
 const CODE1: &str = "60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056";
 const DATA1: &str = "2839e92800000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001";
@@ -135,6 +134,11 @@ impl RuntimeBackend for UnimplementedHandler {
 	fn deleted(&self, _address: H160) -> bool {
 		unimplemented!()
 	}
+
+	fn created(&self, _address: H160) -> bool {
+		unimplemented!()
+	}
+
 	fn is_cold(&self, _address: H160, _index: Option<H256>) -> bool {
 		unimplemented!()
 	}
@@ -157,7 +161,11 @@ impl RuntimeBackend for UnimplementedHandler {
 	fn log(&mut self, _log: Log) -> Result<(), ExitError> {
 		unimplemented!()
 	}
-	fn mark_delete(&mut self, _address: H160) {
+	fn mark_delete_reset(&mut self, _address: H160) {
+		unimplemented!()
+	}
+
+	fn mark_create(&mut self, _address: H160) {
 		unimplemented!()
 	}
 
diff --git a/jsontests/src/run.rs b/jsontests/src/run.rs
@@ -184,8 +184,8 @@ pub fn run_test(
 		state,
 	};
 
-	let mut run_backend = OverlayedBackend::new(&base_backend, initial_accessed.clone());
-	let mut step_backend = OverlayedBackend::new(&base_backend, initial_accessed.clone());
+	let mut run_backend = OverlayedBackend::new(&base_backend, initial_accessed.clone(), &config);
+	let mut step_backend = OverlayedBackend::new(&base_backend, initial_accessed.clone(), &config);
 
 	// Run
 	let run_result = evm::transact(args.clone(), Some(4), &mut run_backend, &invoker);
diff --git a/src/backend/overlayed.rs b/src/backend/overlayed.rs
@@ -11,7 +11,7 @@ use evm_interpreter::{
 };
 use primitive_types::{H160, H256, U256};
 
-use crate::{backend::TransactionalBackend, MergeStrategy};
+use crate::{backend::TransactionalBackend, standard::Config, MergeStrategy};
 
 #[derive(Clone, Debug)]
 pub struct OverlayedChangeSet {
@@ -25,18 +25,24 @@ pub struct OverlayedChangeSet {
 	pub deletes: BTreeSet<H160>,
 }
 
-pub struct OverlayedBackend<B> {
+pub struct OverlayedBackend<'config, B> {
 	backend: B,
 	substate: Box<Substate>,
 	accessed: BTreeSet<(H160, Option<H256>)>,
+	config: &'config Config,
 }
 
-impl<B> OverlayedBackend<B> {
-	pub fn new(backend: B, accessed: BTreeSet<(H160, Option<H256>)>) -> Self {
+impl<'config, B> OverlayedBackend<'config, B> {
+	pub fn new(
+		backend: B,
+		accessed: BTreeSet<(H160, Option<H256>)>,
+		config: &'config Config,
+	) -> Self {
 		Self {
 			backend,
 			substate: Box::new(Substate::new()),
 			accessed,
+			config,
 		}
 	}
 
@@ -57,7 +63,7 @@ impl<B> OverlayedBackend<B> {
 	}
 }
 
-impl<B: RuntimeEnvironment> RuntimeEnvironment for OverlayedBackend<B> {
+impl<B: RuntimeEnvironment> RuntimeEnvironment for OverlayedBackend<'_, B> {
 	fn block_hash(&self, number: U256) -> H256 {
 		self.backend.block_hash(number)
 	}
@@ -95,7 +101,7 @@ impl<B: RuntimeEnvironment> RuntimeEnvironment for OverlayedBackend<B> {
 	}
 }
 
-impl<B: RuntimeBaseBackend> RuntimeBaseBackend for OverlayedBackend<B> {
+impl<B: RuntimeBaseBackend> RuntimeBaseBackend for OverlayedBackend<'_, B> {
 	fn balance(&self, address: H160) -> U256 {
 		if let Some(balance) = self.substate.known_balance(address) {
 			balance
@@ -145,11 +151,15 @@ impl<B: RuntimeBaseBackend> RuntimeBaseBackend for OverlayedBackend<B> {
 	}
 }
 
-impl<B: RuntimeBaseBackend> RuntimeBackend for OverlayedBackend<B> {
+impl<B: RuntimeBaseBackend> RuntimeBackend for OverlayedBackend<'_, B> {
 	fn original_storage(&self, address: H160, index: H256) -> H256 {
 		self.backend.storage(address, index)
 	}
 
+	fn created(&self, address: H160) -> bool {
+		self.substate.created(address)
+	}
+
 	fn deleted(&self, address: H160) -> bool {
 		self.substate.deleted(address)
 	}
@@ -184,8 +194,20 @@ impl<B: RuntimeBaseBackend> RuntimeBackend for OverlayedBackend<B> {
 		Ok(())
 	}
 
-	fn mark_delete(&mut self, address: H160) {
-		self.substate.deletes.insert(address);
+	fn mark_delete_reset(&mut self, address: H160) {
+		if self.config.suicide_only_in_same_tx {
+			if self.created(address) {
+				self.substate.deletes.insert(address);
+				self.substate.storage_resets.insert(address);
+			}
+		} else {
+			self.substate.deletes.insert(address);
+			self.substate.storage_resets.insert(address);
+		}
+	}
+
+	fn mark_create(&mut self, address: H160) {
+		self.substate.creates.insert(address);
 	}
 
 	fn reset_storage(&mut self, address: H160) {
@@ -238,7 +260,7 @@ impl<B: RuntimeBaseBackend> RuntimeBackend for OverlayedBackend<B> {
 	}
 }
 
-impl<B: RuntimeBaseBackend> TransactionalBackend for OverlayedBackend<B> {
+impl<'config, B: RuntimeBaseBackend> TransactionalBackend for OverlayedBackend<'config, B> {
 	fn push_substate(&mut self) {
 		let mut parent = Box::new(Substate::new());
 		mem::swap(&mut parent, &mut self.substate);
@@ -278,6 +300,9 @@ impl<B: RuntimeBaseBackend> TransactionalBackend for OverlayedBackend<B> {
 				for address in child.deletes {
 					self.substate.deletes.insert(address);
 				}
+				for address in child.creates {
+					self.substate.creates.insert(address);
+				}
 			}
 			MergeStrategy::Revert | MergeStrategy::Discard => {}
 		}
@@ -294,6 +319,7 @@ struct Substate {
 	storages: BTreeMap<(H160, H256), H256>,
 	transient_storage: BTreeMap<(H160, H256), H256>,
 	deletes: BTreeSet<H160>,
+	creates: BTreeSet<H160>,
 }
 
 impl Substate {
@@ -308,6 +334,7 @@ impl Substate {
 			storages: Default::default(),
 			transient_storage: Default::default(),
 			deletes: Default::default(),
+			creates: Default::default(),
 		}
 	}
 
@@ -385,4 +412,14 @@ impl Substate {
 			false
 		}
 	}
+
+	pub fn created(&self, address: H160) -> bool {
+		if self.creates.contains(&address) {
+			true
+		} else if let Some(parent) = self.parent.as_ref() {
+			parent.created(address)
+		} else {
+			false
+		}
+	}
 }
diff --git a/src/standard/config.rs b/src/standard/config.rs
@@ -103,6 +103,8 @@ pub struct Config {
 	pub eip_5656_enabled: bool,
 	/// Uses EIP-1559 (Base fee is burned when this flag is enabled) [EIP-1559](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md)
 	pub eip_1559_enabled: bool,
+	/// Selfdestruct deletet contract only if called in the same tx as creation [EIP-6780](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-6780.md)
+	pub suicide_only_in_same_tx: bool,
 }
 
 impl Config {
@@ -159,6 +161,7 @@ impl Config {
 			eip_1153_enabled: false,
 			eip_5656_enabled: false,
 			eip_1559_enabled: false,
+			suicide_only_in_same_tx: false,
 		}
 	}
 
@@ -215,6 +218,7 @@ impl Config {
 			eip_1153_enabled: false,
 			eip_5656_enabled: false,
 			eip_1559_enabled: false,
+			suicide_only_in_same_tx: false,
 		}
 	}
 
@@ -257,6 +261,7 @@ impl Config {
 			eip_1153_enabled,
 			eip_5656_enabled,
 			eip_1559_enabled,
+			suicide_only_in_same_tx,
 		} = inputs;
 
 		// See https://eips.ethereum.org/EIPS/eip-2929
@@ -322,6 +327,7 @@ impl Config {
 			eip_1153_enabled,
 			eip_5656_enabled,
 			eip_1559_enabled,
+			suicide_only_in_same_tx,
 		}
 	}
 }
@@ -344,6 +350,7 @@ struct DerivedConfigInputs {
 	eip_1153_enabled: bool,
 	eip_5656_enabled: bool,
 	eip_1559_enabled: bool,
+	suicide_only_in_same_tx: bool,
 }
 
 impl DerivedConfigInputs {
@@ -361,6 +368,7 @@ impl DerivedConfigInputs {
 			eip_1153_enabled: false,
 			eip_5656_enabled: false,
 			eip_1559_enabled: false,
+			suicide_only_in_same_tx: false,
 		}
 	}
 
@@ -378,6 +386,7 @@ impl DerivedConfigInputs {
 			eip_1153_enabled: false,
 			eip_5656_enabled: false,
 			eip_1559_enabled: true,
+			suicide_only_in_same_tx: false,
 		}
 	}
 
@@ -395,6 +404,7 @@ impl DerivedConfigInputs {
 			eip_1153_enabled: false,
 			eip_5656_enabled: false,
 			eip_1559_enabled: true,
+			suicide_only_in_same_tx: false,
 		}
 	}
 
@@ -413,9 +423,9 @@ impl DerivedConfigInputs {
 			eip_1153_enabled: false,
 			eip_5656_enabled: false,
 			eip_1559_enabled: true,
+			suicide_only_in_same_tx: false,
 		}
 	}
-
 	const fn cancun() -> Self {
 		Self {
 			gas_storage_read_warm: 100,
@@ -428,9 +438,10 @@ impl DerivedConfigInputs {
 			warm_coinbase_address: true,
 			// 2 * (MAX_CODE_SIZE = `24576`) = (0xC000 = 49152) as per EIP-3860
 			max_initcode_size: Some(0xC000),
-			eip_1153_enabled: true,
-			eip_5656_enabled: true,
+			eip_1153_enabled: false,
+			eip_5656_enabled: false,
 			eip_1559_enabled: true,
+			suicide_only_in_same_tx: true,
 		}
 	}
 }
diff --git a/src/standard/invoker/routines.rs b/src/standard/invoker/routines.rs
@@ -75,6 +75,7 @@ where
 	}
 
 	handler.reset_storage(state.as_ref().context.address);
+	handler.mark_create(state.as_ref().context.address);
 
 	resolver.resolve_create(init_code, state, handler)
 }
diff --git a/tests/contract/DeployAndDestroy.sol b/tests/contract/DeployAndDestroy.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract DeployAndDestroy {
+    constructor() {
+        selfdestruct(payable(msg.sender));
+    }
+}
diff --git a/tests/contract/SimpleContract.sol b/tests/contract/SimpleContract.sol
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract SimpleContract {
+    address public owner;
+
+    // Constructor sets the owner of the contract
+    constructor() {
+        owner = msg.sender;
+    }
+
+    // Function to destroy the contract and send the remaining funds to the target address
+    function destroy(address target) public {
+         selfdestruct(payable(target));
+    }
+}
diff --git a/tests/contract/deploy_and_destroy_init_code b/tests/contract/deploy_and_destroy_init_code
@@ -0,0 +1 @@
+6080604052348015600e575f80fd5b503373ffffffffffffffffffffffffffffffffffffffff16fffe
diff --git a/tests/contract/simple_contract_bytecode.txt b/tests/contract/simple_contract_bytecode.txt
@@ -0,0 +1 @@
+608060405234801561000f575f80fd5b50335f806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506101948061005c5f395ff3fe608060405234801561000f575f80fd5b5060043610610033575f3560e01c8062f55d9d146100375780638da5cb5b14610053575b5f80fd5b610051600480360381019061004c919061010b565b610071565b005b61005b61008a565b6040516100689190610145565b60405180910390f35b8073ffffffffffffffffffffffffffffffffffffffff16ff5b5f8054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f6100da826100b1565b9050919050565b6100ea816100d0565b81146100f4575f80fd5b50565b5f81359050610105816100e1565b92915050565b5f602082840312156101205761011f6100ad565b5b5f61012d848285016100f7565b91505092915050565b61013f816100d0565b82525050565b5f6020820190506101585f830184610136565b9291505056fea26469706673582212201e4165398f9671b365261ccc1129042cbcea13db557b5359b2298c51f2ab274d64736f6c63430008150033
diff --git a/tests/eip_6780.rs b/tests/eip_6780.rs
diff --git a/tests/mock.rs b/tests/mock.rs

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ use evm_interpreter::{`
`11`	`11`	`};`
`12`	`12`	`use primitive_types::{H160, H256, U256};`
`13`	`13`
`14`		`-use crate::{backend::TransactionalBackend, MergeStrategy};`
	`14`	`+use crate::{backend::TransactionalBackend, standard::Config, MergeStrategy};`
`15`	`15`
`16`	`16`	`#[derive(Clone, Debug)]`
`17`	`17`	`pub struct OverlayedChangeSet {`
`@@ -25,18 +25,24 @@ pub struct OverlayedChangeSet {`
`25`	`25`	`pub deletes: BTreeSet<H160>,`
`26`	`26`	`}`
`27`	`27`
`28`		`-pub struct OverlayedBackend<B> {`
	`28`	`+pub struct OverlayedBackend<'config, B> {`
`29`	`29`	`backend: B,`
`30`	`30`	`substate: Box<Substate>,`
`31`	`31`	`accessed: BTreeSet<(H160, Option<H256>)>,`
	`32`	`+ config: &'config Config,`
`32`	`33`	`}`
`33`	`34`
`34`		`-impl<B> OverlayedBackend<B> {`
`35`		`- pub fn new(backend: B, accessed: BTreeSet<(H160, Option<H256>)>) -> Self {`
	`35`	`+impl<'config, B> OverlayedBackend<'config, B> {`
	`36`	`+ pub fn new(`
	`37`	`+ backend: B,`
	`38`	`+ accessed: BTreeSet<(H160, Option<H256>)>,`
	`39`	`+ config: &'config Config,`
	`40`	`+ ) -> Self {`
`36`	`41`	`Self {`
`37`	`42`	`backend,`
`38`	`43`	`substate: Box::new(Substate::new()),`
`39`	`44`	`accessed,`
	`45`	`+ config,`
`40`	`46`	`}`
`41`	`47`	`}`
`42`	`48`
`@@ -57,7 +63,7 @@ impl<B> OverlayedBackend<B> {`
`57`	`63`	`}`
`58`	`64`	`}`
`59`	`65`
`60`		`-impl<B: RuntimeEnvironment> RuntimeEnvironment for OverlayedBackend<B> {`
	`66`	`+impl<B: RuntimeEnvironment> RuntimeEnvironment for OverlayedBackend<'_, B> {`
`61`	`67`	`fn block_hash(&self, number: U256) -> H256 {`
`62`	`68`	`self.backend.block_hash(number)`
`63`	`69`	`}`
`@@ -95,7 +101,7 @@ impl<B: RuntimeEnvironment> RuntimeEnvironment for OverlayedBackend<B> {`
`95`	`101`	`}`
`96`	`102`	`}`
`97`	`103`
`98`		`-impl<B: RuntimeBaseBackend> RuntimeBaseBackend for OverlayedBackend<B> {`
	`104`	`+impl<B: RuntimeBaseBackend> RuntimeBaseBackend for OverlayedBackend<'_, B> {`
`99`	`105`	`fn balance(&self, address: H160) -> U256 {`
`100`	`106`	`if let Some(balance) = self.substate.known_balance(address) {`
`101`	`107`	`balance`
`@@ -145,11 +151,15 @@ impl<B: RuntimeBaseBackend> RuntimeBaseBackend for OverlayedBackend<B> {`
`145`	`151`	`}`
`146`	`152`	`}`
`147`	`153`
`148`		`-impl<B: RuntimeBaseBackend> RuntimeBackend for OverlayedBackend<B> {`
	`154`	`+impl<B: RuntimeBaseBackend> RuntimeBackend for OverlayedBackend<'_, B> {`
`149`	`155`	`fn original_storage(&self, address: H160, index: H256) -> H256 {`
`150`	`156`	`self.backend.storage(address, index)`
`151`	`157`	`}`
`152`	`158`
	`159`	`+ fn created(&self, address: H160) -> bool {`
	`160`	`+ self.substate.created(address)`
	`161`	`+ }`
	`162`	`+`
`153`	`163`	`fn deleted(&self, address: H160) -> bool {`
`154`	`164`	`self.substate.deleted(address)`
`155`	`165`	`}`
`@@ -184,8 +194,20 @@ impl<B: RuntimeBaseBackend> RuntimeBackend for OverlayedBackend<B> {`
`184`	`194`	`Ok(())`
`185`	`195`	`}`
`186`	`196`
`187`		`- fn mark_delete(&mut self, address: H160) {`
`188`		`- self.substate.deletes.insert(address);`
	`197`	`+ fn mark_delete_reset(&mut self, address: H160) {`
	`198`	`+ if self.config.suicide_only_in_same_tx {`
	`199`	`+ if self.created(address) {`
	`200`	`+ self.substate.deletes.insert(address);`
	`201`	`+ self.substate.storage_resets.insert(address);`
	`202`	`+ }`
	`203`	`+ } else {`
	`204`	`+ self.substate.deletes.insert(address);`
	`205`	`+ self.substate.storage_resets.insert(address);`
	`206`	`+ }`
	`207`	`+ }`
	`208`	`+`
	`209`	`+ fn mark_create(&mut self, address: H160) {`
	`210`	`+ self.substate.creates.insert(address);`
`189`	`211`	`}`
`190`	`212`
`191`	`213`	`fn reset_storage(&mut self, address: H160) {`
`@@ -238,7 +260,7 @@ impl<B: RuntimeBaseBackend> RuntimeBackend for OverlayedBackend<B> {`
`238`	`260`	`}`
`239`	`261`	`}`
`240`	`262`
`241`		`-impl<B: RuntimeBaseBackend> TransactionalBackend for OverlayedBackend<B> {`
	`263`	`+impl<'config, B: RuntimeBaseBackend> TransactionalBackend for OverlayedBackend<'config, B> {`
`242`	`264`	`fn push_substate(&mut self) {`
`243`	`265`	`let mut parent = Box::new(Substate::new());`
`244`	`266`	`mem::swap(&mut parent, &mut self.substate);`
`@@ -278,6 +300,9 @@ impl<B: RuntimeBaseBackend> TransactionalBackend for OverlayedBackend<B> {`
`278`	`300`	`for address in child.deletes {`
`279`	`301`	`self.substate.deletes.insert(address);`
`280`	`302`	`}`
	`303`	`+ for address in child.creates {`
	`304`	`+ self.substate.creates.insert(address);`
	`305`	`+ }`
`281`	`306`	`}`
`282`	`307`	`MergeStrategy::Revert \| MergeStrategy::Discard => {}`
`283`	`308`	`}`
`@@ -294,6 +319,7 @@ struct Substate {`
`294`	`319`	`storages: BTreeMap<(H160, H256), H256>,`
`295`	`320`	`transient_storage: BTreeMap<(H160, H256), H256>,`
`296`	`321`	`deletes: BTreeSet<H160>,`
	`322`	`+ creates: BTreeSet<H160>,`
`297`	`323`	`}`
`298`	`324`
`299`	`325`	`impl Substate {`
`@@ -308,6 +334,7 @@ impl Substate {`
`308`	`334`	`storages: Default::default(),`
`309`	`335`	`transient_storage: Default::default(),`
`310`	`336`	`deletes: Default::default(),`
	`337`	`+ creates: Default::default(),`
`311`	`338`	`}`
`312`	`339`	`}`
`313`	`340`
`@@ -385,4 +412,14 @@ impl Substate {`
`385`	`412`	`false`
`386`	`413`	`}`
`387`	`414`	`}`
	`415`	`+`
	`416`	`+ pub fn created(&self, address: H160) -> bool {`
	`417`	`+ if self.creates.contains(&address) {`
	`418`	`+ true`
	`419`	`+ } else if let Some(parent) = self.parent.as_ref() {`
	`420`	`+ parent.created(address)`
	`421`	`+ } else {`
	`422`	`+ false`
	`423`	`+ }`
	`424`	`+ }`
`388`	`425`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,8 @@ pub struct Config {`
`103`	`103`	`pub eip_5656_enabled: bool,`
`104`	`104`	`/// Uses EIP-1559 (Base fee is burned when this flag is enabled) [EIP-1559](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md)`
`105`	`105`	`pub eip_1559_enabled: bool,`
	`106`	`+ /// Selfdestruct deletet contract only if called in the same tx as creation [EIP-6780](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-6780.md)`
	`107`	`+ pub suicide_only_in_same_tx: bool,`
`106`	`108`	`}`
`107`	`109`
`108`	`110`	`impl Config {`
`@@ -159,6 +161,7 @@ impl Config {`
`159`	`161`	`eip_1153_enabled: false,`
`160`	`162`	`eip_5656_enabled: false,`
`161`	`163`	`eip_1559_enabled: false,`
	`164`	`+ suicide_only_in_same_tx: false,`
`162`	`165`	`}`
`163`	`166`	`}`
`164`	`167`
`@@ -215,6 +218,7 @@ impl Config {`
`215`	`218`	`eip_1153_enabled: false,`
`216`	`219`	`eip_5656_enabled: false,`
`217`	`220`	`eip_1559_enabled: false,`
	`221`	`+ suicide_only_in_same_tx: false,`
`218`	`222`	`}`
`219`	`223`	`}`
`220`	`224`
`@@ -257,6 +261,7 @@ impl Config {`
`257`	`261`	`eip_1153_enabled,`
`258`	`262`	`eip_5656_enabled,`
`259`	`263`	`eip_1559_enabled,`
	`264`	`+ suicide_only_in_same_tx,`
`260`	`265`	`} = inputs;`
`261`	`266`
`262`	`267`	`// See https://eips.ethereum.org/EIPS/eip-2929`
`@@ -322,6 +327,7 @@ impl Config {`
`322`	`327`	`eip_1153_enabled,`
`323`	`328`	`eip_5656_enabled,`
`324`	`329`	`eip_1559_enabled,`
	`330`	`+ suicide_only_in_same_tx,`
`325`	`331`	`}`
`326`	`332`	`}`
`327`	`333`	`}`
`@@ -344,6 +350,7 @@ struct DerivedConfigInputs {`
`344`	`350`	`eip_1153_enabled: bool,`
`345`	`351`	`eip_5656_enabled: bool,`
`346`	`352`	`eip_1559_enabled: bool,`
	`353`	`+ suicide_only_in_same_tx: bool,`
`347`	`354`	`}`
`348`	`355`
`349`	`356`	`impl DerivedConfigInputs {`
`@@ -361,6 +368,7 @@ impl DerivedConfigInputs {`
`361`	`368`	`eip_1153_enabled: false,`
`362`	`369`	`eip_5656_enabled: false,`
`363`	`370`	`eip_1559_enabled: false,`
	`371`	`+ suicide_only_in_same_tx: false,`
`364`	`372`	`}`
`365`	`373`	`}`
`366`	`374`
`@@ -378,6 +386,7 @@ impl DerivedConfigInputs {`
`378`	`386`	`eip_1153_enabled: false,`
`379`	`387`	`eip_5656_enabled: false,`
`380`	`388`	`eip_1559_enabled: true,`
	`389`	`+ suicide_only_in_same_tx: false,`
`381`	`390`	`}`
`382`	`391`	`}`
`383`	`392`
`@@ -395,6 +404,7 @@ impl DerivedConfigInputs {`
`395`	`404`	`eip_1153_enabled: false,`
`396`	`405`	`eip_5656_enabled: false,`
`397`	`406`	`eip_1559_enabled: true,`
	`407`	`+ suicide_only_in_same_tx: false,`
`398`	`408`	`}`
`399`	`409`	`}`
`400`	`410`
`@@ -413,9 +423,9 @@ impl DerivedConfigInputs {`
`413`	`423`	`eip_1153_enabled: false,`
`414`	`424`	`eip_5656_enabled: false,`
`415`	`425`	`eip_1559_enabled: true,`
	`426`	`+ suicide_only_in_same_tx: false,`
`416`	`427`	`}`
`417`	`428`	`}`
`418`		`-`
`419`	`429`	`const fn cancun() -> Self {`
`420`	`430`	`Self {`
`421`	`431`	`gas_storage_read_warm: 100,`
`@@ -428,9 +438,10 @@ impl DerivedConfigInputs {`
`428`	`438`	`warm_coinbase_address: true,`
`429`	`439`	// 2 * (MAX_CODE_SIZE = `24576`) = (0xC000 = 49152) as per EIP-3860
`430`	`440`	`max_initcode_size: Some(0xC000),`
`431`		`- eip_1153_enabled: true,`
`432`		`- eip_5656_enabled: true,`
	`441`	`+ eip_1153_enabled: false,`
	`442`	`+ eip_5656_enabled: false,`
`433`	`443`	`eip_1559_enabled: true,`
	`444`	`+ suicide_only_in_same_tx: true,`
`434`	`445`	`}`
`435`	`446`	`}`
`436`	`447`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ where`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`handler.reset_storage(state.as_ref().context.address);`
	`78`	`+ handler.mark_create(state.as_ref().context.address);`
`78`	`79`
`79`	`80`	`resolver.resolve_create(init_code, state, handler)`
`80`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+6080604052348015600e575f80fd5b503373ffffffffffffffffffffffffffffffffffffffff16fffe`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+608060405234801561000f575f80fd5b50335f806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506101948061005c5f395ff3fe608060405234801561000f575f80fd5b5060043610610033575f3560e01c8062f55d9d146100375780638da5cb5b14610053575b5f80fd5b610051600480360381019061004c919061010b565b610071565b005b61005b61008a565b6040516100689190610145565b60405180910390f35b8073ffffffffffffffffffffffffffffffffffffffff16ff5b5f8054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f6100da826100b1565b9050919050565b6100ea816100d0565b81146100f4575f80fd5b50565b5f81359050610105816100e1565b92915050565b5f602082840312156101205761011f6100ad565b5b5f61012d848285016100f7565b91505092915050565b61013f816100d0565b82525050565b5f6020820190506101585f830184610136565b9291505056fea26469706673582212201e4165398f9671b365261ccc1129042cbcea13db557b5359b2298c51f2ab274d64736f6c63430008150033