fix(wrapped): set both fee caps to user-specified gasPrice

Author: gacevicljubisa

pkg/transaction/wrapped/wrapped.go

@@ -220,6 +220,12 @@ func (b *wrappedBackend) Close() error {
 
 // SuggestedFeeAndTip calculates the recommended gasFeeCap and gasTipCap for a transaction.
 func (b *wrappedBackend) SuggestedFeeAndTip(ctx context.Context, gasPrice *big.Int, boostPercent int) (*big.Int, *big.Int, error) {
+	if gasPrice != nil {
+		// 1. gasFeeCap: The absolute maximum price per gas does not exceed the user's specified price.
+		// 2. gasTipCap: The entire amount (gasPrice - baseFee) can be used as a priority fee.
+		return new(big.Int).Set(gasPrice), new(big.Int).Set(gasPrice), nil
+	}
+
 	gasTipCap, err := b.backend.SuggestGasTipCap(ctx)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to suggest gas tip cap: %w", err)
@@ -237,30 +243,17 @@ func (b *wrappedBackend) SuggestedFeeAndTip(ctx context.Context, gasPrice *big.I
 		gasTipCap.Set(minimumTip)
 	}
 
-	var gasFeeCap *big.Int
-
-	if gasPrice == nil {
-		latestBlockHeader, err := b.backend.HeaderByNumber(ctx, nil)
-		if err != nil {
-			return nil, nil, fmt.Errorf("failed to get latest block header: %w", err)
-		}
-
-		if latestBlockHeader == nil || latestBlockHeader.BaseFee == nil {
-			return nil, nil, ErrEIP1559NotSupported
-		}
-
-		// EIP-1559: gasFeeCap = (2 * baseFee) + gasTipCap
-		gasFeeCap = new(big.Int).Mul(latestBlockHeader.BaseFee, big.NewInt(int64(baseFeeMultiplier)))
-		gasFeeCap.Add(gasFeeCap, gasTipCap)
-
-	} else {
-		gasFeeCap = new(big.Int).Set(gasPrice)
+	latestBlockHeader, err := b.backend.HeaderByNumber(ctx, nil)
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to get latest block header: %w", err)
 	}
-
-	// gasTipCap cannot exceed gasFeeCap
-	if gasTipCap.Cmp(gasFeeCap) > 0 {
-		gasTipCap.Set(gasFeeCap)
+	if latestBlockHeader == nil || latestBlockHeader.BaseFee == nil {
+		return nil, nil, ErrEIP1559NotSupported
 	}
 
+	// EIP-1559: gasFeeCap = (2 * baseFee) + gasTipCap
+	gasFeeCap := new(big.Int).Mul(latestBlockHeader.BaseFee, big.NewInt(int64(baseFeeMultiplier)))
+	gasFeeCap.Add(gasFeeCap, gasTipCap)
+
 	return gasFeeCap, gasTipCap, nil
 }