Commit 6b8842f9 authored by chriseth's avatar chriseth Committed by GitHub

Merge pull request #303 from ethereum/update-vm

Update to ethereumjs-vm 2.0.1
parents 6b135401 a47917f2
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
"ethereumjs-block": "^1.2.2", "ethereumjs-block": "^1.2.2",
"ethereumjs-tx": "^1.1.1", "ethereumjs-tx": "^1.1.1",
"ethereumjs-util": "^4.4.0", "ethereumjs-util": "^4.4.0",
"ethereumjs-vm": "^1.4.0", "ethereumjs-vm": "^2.0.1",
"http-server": "0.9.0", "http-server": "0.9.0",
"jquery": "^2.2.0", "jquery": "^2.2.0",
"js-base64": "^2.1.9", "js-base64": "^2.1.9",
......
...@@ -16,7 +16,10 @@ if (typeof window.web3 !== 'undefined') { ...@@ -16,7 +16,10 @@ if (typeof window.web3 !== 'undefined') {
web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:8545')) web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:8545'))
} }
var vm = new EthJSVM(null, null, { activatePrecompiles: true, enableHomestead: true }) var vm = new EthJSVM({
enableHomestead: true,
activatePrecompiles: true
})
vm.stateManager.checkpoint() vm.stateManager.checkpoint()
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment