Keep track of code deposit gas when executing contract code

Author: cameel

test/EVMHost.cpp

@@ -161,6 +161,7 @@ void EVMHost::reset()
 	recorded_calls.clear();
 	// Clear EIP-2929 account access indicator
 	recorded_account_accesses.clear();
+	m_totalCodeDepositGas = 0;
 
 	// Mark all precompiled contracts as existing. Existing here means to have a balance (as per EIP-161).
 	// NOTE: keep this in sync with `EVMHost::call` below.
@@ -203,6 +204,7 @@ void EVMHost::newTransactionFrame()
 			// Otherwise, the previous behavior (pre-Cancun) is maintained.
 			accounts.erase(address);
 	newlyCreatedAccounts.clear();
+	m_totalCodeDepositGas = 0;
 	recorded_selfdestructs.clear();
 }
 
@@ -392,15 +394,18 @@ evmc::Result EVMHost::call(evmc_message const& _message) noexcept
 
 	if (message.kind == EVMC_CREATE || message.kind == EVMC_CREATE2)
 	{
-		result.gas_left -= static_cast<int64_t>(evmasm::GasCosts::createDataGas * result.output_size);
+		int64_t codeDepositGas = static_cast<int64_t>(evmasm::GasCosts::createDataGas * result.output_size);
+		result.gas_left -= codeDepositGas;
 		if (result.gas_left < 0)
 		{
+			m_totalCodeDepositGas += -result.gas_left;
 			result.gas_left = 0;
 			result.status_code = EVMC_OUT_OF_GAS;
 			// TODO clear some fields?
 		}
 		else
 		{
+			m_totalCodeDepositGas += codeDepositGas;
 			result.create_address = message.recipient;
 			destination.code = evmc::bytes(result.output_data, result.output_data + result.output_size);
 			destination.codehash = convertToEVMC(keccak256({result.output_data, result.output_size}));

test/EVMHost.h

@@ -94,6 +94,8 @@ class EVMHost: public evmc::MockedHost
 	/// @returns contents of storage at @param _addr.
 	StorageMap const& get_address_storage(evmc::address const& _addr);
 
+	u256 totalCodeDepositGas() const { return m_totalCodeDepositGas; }
+
 	static Address convertFromEVMC(evmc::address const& _addr);
 	static evmc::address convertToEVMC(Address const& _addr);
 	static util::h256 convertFromEVMC(evmc::bytes32 const& _data);
@@ -137,6 +139,11 @@ class EVMHost: public evmc::MockedHost
 	langutil::EVMVersion m_evmVersion;
 	/// EVM version requested from EVMC (matches the above)
 	evmc_revision m_evmRevision;
+
+	/// The part of the total cost of the current transaction that paid for the code deposits.
+	/// I.e. GAS_CODE_DEPOSIT times the total size of deployed code of all newly created contracts,
+	/// including the current contract itself if it was a creation transaction.
+	u256 m_totalCodeDepositGas;
 };
 
 class EVMHostPrinter

test/ExecutionFramework.cpp

@@ -191,6 +191,7 @@ void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256
 	auto const gasRefund = std::min(u256(result.gas_refund), totalGasUsed / refundRatio);
 
 	m_gasUsed = totalGasUsed - gasRefund;
+	m_gasUsedForCodeDeposit = m_evmcHost->totalCodeDepositGas();
 	m_transactionSuccessful = (result.status_code == EVMC_SUCCESS);
 
 	if (m_showMessages)
@@ -199,6 +200,7 @@ void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256
 		std::cout << " result:                    " << static_cast<size_t>(result.status_code) << std::endl;
 		std::cout << " gas used:                  " << m_gasUsed.str() << std::endl;
 		std::cout << " gas used (without refund): " << totalGasUsed.str() << std::endl;
+		std::cout << "     code deposits only:    " << m_gasUsedForCodeDeposit.str() << std::endl;
 		std::cout << " gas refund (total):        " << result.gas_refund << std::endl;
 		std::cout << " gas refund (bound):        " << gasRefund.str() << std::endl;
 	}

test/ExecutionFramework.h

@@ -303,7 +303,13 @@ class ExecutionFramework
 	util::h160 m_sender = account(0);
 	util::h160 m_contractAddress;
 	bytes m_output;
+
+	/// Total gas used by the transaction, after refund.
 	u256 m_gasUsed;
+
+	/// The portion of @a m_gasUsed spent on code deposits of newly created contracts.
+	/// May exceed @a m_gasUsed in rare corner cases due to refunds.
+	u256 m_gasUsedForCodeDeposit;
 };
 
 #define ABI_CHECK(result, expectation) do { \