Add --noverify flag to /cmd/state to skip roots check. (#205)

This commit is contained in:
Igor Mandrigin 2019-11-27 14:52:22 +01:00 committed by GitHub
parent 84285a5ab1
commit ebae2fe281
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 4 deletions

View File

@ -13,6 +13,7 @@ var (
snapshotInterval uint64 snapshotInterval uint64
snapshotFrom uint64 snapshotFrom uint64
witnessInterval uint64 witnessInterval uint64
noverify bool
) )
func init() { func init() {
@ -26,6 +27,7 @@ func init() {
statelessCmd.Flags().Uint64Var(&snapshotInterval, "snapshotInterval", 0, "how often to take snapshots (0 - never, 1 - every block, 1000 - every 1000th block, etc)") statelessCmd.Flags().Uint64Var(&snapshotInterval, "snapshotInterval", 0, "how often to take snapshots (0 - never, 1 - every block, 1000 - every 1000th block, etc)")
statelessCmd.Flags().Uint64Var(&snapshotFrom, "snapshotFrom", 0, "from which block to start snapshots") statelessCmd.Flags().Uint64Var(&snapshotFrom, "snapshotFrom", 0, "from which block to start snapshots")
statelessCmd.Flags().Uint64Var(&witnessInterval, "witnessInterval", 1, "after which block to extract witness (put a large number like 10000000 to disable)") statelessCmd.Flags().Uint64Var(&witnessInterval, "witnessInterval", 1, "after which block to extract witness (put a large number like 10000000 to disable)")
statelessCmd.Flags().BoolVar(&noverify, "noVerify", false, "skip snapshot verification on loading")
rootCmd.AddCommand(statelessCmd) rootCmd.AddCommand(statelessCmd)
@ -40,7 +42,19 @@ var statelessCmd = &cobra.Command{
return ethdb.NewBoltDatabase(path) return ethdb.NewBoltDatabase(path)
} }
stateless.Stateless(block, chaindata, statefile, triesize, preroot, snapshotInterval, snapshotFrom, witnessInterval, statsfile, createDb) stateless.Stateless(
block,
chaindata,
statefile,
triesize,
preroot,
snapshotInterval,
snapshotFrom,
witnessInterval,
statsfile,
!noverify,
createDb,
)
return nil return nil
}, },

View File

@ -79,6 +79,7 @@ func Stateless(
ignoreOlderThan uint64, ignoreOlderThan uint64,
witnessThreshold uint64, witnessThreshold uint64,
statsfile string, statsfile string,
verifySnapshot bool,
createDb CreateDbFunc) { createDb CreateDbFunc) {
state.MaxTrieCacheGen = triesize state.MaxTrieCacheGen = triesize
@ -116,13 +117,16 @@ func Stateless(
check(err) check(err)
preRoot = genesisBlock.Header().Root preRoot = genesisBlock.Header().Root
} else { } else {
//load_snapshot(db, fmt.Sprintf("/Volumes/tb4/turbo-geth-copy/state_%d", blockNum-1))
//loadCodes(db, ethDb)
block := bcb.GetBlockByNumber(blockNum - 1) block := bcb.GetBlockByNumber(blockNum - 1)
fmt.Printf("Block number: %d\n", blockNum-1) fmt.Printf("Block number: %d\n", blockNum-1)
fmt.Printf("Block root hash: %x\n", block.Root()) fmt.Printf("Block root hash: %x\n", block.Root())
preRoot = block.Root() preRoot = block.Root()
if verifySnapshot {
fmt.Println("Verifying snapshot..")
checkRoots(stateDb, preRoot, blockNum-1) checkRoots(stateDb, preRoot, blockNum-1)
fmt.Println("Verifying snapshot... OK")
}
} }
batch := stateDb.NewBatch() batch := stateDb.NewBatch()
defer func() { defer func() {