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
6ad6a259
Commit
6ad6a259
authored
Mar 10, 2021
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
linting
parent
44eac57b
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
5 additions
and
10 deletions
+5
-10
execution-context.ts
libs/remix-lib/src/execution/execution-context.ts
+0
-0
txRunnerVM.ts
libs/remix-lib/src/execution/txRunnerVM.ts
+1
-2
txRunnerWeb3.ts
libs/remix-lib/src/execution/txRunnerWeb3.ts
+1
-1
web3VmProvider.ts
libs/remix-lib/src/web3Provider/web3VmProvider.ts
+1
-1
transactions.ts
libs/remix-simulator/src/methods/transactions.ts
+2
-3
txProcess.ts
libs/remix-simulator/src/methods/txProcess.ts
+0
-1
provider.ts
libs/remix-simulator/src/provider.ts
+0
-1
vm-context.ts
libs/remix-simulator/src/vm-context.ts
+0
-1
No files found.
libs/remix-lib/src/execution/execution-context.ts
View file @
6ad6a259
libs/remix-lib/src/execution/txRunnerVM.ts
View file @
6ad6a259
...
@@ -110,11 +110,10 @@ export class TxRunnerVM {
...
@@ -110,11 +110,10 @@ export class TxRunnerVM {
result
:
result
,
result
:
result
,
transactionHash
:
bufferToHex
(
Buffer
.
from
(
tx
.
hash
())),
transactionHash
:
bufferToHex
(
Buffer
.
from
(
tx
.
hash
())),
block
,
block
,
tx
,
tx
})
})
}).
catch
(
function
(
err
)
{
}).
catch
(
function
(
err
)
{
callback
(
err
)
callback
(
err
)
})
})
}
}
}
}
libs/remix-lib/src/execution/txRunnerWeb3.ts
View file @
6ad6a259
...
@@ -85,7 +85,7 @@ export class TxRunnerWeb3 {
...
@@ -85,7 +85,7 @@ export class TxRunnerWeb3 {
this
.
getWeb3
().
eth
.
estimateGas
(
tx
,
(
err
,
gasEstimation
)
=>
{
this
.
getWeb3
().
eth
.
estimateGas
(
tx
,
(
err
,
gasEstimation
)
=>
{
if
(
err
&&
err
.
message
.
indexOf
(
'Invalid JSON RPC response'
)
!==
-
1
)
{
if
(
err
&&
err
.
message
.
indexOf
(
'Invalid JSON RPC response'
)
!==
-
1
)
{
// // @todo(#378) this should be removed when https://github.com/WalletConnect/walletconnect-monorepo/issues/334 is fixed
// // @todo(#378) this should be removed when https://github.com/WalletConnect/walletconnect-monorepo/issues/334 is fixed
new
Error
(
'Gas estimation failed because of an unknown internal error. This may indicated that the transaction will fail.'
)
callback
(
new
Error
(
'Gas estimation failed because of an unknown internal error. This may indicated that the transaction will fail.'
)
)
}
}
gasEstimationForceSend
(
err
,
()
=>
{
gasEstimationForceSend
(
err
,
()
=>
{
// callback is called whenever no error
// callback is called whenever no error
...
...
libs/remix-lib/src/web3Provider/web3VmProvider.ts
View file @
6ad6a259
...
@@ -74,7 +74,7 @@ export class Web3VmProvider {
...
@@ -74,7 +74,7 @@ export class Web3VmProvider {
this
.
utils
=
Web3
.
utils
||
[]
this
.
utils
=
Web3
.
utils
||
[]
this
.
txsMapBlock
=
{}
this
.
txsMapBlock
=
{}
this
.
blocks
=
{}
this
.
blocks
=
{}
this
.
latestBlockNumber
this
.
latestBlockNumber
=
0
}
}
setVM
(
vm
)
{
setVM
(
vm
)
{
...
...
libs/remix-simulator/src/methods/transactions.ts
View file @
6ad6a259
...
@@ -7,7 +7,6 @@ export class Transactions {
...
@@ -7,7 +7,6 @@ export class Transactions {
accounts
accounts
tags
tags
constructor
(
vmContext
)
{
constructor
(
vmContext
)
{
this
.
vmContext
=
vmContext
this
.
vmContext
=
vmContext
this
.
tags
=
{}
this
.
tags
=
{}
...
@@ -44,7 +43,7 @@ export class Transactions {
...
@@ -44,7 +43,7 @@ export class Transactions {
const
hash
=
'0x'
+
result
.
tx
.
hash
().
toString
(
'hex'
)
const
hash
=
'0x'
+
result
.
tx
.
hash
().
toString
(
'hex'
)
this
.
vmContext
.
trackTx
(
hash
,
result
.
block
)
this
.
vmContext
.
trackTx
(
hash
,
result
.
block
)
this
.
vmContext
.
trackExecResult
(
hash
,
result
.
result
.
execResult
)
this
.
vmContext
.
trackExecResult
(
hash
,
result
.
result
.
execResult
)
return
cb
(
null
,
result
.
transactionHash
)
return
cb
(
null
,
result
.
transactionHash
)
}
}
cb
(
error
)
cb
(
error
)
})
})
...
@@ -122,7 +121,7 @@ export class Transactions {
...
@@ -122,7 +121,7 @@ export class Transactions {
this
.
tags
[
tag
]
=
result
.
transactionHash
this
.
tags
[
tag
]
=
result
.
transactionHash
// calls are not supposed to return a transaction hash. we do this for keeping track of it and allowing debugging calls.
// calls are not supposed to return a transaction hash. we do this for keeping track of it and allowing debugging calls.
const
returnValue
=
`0x
${
result
.
result
.
execResult
.
returnValue
.
toString
(
'hex'
)
||
'0'
}
`
const
returnValue
=
`0x
${
result
.
result
.
execResult
.
returnValue
.
toString
(
'hex'
)
||
'0'
}
`
return
cb
(
null
,
returnValue
)
return
cb
(
null
,
returnValue
)
}
}
cb
(
error
)
cb
(
error
)
})
})
...
...
libs/remix-simulator/src/methods/txProcess.ts
View file @
6ad6a259
...
@@ -3,7 +3,6 @@ const TxExecution = execution.txExecution
...
@@ -3,7 +3,6 @@ const TxExecution = execution.txExecution
const
TxRunnerVM
=
execution
.
TxRunnerVM
const
TxRunnerVM
=
execution
.
TxRunnerVM
const
TxRunner
=
execution
.
TxRunner
const
TxRunner
=
execution
.
TxRunner
function
runCall
(
payload
,
from
,
to
,
data
,
value
,
gasLimit
,
txRunner
,
callbacks
,
callback
)
{
function
runCall
(
payload
,
from
,
to
,
data
,
value
,
gasLimit
,
txRunner
,
callbacks
,
callback
)
{
const
finalCallback
=
function
(
err
,
result
)
{
const
finalCallback
=
function
(
err
,
result
)
{
if
(
err
)
{
if
(
err
)
{
...
...
libs/remix-simulator/src/provider.ts
View file @
6ad6a259
...
@@ -122,4 +122,3 @@ export function extend (web3) {
...
@@ -122,4 +122,3 @@ export function extend (web3) {
})
})
}
}
}
}
libs/remix-simulator/src/vm-context.ts
View file @
6ad6a259
...
@@ -94,7 +94,6 @@ export class VMContext {
...
@@ -94,7 +94,6 @@ export class VMContext {
this
.
txs
=
{}
this
.
txs
=
{}
this
.
exeResults
=
{}
this
.
exeResults
=
{}
this
.
logsManager
=
new
execution
.
LogsManager
()
this
.
logsManager
=
new
execution
.
LogsManager
()
}
}
createVm
(
hardfork
)
{
createVm
(
hardfork
)
{
...
...
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