chore: Accumulated backports to v4-next#22742
Merged
Merged
Conversation
…TH (#22709) (with conflicts)
- Adds a `transfer_in_private_deliver_offchain` to the `Token` contract. - Extends TXE to facilitate Noir tests involving offchain messages. Some contorsions were necessary to make `offchain_receive` available as a regular utility callable from Noir. To my surprise this is the first case of an aztec-macro-generated utility we try to make available that way. Happy to hear if there are better/less ad-hoc ways to do so. --------- Co-authored-by: Jan Beneš <janbenes1234@gmail.com>
…22709) (#22740) Backport of #22709 to `v4-next`. ## Conflict resolution The automatic cherry-pick failed with a conflict in `docs/docs-developers/docs/resources/migration_notes.md`. The PR adds a new `### [CLI] aztec-up no longer exposes transitive npm bins on PATH` entry to the `## TBD` section. In `next` that section already contained a `### [Protocol] Domain separators introduced…` entry (from an unrelated change); in `v4-next` the `## TBD` section is empty, so 3-way merge couldn't place the new entry. Resolution: kept only the new `[CLI]` section from #22709, dropped the unrelated `[Protocol] Domain separators` context that isn't part of #22709 and doesn't apply to `v4-next`. Final diff stat matches #22709 exactly: `+56 / -5`, 4 files (`aztec-up/bin/0.0.1/aztec-install`, `aztec-up/bin/0.0.1/aztec-up`, `aztec-up/bin/0.0.1/install`, `docs/docs-developers/docs/resources/migration_notes.md`). ## Commits 1. `cherry-pick: ... (with conflicts)` — raw cherry-pick with conflict markers committed as-is. 2. `fix: resolve cherry-pick conflicts` — removes markers and the unrelated `[Protocol]` section. No build-fixes commit needed — only shell scripts and a Markdown doc touched, no compilation affected. ## Original PR summary The `aztec-up` installer was adding `$HOME/.aztec/current/node_modules/.bin` to the shell `PATH`, exposing ~40 transitive npm bins (`jest`, `tsc`, `tsserver`, `semver`, `uuid`, `json5`, `pino`, `mime`, `rlp`, ...) and silently shadowing user-installed versions. This PR exposes only the 7 `@aztec/*`-owned bins via a new `symlink_aztec_bins` function and drops `node_modules/.bin` from the `PATH` line and `aztec-up env` output. Backport triggered by `backport-to-v4-next` label on #22709. Original auto-backport run: https://github.com/AztecProtocol/aztec-packages/actions/runs/24837667070 ClaudeBox log: https://claudebox.work/s/c3ea95f8c16a721b?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
4 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: offchain delivered private transfer (#22574)
END_COMMIT_OVERRIDE