2020-09-04 16:50:49 +00:00
|
|
|
// Copyright 2019 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 <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
// Contains a batch of utility type declarations used by the tests. As the node
|
|
|
|
// operates on unique types, a lot of them are needed to check various features.
|
|
|
|
|
|
|
|
package statediff
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
|
|
|
"fmt"
|
2020-09-15 06:03:46 +00:00
|
|
|
"math/bits"
|
2020-11-08 23:25:22 +00:00
|
|
|
"sync"
|
2020-09-04 16:50:49 +00:00
|
|
|
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
|
|
"github.com/ethereum/go-ethereum/core/state"
|
|
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
|
|
"github.com/ethereum/go-ethereum/log"
|
|
|
|
"github.com/ethereum/go-ethereum/rlp"
|
2020-11-17 01:37:36 +00:00
|
|
|
sd "github.com/ethereum/go-ethereum/statediff"
|
2021-10-14 06:47:38 +00:00
|
|
|
sdtrie "github.com/ethereum/go-ethereum/statediff/trie"
|
2020-11-17 01:37:36 +00:00
|
|
|
sdtypes "github.com/ethereum/go-ethereum/statediff/types"
|
2021-10-14 06:47:38 +00:00
|
|
|
"github.com/ethereum/go-ethereum/trie"
|
|
|
|
|
2020-11-08 23:25:22 +00:00
|
|
|
iter "github.com/vulcanize/go-eth-state-node-iterator"
|
2020-09-04 16:50:49 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
var (
|
|
|
|
nullHashBytes = common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000000")
|
|
|
|
emptyNode, _ = rlp.EncodeToBytes([]byte{})
|
|
|
|
emptyContractRoot = crypto.Keccak256Hash(emptyNode)
|
2020-11-08 23:25:22 +00:00
|
|
|
nullCodeHash = crypto.Keccak256Hash([]byte{}).Bytes()
|
2020-09-04 16:50:49 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
// Builder interface exposes the method for building a state diff between two blocks
|
|
|
|
type Builder interface {
|
2020-11-17 01:37:36 +00:00
|
|
|
BuildStateDiffObject(args sd.Args, params sd.Params) (sd.StateObject, error)
|
|
|
|
BuildStateTrieObject(current *types.Block) (sd.StateObject, error)
|
|
|
|
WriteStateDiffObject(args sd.StateRoots, params sd.Params, output sdtypes.StateNodeSink, codeOutput sdtypes.CodeSink) error
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
type builder struct {
|
|
|
|
stateCache state.Database
|
2020-09-15 03:46:50 +00:00
|
|
|
numWorkers uint
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
2020-09-06 17:52:48 +00:00
|
|
|
type iterPair struct {
|
|
|
|
older, newer trie.NodeIterator
|
|
|
|
}
|
|
|
|
|
2020-11-17 01:37:36 +00:00
|
|
|
func resolveNode(it trie.NodeIterator, trieDB *trie.Database) (sdtypes.StateNode, []interface{}, error) {
|
2020-11-10 09:07:59 +00:00
|
|
|
nodePath := make([]byte, len(it.Path()))
|
|
|
|
copy(nodePath, it.Path())
|
|
|
|
node, err := trieDB.Node(it.Hash())
|
|
|
|
if err != nil {
|
2020-11-17 01:37:36 +00:00
|
|
|
return sdtypes.StateNode{}, nil, err
|
2020-11-10 09:07:59 +00:00
|
|
|
}
|
|
|
|
var nodeElements []interface{}
|
|
|
|
if err := rlp.DecodeBytes(node, &nodeElements); err != nil {
|
2020-11-17 01:37:36 +00:00
|
|
|
return sdtypes.StateNode{}, nil, err
|
2020-11-10 09:07:59 +00:00
|
|
|
}
|
2021-10-14 06:47:38 +00:00
|
|
|
ty, err := sdtrie.CheckKeyType(nodeElements)
|
2020-11-10 09:07:59 +00:00
|
|
|
if err != nil {
|
2020-11-17 01:37:36 +00:00
|
|
|
return sdtypes.StateNode{}, nil, err
|
2020-11-10 09:07:59 +00:00
|
|
|
}
|
2020-11-17 01:37:36 +00:00
|
|
|
return sdtypes.StateNode{
|
2020-11-10 09:07:59 +00:00
|
|
|
NodeType: ty,
|
|
|
|
Path: nodePath,
|
|
|
|
NodeValue: node,
|
|
|
|
}, nodeElements, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// convenience
|
2020-11-17 01:37:36 +00:00
|
|
|
func stateNodeAppender(nodes *[]sdtypes.StateNode) sdtypes.StateNodeSink {
|
|
|
|
return func(node sdtypes.StateNode) error {
|
2020-11-10 09:07:59 +00:00
|
|
|
*nodes = append(*nodes, node)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
2020-11-17 01:37:36 +00:00
|
|
|
func storageNodeAppender(nodes *[]sdtypes.StorageNode) sdtypes.StorageNodeSink {
|
|
|
|
return func(node sdtypes.StorageNode) error {
|
2020-11-10 09:07:59 +00:00
|
|
|
*nodes = append(*nodes, node)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
2020-11-17 01:37:36 +00:00
|
|
|
func codeMappingAppender(data *[]sdtypes.CodeAndCodeHash) sdtypes.CodeSink {
|
|
|
|
return func(c sdtypes.CodeAndCodeHash) error {
|
2020-11-10 09:07:59 +00:00
|
|
|
*data = append(*data, c)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-04 16:50:49 +00:00
|
|
|
// NewBuilder is used to create a statediff builder
|
2020-09-15 06:03:46 +00:00
|
|
|
func NewBuilder(stateCache state.Database, workers uint) (Builder, error) {
|
2020-09-15 03:46:50 +00:00
|
|
|
if workers == 0 {
|
|
|
|
workers = 1
|
|
|
|
}
|
2020-09-15 06:03:46 +00:00
|
|
|
if bits.OnesCount(workers) != 1 {
|
|
|
|
return nil, fmt.Errorf("workers must be a power of 2")
|
|
|
|
}
|
2020-09-04 16:50:49 +00:00
|
|
|
return &builder{
|
|
|
|
stateCache: stateCache, // state cache is safe for concurrent reads
|
2020-09-15 03:46:50 +00:00
|
|
|
numWorkers: workers,
|
2020-09-15 06:03:46 +00:00
|
|
|
}, nil
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// BuildStateTrieObject builds a state trie object from the provided block
|
2020-11-17 01:37:36 +00:00
|
|
|
func (sdb *builder) BuildStateTrieObject(current *types.Block) (sd.StateObject, error) {
|
2020-09-04 16:50:49 +00:00
|
|
|
currentTrie, err := sdb.stateCache.OpenTrie(current.Root())
|
|
|
|
if err != nil {
|
2020-11-17 01:37:36 +00:00
|
|
|
return sd.StateObject{}, fmt.Errorf("error creating trie for block %d: %v", current.Number(), err)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
it := currentTrie.NodeIterator([]byte{})
|
2020-11-08 23:25:22 +00:00
|
|
|
stateNodes, codeAndCodeHashes, err := sdb.buildStateTrie(it)
|
2020-09-04 16:50:49 +00:00
|
|
|
if err != nil {
|
2020-11-17 01:37:36 +00:00
|
|
|
return sd.StateObject{}, fmt.Errorf("error collecting state nodes for block %d: %v", current.Number(), err)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
2020-11-17 01:37:36 +00:00
|
|
|
return sd.StateObject{
|
2020-11-08 23:25:22 +00:00
|
|
|
BlockNumber: current.Number(),
|
|
|
|
BlockHash: current.Hash(),
|
|
|
|
Nodes: stateNodes,
|
|
|
|
CodeAndCodeHashes: codeAndCodeHashes,
|
2020-09-04 16:50:49 +00:00
|
|
|
}, nil
|
|
|
|
}
|
|
|
|
|
2020-11-17 01:37:36 +00:00
|
|
|
func (sdb *builder) buildStateTrie(it trie.NodeIterator) ([]sdtypes.StateNode, []sdtypes.CodeAndCodeHash, error) {
|
|
|
|
stateNodes := make([]sdtypes.StateNode, 0)
|
|
|
|
codeAndCodeHashes := make([]sdtypes.CodeAndCodeHash, 0)
|
2020-09-04 16:50:49 +00:00
|
|
|
for it.Next(true) {
|
2020-11-10 09:07:59 +00:00
|
|
|
// skip value nodes
|
2020-11-08 23:25:55 +00:00
|
|
|
if it.Leaf() || bytes.Equal(nullHashBytes, it.Hash().Bytes()) {
|
2020-11-08 23:25:22 +00:00
|
|
|
continue
|
|
|
|
}
|
2020-11-10 09:07:59 +00:00
|
|
|
node, nodeElements, err := resolveNode(it, sdb.stateCache.TrieDB())
|
2020-11-08 23:25:22 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
|
|
|
}
|
2020-11-10 09:07:59 +00:00
|
|
|
switch node.NodeType {
|
2020-11-17 01:37:36 +00:00
|
|
|
case sdtypes.Leaf:
|
2021-10-14 06:47:38 +00:00
|
|
|
var account types.StateAccount
|
2020-09-04 16:50:49 +00:00
|
|
|
if err := rlp.DecodeBytes(nodeElements[1].([]byte), &account); err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil, nil, fmt.Errorf("error decoding account for leaf node at path %x nerror: %v", node.Path, err)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
partialPath := trie.CompactToHex(nodeElements[0].([]byte))
|
2020-11-10 09:07:59 +00:00
|
|
|
valueNodePath := append(node.Path, partialPath...)
|
2020-09-04 16:50:49 +00:00
|
|
|
encodedPath := trie.HexToCompact(valueNodePath)
|
|
|
|
leafKey := encodedPath[1:]
|
2020-11-10 09:07:59 +00:00
|
|
|
node.LeafKey = leafKey
|
2020-11-08 23:25:22 +00:00
|
|
|
if !bytes.Equal(account.CodeHash, nullCodeHash) {
|
2020-11-17 01:37:36 +00:00
|
|
|
var storageNodes []sdtypes.StorageNode
|
2020-11-10 09:07:59 +00:00
|
|
|
err := sdb.buildStorageNodesEventual(account.Root, nil, true, storageNodeAppender(&storageNodes))
|
2020-11-08 23:25:22 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, nil, fmt.Errorf("failed building eventual storage diffs for account %+v\r\nerror: %v", account, err)
|
|
|
|
}
|
|
|
|
node.StorageNodes = storageNodes
|
|
|
|
// emit codehash => code mappings for cod
|
|
|
|
codeHash := common.BytesToHash(account.CodeHash)
|
|
|
|
code, err := sdb.stateCache.ContractCode(common.Hash{}, codeHash)
|
|
|
|
if err != nil {
|
|
|
|
return nil, nil, fmt.Errorf("failed to retrieve code for codehash %s\r\n error: %v", codeHash.String(), err)
|
|
|
|
}
|
2020-11-17 01:37:36 +00:00
|
|
|
codeAndCodeHashes = append(codeAndCodeHashes, sdtypes.CodeAndCodeHash{
|
2020-11-08 23:25:22 +00:00
|
|
|
Hash: codeHash,
|
|
|
|
Code: code,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
stateNodes = append(stateNodes, node)
|
2020-11-17 01:37:36 +00:00
|
|
|
case sdtypes.Extension, sdtypes.Branch:
|
2020-11-10 09:07:59 +00:00
|
|
|
stateNodes = append(stateNodes, node)
|
2020-09-04 16:50:49 +00:00
|
|
|
default:
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil, nil, fmt.Errorf("unexpected node type %s", node.NodeType)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
}
|
2020-11-08 23:25:22 +00:00
|
|
|
return stateNodes, codeAndCodeHashes, it.Error()
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
2020-11-10 09:07:59 +00:00
|
|
|
// BuildStateDiffObject builds a statediff object from two blocks and the provided parameters
|
2020-11-17 01:37:36 +00:00
|
|
|
func (sdb *builder) BuildStateDiffObject(args sd.Args, params sd.Params) (sd.StateObject, error) {
|
|
|
|
var stateNodes []sdtypes.StateNode
|
|
|
|
var codeAndCodeHashes []sdtypes.CodeAndCodeHash
|
2020-11-10 09:07:59 +00:00
|
|
|
err := sdb.WriteStateDiffObject(
|
2020-11-17 01:37:36 +00:00
|
|
|
sd.StateRoots{OldStateRoot: args.OldStateRoot, NewStateRoot: args.NewStateRoot},
|
2020-11-10 09:07:59 +00:00
|
|
|
params, stateNodeAppender(&stateNodes), codeMappingAppender(&codeAndCodeHashes))
|
|
|
|
if err != nil {
|
2020-11-17 01:37:36 +00:00
|
|
|
return sd.StateObject{}, err
|
2020-11-10 09:07:59 +00:00
|
|
|
}
|
2020-11-17 01:37:36 +00:00
|
|
|
return sd.StateObject{
|
2020-11-10 09:07:59 +00:00
|
|
|
BlockHash: args.BlockHash,
|
|
|
|
BlockNumber: args.BlockNumber,
|
|
|
|
Nodes: stateNodes,
|
|
|
|
CodeAndCodeHashes: codeAndCodeHashes,
|
|
|
|
}, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Writes a statediff object to output callback
|
2020-11-17 01:37:36 +00:00
|
|
|
func (sdb *builder) WriteStateDiffObject(args sd.StateRoots, params sd.Params, output sdtypes.StateNodeSink, codeOutput sdtypes.CodeSink) error {
|
2020-09-06 18:09:25 +00:00
|
|
|
if len(params.WatchedAddresses) > 0 {
|
|
|
|
// if we are watching only specific accounts then we are only diffing leaf nodes
|
2020-09-06 17:52:48 +00:00
|
|
|
log.Info("Ignoring intermediate state nodes because WatchedAddresses was passed")
|
2020-09-06 18:09:25 +00:00
|
|
|
params.IntermediateStateNodes = false
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Load tries for old and new states
|
|
|
|
oldTrie, err := sdb.stateCache.OpenTrie(args.OldStateRoot)
|
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return fmt.Errorf("error creating trie for old state root: %v", err)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
newTrie, err := sdb.stateCache.OpenTrie(args.NewStateRoot)
|
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return fmt.Errorf("error creating trie for new state root: %v", err)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
2020-09-06 18:09:25 +00:00
|
|
|
// Split old and new tries into corresponding subtrie iterators
|
2020-09-15 03:46:50 +00:00
|
|
|
oldIterFac := iter.NewSubtrieIteratorFactory(oldTrie, sdb.numWorkers)
|
|
|
|
newIterFac := iter.NewSubtrieIteratorFactory(newTrie, sdb.numWorkers)
|
2020-09-06 18:09:25 +00:00
|
|
|
|
2020-09-06 17:52:48 +00:00
|
|
|
// Create iterators ahead of time to avoid race condition in state.Trie access
|
2020-11-10 09:07:59 +00:00
|
|
|
// We do two state iterations per subtrie: one for new/updated nodes,
|
|
|
|
// one for deleted/updated nodes; prepare 2 iterator instances for each task
|
|
|
|
var iterPairs [][]iterPair
|
2020-09-15 03:46:50 +00:00
|
|
|
for i := uint(0); i < sdb.numWorkers; i++ {
|
2020-11-10 09:07:59 +00:00
|
|
|
iterPairs = append(iterPairs, []iterPair{
|
|
|
|
iterPair{older: oldIterFac.IteratorAt(i), newer: newIterFac.IteratorAt(i)},
|
|
|
|
iterPair{older: oldIterFac.IteratorAt(i), newer: newIterFac.IteratorAt(i)},
|
|
|
|
})
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
2020-11-10 09:07:59 +00:00
|
|
|
// Dispatch workers to process trie data; sync and collect results here via channels
|
2020-11-17 01:37:36 +00:00
|
|
|
nodeChan := make(chan sdtypes.StateNode)
|
|
|
|
codeChan := make(chan sdtypes.CodeAndCodeHash)
|
2020-11-08 23:25:22 +00:00
|
|
|
|
2020-11-10 09:07:59 +00:00
|
|
|
go func() {
|
2020-11-17 01:37:36 +00:00
|
|
|
nodeSender := func(node sdtypes.StateNode) error { nodeChan <- node; return nil }
|
|
|
|
codeSender := func(code sdtypes.CodeAndCodeHash) error { codeChan <- code; return nil }
|
2020-11-10 09:07:59 +00:00
|
|
|
var wg sync.WaitGroup
|
|
|
|
|
|
|
|
for w := uint(0); w < sdb.numWorkers; w++ {
|
|
|
|
wg.Add(1)
|
|
|
|
go func(worker uint) {
|
|
|
|
defer wg.Done()
|
|
|
|
sdb.buildStateDiff(iterPairs[worker], params, nodeSender, codeSender)
|
|
|
|
}(w)
|
|
|
|
}
|
|
|
|
wg.Wait()
|
|
|
|
close(nodeChan)
|
|
|
|
close(codeChan)
|
|
|
|
}()
|
2020-09-06 18:09:25 +00:00
|
|
|
|
2020-11-10 09:07:59 +00:00
|
|
|
for nodeChan != nil || codeChan != nil {
|
|
|
|
select {
|
|
|
|
case node, more := <-nodeChan:
|
|
|
|
if more {
|
|
|
|
if err := output(node); err != nil {
|
2020-09-06 18:09:25 +00:00
|
|
|
return err
|
|
|
|
}
|
2020-11-10 09:07:59 +00:00
|
|
|
} else {
|
|
|
|
nodeChan = nil
|
|
|
|
}
|
|
|
|
case codeAndCodeHash, more := <-codeChan:
|
|
|
|
if more {
|
|
|
|
if err := codeOutput(codeAndCodeHash); err != nil {
|
|
|
|
return err
|
2020-11-08 23:25:22 +00:00
|
|
|
}
|
2020-11-10 09:07:59 +00:00
|
|
|
} else {
|
|
|
|
codeChan = nil
|
2020-09-06 18:09:25 +00:00
|
|
|
}
|
2020-11-10 09:07:59 +00:00
|
|
|
}
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
2020-11-17 01:37:36 +00:00
|
|
|
func (sdb *builder) buildStateDiff(args []iterPair, params sd.Params, output sdtypes.StateNodeSink, codeOutput sdtypes.CodeSink) error {
|
2020-09-06 18:09:25 +00:00
|
|
|
// collect a slice of all the intermediate nodes that were touched and exist at B
|
|
|
|
// a map of their leafkey to all the accounts that were touched and exist at B
|
2020-09-04 16:50:49 +00:00
|
|
|
// and a slice of all the paths for the nodes in both of the above sets
|
2020-11-10 09:07:59 +00:00
|
|
|
var diffAccountsAtB AccountMap
|
|
|
|
var diffPathsAtB map[string]bool
|
|
|
|
var err error
|
|
|
|
if params.IntermediateStateNodes {
|
|
|
|
diffAccountsAtB, diffPathsAtB, err = sdb.createdAndUpdatedStateWithIntermediateNodes(args[0], output)
|
|
|
|
} else {
|
|
|
|
diffAccountsAtB, diffPathsAtB, err = sdb.createdAndUpdatedState(args[0], params.WatchedAddresses)
|
|
|
|
}
|
|
|
|
|
2020-09-04 16:50:49 +00:00
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return fmt.Errorf("error collecting createdAndUpdatedNodes: %v", err)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// collect a slice of all the nodes that existed at a path in A that doesn't exist in B
|
|
|
|
// a map of their leafkey to all the accounts that were touched and exist at A
|
2020-11-10 09:07:59 +00:00
|
|
|
diffAccountsAtA, err := sdb.deletedOrUpdatedState(args[1], diffPathsAtB, output)
|
2020-09-04 16:50:49 +00:00
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return fmt.Errorf("error collecting deletedOrUpdatedNodes: %v", err)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
2020-09-06 18:09:25 +00:00
|
|
|
// collect and sort the leafkey keys for both account mappings into a slice
|
2020-09-04 16:50:49 +00:00
|
|
|
createKeys := sortKeys(diffAccountsAtB)
|
|
|
|
deleteKeys := sortKeys(diffAccountsAtA)
|
|
|
|
|
|
|
|
// and then find the intersection of these keys
|
|
|
|
// these are the leafkeys for the accounts which exist at both A and B but are different
|
2020-09-06 18:09:25 +00:00
|
|
|
// this also mutates the passed in createKeys and deleteKeys, removing the intersection keys
|
2020-09-04 16:50:49 +00:00
|
|
|
// and leaving the truly created or deleted keys in place
|
|
|
|
updatedKeys := findIntersection(createKeys, deleteKeys)
|
|
|
|
|
2020-11-10 09:07:59 +00:00
|
|
|
// build the diff nodes for the updated accounts using the mappings at both A and B as directed by the keys found as the intersection of the two
|
|
|
|
err = sdb.buildAccountUpdates(
|
2020-09-06 18:09:25 +00:00
|
|
|
diffAccountsAtB, diffAccountsAtA, updatedKeys,
|
2020-11-10 09:07:59 +00:00
|
|
|
params.WatchedStorageSlots, params.IntermediateStorageNodes, output)
|
2020-09-04 16:50:49 +00:00
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return fmt.Errorf("error building diff for updated accounts: %v", err)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
// build the diff nodes for created accounts
|
2020-11-10 09:07:59 +00:00
|
|
|
err = sdb.buildAccountCreations(diffAccountsAtB, params.WatchedStorageSlots, params.IntermediateStorageNodes, output, codeOutput)
|
2020-09-04 16:50:49 +00:00
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return fmt.Errorf("error building diff for created accounts: %v", err)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// createdAndUpdatedState returns
|
|
|
|
// a mapping of their leafkeys to all the accounts that exist in a different state at B than A
|
|
|
|
// and a slice of the paths for all of the nodes included in both
|
2020-11-10 09:07:59 +00:00
|
|
|
func (sdb *builder) createdAndUpdatedState(iters iterPair, watchedAddresses []common.Address) (AccountMap, map[string]bool, error) {
|
2020-09-04 16:50:49 +00:00
|
|
|
diffPathsAtB := make(map[string]bool)
|
|
|
|
diffAcountsAtB := make(AccountMap)
|
2020-09-06 18:09:25 +00:00
|
|
|
it, _ := trie.NewDifferenceIterator(iters.older, iters.newer)
|
2020-09-04 16:50:49 +00:00
|
|
|
for it.Next(true) {
|
2020-09-08 01:28:47 +00:00
|
|
|
if it.Leaf() || bytes.Equal(nullHashBytes, it.Hash().Bytes()) {
|
2020-09-04 16:50:49 +00:00
|
|
|
continue
|
|
|
|
}
|
2020-09-06 18:09:25 +00:00
|
|
|
node, nodeElements, err := resolveNode(it, sdb.stateCache.TrieDB())
|
2020-09-04 16:50:49 +00:00
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil, nil, err
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
2020-09-06 18:09:25 +00:00
|
|
|
switch node.NodeType {
|
2020-11-17 01:37:36 +00:00
|
|
|
case sdtypes.Leaf:
|
2020-09-04 16:50:49 +00:00
|
|
|
// created vs updated is important for leaf nodes since we need to diff their storage
|
|
|
|
// so we need to map all changed accounts at B to their leafkey, since account can change pathes but not leafkey
|
2021-10-14 06:47:38 +00:00
|
|
|
var account types.StateAccount
|
2020-09-04 16:50:49 +00:00
|
|
|
if err := rlp.DecodeBytes(nodeElements[1].([]byte), &account); err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil, nil, fmt.Errorf("error decoding account for leaf node at path %x nerror: %v", node.Path, err)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
partialPath := trie.CompactToHex(nodeElements[0].([]byte))
|
2020-09-06 18:09:25 +00:00
|
|
|
valueNodePath := append(node.Path, partialPath...)
|
2020-09-04 16:50:49 +00:00
|
|
|
encodedPath := trie.HexToCompact(valueNodePath)
|
|
|
|
leafKey := encodedPath[1:]
|
|
|
|
if isWatchedAddress(watchedAddresses, leafKey) {
|
|
|
|
diffAcountsAtB[common.Bytes2Hex(leafKey)] = accountWrapper{
|
2020-09-06 18:09:25 +00:00
|
|
|
NodeType: node.NodeType,
|
|
|
|
Path: node.Path,
|
|
|
|
NodeValue: node.NodeValue,
|
2020-09-04 16:50:49 +00:00
|
|
|
LeafKey: leafKey,
|
|
|
|
Account: &account,
|
|
|
|
}
|
|
|
|
}
|
2020-11-10 09:07:59 +00:00
|
|
|
}
|
|
|
|
// add both intermediate and leaf node paths to the list of diffPathsAtB
|
|
|
|
diffPathsAtB[common.Bytes2Hex(node.Path)] = true
|
|
|
|
}
|
|
|
|
return diffAcountsAtB, diffPathsAtB, it.Error()
|
|
|
|
}
|
|
|
|
|
|
|
|
// createdAndUpdatedStateWithIntermediateNodes returns
|
|
|
|
// a slice of all the intermediate nodes that exist in a different state at B than A
|
|
|
|
// a mapping of their leafkeys to all the accounts that exist in a different state at B than A
|
|
|
|
// and a slice of the paths for all of the nodes included in both
|
2020-11-17 01:37:36 +00:00
|
|
|
func (sdb *builder) createdAndUpdatedStateWithIntermediateNodes(iters iterPair, output sdtypes.StateNodeSink) (AccountMap, map[string]bool, error) {
|
2020-11-10 09:07:59 +00:00
|
|
|
diffPathsAtB := make(map[string]bool)
|
|
|
|
diffAcountsAtB := make(AccountMap)
|
|
|
|
it, _ := trie.NewDifferenceIterator(iters.older, iters.newer)
|
|
|
|
for it.Next(true) {
|
|
|
|
if it.Leaf() || bytes.Equal(nullHashBytes, it.Hash().Bytes()) {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
node, nodeElements, err := resolveNode(it, sdb.stateCache.TrieDB())
|
|
|
|
if err != nil {
|
|
|
|
return nil, nil, err
|
|
|
|
}
|
|
|
|
switch node.NodeType {
|
2020-11-17 01:37:36 +00:00
|
|
|
case sdtypes.Leaf:
|
2020-11-10 09:07:59 +00:00
|
|
|
// created vs updated is important for leaf nodes since we need to diff their storage
|
|
|
|
// so we need to map all changed accounts at B to their leafkey, since account can change paths but not leafkey
|
2021-10-14 06:47:38 +00:00
|
|
|
var account types.StateAccount
|
2020-11-10 09:07:59 +00:00
|
|
|
if err := rlp.DecodeBytes(nodeElements[1].([]byte), &account); err != nil {
|
|
|
|
return nil, nil, fmt.Errorf("error decoding account for leaf node at path %x nerror: %v", node.Path, err)
|
|
|
|
}
|
|
|
|
partialPath := trie.CompactToHex(nodeElements[0].([]byte))
|
|
|
|
valueNodePath := append(node.Path, partialPath...)
|
|
|
|
encodedPath := trie.HexToCompact(valueNodePath)
|
|
|
|
leafKey := encodedPath[1:]
|
|
|
|
diffAcountsAtB[common.Bytes2Hex(leafKey)] = accountWrapper{
|
|
|
|
NodeType: node.NodeType,
|
|
|
|
Path: node.Path,
|
|
|
|
NodeValue: node.NodeValue,
|
|
|
|
LeafKey: leafKey,
|
|
|
|
Account: &account,
|
|
|
|
}
|
2020-11-17 01:37:36 +00:00
|
|
|
case sdtypes.Extension, sdtypes.Branch:
|
2020-09-04 16:50:49 +00:00
|
|
|
// create a diff for any intermediate node that has changed at b
|
|
|
|
// created vs updated makes no difference for intermediate nodes since we do not need to diff storage
|
2020-11-17 01:37:36 +00:00
|
|
|
if err := output(sdtypes.StateNode{
|
2020-11-10 09:07:59 +00:00
|
|
|
NodeType: node.NodeType,
|
|
|
|
Path: node.Path,
|
|
|
|
NodeValue: node.NodeValue,
|
|
|
|
}); err != nil {
|
|
|
|
return nil, nil, err
|
2020-09-06 18:09:25 +00:00
|
|
|
}
|
2020-09-04 16:50:49 +00:00
|
|
|
default:
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil, nil, fmt.Errorf("unexpected node type %s", node.NodeType)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
// add both intermediate and leaf node paths to the list of diffPathsAtB
|
2020-09-06 18:09:25 +00:00
|
|
|
diffPathsAtB[common.Bytes2Hex(node.Path)] = true
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
2020-11-10 09:07:59 +00:00
|
|
|
return diffAcountsAtB, diffPathsAtB, it.Error()
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
2020-09-06 18:09:25 +00:00
|
|
|
// deletedOrUpdatedState returns a slice of all the paths that are emptied at B
|
2020-09-04 16:50:49 +00:00
|
|
|
// and a mapping of their leafkeys to all the accounts that exist in a different state at A than B
|
2020-11-17 01:37:36 +00:00
|
|
|
func (sdb *builder) deletedOrUpdatedState(iters iterPair, diffPathsAtB map[string]bool, output sdtypes.StateNodeSink) (AccountMap, error) {
|
2020-09-04 16:50:49 +00:00
|
|
|
diffAccountAtA := make(AccountMap)
|
2020-09-06 18:09:25 +00:00
|
|
|
it, _ := trie.NewDifferenceIterator(iters.newer, iters.older)
|
2020-09-04 16:50:49 +00:00
|
|
|
for it.Next(true) {
|
2020-09-08 01:28:47 +00:00
|
|
|
if it.Leaf() || bytes.Equal(nullHashBytes, it.Hash().Bytes()) {
|
2020-09-04 16:50:49 +00:00
|
|
|
continue
|
|
|
|
}
|
2020-09-06 18:09:25 +00:00
|
|
|
node, nodeElements, err := resolveNode(it, sdb.stateCache.TrieDB())
|
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil, err
|
2020-09-06 18:09:25 +00:00
|
|
|
}
|
|
|
|
switch node.NodeType {
|
2020-11-17 01:37:36 +00:00
|
|
|
case sdtypes.Leaf:
|
2020-09-04 16:50:49 +00:00
|
|
|
// map all different accounts at A to their leafkey
|
2021-10-14 06:47:38 +00:00
|
|
|
var account types.StateAccount
|
2020-09-04 16:50:49 +00:00
|
|
|
if err := rlp.DecodeBytes(nodeElements[1].([]byte), &account); err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil, fmt.Errorf("error decoding account for leaf node at path %x nerror: %v", node.Path, err)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
partialPath := trie.CompactToHex(nodeElements[0].([]byte))
|
2020-09-06 18:09:25 +00:00
|
|
|
valueNodePath := append(node.Path, partialPath...)
|
2020-09-04 16:50:49 +00:00
|
|
|
encodedPath := trie.HexToCompact(valueNodePath)
|
|
|
|
leafKey := encodedPath[1:]
|
|
|
|
diffAccountAtA[common.Bytes2Hex(leafKey)] = accountWrapper{
|
2020-09-06 18:09:25 +00:00
|
|
|
NodeType: node.NodeType,
|
|
|
|
Path: node.Path,
|
|
|
|
NodeValue: node.NodeValue,
|
2020-09-04 16:50:49 +00:00
|
|
|
LeafKey: leafKey,
|
|
|
|
Account: &account,
|
|
|
|
}
|
2021-03-24 22:46:20 +00:00
|
|
|
// if this node's path did not show up in diffPathsAtB
|
|
|
|
// that means the node at this path was deleted (or moved) in B
|
|
|
|
// emit an empty "removed" diff to signify as such
|
|
|
|
if _, ok := diffPathsAtB[common.Bytes2Hex(node.Path)]; !ok {
|
|
|
|
if err := output(sdtypes.StateNode{
|
|
|
|
Path: node.Path,
|
|
|
|
NodeValue: []byte{},
|
|
|
|
NodeType: sdtypes.Removed,
|
|
|
|
LeafKey: leafKey,
|
|
|
|
}); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
2020-11-17 01:37:36 +00:00
|
|
|
case sdtypes.Extension, sdtypes.Branch:
|
2021-03-24 22:46:20 +00:00
|
|
|
// if this node's path did not show up in diffPathsAtB
|
|
|
|
// that means the node at this path was deleted (or moved) in B
|
|
|
|
// emit an empty "removed" diff to signify as such
|
|
|
|
if _, ok := diffPathsAtB[common.Bytes2Hex(node.Path)]; !ok {
|
|
|
|
if err := output(sdtypes.StateNode{
|
|
|
|
Path: node.Path,
|
|
|
|
NodeValue: []byte{},
|
|
|
|
NodeType: sdtypes.Removed,
|
|
|
|
}); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
2020-09-04 16:50:49 +00:00
|
|
|
// fall through, we did everything we need to do with these node types
|
|
|
|
default:
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil, fmt.Errorf("unexpected node type %s", node.NodeType)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
}
|
2020-11-10 09:07:59 +00:00
|
|
|
return diffAccountAtA, it.Error()
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// buildAccountUpdates uses the account diffs maps for A => B and B => A and the known intersection of their leafkeys
|
|
|
|
// to generate the statediff node objects for all of the accounts that existed at both A and B but in different states
|
|
|
|
// needs to be called before building account creations and deletions as this mutates
|
|
|
|
// those account maps to remove the accounts which were updated
|
2020-11-17 01:37:36 +00:00
|
|
|
func (sdb *builder) buildAccountUpdates(creations, deletions AccountMap, updatedKeys []string, watchedStorageKeys []common.Hash, intermediateStorageNodes bool, output sdtypes.StateNodeSink) error {
|
2020-09-04 16:50:49 +00:00
|
|
|
var err error
|
|
|
|
for _, key := range updatedKeys {
|
|
|
|
createdAcc := creations[key]
|
|
|
|
deletedAcc := deletions[key]
|
2020-11-17 01:37:36 +00:00
|
|
|
var storageDiffs []sdtypes.StorageNode
|
2020-09-04 16:50:49 +00:00
|
|
|
if deletedAcc.Account != nil && createdAcc.Account != nil {
|
|
|
|
oldSR := deletedAcc.Account.Root
|
|
|
|
newSR := createdAcc.Account.Root
|
2020-11-10 09:07:59 +00:00
|
|
|
err = sdb.buildStorageNodesIncremental(oldSR, newSR, watchedStorageKeys, intermediateStorageNodes, storageNodeAppender(&storageDiffs))
|
2020-09-04 16:50:49 +00:00
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return fmt.Errorf("failed building incremental storage diffs for account with leafkey %s\r\nerror: %v", key, err)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
}
|
2020-11-17 01:37:36 +00:00
|
|
|
if err = output(sdtypes.StateNode{
|
2020-09-04 16:50:49 +00:00
|
|
|
NodeType: createdAcc.NodeType,
|
|
|
|
Path: createdAcc.Path,
|
|
|
|
NodeValue: createdAcc.NodeValue,
|
|
|
|
LeafKey: createdAcc.LeafKey,
|
|
|
|
StorageNodes: storageDiffs,
|
2020-11-10 09:07:59 +00:00
|
|
|
}); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-09-04 16:50:49 +00:00
|
|
|
delete(creations, key)
|
|
|
|
delete(deletions, key)
|
|
|
|
}
|
|
|
|
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// buildAccountCreations returns the statediff node objects for all the accounts that exist at B but not at A
|
2020-11-08 23:25:22 +00:00
|
|
|
// it also returns the code and codehash for created contract accounts
|
2020-11-17 01:37:36 +00:00
|
|
|
func (sdb *builder) buildAccountCreations(accounts AccountMap, watchedStorageKeys []common.Hash, intermediateStorageNodes bool, output sdtypes.StateNodeSink, codeOutput sdtypes.CodeSink) error {
|
2020-09-04 16:50:49 +00:00
|
|
|
for _, val := range accounts {
|
2020-11-17 01:37:36 +00:00
|
|
|
diff := sdtypes.StateNode{
|
2020-11-08 23:25:22 +00:00
|
|
|
NodeType: val.NodeType,
|
|
|
|
Path: val.Path,
|
|
|
|
LeafKey: val.LeafKey,
|
|
|
|
NodeValue: val.NodeValue,
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
2020-11-08 23:25:22 +00:00
|
|
|
if !bytes.Equal(val.Account.CodeHash, nullCodeHash) {
|
|
|
|
// For contract creations, any storage node contained is a diff
|
2020-11-17 01:37:36 +00:00
|
|
|
var storageDiffs []sdtypes.StorageNode
|
2020-11-10 09:07:59 +00:00
|
|
|
err := sdb.buildStorageNodesEventual(val.Account.Root, watchedStorageKeys, intermediateStorageNodes, storageNodeAppender(&storageDiffs))
|
2020-11-08 23:25:22 +00:00
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return fmt.Errorf("failed building eventual storage diffs for node %x\r\nerror: %v", val.Path, err)
|
2020-11-08 23:25:22 +00:00
|
|
|
}
|
|
|
|
diff.StorageNodes = storageDiffs
|
2020-11-26 10:31:29 +00:00
|
|
|
// emit codehash => code mappings for code
|
2020-11-08 23:25:22 +00:00
|
|
|
codeHash := common.BytesToHash(val.Account.CodeHash)
|
|
|
|
code, err := sdb.stateCache.ContractCode(common.Hash{}, codeHash)
|
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return fmt.Errorf("failed to retrieve code for codehash %s\r\n error: %v", codeHash.String(), err)
|
2020-11-08 23:25:22 +00:00
|
|
|
}
|
2020-11-17 01:37:36 +00:00
|
|
|
if err := codeOutput(sdtypes.CodeAndCodeHash{
|
2020-11-08 23:25:22 +00:00
|
|
|
Hash: codeHash,
|
|
|
|
Code: code,
|
2020-11-10 09:07:59 +00:00
|
|
|
}); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if err := output(diff); err != nil {
|
|
|
|
return err
|
2020-11-08 23:25:22 +00:00
|
|
|
}
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// buildStorageNodesEventual builds the storage diff node objects for a created account
|
|
|
|
// i.e. it returns all the storage nodes at this state, since there is no previous state
|
2020-11-17 01:37:36 +00:00
|
|
|
func (sdb *builder) buildStorageNodesEventual(sr common.Hash, watchedStorageKeys []common.Hash, intermediateNodes bool, output sdtypes.StorageNodeSink) error {
|
2020-09-04 16:50:49 +00:00
|
|
|
if bytes.Equal(sr.Bytes(), emptyContractRoot.Bytes()) {
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
2020-11-10 09:07:59 +00:00
|
|
|
log.Debug("Storage Root For Eventual Diff", "root", sr.Hex())
|
2020-09-04 16:50:49 +00:00
|
|
|
sTrie, err := sdb.stateCache.OpenTrie(sr)
|
|
|
|
if err != nil {
|
|
|
|
log.Info("error in build storage diff eventual", "error", err)
|
2020-11-10 09:07:59 +00:00
|
|
|
return err
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
it := sTrie.NodeIterator(make([]byte, 0))
|
2020-11-10 09:07:59 +00:00
|
|
|
err = sdb.buildStorageNodesFromTrie(it, watchedStorageKeys, intermediateNodes, output)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return nil
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
2020-09-06 18:09:25 +00:00
|
|
|
// buildStorageNodesFromTrie returns all the storage diff node objects in the provided node iterator
|
2020-09-04 16:50:49 +00:00
|
|
|
// if any storage keys are provided it will only return those leaf nodes
|
|
|
|
// including intermediate nodes can be turned on or off
|
2020-11-17 01:37:36 +00:00
|
|
|
func (sdb *builder) buildStorageNodesFromTrie(it trie.NodeIterator, watchedStorageKeys []common.Hash, intermediateNodes bool, output sdtypes.StorageNodeSink) error {
|
2020-09-04 16:50:49 +00:00
|
|
|
for it.Next(true) {
|
2020-09-08 01:28:47 +00:00
|
|
|
if it.Leaf() || bytes.Equal(nullHashBytes, it.Hash().Bytes()) {
|
2020-09-04 16:50:49 +00:00
|
|
|
continue
|
|
|
|
}
|
2020-09-06 18:09:25 +00:00
|
|
|
node, nodeElements, err := resolveNode(it, sdb.stateCache.TrieDB())
|
2020-09-04 16:50:49 +00:00
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return err
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
2020-09-06 18:09:25 +00:00
|
|
|
switch node.NodeType {
|
2020-11-17 01:37:36 +00:00
|
|
|
case sdtypes.Leaf:
|
2020-09-04 16:50:49 +00:00
|
|
|
partialPath := trie.CompactToHex(nodeElements[0].([]byte))
|
2020-09-06 18:09:25 +00:00
|
|
|
valueNodePath := append(node.Path, partialPath...)
|
2020-09-04 16:50:49 +00:00
|
|
|
encodedPath := trie.HexToCompact(valueNodePath)
|
|
|
|
leafKey := encodedPath[1:]
|
|
|
|
if isWatchedStorageKey(watchedStorageKeys, leafKey) {
|
2020-11-17 01:37:36 +00:00
|
|
|
if err := output(sdtypes.StorageNode{
|
2020-09-06 18:09:25 +00:00
|
|
|
NodeType: node.NodeType,
|
|
|
|
Path: node.Path,
|
|
|
|
NodeValue: node.NodeValue,
|
2020-09-04 16:50:49 +00:00
|
|
|
LeafKey: leafKey,
|
2020-11-10 09:07:59 +00:00
|
|
|
}); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
2020-11-17 01:37:36 +00:00
|
|
|
case sdtypes.Extension, sdtypes.Branch:
|
2020-09-04 16:50:49 +00:00
|
|
|
if intermediateNodes {
|
2020-11-17 01:37:36 +00:00
|
|
|
if err := output(sdtypes.StorageNode{
|
2020-09-06 18:09:25 +00:00
|
|
|
NodeType: node.NodeType,
|
|
|
|
Path: node.Path,
|
|
|
|
NodeValue: node.NodeValue,
|
2020-11-10 09:07:59 +00:00
|
|
|
}); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
default:
|
2020-11-10 09:07:59 +00:00
|
|
|
return fmt.Errorf("unexpected node type %s", node.NodeType)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
}
|
2020-11-10 09:07:59 +00:00
|
|
|
return it.Error()
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// buildStorageNodesIncremental builds the storage diff node objects for all nodes that exist in a different state at B than A
|
2020-11-17 01:37:36 +00:00
|
|
|
func (sdb *builder) buildStorageNodesIncremental(oldSR common.Hash, newSR common.Hash, watchedStorageKeys []common.Hash, intermediateNodes bool, output sdtypes.StorageNodeSink) error {
|
2020-09-04 16:50:49 +00:00
|
|
|
if bytes.Equal(newSR.Bytes(), oldSR.Bytes()) {
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
log.Debug("Storage Roots for Incremental Diff", "old", oldSR.Hex(), "new", newSR.Hex())
|
|
|
|
oldTrie, err := sdb.stateCache.OpenTrie(oldSR)
|
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return err
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
newTrie, err := sdb.stateCache.OpenTrie(newSR)
|
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return err
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
2020-11-10 09:07:59 +00:00
|
|
|
diffPathsAtB, err := sdb.createdAndUpdatedStorage(oldTrie.NodeIterator([]byte{}), newTrie.NodeIterator([]byte{}), watchedStorageKeys, intermediateNodes, output)
|
2020-09-04 16:50:49 +00:00
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return err
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
2020-11-10 09:07:59 +00:00
|
|
|
err = sdb.deletedOrUpdatedStorage(oldTrie.NodeIterator([]byte{}), newTrie.NodeIterator([]byte{}), diffPathsAtB, watchedStorageKeys, intermediateNodes, output)
|
2020-09-04 16:50:49 +00:00
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return err
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
2020-11-17 01:37:36 +00:00
|
|
|
func (sdb *builder) createdAndUpdatedStorage(a, b trie.NodeIterator, watchedKeys []common.Hash, intermediateNodes bool, output sdtypes.StorageNodeSink) (map[string]bool, error) {
|
2020-09-04 16:50:49 +00:00
|
|
|
diffPathsAtB := make(map[string]bool)
|
|
|
|
it, _ := trie.NewDifferenceIterator(a, b)
|
|
|
|
for it.Next(true) {
|
2020-09-08 01:28:47 +00:00
|
|
|
if it.Leaf() || bytes.Equal(nullHashBytes, it.Hash().Bytes()) {
|
2020-09-04 16:50:49 +00:00
|
|
|
continue
|
|
|
|
}
|
2020-09-06 18:09:25 +00:00
|
|
|
node, nodeElements, err := resolveNode(it, sdb.stateCache.TrieDB())
|
2020-09-04 16:50:49 +00:00
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil, err
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
2020-09-06 18:09:25 +00:00
|
|
|
switch node.NodeType {
|
2020-11-17 01:37:36 +00:00
|
|
|
case sdtypes.Leaf:
|
2020-09-04 16:50:49 +00:00
|
|
|
partialPath := trie.CompactToHex(nodeElements[0].([]byte))
|
2020-09-06 18:09:25 +00:00
|
|
|
valueNodePath := append(node.Path, partialPath...)
|
2020-09-04 16:50:49 +00:00
|
|
|
encodedPath := trie.HexToCompact(valueNodePath)
|
|
|
|
leafKey := encodedPath[1:]
|
|
|
|
if isWatchedStorageKey(watchedKeys, leafKey) {
|
2020-11-17 01:37:36 +00:00
|
|
|
if err := output(sdtypes.StorageNode{
|
2020-09-06 18:09:25 +00:00
|
|
|
NodeType: node.NodeType,
|
|
|
|
Path: node.Path,
|
|
|
|
NodeValue: node.NodeValue,
|
2020-09-04 16:50:49 +00:00
|
|
|
LeafKey: leafKey,
|
2020-11-10 09:07:59 +00:00
|
|
|
}); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
2020-11-17 01:37:36 +00:00
|
|
|
case sdtypes.Extension, sdtypes.Branch:
|
2020-09-04 16:50:49 +00:00
|
|
|
if intermediateNodes {
|
2020-11-17 01:37:36 +00:00
|
|
|
if err := output(sdtypes.StorageNode{
|
2020-09-06 18:09:25 +00:00
|
|
|
NodeType: node.NodeType,
|
|
|
|
Path: node.Path,
|
|
|
|
NodeValue: node.NodeValue,
|
2020-11-10 09:07:59 +00:00
|
|
|
}); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
default:
|
2020-11-10 09:07:59 +00:00
|
|
|
return nil, fmt.Errorf("unexpected node type %s", node.NodeType)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
2020-09-06 18:09:25 +00:00
|
|
|
diffPathsAtB[common.Bytes2Hex(node.Path)] = true
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
2020-11-10 09:07:59 +00:00
|
|
|
return diffPathsAtB, it.Error()
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
2020-11-17 01:37:36 +00:00
|
|
|
func (sdb *builder) deletedOrUpdatedStorage(a, b trie.NodeIterator, diffPathsAtB map[string]bool, watchedKeys []common.Hash, intermediateNodes bool, output sdtypes.StorageNodeSink) error {
|
2020-09-04 16:50:49 +00:00
|
|
|
it, _ := trie.NewDifferenceIterator(b, a)
|
|
|
|
for it.Next(true) {
|
2020-09-08 01:28:47 +00:00
|
|
|
if it.Leaf() || bytes.Equal(nullHashBytes, it.Hash().Bytes()) {
|
2020-09-04 16:50:49 +00:00
|
|
|
continue
|
|
|
|
}
|
2020-09-06 18:09:25 +00:00
|
|
|
node, nodeElements, err := resolveNode(it, sdb.stateCache.TrieDB())
|
|
|
|
if err != nil {
|
2020-11-10 09:07:59 +00:00
|
|
|
return err
|
2020-09-06 18:09:25 +00:00
|
|
|
}
|
2020-09-04 16:50:49 +00:00
|
|
|
// if this node path showed up in diffPathsAtB
|
|
|
|
// that means this node was updated at B and we already have the updated diff for it
|
|
|
|
// otherwise that means this node was deleted in B and we need to add a "removed" diff to represent that event
|
2020-09-06 18:09:25 +00:00
|
|
|
if _, ok := diffPathsAtB[common.Bytes2Hex(node.Path)]; ok {
|
2020-09-04 16:50:49 +00:00
|
|
|
continue
|
|
|
|
}
|
2020-09-06 18:09:25 +00:00
|
|
|
switch node.NodeType {
|
2020-11-17 01:37:36 +00:00
|
|
|
case sdtypes.Leaf:
|
2020-09-04 16:50:49 +00:00
|
|
|
partialPath := trie.CompactToHex(nodeElements[0].([]byte))
|
2020-09-06 18:09:25 +00:00
|
|
|
valueNodePath := append(node.Path, partialPath...)
|
2020-09-04 16:50:49 +00:00
|
|
|
encodedPath := trie.HexToCompact(valueNodePath)
|
|
|
|
leafKey := encodedPath[1:]
|
|
|
|
if isWatchedStorageKey(watchedKeys, leafKey) {
|
2020-11-17 01:37:36 +00:00
|
|
|
if err := output(sdtypes.StorageNode{
|
|
|
|
NodeType: sdtypes.Removed,
|
2020-09-06 18:09:25 +00:00
|
|
|
Path: node.Path,
|
2020-09-04 16:50:49 +00:00
|
|
|
NodeValue: []byte{},
|
2021-03-24 22:46:20 +00:00
|
|
|
LeafKey: leafKey,
|
2020-11-10 09:07:59 +00:00
|
|
|
}); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
2020-11-17 01:37:36 +00:00
|
|
|
case sdtypes.Extension, sdtypes.Branch:
|
2020-09-04 16:50:49 +00:00
|
|
|
if intermediateNodes {
|
2020-11-17 01:37:36 +00:00
|
|
|
if err := output(sdtypes.StorageNode{
|
|
|
|
NodeType: sdtypes.Removed,
|
2020-09-06 18:09:25 +00:00
|
|
|
Path: node.Path,
|
2020-09-04 16:50:49 +00:00
|
|
|
NodeValue: []byte{},
|
2020-11-10 09:07:59 +00:00
|
|
|
}); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
default:
|
2020-11-10 09:07:59 +00:00
|
|
|
return fmt.Errorf("unexpected node type %s", node.NodeType)
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
}
|
2020-11-10 09:07:59 +00:00
|
|
|
return it.Error()
|
2020-09-04 16:50:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// isWatchedAddress is used to check if a state account corresponds to one of the addresses the builder is configured to watch
|
|
|
|
func isWatchedAddress(watchedAddresses []common.Address, stateLeafKey []byte) bool {
|
|
|
|
// If we aren't watching any specific addresses, we are watching everything
|
|
|
|
if len(watchedAddresses) == 0 {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
for _, addr := range watchedAddresses {
|
|
|
|
addrHashKey := crypto.Keccak256(addr.Bytes())
|
|
|
|
if bytes.Equal(addrHashKey, stateLeafKey) {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
// isWatchedStorageKey is used to check if a storage leaf corresponds to one of the storage slots the builder is configured to watch
|
|
|
|
func isWatchedStorageKey(watchedKeys []common.Hash, storageLeafKey []byte) bool {
|
|
|
|
// If we aren't watching any specific addresses, we are watching everything
|
|
|
|
if len(watchedKeys) == 0 {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
for _, hashKey := range watchedKeys {
|
|
|
|
if bytes.Equal(hashKey.Bytes(), storageLeafKey) {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|