Merge optimism 910c9ade #91

blockchaindevsh · 2024-11-19T14:43:35Z

In order to fix the op-deployer issue, we need to merge with upstream.

This PR merges with upstream commit 910c9ad.

Conflicts:
go.mod
go.sum
packages/contracts-bedrock/scripts/L2Genesis.s.sol
packages/contracts-bedrock/scripts/checks/interfaces/main.go

* fix some typos in alt-da * fix from PR ethereum-optimism#12223 * new find in batcher

* fix docs link * replaced with correct link

It has been replaced with a go script. https://github.com/ethereum-optimism/optimism/blob/rm/check-ifaces-sh/packages/contracts-bedrock/scripts/checks/interfaces/main.go#L1

…ils (ethereum-optimism#12481)

…sm#12551) * add WakeupTraversal_WithExitedThreads * In the TestEVM_WakeupTraversal_WithExitedThreads test, explicitly set the current active thread to exited state (activeThread.Exited = true) to test the wakeup traversal behavior when the active thread has exited && Modified test cases by resetting the active thread's index from exitedThreadIdx to avoid duplicate settings and confusion. * setting Futex fields with varying values.

* fix: remove superchain erc20 modifier (#111) * fix: remove superchain erc20 modifier --------- Co-authored-by: Disco <131301107+0xDiscotech@users.noreply.github.com> Co-authored-by: 0xng <ng@defi.sucks> Co-authored-by: 0xParticle <particle@defi.sucks> Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com> * fix: pre pr --------- Co-authored-by: Disco <131301107+0xDiscotech@users.noreply.github.com> Co-authored-by: 0xng <ng@defi.sucks> Co-authored-by: 0xParticle <particle@defi.sucks> Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com>

* fix: rename crosschain events (#109) * fix: rename crosschain events * fix: semver --------- Co-authored-by: Disco <131301107+0xDiscotech@users.noreply.github.com> Co-authored-by: 0xng <ng@defi.sucks> Co-authored-by: 0xParticle <particle@defi.sucks> Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com> * fix: pre pr * fix: pre pr --------- Co-authored-by: Disco <131301107+0xDiscotech@users.noreply.github.com> Co-authored-by: 0xng <ng@defi.sucks> Co-authored-by: 0xParticle <particle@defi.sucks> Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com>

…sm#12397)

…sm#12483) * cannon: Finish emulating rest of 64-bit instructions This fixes the 64-bit stubs for various instructions (except lld/scd). * review comments; fix dmult * add todo * test div by zero * add a couple more dmultu tests * remove dead code * cannon: Fix remaining mips64 emulation bugs * fix 64-bit Makefile build script; review comments * fix build script

…optimism#11812)

Applies the semgrep rule for return-arg-fmt to Solidity tests.

…hereum-optimism#12606)

* optimize the doc * small fix * reomve outdated content

…imism#12602) * inclusion proof * fix test * add inclusion proof * goimports

Bumps the number of heavy fuzz runs to 20k. 10k recently missed a flake so bumping to 20k to try to avoid that in the future. Not perfect but it will reduce the probability a bit. Developers can still manually set the number of fuzz runs for a particular test with annotations if 20k is too high.

This test fails a lot when executors are under load. This PR changes the test to find the first block with more than one batcher transaction in it, which should be sufficient to assert that the batcher is submitting multiple transactions at once.

…imism#12607)

Updates semgrep config to apply expectRevert to tests. Fixes a few instances where this wasn't being followed.

* feat: support permit2 on superchainweth * chore: run pre-pr --------- Co-authored-by: agusduha <agusnduha@gmail.com> Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com>

…ene format (ethereum-optimism#12619) op-deployer generates rollup configs, and those rollup configs are currently broken for older versions of op-node that don't support reading the EIP1559Params field in the SystemConfig. This PR adds a meta field within the SystemConfig that, when enabled, marshals the SystemConfig without the EIP1559Params field. This solution is backwards-compatible and minimally invasive, requiring no changes to the consensus-critical code that consumes the SystemConfig elsewhere. Closes ethereum-optimism#12615.

* op-program: Compile op-program for Cannon64 * op-program: Update comment

…ism#12622) Co-authored-by: axelKingsley <axel.kingsley@gmail.com> Co-authored-by: Tyler Smith <mail@tcry.pt>

* op-supervisor: DB improvements for cross-safe updates Co-authored-by: axelKingsley <axel.kingsley@gmail.com> Co-authored-by: Tyler Smith <mail@tcry.pt> * op-supervisor: dependency-set improvements Co-authored-by: axelKingsley <axel.kingsley@gmail.com> Co-authored-by: Tyler Smith <mail@tcry.pt> --------- Co-authored-by: axelKingsley <axel.kingsley@gmail.com> Co-authored-by: Tyler Smith <mail@tcry.pt>

…imism#12629)

Update WaitForBlock to maintain two timeouts: a no-change timeout, which fires if the chain's head does not change within a specified window, and an absolute timeout, which fires if the chain's head does not meet or exceed the specified block. These changes should ideally reduce the number of test flakes we're seeing. Everything takes longer when test executors are under load; by maintaining these two timeouts we can provide longer-running tests with more buffer while retaining the ability to fail fast if the chain gets stuck. As part of this PR I also refactored the wait method to use polling rather than WebSockets. I've found WebSockets to be unreliable in tests.

* cannon: Remove memory.SetUint32 Remove uint32 word stores from the `mipsevm.memory` interface. `SetUint32` is inflexible due to its word-alignment constraints. This prevents tests for 32 and 64-bit VMs from using the same program counter values when writing instructions to memory. Instead, tests should use the new `testutil.StoreInstruction` utility function to write instructions to any naturally aligned memory location. * use arch.Word csats in go-ffi

…#12599) * cannon: Simplify load/stores with helper functions * use subword utils in MIPS.sol * lint MIPS.sol * add natspec to MIPSInstructions.sol * use updateSubWord in MIPSInstructions.sol * bump MIPS contract semver * fix nits

* feat:Add more sync tests Signed-off-by: Chen Kai <281165273grape@gmail.com> * feat:add more sync tests Signed-off-by: Chen Kai <281165273grape@gmail.com> * fix:fix failed tests Signed-off-by: Chen Kai <281165273grape@gmail.com> * fix:add copyright credit and remove unused code Signed-off-by: Chen Kai <281165273grape@gmail.com> * fix:fix copyright format Signed-off-by: Chen Kai <281165273grape@gmail.com> * fix code review suggestions Signed-off-by: Chen Kai <281165273grape@gmail.com> --------- Signed-off-by: Chen Kai <281165273grape@gmail.com>

…um-optimism#12885) Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.8.0 to 0.9.0. - [Commits](golang/sync@v0.8.0...v0.9.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix upgrade-semgrep * fix upgrade-semgrep

…-optimism#12946) - Refactor the semver inspector so that it can be called from outside the CLI - Adds a a canonical L2 genesis file for v1.6.0, and a unit test to assert that new chains deployed using v1.6.0 have the right L2 genesis.

* improve tests * fixes * fixes... * Apply suggestions from code review Co-authored-by: smartcontracts <kelvin@optimism.io> * fixes --------- Co-authored-by: smartcontracts <kelvin@optimism.io>

* improve tests * fixes * fixes * fixes * Apply suggestions from code review Co-authored-by: smartcontracts <kelvin@optimism.io> * fixes --------- Co-authored-by: smartcontracts <kelvin@optimism.io>

* fix challenge struct natspec * semver bump * semver bump * semver bump

…-optimism#12960) * security-reviews: Add 3Doc report on Canon F_GETFD changes. * security-reviews: Update README.

Fix typo in build script comment for clarity

CI must passing should be CI must pass.

- fixing the audit commits and descriptions so they map correctly

Fix typo in comment for Keccak256Commitment.Encode method

…timism#12881) * typo corr 2022-02-02-inflation-vuln.md * typo corr README.md * typo corr RUNBOOK.md

* flatten out batcher goroutines * move wg increment to parent fn * ensure mainloop closes before receipts loop * add comments * pass a context to both loops * remove debug lines * clean up mutex handling in receiptsLoop * don't need to set default value the first time * avoid writing to Logger while holding mutex * typo * increase log level and include tx.ID * fix changes from merge, hoist throttling loop goroutine launch to driver * call done on waitgroup in throttlingLoop * move function around hoping this makes the diff nicer

…2957)

…on (ethereum-optimism#12966)

…12430) * implement batchSubmitter.checkExpectedProgress * remove buffer variable * add warning logs when calling waitNodeSyncAndClearState * push method down into channel manager and add test * clarify SyncStatus documentation * improve TestChannelManager_CheckExpectedProgress make parameters "tighter" / more realistic and check an extra case

Conflicts: go.mod go.sum packages/contracts-bedrock/scripts/L2Genesis.s.sol packages/contracts-bedrock/scripts/checks/interfaces/main.go

Gmanboy and others added 30 commits October 23, 2024 07:52

chore: small fix in op-alt-da (ethereum-optimism#12038)

7c1ec6b

* fix some typos in alt-da * fix from PR ethereum-optimism#12223 * new find in batcher

readme: fix network deployments link (ethereum-optimism#12000)

a82a328

* fix docs link * replaced with correct link

doc: enhance derive package code comments (ethereum-optimism#12437)

8311719

fix: superchainWETH failing tests (#114) (ethereum-optimism#12571)

2bbffdc

chore: Remove unused script (ethereum-optimism#12597)

27f9704

It has been replaced with a go script. https://github.com/ethereum-optimism/optimism/blob/rm/check-ifaces-sh/packages/contracts-bedrock/scripts/checks/interfaces/main.go#L1

op-dispute-mon: Use game data from previous update cycle if update fa…

d67991a

…ils (ethereum-optimism#12481)

docs: add info about contributing to larger projects (ethereum-optimi…

7b119c5

…sm#12397)

cannon: Robust div by zero tests (ethereum-optimism#12600)

239330b

fix: fix potential error when running without any argument (ethereum-…

3159e0e

…optimism#11812)

fix(ci): apply return arg fmt rule to tests (ethereum-optimism#12546)

433f488

Applies the semgrep rule for return-arg-fmt to Solidity tests.

op-dispute-mon: Fix flaky test that was dependent on map ordering (et…

280bac5

…hereum-optimism#12606)

test-kontrol: optimize the doc (ethereum-optimism#12065)

03e0b88

* optimize the doc * small fix * reomve outdated content

chore(op-service): Add missing fields to blob API types (ethereum-opt…

532a146

…imism#12602) * inclusion proof * fix test * add inclusion proof * goimports

op-challenger: Add some info on run-trace to the README (ethereum-opt…

5f2cc84

…imism#12607)

maint(ci): apply expectRevert rule to tests (ethereum-optimism#12543)

c23daa0

Updates semgrep config to apply expectRevert to tests. Fixes a few instances where this wasn't being followed.

feat: support permit2 on superchainweth (ethereum-optimism#12596)

196613d

* feat: support permit2 on superchainweth * chore: run pre-pr --------- Co-authored-by: agusduha <agusnduha@gmail.com> Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com>

op-program: Compile op-program for Cannon64 (ethereum-optimism#12574)

21527c6

* op-program: Compile op-program for Cannon64 * op-program: Update comment

op-supervisor: DB improvements for cross-safe updates (ethereum-optim…

a71c492

…ism#12622) Co-authored-by: axelKingsley <axel.kingsley@gmail.com> Co-authored-by: Tyler Smith <mail@tcry.pt>

chore(op-e2e): Run BadTxInBatch tests on Granite only (ethereum-opt…

bf28a04

…imism#12629)

GrapeBaBa and others added 21 commits November 18, 2024 15:31

Sc/fix update semgrep (ethereum-optimism#12942)

29f76e5

* fix upgrade-semgrep * fix upgrade-semgrep

feat: opcm mainnet deploy. (ethereum-optimism#12953)

f6810a4

improve tests L2CrossDomainMessenger_Test (ethereum-optimism#12934)

7359d15

* improve tests * fixes * fixes... * Apply suggestions from code review Co-authored-by: smartcontracts <kelvin@optimism.io> * fixes --------- Co-authored-by: smartcontracts <kelvin@optimism.io>

improve tests of L1CrossDomainMessenger_Test (ethereum-optimism#12933)

e32278e

* improve tests * fixes * fixes * fixes * Apply suggestions from code review Co-authored-by: smartcontracts <kelvin@optimism.io> * fixes --------- Co-authored-by: smartcontracts <kelvin@optimism.io>

fix challenge struct natspec (ethereum-optimism#12951)

357fc7d

* fix challenge struct natspec * semver bump * semver bump * semver bump

security-reviews: Add 3Doc report on Canon F_GETFD changes. (ethereum…

99150d3

…-optimism#12960) * security-reviews: Add 3Doc report on Canon F_GETFD changes. * security-reviews: Update README.

make the solidity code path correct. (ethereum-optimism#12959)

c4a44c9

Typo fix Update build-legacy-cannons.sh (ethereum-optimism#12955)

52e9be8

Fix typo in build script comment for clarity

Typo Update pr-guidelines.md (ethereum-optimism#12929)

d675309

CI must passing should be CI must pass.

Update README.md (ethereum-optimism#12945)

3d50ab9

- fixing the audit commits and descriptions so they map correctly

Typo fix Update commitment.go (ethereum-optimism#12961)

fbcfb83

Fix typo in comment for Keccak256Commitment.Encode method

fix typos (ethereum-optimism#12910)

3e7c1dd

chore: Fix Typos and Minor Edits in Documentation Files* (ethereum-op…

e8de7b1

…timism#12881) * typo corr 2022-02-02-inflation-vuln.md * typo corr README.md * typo corr RUNBOOK.md

document batcher throttling in op-batcher readme (ethereum-optimism#1…

aec3697

…2957)

Update superchain-registry to include metal-sepolia Holocene activati…

8e0b89c

…on (ethereum-optimism#12966)

Merge remote-tracking branch 'origin/develop' into merge-latest

3f3c39a

Conflicts: go.mod go.sum packages/contracts-bedrock/scripts/L2Genesis.s.sol packages/contracts-bedrock/scripts/checks/interfaces/main.go

blockchaindevsh requested review from JustXxx, dajuguan, qizhou and qzhodl November 19, 2024 14:44

qizhou approved these changes Nov 19, 2024

View reviewed changes

qzhodl approved these changes Nov 20, 2024

View reviewed changes

blockchaindevsh merged commit 76de76e into op-es Nov 20, 2024

blockchaindevsh deleted the merge-latest branch November 20, 2024 06:30

blockchaindevsh mentioned this pull request Nov 23, 2024

QKC/OP Devs Meeting #26 Agenda ethstorage/pm#143

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge optimism 910c9ade #91

Merge optimism 910c9ade #91

Uh oh!

blockchaindevsh commented Nov 19, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Merge optimism 910c9ade #91

Merge optimism 910c9ade #91

Uh oh!

Conversation

blockchaindevsh commented Nov 19, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants