update sender

Author: mask-pp

driver/driver_test.go

@@ -168,6 +168,8 @@ func (s *DriverTestSuite) TestCheckL1ReorgToHigherFork() {
 	s.Equal(l1Head3.Number.Uint64(), l1Head1.Number.Uint64())
 	s.Equal(l1Head3.Hash(), l1Head1.Hash())
 
+	// Because of evm_revert operation, the nonce of the proposer need to be adjusted.
+	s.p.Sender.AdjustNonce(nil)
 	// Propose ten blocks on another fork
 	for i := 0; i < 10; i++ {
 		testutils.ProposeInvalidTxListBytes(&s.ClientTestSuite, s.p)
@@ -231,6 +233,7 @@ func (s *DriverTestSuite) TestCheckL1ReorgToLowerFork() {
 	s.Equal(l1Head3.Number.Uint64(), l1Head1.Number.Uint64())
 	s.Equal(l1Head3.Hash(), l1Head1.Hash())
 
+	s.p.Sender.AdjustNonce(nil)
 	// Propose one blocks on another fork
 	testutils.ProposeInvalidTxListBytes(&s.ClientTestSuite, s.p)
 
@@ -291,6 +294,7 @@ func (s *DriverTestSuite) TestCheckL1ReorgToSameHeightFork() {
 	s.Equal(l1Head3.Number.Uint64(), l1Head1.Number.Uint64())
 	s.Equal(l1Head3.Hash(), l1Head1.Hash())
 
+	s.p.Sender.AdjustNonce(nil)
 	// Propose two blocks on another fork
 	testutils.ProposeInvalidTxListBytes(&s.ClientTestSuite, s.p)
 	time.Sleep(3 * time.Second)

internal/sender/sender.go

@@ -5,6 +5,7 @@ import (
 	"crypto/ecdsa"
 	"fmt"
 	"math/big"
+	"os"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -93,6 +94,9 @@ func NewSender(ctx context.Context, cfg *Config, client *rpc.EthClient, priv *ec
 	if cfg.MaxWaitingTime == 0 {
 		cfg.MaxWaitingTime = time.Minute * 5
 	}
+	if cfg.GasLimit == 0 {
+		cfg.GasLimit = 21000
+	}
 
 	sender := &Sender{
 		ctx:            ctx,
@@ -106,7 +110,7 @@ func NewSender(ctx context.Context, cfg *Config, client *rpc.EthClient, priv *ec
 		stopCh:         make(chan struct{}),
 	}
 	// Set the nonce
-	sender.adjustNonce(nil)
+	sender.AdjustNonce(nil)
 	// Update the gas tip and gas fee.
 	err = sender.updateGasTipGasFee(header)
 	if err != nil {
@@ -116,7 +120,9 @@ func NewSender(ctx context.Context, cfg *Config, client *rpc.EthClient, priv *ec
 	if rootSender[opts.From] != nil {
 		return nil, fmt.Errorf("sender already exists")
 	}
-	rootSender[opts.From] = sender
+	if os.Getenv("RUN_TESTS") == "" {
+		rootSender[opts.From] = sender
+	}
 
 	sender.wg.Add(1)
 	go sender.loop()
@@ -193,7 +199,7 @@ func (s *Sender) sendTx(confirmTx *TxConfirm) error {
 	// Check if the error is nonce too low.
 	if err != nil {
 		if strings.Contains(err.Error(), "nonce too low") {
-			s.adjustNonce(baseTx)
+			s.AdjustNonce(baseTx)
 			log.Warn("nonce is not correct, retry to send transaction", "tx_hash", rawTx.Hash().String(), "err", err)
 			return nil
 		}
@@ -210,31 +216,6 @@ func (s *Sender) sendTx(confirmTx *TxConfirm) error {
 	return nil
 }
 
-func (s *Sender) updateGasTipGasFee(head *types.Header) error {
-	// Get the gas tip cap
-	gasTipCap, err := s.client.SuggestGasTipCap(s.ctx)
-	if err != nil {
-		return err
-	}
-
-	// Get the gas fee cap
-	gasFeeCap := new(big.Int).Add(gasTipCap, new(big.Int).Mul(head.BaseFee, big.NewInt(2)))
-	// Check if the gas fee cap is less than the gas tip cap
-	if gasFeeCap.Cmp(gasTipCap) < 0 {
-		return fmt.Errorf("maxFeePerGas (%v) < maxPriorityFeePerGas (%v)", gasFeeCap, gasTipCap)
-	}
-	maxGasFee := big.NewInt(int64(s.MaxGasFee))
-	if gasFeeCap.Cmp(maxGasFee) > 0 {
-		gasFeeCap = new(big.Int).Set(maxGasFee)
-		gasTipCap = new(big.Int).Set(maxGasFee)
-	}
-
-	s.Opts.GasTipCap = gasTipCap
-	s.Opts.GasFeeCap = gasFeeCap
-
-	return nil
-}
-
 func (s *Sender) loop() {
 	defer s.wg.Done()
 
@@ -248,6 +229,8 @@ func (s *Sender) loop() {
 		select {
 		case <-tickResend.C:
 			s.resendTransaction()
+			// Check the unconfirmed transactions
+			s.checkPendingTransactions()
 		case <-tickHead.C:
 			header, err := s.client.HeaderByNumber(s.ctx, nil)
 			if err != nil {
@@ -263,8 +246,6 @@ func (s *Sender) loop() {
 			if err != nil {
 				log.Warn("failed to update gas tip and gas fee", "err", err)
 			}
-			// Check the unconfirmed transactions
-			s.checkPendingTransactions()
 		case <-s.ctx.Done():
 			return
 		case <-s.stopCh:
@@ -288,20 +269,21 @@ func (s *Sender) resendTransaction() {
 }
 
 func (s *Sender) checkPendingTransactions() {
-	curTime := time.Now()
 	for txID, txConfirm := range s.unconfirmedTxs.Items() {
 		if txConfirm.Err != nil {
 			continue
 		}
 		if txConfirm.Receipt == nil {
 			// Ignore the transaction if it is pending.
 			tx, isPending, err := s.client.TransactionByHash(s.ctx, txConfirm.Tx.Hash())
-			if err != nil || isPending {
+			if err != nil {
 				continue
 			}
-			// If the transaction is in mempool for too long, replace it.
-			if waitTime := curTime.Sub(tx.Time()); waitTime > s.MaxWaitingTime {
-				txConfirm.Err = fmt.Errorf("transaction in mempool for too long")
+			if isPending {
+				// If the transaction is in mempool for too long, replace it.
+				if waitTime := time.Since(tx.Time()); waitTime > s.MaxWaitingTime {
+					txConfirm.Err = fmt.Errorf("transaction in mempool for too long")
+				}
 				continue
 			}
 			// Get the transaction receipt.

internal/sender/transaction.go

@@ -42,7 +42,7 @@ func (s *Sender) adjustGas(txData types.TxData) {
 	}
 }
 
-func (s *Sender) adjustNonce(txData types.TxData) {
+func (s *Sender) AdjustNonce(txData types.TxData) {
 	nonce, err := s.client.NonceAt(s.ctx, s.Opts.From, nil)
 	if err != nil {
 		log.Warn("failed to get the nonce", "from", s.Opts.From, "err", err)
@@ -58,6 +58,31 @@ func (s *Sender) adjustNonce(txData types.TxData) {
 	}
 }
 
+func (s *Sender) updateGasTipGasFee(head *types.Header) error {
+	// Get the gas tip cap
+	gasTipCap, err := s.client.SuggestGasTipCap(s.ctx)
+	if err != nil {
+		return err
+	}
+
+	// Get the gas fee cap
+	gasFeeCap := new(big.Int).Add(gasTipCap, new(big.Int).Mul(head.BaseFee, big.NewInt(2)))
+	// Check if the gas fee cap is less than the gas tip cap
+	if gasFeeCap.Cmp(gasTipCap) < 0 {
+		return fmt.Errorf("maxFeePerGas (%v) < maxPriorityFeePerGas (%v)", gasFeeCap, gasTipCap)
+	}
+	maxGasFee := big.NewInt(int64(s.MaxGasFee))
+	if gasFeeCap.Cmp(maxGasFee) > 0 {
+		gasFeeCap = new(big.Int).Set(maxGasFee)
+		gasTipCap = new(big.Int).Set(maxGasFee)
+	}
+
+	s.Opts.GasTipCap = gasTipCap
+	s.Opts.GasFeeCap = gasFeeCap
+
+	return nil
+}
+
 func (s *Sender) makeTxData(tx *types.Transaction) (types.TxData, error) {
 	switch tx.Type() {
 	case types.DynamicFeeTxType:

proposer/proposer.go

@@ -60,7 +60,7 @@ type Proposer struct {
 	CustomProposeOpHook func() error
 	AfterCommitHook     func() error
 
-	sender *sender.Sender
+	Sender *sender.Sender
 
 	ctx context.Context
 	wg  sync.WaitGroup
@@ -104,11 +104,11 @@ func (p *Proposer) InitFromConfig(ctx context.Context, cfg *Config) (err error)
 		return err
 	}
 
-	if p.sender, err = sender.NewSender(ctx, &sender.Config{
-		MaxGasFee:     20000000000,
-		GasGrowthRate: 10,
-		RetryTimes:    0,
-		GasLimit:      cfg.ProposeBlockTxGasLimit,
+	if p.Sender, err = sender.NewSender(ctx, &sender.Config{
+		MaxGasFee:      20000000000,
+		GasGrowthRate:  20,
+		GasLimit:       cfg.ProposeBlockTxGasLimit,
+		MaxWaitingTime: time.Second * 30,
 	}, p.rpc.L1, cfg.L1ProposerPrivKey); err != nil {
 		return err
 	}
@@ -184,7 +184,7 @@ func (p *Proposer) eventLoop() {
 
 // Close closes the proposer instance.
 func (p *Proposer) Close(ctx context.Context) {
-	p.sender.Close()
+	p.Sender.Close()
 	p.wg.Wait()
 }
 
@@ -359,7 +359,7 @@ func (p *Proposer) makeProposeBlockTxWithBlobHash(
 		return nil, err
 	}
 
-	opts := p.sender.Opts
+	opts := p.Sender.Opts
 	opts.Value = maxFee
 	rawTx, err := p.rpc.TaikoL1.ProposeBlock(
 		opts,
@@ -394,7 +394,7 @@ func (p *Proposer) makeProposeBlockTx(
 		return nil, err
 	}
 
-	opts := p.sender.Opts
+	opts := p.Sender.Opts
 	opts.Value = maxFee
 
 	var parentMetaHash = [32]byte{}
@@ -487,7 +487,7 @@ func (p *Proposer) ProposeTxList(
 				log.Warn("Failed to make taikoL1.proposeBlock transaction", "error", encoding.TryParsingCustomError(err))
 				return err
 			}
-			txID, err = p.sender.SendTransaction(tx)
+			txID, err = p.Sender.SendTransaction(tx)
 			if err != nil {
 				log.Warn("Failed to send taikoL1.proposeBlock transaction", "error", encoding.TryParsingCustomError(err))
 				return err
@@ -506,7 +506,7 @@ func (p *Proposer) ProposeTxList(
 	}
 
 	// Waiting for the transaction to be confirmed.
-	confirmCh, _ := p.sender.WaitTxConfirm(txID)
+	confirmCh, _ := p.Sender.WaitTxConfirm(txID)
 	confirm := <-confirmCh
 	if confirm.Err != nil {
 		return confirm.Err

proposer/proposer_test.go

@@ -2,6 +2,7 @@ package proposer
 
 import (
 	"context"
+	"fmt"
 	"math/big"
 	"os"
 	"testing"
@@ -15,6 +16,7 @@ import (
 
 	"github.com/taikoxyz/taiko-client/bindings"
 	"github.com/taikoxyz/taiko-client/internal/testutils"
+	"github.com/taikoxyz/taiko-client/internal/utils"
 	"github.com/taikoxyz/taiko-client/pkg/rpc"
 )
 
@@ -155,39 +157,48 @@ func (s *ProposerTestSuite) TestCustomProposeOpHook() {
 }
 
 func (s *ProposerTestSuite) TestSendProposeBlockTx() {
+	s.SetL1Automine(false)
+	defer s.SetL1Automine(true)
+
+	s.p.Sender.AdjustNonce(nil)
+
 	fee := big.NewInt(10000)
-	opts := s.p.sender.Opts
+	opts := s.p.Sender.Opts
 	opts.Value = fee
 	s.Greater(opts.GasTipCap.Uint64(), uint64(0))
 
 	nonce, err := s.RPCClient.L1.PendingNonceAt(context.Background(), s.p.proposerAddress)
 	s.Nil(err)
 
-	tx := types.NewTransaction(
-		nonce,
-		common.BytesToAddress([]byte{}),
-		common.Big1,
-		100000,
-		opts.GasTipCap,
-		[]byte{},
-	)
-
-	s.SetL1Automine(false)
-	defer s.SetL1Automine(true)
+	var txID string
+	txID, err = s.p.Sender.SendRaw(nonce, &common.Address{}, common.Big1, nil)
+	confirmCh, _ := s.p.Sender.WaitTxConfirm(txID)
+	confirm := <-confirmCh
+	tx := confirm.Tx
 
-	signedTx, err := types.SignTx(tx, types.LatestSignerForChainID(s.RPCClient.L1ChainID), s.p.L1ProposerPrivKey)
+	pendingNonce, err := s.RPCClient.L1.PendingNonceAt(context.Background(), s.p.proposerAddress)
 	s.Nil(err)
-	s.Nil(s.RPCClient.L1.SendTransaction(context.Background(), signedTx))
+	fmt.Println(pendingNonce)
 
-	var emptyTxs []types.Transaction
-	encoded, err := rlp.EncodeToBytes(emptyTxs)
+	encoded, err := rlp.EncodeToBytes([]types.Transaction{})
+	s.Nil(err)
+	var newTx *types.Transaction
+	if s.p.BlobAllowed {
+		newTx, err = s.p.makeProposeBlockTxWithBlobHash(context.Background(), encoded)
+	} else {
+		newTx, err = s.p.makeProposeBlockTx(
+			context.Background(),
+			encoded,
+		)
+	}
 	s.Nil(err)
 
-	newTx, err := s.p.makeProposeBlockTx(
-		context.Background(),
-		encoded,
-	)
+	txID, err = s.p.Sender.SendTransaction(newTx)
 	s.Nil(err)
+	confirmCh, _ = s.p.Sender.WaitTxConfirm(txID)
+	confirm = <-confirmCh
+	s.Nil(confirm.Err)
+
 	s.Greater(newTx.GasTipCap().Uint64(), tx.GasTipCap().Uint64())
 }
 
@@ -217,5 +228,6 @@ func (s *ProposerTestSuite) TestStartClose() {
 }
 
 func TestProposerTestSuite(t *testing.T) {
+	utils.LoadEnv()
 	suite.Run(t, new(ProposerTestSuite))
 }