Get gas price suggestion from the correct block (#817)

# Conflicts: # internal/ethapi/api.go
celo-org · Jan 31, 2020 · 8807079 · 8807079
1 parent 8c1e533
commit 8807079
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/contract_comm/gasprice_minimum/gasprice_minimum.go b/contract_comm/gasprice_minimum/gasprice_minimum.go
@@ -26,7 +26,6 @@ import (
 	"github.com/ethereum/go-ethereum/contract_comm/errors"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/params"
 )
 
@@ -101,11 +100,9 @@ func GetGasPriceMinimum(currency *common.Address, header *types.Header, state vm
 			return FallbackGasPriceMinimum, nil
 		}
 		if err == errors.ErrNoInternalEvmHandlerSingleton {
-			log.Error(err.Error())
 			return FallbackGasPriceMinimum, nil
 		}
 		if err != nil {
-			log.Error(err.Error())
 			return FallbackGasPriceMinimum, err
 		}
 	} else {
@@ -124,6 +121,12 @@ func GetGasPriceMinimum(currency *common.Address, header *types.Header, state vm
 		state,
 	)
 
+	if err == errors.ErrSmartContractNotDeployed || err == errors.ErrRegistryContractNotDeployed {
+		return FallbackGasPriceMinimum, nil
+	}
+	if err == errors.ErrNoInternalEvmHandlerSingleton {
+		return FallbackGasPriceMinimum, nil
+	}
 	if err != nil {
 		return FallbackGasPriceMinimum, err
 	}

diff --git a/eth/api_backend.go b/eth/api_backend.go
@@ -270,8 +270,8 @@ func (b *EthAPIBackend) SuggestPrice(ctx context.Context) (*big.Int, error) {
 	return gpm.GetGasPriceSuggestion(nil, nil, nil)
 }
 
-func (b *EthAPIBackend) SuggestPriceInCurrency(ctx context.Context, currencyAddress *common.Address) (*big.Int, error) {
-	return gpm.GetGasPriceSuggestion(currencyAddress, nil, nil)
+func (b *EthAPIBackend) SuggestPriceInCurrency(ctx context.Context, currencyAddress *common.Address, header *types.Header, state *state.StateDB) (*big.Int, error) {
+	return gpm.GetGasPriceSuggestion(currencyAddress, header, state)
 }
 
 func (b *EthAPIBackend) ChainDb() ethdb.Database {

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -824,7 +824,11 @@ func DoCall(ctx context.Context, b Backend, args CallArgs, blockNrOrHash rpc.Blo
 	// TODO(asa): Remove this once this is handled in the Provider.
 	if gasPrice.Sign() == 0 || gasPrice.Cmp(big.NewInt(0)) == 0 {
 		// TODO(mcortesi): change SuggestGastPriceInCurrent so it doesn't return an error
-		gasPrice, _ = b.SuggestPriceInCurrency(ctx, args.FeeCurrency)
+		gasPrice, err = b.SuggestPriceInCurrency(ctx, args.FeeCurrency, header, state)
+		if err != nil {
+			log.Error("Error suggesting gas price", "block", blockNrOrHash, "err", err)
+			return nil, 0, false, err
+		}
 	}
 
 	value := new(big.Int)
@@ -1421,7 +1425,11 @@ func (args *SendTxArgs) setDefaults(ctx context.Context, b Backend) error {
 	// which will always be in Gold. This allows the default price to be set for the proper currency.
 	// TODO(asa): Remove this once this is handled in the Provider.
 	if args.GasPrice == nil || args.GasPrice.ToInt().Cmp(big.NewInt(0)) == 0 {
-		price, err := b.SuggestPriceInCurrency(ctx, args.FeeCurrency)
+		state, header, err := b.StateAndHeaderByNumber(ctx, rpc.LatestBlockNumber)
+		if err != nil {
+			return err
+		}
+		price, err := b.SuggestPriceInCurrency(ctx, args.FeeCurrency, header, state)
 		if err != nil {
 			return err
 		}

diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go
@@ -42,7 +42,7 @@ type Backend interface {
 	Downloader() *downloader.Downloader
 	ProtocolVersion() int
 	SuggestPrice(ctx context.Context) (*big.Int, error)
-	SuggestPriceInCurrency(ctx context.Context, currencyAddress *common.Address) (*big.Int, error)
+	SuggestPriceInCurrency(ctx context.Context, currencyAddress *common.Address, header *types.Header, state *state.StateDB) (*big.Int, error)
 	ChainDb() ethdb.Database
 	EventMux() *event.TypeMux
 	AccountManager() *accounts.Manager

diff --git a/les/api_backend.go b/les/api_backend.go
@@ -242,8 +242,8 @@ func (b *LesApiBackend) SuggestPrice(ctx context.Context) (*big.Int, error) {
 	return gpm.GetGasPriceSuggestion(nil, nil, nil)
 }
 
-func (b *LesApiBackend) SuggestPriceInCurrency(ctx context.Context, currencyAddress *common.Address) (*big.Int, error) {
-	return gpm.GetGasPriceSuggestion(currencyAddress, nil, nil)
+func (b *LesApiBackend) SuggestPriceInCurrency(ctx context.Context, currencyAddress *common.Address, header *types.Header, state *state.StateDB) (*big.Int, error) {
+	return gpm.GetGasPriceSuggestion(currencyAddress, header, state)
 }
 
 func (b *LesApiBackend) GetGasPriceMinimum(ctx context.Context, currencyAddress *common.Address) (*big.Int, error) {