fix: backport restrict setSenderForTags override to current call (#22672)#22767
Merged
nchamo merged 2 commits intobackport-to-v4-next-stagingfrom Apr 24, 2026
Merged
Conversation
…call (F-564) (#22672) (with conflicts)
AztecBot
added
ci-draft
nchamo
changed the title
nchamo
changed the title
nchamo
approved these changes
Apr 24, 2026
AztecBot
added a commit
that referenced
this pull request
Apr 27, 2026
BEGIN_COMMIT_OVERRIDE feat(aztec)!: add counter template for aztec init (#22751) cherry-pick: fix(pxe): restrict setSenderForTags override to current call (F-564) (#22672) (with conflicts) fix: backport restrict setSenderForTags override to current call (#22672) (#22767) fix(pxe): backport anchor header threading from #22679 to v4-next (#22705) END_COMMIT_OVERRIDE
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 #22672 —
fix(pxe): restrict setSenderForTags override to current call (F-564).Cherry-pick
Cherry-pick of
efc29f75ba017e5f2077b23130fb4dec31ca568aproduced 4 conflicts. Per the 3-commit backport protocol, the commits are:cherry-pick: ... (with conflicts)— raw cherry-pick with conflict markers, for review visibility.fix: resolve cherry-pick conflicts— removes the conflict markers.No build-fixes commit is needed: the files touched by the backport compile cleanly after conflict resolution.
Conflict resolutions
docs/.../migration_notes.md— kept HEAD. The incoming diff contained an unrelated[Protocol] Domain separators ...section from a different commit onnext; the two legitimate PR fix(pxe): restrict setSenderForTags override to current call (F-564) #22672 entries auto-merged into the## TBDsection at the top of the file.yarn-project/aztec.js/src/wallet/deploy_account_method.ts— kept HEAD's richer return typeSendOptions<W extends { returnReceipt: true } ? WaitOpts : W>and its eslint-disable comment (those are v4-next state, unrelated to this PR), and applied the intended renameinjectContractAddressIntoScopes→prepareDeployOptions.yarn-project/pxe/src/contract_function_simulator/oracle/private_execution_oracle.ts— keptlog: this.logger(backport-branch state) and applied the field renamesenderForTags→defaultSenderForTags.yarn-project/pxe/src/pxe.ts(#executePrivate+ its three call sites) — adopted the object-destructuring signature and addedsenderForTags, but kept the backport branch's internalanchorBlockHeaderfetch (the backport branch fetches it inside#executePrivate, whereasnextpasses it in from callers).Analysis
Full write-up: https://gist.github.com/AztecBot/a38189c234928b7f50c218cb3caafea4
ClaudeBox log: https://claudebox.work/s/9d1daacca83ec10b?run=1