Skip to content

feat: merge-train/fairies#23427

Merged
AztecBot merged 5 commits into
nextfrom
merge-train/fairies
May 20, 2026
Merged

feat: merge-train/fairies#23427
AztecBot merged 5 commits into
nextfrom
merge-train/fairies

Conversation

@AztecBot

@AztecBot AztecBot commented May 20, 2026

Copy link
Copy Markdown
Collaborator

BEGIN_COMMIT_OVERRIDE
refactor(pxe)!: remove legacy oracle compat, rename V2 oracles (#23425)
refactor(pxe)!: drop V1 oracle remnants, simplify nullifier witness (#23428)
END_COMMIT_OVERRIDE

nchamo and others added 4 commits May 20, 2026 14:57
…23428)

## Summary

- Drop the V1 `getBlockHashMembershipWitness` oracle handler and rename
`getBlockHashMembershipWitnessV2` to its canonical name.
- Rename `assertCompatibleOracleVersionV2` back to
`assertCompatibleOracleVersion`.
- Remove the `RawNullifierMembershipWitness` shim — the oracle now
returns `(NullifierLeafPreimage, MembershipWitness)` directly.
`NullifierMembershipWitness.toNoirRepresentation()` and `toFields()` are
reordered to match Noir's fixed tuple layout (preimage fields, then
index, then sibling path).
- Bump `ORACLE_VERSION_MAJOR` 24 → 25.

Fixes F-651
Fixes F-546
Fixes F-554

@ludamad ludamad left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 Auto-approved

@AztecBot AztecBot added this pull request to the merge queue May 20, 2026
@AztecBot

Copy link
Copy Markdown
Collaborator Author

🤖 Auto-merge enabled after 4 hours of inactivity. This PR will be merged automatically once all checks pass.

Merged via the queue into next with commit 9e797a0 May 20, 2026
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants