use float in legacy gas

eth/options.go

@@ -5,6 +5,7 @@ package eth
 import (
 	"math/big"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/celer-network/goutils/log"
@@ -15,10 +16,10 @@ type txOptions struct {
 	ethValue *big.Int
 	nonce    uint64
 	// Legacy Tx gas price
-	minGasGwei   uint64
-	maxGasGwei   uint64
-	addGasGwei   uint64
-	forceGasGwei *uint64 // use pointer to allow forcing zero gas
+	minGasGwei   float64
+	maxGasGwei   float64
+	addGasGwei   float64
+	forceGasGwei *float64 // use pointer to allow forcing zero gas
 	// EIP-1559 Tx gas price
 	maxFeePerGasGwei         uint64  // aka GasFeeCap in gwei
 	maxPriorityFeePerGasGwei float64 // aka GasTipCap in gwei
@@ -92,19 +93,19 @@ func WithNonce(n uint64) TxOption {
 	})
 }
 
-func WithMinGasGwei(g uint64) TxOption {
+func WithMinGasGwei(g float64) TxOption {
 	return newFuncTxOption(func(o *txOptions) {
 		o.minGasGwei = g
 	})
 }
 
-func WithMaxGasGwei(g uint64) TxOption {
+func WithMaxGasGwei(g float64) TxOption {
 	return newFuncTxOption(func(o *txOptions) {
 		o.maxGasGwei = g
 	})
 }
 
-func WithAddGasGwei(g uint64) TxOption {
+func WithAddGasGwei(g float64) TxOption {
 	return newFuncTxOption(func(o *txOptions) {
 		o.addGasGwei = g
 	})
@@ -113,7 +114,7 @@ func WithAddGasGwei(g uint64) TxOption {
 func WithForceGasGwei(g string) TxOption {
 	return newFuncTxOption(func(o *txOptions) {
 		if g != "" {
-			gwei, err := strconv.ParseUint(g, 10, 64)
+			gwei, err := strconv.ParseFloat(strings.TrimSpace(g), 64)
 			if err != nil {
 				log.Errorln("invalid ForceGasGwei", g)
 				return

eth/transactor.go

@@ -313,26 +313,26 @@ func determine1559GasPrice(signer *bind.TransactOpts, txopts txOptions, client *
 func determineLegacyGasPrice(
 	signer *bind.TransactOpts, txopts txOptions, client *ethclient.Client) error {
 	if txopts.forceGasGwei != nil {
-		signer.GasPrice = new(big.Int).SetUint64(*txopts.forceGasGwei * 1e9)
+		signer.GasPrice = new(big.Int).SetUint64(uint64(*txopts.forceGasGwei * 1e9))
 		return nil
 	}
 	gasPrice, err := client.SuggestGasPrice(context.Background())
 	if err != nil {
 		return fmt.Errorf("failed to call SuggestGasPrice: %w", err)
 	}
 	if txopts.addGasGwei > 0 { // Add gas price to the suggested value to speed up transactions
-		addPrice := new(big.Int).SetUint64(txopts.addGasGwei * 1e9)
+		addPrice := new(big.Int).SetUint64(uint64(txopts.addGasGwei * 1e9))
 		gasPrice.Add(gasPrice, addPrice)
 	}
 	if txopts.minGasGwei > 0 { // gas can't be lower than minGas
-		minPrice := new(big.Int).SetUint64(txopts.minGasGwei * 1e9)
+		minPrice := new(big.Int).SetUint64(uint64(txopts.minGasGwei * 1e9))
 		// minPrice is larger than suggested, use minPrice
 		if minPrice.Cmp(gasPrice) > 0 {
 			gasPrice = minPrice
 		}
 	}
 	if txopts.maxGasGwei > 0 { // maxGas 0 means no cap on gas price
-		maxPrice := new(big.Int).SetUint64(txopts.maxGasGwei * 1e9)
+		maxPrice := new(big.Int).SetUint64(uint64(txopts.maxGasGwei * 1e9))
 		// GasPrice is larger than allowed cap, use maxPrice but log warning
 		if maxPrice.Cmp(gasPrice) < 0 {
 			log.Warnf("suggested gas price %s larger than cap %s", gasPrice, maxPrice)