fixup: adopt to latest changes in protocol

Author: djolertrk

Cargo.lock

@@ -172,11 +172,7 @@ pub async fn show_account<AUTH>(
                 },
                 Asset::NonFungible(non_fungible_asset) => {
                     // TODO: Display non-fungible assets more clearly.
-                    (
-                        "Non Fungible Asset",
-                        non_fungible_asset.faucet_id().to_hex(),
-                        1.0.to_string(),
-                    )
+                    ("Non Fungible Asset", non_fungible_asset.faucet_id().to_hex(), 1.0.to_string())
                 },
             };
             table.add_row(vec![asset_type, &faucet, &amount.clone()]);

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

@@ -400,7 +400,7 @@ async fn execute_transaction<AUTH: Keystore + Sync + 'static>(
     let output_notes = executed_transaction
         .output_notes()
         .iter()
-        .map(|note| note.id())
+        .map(miden_client::transaction::RawOutputNote::id)
         .collect::<Vec<_>>();
 
     println!("Proving transaction...");
@@ -513,18 +513,10 @@ fn print_transaction_details(executed_tx: &ExecutedTransaction) -> Result<(), Cl
         for (asset, action) in account_delta.vault().non_fungible().iter() {
             match action {
                 NonFungibleDeltaAction::Add => {
-                    table.add_row(vec![
-                        "Non Fungible Asset",
-                        &asset.faucet_id().to_hex(),
-                        "1",
-                    ]);
+                    table.add_row(vec!["Non Fungible Asset", &asset.faucet_id().to_hex(), "1"]);
                 },
                 NonFungibleDeltaAction::Remove => {
-                    table.add_row(vec![
-                        "Non Fungible Asset",
-                        &asset.faucet_id().to_hex(),
-                        "-1",
-                    ]);
+                    table.add_row(vec!["Non Fungible Asset", &asset.faucet_id().to_hex(), "-1"]);
                 },
             }
         }

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

@@ -267,11 +267,9 @@ async fn show_note<AUTH: Keystore + Sync>(
                 let (faucet, amount) = faucet_details_map.format_fungible_asset(fungible_asset)?;
                 ("Fungible Asset", faucet, amount)
             },
-            Asset::NonFungible(non_fungible_asset) => (
-                "Non Fungible Asset",
-                non_fungible_asset.faucet_id().to_hex(),
-                1.0.to_string(),
-            ),
+            Asset::NonFungible(non_fungible_asset) => {
+                ("Non Fungible Asset", non_fungible_asset.faucet_id().to_hex(), 1.0.to_string())
+            },
         };
         table.add_row(vec![asset_type, &faucet, &amount.clone()]);
     }

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

@@ -33,7 +33,7 @@ use miden_client::testing::common::{
     execute_tx_and_sync,
     insert_new_wallet,
 };
-use miden_client::transaction::{OutputNote, TransactionRequestBuilder};
+use miden_client::transaction::{RawOutputNote, TransactionRequestBuilder};
 use miden_client::utils::Serializable;
 use miden_client::{self, Client, DebugMode, Felt};
 use miden_client_cli::MIDEN_DIR;
@@ -714,7 +714,7 @@ async fn debug_mode_outputs_logs() -> Result<()> {
     // Send transaction and wait for it to be committed
     client.sync_state().await?;
     let transaction_request = TransactionRequestBuilder::new()
-        .own_output_notes(vec![OutputNote::Full(note.clone())])
+        .own_output_notes(vec![RawOutputNote::Full(note.clone())])
         .build()?;
     execute_tx_and_sync(&mut client, account.id(), transaction_request).await?;
 
@@ -906,7 +906,7 @@ async fn new_wallet_with_deploy_flag() -> Result<()> {
     // Verify that the nonce is non-zero (account was deployed)
     // By convention, a nonce of 0 indicates an undeployed account
     assert!(
-        nonce.as_int() > 0,
+        nonce.as_canonical_u64() > 0,
         "Account nonce should be non-zero after deployment, but got: {nonce}"
     );
 
@@ -1320,7 +1320,7 @@ fn create_account_with_acl_auth() {
     // Create init storage data file for acl-auth with a test public key
     let init_storage_data_toml = r#"
         "miden::standards::auth::singlesig_acl::pub_key" = "0x0000000000000000000000000000000000000000000000000000000000000001"
-        "miden::standards::auth::singlesig_acl::scheme" = "Falcon512Rpo"
+        "miden::standards::auth::singlesig_acl::scheme" = "Falcon512Poseidon2"
         "miden::standards::auth::singlesig_acl::config.num_tracked_procs" = "1"
         "miden::standards::auth::singlesig_acl::config.allow_unauthorized_output_notes" = "0"
         "miden::standards::auth::singlesig_acl::config.allow_unauthorized_input_notes" = "0"

bin/miden-cli/tests/cli.rs

@@ -189,9 +189,7 @@ impl<AUTH> Client<AUTH> {
                     return Err(ClientError::AccountAlreadyTracked(account.id()));
                 }
 
-                if tracked_account.nonce().as_canonical_u64()
-                    > account.nonce().as_canonical_u64()
-                {
+                if tracked_account.nonce().as_canonical_u64() > account.nonce().as_canonical_u64() {
                     // If the new account is older than the one being tracked, return an error
                     return Err(ClientError::AccountNonceTooLow);
                 }

crates/rust-client/src/account/mod.rs

@@ -18,7 +18,8 @@ use miden_standards::account::interface::AccountInterfaceError;
 // ================================================================================================
 pub use miden_standards::errors::CodeBuilderError;
 pub use miden_tx::AuthenticationError;
-use miden_tx::utils::{DeserializationError, HexParseError};
+use miden_tx::utils::HexParseError;
+use miden_tx::utils::serde::DeserializationError;
 use miden_tx::{NoteCheckerError, TransactionExecutorError, TransactionProverError};
 use thiserror::Error;
 

crates/rust-client/src/errors.rs

@@ -13,8 +13,8 @@ use miden_protocol::account::AccountId;
 use miden_protocol::account::auth::{AuthSecretKey, PublicKey, PublicKeyCommitment, Signature};
 use miden_tx::AuthenticationError;
 use miden_tx::auth::{SigningInputs, TransactionAuthenticator};
+use miden_tx::utils::serde::{Deserializable, Serializable};
 use miden_tx::utils::sync::RwLock;
-use miden_tx::utils::{Deserializable, Serializable};
 use serde::{Deserialize, Serialize};
 
 use super::{KeyStoreError, Keystore};

crates/rust-client/src/keystore/fs_keystore.rs

@@ -285,8 +285,8 @@ pub mod vm {
         PackageExport,
         PackageKind,
         PackageManifest,
-        Program,
         ProcedureExport,
+        Program,
         QualifiedProcedureName,
         Section,
         SectionId,

crates/rust-client/src/lib.rs

@@ -12,7 +12,13 @@ use miden_protocol::address::Address;
 use miden_protocol::note::{Note, NoteDetails, NoteFile, NoteHeader, NoteTag};
 use miden_protocol::utils::serde::Serializable;
 use miden_tx::auth::TransactionAuthenticator;
-use miden_tx::utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, SliceReader};
+use miden_tx::utils::serde::{
+    ByteReader,
+    ByteWriter,
+    Deserializable,
+    DeserializationError,
+    SliceReader,
+};
 
 pub use self::errors::NoteTransportError;
 use crate::{Client, ClientError};