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

fix: sync develop #216

Merged
merged 60 commits into from
Jan 23, 2025
Merged

Conversation

agusduha
Copy link
Member

No description provided.

mslipper and others added 30 commits January 16, 2025 16:43
* op-program: Build an interop prestate

The bootstrap process for interop is different so introduces a separate main method.

* op-program: Stop setting USE_INTEROP env var when running client in external process.

The interop version is used by specifying the interop client binary.
Update Makefile to build a native version of the interop client binary.
* use camel case for opcm outputversion var

* fix test

* rm entirely
…hereum-optimism#13812)

* op-program: Stop derivation once the claimed timestamp is reached

* op-program: Add comment and switch to a panic if agreed is already after claimed
…ereum-optimism#13796)

Add prestate provider for super roots that can provide preimages.
)

* op-program: Implement consolidation for interop

* address todos; fix claim validation bug

* fix test

* fix todos

* op-program: Fix short-circuit logic in block walk

* op-program: Use l2-chain block fetcher in canon

* op-program: Fix current header in engine_backend

* op-program: Filter hazardrous exec msgs

* cleanup

* fix block cache lookup

* snap to earliest block and update tests

Co-authored-by: Adrian Sutton <adrian@oplabs.co>

* use adrian's suggestion

* todo formatting

---------

Co-authored-by: Adrian Sutton <adrian@oplabs.co>
…ptimism#13819)

* op-program: Implement retries in prefetcher block re-exec

* add canon block with error test case

* add comment on error case in rexec
* op-chain-ops: op-run-block debug tool

* op-run-block: fix conflict with geth merge
This is a convenience feature that allows a user to "enter" a devnet /
chain and get a subshell with relevant data (in particular env
variables).

The goal is to try an minimize the amount of error-prone log-browsing
and copy-pasting before being able to interact with the environment.
Not currently used in the interop devnet as we're not yet deploying the new game type.
* feat(op-challenger): Kona interop executor

* Add agreed prestate to `LocalGameInputs`

* super executor 🦸

* lint
Make sync validator configurable per game type.
* op-challenger: Implement split adapter and trace accessor creation for super cannon

* op-challenger: Implement register task for super cannon

* op-challenger: Actually register super cannon game handler

* op-challenger: Lazy create clients

Make sync validator configurable per game type.

* op-challenger: Test split adapter

Remove ClaimTimestamp from ClaimInfo as we always use the poststate timestamp
* feat: add OP_SUCCINCT game type

* fix: change OP_SUCCINCT to 5

* add ASTERISC_KONA
* feat: Implement OPCM upgrade

* feat: better comment

* feat: Move vars to Setup where they belong

* gas snapshot
…-optimism#13767)

Bumps [github.com/hashicorp/raft-boltdb/v2](https://github.com/hashicorp/raft-boltdb) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/hashicorp/raft-boltdb/releases)
- [Commits](hashicorp/raft-boltdb@v2.3.0...v2.3.1)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/raft-boltdb/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ism#13823)

This change adds a "compilation" phase for devnet manifest.
Bottom line, we:

- treat the devnet manifest as a high-level specification of an
  expected deployment

- open up the possibility to generate an actionable input for an
  arbitrary deployer

- use kurtosis as a first target, by generating a valid kurtosis input
  that reflects the properties defined in the manifest

pkg/devnet/cmd/main.go is a toy tool to perform that last step.

Going forward, we could imagine a k8s deployment being "compiled"
following a similar process.
Or this being used during automated tests setup in order to create the
right target environment.

At a high-level, this is part of an effort to standardize our sources
of truth across the board.
)

Signed-off-by: piguagua <piguagua@aliyun.com>
…sm#13807)

* refactor: using slices.Contains to simplify the code

Signed-off-by: pinglanlu <pinglanlu@outlook.com>

* op-batcher: reintroduce helper func to fix other usages

---------

Signed-off-by: pinglanlu <pinglanlu@outlook.com>
Co-authored-by: protolambda <proto@protolambda.com>
sigma and others added 22 commits January 20, 2025 20:12
This will host the code that interacts with:
- the definition of a devnet (including generation of kurtosis inputs)
- an arbitrary devnet, regardless of whether it's kurtosis-backed or not

On the other hand, kurtosis-devnet remains focused solely on the
instantiation of a devnet on kurtosis.

As such, kurtosis-devnet can depend on devnet-sdk, but not the other
way around.
…gs (ethereum-optimism#13439)

* docker: Fix RedundantTargetPlatform warnings

* docker: Fix LegacyKeyValueFormat warnings
* op-deployer: Improve default hardfork choice

The deploy config was previously created with Holocene activated by default. This PR updates the hardfork selection logic to choose default hardforks based on the contracts version.

* CR updates
…#13866)

* op-node/rollup/derive: Reorganize baseBatchStage

Fixes ethereum-optimism#12567

* reword comment

Co-authored-by: George Knee <georgeknee@googlemail.com>

---------

Co-authored-by: George Knee <georgeknee@googlemail.com>
…dation of fromda entries (ethereum-optimism#13840)

* op-supervisor: return typed pairs of L1/L2 blocks, and support invalidation of fromda entries

* op-supervisor: support DA db block-invalidation and replacement

* op-supervisor: fix and cover edge-case of replacing a block at later L1 scope
* ci: Publish cannon prestates on develop and op-program releases.

* ci: Use new context

* ci: Remove comma

* fix branch name

* ci: Build all cannon prestates so they can be published

* ci: Not mt64 its just mt

* ci: Remove temporary settings

---------

Co-authored-by: raffaele-oplabs <raffaele@oplabs.co>
…thereum-optimism#13922)

* make interfaces for opcm contracts and use them in tests and scripts

* fix opcm interop deployment
* cannon: Simplify futex handling

* cannon: Cut envar and go ahead and implement new futex behavior directly

* cannon: Cut now unused onWaitComplete() method

* cannon: Update single-threaded mips call to getSyscallArgs

* cannon: Update contracts to match go vm

* cannon: Update solidity tests

* cannon: Reconcile MIPS.sol version with latest release (1.2.1)

* cannon: Update differential tests

* cannon: Cut wakeup field

* cannon: Remove thread futex fields

* cannon: Fix const name

* cannon: Add new cannon state versions

* cannon: Cut wakeup stats

* cannon: Fix ParseStateVersion(), add test

* cannon: Reenable evm validation in tests

* cannon: Temporarily use ad hoc cannon release

* cannon: Run semver lock

* cannon: Fix semver comment, run semver-lock

* cannon: Cut unused constants

* cannon: Use latest cannon release in op-stack-go dockerfile

---------

Co-authored-by: inphi <mlaw2501@gmail.com>
…3856)

* txmgr: Add custom publish error message handling

Fixes ethereum-optimism#13739

* add prefix TXMGR to env var

Co-authored-by: protolambda <proto@protolambda.com>

---------

Co-authored-by: protolambda <proto@protolambda.com>
…thereum-optimism#13838)

Changes type to just []byte and uses empty array as not set for simplicity.
…hereum-optimism#13863)

* append -rc if not upgraded yet

* append -rc if not upgraded yet

* fix tests

* fix tests

* fixes

* try fix go tests

* fix contracts tests

* fixes

* fixes

* fixes

* fixes
* contracts-bedrock: remove GCT code

This commit removes the custom gas token code from the L2 contracts.
The interop contracts were tightly integrated into this code,
so the diff is quite large.

We cannot remove the getters from the `L1Block` contract because
chains did a genesis with `WETH` that calls out to the `L1Block`
contract. `WETH` is not proxied, so we cannot modify the bytecode
without an irregular state transition. Just going to leave the
functions on `L1Block` for simplicity.

Both the messenger and the bridge have the references to CGT removed.

* l1block: test coverage

* contracts-bedrock: more cleanup

* compiler error

* gas-snapshot

* contracts-bedrock: remove dead imports

* ctb: unused imports

* snapshots: update

* interfaces

* ctb: fix
We just requested the header by hash so can skip hashing the header to update the cache and just use the already known hash.
…um-optimism#13833)

* op-challenger: Migrate config over to supporting multiple L2s

* op-challenger: Update flags to support multiple L2s

* op-dispute-mon: Keep the single network flag logic
@agusduha agusduha self-assigned this Jan 23, 2025
@agusduha agusduha merged commit 1d08b45 into sc-feat/add-shared-lockbox Jan 23, 2025
1 check passed
@agusduha agusduha deleted the fix/merge-conflict-lockbox-8 branch January 23, 2025 15:07
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.