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 237 commits into
base: celestia-develop
Choose a base branch
from

Conversation

Bidon15
Copy link
Member

@Bidon15 Bidon15 commented Nov 12, 2024

Overview

maurelian and others added 30 commits October 23, 2024 18:08
* 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 <[email protected]>
Co-authored-by: 0xng <[email protected]>
Co-authored-by: 0xParticle <[email protected]>
Co-authored-by: gotzenx <[email protected]>

* fix: pre pr

---------

Co-authored-by: Disco <[email protected]>
Co-authored-by: 0xng <[email protected]>
Co-authored-by: 0xParticle <[email protected]>
Co-authored-by: gotzenx <[email protected]>
* fix: rename crosschain events (#109)

* fix: rename crosschain events

* fix: semver

---------

Co-authored-by: Disco <[email protected]>
Co-authored-by: 0xng <[email protected]>
Co-authored-by: 0xParticle <[email protected]>
Co-authored-by: gotzenx <[email protected]>

* fix: pre pr

* fix: pre pr

---------

Co-authored-by: Disco <[email protected]>
Co-authored-by: 0xng <[email protected]>
Co-authored-by: 0xParticle <[email protected]>
Co-authored-by: gotzenx <[email protected]>
* 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
Applies the semgrep rule for return-arg-fmt to Solidity tests.
* optimize the doc

* small fix

* reomve outdated content
* 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.
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 <[email protected]>
Co-authored-by: gotzenx <[email protected]>
…ene format (#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 #12615.
* op-program: Compile op-program for Cannon64

* op-program: Update comment
* op-supervisor: DB improvements for cross-safe updates

Co-authored-by: axelKingsley <[email protected]>
Co-authored-by: Tyler Smith <[email protected]>

* op-supervisor: dependency-set improvements

Co-authored-by: axelKingsley <[email protected]>
Co-authored-by: Tyler Smith <[email protected]>

---------

Co-authored-by: axelKingsley <[email protected]>
Co-authored-by: Tyler Smith <[email protected]>
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
* 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(ct): add semgrep rule to use encodeCall

encodeCall is almost always better than encodeWithSelector because
it maintains type safety. Prefer encodeCall unless
encodeWithSelector is actually necessary.

* maint(ct): update contracts to use encodeCall

Updates a number of contracts to use encodeCall instead of
encodeWithSelector where possible.
* update test folder so that smegrep require and revert checks pass for it

* fix test
brawncode and others added 30 commits November 19, 2024 07:27
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.
* migrate close-stale github action

* using external script

* completing script

* removing old github action

* example only

* removing versions

* removing tag-service
* feat(ctb): `RISCV.sol`

semver-lock

Co-Authored-By: Minhyuk Kim <[email protected]>
Co-Authored-By: Taem Park <[email protected]>
Co-Authored-By: Park Changwan <[email protected]>
Co-Authored-By: protolambda <[email protected]>

* snapshots

* diff with remote in CI

* schedule diff job

* Update .circleci/config.yml

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

* remove check changed

---------

Co-authored-by: Minhyuk Kim <[email protected]>
Co-authored-by: Taem Park <[email protected]>
Co-authored-by: Park Changwan <[email protected]>
Co-authored-by: protolambda <[email protected]>
Co-authored-by: Matt Solomon <[email protected]>
* improve delayedWeth test and coverage

* improve delayedWeth test and coverage

* fix DataAvailabilityChallenge failing fuzz test
* improve universal and libraries tests and coverage

* fixes
Bumps ethereum/client-go from v1.14.11 to v1.14.12.

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* contracts: remove op-nft

Remove the `op-nft` package from the contracts package. None of these
contracts are maintained and can be moved to another repo if necessary.
The purpose of this commit is to reduce compilation time. Less files
to compile means less compilation time.

* fix: semver lock step - ran pre-pr.

* fix: use added/modified filter for heavy fuzz

Updates the heavy fuzz filter for CI to only check for added or
modified contracts, now excluding deleted or moved contracts.

---------

Co-authored-by: Blaine Malone <[email protected]>
Co-authored-by: Kelvin Fichter <[email protected]>
* improve optimismportal(2) test coverage

* improve optimismportal(2) test coverage

* more tests, fixes
* improve dispute game tests and coverage

* fixes
…12983)

Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](kurtosis-tech/kurtosis@1.4.1...1.4.2)

---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* op-node: Create metrics to record if sequencer is active

* op-node: Update transactions_sequenced_total metric

---------

Co-authored-by: protolambda <[email protected]>
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.