txdag: refactor txdag generation code, opt performance, fix issues;

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)))

core/blockchain.go

@@ -1963,20 +1963,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 {
-			// 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())
-				}
-			} else {
-				log.Error("ResolveTxDAG err", "block", block.NumberU64(), "tx", len(block.Transactions()), "err", err)
-			}
-		}
-
 		// Update the metrics touched during block processing and validation
 		accountReadTimer.Update(statedb.AccountReads)                 // Account reads are complete(in processing)
 		storageReadTimer.Update(statedb.StorageReads)                 // Storage reads are complete(in processing)

core/state/state_object.go

@@ -300,23 +300,27 @@ func (s *stateObject) finalise(prefetch bool) {
 }
 
 func (s *stateObject) finaliseRWSet() {
+	if s.db.mvStates == nil {
+		return
+	}
+	ms := s.db.mvStates
 	for key, value := range s.dirtyStorage {
 		// 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) {
 			continue
 		}
-		s.db.RecordStorageWrite(s.address, key, value)
+		ms.RecordStorageWrite(s.address, key)
 	}
 
 	if s.dirtyNonce != nil && *s.dirtyNonce != s.data.Nonce {
-		s.db.RecordAccountWrite(s.address, types.AccountNonce, *s.dirtyNonce)
+		ms.RecordAccountWrite(s.address, types.AccountNonce)
 	}
 	if s.dirtyBalance != nil && s.dirtyBalance.Cmp(s.data.Balance) != 0 {
-		s.db.RecordAccountWrite(s.address, types.AccountBalance, new(big.Int).Set(s.dirtyBalance))
+		ms.RecordAccountWrite(s.address, types.AccountBalance)
 	}
 	if s.dirtyCodeHash != nil && !slices.Equal(s.dirtyCodeHash, s.data.CodeHash) {
-		s.db.RecordAccountWrite(s.address, types.AccountCodeHash, s.dirtyCodeHash)
+		ms.RecordAccountWrite(s.address, types.AccountCodeHash)
 	}
 }