Node URL:
+ return yo`
Node URL:
${this.connectInfo}
`
} else {
return ''
diff --git a/src/ui/VmDebugger.js b/src/ui/VmDebugger.js
index 1a67ac8731..d319d02d2c 100644
--- a/src/ui/VmDebugger.js
+++ b/src/ui/VmDebugger.js
@@ -11,8 +11,8 @@ var FullStoragesChangesPanel = require('./FullStoragesChanges')
var yo = require('yo-yo')
var ui = require('../helpers/ui')
-function VmDebugger (_parent, _traceManager, _web3) {
- this.asmCode = new ASMCode(_parent, _traceManager, _web3)
+function VmDebugger (_parent, _traceManager) {
+ this.asmCode = new ASMCode(_parent, _traceManager)
this.stackPanel = new StackPanel(_parent, _traceManager)
this.storagePanel = new StoragePanel(_parent, _traceManager)
this.memoryPanel = new MemoryPanel(_parent, _traceManager)
diff --git a/src/web3Provider/web3Provider.js b/src/web3Provider/web3Provider.js
deleted file mode 100644
index 45285c84ce..0000000000
--- a/src/web3Provider/web3Provider.js
+++ /dev/null
@@ -1,70 +0,0 @@
-var Web3VMProvider = require('./web3VmProvider')
-
-function Web3Provider () {
- var self = this
- this.currentMode
- this.actions = {}
- this.modes = {}
- this.currentProvider = {'host': 'browser-solidity proxy provider'}
- this.providers = { 'HttpProvider': function (url) {} }
- this.eth = {}
- this.debug = {}
- this.eth.getCode = function (address, cb) { if (self.check(cb)) { return self.actions[self.currentMode]['eth.getCode'].apply(self.executingMode(), arguments) } }
- this.setProvider = function (provider) { if (self.check()) { return self.actions[self.currentMode]['setProvider'].apply(self.executingMode(), [provider]) } }
- this.debug.traceTransaction = function (txHash, options, cb) { if (self.check()) { return self.actions[self.currentMode]['debug.traceTransaction'].apply(self.executingMode(), arguments) } }
- this.debug.storageAt = function (blockNumber, txIndex, address, cb) { if (self.check()) { return self.actions[self.currentMode]['debug.storageAt'].apply(self.executingMode(), arguments) } }
- this.eth.getTransaction = function (txHash) { if (self.check()) { return self.actions[self.currentMode]['eth.getTransaction'].apply(self.executingMode(), arguments) } }
- this.eth.getTransactionFromBlock = function (blockNumber, txIndex) { if (self.check()) { return self.actions[self.currentMode]['eth.getTransactionFromBlock'].apply(self.executingMode(), arguments) } }
- this.eth.getBlockNumber = function (cb) { if (self.check()) { return self.actions[self.currentMode]['eth.getBlockNumber'].apply(self.executingMode(), arguments) } }
-}
-
-Web3Provider.prototype.check = function (cb) {
- if (!this.currentMode) {
- if (cb) {
- cb('error: no provider has been setup ', null)
- }
- return false
- }
- return true
-}
-
-Web3Provider.prototype.switchTo = function (type, cb) {
- if (this.actions[type]) {
- this.currentMode = type
- cb(null, 'ok')
- } else {
- cb('error: this provider has not been setup (' + type + ')', null)
- }
-}
-
-Web3Provider.prototype.executingMode = function () {
- return this.modes[this.currentMode]
-}
-
-Web3Provider.prototype.initWeb3 = function (web3) {
- this.actions['EXTERNAL'] = {}
- this.actions['EXTERNAL']['eth.getCode'] = web3.eth.getCode
- this.actions['EXTERNAL']['setProvider'] = web3.setProvider
- this.actions['EXTERNAL']['debug.traceTransaction'] = web3.debug.traceTransaction
- this.actions['EXTERNAL']['debug.storageAt'] = web3.debug.storageAt
- this.actions['EXTERNAL']['eth.getTransaction'] = web3.eth.getTransaction
- this.actions['EXTERNAL']['eth.getTransactionFromBlock'] = web3.eth.getTransactionFromBlock
- this.actions['EXTERNAL']['eth.getBlockNumber'] = web3.eth.getBlockNumber
- this.modes['EXTERNAL'] = web3
-}
-
-Web3Provider.prototype.initVM = function (vm) {
- var vmProvider = new Web3VMProvider()
- vmProvider.setVM(vm)
- this.actions['VM'] = {}
- this.actions['VM']['eth.getCode'] = vmProvider.getCode
- this.actions['VM']['setProvider'] = vmProvider.setProvider
- this.actions['VM']['debug.traceTransaction'] = vmProvider.traceTransaction
- this.actions['VM']['debug.storageAt'] = vmProvider.storageAt
- this.actions['VM']['eth.getTransaction'] = vmProvider.getTransaction
- this.actions['VM']['eth.getTransactionFromBlock'] = vmProvider.getTransactionFromBlock
- this.actions['VM']['eth.getBlockNumber'] = vmProvider.getBlockNumber
- this.modes['VM'] = vmProvider
-}
-
-module.exports = Web3Provider
diff --git a/src/web3Provider/web3Providers.js b/src/web3Provider/web3Providers.js
new file mode 100644
index 0000000000..4fbe0b673c
--- /dev/null
+++ b/src/web3Provider/web3Providers.js
@@ -0,0 +1,41 @@
+var Web3VMProvider = require('./web3VmProvider')
+var init = require('../helpers/init')
+
+function Web3Providers () {
+ this.modes = {}
+}
+
+Web3Providers.prototype.addProvider = function (type, obj) {
+ if (type === 'INTERNAL') {
+ var web3 = init.loadWeb3()
+ this.addWeb3(type, web3)
+ } else if (type === 'EXTERNAL') {
+ init.extendWeb3(obj)
+ this.addWeb3(type, obj)
+ } else if (type === 'VM') {
+ this.addVM(obj)
+ } else {
+ this.addWeb3(type, obj)
+ }
+}
+
+Web3Providers.prototype.get = function (type, cb) {
+ if (this.modes[type]) {
+ this.currentMode = type
+ cb(null, this.modes[type])
+ } else {
+ cb('error: this provider has not been setup (' + type + ')', null)
+ }
+}
+
+Web3Providers.prototype.addWeb3 = function (type, web3) {
+ this.modes[type] = web3
+}
+
+Web3Providers.prototype.addVM = function (vm) {
+ var vmProvider = new Web3VMProvider()
+ vmProvider.setVM(vm)
+ this.modes['VM'] = vmProvider
+}
+
+module.exports = Web3Providers
diff --git a/src/web3Provider/web3VmProvider.js b/src/web3Provider/web3VmProvider.js
index 069b0c2f75..4f1cb75d89 100644
--- a/src/web3Provider/web3VmProvider.js
+++ b/src/web3Provider/web3VmProvider.js
@@ -1,49 +1,22 @@
var ethJSUtil = require('ethereumjs-util')
-var BN = ethJSUtil.BN
function web3VmProvider () {
+ var self = this
this.vm
this.vmTraces = {}
this.txs = {}
this.processingHash
this.incr = 0
-}
-
-var hexConvert = function (ints) {
- var ret = '0x'
- for (var i = 0; i < ints.length; i++) {
- try {
- var h = ints[i]
- if (h) {
- h = h.toString(16)
- ret += ('0x' + h) < 0x10 ? '0' + h : h
- } else {
- ret += '00'
- }
- } catch (e) {
- console.log('hexconvert ' + i + ' ' + ints.length)
- console.log(e)
- }
- }
- return ret
-}
-
-var hexListConvert = function (intsList) {
- var ret = []
- for (var k in intsList) {
- ret.push(hexConvert(intsList[k]))
- }
- return ret
-}
-
-var formatMemory = function (mem) {
- var hexMem = hexConvert(mem).substr(2)
- var ret = []
- for (var k = 0; k < hexMem.length; k += 32) {
- var row = hexMem.substr(k, 32)
- ret.push(row)
- }
- return ret
+ this.eth = {}
+ this.debug = {}
+ this.eth.getCode = function (address, cb) { return self.getCode(address, cb) }
+ this.eth.getTransaction = function (hash, cb) { return self.getTransaction(hash, cb) }
+ this.eth.getTransactionFromBlock = function (blockNumber, txIndex, cb) { return self.getTransactionFromBlock(blockNumber, txIndex, cb) }
+ this.eth.getBlockNumber = function (cb) { return self.getBlockNumber(cb) }
+ this.debug.traceTransaction = function (hash, options, cb) { return self.traceTransaction(hash, options, cb) }
+ this.debug.storageAt = function (blockNumber, txIndex, address, cb) { return self.storageAt(blockNumber, txIndex, address, cb) }
+ this.providers = { 'HttpProvider': function (url) {} }
+ this.currentProvider = {'host': 'vm provider'}
}
web3VmProvider.prototype.setVM = function (vm) {
@@ -109,9 +82,8 @@ web3VmProvider.prototype.pushTrace = function (self, data) {
storage: data.storage,
op: data.opcode.name,
pc: data.pc,
- gas: data.opcode.fee.toString(),
- gasLeft: data.gasLeft.toString(),
- gasCost: self.vmTraces[self.processingHash].structLogs.length > 0 ? ((new BN(self.vmTraces[self.processingHash].structLogs[0].gasLeft)) - data.gasLeft).toString() : data.opcode.fee.toString()
+ gasCost: data.opcode.fee.toString(),
+ gas: data.gasLeft.toString()
}
self.vmTraces[self.processingHash].structLogs.push(step)
}
@@ -141,6 +113,8 @@ web3VmProvider.prototype.traceTransaction = function (txHash, options, cb) {
web3VmProvider.prototype.storageAt = function (blockNumber, txIndex, address, cb) { cb(null, {}) }
+web3VmProvider.prototype.getBlockNumber = function (cb) { cb(null, 'vm provider') }
+
web3VmProvider.prototype.getTransaction = function (txHash, cb) {
if (this.txs[txHash]) {
if (cb) {
@@ -157,7 +131,7 @@ web3VmProvider.prototype.getTransaction = function (txHash, cb) {
}
web3VmProvider.prototype.getTransactionFromBlock = function (blockNumber, txIndex, cb) {
- var mes = 'not supposed to be needed by remix'
+ var mes = 'not supposed to be needed by remix in vmmode'
console.log(mes)
if (cb) {
cb(mes, null)
@@ -165,4 +139,36 @@ web3VmProvider.prototype.getTransactionFromBlock = function (blockNumber, txInde
throw mes
}
+var hexConvert = function (ints) {
+ var ret = '0x'
+ for (var i = 0; i < ints.length; i++) {
+ var h = ints[i]
+ if (h) {
+ h = h.toString(16)
+ ret += ('0x' + h) < 0x10 ? '0' + h : h
+ } else {
+ ret += '00'
+ }
+ }
+ return ret
+}
+
+var hexListConvert = function (intsList) {
+ var ret = []
+ for (var k in intsList) {
+ ret.push(hexConvert(intsList[k]))
+ }
+ return ret
+}
+
+var formatMemory = function (mem) {
+ var hexMem = hexConvert(mem).substr(2)
+ var ret = []
+ for (var k = 0; k < hexMem.length; k += 32) {
+ var row = hexMem.substr(k, 32)
+ ret.push(row)
+ }
+ return ret
+}
+
module.exports = web3VmProvider
diff --git a/test-browser/init.js b/test-browser/init.js
index 9b853a72e1..11a014f8a2 100644
--- a/test-browser/init.js
+++ b/test-browser/init.js
@@ -15,7 +15,10 @@ function injectScript (file, browser, callback) {
browser.execute(function (data) {
var vmdebugger = document.getElementById('app').vmdebugger
data = JSON.parse(data)
- vmdebugger.web3.eth.getCode = function (address, callback) {
+ var uiTestweb3 = {}
+ uiTestweb3.eth = {}
+ uiTestweb3.debug = {}
+ uiTestweb3.eth.getCode = function (address, callback) {
if (callback) {
callback(null, data.testCodes[address])
} else {
@@ -23,15 +26,15 @@ function injectScript (file, browser, callback) {
}
}
- vmdebugger.web3.debug.traceTransaction = function (txHash, options, callback) {
+ uiTestweb3.debug.traceTransaction = function (txHash, options, callback) {
callback(null, data.testTraces[txHash])
}
- vmdebugger.web3.debug.storageAt = function (blockNumber, txIndex, address, callback) {
+ uiTestweb3.debug.storageAt = function (blockNumber, txIndex, address, callback) {
callback(null, {})
}
- vmdebugger.web3.eth.getTransaction = function (txHash, callback) {
+ uiTestweb3.eth.getTransaction = function (txHash, callback) {
if (callback) {
callback(null, data.testTxs[txHash])
} else {
@@ -39,7 +42,7 @@ function injectScript (file, browser, callback) {
}
}
- vmdebugger.web3.eth.getTransactionFromBlock = function (blockNumber, txIndex, callback) {
+ uiTestweb3.eth.getTransactionFromBlock = function (blockNumber, txIndex, callback) {
if (callback) {
callback(null, data.testTxsByBlock[blockNumber + '-' + txIndex])
} else {
@@ -47,9 +50,16 @@ function injectScript (file, browser, callback) {
}
}
- vmdebugger.web3.eth.getBlockNumber = function (callback) { callback(null, 'web3 modified for testing purposes :)') }
+ uiTestweb3.eth.getBlockNumber = function (callback) { callback(null, 'web3 modified for testing purposes :)') }
- vmdebugger.web3.currentProvider = {host: 'web3 modified for testing purposes :)'}
+ uiTestweb3.eth.providers = { 'HttpProvider': function (url) {} }
+
+ uiTestweb3.eth.setProvider = function (provider) {}
+
+ uiTestweb3.currentProvider = {host: 'web3 modified for testing purposes :)'}
+
+ vmdebugger.addProvider('TEST', uiTestweb3)
+ vmdebugger.switchProvider('TEST')
}, [result], function () {
callback()
})
diff --git a/test/codeManager.js b/test/codeManager.js
index bcb7653496..2d9ceb9da3 100644
--- a/test/codeManager.js
+++ b/test/codeManager.js
@@ -1,25 +1,34 @@
'use strict'
var tape = require('tape')
-var init = require('../src/helpers/init')
+var Web3Providers = require('../src/web3Provider/web3Providers')
var TraceManager = require('../src/trace/traceManager')
var CodeManager = require('../src/code/codeManager')
var web3Test = require('./resources/testWeb3')
-var initWeb3 = require('./init')
+var util = require('../src/helpers/global')
tape('CodeManager', function (t) {
var codeManager
- var web3 = init.loadWeb3()
- initWeb3.overrideWeb3(web3, web3Test)
- var traceManager = new TraceManager(web3)
- codeManager = new CodeManager(web3, traceManager)
- var contractCode = web3.eth.getCode('0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5')
- codeManager.codeResolver.cacheExecutingCode('0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5', contractCode) // so a call to web3 is not necessary
- var tx = web3.eth.getTransaction('0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51')
- traceManager.resolveTrace(tx, function (error, result) {
+ var web3Providers = new Web3Providers()
+ web3Providers.addProvider('TEST', web3Test)
+ web3Providers.get('TEST', function (error, obj) {
if (error) {
- t.fail(' - traceManager.resolveTrace - failed ' + result)
+ var mes = 'provider TEST not defined'
+ console.log(mes)
+ t.fail(mes)
} else {
- continueTesting(t, codeManager)
+ util.web3 = obj
+ var traceManager = new TraceManager()
+ codeManager = new CodeManager(traceManager)
+ var contractCode = util.web3.eth.getCode('0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5')
+ codeManager.codeResolver.cacheExecutingCode('0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5', contractCode) // so a call to web3 is not necessary
+ var tx = util.web3.eth.getTransaction('0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51')
+ traceManager.resolveTrace(tx, function (error, result) {
+ if (error) {
+ t.fail(' - traceManager.resolveTrace - failed ' + result)
+ } else {
+ continueTesting(t, codeManager)
+ }
+ })
}
})
})
@@ -54,7 +63,7 @@ function continueTesting (t, codeManager) {
}
}
})
- var tx = codeManager.web3.eth.getTransaction('0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51')
+ var tx = util.web3.eth.getTransaction('0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51')
codeManager.resolveStep(0, tx)
codeManager.resolveStep(70, tx)
})
diff --git a/test/resources/testWeb3.js b/test/resources/testWeb3.js
index f2e6467966..f5d8bbb4e7 100644
--- a/test/resources/testWeb3.js
+++ b/test/resources/testWeb3.js
@@ -1,10 +1,12 @@
'use strict'
var init = require('../init')
var web3Override = {}
+web3Override.eth = {}
+web3Override.debug = {}
var data = init.readFile(require('path').resolve(__dirname, 'testWeb3.json'))
var data = JSON.parse(data)
-web3Override.getCode = function (address, callback) {
+web3Override.eth.getCode = function (address, callback) {
if (callback) {
callback(null, data.testCodes[address])
} else {
@@ -12,15 +14,15 @@ web3Override.getCode = function (address, callback) {
}
}
-web3Override.traceTransaction = function (txHash, options, callback) {
+web3Override.debug.traceTransaction = function (txHash, options, callback) {
callback(null, data.testTraces[txHash])
}
-web3Override.storageAt = function (blockNumber, txIndex, address, callback) {
+web3Override.debug.storageAt = function (blockNumber, txIndex, address, callback) {
callback(null, {})
}
-web3Override.getTransaction = function (txHash, callback) {
+web3Override.eth.getTransaction = function (txHash, callback) {
if (callback) {
callback(null, data.testTxs[txHash])
} else {
@@ -28,7 +30,7 @@ web3Override.getTransaction = function (txHash, callback) {
}
}
-web3Override.getTransactionFromBlock = function (blockNumber, txIndex, callback) {
+web3Override.eth.getTransactionFromBlock = function (blockNumber, txIndex, callback) {
if (callback) {
callback(null, data.testTxsByBlock[blockNumber + '-' + txIndex])
} else {
@@ -36,7 +38,13 @@ web3Override.getTransactionFromBlock = function (blockNumber, txIndex, callback)
}
}
-web3Override.getBlockNumber = function (callback) { callback('web3 modified testing purposes :)') }
+web3Override.eth.getBlockNumber = function (callback) { callback('web3 modified testing purposes :)') }
+
+web3Override.eth.setProvider = function (provider) {}
+
+web3Override.eth.providers = { 'HttpProvider': function (url) {} }
+
+web3Override.eth.currentProvider = {'host': 'test provider'}
if (typeof (module) !== 'undefined' && typeof (module.exports) !== 'undefined') {
module.exports = web3Override
diff --git a/test/traceManager.js b/test/traceManager.js
index 7bc7d9ae4d..facb586eca 100644
--- a/test/traceManager.js
+++ b/test/traceManager.js
@@ -1,22 +1,31 @@
'use strict'
var TraceManager = require('../src/trace/traceManager')
var tape = require('tape')
-var init = require('../src/helpers/init')
+var Web3Providers = require('../src/web3Provider/web3Providers')
+var util = require('../src/helpers/global')
var web3Test = require('./resources/testWeb3')
-var initWeb3 = require('./init')
tape('TraceManager', function (t) {
var traceManager
t.test('TraceManager.init', function (st) {
- var web3 = init.loadWeb3()
- initWeb3.overrideWeb3(web3, web3Test)
- traceManager = new TraceManager(web3)
- st.end()
+ var web3Providers = new Web3Providers()
+ web3Providers.addProvider('TEST', web3Test)
+ web3Providers.get('TEST', function (error, obj) {
+ if (error) {
+ var mes = 'provider TEST not defined'
+ console.log(mes)
+ st.fail(mes)
+ } else {
+ util.web3 = obj
+ traceManager = new TraceManager()
+ st.end()
+ }
+ })
})
t.test('TraceManager.resolveTrace', function (st) {
- var tx = traceManager.web3.eth.getTransaction('0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51')
+ var tx = util.web3.eth.getTransaction('0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51')
traceManager.resolveTrace(tx, function (error, result) {
if (error) {
st.fail(' - traceManager.resolveTrace - failed ' + result)
@@ -45,7 +54,7 @@ tape('TraceManager', function (t) {
})
t.test('TraceManager.getStorageAt', function (st) {
- var tx = traceManager.web3.eth.getTransaction('0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51')
+ var tx = util.web3.eth.getTransaction('0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51')
traceManager.getStorageAt(110, tx, function (error, result) {
if (error) {
st.fail(error)