Merge pull request #5 from node-real/netmarble_v2.0_dev

fix:fncy2 gpo.DefaultPrice causes the bug that suggestPrice is unreas…

Author: xuan-io

core/tx_pool.go

@@ -1316,7 +1316,7 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) {
 			log.Warn("Failed to get gasPrice", "err", err)
 		} else {
 			if gasPrice != nil && gasPrice.Cmp(common.Big0) > 0 {
-				if pool.gasPrice.Cmp(gasPrice) != 0 {
+				if pool.gasPrice == nil || pool.gasPrice.Cmp(gasPrice) != 0 {
 					log.Debug("Set gasPrice ", " old gasPrice", pool.gasPrice, " new gasPrice", gasPrice)
 					pool.SetGasPriceWithoutLock(gasPrice)
 				}

eth/backend.go

@@ -64,6 +64,8 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 )
 
+var maxPrice = big.NewInt(1200000 * params.GWei)
+
 // Config contains the configuration options of the ETH protocol.
 // Deprecated: use ethconfig.Config instead.
 type Config = ethconfig.Config
@@ -226,7 +228,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 		config.TxPool.Journal = stack.ResolvePath(config.TxPool.Journal)
 	}
 	//getCurrentGasPriceFunc
-	eth.txPool = core.NewEnhanceTxPool(config.TxPool, chainConfig, eth.blockchain, getCurrentGasFreeAddressMapFunc(ethAPI), getCurrentGasPriceFunc(ethAPI))
+	eth.txPool = core.NewEnhanceTxPool(config.TxPool, chainConfig, eth.blockchain, getCurrentGasFreeAddressMapFunc(ethAPI), getCurrentGasPriceFunc(eth, ethAPI))
 
 	// Permit the downloader to use the trie cache allowance during fast sync
 	cacheLimit := cacheConfig.TrieCleanLimit + cacheConfig.TrieDirtyLimit + cacheConfig.SnapshotLimit
@@ -600,7 +602,7 @@ func (s *Ethereum) Stop() error {
 
 	return nil
 }
-func getCurrentGasPriceFunc(ee *ethapi.PublicBlockChainAPI) func(common.Hash) (*big.Int, error) {
+func getCurrentGasPriceFunc(eth *Ethereum, ee *ethapi.PublicBlockChainAPI) func(common.Hash) (*big.Int, error) {
 	return func(blockHash common.Hash) (*big.Int, error) {
 		// block
 		blockNr := rpc.BlockNumberOrHashWithHash(blockHash, false)
@@ -631,11 +633,24 @@ func getCurrentGasPriceFunc(ee *ethapi.PublicBlockChainAPI) func(common.Hash) (*
 		if err != nil {
 			return nil, err
 		}
-		out := big.NewInt(0)
-		if err := chainConfig.UnpackIntoInterface(&out, method, result); err != nil {
+		gasPrice := big.NewInt(0)
+		if err := chainConfig.UnpackIntoInterface(&gasPrice, method, result); err != nil {
 			return nil, err
 		}
-		return out, nil
+		if gasPrice != nil && eth.APIBackend.gpo != nil && gasPrice.Cmp(common.Big0) > 0 {
+			if eth.APIBackend.gpo.GetDefaultPrice() == nil || eth.APIBackend.gpo.GetDefaultPrice().Cmp(gasPrice) != 0 {
+				eth.APIBackend.gpo.SetDefaultPrice(gasPrice)
+			}
+			if eth.APIBackend.gpo.GetMaxPrice() == nil || eth.APIBackend.gpo.GetMaxPrice().Cmp(maxPrice) != 0 {
+				eth.APIBackend.gpo.SetMaxPrice(maxPrice)
+			}
+			if eth.gasPrice == nil || eth.gasPrice.Cmp(gasPrice) != 0 {
+				eth.lock.Lock()
+				eth.gasPrice = gasPrice
+				eth.lock.Unlock()
+			}
+		}
+		return gasPrice, nil
 	}
 }
 

eth/gasprice/gasprice.go

@@ -98,6 +98,20 @@ func NewOracle(backend OracleBackend, params Config) *Oracle {
 	}
 }
 
+func (gpo *Oracle) SetDefaultPrice(defaultPrice *big.Int) {
+	gpo.defaultPrice = defaultPrice
+}
+func (gpo *Oracle) GetDefaultPrice() *big.Int {
+	return gpo.defaultPrice
+}
+
+func (gpo *Oracle) SetMaxPrice(maxPrice *big.Int) {
+	gpo.maxPrice = maxPrice
+}
+func (gpo *Oracle) GetMaxPrice() *big.Int {
+	return gpo.maxPrice
+}
+
 // SuggestPrice returns a gasprice so that newly created transaction can
 // have a very high chance to be included in the following blocks.
 func (gpo *Oracle) SuggestPrice(ctx context.Context) (*big.Int, error) {