diff --git a/core/state/snapshot/account.go b/core/state/snapshot/account.go index 1068dc2a01..d2e0fd00a4 100644 --- a/core/state/snapshot/account.go +++ b/core/state/snapshot/account.go @@ -52,3 +52,30 @@ func AccountRLP(nonce uint64, balance *big.Int, root common.Hash, codehash []byt } return data } + +// conversionAccount is used for converting between full and slim format. When +// doing this, we can consider 'balance' as a byte array, as it has already +// been converted from big.Int into an rlp-byteslice. +type conversionAccount struct { + Nonce uint64 + Balance []byte + Root []byte + CodeHash []byte +} + +// SlimToFull converts data on the 'slim RLP' format into the full RLP-format +func SlimToFull(data []byte) []byte { + acc := &conversionAccount{} + rlp.DecodeBytes(data, acc) + if len(acc.Root) == 0 { + acc.Root = emptyRoot[:] + } + if len(acc.CodeHash) == 0 { + acc.CodeHash = emptyCode[:] + } + fullData, err := rlp.EncodeToBytes(acc) + if err != nil { + panic(err) + } + return fullData +} diff --git a/core/state/snapshot/conversion.go b/core/state/snapshot/conversion.go new file mode 100644 index 0000000000..5d7893a537 --- /dev/null +++ b/core/state/snapshot/conversion.go @@ -0,0 +1,84 @@ +// Copyright 2020 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with the go-ethereum library. If not, see . + +package snapshot + +import ( + "sync" + "time" + + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/ethereum/go-ethereum/log" + "github.com/ethereum/go-ethereum/trie" +) + +type leaf struct { + key common.Hash + value []byte +} + +type trieGeneratorFn func(in chan (leaf), out chan (common.Hash)) + +// GenerateTrieRoot takes an account iterator and reproduces the root hash. +func GenerateTrieRoot(it AccountIterator) common.Hash { + return generateTrieRoot(it, StdGenerate) +} + +func generateTrieRoot(it AccountIterator, generatorFn trieGeneratorFn) common.Hash { + var ( + in = make(chan leaf) // chan to pass leaves + out = make(chan common.Hash) // chan to collect result + wg sync.WaitGroup + ) + wg.Add(1) + go func() { + generatorFn(in, out) + wg.Done() + }() + // Feed leaves + start := time.Now() + logged := time.Now() + accounts := 0 + for it.Next() { + slimData := it.Account() + + fullData := SlimToFull(slimData) + l := leaf{it.Hash(), fullData} + in <- l + if time.Since(logged) > 8*time.Second { + log.Info("Generating trie hash from snapshot", + "at", l.key, "accounts", accounts, "elapsed", time.Since(start)) + logged = time.Now() + } + accounts++ + } + close(in) + result := <-out + log.Info("Generated trie hash from snapshot", "accounts", accounts, "elapsed", time.Since(start)) + wg.Wait() + return result +} + +// StdGenerate is a very basic hexary trie builder which uses the same Trie +// as the rest of geth, with no enhancements or optimizations +func StdGenerate(in chan (leaf), out chan (common.Hash)) { + t, _ := trie.New(common.Hash{}, trie.NewDatabase(memorydb.New())) + for leaf := range in { + t.TryUpdate(leaf.key[:], leaf.value) + } + out <- t.Hash() +}