|
|
|
// 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 light
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"errors"
|
|
|
|
"fmt"
|
|
|
|
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
|
|
"github.com/ethereum/go-ethereum/core/rawdb"
|
|
|
|
"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/ethdb"
|
|
|
|
"github.com/ethereum/go-ethereum/rlp"
|
|
|
|
"github.com/ethereum/go-ethereum/trie"
|
|
|
|
"github.com/ethereum/go-ethereum/trie/trienode"
|
|
|
|
)
|
|
|
|
|
|
|
|
var (
|
|
|
|
sha3Nil = crypto.Keccak256Hash(nil)
|
|
|
|
)
|
|
|
|
|
|
|
|
func NewState(ctx context.Context, head *types.Header, odr OdrBackend) *state.StateDB {
|
|
|
|
state, _ := state.New(head.Root, NewStateDatabase(ctx, head, odr), nil)
|
|
|
|
return state
|
|
|
|
}
|
|
|
|
|
|
|
|
func NewStateDatabase(ctx context.Context, head *types.Header, odr OdrBackend) state.Database {
|
|
|
|
return &odrDatabase{ctx, StateTrieID(head), odr}
|
|
|
|
}
|
|
|
|
|
|
|
|
type odrDatabase struct {
|
|
|
|
ctx context.Context
|
|
|
|
id *TrieID
|
|
|
|
backend OdrBackend
|
|
|
|
}
|
|
|
|
|
|
|
|
func (db *odrDatabase) OpenTrie(root common.Hash) (state.Trie, error) {
|
|
|
|
return &odrTrie{db: db, id: db.id}, nil
|
|
|
|
}
|
|
|
|
|
core/state, light, les: make signature of ContractCode hash-independent (#27209)
* core/state, light, les: make signature of ContractCode hash-independent
* push current state for feedback
* les: fix unit test
* core, les, light: fix les unittests
* core/state, trie, les, light: fix state iterator
* core, les: address comments
* les: fix lint
---------
Co-authored-by: Gary Rong <garyrong0905@gmail.com>
1 year ago
|
|
|
func (db *odrDatabase) OpenStorageTrie(stateRoot common.Hash, address common.Address, root common.Hash) (state.Trie, error) {
|
|
|
|
return &odrTrie{db: db, id: StorageTrieID(db.id, address, root)}, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (db *odrDatabase) CopyTrie(t state.Trie) state.Trie {
|
|
|
|
switch t := t.(type) {
|
|
|
|
case *odrTrie:
|
|
|
|
cpy := &odrTrie{db: t.db, id: t.id}
|
|
|
|
if t.trie != nil {
|
cmd, core, eth, les, light: track deleted nodes (#25757)
* cmd, core, eth, les, light: track deleted nodes
* trie: add docs
* trie: address comments
* cmd, core, eth, les, light, trie: trie id
* trie: add tests
* trie, core: updates
* trie: fix imports
* trie: add utility print-method for nodeset
* trie: import err
* trie: fix go vet warnings
Co-authored-by: Martin Holst Swende <martin@swende.se>
2 years ago
|
|
|
cpy.trie = t.trie.Copy()
|
|
|
|
}
|
|
|
|
return cpy
|
|
|
|
default:
|
|
|
|
panic(fmt.Errorf("unknown trie type %T", t))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
core/state, light, les: make signature of ContractCode hash-independent (#27209)
* core/state, light, les: make signature of ContractCode hash-independent
* push current state for feedback
* les: fix unit test
* core, les, light: fix les unittests
* core/state, trie, les, light: fix state iterator
* core, les: address comments
* les: fix lint
---------
Co-authored-by: Gary Rong <garyrong0905@gmail.com>
1 year ago
|
|
|
func (db *odrDatabase) ContractCode(addr common.Address, codeHash common.Hash) ([]byte, error) {
|
|
|
|
if codeHash == sha3Nil {
|
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
code := rawdb.ReadCode(db.backend.Database(), codeHash)
|
|
|
|
if len(code) != 0 {
|
|
|
|
return code, nil
|
|
|
|
}
|
|
|
|
id := *db.id
|
core/state, light, les: make signature of ContractCode hash-independent (#27209)
* core/state, light, les: make signature of ContractCode hash-independent
* push current state for feedback
* les: fix unit test
* core, les, light: fix les unittests
* core/state, trie, les, light: fix state iterator
* core, les: address comments
* les: fix lint
---------
Co-authored-by: Gary Rong <garyrong0905@gmail.com>
1 year ago
|
|
|
id.AccountAddress = addr[:]
|
|
|
|
req := &CodeRequest{Id: &id, Hash: codeHash}
|
|
|
|
err := db.backend.Retrieve(db.ctx, req)
|
|
|
|
return req.Data, err
|
|
|
|
}
|
|
|
|
|
core/state, light, les: make signature of ContractCode hash-independent (#27209)
* core/state, light, les: make signature of ContractCode hash-independent
* push current state for feedback
* les: fix unit test
* core, les, light: fix les unittests
* core/state, trie, les, light: fix state iterator
* core, les: address comments
* les: fix lint
---------
Co-authored-by: Gary Rong <garyrong0905@gmail.com>
1 year ago
|
|
|
func (db *odrDatabase) ContractCodeSize(addr common.Address, codeHash common.Hash) (int, error) {
|
|
|
|
code, err := db.ContractCode(addr, codeHash)
|
|
|
|
return len(code), err
|
|
|
|
}
|
|
|
|
|
|
|
|
func (db *odrDatabase) TrieDB() *trie.Database {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (db *odrDatabase) DiskDB() ethdb.KeyValueStore {
|
|
|
|
panic("not implemented")
|
|
|
|
}
|
|
|
|
|
|
|
|
type odrTrie struct {
|
|
|
|
db *odrDatabase
|
|
|
|
id *TrieID
|
|
|
|
trie *trie.Trie
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *odrTrie) GetStorage(_ common.Address, key []byte) ([]byte, error) {
|
|
|
|
key = crypto.Keccak256(key)
|
|
|
|
var enc []byte
|
|
|
|
err := t.do(key, func() (err error) {
|
|
|
|
enc, err = t.trie.Get(key)
|
|
|
|
return err
|
|
|
|
})
|
|
|
|
if err != nil || len(enc) == 0 {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
_, content, _, err := rlp.Split(enc)
|
|
|
|
return content, err
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *odrTrie) GetAccount(address common.Address) (*types.StateAccount, error) {
|
|
|
|
var (
|
|
|
|
enc []byte
|
|
|
|
key = crypto.Keccak256(address.Bytes())
|
|
|
|
)
|
|
|
|
err := t.do(key, func() (err error) {
|
|
|
|
enc, err = t.trie.Get(key)
|
|
|
|
return err
|
|
|
|
})
|
|
|
|
if err != nil || len(enc) == 0 {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
acct := new(types.StateAccount)
|
|
|
|
if err := rlp.DecodeBytes(enc, acct); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return acct, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *odrTrie) UpdateAccount(address common.Address, acc *types.StateAccount) error {
|
|
|
|
key := crypto.Keccak256(address.Bytes())
|
|
|
|
value, err := rlp.EncodeToBytes(acc)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("decoding error in account update: %w", err)
|
|
|
|
}
|
|
|
|
return t.do(key, func() error {
|
|
|
|
return t.trie.Update(key, value)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *odrTrie) UpdateContractCode(_ common.Address, _ common.Hash, _ []byte) error {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *odrTrie) UpdateStorage(_ common.Address, key, value []byte) error {
|
|
|
|
key = crypto.Keccak256(key)
|
|
|
|
v, _ := rlp.EncodeToBytes(value)
|
|
|
|
return t.do(key, func() error {
|
|
|
|
return t.trie.Update(key, v)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *odrTrie) DeleteStorage(_ common.Address, key []byte) error {
|
|
|
|
key = crypto.Keccak256(key)
|
|
|
|
return t.do(key, func() error {
|
|
|
|
return t.trie.Delete(key)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
// DeleteAccount abstracts an account deletion from the trie.
|
|
|
|
func (t *odrTrie) DeleteAccount(address common.Address) error {
|
|
|
|
key := crypto.Keccak256(address.Bytes())
|
|
|
|
return t.do(key, func() error {
|
|
|
|
return t.trie.Delete(key)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *odrTrie) Commit(collectLeaf bool) (common.Hash, *trienode.NodeSet, error) {
|
|
|
|
if t.trie == nil {
|
|
|
|
return t.id.Root, nil, nil
|
|
|
|
}
|
|
|
|
return t.trie.Commit(collectLeaf)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *odrTrie) Hash() common.Hash {
|
|
|
|
if t.trie == nil {
|
|
|
|
return t.id.Root
|
|
|
|
}
|
|
|
|
return t.trie.Hash()
|
|
|
|
}
|
|
|
|
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
1 year ago
|
|
|
func (t *odrTrie) NodeIterator(startkey []byte) (trie.NodeIterator, error) {
|
|
|
|
return newNodeIterator(t, startkey), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *odrTrie) GetKey(sha []byte) []byte {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *odrTrie) Prove(key []byte, proofDb ethdb.KeyValueWriter) error {
|
|
|
|
return errors.New("not implemented, needs client/server interface split")
|
|
|
|
}
|
|
|
|
|
|
|
|
// do tries and retries to execute a function until it returns with no error or
|
|
|
|
// an error type other than MissingNodeError
|
|
|
|
func (t *odrTrie) do(key []byte, fn func() error) error {
|
|
|
|
for {
|
|
|
|
var err error
|
|
|
|
if t.trie == nil {
|
cmd, core, eth, les, light: track deleted nodes (#25757)
* cmd, core, eth, les, light: track deleted nodes
* trie: add docs
* trie: address comments
* cmd, core, eth, les, light, trie: trie id
* trie: add tests
* trie, core: updates
* trie: fix imports
* trie: add utility print-method for nodeset
* trie: import err
* trie: fix go vet warnings
Co-authored-by: Martin Holst Swende <martin@swende.se>
2 years ago
|
|
|
var id *trie.ID
|
core/state, light, les: make signature of ContractCode hash-independent (#27209)
* core/state, light, les: make signature of ContractCode hash-independent
* push current state for feedback
* les: fix unit test
* core, les, light: fix les unittests
* core/state, trie, les, light: fix state iterator
* core, les: address comments
* les: fix lint
---------
Co-authored-by: Gary Rong <garyrong0905@gmail.com>
1 year ago
|
|
|
if len(t.id.AccountAddress) > 0 {
|
|
|
|
id = trie.StorageTrieID(t.id.StateRoot, crypto.Keccak256Hash(t.id.AccountAddress), t.id.Root)
|
cmd, core, eth, les, light: track deleted nodes (#25757)
* cmd, core, eth, les, light: track deleted nodes
* trie: add docs
* trie: address comments
* cmd, core, eth, les, light, trie: trie id
* trie: add tests
* trie, core: updates
* trie: fix imports
* trie: add utility print-method for nodeset
* trie: import err
* trie: fix go vet warnings
Co-authored-by: Martin Holst Swende <martin@swende.se>
2 years ago
|
|
|
} else {
|
|
|
|
id = trie.StateTrieID(t.id.StateRoot)
|
|
|
|
}
|
cmd, core, eth, les, light: track deleted nodes (#25757)
* cmd, core, eth, les, light: track deleted nodes
* trie: add docs
* trie: address comments
* cmd, core, eth, les, light, trie: trie id
* trie: add tests
* trie, core: updates
* trie: fix imports
* trie: add utility print-method for nodeset
* trie: import err
* trie: fix go vet warnings
Co-authored-by: Martin Holst Swende <martin@swende.se>
2 years ago
|
|
|
t.trie, err = trie.New(id, trie.NewDatabase(t.db.backend.Database()))
|
|
|
|
}
|
|
|
|
if err == nil {
|
|
|
|
err = fn()
|
|
|
|
}
|
|
|
|
if _, ok := err.(*trie.MissingNodeError); !ok {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
r := &TrieRequest{Id: t.id, Key: key}
|
|
|
|
if err := t.db.backend.Retrieve(t.db.ctx, r); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type nodeIterator struct {
|
|
|
|
trie.NodeIterator
|
|
|
|
t *odrTrie
|
|
|
|
err error
|
|
|
|
}
|
|
|
|
|
|
|
|
func newNodeIterator(t *odrTrie, startkey []byte) trie.NodeIterator {
|
|
|
|
it := &nodeIterator{t: t}
|
|
|
|
// Open the actual non-ODR trie if that hasn't happened yet.
|
|
|
|
if t.trie == nil {
|
|
|
|
it.do(func() error {
|
cmd, core, eth, les, light: track deleted nodes (#25757)
* cmd, core, eth, les, light: track deleted nodes
* trie: add docs
* trie: address comments
* cmd, core, eth, les, light, trie: trie id
* trie: add tests
* trie, core: updates
* trie: fix imports
* trie: add utility print-method for nodeset
* trie: import err
* trie: fix go vet warnings
Co-authored-by: Martin Holst Swende <martin@swende.se>
2 years ago
|
|
|
var id *trie.ID
|
core/state, light, les: make signature of ContractCode hash-independent (#27209)
* core/state, light, les: make signature of ContractCode hash-independent
* push current state for feedback
* les: fix unit test
* core, les, light: fix les unittests
* core/state, trie, les, light: fix state iterator
* core, les: address comments
* les: fix lint
---------
Co-authored-by: Gary Rong <garyrong0905@gmail.com>
1 year ago
|
|
|
if len(t.id.AccountAddress) > 0 {
|
|
|
|
id = trie.StorageTrieID(t.id.StateRoot, crypto.Keccak256Hash(t.id.AccountAddress), t.id.Root)
|
cmd, core, eth, les, light: track deleted nodes (#25757)
* cmd, core, eth, les, light: track deleted nodes
* trie: add docs
* trie: address comments
* cmd, core, eth, les, light, trie: trie id
* trie: add tests
* trie, core: updates
* trie: fix imports
* trie: add utility print-method for nodeset
* trie: import err
* trie: fix go vet warnings
Co-authored-by: Martin Holst Swende <martin@swende.se>
2 years ago
|
|
|
} else {
|
|
|
|
id = trie.StateTrieID(t.id.StateRoot)
|
|
|
|
}
|
cmd, core, eth, les, light: track deleted nodes (#25757)
* cmd, core, eth, les, light: track deleted nodes
* trie: add docs
* trie: address comments
* cmd, core, eth, les, light, trie: trie id
* trie: add tests
* trie, core: updates
* trie: fix imports
* trie: add utility print-method for nodeset
* trie: import err
* trie: fix go vet warnings
Co-authored-by: Martin Holst Swende <martin@swende.se>
2 years ago
|
|
|
t, err := trie.New(id, trie.NewDatabase(t.db.backend.Database()))
|
|
|
|
if err == nil {
|
|
|
|
it.t.trie = t
|
|
|
|
}
|
|
|
|
return err
|
|
|
|
})
|
|
|
|
}
|
|
|
|
it.do(func() error {
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
1 year ago
|
|
|
var err error
|
|
|
|
it.NodeIterator, err = it.t.trie.NodeIterator(startkey)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return it.NodeIterator.Error()
|
|
|
|
})
|
|
|
|
return it
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *nodeIterator) Next(descend bool) bool {
|
|
|
|
var ok bool
|
|
|
|
it.do(func() error {
|
|
|
|
ok = it.NodeIterator.Next(descend)
|
|
|
|
return it.NodeIterator.Error()
|
|
|
|
})
|
|
|
|
return ok
|
|
|
|
}
|
|
|
|
|
|
|
|
// do runs fn and attempts to fill in missing nodes by retrieving.
|
|
|
|
func (it *nodeIterator) do(fn func() error) {
|
|
|
|
var lasthash common.Hash
|
|
|
|
for {
|
|
|
|
it.err = fn()
|
|
|
|
missing, ok := it.err.(*trie.MissingNodeError)
|
|
|
|
if !ok {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if missing.NodeHash == lasthash {
|
|
|
|
it.err = fmt.Errorf("retrieve loop for trie node %x", missing.NodeHash)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
lasthash = missing.NodeHash
|
|
|
|
r := &TrieRequest{Id: it.t.id, Key: nibblesToKey(missing.Path)}
|
|
|
|
if it.err = it.t.db.backend.Retrieve(it.t.db.ctx, r); it.err != nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (it *nodeIterator) Error() error {
|
|
|
|
if it.err != nil {
|
|
|
|
return it.err
|
|
|
|
}
|
|
|
|
return it.NodeIterator.Error()
|
|
|
|
}
|
|
|
|
|
|
|
|
func nibblesToKey(nib []byte) []byte {
|
|
|
|
if len(nib) > 0 && nib[len(nib)-1] == 0x10 {
|
|
|
|
nib = nib[:len(nib)-1] // drop terminator
|
|
|
|
}
|
|
|
|
if len(nib)&1 == 1 {
|
|
|
|
nib = append(nib, 0) // make even
|
|
|
|
}
|
|
|
|
key := make([]byte, len(nib)/2)
|
|
|
|
for bi, ni := 0, 0; ni < len(nib); bi, ni = bi+1, ni+2 {
|
|
|
|
key[bi] = nib[ni]<<4 | nib[ni+1]
|
|
|
|
}
|
|
|
|
return key
|
|
|
|
}
|