2017-04-14 11:29:00 +03:00
|
|
|
// Copyright 2017 The go-ethereum Authors
|
2017-04-12 17:27:23 +03:00
|
|
|
// This file is part of the go-ethereum library.
|
|
|
|
//
|
|
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
//
|
|
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU Lesser General Public License for more details.
|
|
|
|
//
|
|
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
2021-02-05 15:51:15 +03:00
|
|
|
// Package ethconfig contains the configuration of the ETH and LES protocols.
|
|
|
|
package ethconfig
|
2017-04-12 17:27:23 +03:00
|
|
|
|
|
|
|
import (
|
|
|
|
"math/big"
|
|
|
|
"os"
|
|
|
|
"os/user"
|
|
|
|
"path/filepath"
|
|
|
|
"runtime"
|
2018-02-05 19:40:32 +03:00
|
|
|
"time"
|
2017-04-12 17:27:23 +03:00
|
|
|
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
2021-02-05 15:51:15 +03:00
|
|
|
"github.com/ethereum/go-ethereum/consensus"
|
all: core rework for the merge transition (#23761)
* all: work for eth1/2 transtition
* consensus/beacon, eth: change beacon difficulty to 0
* eth: updates
* all: add terminalBlockDifficulty config, fix rebasing issues
* eth: implemented merge interop spec
* internal/ethapi: update to v1.0.0.alpha.2
This commit updates the code to the new spec, moving payloadId into
it's own object. It also fixes an issue with finalizing an empty blockhash.
It also properly sets the basefee
* all: sync polishes, other fixes + refactors
* core, eth: correct semantics for LeavePoW, EnterPoS
* core: fixed rebasing artifacts
* core: light: performance improvements
* core: use keyed field (f)
* core: eth: fix compilation issues + tests
* eth/catalyst: dbetter error codes
* all: move Merger to consensus/, remove reliance on it in bc
* all: renamed EnterPoS and LeavePoW to ReachTDD and FinalizePoS
* core: make mergelogs a function
* core: use InsertChain instead of InsertBlock
* les: drop merger from lightchain object
* consensus: add merger
* core: recoverAncestors in catalyst mode
* core: fix nitpick
* all: removed merger from beacon, use TTD, nitpicks
* consensus: eth: add docstring, removed unnecessary code duplication
* consensus/beacon: better comment
* all: easy to fix nitpicks by karalabe
* consensus/beacon: verify known headers to be sure
* core: comments
* core: eth: don't drop peers who advertise blocks, nitpicks
* core: never add beacon blocks to the future queue
* core: fixed nitpicks
* consensus/beacon: simplify IsTTDReached check
* consensus/beacon: correct IsTTDReached check
Co-authored-by: rjl493456442 <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
2021-11-26 14:23:02 +03:00
|
|
|
"github.com/ethereum/go-ethereum/consensus/beacon"
|
2021-02-05 15:51:15 +03:00
|
|
|
"github.com/ethereum/go-ethereum/consensus/clique"
|
2017-11-24 17:10:27 +03:00
|
|
|
"github.com/ethereum/go-ethereum/consensus/ethash"
|
2017-04-12 17:27:23 +03:00
|
|
|
"github.com/ethereum/go-ethereum/core"
|
|
|
|
"github.com/ethereum/go-ethereum/eth/downloader"
|
|
|
|
"github.com/ethereum/go-ethereum/eth/gasprice"
|
2021-02-05 15:51:15 +03:00
|
|
|
"github.com/ethereum/go-ethereum/ethdb"
|
|
|
|
"github.com/ethereum/go-ethereum/log"
|
2019-04-23 10:08:51 +03:00
|
|
|
"github.com/ethereum/go-ethereum/miner"
|
2021-02-05 15:51:15 +03:00
|
|
|
"github.com/ethereum/go-ethereum/node"
|
2017-04-12 17:27:23 +03:00
|
|
|
"github.com/ethereum/go-ethereum/params"
|
|
|
|
)
|
|
|
|
|
2021-02-05 15:51:15 +03:00
|
|
|
// FullNodeGPO contains default gasprice oracle settings for full node.
|
|
|
|
var FullNodeGPO = gasprice.Config{
|
2021-06-28 17:16:32 +03:00
|
|
|
Blocks: 20,
|
|
|
|
Percentile: 60,
|
2021-08-24 00:50:24 +03:00
|
|
|
MaxHeaderHistory: 1024,
|
|
|
|
MaxBlockHistory: 1024,
|
2021-06-28 17:16:32 +03:00
|
|
|
MaxPrice: gasprice.DefaultMaxPrice,
|
|
|
|
IgnorePrice: gasprice.DefaultIgnorePrice,
|
2020-07-03 15:50:35 +03:00
|
|
|
}
|
|
|
|
|
2021-02-05 15:51:15 +03:00
|
|
|
// LightClientGPO contains default gasprice oracle settings for light client.
|
|
|
|
var LightClientGPO = gasprice.Config{
|
2021-06-28 17:16:32 +03:00
|
|
|
Blocks: 2,
|
|
|
|
Percentile: 60,
|
|
|
|
MaxHeaderHistory: 300,
|
|
|
|
MaxBlockHistory: 5,
|
|
|
|
MaxPrice: gasprice.DefaultMaxPrice,
|
|
|
|
IgnorePrice: gasprice.DefaultIgnorePrice,
|
2020-07-03 15:50:35 +03:00
|
|
|
}
|
|
|
|
|
2021-02-05 15:51:15 +03:00
|
|
|
// Defaults contains default settings for use on the Ethereum main net.
|
|
|
|
var Defaults = Config{
|
2021-05-31 10:21:48 +03:00
|
|
|
SyncMode: downloader.SnapSync,
|
2017-11-24 17:10:27 +03:00
|
|
|
Ethash: ethash.Config{
|
2020-03-31 11:44:04 +03:00
|
|
|
CacheDir: "ethash",
|
|
|
|
CachesInMem: 2,
|
|
|
|
CachesOnDisk: 3,
|
|
|
|
CachesLockMmap: false,
|
|
|
|
DatasetsInMem: 1,
|
|
|
|
DatasetsOnDisk: 2,
|
|
|
|
DatasetsLockMmap: false,
|
2017-11-24 17:10:27 +03:00
|
|
|
},
|
2020-07-28 16:30:31 +03:00
|
|
|
NetworkId: 1,
|
2021-02-08 21:44:05 +03:00
|
|
|
TxLookupLimit: 2350000,
|
2020-07-28 16:30:31 +03:00
|
|
|
LightPeers: 100,
|
|
|
|
UltraLightFraction: 75,
|
|
|
|
DatabaseCache: 512,
|
2020-08-06 15:28:31 +03:00
|
|
|
TrieCleanCache: 154,
|
2020-07-28 16:30:31 +03:00
|
|
|
TrieCleanCacheJournal: "triecache",
|
|
|
|
TrieCleanCacheRejournal: 60 * time.Minute,
|
|
|
|
TrieDirtyCache: 256,
|
|
|
|
TrieTimeout: 60 * time.Minute,
|
2020-08-06 15:28:31 +03:00
|
|
|
SnapshotCache: 102,
|
2019-04-23 10:08:51 +03:00
|
|
|
Miner: miner.Config{
|
2022-04-12 08:48:03 +03:00
|
|
|
GasCeil: 30000000,
|
2019-04-23 10:08:51 +03:00
|
|
|
GasPrice: big.NewInt(params.GWei),
|
|
|
|
Recommit: 3 * time.Second,
|
|
|
|
},
|
2021-10-12 11:46:04 +03:00
|
|
|
TxPool: core.DefaultTxPoolConfig,
|
|
|
|
RPCGasCap: 50000000,
|
|
|
|
RPCEVMTimeout: 5 * time.Second,
|
|
|
|
GPO: FullNodeGPO,
|
|
|
|
RPCTxFeeCap: 1, // 1 ether
|
2017-04-12 17:27:23 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
func init() {
|
|
|
|
home := os.Getenv("HOME")
|
|
|
|
if home == "" {
|
|
|
|
if user, err := user.Current(); err == nil {
|
|
|
|
home = user.HomeDir
|
|
|
|
}
|
|
|
|
}
|
2019-02-19 14:15:15 +03:00
|
|
|
if runtime.GOOS == "darwin" {
|
2021-02-05 15:51:15 +03:00
|
|
|
Defaults.Ethash.DatasetDir = filepath.Join(home, "Library", "Ethash")
|
2019-02-19 14:15:15 +03:00
|
|
|
} else if runtime.GOOS == "windows" {
|
|
|
|
localappdata := os.Getenv("LOCALAPPDATA")
|
|
|
|
if localappdata != "" {
|
2021-02-05 15:51:15 +03:00
|
|
|
Defaults.Ethash.DatasetDir = filepath.Join(localappdata, "Ethash")
|
2019-02-19 14:15:15 +03:00
|
|
|
} else {
|
2021-02-05 15:51:15 +03:00
|
|
|
Defaults.Ethash.DatasetDir = filepath.Join(home, "AppData", "Local", "Ethash")
|
2019-02-19 14:15:15 +03:00
|
|
|
}
|
2017-04-12 17:27:23 +03:00
|
|
|
} else {
|
2021-02-05 15:51:15 +03:00
|
|
|
Defaults.Ethash.DatasetDir = filepath.Join(home, ".ethash")
|
2017-04-12 17:27:23 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-04-12 21:24:02 +03:00
|
|
|
//go:generate go run github.com/fjl/gencodec -type Config -formats toml -out gen_config.go
|
2017-04-12 17:27:23 +03:00
|
|
|
|
2021-02-05 15:51:15 +03:00
|
|
|
// Config contains configuration options for of the ETH and LES protocols.
|
2017-04-12 17:27:23 +03:00
|
|
|
type Config struct {
|
|
|
|
// The genesis block, which is inserted if the database is empty.
|
|
|
|
// If nil, the Ethereum main net block is used.
|
|
|
|
Genesis *core.Genesis `toml:",omitempty"`
|
|
|
|
|
|
|
|
// Protocol options
|
2017-04-25 14:31:15 +03:00
|
|
|
NetworkId uint64 // Network ID to use for selecting peers to connect to
|
2017-04-12 17:27:23 +03:00
|
|
|
SyncMode downloader.SyncMode
|
2019-04-01 11:52:11 +03:00
|
|
|
|
2020-02-13 16:38:30 +03:00
|
|
|
// This can be set to list of enrtree:// URLs which will be queried for
|
|
|
|
// for nodes to connect to.
|
2020-12-14 12:27:15 +03:00
|
|
|
EthDiscoveryURLs []string
|
|
|
|
SnapDiscoveryURLs []string
|
2020-02-13 16:38:30 +03:00
|
|
|
|
2019-04-01 11:52:11 +03:00
|
|
|
NoPruning bool // Whether to disable pruning and flush everything to disk
|
|
|
|
NoPrefetch bool // Whether to disable prefetching and only load state on demand
|
2017-04-12 17:27:23 +03:00
|
|
|
|
2020-05-11 18:58:43 +03:00
|
|
|
TxLookupLimit uint64 `toml:",omitempty"` // The maximum number of blocks from head whose tx indices are reserved.
|
|
|
|
|
2022-03-15 14:20:03 +03:00
|
|
|
// PeerRequiredBlocks is a set of block number -> hash mappings which must be in the
|
|
|
|
// canonical chain of all remote peers. Setting the option makes geth verify the
|
|
|
|
// presence of these blocks for every new peer connection.
|
|
|
|
PeerRequiredBlocks map[uint64]common.Hash `toml:"-"`
|
2018-11-02 23:26:45 +03:00
|
|
|
|
2017-04-12 17:27:23 +03:00
|
|
|
// Light client options
|
2021-01-19 12:52:45 +03:00
|
|
|
LightServ int `toml:",omitempty"` // Maximum percentage of time allowed for serving LES requests
|
|
|
|
LightIngress int `toml:",omitempty"` // Incoming bandwidth limit for light servers
|
|
|
|
LightEgress int `toml:",omitempty"` // Outgoing bandwidth limit for light servers
|
|
|
|
LightPeers int `toml:",omitempty"` // Maximum number of LES client peers
|
|
|
|
LightNoPrune bool `toml:",omitempty"` // Whether to disable light chain pruning
|
2021-02-25 15:55:07 +03:00
|
|
|
LightNoSyncServe bool `toml:",omitempty"` // Whether to serve light clients before syncing
|
2021-01-19 12:52:45 +03:00
|
|
|
SyncFromCheckpoint bool `toml:",omitempty"` // Whether to sync the header chain from the configured checkpoint
|
2019-01-24 14:18:26 +03:00
|
|
|
|
|
|
|
// Ultra Light client options
|
2019-07-09 20:30:24 +03:00
|
|
|
UltraLightServers []string `toml:",omitempty"` // List of trusted ultra light servers
|
|
|
|
UltraLightFraction int `toml:",omitempty"` // Percentage of trusted servers to accept an announcement
|
|
|
|
UltraLightOnlyAnnounce bool `toml:",omitempty"` // Whether to only announce headers, or also serve them
|
2017-04-12 17:27:23 +03:00
|
|
|
|
|
|
|
// Database options
|
|
|
|
SkipBcVersionCheck bool `toml:"-"`
|
|
|
|
DatabaseHandles int `toml:"-"`
|
|
|
|
DatabaseCache int
|
2019-03-08 16:56:20 +03:00
|
|
|
DatabaseFreezer string
|
2018-09-24 15:57:49 +03:00
|
|
|
|
2020-07-28 16:30:31 +03:00
|
|
|
TrieCleanCache int
|
|
|
|
TrieCleanCacheJournal string `toml:",omitempty"` // Disk journal directory for trie cache to survive node restarts
|
|
|
|
TrieCleanCacheRejournal time.Duration `toml:",omitempty"` // Time interval to regenerate the journal for clean cache
|
|
|
|
TrieDirtyCache int
|
|
|
|
TrieTimeout time.Duration
|
|
|
|
SnapshotCache int
|
2020-11-18 12:51:33 +03:00
|
|
|
Preimages bool
|
2017-04-12 17:27:23 +03:00
|
|
|
|
2019-04-23 10:08:51 +03:00
|
|
|
// Mining options
|
|
|
|
Miner miner.Config
|
2017-04-12 17:27:23 +03:00
|
|
|
|
|
|
|
// Ethash options
|
2017-11-24 17:10:27 +03:00
|
|
|
Ethash ethash.Config
|
2017-04-12 17:27:23 +03:00
|
|
|
|
2017-05-26 13:40:47 +03:00
|
|
|
// Transaction pool options
|
|
|
|
TxPool core.TxPoolConfig
|
|
|
|
|
2017-04-12 17:27:23 +03:00
|
|
|
// Gas Price Oracle options
|
|
|
|
GPO gasprice.Config
|
|
|
|
|
|
|
|
// Enables tracking of SHA3 preimages in the VM
|
|
|
|
EnablePreimageRecording bool
|
|
|
|
|
|
|
|
// Miscellaneous options
|
2017-11-24 17:10:27 +03:00
|
|
|
DocRoot string `toml:"-"`
|
2018-09-20 10:44:35 +03:00
|
|
|
|
2019-04-08 14:49:52 +03:00
|
|
|
// RPCGasCap is the global gas cap for eth-call variants.
|
2021-03-25 17:37:51 +03:00
|
|
|
RPCGasCap uint64
|
all: on-chain oracle checkpoint syncing (#19543)
* all: implement simple checkpoint syncing
cmd, les, node: remove callback mechanism
cmd, node: remove callback definition
les: simplify the registrar
les: expose checkpoint rpc services in the light client
les, light: don't store untrusted receipt
cmd, contracts, les: discard stale checkpoint
cmd, contracts/registrar: loose restriction of registeration
cmd, contracts: add replay-protection
all: off-chain multi-signature contract
params: deploy checkpoint contract for rinkeby
cmd/registrar: add raw signing mode for registrar
cmd/registrar, contracts/registrar, les: fixed messages
* cmd/registrar, contracts/registrar: fix lints
* accounts/abi/bind, les: address comments
* cmd, contracts, les, light, params: minor checkpoint sync cleanups
* cmd, eth, les, light: move checkpoint config to config file
* cmd, eth, les, params: address comments
* eth, les, params: address comments
* cmd: polish up the checkpoint admin CLI
* cmd, contracts, params: deploy new version contract
* cmd/checkpoint-admin: add another flag for clef mode signing
* cmd, contracts, les: rename and regen checkpoint oracle with abigen
2019-06-28 10:34:02 +03:00
|
|
|
|
2021-10-12 11:46:04 +03:00
|
|
|
// RPCEVMTimeout is the global timeout for eth-call.
|
|
|
|
RPCEVMTimeout time.Duration
|
|
|
|
|
2020-06-17 10:46:31 +03:00
|
|
|
// RPCTxFeeCap is the global transaction fee(price * gaslimit) cap for
|
|
|
|
// send-transction variants. The unit is ether.
|
2021-03-25 17:37:51 +03:00
|
|
|
RPCTxFeeCap float64
|
2020-06-17 10:46:31 +03:00
|
|
|
|
all: on-chain oracle checkpoint syncing (#19543)
* all: implement simple checkpoint syncing
cmd, les, node: remove callback mechanism
cmd, node: remove callback definition
les: simplify the registrar
les: expose checkpoint rpc services in the light client
les, light: don't store untrusted receipt
cmd, contracts, les: discard stale checkpoint
cmd, contracts/registrar: loose restriction of registeration
cmd, contracts: add replay-protection
all: off-chain multi-signature contract
params: deploy checkpoint contract for rinkeby
cmd/registrar: add raw signing mode for registrar
cmd/registrar, contracts/registrar, les: fixed messages
* cmd/registrar, contracts/registrar: fix lints
* accounts/abi/bind, les: address comments
* cmd, contracts, les, light, params: minor checkpoint sync cleanups
* cmd, eth, les, light: move checkpoint config to config file
* cmd, eth, les, params: address comments
* eth, les, params: address comments
* cmd: polish up the checkpoint admin CLI
* cmd, contracts, params: deploy new version contract
* cmd/checkpoint-admin: add another flag for clef mode signing
* cmd, contracts, les: rename and regen checkpoint oracle with abigen
2019-06-28 10:34:02 +03:00
|
|
|
// Checkpoint is a hardcoded checkpoint which can be nil.
|
2019-07-11 14:37:08 +03:00
|
|
|
Checkpoint *params.TrustedCheckpoint `toml:",omitempty"`
|
all: on-chain oracle checkpoint syncing (#19543)
* all: implement simple checkpoint syncing
cmd, les, node: remove callback mechanism
cmd, node: remove callback definition
les: simplify the registrar
les: expose checkpoint rpc services in the light client
les, light: don't store untrusted receipt
cmd, contracts, les: discard stale checkpoint
cmd, contracts/registrar: loose restriction of registeration
cmd, contracts: add replay-protection
all: off-chain multi-signature contract
params: deploy checkpoint contract for rinkeby
cmd/registrar: add raw signing mode for registrar
cmd/registrar, contracts/registrar, les: fixed messages
* cmd/registrar, contracts/registrar: fix lints
* accounts/abi/bind, les: address comments
* cmd, contracts, les, light, params: minor checkpoint sync cleanups
* cmd, eth, les, light: move checkpoint config to config file
* cmd, eth, les, params: address comments
* eth, les, params: address comments
* cmd: polish up the checkpoint admin CLI
* cmd, contracts, params: deploy new version contract
* cmd/checkpoint-admin: add another flag for clef mode signing
* cmd, contracts, les: rename and regen checkpoint oracle with abigen
2019-06-28 10:34:02 +03:00
|
|
|
|
|
|
|
// CheckpointOracle is the configuration for checkpoint oracle.
|
2019-07-11 14:37:08 +03:00
|
|
|
CheckpointOracle *params.CheckpointOracleConfig `toml:",omitempty"`
|
2021-02-25 10:10:30 +03:00
|
|
|
|
2021-10-28 23:18:14 +03:00
|
|
|
// Arrow Glacier block override (TODO: remove after the fork)
|
|
|
|
OverrideArrowGlacier *big.Int `toml:",omitempty"`
|
all: core rework for the merge transition (#23761)
* all: work for eth1/2 transtition
* consensus/beacon, eth: change beacon difficulty to 0
* eth: updates
* all: add terminalBlockDifficulty config, fix rebasing issues
* eth: implemented merge interop spec
* internal/ethapi: update to v1.0.0.alpha.2
This commit updates the code to the new spec, moving payloadId into
it's own object. It also fixes an issue with finalizing an empty blockhash.
It also properly sets the basefee
* all: sync polishes, other fixes + refactors
* core, eth: correct semantics for LeavePoW, EnterPoS
* core: fixed rebasing artifacts
* core: light: performance improvements
* core: use keyed field (f)
* core: eth: fix compilation issues + tests
* eth/catalyst: dbetter error codes
* all: move Merger to consensus/, remove reliance on it in bc
* all: renamed EnterPoS and LeavePoW to ReachTDD and FinalizePoS
* core: make mergelogs a function
* core: use InsertChain instead of InsertBlock
* les: drop merger from lightchain object
* consensus: add merger
* core: recoverAncestors in catalyst mode
* core: fix nitpick
* all: removed merger from beacon, use TTD, nitpicks
* consensus: eth: add docstring, removed unnecessary code duplication
* consensus/beacon: better comment
* all: easy to fix nitpicks by karalabe
* consensus/beacon: verify known headers to be sure
* core: comments
* core: eth: don't drop peers who advertise blocks, nitpicks
* core: never add beacon blocks to the future queue
* core: fixed nitpicks
* consensus/beacon: simplify IsTTDReached check
* consensus/beacon: correct IsTTDReached check
Co-authored-by: rjl493456442 <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
2021-11-26 14:23:02 +03:00
|
|
|
|
|
|
|
// OverrideTerminalTotalDifficulty (TODO: remove after the fork)
|
|
|
|
OverrideTerminalTotalDifficulty *big.Int `toml:",omitempty"`
|
2017-04-12 17:27:23 +03:00
|
|
|
}
|
2021-02-05 15:51:15 +03:00
|
|
|
|
|
|
|
// CreateConsensusEngine creates a consensus engine for the given chain configuration.
|
|
|
|
func CreateConsensusEngine(stack *node.Node, chainConfig *params.ChainConfig, config *ethash.Config, notify []string, noverify bool, db ethdb.Database) consensus.Engine {
|
|
|
|
// If proof-of-authority is requested, set it up
|
all: core rework for the merge transition (#23761)
* all: work for eth1/2 transtition
* consensus/beacon, eth: change beacon difficulty to 0
* eth: updates
* all: add terminalBlockDifficulty config, fix rebasing issues
* eth: implemented merge interop spec
* internal/ethapi: update to v1.0.0.alpha.2
This commit updates the code to the new spec, moving payloadId into
it's own object. It also fixes an issue with finalizing an empty blockhash.
It also properly sets the basefee
* all: sync polishes, other fixes + refactors
* core, eth: correct semantics for LeavePoW, EnterPoS
* core: fixed rebasing artifacts
* core: light: performance improvements
* core: use keyed field (f)
* core: eth: fix compilation issues + tests
* eth/catalyst: dbetter error codes
* all: move Merger to consensus/, remove reliance on it in bc
* all: renamed EnterPoS and LeavePoW to ReachTDD and FinalizePoS
* core: make mergelogs a function
* core: use InsertChain instead of InsertBlock
* les: drop merger from lightchain object
* consensus: add merger
* core: recoverAncestors in catalyst mode
* core: fix nitpick
* all: removed merger from beacon, use TTD, nitpicks
* consensus: eth: add docstring, removed unnecessary code duplication
* consensus/beacon: better comment
* all: easy to fix nitpicks by karalabe
* consensus/beacon: verify known headers to be sure
* core: comments
* core: eth: don't drop peers who advertise blocks, nitpicks
* core: never add beacon blocks to the future queue
* core: fixed nitpicks
* consensus/beacon: simplify IsTTDReached check
* consensus/beacon: correct IsTTDReached check
Co-authored-by: rjl493456442 <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
2021-11-26 14:23:02 +03:00
|
|
|
var engine consensus.Engine
|
2021-02-05 15:51:15 +03:00
|
|
|
if chainConfig.Clique != nil {
|
all: core rework for the merge transition (#23761)
* all: work for eth1/2 transtition
* consensus/beacon, eth: change beacon difficulty to 0
* eth: updates
* all: add terminalBlockDifficulty config, fix rebasing issues
* eth: implemented merge interop spec
* internal/ethapi: update to v1.0.0.alpha.2
This commit updates the code to the new spec, moving payloadId into
it's own object. It also fixes an issue with finalizing an empty blockhash.
It also properly sets the basefee
* all: sync polishes, other fixes + refactors
* core, eth: correct semantics for LeavePoW, EnterPoS
* core: fixed rebasing artifacts
* core: light: performance improvements
* core: use keyed field (f)
* core: eth: fix compilation issues + tests
* eth/catalyst: dbetter error codes
* all: move Merger to consensus/, remove reliance on it in bc
* all: renamed EnterPoS and LeavePoW to ReachTDD and FinalizePoS
* core: make mergelogs a function
* core: use InsertChain instead of InsertBlock
* les: drop merger from lightchain object
* consensus: add merger
* core: recoverAncestors in catalyst mode
* core: fix nitpick
* all: removed merger from beacon, use TTD, nitpicks
* consensus: eth: add docstring, removed unnecessary code duplication
* consensus/beacon: better comment
* all: easy to fix nitpicks by karalabe
* consensus/beacon: verify known headers to be sure
* core: comments
* core: eth: don't drop peers who advertise blocks, nitpicks
* core: never add beacon blocks to the future queue
* core: fixed nitpicks
* consensus/beacon: simplify IsTTDReached check
* consensus/beacon: correct IsTTDReached check
Co-authored-by: rjl493456442 <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
2021-11-26 14:23:02 +03:00
|
|
|
engine = clique.New(chainConfig.Clique, db)
|
|
|
|
} else {
|
|
|
|
switch config.PowMode {
|
|
|
|
case ethash.ModeFake:
|
|
|
|
log.Warn("Ethash used in fake mode")
|
|
|
|
case ethash.ModeTest:
|
|
|
|
log.Warn("Ethash used in test mode")
|
|
|
|
case ethash.ModeShared:
|
|
|
|
log.Warn("Ethash used in shared mode")
|
|
|
|
}
|
|
|
|
engine = ethash.New(ethash.Config{
|
|
|
|
PowMode: config.PowMode,
|
|
|
|
CacheDir: stack.ResolvePath(config.CacheDir),
|
|
|
|
CachesInMem: config.CachesInMem,
|
|
|
|
CachesOnDisk: config.CachesOnDisk,
|
|
|
|
CachesLockMmap: config.CachesLockMmap,
|
|
|
|
DatasetDir: config.DatasetDir,
|
|
|
|
DatasetsInMem: config.DatasetsInMem,
|
|
|
|
DatasetsOnDisk: config.DatasetsOnDisk,
|
|
|
|
DatasetsLockMmap: config.DatasetsLockMmap,
|
|
|
|
NotifyFull: config.NotifyFull,
|
|
|
|
}, notify, noverify)
|
|
|
|
engine.(*ethash.Ethash).SetThreads(-1) // Disable CPU mining
|
2021-02-05 15:51:15 +03:00
|
|
|
}
|
all: core rework for the merge transition (#23761)
* all: work for eth1/2 transtition
* consensus/beacon, eth: change beacon difficulty to 0
* eth: updates
* all: add terminalBlockDifficulty config, fix rebasing issues
* eth: implemented merge interop spec
* internal/ethapi: update to v1.0.0.alpha.2
This commit updates the code to the new spec, moving payloadId into
it's own object. It also fixes an issue with finalizing an empty blockhash.
It also properly sets the basefee
* all: sync polishes, other fixes + refactors
* core, eth: correct semantics for LeavePoW, EnterPoS
* core: fixed rebasing artifacts
* core: light: performance improvements
* core: use keyed field (f)
* core: eth: fix compilation issues + tests
* eth/catalyst: dbetter error codes
* all: move Merger to consensus/, remove reliance on it in bc
* all: renamed EnterPoS and LeavePoW to ReachTDD and FinalizePoS
* core: make mergelogs a function
* core: use InsertChain instead of InsertBlock
* les: drop merger from lightchain object
* consensus: add merger
* core: recoverAncestors in catalyst mode
* core: fix nitpick
* all: removed merger from beacon, use TTD, nitpicks
* consensus: eth: add docstring, removed unnecessary code duplication
* consensus/beacon: better comment
* all: easy to fix nitpicks by karalabe
* consensus/beacon: verify known headers to be sure
* core: comments
* core: eth: don't drop peers who advertise blocks, nitpicks
* core: never add beacon blocks to the future queue
* core: fixed nitpicks
* consensus/beacon: simplify IsTTDReached check
* consensus/beacon: correct IsTTDReached check
Co-authored-by: rjl493456442 <garyrong0905@gmail.com>
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
2021-11-26 14:23:02 +03:00
|
|
|
return beacon.New(engine)
|
2021-02-05 15:51:15 +03:00
|
|
|
}
|