forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-11 06:23:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: create engine before blochain

Browse source
This commit is contained in:
Jaynti Kanani 2020-11-14 14:52:27 +05:30
parent 2f79768ad0
commit 7319922ad5
No known key found for this signature in database
GPG key ID: 4396982C976BAE5E
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
eth/backend.go
View file

@ -140,6 +140,19 @@ func New(stack *node.Node, config *Config) (*Ethereum, error) {
p2pServer: stack.Server(), p2pServer: stack.Server(),
} }
// START: Bor changes
eth.APIBackend = &EthAPIBackend{stack.Config().ExtRPCEnabled(), eth, nil}
gpoParams := config.GPO
if gpoParams.Default == nil {
gpoParams.Default = config.Miner.GasPrice
}
eth.APIBackend.gpo = gasprice.NewOracle(eth.APIBackend, gpoParams)
// create eth api and set engine
ethAPI := ethapi.NewPublicBlockChainAPI(eth.APIBackend)
eth.engine = CreateConsensusEngine(stack, chainConfig, config, chainDb, ethAPI)
// END: Bor changes
bcVersion := rawdb.ReadDatabaseVersion(chainDb) bcVersion := rawdb.ReadDatabaseVersion(chainDb)
var dbVer = "<nil>" var dbVer = "<nil>"
if bcVersion != nil { if bcVersion != nil {
@ -176,6 +189,8 @@ func New(stack *node.Node, config *Config) (*Ethereum, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
eth.engine.VerifyHeader(eth.blockchain, eth.blockchain.CurrentHeader(), true) // TODO think on it
// Rewind the chain in case of an incompatible config upgrade. // Rewind the chain in case of an incompatible config upgrade.
if compat, ok := genesisErr.(*params.ConfigCompatError); ok { if compat, ok := genesisErr.(*params.ConfigCompatError); ok {
log.Warn("Rewinding chain to upgrade configuration", "err", compat) log.Warn("Rewinding chain to upgrade configuration", "err", compat)
@ -201,17 +216,6 @@ func New(stack *node.Node, config *Config) (*Ethereum, error) {
eth.miner = miner.New(eth, &config.Miner, chainConfig, eth.EventMux(), eth.engine, eth.isLocalBlock) eth.miner = miner.New(eth, &config.Miner, chainConfig, eth.EventMux(), eth.engine, eth.isLocalBlock)
eth.miner.SetExtra(makeExtraData(config.Miner.ExtraData)) eth.miner.SetExtra(makeExtraData(config.Miner.ExtraData))
eth.APIBackend = &EthAPIBackend{stack.Config().ExtRPCEnabled(), eth, nil}
gpoParams := config.GPO
if gpoParams.Default == nil {
gpoParams.Default = config.Miner.GasPrice
}
eth.APIBackend.gpo = gasprice.NewOracle(eth.APIBackend, gpoParams)
// create eth api and set engine
ethAPI := ethapi.NewPublicBlockChainAPI(eth.APIBackend)
eth.engine = CreateConsensusEngine(stack, chainConfig, config, chainDb, ethAPI)
eth.dialCandidates, err = eth.setupDiscovery(&stack.Config().P2P) eth.dialCandidates, err = eth.setupDiscovery(&stack.Config().P2P)
if err != nil { if err != nil {
return nil, err return nil, err
@ -232,7 +236,7 @@ func makeExtraData(extra []byte) []byte {
// create default extradata // create default extradata
extra, _ = rlp.EncodeToBytes([]interface{}{ extra, _ = rlp.EncodeToBytes([]interface{}{
uint(params.VersionMajor<<16 | params.VersionMinor<<8 | params.VersionPatch), uint(params.VersionMajor<<16 | params.VersionMinor<<8 | params.VersionPatch),
"geth", "bor",
runtime.Version(), runtime.Version(),
runtime.GOOS, runtime.GOOS,
}) })
@ -559,3 +563,12 @@ func (s *Ethereum) Stop() error {
s.eventMux.Stop() s.eventMux.Stop()
return nil return nil
} }
//
// Bor related methods
//
// SetBlockchain set blockchain while testing
func (s *Ethereum) SetBlockchain(blockchain *core.BlockChain) {
s.blockchain = blockchain
}