mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2024-12-23 12:07:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

integration - to use same blockchain config as production (#727)

Browse Source
This commit is contained in:
Alex Sharov 2020-07-09 19:54:10 +07:00 committed by GitHub
parent 5f77570556
commit 686f186545
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/integration/stages.go
View File

@ -7,7 +7,7 @@ import (
"github.com/ledgerwatch/turbo-geth/consensus/ethash"
"github.com/ledgerwatch/turbo-geth/core"
"github.com/ledgerwatch/turbo-geth/core/vm"
"github.com/ledgerwatch/turbo-geth/eth"
"github.com/ledgerwatch/turbo-geth/eth/stagedsync"
"github.com/ledgerwatch/turbo-geth/eth/stagedsync/stages"
"github.com/ledgerwatch/turbo-geth/ethdb"
@ -198,15 +198,18 @@ func stage4(ctx context.Context) error {
// TODO
}
blockchain, err := newBlockChain(db)
if err != nil {
return err
}
stage4 := progress(db, stages.Execution)
log.Info("Stage4", "progress", stage4.BlockNumber)
ch := ctx.Done()
blockchain, _ := core.NewBlockChain(db, nil, params.MainnetChainConfig, ethash.NewFaker(), vm.Config{}, nil, nil, nil)
if unwind > 0 {
u := &stagedsync.UnwindState{Stage: stages.Execution, UnwindPoint: stage4.BlockNumber - unwind}
return stagedsync.UnwindExecutionStage(u, stage4, db)
}
return stagedsync.SpawnExecuteBlocksStage(stage4, db, blockchain, block, ch, nil, false)
return stagedsync.SpawnExecuteBlocksStage(stage4, db, blockchain, block, ch, blockchain.DestsCache, false)
}
func stage5(ctx context.Context) error {
@ -320,3 +323,13 @@ func printAllStages(_ context.Context) error {
return printStages(db)
}
func newBlockChain(db ethdb.Database) (*core.BlockChain, error) {
config := eth.DefaultConfig
chainConfig, _, _, err := core.SetupGenesisBlock(db, config.Genesis, config.StorageMode.History)
if err != nil {
return nil, err
}
vmConfig, cacheConfig, dests := eth.BlockchainRuntimeConfig(&config)
return core.NewBlockChain(db, cacheConfig, chainConfig, ethash.NewFaker(), vmConfig, nil, &config.TxLookupLimit, dests)
}

5
cmd/integration/state_stages.go
View File

@ -4,14 +4,11 @@ import (
"context"
"fmt"
"github.com/ledgerwatch/turbo-geth/consensus/ethash"
"github.com/ledgerwatch/turbo-geth/core"
"github.com/ledgerwatch/turbo-geth/core/vm"
"github.com/ledgerwatch/turbo-geth/eth/stagedsync"
"github.com/ledgerwatch/turbo-geth/eth/stagedsync/stages"
"github.com/ledgerwatch/turbo-geth/ethdb"
"github.com/ledgerwatch/turbo-geth/log"
"github.com/ledgerwatch/turbo-geth/params"
"github.com/spf13/cobra"
)
@ -48,7 +45,7 @@ func syncBySmallSteps(ctx context.Context, chaindata string) error {
core.UsePlainStateExecution = true
db := ethdb.MustOpen(chaindata)
defer db.Close()
blockchain, err := core.NewBlockChain(db, nil, params.MainnetChainConfig, ethash.NewFaker(), vm.Config{}, nil, nil, nil)
blockchain, err := newBlockChain(db)
if err != nil {
return err
}

47
eth/backend.go
View File

@ -217,28 +217,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
return nil, err
}
var (
vmConfig = vm.Config{
EnablePreimageRecording: config.EnablePreimageRecording,
EWASMInterpreter: config.EWASMInterpreter,
EVMInterpreter: config.EVMInterpreter,
}
cacheConfig = &core.CacheConfig{
Pruning: config.Pruning,
BlocksBeforePruning: config.BlocksBeforePruning,
BlocksToPrune: config.BlocksToPrune,
PruneTimeout: config.PruningTimeout,
TrieCleanLimit: config.TrieCleanCache,
TrieCleanNoPrefetch: config.NoPrefetch,
TrieDirtyLimit: config.TrieDirtyCache,
TrieTimeLimit: config.TrieTimeout,
DownloadOnly: config.DownloadOnly,
NoHistory: !config.StorageMode.History,
ArchiveSyncInterval: uint64(config.ArchiveSyncInterval),
}
)
dests := vm.NewDestsCache(50000)
vmConfig, cacheConfig, dests := BlockchainRuntimeConfig(config)
eth.blockchain, err = core.NewBlockChain(chainDb, cacheConfig, chainConfig, eth.engine, vmConfig, eth.shouldPreserve, &config.TxLookupLimit, dests)
if err != nil {
return nil, err
@ -310,6 +289,30 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
return eth, nil
}
func BlockchainRuntimeConfig(config *Config) (vm.Config, *core.CacheConfig, *vm.DestsCache) {
var (
vmConfig = vm.Config{
EnablePreimageRecording: config.EnablePreimageRecording,
EWASMInterpreter: config.EWASMInterpreter,
EVMInterpreter: config.EVMInterpreter,
}
cacheConfig = &core.CacheConfig{
Pruning: config.Pruning,
BlocksBeforePruning: config.BlocksBeforePruning,
BlocksToPrune: config.BlocksToPrune,
PruneTimeout: config.PruningTimeout,
TrieCleanLimit: config.TrieCleanCache,
TrieCleanNoPrefetch: config.NoPrefetch,
TrieDirtyLimit: config.TrieDirtyCache,
TrieTimeLimit: config.TrieTimeout,
DownloadOnly: config.DownloadOnly,
NoHistory: !config.StorageMode.History,
ArchiveSyncInterval: uint64(config.ArchiveSyncInterval),
}
)
return vmConfig, cacheConfig, vm.NewDestsCache(50000)
}
func makeExtraData(extra []byte) []byte {
if len(extra) == 0 {
// create default extradata