From 6479138dd4963d28df94f186077df6864ff09b32 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Thu, 24 Sep 2020 18:46:39 +0100
Subject: [PATCH] EVMHost: keep precompile balance/settings across resets

Also set proper codehash for precompiles.
---
 test/EVMHost.cpp | 30 ++++++++++++++++++++----------
 test/EVMHost.h   |  2 +-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 10b29d99f..3b4ea2117 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -123,6 +123,22 @@ EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):
 	else
 		assertThrow(false, Exception, "Unsupported EVM version");
 
+	tx_context.block_difficulty = evmc::uint256be{200000000};
+	tx_context.block_gas_limit = 20000000;
+	tx_context.block_coinbase = 0x7878787878787878787878787878787878787878_address;
+	tx_context.tx_gas_price = evmc::uint256be{3000000000};
+	tx_context.tx_origin = 0x9292929292929292929292929292929292929292_address;
+	// Mainnet according to EIP-155
+	tx_context.chain_id = evmc::uint256be{1};
+
+	reset();
+}
+
+void EVMHost::reset()
+{
+	accounts.clear();
+	m_currentAddress = {};
+
 	// 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.
 	//
@@ -131,19 +147,13 @@ EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):
 	// roughly 22 days before the update went live.
 	for (unsigned precompiledAddress = 1; precompiledAddress <= 8; precompiledAddress++)
 	{
-		evmc::address address{};
-		address.bytes[19] = precompiledAddress;
+		evmc::address address{precompiledAddress};
 		// 1wei
 		accounts[address].balance = evmc::uint256be{1};
+		// Set according to EIP-1052.
+		if (precompiledAddress < 5 || m_evmVersion >= langutil::EVMVersion::byzantium())
+			accounts[address].codehash = 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470_bytes32;
 	}
-
-	tx_context.block_difficulty = evmc::uint256be{200000000};
-	tx_context.block_gas_limit = 20000000;
-	tx_context.block_coinbase = 0x7878787878787878787878787878787878787878_address;
-	tx_context.tx_gas_price = evmc::uint256be{3000000000};
-	tx_context.tx_origin = 0x9292929292929292929292929292929292929292_address;
-	// Mainnet according to EIP-155
-	tx_context.chain_id = evmc::uint256be{1};
 }
 
 void EVMHost::selfdestruct(const evmc::address& _addr, const evmc::address& _beneficiary) noexcept
diff --git a/test/EVMHost.h b/test/EVMHost.h
index 91cb9b809..768c20659 100644
--- a/test/EVMHost.h
+++ b/test/EVMHost.h
@@ -54,7 +54,7 @@ public:
 
 	explicit EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm);
 
-	void reset() { accounts.clear(); m_currentAddress = {}; }
+	void reset();
 	void newBlock()
 	{
 		tx_context.block_number++;