Submitter: only bump gas price for transactions with current nonce

ethergo/chain/gas/cmp.go

@@ -1,10 +1,11 @@
 package gas
 
 import (
+	"math/big"
+
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/synapsecns/sanguine/core"
-	"math/big"
 )
 
 // CompareGas allows for gas comparisons between txes. In the case of an eip-1559 txOpts and a
@@ -92,7 +93,13 @@ func bumpDynamicTxFees(opts *bind.TransactOpts, percentIncrease int, baseFee, ma
 		logger.Warnf("new tip cap %s still less than fee cap %s + base fee %s, bumping tip not and not fee", newTipCap, maxPrice, baseFee)
 	}
 
-	opts.GasFeeCap = maxPrice
+	newFeeCap := BumpByPercent(opts.GasFeeCap, percentIncrease)
+	if maxPrice.Cmp(newFeeCap) > 0 {
+		opts.GasFeeCap = newFeeCap
+	} else {
+		opts.GasFeeCap = maxPrice
+		logger.Warnf("new fee cap %s exceeds max price %s, using max price", newFeeCap, maxPrice)
+	}
 }
 
 // BumpByPercent bumps a gas price by a percentage.

ethergo/submitter/chain_queue.go

@@ -84,7 +84,12 @@
 			continue
 		}
 
-		cq.bumpTX(gCtx, tx)
+		// should only bump the gas price if we are at current nonce
+		if tx.Nonce() == currentNonce {
+			cq.bumpTX(gCtx, tx, true)
+		} else {
+			cq.bumpTX(gCtx, tx, false)
+		}
 	}
 	cq.updateOldTxStatuses(gCtx)
 
@@ -144,7 +149,7 @@
 }
 
 // nolint: cyclop
-func (c *chainQueue) bumpTX(parentCtx context.Context, ogTx db.TX) {
+func (c *chainQueue) bumpTX(parentCtx context.Context, ogTx db.TX, bumpGasPrice bool) {
 	c.g.Go(func() (err error) {
 		if !c.isBumpIntervalElapsed(ogTx) {
 			c.addToReprocessQueue(ogTx)
@@ -171,7 +176,11 @@
 		transactor.Nonce = new(big.Int).SetUint64(tx.Nonce())
 		transactor.GasLimit = newGasEstimate
 
-		err = c.setGasPrice(ctx, c.client, transactor, c.chainID, ogTx.Transaction)
+		prevTx := ogTx.Transaction
+		if !bumpGasPrice {
+			prevTx = nil
+		}
+		err = c.setGasPrice(ctx, c.client, transactor, c.chainID, prevTx)
 		if err != nil {
 			return fmt.Errorf("could not set gas price: %w", err)
 		}

ethergo/submitter/config/config.go

@@ -57,7 +57,8 @@ const (
 	DefaultBumpIntervalSeconds = 30
 
 	// DefaultGasBumpPercentage is the default percentage to bump the gas price by.
-	DefaultGasBumpPercentage = 5
+	// See: https://github.com/ethereum/go-ethereum/blob/8c5576b1ac89473c7ec15c9b03d1ca02e9499dcc/core/txpool/legacypool/legacypool.go#L146
+	DefaultGasBumpPercentage = 10
 
 	// DefaultGasEstimate is the default gas estimate to use for transactions.
 	DefaultGasEstimate = uint64(1200000)

ethergo/submitter/submitter.go

@@ -358,12 +358,27 @@ func (t *txSubmitterImpl) setGasPrice(ctx context.Context, client client.EVM,
 			transactor.GasFeeCap = maxPrice
 		}
 
+		span.SetAttributes(
+			attribute.String("gas_price", bigPtrToString(transactor.GasPrice)),
+			attribute.String("gas_fee_cap", bigPtrToString(transactor.GasFeeCap)),
+			attribute.String("gas_tip_cap", bigPtrToString(transactor.GasTipCap)),
+		)
 		metrics.EndSpanWithErr(span, err)
 	}()
 
 	// TODO: cache both of these values
+	shouldBump := true
 	if t.config.SupportsEIP1559(int(bigChainID.Uint64())) {
-		transactor.GasFeeCap = t.config.GetMaxGasPrice(chainID)
+		transactor.GasFeeCap, err = client.SuggestGasPrice(ctx)
+		if err != nil {
+			return fmt.Errorf("could not get gas price: %w", err)
+		}
+		// don't bump fee cap if we hit the max configured gas price
+		if transactor.GasFeeCap.Cmp(maxPrice) > 0 {
+			transactor.GasFeeCap = maxPrice
+			shouldBump = false
+			span.AddEvent("not bumping fee cap since max price is reached")
+		}
 
 		transactor.GasTipCap, err = client.SuggestGasTipCap(ctx)
 		if err != nil {
@@ -378,7 +393,7 @@ func (t *txSubmitterImpl) setGasPrice(ctx context.Context, client client.EVM,
 	t.applyBaseGasPrice(transactor, chainID)
 
 	//nolint: nestif
-	if prevTx != nil {
+	if prevTx != nil && shouldBump {
 		gasBlock, err := t.getGasBlock(ctx, client, chainID)
 		if err != nil {
 			span.AddEvent("could not get gas block", trace.WithAttributes(attribute.String("error", err.Error())))

ethergo/submitter/submitter_test.go

@@ -44,7 +44,7 @@ func (s *SubmitterSuite) TestSetGasPrice() {
 	maxPrice := new(big.Int).Add(gasPrice, new(big.Int).SetUint64(1))
 	cfg.SetGlobalMaxGasPrice(maxPrice)
 
-	client.On(testsuite.GetFunctionName(client.SuggestGasPrice), mock.Anything).Twice().Return(gasPrice, nil)
+	client.On(testsuite.GetFunctionName(client.SuggestGasPrice), mock.Anything).Times(3).Return(gasPrice, nil)
 	err = ts.SetGasPrice(s.GetTestContext(), client, transactor, chainID, nil)
 	s.Require().NoError(err)