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

feat!: upstream to optimism v1.2.0 #227

Merged
merged 10,000 commits into from
Dec 4, 2023
Merged

feat!: upstream to optimism v1.2.0 #227

merged 10,000 commits into from
Dec 4, 2023

Conversation

kangsorang
Copy link
Contributor

@kangsorang kangsorang commented Nov 16, 2023

Description

Working upstream on updates to Optimism v1.2.0.
A merge commit has been created with Optimism based on Kroma that reflects content up to Optimism v1.0.3.
Any future upstream work can now be merged using the Optimism repo.

I have reflected the necessary Optimism components centered on Batcher and Node.
I also worked to match the existing Kroma structure with Optimism as much as possible for future upstream convenience.
To make it easier to track changes between Optimism and Kroma in code, I didn't apply any additional linters.

NOTE:
The version of the KROMA GETH you are importing references a GETH whose work is not currently complete. It will be updated later.
Golang version has been updated, it needs to be configured.

BREAKINGS

  • Need to rename fields in rollup config
    max_proposer_drift -> max_sequencer_drift
    proposer_window_size -> seq_window_size

  • ENV renaming required due to node flag changes
    NODE_PROPOSER_ENABLED -> NODE_SEQUENCER_ENABLED
    NODE_PROPOSER_L1_CONFS -> NODE_SEQUENCER_L1_CONFS
    NODE_SYNCER_L1_CONFS -> NODE_VERIFIER_L1_CONFS

  • Adding a required configuration environment variable to add validation logic
    VALIDATOR_RPC_ADDR
    VALIDATOR_RPC_PORT
    VALIDATOR_RPC_ENABLE_ADMIN

OptimismBot and others added 30 commits September 28, 2023 20:07
…rn/chai-4.3.10

build(deps): bump chai from 4.3.9 to 4.3.10
…rn/hardhat-2.17.4

build(deps-dev): bump hardhat from 2.17.2 to 2.17.4
…evelop

CI: Store test results after running indexer tests
…rn/glob-10.3.10

build(deps-dev): bump glob from 10.3.3 to 10.3.10
…rn/swc/core-1.3.90

build(deps-dev): bump @swc/core from 1.3.76 to 1.3.90
Bumps ethereum/client-go from v1.13.1 to v1.13.2.

---
updated-dependencies:
- dependency-name: ethereum/client-go
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.27.10 to 1.28.0.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.27.10...v1.28.0)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…rn/viem-1.13.0

build(deps): bump viem from 1.3.1 to 1.13.0
Bumps [viem](https://github.com/wagmi-dev/viem) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/wagmi-dev/viem/releases)
- [Commits](https://github.com/wagmi-dev/viem/compare/viem@1.13.0...viem@1.14.0)

---
updated-dependencies:
- dependency-name: viem
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@vitest/coverage-istanbul](https://github.com/vitest-dev/vitest/tree/HEAD/packages/coverage-istanbul) from 0.34.1 to 0.34.6.
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Commits](https://github.com/vitest-dev/vitest/commits/v0.34.6/packages/coverage-istanbul)

---
updated-dependencies:
- dependency-name: "@vitest/coverage-istanbul"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
feat(ctb): Move storage getters and setters to own lib
* Multiple mergify queues.

* Update urgent label

* Use queue conditions as opposed to conditions field
@kangsorang kangsorang force-pushed the feat/op-upstream branch 2 times, most recently from 2fc6f1d to 731a681 Compare November 27, 2023 01:13
@kangsorang kangsorang requested a review from 0xHansLee November 27, 2023 01:53
@kangsorang kangsorang requested a review from Pangssu November 27, 2023 02:15
@kangsorang kangsorang force-pushed the feat/op-upstream branch 3 times, most recently from f06c961 to b351574 Compare November 27, 2023 03:34
@kangsorang kangsorang requested a review from jyc228 November 27, 2023 09:19
@kangsorang
Copy link
Contributor Author

This is quite clear to me

That's clear, I agree.

@kangsorang kangsorang force-pushed the feat/op-upstream branch 4 times, most recently from f87b6f6 to 304cfeb Compare November 29, 2023 01:43
Fixed to keep op-form names for components we didn't create.
op-node/cmd/main.go Outdated Show resolved Hide resolved
op-node/flags/flags.go Outdated Show resolved Hide resolved
Copy link
Contributor

@0xHansLee 0xHansLee left a comment

Choose a reason for hiding this comment

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

LGTM.
Let's merge this after this PR merged.

@seolaoh
Copy link
Contributor

seolaoh commented Nov 30, 2023

Are there any contract code changes that we can apply?

Do you mean the upgraded contract code?

Yes I mean some contract code changes which could be applied to Kroma also. Are there any decisions not to apply contract code changes further?

@kangsorang
Copy link
Contributor Author

Are there any contract code changes that we can apply?

Do you mean the upgraded contract code?

Yes I mean some contract code changes which could be applied to Kroma also. Are there any decisions not to apply contract code changes further?

That wasn't the decision. I think we can work on that in the future if we see the need.
I excluded the contract changes because they didn't add much functionality.

Copy link
Contributor

@seolaoh seolaoh left a comment

Choose a reason for hiding this comment

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

LGTM

@kangsorang kangsorang merged commit 5a06153 into dev Dec 4, 2023
2 checks passed
@kangsorang kangsorang deleted the feat/op-upstream branch December 4, 2023 03:26
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.