diff options
| -rw-r--r-- | core/state/dump.go | 7 | ||||
| -rw-r--r-- | trie/iterator.go | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/core/state/dump.go b/core/state/dump.go index 51d3e5554..7912fd5f9 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -118,7 +118,12 @@ func (self *StateDB) dump(c collector, excludeCode, excludeStorage, excludeMissi account.Storage = make(map[common.Hash]string) storageIt := trie.NewIterator(obj.getTrie(self.db).NodeIterator(nil)) for storageIt.Next() { - account.Storage[common.BytesToHash(self.trie.GetKey(storageIt.Key))] = common.Bytes2Hex(storageIt.Value) + _, content, _, err := rlp.Split(storageIt.Value) + if err != nil { + log.Error("Failed to decode the value returned by iterator", "error", err) + continue + } + account.Storage[common.BytesToHash(self.trie.GetKey(storageIt.Key))] = common.Bytes2Hex(content) } } c.onAccount(addr, account) diff --git a/trie/iterator.go b/trie/iterator.go index da93b2fad..8e84dee3b 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -34,7 +34,9 @@ type Iterator struct { Err error } -// NewIterator creates a new key-value iterator from a node iterator +// NewIterator creates a new key-value iterator from a node iterator. +// Note that the value returned by the iterator is raw. If the content is encoded +// (e.g. storage value is RLP-encoded), it's caller's duty to decode it. func NewIterator(it NodeIterator) *Iterator { return &Iterator{ nodeIt: it, |