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
ebe128eb
Commit
ebe128eb
authored
Aug 14, 2017
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
display call result
parent
980856e4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
15 deletions
+40
-15
txFormat.js
src/app/execution/txFormat.js
+19
-4
universal-dapp.js
src/universal-dapp.js
+21
-11
No files found.
src/app/execution/txFormat.js
View file @
ebe128eb
'use strict'
var
$
=
require
(
'jquery'
)
var
ethJSABI
=
require
(
'ethereumjs-abi'
)
var
ethJSUtil
=
require
(
'ethereumjs-util'
)
var
BN
=
ethJSUtil
.
BN
var
helper
=
require
(
'./txHelper'
)
var
TreeView
=
require
(
'ethereum-remix'
).
ui
.
TreeView
module
.
exports
=
{
/**
...
...
@@ -121,6 +124,18 @@ module.exports = {
decodeResponse
:
function
(
response
,
fnabi
,
callback
)
{
// Only decode if there supposed to be fields
var
treeView
=
new
TreeView
({
extractData
:
(
item
,
parent
,
key
)
=>
{
var
ret
=
{}
if
(
BN
.
isBN
(
item
))
{
ret
.
self
=
item
.
toString
(
10
)
ret
.
children
=
[]
}
else
{
ret
=
treeView
.
extractDataDefault
(
item
,
parent
,
key
)
}
return
ret
}
})
if
(
fnabi
.
outputs
&&
fnabi
.
outputs
.
length
>
0
)
{
try
{
var
i
...
...
@@ -134,17 +149,17 @@ module.exports = {
var
decodedObj
=
ethJSABI
.
rawDecode
(
outputTypes
,
response
)
// format decoded data
decodedObj
=
ethJSABI
.
stringify
(
outputTypes
,
decodedObj
)
var
json
=
{}
for
(
i
=
0
;
i
<
outputTypes
.
length
;
i
++
)
{
var
name
=
fnabi
.
outputs
[
i
].
name
if
(
name
.
length
>
0
)
{
decodedObj
[
i
]
=
outputTypes
[
i
]
+
' '
+
name
+
': '
+
decodedObj
[
i
]
json
[
outputTypes
[
i
]
+
' '
+
name
]
=
decodedObj
[
i
]
}
else
{
decodedObj
[
i
]
=
outputTypes
[
i
]
+
': '
+
decodedObj
[
i
]
json
[
outputTypes
[
i
]]
=
decodedObj
[
i
]
}
}
return
callback
(
null
,
decodedObj
)
return
callback
(
null
,
treeView
.
render
(
json
)
)
}
catch
(
e
)
{
return
callback
(
'Failed to decode output: '
+
e
)
}
...
...
src/universal-dapp.js
View file @
ebe128eb
...
...
@@ -362,19 +362,28 @@ UniversalDApp.prototype.getCallButton = function (args) {
.
attr
(
'title'
,
title
)
.
text
(
title
)
.
click
(()
=>
{
txFormat
.
buildData
(
args
.
contractAbi
,
self
.
contracts
,
false
,
args
.
funABI
,
inputField
.
val
(),
self
,
self
.
executionContext
,
(
error
,
data
)
=>
{
if
(
!
error
)
{
txExecution
.
callFunction
(
args
.
address
,
data
,
args
.
funABI
,
self
,
(
error
,
txResult
)
=>
{
// TODO here should send the result to the dom-console
console
.
log
(
'function call'
,
error
,
txResult
)
alert
(
error
+
' '
+
txResult
.
transactionHash
)
})
}
else
{
alert
(
error
)
}
})
call
()
})
function
call
()
{
txFormat
.
buildData
(
args
.
contractAbi
,
self
.
contracts
,
false
,
args
.
funABI
,
inputField
.
val
(),
self
,
self
.
executionContext
,
(
error
,
data
)
=>
{
if
(
!
error
)
{
txExecution
.
callFunction
(
args
.
address
,
data
,
args
.
funABI
,
self
,
(
error
,
txResult
)
=>
{
if
(
!
error
)
{
if
(
lookupOnly
)
{
txFormat
.
decodeResponse
(
self
.
executionContext
.
isVM
()
?
txResult
.
result
.
vm
.
return
:
ethJSUtil
.
toBuffer
(
txResult
.
result
),
args
.
funABI
,
(
error
,
decoded
)
=>
{
$outputOverride
.
html
(
error
?
'error'
+
error
:
decoded
)
})
}
}
else
{
alert
(
error
)
}
})
}
else
{
alert
(
error
)
}
})
}
// TODO the auto call to constant function has been removed. needs to readd it later.
var
$contractProperty
=
$
(
`<div class="contractProperty
${
css
.
buttonsContainer
}
"></div>`
)
...
...
@@ -384,6 +393,7 @@ UniversalDApp.prototype.getCallButton = function (args) {
if
(
lookupOnly
)
{
$contractProperty
.
addClass
(
'constant'
)
call
()
}
if
(
args
.
funABI
.
inputs
&&
args
.
funABI
.
inputs
.
length
>
0
)
{
...
...
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