forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

dev: fix: CreateConsensusEngine for new ethereum objects

Browse source
This commit is contained in:
marcello33 2023-06-13 15:11:08 +02:00
parent dda0d1163f
commit df106e64df
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/vm/interpreter.go
View file

@ -78,7 +78,7 @@ type EVMInterpreter struct {
returnData []byte // Last CALL's return data for subsequent reuse
}
// TxCacher is an wrapper of lru.cache for caching transactions that get interrupted
// TxCache is a wrapper of lru.cache for caching transactions that get interrupted
type TxCache struct {
Cache *lru.Cache
}

20
eth/backend.go
View file

@ -21,6 +21,7 @@ import (
"context"
"errors"
"fmt"
"github.com/ethereum/go-ethereum/trie"
"math/big"
"runtime"
"sync"
@ -181,9 +182,19 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
}
ethereum.APIBackend.gpo = gasprice.NewOracle(ethereum.APIBackend, gpoParams)
// Override the chain config with provided settings.
var overrides core.ChainOverrides
if config.OverrideShanghai != nil {
overrides.OverrideShanghai = config.OverrideShanghai
}
chainConfig, _, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, trie.NewDatabase(chainDb), config.Genesis, &overrides)
if _, isCompat := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !isCompat {
return nil, genesisErr
}
blockChainAPI := ethapi.NewBlockChainAPI(ethereum.APIBackend)
// TODO marcello fix configs (using nil atm)
engine := ethconfig.CreateConsensusEngine(stack, nil, nil, &ethashConfig, cliqueConfig, config.Miner.Notify, config.Miner.Noverify, chainDb, nil)
engine := ethconfig.CreateConsensusEngine(stack, chainConfig, config, &ethashConfig, cliqueConfig, config.Miner.Notify, config.Miner.Noverify, chainDb, blockChainAPI)
ethereum.engine = engine
// END: Bor changes
@ -223,11 +234,6 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
TriesInMemory: config.TriesInMemory,
}
)
// Override the chain config with provided settings.
var overrides core.ChainOverrides
if config.OverrideShanghai != nil {
overrides.OverrideShanghai = config.OverrideShanghai
}
checker := whitelist.NewService(10)