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
e6268175
Unverified
Commit
e6268175
authored
Jun 11, 2018
by
yann300
Committed by
GitHub
Jun 11, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #844 from ethereum/retrieveReceipt
Retrieve receipt
parents
d3e98877
8d98d382
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
txListener.js
remix-lib/src/execution/txListener.js
+10
-7
web3VmProvider.js
remix-lib/src/web3Provider/web3VmProvider.js
+1
-0
No files found.
remix-lib/src/execution/txListener.js
View file @
e6268175
...
...
@@ -200,13 +200,16 @@ class TxListener {
_resolve
(
transactions
,
callback
)
{
async
.
each
(
transactions
,
(
tx
,
cb
)
=>
{
this
.
_resolveTx
(
tx
,
(
error
,
resolvedData
)
=>
{
if
(
error
)
cb
(
error
)
if
(
resolvedData
)
{
this
.
event
.
trigger
(
'txResolved'
,
[
tx
,
resolvedData
])
}
this
.
event
.
trigger
(
'newTransaction'
,
[
tx
])
cb
()
executionContext
.
web3
().
eth
.
getTransactionReceipt
(
tx
.
hash
,
(
error
,
receipt
)
=>
{
if
(
error
)
return
cb
(
error
)
this
.
_resolveTx
(
receipt
,
(
error
,
resolvedData
)
=>
{
if
(
error
)
cb
(
error
)
if
(
resolvedData
)
{
this
.
event
.
trigger
(
'txResolved'
,
[
receipt
,
resolvedData
])
}
this
.
event
.
trigger
(
'newTransaction'
,
[
receipt
])
cb
()
})
})
},
()
=>
{
callback
()
...
...
remix-lib/src/web3Provider/web3VmProvider.js
View file @
e6268175
...
...
@@ -121,6 +121,7 @@ web3VmProvider.prototype.txProcessed = function (self, data) {
})
}
self
.
txsReceipt
[
self
.
processingHash
].
logs
=
logs
self
.
txsReceipt
[
self
.
processingHash
].
transactionHash
=
self
.
processingHash
if
(
data
.
createdAddress
)
{
var
address
=
util
.
hexConvert
(
data
.
createdAddress
)
...
...
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