Merge branch 'gaslimit'

benma · benma · commit cb1274b65320 · 2020-06-07T03:22:40.000+02:00
diff --git a/backend/coins/eth/account.go b/backend/coins/eth/account.go
@@ -570,14 +570,10 @@ func (account *Account) newTx(
 			}
 		}
 	}
-	gasLimit := uint64(21000) // gas limit for standard ethereum transactions
-	if account.coin.erc20Token != nil {
-		n, err := account.coin.client.EstimateGas(context.TODO(), message)
-		if err != nil {
-			account.log.WithError(err).Error("Could not estimate the gas limit.")
-			return nil, errp.WithStack(errors.ErrInvalidData)
-		}
-		gasLimit = n
+	gasLimit, err := account.coin.client.EstimateGas(context.TODO(), message)
+	if err != nil {
+		account.log.WithError(err).Error("Could not estimate the gas limit.")
+		return nil, errp.WithStack(errors.ErrInvalidData)
 	}
 
 	fee := new(big.Int).Mul(new(big.Int).SetUint64(gasLimit), suggestedGasPrice)

Original file line number	Diff line number	Diff line change
`@@ -570,14 +570,10 @@ func (account *Account) newTx(`
`570`	`570`	`}`
`571`	`571`	`}`
`572`	`572`	`}`
`573`		`- gasLimit := uint64(21000) // gas limit for standard ethereum transactions`
`574`		`- if account.coin.erc20Token != nil {`
`575`		`- n, err := account.coin.client.EstimateGas(context.TODO(), message)`
`576`		`- if err != nil {`
`577`		`- account.log.WithError(err).Error("Could not estimate the gas limit.")`
`578`		`- return nil, errp.WithStack(errors.ErrInvalidData)`
`579`		`- }`
`580`		`- gasLimit = n`
	`573`	`+ gasLimit, err := account.coin.client.EstimateGas(context.TODO(), message)`
	`574`	`+ if err != nil {`
	`575`	`+ account.log.WithError(err).Error("Could not estimate the gas limit.")`
	`576`	`+ return nil, errp.WithStack(errors.ErrInvalidData)`
`581`	`577`	`}`
`582`	`578`
`583`	`579`	`fee := new(big.Int).Mul(new(big.Int).SetUint64(gasLimit), suggestedGasPrice)`