Merge pull request #530 from node-real/bep-440

feat: add support of BEP-440

cmd/state/exec3/state_recon.go

@@ -20,9 +20,10 @@ import (
 	"context"
 	"encoding/binary"
 	"fmt"
-	"github.com/erigontech/erigon/core/systemcontracts"
 	"sync"
 
+	"github.com/erigontech/erigon/core/systemcontracts"
+
 	"github.com/erigontech/erigon-lib/common/datadir"
 
 	"github.com/RoaringBitmap/roaring/roaring64"
@@ -344,24 +345,24 @@ func (rw *ReconWorker) runTxTask(txTask *state.TxTask) error {
 		}
 	} else if txTask.TxIndex == -1 {
 		// Block initialisation
+		if rw.isPoSA && !rw.chainConfig.IsFeynman(header.Number.Uint64(), header.Time) {
+			lastBlockTime := header.Time - rw.chainConfig.Parlia.Period
+			parent := rw.chain.GetHeaderByHash(header.ParentHash)
+			if parent != nil {
+				lastBlockTime = parent.Time
+			}
+			systemcontracts.UpgradeBuildInSystemContract(rw.chainConfig, header.Number, lastBlockTime, header.Time, ibs, rw.logger)
+		}
+
 		syscall := func(contract libcommon.Address, data []byte, ibState *state.IntraBlockState, header *types.Header, constCall bool) ([]byte, error) {
 			return core.SysCallContract(contract, data, rw.chainConfig, ibState, header, rw.engine, constCall /* constCall */)
 		}
-
 		rw.engine.Initialize(rw.chainConfig, rw.chain, header, ibs, syscall, rw.logger, nil)
 		if err = ibs.FinalizeTx(rules, noop); err != nil {
 			if _, readError := rw.stateReader.ReadError(); !readError {
 				return err
 			}
 		}
-		if rw.isPoSA && !rw.chainConfig.IsFeynman(header.Number.Uint64(), header.Time) {
-			lastBlockTime := header.Time - rw.chainConfig.Parlia.Period
-			parent := rw.chain.GetHeaderByHash(header.ParentHash)
-			if parent != nil {
-				lastBlockTime = parent.Time
-			}
-			systemcontracts.UpgradeBuildInSystemContract(rw.chainConfig, header.Number, lastBlockTime, header.Time, ibs, rw.logger)
-		}
 	} else {
 		if rw.isPoSA {
 			if isSystemTx, err := rw.posa.IsSystemTransaction(txTask.Tx, txTask.Header); err != nil {

consensus/misc/eip2935.go

@@ -19,17 +19,15 @@ package misc
 import (
 	"github.com/holiman/uint256"
 
-	"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"
 	"github.com/erigontech/erigon/core/state"
 	"github.com/erigontech/erigon/core/types"
 	"github.com/erigontech/erigon/params"
 )
 
-func StoreBlockHashesEip2935(header *types.Header, state *state.IntraBlockState, config *chain.Config, headerReader consensus.ChainHeaderReader) {
+func StoreBlockHashesEip2935(header *types.Header, state *state.IntraBlockState) {
 	if state.GetCodeSize(params.HistoryStorageAddress) == 0 {
 		log.Debug("[EIP-2935] No code deployed to HistoryStorageAddress before call to store EIP-2935 history")
 		return

consensus/parlia/parlia.go

@@ -6,16 +6,17 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"github.com/erigontech/erigon/consensus/parlia/finality"
-	"github.com/erigontech/erigon/core/tracing"
-	"github.com/erigontech/erigon/core/vm/evmtypes"
 	"io"
 	"math/big"
 	"sort"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/erigontech/erigon/consensus/parlia/finality"
+	"github.com/erigontech/erigon/core/tracing"
+	"github.com/erigontech/erigon/core/vm/evmtypes"
+
 	"github.com/erigontech/erigon/crypto/cryptopool"
 	"github.com/erigontech/erigon/turbo/services"
 
@@ -911,6 +912,12 @@ func (p *Parlia) Initialize(config *chain.Config, chain consensus.ChainHeaderRea
 	if err = p.verifyTurnLength(chain, header, state); err != nil {
 		return err
 	}
+
+	// store block hashes for EIP-2935 (BEP440) upgrade
+	if config.IsPrague(header.Time) {
+		misc.StoreBlockHashesEip2935(header, state)
+	}
+
 	// update validators every day
 	if p.chainConfig.IsFeynman(header.Number.Uint64(), header.Time) && isBreatheBlock(parentHeader.Time, header.Time) {
 		// we should avoid update validators in the Feynman upgrade block

core/blockchain.go

@@ -24,11 +24,12 @@ import (
 	"cmp"
 	"encoding/json"
 	"fmt"
-	"github.com/erigontech/erigon/core/systemcontracts"
 	"reflect"
 	"slices"
 	"time"
 
+	"github.com/erigontech/erigon/core/systemcontracts"
+
 	"golang.org/x/crypto/sha3"
 
 	"github.com/erigontech/erigon-lib/chain"
@@ -503,13 +504,14 @@ func FinalizeBlockExecution(
 func InitializeBlockExecution(engine consensus.Engine, chain consensus.ChainHeaderReader, header, parent *types.Header,
 	cc *chain.Config, ibs *state.IntraBlockState, logger log.Logger, tracer *tracing.Hooks,
 ) error {
-	engine.Initialize(cc, chain, header, ibs, func(contract libcommon.Address, data []byte, ibState *state.IntraBlockState, header *types.Header, constCall bool) ([]byte, error) {
-		return SysCallContract(contract, data, cc, ibState, header, engine, constCall)
-	}, logger, tracer)
 	if !cc.IsFeynman(header.Number.Uint64(), header.Time) {
 		systemcontracts.UpgradeBuildInSystemContract(cc, header.Number, parent.Time, header.Time, ibs, logger)
 	}
 
+	engine.Initialize(cc, chain, header, ibs, func(contract libcommon.Address, data []byte, ibState *state.IntraBlockState, header *types.Header, constCall bool) ([]byte, error) {
+		return SysCallContract(contract, data, cc, ibState, header, engine, constCall)
+	}, logger, tracer)
+
 	noop := state.NewNoopWriter()
 	ibs.FinalizeTx(cc.Rules(header.Number.Uint64(), header.Time), noop)
 	return nil

core/systemcontracts/upgrade.go

@@ -18,13 +18,14 @@ package systemcontracts
 
 import (
 	"fmt"
+	"math/big"
+	"strconv"
+
 	"github.com/erigontech/erigon-lib/chain"
 	libcommon "github.com/erigontech/erigon-lib/common"
 	"github.com/erigontech/erigon-lib/log/v3"
 	"github.com/erigontech/erigon/core/state"
 	"github.com/erigontech/erigon/core/types"
-	"math/big"
-	"strconv"
 )
 
 type UpgradeConfig struct {

erigon-lib/chain/chain_config.go

@@ -499,7 +499,7 @@ func (c *Config) IsHaber(num uint64, time uint64) bool {
 	return c.IsLondon(num) && isForked(c.HaberTime, time)
 }
 
-// IsHaber returns whether time is either equal to the Haber fork time or greater.
+// IsHaber returns whether time is either equal to the HaberFix fork time or greater.
 func (c *Config) IsHaberFix(num uint64, time uint64) bool {
 	return c.IsLondon(num) && isForked(c.HaberFixTime, time)
 }
@@ -513,12 +513,12 @@ func (c *Config) IsOnHaberFix(currentBlockNumber *big.Int, lastBlockTime uint64,
 	return !c.IsHaberFix(lastBlockNumber.Uint64(), lastBlockTime) && c.IsHaberFix(currentBlockNumber.Uint64(), currentBlockTime)
 }
 
-// IsBohr returns whether time is either equal to the Haber fork time or greater.
+// IsBohr returns whether time is either equal to the Bohr fork time or greater.
 func (c *Config) IsBohr(num uint64, time uint64) bool {
 	return c.IsLondon(num) && isForked(c.BohrTime, time)
 }
 
-// IsOnBohr returns whether currentBlockTime is either equal to the HaberFix fork time or greater firstly.
+// IsOnBohr returns whether currentBlockTime is either equal to the Bohr fork time or greater firstly.
 func (c *Config) IsOnBohr(currentBlockNumber *big.Int, lastBlockTime uint64, currentBlockTime uint64) bool {
 	lastBlockNumber := new(big.Int)
 	if currentBlockNumber.Cmp(big.NewInt(1)) >= 0 {
@@ -527,12 +527,12 @@ func (c *Config) IsOnBohr(currentBlockNumber *big.Int, lastBlockTime uint64, cur
 	return !c.IsBohr(lastBlockNumber.Uint64(), lastBlockTime) && c.IsBohr(currentBlockNumber.Uint64(), currentBlockTime)
 }
 
-// IsPascal returns whether time is either equal to the Haber fork time or greater.
+// IsPascal returns whether time is either equal to the Pascal fork time or greater.
 func (c *Config) IsPascal(num uint64, time uint64) bool {
 	return c.IsLondon(num) && isForked(c.PascalTime, time)
 }
 
-// IsOnPascal returns whether currentBlockTime is either equal to the HaberFix fork time or greater firstly.
+// IsOnPascal returns whether currentBlockTime is either equal to the Pascal fork time or greater firstly.
 func (c *Config) IsOnPascal(currentBlockNumber *big.Int, lastBlockTime uint64, currentBlockTime uint64) bool {
 	lastBlockNumber := new(big.Int)
 	if currentBlockNumber.Cmp(big.NewInt(1)) >= 0 {