Skip to content

feat: merge-train/avm#23332

Open
AztecBot wants to merge 8 commits into
nextfrom
merge-train/avm
Open

feat: merge-train/avm#23332
AztecBot wants to merge 8 commits into
nextfrom
merge-train/avm

Conversation

@AztecBot
Copy link
Copy Markdown
Collaborator

@AztecBot AztecBot commented May 16, 2026

BEGIN_COMMIT_OVERRIDE
feat!: add immutables_hash to contract instance (#23091)
feat!: update address derivation (#23151)
feat(avm)!: add immutables_hash member to get contract instance opcode (#23152)
feat!: azip 8 public key hashes (#23159)
feat(avm)!: Remove is_infinite flag from AVM ECC & update noir submodule with serialization changes (#23342)
fix(avm): addressing claude review of interaction builders code (#23431)
END_COMMIT_OVERRIDE

Part 1 of the immutables_hash changes as part of
[AZIP-9](AztecProtocol/governance#20)

This pr just adds the `immutables_hash` field to the various
`ContractInstance` structs across the codebase.

It also updates the `publish_contract_instance` function and bumps
various constants for`ContractInstance` versions and
`PXE_DATA_SCHEMA_VERSION`
Copy link
Copy Markdown
Contributor

@IlyasRidhuan IlyasRidhuan left a comment

Choose a reason for hiding this comment

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

Holding this train up as we want to atomically merge azip changes

Part 2 of the immutables_hash changes as part of
[AZIP-9](AztecProtocol/governance#20)

Updates address derivation to include the `immutables_hash`.
Specifically, `immutables_hash` is now part of the
`salted_initialization_hash` computation

This also includes a constant update from `DOM_SEP__CONTRACT_ADDRESS_V1`
-> `DOM_SEP__CONTRACT_ADDRESS_V2`
#23152)

Part 3 of the immutables_hash changes as part of
[AZIP-9](AztecProtocol/governance#20)

This updates the `GETCONTRACTINSTANCE` opcode so that the
`immutables_hash` can be retrieved from the contract instance via the
opcode.
@IlyasRidhuan IlyasRidhuan requested a review from sirasistant as a code owner May 16, 2026 09:42
Copy link
Copy Markdown
Collaborator

@ludamad ludamad left a comment

Choose a reason for hiding this comment

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

🤖 Auto-approved

@AztecBot AztecBot enabled auto-merge May 16, 2026 14:26
@AztecBot
Copy link
Copy Markdown
Collaborator Author

🤖 Auto-merge enabled after 4 hours of inactivity. This PR will be merged automatically once all checks pass.

@IlyasRidhuan IlyasRidhuan disabled auto-merge May 16, 2026 17:39
@AztecBot AztecBot enabled auto-merge May 16, 2026 18:16
@AztecBot
Copy link
Copy Markdown
Collaborator Author

🤖 Auto-merge enabled after 4 hours of inactivity. This PR will be merged automatically once all checks pass.

jeanmon and others added 4 commits May 20, 2026 14:32
Implementation of
[AZIP-8](https://github.com/AztecProtocol/governance/blob/main/AZIPs/azip-8.md)

---------

Co-authored-by: jeanmon <jean@aztec-labs.com>
Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com>
…odule with serialization changes (#23342)

### Summary

This branch brings together two PRs:
1. #23155: Bumps
noir - crucially includes upstream change `chore!: remove is_infinite
from EmbeddedCurvePoint`
2. #22564: Top of
large stack which removes `is_infinite` flag from AVM opcode and point
struct

PR 1 requires AVM changes in 2 to run (since it removes the `inf` flag
from ACIR). For more details on specific changes see the relevant PRs
above.
Note that 1 is applied first so this PR will initially be identical to
it, apart from any changes needed from targeting the AVM merge train.

---

Will close:
- [AVM Foundation Issue
13](https://linear.app/aztec-foundation/issue/AVM-13/enforce-canonical-point-at-infinity-representation)
- enforce that points at inifinity are represented by `(0, 0)`
- [AVM Foundation Issue
14](https://linear.app/aztec-foundation/issue/AVM-14/remove-is-inf-flag-from-avm-ec-point-representation)
- remove `is_infinite` flag
 
These issues form the bulk of the project: [Align Circuit Point Infinity
Representation with Noir +
BB](https://linear.app/aztec-foundation/project/align-circuit-point-infinity-representation-with-noir-bb-5564f056ac0e/overview)

---------

Co-authored-by: Tom French <15848336+TomAFrench@users.noreply.github.com>
Co-authored-by: AztecBot <tech@aztec-labs.com>
Detailed of the report is in the following gist:
https://gist.github.com/AztecBot/b8be80df63afe353b576d5e9b13e70f2

We applied some mitigations for H1, M2, L1, L2, L4, L5

---------

Co-authored-by: jeanmon <jean@aztec-labs.com>
@IlyasRidhuan IlyasRidhuan self-requested a review May 21, 2026 09:03
@IlyasRidhuan IlyasRidhuan dismissed their stale review May 21, 2026 09:03

Hold released

@AztecBot AztecBot added this pull request to the merge queue May 21, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 21, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants