|
|
|
// Copyright 2017 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 eth
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
|
|
|
"fmt"
|
|
|
|
"math/big"
|
|
|
|
"reflect"
|
|
|
|
"testing"
|
|
|
|
|
|
|
|
"github.com/davecgh/go-spew/spew"
|
|
|
|
"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/trie"
|
|
|
|
"golang.org/x/exp/slices"
|
|
|
|
)
|
|
|
|
|
|
|
|
var dumper = spew.ConfigState{Indent: " "}
|
|
|
|
|
|
|
|
func accountRangeTest(t *testing.T, trie *state.Trie, statedb *state.StateDB, start common.Hash, requestedNum int, expectedNum int) state.IteratorDump {
|
cmd/geth, eth, core: snapshot dump + unify with trie dump (#22795)
* cmd/geth, eth, core: snapshot dump + unify with trie dump
* cmd/evm: dump API fixes
* cmd/geth, core, eth: fix some remaining errors
* cmd/evm: dump - add limit, support address startkey, address review concerns
* cmd, core/state, eth: minor polishes, fix snap dump crash, unify format
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
4 years ago
|
|
|
result := statedb.IteratorDump(&state.DumpConfig{
|
|
|
|
SkipCode: true,
|
|
|
|
SkipStorage: true,
|
|
|
|
OnlyWithAddresses: false,
|
|
|
|
Start: start.Bytes(),
|
|
|
|
Max: uint64(requestedNum),
|
|
|
|
})
|
|
|
|
|
|
|
|
if len(result.Accounts) != expectedNum {
|
|
|
|
t.Fatalf("expected %d results, got %d", expectedNum, len(result.Accounts))
|
|
|
|
}
|
|
|
|
for address := range result.Accounts {
|
|
|
|
if address == (common.Address{}) {
|
|
|
|
t.Fatalf("empty address returned")
|
|
|
|
}
|
|
|
|
if !statedb.Exist(address) {
|
|
|
|
t.Fatalf("account not found in state %s", address.Hex())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestAccountRange(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
var (
|
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
|
|
|
statedb = state.NewDatabaseWithConfig(rawdb.NewMemoryDatabase(), &trie.Config{Preimages: true})
|
|
|
|
sdb, _ = state.New(types.EmptyRootHash, statedb, nil)
|
|
|
|
addrs = [AccountRangeMaxResults * 2]common.Address{}
|
|
|
|
m = map[common.Address]bool{}
|
|
|
|
)
|
|
|
|
|
|
|
|
for i := range addrs {
|
|
|
|
hash := common.HexToHash(fmt.Sprintf("%x", i))
|
|
|
|
addr := common.BytesToAddress(crypto.Keccak256Hash(hash.Bytes()).Bytes())
|
|
|
|
addrs[i] = addr
|
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
|
|
|
sdb.SetBalance(addrs[i], big.NewInt(1))
|
|
|
|
if _, ok := m[addr]; ok {
|
|
|
|
t.Fatalf("bad")
|
|
|
|
} else {
|
|
|
|
m[addr] = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
root, _ := sdb.Commit(0, true)
|
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
|
|
|
sdb, _ = state.New(root, statedb, nil)
|
|
|
|
|
|
|
|
trie, err := statedb.OpenTrie(root)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
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
|
|
|
accountRangeTest(t, &trie, sdb, common.Hash{}, AccountRangeMaxResults/2, AccountRangeMaxResults/2)
|
|
|
|
// test pagination
|
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
|
|
|
firstResult := accountRangeTest(t, &trie, sdb, common.Hash{}, AccountRangeMaxResults, AccountRangeMaxResults)
|
|
|
|
secondResult := accountRangeTest(t, &trie, sdb, common.BytesToHash(firstResult.Next), AccountRangeMaxResults, AccountRangeMaxResults)
|
|
|
|
|
|
|
|
hList := make([]common.Hash, 0)
|
|
|
|
for addr1 := range firstResult.Accounts {
|
|
|
|
// If address is empty, then it makes no sense to compare
|
|
|
|
// them as they might be two different accounts.
|
|
|
|
if addr1 == (common.Address{}) {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if _, duplicate := secondResult.Accounts[addr1]; duplicate {
|
|
|
|
t.Fatalf("pagination test failed: results should not overlap")
|
|
|
|
}
|
|
|
|
hList = append(hList, crypto.Keccak256Hash(addr1.Bytes()))
|
|
|
|
}
|
|
|
|
// Test to see if it's possible to recover from the middle of the previous
|
|
|
|
// set and get an even split between the first and second sets.
|
|
|
|
slices.SortFunc(hList, common.Hash.Cmp)
|
|
|
|
middleH := hList[AccountRangeMaxResults/2]
|
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
|
|
|
middleResult := accountRangeTest(t, &trie, sdb, middleH, AccountRangeMaxResults, AccountRangeMaxResults)
|
|
|
|
missing, infirst, insecond := 0, 0, 0
|
|
|
|
for h := range middleResult.Accounts {
|
|
|
|
if _, ok := firstResult.Accounts[h]; ok {
|
|
|
|
infirst++
|
|
|
|
} else if _, ok := secondResult.Accounts[h]; ok {
|
|
|
|
insecond++
|
|
|
|
} else {
|
|
|
|
missing++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if missing != 0 {
|
|
|
|
t.Fatalf("%d hashes in the 'middle' set were neither in the first not the second set", missing)
|
|
|
|
}
|
|
|
|
if infirst != AccountRangeMaxResults/2 {
|
|
|
|
t.Fatalf("Imbalance in the number of first-test results: %d != %d", infirst, AccountRangeMaxResults/2)
|
|
|
|
}
|
|
|
|
if insecond != AccountRangeMaxResults/2 {
|
|
|
|
t.Fatalf("Imbalance in the number of second-test results: %d != %d", insecond, AccountRangeMaxResults/2)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestEmptyAccountRange(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
var (
|
cmd/geth, eth, core: snapshot dump + unify with trie dump (#22795)
* cmd/geth, eth, core: snapshot dump + unify with trie dump
* cmd/evm: dump API fixes
* cmd/geth, core, eth: fix some remaining errors
* cmd/evm: dump - add limit, support address startkey, address review concerns
* cmd, core/state, eth: minor polishes, fix snap dump crash, unify format
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
4 years ago
|
|
|
statedb = state.NewDatabase(rawdb.NewMemoryDatabase())
|
|
|
|
st, _ = state.New(types.EmptyRootHash, statedb, nil)
|
|
|
|
)
|
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
|
|
|
// Commit(although nothing to flush) and re-init the statedb
|
|
|
|
st.Commit(0, true)
|
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
|
|
|
st, _ = state.New(types.EmptyRootHash, statedb, nil)
|
|
|
|
|
cmd/geth, eth, core: snapshot dump + unify with trie dump (#22795)
* cmd/geth, eth, core: snapshot dump + unify with trie dump
* cmd/evm: dump API fixes
* cmd/geth, core, eth: fix some remaining errors
* cmd/evm: dump - add limit, support address startkey, address review concerns
* cmd, core/state, eth: minor polishes, fix snap dump crash, unify format
Co-authored-by: Péter Szilágyi <peterke@gmail.com>
4 years ago
|
|
|
results := st.IteratorDump(&state.DumpConfig{
|
|
|
|
SkipCode: true,
|
|
|
|
SkipStorage: true,
|
|
|
|
OnlyWithAddresses: true,
|
|
|
|
Max: uint64(AccountRangeMaxResults),
|
|
|
|
})
|
|
|
|
if bytes.Equal(results.Next, (common.Hash{}).Bytes()) {
|
|
|
|
t.Fatalf("Empty results should not return a second page")
|
|
|
|
}
|
|
|
|
if len(results.Accounts) != 0 {
|
|
|
|
t.Fatalf("Empty state should not return addresses: %v", results.Accounts)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestStorageRangeAt(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
// Create a state where account 0x010000... has a few storage entries.
|
|
|
|
var (
|
|
|
|
db = state.NewDatabaseWithConfig(rawdb.NewMemoryDatabase(), &trie.Config{Preimages: true})
|
|
|
|
sdb, _ = state.New(types.EmptyRootHash, db, nil)
|
|
|
|
addr = common.Address{0x01}
|
|
|
|
keys = []common.Hash{ // hashes of Keys of storage
|
|
|
|
common.HexToHash("340dd630ad21bf010b4e676dbfa9ba9a02175262d1fa356232cfde6cb5b47ef2"),
|
|
|
|
common.HexToHash("426fcb404ab2d5d8e61a3d918108006bbb0a9be65e92235bb10eefbdb6dcd053"),
|
|
|
|
common.HexToHash("48078cfed56339ea54962e72c37c7f588fc4f8e5bc173827ba75cb10a63a96a5"),
|
|
|
|
common.HexToHash("5723d2c3a83af9b735e3b7f21531e5623d183a9095a56604ead41f3582fdfb75"),
|
|
|
|
}
|
|
|
|
storage = storageMap{
|
|
|
|
keys[0]: {Key: &common.Hash{0x02}, Value: common.Hash{0x01}},
|
|
|
|
keys[1]: {Key: &common.Hash{0x04}, Value: common.Hash{0x02}},
|
|
|
|
keys[2]: {Key: &common.Hash{0x01}, Value: common.Hash{0x03}},
|
|
|
|
keys[3]: {Key: &common.Hash{0x03}, Value: common.Hash{0x04}},
|
|
|
|
}
|
|
|
|
)
|
|
|
|
for _, entry := range storage {
|
|
|
|
sdb.SetState(addr, *entry.Key, entry.Value)
|
|
|
|
}
|
|
|
|
root, _ := sdb.Commit(0, false)
|
|
|
|
sdb, _ = state.New(root, db, nil)
|
|
|
|
|
|
|
|
// Check a few combinations of limit and start/end.
|
|
|
|
tests := []struct {
|
|
|
|
start []byte
|
|
|
|
limit int
|
|
|
|
want StorageRangeResult
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
start: []byte{}, limit: 0,
|
|
|
|
want: StorageRangeResult{storageMap{}, &keys[0]},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
start: []byte{}, limit: 100,
|
|
|
|
want: StorageRangeResult{storage, nil},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
start: []byte{}, limit: 2,
|
|
|
|
want: StorageRangeResult{storageMap{keys[0]: storage[keys[0]], keys[1]: storage[keys[1]]}, &keys[2]},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
start: []byte{0x00}, limit: 4,
|
|
|
|
want: StorageRangeResult{storage, nil},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
start: []byte{0x40}, limit: 2,
|
|
|
|
want: StorageRangeResult{storageMap{keys[1]: storage[keys[1]], keys[2]: storage[keys[2]]}, &keys[3]},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, test := range tests {
|
|
|
|
result, err := storageRangeAt(sdb, root, addr, test.start, test.limit)
|
|
|
|
if err != nil {
|
|
|
|
t.Error(err)
|
|
|
|
}
|
|
|
|
if !reflect.DeepEqual(result, test.want) {
|
|
|
|
t.Fatalf("wrong result for range %#x.., limit %d:\ngot %s\nwant %s",
|
|
|
|
test.start, test.limit, dumper.Sdump(result), dumper.Sdump(&test.want))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|