Merge branch 'main' into refactor/makefile

Author: Halimao

cmd/node/app/app.go

@@ -64,7 +64,7 @@ func StartUpChain(yuCfg *yuConfig.KernelConf, poaCfg *poa.PoaConfig, evmCfg *evm
 
 	ethrpc.StartupEthRPC(chain, evmCfg)
 	if evmCfg.EnableBridge {
-		StartupL1Watcher(evmCfg, db)
+		//	StartupL1Watcher(evmCfg, db)
 		StartupRelayer(chain, evmCfg, db)
 		StartupBridgeRpc(evmCfg, db)
 	}
@@ -123,12 +123,12 @@ func StartupL1Watcher(cfg *evm.GethConfig, db *gorm.DB) {
 func StartupRelayer(chain *kernel.Kernel, cfg *evm.GethConfig, db *gorm.DB) {
 	ctx := context.Background()
 
-	l1Client, err := ethclient.Dial(cfg.L1ClientAddress)
+	l2Client, err := ethclient.Dial(cfg.L2ClientAddress)
 	if err != nil {
 		logrus.Fatal("failed to connect to L1 geth", "endpoint", cfg.L1ClientAddress, "err", err)
 	}
 
-	l1Relayer, err := relayer.NewL1Relayer(ctx, cfg, l1Client, chain, db)
+	l1Relayer, err := relayer.NewL1Relayer(ctx, cfg, l2Client, chain, db)
 	if err != nil {
 		logrus.Fatal("init bridge relayer failed: ", err)
 	}

metrics/metrics.go

@@ -191,7 +191,7 @@ var (
 			Name:      "withdraw_message_nonce_gap",
 			Help:      "The gap between the current value of the bridge event nonce and the expected value.",
 		},
-		[]string{TypeLbl},
+		[]string{TypeLbl, TypeStatusLbl},
 	)
 )
 

parallel/evm_process.go

@@ -25,11 +25,12 @@ const (
 
 type ParallelEVM struct {
 	*tripod.Tripod
-	cpdb        *state.StateDB
-	Solidity    *evm.Solidity `tripod:"solidity"`
-	statManager *BlockTxnStatManager
-	objectInc   map[common2.Address]int
-	processor   EvmProcessor
+	cpdb            *state.StateDB
+	Solidity        *evm.Solidity `tripod:"solidity"`
+	statManager     *BlockTxnStatManager
+	objectInc       map[common2.Address]int
+	processor       EvmProcessor
+	blockTxnCtxList []*txnCtx
 }
 
 func NewParallelEVM() *ParallelEVM {

parallel/evm_util.go

@@ -168,41 +168,23 @@ func (k *ParallelEVM) prepareTxnList(block *types.Block) ([]*txnCtx, map[common.
 
 func (k *ParallelEVM) executeTxnCtxListInOrder(sdb *state.StateDB, list []*txnCtx, isRedo bool) []*txnCtx {
 	for index, tctx := range list {
-		nonExecuteSDB := sdb.Copy()
 		if tctx.err != nil {
 			list[index] = tctx
 			continue
 		}
+		hasErr := false
 		tctx.ctx.ExtraInterface = pending_state.NewPendingStateWrapper(pending_state.NewStateDBWrapper(sdb), pending_state.NewStateContext(false), int64(index))
 		err := tctx.writing(tctx.ctx)
 		if err != nil {
+			hasErr = true
 			tctx.err = err
 			tctx.receipt = k.handleTxnError(err, tctx.ctx, tctx.ctx.Block, tctx.txn)
-			list[index] = tctx
-			sdb = nonExecuteSDB
-			continue
 		} else {
 			tctx.receipt = k.handleTxnEvent(tctx.ctx, tctx.ctx.Block, tctx.txn, isRedo)
-			tctx.ps = tctx.ctx.ExtraInterface.(*pending_state.PendingStateWrapper)
-			sdb = tctx.ps.GetStateDB()
 		}
+		tctx.ps = tctx.ctx.ExtraInterface.(*pending_state.PendingStateWrapper)
 		list[index] = tctx
-		// only for check message nonce
-		if tctx.req.Address != nil && *tctx.req.Address == testBridgeContractAddress {
-			messageNonceSlot := sdb.GetState(testBridgeContractAddress, testStorageSlotHash)
-			// logrus.Infof("testStorageSlotHash %s", testStorageSlotHash.String())
-			// logrus.Infof("executeTxnCtxListInOrder index %d, messageNonceSlot %s", index, messageNonceSlot.String())
-			currentMessageNonceSlot := new(big.Int).SetBytes(messageNonceSlot.Bytes())
-			//logrus.Infof("lastMessageNonceSlot %s", lastMessageNonceSlot.String())
-			if lastMessageNonceSlot.Cmp(big.NewInt(0)) != 0 {
-				diff := new(big.Int).Sub(currentMessageNonceSlot, lastMessageNonceSlot)
-				if diff.Cmp(big.NewInt(1)) > 0 {
-					logrus.Warnf("Message nonce slot increased by more than 1: txhash %s, before %s, after %s, index %d ,diff %s,tctx.ctx.Block.Height %d", tctx.txn.TxnHash.String(), lastMessageNonceSlot.String(), currentMessageNonceSlot.String(), index, diff.String(), tctx.ctx.Block.Height)
-					metrics.WithdrawMessageNonceGap.WithLabelValues("bridge").Inc()
-				}
-			}
-			lastMessageNonceSlot.Set(currentMessageNonceSlot)
-		}
+		k.checkNonce(sdb, tctx, hasErr)
 	}
 	k.gcCopiedStateDB(nil, list)
 	return list
@@ -215,3 +197,33 @@ func (k *ParallelEVM) gcCopiedStateDB(copiedStateDBList []*pending_state.Pending
 		ctx.ps = nil
 	}
 }
+
+func (k *ParallelEVM) checkNonce(sdb *state.StateDB, tctx *txnCtx, hasErr bool) {
+	if tctx.req.Address != nil && *tctx.req.Address == testBridgeContractAddress {
+		messageNonceSlot := sdb.GetState(testBridgeContractAddress, testStorageSlotHash)
+		currentMessageNonceSlot := new(big.Int).SetBytes(messageNonceSlot.Bytes())
+		if lastMessageNonceSlot.Cmp(big.NewInt(0)) != 0 {
+			diff := new(big.Int).Sub(currentMessageNonceSlot, lastMessageNonceSlot)
+			if hasErr {
+				if diff.Cmp(big.NewInt(0)) != 0 {
+					logrus.Warnf("message nonce changed when error: txhash %s, before %s, after %s,diff %s,tctx.ctx.Block.Height %d", tctx.txn.TxnHash.String(), lastMessageNonceSlot.String(), currentMessageNonceSlot.String(), diff.String(), tctx.ctx.Block.Height)
+					metrics.WithdrawMessageNonceGap.WithLabelValues("bridge", "err_increased").Inc()
+				}
+			} else {
+				if diff.Cmp(big.NewInt(1)) > 0 {
+					logrus.Warnf("message nonce slot increased by more than 1: txhash %s, before %s, after %s, diff %s,tctx.ctx.Block.Height %d", tctx.txn.TxnHash.String(), lastMessageNonceSlot.String(), currentMessageNonceSlot.String(), diff.String(), tctx.ctx.Block.Height)
+					metrics.WithdrawMessageNonceGap.WithLabelValues("bridge", "more_increase").Inc()
+					for _, eachTctx := range k.blockTxnCtxList {
+						slot := sdb.GetState(testBridgeContractAddress, testStorageSlotHash)
+						nonce := new(big.Int).SetBytes(slot.Bytes())
+						logrus.Infof("txhash %s, message nonce %s, hasErr:%v", eachTctx.txn.TxnHash.String(), nonce.String(), eachTctx.err != nil)
+						if eachTctx.txn.TxnHash == tctx.txn.TxnHash {
+							break
+						}
+					}
+				}
+			}
+		}
+		lastMessageNonceSlot.Set(currentMessageNonceSlot)
+	}
+}

parallel/serial_evm.go

@@ -27,6 +27,7 @@ func NewSerialEvmExecutor(evm *ParallelEVM) *SerialEvmExecutor {
 func (s *SerialEvmExecutor) Prepare(block *types.Block) {
 	s.k.prepareExecute()
 	s.txnCtxList, s.receipts = s.k.prepareTxnList(block)
+	s.k.blockTxnCtxList = s.txnCtxList
 	s.k.updateTxnObjInc(s.txnCtxList)
 }