add unit tests

scroll-tech · Dec 26, 2023 · 7c28428 · 7c28428
1 parent 8c9d96a
commit 7c28428
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 10 deletions.
diff --git a/common/cmd/cmd.go b/common/cmd/cmd.go
@@ -95,8 +95,7 @@ func (c *Cmd) Write(data []byte) (int, error) {
 	if verbose || c.openLog {
 		fmt.Printf("%s:\n\t%v", c.name, out)
 	} else if strings.Contains(strings.ToLower(out), "error") ||
-		strings.Contains(strings.ToLower(out), "warning") ||
-		strings.Contains(strings.ToLower(out), "info") {
+		strings.Contains(strings.ToLower(out), "warning") {
 		fmt.Printf("%s:\n\t%v", c.name, out)
 	}
 	go c.checkFuncs.IterCb(func(_ string, value interface{}) {

diff --git a/rollup/internal/controller/sender/sender.go b/rollup/internal/controller/sender/sender.go
@@ -222,13 +222,13 @@ func (s *Sender) SendTransaction(ID string, target *common.Address, value *big.I
 
 	if feeData, err = s.getFeeData(s.auth, target, value, data, fallbackGasLimit); err != nil {
 		s.metrics.sendTransactionFailureGetFee.WithLabelValues(s.service, s.name).Inc()
-		log.Error("failed to get fee data", "from", s.auth.From.String(), "to", target.String(), "value", value.Uint64(), "fallback gas limit", fallbackGasLimit, "err", err)
+		log.Error("failed to get fee data", "from", s.auth.From.String(), "nonce", s.auth.Nonce.Uint64(), "fallback gas limit", fallbackGasLimit, "err", err)
 		return common.Hash{}, fmt.Errorf("failed to get fee data, err: %w", err)
 	}
 
 	if tx, err = s.createAndSendTx(s.auth, feeData, target, value, data, nil); err != nil {
 		s.metrics.sendTransactionFailureSendTx.WithLabelValues(s.service, s.name).Inc()
-		log.Error("failed to create and send tx (non-resubmit case)", "from", s.auth.From.String(), "to", target.String(), "nonce", s.auth.Nonce.Uint64(), "value", value.Uint64(), "err", err)
+		log.Error("failed to create and send tx (non-resubmit case)", "from", s.auth.From.String(), "nonce", s.auth.Nonce.Uint64(), "err", err)
 		return common.Hash{}, fmt.Errorf("failed to create and send transaction, err: %w", err)
 	}
 
@@ -439,7 +439,7 @@ func (s *Sender) resubmitTransaction(feeData *FeeData, auth *bind.TransactOpts,
 	s.metrics.resubmitTransactionTotal.WithLabelValues(s.service, s.name).Inc()
 	tx, err := s.createAndSendTx(auth, feeData, tx.To(), tx.Value(), tx.Data(), &nonce)
 	if err != nil {
-		log.Error("failed to create and send tx (resubmit case)", "from", s.auth.From.String(), "to", tx.To().String(), "nonce", nonce, "value", tx.Value().Uint64(), "err", err)
+		log.Error("failed to create and send tx (resubmit case)", "from", s.auth.From.String(), "nonce", nonce, "err", err)
 		return nil, err
 	}
 	return tx, nil

diff --git a/rollup/internal/controller/sender/sender_test.go b/rollup/internal/controller/sender/sender_test.go
@@ -43,7 +43,7 @@ func setupEnv(t *testing.T) {
 	var err error
 	cfg, err = config.NewConfig("../../../conf/config.json")
 	assert.NoError(t, err)
-	base.RunImages(t)
+	base.RunL1Geth(t)
 	priv, err := crypto.HexToECDSA("1212121212121212121212121212121212121212121212121212121212121212")
 	assert.NoError(t, err)
 	// Load default private key.
@@ -60,7 +60,9 @@ func TestSender(t *testing.T) {
 	t.Run("test new sender", testNewSender)
 	t.Run("test pending limit", testPendLimit)
 	t.Run("test fallback gas limit", testFallbackGasLimit)
-	t.Run("test resubmit transaction", testResubmitTransaction)
+	t.Run("test resubmit zero gas price transaction", testResubmitZeroGasPriceTransaction)
+	t.Run("test resubmit non-zero gas price transaction", testResubmitNonZeroGasPriceTransaction)
+	t.Run("test resubmit under priced transaction", testResubmitUnderpricedTransaction)
 	t.Run("test resubmit transaction with rising base fee", testResubmitTransactionWithRisingBaseFee)
 	t.Run("test check pending transaction", testCheckPendingTransaction)
 }
@@ -138,21 +140,78 @@ func testFallbackGasLimit(t *testing.T) {
 	}
 }
 
-func testResubmitTransaction(t *testing.T) {
+func testResubmitZeroGasPriceTransaction(t *testing.T) {
 	for _, txType := range txTypes {
 		cfgCopy := *cfg.L1Config.RelayerConfig.SenderConfig
 		cfgCopy.TxType = txType
 		s, err := NewSender(context.Background(), &cfgCopy, privateKey, "test", "test", nil)
 		assert.NoError(t, err)
-		tx := types.NewTransaction(s.auth.Nonce.Uint64(), common.Address{}, big.NewInt(0), 0, big.NewInt(0), nil)
-		feeData, err := s.getFeeData(s.auth, &common.Address{}, big.NewInt(0), nil, 0)
+		feeData := &FeeData{
+			gasPrice:  big.NewInt(0),
+			gasTipCap: big.NewInt(0),
+			gasFeeCap: big.NewInt(0),
+			gasLimit:  50000,
+		}
+		tx, err := s.createAndSendTx(s.auth, feeData, &common.Address{}, big.NewInt(0), nil, nil)
 		assert.NoError(t, err)
+		assert.NotNil(t, tx)
+		// Increase at least 1 wei in gas price, gas tip cap and gas fee cap.
 		_, err = s.resubmitTransaction(feeData, s.auth, tx)
 		assert.NoError(t, err)
 		s.Stop()
 	}
 }
 
+func testResubmitNonZeroGasPriceTransaction(t *testing.T) {
+	for _, txType := range txTypes {
+		cfgCopy := *cfg.L1Config.RelayerConfig.SenderConfig
+		// Bump gas price, gas tip cap and gas fee cap just touch the minimum threshold of 10% (default config of geth).
+		cfgCopy.EscalateMultipleNum = 110
+		cfgCopy.EscalateMultipleDen = 100
+		cfgCopy.TxType = txType
+		s, err := NewSender(context.Background(), &cfgCopy, privateKey, "test", "test", nil)
+		assert.NoError(t, err)
+		feeData := &FeeData{
+			gasPrice:  big.NewInt(100000),
+			gasTipCap: big.NewInt(100000),
+			gasFeeCap: big.NewInt(100000),
+			gasLimit:  50000,
+		}
+		tx, err := s.createAndSendTx(s.auth, feeData, &common.Address{}, big.NewInt(0), nil, nil)
+		assert.NoError(t, err)
+		assert.NotNil(t, tx)
+		// Increase at least 1 wei in gas price, gas tip cap and gas fee cap.
+		_, err = s.resubmitTransaction(feeData, s.auth, tx)
+		assert.NoError(t, err)
+		s.Stop()
+	}
+}
+
+func testResubmitUnderpricedTransaction(t *testing.T) {
+	for _, txType := range txTypes {
+		cfgCopy := *cfg.L1Config.RelayerConfig.SenderConfig
+		// Bump gas price, gas tip cap and gas fee cap less than 10% (default config of geth).
+		cfgCopy.EscalateMultipleNum = 109
+		cfgCopy.EscalateMultipleDen = 100
+		cfgCopy.TxType = txType
+		s, err := NewSender(context.Background(), &cfgCopy, privateKey, "test", "test", nil)
+		assert.NoError(t, err)
+		feeData := &FeeData{
+			gasPrice:  big.NewInt(100000),
+			gasTipCap: big.NewInt(100000),
+			gasFeeCap: big.NewInt(100000),
+			gasLimit:  50000,
+		}
+		tx, err := s.createAndSendTx(s.auth, feeData, &common.Address{}, big.NewInt(0), nil, nil)
+		assert.NoError(t, err)
+		assert.NotNil(t, tx)
+		// Increase at least 1 wei in gas price, gas tip cap and gas fee cap.
+		_, err = s.resubmitTransaction(feeData, s.auth, tx)
+		assert.Error(t, err, "replacement transaction underpriced")
+		s.Stop()
+	}
+}
+
 func testResubmitTransactionWithRisingBaseFee(t *testing.T) {
 	txType := "DynamicFeeTx"