Skip to content

Merge upstream v2.6.0 - #12

Merged
sduchesneau merged 87 commits into
release/2.xfrom
bump/v2.6.0
Oct 22, 2026
Merged

sduchesneau merged 87 commits into
release/2.xfrom
bump/v2.6.0

Conversation

@sduchesneau

@sduchesneau sduchesneau commented Oct 22, 2026 •

Copy link
Copy Markdown

Merges worldcoin/world-chain v2.6.0. Upstream moved reth to ethereum-optimism/reth 0fbe4285 (reth v2.5.2) and optimism to op-reth/v2.6.0, so both Firehose forks follow: streamingfast/reth#82 and streamingfast/optimism#27 (pinned by branch until they are tagged world-chain-v2.6.0-fh3.1). FIRE INIT and the genesis block now come from on_component_initialized, like reth and op-reth; there is no Firehose ExEx. Upstream's new AGENTS.md is taken as is; our notes moved to AGENTS.sf.md. Adds ACTIVATIONS.md.

Tested: cargo test -p world-chain-evm -p world-chain-node (23 passed). Battlefield world-chain-devnet: 78 passing, 23 pending, no snapshot changes. The compare-blocks test fails only on blob_gas/receipt.blob_gas_used: a false diff in fireeth compare-blocks-rpc, which now reads the Jovian DA footprint op-reth reports in receipt blobGasUsed (details in .dev/update-to-v2.6.0-fh.md).

Before merge: pin both reth and optimism depencencies by tag world-chain-v2.6.0-fh3.1

Kemperino and others added 30 commits August 29, 2026 22:28
* feat(contracts): add WLD staking vault for proof bonds

* refactor(contracts): share proof deployment vault lookup

* docs(contracts): clarify proof implementation workflow

* docs(wip-1006): clarify atomic proposal creation

* docs(wip-1006): remove migration caveat

* docs(wip-1006): restore deadline formulas

* refactor(contracts): inline proof vault lookup

* refactor(contracts): use explicit WLD units for bonds

* refactor(contracts): reuse game bond accounting helper

* docs(contracts): explain settlement recipient capacity

* docs(contracts): explain settlement deduplication

* refactor(contracts): avoid payout array assembly

* docs(contracts): clarify settlement candidates

* refactor(contracts): extract settlement candidates

* test(contracts): clarify settlement dedup coverage

* docs(contracts): explain proposal UUID derivation

* test(contracts): cover vault failure paths

* feat(contracts): simplify WLD staking (worldcoin#1093)

* feat: simplify deposit logic

* feat(contracts): use deposited WLD for proof bonds

* fix(contracts): harden proof game arithmetic

---------

Co-authored-by: Kemperino <33121795+Kemperino@users.noreply.github.com>

* refactor(contracts): extract vault errors into Errors.sol

Move IWLDStakingVault's errors into a free-floating src/dispute/lib/Errors.sol,
matching the Optimism dispute Errors.sol convention this repo builds on, and
natspec all remaining types (structs and events) in the interface.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* style(contracts): format vault revert assertions

* refactor(contracts): simplify vault deposits

* refactor(contracts): remove vault liability tracking

* refactor(contracts): remove vault recovery authority

* docs(contracts): document vault storage

* refactor(contracts): use vault access modifiers

* refactor(contracts): remove vault hold authority

* docs(contracts): note dead protocol recipient

* refactor(contracts): generalize bond vault to ERC-20

* docs(contracts): add vault ownership metadata

---------

Co-authored-by: 0xOsiris <djosiris@proton.me>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* feat(proofs): use WLD vault for game bonds

* refactor(proofs): use generic ERC-20 bond terminology
* feat(contracts): add WLD staking vault for proof bonds

* refactor(contracts): share proof deployment vault lookup

* docs(contracts): clarify proof implementation workflow

* docs(wip-1006): clarify atomic proposal creation

* docs(wip-1006): remove migration caveat

* docs(wip-1006): restore deadline formulas

* refactor(contracts): inline proof vault lookup

* refactor(contracts): use explicit WLD units for bonds

* refactor(contracts): reuse game bond accounting helper

* docs(contracts): explain settlement recipient capacity

* docs(contracts): explain settlement deduplication

* refactor(contracts): avoid payout array assembly

* docs(contracts): clarify settlement candidates

* refactor(contracts): extract settlement candidates

* test(contracts): clarify settlement dedup coverage

* docs(contracts): explain proposal UUID derivation

* test(contracts): cover vault failure paths

* feat(contracts): simplify WLD staking (worldcoin#1093)

* feat: simplify deposit logic

* feat(contracts): use deposited WLD for proof bonds

* fix(contracts): harden proof game arithmetic

---------

Co-authored-by: Kemperino <33121795+Kemperino@users.noreply.github.com>

* refactor(contracts): extract vault errors into Errors.sol

Move IWLDStakingVault's errors into a free-floating src/dispute/lib/Errors.sol,
matching the Optimism dispute Errors.sol convention this repo builds on, and
natspec all remaining types (structs and events) in the interface.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* style(contracts): format vault revert assertions

* refactor(contracts): simplify vault deposits

* refactor(contracts): remove vault liability tracking

* refactor(contracts): remove vault recovery authority

* docs(contracts): document vault storage

* refactor(contracts): use vault access modifiers

* refactor(contracts): remove vault hold authority

* docs(contracts): note dead protocol recipient

* feat(proofs): use WLD vault for game bonds

* test(devnet): fund WLD proof-system bonds

* feat(devnet): fund persistent proof bond accounts

* test(devnet): harden mock bond funding

* refactor(devnet): use unified vault deposit API

* test(devnet): verify vault backing directly

* refactor(contracts): generalize bond vault to ERC-20

* refactor(proofs): use generic ERC-20 bond terminology

* refactor(devnet): use generic ERC-20 bond terminology

---------

Co-authored-by: 0xOsiris <djosiris@proton.me>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* chore(proofs): prepare v1.0.0-rc.2

* chore(proofs): record rc.2 measurements
…dcoin#1102)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* record alphanet rc2 proof deployment

* record alphanet rc2 PCR approval

* drop redundant bond token deployment record
* ci: enable Karst acceptance checks on stage

* ci: enable stage Karst deposit acceptance check

* test: log acceptance sender addresses before RPC

* test: report all Karst acceptance check failures
…dcoin#1114)

* init_withdrawal_done

* prove_withdrawal done

* finalize_withdrawal done

* fixes

* add configurable timeout
…1116)

* add challenger test

* already challenged game is ignored test

* different bad root claim
* feat(proofs): log local SP1 limit estimation progress

* feat(proofs): add worker phase observability

* fix(proofs): avoid duplicate SP1 witness metrics
…1128)

* chore(proofs): record rc.2 measurements

* record fresh alphanet mock bond deployment

* record 450 block proof implementation

* remove redundant mock token deployment record

* keep repository measurements aligned with main
…orldcoin#1129)

* feat(proposer): add L1 RPC fallback

* refactor(proofs): unify metered RPC clients

* feat(proofs): add L1 RPC fallback to services

* feat(metrics): label RPC endpoint role

* fix(metrics): label verifying consensus RPC
* fix(proofs): cancel obsolete proof jobs

* fix(prover-service): use shared L1 RPC fallback

* chore(prover-service): consolidate initial migration

* chore(prover-service): poll obsolete jobs every five minutes

* docs(prover-service): remove rollout paragraph

* chore(prover-service): restore poller interval

* fix(prover-service): bind cancellation values
* fix(proofs): accelerate SP1 guest cryptography

* chore(proofs): keep crypto patch change minimal

* fix(proofs): handle cancelled jobs in prover CLI

* fix(proofs): model challenged proof threshold in test fake
* perf(proofs): enable patched BN254 backend for SP1

* chore(proofs): refresh SP1 BN254 range measurements

* fix(proofs): update Nitro measurements after manifest change
* chore(proofs): prepare version 1.0.0-rc.3

* chore(proofs): refresh RC3 measurements
alessandromazza98 and others added 25 commits October 2, 2026 17:12
* feat(ci): add risk-based pull request review gates

* code owner ci bypass

* changes

* force merge

* fix bugbot issue

* fix(ci): prevent PRs from disabling review notifications

---------

Co-authored-by: Eric Woolsey <ewoolsey@ualberta.ca>
# Conflicts:
#	AGENTS.md
#	Cargo.lock
@sduchesneau
sduchesneau marked this pull request as ready for review October 22, 2026 20:21
@sduchesneau
sduchesneau merged commit 600cd86 into release/2.x Oct 22, 2026
4 of 6 checks passed
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.

8 participants