Merge pull request #13594 from ethereum/evmc-selfdestruct

EVMHost: implement selfdestruct better

Author: cameel

test/EVMHost.cpp

@@ -170,14 +170,18 @@ void EVMHost::reset()
 	}
 }
 
-void EVMHost::resetWarmAccess()
+void EVMHost::newTransactionFrame()
 {
 	// Clear EIP-2929 account access indicator
 	recorded_account_accesses.clear();
 	// Clear EIP-2929 storage access indicator
 	for (auto& [address, account]: accounts)
 		for (auto& [slot, value]: account.storage)
 			value.access_status = EVMC_ACCESS_COLD;
+	// Process selfdestruct list
+	for (auto& [address, _]: recorded_selfdestructs)
+		accounts.erase(address);
+	recorded_selfdestructs.clear();
 }
 
 void EVMHost::transfer(evmc::MockedAccount& _sender, evmc::MockedAccount& _recipient, u256 const& _value) noexcept
@@ -190,12 +194,11 @@ void EVMHost::transfer(evmc::MockedAccount& _sender, evmc::MockedAccount& _recip
 void EVMHost::selfdestruct(const evmc::address& _addr, const evmc::address& _beneficiary) noexcept
 {
 	// TODO actual selfdestruct is even more complicated.
-	// TODO reuse MockedHost::selfdestruct.
 
 	transfer(accounts[_addr], accounts[_beneficiary], convertFromEVMC(accounts[_addr].balance));
-	accounts.erase(_addr);
-	// Record self destructs
-	recorded_selfdestructs.push_back({_addr, _beneficiary});
+
+	// Record self destructs. Clearing will be done in newTransactionFrame().
+	MockedHost::selfdestruct(_addr, _beneficiary);
 }
 
 void EVMHost::recordCalls(evmc_message const& _message) noexcept

test/EVMHost.h

@@ -82,7 +82,7 @@ class EVMHost: public evmc::MockedHost
 		tx_context.block_number++;
 		tx_context.block_timestamp += 15;
 		recorded_logs.clear();
-		resetWarmAccess();
+		newTransactionFrame();
 	}
 
 	/// @returns contents of storage at @param _addr.
@@ -98,8 +98,9 @@ class EVMHost: public evmc::MockedHost
 	/// Transfer value between accounts. Checks for sufficient balance.
 	void transfer(evmc::MockedAccount& _sender, evmc::MockedAccount& _recipient, u256 const& _value) noexcept;
 
-	/// Clears EIP-2929 account and storage access indicator
-	void resetWarmAccess();
+	/// Start a new transaction frame.
+	/// This will perform selfdestructs and clear account/storage access indicator for EIP-2929.
+	void newTransactionFrame();
 
 	/// Records calls made via @param _message.
 	void recordCalls(evmc_message const& _message) noexcept;