Merge pull request #8591 from ethereum-optimism/aj/backport-txmgr-fix…

…-canyon-mainnet Backport #8572: fix swapped fee/tip parameters to estimateGas
ethereum-optimism · Dec 12, 2023 · 39fc506 · 39fc506
2 parents 6a9f126 + aa7fda6
commit 39fc506
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/op-service/txmgr/txmgr.go b/op-service/txmgr/txmgr.go
@@ -227,8 +227,8 @@ func (m *SimpleTxManager) craftTx(ctx context.Context, candidate TxCandidate) (*
 		gas, err := m.backend.EstimateGas(ctx, ethereum.CallMsg{
 			From:      m.cfg.From,
 			To:        candidate.To,
-			GasFeeCap: gasFeeCap,
 			GasTipCap: gasTipCap,
+			GasFeeCap: gasFeeCap,
 			Data:      rawTx.Data,
 			Value:     rawTx.Value,
 		})
@@ -536,8 +536,8 @@ func (m *SimpleTxManager) increaseGasPrice(ctx context.Context, tx *types.Transa
 	gas, err := m.backend.EstimateGas(ctx, ethereum.CallMsg{
 		From:      m.cfg.From,
 		To:        rawTx.To,
-		GasFeeCap: bumpedTip,
-		GasTipCap: bumpedFee,
+		GasTipCap: bumpedTip,
+		GasFeeCap: bumpedFee,
 		Data:      rawTx.Data,
 	})
 	if err != nil {

diff --git a/op-service/txmgr/txmgr_test.go b/op-service/txmgr/txmgr_test.go
@@ -211,6 +211,9 @@ func (b *mockBackend) EstimateGas(ctx context.Context, msg ethereum.CallMsg) (ui
 	if b.g.err != nil {
 		return 0, b.g.err
 	}
+	if msg.GasFeeCap.Cmp(msg.GasTipCap) < 0 {
+		return 0, core.ErrTipAboveFeeCap
+	}
 	return b.g.basefee().Uint64(), nil
 }