Delay EIP96 from Byzantium to Constantinople

Following ethereum/EIPs#685
ethereum · Aug 16, 2017 · 84b2e64 · 84b2e64
1 parent a8bac5d
commit 84b2e64
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/libethcore/EVMSchedule.h b/libethcore/EVMSchedule.h
@@ -106,7 +106,6 @@ static const EVMSchedule EIP158Schedule = []
 static const EVMSchedule ByzantiumSchedule = []
 {
 	EVMSchedule schedule = EIP158Schedule;
-	schedule.blockhashGas = 800;
 	schedule.haveRevert = true;
 	schedule.haveReturnData = true;
 	schedule.haveStaticCall = true;
@@ -116,6 +115,7 @@ static const EVMSchedule ByzantiumSchedule = []
 static const EVMSchedule ConstantinopleSchedule = []
 {
 	EVMSchedule schedule = ByzantiumSchedule;
+	schedule.blockhashGas = 800;
 	schedule.haveCreate2 = true;
 	return schedule;
 }();

diff --git a/libethereum/Block.cpp b/libethereum/Block.cpp
@@ -702,15 +702,15 @@ void Block::updateBlockhashContract()
 {
 	u256 const blockNumber = info().number();
 
-	u256 const byzantiumForkBlock = m_sealEngine->chainParams().u256Param("byzantiumForkBlock");
-	if (blockNumber == byzantiumForkBlock)
+	u256 const constantinopleForkBlock = m_sealEngine->chainParams().u256Param("constantinopleForkBlock");
+	if (blockNumber == constantinopleForkBlock)
 	{
 		m_state.createContract(c_blockhashContractAddress);
 		m_state.setCode(c_blockhashContractAddress, bytes(c_blockhashContractCode));
 		m_state.commit(State::CommitBehaviour::KeepEmptyAccounts);
 	}
 
-	if (blockNumber >= byzantiumForkBlock)
+	if (blockNumber >= constantinopleForkBlock)
 	{
 		DummyLastBlockHashes lastBlockHashes; // assuming blockhash contract won't need BLOCKHASH itself
 		Executive e(*this, lastBlockHashes);

diff --git a/libethereum/ExtVM.cpp b/libethereum/ExtVM.cpp
@@ -149,7 +149,7 @@ h256 ExtVM::blockHash(u256 _number)
 	if (_number >= currentNumber || _number < (std::max<u256>(256, currentNumber) - 256))
 		return h256();
 
-	if (currentNumber < m_sealEngine.chainParams().u256Param("byzantiumForkBlock") + 256)
+	if (currentNumber < m_sealEngine.chainParams().u256Param("constantinopleForkBlock") + 256)
 	{
 		h256 const parentHash = envInfo().header().parentHash();
 		h256s const lastHashes = envInfo().lastHashes().precedingHashes(parentHash);