Skip to content

chore: migrate agglayer to latest next#2639

Merged
mmagician merged 58 commits intoagglayerfrom
mmagician-migrate-agglayer-vm-21
Mar 19, 2026
Merged

chore: migrate agglayer to latest next#2639
mmagician merged 58 commits intoagglayerfrom
mmagician-migrate-agglayer-vm-21

Conversation

@mmagician
Copy link
Copy Markdown
Collaborator

@mmagician mmagician commented Mar 19, 2026

includes the migration from VM 0.19 to 0.22.0-alpha

to be merged with a squash commit here

PhilippGackstatter and others added 30 commits March 2, 2026 23:26
* chore: use `get_balance` helper in account_delta

* chore: Add `TryFrom<Word> for AssetVaultKey`

* feat: refactor `asset.masm`

* feat: add `fungible_asset.masm`

* feat: refactor `asset_vault.masm`

* feat: refactor `faucet.masm`

* feat: refactor `account.masm`

* feat: refactor `account_delta.masm`

* feat: refactor `epilogue.masm`

* feat: refactor `output_note.masm`

* feat: refactor `prologue.masm`

* chore: increase `NOTE_MEM_SIZE` to 3072

* chore: adapt `NoteAssets` commitment

* feat: refactor `note.masm`

* chore: refactor `api.masm`

* chore: regenerate kernel proc hashes

* chore: add changelog

* fix: faucet::mint output docs

* chore: update memory.rs input/output note memory layouts

* fix: duplicate num assets in memory.rs table

* feat: move `build_asset_vault_key` to shared utils

* feat: refactor `faucet::mint`

* feat: refactor `faucet::burn`

* chore: refactor `create_non_fungible_asset` for uniformity

* feat: refactor `native_account::remove_asset`

* chore: move `mock::util` lib to miden-standards

* feat: refactor `move_asset_to_note`

* feat: add asset key to SWAP storage

* feat: refactor `native_account::add_asset`

* chore: refactor `receive_asset`

* feat: refactor `output_note::add_asset`

* chore: deduplicate epilogue asset preservation test

* chore: remove re-export of vault key builder procedures

* chore: regenerate kernel procedure hashes

* chore: add changelog

* fix: doc link to mock util lib

* chore: improve send_note_body impl and test

* fix: replace leftover `ASSET`s with `ASSET_VALUE`

* chore: update protocol library docs

* fix: rename leftover `ASSET` to `ASSET_VALUE`

* chore: remove unused error

* chore: regenerate tx kernel errors

* chore: improve note assets commitment computation

* fix: input notes memory assertions

* chore: add renamed procedures to changelog

* fix: incorrect stack and doc comment

* fix: p2id::new test

* feat: validate new asset layouts

* chore: update asset procedure calls in faucet

* feat: add create_fungible_asset_unchecked

* chore: change has_non_fungible_asset to take asset key

* feat: include full faucet ID limbs in asset delta

* chore: remove into `Word` conversions for assets

* feat: Implement strongly typed asset vault key

* chore: temporarily remove asset vault key hash

* chore: remove asset from word conversion

* feat: update `Asset` docs

* chore: remove unused (non-)fungible asset builders

* feat: refactor asset serialization and tests

* chore: add validation in get_asset and get_initial_asset

* chore: adapt miden-standards to changed asset def

* chore: adapt miden-tx to changed asset def

* feat: return native asset ID and fee amount as tx output

* chore: update create_non_fungible_asset faucet/asset APIs

* chore: adapt tests to new asset layouts

* feat: validate asset ID prefix in non-fungible assets

* chore: drop trailing "asset" from `asset::validate_asset`

* chore: rewrite asset validation tests

* chore: merge validate_value in `fungible_asset`

* chore: remove unused build_asset_vault_key procedures

* chore: remove `LexicographicWord` wrapper in non-fungible asset delta

* chore: update asset::create_non_fungible_asset signature in docs

* fix: test name, vault key display impl, remove unused errors

* fix: intra doc links

* chore: add changelog

* Initial plan

* Address review nits: add load_asset_key_and_value utility, use explicit ASSET_PTR constants, rename variables, add test

Co-authored-by: mmagician <8402446+mmagician@users.noreply.github.com>

* Fix load_asset_key_and_value procedure and usages in prologue and epilogue

Co-authored-by: mmagician <8402446+mmagician@users.noreply.github.com>

* Run cargo fmt to fix formatting issues

Co-authored-by: mmagician <8402446+mmagician@users.noreply.github.com>

* Rename asset_value back to asset in tx_event.rs

Co-authored-by: mmagician <8402446+mmagician@users.noreply.github.com>

* Run cargo fmt to fix formatting after variable rename

Co-authored-by: mmagician <8402446+mmagician@users.noreply.github.com>

* chore: simplify fungible_asset merge and add split

* chore: remove outdated edge case handling in vault

* chore: convert u64s from BE to LE

* feat: migrate rpo256 -> poseidon2

* chore: upgrade miden VM & crypto in Cargo.toml

* chore: refactor memory.masm from BE to LE

* chore: update broken imports in `miden-protocol`

* chore: introduce `FromNum` and `TryFromNum` traits

* chore: FieldElement import, as_int, and read_many_iter in `protocol`

* chore: replace imports in miden-protocol-macros

* chore: update imports in miden-standards

* chore: update imports in miden-tx

* chore: deactivate agglayer in workspace and miden-testing

* chore: update imports in miden-testing

* chore: migrate account ID and asset-related MASM modules to LE

* chore: migrate account, delta and note-related MASM modules to LE

* chore: migrate prologue & epilogue to LE

* chore: update empty SMT root

* chore: migrate tx and api.masm modules to LE

* chore: reverse tx stack inputs and outputs

* chore: migrate miden::protocol from BE to LE

* chore: swap order of link map operands on adv stack

* chore: swap prefix/suffix in asset vault test

* chore: use more resilient way to write test_transaction_epilogue

* chore: migrate tests in miden-testing from BE to LE

* chore: update schema type IDs for falcon512_poseidon2::pub_key

* chore: migrate miden::standards::{access, auth} from BE to LE

* chore: migrate miden::standards::faucets from BE to LE

* chore: migrate miden::standards::data_structures from BE to LE

* chore: migrate miden::standards::notes from BE to LE

* chore: migrate miden::standards::{wallets, attachments} from BE to LE

* fix: mmr authentication path for latest block

* chore: use falcon512_poseidon2::encode_signature for sig prep

* chore: update protocol library docs

* chore: remove @BigEndian from type defs

* fix: avoid using undeclared stack

* feat: reexport asset::mem_load

* chore: migrate singlesig_acl from be to le

* fix: multisig stack layouts after migration

* chore: update Cargo.lock and regenerate kernel proc hashes

* chore: cargo update to latest crypto and VM patch releases

* fix: unused imports after miden-field upgrade

* chore: use `Felt::{from, try_from}` and remove `(Try)FromNum`

* chore: remove temp mmr fix and adapt find_half_key_value call

* chore: regenerate kernel proc hashes

* chore: make toml

* chore: add changelog entry

* fix: outdated doc links

* fix: make format

* chore: deactivate miden-agglayer in check-features.sh

* chore: allow bincode in deny.toml

* fix: deny.toml entries and upgrade toml to 1.0

* fix: transaction context builder doc test

* feat: Add `Asset::as_elements`

* chore: use `asset::mem_load` in swap note

* fix: update agglayer::bridge::bridge_out to new asset layout

* chore: remove `Ord for Asset` impl

* chore: re-add error when asset-to-be-removed is not present

* chore: remove whitespace in docs

* chore: `cargo update`

* chore: use seed digest 2 and 3 as account ID suffix and prefix

* chore: remove `AccountId::try_from<[Felt; 2]>`; add `try_from_elements`

* chore: consistently use `RATE0, RATE1, CAPACITY` for hasher state

* chore: optimize account_id::validate for little-endian order

* chore: optimize account ID seed validation

* chore: reverse tx summary stack layout

* feat: optimize `account::is_slot_id_lt` for little-endian layout

* chore: regenerate kernel proc hashes

* chore: add changelog

* chore: rename `Falcon512Rpo` to `Falcon512Poseidon2`

* chore: rename `_ADDRESS` to `_PTR` in swap

* chore: rename `asset::{mem_store, mem_load}` to store/load

* chore: use imports instead of absolute paths

* chore: reword non-fungible asset key collision resistance

* chore: add `AssetId::is_empty`

* chore: remove unnecessary imports in `AssetVault`

* chore: spell out asset key layout in has_non_fungible_asset

* chore: validate account ID type in AssetVaultKey::new

* fix: typo in Asset docs

* chore: prefix `get/into_faucet_id` with `key`

* chore: prefix `get/into_asset_id` with `key`

* chore: suffix `is_(non_)fungible_asset` with `key`

* chore: address review comments

* chore: update outdated tx kernel input/output docs

* chore: LE layout for upcoming fpi account ID; fix stack comments

* chore: replace `type Word` with built-in `word`

* fix: asset::mem_store using `_be` instructions

* chore: update `add_input_notes` docs

* chore: Add `fungible_asset::to_amount`

* chore: replace `swap.3` with `movdn.3`

* chore: rename `get_balance_from_fungible_asset` to `value_into_amount`

* chore: use more explicit `poseidon2::copy_digest`

* chore: ensure asset vault key validity for fungible keys

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mmagician <8402446+mmagician@users.noreply.github.com>
Co-authored-by: Bobbin Threadbare <bobbinth@protonmail.com>
* feat: Enable warnings_as_errors in assembler

* fix: remove unused imports in miden-protocol

* fix: remove unused imports in miden-standards
…#2544)

The migration to miden-crypto 0.22 replaced `winter_rand_utils::rand_value`
with `miden_crypto::rand::test_utils::rand_value`, which is gated behind
`#[cfg(any(test, feature = "std"))]`. Since the workspace dependency uses
`default-features = false`, crates depending on `miden-protocol/testing`
without `std` failed to compile, breaking the release-dry-run MSRV check.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* chore: enable CI on merge queue trigger

* Update .github/workflows/build-docs.yml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Introducing a dedicated AccountIdKey type to unify and centralize all AccountId

* changelog for introduce AccountIdKey type

* refactor: clean up comments and improve code readability in AccountIdKey and tests

* refactor: update AccountIdKey conversion method and clean up imports

* refactor: reorganize AccountIdKey indices and clean up related code

* Apply suggestions from code review

* Update crates/miden-protocol/src/block/account_tree/account_id_key.rs

* Update crates/miden-protocol/src/block/account_tree/account_id_key.rs

* feat: validate account ID in `AccountTree::new`

---------

Co-authored-by: Bobbin Threadbare <43513081+bobbinth@users.noreply.github.com>
Co-authored-by: Philipp Gackstatter <PhilippGackstatter@users.noreply.github.com>
…n `account::set_item` and `account::set_map_item`
* feat: implement two-step ownership management for account components

- Add `ownable2step.masm` to provide two-step ownership functionality, requiring explicit acceptance of ownership transfers.
- Create Rust module for `Ownable2Step` struct to manage ownership state and storage layout.
- Introduce error handling for ownership operations in `standards.rs`.
- Develop comprehensive tests for ownership transfer, acceptance, and renouncement scenarios in `ownable2step.rs`.

* feat: add Ownable2Step account component for two-step ownership transfer

* fix: correct ownership word layout and update transfer ownership logic in ownable2step

* Refactor ownership management to use Ownable2Step pattern

- Updated the access control mechanism to implement a two-step ownership transfer pattern in the ownable2step module.
- Modified the storage layout to accommodate the new ownership structure, reversing the order of owner and nominated owner fields.
- Refactored the network fungible faucet to utilize the new Ownable2Step for ownership management.
- Adjusted related tests to validate the new ownership transfer logic and ensure correct behavior when transferring and accepting ownership.
- Updated error handling to reflect changes in ownership management, including new error messages for ownership transfer scenarios.

* refactor: update ownership word layout and adjust related logic in Ownable2Step

* refactor: rename owner and nominated_owner to get_owner and get_nominated_owner for consistency

* refactor: streamline ownership management in tests by utilizing Ownable2Step according to philip

* fix: `make format`

---------

Co-authored-by: Bobbin Threadbare <43513081+bobbinth@users.noreply.github.com>
Co-authored-by: Philipp Gackstatter <PhilippGackstatter@users.noreply.github.com>
…2575)

* feat(asm): add create_fungible_key proc for fungible asset vault keys

* chore: re-export create_fungible_key from `protocol::asset`

* chore: add changelog

---------

Co-authored-by: Philipp Gackstatter <PhilippGackstatter@users.noreply.github.com>
* feat: migrate miden-agglayer to VM 0.21 and crypto 0.22

Re-enable the miden-agglayer crate in the workspace and apply all
necessary API and convention changes from the VM 0.21 migration:

Rust changes:
- Remove FieldElement trait imports (removed from miden-core)
- Felt::as_int() -> Felt::as_canonical_u64()
- Program import moved to miden_core::program::Program
- bytes_to_packed_u32_felts -> bytes_to_packed_u32_elements (miden_core::utils)
- AccountId::try_from([Felt;2]) -> AccountId::try_from_elements(suffix, prefix)
- Serializable/Deserializable from miden_assembly::serde (was ::utils)

MASM changes:
- rpo256 -> poseidon2 (hash function migration)
- asset::mem_store/mem_load -> asset::store/load (procedure renames)
- u64::overflowing_mul -> u64::widening_mul
- u128_sub_no_underflow rewritten for LE convention (u64 procedures
  now use [lo, hi] input/output order)
- verify_u128_to_native_amount_conversion updated for LE result order

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix: migrate agglayer tests and fix LE convention issues

Re-enable agglayer tests in miden-testing and fix all compilation
and runtime errors from the VM 0.21 migration:

Test compilation fixes:
- FieldElement import removal, as_int -> as_canonical_u64
- AuthScheme::Falcon512Rpo -> Falcon512Poseidon2
- AdviceInputs path: miden_processor::advice::AdviceInputs
- FastProcessor::new_debug -> new().with_advice().with_debugging()
- StackInputs::new(vec![]) -> new(&[])
- bytes_to_packed_u32_felts -> bytes_to_packed_u32_elements
- AccountId::try_from -> try_from_elements

MASM runtime fixes:
- eth_address.masm: fix u32split LE output order in build_felt
  verification (movup.4 -> movup.3 for lo/hi comparison)
- bridge_out.masm: fix create_burn_note note_idx corruption -
  loc_loadw_be overwrites top 4 stack elements including both
  copies from dup; save note_idx to local instead (pre-existing
  bug that only manifested with multiple output notes)
- bridge_out.masm: fix num_leaves storage LE ordering - push
  new_leaf_count to stack top for Word[0] storage, use
  mem_storew_le instead of mem_storew_be for loading
- bridge_config.masm: update GER hash from Rpo256 to Poseidon2
- canonical_zeros: remove .rev() from build.rs generation, swap
  push order for LE memory layout
- Word element ordering fixes for bridge admin, GER manager,
  faucet registry keys, and conversion metadata

Test expectation fixes:
- Rpo256 -> Poseidon2 for GER hash computation
- Removed word reversal in root/proof reading (LE convention)
- Fixed expected storage value ordering
- mem_storew_be -> mem_storew_le in test MASM code

All 39 agglayer tests pass.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* style: apply rustfmt formatting

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* refactor: address PR review comments

- Extract `create_id_key(id: AccountId) -> Word` helper and reuse for
  bridge_admin, ger_manager, bridge_account_id, and faucet_registry_key
- Replace `felts_to_bytes` with re-export of `packed_u32_elements_to_bytes`
  from miden-core (identical implementation)
- Remove stale comment in config_note.rs
- Use `Felt::ONE` instead of `Felt::new(1)` in config_bridge test
- Add TODO comments referencing issue #2548 for getter helpers
- Simplify note_idx handling: use `padw` before `loc_loadw_le` instead of
  saving to a local variable; revert @Locals(15) to @Locals(14)
- Switch `loc_storew_be`/`loc_loadw_be` to `_le` variants in create_burn_note
- Add stack state comments before third overflowing_sub in u128_sub_no_underflow

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* chore: padding is 15

* remove utils re-export, faucet_registry_key

* chore: drop 4 words

* fix: pad before call invoc.; explicit stack comments

* fix: unnecesary dup and incorrect movup

* style: codify multi-element naming convention for MASM stack comments

Add convention to masm_doc_comment_fmt.md:
- `value` = single felt
- `value(N)` = N felts (non-word)
- `VALUE` = word (4 felts, no (4) suffix needed)

Apply throughout agglayer MASM: drop redundant (4) from ASSET_KEY,
ASSET_VALUE, SERIAL_NUM, SCRIPT_ROOT, RECIPIENT, NOTE_ATTACHMENT,
PROC_MAST_ROOT, OLD_VALUE, VALUE, U256_LO, U256_HI.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* chore: update comments on poseidon inputs

* Update crates/miden-protocol/masm_doc_comment_fmt.md

Co-authored-by: Philipp Gackstatter <PhilippGackstatter@users.noreply.github.com>

* chore: test for high x3

* fix: correctly rearrange lo/hi for sub

* chore: more explicit sub comments

* chore: revert changes to faucet config slot

* chore: revert prefix<>suffix storage ordering

* fix: store flag values at word[0] for LE convention

Change GER_KNOWN_FLAG and IS_FAUCET_REGISTERED_FLAG to be stored at
word[0] instead of word[3]. Under LE, `push.0.0.0.FLAG` puts FLAG at
stack top = word[0], matching the documented layout [1, 0, 0, 0].

Previously `push.FLAG.0.0.0` placed FLAG at stack bottom = word[3],
resulting in Word([0, 0, 0, 1]) which contradicted the docs.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* chore: use felts directly instead of extracting u64

* chore: fix build

* Apply suggestion from @PhilippGackstatter

Co-authored-by: Philipp Gackstatter <PhilippGackstatter@users.noreply.github.com>

* chore: use AccountIdKey

* refactor: push explicit zeros, dont assume padding is 0

* refactor: simplify assert_faucet_registered by asserting first

* chore: re-add miden-agglayer to feature checks

Now that miden-agglayer has been migrated, add it back to the
check-features.sh loop.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* refactor: explicit pointers for storing prefix/suffix

* refactor: swap to_account_id output to LE convention [suffix, prefix]

All other bridge/faucet MASM procedures use [suffix, prefix] (suffix on
top) for account IDs on the stack. Align to_account_id with this
convention by adding a swap at the end, and update all callers:
- faucet/mod.masm: update get_destination_account_id_data, claim, and
  build_p2id_output_note to handle the new stack order
- solidity_miden_address_conversion test: swap stack index expectations

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude (Opus) <noreply@anthropic.com>
Co-authored-by: Bobbin Threadbare <43513081+bobbinth@users.noreply.github.com>
Co-authored-by: Philipp Gackstatter <PhilippGackstatter@users.noreply.github.com>
Co-authored-by: Bobbin Threadbare <bobbinth@protonmail.com>
djolertrk and others added 12 commits March 18, 2026 11:22
* refactor: update RandomCoin, use position of LeafIndex

* chore: update deny file

* chore: use version from crates.io, update deny file
The constants FAUCET_ID_SUFFIX and FAUCET_ID_PREFIX were swapped
relative to the actual storage layout in config_note.rs (suffix at
index 5, prefix at index 6). This caused register_faucet to store
with a mismatched key, so lookups returned empty.

Also fix the misleading doc comment in config_note.rs.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
The NetworkFungibleFaucet's mint_and_send now requires Ownable2Step
for ownership verification and OwnerControlled for mint policy
management. Migrate the agglayer faucet from a custom owner_config
storage slot to these standard components:

- Remove bridge_account_id from AggLayerFaucet (ownership is now
  handled by the Ownable2Step component)
- Add Ownable2Step and OwnerControlled as companion components in
  the faucet account builder
- Use Ownable2Step::try_from_storage to extract the owner in
  bridge_account_id() helper

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
The build.rs computes the faucet code commitment for validation checks.
After adding Ownable2Step and OwnerControlled as companion components,
the code commitment must include their procedures.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
The MINT note script reads storage with mem_loadw_le (LE convention),
so the bridge must store the P2ID script root, serial number, and
attachment data using mem_storew_le to match. Using mem_storew_be
caused the P2ID script root hash to be stored with reversed elements,
making it unresolvable by the kernel.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- Use mem_storew_le for MINT note storage in bridge_in.masm to match
  the MINT note script's mem_loadw_le reads (VM 0.21 byte-endianness).
- Add MintNote::script() to bridge_in TX3 context.
- Fix clippy useless_conversion warnings in bridge.rs.
- Formatting fix in faucet.rs.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@mmagician mmagician marked this pull request as ready for review March 19, 2026 13:13
@mmagician mmagician added the agglayer PRs or issues related to AggLayer bridging integration label Mar 19, 2026
@mmagician mmagician marked this pull request as ready for review March 19, 2026 15:43
Copy link
Copy Markdown
Contributor

@Fumuran Fumuran left a comment

Choose a reason for hiding this comment

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

Looks good to me! Here and there, there are missing or excessive blank lines, but I think it will be better to fix them in a future PRs.

Copy link
Copy Markdown
Member

@partylikeits1983 partylikeits1983 left a comment

Choose a reason for hiding this comment

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

Awesome! Looks good to me!

Do you mind if we merge #2622 first, and then this PR?

@mmagician
Copy link
Copy Markdown
Collaborator Author

Since we can release beta without #2622, I am going to push back on that, as it would require another migration here, further delaying beta.

@mmagician mmagician merged commit 32b0ef2 into agglayer Mar 19, 2026
17 checks passed
@mmagician mmagician deleted the mmagician-migrate-agglayer-vm-21 branch March 19, 2026 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agglayer PRs or issues related to AggLayer bridging integration

Projects

None yet

Development

Successfully merging this pull request may close these issues.