forked from cerc-io/plugeth
cmd/utils: utilize beacon wrapper in makechain (#24620)
* cmd/utils: utilize beacon wrapper in makechain * cmd/utils: fix fake-pow to also be wrapped in beacon * consensus/misc: correct error message
This commit is contained in:
parent
1f5943e4f9
commit
c3a5054c27
@ -38,7 +38,6 @@ import (
|
||||
"github.com/ethereum/go-ethereum/common"
|
||||
"github.com/ethereum/go-ethereum/common/fdlimit"
|
||||
"github.com/ethereum/go-ethereum/consensus"
|
||||
"github.com/ethereum/go-ethereum/consensus/clique"
|
||||
"github.com/ethereum/go-ethereum/consensus/ethash"
|
||||
"github.com/ethereum/go-ethereum/core"
|
||||
"github.com/ethereum/go-ethereum/core/rawdb"
|
||||
@ -1968,24 +1967,13 @@ func MakeChain(ctx *cli.Context, stack *node.Node) (chain *core.BlockChain, chai
|
||||
if err != nil {
|
||||
Fatalf("%v", err)
|
||||
}
|
||||
|
||||
var engine consensus.Engine
|
||||
if config.Clique != nil {
|
||||
engine = clique.New(config.Clique, chainDb)
|
||||
} else {
|
||||
engine = ethash.NewFaker()
|
||||
if !ctx.GlobalBool(FakePoWFlag.Name) {
|
||||
engine = ethash.New(ethash.Config{
|
||||
CacheDir: stack.ResolvePath(ethconfig.Defaults.Ethash.CacheDir),
|
||||
CachesInMem: ethconfig.Defaults.Ethash.CachesInMem,
|
||||
CachesOnDisk: ethconfig.Defaults.Ethash.CachesOnDisk,
|
||||
CachesLockMmap: ethconfig.Defaults.Ethash.CachesLockMmap,
|
||||
DatasetDir: stack.ResolvePath(ethconfig.Defaults.Ethash.DatasetDir),
|
||||
DatasetsInMem: ethconfig.Defaults.Ethash.DatasetsInMem,
|
||||
DatasetsOnDisk: ethconfig.Defaults.Ethash.DatasetsOnDisk,
|
||||
DatasetsLockMmap: ethconfig.Defaults.Ethash.DatasetsLockMmap,
|
||||
}, nil, false)
|
||||
}
|
||||
ethashConf := ethconfig.Defaults.Ethash
|
||||
if ctx.GlobalBool(FakePoWFlag.Name) {
|
||||
ethashConf.PowMode = ethash.ModeFake
|
||||
}
|
||||
engine = ethconfig.CreateConsensusEngine(stack, config, ðashConf, nil, false, chainDb)
|
||||
if gcmode := ctx.GlobalString(GCModeFlag.Name); gcmode != "full" && gcmode != "archive" {
|
||||
Fatalf("--%s must be either 'full' or 'archive'", GCModeFlag.Name)
|
||||
}
|
||||
|
@ -46,7 +46,7 @@ func VerifyEip1559Header(config *params.ChainConfig, parent, header *types.Heade
|
||||
expectedBaseFee := CalcBaseFee(config, parent)
|
||||
if header.BaseFee.Cmp(expectedBaseFee) != 0 {
|
||||
return fmt.Errorf("invalid baseFee: have %s, want %s, parentBaseFee %s, parentGasUsed %d",
|
||||
expectedBaseFee, header.BaseFee, parent.BaseFee, parent.GasUsed)
|
||||
header.BaseFee, expectedBaseFee, parent.BaseFee, parent.GasUsed)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user