verkle: Implement Trie, NodeIterator and Database ifs Fix crash in TestDump Fix TestDump Fix TrieCopy remove unnecessary traces fix: Error() returned errIteratorEnd in verkle node iterator rewrite the iterator and change the signature of OpenStorageTrie add the adapter to reuse the account trie for storage don't try to deserialize a storage leaf into an account Fix statedb unit tests (#14) * debug code * Fix more unit tests * remove traces * Go back to the full range One tree to rule them all remove updateRoot, there is no root to update store code inside the account leaf fix build save current state for Sina Update go-verkle to latest Charge WITNESS_*_COST gas on storage loads Add witness costs for SSTORE as well Charge witness gas in the case of code execution corresponding code deletion add a --verkle flag to separate verkle experiments from regular geth operations use the snapshot to get data stateless execution from block witness AccessWitness functions Add block generation test + genesis snapshot generation test stateless block execution (#18) * test stateless block execution * Force tree resolution before generating the proof increased coverage in stateless test execution (#19) * test stateless block execution * Force tree resolution before generating the proof * increase coverage in stateless test execution ensure geth compiles fix issues in tests with verkle trees deactivated Ensure stateless data is available when executing statelessly (#20) * Ensure stateless data is available when executing statelessly * Actual execution of a statless block * bugfixes in stateless block execution * code cleanup - Reduce PR footprint by reverting NewEVM to its original signature - Move the access witness to the block context - prepare for a change in AW semantics Need to store the initial values. - Use the touch helper function, DRY * revert the signature of MustCommit to its original form (#21) fix leaf proofs in stateless execution (#22) * Fixes in witness pre-state * Add the recipient's nonce to the witness * reduce PR footprint and investigate issue in root state calculation * quick build fix cleanup: Remove extra parameter in ToBlock revert ToBlock to its older signature fix import cycle in vm tests fix linter issue fix appveyor build fix nil pointers in tests Add indices, yis and Cis to the block's Verkle proof upgrade geth dependency to drop geth's common dep fix cmd/devp2p tests fix rebase issues quell an appveyor warning fix address touching in SLOAD and SSTORE fix access witness for code size touch target account data before calling make sure the proper locations get touched in (ext)codecopy touch all code pages in execution add pushdata to witness remove useless code in genesis snapshot generation testnet: fix some of the rebase/drift issues Fix verkle proof generation in block fix an issue occuring when chunking past the code size fix: ensure the code copy doesn't extend past the code size
165 lines
5.2 KiB
Go
165 lines
5.2 KiB
Go
// Copyright 2015 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/>.
|
|
|
|
package state
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
"github.com/ethereum/go-ethereum/rlp"
|
|
"github.com/ethereum/go-ethereum/trie"
|
|
)
|
|
|
|
// NodeIterator is an iterator to traverse the entire state trie post-order,
|
|
// including all of the contract code and contract state tries.
|
|
type NodeIterator struct {
|
|
state *StateDB // State being iterated
|
|
|
|
stateIt trie.NodeIterator // Primary iterator for the global state trie
|
|
dataIt trie.NodeIterator // Secondary iterator for the data trie of 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)
|
|
Parent common.Hash // Hash of the first full ancestor node (nil if current is the root)
|
|
|
|
Error error // Failure set in case of an internal error in the iterator
|
|
}
|
|
|
|
// NewNodeIterator creates an post-order state node iterator.
|
|
func NewNodeIterator(state *StateDB) *NodeIterator {
|
|
return &NodeIterator{
|
|
state: state,
|
|
}
|
|
}
|
|
|
|
// Next moves the iterator to the next node, returning whether there are any
|
|
// further nodes. In case of an internal error this method returns false and
|
|
// sets the Error field to the encountered failure.
|
|
func (it *NodeIterator) Next() bool {
|
|
// If the iterator failed previously, don't do anything
|
|
if it.Error != nil {
|
|
return false
|
|
}
|
|
// Otherwise step forward with the iterator and report any errors
|
|
if err := it.step(); err != nil {
|
|
it.Error = err
|
|
return false
|
|
}
|
|
return it.retrieve()
|
|
}
|
|
|
|
// step moves the iterator to the next entry of the state trie.
|
|
func (it *NodeIterator) step() error {
|
|
// Abort if we reached the end of the iteration
|
|
if it.state == nil {
|
|
return nil
|
|
}
|
|
// Initialize the iterator if we've just started
|
|
if it.stateIt == nil {
|
|
it.stateIt = it.state.trie.NodeIterator(nil)
|
|
|
|
// If the trie is a verkle trie, then the data and state
|
|
// are the same tree, and as a result both iterators are
|
|
// the same. This is a hack meant for both tree types to
|
|
// work.
|
|
if _, ok := it.state.trie.(*trie.VerkleTrie); ok {
|
|
it.dataIt = it.stateIt
|
|
}
|
|
}
|
|
// If we had data nodes previously, we surely have at least state nodes
|
|
if it.dataIt != nil {
|
|
if cont := it.dataIt.Next(true); !cont {
|
|
if it.dataIt.Error() != nil {
|
|
return it.dataIt.Error()
|
|
}
|
|
it.dataIt = nil
|
|
}
|
|
return nil
|
|
}
|
|
// If we had source code previously, discard that
|
|
if it.code != nil {
|
|
it.code = nil
|
|
return nil
|
|
}
|
|
// Step to the next state trie node, terminating if we're out of nodes
|
|
if cont := it.stateIt.Next(true); !cont {
|
|
if it.stateIt.Error() != nil {
|
|
return it.stateIt.Error()
|
|
}
|
|
it.state, it.stateIt = nil, nil
|
|
return nil
|
|
}
|
|
// If the state trie node is an internal entry, leave as is.
|
|
if !it.stateIt.Leaf() {
|
|
return nil
|
|
}
|
|
|
|
// Otherwise we've reached an account node, initiate data iteration
|
|
var account types.StateAccount
|
|
if err := rlp.Decode(bytes.NewReader(it.stateIt.LeafBlob()), &account); err != nil {
|
|
return err
|
|
}
|
|
dataTrie, err := it.state.db.OpenStorageTrie(common.BytesToHash(it.stateIt.LeafKey()), account.Root)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
it.dataIt = dataTrie.NodeIterator(nil)
|
|
if !it.dataIt.Next(true) {
|
|
it.dataIt = nil
|
|
}
|
|
if !bytes.Equal(account.CodeHash, emptyCodeHash) {
|
|
it.codeHash = common.BytesToHash(account.CodeHash)
|
|
addrHash := common.BytesToHash(it.stateIt.LeafKey())
|
|
it.code, err = it.state.db.ContractCode(addrHash, common.BytesToHash(account.CodeHash))
|
|
if err != nil {
|
|
return fmt.Errorf("code %x: %v", account.CodeHash, err)
|
|
}
|
|
}
|
|
it.accountHash = it.stateIt.Parent()
|
|
return nil
|
|
}
|
|
|
|
// retrieve pulls and caches the current state entry the iterator is traversing.
|
|
// 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 = common.Hash{}
|
|
|
|
// If the iteration's done, return no available data
|
|
if it.state == nil {
|
|
return false
|
|
}
|
|
// Otherwise retrieve the current entry
|
|
switch {
|
|
case it.dataIt != nil:
|
|
it.Hash, it.Parent = it.dataIt.Hash(), it.dataIt.Parent()
|
|
if it.Parent == (common.Hash{}) {
|
|
it.Parent = it.accountHash
|
|
}
|
|
case it.code != nil:
|
|
it.Hash, it.Parent = it.codeHash, it.accountHash
|
|
case it.stateIt != nil:
|
|
it.Hash, it.Parent = it.stateIt.Hash(), it.stateIt.Parent()
|
|
}
|
|
return true
|
|
}
|