forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert to accountRangeAt which uses preimagedb

Browse source
This commit is contained in:
Jared Wasinger 2018-12-04 14:45:41 +00:00 committed by Guillaume Ballet
parent a6c2a5b05d
commit 6d85892579
2 changed files with 14 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
eth/api.go
View file

@ -17,7 +17,6 @@
package eth package eth
import ( import (
"bytes"
"compress/gzip" "compress/gzip"
"context" "context"
"errors" "errors"
@ -335,42 +334,28 @@ func (api *PrivateDebugAPI) GetBadBlocks(ctx context.Context) ([]*BadBlockArgs,
return results, nil return results, nil
} }
type addressMap map[common.Hash]common.Address
type AccountRangeResult struct { type AccountRangeResult struct {
Preimages []common.Hash `json:"preimages"` AddressMap addressMap `json:"addressMap"`
Next common.Hash `json:"nextKey"`
} }
func accountRange(st state.Trie, start *common.Hash, maxResults int) (AccountRangeResult, error) { func accountRange(st state.Trie, start *common.Hash, maxResult int) (AccountRangeResult, error) {
it := trie.NewIterator(st.NodeIterator(start[:])) it := trie.NewIterator(st.NodeIterator(start[:]))
result := AccountRangeResult{Preimages: []common.Hash{}, Next: common.Hash{}} result := AccountRangeResult{AddressMap: addressMap{}}
zeros := make([]byte, common.HashLength) for i := 0; i < maxResult && it.Next(); i++ {
key := st.GetKey(it.Key)
if bytes.Equal(start.Bytes()[:], zeros) { // If key is nil, that means it wasn't found in the preimage database.
start = nil // This is not a problem, because we still return the hash of the key together with
// address zero and the client can very easily determine that the hash of the addres zero
// is not matching, which means it wasn't found.
result.AddressMap[common.BytesToHash(it.Key)] = common.BytesToAddress(key)
} }
if maxResults > 100 {
maxResults = 100
}
// dont return the first account preimage
if !it.Next() && start != &(common.Hash{}) {
return result, nil return result, nil
} }
for i := 0; i < maxResults-1 && it.Next(); i++ { //block hash or number, tx index, start address hash, max results
result.Preimages = append(result.Preimages, common.BytesToHash(it.Key)) func (api *PrivateDebugAPI) AccountRangeAt(ctx context.Context, blockNr rpc.BlockNumber, txIndex int, startAddr *common.Hash, maxResults int) (AccountRangeResult, error) {
}
if it.Next() {
result.Next = common.BytesToHash(it.Key)
}
return result, nil
}
//enumerate and return account preimages in the state at the current block
func (api *PrivateDebugAPI) AccountRange(ctx context.Context, startAddr *common.Hash, maxResults int) (AccountRangeResult, error) {
var statedb *state.StateDB = nil var statedb *state.StateDB = nil
var err error = nil var err error = nil
var block = api.eth.blockchain.CurrentBlock() var block = api.eth.blockchain.CurrentBlock()

45
eth/api_test.go
View file

@ -30,51 +30,6 @@ import (
var dumper = spew.ConfigState{Indent: " "} var dumper = spew.ConfigState{Indent: " "}
func TestAccountRange(t *testing.T) {
state, _ := state.New(common.Hash{}, state.NewDatabase(ethdb.NewMemDatabase()))
expectedPreimages := make(map[common.Hash]interface{})
// create some accounts
for i := 0; i < 256; i++ {
address := common.Address{byte(i)}
obj := state.GetOrNewStateObject(address)
expectedPreimages[crypto.Keccak256Hash(address.Bytes())] = true
obj.AddBalance(big.NewInt(22))
obj.SetCode(crypto.Keccak256Hash([]byte{3, 3, 3, 3, 3, 3, 3}), []byte{3, 3, 3, 3, 3, 3, 3})
//root = state.Commit(false)
}
root, err := state.Commit(false)
if err != nil {
t.Fatalf("%s", err)
}
state.Finalise(false)
trie, err := state.Database().OpenTrie(root)
if err != nil {
t.Fatalf("%s", err)
}
zeroHash := crypto.Keccak256Hash(common.Hash{}.Bytes())
result, err := accountRange(trie, &zeroHash, 256)
if err != nil {
t.Fatalf("%s", err)
}
if len(result.Preimages) != 99 {
t.Fatalf("maximum number of results returned should be 99, returned %d", len(result.Preimages))
}
for _, v := range result.Preimages {
if _, ok := expectedPreimages[v]; !ok {
t.Fatalf("expected to find preimage %s in result", v.String())
}
}
}
func TestStorageRangeAt(t *testing.T) { func TestStorageRangeAt(t *testing.T) {
// Create a state where account 0x010000... has a few storage entries. // Create a state where account 0x010000... has a few storage entries.
var ( var (