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
63419e6a
Commit
63419e6a
authored
Feb 08, 2020
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix passing blockchain param
parent
be3eeb80
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
sendTxCallbacks.js
src/app/ui/sendTxCallbacks.js
+3
-3
universal-dapp-ui.js
src/app/ui/universal-dapp-ui.js
+1
-1
No files found.
src/app/ui/sendTxCallbacks.js
View file @
63419e6a
...
...
@@ -7,13 +7,13 @@ const typeConversion = remixLib.execution.typeConversion
const
Web3
=
require
(
'web3'
)
module
.
exports
=
{
getCallBacksWithContext
:
(
udappUI
,
executionContext
)
=>
{
getCallBacksWithContext
:
(
udappUI
,
blockchain
)
=>
{
let
callbacks
=
{}
callbacks
.
confirmationCb
=
confirmationCb
callbacks
.
continueCb
=
continueCb
callbacks
.
promptCb
=
promptCb
callbacks
.
udappUI
=
udappUI
callbacks
.
executionContext
=
executionContext
callbacks
.
blockchain
=
blockchain
return
callbacks
}
}
...
...
@@ -67,7 +67,7 @@ const confirmationCb = function (network, tx, gasEstimation, continueTxExecution
cb
(
txFeeText
,
priceStatus
)
},
(
cb
)
=>
{
self
.
executionContext
.
web3
().
eth
.
getGasPrice
((
error
,
gasPrice
)
=>
{
self
.
blockchain
.
web3
().
eth
.
getGasPrice
((
error
,
gasPrice
)
=>
{
const
warnMessage
=
' Please fix this issue before sending any transaction. '
if
(
error
)
{
return
cb
(
'Unable to retrieve the current network gas price.'
+
warnMessage
+
error
)
...
...
src/app/ui/universal-dapp-ui.js
View file @
63419e6a
...
...
@@ -233,7 +233,7 @@ UniversalDAppUI.prototype.runTransaction = function (lookupOnly, args, valArr, i
const
functionName
=
args
.
funABI
.
type
===
'function'
?
args
.
funABI
.
name
:
`(
${
args
.
funABI
.
type
}
)`
const
logMsg
=
`
${
lookupOnly
?
'call'
:
'transact'
}
to
${
args
.
contractName
}
.
${
functionName
}
`
const
callbacksInContext
=
txCallBacks
.
getCallBacksWithContext
(
this
,
this
.
executionContext
)
const
callbacksInContext
=
txCallBacks
.
getCallBacksWithContext
(
this
,
this
.
blockchain
)
const
outputCb
=
(
returnValue
)
=>
{
if
(
outputOverride
)
{
...
...
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