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
8f9ef36e
Commit
8f9ef36e
authored
Sep 25, 2019
by
Iuri Matias
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix useCall
parent
12c5668b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
5 deletions
+14
-5
txExecution.js
remix-lib/src/execution/txExecution.js
+1
-1
txRunner.js
remix-lib/src/execution/txRunner.js
+3
-0
transactions.js
remix-simulator/src/methods/transactions.js
+5
-2
txProcess.js
remix-simulator/src/methods/txProcess.js
+5
-2
No files found.
remix-lib/src/execution/txExecution.js
View file @
8f9ef36e
...
...
@@ -43,7 +43,7 @@ module.exports = {
* @param {Function} finalCallback - last callback.
*/
callFunction
:
function
(
from
,
to
,
data
,
value
,
gasLimit
,
funAbi
,
txRunner
,
callbacks
,
finalCallback
)
{
var
tx
=
{
from
:
from
,
to
:
to
,
data
:
data
,
useCall
:
f
alse
,
value
:
value
,
gasLimit
:
gasLimit
}
var
tx
=
{
from
:
from
,
to
:
to
,
data
:
data
,
useCall
:
f
unAbi
.
constant
,
value
:
value
,
gasLimit
:
gasLimit
}
txRunner
.
rawRun
(
tx
,
callbacks
.
confirmationCb
,
callbacks
.
gasEstimationForceSend
,
callbacks
.
promptCb
,
(
error
,
txResult
)
=>
{
// see universaldapp.js line 660 => 700 to check possible values of txResult (error case)
finalCallback
(
error
,
txResult
)
...
...
remix-lib/src/execution/txRunner.js
View file @
8f9ef36e
...
...
@@ -133,6 +133,9 @@ class TxRunner {
++
self
.
blockNumber
this
.
runBlockInVm
(
tx
,
block
,
callback
)
}
else
{
console
.
dir
(
"============"
)
console
.
dir
(
"========= useCall"
)
console
.
dir
(
"============"
)
executionContext
.
vm
().
stateManager
.
checkpoint
(()
=>
{
this
.
runBlockInVm
(
tx
,
block
,
(
err
,
result
)
=>
{
executionContext
.
vm
().
stateManager
.
revert
(()
=>
{
...
...
remix-simulator/src/methods/transactions.js
View file @
8f9ef36e
...
...
@@ -50,8 +50,8 @@ Transactions.prototype.eth_getTransactionReceipt = function (payload, cb) {
'cumulativeGasUsed'
:
Web3
.
utils
.
toHex
(
receipt
.
gas
),
'contractAddress'
:
receipt
.
contractAddress
,
'logs'
:
receipt
.
logs
,
//
'status': receipt.status
'status'
:
"0x01"
'status'
:
receipt
.
status
//
'status': "0x01"
}
if
(
r
.
blockNumber
===
'0x'
)
{
...
...
@@ -83,6 +83,9 @@ Transactions.prototype.eth_call = function (payload, cb) {
if
(
payload
.
params
&&
payload
.
params
.
length
>
0
&&
payload
.
params
[
0
].
from
)
{
payload
.
params
[
0
].
from
=
ethJSUtil
.
toChecksumAddress
(
payload
.
params
[
0
].
from
)
}
if
(
payload
.
params
&&
payload
.
params
.
length
>
0
&&
payload
.
params
[
0
].
to
)
{
payload
.
params
[
0
].
to
=
ethJSUtil
.
toChecksumAddress
(
payload
.
params
[
0
].
to
)
}
processTx
(
this
.
accounts
,
payload
,
true
,
cb
)
}
...
...
remix-simulator/src/methods/txProcess.js
View file @
8f9ef36e
...
...
@@ -9,6 +9,9 @@ function runCall (payload, from, to, data, value, gasLimit, txRunner, callbacks,
return
callback
(
err
)
}
console
.
dir
(
result
.
result
.
vm
)
console
.
dir
(
result
.
result
.
vm
.
error
)
console
.
dir
(
result
.
result
)
let
toReturn
=
'0x'
+
result
.
result
.
vm
.
return
.
toString
(
'hex'
)
if
(
toReturn
===
'0x'
)
{
toReturn
=
'0x0'
...
...
@@ -16,7 +19,7 @@ function runCall (payload, from, to, data, value, gasLimit, txRunner, callbacks,
return
callback
(
null
,
toReturn
)
}
TxExecution
.
callFunction
(
from
,
to
,
data
,
value
,
gasLimit
,
null
,
txRunner
,
callbacks
,
finalCallback
,
true
)
TxExecution
.
callFunction
(
from
,
to
,
data
,
value
,
gasLimit
,
{
constant
:
true
}
,
txRunner
,
callbacks
,
finalCallback
,
true
)
}
function
runTx
(
payload
,
from
,
to
,
data
,
value
,
gasLimit
,
txRunner
,
callbacks
,
callback
)
{
...
...
@@ -27,7 +30,7 @@ function runTx (payload, from, to, data, value, gasLimit, txRunner, callbacks, c
callback
(
null
,
result
.
transactionHash
)
}
TxExecution
.
callFunction
(
from
,
to
,
data
,
value
,
gasLimit
,
null
,
txRunner
,
callbacks
,
finalCallback
,
false
)
TxExecution
.
callFunction
(
from
,
to
,
data
,
value
,
gasLimit
,
{
constant
:
false
}
,
txRunner
,
callbacks
,
finalCallback
,
false
)
}
function
createContract
(
payload
,
from
,
data
,
value
,
gasLimit
,
txRunner
,
callbacks
,
callback
)
{
...
...
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