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
bb6142a3
Commit
bb6142a3
authored
Jul 02, 2018
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add logCallback fn to log to the remix console
parent
65732069
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
24 deletions
+25
-24
app.js
src/app.js
+4
-0
run-tab.js
src/app/tabs/run-tab.js
+8
-11
recorder.js
src/recorder.js
+6
-6
universal-dapp.js
src/universal-dapp.js
+7
-7
No files found.
src/app.js
View file @
bb6142a3
...
...
@@ -384,6 +384,10 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
}
})
registry
.
put
({
api
:
(
msg
)
=>
{
self
.
_components
.
editorpanel
.
logHtmlMessage
(
msg
)
},
name
:
'logCallback'
})
// ----------------- Compiler -----------------
self
.
_components
.
compiler
=
new
Compiler
((
url
,
cb
)
=>
self
.
importFileCb
(
url
,
cb
))
var
compiler
=
self
.
_components
.
compiler
...
...
src/app/tabs/run-tab.js
View file @
bb6142a3
...
...
@@ -42,8 +42,7 @@ function runTab (localRegistry) {
udappUI
:
self
.
_components
.
registry
.
get
(
'udappUI'
).
api
,
config
:
self
.
_components
.
registry
.
get
(
'config'
).
api
,
fileManager
:
self
.
_components
.
registry
.
get
(
'filemanager'
).
api
,
editorPanel
:
self
.
_components
.
registry
.
get
(
'editorpanel'
).
api
,
editor
:
self
.
_components
.
registry
.
get
(
'editor'
).
api
logCallback
:
self
.
_components
.
registry
.
get
(
'logCallback'
).
api
}
self
.
_view
.
recorderCount
=
yo
`<span>0</span>`
self
.
_view
.
instanceContainer
=
yo
`<div class="
${
css
.
instanceContainer
}
"></div>`
...
...
@@ -198,9 +197,7 @@ function updateAccountBalances (container, self) {
RECORDER
------------------------------------------------ */
function
makeRecorder
(
registry
,
runTabEvent
,
self
)
{
var
recorder
=
new
Recorder
(
self
.
_deps
.
compiler
,
self
.
_deps
.
udapp
,
(
msg
)
=>
{
self
.
_deps
.
editorPanel
.
logMessage
(
msg
)
})
var
recorder
=
new
Recorder
(
self
.
_deps
.
compiler
,
self
.
_deps
.
udapp
,
self
.
_deps
.
logCallback
)
recorder
.
event
.
register
(
'newTxRecorded'
,
(
count
)
=>
{
self
.
data
.
count
=
count
...
...
@@ -370,21 +367,21 @@ function contractDropdown (events, self) {
var
constructor
=
txHelper
.
getConstructorInterface
(
selectedContract
.
contract
.
object
.
abi
)
txFormat
.
buildData
(
selectedContract
.
name
,
selectedContract
.
contract
.
object
,
self
.
_deps
.
compiler
.
getContracts
(),
true
,
constructor
,
args
,
(
error
,
data
)
=>
{
if
(
!
error
)
{
self
.
_deps
.
editorPanel
.
logMessage
(
`creation of
${
selectedContract
.
name
}
pending...`
)
self
.
_deps
.
logCallback
(
`creation of
${
selectedContract
.
name
}
pending...`
)
self
.
_deps
.
udapp
.
createContract
(
data
,
(
error
,
txResult
)
=>
{
if
(
error
)
{
self
.
_deps
.
editorPanel
.
logMessage
(
`creation of
${
selectedContract
.
name
}
errored: `
+
error
)
self
.
_deps
.
logCallback
(
`creation of
${
selectedContract
.
name
}
errored: `
+
error
)
}
else
{
var
isVM
=
executionContext
.
isVM
()
if
(
isVM
)
{
var
vmError
=
txExecution
.
checkVMError
(
txResult
)
if
(
vmError
.
error
)
{
self
.
_deps
.
editorPanel
.
logMessage
(
vmError
.
message
)
self
.
_deps
.
logCallback
(
vmError
.
message
)
return
}
}
if
(
txResult
.
result
.
status
&&
txResult
.
result
.
status
===
'0x0'
)
{
self
.
_deps
.
editorPanel
.
logMessage
(
`creation of
${
selectedContract
.
name
}
errored: transaction execution failed`
)
self
.
_deps
.
logCallback
(
`creation of
${
selectedContract
.
name
}
errored: transaction execution failed`
)
return
}
var
noInstancesText
=
self
.
_view
.
noInstancesText
...
...
@@ -394,10 +391,10 @@ function contractDropdown (events, self) {
}
})
}
else
{
self
.
_deps
.
editorPanel
.
logMessage
(
`creation of
${
selectedContract
.
name
}
errored: `
+
error
)
self
.
_deps
.
logCallback
(
`creation of
${
selectedContract
.
name
}
errored: `
+
error
)
}
},
(
msg
)
=>
{
self
.
_deps
.
editorPanel
.
logMessage
(
msg
)
self
.
_deps
.
logCallback
(
msg
)
},
(
data
,
runTxCallback
)
=>
{
// called for libraries deployment
self
.
_deps
.
udapp
.
runTx
(
data
,
runTxCallback
)
...
...
src/recorder.js
View file @
bb6142a3
...
...
@@ -13,9 +13,9 @@ var modal = require('./app/ui/modal-dialog-custom')
*
*/
class
Recorder
{
constructor
(
compiler
,
udapp
,
ms
gCallBack
)
{
constructor
(
compiler
,
udapp
,
lo
gCallBack
)
{
var
self
=
this
self
.
msgCallBack
=
ms
gCallBack
self
.
logCallBack
=
lo
gCallBack
self
.
event
=
new
EventManager
()
self
.
data
=
{
_listen
:
true
,
_replay
:
false
,
journal
:
[],
_createdContracts
:
{},
_createdContractsReverse
:
{},
_usedAccounts
:
{},
_abis
:
{},
_contractABIReferences
:
{},
_linkReferences
:
{}
}
...
...
@@ -178,7 +178,7 @@ class Recorder {
run
(
records
,
accounts
,
options
,
abis
,
linkReferences
,
udapp
,
newContractFn
)
{
var
self
=
this
self
.
setListen
(
false
)
self
.
ms
gCallBack
(
`Running
${
records
.
length
}
transaction(s) ...`
)
self
.
lo
gCallBack
(
`Running
${
records
.
length
}
transaction(s) ...`
)
async
.
eachOfSeries
(
records
,
function
(
tx
,
index
,
cb
)
{
var
record
=
self
.
resolveAddress
(
tx
.
record
,
accounts
,
options
)
var
abi
=
abis
[
tx
.
record
.
abi
]
...
...
@@ -235,14 +235,14 @@ class Recorder {
cb
(
data
.
error
)
return
}
else
{
self
.
ms
gCallBack
(
`(
${
index
}
)
${
JSON
.
stringify
(
record
,
null
,
'
\
t'
)}
`
)
self
.
ms
gCallBack
(
`(
${
index
}
) data:
${
data
.
data
}
`
)
self
.
lo
gCallBack
(
`(
${
index
}
)
${
JSON
.
stringify
(
record
,
null
,
'
\
t'
)}
`
)
self
.
lo
gCallBack
(
`(
${
index
}
) data:
${
data
.
data
}
`
)
record
.
data
=
{
dataHex
:
data
.
data
,
funArgs
:
tx
.
record
.
parameters
,
funAbi
:
fnABI
,
contractBytecode
:
tx
.
record
.
bytecode
,
contractName
:
tx
.
record
.
contractName
}
}
udapp
.
runTx
(
record
,
function
(
err
,
txResult
)
{
if
(
err
)
{
console
.
error
(
err
)
self
.
ms
gCallBack
(
err
+
'. Execution failed at '
+
index
)
self
.
lo
gCallBack
(
err
+
'. Execution failed at '
+
index
)
}
else
{
var
address
=
executionContext
.
isVM
()
?
txResult
.
result
.
createdAddress
:
txResult
.
result
.
contractAddress
if
(
address
)
{
...
...
src/universal-dapp.js
View file @
bb6142a3
...
...
@@ -29,7 +29,7 @@ function UniversalDApp (opts, localRegistry) {
self
.
removable
=
opts
.
removable
self
.
removable_instances
=
opts
.
removable_instances
self
.
_deps
=
{
config
:
self
.
_components
.
registry
.
get
(
'config
'
).
api
logCallback
:
self
.
_components
.
registry
.
get
(
'logCallback
'
).
api
}
executionContext
.
event
.
register
(
'contextChanged'
,
this
,
function
(
context
)
{
self
.
reset
(
self
.
contracts
)
...
...
@@ -190,9 +190,9 @@ UniversalDApp.prototype.call = function (isUserAction, args, value, lookupOnly,
if
(
!
error
)
{
if
(
isUserAction
)
{
if
(
!
args
.
funABI
.
constant
)
{
self
.
_deps
.
editorpanel
.
logMessage
(
`
${
logMsg
}
pending ... `
)
self
.
_deps
.
logCallback
(
`
${
logMsg
}
pending ... `
)
}
else
{
self
.
_deps
.
editorpanel
.
logMessage
(
`
${
logMsg
}
`
)
self
.
_deps
.
logCallback
(
`
${
logMsg
}
`
)
}
}
self
.
callFunction
(
args
.
address
,
data
,
args
.
funABI
,
(
error
,
txResult
)
=>
{
...
...
@@ -201,7 +201,7 @@ UniversalDApp.prototype.call = function (isUserAction, args, value, lookupOnly,
if
(
isVM
)
{
var
vmError
=
txExecution
.
checkVMError
(
txResult
)
if
(
vmError
.
error
)
{
self
.
_deps
.
editorpanel
.
logMessage
(
`
${
logMsg
}
errored:
${
vmError
.
message
}
`
)
self
.
_deps
.
logCallback
(
`
${
logMsg
}
errored:
${
vmError
.
message
}
`
)
return
}
}
...
...
@@ -210,14 +210,14 @@ UniversalDApp.prototype.call = function (isUserAction, args, value, lookupOnly,
outputCb
(
decoded
)
}
}
else
{
self
.
_deps
.
editorpanel
.
logMessage
(
`
${
logMsg
}
errored:
${
error
}
`
)
self
.
_deps
.
logCallback
(
`
${
logMsg
}
errored:
${
error
}
`
)
}
})
}
else
{
self
.
_deps
.
editorpanel
.
logMessage
(
`
${
logMsg
}
errored:
${
error
}
`
)
self
.
_deps
.
logCallback
(
`
${
logMsg
}
errored:
${
error
}
`
)
}
},
(
msg
)
=>
{
self
.
_deps
.
editorpanel
.
logMessage
(
msg
)
self
.
_deps
.
logCallback
(
msg
)
},
(
data
,
runTxCallback
)
=>
{
// called for libraries deployment
self
.
runTx
(
data
,
runTxCallback
)
...
...
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