chore: update base & node deps (0xMiden#1454)

Author: juan518munoz

Cargo.lock

@@ -20,7 +20,7 @@ authors      = ["miden contributors"]
 edition      = "2024"
 license      = "MIT"
 repository   = "https://github.com/0xMiden/miden-client"
-rust-version = "1.89"
+rust-version = "1.90"
 version      = "0.12.0"
 
 [profile.test-dev]
@@ -29,10 +29,10 @@ opt-level = 1
 
 [workspace.dependencies]
 # Miden base/protocol dependencies
-miden-lib     = { branch = "next", default-features = false, git = "https://github.com/0xMiden/miden-base" }
-miden-objects = { branch = "next", default-features = false, git = "https://github.com/0xMiden/miden-base" }
-miden-testing = { branch = "next", default-features = false, git = "https://github.com/0xMiden/miden-base" }
-miden-tx      = { branch = "next", default-features = false, git = "https://github.com/0xMiden/miden-base" }
+miden-lib     = { default-features = false, version = "0.12" }
+miden-objects = { default-features = false, version = "0.12" }
+miden-testing = { default-features = false, version = "0.12" }
+miden-tx      = { default-features = false, version = "0.12" }
 
 # Miden node dependencies
 miden-node-block-producer = { branch = "next", git = "https://github.com/0xMiden/miden-node" }
@@ -41,7 +41,7 @@ miden-node-proto-build = { branch = "next", default-features = false, git = "htt
 miden-node-rpc = { branch = "next", git = "https://github.com/0xMiden/miden-node" }
 miden-node-store = { branch = "next", git = "https://github.com/0xMiden/miden-node" }
 miden-node-utils = { branch = "next", git = "https://github.com/0xMiden/miden-node" }
-miden-note-transport-proto-build = { default-features = false, git = "https://github.com/0xMiden/miden-note-transport" }
+miden-note-transport-proto-build = { branch = "tomasarrachea-update-deps", default-features = false, git = "https://github.com/lambdaclass/miden-note-transport" }
 miden-remote-prover = { branch = "next", features = ["concurrent"], git = "https://github.com/0xMiden/miden-node" }
 miden-remote-prover-client = { branch = "next", default-features = false, features = [
   "tx-prover",

Cargo.toml

@@ -1,13 +1,13 @@
 # Custom P2ID note script
 #
-# This note script asserts that the note args are exactly the same as passed 
+# This note script asserts that the note args are exactly the same as passed
 # (currently defined as {expected_note_arg_1} and {expected_note_arg_2}).
-# Since the args are too big to fit in a single note arg, we provide them via advice inputs and 
+# Since the args are too big to fit in a single note arg, we provide them via advice inputs and
 # address them via their commitment (noted as NOTE_ARG)
-# This note script is based off of the P2ID note script because notes currently need to have 
-# assets, otherwise it could have been boiled down to the assert. 
+# This note script is based off of the P2ID note script because notes currently need to have
+# assets, otherwise it could have been boiled down to the assert.
 
-use.miden::account
+use.miden::native_account
 use.miden::active_note
 use.miden::contracts::wallets::basic->wallet
 use.std::mem
@@ -27,20 +27,20 @@ begin
     # => [target_mem_addr']
     dropw
     # => []
-    
+
     # read first word
     push.{mem_address}
     # => [data_mem_address]
-    mem_loadw
+    mem_loadw_be
     # => [NOTE_ARG_1]
-    
+
     push.{expected_note_arg_1} assert_eqw.err="First note argument didn't match expected"
     # => []
 
     # read second word
     push.{mem_address_2}
     # => [data_mem_address_2]
-    mem_loadw
+    mem_loadw_be
     # => [NOTE_ARG_2]
 
     push.{expected_note_arg_2} assert_eqw.err="Second note argument didn't match expected"
@@ -58,7 +58,7 @@ begin
     mem_load
     # => [target_account_id_prefix]
 
-    exec.account::get_id swap drop
+    exec.native_account::get_id swap drop
     # => [account_id_prefix, target_account_id_prefix, ...]
 
     # ensure account_id = target_account_id, fails otherwise

bin/integration-tests/src/asm/custom_p2id.masm

@@ -1185,16 +1185,16 @@ pub async fn test_unused_rpc_api(client_config: ClientConfig) -> Result<()> {
 
     // Define the account code for the custom library
     let custom_code = "
-        use.miden::account
+        use.miden::native_account
 
         export.update_map
             push.1.2.3.4
             # => [VALUE]
             push.0.0.0.0
             # => [KEY, VALUE]
-            push.1
+            push.0
             # => [index, KEY, VALUE]
-            exec.account::set_map_item
+            exec.native_account::set_map_item
             dropw dropw dropw dropw
         end
     ";
@@ -1205,7 +1205,7 @@ pub async fn test_unused_rpc_api(client_config: ClientConfig) -> Result<()> {
         [Felt::new(0), Felt::new(0), Felt::new(0), Felt::new(1)].into(),
     )?;
 
-    let storage_slots = vec![StorageSlot::empty_map(), StorageSlot::Map(storage_map)];
+    let storage_slots = vec![StorageSlot::Map(storage_map)];
     let (account_with_map_item, _) = insert_account_with_custom_component(
         &mut client,
         custom_code,

bin/integration-tests/src/tests/client.rs

@@ -197,7 +197,7 @@ pub async fn test_merkle_store(client_config: ClientConfig) -> Result<()> {
              push.{num_leaves} push.4000 mem_store
 
              # merkle root -> mem[4004]
-             push.{} push.4004 mem_storew dropw
+             push.{} push.4004 mem_storew_be dropw
         ",
         merkle_root.to_hex()
     );

bin/integration-tests/src/tests/custom_transaction.rs

@@ -53,7 +53,7 @@ pub async fn test_fpi_execute_program(client_config: ClientConfig) -> Result<()>
                 push.{map_key}
                 # item index
                 push.0
-                exec.::miden::account::get_map_item
+                exec.::miden::active_account::get_map_item
                 swapw dropw
             end",
             map_key = Word::from(MAP_KEY)
@@ -64,7 +64,6 @@ pub async fn test_fpi_execute_program(client_config: ClientConfig) -> Result<()>
     let code = format!(
         "
         use.miden::tx
-        use.miden::account
         begin
             # push the root of the `get_fpi_item` account procedure
             push.{proc_root}
@@ -132,7 +131,7 @@ pub async fn test_nested_fpi_calls(client_config: ClientConfig) -> Result<()> {
                 push.{map_key}
                 # item index
                 push.0
-                exec.::miden::account::get_map_item
+                exec.::miden::active_account::get_map_item
                 swapw dropw
             end",
             map_key = Word::from(MAP_KEY)
@@ -250,7 +249,7 @@ async fn standard_fpi(storage_mode: AccountStorageMode, client_config: ClientCon
                 push.{map_key}
                 # item index
                 push.0
-                exec.::miden::account::get_map_item
+                exec.::miden::active_account::get_map_item
                 swapw dropw
             end",
             map_key = Word::from(MAP_KEY)
@@ -424,5 +423,9 @@ async fn deploy_foreign_account(
         .await?;
     wait_for_tx(client, tx_id).await?;
 
+    // NOTE: We get the new account state here since the first transaction updates the nonce from
+    // to 1
+    let foreign_account: Account = client.get_account(foreign_account_id).await?.unwrap().into();
+
     Ok((foreign_account, proc_root))
 }

bin/integration-tests/src/tests/fpi.rs

@@ -32,36 +32,37 @@ use crate::tests::config::ClientConfig;
 // ================================================================================================
 
 const COUNTER_CONTRACT: &str = "
-        use.miden::account
+        use.miden::active_account
+        use.miden::native_account
         use.std::sys
 
         # => []
         export.get_count
             push.0
-            exec.account::get_item
+            exec.active_account::get_item
             exec.sys::truncate_stack
         end
 
         # => []
         export.increment_count
             push.0
             # => [index]
-            exec.account::get_item
+            exec.active_account::get_item
             # => [count]
             push.1 add
             # => [count+1]
             push.0
             # [index, count+1]
-            exec.account::set_item
+            exec.native_account::set_item
             # => []
             exec.sys::truncate_stack
             # => []
         end";
 
 const INCR_NONCE_AUTH_CODE: &str = "
-    use.miden::account
+    use.miden::native_account
     export.auth__basic
-        exec.account::incr_nonce
+        exec.native_account::incr_nonce
         drop
     end
 ";

bin/integration-tests/src/tests/network_transaction.rs

@@ -1,7 +1,8 @@
 use std::sync::Arc;
 
 use anyhow::{Context, Result};
-use miden_client::account::{AccountIdAddress, AccountStorageMode, Address, AddressInterface};
+use miden_client::account::AccountStorageMode;
+use miden_client::address::{Address, AddressInterface, RoutingParameters};
 use miden_client::asset::FungibleAsset;
 use miden_client::keystore::FilesystemKeyStore;
 use miden_client::note::NoteType;
@@ -139,10 +140,9 @@ async fn run_flow(
             .context("failed to insert faucet in sender")?;
 
     // Build recipient address
-    let recipient_address = Address::AccountId(AccountIdAddress::new(
-        recipient_account.id(),
-        AddressInterface::BasicWallet,
-    ));
+    let recipient_address = Address::new(recipient_account.id())
+        .with_routing_parameters(RoutingParameters::new(AddressInterface::BasicWallet))
+        .context("failed to build recipient address")?;
 
     // Ensure recipient has no input notes
     recipient.sync_state().await.context("recipient initial sync")?;

bin/integration-tests/src/tests/transport.rs

@@ -1,7 +1,7 @@
 use clap::Parser;
 use comfy_table::{Cell, ContentArrangement, presets};
 use miden_client::account::{Account, AccountId, AccountType, StorageSlot};
-use miden_client::address::{AccountIdAddress, Address, AddressInterface};
+use miden_client::address::{Address, AddressInterface, RoutingParameters};
 use miden_client::asset::Asset;
 use miden_client::rpc::{GrpcClient, NodeRpcClient};
 use miden_client::transaction::{AccountComponentInterface, AccountInterface};
@@ -317,16 +317,19 @@ async fn account_bech_32<AUTH>(
 
     let account_interface: AccountInterface = account_record.account().into();
 
-    let interface = if account_interface
+    let mut address = Address::new(account_id);
+    if account_interface
         .components()
         .iter()
         .any(|c| matches!(c, AccountComponentInterface::BasicWallet))
     {
-        AddressInterface::BasicWallet
-    } else {
-        AddressInterface::Unspecified
-    };
+        address = address
+            .with_routing_parameters(RoutingParameters::new(AddressInterface::BasicWallet))
+            .map_err(|err| {
+                CliError::Address(err, "Failed to set routing parameters".to_string())
+            })?;
+    }
 
-    let address = AccountIdAddress::new(account_id, interface);
-    Ok(Address::from(address).to_bech32(cli_config.rpc.endpoint.0.to_network_id()))
+    let encoded = address.encode(cli_config.rpc.endpoint.0.to_network_id());
+    Ok(encoded)
 }

bin/miden-cli/src/commands/account.rs

@@ -1,9 +1,8 @@
 use std::str::FromStr;
 
 use miden_client::Client;
-use miden_client::account::AccountIdAddress;
-use miden_client::address::{Address, AddressInterface, NetworkId};
-use miden_client::note::NoteExecutionMode;
+use miden_client::address::{Address, AddressInterface, NetworkId, RoutingParameters};
+use miden_client::note::{NoteExecutionMode, NoteTag};
 
 use crate::errors::CliError;
 use crate::utils::parse_account_id;
@@ -12,7 +11,6 @@ use crate::{Parser, Subcommand, create_dynamic_table, load_config_file};
 #[derive(Debug, Clone)]
 pub enum CliAddressInterface {
     BasicWallet,
-    Unspecified,
 }
 
 impl FromStr for CliAddressInterface {
@@ -21,7 +19,6 @@ impl FromStr for CliAddressInterface {
     fn from_str(value: &str) -> Result<Self, Self::Err> {
         match value {
             "BasicWallet" => Ok(CliAddressInterface::BasicWallet),
-            "Unspecified" => Ok(CliAddressInterface::Unspecified),
             other => Err(format!(
                 "Invalid interface: {other}. Valid values are: BasicWallet, Unspecified",
             )),
@@ -33,7 +30,6 @@ impl From<CliAddressInterface> for AddressInterface {
     fn from(value: CliAddressInterface) -> Self {
         match value {
             CliAddressInterface::BasicWallet => AddressInterface::BasicWallet,
-            CliAddressInterface::Unspecified => AddressInterface::Unspecified,
         }
     }
 }
@@ -99,8 +95,11 @@ fn print_account_addresses(account_id: &String, addresses: &Vec<Address>, networ
     println!("Addresses for AccountId {account_id}:");
     let mut table = create_dynamic_table(&["Address", "Interface"]);
     for address in addresses {
-        let address_bech32 = address.to_bech32(network_id.clone());
-        let interface = address.interface().to_string();
+        let address_bech32 = address.encode(network_id.clone());
+        let interface = match address.interface() {
+            Some(interface) => interface.to_string(),
+            None => "Unspecified".to_string(),
+        };
         table.add_row(vec![address_bech32, interface]);
     }
 
@@ -152,18 +151,22 @@ async fn add_address<AUTH>(
 ) -> Result<(), CliError> {
     let account_id = parse_account_id(&client, &account_id).await?;
     let interface = interface.into();
-    let account_id_address = match tag_len {
-        Some(tag_len) => AccountIdAddress::new(account_id, interface)
-            .with_tag_len(tag_len)
+    let routing_params = match tag_len {
+        Some(tag_len) => RoutingParameters::new(interface)
+            .with_note_tag_len(tag_len)
             .map_err(|e| CliError::Address(e, String::new()))?,
-        None => AccountIdAddress::new(account_id, interface),
+        None => RoutingParameters::new(interface),
     };
+    let address = Address::new(account_id)
+        .with_routing_parameters(routing_params)
+        .map_err(|err| CliError::Address(err, "Failed to set routing params".to_string()))?;
 
-    let execution_mode = match account_id_address.to_note_tag().execution_mode() {
+    let note_tag = NoteTag::from_account_id(account_id);
+    let execution_mode = match note_tag.execution_mode() {
         NoteExecutionMode::Local => "Local",
         NoteExecutionMode::Network => "Network",
     };
-    client.add_address(account_id_address.into(), account_id).await?;
+    client.add_address(address, account_id).await?;
 
     println!("Address added: Account Id {account_id} - Execution mode: {execution_mode}");
     Ok(())
@@ -175,7 +178,7 @@ async fn remove_address<AUTH>(
     address: String,
 ) -> Result<(), CliError> {
     let account_id = parse_account_id(&client, &account_id).await?;
-    let (_, address) = Address::from_bech32(&address).map_err(|e| CliError::Address(e, address))?;
+    let (_, address) = Address::decode(&address).map_err(|e| CliError::Address(e, address))?;
     let execution_mode = match address.to_note_tag().execution_mode() {
         NoteExecutionMode::Local => "Local",
         NoteExecutionMode::Network => "Network",