Merge branch 'next' into fabrizioorsi-multicall-cli

Signed-off-by: Tomas Fabrizio Orsi <[email protected]>

Author: lima-limon-inc

bin/miden-cli/build.rs

@@ -1,17 +1,17 @@
-use std::{
-    env, fs,
-    path::{Path, PathBuf},
-};
+use std::path::{Path, PathBuf};
+use std::{env, fs};
 
 use miden_client::account::component::{
-    AccountComponentMetadata, AccountComponentTemplate, COMPONENT_TEMPLATE_EXTENSION,
+    AccountComponentMetadata,
+    AccountComponentTemplate,
+    COMPONENT_TEMPLATE_EXTENSION,
 };
-use miden_lib::{
-    account::components::{
-        basic_fungible_faucet_library, basic_wallet_library, rpo_falcon_512_library,
-    },
-    utils::Serializable,
+use miden_lib::account::components::{
+    basic_fungible_faucet_library,
+    basic_wallet_library,
+    rpo_falcon_512_library,
 };
+use miden_lib::utils::Serializable;
 use miden_objects::assembly::Library;
 
 fn main() {

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

@@ -1,20 +1,15 @@
 use clap::Parser;
 use comfy_table::{Cell, ContentArrangement, presets};
-use miden_client::{
-    Client, ZERO,
-    account::{Account, AccountId, AccountType, StorageSlot},
-    asset::Asset,
-    rpc::{NodeRpcClient, TonicRpcClient},
-};
+use miden_client::account::{Account, AccountId, AccountType, StorageSlot};
+use miden_client::asset::Asset;
+use miden_client::rpc::{NodeRpcClient, TonicRpcClient};
+use miden_client::{Client, ZERO};
 use miden_objects::PrettyPrint;
 
-use crate::{
-    client_binary_name,
-    config::CliConfig,
-    create_dynamic_table,
-    errors::CliError,
-    utils::{load_config_file, load_faucet_details_map, parse_account_id, update_config},
-};
+use crate::config::CliConfig;
+use crate::errors::CliError;
+use crate::utils::{load_config_file, load_faucet_details_map, parse_account_id, update_config};
+use crate::{client_binary_name, create_dynamic_table};
 
 // ACCOUNT COMMAND
 // ================================================================================================

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

@@ -1,11 +1,14 @@
-use std::{collections::BTreeSet, path::PathBuf};
+use std::collections::BTreeSet;
+use std::path::PathBuf;
 
 use clap::Parser;
-use miden_client::{Client, Felt, Word, auth::TransactionAuthenticator};
+use miden_client::auth::TransactionAuthenticator;
+use miden_client::{Client, Felt, Word};
 use miden_objects::vm::AdviceInputs;
 use serde::{Deserialize, Deserializer, Serialize, de};
 
-use crate::{errors::CliError, utils::get_input_acc_id_by_prefix_or_default};
+use crate::errors::CliError;
+use crate::utils::get_input_acc_id_by_prefix_or_default;
 
 // EXEC COMMAND
 // ================================================================================================

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

@@ -1,19 +1,19 @@
-use std::{fs::File, io::Write, path::PathBuf};
-
-use miden_client::{
-    Client, Word,
-    account::{Account, AccountFile},
-    auth::TransactionAuthenticator,
-    store::NoteExportType,
-    transaction::AccountInterface,
-    utils::Serializable,
-};
+use std::fs::File;
+use std::io::Write;
+use std::path::PathBuf;
+
+use miden_client::account::{Account, AccountFile};
+use miden_client::auth::TransactionAuthenticator;
+use miden_client::store::NoteExportType;
+use miden_client::transaction::AccountInterface;
+use miden_client::utils::Serializable;
+use miden_client::{Client, Word};
 use miden_lib::AuthScheme;
 use tracing::info;
 
-use crate::{
-    CliKeyStore, Parser, errors::CliError, get_output_note_with_id_prefix, utils::parse_account_id,
-};
+use crate::errors::CliError;
+use crate::utils::parse_account_id;
+use crate::{CliKeyStore, Parser, get_output_note_with_id_prefix};
 
 #[derive(Debug, Parser, Clone)]
 #[command(about = "Export client output notes, or account data")]

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

@@ -1,22 +1,18 @@
-use std::{
-    fs::{self, File},
-    io::Read,
-    path::PathBuf,
-};
-
-use miden_client::{
-    Client, ClientError,
-    account::{AccountFile, AccountId},
-    auth::TransactionAuthenticator,
-    note::NoteFile,
-    utils::Deserializable,
-};
+use std::fs::{self, File};
+use std::io::Read;
+use std::path::PathBuf;
+
+use miden_client::account::{AccountFile, AccountId};
+use miden_client::auth::TransactionAuthenticator;
+use miden_client::note::NoteFile;
+use miden_client::utils::Deserializable;
+use miden_client::{Client, ClientError};
 use tracing::info;
 
-use crate::{
-    CliKeyStore, Parser, commands::account::maybe_set_default_account, errors::CliError,
-    utils::load_config_file,
-};
+use crate::commands::account::maybe_set_default_account;
+use crate::errors::CliError;
+use crate::utils::load_config_file;
+use crate::{CliKeyStore, Parser};
 
 #[derive(Debug, Parser, Clone)]
 #[command(about = "Import notes or accounts")]

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

@@ -1,17 +1,13 @@
-use std::{
-    fs::{self, File},
-    io::Write,
-    path::PathBuf,
-};
+use std::fs::{self, File};
+use std::io::Write;
+use std::path::PathBuf;
 
 use clap::Parser;
 use tracing::info;
 
-use crate::{
-    CLIENT_CONFIG_FILE_NAME,
-    config::{CliConfig, CliEndpoint, Network},
-    errors::CliError,
-};
+use crate::CLIENT_CONFIG_FILE_NAME;
+use crate::config::{CliConfig, CliEndpoint, Network};
+use crate::errors::CliError;
 
 /// Contains the account component template file generated on build.rs, corresponding to the basic
 /// wallet component.

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

@@ -1,34 +1,31 @@
-use std::{
-    collections::BTreeMap,
-    fs::{self, File},
-    io::{Read, Write},
-    path::PathBuf,
-    vec,
-};
+use std::collections::BTreeMap;
+use std::fs::{self, File};
+use std::io::{Read, Write};
+use std::path::PathBuf;
+use std::vec;
 
 use clap::{Parser, ValueEnum};
-use miden_client::{
-    Client,
-    account::{
-        Account, AccountBuilder, AccountStorageMode, AccountType,
-        component::COMPONENT_TEMPLATE_EXTENSION,
-    },
-    auth::{AuthSecretKey, TransactionAuthenticator},
-    crypto::SecretKey,
-    transaction::TransactionRequestBuilder,
-    utils::Deserializable,
-};
+use miden_client::Client;
+use miden_client::account::component::COMPONENT_TEMPLATE_EXTENSION;
+use miden_client::account::{Account, AccountBuilder, AccountStorageMode, AccountType};
+use miden_client::auth::{AuthSecretKey, TransactionAuthenticator};
+use miden_client::crypto::SecretKey;
+use miden_client::transaction::TransactionRequestBuilder;
+use miden_client::utils::Deserializable;
 use miden_lib::account::auth::AuthRpoFalcon512;
 use miden_objects::account::{
-    AccountComponent, AccountComponentTemplate, InitStorageData, StorageValueName,
+    AccountComponent,
+    AccountComponentTemplate,
+    InitStorageData,
+    StorageValueName,
 };
 use rand::RngCore;
 use tracing::debug;
 
-use crate::{
-    CliKeyStore, client_binary_name, commands::account::maybe_set_default_account,
-    errors::CliError, utils::load_config_file,
-};
+use crate::commands::account::maybe_set_default_account;
+use crate::errors::CliError;
+use crate::utils::load_config_file;
+use crate::{CliKeyStore, client_binary_name};
 
 // CLI TYPES
 // ================================================================================================

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

@@ -1,27 +1,37 @@
-use std::{io, sync::Arc};
+use std::io;
+use std::sync::Arc;
 
 use clap::{Parser, ValueEnum};
-use miden_client::{
-    Client, RemoteTransactionProver,
-    account::AccountId,
-    asset::{FungibleAsset, NonFungibleDeltaAction},
-    auth::TransactionAuthenticator,
-    note::{BlockNumber, NoteType as MidenNoteType, build_swap_tag, get_input_note_with_id_prefix},
-    store::NoteRecordError,
-    transaction::{
-        InputNote, OutputNote, PaymentNoteDescription, SwapTransactionData, TransactionRequest,
-        TransactionRequestBuilder, TransactionResult,
-    },
+use miden_client::account::AccountId;
+use miden_client::asset::{FungibleAsset, NonFungibleDeltaAction};
+use miden_client::auth::TransactionAuthenticator;
+use miden_client::note::{
+    BlockNumber,
+    NoteType as MidenNoteType,
+    build_swap_tag,
+    get_input_note_with_id_prefix,
 };
+use miden_client::store::NoteRecordError;
+use miden_client::transaction::{
+    InputNote,
+    OutputNote,
+    PaymentNoteDescription,
+    SwapTransactionData,
+    TransactionRequest,
+    TransactionRequestBuilder,
+    TransactionResult,
+};
+use miden_client::{Client, RemoteTransactionProver};
 use tracing::info;
 
-use crate::{
-    create_dynamic_table,
-    errors::CliError,
-    utils::{
-        SHARED_TOKEN_DOCUMENTATION, get_input_acc_id_by_prefix_or_default, load_config_file,
-        load_faucet_details_map, parse_account_id,
-    },
+use crate::create_dynamic_table;
+use crate::errors::CliError;
+use crate::utils::{
+    SHARED_TOKEN_DOCUMENTATION,
+    get_input_acc_id_by_prefix_or_default,
+    load_config_file,
+    load_faucet_details_map,
+    parse_account_id,
 };
 
 #[derive(Debug, Clone, Copy, ValueEnum)]

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

@@ -1,22 +1,21 @@
 use clap::ValueEnum;
 use comfy_table::{Attribute, Cell, ContentArrangement, Table, presets};
-use miden_client::{
-    Client, ClientError, IdPrefixFetchError,
-    asset::Asset,
-    auth::TransactionAuthenticator,
-    note::{
-        NoteConsumability, NoteInputs, NoteMetadata, WellKnownNote, get_input_note_with_id_prefix,
-    },
-    store::{InputNoteRecord, NoteFilter as ClientNoteFilter, OutputNoteRecord},
+use miden_client::asset::Asset;
+use miden_client::auth::TransactionAuthenticator;
+use miden_client::note::{
+    NoteConsumability,
+    NoteInputs,
+    NoteMetadata,
+    WellKnownNote,
+    get_input_note_with_id_prefix,
 };
+use miden_client::store::{InputNoteRecord, NoteFilter as ClientNoteFilter, OutputNoteRecord};
+use miden_client::{Client, ClientError, IdPrefixFetchError};
 use miden_objects::PrettyPrint;
 
-use crate::{
-    Parser, create_dynamic_table,
-    errors::CliError,
-    get_output_note_with_id_prefix,
-    utils::{load_faucet_details_map, parse_account_id},
-};
+use crate::errors::CliError;
+use crate::utils::{load_faucet_details_map, parse_account_id};
+use crate::{Parser, create_dynamic_table, get_output_note_with_id_prefix};
 
 #[derive(Clone, Debug, ValueEnum)]
 pub enum NoteFilter {

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

@@ -1,5 +1,6 @@
 use clap::Parser;
-use miden_client::{Client, auth::TransactionAuthenticator};
+use miden_client::Client;
+use miden_client::auth::TransactionAuthenticator;
 
 use crate::errors::CliError;