Commit 0af7f430 authored by chriseth's avatar chriseth

Merge pull request #6 from ethereum/patch/block-details

Support block header parameters in VM mode (timestamp for now)
parents 8cd8b291 1e155b13
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
"build": "mkdir -p build; browserify src/index.js -o build/app.js" "build": "mkdir -p build; browserify src/index.js -o build/app.js"
}, },
"devDependencies": { "devDependencies": {
"ethereumjs-block": "^1.2.2",
"ethereumjs-vm": "^1.3.0", "ethereumjs-vm": "^1.3.0",
"merkle-patricia-tree": "^2.1.2", "merkle-patricia-tree": "^2.1.2",
"ethereumjs-util": "^4.4.0", "ethereumjs-util": "^4.4.0",
......
...@@ -5,6 +5,7 @@ var ethJSUtil = require('ethereumjs-util'); ...@@ -5,6 +5,7 @@ var ethJSUtil = require('ethereumjs-util');
var EthJSTX = require('ethereumjs-tx'); var EthJSTX = require('ethereumjs-tx');
var EthJSAccount = require('ethereumjs-account'); var EthJSAccount = require('ethereumjs-account');
var ethABI = require('ethereumjs-abi'); var ethABI = require('ethereumjs-abi');
var EthJSBlock = require('ethereumjs-block');
var web3 = require('./web3-adapter.js'); var web3 = require('./web3-adapter.js');
function UniversalDApp (contracts, options) { function UniversalDApp (contracts, options) {
...@@ -569,7 +570,15 @@ UniversalDApp.prototype.runTx = function( data, args, cb) { ...@@ -569,7 +570,15 @@ UniversalDApp.prototype.runTx = function( data, args, cb) {
data: new Buffer(data.slice(2), 'hex') data: new Buffer(data.slice(2), 'hex')
}); });
tx.sign(account.privateKey); tx.sign(account.privateKey);
this.vm.runTx({tx: tx, skipBalance: true, skipNonce: true, enableHomestead: true}, cb); var block = new EthJSBlock({
header: {
// FIXME: support coinbase, difficulty, number and gasLimit
timestamp: new Date().getTime() / 1000 | 0
},
transactions: [],
uncleHeaders: []
});
this.vm.runTx({block: block, tx: tx, skipBalance: true, skipNonce: true, enableHomestead: true}, cb);
} catch (e) { } catch (e) {
cb( e, null ); cb( e, null );
} }
......
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