Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
c69aeb9
bedrock-goerli-96f44f79 deployment
optimisticben Jul 25, 2022
51a1595
added changeset
optimisticben Jul 25, 2022
cf25c4b
Add cloudbuild file for bedrock image builds (#3073)
optimisticben Jul 26, 2022
0d9769b
chore: Fix foundry config to use profiles key (#3088)
maurelian Jul 26, 2022
19d6a8e
op-bindings: regenerate (#3099)
tynes Jul 26, 2022
4a07282
Merge branch 'develop' into bedrock-goerli-96f44f79
tynes Jul 26, 2022
0fb9310
contracts: update docs
tynes Jul 26, 2022
330a85c
Merge pull request #3101 from ethereum-optimism/contracts/updated-docs
tynes Jul 26, 2022
3b2f061
test(ctb): Add failure tests for finalizeWithdrawalTransaction
maurelian Jul 25, 2022
dc1d5e8
docs(ctb): Add comment regarding proxy address check
maurelian Jul 26, 2022
13a9e9b
Merge pull request #3089 from ethereum-optimism/m/test-finalizeWdTx
maurelian Jul 26, 2022
755d5cb
ci: remove publishing of deprecated images
tynes Jul 27, 2022
d544f80
contracts-bedrock: standard initializable (#3109)
tynes Jul 27, 2022
915f3b2
proxyd: Parameterize full RPC request logging (#3110)
mslipper Jul 27, 2022
898c7ac
contracts-bedrock: update hardhat forge dep
tynes Jul 25, 2022
6cc63d6
bindings + snapshot: update
tynes Jul 25, 2022
c97ad24
contracts-bedrock: fix build (#3114)
tynes Jul 28, 2022
c57337c
Merge branch 'develop' into deps/contracts-bedrock
tynes Jul 28, 2022
d16a853
op-bindings: speed up build
tynes Jul 28, 2022
74719d7
Merge pull request #3116 from ethereum-optimism/ci/speed-up-bindings
tynes Jul 28, 2022
fe79994
Merge pull request #3108 from ethereum-optimism/ci/remove-old-images
tynes Jul 28, 2022
d74e029
Merge branch 'develop' into bedrock-goerli-96f44f79
tynes Jul 28, 2022
af96563
contracts-bedrock: fix typechain export
tynes Jul 28, 2022
a057342
Merge branch 'develop' into deps/contracts-bedrock
tynes Jul 28, 2022
1242293
Merge pull request #3095 from ethereum-optimism/deps/contracts-bedrock
tynes Jul 28, 2022
ccbfe54
contracts-bedrock: update hardhat-forge plugin
tynes Jul 28, 2022
3c2071c
makefile: `clean-node-modules`
tynes Jul 28, 2022
fc050af
Merge pull request #3120 from ethereum-optimism/deps/hh-forge
tynes Jul 28, 2022
00fe6a7
ci: Add cloudbuild for bedrock deployer (#3123)
mslipper Jul 28, 2022
6c9862a
ops: Properly set devnet batch submitter address (#3121)
trianglesphere Jul 28, 2022
620dddb
Merge pull request #3118 from ethereum-optimism/fix/ctb-typechain-export
tynes Jul 28, 2022
0df744f
core-utils,contracts-bedrock,ci: OpNodeProvider + check
tynes Jul 28, 2022
c648d55
contracts-bedrock: modularize build
tynes Jul 28, 2022
d97df13
integration-tests: modularize
tynes Jul 28, 2022
6f54608
Merge pull request #3128 from ethereum-optimism/ctb/deps-build-cleanup
tynes Jul 28, 2022
d1702ad
Merge pull request #3096 from ethereum-optimism/bedrock-goerli-96f44f79
tynes Jul 28, 2022
f90ff30
Merge pull request #3129 from ethereum-optimism/fix/itests-modularize
tynes Jul 28, 2022
ae09706
Merge pull request #3122 from ethereum-optimism/helper/clean-node-mod…
tynes Jul 28, 2022
82ca9c4
Merge branch 'develop' into ci/check-op-node
mergify[bot] Jul 28, 2022
0f9e727
contracts-bedrock: fix build
tynes Jul 29, 2022
64337ed
Merge pull request #3124 from ethereum-optimism/ci/check-op-node
tynes Jul 29, 2022
a32e68a
contracts-bedrock: in place handling of immutables
tynes Jul 28, 2022
1475b28
ci: add immutables check to ci
tynes Jul 28, 2022
118e9be
contracts-bedrock: add some comments + cleanup
tynes Jul 28, 2022
9edfdd5
contracts-bedrock: better error message
tynes Jul 29, 2022
43ab823
contracts-bedrock: PR review comments
tynes Jul 29, 2022
1124f30
contracts-bedrock: more pr review
tynes Jul 29, 2022
966e1b1
Merge pull request #3119 from ethereum-optimism/ctb/genesis-l2-immuta…
tynes Jul 29, 2022
7f6ea13
deps: update excessively-safe-call
tynes Jul 29, 2022
9e97694
ops: Use starting L1 Block for timestamp everywhere (#3085)
trianglesphere Jul 29, 2022
f1bcf4b
test(ctb): change gasLimit arg to uint256 (#3111)
maurelian Jul 29, 2022
2a7be36
bedrock: Optional pprof servers (#3136)
trianglesphere Jul 29, 2022
3dd296e
contracts-bedrock: fix deployment
tynes Jul 30, 2022
fe94b86
contracts-bedrock: add watch task
tynes Jul 30, 2022
abee324
ops-bedrock: simple config fixes
tynes Jul 30, 2022
a6b8a69
Merge branch 'develop' into deps/safe-call
tynes Jul 30, 2022
70bf922
Merge pull request #3133 from ethereum-optimism/deps/safe-call
tynes Jul 30, 2022
056cb98
contracts-bedrock: fix slither
tynes Jul 31, 2022
6ce47f3
hardhat-deploy-config: Support JSON-formatted deploy configs (#3145)
mslipper Aug 1, 2022
5c0e604
ci: attempt fix
tynes Aug 1, 2022
b5b6b31
ci: Tag cloudbuild images with the commit SHA (#3147)
mslipper Aug 1, 2022
6d9011e
contracts-bedrock: Fix provider usage in L2OutputOracle deployment sc…
mslipper Aug 1, 2022
e736a4d
ops: update foundry docker image version (#3090)
tynes Aug 1, 2022
bd7258a
Merge pull request #3143 from ethereum-optimism/fix/slither-ci
tynes Aug 1, 2022
bea97cd
contracts-bedrock: fix gas snapshot (#3144)
tynes Aug 1, 2022
f05ab6b
feat: Add wstETH to sdk (#3127)
roninjin10 Aug 1, 2022
1d23f3b
Merge branch 'develop' into fix/docker-config
tynes Aug 1, 2022
89a2f76
Merge pull request #3139 from ethereum-optimism/fix/docker-config
tynes Aug 1, 2022
3bbbfb3
Merge pull request #3138 from ethereum-optimism/feat/watch-task
tynes Aug 1, 2022
d8f03f9
Merge pull request #3137 from ethereum-optimism/fix/deploy-portal
tynes Aug 1, 2022
f7fcf8a
op-node: Add p2p utils (#3150)
mslipper Aug 1, 2022
9501096
Revert "op-node: Add p2p utils (#3150)" (#3152)
mslipper Aug 1, 2022
4fe787d
op-node: Properly set timestamp in PreparePayloadAttributes (#3151)
trianglesphere Aug 1, 2022
0c5ad1d
ci: Fix cloudbuild tag names (#3154)
mslipper Aug 1, 2022
0e7184b
op-node: Add p2p utils (#3153)
mslipper Aug 1, 2022
4554155
contracts-bedrock: L2ToL1MessagePasser event extension
tynes Jul 29, 2022
6db6627
op-bindings: regenerate
tynes Jul 29, 2022
391c162
op-node: make withdrawal tooling more resilient
tynes Aug 1, 2022
6e272fc
specs: update to include `WithdrwalInitiatedExtension1`
tynes Aug 1, 2022
20a9fe4
Merge pull request #3135 from ethereum-optimism/fix/contracts-event-e…
tynes Aug 1, 2022
357c770
op-proposer, op-batcher: Support private keys in addition to mnemonic…
mslipper Aug 1, 2022
28649d6
contracts-bedrock: add forge contract verification support (#3141)
tynes Aug 2, 2022
dac4a9f
feat(sdk): add Bedrock support to SDK (#3086)
smartcontracts Aug 2, 2022
9673eca
op-node: Isolated channel frame serialization (#3125)
trianglesphere Aug 2, 2022
a184269
op-node: Derivation metrics (#3156)
mslipper Aug 3, 2022
bd65ee5
op-node: Add transactions sequenced metric (#3162)
mslipper Aug 3, 2022
6500c75
op-node/cmd: update op-node command description (#3140)
protolambda Aug 3, 2022
7b7dae0
use dai adapter not standard (#3159)
roninjin10 Aug 3, 2022
b1cc033
specs: fix spec markdown linting (#3061)
protolambda Aug 3, 2022
96103ed
typo (#3084)
fasteater Aug 3, 2022
406a4fc
proxyd: Unwrap single RPC batches (#3165)
mslipper Aug 4, 2022
acdea79
ci: Add devnet timeout (#3167)
mslipper Aug 4, 2022
8ae3915
op-node: Use unmetered L1 Attributes Transaction (#3157)
trianglesphere Aug 4, 2022
b6f4bfc
proxyd: Add frontend rate limiting (#3166)
mslipper Aug 4, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/angry-cameras-arrive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-bedrock': patch
---

Fix slither script
5 changes: 5 additions & 0 deletions .changeset/cool-items-smell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-bedrock': patch
---

Update genesis-l2 task to set immutables in the bytecode
5 changes: 5 additions & 0 deletions .changeset/curly-spies-switch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-bedrock': patch
---

Fix build for smaller package
5 changes: 5 additions & 0 deletions .changeset/dry-bears-beg.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-bedrock': patch
---

Use the same initializable across codebase
5 changes: 5 additions & 0 deletions .changeset/early-keys-know.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-bedrock': patch
---

Update @foundry-rs/hardhat-forge@0.1.16
5 changes: 5 additions & 0 deletions .changeset/eight-ravens-prove.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-bedrock': patch
---

Fix build on latest foundry
5 changes: 5 additions & 0 deletions .changeset/eighty-kings-approve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/core-utils': patch
---

Implement basic OpNodeProvider
5 changes: 5 additions & 0 deletions .changeset/fast-mangos-smoke.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/hardhat-deploy-config': patch
---

Support JSON-formatted deploy configs
5 changes: 5 additions & 0 deletions .changeset/giant-gifts-attend.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/proxyd': minor
---

Add frontend rate limiting
5 changes: 5 additions & 0 deletions .changeset/hip-shrimps-cheat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-bedrock': patch
---

Emit an extra event when withdrawals are initiated to make chainops easier
5 changes: 5 additions & 0 deletions .changeset/little-squids-invent.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/proxyd': patch
---

Unwrap single RPC batches
5 changes: 5 additions & 0 deletions .changeset/many-wasps-notice.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-bedrock': patch
---

Fix portal deployment to have L2OutputOracle proxy address
5 changes: 5 additions & 0 deletions .changeset/modern-candles-obey.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-bedrock': patch
---

Add watch task
5 changes: 5 additions & 0 deletions .changeset/pretty-boxes-thank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-bedrock': patch
---

Add harhdat forge contract verification support
5 changes: 5 additions & 0 deletions .changeset/quiet-books-design.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/proxyd': patch
---

Parameterize full RPC request logging
5 changes: 5 additions & 0 deletions .changeset/rare-suits-turn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-bedrock': patch
---

Update hardhat-forge dep, remove dead deps
5 changes: 5 additions & 0 deletions .changeset/slimy-spoons-repair.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-bedrock': patch
---

bedrock-goerli-96f44f79 deployment
5 changes: 5 additions & 0 deletions .changeset/smart-pumpkins-jam.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/foundry': patch
---

Update to 64fe4acc97e6d76551cea7598c201f05ecd65639
6 changes: 6 additions & 0 deletions .changeset/spotty-cameras-guess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@eth-optimism/contracts-bedrock': patch
'@eth-optimism/core-utils': patch
---

Update deposit transaction type
5 changes: 5 additions & 0 deletions .changeset/wet-doors-collect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/integration-tests': patch
---

Modularize the itests away from depending on api of messenger
5 changes: 5 additions & 0 deletions .changeset/wet-suns-develop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-bedrock': patch
---

Fix typechain exports
5 changes: 5 additions & 0 deletions .changeset/wicked-impalas-wonder.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/sdk': minor
---

Add wstETH to sdk
7 changes: 7 additions & 0 deletions .changeset/wise-ads-try.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@eth-optimism/sdk': minor
'@eth-optimism/contracts-bedrock': patch
'@eth-optimism/core-utils': patch
---

Updates the SDK to be compatible with Bedrock (via the "bedrock: true" constructor param). Updates the build pipeline for contracts-bedrock to export a properly formatted dist folder that matches our other packages.
47 changes: 23 additions & 24 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: Check if we should run
command: |
shopt -s inherit_errexit
CHANGED=$(check-changed "packages/")
CHANGED=$(check-changed "(op-bindings|packages/)")
if [[ "$CHANGED" = "FALSE" ]]; then
circleci step halt
fi
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
name: gas snapshot
command: |
forge --version
forge snapshot --check || exit 0
forge snapshot --check
environment:
FOUNDRY_PROFILE: ci
working_directory: packages/contracts-bedrock
Expand Down Expand Up @@ -277,14 +277,19 @@ jobs:
image: ubuntu-2004:202111-02
steps:
- checkout
- run:
name: yarn dev deps # todo: what's the best way to pull in the dependencies for linting? yarn install above is using production env without dev dependencies
command: yarn install --production=false
- run:
name: specs toc
command: yarn lint:specs:toc && git diff --exit-code
- run:
name: markdown lint
command: |
docker run -v `pwd`:/workdir davidanson/markdownlint-cli2:0.4.0 "op-node/README.md" "./specs/**/*.md" "#**/node_modules"
command: yarn lint:specs:check
- run:
name: link lint
command: |
docker run --init -it -v `pwd`:/input lycheeverse/lychee --verbose --no-progress --exclude-loopback --exclude twitter.com --exclude-mail /input/README.md "/input/specs/**/*.md" "/input/meta/**/*.md" "/input/op-node/**/*.md" || exit 0
docker run --init -it -v `pwd`:/input lycheeverse/lychee --verbose --no-progress --exclude-loopback --exclude twitter.com --exclude-mail /input/README.md "/input/specs/**/*.md"

fuzz-op-node:
docker:
Expand Down Expand Up @@ -449,17 +454,25 @@ jobs:
make devnet-up
- run:
name: Do a deposit
no_output_timeout: 5m
command: |
npx hardhat compile
npx hardhat deposit \
timeout 5m npx hardhat deposit \
--to 0xB79f76EF2c5F0286176833E7B2eEe103b1CC3244 \
--amount-eth 1 \
--private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 \
--network devnetL1
working_directory: packages/contracts-bedrock/contracts-bedrock
working_directory: packages/contracts-bedrock
- run:
name: Deposit ERC20 through the bridge
command: timeout 5m npx hardhat deposit --network devnetL1
working_directory: packages/sdk
- run:
name: Check the status
command: npx hardhat check-op-node
working_directory: packages/contracts-bedrock
- run:
command: echo "Deposit complete."
name: Check L2 Config
command: npx hardhat check-l2-config
working_directory: packages/contracts-bedrock

integration-tests:
machine:
Expand Down Expand Up @@ -691,20 +704,6 @@ workflows:
docker_context: ops/docker/hardhat
context:
- optimism
- docker-publish:
name: go-builder-release
docker_file: ops/docker/go-builder/Dockerfile
docker_tags: ethereumoptimism/go-builder:nightly
docker_context: .
context:
- optimism
- docker-publish:
name: js-builder-release
docker_file: ops/docker/js-builder/Dockerfile
docker_tags: ethereumoptimism/js-builder:nightly
docker_context: .
context:
- optimism
- docker-publish:
name: proxyd-release
docker_file: proxyd/Dockerfile
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,7 @@ semgrep:
$(eval DEV_REF := $(shell git rev-parse develop))
SEMGREP_REPO_NAME=ethereum-optimism/optimism semgrep ci --baseline-commit=$(DEV_REF)
.PHONY: semgrep

clean-node-modules:
rm -rf node_modules
rm -rf packages/**/node_modules
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ root
├── <a href="./teleportr">teleportr</a>: Bridge for teleporting ETH between L1 and L2 at low cost

~~ BEDROCK upgrade - Not production-ready yet, part of next major upgrade ~~
├── <a href="./contracts-bedrock">contracts-bedrock</a>: Bedrock smart contracts. To be merged with ./packages/contracts.
├── <a href="./packages/contracts-bedrock">packages/contracts-bedrock</a>: Bedrock smart contracts. To be merged with ./packages/contracts.
├── <a href="./op-bindings">op-bindings</a>: Go bindings for Bedrock smart contracts.
├── <a href="./op-batcher">op-batcher</a>: L2-Batch Submitter, submits bundles of batches to L1
├── <a href="./op-e2e">op-e2e</a>: End-to-End testing of all bedrock components in Go
Expand Down
36 changes: 36 additions & 0 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
steps:
- name: 'gcr.io/kaniko-project/executor:latest'
args:
- --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/op-node:$_TAG
- --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/op-node:$COMMIT_SHA
- --dockerfile=op-node/Dockerfile
- --cache=true
- --cache-ttl=48h
waitFor: ['-']
- name: 'gcr.io/kaniko-project/executor:latest'
args:
- --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/op-batcher:$_TAG
- --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/op-batcher:$COMMIT_SHA
- --dockerfile=./op-batcher/Dockerfile
- --cache=true
- --cache-ttl=48h
waitFor: ['-']
- name: 'gcr.io/kaniko-project/executor:latest'
args:
- --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/op-proposer:$_TAG
- --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/op-proposer:$COMMIT_SHA
- --dockerfile=./op-proposer/Dockerfile
- --cache=true
- --cache-ttl=48h
waitFor: ['-']
- name: 'gcr.io/kaniko-project/executor:latest'
args:
- --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/deployer-bedrock:$_TAG
- --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/deployer-bedrock:$COMMIT_SHA
- --dockerfile=./ops/docker/Dockerfile.packages
- --target=deployer-bedrock
- --cache=true
- --cache-ttl=48h
waitFor: ['-']
options:
machineType: N1_HIGHCPU_32
4 changes: 2 additions & 2 deletions go.work
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use (
./state-surgery
)

replace github.com/ethereum/go-ethereum v1.10.20 => github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220715235548-70b02481016d
replace github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220803173305-1c9d4cc76a6e

// For local debugging:
//replace github.com/ethereum/go-ethereum v1.10.20 => ../go-ethereum
//replace github.com/ethereum/go-ethereum v1.10.21 => ../go-ethereum
1 change: 1 addition & 0 deletions go.work.sum
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJW
cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M=
cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s=
cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU=
github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
Expand Down
9 changes: 4 additions & 5 deletions integration-tests/test/queue-ingestion.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { providers } from 'ethers'
import { applyL1ToL2Alias } from '@eth-optimism/core-utils'
import { asL2Provider } from '@eth-optimism/sdk'
import { getContractInterface } from '@eth-optimism/contracts'

/* Imports: External */
import { expect } from './shared/setup'
Expand Down Expand Up @@ -47,11 +48,9 @@ describe('Queue Ingestion', () => {
receipt.remoteTx.hash
)) as any

const params =
env.messenger.contracts.l2.L2CrossDomainMessenger.interface.decodeFunctionData(
'relayMessage',
l2Tx.data
)
const params = getContractInterface(
'L2CrossDomainMessenger'
).decodeFunctionData('relayMessage', l2Tx.data)

expect(params._sender.toLowerCase()).to.equal(
env.l1Wallet.address.toLowerCase()
Expand Down
Loading