diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-05-26 18:40:47 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2017-05-29 16:29:46 +0800 |
| commit | 08959bbc70ade02109c819fdee72be1ed9310726 (patch) | |
| tree | cfa633babd7910a5b081b5f89f0d25dc80a02add /eth | |
| parent | dd5ed01f3b5ff5e426c9e2e4a55a8b05b10bc78d (diff) | |
| download | go-tangerine-08959bbc70ade02109c819fdee72be1ed9310726.tar go-tangerine-08959bbc70ade02109c819fdee72be1ed9310726.tar.gz go-tangerine-08959bbc70ade02109c819fdee72be1ed9310726.tar.bz2 go-tangerine-08959bbc70ade02109c819fdee72be1ed9310726.tar.lz go-tangerine-08959bbc70ade02109c819fdee72be1ed9310726.tar.xz go-tangerine-08959bbc70ade02109c819fdee72be1ed9310726.tar.zst go-tangerine-08959bbc70ade02109c819fdee72be1ed9310726.zip | |
cmd, core, eth: configurable txpool parameters
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/backend.go | 2 | ||||
| -rw-r--r-- | eth/config.go | 4 | ||||
| -rw-r--r-- | eth/gen_config.go | 6 |
3 files changed, 11 insertions, 1 deletions
diff --git a/eth/backend.go b/eth/backend.go index 7c63fa51d..e4357deb3 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -150,7 +150,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { core.WriteChainConfig(chainDb, genesisHash, chainConfig) } - newPool := core.NewTxPool(eth.chainConfig, eth.EventMux(), eth.blockchain.State, eth.blockchain.GasLimit) + newPool := core.NewTxPool(config.TxPool, eth.chainConfig, eth.EventMux(), eth.blockchain.State, eth.blockchain.GasLimit) eth.txPool = newPool maxPeers := config.MaxPeers diff --git a/eth/config.go b/eth/config.go index 22c09b170..4109cff8b 100644 --- a/eth/config.go +++ b/eth/config.go @@ -44,6 +44,7 @@ var DefaultConfig = Config{ DatabaseCache: 128, GasPrice: big.NewInt(18 * params.Shannon), + TxPool: core.DefaultTxPoolConfig, GPO: gasprice.Config{ Blocks: 10, Percentile: 50, @@ -99,6 +100,9 @@ type Config struct { EthashDatasetsInMem int EthashDatasetsOnDisk int + // Transaction pool options + TxPool core.TxPoolConfig + // Gas Price Oracle options GPO gasprice.Config diff --git a/eth/gen_config.go b/eth/gen_config.go index 955facf8f..477479419 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -33,6 +33,7 @@ func (c Config) MarshalTOML() (interface{}, error) { EthashDatasetDir string EthashDatasetsInMem int EthashDatasetsOnDisk int + TxPool core.TxPoolConfig GPO gasprice.Config EnablePreimageRecording bool DocRoot string `toml:"-"` @@ -60,6 +61,7 @@ func (c Config) MarshalTOML() (interface{}, error) { enc.EthashDatasetDir = c.EthashDatasetDir enc.EthashDatasetsInMem = c.EthashDatasetsInMem enc.EthashDatasetsOnDisk = c.EthashDatasetsOnDisk + enc.TxPool = c.TxPool enc.GPO = c.GPO enc.EnablePreimageRecording = c.EnablePreimageRecording enc.DocRoot = c.DocRoot @@ -90,6 +92,7 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { EthashDatasetDir *string EthashDatasetsInMem *int EthashDatasetsOnDisk *int + TxPool *core.TxPoolConfig GPO *gasprice.Config EnablePreimageRecording *bool DocRoot *string `toml:"-"` @@ -158,6 +161,9 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { if dec.EthashDatasetsOnDisk != nil { c.EthashDatasetsOnDisk = *dec.EthashDatasetsOnDisk } + if dec.TxPool != nil { + c.TxPool = *dec.TxPool + } if dec.GPO != nil { c.GPO = *dec.GPO } |