Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
8c3e8e11
Unverified
Commit
8c3e8e11
authored
Aug 23, 2021
by
Mark Tyneway
Committed by
GitHub
Aug 23, 2021
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1368 from ethereum-optimism/sc/fix-contract-browser-compat
fix: correctly use contract artifact import
parents
cdaf2490
ecc2f8c1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
10 deletions
+14
-10
many-pants-appear.md
.changeset/many-pants-appear.md
+6
-0
contract-defs.ts
packages/contracts/src/contract-defs.ts
+8
-10
No files found.
.changeset/many-pants-appear.md
0 → 100644
View file @
8c3e8e11
---
'
@eth-optimism/contracts'
:
patch
'
@eth-optimism/message-relayer'
:
patch
---
Patch so contracts package will correctly use the browser-compatible contract artifacts import
packages/contracts/src/contract-defs.ts
View file @
8c3e8e11
import
*
as
path
from
'
path
'
import
*
as
glob
from
'
glob
'
import
{
import
{
ethers
,
ethers
,
ContractFactory
,
ContractFactory
,
...
@@ -11,16 +9,16 @@ import {
...
@@ -11,16 +9,16 @@ import {
import
{
Interface
}
from
'
ethers/lib/utils
'
import
{
Interface
}
from
'
ethers/lib/utils
'
export
const
getContractDefinition
=
(
name
:
string
,
ovm
?:
boolean
):
any
=>
{
export
const
getContractDefinition
=
(
name
:
string
,
ovm
?:
boolean
):
any
=>
{
const
match
=
glob
.
sync
(
// We import this using `require` because hardhat tries to build this file when compiling
path
.
resolve
(
__dirname
,
`../artifacts
${
ovm
?
'
-ovm
'
:
''
}
`
)
+
// the contracts, but we need the contracts to be compiled before the contract-artifacts.ts
`/**/
${
name
.
split
(
'
-
'
).
join
(
'
:
'
)}
.json`
// file can be generated.
)
// eslint-disable-next-line @typescript-eslint/no-var-requires
const
{
getContractArtifact
}
=
require
(
'
./contract-artifacts
'
)
if
(
match
.
length
>
0
)
{
const
artifact
=
getContractArtifact
(
name
,
ovm
)
return
require
(
match
[
0
])
if
(
artifact
===
undefined
)
{
}
else
{
throw
new
Error
(
`Unable to find artifact for contract:
${
name
}
`
)
throw
new
Error
(
`Unable to find artifact for contract:
${
name
}
`
)
}
}
return
artifact
}
}
export
const
getContractInterface
=
(
export
const
getContractInterface
=
(
...
...
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