1.dev and self-test the requirement of new economic system

2. fix bug that get gasPrice from contract

Author: eric

consensus/parlia/parlia.go

@@ -1078,12 +1078,13 @@ func (p *Parlia) distributeIncoming(val common.Address, state *state.StateDB, he
 		rewards = rewards.Add(rewards, blockRewards)
 		state.AddBalance(coinbase, blockRewards)
 	}
-
 	if rewards.Cmp(common.Big0) <= 0 {
 		return nil
 	}
 	if p.chainConfig.IsFncy2(header.Number) {
-
+		if blockRewards == nil {
+			blockRewards = big.NewInt(0)
+		}
 		return p.distributeRewards(rewards, blockRewards, balance, val, state, header, chain, txs, receipts, receivedTxs, usedGas, mining)
 	}
 	// remove 1/16 reward according to netmarble

core/tx_pool.go

@@ -487,9 +487,17 @@ func (pool *TxPool) SubscribeReannoTxsEvent(ch chan<- ReannoTxsEvent) event.Subs
 func (pool *TxPool) GasPrice() *big.Int {
 	pool.mu.RLock()
 	defer pool.mu.RUnlock()
+	return new(big.Int).Set(pool.gasPrice)
+}
 
+//Fncy2 Update
+func (pool *TxPool) GasPriceWithoutLock() *big.Int {
 	return new(big.Int).Set(pool.gasPrice)
 }
+func (pool *TxPool) SetGasPriceWithoutLock(price *big.Int) {
+	pool.gasPrice = price
+	log.Info("Transaction pool price threshold updated", "price", price)
+}
 
 // SetGasPrice updates the minimum price required by the transaction pool for a
 // new transaction, and drops all transactions below this threshold.
@@ -559,7 +567,6 @@ func (pool *TxPool) Content() (map[common.Address]types.Transactions, map[common
 func (pool *TxPool) Pending() (map[common.Address]types.Transactions, error) {
 	pool.mu.Lock()
 	defer pool.mu.Unlock()
-
 	pending := make(map[common.Address]types.Transactions)
 	for addr, list := range pool.pending {
 		pending[addr] = list.Flatten()
@@ -1309,7 +1316,7 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) {
 			if gasPrice != nil && gasPrice.Cmp(common.Big0) > 0 {
 				if pool.gasPrice.Cmp(gasPrice) != 0 {
 					log.Debug("Set gasPrice ", " old gasPrice", pool.gasPrice, " new gasPrice", gasPrice)
-					pool.SetGasPrice(gasPrice)
+					pool.SetGasPriceWithoutLock(gasPrice)
 				}
 			}
 		}

eth/api_backend.go

@@ -276,7 +276,9 @@ func (b *EthAPIBackend) Downloader() *downloader.Downloader {
 }
 
 func (b *EthAPIBackend) SuggestPrice(ctx context.Context) (*big.Int, error) {
-	return b.gpo.SuggestPrice(ctx)
+	//Fncy2 Update
+	//return b.gpo.SuggestPrice(ctx)
+	return b.eth.TxPool().GasPriceWithoutLock(), nil
 }
 
 func (b *EthAPIBackend) Chain() *core.BlockChain {