move new code to blockallocs

consensus/misc/eip2935.go

@@ -47,10 +47,3 @@ func storeHash(num uint64, hash libcommon.Hash, state *state.IntraBlockState) {
 	parentHashInt := uint256.NewInt(0).SetBytes32(hash.Bytes())
 	state.SetState(params.HistoryStorageAddress, &storageSlot, *parentHashInt)
 }
-
-func InitializeBlockHashesEip2935(state *state.IntraBlockState) {
-	if state.GetCodeSize(params.HistoryStorageAddress) != 0 {
-		return
-	}
-	state.SetCode(params.HistoryStorageAddress, params.HistoryStorageCode)
-}

core/systemcontracts/upgrade.go

@@ -24,7 +24,6 @@ import (
 	"github.com/erigontech/erigon-lib/chain"
 	libcommon "github.com/erigontech/erigon-lib/common"
 	"github.com/erigontech/erigon-lib/log/v3"
-	"github.com/erigontech/erigon/consensus/misc"
 	"github.com/erigontech/erigon/core/state"
 	"github.com/erigontech/erigon/core/types"
 )
@@ -62,10 +61,6 @@ func UpgradeBuildInSystemContract(config *chain.Config, blockNumber *big.Int, la
 		return
 	}
 
-	if config.IsOnPrague(blockNumber, lastBlockTime, blockTime) {
-		misc.InitializeBlockHashesEip2935(state)
-	}
-
 	for blockNumberOrTime, genesisAlloc := range config.Parlia.BlockAlloc {
 		numOrTime, err := strconv.ParseUint(blockNumberOrTime, 10, 64)
 		if err != nil {

erigon-lib/chain/chain_config.go

@@ -295,15 +295,6 @@ func (c *Config) IsPrague(time uint64) bool {
 	return isForked(c.PragueTime, time)
 }
 
-// IsOnPrague  returns whether currentBlockTime is either equal to the Prague  fork time or greater firstly.
-func (c *Config) IsOnPrague(currentBlockNumber *big.Int, lastBlockTime uint64, currentBlockTime uint64) bool {
-	lastBlockNumber := new(big.Int)
-	if currentBlockNumber.Cmp(big.NewInt(1)) >= 0 {
-		lastBlockNumber.Sub(currentBlockNumber, big.NewInt(1))
-	}
-	return !c.IsPrague(lastBlockTime) && c.IsPrague(currentBlockTime)
-}
-
 // IsOsaka returns whether time is either equal to the Osaka fork time or greater.
 func (c *Config) IsOsaka(time uint64) bool {
 	return isForked(c.OsakaTime, time)

params/protocol_params.go

@@ -221,9 +221,6 @@ var BeaconRootsAddress = common.HexToAddress("0x000F3df6D732807Ef1319fB7B8bB8522
 // EIP-2935: Historical block hashes in state
 var HistoryStorageAddress = common.HexToAddress("0x0aae40965e6800cd9b1f4b05ff21581047e3f91e")
 
-// HistoryStorageCode is the code with getters for historical block hashes.
-var HistoryStorageCode = common.FromHex("3373fffffffffffffffffffffffffffffffffffffffe1460575767ffffffffffffffff5f3511605357600143035f3511604b575f35612000014311604b57611fff5f3516545f5260205ff35b5f5f5260205ff35b5f5ffd5b5f35611fff60014303165500")
-
 // EIP-7002: Execution layer triggerable withdrawals
 var WithdrawalRequestAddress = common.HexToAddress("0x09Fc772D0857550724b07B850a4323f39112aAaA")