Merge pull request #23384 from holiman/fix_gasfoo

karalabe · web-flow · commit 2a451f9eb302 · 2021-08-12T09:57:06.000+03:00
internal/ethapi: add back missing check for maxfee &lt; maxPriorityFee
diff --git a/internal/ethapi/transaction_args.go b/internal/ethapi/transaction_args.go
@@ -120,6 +120,11 @@ func (args *TransactionArgs) setDefaults(ctx context.Context, b Backend) error {
 				args.GasPrice = (*hexutil.Big)(price)
 			}
 		}
+	} else {
+		// Both maxPriorityfee and maxFee set by caller. Sanity-check their internal relation
+		if args.MaxFeePerGas.ToInt().Cmp(args.MaxPriorityFeePerGas.ToInt()) < 0 {
+			return fmt.Errorf("maxFeePerGas (%v) < maxPriorityFeePerGas (%v)", args.MaxFeePerGas, args.MaxPriorityFeePerGas)
+		}
 	}
 	if args.Value == nil {
 		args.Value = new(hexutil.Big)

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,11 @@ func (args *TransactionArgs) setDefaults(ctx context.Context, b Backend) error {`
`120`	`120`	`args.GasPrice = (*hexutil.Big)(price)`
`121`	`121`	`}`
`122`	`122`	`}`
	`123`	`+ } else {`
	`124`	`+ // Both maxPriorityfee and maxFee set by caller. Sanity-check their internal relation`
	`125`	`+ if args.MaxFeePerGas.ToInt().Cmp(args.MaxPriorityFeePerGas.ToInt()) < 0 {`
	`126`	`+ return fmt.Errorf("maxFeePerGas (%v) < maxPriorityFeePerGas (%v)", args.MaxFeePerGas, args.MaxPriorityFeePerGas)`
	`127`	`+ }`
`123`	`128`	`}`
`124`	`129`	`if args.Value == nil {`
`125`	`130`	`args.Value = new(hexutil.Big)`