Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
7bef3013
Commit
7bef3013
authored
Mar 02, 2018
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add debug node ref
parent
6589de24
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
6 deletions
+29
-6
mappingPreimages.js
remix-core/src/storage/mappingPreimages.js
+1
-1
storageResolver.js
remix-core/src/storage/storageResolver.js
+1
-1
traceRetriever.js
remix-core/src/trace/traceRetriever.js
+1
-1
Ethdebugger.js
remix-debugger/src/ui/Ethdebugger.js
+10
-0
global.js
remix-lib/src/global.js
+2
-1
init.js
remix-lib/src/init.js
+14
-2
No files found.
remix-core/src/storage/mappingPreimages.js
View file @
7bef3013
...
@@ -44,7 +44,7 @@ async function decodeMappingsKeys (storage, callback) {
...
@@ -44,7 +44,7 @@ async function decodeMappingsKeys (storage, callback) {
*/
*/
function
getPreimage
(
key
)
{
function
getPreimage
(
key
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
global
.
web3
.
debug
.
preimage
(
key
.
indexOf
(
'0x'
)
===
0
?
key
:
'0x'
+
key
,
function
(
error
,
preimage
)
{
global
.
web3
Debug
.
debug
.
preimage
(
key
.
indexOf
(
'0x'
)
===
0
?
key
:
'0x'
+
key
,
function
(
error
,
preimage
)
{
if
(
error
)
{
if
(
error
)
{
resolve
(
null
)
resolve
(
null
)
}
else
{
}
else
{
...
...
remix-core/src/storage/storageResolver.js
View file @
7bef3013
...
@@ -146,7 +146,7 @@ function storageRangeWeb3Call (tx, address, start, maxSize, callback) {
...
@@ -146,7 +146,7 @@ function storageRangeWeb3Call (tx, address, start, maxSize, callback) {
if
(
traceHelper
.
isContractCreation
(
address
))
{
if
(
traceHelper
.
isContractCreation
(
address
))
{
callback
(
null
,
{},
null
)
callback
(
null
,
{},
null
)
}
else
{
}
else
{
global
.
web3
.
debug
.
storageRangeAt
(
global
.
web3
Debug
.
debug
.
storageRangeAt
(
tx
.
blockHash
,
tx
.
transactionIndex
===
undefined
?
tx
.
hash
:
tx
.
transactionIndex
,
tx
.
blockHash
,
tx
.
transactionIndex
===
undefined
?
tx
.
hash
:
tx
.
transactionIndex
,
address
,
address
,
start
,
start
,
...
...
remix-core/src/trace/traceRetriever.js
View file @
7bef3013
...
@@ -12,7 +12,7 @@ TraceRetriever.prototype.getTrace = function (txHash, callback) {
...
@@ -12,7 +12,7 @@ TraceRetriever.prototype.getTrace = function (txHash, callback) {
disableStack
:
false
,
disableStack
:
false
,
fullStorage
:
false
fullStorage
:
false
}
}
global
.
web3
.
debug
.
traceTransaction
(
txHash
,
options
,
function
(
error
,
result
)
{
global
.
web3
Debug
.
debug
.
traceTransaction
(
txHash
,
options
,
function
(
error
,
result
)
{
callback
(
error
,
result
)
callback
(
error
,
result
)
})
})
}
}
...
...
remix-debugger/src/ui/Ethdebugger.js
View file @
7bef3013
...
@@ -6,6 +6,8 @@ var TraceManager = remixCore.trace.TraceManager
...
@@ -6,6 +6,8 @@ var TraceManager = remixCore.trace.TraceManager
var
VmDebugger
=
require
(
'./VmDebugger'
)
var
VmDebugger
=
require
(
'./VmDebugger'
)
var
remixLib
=
require
(
'remix-lib'
)
var
remixLib
=
require
(
'remix-lib'
)
var
global
=
remixLib
.
global
var
global
=
remixLib
.
global
var
init
=
remixLib
.
init
var
executionContext
=
remixLib
.
execution
.
executionContext
var
EventManager
=
remixLib
.
EventManager
var
EventManager
=
remixLib
.
EventManager
var
yo
=
require
(
'yo-yo'
)
var
yo
=
require
(
'yo-yo'
)
var
csjs
=
require
(
'csjs-inject'
)
var
csjs
=
require
(
'csjs-inject'
)
...
@@ -97,6 +99,14 @@ Ethdebugger.prototype.switchProvider = function (type) {
...
@@ -97,6 +99,14 @@ Ethdebugger.prototype.switchProvider = function (type) {
console
.
log
(
'provider '
+
type
+
' not defined'
)
console
.
log
(
'provider '
+
type
+
' not defined'
)
}
else
{
}
else
{
global
.
web3
=
obj
global
.
web3
=
obj
executionContext
.
detectNetwork
((
error
,
network
)
=>
{
if
(
error
||
!
network
)
{
global
.
web3Debug
=
obj
}
else
{
var
webDebugNode
=
init
.
web3DebugNode
(
network
.
name
)
global
.
web3Debug
=
!
webDebugNode
?
obj
:
webDebugNode
}
})
self
.
event
.
trigger
(
'providerChanged'
,
[
type
])
self
.
event
.
trigger
(
'providerChanged'
,
[
type
])
}
}
})
})
...
...
remix-lib/src/global.js
View file @
7bef3013
module
.
exports
=
{
module
.
exports
=
{
web3
:
null
web3
:
null
,
web3Debug
:
null
// this node should support the debug endpoint
}
}
remix-lib/src/init.js
View file @
7bef3013
...
@@ -2,9 +2,10 @@
...
@@ -2,9 +2,10 @@
var
Web3
=
require
(
'web3'
)
var
Web3
=
require
(
'web3'
)
module
.
exports
=
{
module
.
exports
=
{
loadWeb3
:
function
()
{
loadWeb3
:
function
(
url
)
{
if
(
!
url
)
url
=
'http://localhost:8545'
var
web3
=
new
Web3
()
var
web3
=
new
Web3
()
web3
.
setProvider
(
new
web3
.
providers
.
HttpProvider
(
'http://localhost:8545'
))
web3
.
setProvider
(
new
web3
.
providers
.
HttpProvider
(
url
))
this
.
extend
(
web3
)
this
.
extend
(
web3
)
return
web3
return
web3
},
},
...
@@ -17,6 +18,13 @@ module.exports = {
...
@@ -17,6 +18,13 @@ module.exports = {
web3
.
setProvider
(
new
web3
.
providers
.
HttpProvider
(
url
))
web3
.
setProvider
(
new
web3
.
providers
.
HttpProvider
(
url
))
},
},
web3DebugNode
:
function
(
network
)
{
if
(
web3DebugNodes
[
network
])
{
return
this
.
loadWeb3
(
web3DebugNodes
[
network
])
}
return
null
},
extend
:
function
(
web3
)
{
extend
:
function
(
web3
)
{
if
(
!
web3
.
_extend
)
{
if
(
!
web3
.
_extend
)
{
return
return
...
@@ -58,3 +66,7 @@ module.exports = {
...
@@ -58,3 +66,7 @@ module.exports = {
}
}
}
}
}
}
var
web3DebugNodes
=
{
'Main'
:
'https://mainnet.infura.io/remix'
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment