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
88bee890
Commit
88bee890
authored
May 10, 2021
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
linting
parent
521ab4af
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
txExecution.ts
libs/remix-lib/src/execution/txExecution.ts
+4
-4
txHelper.ts
libs/remix-lib/src/execution/txHelper.ts
+2
-3
No files found.
libs/remix-lib/src/execution/txExecution.ts
View file @
88bee890
...
...
@@ -91,14 +91,14 @@ export function checkVMError (txResult, abi) {
const
returnData
=
txResult
.
result
.
execResult
.
returnValue
const
returnDataHex
=
returnData
.
slice
(
0
,
4
).
toString
(
'hex'
)
let
customError
if
(
abi
)
{
if
(
abi
)
{
let
decodedCustomErrorInputs
for
(
const
item
of
abi
)
{
if
(
item
.
type
===
'error'
)
{
// ethers doesn't crash anymore if "error" type is specified, but it doesn't extract the errors. see:
// https://github.com/ethers-io/ethers.js/commit/bd05aed070ac9e1421a3e2bff2ceea150bedf9b7
// we need here to fake the type, so the "getSighash" function works properly
const
fn
=
getFunctionFragment
({
...
item
,
type
:
'function'
,
stateMutability
:
"nonpayable"
})
const
fn
=
getFunctionFragment
({
...
item
,
type
:
'function'
,
stateMutability
:
'nonpayable'
})
if
(
!
fn
)
continue
const
sign
=
fn
.
getSighash
(
item
.
name
)
if
(
!
sign
)
continue
...
...
@@ -110,9 +110,9 @@ export function checkVMError (txResult, abi) {
}
}
if
(
decodedCustomErrorInputs
)
{
msg
=
`\tThe transaction has been reverted to the initial state.\nError provided by the contract:`
msg
=
'
\
tThe transaction has been reverted to the initial state.
\
nError provided by the contract:'
msg
+=
`\n
${
customError
}
`
msg
+=
`\nParameters:`
msg
+=
'
\
nParameters:'
msg
+=
`\n
${
decodedCustomErrorInputs
}
`
}
}
...
...
libs/remix-lib/src/execution/txHelper.ts
View file @
88bee890
...
...
@@ -40,7 +40,7 @@ export function encodeFunctionId (funABI) {
export
function
getFunctionFragment
(
funABI
):
ethers
.
utils
.
Interface
{
if
(
funABI
.
type
===
'fallback'
||
funABI
.
type
===
'receive'
)
return
null
return
new
ethers
.
utils
.
Interface
([
funABI
])
return
new
ethers
.
utils
.
Interface
([
funABI
])
}
export
function
sortAbiFunction
(
contractabi
)
{
...
...
@@ -120,10 +120,9 @@ export function getFromInterface (abi, fnName, type) {
return
fn
}
}
return
null
return
null
}
export
function
getFunction
(
abi
,
fnName
)
{
return
getFromInterface
(
abi
,
fnName
,
'function'
)
}
...
...
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