docs: fix v4.2.0 developer tutorial/guide bugs (backport #22618)#22762
Merged
critesjosh merged 3 commits intoApr 24, 2026
Merged
Conversation
AztecBot
added
ci-draft
critesjosh
approved these changes
Apr 24, 2026
critesjosh
merged commit 9b63b26
into
backport-to-v4-next-staging
33 of 36 checks passed
3 tasks
critesjosh
added a commit
that referenced
this pull request
Apr 28, 2026
Backport of #22541 to `backport-to-v4-next-staging`. Cherry-picked merge commit `8b748b9c52` and resolved conflicts. The three-commit structure is preserved: cherry-pick with markers, conflict resolution, and one adaptation commit. Per-file analysis and resolution notes: https://gist.github.com/AztecBot/a68baa18840f313a136985d096d6be79 ## Path mapping The source PR modified `docs/developer_versioned_docs/version-v4.2.0/...`, but `version-v4.2.0/` does not exist in v4-next; the versioned docs there are split into `version-v4.1.0-rc.2` (testnet) and `version-v4.2.0-aztecnr-rc.2` (mainnet). Git's rename detection routed the changes: - Source `version-v4.2.0/foundational-topics/...` → `version-v4.1.0-rc.2/foundational-topics/...` - Source `version-v4.2.0/aztec-js/how_to_pay_fees.md` → `version-v4.2.0-aztecnr-rc.2/aztec-js/how_to_pay_fees.md` - Source `version-v4.2.0/aztec-js/how_to_use_private_fee_juice.md` (new file) → added under `version-v4.2.0-aztecnr-rc.2/aztec-js/` - Source `docs-developers/...` → same path I left the split as git produced it, matching the precedent in #22762. ## Reviewer notes - The split above is asymmetric (foundational-topics in `v4.1.0-rc.2`, aztec-js in `v4.2.0-aztecnr-rc.2`). Happy to propagate to both versioned trees for symmetric coverage. - `version-v4.2.0-aztecnr-rc.2/aztec-js/how_to_pay_fees.md` still contains older `Private FPCs enable…` / `Public FPCs can be used…` snippets that are now redundant with the new sections the PR introduced; left in place since the PR did not touch them. - `version-v4.1.0-rc.2/foundational-topics/fees.md` ended up with a duplicate `gas_settings.ts` source link (one v4.1.0-rc.2, one v4.2.0) from auto-merge; the duplicate is outside the conflict region so I did not touch it in the conflict-resolution commit. ## Test plan - [x] No conflict markers remain - [x] Code-block fences balanced in modified files - [ ] Docs build passes CI ClaudeBox log: https://claudebox.work/s/f04540a46c506217?run=1 ClaudeBox log: https://claudebox.work/s/f04540a46c506217?run=1
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
2 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.
Backport of #22618 to
backport-to-v4-next-staging.Summary
Cherry-picked the merge commit (
31fedbddff) from #22618 and resolved the backport conflicts. The three-commit structure is preserved: the cherry-pick with markers, the conflict resolution, and one adaptation commit forlocal_network.md(which was deleted innextby an unrelated rework but still lives on this branch).Analysis and per-file resolution notes: https://gist.github.com/AztecBot/cc596d94d15a67b2ade3395ffe8e27da
Path mapping
docs/developer_versioned_docs/version-v4.2.0/...→docs/developer_versioned_docs/version-v4.1.0-rc.2/...docs/docs-developers/...→ same pathReviewer note
Git's rename detection routed three
aztec-nr/framework-description/advanced/*.mdfiles (how_to_prove_history,how_to_retrieve_filter_notes,writing_efficient_contracts) toversion-v4.2.0-aztecnr-rc.2/(mainnet snapshot) rather thanversion-v4.1.0-rc.2/(testnet snapshot). These files drop the deprecateddep::aztec::import prefix, which is a v4.2.0-only deprecation. I left them routed to mainnet only, sincedep::aztec::is still valid in v4.1.0-rc.2. Happy to also propagate tov4.1.0-rc.2/if you prefer symmetric coverage.Test plan
ClaudeBox log: https://claudebox.work/s/14d93942d50cf8eb?run=1