fix(state): Change StorageState.Entries() to expect a block hash

Author: haikoschol

dot/rpc/interfaces.go

@@ -23,7 +23,7 @@ type StorageAPI interface {
 	GetStorage(bhash *common.Hash, key []byte) ([]byte, error)
 	GetStorageChild(root *common.Hash, keyToChild []byte) (trie.Trie, error)
 	GetStorageFromChild(root *common.Hash, keyToChild, key []byte) ([]byte, error)
-	Entries(root *common.Hash) (map[string][]byte, error)
+	Entries(bhash *common.Hash) (map[string][]byte, error)
 	GetStateRootFromBlock(bhash *common.Hash) (*common.Hash, error)
 	GetKeysWithPrefix(root *common.Hash, prefix []byte) ([][]byte, error)
 	RegisterStorageObserver(observer state.Observer)

dot/rpc/modules/api.go

@@ -21,7 +21,7 @@ type StorageAPI interface {
 	GetStorage(bhash *common.Hash, key []byte) ([]byte, error)
 	GetStorageChild(root *common.Hash, keyToChild []byte) (trie.Trie, error)
 	GetStorageFromChild(root *common.Hash, keyToChild, key []byte) ([]byte, error)
-	Entries(root *common.Hash) (map[string][]byte, error)
+	Entries(bhash *common.Hash) (map[string][]byte, error)
 	GetStateRootFromBlock(bhash *common.Hash) (*common.Hash, error)
 	GetKeysWithPrefix(root *common.Hash, prefix []byte) ([][]byte, error)
 	RegisterStorageObserver(observer state.Observer)

dot/rpc/modules/state.go

@@ -207,7 +207,7 @@ func (sm *StateModule) GetPairs(_ *http.Request, req *StatePairRequest, res *Sta
 	}
 
 	if req.Prefix == nil || *req.Prefix == "" || *req.Prefix == "0x" {
-		pairs, err := sm.storageAPI.Entries(stateRootHash)
+		pairs, err := sm.storageAPI.Entries(req.Bhash)
 		if err != nil {
 			return err
 		}

dot/state/inmemory_storage.go

@@ -242,8 +242,18 @@ func (s *InmemoryStorageState) StorageRoot() (common.Hash, error) {
 	return header.StateRoot, nil
 }
 
-// Entries returns Entries from the trie with the given state root
-func (s *InmemoryStorageState) Entries(root *common.Hash) (map[string][]byte, error) {
+// Entries returns Entries from the trie for the given block hash
+func (s *InmemoryStorageState) Entries(bhash *common.Hash) (map[string][]byte, error) {
+	if bhash == nil {
+		b := s.blockState.BestBlockHash()
+		bhash = &b
+	}
+
+	root, err := s.GetStateRootFromBlock(bhash)
+	if err != nil {
+		return nil, err
+	}
+
 	tr, err := s.loadTrie(root)
 	if err != nil {
 		return nil, err

dot/state/inmemory_storage_test.go

@@ -143,7 +143,7 @@ func TestStorage_LoadFromDB(t *testing.T) {
 
 	storage.blockState.GetTries().delete(root)
 
-	entries, err := storage.Entries(&root)
+	entries, err := storage.Entries(&hash)
 	require.NoError(t, err)
 	require.Equal(t, 5, len(entries))
 }

dot/state/storage_state.go

@@ -20,7 +20,7 @@ type StorageState interface {
 	GenerateTrieProof(stateRoot common.Hash, keys [][]byte) ([][]byte, error)
 	GetStorage(bhash *common.Hash, key []byte) ([]byte, error)
 	StorageRoot() (common.Hash, error)
-	Entries(root *common.Hash) (map[string][]byte, error) // should be overhauled to iterate
+	Entries(bhash *common.Hash) (map[string][]byte, error) // should be overhauled to iterate
 	GetKeysWithPrefix(root *common.Hash, prefix []byte) ([][]byte, error)
 	GetStorageChild(root *common.Hash, keyToChild []byte) (trie.Trie, error)
 	GetStorageFromChild(root *common.Hash, keyToChild, key []byte) ([]byte, error)