Commit a83387cc authored by OptimismBot's avatar OptimismBot Committed by GitHub

Merge pull request #5920 from ethereum-optimism/willc/sdk-bedrock-default

feat(sdk): Make bedrock the default
parents 57855e8b b9ec9d07
---
'@eth-optimism/message-relayer': major
'@eth-optimism/fault-detector': major
'@eth-optimism/sdk': major
---
Make optimism/sdk default to bedrock mode
...@@ -78,7 +78,7 @@ export class FaultDetector extends BaseServiceV2<Options, Metrics, State> { ...@@ -78,7 +78,7 @@ export class FaultDetector extends BaseServiceV2<Options, Metrics, State> {
}, },
bedrock: { bedrock: {
validator: validators.bool, validator: validators.bool,
default: false, default: true,
desc: 'Whether or not the service is running against a Bedrock chain', desc: 'Whether or not the service is running against a Bedrock chain',
public: true, public: true,
}, },
......
...@@ -143,13 +143,8 @@ export class CrossChainMessenger { ...@@ -143,13 +143,8 @@ export class CrossChainMessenger {
bridges?: BridgeAdapterData bridges?: BridgeAdapterData
bedrock?: boolean bedrock?: boolean
}) { }) {
this.bedrock = opts.bedrock ?? false this.bedrock = opts.bedrock ?? true
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.l1SignerOrProvider = toSignerOrProvider(opts.l1SignerOrProvider)
this.l2SignerOrProvider = toSignerOrProvider(opts.l2SignerOrProvider) this.l2SignerOrProvider = toSignerOrProvider(opts.l2SignerOrProvider)
......
...@@ -30,6 +30,7 @@ describe('CrossChainMessenger', () => { ...@@ -30,6 +30,7 @@ describe('CrossChainMessenger', () => {
describe('when given an ethers provider for the L1 provider', () => { describe('when given an ethers provider for the L1 provider', () => {
it('should use the provider as the L1 provider', () => { it('should use the provider as the L1 provider', () => {
const messenger = new CrossChainMessenger({ const messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: ethers.provider, l2SignerOrProvider: ethers.provider,
l1ChainId: L1ChainID.MAINNET, l1ChainId: L1ChainID.MAINNET,
...@@ -43,6 +44,7 @@ describe('CrossChainMessenger', () => { ...@@ -43,6 +44,7 @@ describe('CrossChainMessenger', () => {
describe('when given an ethers provider for the L2 provider', () => { describe('when given an ethers provider for the L2 provider', () => {
it('should use the provider as the L2 provider', () => { it('should use the provider as the L2 provider', () => {
const messenger = new CrossChainMessenger({ const messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: ethers.provider, l2SignerOrProvider: ethers.provider,
l1ChainId: L1ChainID.MAINNET, l1ChainId: L1ChainID.MAINNET,
...@@ -56,6 +58,7 @@ describe('CrossChainMessenger', () => { ...@@ -56,6 +58,7 @@ describe('CrossChainMessenger', () => {
describe('when given a string as the L1 provider', () => { describe('when given a string as the L1 provider', () => {
it('should create a JSON-RPC provider for the L1 provider', () => { it('should create a JSON-RPC provider for the L1 provider', () => {
const messenger = new CrossChainMessenger({ const messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: 'https://localhost:8545', l1SignerOrProvider: 'https://localhost:8545',
l2SignerOrProvider: ethers.provider, l2SignerOrProvider: ethers.provider,
l1ChainId: L1ChainID.MAINNET, l1ChainId: L1ChainID.MAINNET,
...@@ -69,6 +72,7 @@ describe('CrossChainMessenger', () => { ...@@ -69,6 +72,7 @@ describe('CrossChainMessenger', () => {
describe('when given a string as the L2 provider', () => { describe('when given a string as the L2 provider', () => {
it('should create a JSON-RPC provider for the L2 provider', () => { it('should create a JSON-RPC provider for the L2 provider', () => {
const messenger = new CrossChainMessenger({ const messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: 'https://localhost:8545', l2SignerOrProvider: 'https://localhost:8545',
l1ChainId: L1ChainID.MAINNET, l1ChainId: L1ChainID.MAINNET,
...@@ -83,6 +87,7 @@ describe('CrossChainMessenger', () => { ...@@ -83,6 +87,7 @@ describe('CrossChainMessenger', () => {
it('should throw an error', () => { it('should throw an error', () => {
expect(() => { expect(() => {
new CrossChainMessenger({ new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: ethers.provider, l2SignerOrProvider: ethers.provider,
l1ChainId: undefined as any, l1ChainId: undefined as any,
...@@ -96,6 +101,7 @@ describe('CrossChainMessenger', () => { ...@@ -96,6 +101,7 @@ describe('CrossChainMessenger', () => {
it('should throw an error', () => { it('should throw an error', () => {
expect(() => { expect(() => {
new CrossChainMessenger({ new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: ethers.provider, l2SignerOrProvider: ethers.provider,
l1ChainId: L1ChainID.MAINNET, l1ChainId: L1ChainID.MAINNET,
...@@ -109,6 +115,7 @@ describe('CrossChainMessenger', () => { ...@@ -109,6 +115,7 @@ describe('CrossChainMessenger', () => {
describe('when given a known chain ID', () => { describe('when given a known chain ID', () => {
it('should use the contract addresses for the known chain ID', () => { it('should use the contract addresses for the known chain ID', () => {
const messenger = new CrossChainMessenger({ const messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: 'https://localhost:8545', l2SignerOrProvider: 'https://localhost:8545',
l1ChainId: L1ChainID.MAINNET, l1ChainId: L1ChainID.MAINNET,
...@@ -135,6 +142,7 @@ describe('CrossChainMessenger', () => { ...@@ -135,6 +142,7 @@ describe('CrossChainMessenger', () => {
it('should throw an error', () => { it('should throw an error', () => {
expect(() => { expect(() => {
new CrossChainMessenger({ new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: 'https://localhost:8545', l2SignerOrProvider: 'https://localhost:8545',
l1ChainId: L1ChainID.MAINNET, l1ChainId: L1ChainID.MAINNET,
...@@ -157,6 +165,7 @@ describe('CrossChainMessenger', () => { ...@@ -157,6 +165,7 @@ describe('CrossChainMessenger', () => {
}, },
} }
const messenger = new CrossChainMessenger({ const messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: 'https://localhost:8545', l2SignerOrProvider: 'https://localhost:8545',
l1ChainId: L1ChainID.MAINNET, l1ChainId: L1ChainID.MAINNET,
...@@ -210,6 +219,7 @@ describe('CrossChainMessenger', () => { ...@@ -210,6 +219,7 @@ describe('CrossChainMessenger', () => {
} }
const messenger = new CrossChainMessenger({ const messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: 'https://localhost:8545', l2SignerOrProvider: 'https://localhost:8545',
l1ChainId: L1ChainID.MAINNET, l1ChainId: L1ChainID.MAINNET,
...@@ -247,6 +257,7 @@ describe('CrossChainMessenger', () => { ...@@ -247,6 +257,7 @@ describe('CrossChainMessenger', () => {
it('should throw an error', () => { it('should throw an error', () => {
expect(() => { expect(() => {
new CrossChainMessenger({ new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: 'https://localhost:8545', l2SignerOrProvider: 'https://localhost:8545',
l1ChainId: L1ChainID.MAINNET, l1ChainId: L1ChainID.MAINNET,
...@@ -283,6 +294,7 @@ describe('CrossChainMessenger', () => { ...@@ -283,6 +294,7 @@ describe('CrossChainMessenger', () => {
).deploy()) as any ).deploy()) as any
messenger = new CrossChainMessenger({ messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: ethers.provider, l2SignerOrProvider: ethers.provider,
l1ChainId: L1ChainID.HARDHAT_LOCAL, l1ChainId: L1ChainID.HARDHAT_LOCAL,
...@@ -473,6 +485,7 @@ describe('CrossChainMessenger', () => { ...@@ -473,6 +485,7 @@ describe('CrossChainMessenger', () => {
).deploy(l2Messenger.address)) as any ).deploy(l2Messenger.address)) as any
messenger = new CrossChainMessenger({ messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: ethers.provider, l2SignerOrProvider: ethers.provider,
l1ChainId: L1ChainID.HARDHAT_LOCAL, l1ChainId: L1ChainID.HARDHAT_LOCAL,
...@@ -591,6 +604,7 @@ describe('CrossChainMessenger', () => { ...@@ -591,6 +604,7 @@ describe('CrossChainMessenger', () => {
).deploy()) as any ).deploy()) as any
messenger = new CrossChainMessenger({ messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: ethers.provider, l2SignerOrProvider: ethers.provider,
l1ChainId: L1ChainID.HARDHAT_LOCAL, l1ChainId: L1ChainID.HARDHAT_LOCAL,
...@@ -824,6 +838,7 @@ describe('CrossChainMessenger', () => { ...@@ -824,6 +838,7 @@ describe('CrossChainMessenger', () => {
).deploy(l2Messenger.address)) as any ).deploy(l2Messenger.address)) as any
messenger = new CrossChainMessenger({ messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: ethers.provider, l2SignerOrProvider: ethers.provider,
l1ChainId: L1ChainID.HARDHAT_LOCAL, l1ChainId: L1ChainID.HARDHAT_LOCAL,
...@@ -974,6 +989,7 @@ describe('CrossChainMessenger', () => { ...@@ -974,6 +989,7 @@ describe('CrossChainMessenger', () => {
).deploy()) as any ).deploy()) as any
messenger = new CrossChainMessenger({ messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: ethers.provider, l2SignerOrProvider: ethers.provider,
l1ChainId: L1ChainID.HARDHAT_LOCAL, l1ChainId: L1ChainID.HARDHAT_LOCAL,
...@@ -1072,6 +1088,7 @@ describe('CrossChainMessenger', () => { ...@@ -1072,6 +1088,7 @@ describe('CrossChainMessenger', () => {
let messenger: CrossChainMessenger let messenger: CrossChainMessenger
beforeEach(async () => { beforeEach(async () => {
messenger = new CrossChainMessenger({ messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: ethers.provider, l2SignerOrProvider: ethers.provider,
l1ChainId: L1ChainID.HARDHAT_LOCAL, l1ChainId: L1ChainID.HARDHAT_LOCAL,
...@@ -1176,6 +1193,7 @@ describe('CrossChainMessenger', () => { ...@@ -1176,6 +1193,7 @@ describe('CrossChainMessenger', () => {
).deploy()) as any ).deploy()) as any
messenger = new CrossChainMessenger({ messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: ethers.provider, l1SignerOrProvider: ethers.provider,
l2SignerOrProvider: ethers.provider, l2SignerOrProvider: ethers.provider,
l1ChainId: L1ChainID.HARDHAT_LOCAL, l1ChainId: L1ChainID.HARDHAT_LOCAL,
...@@ -1349,6 +1367,7 @@ describe('CrossChainMessenger', () => { ...@@ -1349,6 +1367,7 @@ describe('CrossChainMessenger', () => {
).deploy()) as any ).deploy()) as any
messenger = new CrossChainMessenger({ messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: l1Signer, l1SignerOrProvider: l1Signer,
l2SignerOrProvider: l2Signer, l2SignerOrProvider: l2Signer,
l1ChainId: L1ChainID.HARDHAT_LOCAL, l1ChainId: L1ChainID.HARDHAT_LOCAL,
...@@ -1445,6 +1464,7 @@ describe('CrossChainMessenger', () => { ...@@ -1445,6 +1464,7 @@ describe('CrossChainMessenger', () => {
).deploy()) as any ).deploy()) as any
messenger = new CrossChainMessenger({ messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: l1Signer, l1SignerOrProvider: l1Signer,
l2SignerOrProvider: l2Signer, l2SignerOrProvider: l2Signer,
l1ChainId: L1ChainID.HARDHAT_LOCAL, l1ChainId: L1ChainID.HARDHAT_LOCAL,
...@@ -1542,6 +1562,7 @@ describe('CrossChainMessenger', () => { ...@@ -1542,6 +1562,7 @@ describe('CrossChainMessenger', () => {
).deploy(l2Messenger.address)) as any ).deploy(l2Messenger.address)) as any
messenger = new CrossChainMessenger({ messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: l1Signer, l1SignerOrProvider: l1Signer,
l2SignerOrProvider: l2Signer, l2SignerOrProvider: l2Signer,
l1ChainId: L1ChainID.HARDHAT_LOCAL, l1ChainId: L1ChainID.HARDHAT_LOCAL,
...@@ -1599,6 +1620,7 @@ describe('CrossChainMessenger', () => { ...@@ -1599,6 +1620,7 @@ describe('CrossChainMessenger', () => {
).deploy(l2Messenger.address)) as any ).deploy(l2Messenger.address)) as any
messenger = new CrossChainMessenger({ messenger = new CrossChainMessenger({
bedrock: false,
l1SignerOrProvider: l1Signer, l1SignerOrProvider: l1Signer,
l2SignerOrProvider: l2Signer, l2SignerOrProvider: l2Signer,
l1ChainId: L1ChainID.HARDHAT_LOCAL, l1ChainId: L1ChainID.HARDHAT_LOCAL,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment