From bbe795455a13c57dbba64c1082b618e791af46ce Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 24 Mar 2015 15:14:03 +0100 Subject: Secure trie shakey / key matching --- core/state/dump.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/state') diff --git a/core/state/dump.go b/core/state/dump.go index 712f8da1f..70ea21691 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -28,17 +28,17 @@ func (self *StateDB) RawDump() World { it := self.trie.Iterator() for it.Next() { - stateObject := NewStateObjectFromBytes(common.BytesToAddress(it.Key), it.Value, self.db) + addr := self.trie.GetKey(it.Key) + stateObject := NewStateObjectFromBytes(common.BytesToAddress(addr), it.Value, self.db) account := Account{Balance: stateObject.balance.String(), Nonce: stateObject.nonce, Root: common.Bytes2Hex(stateObject.Root()), CodeHash: common.Bytes2Hex(stateObject.codeHash)} account.Storage = make(map[string]string) storageIt := stateObject.State.trie.Iterator() for storageIt.Next() { - fmt.Println("value", storageIt.Value) - account.Storage[common.Bytes2Hex(storageIt.Key)] = common.Bytes2Hex(storageIt.Value) + account.Storage[common.Bytes2Hex(self.trie.GetKey(storageIt.Key))] = common.Bytes2Hex(storageIt.Value) } - world.Accounts[common.Bytes2Hex(it.Key)] = account + world.Accounts[common.Bytes2Hex(addr)] = account } return world } -- cgit v1.2.3