feat!: upstream to optimism v1.3.0 #239

Pangssu · 2023-12-22T06:14:49Z

Description

This is a PR to upstream to Optimism v1.3.0.
Note that I have reduced diffs from Optimism as much as possible to make the upstream task easier.
As a result, there are some breaking changes.

BREAKING CHANGES

It retains the hardfork naming used by Optimism, such as Bedrock, Regolith, Canyon. Therefore, the regolith_time field must be added to the rollup.json and l2GenesisRegolithTimeOffset to the deploy-config files. Note that Kroma is always post-regolith environment.
You will need to install and use pnpm as your node.js package manager. We no longer use yarn.
Some packages have been modified to allow kroma to work properly, and these have been separated into packages with the kroma- prefix.
- op-bindings -> kroma-bindings
- op-chain-ops -> kroma-chain-ops
- bedrock-devnet -> kroma-devnet
The way to run e2e tests and startup local devnet has changed.
- Like Optimism, you need to run the make devnet-allocs command to create an allocs.json before e2e testing.
- The e2e test uses the config from the devnetL1 environment. For more information, see the packages/contracts/deploy-config/devnetL1-template.json.
- It use a python script in kroma-devnet to startup the local devnet, not a bash script.

…evnet Enable Canyon in the devnet

op-bindings: regenerate

Bumps [github.com/google/uuid](https://github.com/google/uuid) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/google/uuid/releases) - [Changelog](https://github.com/google/uuid/blob/master/CHANGELOG.md) - [Commits](google/uuid@v1.3.1...v1.4.0) --- updated-dependencies: - dependency-name: github.com/google/uuid dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

- add match check-values-match job that searches using grep - define workflow to verify initializer value matches between contract and genesis

fix: string encode error TS2345

…y 1 match

…/github.com/google/uuid-1.4.0 build(deps): bump github.com/google/uuid from 1.3.1 to 1.4.0

…teral

fix: race condition updating last updated scorebook timestamp

…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.

Makefile

jyc228

lgtm

kangsorang · 2024-01-12T10:29:35Z

Currently, only Legolith and Spanbatch are applied to devnet environments, why not add the Canyon flag as well?
(devnetL1-template.json)

kangsorang · 2024-01-12T10:30:54Z

And if we are going to include the Canyon hardfork in the next release, it would be nice to include the Canyon environment variable in the script to work in the e2e environment. (OP_E2E_USE_CANYON)

kangsorang · 2024-01-15T01:43:36Z

kroma-chain-ops/genesis/setters.go

+
+// [Kroma: START]
+var (
+	L1ProxyCount = uint64(2048)


Isn't this value now unnecessary because of the improvements?

kangsorang · 2024-01-15T04:53:28Z

packages/contracts/deploy-config/devnetL1-template.json

+  "l1GenesisBlockTimestamp": "0x64c811bf",
+  "l2GenesisRegolithTimeOffset": "0x0",
+  "l2GenesisSpanBatchTimeOffset": "0x0",
+  "l2GenesisCanyonTimeOffset": "0x40",


I was wondering if there is a reason why it is 0x40 and not 0x00.
And for l2GenesisCanyonTimeOffset to be set, shouldn't eip1559DenominatorCanyon also be included?

eip1559DenominatorCanyon added.

If I set the l2GenesisCanyonTimeOffset to 0x40, I think we can test the hard fork on the devnet.

kangsorang · 2024-01-15T05:17:34Z

op-node/p2p/gossip.go

@@ -69,10 +70,14 @@ func blocksTopicV1(cfg *rollup.Config) string {
 	return fmt.Sprintf("/kroma/%s/0/blocks", cfg.L2ChainID.String())
 }

+func blocksTopicV2(cfg *rollup.Config) string {
+	return fmt.Sprintf("/optimism/%s/1/blocks", cfg.L2ChainID.String())


Wouldn't it be nice to unify the format for v1, v2 topics?

0xHansLee

Why the legacy-bindings and predeployes/address.go are deleted in op-bindings? I know the deleted things are not used in Kroma, but it would also be good to have in terms of less changes compared with Optimism

op-batcher/metrics/metrics.go

op-e2e/actions/blocktime_test.go

op-e2e/actions/l1_replica.go

op-e2e/actions/l2_verifier.go

0xHansLee · 2024-01-15T06:07:00Z

op-node/p2p/gossip.go

@@ -69,10 +70,14 @@ func blocksTopicV1(cfg *rollup.Config) string {
 	return fmt.Sprintf("/kroma/%s/0/blocks", cfg.L2ChainID.String())
 }

+func blocksTopicV2(cfg *rollup.Config) string {
+	return fmt.Sprintf("/optimism/%s/1/blocks", cfg.L2ChainID.String())


kangsorang · 2024-01-15T06:31:25Z

op-service/client/l2/engineapi/test/l2_engine_api_tests.go

Just curiosity, this filename ends with tests, so I think it's not being recognized as a test file by golang.
Is this by design?

l2_engine_test.go will test it.

Makefile

.gitignore

packages/contracts/hardhat.config.ts

Makefile

kroma-validator/challenger.go

kroma-chain-ops/cmd/check-l2/main.go

kroma-chain-ops/crossdomain/encoding_test.go

packages/contracts/scripts/differential-testing/differential-testing.go

0xHansLee

LGTM
Before merging, have you tested running a node locally sync with live network (mainnet or sepolia)?

op-e2e/actions/l2_runtime.go

seolaoh

LGTM

kangsorang

LGTM!

trianglesphere and others added 30 commits October 26, 2023 09:15

Merge pull request #7830 from ethereum-optimism/jg/enable_canyon_in_d…

5a80dc9

…evnet Enable Canyon in the devnet

op-bindings: regenerate

8b96404

Merge pull request #7873 from ethereum-optimism/fix/bindings

a1e9186

op-bindings: regenerate

Verify Initializer Volues in Contract & Genesis Match

ae67c7c

- add match check-values-match job that searches using grep - define workflow to verify initializer value matches between contract and genesis

docker image & fmt

3f41ff9

defaults

93f38e6

Merge pull request #7833 from keroro520/fix-ts-compile-BufferEncoding

b12fd0d

fix: string encode error TS2345

add awk script to ignore single and multi line comments & require onl…

03f5fd0

…y 1 match

indent

27009c1

Merge pull request #7871 from ethereum-optimism/dependabot/go_modules…

31704c5

…/github.com/google/uuid-1.4.0 build(deps): bump github.com/google/uuid from 1.3.1 to 1.4.0

CircleCI didn't like the << in my last script, switching to string li…

fb12a4a

…teral

chore: Improve chain-mon docker build

cd85e3d

move entrypoint to builder image

e02becb

quote kind

d647769

Merge pull request #7838 from LuisMarcano-antithesis/fix/race

fd19665

fix: race condition updating last updated scorebook timestamp

inline script

ef1dfdb

Merge pull request #7840 from ethereum-optimism/10-25-chore_Improve_c…

4c2d164

…hain-mon_docker_build chore: Improve chain-mon docker build

op-node: Pull in Canyon Time from superchain registry

b63da65

export script to bash env

fafcb05

handle awk error

b591429

Merge pull request #7870 from ethereum-optimism/docker-publish-fix

e0a8f3a

ops: handle warm-up output case during docker publish correctly

Merge pull request #7844 from ethereum-optimism/dependabot/npm_and_ya…

584b8c8

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

Merge pull request #7872 from ethereum-optimism/jg/superchain_canyon_…

9ac454a

…config op-node: Pull in Canyon Time from superchain registry

ci: Add filters so op-stack-go-docker-build-release builds on tags.

ed4a486

Merge pull request #7878 from ethereum-optimism/aj/release-filter

ebed8b7

ci: Add filters so op-stack-go-docker-build-release builds on tags.

Merge pull request #7861 from ethereum-optimism/ctb/test-import-style

489055c

contracts-bedrock: modern import style in tests

invariant-docs: regenerate

78c6c7f

contracts-bedrock: gas snapshot

43f9f7a

Pangssu removed the request for review from a team December 22, 2023 06:16

Pangssu force-pushed the feat/upstream-op-v1.3.0 branch 3 times, most recently from 88baeee to 7ba1fb1 Compare December 22, 2023 08:54

0xHansLee requested a review from jyc228 January 2, 2024 09:14

Pangssu force-pushed the feat/upstream-op-v1.3.0 branch from 7ba1fb1 to e00548a Compare January 8, 2024 06:55

kangsorang reviewed Jan 11, 2024

View reviewed changes

Makefile Show resolved Hide resolved

jyc228 approved these changes Jan 12, 2024

View reviewed changes

kangsorang reviewed Jan 15, 2024

View reviewed changes

Pangssu force-pushed the feat/upstream-op-v1.3.0 branch from e00548a to 1059db8 Compare January 15, 2024 04:05

kangsorang reviewed Jan 15, 2024

View reviewed changes

0xHansLee reviewed Jan 15, 2024

View reviewed changes

kangsorang reviewed Jan 15, 2024

View reviewed changes

seolaoh reviewed Jan 15, 2024

View reviewed changes

feat: reduce conflicts with optimism v1.2.0

9d5e944

Pangssu force-pushed the feat/upstream-op-v1.3.0 branch from 1059db8 to 46cf288 Compare January 16, 2024 13:15

0xHansLee approved these changes Jan 16, 2024

View reviewed changes

seolaoh reviewed Jan 17, 2024

View reviewed changes

op-e2e/actions/l2_runtime.go Show resolved Hide resolved

Pangssu force-pushed the feat/upstream-op-v1.3.0 branch 2 times, most recently from 4c992f3 to 1c2755b Compare January 17, 2024 05:45

seolaoh approved these changes Jan 17, 2024

View reviewed changes

kangsorang approved these changes Jan 17, 2024

View reviewed changes

Merge tag 'op-node/v1.3.0' into feat/upstream-op-v1.3.0

b2e2a80

Pangssu force-pushed the feat/upstream-op-v1.3.0 branch from 1c2755b to b2e2a80 Compare January 17, 2024 07:46

Pangssu merged commit 321b5e0 into dev Jan 17, 2024
2 checks passed

Pangssu deleted the feat/upstream-op-v1.3.0 branch January 17, 2024 09:27

Pangssu mentioned this pull request Jan 19, 2024

feat: upstream to opimism v1.4.0 #245

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat!: upstream to optimism v1.3.0 #239

feat!: upstream to optimism v1.3.0 #239

Pangssu commented Dec 22, 2023 •

edited

Loading

jyc228 left a comment

kangsorang commented Jan 12, 2024 •

edited

Loading

kangsorang commented Jan 12, 2024

kangsorang Jan 15, 2024

kangsorang Jan 15, 2024

Pangssu Jan 17, 2024

kangsorang Jan 15, 2024

0xHansLee Jan 15, 2024

0xHansLee left a comment

0xHansLee Jan 15, 2024

kangsorang Jan 15, 2024

Pangssu Jan 16, 2024

0xHansLee left a comment

seolaoh left a comment

kangsorang left a comment

feat!: upstream to optimism v1.3.0 #239

feat!: upstream to optimism v1.3.0 #239

Conversation

Pangssu commented Dec 22, 2023 • edited Loading

Description

BREAKING CHANGES

jyc228 left a comment

Choose a reason for hiding this comment

kangsorang commented Jan 12, 2024 • edited Loading

kangsorang commented Jan 12, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0xHansLee left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0xHansLee left a comment

Choose a reason for hiding this comment

seolaoh left a comment

Choose a reason for hiding this comment

kangsorang left a comment

Choose a reason for hiding this comment

Pangssu commented Dec 22, 2023 •

edited

Loading

kangsorang commented Jan 12, 2024 •

edited

Loading