chore: Accumulated backports to v4-next#22416
Merged
Conversation
Already fixed in next, just backporting the fix.
Set CONTRACT_ARTIFACTS_VERSION=<x.y.z> to transparently redirect @aztec/noir-contracts.js and @aztec/noir-test-contracts.js imports to a published version installed on demand under yarn-project/end-to-end/.legacy-contracts/<version>/. Enables verifying that contracts deployed from previous releases still work against the current stack. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
The jest resolver handles redirection; the Node loader hook was dead code for our actual use case. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Previously required running scripts/ensure_legacy_contracts.mjs before jest. Moving the install into the resolver itself makes CONTRACT_ARTIFACTS_VERSION work with any entrypoint (e.g. yarn test:e2e). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
The previous resolver redirected the entire @aztec/noir-contracts.js package, which dragged the legacy @aztec/aztec.js along with it. That coupled the test to a moving runtime API surface and would fail at import time on unrelated breaking changes. Now the resolver lets defaultResolver run first and only swaps JSON files under .../noir-contracts.js/artifacts/ (and noir-test-contracts.js) to the legacy cache equivalents. TS wrapper classes load from the current workspace and use current aztec.js, so the test exercises only the deployed-contract artifact compatibility surface. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Already fixed in next, just backporting the fix.
Necessary to enable patterns like the `Immutables` macro. Wallets still need to verify scopes forwarded from the app, so this is harmless and useful
Resolved conflict by taking PR #22419's updated addresses: - Slasher: mainnet 0x64E6e9Bb..., testnet 0xCF750B72... - Tally Slashing Proposer: mainnet 0xa4a38fD0... - Honk Verifier: added mainnet 0x70aedda4... - Slash Payload Cloneable: added mainnet 0xAA43220b...
… fix contract addresses and unstaking delay (#22424) ## Summary Backport of #22419 to v4-next. The automatic cherry-pick failed due to conflicts in `docs/docs/networks.md` — the v4-next branch had different Slasher mainnet address (`0x91a3745c...`) compared to next (`0x64E6e9Bb...`). ### Conflict resolution Took PR #22419's updated addresses for all conflicting rows: - **Slasher**: mainnet `0x64E6e9Bb...`, testnet `0xCF750B72...` (was showing Rollup address) - **Tally Slashing Proposer**: mainnet `0xa4a38fD0...` (verified via Slasher.PROPOSER) - **Honk Verifier**: added mainnet `0x70aedda4...` (was N/A) - **Slash Payload Cloneable**: added mainnet `0xAA43220b...` (was N/A) ### Also included (applied cleanly) - **Reward Booster** mainnet address update - Unstaking delay: replaced conditional with table showing both networks - Added governance withdrawal delay info (~38 days mainnet, ~1.6 days testnet) ClaudeBox log: https://claudebox.work/s/8697787a37a84540?run=1
PR to simply reduce an annoying logline to debug.
Thunkar
approved these changes
Apr 8, 2026
Collaborator
Author
|
🤖 Auto-merge enabled after 8 hours of inactivity. This PR will be merged automatically once all checks pass. |
Resolved conflict in version.nr by accepting the incoming major/minor version split (ORACLE_VERSION_MAJOR=22, ORACLE_VERSION_MINOR=0), replacing the old single ORACLE_VERSION=21 constant.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
BEGIN_COMMIT_OVERRIDE
feat(e2e): support running tests against legacy noir contract artifacts (#22388)
chore: deflake p2p client test (#22385)
fix: pass additionalScopes to executeUtility (#22411)
fix(docs): backport PR #22419 — update networks page for Alpha phase, fix contract addresses and unstaking delay (#22424)
chore: Reduce logging verbosity (#22423)
END_COMMIT_OVERRIDE