chore: Accumulated backports to v4-next#22699
Merged
Merged
Conversation
…ort #22642) Cherry-pick commit with conflict markers preserved.
epochs_l1_reorgs.parallel.test.ts 'updates L1 to L2 messages changed due to an L1 reorg' — known flake in e2e-p2p-epoch-flakes group, unrelated to this backport.
Use same structure as the handles missed message inserted by an L1 reorg test to wait for checkpoint when sending L2 txs to help trigger mbps. Co-authored-by: danielntmd <danielntmd@nethermind.io>
Cherry-pick of 1c4aa0c from PR #22673. Conflict markers preserved AS-IS in this commit; resolved in follow-up. Original PR description: ## Summary Three issues on `/developers/docs/aztec-js/how_to_create_account` that block users following the guide end-to-end. **1. Install command missing `@aztec/noir-contracts.js`.** The Sponsored FPC snippet imports `@aztec/noir-contracts.js/SponsoredFPC`, but the Install dependencies section only lists `@aztec/aztec.js` and `@aztec/wallets`. **2. Misleading info-note wording.** Reworded info note below the Sponsored FPC snippet. **3. Invisible `feeJuiceAccount` in Verify deployment.** Wrap the second account creation in a new `docs:start:create_fee_juice_account` block; switch `verify_account_deployment` to reference `newAccount`.
- Renamed v4.2.0 versioned docs path to v4.2.0-aztecnr-rc.2 (already done by automerge). - Install command: kept 4.2.0-aztecnr-rc.2 version suffix while adding the new @aztec/noir-contracts.js dependency from PR #22673. - Sponsored-FPC info note: kept the existing per-branch fragment anchors (#sponsored-fee-payment-contracts in the versioned doc, #sponsored-fpc-devnet-and-local-only in docs-developers) while adopting the PR's reworded sentence.
…rences (#22668) (with conflicts) Cherry-pick of #22668 (squash merge commit 34a28d4) onto v4-next. Conflicts + git rename-detection misfires to resolve in next commit: - version-v4.1.0-rc.2/docs/aztec-nr/debugging.md: auto-merged from version-v4.2.0/... — git mapped the v4.2.0 patch here because version-v4.2.0/ does not exist on v4-next. Out of original PR scope (the original author intentionally only patched v4.2.0/). - version-v4.1.0-rc.2/docs/tutorials/contract_tutorials/counter_contract.md: same — auto-merged from v4.2.0 misfire. Out of original PR scope. - docs/docs-developers/docs/aztec-nr/logging.md: file does not exist on v4-next (the unversioned source still uses debugging.md here — the rename to logging.md hasn't happened on this branch yet). Cherry-pick left the modified version of logging.md in tree, but it should be dropped and the equivalent LOG_LEVEL clarification applied to debugging.md instead in a follow-up commit. Legitimate portion: docs-developers/docs/tutorials/contract_tutorials/counter_contract.md oracle::debug_log -> oracle::logging bullet fix (auto-applied cleanly).
Revert the auto-merged changes that landed outside the original PR's scope: - version-v4.1.0-rc.2/docs/aztec-nr/debugging.md: revert. The original PR intentionally only patched the v4.2.0 versioned snapshot. v4.1.0-rc.2 is a separate published snapshot and is not within scope. - version-v4.1.0-rc.2/docs/tutorials/contract_tutorials/counter_contract.md: revert (same reason). - docs/docs-developers/docs/aztec-nr/logging.md: drop. This file does not exist on v4-next — the unversioned source still uses debugging.md. The cherry-pick left the modified version in tree by accident. The equivalent LOG_LEVEL clarification will be applied to debugging.md in the follow-up adapt commit. The legitimate change to docs-developers/docs/tutorials/contract_tutorials/counter_contract.md (oracle::debug_log -> oracle::logging bullet) is kept.
v4-next does not yet contain a version-v4.2.0/ snapshot — the closest snapshot is version-v4.2.0-aztecnr-rc.2/. The unversioned source still uses debugging.md (the rename to logging.md hasn't happened on this branch). Apply the equivalent intent of #22668 to the v4-next paths: - version-v4.2.0-aztecnr-rc.2/docs/aztec-nr/debugging.md: add LOG_LEVEL filter-format clarification + silent;debug:simulator example. The oracle::debug_log -> oracle::logging import-path fix is already present at this snapshot, so only the LOG_LEVEL block is changed. - version-v4.2.0-aztecnr-rc.2/docs/tutorials/contract_tutorials/counter_contract.md: fix the oracle::debug_log::debug_log_format bullet (the code sample above it already uses oracle::logging). aztec new counter is also already correct on this snapshot. - docs/docs-developers/docs/aztec-nr/debugging.md: add the same LOG_LEVEL filter-format clarification — equivalent of the unversioned logging.md change in the original PR.
…2675) ## Summary Stop conflating `aztec` with `nargo` in the Noir LSP setup guide, and list every binary the installer actually provides. The docs led me down the wrong path while trying to get the LSP working when going through the counter contract tutorial. - `docs/aztec-nr/installation.md`: rewritten around `nargo` only. Drops the old `which aztec` guidance (which pointed users at `$HOME/.aztec/current/node_modules/.bin/aztec`, unusable as an LSP backend). Recommends leaving `Noir: Nargo Path` empty for auto-discovery; falls back to `which nargo`. Adds troubleshooting for `startFailed` and shadowed `nargo` on `PATH`. - `getting_started_on_local_network.md`: install list now matches the `aztec-install` output (adds `nargo`, `noir-profiler`, `bb`) and links to the Noir VSCode Extension guide.
…t) (#22698) Backport of #22668 onto `backport-to-v4-next-staging`. ## Why this PR is more than a clean cherry-pick The original PR patched files that don't exist on v4-next: - `docs/developer_versioned_docs/version-v4.2.0/...` — v4-next does not yet have a finalized `version-v4.2.0/` snapshot; the closest is `version-v4.2.0-aztecnr-rc.2/`. - `docs/docs-developers/docs/aztec-nr/logging.md` — the unversioned source still uses `debugging.md` on this branch (the rename to `logging.md` hasn't happened here). `git cherry-pick` rename-detected the `version-v4.2.0/...` patches onto `version-v4.1.0-rc.2/...`, which is a separate published snapshot the original author intentionally chose not to touch. ## 3-commit structure 1. **`cherry-pick: ... (with conflicts)`** — the raw `git cherry-pick -Xno-renames` output, including the auto-merged-into-v4.1.0-rc.2 misfires and the `logging.md` left in tree, so reviewers can see what cherry-pick actually produced. 2. **`fix: resolve cherry-pick conflicts`** — reverts the v4.1.0-rc.2 misfires (out of scope) and drops `logging.md` (file doesn't belong on v4-next). 3. **`fix: adapt backport for v4-next file structure`** — applies the equivalent intent to: - `version-v4.2.0-aztecnr-rc.2/aztec-nr/debugging.md` — `LOG_LEVEL` filter-format clarification (the `oracle::debug_log` → `oracle::logging` import-path fix is already present at this snapshot). - `version-v4.2.0-aztecnr-rc.2/tutorials/contract_tutorials/counter_contract.md` — fix the `oracle::debug_log::debug_log_format` bullet (the code sample above already uses `oracle::logging`; `aztec new counter` was already correct here). - `docs/docs-developers/docs/aztec-nr/debugging.md` — same `LOG_LEVEL` clarification (equivalent of the unversioned `logging.md` change). ## Net diff Four files changed, +12/−2: - `docs/developer_versioned_docs/version-v4.2.0-aztecnr-rc.2/docs/aztec-nr/debugging.md` - `docs/developer_versioned_docs/version-v4.2.0-aztecnr-rc.2/docs/tutorials/contract_tutorials/counter_contract.md` - `docs/docs-developers/docs/aztec-nr/debugging.md` - `docs/docs-developers/docs/tutorials/contract_tutorials/counter_contract.md` 🤖 Backported by [Claudebox](https://claudebox.work/s/137b5311b08bcee5?run=1). ClaudeBox log: https://claudebox.work/s/137b5311b08bcee5?run=1
Backport of #22673 to `backport-to-v4-next-staging`. The automatic patch-apply backport failed due to two conflicts. Resolved manually following the standard 3-commit backport pattern (without the build-fixes commit — this PR is docs-only and required no code adaptation). ## Commits 1. **`docs: fix issues with Creating Accounts page (backport #22673)`** — `git cherry-pick` of upstream squash commit `1c4aa0c`. Committed with conflict markers in place so reviewers can see exactly what conflicted. 2. **`fix: resolve cherry-pick conflicts`** — minimal edits to the conflicted hunks only. ## Conflicts and how they were resolved Both conflicts boil down to v4-next-staging using different naming than `next` for things the PR also touched, so a clean three-way merge wasn't possible. ### `docs/developer_versioned_docs/version-v4.2.0-aztecnr-rc.2/docs/aztec-js/how_to_create_account.md` The original PR edits live under `version-v4.2.0/...`; on this branch the directory is renamed to `version-v4.2.0-aztecnr-rc.2/...`, which forced both hunks into a path-rename conflict. - **Install line** — kept the `4.2.0-aztecnr-rc.2` version suffix used everywhere else in this file, while still adopting the PR's intended addition of `@aztec/noir-contracts.js`. - **Sponsored-FPC info note** — adopted the PR's reworded sentence ("for more details on the Sponsored FPC and what this snippet means"), but kept the existing `#sponsored-fee-payment-contracts` anchor since the target heading in this branch's `how_to_pay_fees.md` is still `### Sponsored Fee Payment Contracts`. Switching to `#sponsored-fpc` would have broken the link on this branch. ### `docs/docs-developers/docs/aztec-js/how_to_create_account.md` - **Sponsored-FPC info note** — same wording change as above, but kept the branch's existing anchor `#sponsored-fpc-devnet-and-local-only` since that branch's `how_to_pay_fees.md` heading is `### Sponsored FPC (devnet and local only)`. ## Verification - Cumulative diff stats vs. base match the original PR exactly (3 files, +44 −11). - No conflict markers remain in any file (grep confirmed). - `docs:start:create_fee_juice_account` / `docs:end:create_fee_juice_account` markers exist in `docs/examples/ts/aztecjs_connection/index.ts`, so the `#include_code` reference in the docs-developers file resolves. Original PR description below for context. --- ## Summary Three issues on `/developers/docs/aztec-js/how_to_create_account` that block users following the guide end-to-end. **1. Install command missing `@aztec/noir-contracts.js`.** The Sponsored FPC snippet imports `@aztec/noir-contracts.js/SponsoredFPC`, but the Install dependencies section only lists `@aztec/aztec.js` and `@aztec/wallets`. Users hit `Cannot find module '@aztec/noir-contracts.js/SponsoredFPC'`. **2. Misleading info-note wording.** Reworded the note below the Sponsored FPC snippet — "setting up" implied the user needed to deploy/configure the canonical contract. **3. Invisible `feeJuiceAccount` in Verify deployment.** The variable was created between `docs:start`/`docs:end` markers in the shared example file, so it never made it into the rendered page. Wrapped it in a new `docs:start:create_fee_juice_account` block; switched `verify_account_deployment` to reference `newAccount` with an inline note for the Fee Juice path. ClaudeBox log: https://claudebox.work/s/ae934d6a0d27b8f5?run=1
…markers (#22649) Cherry-picked d84d562 as-is. Conflict markers intact in: - docs/developer_versioned_docs/version-v4.1.0-rc.2/docs/aztec-nr/framework-description/advanced/protocol_oracles.md - docs/developer_versioned_docs/version-v4.1.0-rc.2/docs/aztec-nr/testing_contracts.md - docs/examples/ts/recursive_verification/index.ts Modify/delete conflicts (files removed on v4-next but modified upstream) left as the upstream modified version in tree — will be resolved in the next commit per .claude/claudebox/backport.md.
- Accept upstream apiref-link content in the two versioned docs files, keeping them at the v4.1.0-rc.2 path (v4-next has no v4.2.0 directory). - Drop stale `// docs:end:imports` marker in recursive_verification index.ts, keeping the `assert` import which is still used. - Delete the webapp-tutorial and solidity/example_swap example trees that were already removed on v4-next (they were re-added by the modify/delete side of the cherry-pick).
#22708) Backport of #22649 to v4-next. ## Original PR #22649 — "docs: link to apiref, not gh, remove stale include code markers" Swaps GitHub-file links for apiref pages and strips ~hundreds of `// docs:start:*` / `// docs:end:*` markers that no longer feed any `#include_code` macro (remnants of deleted tutorials). ## Cherry-pick conflicts The automatic cherry-pick produced 3 content conflicts and 37 modify/delete conflicts. Resolution follows `.claude/claudebox/backport.md`: commit 1 records the cherry-pick with conflict markers intact; commit 2 resolves them. **Content conflicts (3)** — upstream renamed `developer_versioned_docs/version-v4.1.0-rc.2/` → `version-v4.2.0/`; on v4-next only `v4.1.0-rc.2` exists, so the files stay at the original path but the body of each conflict takes the upstream (apiref) side: - `docs/developer_versioned_docs/version-v4.1.0-rc.2/docs/aztec-nr/framework-description/advanced/protocol_oracles.md` - `docs/developer_versioned_docs/version-v4.1.0-rc.2/docs/aztec-nr/testing_contracts.md` - `docs/examples/ts/recursive_verification/index.ts` — kept `import assert from "node:assert"` (still used on line 118), dropped the stale `// docs:end:imports` marker. **Modify/delete conflicts (37)** — `docs/examples/webapp-tutorial/*` and `docs/examples/solidity/example_swap/*` were removed on v4-next but modified by #22649. Resolution: keep them deleted. ## Sanity check Grepped all `#include_code` references still live in `docs-developers/` and `developer_versioned_docs/` against the markers #22649 removed: every marker name that shows up in both lists still exists in the referenced source file after the backport, so no docs build should break. Docs-only change — no compile step, no third "build fixes" commit needed. ClaudeBox log: https://claudebox.work/s/3a184859f1383af3?run=1
docs/CLAUDE.md: take newer timestamp/version from PR #22515 docs/docs/networks.md: keep v4-next Ignition wording for Phase 1, add pointer to new Alpha Network page
…tes (v4-next) (#22714) Backport of #22515 to v4-next. ## Summary - New Alpha Network page at `/participate/alpha` (`docs/docs-participate/alpha.md`): known limitations, state-migration expectations across rollup upgrades, security disclosure, path-to-Beta, per-role expectations. - `limitations.md` + `privacy_considerations.md`: document `enqueue_incognito` for hiding `msg_sender`, note that hashes/nullifiers/private logs are now padded, drop stale `Decoder.sol` link, remove duplicate `msg_sender` section. - Caution banner in Participate index, sidebar entry, and pointer from `networks.md` to the new page. ## Conflict resolution Two files conflicted on auto-cherry-pick: 1. **`docs/CLAUDE.md`** — trivial timestamp/version block. Took newer values from the PR (`2026-04-21` / `1.7`). 2. **`docs/docs/networks.md`** — terminology mismatch. On `next`, the mainnet phase is called "Alpha"; on v4-next it's called "Ignition" (Phase 1 — gas limit 0, no user tx, governance/staking active). The PR's replacement paragraph described "transaction processing fully active" which is `next`-accurate but not v4-next-accurate. Resolution: kept v4-next's Ignition description of Phase 1 specifics, but appended the pointer to the new Alpha Network page so it's still linked from the networks guide. Full analysis: https://gist.github.com/AztecBot/9076276b1dc2e239f25e3f3983abb53a ## Commit structure Per `CLAUDE.md` backport protocol: 1. `cherry-pick: …` — conflicted files staged AS-IS with markers. 2. `fix: resolve cherry-pick conflicts` — resolves the two markers. No build-fix commit needed (docs-only). ClaudeBox log: https://claudebox.work/s/6d396637e42fb57b?run=1
Collaborator
Author
|
🤖 Auto-merge enabled after 8 hours of inactivity. This PR will be merged automatically once all checks pass. |
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
8 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
fix: (A-589) epochs l1 reorgs test (#20999)
fix(pxe): propagate calldata count from nested private oracles (backport #22642) (#22677)
fix(docs): Noir LSP and binaries installed by the aztec installer (#22675)
END_COMMIT_OVERRIDE