Skip to content

B
baas-ide
Commit 0fdf5d6a authored by chriseth's avatar chriseth Committed by GitHub
Browse files
Options

Merge pull request #131 from ethereum/fixvmmode

Fix VM mode (safari/ie)
parents 0ea03645 a66f9840
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
src/web3Provider/web3VmProvider.js
View file @ 0fdf5d6a
var ethJSUtil = require('ethereumjs-util')
var util = require('../helpers/util') var util = require('../helpers/util')
var Web3 = require('web3')
function web3VmProvider () { function web3VmProvider () {
var self = this var self = this
this.web3 = new Web3()
this.vm this.vm
this.vmTraces = {} this.vmTraces = {}
this.txs = {} this.txs = {}
...@@ -42,7 +43,7 @@ web3VmProvider.prototype.releaseCurrentHash = function () { ...@@ -42,7 +43,7 @@ web3VmProvider.prototype.releaseCurrentHash = function () {
web3VmProvider.prototype.txWillProcess = function (self, data) { web3VmProvider.prototype.txWillProcess = function (self, data) {
self.incr++ self.incr++
self.processingHash = '0x' + ethJSUtil.sha3([data.r, data.s, data.v, self.incr]).join('') self.processingHash = this.web3.sha3([data.r, data.s, data.v, self.incr].join(''))
self.vmTraces[self.processingHash] = { self.vmTraces[self.processingHash] = {
gas: '0x0', gas: '0x0',
return: '0x0', return: '0x0',
......
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