Skip to content

B
baas-ide
Unverified Commit 3f802726 authored by yann300's avatar yann300 Committed by GitHub
Browse files
Options

Merge pull request #865 from ethereum/remove_global

remove global web3 object
parents 18d90084 e174d97b
Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 232 deletions
remix-core/index.js
View file @ 3f802726
......@@ -5,9 +5,6 @@ var StorageResolver = require('./src/storage/storageResolver')
var TraceManager = require('./src/trace/traceManager')
module.exports = {
global: {
web3: null
},
code: {
CodeManager: CodeManager,
BreakpointManager: BreakpointManager
......
remix-core/src/code/codeManager.js
View file @ 3f802726
......@@ -3,7 +3,7 @@ var remixLib = require('remix-lib')
var EventManager = remixLib.EventManager
var traceHelper = remixLib.helpers.trace
var SourceMappingDecoder = remixLib.SourceMappingDecoder
var codeResolver = require('./codeResolver')
var CodeResolver = require('./codeResolver')
/*
resolve contract code referenced by vmtrace in order to be used by asm listview.
......@@ -16,7 +16,7 @@ function CodeManager (_traceManager) {
this.event = new EventManager()
this.isLoading = false
this.traceManager = _traceManager
this.codeResolver = codeResolver
this.codeResolver = new CodeResolver({web3: this.traceManager.web3})
}
/**
......@@ -57,12 +57,13 @@ CodeManager.prototype.resolveStep = function (stepIndex, tx) {
* @param {Function} cb - callback function, return the bytecode
*/
CodeManager.prototype.getCode = function (address, cb) {
const self = this
if (traceHelper.isContractCreation(address)) {
var codes = codeResolver.getExecutingCodeFromCache(address)
var codes = this.codeResolver.getExecutingCodeFromCache(address)
if (!codes) {
this.traceManager.getContractCreationCode(address, function (error, hexCode) {
if (!error) {
codes = codeResolver.cacheExecutingCode(address, hexCode)
codes = self.codeResolver.cacheExecutingCode(address, hexCode)
cb(null, codes)
}
})
......@@ -70,7 +71,7 @@ CodeManager.prototype.getCode = function (address, cb) {
cb(null, codes)
}
} else {
codeResolver.resolveCode(address, function (address, code) {
this.codeResolver.resolveCode(address, function (address, code) {
cb(null, code)
})
}
......@@ -111,12 +112,13 @@ CodeManager.prototype.getFunctionFromStep = function (stepIndex, sourceMap, ast)
* @param {Function} callback - instruction index
*/
CodeManager.prototype.getInstructionIndex = function (address, step, callback) {
const self = this
this.traceManager.getCurrentPC(step, function (error, pc) {
if (error) {
console.log(error)
callback('Cannot retrieve current PC for ' + step, null)
} else {
var itemIndex = codeResolver.getInstructionIndex(address, pc)
var itemIndex = self.codeResolver.getInstructionIndex(address, pc)
callback(null, itemIndex)
}
})
......@@ -132,7 +134,7 @@ CodeManager.prototype.getInstructionIndex = function (address, step, callback) {
* @return {Object} return the ast node of the function
*/
CodeManager.prototype.getFunctionFromPC = function (address, pc, sourceMap, ast) {
var instIndex = codeResolver.getInstructionIndex(address, pc)
var instIndex = this.codeResolver.getInstructionIndex(address, pc)
return SourceMappingDecoder.findNodeAtInstructionIndex('FunctionDefinition', instIndex, sourceMap, ast)
}
......
remix-core/src/code/codeResolver.js
View file @ 3f802726
'use strict'
var codeUtils = require('./codeUtils')
var remixLib = require('remix-lib')
var global = remixLib.global
module.exports = {
bytecodeByAddress: {}, // bytes code by contract addesses
instructionsByAddress: {}, // assembly items instructions list by contract addesses
instructionsIndexByBytesOffset: {}, // mapping between bytes offset and instructions index.
function CodeResolver (options) {
this.web3 = options.web3
clear: function () {
this.bytecodeByAddress = {}
this.instructionsByAddress = {}
this.instructionsIndexByBytesOffset = {}
},
resolveCode: function (address, callBack) {
var cache = this.getExecutingCodeFromCache(address)
if (cache) {
callBack(address, cache)
return
}
var self = this
this.loadCode(address, function (code) {
callBack(address, self.cacheExecutingCode(address, code))
})
},
this.bytecodeByAddress = {} // bytes code by contract addesses
this.instructionsByAddress = {} // assembly items instructions list by contract addesses
this.instructionsIndexByBytesOffset = {} // mapping between bytes offset and instructions index.
}
loadCode: function (address, callback) {
console.log('loading new code from web3 ' + address)
global.web3.eth.getCode(address, function (error, result) {
if (error) {
console.log(error)
} else {
callback(result)
}
})
},
CodeResolver.prototype.clear = function () {
this.bytecodeByAddress = {}
this.instructionsByAddress = {}
this.instructionsIndexByBytesOffset = {}
}
cacheExecutingCode: function (address, hexCode) {
var codes = this.formatCode(hexCode)
this.bytecodeByAddress[address] = hexCode
this.instructionsByAddress[address] = codes.code
this.instructionsIndexByBytesOffset[address] = codes.instructionsIndexByBytesOffset
return this.getExecutingCodeFromCache(address)
},
CodeResolver.prototype.resolveCode = function (address, callBack) {
var cache = this.getExecutingCodeFromCache(address)
if (cache) {
callBack(address, cache)
return
}
formatCode: function (hexCode) {
var code = codeUtils.nameOpCodes(new Buffer(hexCode.substring(2), 'hex'))
return {
code: code[0],
instructionsIndexByBytesOffset: code[1]
}
},
var self = this
this.loadCode(address, function (code) {
callBack(address, self.cacheExecutingCode(address, code))
})
}
getExecutingCodeFromCache: function (address) {
if (this.instructionsByAddress[address]) {
return {
instructions: this.instructionsByAddress[address],
instructionsIndexByBytesOffset: this.instructionsIndexByBytesOffset[address],
bytecode: this.bytecodeByAddress[address]
}
CodeResolver.prototype.loadCode = function (address, callback) {
console.log('loading new code from web3 ' + address)
this.web3.eth.getCode(address, function (error, result) {
if (error) {
console.log(error)
} else {
return null
callback(result)
}
},
})
}
getInstructionIndex: function (address, pc) {
return this.getExecutingCodeFromCache(address).instructionsIndexByBytesOffset[pc]
CodeResolver.prototype.cacheExecutingCode = function (address, hexCode) {
var codes = this.formatCode(hexCode)
this.bytecodeByAddress[address] = hexCode
this.instructionsByAddress[address] = codes.code
this.instructionsIndexByBytesOffset[address] = codes.instructionsIndexByBytesOffset
return this.getExecutingCodeFromCache(address)
}
CodeResolver.prototype.formatCode = function (hexCode) {
var code = codeUtils.nameOpCodes(new Buffer(hexCode.substring(2), 'hex'))
return {
code: code[0],
instructionsIndexByBytesOffset: code[1]
}
}
CodeResolver.prototype.getExecutingCodeFromCache = function (address) {
if (this.instructionsByAddress[address]) {
return {
instructions: this.instructionsByAddress[address],
instructionsIndexByBytesOffset: this.instructionsIndexByBytesOffset[address],
bytecode: this.bytecodeByAddress[address]
}
} else {
return null
}
}
CodeResolver.prototype.getInstructionIndex = function (address, pc) {
return this.getExecutingCodeFromCache(address).instructionsIndexByBytesOffset[pc]
}
module.exports = CodeResolver
remix-core/src/storage/mappingPreimages.js
View file @ 3f802726
var remixLib = require('remix-lib')
var global = remixLib.global
module.exports = {
decodeMappingsKeys: decodeMappingsKeys
......@@ -13,12 +11,12 @@ module.exports = {
* @param {Function} callback - calback
* @return {Map} - solidity mapping location (e.g { "<mapping_slot>" : { "<mapping-key1>": preimageOf1 }, { "<mapping-key2>": preimageOf2 }, ... })
*/
async function decodeMappingsKeys (storage, callback) {
async function decodeMappingsKeys (web3, storage, callback) {
var ret = {}
for (var hashedLoc in storage) {
var preimage
try {
preimage = await getPreimage(storage[hashedLoc].key)
preimage = await getPreimage(web3, storage[hashedLoc].key)
} catch (e) {
}
if (preimage) {
......@@ -42,9 +40,9 @@ async function decodeMappingsKeys (storage, callback) {
* @param {String} key - key to retrieve the preimage of
* @return {String} - preimage of the given key
*/
function getPreimage (key) {
function getPreimage (web3, key) {
return new Promise((resolve, reject) => {
global.web3Debug.debug.preimage(key.indexOf('0x') === 0 ? key : '0x' + key, function (error, preimage) {
web3.debug.preimage(key.indexOf('0x') === 0 ? key : '0x' + key, function (error, preimage) {
if (error) {
resolve(null)
} else {
......
remix-core/src/storage/storageResolver.js
View file @ 3f802726
'use strict'
var remixLib = require('remix-lib')
var traceHelper = remixLib.helpers.trace
var global = remixLib.global
var mappingPreimages = require('./mappingPreimages')
/**
......@@ -9,34 +8,37 @@ var mappingPreimages = require('./mappingPreimages')
* (TODO: one instance need to be shared over all the components)
*/
class StorageResolver {
constructor () {
constructor (options) {
this.storageByAddress = {}
this.preimagesMappingByAddress = {}
this.maxSize = 100
this.web3 = options.web3
this.zeroSlot = '0x0000000000000000000000000000000000000000000000000000000000000000'
}
/**
* returns the storage for the given context (address and vm trace index)
* returns the range 0x0 => this.maxSize
*
* @param {Object} - tx - transaction
* @param {Int} - stepIndex - Index of the stop in the vm trace
* @param {String} - address - lookup address
* @param {Function} - callback - contains a map: [hashedKey] = {key, hashedKey, value}
*/
* returns the storage for the given context (address and vm trace index)
* returns the range 0x0 => this.maxSize
*
* @param {Object} - tx - transaction
* @param {Int} - stepIndex - Index of the stop in the vm trace
* @param {String} - address - lookup address
* @param {Function} - callback - contains a map: [hashedKey] = {key, hashedKey, value}
*/
storageRange (tx, stepIndex, address, callback) {
storageRangeInternal(this, zeroSlot, tx, stepIndex, address, callback)
this.storageRangeInternal(this, this.zeroSlot, tx, stepIndex, address, callback)
}
/**
* compute the mappgings type locations for the current address (cached for a debugging session)
* note: that only retrieve the first 100 items.
*
* @param {String} address - contract address
* @param {Object} address - storage
* @return {Function} - callback
*/
* compute the mappgings type locations for the current address (cached for a debugging session)
* note: that only retrieve the first 100 items.
*
* @param {String} address - contract address
* @param {Object} address - storage
* @return {Function} - callback
*/
initialPreimagesMappings (tx, stepIndex, address, callback) {
const self = this
if (this.preimagesMappingByAddress[address]) {
return callback(null, this.preimagesMappingByAddress[address])
}
......@@ -44,7 +46,7 @@ class StorageResolver {
if (error) {
return callback(error)
}
mappingPreimages.decodeMappingsKeys(storage, (error, mappings) => {
mappingPreimages.decodeMappingsKeys(self.web3, storage, (error, mappings) => {
if (error) {
callback(error)
} else {
......@@ -56,16 +58,16 @@ class StorageResolver {
}
/**
* return a slot value for the given context (address and vm trace index)
*
* @param {String} - slot - slot key
* @param {Object} - tx - transaction
* @param {Int} - stepIndex - Index of the stop in the vm trace
* @param {String} - address - lookup address
* @param {Function} - callback - {key, hashedKey, value} -
*/
* return a slot value for the given context (address and vm trace index)
*
* @param {String} - slot - slot key
* @param {Object} - tx - transaction
* @param {Int} - stepIndex - Index of the stop in the vm trace
* @param {String} - address - lookup address
* @param {Function} - callback - {key, hashedKey, value} -
*/
storageSlot (slot, tx, stepIndex, address, callback) {
storageRangeInternal(this, slot, tx, stepIndex, address, function (error, storage) {
this.storageRangeInternal(this, slot, tx, stepIndex, address, function (error, storage) {
if (error) {
callback(error)
} else {
......@@ -75,91 +77,89 @@ class StorageResolver {
}
/**
* return True if the storage at @arg address is complete
*
* @param {String} address - contract address
* @return {Bool} - return True if the storage at @arg address is complete
*/
* return True if the storage at @arg address is complete
*
* @param {String} address - contract address
* @return {Bool} - return True if the storage at @arg address is complete
*/
isComplete (address) {
return this.storageByAddress[address] && this.storageByAddress[address].complete
}
}
/**
* retrieve the storage and ensure at least @arg slot is cached.
* - If @arg slot is already cached, the storage will be returned from the cache
* even if the next 1000 items are not in the cache.
* - If @arg slot is not cached, the corresponding value will be resolved and the next 1000 slots.
*/
function storageRangeInternal (self, slotKey, tx, stepIndex, address, callback) {
var cached = fromCache(self, address)
if (cached && cached.storage[slotKey]) { // we have the current slot in the cache and maybe the next 1000...
return callback(null, cached.storage)
}
storageRangeWeb3Call(tx, address, slotKey, self.maxSize, (error, storage, nextKey) => {
if (error) {
return callback(error)
/**
* retrieve the storage and ensure at least @arg slot is cached.
* - If @arg slot is already cached, the storage will be returned from the cache
* even if the next 1000 items are not in the cache.
* - If @arg slot is not cached, the corresponding value will be resolved and the next 1000 slots.
*/
storageRangeInternal (self, slotKey, tx, stepIndex, address, callback) {
var cached = this.fromCache(self, address)
if (cached && cached.storage[slotKey]) { // we have the current slot in the cache and maybe the next 1000...
return callback(null, cached.storage)
}
if (!storage[slotKey] && slotKey !== zeroSlot) { // we don't cache the zero slot (could lead to inconsistency)
storage[slotKey] = {
key: slotKey,
value: zeroSlot
this.storageRangeWeb3Call(tx, address, slotKey, self.maxSize, (error, storage, nextKey) => {
if (error) {
return callback(error)
}
}
toCache(self, address, storage)
if (slotKey === zeroSlot && !nextKey) { // only working if keys are sorted !!
self.storageByAddress[address].complete = true
}
callback(null, storage)
})
}
var zeroSlot = '0x0000000000000000000000000000000000000000000000000000000000000000'
if (!storage[slotKey] && slotKey !== self.zeroSlot) { // we don't cache the zero slot (could lead to inconsistency)
storage[slotKey] = {
key: slotKey,
value: self.zeroSlot
}
}
self.toCache(self, address, storage)
if (slotKey === self.zeroSlot && !nextKey) { // only working if keys are sorted !!
self.storageByAddress[address].complete = true
}
callback(null, storage)
})
}
/**
* retrieve the storage from the cache. if @arg slot is defined, return only the desired slot, if not return the entire known storage
*
* @param {String} address - contract address
* @return {String} - either the entire known storage or a single value
*/
function fromCache (self, address) {
if (!self.storageByAddress[address]) {
return null
/**
* retrieve the storage from the cache. if @arg slot is defined, return only the desired slot, if not return the entire known storage
*
* @param {String} address - contract address
* @return {String} - either the entire known storage or a single value
*/
fromCache (self, address) {
if (!self.storageByAddress[address]) {
return null
}
return self.storageByAddress[address]
}
return self.storageByAddress[address]
}
/**
* store the result of `storageRangeAtInternal`
*
* @param {String} address - contract address
* @param {Object} storage - result of `storageRangeAtInternal`, contains {key, hashedKey, value}
*/
function toCache (self, address, storage) {
if (!self.storageByAddress[address]) {
self.storageByAddress[address] = {}
/**
* store the result of `storageRangeAtInternal`
*
* @param {String} address - contract address
* @param {Object} storage - result of `storageRangeAtInternal`, contains {key, hashedKey, value}
*/
toCache (self, address, storage) {
if (!self.storageByAddress[address]) {
self.storageByAddress[address] = {}
}
self.storageByAddress[address].storage = Object.assign(self.storageByAddress[address].storage || {}, storage)
}
self.storageByAddress[address].storage = Object.assign(self.storageByAddress[address].storage || {}, storage)
}
function storageRangeWeb3Call (tx, address, start, maxSize, callback) {
if (traceHelper.isContractCreation(address)) {
callback(null, {}, null)
} else {
global.web3Debug.debug.storageRangeAt(
tx.blockHash, tx.transactionIndex === undefined ? tx.hash : tx.transactionIndex,
address,
start,
maxSize,
(error, result) => {
if (error) {
callback(error)
} else if (result.storage) {
callback(null, result.storage, result.nextKey)
} else {
callback('the storage has not been provided')
}
})
storageRangeWeb3Call (tx, address, start, maxSize, callback) {
if (traceHelper.isContractCreation(address)) {
callback(null, {}, null)
} else {
this.web3.debug.storageRangeAt(
tx.blockHash, tx.transactionIndex === undefined ? tx.hash : tx.transactionIndex,
address,
start,
maxSize,
(error, result) => {
if (error) {
callback(error)
} else if (result.storage) {
callback(null, result.storage, result.nextKey)
} else {
callback('the storage has not been provided')
}
})
}
}
}
......
remix-core/src/storage/storageViewer.js
View file @ 3f802726
......@@ -12,6 +12,7 @@ class StorageViewer {
constructor (_context, _storageResolver, _traceManager) {
this.context = _context
this.storageResolver = _storageResolver
this.web3 = this.storageResolver.web3
this.initialMappingsLocationPromise = null
this.currentMappingsLocationPromise = null
_traceManager.accumulateStorageChanges(this.context.stepIndex, this.context.address, {}, (error, storageChanges) => {
......@@ -117,7 +118,7 @@ class StorageViewer {
if (this.mappingsLocationChanges) {
return callback(null, this.mappingsLocationChanges)
}
mappingPreimages.decodeMappingsKeys(storageChanges, (error, mappings) => {
mappingPreimages.decodeMappingsKeys(this.web3, storageChanges, (error, mappings) => {
if (!error) {
this.mappingsLocationChanges = mappings
return callback(null, this.mappingsLocationChanges)
......
remix-core/src/trace/traceManager.js
View file @ 3f802726
......@@ -6,14 +6,14 @@ var TraceStepManager = require('./traceStepManager')
var remixLib = require('remix-lib')
var traceHelper = remixLib.helpers.trace
var util = remixLib.util
var global = remixLib.global
function TraceManager () {
function TraceManager (options) {
this.web3 = options.web3
this.isLoading = false
this.trace = null
this.traceCache = new TraceCache()
this.traceAnalyser = new TraceAnalyser(this.traceCache)
this.traceRetriever = new TraceRetriever()
this.traceRetriever = new TraceRetriever({web3: this.web3})
this.traceStepManager = new TraceStepManager(this.traceAnalyser)
this.tx
}
......@@ -22,7 +22,7 @@ function TraceManager () {
TraceManager.prototype.resolveTrace = function (tx, callback) {
this.tx = tx
this.init()
if (!global.web3) callback('web3 not loaded', false)
if (!this.web3) callback('web3 not loaded', false)
this.isLoading = true
var self = this
this.traceRetriever.getTrace(tx.hash, function (error, result) {
......
remix-core/src/trace/traceRetriever.js
View file @ 3f802726
'use strict'
var remixLib = require('remix-lib')
var global = remixLib.global
function TraceRetriever () {
function TraceRetriever (options) {
this.web3 = options.web3
}
TraceRetriever.prototype.getTrace = function (txHash, callback) {
......@@ -12,7 +11,7 @@ TraceRetriever.prototype.getTrace = function (txHash, callback) {
disableStack: false,
fullStorage: false
}
global.web3Debug.debug.traceTransaction(txHash, options, function (error, result) {
this.web3.debug.traceTransaction(txHash, options, function (error, result) {
callback(error, result)
})
}
......
remix-core/test/codeManager.js
View file @ 3f802726
......@@ -5,7 +5,8 @@ var Web3Providers = remixLib.vm.Web3Providers
var TraceManager = require('../src/trace/traceManager')
var CodeManager = require('../src/code/codeManager')
var web3Test = require('./resources/testWeb3')
var global = remixLib.global
let web3 = null
tape('CodeManager', function (t) {
var codeManager
......@@ -17,12 +18,12 @@ tape('CodeManager', function (t) {
console.log(mes)
t.fail(mes)
} else {
global.web3 = obj
var traceManager = new TraceManager()
web3 = obj
var traceManager = new TraceManager({web3: web3})
codeManager = new CodeManager(traceManager)
var contractCode = global.web3.eth.getCode('0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5')
var contractCode = web3.eth.getCode('0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5')
codeManager.codeResolver.cacheExecutingCode('0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5', contractCode) // so a call to web3 is not necessary
var tx = global.web3.eth.getTransaction('0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51')
var tx = web3.eth.getTransaction('0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51')
traceManager.resolveTrace(tx, function (error, result) {
if (error) {
t.fail(' - traceManager.resolveTrace - failed ' + result)
......@@ -63,7 +64,7 @@ function continueTesting (t, codeManager) {
}
}
})
var tx = global.web3.eth.getTransaction('0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51')
var tx = web3.eth.getTransaction('0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51')
codeManager.resolveStep(0, tx)
codeManager.resolveStep(70, tx)
})
......
remix-core/test/traceManager.js
View file @ 3f802726
......@@ -3,9 +3,10 @@ var TraceManager = require('../src/trace/traceManager')
var tape = require('tape')
var remixLib = require('remix-lib')
var Web3Providers = remixLib.vm.Web3Providers
var global = remixLib.global
var web3Test = require('./resources/testWeb3')
let web3 = null
tape('TraceManager', function (t) {
var traceManager
......@@ -18,16 +19,15 @@ tape('TraceManager', function (t) {
console.log(mes)
st.fail(mes)
} else {
global.web3 = obj
global.web3Debug = obj
traceManager = new TraceManager()
web3 = obj
traceManager = new TraceManager({web3: web3})
st.end()
}
})
})
t.test('TraceManager.resolveTrace', function (st) {
var tx = global.web3.eth.getTransaction('0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51')
var tx = web3.eth.getTransaction('0x20ef65b8b186ca942fcccd634f37074dde49b541c27994fc7596740ef44cfd51')
traceManager.resolveTrace(tx, function (error, result) {
if (error) {
st.fail(' - traceManager.resolveTrace - failed ' + result)
......
remix-debug/src/Ethdebugger.js
View file @ 3f802726
......@@ -4,7 +4,6 @@ var TraceManager = remixCore.trace.TraceManager
var StorageViewer = remixCore.storage.StorageViewer
var remixLib = require('remix-lib')
var traceHelper = remixLib.helpers.trace
var global = remixLib.global
var init = remixLib.init
var executionContext = remixLib.execution.executionContext
var EventManager = remixLib.EventManager
......@@ -35,6 +34,8 @@ function Ethdebugger (opts) {
this.opts = opts || {}
if (!this.opts.compilationResult) this.opts.compilationResult = () => { return null }
this.web3 = opts.web3
this.event = new EventManager()
this.tx
......@@ -43,7 +44,16 @@ function Ethdebugger (opts) {
this.addProvider('DUMMYWEB3', new DummyProvider())
this.switchProvider('DUMMYWEB3')
this.traceManager = new TraceManager()
this.traceManager = new TraceManager({web3: this.web3})
this.codeManager = new CodeManager(this.traceManager)
this.solidityProxy = new SolidityProxy(this.traceManager, this.codeManager)
this.storageResolver = null
this.callTree = new InternalCallTree(this.event, this.traceManager, this.solidityProxy, this.codeManager, { includeLocalVariables: true })
}
Ethdebugger.prototype.setManagers = function () {
this.traceManager = new TraceManager({web3: this.web3})
this.codeManager = new CodeManager(this.traceManager)
this.solidityProxy = new SolidityProxy(this.traceManager, this.codeManager)
this.storageResolver = null
......@@ -152,7 +162,7 @@ Ethdebugger.prototype.storageViewAt = function (step, address) {
}
/* set env */
Ethdebugger.prototype.web3 = function () {
return global.web3
return this.web3
}
Ethdebugger.prototype.addProvider = function (type, obj) {
......@@ -166,14 +176,19 @@ Ethdebugger.prototype.switchProvider = function (type) {
if (error) {
console.log('provider ' + type + ' not defined')
} else {
global.web3 = obj
self.web3 = obj
self.setManagers()
// self.traceManager.web3 = self.web3
executionContext.detectNetwork((error, network) => {
if (error || !network) {
global.web3Debug = obj
self.web3Debug = obj
self.web3 = obj
} else {
var webDebugNode = init.web3DebugNode(network.name)
global.web3Debug = !webDebugNode ? obj : webDebugNode
self.web3Debug = !webDebugNode ? obj : webDebugNode
self.web3 = !webDebugNode ? obj : webDebugNode
}
self.setManagers()
})
self.event.trigger('providerChanged', [type])
}
......@@ -214,7 +229,7 @@ Ethdebugger.prototype.debug = function (tx) {
if (self.breakpointManager && self.breakpointManager.hasBreakpoint()) {
self.breakpointManager.jumpNextBreakpoint(false)
}
self.storageResolver = new StorageResolver()
self.storageResolver = new StorageResolver({web3: self.traceManager.web3})
} else {
self.statusMessage = error ? error.message : 'Trace not loaded'
}
......
remix-debug/test/vmCall.js
View file @ 3f802726
......@@ -51,8 +51,7 @@ function initVM (st, privateKey) {
console.log(mes)
st.fail(mes)
} else {
remixLib.global.web3 = obj
remixLib.global.web3Debug = obj
vm.web3 = obj
}
})
return vm
......
remix-lib/README.md
View file @ 3f802726
......@@ -18,9 +18,7 @@ Provides:
init: init,
util: util,
AstWalker: AstWalker,
global: global,
ui: {
styleGuide: styleGuide
}
}
}
remix-lib/index.js
View file @ 3f802726
......@@ -11,7 +11,6 @@ var Web3Providers = require('./src/web3Provider/web3Providers')
var DummyProvider = require('./src/web3Provider/dummyProvider')
var Web3VMProvider = require('./src/web3Provider/web3VmProvider')
var AstWalker = require('./src/astWalker')
var global = require('./src/global')
var Storage = require('./src/storage')
var EventsDecoder = require('./src/execution/eventsDecoder')
......@@ -50,7 +49,6 @@ function modules () {
init: init,
util: util,
AstWalker: AstWalker,
global: global,
execution: {
EventsDecoder: EventsDecoder,
txExecution: txExecution,
......
remix-lib/src/global.js deleted 100644 → 0
View file @ 18d90084
module.exports = {
web3: null,
web3Debug: null // this node should support the debug endpoint
}
remix-solidity/test/decoder/localsTests/int.js
View file @ 3f802726
......@@ -6,7 +6,6 @@ var vmCall = require('../vmCall')
var remixLib = require('remix-lib')
var traceHelper = remixLib.helpers.trace
var global = remixLib.global
var SolidityProxy = require('../../../src/decoder/solidityProxy')
var InternalCallTree = require('../../../src/decoder/internalCallTree')
var EventManager = remixLib.EventManager
......@@ -17,12 +16,12 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
if (error) {
st.fail(error)
} else {
global.web3.getTransaction(txHash, function (error, tx) {
vm.web3.eth.getTransaction(txHash, function (error, tx) {
if (error) {
st.fail(error)
} else {
tx.to = traceHelper.contractCreationToken('0')
var traceManager = new TraceManager()
var traceManager = new TraceManager({web3: vm.web3})
var codeManager = new CodeManager(traceManager)
codeManager.clear()
var solidityProxy = new SolidityProxy(traceManager, codeManager)
......
remix-solidity/test/decoder/localsTests/misc.js
View file @ 3f802726
......@@ -5,7 +5,6 @@ var CodeManager = remixCore.code.CodeManager
var vmCall = require('../vmCall')
var remixLib = require('remix-lib')
var traceHelper = remixLib.helpers.trace
var global = remixLib.global
var SolidityProxy = require('../../../src/decoder/solidityProxy')
var InternalCallTree = require('../../../src/decoder/internalCallTree')
var EventManager = remixLib.EventManager
......@@ -16,12 +15,12 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
if (error) {
st.fail(error)
} else {
global.web3.getTransaction(txHash, function (error, tx) {
vm.web3.eth.getTransaction(txHash, function (error, tx) {
if (error) {
st.fail(error)
} else {
tx.to = traceHelper.contractCreationToken('0')
var traceManager = new TraceManager()
var traceManager = new TraceManager({web3: vm.web3})
var codeManager = new CodeManager(traceManager)
codeManager.clear()
var solidityProxy = new SolidityProxy(traceManager, codeManager)
......
remix-solidity/test/decoder/localsTests/misc2.js
View file @ 3f802726
......@@ -5,7 +5,6 @@ var CodeManager = remixCore.code.CodeManager
var vmCall = require('../vmCall')
var remixLib = require('remix-lib')
var traceHelper = remixLib.helpers.trace
var global = remixLib.global
var SolidityProxy = require('../../../src/decoder/solidityProxy')
var InternalCallTree = require('../../../src/decoder/internalCallTree')
var EventManager = remixLib.EventManager
......@@ -16,12 +15,12 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
if (error) {
st.fail(error)
} else {
global.web3.getTransaction(txHash, function (error, tx) {
vm.web3.eth.getTransaction(txHash, function (error, tx) {
if (error) {
st.fail(error)
} else {
tx.to = traceHelper.contractCreationToken('0')
var traceManager = new TraceManager()
var traceManager = new TraceManager({web3: vm.web3})
var codeManager = new CodeManager(traceManager)
codeManager.clear()
var solidityProxy = new SolidityProxy(traceManager, codeManager)
......
remix-solidity/test/decoder/localsTests/structArray.js
View file @ 3f802726
......@@ -5,7 +5,6 @@ var CodeManager = remixCore.code.CodeManager
var vmCall = require('../vmCall')
var remixLib = require('remix-lib')
var traceHelper = remixLib.helpers.trace
var global = remixLib.global
var SolidityProxy = require('../../../src/decoder/solidityProxy')
var InternalCallTree = require('../../../src/decoder/internalCallTree')
var EventManager = remixLib.EventManager
......@@ -16,12 +15,12 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
if (error) {
st.fail(error)
} else {
global.web3.getTransaction(txHash, function (error, tx) {
vm.web3.eth.getTransaction(txHash, function (error, tx) {
if (error) {
st.fail(error)
} else {
tx.to = traceHelper.contractCreationToken('0')
var traceManager = new TraceManager()
var traceManager = new TraceManager({web3: vm.web3})
var codeManager = new CodeManager(traceManager)
codeManager.clear()
var solidityProxy = new SolidityProxy(traceManager, codeManager)
......
remix-solidity/test/decoder/stateTests/mapping.js
View file @ 3f802726
......@@ -15,7 +15,7 @@ module.exports = function testMappingStorage (st, cb) {
console.log(error)
st.end(error)
} else {
remixLib.global.web3.eth.getTransaction(txHash, (error, tx) => {
vm.web3.eth.getTransaction(txHash, (error, tx) => {
if (error) {
console.log(error)
st.end(error)
......@@ -35,13 +35,13 @@ function testMapping (st, vm, privateKey, contractAddress, output, cb) {
st.end(error)
} else {
console.log(txHash)
remixLib.global.web3.eth.getTransaction(txHash, (error, tx) => {
vm.web3.eth.getTransaction(txHash, (error, tx) => {
if (error) {
console.log(error)
st.end(error)
} else {
var TraceManager = require('remix-core').trace.TraceManager
var traceManager = new TraceManager()
var traceManager = new TraceManager({web3: vm.web3})
traceManager.resolveTrace(tx, () => {
var StorageResolver = require('remix-core').storage.StorageResolver
var StorageViewer = require('remix-core').storage.StorageViewer
......@@ -49,7 +49,7 @@ function testMapping (st, vm, privateKey, contractAddress, output, cb) {
stepIndex: 213,
tx: tx,
address: contractAddress
}, new StorageResolver(), traceManager)
}, new StorageResolver({web3: vm.web3}), traceManager)
var stateVars = stateDecoder.extractStateVariables('SimpleMappingState', output.sources)
stateDecoder.decodeState(stateVars, storageViewer).then((result) => {
console.log('ok', JSON.stringify(result))
......
remix-solidity/test/decoder/vmCall.js
View file @ 3f802726
......@@ -51,8 +51,7 @@ function initVM (st, privateKey) {
console.log(mes)
st.fail(mes)
} else {
remixLib.global.web3 = obj
remixLib.global.web3Debug = obj
vm.web3 = obj
}
})
return vm
......
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