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

@@ -1054,15 +1054,15 @@ func (p *Parlia) getCurrentValidators(blockHash common.Hash) ([]common.Address,
 }
 func (p *Parlia) BlockRewards(blockNumber *big.Int) *big.Int {
 	if rules := p.chainConfig.Rules(blockNumber); rules.HasBlockRewards {
-		if p.chainConfig.Parlia.StopMintBlock != nil && p.chainConfig.Parlia.StopMintBlock.Cmp(blockNumber) >= 0 {
-			return big.NewInt(0)
+		if p.chainConfig.Parlia.StopMintBlock != nil && p.chainConfig.Parlia.StopMintBlock.Cmp(blockNumber) <= 0 {
+			return nil
 		}
 		blockRewards := p.chainConfig.Parlia.BlockRewards
 		if blockRewards != nil && blockRewards.Cmp(common.Big0) > 0 {
 			return blockRewards
 		}
 	}
-	return big.NewInt(0)
+	return nil
 }
 
 // slash spoiled validators
@@ -1074,7 +1074,7 @@ func (p *Parlia) distributeIncoming(val common.Address, state *state.StateDB, he
 	state.AddBalance(coinbase, balance)
 	rewards := big.NewInt(0).Abs(balance)
 	blockRewards := p.BlockRewards(header.Number)
-	if blockRewards.Cmp(common.Big0) > 0 {
+	if blockRewards != nil {
 		rewards = rewards.Add(rewards, blockRewards)
 		state.AddBalance(coinbase, blockRewards)
 	}

core/tx_pool.go

@@ -1291,16 +1291,7 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) {
 			}
 		}
 	}
-	gasPrice, err := pool.gasPriceFunc(pool.chain.CurrentBlock().Hash())
-	if err != nil {
-		log.Warn("Failed to get gasPrice", "err", err)
-	} else {
-		if gasPrice != nil && gasPrice.Cmp(common.Big0) > 0 {
-			if pool.gasPrice.Cmp(gasPrice) != 0 {
-				pool.SetGasPrice(gasPrice)
-			}
-		}
-	}
+
 	// Inject any transactions discarded due to reorgs
 	log.Debug("Reinjecting stale transactions", "count", len(reinject))
 	senderCacher.recover(pool.signer, reinject)
@@ -1310,6 +1301,20 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) {
 	next := new(big.Int).Add(newHead.Number, big.NewInt(1))
 	pool.istanbul = pool.chainconfig.IsIstanbul(next)
 	pool.eip2718 = pool.chainconfig.IsBerlin(next)
+	if pool.chainconfig.IsFncy2(next) {
+		gasPrice, err := pool.gasPriceFunc(pool.chain.CurrentBlock().Hash())
+		if err != nil {
+			log.Warn("Failed to get gasPrice", "err", err)
+		} else {
+			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)
+				}
+			}
+		}
+	}
+
 }
 
 // promoteExecutables moves transactions that have become processable from the

eth/backend.go

@@ -632,11 +632,10 @@ func getCurrentGasPriceFunc(ee *ethapi.PublicBlockChainAPI) func(common.Hash) (*
 			return nil, err
 		}
 		out := big.NewInt(0)
-		if err := chainConfig.UnpackIntoInterface(out, method, result); err != nil {
+		if err := chainConfig.UnpackIntoInterface(&out, method, result); err != nil {
 			return nil, err
 		}
 		return out, nil
-
 	}
 }
 

eth/tracers/api.go

@@ -544,7 +544,7 @@ func (api *API) IntermediateRoots(ctx context.Context, hash common.Hash, config
 				}
 				if i == len(block.Transactions())-1 && tx.To().Hex() == systemcontract.ValidatorContract {
 					blockRewards := posa.BlockRewards(block.Header().Number)
-					if blockRewards.Cmp(common.Big0) > 0 {
+					if blockRewards != nil {
 						statedb.AddBalance(vmctx.Coinbase, blockRewards)
 					}
 				}
@@ -660,7 +660,7 @@ func (api *API) traceBlock(ctx context.Context, block *types.Block, config *Trac
 				}
 				if i == len(txs)-1 && tx.To().Hex() == systemcontract.ValidatorContract {
 					blockRewards := posa.BlockRewards(block.Header().Number)
-					if blockRewards.Cmp(common.Big0) > 0 {
+					if blockRewards != nil {
 						statedb.AddBalance(block.Header().Coinbase, blockRewards)
 					}
 				}
@@ -790,7 +790,7 @@ func (api *API) standardTraceBlockToFile(ctx context.Context, block *types.Block
 				}
 				if i == len(block.Transactions())-1 && tx.To().Hex() == systemcontract.ValidatorContract {
 					blockRewards := posa.BlockRewards(block.Header().Number)
-					if blockRewards.Cmp(common.Big0) > 0 {
+					if blockRewards != nil {
 						statedb.AddBalance(vmctx.Coinbase, blockRewards)
 					}
 				}
@@ -963,7 +963,7 @@ func (api *API) traceTx(ctx context.Context, message core.Message, txctx *Contex
 		}
 		if txctx.TxIndex == txctx.TxCount-1 && message.To().Hex() == systemcontract.ValidatorContract {
 			blockRewards := posa.BlockRewards(vmctx.BlockNumber)
-			if blockRewards.Cmp(common.Big0) > 0 {
+			if blockRewards != nil {
 				statedb.AddBalance(vmctx.Coinbase, blockRewards)
 			}
 		}

internal/ethapi/api.go

@@ -1236,7 +1236,7 @@ func (s *PublicBlockChainAPI) replay(ctx context.Context, block *types.Block, ac
 				}
 				if i == len(block.Transactions())-1 && tx.To().Hex() == systemcontract.ValidatorContract {
 					blockRewards := posa.BlockRewards(block.Header().Number)
-					if blockRewards.Cmp(common.Big0) > 0 {
+					if blockRewards != nil {
 						statedb.AddBalance(context.Coinbase, blockRewards)
 					}
 				}