fix

Author: corey

token-price-oracle/client/sign.go

@@ -104,7 +104,7 @@ func (s *Signer) CreateAndSignTx(
 	if maxTip := client.GetMaxGasTipCap(); maxTip != nil {
 		if tip.Cmp(maxTip) > 0 {
 			log.Debug("Applying gas tip cap limit", "dynamic", tip, "cap", maxTip)
-			tip = maxTip
+			tip = new(big.Int).Set(maxTip)
 		}
 	}
 
@@ -129,10 +129,16 @@ func (s *Signer) CreateAndSignTx(
 	if maxFeeCap := client.GetMaxGasFeeCap(); maxFeeCap != nil {
 		if gasFeeCap.Cmp(maxFeeCap) > 0 {
 			log.Debug("Applying gas fee cap limit", "dynamic", gasFeeCap, "cap", maxFeeCap)
-			gasFeeCap = maxFeeCap
+			gasFeeCap = new(big.Int).Set(maxFeeCap)
 		}
 	}
 
+	// Ensure gasTipCap <= gasFeeCap (EIP-1559 invariant)
+	if tip.Cmp(gasFeeCap) > 0 {
+		log.Debug("Clamping tip to gasFeeCap", "tip", tip, "gasFeeCap", gasFeeCap)
+		tip = new(big.Int).Set(gasFeeCap)
+	}
+
 	// Estimate gas
 	gas, err := client.GetClient().EstimateGas(ctx, ethereum.CallMsg{
 		From:      from,

token-price-oracle/config/config.go

@@ -126,6 +126,11 @@ func LoadConfig(ctx *cli.Context) (*Config, error) {
 		cfg.GasTipCap = &v
 	}
 
+	// Validate GasFeeCap >= GasTipCap when both are set (EIP-1559 invariant)
+	if cfg.GasFeeCap != nil && cfg.GasTipCap != nil && *cfg.GasFeeCap < *cfg.GasTipCap {
+		return nil, fmt.Errorf("--gas-fee-cap (%d) must be >= --gas-tip-cap (%d)", *cfg.GasFeeCap, *cfg.GasTipCap)
+	}
+
 	// Parse token registry address (optional)
 	cfg.L2TokenRegistryAddr = predeploys.L2TokenRegistryAddr
 

token-price-oracle/updater/tx_manager.go

@@ -247,6 +247,12 @@ func (m *TxManager) applyGasCaps(ctx context.Context, auth *bind.TransactOpts) e
 	}
 	auth.GasFeeCap = gasFeeCap
 
+	// Ensure gasTipCap <= gasFeeCap (EIP-1559 invariant)
+	if auth.GasTipCap.Cmp(auth.GasFeeCap) > 0 {
+		log.Debug("Clamping tip to gasFeeCap", "tip", auth.GasTipCap, "gasFeeCap", auth.GasFeeCap)
+		auth.GasTipCap = new(big.Int).Set(auth.GasFeeCap)
+	}
+
 	log.Debug("Gas caps applied", "tipCap", auth.GasTipCap, "feeCap", auth.GasFeeCap)
 	return nil
 }