Skip to content

op-deployer: Separate L1 and L2 contract artifacts#12480

Merged
mslipper merged 3 commits intodevelopfrom
feat/separate-l1-l2-versions
Oct 16, 2024
Merged

op-deployer: Separate L1 and L2 contract artifacts#12480
mslipper merged 3 commits intodevelopfrom
feat/separate-l1-l2-versions

Conversation

@mslipper
Copy link
Collaborator

Adds support for specifying separate artifact URLs for L1 and L2. There are two new fields in the intent - L1ContractsLocator and L2ContractsLocator - which together replace the ContractArtifactsURL and ContractsRelease fields. Specifying a file or HTTPS URL for either field will automatically enable dev mode for the deployment. Specifying a tag:// URL will use the standard deployment for L1 and L2. The default have been set to the following:

  • L1: op-contracts/v1.6.0
  • L2: op-contracts/v1.7.0-beta.1+l2-contracts

Fixes https://github.com/ethereum-optimism/platforms-team/issues/337.

Adds support for specifying separate artifact URLs for L1 and L2. There are two new fields in the intent - `L1ContractsLocator` and `L2ContractsLocator` - which together replace the `ContractArtifactsURL` and `ContractsRelease` fields. Specifying a file or HTTPS URL for either field will automatically enable dev mode for the deployment. Specifying a `tag://` URL will use the standard deployment for L1 and L2. The default have been set to the following:

- L1: `op-contracts/v1.6.0`
- L2: `op-contracts/v1.7.0-beta.1+l2-contracts`

Fixes ethereum-optimism/platforms-team#337.
@mslipper mslipper requested a review from blmalone October 16, 2024 05:26
@semgrep-app
Copy link
Contributor

semgrep-app bot commented Oct 16, 2024

Semgrep found 1 golang_fmt_errorf_no_params finding:

  • op-supervisor/supervisor/backend/db/db_test.go

No fmt.Errorf invocations without fmt arguments allowed

Ignore this finding from golang_fmt_errorf_no_params.

Semgrep found 1 math-random-used finding:

  • op-supervisor/supervisor/backend/source/head_monitor_test.go

Do not use math/rand. Use crypto/rand instead.

Ignore this finding from math-random-used.

Semgrep found 1 marshal-json-pointer-receiver finding:

  • op-supervisor/supervisor/backend/db/heads/types.go

MarshalJSON with a pointer receiver has surprising results: golang/go#22967

Ignore this finding from marshal-json-pointer-receiver.

Semgrep found 1 err-nil-check finding:

superfluous nil err check before return

Ignore this finding from err-nil-check.

Copy link
Contributor

@blmalone blmalone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm.

One small, non-blocking question.

Side note:
AFAIK, op-chain-ops/deployer/integration_test/apply_test.go only tests the flow were ArtifactsLocator has a URL and not a Tag. Given that the most common production execution of the apply command will be with the Tag field set, I think an additional test for this would be useful. I made an issue for this here.

@mslipper mslipper added this pull request to the merge queue Oct 16, 2024
Merged via the queue into develop with commit 3f65402 Oct 16, 2024
@mslipper mslipper deleted the feat/separate-l1-l2-versions branch October 16, 2024 18:08
samlaf pushed a commit to samlaf/optimism that referenced this pull request Nov 10, 2024
…#12480)

* op-deployer: Separate L1 and L2 contract artifacts

Adds support for specifying separate artifact URLs for L1 and L2. There are two new fields in the intent - `L1ContractsLocator` and `L2ContractsLocator` - which together replace the `ContractArtifactsURL` and `ContractsRelease` fields. Specifying a file or HTTPS URL for either field will automatically enable dev mode for the deployment. Specifying a `tag://` URL will use the standard deployment for L1 and L2. The default have been set to the following:

- L1: `op-contracts/v1.6.0`
- L2: `op-contracts/v1.7.0-beta.1+l2-contracts`

Fixes https://github.com/ethereum-optimism/platforms-team/issues/337.

* fix test

* fix another test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants