cmd, core, eth, miner: remove txpool gas price limits (#14442)
This commit is contained in:
committed by
Felix Lange
parent
e20158176d
commit
a2f23ca9b1
@ -153,6 +153,8 @@ func (api *PrivateMinerAPI) Start(threads *int) error {
|
||||
}
|
||||
// Start the miner and return
|
||||
if !api.e.IsMining() {
|
||||
// Propagate the initial price point to the transaction pool
|
||||
api.e.txPool.SetGasPrice(api.e.gasPrice)
|
||||
return api.e.StartMining(true)
|
||||
}
|
||||
return nil
|
||||
@ -180,7 +182,7 @@ func (api *PrivateMinerAPI) SetExtra(extra string) (bool, error) {
|
||||
|
||||
// SetGasPrice sets the minimum accepted gas price for the miner.
|
||||
func (api *PrivateMinerAPI) SetGasPrice(gasPrice hexutil.Big) bool {
|
||||
api.e.Miner().SetGasPrice((*big.Int)(&gasPrice))
|
||||
api.e.txPool.SetGasPrice((*big.Int)(&gasPrice))
|
||||
return true
|
||||
}
|
||||
|
||||
|
@ -20,6 +20,7 @@ package eth
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"math/big"
|
||||
"runtime"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
@ -76,6 +77,7 @@ type Ethereum struct {
|
||||
ApiBackend *EthApiBackend
|
||||
|
||||
miner *miner.Miner
|
||||
gasPrice *big.Int
|
||||
Mining bool
|
||||
MinerThreads int
|
||||
etherbase common.Address
|
||||
@ -167,7 +169,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
|
||||
}
|
||||
|
||||
eth.miner = miner.New(eth, eth.chainConfig, eth.EventMux(), eth.engine)
|
||||
eth.miner.SetGasPrice(config.GasPrice)
|
||||
eth.gasPrice = config.GasPrice
|
||||
eth.miner.SetExtra(makeExtraData(config.ExtraData))
|
||||
|
||||
eth.ApiBackend = &EthApiBackend{eth, nil}
|
||||
|
@ -42,7 +42,7 @@ var DefaultConfig = Config{
|
||||
NetworkId: 1,
|
||||
LightPeers: 20,
|
||||
DatabaseCache: 128,
|
||||
GasPrice: big.NewInt(20 * params.Shannon),
|
||||
GasPrice: big.NewInt(18 * params.Shannon),
|
||||
|
||||
GPO: gasprice.Config{
|
||||
Blocks: 10,
|
||||
|
Reference in New Issue
Block a user