Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream v1.3.0 #121

Merged
merged 5,531 commits into from
Mar 8, 2024
Merged

Merge upstream v1.3.0 #121

merged 5,531 commits into from
Mar 8, 2024

Conversation

bnoieh
Copy link
Contributor

@bnoieh bnoieh commented Feb 6, 2024

Description

Merge upstream optimism v1.3.0

Rationale

To import bugsfix/improvements/features from upstream

Example

n/a

Changes

Changes from upstream

v1.1.1 -> v1.3.0

Modifies to upstream

  1. keep current docker ops rather than upstream(refactored to depend on circle ci)
  2. keep current preset chain config rather than upstream(refactored to use superchain registry)

Others

  1. cherry pick commit to apply fix to upstream v1.3.0

tynes and others added 30 commits October 26, 2023 12:08
…hain-mon_docker_build

chore: Improve chain-mon docker build
ops: handle warm-up output case during docker publish correctly
…rn/types/node-20.8.9

build(deps-dev): bump @types/node from 20.8.8 to 20.8.9
…config

op-node: Pull in Canyon Time from superchain registry
ci: Add filters so op-stack-go-docker-build-release builds on tags.
contracts-bedrock: modern import style in tests
Adds a new helper library called `EIP1967Helper` that can
get the admin and impl storage slots from a `Proxy` implementing
ERC1967. This is more helpful to use than hardcoded magic values
such as `multisig` because it is not clear who the multisig is
since its value is assigned in a different file. We want to decouple
the value from a magic value and set it to exactly what we want it
to be which is the admin. This will work in all cases no matter what
the admin is since it dynamically pulls the value from storage for
the tests.
…tushar/client-pod-issue-131/initializer-ci-check
Fault dispute tests take longer to execute when polling with HTTP so disable the longer running cannon tests on HTTP.
Cannon itself is unaffected by the connection type and the challenger is tested with HTTP via the alphabet game tests.
ci: Use pipeline.git.tag not pipeline.git.branch when doing releases
op-e2e: Disable cannon tests when using HTTP instead of WS
Remove the publish step because all tags are added by the docker buildx step already.
Remove the git tag from the release tags to add and allow the release script to add it instead.
…d-typos

Fixes docker-bake build targets for ci-builder and chain-mon
…ishonest moves.

The timeout is expected to be reached sometimes because the challenger has chosen not to respond, so we don't want the default long timeout.
@bnoieh bnoieh requested review from owen-reorg, krish-nr and welkin22 and removed request for redhdx and andyzhang2023 February 6, 2024 03:27
go.mod Outdated Show resolved Hide resolved
@owen-reorg owen-reorg merged commit ce2627c into develop Mar 8, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.