Merge pull request ethereum#276 from OffchainLabs/fix-pruner-account-…

…address-not-available

fix prunning: use correct state root and don't require account address

core/state/pruner/pruner.go

@@ -381,14 +381,7 @@ func dumpRawTrieDescendants(db ethdb.Database, root common.Hash, output *stateBl
 				output.Put(data.CodeHash, nil)
 			}
 			if data.Root != (common.Hash{}) {
-				// Lookup the preimage of account hash
-				preimage := tr.GetKey(accountIt.LeafKey())
-				if preimage == nil {
-					return errors.New("account address is not available")
-				}
-				address := common.BytesToAddress(preimage)
-
-				storageTr, err := sdb.OpenStorageTrie(key, address, data.Root)
+				storageTr, err := trie.NewStateTrie(trie.StorageTrieID(root, key, data.Root), sdb.TrieDB())
 				if err != nil {
 					return err
 				}