Skip to content

Merge develop into master#2845

Merged
mslipper merged 18 commits intomasterfrom
develop
Jun 23, 2022
Merged

Merge develop into master#2845
mslipper merged 18 commits intomasterfrom
develop

Conversation

@tynes
Copy link
Copy Markdown
Contributor

@tynes tynes commented Jun 23, 2022

Description
Merges develop into master to start the release process

smartcontracts and others added 18 commits June 18, 2022 23:33
Fixes a bug where the FD would try to get blocks beyond the local tip,
triggering an error in L2Geth.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
The current default values for image tags will result in a replica that is unable to fully sync (see #2686)

Update to latest released versions

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* bedrock: lint and formatting ignore deployments

* fix(bedrock): throw errors for eslint warnings

* chore(bedrock): Format bedrock hardhat config
* add version to healthz for convenience

* changeset

Co-authored-by: Will Cory <willcory@Wills-MacBook-Pro.local>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* feat(dev-env):Pin yarn to a common shared version

* fix git ignore

Co-authored-by: Will Cory <willcory@Wills-MacBook-Pro.local>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* fix(bedrock): arguments in L2OO deploy scripts

* chore: changeset
* op-replica env should include new values

* Also kovan

* Remove replica-healthcheck envs (uses network env now)

* Update default-mainnet.env

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Fixes a bug in the deploy script for the L1CrossDomainMessenger where
the L2OutputOracle was being passed into the constructor rather than the
OptimismPortal, breaking the contract.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Updates the SDK to use the L2 chain ID, instead of the L1 chain ID, as
the source of truth when loading chain-specific data. We're going to
need this now that we're planning to have multiple L2s attached to the
same L1 (goerli) during our Bedrock testing plan. Part of a series of
PRs meant to simplify the SDK and prepare it for Bedrock.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
* fix (bedrock): deploy L2OO - fix args

* chore: changeset
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
* fix(op-e2e): less flakey TestL2OutputSubmitter

* fix(op-e2e): increase timeout on testwithdrawals
* ci(bedrock): Add storage-snapshot script

* bedrock: add populated storage layout

* Update config.yml

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* bedrock: Add sequencer role to output oracle

* bedrock: Test oracle access controls.

* chore(bedrock): bindings, snapshot, changeset

* bedrock: update oracle storage snapshot

* bedrock: deploy scripts with oracle owner

* test(bedrock): fix warp function in oracle test

* bedrock: Address review feedback

* bedrock: Generate unique deployer key in tests

* kick build

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
* contracts-bedrock: hardhat genesis-l1

* contracts-bedrock: hardhat genesis-l2

* core-utils: update types

* contracts-bedrock: hardhat rollup-config

* contracts-bedrock: update deploy scripts

* contracts-governance: more solc output

* contracts-bedrock: deploy config

* contracts-bedrock: general fixes

* ops-bedrock: use new script

* lint

* lint: fix
* bedrock: Add sequencer role to output oracle

* bedrock: Test oracle access controls.

* bedrock: Make the Output Oracle upgradeable

* chore(bedrock): bindings, snapshot, changeset

* update storage layout

* kick CI

* kick CI

* Archive personal fork then kick again

* kick build

* contracts-bedrock: new storage layout

* contracts-bedrock: fix deploy script

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
* ci: Upgrade golangci-lint version to one that handles Go 1.18

* Fix proxyd lint
@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented Jun 23, 2022

🦋 Changeset detected

Latest commit: df5eb9e

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 13 packages
Name Type
@eth-optimism/contracts-bedrock Minor
@eth-optimism/sdk Minor
@eth-optimism/core-utils Minor
@eth-optimism/integration-tests Patch
@eth-optimism/contracts-governance Patch
@eth-optimism/fault-detector Patch
@eth-optimism/message-relayer Patch
@eth-optimism/go-builder Patch
@eth-optimism/common-ts Minor
@eth-optimism/drippie-mon Patch
@eth-optimism/contracts Patch
@eth-optimism/data-transport-layer Patch
@eth-optimism/replica-healthcheck Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@github-actions github-actions bot added 2-reviewers C-protocol-critical Category: Modifies protocol-critical code A-pkg-core-utils Area: packages/core-utils A-integration Area: integration tests A-cannon Area: cannon A-ops Area: ops A-pkg-sdk Area: packages/sdk labels Jun 23, 2022
@mergify mergify bot requested a review from smartcontracts June 23, 2022 16:27
@mslipper mslipper merged commit 3c18810 into master Jun 23, 2022
theochap pushed a commit that referenced this pull request Dec 10, 2025
More cleanup of `anyhow` in CLI and rollup after
op-rs/kona#916
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-cannon Area: cannon A-integration Area: integration tests A-ops Area: ops A-pkg-core-utils Area: packages/core-utils A-pkg-sdk Area: packages/sdk C-protocol-critical Category: Modifies protocol-critical code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants