tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/state, trie: node iterator reports parent hashes too

Browse Source
This commit is contained in:
Péter Szilágyi 2016-01-08 13:46:45 +02:00
parent 5a057a8ded
commit 151c7bef41
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/state/iterator.go
View File

@ -34,11 +34,13 @@ type NodeIterator struct {
stateIt *trie.NodeIterator // Primary iterator for the global state trie
dataIt *trie.NodeIterator // Secondary iterator for the data trie of a contract
codeHash common.Hash // Hash of the contract source code
code []byte // Source code associated with a contract
accountHash common.Hash // Hash of the node containing the account
codeHash common.Hash // Hash of the contract source code
code []byte // Source code associated with a contract
Hash common.Hash // Hash of the current entry being iterated (nil if not standalone)
Entry interface{} // Current state entry being iterated (internal representation)
Hash common.Hash // Hash of the current entry being iterated (nil if not standalone)
Entry interface{} // Current state entry being iterated (internal representation)
Parent common.Hash // Hash of the first full ancestor node (nil if current is the root)
}
// NewNodeIterator creates an post-order state node iterator.
@ -112,6 +114,7 @@ func (it *NodeIterator) step() {
panic(fmt.Sprintf("code %x: %v", account.CodeHash, err))
}
}
it.accountHash = it.stateIt.Parent
}
// retrieve pulls and caches the current state entry the iterator is traversing.
@ -127,11 +130,14 @@ func (it *NodeIterator) retrieve() bool {
// Otherwise retrieve the current entry
switch {
case it.dataIt != nil:
it.Hash, it.Entry = it.dataIt.Hash, it.dataIt.Node
it.Hash, it.Entry, it.Parent = it.dataIt.Hash, it.dataIt.Node, it.dataIt.Parent
if it.Parent == (common.Hash{}) {
it.Parent = it.accountHash
}
case it.code != nil:
it.Hash, it.Entry = it.codeHash, it.code
it.Hash, it.Entry, it.Parent = it.codeHash, it.code, it.accountHash
case it.stateIt != nil:
it.Hash, it.Entry = it.stateIt.Hash, it.stateIt.Node
it.Hash, it.Entry, it.Parent = it.stateIt.Hash, it.stateIt.Node, it.stateIt.Parent
}
return true
}

22
trie/iterator.go
View File

@ -153,9 +153,10 @@ func (self *Iterator) key(node interface{}) []byte {
// nodeIteratorState represents the iteration state at one particular node of the
// trie, which can be resumed at a later invocation.
type nodeIteratorState struct {
hash common.Hash // Hash of the node being iterated (nil if not standalone)
node node // Trie node being iterated
child int // Child to be processed next
hash common.Hash // Hash of the node being iterated (nil if not standalone)
node node // Trie node being iterated
parent common.Hash // Hash of the first full ancestor node (nil if current is the root)
child int // Child to be processed next
}
// NodeIterator is an iterator to traverse the trie post-order.
@ -165,6 +166,7 @@ type NodeIterator struct {
Hash common.Hash // Hash of the current node being iterated (nil if not standalone)
Node node // Current node being iterated (internal representation)
Parent common.Hash // Hash of the first full ancestor node (nil if current is the root)
Leaf bool // Flag whether the current node is a value (data) node
LeafBlob []byte // Data blob contained within a leaf (otherwise nil)
}
@ -206,6 +208,10 @@ func (it *NodeIterator) step() {
// Continue iteration to the next child
for {
parent := it.stack[len(it.stack)-1]
ancestor := parent.hash
if (ancestor == common.Hash{}) {
ancestor = parent.parent
}
if node, ok := parent.node.(fullNode); ok {
// Full node, traverse all children, then the node itself
if parent.child >= len(node) {
@ -213,7 +219,7 @@ func (it *NodeIterator) step() {
}
for parent.child++; parent.child < len(node); parent.child++ {
if current := node[parent.child]; current != nil {
it.stack = append(it.stack, &nodeIteratorState{node: current, child: -1})
it.stack = append(it.stack, &nodeIteratorState{node: current, parent: ancestor, child: -1})
break
}
}
@ -223,7 +229,7 @@ func (it *NodeIterator) step() {
break
}
parent.child++
it.stack = append(it.stack, &nodeIteratorState{node: node.Val, child: -1})
it.stack = append(it.stack, &nodeIteratorState{node: node.Val, parent: ancestor, child: -1})
} else if hash, ok := parent.node.(hashNode); ok {
// Hash node, resolve the hash child from the database, then the node itself
if parent.child >= 0 {
@ -235,7 +241,7 @@ func (it *NodeIterator) step() {
if err != nil {
panic(err)
}
it.stack = append(it.stack, &nodeIteratorState{hash: common.BytesToHash(hash), node: node, child: -1})
it.stack = append(it.stack, &nodeIteratorState{hash: common.BytesToHash(hash), node: node, parent: ancestor, child: -1})
} else {
break
}
@ -249,7 +255,7 @@ func (it *NodeIterator) step() {
// The method returns whether there are any more data left for inspection.
func (it *NodeIterator) retrieve() bool {
// Clear out any previously set values
it.Hash, it.Node, it.Leaf, it.LeafBlob = common.Hash{}, nil, false, nil
it.Hash, it.Node, it.Parent, it.Leaf, it.LeafBlob = common.Hash{}, nil, common.Hash{}, false, nil
// If the iteration's done, return no available data
if it.trie == nil {
@ -258,7 +264,7 @@ func (it *NodeIterator) retrieve() bool {
// Otherwise retrieve the current node and resolve leaf accessors
state := it.stack[len(it.stack)-1]
it.Hash, it.Node = state.hash, state.node
it.Hash, it.Node, it.Parent = state.hash, state.node, state.parent
if value, ok := it.Node.(valueNode); ok {
it.Leaf, it.LeafBlob = true, []byte(value)
}