Skip to content

fix(pxe): throw error on origin/contract address mismatch in simulation#22637

Merged
nchamo merged 1 commit intomerge-train/fairiesfrom
fix/origin-mismatch-error
Apr 17, 2026
Merged

fix(pxe): throw error on origin/contract address mismatch in simulation#22637
nchamo merged 1 commit intomerge-train/fairiesfrom
fix/origin-mismatch-error

Conversation

@nchamo
Copy link
Copy Markdown
Contributor

@nchamo nchamo commented Apr 17, 2026

Summary

  • Upgrades the origin/contract address mismatch check in ContractFunctionSimulator.run() from a warning to a thrown error, preventing simulation from proceeding with inconsistent addresses that could produce misleading results.
  • Adds a test that verifies the error is thrown when request.origin differs from the contractAddress option.

Fixes AztecProtocol/aztec-claude#314

@nchamo nchamo self-assigned this Apr 17, 2026
@nchamo nchamo requested a review from Thunkar April 17, 2026 13:06
Copy link
Copy Markdown
Contributor

@Thunkar Thunkar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would sleep better with a CI-full on this one

@nchamo nchamo added the ci-full Run all master checks. label Apr 17, 2026
@nchamo nchamo merged commit 6107513 into merge-train/fairies Apr 17, 2026
26 checks passed
@nchamo nchamo deleted the fix/origin-mismatch-error branch April 17, 2026 13:51
@AztecBot
Copy link
Copy Markdown
Collaborator

✅ Successfully backported to backport-to-v4-next-staging #22580.

github-merge-queue bot pushed a commit that referenced this pull request Apr 17, 2026
BEGIN_COMMIT_OVERRIDE
fix(pxe): stop block synchronizer on PXE shutdown (#22604)
fix(aztec): respect TEST_ACCOUNTS env var in local network mode (#22600)
fix: check all aztec-nr dependency tags, not just aztec (#22483)
fix: reuse anchor block in kernel oracle (#22631)
refactor: unify contract compilation pipeline via bb aztec_process
(#22590)
fix(pxe): queue registerSender wipe to avoid racing with in-flight jobs
(#22623)
fix(pxe): bounds-check PropertySelector in pick_notes (#22614)
fix(pxe): guard private event store rollback against in-flight jobs
(#22615)
refactor(pxe): rename sideEffectCounter to initialSideEffectCounter
(#22599)
fix(pxe): correct stale authwitness comment and inverted tagging error
(#22537)
fix(aztec-nr): range-check auth witness fields before byte cast (#22624)
fix(pxe): serialize block stream event handling to prevent race
conditions (#22635)
fix(pxe): throw error on origin/contract address mismatch in simulation
(#22637)
END_COMMIT_OVERRIDE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-to-v4-next ci-full Run all master checks.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants