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

[WIP]: conflicts review #476

Draft
wants to merge 444 commits into
base: celestia-develop
Choose a base branch
from

Conversation

Bidon15
Copy link
Member

@Bidon15 Bidon15 commented Nov 12, 2024

Overview

GrapeBaBa and others added 30 commits November 18, 2024 15:31
* feat:Add more sync tests

Signed-off-by: Chen Kai <[email protected]>

* feat:add more sync tests

Signed-off-by: Chen Kai <[email protected]>

* fix:fix failed tests

Signed-off-by: Chen Kai <[email protected]>

* fix:add copyright credit and remove unused code

Signed-off-by: Chen Kai <[email protected]>

* fix:fix copyright format

Signed-off-by: Chen Kai <[email protected]>

* fix code review suggestions

Signed-off-by: Chen Kai <[email protected]>

---------

Signed-off-by: Chen Kai <[email protected]>
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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix upgrade-semgrep

* fix upgrade-semgrep
- 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 <[email protected]>

* fixes

---------

Co-authored-by: smartcontracts <[email protected]>
* improve tests

* fixes

* fixes

* fixes

* Apply suggestions from code review

Co-authored-by: smartcontracts <[email protected]>

* fixes

---------

Co-authored-by: smartcontracts <[email protected]>
* fix challenge struct natspec

* semver bump

* semver bump

* semver bump
* 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
* 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
* 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
…#12919)

* Reset Derivation when Supervisor is Behind

* Disable Batcher Throttling in Interop local-devnet
Adds a unit test for mainnet deployments at version 1.6.0.
* interop: make geth Dockerfile use rc5

* use rc6

* Update ops-bedrock/l2-op-geth-interop.Dockerfile
It has been 6 months since we removed the package and added the
redirect. Anybody that has not learned where it is at this point
will be able to search Github and find a link to this commit.
Update the op-deployer Dockerfile to install CA certificates and symlink /op-deployer into /usr/local/bin so that it's on the container's PATH.
axelKingsley and others added 30 commits December 9, 2024 15:20
* supervisor: L1 Processor

* comments ; test fixes

* Make L1 source separate from RPC Addr

* fix test

* Add atomic bool for singleton processor routine
* add RegSP constant

* address comments

* fix natspec

* update semver-lock
* Revert "maint: bump forge version (#13301)"

This reverts commit a2e7d85.

* Reapply "maint: bump forge version (#13301)"

This reverts commit 048f074.

* Rebuild all on mise.toml

* fix: verify mise dependencies if necessary

---------

Co-authored-by: Kelvin Fichter <[email protected]>
The SSZ fuzz tests were not erroring when the `edOffset` was 508 and the `txOffset` was 514. This is because the transaction unmarshaler was reading the number of transactions in the payload as zero, but not checking to see if there was additional data left over. This should never be the case for a valid payload.

To verify, I ran the fuzz suite for 5 minutes:

```
fuzz: elapsed: 5m1s, execs: 12910962 (42267/sec), new interesting: 9 (total: 41)
```
Co-authored-by: Matthew Slipper <[email protected]>
When fuzz tests fail they write data to the test directory. This PR archives the fuzz data to make future debugging easier.
* enhance TestBatchReader

* add more test

* address comments

* address comments

* remove extra comment
…13329)

* use pendingBlocks() for s.metr.RecordL2BlocksAdded

* use pendingBlocks when channel is opened
* fix: clarity around how salts are made.

* fix: removed named return value.

* fix: semver lock updated.

* fix: pr comments.

* fix: adding natpsec to the new salt helper functions.

fix: adding natpsec to the new salt helper functions.

* fix: more details around why proxy salts include contract name.

* Update packages/contracts-bedrock/src/L1/OPContractsManager.sol

Co-authored-by: Matt Solomon <[email protected]>

* Update packages/contracts-bedrock/src/L1/OPContractsManager.sol

Co-authored-by: Matt Solomon <[email protected]>

* fix: only having one compute salt function

* fix: pre-pr ran

* Update packages/contracts-bedrock/src/L1/OPContractsManager.sol

Co-authored-by: Matt Solomon <[email protected]>

* fix: fix pre-pr

---------

Co-authored-by: Matt Solomon <[email protected]>
Adds additional op-deployer scripts to support alternative fault proof implementations. This is a prerequisite to deleting the allocs files, since many tests need a fast dispute game and an alphabet VM.
* op-supervisor,op-node: introduce follow/managed interop mode v2

* interop: test workaround, serve supervisor while using old deriver

* interop: fix API setup/usage, fix action test setup

* op-node: fix interop server endpoint getter

* interop: minor fixes, update TODO references
Adds new dev commands that use the lite profile to execute
everything and ultimately reduce compile time by several minutes.
* Update PROPERTIES.md

* Update README.md

* Update GovernanceToken.sol

* Update Burn.Eth.t.sol
* interop-devnet,fix: Add newly required op-supervisor flags.

* interop,tweak: Add interop.jwt-secret flags to op-nodes.
Users can now specify additional dispute games with custom VM types and preimage oracles. This will help with removing allocs files in the future.
Moves code coverage for smart contracts into mainline ci. CI will
now reject PRs that do not have 100% patch coverage.
* cannon: Track steps between ll and sc

* cannon: Track rmw failures, keep counts for rmw ops

* cannon: Add unit tests for stats tracking

* cannon: Simplify step count stats

* cannon: Track explicit memory reservation invalidation

* cannon: Set stats on DebugInfo

* cannon: Rename method

* cannon: Track forced preemptions

* cannon: Track failed wakeup traversals

* cannon: Track idle steps for thread 0

* cannon: Reorganize vm metrics, add methods to record new stats

* cannon: Use uint64 over int

* cannon: Record new metrics

* cannon: Update readme run-trace flag

* cannon: Use uint64 type consistently

* cannon: Add debugInfo serialization test

* cannon: Check metrics in executor test

* cannon: Record total steps

* cannon: Check error in test

* cannon: Enable stats tracking via --debug-info flag

* cannon: Fix steps json field name

* cannon: Keep a small cache of ll steps for more accurate tracking

* cannon: Tweak test

* cannon: Modify test to better validate json parsing

* cannon: Use non-threadsafe simplelru
Renames the ManagerOwnerAddrFor method to reflect what it actually does, and point it at the Sepolia proxy admin.
* Add Finality Handling to L1 Processor

* Add E2E Test for Finality Tracking

* Completely remove UpdateFinalizedL1 API

* use BlockRef in Supervisor Client return
* Add SyncNode and Controller

* Add Tests; Real DeriveFromL1 function
Fixes a minor flake in CrossL2Inbox where the test can fail when
the target is the vm address itself.
Makes CommonTest generic over Solidity versions by removing
direct dependencies on 0.8.15 contracts. Updates some interfaces
to achieve this.
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.