fix(tx-submitter): ensure correct feecap on resubmission (#747)

WorldDogs · web-flow · commit 0c7a9973d69c · 2025-04-11T16:33:40.000+08:00
Co-authored-by: WorldDogs &lt;noreply.github.com&gt;
diff --git a/tx-submitter/services/rollup.go b/tx-submitter/services/rollup.go
@@ -1603,13 +1603,17 @@ func (r *Rollup) ReSubmitTx(resend bool, tx *ethtypes.Transaction) (*ethtypes.Tr
 			if err != nil {
 				return nil, fmt.Errorf("get l1 head error:%w", err)
 			}
+			var recalculatedFeecap *big.Int
 			if head.BaseFee != nil {
-				gasFeeCap = new(big.Int).Add(
+				recalculatedFeecap = new(big.Int).Add(
 					tip,
 					new(big.Int).Mul(head.BaseFee, big.NewInt(2)),
 				)
 			} else {
-				gasFeeCap = new(big.Int).Set(tip)
+				recalculatedFeecap = new(big.Int).Set(tip)
+			}
+			if recalculatedFeecap.Cmp(gasFeeCap) > 0 {
+				gasFeeCap = recalculatedFeecap
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1603,13 +1603,17 @@ func (r Rollup) ReSubmitTx(resend bool, tx ethtypes.Transaction) (*ethtypes.Tr`
`1603`	`1603`	`if err != nil {`
`1604`	`1604`	`return nil, fmt.Errorf("get l1 head error:%w", err)`
`1605`	`1605`	`}`
	`1606`	`+ var recalculatedFeecap *big.Int`
`1606`	`1607`	`if head.BaseFee != nil {`
`1607`		`- gasFeeCap = new(big.Int).Add(`
	`1608`	`+ recalculatedFeecap = new(big.Int).Add(`
`1608`	`1609`	`tip,`
`1609`	`1610`	`new(big.Int).Mul(head.BaseFee, big.NewInt(2)),`
`1610`	`1611`	`)`
`1611`	`1612`	`} else {`
`1612`		`- gasFeeCap = new(big.Int).Set(tip)`
	`1613`	`+ recalculatedFeecap = new(big.Int).Set(tip)`
	`1614`	`+ }`
	`1615`	`+ if recalculatedFeecap.Cmp(gasFeeCap) > 0 {`
	`1616`	`+ gasFeeCap = recalculatedFeecap`
`1613`	`1617`	`}`
`1614`	`1618`	`}`
`1615`	`1619`	`}`