feat: adapt the layout of Assets to the double word representation

CHANGELOG.md

@@ -54,6 +54,7 @@
 - [BREAKING] Refactored assets in the tx kernel and `miden::protocol` from one to two words, i.e. `ASSET` becomes `ASSET_KEY` and `ASSET_VALUE` ([#2396](https://github.com/0xMiden/miden-base/pull/2396), [#2410](https://github.com/0xMiden/miden-base/pull/2410)).
 - [BREAKING] Rename `miden::protocol::asset::build_fungible_asset` to `miden::protocol::asset::create_fungible_asset` ([#2410](https://github.com/0xMiden/miden-base/pull/2410)).
 - [BREAKING] Rename `miden::protocol::asset::build_non_fungible_asset` to `miden::protocol::asset::create_non_fungible_asset` ([#2410](https://github.com/0xMiden/miden-base/pull/2410)).
+- [BREAKING] Change the layout of fungible and non-fungible assets ([#2437](https://github.com/0xMiden/miden-base/pull/2437)).
 - [BREAKING] Refactored assets in the tx kernel from one to two words, i.e. `ASSET` becomes `ASSET_KEY` and `ASSET_VALUE` ([#2396](https://github.com/0xMiden/miden-base/pull/2396)).
 - Unified the underlying representation of `ExitRoot` and `SmtNode` and use type aliases ([#2387](https://github.com/0xMiden/miden-base/pull/2387)).
 - [BREAKING] Moved padding to the end of `CLAIM` `NoteStorage` layout ([#2405](https://github.com/0xMiden/miden-base/pull/2405)).

crates/miden-agglayer/asm/agglayer/bridge/bridge_out.masm

@@ -215,26 +215,25 @@ end
 #!
 #! Invocation: exec
 proc convert_asset
-    # => [faucet_id_prefix, faucet_id_suffix, 0, 0, faucet_id_prefix, faucet_id_suffix, 0, amount]
-
     # --- Step 1: Assert faucet is registered ---
+    swapw
+    exec.asset::get_balance_from_fungible_asset
+    movdn.4
+    # => [ASSET_KEY, amount]
+
+    exec.asset::key_into_faucet_id
+    # => [faucet_id_prefix, faucet_id_suffix, amount]
+
     dup.1 dup.1
     exec.bridge_config::assert_faucet_registered
-    dropw
-    # => [faucet_id_prefix, faucet_id_suffix, 0, amount]
+    # => [faucet_id_prefix, faucet_id_suffix, amount]
 
     # --- Step 2: FPI to faucet's asset_to_origin_asset ---
 
-    # Drop the zero padding between faucet_id and amount.
-    # TODO(expand_assets): Use asset::get_faucet_id helper.
-    movup.2 drop
-    # => [faucet_id_prefix, faucet_id_suffix, amount]
-
     procref.agglayer_faucet::asset_to_origin_asset
     # => [PROC_MAST_ROOT(4), faucet_id_prefix, faucet_id_suffix, amount]
 
     # Move faucet_id above PROC_MAST_ROOT
-    # TODO(expand_assets): This needs an update in 2437.
     movup.5 movup.5
     # => [faucet_id_prefix, faucet_id_suffix, PROC_MAST_ROOT(4), amount]
 
@@ -466,8 +465,7 @@ proc create_burn_note
     exec.asset::mem_store
     # => [ASSET_KEY]
 
-    # TODO(expand_assets): Use asset::get_faucet_id helper.
-    dupw movup.2 drop movup.2 drop
+    dupw exec.asset::key_to_faucet_id
     # => [faucet_id_prefix, faucet_id_suffix, ASSET_KEY]
 
     # Create NetworkAccountTarget attachment for the faucet
@@ -531,6 +529,6 @@ proc create_burn_note
 
     # TODO: Check where the extra elements are coming from by adding pad comments throughout the
     # procedure.
-    drop
+    dropw drop
     # => []
 end

crates/miden-agglayer/asm/note_scripts/B2AGG.masm

@@ -95,7 +95,7 @@ begin
         push.STORAGE_START_PTR add.4 mem_loadw_le swapw mem_loadw_le.STORAGE_START_PTR
         # => [dest_network, dest_address(5), pad(10)]
 
-        # Load ASSET_VALUE onto the stack from ASSET_PTR + ASSET_VALUE_MEMORY_OFFSET
+        # Load asset onto the stack from ASSET_PTR
         push.ASSET_PTR exec.asset::mem_load
         # => [ASSET_KEY, ASSET_VALUE, dest_network, dest_address(5), pad(10)]
 

crates/miden-protocol/asm/kernels/transaction/api.masm

@@ -628,7 +628,8 @@ end
 #!
 #! Invocation: dynexec
 pub proc account_get_asset
-    # TODO(expand_assets): Validate ASSET_KEY once validation logic exists.
+    exec.asset::validate_key
+    # => [ASSET_KEY, pad(12)]
 
     exec.account::get_asset
     # => [ASSET_VALUE, pad(12)]
@@ -646,7 +647,8 @@ end
 #!
 #! Invocation: dynexec
 pub proc account_get_initial_asset
-    # TODO(expand_assets): Validate ASSET_KEY once validation logic exists.
+    exec.asset::validate_key
+    # => [ASSET_KEY, pad(12)]
 
     exec.account::get_initial_asset
     # => [ASSET_VALUE, pad(12)]