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
a83387cc
Unverified
Commit
a83387cc
authored
Jun 09, 2023
by
OptimismBot
Committed by
GitHub
Jun 09, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5920 from ethereum-optimism/willc/sdk-bedrock-default
feat(sdk): Make bedrock the default
parents
57855e8b
b9ec9d07
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
7 deletions
+31
-7
fair-poems-give.md
.changeset/fair-poems-give.md
+7
-0
service.ts
packages/fault-detector/src/service.ts
+1
-1
cross-chain-messenger.ts
packages/sdk/src/cross-chain-messenger.ts
+1
-6
cross-chain-messenger.spec.ts
packages/sdk/test/cross-chain-messenger.spec.ts
+22
-0
No files found.
.changeset/fair-poems-give.md
0 → 100644
View file @
a83387cc
---
'
@eth-optimism/message-relayer'
:
major
'
@eth-optimism/fault-detector'
:
major
'
@eth-optimism/sdk'
:
major
---
Make optimism/sdk default to bedrock mode
packages/fault-detector/src/service.ts
View file @
a83387cc
...
...
@@ -78,7 +78,7 @@ export class FaultDetector extends BaseServiceV2<Options, Metrics, State> {
},
bedrock
:
{
validator
:
validators
.
bool
,
default
:
fals
e
,
default
:
tru
e
,
desc
:
'
Whether or not the service is running against a Bedrock chain
'
,
public
:
true
,
},
...
...
packages/sdk/src/cross-chain-messenger.ts
View file @
a83387cc
...
...
@@ -143,13 +143,8 @@ export class CrossChainMessenger {
bridges
?:
BridgeAdapterData
bedrock
?:
boolean
})
{
this
.
bedrock
=
opts
.
bedrock
??
fals
e
this
.
bedrock
=
opts
.
bedrock
??
tru
e
if
(
!
this
.
bedrock
)
{
console
.
warn
(
'
Bedrock compatibility is disabled in CrossChainMessenger. Please enable it if you are using Bedrock.
'
)
}
this
.
l1SignerOrProvider
=
toSignerOrProvider
(
opts
.
l1SignerOrProvider
)
this
.
l2SignerOrProvider
=
toSignerOrProvider
(
opts
.
l2SignerOrProvider
)
...
...
packages/sdk/test/cross-chain-messenger.spec.ts
View file @
a83387cc
...
...
@@ -30,6 +30,7 @@ describe('CrossChainMessenger', () => {
describe
(
'
when given an ethers provider for the L1 provider
'
,
()
=>
{
it
(
'
should use the provider as the L1 provider
'
,
()
=>
{
const
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
ethers
.
provider
,
l1ChainId
:
L1ChainID
.
MAINNET
,
...
...
@@ -43,6 +44,7 @@ describe('CrossChainMessenger', () => {
describe
(
'
when given an ethers provider for the L2 provider
'
,
()
=>
{
it
(
'
should use the provider as the L2 provider
'
,
()
=>
{
const
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
ethers
.
provider
,
l1ChainId
:
L1ChainID
.
MAINNET
,
...
...
@@ -56,6 +58,7 @@ describe('CrossChainMessenger', () => {
describe
(
'
when given a string as the L1 provider
'
,
()
=>
{
it
(
'
should create a JSON-RPC provider for the L1 provider
'
,
()
=>
{
const
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
'
https://localhost:8545
'
,
l2SignerOrProvider
:
ethers
.
provider
,
l1ChainId
:
L1ChainID
.
MAINNET
,
...
...
@@ -69,6 +72,7 @@ describe('CrossChainMessenger', () => {
describe
(
'
when given a string as the L2 provider
'
,
()
=>
{
it
(
'
should create a JSON-RPC provider for the L2 provider
'
,
()
=>
{
const
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
'
https://localhost:8545
'
,
l1ChainId
:
L1ChainID
.
MAINNET
,
...
...
@@ -83,6 +87,7 @@ describe('CrossChainMessenger', () => {
it
(
'
should throw an error
'
,
()
=>
{
expect
(()
=>
{
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
ethers
.
provider
,
l1ChainId
:
undefined
as
any
,
...
...
@@ -96,6 +101,7 @@ describe('CrossChainMessenger', () => {
it
(
'
should throw an error
'
,
()
=>
{
expect
(()
=>
{
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
ethers
.
provider
,
l1ChainId
:
L1ChainID
.
MAINNET
,
...
...
@@ -109,6 +115,7 @@ describe('CrossChainMessenger', () => {
describe
(
'
when given a known chain ID
'
,
()
=>
{
it
(
'
should use the contract addresses for the known chain ID
'
,
()
=>
{
const
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
'
https://localhost:8545
'
,
l1ChainId
:
L1ChainID
.
MAINNET
,
...
...
@@ -135,6 +142,7 @@ describe('CrossChainMessenger', () => {
it
(
'
should throw an error
'
,
()
=>
{
expect
(()
=>
{
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
'
https://localhost:8545
'
,
l1ChainId
:
L1ChainID
.
MAINNET
,
...
...
@@ -157,6 +165,7 @@ describe('CrossChainMessenger', () => {
},
}
const
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
'
https://localhost:8545
'
,
l1ChainId
:
L1ChainID
.
MAINNET
,
...
...
@@ -210,6 +219,7 @@ describe('CrossChainMessenger', () => {
}
const
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
'
https://localhost:8545
'
,
l1ChainId
:
L1ChainID
.
MAINNET
,
...
...
@@ -247,6 +257,7 @@ describe('CrossChainMessenger', () => {
it
(
'
should throw an error
'
,
()
=>
{
expect
(()
=>
{
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
'
https://localhost:8545
'
,
l1ChainId
:
L1ChainID
.
MAINNET
,
...
...
@@ -283,6 +294,7 @@ describe('CrossChainMessenger', () => {
).
deploy
())
as
any
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
ethers
.
provider
,
l1ChainId
:
L1ChainID
.
HARDHAT_LOCAL
,
...
...
@@ -473,6 +485,7 @@ describe('CrossChainMessenger', () => {
).
deploy
(
l2Messenger
.
address
))
as
any
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
ethers
.
provider
,
l1ChainId
:
L1ChainID
.
HARDHAT_LOCAL
,
...
...
@@ -591,6 +604,7 @@ describe('CrossChainMessenger', () => {
).
deploy
())
as
any
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
ethers
.
provider
,
l1ChainId
:
L1ChainID
.
HARDHAT_LOCAL
,
...
...
@@ -824,6 +838,7 @@ describe('CrossChainMessenger', () => {
).
deploy
(
l2Messenger
.
address
))
as
any
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
ethers
.
provider
,
l1ChainId
:
L1ChainID
.
HARDHAT_LOCAL
,
...
...
@@ -974,6 +989,7 @@ describe('CrossChainMessenger', () => {
).
deploy
())
as
any
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
ethers
.
provider
,
l1ChainId
:
L1ChainID
.
HARDHAT_LOCAL
,
...
...
@@ -1072,6 +1088,7 @@ describe('CrossChainMessenger', () => {
let
messenger
:
CrossChainMessenger
beforeEach
(
async
()
=>
{
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
ethers
.
provider
,
l1ChainId
:
L1ChainID
.
HARDHAT_LOCAL
,
...
...
@@ -1176,6 +1193,7 @@ describe('CrossChainMessenger', () => {
).
deploy
())
as
any
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
ethers
.
provider
,
l2SignerOrProvider
:
ethers
.
provider
,
l1ChainId
:
L1ChainID
.
HARDHAT_LOCAL
,
...
...
@@ -1349,6 +1367,7 @@ describe('CrossChainMessenger', () => {
).
deploy
())
as
any
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
l1Signer
,
l2SignerOrProvider
:
l2Signer
,
l1ChainId
:
L1ChainID
.
HARDHAT_LOCAL
,
...
...
@@ -1445,6 +1464,7 @@ describe('CrossChainMessenger', () => {
).
deploy
())
as
any
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
l1Signer
,
l2SignerOrProvider
:
l2Signer
,
l1ChainId
:
L1ChainID
.
HARDHAT_LOCAL
,
...
...
@@ -1542,6 +1562,7 @@ describe('CrossChainMessenger', () => {
).
deploy
(
l2Messenger
.
address
))
as
any
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
l1Signer
,
l2SignerOrProvider
:
l2Signer
,
l1ChainId
:
L1ChainID
.
HARDHAT_LOCAL
,
...
...
@@ -1599,6 +1620,7 @@ describe('CrossChainMessenger', () => {
).
deploy
(
l2Messenger
.
address
))
as
any
messenger
=
new
CrossChainMessenger
({
bedrock
:
false
,
l1SignerOrProvider
:
l1Signer
,
l2SignerOrProvider
:
l2Signer
,
l1ChainId
:
L1ChainID
.
HARDHAT_LOCAL
,
...
...
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