Merge branch 'main' into PEVM-rebase-v054

Author: sunny2022da

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## v0.5.4
+
+This is a minor release for opBNB Mainnet and Testnet.
+
+It enables the TxDAG generation feature.
+When it's enabled in the sequencer, it will generate TxDAG of the block and append it to the last transaction calldata.
+The TxDAG can be used for acceleration of the block execution along with the parallel evm feature released in [v0.5.1-pevm.alpha](https://github.com/bnb-chain/op-geth/releases/tag/v0.5.1-pevm.alpha).
+
+It's optional to upgrade to this version since the new feature only works in the sequencer node.
+
+### What's Changed
+* feat: TxDAG generation v0.1 version by @welkin22 in https://github.com/bnb-chain/op-geth/pull/187
+
+### Docker Images
+ghcr.io/bnb-chain/op-geth:v0.5.4
+
+**Full Changelog**: https://github.com/bnb-chain/op-geth/compare/v0.5.3...v0.5.4
+
 ## v0.5.3
 
 This is a minor release for opBNB Mainnet and Testnet.

cmd/evm/blockrunner.go

@@ -86,7 +86,7 @@ func blockTestCmd(ctx *cli.Context) error {
 			continue
 		}
 		test := tests[name]
-		if err := test.Run(false, rawdb.HashScheme, tracer, func(res error, chain *core.BlockChain) {
+		if err := test.Run(false, rawdb.HashScheme, tracer, false, func(res error, chain *core.BlockChain) {
 			if ctx.Bool(DumpFlag.Name) {
 				if state, _ := chain.State(); state != nil {
 					fmt.Println(string(state.Dump(nil)))

cmd/utils/flags.go

@@ -1125,7 +1125,7 @@ Please note that --` + MetricsHTTPFlag.Name + ` must be set to start the server.
 
 	ParallelTxDAGFlag = &cli.BoolFlag{
 		Name:     "parallel.txdag",
-		Usage:    "Enable the experimental parallel TxDAG generation, only valid in full sync mode (default = false)",
+		Usage:    "Enable the experimental parallel TxDAG generation (default = false)",
 		Category: flags.VMCategory,
 	}
 
@@ -2055,7 +2055,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 	if ctx.IsSet(ParallelTxNumFlag.Name) {
 		cfg.ParallelTxNum = ctx.Int(ParallelTxNumFlag.Name)
 	}
-
 	if ctx.IsSet(ParallelTxDAGFlag.Name) {
 		cfg.EnableParallelTxDAG = ctx.Bool(ParallelTxDAGFlag.Name)
 	}

core/blockchain.go

@@ -320,6 +320,7 @@ type BlockChain struct {
 	forker     *ForkChoice
 	vmConfig   vm.Config
 
+	// parallel EVM related
 	enableTxDAG     bool
 	txDAGWriteCh    chan TxDAGOutputItem
 	txDAGReader     *TxDAGFileReader
@@ -2113,27 +2114,6 @@ func (bc *BlockChain) insertChain(chain types.Blocks, setHead bool) (int, error)
 		vtime := time.Since(vstart)
 		proctime := time.Since(start) // processing + validation
 
-		if bc.enableTxDAG && !bc.vmConfig.EnableParallelExec {
-			// compare input TxDAG when it enable in consensus
-			dag, err := statedb.ResolveTxDAG(len(block.Transactions()), []common.Address{block.Coinbase(), params.OptimismBaseFeeRecipient, params.OptimismL1FeeRecipient})
-			if err == nil {
-				// TODO(galaio): check TxDAG correctness?
-				log.Debug("Process TxDAG result", "block", block.NumberU64(), "txDAG", dag)
-				if metrics.EnabledExpensive {
-					go types.EvaluateTxDAGPerformance(dag, statedb.ResolveStats())
-				}
-				// try to write txDAG into file
-				if bc.txDAGWriteCh != nil && dag != nil {
-					bc.txDAGWriteCh <- TxDAGOutputItem{
-						blockNumber: block.NumberU64(),
-						txDAG:       dag,
-					}
-				}
-			} else {
-				log.Error("ResolveTxDAG err", "block", block.NumberU64(), "tx", len(block.Transactions()), "err", err)
-			}
-		}
-
 		// Update the metrics touched during block processing and validation
 		timers := statedb.Timers()
 		accountReadTimer.Update(timers.AccountReads)                 // Account reads are complete(in processing)

core/state/interface.go

@@ -84,8 +84,6 @@ type StateDBer interface {
 	StopPrefetcher()
 	StartPrefetcher(namespace string)
 	SetExpectedStateRoot(root common.Hash)
-	ResolveTxDAG(txCnt int, gasFeeReceivers []common.Address) (types.TxDAG, error)
-	ResolveStats() map[int]*types.ExeStat
 	IntermediateRoot(deleteEmptyObjects bool) common.Hash
 	Error() error
 	Timers() *Timers
@@ -112,7 +110,6 @@ type StateDBer interface {
 	setError(err error)
 	getTrieParallelLock() *sync.Mutex
 	timeAddStorageReads(du time.Duration)
-	RecordWrite(key types.RWKey, value interface{})
 	timeAddStorageUpdates(du time.Duration)
 	countAddStorageDeleted(diff int)
 	countAddStorageUpdated(diff int)
@@ -125,4 +122,5 @@ type StateDBer interface {
 	timeAddStorageCommits(du time.Duration)
 	getOrNewStateObject(addr common.Address) *stateObject
 	prefetchAccount(address common.Address)
+	CheckFeeReceiversRWSet()
 }

core/state/pevm_statedb.go

@@ -73,6 +73,11 @@ type UncommittedDB struct {
 	isMainDBIsParallelDB bool
 }
 
+func (pst *UncommittedDB) CheckFeeReceiversRWSet() {
+	//TODO implement me
+	return
+}
+
 func NewUncommittedDB(maindb StateDBer) *UncommittedDB {
 	_, ok := maindb.(*ParallelStateDB)
 	return &UncommittedDB{
@@ -1571,15 +1576,6 @@ func (p *ParallelStateDB) StartPrefetcher(namespace string) {
 	}
 }
 
-func (p *ParallelStateDB) ResolveTxDAG(txCnt int, gasFeeReceivers []common.Address) (types.TxDAG, error) {
-	//do nothing
-	return nil, nil
-}
-
-func (p *ParallelStateDB) ResolveStats() map[int]*types.ExeStat {
-	return nil
-}
-
 func (p *ParallelStateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
 	// Finalise all the dirty storage states and write them into the tries
 	p.Finalise(deleteEmptyObjects)
@@ -2401,10 +2397,6 @@ func (p *ParallelStateDB) timeAddStorageReads(du time.Duration) {
 	p.StorageReads += du
 }
 
-func (p *ParallelStateDB) RecordWrite(key types.RWKey, value interface{}) {
-	//do nothing
-}
-
 func (p *ParallelStateDB) timeAddStorageUpdates(du time.Duration) {
 	p.StorageUpdates += du
 }
@@ -2449,3 +2441,7 @@ func (p *ParallelStateDB) setStateObjectIfEmpty(obj *stateObject) bool {
 	_, loaded := p.stateObjects.LoadOrStore(obj.address, obj)
 	return !loaded
 }
+
+func (s *ParallelStateDB) CheckFeeReceiversRWSet() {
+	return
+}

core/state/state_object.go

@@ -19,14 +19,13 @@ package state
 import (
 	"bytes"
 	"fmt"
+	"golang.org/x/exp/slices"
 	"io"
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/core/opcodeCompiler/compiler"
-	"golang.org/x/exp/slices"
-
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/opcodeCompiler/compiler"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/metrics"
@@ -228,7 +227,6 @@ func (s *stateObject) empty() bool {
 	//   Slot 0 tx 2: GetNonce, lightCopy based on main DB(balance = 100) , not empty
 
 	if !s.dbItf.GetBalance(s.address).IsZero() { // check balance first, since it is most likely not zero
-
 		return false
 	}
 	if s.dbItf.GetNonce(s.address) != 0 {
@@ -261,7 +259,6 @@ func newObject(dbItf StateDBer, isParallel bool, address common.Address, acct *t
 	}
 
 	// dirty data when create a new account
-
 	if created {
 		s.dirtyBalance = new(uint256.Int).Set(acct.Balance)
 		s.dirtyNonce = new(uint64)
@@ -439,6 +436,7 @@ func (s *stateObject) finalise(prefetch bool) {
 		s.data.Nonce = *s.dirtyNonce
 		s.dirtyNonce = nil
 	}
+
 	if s.dirtyBalance != nil {
 		s.data.Balance = s.dirtyBalance
 		s.dirtyBalance = nil
@@ -447,6 +445,7 @@ func (s *stateObject) finalise(prefetch bool) {
 		s.data.CodeHash = s.dirtyCodeHash
 		s.dirtyCodeHash = nil
 	}
+
 	if s.dbItf.getPrefetcher() != nil && prefetch && len(slotsToPrefetch) > 0 && s.data.Root != types.EmptyRootHash {
 		s.dbItf.getTrieParallelLock().Lock()
 		s.dbItf.getPrefetcher().prefetch(s.addrHash, s.data.Root, s.address, slotsToPrefetch)
@@ -458,24 +457,30 @@ func (s *stateObject) finalise(prefetch bool) {
 }
 
 func (s *stateObject) finaliseRWSet() {
+	if s.isParallel {
+		return
+	}
+	db := s.dbItf.(*StateDB)
+	if db.mvStates == nil {
+		return
+	}
+	ms := db.mvStates
 	s.dirtyStorage.Range(func(key, value interface{}) bool {
-		// three are some unclean dirtyStorage from previous reverted txs, it will skip finalise
-		// so add a new rule, if val has no change, then skip it
 		if value == s.GetCommittedState(key.(common.Hash)) {
 			return true
 		}
-		s.dbItf.RecordWrite(types.StorageStateKey(s.address, key.(common.Hash)), value.(common.Hash))
+		ms.RecordStorageWrite(s.address, key.(common.Hash))
 		return true
 	})
 
 	if s.dirtyNonce != nil && *s.dirtyNonce != s.data.Nonce {
-		s.dbItf.RecordWrite(types.AccountStateKey(s.address, types.AccountNonce), *s.dirtyNonce)
+		ms.RecordAccountWrite(s.address, types.AccountNonce)
 	}
 	if s.dirtyBalance != nil && s.dirtyBalance.Cmp(s.data.Balance) != 0 {
-		s.dbItf.RecordWrite(types.AccountStateKey(s.address, types.AccountBalance), new(uint256.Int).Set(s.dirtyBalance))
+		ms.RecordAccountWrite(s.address, types.AccountBalance)
 	}
 	if s.dirtyCodeHash != nil && !slices.Equal(s.dirtyCodeHash, s.data.CodeHash) {
-		s.dbItf.RecordWrite(types.AccountStateKey(s.address, types.AccountCodeHash), s.dirtyCodeHash)
+		ms.RecordAccountWrite(s.address, types.AccountCodeHash)
 	}
 }
 
@@ -718,9 +723,16 @@ func (s *stateObject) deepCopy(db *StateDB) *stateObject {
 	object.selfDestructed = s.selfDestructed
 	object.dirtyCode = s.dirtyCode
 	object.deleted = s.deleted
-	object.dirtyBalance = s.dirtyBalance
-	object.dirtyNonce = s.dirtyNonce
-	object.dirtyCodeHash = s.dirtyCodeHash
+	if s.dirtyBalance != nil {
+		object.dirtyBalance = new(uint256.Int).Set(s.dirtyBalance)
+	}
+	if s.dirtyNonce != nil {
+		object.dirtyNonce = new(uint64)
+		*object.dirtyNonce = *s.dirtyNonce
+	}
+	if s.dirtyCodeHash != nil {
+		object.dirtyCodeHash = s.dirtyCodeHash
+	}
 	return object
 }