Merge pull request #345 from ethereum/fixvmstorage

src/app/execution-context.js

@@ -5,6 +5,8 @@ var $ = require('jquery')
 var Web3 = require('web3')
 var EventManager = require('../lib/eventManager')
 var EthJSVM = require('ethereumjs-vm')
+var ethUtil = require('ethereumjs-util')
+var StateManager = require('ethereumjs-vm/lib/stateManager')
 
 var injectedProvider
 
@@ -16,10 +18,49 @@ if (typeof window.web3 !== 'undefined') {
   web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:8545'))
 }
 
+/*
+  extend vm state manager and instanciate VM
+*/
+
+class StateManagerCommonStorageDump extends StateManager {
+  constructor (arg) {
+    super(arg)
+    this.keyHashes = {}
+  }
+
+  putContractStorage (address, key, value, cb) {
+    this.keyHashes[ethUtil.sha3(key)] = ethUtil.bufferToHex(key)
+    super.putContractStorage(address, key, value, cb)
+  }
+
+  dumpStorage (address, cb) {
+    var self = this
+    this._getStorageTrie(address, function (err, trie) {
+      if (err) {
+        return cb(err)
+      }
+      var storage = {}
+      var stream = trie.createReadStream()
+      stream.on('data', function (val) {
+        storage[self.keyHashes[val.key]] = val.value.toString('hex')
+      })
+      stream.on('end', function () {
+        cb(storage)
+      })
+    })
+  }
+}
+
+var stateManager = new StateManagerCommonStorageDump({})
 var vm = new EthJSVM({
   enableHomestead: true,
   activatePrecompiles: true
 })
+
+// FIXME: move state manager in EthJSVM ctr
+vm.stateManager = stateManager
+vm.blockchain = stateManager.blockchain
+vm.trie = stateManager.trie
 vm.stateManager.checkpoint()
 
 /*