Latest changes

This commit is contained in:
pavelkrolevets 2018-08-28 13:38:19 +08:00
parent 8ee5d4bf63
commit 5de11331d5
2 changed files with 4 additions and 14 deletions

View file

@ -35,16 +35,9 @@ import (
// DefaultConfig contains default settings for use on the Ethereum main net. // DefaultConfig contains default settings for use on the Ethereum main net.
var DefaultConfig = Config{ var DefaultConfig = Config{
SyncMode: downloader.FastSync, SyncMode: downloader.FullSync,
Ethash: ethash.Config{ NetworkId: 1515,
CacheDir: "ethash", LightPeers: 20,
CachesInMem: 2,
CachesOnDisk: 3,
DatasetsInMem: 1,
DatasetsOnDisk: 2,
},
NetworkId: 1,
LightPeers: 100,
DatabaseCache: 768, DatabaseCache: 768,
TrieCache: 256, TrieCache: 256,
TrieTimeout: 60 * time.Minute, TrieTimeout: 60 * time.Minute,
@ -102,9 +95,6 @@ type Config struct {
ExtraData []byte `toml:",omitempty"` ExtraData []byte `toml:",omitempty"`
GasPrice *big.Int GasPrice *big.Int
// Ethash options
Ethash ethash.Config
// Transaction pool options // Transaction pool options
TxPool core.TxPoolConfig TxPool core.TxPoolConfig

View file

@ -71,7 +71,7 @@ type ChainConfig struct {
ConstantinopleBlock *big.Int `json:"constantinopleBlock,omitempty"` // Constantinople switch block (nil = no fork, 0 = already activated) ConstantinopleBlock *big.Int `json:"constantinopleBlock,omitempty"` // Constantinople switch block (nil = no fork, 0 = already activated)
// Various consensus engines // Various consensus engines
LCP *LcpConfig `json:"LCP,omitempty"` LCP *LcpConfig `json:"lcp,omitempty"`
} }
// LCP is the consensus engine. // LCP is the consensus engine.