diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d6b1a4c56..7ff0fdd827 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## v0.16.0 (TBD) ### Changes +- [Added] `min_fill_amount` field to `PswapNoteStorage` to prevent very small partial fills (#3235) - [BREAKING] Replaced the owner-only transfer allowlist/blocklist admin components (`AllowlistOwnerControlled` / `BlocklistOwnerControlled`) with authority-gated `AllowlistManager` / `BlocklistManager` ([#3277](https://github.com/0xMiden/protocol/pull/3277)). diff --git a/bin/bench-note-checker/src/lib.rs b/bin/bench-note-checker/src/lib.rs index 5d91c28a3f..dbc7afa6f3 100644 --- a/bin/bench-note-checker/src/lib.rs +++ b/bin/bench-note-checker/src/lib.rs @@ -3,8 +3,7 @@ use miden_protocol::asset::FungibleAsset; use miden_protocol::crypto::rand::RandomCoin; use miden_protocol::note::{Note, NoteType}; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, - ACCOUNT_ID_SENDER, + ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, ACCOUNT_ID_SENDER, }; use miden_standards::testing::note::NoteBuilder; use miden_testing::{Auth, MockChain, TxContextInput}; diff --git a/bin/bench-transaction/src/context_setups.rs b/bin/bench-transaction/src/context_setups.rs index d58dd35859..aff0d02e3b 100644 --- a/bin/bench-transaction/src/context_setups.rs +++ b/bin/bench-transaction/src/context_setups.rs @@ -1,16 +1,8 @@ use anyhow::Result; pub use miden_agglayer::testing::ClaimDataSource; use miden_agglayer::{ - AggLayerBridge, - B2AggNote, - ClaimNote, - ClaimNoteStorage, - ConfigAggBridgeNote, - ConversionMetadata, - EthAddress, - MetadataHash, - UpdateGerNote, - create_existing_agglayer_faucet, + AggLayerBridge, B2AggNote, ClaimNote, ClaimNoteStorage, ConfigAggBridgeNote, + ConversionMetadata, EthAddress, MetadataHash, UpdateGerNote, create_existing_agglayer_faucet, create_existing_bridge_account, }; use miden_protocol::account::auth::AuthScheme; diff --git a/bin/bench-transaction/src/cycle_counting_benchmarks/trace_capture.rs b/bin/bench-transaction/src/cycle_counting_benchmarks/trace_capture.rs index 137b432bbb..34de740374 100644 --- a/bin/bench-transaction/src/cycle_counting_benchmarks/trace_capture.rs +++ b/bin/bench-transaction/src/cycle_counting_benchmarks/trace_capture.rs @@ -8,10 +8,7 @@ use miden_processor::trace::{TraceLenSummary, build_trace}; use miden_protocol::transaction::{TransactionInputs, TransactionKernel, TransactionMeasurements}; use miden_testing::TransactionContext; use miden_tx::{ - AccountProcedureIndexMap, - ExecutionOptions, - ScriptMastForestStore, - TransactionMastStore, + AccountProcedureIndexMap, ExecutionOptions, ScriptMastForestStore, TransactionMastStore, TransactionProverHost, }; diff --git a/bin/bench-transaction/src/main.rs b/bin/bench-transaction/src/main.rs index 0defbf0257..a72ebfec6f 100644 --- a/bin/bench-transaction/src/main.rs +++ b/bin/bench-transaction/src/main.rs @@ -6,15 +6,10 @@ use anyhow::{Context, Result}; mod context_setups; use context_setups::{ - ClaimDataSource, - tx_consume_b2agg_note, - tx_consume_claim_note, - tx_consume_single_p2id_note_ecdsa, - tx_consume_single_p2id_note_falcon, - tx_consume_two_p2id_notes_ecdsa, - tx_consume_two_p2id_notes_falcon, - tx_create_single_p2id_note_ecdsa, - tx_create_single_p2id_note_falcon, + ClaimDataSource, tx_consume_b2agg_note, tx_consume_claim_note, + tx_consume_single_p2id_note_ecdsa, tx_consume_single_p2id_note_falcon, + tx_consume_two_p2id_notes_ecdsa, tx_consume_two_p2id_notes_falcon, + tx_create_single_p2id_note_ecdsa, tx_create_single_p2id_note_falcon, }; mod cycle_counting_benchmarks; diff --git a/bin/bench-transaction/src/time_counting_benchmarks/prove.rs b/bin/bench-transaction/src/time_counting_benchmarks/prove.rs index dd674de83f..f877bb3b2f 100644 --- a/bin/bench-transaction/src/time_counting_benchmarks/prove.rs +++ b/bin/bench-transaction/src/time_counting_benchmarks/prove.rs @@ -4,13 +4,9 @@ use std::time::{Duration, Instant}; use anyhow::Result; use bench_transaction::context_setups::{ - ClaimDataSource, - tx_consume_b2agg_note, - tx_consume_claim_note, - tx_consume_single_p2id_note_ecdsa, - tx_consume_single_p2id_note_falcon, - tx_consume_two_p2id_notes_ecdsa, - tx_consume_two_p2id_notes_falcon, + ClaimDataSource, tx_consume_b2agg_note, tx_consume_claim_note, + tx_consume_single_p2id_note_ecdsa, tx_consume_single_p2id_note_falcon, + tx_consume_two_p2id_notes_ecdsa, tx_consume_two_p2id_notes_falcon, }; use criterion::{BatchSize, Bencher, Criterion, SamplingMode, criterion_group, criterion_main}; use miden_protocol::transaction::{ExecutedTransaction, ProvenTransaction}; diff --git a/crates/miden-agglayer/build.rs b/crates/miden-agglayer/build.rs index db4e1f9b7e..72d5e098bc 100644 --- a/crates/miden-agglayer/build.rs +++ b/crates/miden-agglayer/build.rs @@ -7,13 +7,7 @@ use std::sync::Arc; use fs_err as fs; use miden_assembly::diagnostics::{IntoDiagnostic, Result, WrapErr}; use miden_assembly::{ - Assembler, - Linkage, - ModuleParser, - Path as MasmPath, - Report, - SourceManager, - ast, + Assembler, Linkage, ModuleParser, Path as MasmPath, Report, SourceManager, ast, }; use miden_assembly_syntax::Parse; use miden_core::Word; @@ -25,10 +19,7 @@ use miden_protocol::transaction::TransactionKernel; use miden_standards::account::access::Authority; use miden_standards::account::auth::AuthNetworkAccount; use miden_standards::account::policies::{ - BurnPolicy, - MintPolicy, - TokenPolicyManager, - TransferPolicy, + BurnPolicy, MintPolicy, TokenPolicyManager, TransferPolicy, }; use regex::Regex; diff --git a/crates/miden-agglayer/src/b2agg_note.rs b/crates/miden-agglayer/src/b2agg_note.rs index 7d54b246c6..c4968a4242 100644 --- a/crates/miden-agglayer/src/b2agg_note.rs +++ b/crates/miden-agglayer/src/b2agg_note.rs @@ -11,16 +11,8 @@ use miden_protocol::assembly::Library; use miden_protocol::crypto::rand::FeltRng; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteRecipient, - NoteScript, - NoteScriptRoot, - NoteStorage, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteRecipient, NoteScript, NoteScriptRoot, + NoteStorage, NoteType, PartialNoteMetadata, }; use miden_protocol::utils::serde::Deserializable; use miden_standards::note::{NetworkAccountTarget, NoteExecutionHint}; diff --git a/crates/miden-agglayer/src/bridge.rs b/crates/miden-agglayer/src/bridge.rs index 64dd665efd..5626797c78 100644 --- a/crates/miden-agglayer/src/bridge.rs +++ b/crates/miden-agglayer/src/bridge.rs @@ -7,12 +7,7 @@ use alloc::vec::Vec; use miden_core::{Felt, ONE, Word, ZERO}; use miden_protocol::account::component::AccountComponentMetadata; use miden_protocol::account::{ - Account, - AccountComponent, - AccountId, - StorageMapKey, - StorageSlot, - StorageSlotName, + Account, AccountComponent, AccountId, StorageMapKey, StorageSlot, StorageSlotName, }; use miden_protocol::block::account_tree::AccountIdKey; use miden_protocol::crypto::hash::poseidon2::Poseidon2; @@ -27,24 +22,9 @@ use crate::utils::Keccak256Output; /// Removed-GER hash chain representation (32-byte Keccak256 hash) pub type RemovedGerHashChain = Keccak256Output; pub use crate::{ - B2AggNote, - ClaimNote, - ClaimNoteStorage, - ConfigAggBridgeNote, - DeregisterAggFaucetNote, - EthAddress, - EthAmount, - EthAmountError, - EthEmbeddedAccountId, - ExitRoot, - GlobalIndex, - GlobalIndexError, - LeafData, - MetadataHash, - ProofData, - RemoveGerNote, - SmtNode, - UpdateGerNote, + B2AggNote, ClaimNote, ClaimNoteStorage, ConfigAggBridgeNote, DeregisterAggFaucetNote, + EthAddress, EthAmount, EthAmountError, EthEmbeddedAccountId, ExitRoot, GlobalIndex, + GlobalIndexError, LeafData, MetadataHash, ProofData, RemoveGerNote, SmtNode, UpdateGerNote, }; // CONSTANTS diff --git a/crates/miden-agglayer/src/claim_note.rs b/crates/miden-agglayer/src/claim_note.rs index 7ad76c1b21..c70ff2b32f 100644 --- a/crates/miden-agglayer/src/claim_note.rs +++ b/crates/miden-agglayer/src/claim_note.rs @@ -8,16 +8,8 @@ use miden_protocol::crypto::SequentialCommit; use miden_protocol::crypto::rand::FeltRng; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteRecipient, - NoteScript, - NoteScriptRoot, - NoteStorage, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteRecipient, NoteScript, NoteScriptRoot, + NoteStorage, NoteType, PartialNoteMetadata, }; use miden_protocol::utils::serde::Deserializable; use miden_standards::note::{NetworkAccountTarget, NoteExecutionHint}; diff --git a/crates/miden-agglayer/src/config_note.rs b/crates/miden-agglayer/src/config_note.rs index a3b35ebe04..9fda3c40e4 100644 --- a/crates/miden-agglayer/src/config_note.rs +++ b/crates/miden-agglayer/src/config_note.rs @@ -15,16 +15,8 @@ use miden_protocol::assembly::Library; use miden_protocol::crypto::rand::FeltRng; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteRecipient, - NoteScript, - NoteScriptRoot, - NoteStorage, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteRecipient, NoteScript, NoteScriptRoot, + NoteStorage, NoteType, PartialNoteMetadata, }; use miden_protocol::utils::serde::Deserializable; use miden_standards::note::{NetworkAccountTarget, NoteExecutionHint}; diff --git a/crates/miden-agglayer/src/deregister_note.rs b/crates/miden-agglayer/src/deregister_note.rs index 419fb44a17..8ac18023c0 100644 --- a/crates/miden-agglayer/src/deregister_note.rs +++ b/crates/miden-agglayer/src/deregister_note.rs @@ -15,16 +15,8 @@ use miden_protocol::assembly::Library; use miden_protocol::crypto::rand::FeltRng; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteRecipient, - NoteScript, - NoteScriptRoot, - NoteStorage, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteRecipient, NoteScript, NoteScriptRoot, + NoteStorage, NoteType, PartialNoteMetadata, }; use miden_protocol::utils::serde::Deserializable; use miden_standards::note::{NetworkAccountTarget, NoteExecutionHint}; diff --git a/crates/miden-agglayer/src/faucet.rs b/crates/miden-agglayer/src/faucet.rs index 2d1c28ca46..c7b193a824 100644 --- a/crates/miden-agglayer/src/faucet.rs +++ b/crates/miden-agglayer/src/faucet.rs @@ -19,22 +19,9 @@ use thiserror::Error; use super::agglayer_faucet_component_library; pub use crate::{ - AggLayerBridge, - B2AggNote, - ClaimNoteStorage, - ConfigAggBridgeNote, - EthAddress, - EthAmount, - EthAmountError, - EthEmbeddedAccountId, - ExitRoot, - GlobalIndex, - GlobalIndexError, - LeafData, - MetadataHash, - ProofData, - SmtNode, - UpdateGerNote, + AggLayerBridge, B2AggNote, ClaimNoteStorage, ConfigAggBridgeNote, EthAddress, EthAmount, + EthAmountError, EthEmbeddedAccountId, ExitRoot, GlobalIndex, GlobalIndexError, LeafData, + MetadataHash, ProofData, SmtNode, UpdateGerNote, }; // CONSTANTS diff --git a/crates/miden-agglayer/src/ger_note.rs b/crates/miden-agglayer/src/ger_note.rs index 369742c245..ace3f69877 100644 --- a/crates/miden-agglayer/src/ger_note.rs +++ b/crates/miden-agglayer/src/ger_note.rs @@ -12,15 +12,8 @@ use miden_protocol::account::AccountId; use miden_protocol::crypto::rand::FeltRng; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteRecipient, - NoteScript, - NoteStorage, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteRecipient, NoteScript, NoteStorage, + NoteType, PartialNoteMetadata, }; use miden_standards::note::{NetworkAccountTarget, NoteExecutionHint}; diff --git a/crates/miden-agglayer/src/lib.rs b/crates/miden-agglayer/src/lib.rs index 9e78c02bed..15d6c8df80 100644 --- a/crates/miden-agglayer/src/lib.rs +++ b/crates/miden-agglayer/src/lib.rs @@ -10,11 +10,7 @@ use miden_protocol::utils::serde::Deserializable; use miden_standards::account::access::{Authority, Ownable2Step}; use miden_standards::account::auth::AuthNetworkAccount; use miden_standards::account::policies::{ - BurnAllowAll, - BurnPolicy, - MintPolicy, - TokenPolicyManager, - TransferPolicy, + BurnAllowAll, BurnPolicy, MintPolicy, TokenPolicyManager, TransferPolicy, }; use miden_utils_sync::LazyLock; @@ -36,26 +32,14 @@ pub mod utils; pub use b2agg_note::B2AggNote; pub use bridge::{AggLayerBridge, AgglayerBridgeError, RemovedGerHashChain}; pub use claim_note::{ - CgiChainHash, - ClaimNote, - ClaimNoteStorage, - ExitRoot, - LeafData, - LeafValue, - ProofData, - SmtNode, + CgiChainHash, ClaimNote, ClaimNoteStorage, ExitRoot, LeafData, LeafValue, ProofData, SmtNode, }; pub use config_note::{ConfigAggBridgeNote, ConversionMetadata}; pub use deregister_note::DeregisterAggFaucetNote; #[cfg(any(test, feature = "testing"))] pub use eth_types::GlobalIndexExt; pub use eth_types::{ - EthAddress, - EthAmount, - EthAmountError, - EthEmbeddedAccountId, - GlobalIndex, - GlobalIndexError, + EthAddress, EthAmount, EthAmountError, EthEmbeddedAccountId, GlobalIndex, GlobalIndexError, MetadataHash, }; pub use faucet::{AggLayerFaucet, AgglayerFaucetError}; diff --git a/crates/miden-protocol/src/account/account_id/id_prefix.rs b/crates/miden-protocol/src/account/account_id/id_prefix.rs index 1011d50ed7..33be6cb766 100644 --- a/crates/miden-protocol/src/account/account_id/id_prefix.rs +++ b/crates/miden-protocol/src/account/account_id/id_prefix.rs @@ -7,11 +7,7 @@ use crate::account::account_id::AccountIdPrefixV1; use crate::account::{AccountIdVersion, AccountType, AssetCallbackFlag}; use crate::errors::AccountIdError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // ACCOUNT ID PREFIX diff --git a/crates/miden-protocol/src/account/account_id/mod.rs b/crates/miden-protocol/src/account/account_id/mod.rs index 9a41b5bbf1..4c2b3120c7 100644 --- a/crates/miden-protocol/src/account/account_id/mod.rs +++ b/crates/miden-protocol/src/account/account_id/mod.rs @@ -25,11 +25,7 @@ use crate::Word; use crate::address::NetworkId; use crate::errors::{AccountError, AccountIdError}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// The identifier of an [`Account`](crate::account::Account). @@ -496,15 +492,10 @@ mod tests { use crate::address::{AddressType, CustomNetworkId}; use crate::errors::Bech32Error; use crate::testing::account_id::{ - ACCOUNT_ID_MAX_ZEROES, - ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, - ACCOUNT_ID_PRIVATE_SENDER, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_WITH_CALLBACKS, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, - ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, - ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, - AccountIdBuilder, + ACCOUNT_ID_MAX_ZEROES, ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, ACCOUNT_ID_PRIVATE_SENDER, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_WITH_CALLBACKS, + ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, + ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, AccountIdBuilder, }; #[test] diff --git a/crates/miden-protocol/src/account/account_id/seed.rs b/crates/miden-protocol/src/account/account_id/seed.rs index 4528d5448d..d771f6ec9c 100644 --- a/crates/miden-protocol/src/account/account_id/seed.rs +++ b/crates/miden-protocol/src/account/account_id/seed.rs @@ -2,9 +2,7 @@ use alloc::vec::Vec; use crate::account::account_id::AccountIdVersion; use crate::account::account_id::v1::{ - compute_digest, - extract_asset_callback_flag, - validate_prefix, + compute_digest, extract_asset_callback_flag, validate_prefix, }; use crate::account::{AccountIdV1, AccountType, AssetCallbackFlag}; use crate::errors::AccountError; diff --git a/crates/miden-protocol/src/account/account_id/v1/mod.rs b/crates/miden-protocol/src/account/account_id/v1/mod.rs index cd502c2b1d..cefb248cec 100644 --- a/crates/miden-protocol/src/account/account_id/v1/mod.rs +++ b/crates/miden-protocol/src/account/account_id/v1/mod.rs @@ -14,11 +14,7 @@ use crate::account::{AccountIdVersion, AccountType, AssetCallbackFlag}; use crate::address::AddressType; use crate::errors::{AccountError, AccountIdError, Bech32Error}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{EMPTY_WORD, Felt, Hasher, Word}; @@ -524,10 +520,8 @@ mod tests { use super::*; use crate::account::AccountIdPrefix; use crate::testing::account_id::{ - ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, - ACCOUNT_ID_PRIVATE_SENDER, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, + ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, ACCOUNT_ID_PRIVATE_SENDER, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, }; diff --git a/crates/miden-protocol/src/account/account_id/v1/prefix.rs b/crates/miden-protocol/src/account/account_id/v1/prefix.rs index 9abe06daae..8bc092a8eb 100644 --- a/crates/miden-protocol/src/account/account_id/v1/prefix.rs +++ b/crates/miden-protocol/src/account/account_id/v1/prefix.rs @@ -8,11 +8,7 @@ use crate::account::account_id::v1::{self, validate_prefix}; use crate::account::{AccountIdVersion, AccountType, AssetCallbackFlag}; use crate::errors::AccountIdError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // ACCOUNT ID PREFIX VERSION 1 @@ -229,10 +225,8 @@ mod tests { use super::*; use crate::account::{AccountId, AccountIdPrefix}; use crate::testing::account_id::{ - ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, - ACCOUNT_ID_PRIVATE_SENDER, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, + ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, ACCOUNT_ID_PRIVATE_SENDER, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, }; diff --git a/crates/miden-protocol/src/account/auth.rs b/crates/miden-protocol/src/account/auth.rs index 46fffbd86d..d797996915 100644 --- a/crates/miden-protocol/src/account/auth.rs +++ b/crates/miden-protocol/src/account/auth.rs @@ -8,11 +8,7 @@ use rand::{CryptoRng, Rng}; use crate::crypto::dsa::{ecdsa_k256_keccak, falcon512_poseidon2}; use crate::errors::AuthSchemeError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Word}; diff --git a/crates/miden-protocol/src/account/builder/mod.rs b/crates/miden-protocol/src/account/builder/mod.rs index 4e155266f7..bdeec0b693 100644 --- a/crates/miden-protocol/src/account/builder/mod.rs +++ b/crates/miden-protocol/src/account/builder/mod.rs @@ -3,15 +3,8 @@ use alloc::vec::Vec; use crate::account::component::StorageSchema; use crate::account::{ - Account, - AccountCode, - AccountComponent, - AccountId, - AccountIdV1, - AccountIdVersion, - AccountStorage, - AccountType, - AssetCallbackFlag, + Account, AccountCode, AccountComponent, AccountId, AccountIdV1, AccountIdVersion, + AccountStorage, AccountType, AssetCallbackFlag, }; use crate::asset::AssetVault; use crate::errors::AccountError; diff --git a/crates/miden-protocol/src/account/code/mod.rs b/crates/miden-protocol/src/account/code/mod.rs index 7b90307471..18e9616fd0 100644 --- a/crates/miden-protocol/src/account/code/mod.rs +++ b/crates/miden-protocol/src/account/code/mod.rs @@ -9,13 +9,7 @@ use miden_mast_package::debug_info::PackageDebugInfo; use miden_processor::LoadedMastForest; use super::{ - AccountError, - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Felt, - Hasher, + AccountError, ByteReader, ByteWriter, Deserializable, DeserializationError, Felt, Hasher, Serializable, }; use crate::Word; diff --git a/crates/miden-protocol/src/account/code/procedure.rs b/crates/miden-protocol/src/account/code/procedure.rs index 1f8ff38f61..e997d11912 100644 --- a/crates/miden-protocol/src/account/code/procedure.rs +++ b/crates/miden-protocol/src/account/code/procedure.rs @@ -8,11 +8,7 @@ use miden_processor::mast::{MastNode, MastNodeExt, MastNodeId}; use crate::Word; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // ACCOUNT PROCEDURE ROOT diff --git a/crates/miden-protocol/src/account/component/metadata/mod.rs b/crates/miden-protocol/src/account/component/metadata/mod.rs index e06f1b2767..fbd5fb0de0 100644 --- a/crates/miden-protocol/src/account/component/metadata/mod.rs +++ b/crates/miden-protocol/src/account/component/metadata/mod.rs @@ -8,11 +8,7 @@ use semver::Version; use super::{SchemaRequirement, StorageSchema, StorageValueName}; use crate::errors::AccountError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // ACCOUNT COMPONENT METADATA diff --git a/crates/miden-protocol/src/account/component/storage/schema/felt.rs b/crates/miden-protocol/src/account/component/storage/schema/felt.rs index 1bf4a4ff9a..d4d0f3925b 100644 --- a/crates/miden-protocol/src/account/component/storage/schema/felt.rs +++ b/crates/miden-protocol/src/account/component/storage/schema/felt.rs @@ -8,11 +8,7 @@ use crate::Felt; use crate::account::StorageSlotName; use crate::errors::ComponentMetadataError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // FELT SCHEMA diff --git a/crates/miden-protocol/src/account/component/storage/schema/map_slot.rs b/crates/miden-protocol/src/account/component/storage/schema/map_slot.rs index 065d5877ca..57797625f7 100644 --- a/crates/miden-protocol/src/account/component/storage/schema/map_slot.rs +++ b/crates/miden-protocol/src/account/component/storage/schema/map_slot.rs @@ -9,11 +9,7 @@ use crate::Word; use crate::account::{StorageMap, StorageMapKey, StorageSlotName}; use crate::errors::ComponentMetadataError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // MAP SLOT SCHEMA diff --git a/crates/miden-protocol/src/account/component/storage/schema/mod.rs b/crates/miden-protocol/src/account/component/storage/schema/mod.rs index fd93070c9d..5b48419bbf 100644 --- a/crates/miden-protocol/src/account/component/storage/schema/mod.rs +++ b/crates/miden-protocol/src/account/component/storage/schema/mod.rs @@ -8,11 +8,7 @@ use crate::account::{StorageSlot, StorageSlotName}; use crate::crypto::utils::bytes_to_elements_with_padding; use crate::errors::ComponentMetadataError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Hasher, Word}; diff --git a/crates/miden-protocol/src/account/component/storage/schema/slot.rs b/crates/miden-protocol/src/account/component/storage/schema/slot.rs index 6677b5eb05..6d4b294151 100644 --- a/crates/miden-protocol/src/account/component/storage/schema/slot.rs +++ b/crates/miden-protocol/src/account/component/storage/schema/slot.rs @@ -7,11 +7,7 @@ use super::{MapSlotSchema, ValueSlotSchema, WordSchema}; use crate::account::{StorageSlot, StorageSlotName}; use crate::errors::ComponentMetadataError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // STORAGE SLOT SCHEMA diff --git a/crates/miden-protocol/src/account/component/storage/schema/value_slot.rs b/crates/miden-protocol/src/account/component/storage/schema/value_slot.rs index c472a45778..9d74350c1e 100644 --- a/crates/miden-protocol/src/account/component/storage/schema/value_slot.rs +++ b/crates/miden-protocol/src/account/component/storage/schema/value_slot.rs @@ -8,11 +8,7 @@ use crate::Word; use crate::account::StorageSlotName; use crate::errors::ComponentMetadataError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // VALUE SLOT SCHEMA diff --git a/crates/miden-protocol/src/account/component/storage/schema/word.rs b/crates/miden-protocol/src/account/component/storage/schema/word.rs index de609ebb25..8d58b7a436 100644 --- a/crates/miden-protocol/src/account/component/storage/schema/word.rs +++ b/crates/miden-protocol/src/account/component/storage/schema/word.rs @@ -7,11 +7,7 @@ use super::FeltSchema; use crate::account::StorageSlotName; use crate::errors::ComponentMetadataError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Word}; diff --git a/crates/miden-protocol/src/account/component/storage/toml/init_storage_data.rs b/crates/miden-protocol/src/account/component/storage/toml/init_storage_data.rs index cf681dc852..3e26a53fc7 100644 --- a/crates/miden-protocol/src/account/component/storage/toml/init_storage_data.rs +++ b/crates/miden-protocol/src/account/component/storage/toml/init_storage_data.rs @@ -4,11 +4,8 @@ use serde::Deserialize; use thiserror::Error; use super::super::{ - InitStorageData, - InitStorageDataError as CoreInitStorageDataError, - StorageValueName, - StorageValueNameError, - WordValue, + InitStorageData, InitStorageDataError as CoreInitStorageDataError, StorageValueName, + StorageValueNameError, WordValue, }; use super::RawMapEntrySchema; diff --git a/crates/miden-protocol/src/account/component/storage/toml/mod.rs b/crates/miden-protocol/src/account/component/storage/toml/mod.rs index 700eb12463..30fe30f358 100644 --- a/crates/miden-protocol/src/account/component/storage/toml/mod.rs +++ b/crates/miden-protocol/src/account/component/storage/toml/mod.rs @@ -8,14 +8,8 @@ use serde::de::Error as _; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use super::super::{ - FeltSchema, - MapSlotSchema, - StorageSchema, - StorageSlotSchema, - StorageValueName, - ValueSlotSchema, - WordSchema, - WordValue, + FeltSchema, MapSlotSchema, StorageSchema, StorageSlotSchema, StorageValueName, ValueSlotSchema, + WordSchema, WordValue, }; use crate::account::StorageSlotName; use crate::account::component::storage::type_registry::SCHEMA_TYPE_REGISTRY; diff --git a/crates/miden-protocol/src/account/component/storage/toml/tests.rs b/crates/miden-protocol/src/account/component/storage/toml/tests.rs index f5a7c3180e..34c099625b 100644 --- a/crates/miden-protocol/src/account/component/storage/toml/tests.rs +++ b/crates/miden-protocol/src/account/component/storage/toml/tests.rs @@ -5,15 +5,8 @@ use miden_core::{Felt, Word}; use crate::account::component::toml::init_storage_data::InitStorageDataError; use crate::account::component::{ - AccountComponentMetadata, - InitStorageData, - InitStorageDataError as CoreInitStorageDataError, - SchemaType, - StorageSlotSchema, - StorageValueName, - StorageValueNameError, - WordSchema, - WordValue, + AccountComponentMetadata, InitStorageData, InitStorageDataError as CoreInitStorageDataError, + SchemaType, StorageSlotSchema, StorageValueName, StorageValueNameError, WordSchema, WordValue, }; use crate::account::{StorageMapKey, StorageSlotContent, StorageSlotName}; use crate::asset::TokenSymbol; diff --git a/crates/miden-protocol/src/account/component/storage/type_registry.rs b/crates/miden-protocol/src/account/component/storage/type_registry.rs index 6871b5b1d6..e8962c6ccb 100644 --- a/crates/miden-protocol/src/account/component/storage/type_registry.rs +++ b/crates/miden-protocol/src/account/component/storage/type_registry.rs @@ -12,11 +12,7 @@ use crate::account::RoleSymbol; use crate::account::auth::{AuthScheme, PublicKey}; use crate::asset::TokenSymbol; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::utils::sync::LazyLock; diff --git a/crates/miden-protocol/src/account/component/storage/value_name.rs b/crates/miden-protocol/src/account/component/storage/value_name.rs index 46568ebef6..a2543af1c8 100644 --- a/crates/miden-protocol/src/account/component/storage/value_name.rs +++ b/crates/miden-protocol/src/account/component/storage/value_name.rs @@ -8,11 +8,7 @@ use thiserror::Error; use crate::account::StorageSlotName; use crate::errors::StorageSlotNameError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// A simple wrapper type around a string key that identifies init-provided values. diff --git a/crates/miden-protocol/src/account/delta/mod.rs b/crates/miden-protocol/src/account/delta/mod.rs index 6d5c2ec835..64e4c3eca1 100644 --- a/crates/miden-protocol/src/account/delta/mod.rs +++ b/crates/miden-protocol/src/account/delta/mod.rs @@ -6,11 +6,7 @@ use crate::asset::AssetVault; use crate::crypto::SequentialCommit; use crate::errors::{AccountDeltaError, AccountError}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Word, ZERO}; @@ -19,10 +15,7 @@ pub use delta_op::AssetDeltaOperation; mod vault; pub use vault::{ - AccountVaultDelta, - FungibleAssetDelta, - NonFungibleAssetDelta, - NonFungibleDeltaAction, + AccountVaultDelta, FungibleAssetDelta, NonFungibleAssetDelta, NonFungibleDeltaAction, }; // ACCOUNT DELTA @@ -494,26 +487,15 @@ mod tests { use super::{AccountDelta, AccountStoragePatch, AccountVaultDelta}; use crate::account::{ - Account, - AccountCode, - AccountId, - AccountStorage, - AccountType, - StorageMapKey, - StorageMapPatch, - StorageSlotName, + Account, AccountCode, AccountId, AccountStorage, AccountType, StorageMapKey, + StorageMapPatch, StorageSlotName, }; use crate::asset::{ - Asset, - AssetVault, - FungibleAsset, - NonFungibleAsset, - NonFungibleAssetDetails, + Asset, AssetVault, FungibleAsset, NonFungibleAsset, NonFungibleAssetDetails, }; use crate::errors::AccountDeltaError; use crate::testing::account_id::{ - ACCOUNT_ID_PRIVATE_SENDER, - ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, + ACCOUNT_ID_PRIVATE_SENDER, ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, AccountIdBuilder, }; use crate::utils::serde::Serializable; diff --git a/crates/miden-protocol/src/account/delta/vault.rs b/crates/miden-protocol/src/account/delta/vault.rs index a034d5539b..cc3f2df21d 100644 --- a/crates/miden-protocol/src/account/delta/vault.rs +++ b/crates/miden-protocol/src/account/delta/vault.rs @@ -6,12 +6,7 @@ use alloc::vec::Vec; use miden_core::Word; use super::{ - AccountDeltaError, - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + AccountDeltaError, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::Felt; use crate::account::delta::AssetDeltaOperation; diff --git a/crates/miden-protocol/src/account/file.rs b/crates/miden-protocol/src/account/file.rs index 7c8e309c84..b1b0821e03 100644 --- a/crates/miden-protocol/src/account/file.rs +++ b/crates/miden-protocol/src/account/file.rs @@ -9,11 +9,7 @@ use std::{ use miden_crypto::utils::SliceReader; use super::super::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use super::Account; use super::auth::AuthSecretKey; diff --git a/crates/miden-protocol/src/account/header.rs b/crates/miden-protocol/src/account/header.rs index c817eb966d..0a789fd20a 100644 --- a/crates/miden-protocol/src/account/header.rs +++ b/crates/miden-protocol/src/account/header.rs @@ -4,22 +4,12 @@ use super::{Account, AccountId, Felt, PartialAccount}; use crate::crypto::SequentialCommit; use crate::errors::AccountError; use crate::transaction::memory::{ - ACCT_CODE_COMMITMENT_OFFSET, - ACCT_DATA_MEM_SIZE, - ACCT_ID_AND_NONCE_OFFSET, - ACCT_ID_PREFIX_IDX, - ACCT_ID_SUFFIX_IDX, - ACCT_NONCE_IDX, - ACCT_STORAGE_COMMITMENT_OFFSET, - ACCT_VAULT_ROOT_OFFSET, + ACCT_CODE_COMMITMENT_OFFSET, ACCT_DATA_MEM_SIZE, ACCT_ID_AND_NONCE_OFFSET, ACCT_ID_PREFIX_IDX, + ACCT_ID_SUFFIX_IDX, ACCT_NONCE_IDX, ACCT_STORAGE_COMMITMENT_OFFSET, ACCT_VAULT_ROOT_OFFSET, MemoryOffset, }; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{WORD_SIZE, Word, WordError}; diff --git a/crates/miden-protocol/src/account/mod.rs b/crates/miden-protocol/src/account/mod.rs index 2ae454fd35..642a42bc56 100644 --- a/crates/miden-protocol/src/account/mod.rs +++ b/crates/miden-protocol/src/account/mod.rs @@ -5,22 +5,13 @@ use crate::asset::{Asset, AssetVault}; use crate::crypto::SequentialCommit; use crate::errors::AccountError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Hasher, Word, ZERO}; mod account_id; pub use account_id::{ - AccountId, - AccountIdPrefix, - AccountIdPrefixV1, - AccountIdV1, - AccountIdVersion, - AccountType, + AccountId, AccountIdPrefix, AccountIdPrefixV1, AccountIdV1, AccountIdVersion, AccountType, AssetCallbackFlag, }; @@ -46,42 +37,21 @@ pub use interface::{AccountCodeInterface, AccountComponentName}; mod patch; pub use patch::{ - AccountPatch, - AccountStoragePatch, - AccountUpdateDetails, - AccountVaultPatch, - StorageMapPatch, - StorageMapPatchEntries, - StoragePatchOperation, - StorageSlotPatch, - StorageValuePatch, + AccountPatch, AccountStoragePatch, AccountUpdateDetails, AccountVaultPatch, StorageMapPatch, + StorageMapPatchEntries, StoragePatchOperation, StorageSlotPatch, StorageValuePatch, }; pub mod delta; pub use delta::{ - AccountDelta, - AccountVaultDelta, - FungibleAssetDelta, - NonFungibleAssetDelta, + AccountDelta, AccountVaultDelta, FungibleAssetDelta, NonFungibleAssetDelta, NonFungibleDeltaAction, }; pub mod storage; pub use storage::{ - AccountStorage, - AccountStorageHeader, - PartialStorage, - PartialStorageMap, - StorageMap, - StorageMapKey, - StorageMapKeyHash, - StorageMapWitness, - StorageSlot, - StorageSlotContent, - StorageSlotHeader, - StorageSlotId, - StorageSlotName, - StorageSlotType, + AccountStorage, AccountStorageHeader, PartialStorage, PartialStorageMap, StorageMap, + StorageMapKey, StorageMapKeyHash, StorageMapWitness, StorageSlot, StorageSlotContent, + StorageSlotHeader, StorageSlotId, StorageSlotName, StorageSlotType, }; mod header; @@ -593,20 +563,9 @@ mod tests { use super::{AccountCode, AccountDelta, AccountId, AccountStorage, AccountStoragePatch}; use crate::account::{ - Account, - AccountBuilder, - AccountIdVersion, - AccountPatch, - AccountType, - AccountVaultDelta, - AccountVaultPatch, - AssetCallbackFlag, - PartialAccount, - StorageMap, - StorageMapKey, - StorageSlot, - StorageSlotContent, - StorageSlotName, + Account, AccountBuilder, AccountIdVersion, AccountPatch, AccountType, AccountVaultDelta, + AccountVaultPatch, AssetCallbackFlag, PartialAccount, StorageMap, StorageMapKey, + StorageSlot, StorageSlotContent, StorageSlotName, }; use crate::asset::{Asset, AssetVault, FungibleAsset, NonFungibleAsset}; use crate::errors::AccountError; diff --git a/crates/miden-protocol/src/account/partial.rs b/crates/miden-protocol/src/account/partial.rs index dc8b32e55c..9032186696 100644 --- a/crates/miden-protocol/src/account/partial.rs +++ b/crates/miden-protocol/src/account/partial.rs @@ -10,11 +10,7 @@ use crate::asset::PartialVault; use crate::crypto::SequentialCommit; use crate::errors::AccountError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// A partial representation of an account. diff --git a/crates/miden-protocol/src/account/patch/mod.rs b/crates/miden-protocol/src/account/patch/mod.rs index abcdfde6a2..9a3cbadd02 100644 --- a/crates/miden-protocol/src/account/patch/mod.rs +++ b/crates/miden-protocol/src/account/patch/mod.rs @@ -6,12 +6,8 @@ use alloc::string::ToString; use alloc::vec::Vec; pub use storage::{ - AccountStoragePatch, - StorageMapPatch, - StorageMapPatchEntries, - StoragePatchOperation, - StorageSlotPatch, - StorageValuePatch, + AccountStoragePatch, StorageMapPatch, StorageMapPatchEntries, StoragePatchOperation, + StorageSlotPatch, StorageValuePatch, }; pub use update_details::AccountUpdateDetails; pub use vault::AccountVaultPatch; @@ -21,11 +17,7 @@ use crate::asset::AssetVault; use crate::crypto::SequentialCommit; use crate::errors::{AccountError, AccountPatchError}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Word}; @@ -484,21 +476,13 @@ mod tests { use super::{AccountPatch, AccountVaultPatch}; use crate::account::{ - Account, - AccountCode, - AccountId, - AccountStoragePatch, - StorageMapKey, - StorageMapPatch, - StorageSlotName, - StorageSlotPatch, - StorageValuePatch, + Account, AccountCode, AccountId, AccountStoragePatch, StorageMapKey, StorageMapPatch, + StorageSlotName, StorageSlotPatch, StorageValuePatch, }; use crate::asset::{Asset, FungibleAsset, NonFungibleAsset}; use crate::errors::{AccountError, AccountPatchError}; use crate::testing::account_id::{ - ACCOUNT_ID_PRIVATE_SENDER, - ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, + ACCOUNT_ID_PRIVATE_SENDER, ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, }; use crate::utils::serde::Serializable; use crate::{Felt, Word}; diff --git a/crates/miden-protocol/src/account/patch/storage/map_patch.rs b/crates/miden-protocol/src/account/patch/storage/map_patch.rs index caddc65671..cd717d111a 100644 --- a/crates/miden-protocol/src/account/patch/storage/map_patch.rs +++ b/crates/miden-protocol/src/account/patch/storage/map_patch.rs @@ -5,11 +5,7 @@ use crate::Word; use crate::account::{StorageMap, StorageMapKey, StoragePatchOperation, StorageSlotName}; use crate::errors::AccountPatchError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // STORAGE MAP PATCH diff --git a/crates/miden-protocol/src/account/patch/storage/slot_patch.rs b/crates/miden-protocol/src/account/patch/storage/slot_patch.rs index f5173e7953..1ec983c585 100644 --- a/crates/miden-protocol/src/account/patch/storage/slot_patch.rs +++ b/crates/miden-protocol/src/account/patch/storage/slot_patch.rs @@ -1,19 +1,10 @@ use crate::account::{ - StorageMapPatch, - StorageMapPatchEntries, - StoragePatchOperation, - StorageSlotContent, - StorageSlotName, - StorageSlotType, - StorageValuePatch, + StorageMapPatch, StorageMapPatchEntries, StoragePatchOperation, StorageSlotContent, + StorageSlotName, StorageSlotType, StorageValuePatch, }; use crate::errors::AccountPatchError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // STORAGE SLOT PATCH diff --git a/crates/miden-protocol/src/account/patch/storage/storage_patch.rs b/crates/miden-protocol/src/account/patch/storage/storage_patch.rs index 985bf3a2ee..40e25e744e 100644 --- a/crates/miden-protocol/src/account/patch/storage/storage_patch.rs +++ b/crates/miden-protocol/src/account/patch/storage/storage_patch.rs @@ -5,19 +5,11 @@ use alloc::vec::Vec; use super::slot_patch::MergeOutcome; use crate::Felt; use crate::account::{ - AccountStorage, - StorageMapPatch, - StorageSlotName, - StorageSlotPatch, - StorageValuePatch, + AccountStorage, StorageMapPatch, StorageSlotName, StorageSlotPatch, StorageValuePatch, }; use crate::errors::AccountPatchError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // ACCOUNT STORAGE PATCH diff --git a/crates/miden-protocol/src/account/patch/storage/tests.rs b/crates/miden-protocol/src/account/patch/storage/tests.rs index ceba8e50b8..0d5e5e8861 100644 --- a/crates/miden-protocol/src/account/patch/storage/tests.rs +++ b/crates/miden-protocol/src/account/patch/storage/tests.rs @@ -7,20 +7,9 @@ use anyhow::Context; use assert_matches::assert_matches; use crate::account::{ - Account, - AccountCode, - AccountId, - AccountPatch, - AccountStorage, - AccountStoragePatch, - AccountVaultPatch, - StorageMapKey, - StorageMapPatch, - StorageMapPatchEntries, - StorageSlot, - StorageSlotName, - StorageSlotPatch, - StorageValuePatch, + Account, AccountCode, AccountId, AccountPatch, AccountStorage, AccountStoragePatch, + AccountVaultPatch, StorageMapKey, StorageMapPatch, StorageMapPatchEntries, StorageSlot, + StorageSlotName, StorageSlotPatch, StorageValuePatch, }; use crate::asset::AssetVault; use crate::errors::AccountPatchError; diff --git a/crates/miden-protocol/src/account/patch/storage/value_patch.rs b/crates/miden-protocol/src/account/patch/storage/value_patch.rs index f92a735807..45fa60c261 100644 --- a/crates/miden-protocol/src/account/patch/storage/value_patch.rs +++ b/crates/miden-protocol/src/account/patch/storage/value_patch.rs @@ -3,11 +3,7 @@ use crate::Word; use crate::account::{StoragePatchOperation, StorageSlotName}; use crate::errors::AccountPatchError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // STORAGE VALUE PATCH diff --git a/crates/miden-protocol/src/account/patch/update_details.rs b/crates/miden-protocol/src/account/patch/update_details.rs index e604483736..fd8dafe8e9 100644 --- a/crates/miden-protocol/src/account/patch/update_details.rs +++ b/crates/miden-protocol/src/account/patch/update_details.rs @@ -1,11 +1,7 @@ use crate::account::AccountPatch; use crate::errors::AccountPatchError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // ACCOUNT UPDATE DETAILS @@ -123,13 +119,8 @@ impl Deserializable for AccountUpdateDetails { mod tests { use super::AccountUpdateDetails; use crate::account::{ - AccountCode, - AccountId, - AccountPatch, - AccountStoragePatch, - AccountVaultPatch, - StorageMapKey, - StorageSlotName, + AccountCode, AccountId, AccountPatch, AccountStoragePatch, AccountVaultPatch, + StorageMapKey, StorageSlotName, }; use crate::asset::{Asset, FungibleAsset, NonFungibleAsset}; use crate::testing::account_id::ACCOUNT_ID_PRIVATE_SENDER; diff --git a/crates/miden-protocol/src/account/patch/vault.rs b/crates/miden-protocol/src/account/patch/vault.rs index 383425f3c5..a1aa47caf0 100644 --- a/crates/miden-protocol/src/account/patch/vault.rs +++ b/crates/miden-protocol/src/account/patch/vault.rs @@ -5,11 +5,7 @@ use alloc::vec::Vec; use crate::asset::{Asset, AssetId}; use crate::errors::AssetError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Word}; diff --git a/crates/miden-protocol/src/account/storage/header.rs b/crates/miden-protocol/src/account/storage/header.rs index a9a401c12c..e948253eca 100644 --- a/crates/miden-protocol/src/account/storage/header.rs +++ b/crates/miden-protocol/src/account/storage/header.rs @@ -10,11 +10,7 @@ use crate::account::{StorageSlot, StorageSlotId, StorageSlotName}; use crate::crypto::SequentialCommit; use crate::errors::AccountError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // ACCOUNT STORAGE HEADER diff --git a/crates/miden-protocol/src/account/storage/map/key.rs b/crates/miden-protocol/src/account/storage/map/key.rs index a44afa6690..a3fa503b6b 100644 --- a/crates/miden-protocol/src/account/storage/map/key.rs +++ b/crates/miden-protocol/src/account/storage/map/key.rs @@ -4,11 +4,7 @@ use miden_crypto::merkle::smt::{LeafIndex, SMT_DEPTH}; use miden_crypto_derive::WordWrapper; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Hasher, Word}; diff --git a/crates/miden-protocol/src/account/storage/map/mod.rs b/crates/miden-protocol/src/account/storage/map/mod.rs index 6f7a6d8078..ee2903b3f3 100644 --- a/crates/miden-protocol/src/account/storage/map/mod.rs +++ b/crates/miden-protocol/src/account/storage/map/mod.rs @@ -235,12 +235,7 @@ mod tests { use assert_matches::assert_matches; use super::{ - Deserializable, - EMPTY_STORAGE_MAP_ROOT, - Serializable, - StorageMap, - StorageMapKey, - Word, + Deserializable, EMPTY_STORAGE_MAP_ROOT, Serializable, StorageMap, StorageMapKey, Word, }; use crate::errors::StorageMapError; diff --git a/crates/miden-protocol/src/account/storage/map/partial.rs b/crates/miden-protocol/src/account/storage/map/partial.rs index e120c32d8d..54122b5992 100644 --- a/crates/miden-protocol/src/account/storage/map/partial.rs +++ b/crates/miden-protocol/src/account/storage/map/partial.rs @@ -6,11 +6,7 @@ use miden_crypto::merkle::{InnerNodeInfo, MerkleError}; use crate::account::{StorageMap, StorageMapKey, StorageMapWitness}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// A partial representation of a [`StorageMap`], containing only proofs for a subset of the diff --git a/crates/miden-protocol/src/account/storage/mod.rs b/crates/miden-protocol/src/account/storage/mod.rs index 900838f057..b99cd31450 100644 --- a/crates/miden-protocol/src/account/storage/mod.rs +++ b/crates/miden-protocol/src/account/storage/mod.rs @@ -2,22 +2,11 @@ use alloc::string::ToString; use alloc::vec::Vec; use super::{ - AccountError, - AccountStoragePatch, - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Felt, - Serializable, - Word, + AccountError, AccountStoragePatch, ByteReader, ByteWriter, Deserializable, + DeserializationError, Felt, Serializable, Word, }; use crate::account::{ - AccountComponent, - StorageMapPatch, - StorageMapPatchEntries, - StorageSlotPatch, - StorageValuePatch, + AccountComponent, StorageMapPatch, StorageMapPatchEntries, StorageSlotPatch, StorageValuePatch, }; use crate::crypto::SequentialCommit; @@ -487,13 +476,8 @@ mod tests { use super::{AccountStorage, Deserializable, Serializable}; use crate::Word; use crate::account::{ - AccountStorageHeader, - AccountStoragePatch, - StorageSlot, - StorageSlotHeader, - StorageSlotName, - StorageSlotPatch, - StorageValuePatch, + AccountStorageHeader, AccountStoragePatch, StorageSlot, StorageSlotHeader, StorageSlotName, + StorageSlotPatch, StorageValuePatch, }; use crate::errors::AccountError; diff --git a/crates/miden-protocol/src/account/storage/partial.rs b/crates/miden-protocol/src/account/storage/partial.rs index d3e9a243ca..56342e95af 100644 --- a/crates/miden-protocol/src/account/storage/partial.rs +++ b/crates/miden-protocol/src/account/storage/partial.rs @@ -8,11 +8,7 @@ use super::{AccountStorage, AccountStorageHeader, StorageSlotContent}; use crate::account::PartialStorageMap; use crate::errors::AccountError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// A partial representation of an account storage, containing only a subset of the storage data. @@ -162,14 +158,8 @@ mod tests { use miden_core::Word; use crate::account::{ - AccountStorage, - AccountStorageHeader, - PartialStorage, - PartialStorageMap, - StorageMap, - StorageMapKey, - StorageSlot, - StorageSlotName, + AccountStorage, AccountStorageHeader, PartialStorage, PartialStorageMap, StorageMap, + StorageMapKey, StorageSlot, StorageSlotName, }; #[test] diff --git a/crates/miden-protocol/src/account/storage/slot/slot_content.rs b/crates/miden-protocol/src/account/storage/slot/slot_content.rs index dfc37017dd..7413c347b4 100644 --- a/crates/miden-protocol/src/account/storage/slot/slot_content.rs +++ b/crates/miden-protocol/src/account/storage/slot/slot_content.rs @@ -4,11 +4,7 @@ use crate::account::StorageSlotType; use crate::account::storage::map::EMPTY_STORAGE_MAP_ROOT; use crate::account::storage::{StorageMap, Word}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // STORAGE SLOT CONTENT diff --git a/crates/miden-protocol/src/account/storage/slot/slot_id.rs b/crates/miden-protocol/src/account/storage/slot/slot_id.rs index b589cfef6d..424371f82c 100644 --- a/crates/miden-protocol/src/account/storage/slot/slot_id.rs +++ b/crates/miden-protocol/src/account/storage/slot/slot_id.rs @@ -6,11 +6,7 @@ use miden_core::utils::hash_string_to_word; use crate::Felt; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// The partial hash of a [`StorageSlotName`](super::StorageSlotName). diff --git a/crates/miden-protocol/src/account/storage/slot/slot_name.rs b/crates/miden-protocol/src/account/storage/slot/slot_name.rs index d1fdffdbf9..7942ae0b17 100644 --- a/crates/miden-protocol/src/account/storage/slot/slot_name.rs +++ b/crates/miden-protocol/src/account/storage/slot/slot_name.rs @@ -7,11 +7,7 @@ use crate::account::name_validation::{self, NameValidationError}; use crate::account::storage::slot::StorageSlotId; use crate::errors::StorageSlotNameError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// The name of an account storage slot. diff --git a/crates/miden-protocol/src/account/storage/slot/storage_slot.rs b/crates/miden-protocol/src/account/storage/slot/storage_slot.rs index 37da4c86a9..93b813d99e 100644 --- a/crates/miden-protocol/src/account/storage/slot/storage_slot.rs +++ b/crates/miden-protocol/src/account/storage/slot/storage_slot.rs @@ -2,11 +2,7 @@ use crate::Word; use crate::account::storage::slot::StorageSlotId; use crate::account::{StorageMap, StorageSlotContent, StorageSlotName, StorageSlotType}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// An individual storage slot in [`AccountStorage`](crate::account::AccountStorage). diff --git a/crates/miden-protocol/src/account/storage/slot/type.rs b/crates/miden-protocol/src/account/storage/slot/type.rs index baa12f204c..4e80b3d948 100644 --- a/crates/miden-protocol/src/account/storage/slot/type.rs +++ b/crates/miden-protocol/src/account/storage/slot/type.rs @@ -6,11 +6,7 @@ use miden_core::{ONE, ZERO}; use crate::Felt; use crate::errors::AccountError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // STORAGE SLOT TYPE diff --git a/crates/miden-protocol/src/address/address_id.rs b/crates/miden-protocol/src/address/address_id.rs index 70c8eb14df..034b30e88f 100644 --- a/crates/miden-protocol/src/address/address_id.rs +++ b/crates/miden-protocol/src/address/address_id.rs @@ -7,11 +7,7 @@ use crate::account::AccountId; use crate::address::{AddressType, NetworkId}; use crate::errors::{AddressError, Bech32Error}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// The identifier of an [`Address`](super::Address). diff --git a/crates/miden-protocol/src/address/mod.rs b/crates/miden-protocol/src/address/mod.rs index 754a19a872..6af5bf8859 100644 --- a/crates/miden-protocol/src/address/mod.rs +++ b/crates/miden-protocol/src/address/mod.rs @@ -18,11 +18,7 @@ use crate::crypto::ies::SealingKey; use crate::errors::AddressError; use crate::note::NoteTag; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; mod address_id; diff --git a/crates/miden-protocol/src/address/routing_parameters.rs b/crates/miden-protocol/src/address/routing_parameters.rs index ac37c7affe..c97027557d 100644 --- a/crates/miden-protocol/src/address/routing_parameters.rs +++ b/crates/miden-protocol/src/address/routing_parameters.rs @@ -11,11 +11,7 @@ use crate::crypto::ies::SealingKey; use crate::errors::{AddressError, Bech32Error}; use crate::note::NoteTag; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::utils::sync::LazyLock; diff --git a/crates/miden-protocol/src/asset/asset_amount.rs b/crates/miden-protocol/src/asset/asset_amount.rs index 532a892362..ae9385d72d 100644 --- a/crates/miden-protocol/src/asset/asset_amount.rs +++ b/crates/miden-protocol/src/asset/asset_amount.rs @@ -4,11 +4,7 @@ use core::ops::{Add, Sub}; use super::super::errors::AssetError; use super::super::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::Felt; diff --git a/crates/miden-protocol/src/asset/asset_composition.rs b/crates/miden-protocol/src/asset/asset_composition.rs index 2175a4e071..2c8ef9948b 100644 --- a/crates/miden-protocol/src/asset/asset_composition.rs +++ b/crates/miden-protocol/src/asset/asset_composition.rs @@ -2,11 +2,7 @@ use alloc::string::ToString; use crate::errors::AssetError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// Indicates how an asset is composed (i.e. how its merge/split semantics are defined). diff --git a/crates/miden-protocol/src/asset/fungible.rs b/crates/miden-protocol/src/asset/fungible.rs index b89a5d31e8..a7a26fb56e 100644 --- a/crates/miden-protocol/src/asset/fungible.rs +++ b/crates/miden-protocol/src/asset/fungible.rs @@ -7,11 +7,7 @@ use crate::Felt; use crate::account::{AccountId, AssetCallbackFlag}; use crate::asset::AssetClass; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // FUNGIBLE ASSET @@ -256,10 +252,8 @@ mod tests { use crate::asset::NonFungibleAsset; use crate::asset::tests::set_asset_metadata; use crate::testing::account_id::{ - ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_2, + ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_2, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_3, }; diff --git a/crates/miden-protocol/src/asset/mod.rs b/crates/miden-protocol/src/asset/mod.rs index 62de5ebe6e..6759a13e90 100644 --- a/crates/miden-protocol/src/asset/mod.rs +++ b/crates/miden-protocol/src/asset/mod.rs @@ -1,10 +1,6 @@ use super::errors::{AssetError, TokenSymbolError}; use super::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use super::{Felt, Word}; use crate::account::AccountId; @@ -263,14 +259,10 @@ mod tests { use crate::asset::{AssetClass, AssetComposition, AssetId}; use crate::errors::AssetError; use crate::testing::account_id::{ - ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, - ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_2, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_3, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET_1, + ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_2, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_3, + ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET_1, }; /// Returns the metadata byte encoded in an asset ID word. diff --git a/crates/miden-protocol/src/asset/nonfungible.rs b/crates/miden-protocol/src/asset/nonfungible.rs index ed3a51c7ea..7dd4f6fc9e 100644 --- a/crates/miden-protocol/src/asset/nonfungible.rs +++ b/crates/miden-protocol/src/asset/nonfungible.rs @@ -7,11 +7,7 @@ use crate::Hasher; use crate::account::AccountId; use crate::asset::vault::AssetClass; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // NON-FUNGIBLE ASSET @@ -229,8 +225,7 @@ mod tests { use crate::account::AccountId; use crate::asset::FungibleAsset; use crate::testing::account_id::{ - ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, + ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET_1, }; diff --git a/crates/miden-protocol/src/asset/vault/asset_id.rs b/crates/miden-protocol/src/asset/vault/asset_id.rs index fcc38b366e..a0b9ae18e7 100644 --- a/crates/miden-protocol/src/asset/vault/asset_id.rs +++ b/crates/miden-protocol/src/asset/vault/asset_id.rs @@ -11,11 +11,7 @@ use crate::asset::{Asset, AssetComposition, FungibleAsset, NonFungibleAsset}; use crate::crypto::merkle::smt::SMT_DEPTH; use crate::errors::AssetError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Hasher, Word}; @@ -305,8 +301,7 @@ mod tests { use crate::asset::AssetComposition; use crate::asset::tests::{asset_metadata, set_asset_metadata}; use crate::testing::account_id::{ - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, }; #[test] diff --git a/crates/miden-protocol/src/asset/vault/asset_witness.rs b/crates/miden-protocol/src/asset/vault/asset_witness.rs index 581973f52b..7a8031afe8 100644 --- a/crates/miden-protocol/src/asset/vault/asset_witness.rs +++ b/crates/miden-protocol/src/asset/vault/asset_witness.rs @@ -11,11 +11,7 @@ use crate::Word; use crate::asset::Asset; use crate::errors::AssetError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// A witness of an asset in an [`AssetVault`](super::AssetVault). @@ -192,8 +188,7 @@ mod tests { use super::*; use crate::asset::{AssetVault, FungibleAsset, NonFungibleAsset}; use crate::testing::account_id::{ - ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_3, + ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_3, }; /// Tests that constructing an asset witness fails if the (asset_id, value) pair stored in the diff --git a/crates/miden-protocol/src/asset/vault/mod.rs b/crates/miden-protocol/src/asset/vault/mod.rs index dc6ab38ec2..74b5f1a7b4 100644 --- a/crates/miden-protocol/src/asset/vault/mod.rs +++ b/crates/miden-protocol/src/asset/vault/mod.rs @@ -5,16 +5,8 @@ use alloc::vec::Vec; use miden_crypto::merkle::InnerNodeInfo; use super::{ - Asset, - AssetAmount, - AssetComposition, - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - FungibleAsset, - NonFungibleAsset, - Serializable, + Asset, AssetAmount, AssetComposition, ByteReader, ByteWriter, Deserializable, + DeserializationError, FungibleAsset, NonFungibleAsset, Serializable, }; use crate::Word; use crate::account::AccountVaultPatch; diff --git a/crates/miden-protocol/src/asset/vault/partial.rs b/crates/miden-protocol/src/asset/vault/partial.rs index 45e15859e6..6cec5829a8 100644 --- a/crates/miden-protocol/src/asset/vault/partial.rs +++ b/crates/miden-protocol/src/asset/vault/partial.rs @@ -10,11 +10,7 @@ use crate::Word; use crate::asset::{Asset, AssetWitness}; use crate::errors::PartialAssetVaultError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// A partial representation of an [`AssetVault`], containing only proofs for a subset of assets. diff --git a/crates/miden-protocol/src/batch/account_update.rs b/crates/miden-protocol/src/batch/account_update.rs index c826f1d496..a09ced60dd 100644 --- a/crates/miden-protocol/src/batch/account_update.rs +++ b/crates/miden-protocol/src/batch/account_update.rs @@ -5,11 +5,7 @@ use crate::account::{AccountId, AccountUpdateDetails}; use crate::errors::BatchAccountUpdateError; use crate::transaction::ProvenTransaction; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // BATCH ACCOUNT UPDATE diff --git a/crates/miden-protocol/src/batch/batch_id.rs b/crates/miden-protocol/src/batch/batch_id.rs index 39cfe42255..3603c351dc 100644 --- a/crates/miden-protocol/src/batch/batch_id.rs +++ b/crates/miden-protocol/src/batch/batch_id.rs @@ -6,11 +6,7 @@ use miden_crypto_derive::WordWrapper; use crate::account::AccountId; use crate::transaction::{ProvenTransaction, TransactionId}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Hasher, Word, ZERO}; diff --git a/crates/miden-protocol/src/batch/note_tracker.rs b/crates/miden-protocol/src/batch/note_tracker.rs index cfe33e056a..756713863e 100644 --- a/crates/miden-protocol/src/batch/note_tracker.rs +++ b/crates/miden-protocol/src/batch/note_tracker.rs @@ -8,11 +8,7 @@ use crate::crypto::merkle::MerkleError; use crate::errors::{ProposedBatchError, ProposedBlockError}; use crate::note::{NoteHeader, NoteId, NoteInclusionProof, Nullifier}; use crate::transaction::{ - InputNoteCommitment, - OutputNote, - PartialBlockchain, - ProvenTransaction, - TransactionId, + InputNoteCommitment, OutputNote, PartialBlockchain, ProvenTransaction, TransactionId, }; // NOTE CONTAINER diff --git a/crates/miden-protocol/src/batch/note_tree.rs b/crates/miden-protocol/src/batch/note_tree.rs index 2c157e10fa..8722fc7283 100644 --- a/crates/miden-protocol/src/batch/note_tree.rs +++ b/crates/miden-protocol/src/batch/note_tree.rs @@ -4,11 +4,7 @@ use crate::crypto::merkle::MerkleError; use crate::crypto::merkle::smt::{LeafIndex, SimpleSmt}; use crate::note::NoteHeader; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{BATCH_NOTE_TREE_DEPTH, EMPTY_WORD, Word}; diff --git a/crates/miden-protocol/src/batch/ordered_batches.rs b/crates/miden-protocol/src/batch/ordered_batches.rs index 749707480c..bb63f204ff 100644 --- a/crates/miden-protocol/src/batch/ordered_batches.rs +++ b/crates/miden-protocol/src/batch/ordered_batches.rs @@ -3,11 +3,7 @@ use alloc::vec::Vec; use crate::batch::ProvenBatch; use crate::transaction::OrderedTransactionHeaders; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // ORDERED BATCHES diff --git a/crates/miden-protocol/src/batch/proposed_batch.rs b/crates/miden-protocol/src/batch/proposed_batch.rs index 9dafc68d67..8941e7147f 100644 --- a/crates/miden-protocol/src/batch/proposed_batch.rs +++ b/crates/miden-protocol/src/batch/proposed_batch.rs @@ -10,21 +10,11 @@ use crate::block::{BlockHeader, BlockNumber}; use crate::errors::ProposedBatchError; use crate::note::{NoteId, NoteInclusionProof}; use crate::transaction::{ - InputNoteCommitment, - InputNotes, - OrderedTransactionHeaders, - OutputNote, - PartialBlockchain, - ProvenTransaction, - TransactionHeader, - TransactionVerifier, + InputNoteCommitment, InputNotes, OrderedTransactionHeaders, OutputNote, PartialBlockchain, + ProvenTransaction, TransactionHeader, TransactionVerifier, }; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{MAX_ACCOUNTS_PER_BATCH, MAX_INPUT_NOTES_PER_BATCH, MAX_OUTPUT_NOTES_PER_BATCH}; diff --git a/crates/miden-protocol/src/batch/proven_batch.rs b/crates/miden-protocol/src/batch/proven_batch.rs index c8af8c1cab..b821a14f98 100644 --- a/crates/miden-protocol/src/batch/proven_batch.rs +++ b/crates/miden-protocol/src/batch/proven_batch.rs @@ -9,11 +9,7 @@ use crate::errors::ProvenBatchError; use crate::note::Nullifier; use crate::transaction::{InputNoteCommitment, InputNotes, OrderedTransactionHeaders, OutputNote}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::vm::ExecutionProof; use crate::{MIN_PROOF_SECURITY_LEVEL, Word}; diff --git a/crates/miden-protocol/src/block/account_tree/mod.rs b/crates/miden-protocol/src/block/account_tree/mod.rs index 4e0a6b12ee..c6f0a1c1e1 100644 --- a/crates/miden-protocol/src/block/account_tree/mod.rs +++ b/crates/miden-protocol/src/block/account_tree/mod.rs @@ -11,11 +11,7 @@ use crate::crypto::merkle::MerkleError; use crate::crypto::merkle::smt::{MutationSet, SMT_DEPTH, Smt, SmtLeaf}; use crate::errors::AccountTreeError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; mod partial; diff --git a/crates/miden-protocol/src/block/account_tree/witness.rs b/crates/miden-protocol/src/block/account_tree/witness.rs index 0b23b9f6ba..e69098f7e3 100644 --- a/crates/miden-protocol/src/block/account_tree/witness.rs +++ b/crates/miden-protocol/src/block/account_tree/witness.rs @@ -8,11 +8,7 @@ use crate::account::AccountId; use crate::block::account_tree::AccountIdKey; use crate::errors::AccountTreeError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // ACCOUNT WITNESS diff --git a/crates/miden-protocol/src/block/account_update_witness.rs b/crates/miden-protocol/src/block/account_update_witness.rs index afa6728219..6d985eefd4 100644 --- a/crates/miden-protocol/src/block/account_update_witness.rs +++ b/crates/miden-protocol/src/block/account_update_witness.rs @@ -2,11 +2,7 @@ use crate::Word; use crate::account::AccountUpdateDetails; use crate::block::account_tree::AccountWitness; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// This type encapsulates essentially three components: diff --git a/crates/miden-protocol/src/block/block_account_update.rs b/crates/miden-protocol/src/block/block_account_update.rs index 97b7084bba..49f7cfd9b4 100644 --- a/crates/miden-protocol/src/block/block_account_update.rs +++ b/crates/miden-protocol/src/block/block_account_update.rs @@ -1,11 +1,7 @@ use crate::Word; use crate::account::{AccountId, AccountUpdateDetails}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // BLOCK ACCOUNT UPDATE diff --git a/crates/miden-protocol/src/block/block_body.rs b/crates/miden-protocol/src/block/block_body.rs index 3d0a6ff2cd..d599f77a78 100644 --- a/crates/miden-protocol/src/block/block_body.rs +++ b/crates/miden-protocol/src/block/block_body.rs @@ -3,20 +3,12 @@ use alloc::vec::Vec; use miden_core::Word; use crate::block::{ - BlockAccountUpdate, - BlockNoteIndex, - BlockNoteTree, - OutputNoteBatch, - ProposedBlock, + BlockAccountUpdate, BlockNoteIndex, BlockNoteTree, OutputNoteBatch, ProposedBlock, }; use crate::note::Nullifier; use crate::transaction::{OrderedTransactionHeaders, OutputNote}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // BLOCK BODY diff --git a/crates/miden-protocol/src/block/block_inputs.rs b/crates/miden-protocol/src/block/block_inputs.rs index 5e531f9e82..13800a1cd9 100644 --- a/crates/miden-protocol/src/block/block_inputs.rs +++ b/crates/miden-protocol/src/block/block_inputs.rs @@ -7,11 +7,7 @@ use crate::block::nullifier_tree::NullifierWitness; use crate::note::{NoteId, NoteInclusionProof, Nullifier}; use crate::transaction::PartialBlockchain; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // BLOCK INPUTS diff --git a/crates/miden-protocol/src/block/block_number.rs b/crates/miden-protocol/src/block/block_number.rs index 8a001c5104..75f2dec4c2 100644 --- a/crates/miden-protocol/src/block/block_number.rs +++ b/crates/miden-protocol/src/block/block_number.rs @@ -3,11 +3,7 @@ use core::ops::Add; use crate::Felt; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // BLOCK NUMBER diff --git a/crates/miden-protocol/src/block/block_proof.rs b/crates/miden-protocol/src/block/block_proof.rs index 999b9ccd3a..856f18a645 100644 --- a/crates/miden-protocol/src/block/block_proof.rs +++ b/crates/miden-protocol/src/block/block_proof.rs @@ -1,9 +1,5 @@ use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// Represents a proof of a block in the chain. diff --git a/crates/miden-protocol/src/block/block_signatures.rs b/crates/miden-protocol/src/block/block_signatures.rs index ea6e565c48..67d8fb78ea 100644 --- a/crates/miden-protocol/src/block/block_signatures.rs +++ b/crates/miden-protocol/src/block/block_signatures.rs @@ -5,11 +5,7 @@ use miden_crypto::dsa::ecdsa_k256_keccak::Signature; use crate::Word; use crate::block::ValidatorKeys; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // SIGNATURE VERIFICATION ERROR diff --git a/crates/miden-protocol/src/block/blockchain.rs b/crates/miden-protocol/src/block/blockchain.rs index 99bc0ddffb..e08ddb2a0a 100644 --- a/crates/miden-protocol/src/block/blockchain.rs +++ b/crates/miden-protocol/src/block/blockchain.rs @@ -5,11 +5,7 @@ use miden_crypto::merkle::mmr::{Forest, Mmr, MmrError, MmrPeaks, MmrProof, Parti use crate::Word; use crate::block::BlockNumber; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// The [Merkle Mountain Range](Mmr) defining the Miden blockchain. diff --git a/crates/miden-protocol/src/block/header.rs b/crates/miden-protocol/src/block/header.rs index 7ffe1fdf16..ae5a78526e 100644 --- a/crates/miden-protocol/src/block/header.rs +++ b/crates/miden-protocol/src/block/header.rs @@ -3,11 +3,7 @@ use alloc::vec::Vec; use crate::account::AccountId; use crate::block::{BlockNumber, BlockSignatures, SignatureVerificationError, ValidatorKeys}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Hasher, Word, ZERO}; diff --git a/crates/miden-protocol/src/block/note_tree.rs b/crates/miden-protocol/src/block/note_tree.rs index 127a8721a7..a104ef5391 100644 --- a/crates/miden-protocol/src/block/note_tree.rs +++ b/crates/miden-protocol/src/block/note_tree.rs @@ -8,18 +8,11 @@ use crate::crypto::merkle::MerkleError; use crate::crypto::merkle::smt::{LeafIndex, SimpleSmt}; use crate::note::NoteHeader; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{ - BLOCK_NOTE_TREE_DEPTH, - MAX_BATCHES_PER_BLOCK, - MAX_OUTPUT_NOTES_PER_BATCH, - MAX_OUTPUT_NOTES_PER_BLOCK, - Word, + BLOCK_NOTE_TREE_DEPTH, MAX_BATCHES_PER_BLOCK, MAX_OUTPUT_NOTES_PER_BATCH, + MAX_OUTPUT_NOTES_PER_BLOCK, Word, }; /// Wrapper over [SimpleSmt] for notes tree. diff --git a/crates/miden-protocol/src/block/nullifier_tree/mod.rs b/crates/miden-protocol/src/block/nullifier_tree/mod.rs index 18576f4458..2e8d98004e 100644 --- a/crates/miden-protocol/src/block/nullifier_tree/mod.rs +++ b/crates/miden-protocol/src/block/nullifier_tree/mod.rs @@ -10,11 +10,7 @@ use crate::crypto::merkle::smt::{MutationSet, SMT_DEPTH, Smt}; use crate::errors::NullifierTreeError; use crate::note::Nullifier; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Word}; diff --git a/crates/miden-protocol/src/block/nullifier_tree/witness.rs b/crates/miden-protocol/src/block/nullifier_tree/witness.rs index 1b7df6db38..b8762a5bb7 100644 --- a/crates/miden-protocol/src/block/nullifier_tree/witness.rs +++ b/crates/miden-protocol/src/block/nullifier_tree/witness.rs @@ -1,10 +1,6 @@ use crate::crypto::merkle::smt::SmtProof; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // NULLIFIER WITNESS diff --git a/crates/miden-protocol/src/block/proposed_block.rs b/crates/miden-protocol/src/block/proposed_block.rs index 9b407c0ced..c6abe99d4b 100644 --- a/crates/miden-protocol/src/block/proposed_block.rs +++ b/crates/miden-protocol/src/block/proposed_block.rs @@ -9,30 +9,16 @@ use crate::block::account_tree::{AccountWitness, PartialAccountTree}; use crate::block::block_inputs::BlockInputs; use crate::block::nullifier_tree::{NullifierWitness, PartialNullifierTree}; use crate::block::{ - AccountUpdateWitness, - BlockBody, - BlockHeader, - BlockNoteIndex, - BlockNoteTree, - BlockNumber, - OutputNoteBatch, - ValidatorKeys, + AccountUpdateWitness, BlockBody, BlockHeader, BlockNoteIndex, BlockNoteTree, BlockNumber, + OutputNoteBatch, ValidatorKeys, }; use crate::errors::ProposedBlockError; use crate::note::{NoteId, Nullifier}; use crate::transaction::{ - InputNoteCommitment, - OutputNote, - PartialBlockchain, - TransactionHeader, - TransactionKernel, + InputNoteCommitment, OutputNote, PartialBlockchain, TransactionHeader, TransactionKernel, }; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{EMPTY_WORD, MAX_BATCHES_PER_BLOCK, Word}; diff --git a/crates/miden-protocol/src/block/proven_block.rs b/crates/miden-protocol/src/block/proven_block.rs index 909765ce53..a4bd9202e2 100644 --- a/crates/miden-protocol/src/block/proven_block.rs +++ b/crates/miden-protocol/src/block/proven_block.rs @@ -4,11 +4,7 @@ use crate::MIN_PROOF_SECURITY_LEVEL; use crate::block::header::ParentValidationError; use crate::block::{BlockBody, BlockHeader, BlockNumber, BlockProof, BlockSignatures}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // PROVEN BLOCK ERROR diff --git a/crates/miden-protocol/src/block/signed_block.rs b/crates/miden-protocol/src/block/signed_block.rs index 2599ba710d..c067f7bbaf 100644 --- a/crates/miden-protocol/src/block/signed_block.rs +++ b/crates/miden-protocol/src/block/signed_block.rs @@ -3,11 +3,7 @@ use miden_core::Word; use crate::block::header::ParentValidationError; use crate::block::{BlockBody, BlockHeader, BlockNumber, BlockSignatures}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // SIGNED BLOCK ERROR diff --git a/crates/miden-protocol/src/block/validator_keys.rs b/crates/miden-protocol/src/block/validator_keys.rs index 4537a6c018..f61abef5e9 100644 --- a/crates/miden-protocol/src/block/validator_keys.rs +++ b/crates/miden-protocol/src/block/validator_keys.rs @@ -3,11 +3,7 @@ use alloc::vec::Vec; use crate::crypto::dsa::ecdsa_k256_keccak::PublicKey; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Hasher, WORD_SIZE, Word}; diff --git a/crates/miden-protocol/src/errors/mod.rs b/crates/miden-protocol/src/errors/mod.rs index 6cb94ff7b0..ab127c4566 100644 --- a/crates/miden-protocol/src/errors/mod.rs +++ b/crates/miden-protocol/src/errors/mod.rs @@ -20,39 +20,22 @@ use super::note::NoteId; use super::{MAX_BATCHES_PER_BLOCK, MAX_OUTPUT_NOTES_PER_BATCH, Word}; use crate::account::component::{SchemaTypeError, StorageValueName, StorageValueNameError}; use crate::account::{ - AccountCode, - AccountIdPrefix, - AccountProcedureRoot, - AccountStorage, - StorageMapKey, - StorageSlotId, - StorageSlotName, + AccountCode, AccountIdPrefix, AccountProcedureRoot, AccountStorage, StorageMapKey, + StorageSlotId, StorageSlotName, }; use crate::address::AddressType; use crate::asset::AssetClass; use crate::batch::BatchId; use crate::block::BlockNumber; use crate::note::{ - NoteAssets, - NoteAttachment, - NoteAttachmentScheme, - NoteAttachments, - NoteTag, - NoteType, - Nullifier, + NoteAssets, NoteAttachment, NoteAttachmentScheme, NoteAttachments, NoteTag, NoteType, Nullifier, }; use crate::transaction::TransactionId; use crate::utils::serde::DeserializationError; use crate::vm::EventId; use crate::{ - ACCOUNT_UPDATE_MAX_SIZE, - Felt, - MAX_ACCOUNTS_PER_BATCH, - MAX_INPUT_NOTES_PER_BATCH, - MAX_INPUT_NOTES_PER_TX, - MAX_NOTE_STORAGE_ITEMS, - MAX_OUTPUT_NOTES_PER_TX, - NOTE_MAX_SIZE, + ACCOUNT_UPDATE_MAX_SIZE, Felt, MAX_ACCOUNTS_PER_BATCH, MAX_INPUT_NOTES_PER_BATCH, + MAX_INPUT_NOTES_PER_TX, MAX_NOTE_STORAGE_ITEMS, MAX_OUTPUT_NOTES_PER_TX, NOTE_MAX_SIZE, }; #[cfg(any(feature = "testing", test))] diff --git a/crates/miden-protocol/src/lib.rs b/crates/miden-protocol/src/lib.rs index 678fa90281..d39eb125f4 100644 --- a/crates/miden-protocol/src/lib.rs +++ b/crates/miden-protocol/src/lib.rs @@ -39,24 +39,12 @@ pub mod assembly { pub use miden_assembly::ast::{Module, ModuleKind, ProcedureName, QualifiedProcedureName}; pub use miden_assembly::debuginfo::SourceManagerSync; pub use miden_assembly::{ - Assembler, - DefaultSourceManager, - Linkage, - ModuleParser, - Path, - SourceFile, - SourceId, - SourceManager, - SourceSpan, - debuginfo, - diagnostics, - mast, + Assembler, DefaultSourceManager, Linkage, ModuleParser, Path, SourceFile, SourceId, + SourceManager, SourceSpan, debuginfo, diagnostics, mast, }; pub use miden_assembly_syntax::Parse; pub use miden_mast_package::{ - Package as KernelLibrary, - Package as Library, - PackageExport as LibraryExport, + Package as KernelLibrary, Package as Library, PackageExport as LibraryExport, ProcedureExport, }; } @@ -74,14 +62,8 @@ pub mod vm { pub use miden_core::program::{Program, ProgramInfo}; pub use miden_mast_package::debug_info::{DebugSourceNodeId, PackageDebugInfo}; pub use miden_mast_package::{ - Package, - PackageDebugInfoError, - PackageExport, - PackageManifest, - ProcedureExport, - Section, - SectionId, - TargetType, + Package, PackageDebugInfoError, PackageExport, PackageManifest, ProcedureExport, Section, + SectionId, TargetType, }; pub use miden_processor::trace::RowIndex; pub use miden_processor::{FutureMaybeSend, MIN_STACK_DEPTH, StackInputs, StackOutputs}; diff --git a/crates/miden-protocol/src/note/assets.rs b/crates/miden-protocol/src/note/assets.rs index 9daa28fe68..4a015586de 100644 --- a/crates/miden-protocol/src/note/assets.rs +++ b/crates/miden-protocol/src/note/assets.rs @@ -5,11 +5,7 @@ use miden_crypto::SequentialCommit; use crate::asset::{Asset, FungibleAsset, NonFungibleAsset}; use crate::errors::NoteError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Hasher, MAX_ASSETS_PER_NOTE, WORD_SIZE, Word}; @@ -194,8 +190,7 @@ mod tests { use crate::asset::{Asset, FungibleAsset, NonFungibleAsset, NonFungibleAssetDetails}; use crate::errors::NoteError; use crate::testing::account_id::{ - ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, - ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, + ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, }; diff --git a/crates/miden-protocol/src/note/attachment/mod.rs b/crates/miden-protocol/src/note/attachment/mod.rs index d03c51ffdd..46644a6ef0 100644 --- a/crates/miden-protocol/src/note/attachment/mod.rs +++ b/crates/miden-protocol/src/note/attachment/mod.rs @@ -7,11 +7,7 @@ use alloc::vec::Vec; use crate::crypto::SequentialCommit; use crate::errors::NoteError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Hasher, Word}; diff --git a/crates/miden-protocol/src/note/details.rs b/crates/miden-protocol/src/note/details.rs index 54b6e68c3f..095d8c5136 100644 --- a/crates/miden-protocol/src/note/details.rs +++ b/crates/miden-protocol/src/note/details.rs @@ -1,11 +1,7 @@ use super::{NoteAssets, NoteDetailsCommitment, NoteRecipient, NoteScript, NoteStorage}; use crate::Word; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // NOTE DETAILS diff --git a/crates/miden-protocol/src/note/header.rs b/crates/miden-protocol/src/note/header.rs index 6bf3663813..8507215f8f 100644 --- a/crates/miden-protocol/src/note/header.rs +++ b/crates/miden-protocol/src/note/header.rs @@ -1,12 +1,6 @@ use super::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - NoteDetailsCommitment, - NoteId, - NoteMetadata, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, NoteDetailsCommitment, NoteId, + NoteMetadata, Serializable, }; // NOTE HEADER diff --git a/crates/miden-protocol/src/note/location.rs b/crates/miden-protocol/src/note/location.rs index 1d5ed153d9..b4c6378011 100644 --- a/crates/miden-protocol/src/note/location.rs +++ b/crates/miden-protocol/src/note/location.rs @@ -1,12 +1,7 @@ use miden_crypto::merkle::SparseMerklePath; use super::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - NoteError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, NoteError, Serializable, }; use crate::block::BlockNumber; use crate::crypto::merkle::InnerNodeInfo; diff --git a/crates/miden-protocol/src/note/metadata.rs b/crates/miden-protocol/src/note/metadata.rs index 048bebc584..c46b3ff2b3 100644 --- a/crates/miden-protocol/src/note/metadata.rs +++ b/crates/miden-protocol/src/note/metadata.rs @@ -1,14 +1,6 @@ use super::{ - AccountId, - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Felt, - NoteTag, - NoteType, - Serializable, - Word, + AccountId, ByteReader, ByteWriter, Deserializable, DeserializationError, Felt, NoteTag, + NoteType, Serializable, Word, }; use crate::Hasher; use crate::note::{NoteAttachmentHeader, NoteAttachments}; diff --git a/crates/miden-protocol/src/note/mod.rs b/crates/miden-protocol/src/note/mod.rs index 7c39badf2e..ff93068433 100644 --- a/crates/miden-protocol/src/note/mod.rs +++ b/crates/miden-protocol/src/note/mod.rs @@ -3,11 +3,7 @@ use miden_crypto::Word; use crate::account::AccountId; use crate::errors::NoteError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Hasher, ZERO}; @@ -28,10 +24,7 @@ pub use metadata::{NoteMetadata, PartialNoteMetadata}; mod attachment; pub use attachment::{ - NoteAttachment, - NoteAttachmentContent, - NoteAttachmentHeader, - NoteAttachmentScheme, + NoteAttachment, NoteAttachmentContent, NoteAttachmentHeader, NoteAttachmentScheme, NoteAttachments, }; diff --git a/crates/miden-protocol/src/note/note_details_commitment.rs b/crates/miden-protocol/src/note/note_details_commitment.rs index f1c3fd7ac6..7d6778f053 100644 --- a/crates/miden-protocol/src/note/note_details_commitment.rs +++ b/crates/miden-protocol/src/note/note_details_commitment.rs @@ -5,11 +5,7 @@ use miden_crypto_derive::WordWrapper; use super::{Hasher, Word}; use crate::note::{NoteAssets, NoteRecipient}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // NOTE DETAILS COMMITMENT diff --git a/crates/miden-protocol/src/note/note_id.rs b/crates/miden-protocol/src/note/note_id.rs index c95da1f3b2..2126e39814 100644 --- a/crates/miden-protocol/src/note/note_id.rs +++ b/crates/miden-protocol/src/note/note_id.rs @@ -5,11 +5,7 @@ use miden_crypto_derive::WordWrapper; use super::{NoteDetailsCommitment, NoteMetadata}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Hasher, Word, WordError}; diff --git a/crates/miden-protocol/src/note/note_tag.rs b/crates/miden-protocol/src/note/note_tag.rs index 1d4e815cd6..973b5c9a6d 100644 --- a/crates/miden-protocol/src/note/note_tag.rs +++ b/crates/miden-protocol/src/note/note_tag.rs @@ -3,12 +3,7 @@ use core::fmt; use miden_crypto::Felt; use super::{ - AccountId, - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - NoteError, + AccountId, ByteReader, ByteWriter, Deserializable, DeserializationError, NoteError, Serializable, }; // NOTE TAG @@ -178,21 +173,15 @@ mod tests { use super::NoteTag; use crate::account::{AccountId, AccountType}; use crate::testing::account_id::{ - ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, - ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, - ACCOUNT_ID_PRIVATE_SENDER, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_2, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_3, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET_1, - ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, + ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, + ACCOUNT_ID_PRIVATE_SENDER, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_2, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_3, ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, + ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET_1, ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE_2, ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, - ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE_ON_CHAIN_2, - ACCOUNT_ID_SENDER, + ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE_ON_CHAIN_2, ACCOUNT_ID_SENDER, AccountIdBuilder, }; diff --git a/crates/miden-protocol/src/note/note_type.rs b/crates/miden-protocol/src/note/note_type.rs index 204746d336..3c4c9fdefa 100644 --- a/crates/miden-protocol/src/note/note_type.rs +++ b/crates/miden-protocol/src/note/note_type.rs @@ -4,11 +4,7 @@ use core::str::FromStr; use crate::Felt; use crate::errors::NoteError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // NOTE TYPE diff --git a/crates/miden-protocol/src/note/nullifier.rs b/crates/miden-protocol/src/note/nullifier.rs index 79ea1d2aad..77486e5690 100644 --- a/crates/miden-protocol/src/note/nullifier.rs +++ b/crates/miden-protocol/src/note/nullifier.rs @@ -6,14 +6,7 @@ use miden_crypto::WordError; use miden_crypto_derive::WordWrapper; use super::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Felt, - Hasher, - Serializable, - Word, + ByteReader, ByteWriter, Deserializable, DeserializationError, Felt, Hasher, Serializable, Word, ZERO, }; use crate::note::{NoteDetails, NoteMetadata, NoteScriptRoot}; diff --git a/crates/miden-protocol/src/note/partial.rs b/crates/miden-protocol/src/note/partial.rs index 3626bc8d3b..52b6fc0f4a 100644 --- a/crates/miden-protocol/src/note/partial.rs +++ b/crates/miden-protocol/src/note/partial.rs @@ -1,16 +1,6 @@ use super::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - NoteAssets, - NoteAttachments, - NoteDetailsCommitment, - NoteHeader, - NoteId, - NoteMetadata, - PartialNoteMetadata, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, NoteAssets, NoteAttachments, + NoteDetailsCommitment, NoteHeader, NoteId, NoteMetadata, PartialNoteMetadata, Serializable, }; use crate::Word; diff --git a/crates/miden-protocol/src/note/recipient.rs b/crates/miden-protocol/src/note/recipient.rs index 110b1383e5..37d2328a36 100644 --- a/crates/miden-protocol/src/note/recipient.rs +++ b/crates/miden-protocol/src/note/recipient.rs @@ -1,15 +1,8 @@ use core::fmt::Debug; use super::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Hasher, - NoteScript, - NoteStorage, - Serializable, - Word, + ByteReader, ByteWriter, Deserializable, DeserializationError, Hasher, NoteScript, NoteStorage, + Serializable, Word, }; /// Value that describes under which condition a note can be consumed. diff --git a/crates/miden-protocol/src/note/script.rs b/crates/miden-protocol/src/note/script.rs index 671bd15d26..68d2ed1bd5 100644 --- a/crates/miden-protocol/src/note/script.rs +++ b/crates/miden-protocol/src/note/script.rs @@ -17,11 +17,7 @@ use crate::errors::NoteError; use crate::package::{loaded_mast_forest, package_debug_info}; use crate::utils::create_external_node_forest; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::vm::{AdviceMap, Program}; use crate::{PrettyPrint, Word}; diff --git a/crates/miden-protocol/src/note/storage.rs b/crates/miden-protocol/src/note/storage.rs index 01af8614ad..2bd2021d00 100644 --- a/crates/miden-protocol/src/note/storage.rs +++ b/crates/miden-protocol/src/note/storage.rs @@ -2,11 +2,7 @@ use alloc::vec::Vec; use crate::errors::NoteError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Hasher, MAX_NOTE_STORAGE_ITEMS, Word}; diff --git a/crates/miden-protocol/src/testing/account.rs b/crates/miden-protocol/src/testing/account.rs index 036ce0513f..697e30a96e 100644 --- a/crates/miden-protocol/src/testing/account.rs +++ b/crates/miden-protocol/src/testing/account.rs @@ -3,8 +3,7 @@ use crate::Felt; use crate::account::{Account, AccountCode, AccountId, AccountStorage}; use crate::asset::{Asset, AssetVault, FungibleAsset, NonFungibleAsset}; use crate::testing::account_id::{ - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_2, }; diff --git a/crates/miden-protocol/src/testing/asset.rs b/crates/miden-protocol/src/testing/asset.rs index 1a48b103e6..60f1e2dc1b 100644 --- a/crates/miden-protocol/src/testing/asset.rs +++ b/crates/miden-protocol/src/testing/asset.rs @@ -1,8 +1,7 @@ use crate::account::AccountId; use crate::asset::{Asset, FungibleAsset, NonFungibleAsset, NonFungibleAssetDetails}; use crate::testing::account_id::{ - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, }; impl NonFungibleAsset { diff --git a/crates/miden-protocol/src/testing/note.rs b/crates/miden-protocol/src/testing/note.rs index b877dddb25..5b787a6fd6 100644 --- a/crates/miden-protocol/src/testing/note.rs +++ b/crates/miden-protocol/src/testing/note.rs @@ -3,13 +3,7 @@ use alloc::vec::Vec; use crate::Word; use crate::asset::FungibleAsset; use crate::note::{ - Note, - NoteAssets, - NoteRecipient, - NoteScript, - NoteStorage, - NoteTag, - NoteType, + Note, NoteAssets, NoteRecipient, NoteScript, NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use crate::testing::account_id::ACCOUNT_ID_SENDER; diff --git a/crates/miden-protocol/src/testing/storage.rs b/crates/miden-protocol/src/testing/storage.rs index 4a30ef1c97..31d3764510 100644 --- a/crates/miden-protocol/src/testing/storage.rs +++ b/crates/miden-protocol/src/testing/storage.rs @@ -4,16 +4,8 @@ use alloc::vec::Vec; use miden_core::{Felt, Word}; use crate::account::{ - AccountStorage, - AccountStoragePatch, - StorageMap, - StorageMapKey, - StorageMapPatch, - StorageMapPatchEntries, - StorageSlot, - StorageSlotName, - StorageSlotPatch, - StorageValuePatch, + AccountStorage, AccountStoragePatch, StorageMap, StorageMapKey, StorageMapPatch, + StorageMapPatchEntries, StorageSlot, StorageSlotName, StorageSlotPatch, StorageValuePatch, }; use crate::utils::sync::LazyLock; diff --git a/crates/miden-protocol/src/transaction/executed_tx.rs b/crates/miden-protocol/src/transaction/executed_tx.rs index a431f7506c..7d042d0261 100644 --- a/crates/miden-protocol/src/transaction/executed_tx.rs +++ b/crates/miden-protocol/src/transaction/executed_tx.rs @@ -1,26 +1,14 @@ use alloc::vec::Vec; use super::{ - AccountHeader, - AccountId, - AdviceInputs, - InputNote, - InputNotes, - NoteId, - RawOutputNotes, - TransactionArgs, - TransactionId, - TransactionOutputs, + AccountHeader, AccountId, AdviceInputs, InputNote, InputNotes, NoteId, RawOutputNotes, + TransactionArgs, TransactionId, TransactionOutputs, }; use crate::account::{AccountPatch, PartialAccount}; use crate::block::{BlockHeader, BlockNumber}; use crate::transaction::TransactionInputs; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // EXECUTED TRANSACTION diff --git a/crates/miden-protocol/src/transaction/inputs/account.rs b/crates/miden-protocol/src/transaction/inputs/account.rs index e7e43446a3..b07f15160d 100644 --- a/crates/miden-protocol/src/transaction/inputs/account.rs +++ b/crates/miden-protocol/src/transaction/inputs/account.rs @@ -4,11 +4,7 @@ use crate::asset::PartialVault; use crate::block::account_tree::AccountWitness; use crate::crypto::merkle::smt::{SmtProof, SmtProofError}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // ACCOUNT INPUTS diff --git a/crates/miden-protocol/src/transaction/inputs/mod.rs b/crates/miden-protocol/src/transaction/inputs/mod.rs index 29b206d454..fa410504b0 100644 --- a/crates/miden-protocol/src/transaction/inputs/mod.rs +++ b/crates/miden-protocol/src/transaction/inputs/mod.rs @@ -8,16 +8,8 @@ use miden_crypto::merkle::smt::{SmtLeaf, SmtProof}; use super::PartialBlockchain; use crate::account::{ - AccountCode, - AccountHeader, - AccountId, - AccountStorageHeader, - PartialAccount, - PartialStorage, - StorageMapKey, - StorageMapWitness, - StorageSlotId, - StorageSlotName, + AccountCode, AccountHeader, AccountId, AccountStorageHeader, PartialAccount, PartialStorage, + StorageMapKey, StorageMapWitness, StorageSlotId, StorageSlotName, }; use crate::asset::{Asset, AssetId, AssetWitness, PartialVault}; use crate::block::account_tree::{AccountIdKey, AccountWitness}; @@ -27,11 +19,7 @@ use crate::errors::{TransactionInputError, TransactionInputsExtractionError}; use crate::note::{Note, NoteInclusionProof}; use crate::transaction::{TransactionArgs, TransactionScript}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Word}; diff --git a/crates/miden-protocol/src/transaction/inputs/notes.rs b/crates/miden-protocol/src/transaction/inputs/notes.rs index 1c1bbafe74..866af3e230 100644 --- a/crates/miden-protocol/src/transaction/inputs/notes.rs +++ b/crates/miden-protocol/src/transaction/inputs/notes.rs @@ -5,11 +5,7 @@ use super::TransactionInputError; use crate::note::{Note, NoteId, NoteInclusionProof, NoteLocation, Nullifier}; use crate::transaction::InputNoteCommitment; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Hasher, MAX_INPUT_NOTES_PER_TX, Word}; diff --git a/crates/miden-protocol/src/transaction/inputs/tests.rs b/crates/miden-protocol/src/transaction/inputs/tests.rs index fa6b20e9f1..a851b4251e 100644 --- a/crates/miden-protocol/src/transaction/inputs/tests.rs +++ b/crates/miden-protocol/src/transaction/inputs/tests.rs @@ -5,15 +5,8 @@ use std::collections::BTreeMap; use std::vec::Vec; use crate::account::{ - AccountCode, - AccountHeader, - AccountId, - AccountStorageHeader, - PartialAccount, - PartialStorage, - StorageSlotHeader, - StorageSlotName, - StorageSlotType, + AccountCode, AccountHeader, AccountId, AccountStorageHeader, PartialAccount, PartialStorage, + StorageSlotHeader, StorageSlotName, StorageSlotType, }; use crate::asset::PartialVault; use crate::block::account_tree::AccountIdKey; @@ -297,11 +290,7 @@ fn test_transaction_inputs_serialization_with_foreign_slot_names() { use miden_core::Felt; use crate::account::{ - AccountCode, - AccountId, - AccountStorageHeader, - PartialAccount, - PartialStorage, + AccountCode, AccountId, AccountStorageHeader, PartialAccount, PartialStorage, StorageSlotName, }; use crate::asset::PartialVault; diff --git a/crates/miden-protocol/src/transaction/kernel/advice_inputs.rs b/crates/miden-protocol/src/transaction/kernel/advice_inputs.rs index 8b47a94238..9f0b6c36dd 100644 --- a/crates/miden-protocol/src/transaction/kernel/advice_inputs.rs +++ b/crates/miden-protocol/src/transaction/kernel/advice_inputs.rs @@ -7,11 +7,7 @@ use crate::block::account_tree::{AccountIdKey, AccountWitness}; use crate::crypto::SequentialCommit; use crate::crypto::merkle::InnerNodeInfo; use crate::transaction::{ - AccountInputs, - InputNote, - PartialBlockchain, - TransactionInputs, - TransactionKernel, + AccountInputs, InputNote, PartialBlockchain, TransactionInputs, TransactionKernel, }; use crate::vm::AdviceInputs; use crate::{EMPTY_WORD, Felt, Word, ZERO}; diff --git a/crates/miden-protocol/src/transaction/kernel/mod.rs b/crates/miden-protocol/src/transaction/kernel/mod.rs index df0651ba81..d1eed2d6fe 100644 --- a/crates/miden-protocol/src/transaction/kernel/mod.rs +++ b/crates/miden-protocol/src/transaction/kernel/mod.rs @@ -15,13 +15,7 @@ use crate::protocol::ProtocolLib; use crate::transaction::{RawOutputNote, RawOutputNotes, TransactionInputs, TransactionOutputs}; use crate::utils::sync::LazyLock; use crate::vm::{ - AdviceInputs, - DebugSourceNodeId, - Package, - PackageDebugInfo, - Program, - ProgramInfo, - StackInputs, + AdviceInputs, DebugSourceNodeId, Package, PackageDebugInfo, Program, ProgramInfo, StackInputs, StackOutputs, }; use crate::{Felt, Hasher, Word}; diff --git a/crates/miden-protocol/src/transaction/mod.rs b/crates/miden-protocol/src/transaction/mod.rs index 2133f1951e..fedca7ba48 100644 --- a/crates/miden-protocol/src/transaction/mod.rs +++ b/crates/miden-protocol/src/transaction/mod.rs @@ -21,23 +21,14 @@ pub use inputs::{AccountInputs, InputNote, InputNotes, ToInputNoteCommitments, T pub use kernel::{TransactionAdviceInputs, TransactionEventId, TransactionKernel, memory}; pub use ordered_transactions::OrderedTransactionHeaders; pub use outputs::{ - OutputNote, - OutputNoteCollection, - OutputNotes, - PrivateOutputNote, - PublicOutputNote, - RawOutputNote, - RawOutputNotes, - TransactionOutputs, + OutputNote, OutputNoteCollection, OutputNotes, PrivateOutputNote, PublicOutputNote, + RawOutputNote, RawOutputNotes, TransactionOutputs, }; pub use partial_blockchain::PartialBlockchain; pub use proven_tx::{InputNoteCommitment, ProvenTransaction, TxAccountUpdate}; pub use transaction_id::TransactionId; pub use tx_args::{ - TRANSACTION_SCRIPT_ATTRIBUTE, - TransactionArgs, - TransactionScript, - TransactionScriptRoot, + TRANSACTION_SCRIPT_ATTRIBUTE, TransactionArgs, TransactionScript, TransactionScriptRoot, }; pub use tx_header::TransactionHeader; pub use tx_summary::TransactionSummary; diff --git a/crates/miden-protocol/src/transaction/ordered_transactions.rs b/crates/miden-protocol/src/transaction/ordered_transactions.rs index fbf32c8e72..c266fb3d6b 100644 --- a/crates/miden-protocol/src/transaction/ordered_transactions.rs +++ b/crates/miden-protocol/src/transaction/ordered_transactions.rs @@ -3,11 +3,7 @@ use alloc::vec::Vec; use crate::account::AccountId; use crate::transaction::{TransactionHeader, TransactionId}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Hasher, Word, ZERO}; diff --git a/crates/miden-protocol/src/transaction/outputs/mod.rs b/crates/miden-protocol/src/transaction/outputs/mod.rs index bf3c39ecb7..e9f39d602f 100644 --- a/crates/miden-protocol/src/transaction/outputs/mod.rs +++ b/crates/miden-protocol/src/transaction/outputs/mod.rs @@ -4,22 +4,13 @@ use crate::Word; use crate::account::AccountHeader; use crate::block::BlockNumber; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; mod notes; pub use notes::{ - OutputNote, - OutputNoteCollection, - OutputNotes, - PrivateOutputNote, - PublicOutputNote, - RawOutputNote, - RawOutputNotes, + OutputNote, OutputNoteCollection, OutputNotes, PrivateOutputNote, PublicOutputNote, + RawOutputNote, RawOutputNotes, }; #[cfg(test)] diff --git a/crates/miden-protocol/src/transaction/outputs/notes.rs b/crates/miden-protocol/src/transaction/outputs/notes.rs index 1199d5f0a1..94be721c92 100644 --- a/crates/miden-protocol/src/transaction/outputs/notes.rs +++ b/crates/miden-protocol/src/transaction/outputs/notes.rs @@ -6,22 +6,11 @@ use core::fmt::Debug; use crate::constants::NOTE_MAX_SIZE; use crate::errors::{OutputNoteError, TransactionOutputError}; use crate::note::{ - Note, - NoteAssets, - NoteAttachments, - NoteDetailsCommitment, - NoteHeader, - NoteId, - NoteMetadata, - NoteRecipient, - PartialNote, + Note, NoteAssets, NoteAttachments, NoteDetailsCommitment, NoteHeader, NoteId, NoteMetadata, + NoteRecipient, PartialNote, }; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Hasher, MAX_OUTPUT_NOTES_PER_TX, Word}; diff --git a/crates/miden-protocol/src/transaction/outputs/tests.rs b/crates/miden-protocol/src/transaction/outputs/tests.rs index 612389234c..826453ba14 100644 --- a/crates/miden-protocol/src/transaction/outputs/tests.rs +++ b/crates/miden-protocol/src/transaction/outputs/tests.rs @@ -9,19 +9,11 @@ use crate::asset::FungibleAsset; use crate::constants::NOTE_MAX_SIZE; use crate::errors::{OutputNoteError, TransactionOutputError}; use crate::note::{ - Note, - NoteAssets, - NoteRecipient, - NoteScript, - NoteStorage, - NoteTag, - NoteType, + Note, NoteAssets, NoteRecipient, NoteScript, NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use crate::testing::account_id::{ - ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_SENDER, + ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_SENDER, }; use crate::utils::serde::Serializable; use crate::{Felt, Word}; diff --git a/crates/miden-protocol/src/transaction/proven_tx.rs b/crates/miden-protocol/src/transaction/proven_tx.rs index 08b6674dd7..2323b1c519 100644 --- a/crates/miden-protocol/src/transaction/proven_tx.rs +++ b/crates/miden-protocol/src/transaction/proven_tx.rs @@ -8,19 +8,10 @@ use crate::block::BlockNumber; use crate::errors::ProvenTransactionError; use crate::note::{NoteHeader, NoteId}; use crate::transaction::{ - AccountId, - InputNotes, - Nullifier, - OutputNote, - OutputNotes, - TransactionId, + AccountId, InputNotes, Nullifier, OutputNote, OutputNotes, TransactionId, }; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::vm::ExecutionProof; use crate::{ACCOUNT_UPDATE_MAX_SIZE, Word}; @@ -584,23 +575,13 @@ mod tests { use super::ProvenTransaction; use crate::account::{ - Account, - AccountId, - AccountPatch, - AccountStoragePatch, - AccountType, - AccountUpdateDetails, - AccountVaultPatch, - StorageMapKey, - StorageMapPatch, - StorageMapPatchEntries, - StorageSlotName, + Account, AccountId, AccountPatch, AccountStoragePatch, AccountType, AccountUpdateDetails, + AccountVaultPatch, StorageMapKey, StorageMapPatch, StorageMapPatchEntries, StorageSlotName, }; use crate::block::BlockNumber; use crate::errors::ProvenTransactionError; use crate::testing::account_id::{ - ACCOUNT_ID_PRIVATE_SENDER, - ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, + ACCOUNT_ID_PRIVATE_SENDER, ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, }; use crate::testing::add_component::AddComponent; use crate::testing::noop_auth_component::NoopAuthComponent; diff --git a/crates/miden-protocol/src/transaction/transaction_id.rs b/crates/miden-protocol/src/transaction/transaction_id.rs index 4eb53a1932..ff977c3d94 100644 --- a/crates/miden-protocol/src/transaction/transaction_id.rs +++ b/crates/miden-protocol/src/transaction/transaction_id.rs @@ -5,11 +5,7 @@ use miden_crypto_derive::WordWrapper; use super::{Hasher, ProvenTransaction, WORD_SIZE, Word, ZERO}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // TRANSACTION ID diff --git a/crates/miden-protocol/src/transaction/tx_args.rs b/crates/miden-protocol/src/transaction/tx_args.rs index 7a23796c36..814da2b2e8 100644 --- a/crates/miden-protocol/src/transaction/tx_args.rs +++ b/crates/miden-protocol/src/transaction/tx_args.rs @@ -19,11 +19,7 @@ use crate::note::{NoteId, NoteRecipient}; use crate::package::{loaded_mast_forest, package_debug_info}; use crate::utils::create_external_node_forest; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::vm::{AdviceInputs, AdviceMap, Program}; use crate::{EMPTY_WORD, MastForest, MastNodeId}; diff --git a/crates/miden-protocol/src/transaction/tx_header.rs b/crates/miden-protocol/src/transaction/tx_header.rs index 0a6a561281..0d00545563 100644 --- a/crates/miden-protocol/src/transaction/tx_header.rs +++ b/crates/miden-protocol/src/transaction/tx_header.rs @@ -3,20 +3,11 @@ use alloc::vec::Vec; use crate::Word; use crate::note::NoteHeader; use crate::transaction::{ - AccountId, - ExecutedTransaction, - InputNoteCommitment, - InputNotes, - ProvenTransaction, - RawOutputNotes, - TransactionId, + AccountId, ExecutedTransaction, InputNoteCommitment, InputNotes, ProvenTransaction, + RawOutputNotes, TransactionId, }; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; /// A transaction header derived from a diff --git a/crates/miden-protocol/src/transaction/tx_summary.rs b/crates/miden-protocol/src/transaction/tx_summary.rs index f02342e456..f6060f1793 100644 --- a/crates/miden-protocol/src/transaction/tx_summary.rs +++ b/crates/miden-protocol/src/transaction/tx_summary.rs @@ -4,11 +4,7 @@ use crate::account::AccountDelta; use crate::crypto::SequentialCommit; use crate::transaction::{InputNote, InputNotes, RawOutputNotes}; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; use crate::{Felt, Word}; diff --git a/crates/miden-protocol/src/utils/mod.rs b/crates/miden-protocol/src/utils/mod.rs index d63914a238..f83786d08e 100644 --- a/crates/miden-protocol/src/utils/mod.rs +++ b/crates/miden-protocol/src/utils/mod.rs @@ -11,12 +11,7 @@ use crate::vm::AdviceMap; pub mod serde { pub use miden_crypto::utils::{ - BudgetedReader, - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + BudgetedReader, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, SliceReader, }; } diff --git a/crates/miden-standards/asm/standards/notes/pswap.masm b/crates/miden-standards/asm/standards/notes/pswap.masm index 964706918b..90d31bfe25 100644 --- a/crates/miden-standards/asm/standards/notes/pswap.masm +++ b/crates/miden-standards/asm/standards/notes/pswap.masm @@ -16,7 +16,7 @@ use miden::standards::note::note_creator # CONSTANTS # ================================================================================================= -const NUM_STORAGE_ITEMS=6 +const NUM_STORAGE_ITEMS=7 const MAX_U32=0x0000000100000000 # Attachment scheme used by both PSWAP output notes (payback P2ID + remainder PSWAP). @@ -96,7 +96,7 @@ const PARENT_ATTACHMENT_DEPTH_OFFSET = 2 # ERRORS # ================================================================================================= -const ERR_PSWAP_WRONG_NUMBER_OF_STORAGE_ITEMS="PSWAP script expects exactly 6 note storage items" +const ERR_PSWAP_WRONG_NUMBER_OF_STORAGE_ITEMS="PSWAP script expects exactly 7 note storage items" const ERR_PSWAP_WRONG_NUMBER_OF_ASSETS="PSWAP script requires exactly one note asset" const ERR_PSWAP_FILL_SUM_OVERFLOW="PSWAP account_fill + note_fill overflows u64" const ERR_PSWAP_NOT_VALID_ASSET_AMOUNT="PSWAP computed amount exceeds max fungible asset amount" diff --git a/crates/miden-standards/src/account/access/authority.rs b/crates/miden-standards/src/account/access/authority.rs index 38e3e4cfc6..e6b4b4c737 100644 --- a/crates/miden-standards/src/account/access/authority.rs +++ b/crates/miden-standards/src/account/access/authority.rs @@ -2,23 +2,12 @@ use alloc::collections::BTreeMap; use alloc::vec; use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - FeltSchema, - SchemaType, - StorageSchema, + AccountComponentCode, AccountComponentMetadata, FeltSchema, SchemaType, StorageSchema, StorageSlotSchema, }; use miden_protocol::account::{ - AccountComponent, - AccountProcedureRoot, - AccountStorage, - RoleSymbol, - StorageMap, - StorageMapKey, - StorageSlot, - StorageSlotContent, - StorageSlotName, + AccountComponent, AccountProcedureRoot, AccountStorage, RoleSymbol, StorageMap, StorageMapKey, + StorageSlot, StorageSlotContent, StorageSlotName, }; use miden_protocol::errors::{AccountError, RoleSymbolError}; use miden_protocol::utils::sync::LazyLock; diff --git a/crates/miden-standards/src/account/access/ownable2step.rs b/crates/miden-standards/src/account/access/ownable2step.rs index 2e828ec80f..34d266eb86 100644 --- a/crates/miden-standards/src/account/access/ownable2step.rs +++ b/crates/miden-standards/src/account/access/ownable2step.rs @@ -1,17 +1,8 @@ use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - FeltSchema, - StorageSchema, - StorageSlotSchema, + AccountComponentCode, AccountComponentMetadata, FeltSchema, StorageSchema, StorageSlotSchema, }; use miden_protocol::account::{ - AccountComponent, - AccountComponentName, - AccountId, - AccountStorage, - StorageSlot, - StorageSlotName, + AccountComponent, AccountComponentName, AccountId, AccountStorage, StorageSlot, StorageSlotName, }; use miden_protocol::errors::AccountIdError; use miden_protocol::utils::sync::LazyLock; diff --git a/crates/miden-standards/src/account/access/pausable/mod.rs b/crates/miden-standards/src/account/access/pausable/mod.rs index f821d9f7b1..0842f78f96 100644 --- a/crates/miden-standards/src/account/access/pausable/mod.rs +++ b/crates/miden-standards/src/account/access/pausable/mod.rs @@ -1,14 +1,8 @@ use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - StorageSchema, - StorageSlotSchema, + AccountComponentCode, AccountComponentMetadata, StorageSchema, StorageSlotSchema, }; use miden_protocol::account::{ - AccountComponent, - AccountProcedureRoot, - StorageSlot, - StorageSlotName, + AccountComponent, AccountProcedureRoot, StorageSlot, StorageSlotName, }; use miden_protocol::utils::sync::LazyLock; use miden_protocol::{Felt, Word}; diff --git a/crates/miden-standards/src/account/access/rbac.rs b/crates/miden-standards/src/account/access/rbac.rs index 8fc902f304..68212b60ce 100644 --- a/crates/miden-standards/src/account/access/rbac.rs +++ b/crates/miden-standards/src/account/access/rbac.rs @@ -2,21 +2,11 @@ use alloc::collections::BTreeSet; use alloc::vec; use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - SchemaType, - StorageSchema, - StorageSlotSchema, + AccountComponentCode, AccountComponentMetadata, SchemaType, StorageSchema, StorageSlotSchema, }; use miden_protocol::account::{ - AccountComponent, - AccountComponentName, - AccountId, - RoleSymbol, - StorageMap, - StorageMapKey, - StorageSlot, - StorageSlotName, + AccountComponent, AccountComponentName, AccountId, RoleSymbol, StorageMap, StorageMapKey, + StorageSlot, StorageSlotName, }; use miden_protocol::utils::sync::LazyLock; use miden_protocol::{Felt, Word}; diff --git a/crates/miden-standards/src/account/access/warden.rs b/crates/miden-standards/src/account/access/warden.rs index c943173925..8d50420ee0 100644 --- a/crates/miden-standards/src/account/access/warden.rs +++ b/crates/miden-standards/src/account/access/warden.rs @@ -1,17 +1,8 @@ use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - FeltSchema, - StorageSchema, - StorageSlotSchema, + AccountComponentCode, AccountComponentMetadata, FeltSchema, StorageSchema, StorageSlotSchema, }; use miden_protocol::account::{ - AccountComponent, - AccountComponentName, - AccountId, - AccountStorage, - StorageSlot, - StorageSlotName, + AccountComponent, AccountComponentName, AccountId, AccountStorage, StorageSlot, StorageSlotName, }; use miden_protocol::errors::AccountIdError; use miden_protocol::utils::sync::LazyLock; diff --git a/crates/miden-standards/src/account/auth/guarded_multisig.rs b/crates/miden-standards/src/account/auth/guarded_multisig.rs index ac61e51d1f..5639a7d66d 100644 --- a/crates/miden-standards/src/account/auth/guarded_multisig.rs +++ b/crates/miden-standards/src/account/auth/guarded_multisig.rs @@ -4,20 +4,11 @@ use alloc::vec::Vec; use miden_protocol::Word; use miden_protocol::account::auth::{AuthScheme, PublicKeyCommitment}; use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - SchemaType, - StorageSchema, - StorageSlotSchema, + AccountComponentCode, AccountComponentMetadata, SchemaType, StorageSchema, StorageSlotSchema, }; use miden_protocol::account::{ - AccountComponent, - AccountComponentName, - AccountProcedureRoot, - StorageMap, - StorageMapKey, - StorageSlot, - StorageSlotName, + AccountComponent, AccountComponentName, AccountProcedureRoot, StorageMap, StorageMapKey, + StorageSlot, StorageSlotName, }; use miden_protocol::errors::AccountError; use miden_protocol::utils::sync::LazyLock; diff --git a/crates/miden-standards/src/account/auth/mod.rs b/crates/miden-standards/src/account/auth/mod.rs index 66abea07fa..9bcbf6e616 100644 --- a/crates/miden-standards/src/account/auth/mod.rs +++ b/crates/miden-standards/src/account/auth/mod.rs @@ -21,10 +21,7 @@ pub use guarded_multisig::{AuthGuardedMultisig, AuthGuardedMultisigConfig, Guard mod network_account; pub use network_account::{ - AuthNetworkAccount, - NetworkAccount, - NetworkAccountNoteAllowlist, - NetworkAccountNoteAllowlistError, - NetworkAccountTxScriptAllowlist, + AuthNetworkAccount, NetworkAccount, NetworkAccountNoteAllowlist, + NetworkAccountNoteAllowlistError, NetworkAccountTxScriptAllowlist, NetworkAccountTxScriptAllowlistError, }; diff --git a/crates/miden-standards/src/account/auth/multisig.rs b/crates/miden-standards/src/account/auth/multisig.rs index 3a9e611ff0..b588ebf833 100644 --- a/crates/miden-standards/src/account/auth/multisig.rs +++ b/crates/miden-standards/src/account/auth/multisig.rs @@ -3,21 +3,12 @@ use alloc::vec::Vec; use miden_protocol::Word; use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - FeltSchema, - SchemaType, - StorageSchema, + AccountComponentCode, AccountComponentMetadata, FeltSchema, SchemaType, StorageSchema, StorageSlotSchema, }; use miden_protocol::account::{ - AccountComponent, - AccountComponentName, - AccountProcedureRoot, - StorageMap, - StorageMapKey, - StorageSlot, - StorageSlotName, + AccountComponent, AccountComponentName, AccountProcedureRoot, StorageMap, StorageMapKey, + StorageSlot, StorageSlotName, }; use miden_protocol::errors::AccountError; use miden_protocol::utils::sync::LazyLock; diff --git a/crates/miden-standards/src/account/auth/multisig_smart/component.rs b/crates/miden-standards/src/account/auth/multisig_smart/component.rs index b016642eae..fc1ce17c5f 100644 --- a/crates/miden-standards/src/account/auth/multisig_smart/component.rs +++ b/crates/miden-standards/src/account/auth/multisig_smart/component.rs @@ -2,18 +2,10 @@ use alloc::vec::Vec; use miden_protocol::Word; use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - SchemaType, - StorageSchema, - StorageSlotSchema, + AccountComponentCode, AccountComponentMetadata, SchemaType, StorageSchema, StorageSlotSchema, }; use miden_protocol::account::{ - AccountComponent, - StorageMap, - StorageMapKey, - StorageSlot, - StorageSlotName, + AccountComponent, StorageMap, StorageMapKey, StorageSlot, StorageSlotName, }; use miden_protocol::errors::AccountError; use miden_protocol::utils::sync::LazyLock; @@ -22,9 +14,7 @@ use miden_protocol::utils::sync::LazyLock; // are exposed as `pub(super)` in the sibling `multisig` module; we reference them directly so // the sharing is visible at the use site rather than hidden behind delegating methods. use super::super::multisig::{ - APPROVER_PUBKEYS_SLOT_NAME, - APPROVER_SCHEME_ID_SLOT_NAME, - EXECUTED_TRANSACTIONS_SLOT_NAME, + APPROVER_PUBKEYS_SLOT_NAME, APPROVER_SCHEME_ID_SLOT_NAME, EXECUTED_TRANSACTIONS_SLOT_NAME, THRESHOLD_CONFIG_SLOT_NAME, }; use super::ProcedurePolicy; diff --git a/crates/miden-standards/src/account/auth/multisig_smart/mod.rs b/crates/miden-standards/src/account/auth/multisig_smart/mod.rs index 8a3b7e705b..c6b815e48e 100644 --- a/crates/miden-standards/src/account/auth/multisig_smart/mod.rs +++ b/crates/miden-standards/src/account/auth/multisig_smart/mod.rs @@ -3,7 +3,5 @@ mod procedure_policies; pub use component::{AuthMultisigSmart, AuthMultisigSmartConfig}; pub use procedure_policies::{ - ProcedurePolicy, - ProcedurePolicyExecutionMode, - ProcedurePolicyNoteRestriction, + ProcedurePolicy, ProcedurePolicyExecutionMode, ProcedurePolicyNoteRestriction, }; diff --git a/crates/miden-standards/src/account/auth/network_account/auth_network_account.rs b/crates/miden-standards/src/account/auth/network_account/auth_network_account.rs index 8a2c363e35..edc705dbde 100644 --- a/crates/miden-standards/src/account/auth/network_account/auth_network_account.rs +++ b/crates/miden-standards/src/account/auth/network_account/auth_network_account.rs @@ -2,19 +2,14 @@ use alloc::collections::BTreeSet; use alloc::vec; use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - StorageSchema, - StorageSlotSchema, + AccountComponentCode, AccountComponentMetadata, StorageSchema, StorageSlotSchema, }; use miden_protocol::account::{AccountComponent, AccountComponentName, StorageSlotName}; use miden_protocol::note::NoteScriptRoot; use miden_protocol::transaction::TransactionScriptRoot; use super::{ - NetworkAccountNoteAllowlist, - NetworkAccountNoteAllowlistError, - NetworkAccountTxScriptAllowlist, + NetworkAccountNoteAllowlist, NetworkAccountNoteAllowlistError, NetworkAccountTxScriptAllowlist, }; use crate::account::account_component_code; diff --git a/crates/miden-standards/src/account/auth/network_account/mod.rs b/crates/miden-standards/src/account/auth/network_account/mod.rs index d1362af9ab..8e5909c0fd 100644 --- a/crates/miden-standards/src/account/auth/network_account/mod.rs +++ b/crates/miden-standards/src/account/auth/network_account/mod.rs @@ -10,6 +10,5 @@ pub use note_allowlist::{NetworkAccountNoteAllowlist, NetworkAccountNoteAllowlis mod tx_script_allowlist; pub use tx_script_allowlist::{ - NetworkAccountTxScriptAllowlist, - NetworkAccountTxScriptAllowlistError, + NetworkAccountTxScriptAllowlist, NetworkAccountTxScriptAllowlistError, }; diff --git a/crates/miden-standards/src/account/auth/network_account/network_account.rs b/crates/miden-standards/src/account/auth/network_account/network_account.rs index 9f3e9aef7b..33a61c81b3 100644 --- a/crates/miden-standards/src/account/auth/network_account/network_account.rs +++ b/crates/miden-standards/src/account/auth/network_account/network_account.rs @@ -1,8 +1,7 @@ use miden_protocol::account::{Account, AccountId, AccountStorage}; use crate::account::auth::network_account::{ - NetworkAccountNoteAllowlist, - NetworkAccountNoteAllowlistError, + NetworkAccountNoteAllowlist, NetworkAccountNoteAllowlistError, }; // NETWORK ACCOUNT diff --git a/crates/miden-standards/src/account/auth/network_account/note_allowlist.rs b/crates/miden-standards/src/account/auth/network_account/note_allowlist.rs index 5d458e39ff..3d5418ef35 100644 --- a/crates/miden-standards/src/account/auth/network_account/note_allowlist.rs +++ b/crates/miden-standards/src/account/auth/network_account/note_allowlist.rs @@ -2,12 +2,7 @@ use alloc::collections::BTreeSet; use miden_protocol::account::component::{SchemaType, StorageSlotSchema}; use miden_protocol::account::{ - AccountId, - AccountStorage, - StorageMap, - StorageMapKey, - StorageSlot, - StorageSlotContent, + AccountId, AccountStorage, StorageMap, StorageMapKey, StorageSlot, StorageSlotContent, StorageSlotName, }; use miden_protocol::note::NoteScriptRoot; diff --git a/crates/miden-standards/src/account/auth/network_account/tx_script_allowlist.rs b/crates/miden-standards/src/account/auth/network_account/tx_script_allowlist.rs index 58d78b6340..211fc89e77 100644 --- a/crates/miden-standards/src/account/auth/network_account/tx_script_allowlist.rs +++ b/crates/miden-standards/src/account/auth/network_account/tx_script_allowlist.rs @@ -2,12 +2,7 @@ use alloc::collections::BTreeSet; use miden_protocol::account::component::{SchemaType, StorageSlotSchema}; use miden_protocol::account::{ - AccountStorage, - StorageMap, - StorageMapKey, - StorageSlot, - StorageSlotContent, - StorageSlotName, + AccountStorage, StorageMap, StorageMapKey, StorageSlot, StorageSlotContent, StorageSlotName, }; use miden_protocol::transaction::TransactionScriptRoot; use miden_protocol::utils::sync::LazyLock; diff --git a/crates/miden-standards/src/account/auth/singlesig.rs b/crates/miden-standards/src/account/auth/singlesig.rs index 721ca1af04..b9e347f2e1 100644 --- a/crates/miden-standards/src/account/auth/singlesig.rs +++ b/crates/miden-standards/src/account/auth/singlesig.rs @@ -1,17 +1,10 @@ use miden_protocol::Word; use miden_protocol::account::auth::{AuthScheme, PublicKey}; use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - SchemaType, - StorageSchema, - StorageSlotSchema, + AccountComponentCode, AccountComponentMetadata, SchemaType, StorageSchema, StorageSlotSchema, }; use miden_protocol::account::{ - AccountComponent, - AccountComponentName, - StorageSlot, - StorageSlotName, + AccountComponent, AccountComponentName, StorageSlot, StorageSlotName, }; use miden_protocol::crypto::dsa::{ecdsa_k256_keccak, falcon512_poseidon2}; use miden_protocol::utils::sync::LazyLock; diff --git a/crates/miden-standards/src/account/auth/singlesig_acl.rs b/crates/miden-standards/src/account/auth/singlesig_acl.rs index 86c49ce19d..65faf27aa2 100644 --- a/crates/miden-standards/src/account/auth/singlesig_acl.rs +++ b/crates/miden-standards/src/account/auth/singlesig_acl.rs @@ -3,21 +3,11 @@ use alloc::vec::Vec; use miden_protocol::Word; use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - SchemaType, - StorageSchema, - StorageSlotSchema, + AccountComponentCode, AccountComponentMetadata, SchemaType, StorageSchema, StorageSlotSchema, }; use miden_protocol::account::{ - AccountCode, - AccountComponent, - AccountComponentName, - AccountProcedureRoot, - StorageMap, - StorageMapKey, - StorageSlot, - StorageSlotName, + AccountCode, AccountComponent, AccountComponentName, AccountProcedureRoot, StorageMap, + StorageMapKey, StorageSlot, StorageSlotName, }; use miden_protocol::errors::AccountError; use miden_protocol::utils::sync::LazyLock; diff --git a/crates/miden-standards/src/account/components/mod.rs b/crates/miden-standards/src/account/components/mod.rs index 8b81b39b34..33fb715385 100644 --- a/crates/miden-standards/src/account/components/mod.rs +++ b/crates/miden-standards/src/account/components/mod.rs @@ -5,13 +5,8 @@ use miden_protocol::account::AccountProcedureRoot; use crate::account::access::{Authority, Ownable2Step, RoleBasedAccessControl}; use crate::account::auth::{ - AuthGuardedMultisig, - AuthMultisig, - AuthMultisigSmart, - AuthNetworkAccount, - AuthSingleSig, - AuthSingleSigAcl, - NoAuth, + AuthGuardedMultisig, AuthMultisig, AuthMultisigSmart, AuthNetworkAccount, AuthSingleSig, + AuthSingleSigAcl, NoAuth, }; use crate::account::faucets::FungibleFaucet; use crate::account::inspection::CodeInspection; diff --git a/crates/miden-standards/src/account/faucets/fungible/mod.rs b/crates/miden-standards/src/account/faucets/fungible/mod.rs index 50cdb04f3c..9c8863fced 100644 --- a/crates/miden-standards/src/account/faucets/fungible/mod.rs +++ b/crates/miden-standards/src/account/faucets/fungible/mod.rs @@ -1,24 +1,12 @@ use alloc::vec::Vec; use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - FeltSchema, - SchemaType, - StorageSchema, + AccountComponentCode, AccountComponentMetadata, FeltSchema, SchemaType, StorageSchema, StorageSlotSchema, }; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountCodeInterface, - AccountComponent, - AccountComponentName, - AccountProcedureRoot, - AccountStorage, - AccountType, - AssetCallbackFlag, - StorageSlot, + Account, AccountBuilder, AccountCodeInterface, AccountComponent, AccountComponentName, + AccountProcedureRoot, AccountStorage, AccountType, AssetCallbackFlag, StorageSlot, StorageSlotName, }; use miden_protocol::asset::{AssetAmount, TokenSymbol}; @@ -26,21 +14,13 @@ use miden_protocol::utils::sync::LazyLock; use miden_protocol::{Felt, Word}; use super::{ - Description, - ExternalLink, - FungibleFaucetError, - LogoURI, - TokenMetadata, - TokenMetadataError, + Description, ExternalLink, FungibleFaucetError, LogoURI, TokenMetadata, TokenMetadataError, TokenName, }; use crate::account::access::{AccessControl, Authority, Pausable, PausableManager}; use crate::account::account_component_code; use crate::account::auth::{ - AuthGuardedMultisig, - AuthMultisig, - AuthNetworkAccount, - AuthSingleSigAcl, + AuthGuardedMultisig, AuthMultisig, AuthNetworkAccount, AuthSingleSigAcl, }; use crate::account::policies::TokenPolicyManager; use crate::note::{BurnNote, MintNote}; diff --git a/crates/miden-standards/src/account/faucets/fungible/tests.rs b/crates/miden-standards/src/account/faucets/fungible/tests.rs index 46d90a388d..4b6ceed40a 100644 --- a/crates/miden-standards/src/account/faucets/fungible/tests.rs +++ b/crates/miden-standards/src/account/faucets/fungible/tests.rs @@ -5,29 +5,19 @@ use miden_protocol::asset::{AssetAmount, TokenSymbol}; use miden_protocol::{Felt, Word}; use super::{ - FungibleFaucet, - create_guarded_user_fungible_faucet, - create_multisig_user_fungible_faucet, - create_network_fungible_faucet, - create_singlesig_user_fungible_faucet, + FungibleFaucet, create_guarded_user_fungible_faucet, create_multisig_user_fungible_faucet, + create_network_fungible_faucet, create_singlesig_user_fungible_faucet, }; use crate::account::access::{AccessControl, PausableManager}; use crate::account::auth::{ - Approver, - AuthGuardedMultisig, - AuthMultisig, - AuthNetworkAccount, - AuthSingleSig, - AuthSingleSigAcl, - GuardianConfig, + Approver, AuthGuardedMultisig, AuthMultisig, AuthNetworkAccount, AuthSingleSig, + AuthSingleSigAcl, GuardianConfig, }; use crate::account::faucets::{Description, FungibleFaucetError, TokenMetadata, TokenName}; use crate::account::policies::{BurnPolicy, MintPolicy, TokenPolicyManager, TransferPolicy}; use crate::account::wallets::BasicWallet; use crate::testing::faucet::{ - user_faucet_guarded, - user_faucet_multisig, - user_faucet_single_sig_acl, + user_faucet_guarded, user_faucet_multisig, user_faucet_single_sig_acl, }; use crate::tx_script::ExpirationTransactionScript; diff --git a/crates/miden-standards/src/account/faucets/mod.rs b/crates/miden-standards/src/account/faucets/mod.rs index 44541ac71b..04566c7f42 100644 --- a/crates/miden-standards/src/account/faucets/mod.rs +++ b/crates/miden-standards/src/account/faucets/mod.rs @@ -10,18 +10,12 @@ mod non_fungible; mod token_metadata; pub use fungible::{ - FungibleFaucet, - FungibleFaucetBuilder, - create_guarded_user_fungible_faucet, - create_multisig_user_fungible_faucet, - create_network_fungible_faucet, + FungibleFaucet, FungibleFaucetBuilder, create_guarded_user_fungible_faucet, + create_multisig_user_fungible_faucet, create_network_fungible_faucet, create_singlesig_user_fungible_faucet, }; pub use non_fungible::{ - AssetStatus, - NonFungibleFaucet, - NonFungibleFaucetBuilder, - create_network_non_fungible_faucet, + AssetStatus, NonFungibleFaucet, NonFungibleFaucetBuilder, create_network_non_fungible_faucet, create_user_non_fungible_faucet, }; pub use token_metadata::{Description, ExternalLink, LogoURI, TokenMetadata, TokenName}; diff --git a/crates/miden-standards/src/account/faucets/non_fungible/mod.rs b/crates/miden-standards/src/account/faucets/non_fungible/mod.rs index 6fd3184984..c1a9f2815b 100644 --- a/crates/miden-standards/src/account/faucets/non_fungible/mod.rs +++ b/crates/miden-standards/src/account/faucets/non_fungible/mod.rs @@ -1,25 +1,12 @@ use alloc::vec::Vec; use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - FeltSchema, - SchemaType, - StorageSchema, + AccountComponentCode, AccountComponentMetadata, FeltSchema, SchemaType, StorageSchema, StorageSlotSchema, }; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountCodeInterface, - AccountComponent, - AccountComponentName, - AccountProcedureRoot, - AccountStorage, - AccountType, - StorageMap, - StorageMapKey, - StorageSlot, + Account, AccountBuilder, AccountCodeInterface, AccountComponent, AccountComponentName, + AccountProcedureRoot, AccountStorage, AccountType, StorageMap, StorageMapKey, StorageSlot, StorageSlotName, }; use miden_protocol::asset::TokenSymbol; @@ -27,12 +14,7 @@ use miden_protocol::utils::sync::LazyLock; use miden_protocol::{Felt, Hasher, Word}; use super::{ - Description, - ExternalLink, - LogoURI, - NonFungibleFaucetError, - TokenMetadata, - TokenMetadataError, + Description, ExternalLink, LogoURI, NonFungibleFaucetError, TokenMetadata, TokenMetadataError, TokenName, }; use crate::account::access::{AccessControl, Authority, Pausable, PausableManager}; diff --git a/crates/miden-standards/src/account/inspection/schema_commitment.rs b/crates/miden-standards/src/account/inspection/schema_commitment.rs index bdc2388c78..e3cfb5a25a 100644 --- a/crates/miden-standards/src/account/inspection/schema_commitment.rs +++ b/crates/miden-standards/src/account/inspection/schema_commitment.rs @@ -10,19 +10,11 @@ use alloc::collections::BTreeMap; use miden_protocol::Word; use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - SchemaType, - StorageSchema, - StorageSlotSchema, + AccountComponentCode, AccountComponentMetadata, SchemaType, StorageSchema, StorageSlotSchema, WordSchema, }; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountComponent, - StorageSlot, - StorageSlotName, + Account, AccountBuilder, AccountComponent, StorageSlot, StorageSlotName, }; use miden_protocol::errors::{AccountError, ComponentMetadataError}; use miden_protocol::utils::sync::LazyLock; diff --git a/crates/miden-standards/src/account/interface/test.rs b/crates/miden-standards/src/account/interface/test.rs index f817023553..72f9a84d18 100644 --- a/crates/miden-standards/src/account/interface/test.rs +++ b/crates/miden-standards/src/account/interface/test.rs @@ -9,12 +9,7 @@ use miden_protocol::note::{NoteAttachments, NoteType}; use miden_protocol::testing::account_id::ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE; use crate::account::auth::{ - Approver, - ApproverSet, - AuthMultisig, - AuthMultisigConfig, - AuthSingleSig, - NoAuth, + Approver, ApproverSet, AuthMultisig, AuthMultisigConfig, AuthSingleSig, NoAuth, }; use crate::account::interface::{AccountComponentInterface, AccountInterface, AccountInterfaceExt}; use crate::account::wallets::BasicWallet; diff --git a/crates/miden-standards/src/account/policies/burn/min_burn_amount.rs b/crates/miden-standards/src/account/policies/burn/min_burn_amount.rs index 999d08f35a..1952bb7213 100644 --- a/crates/miden-standards/src/account/policies/burn/min_burn_amount.rs +++ b/crates/miden-standards/src/account/policies/burn/min_burn_amount.rs @@ -1,16 +1,8 @@ use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - SchemaType, - StorageSchema, - StorageSlotSchema, + AccountComponentCode, AccountComponentMetadata, SchemaType, StorageSchema, StorageSlotSchema, }; use miden_protocol::account::{ - AccountComponent, - AccountComponentName, - AccountProcedureRoot, - StorageSlot, - StorageSlotName, + AccountComponent, AccountComponentName, AccountProcedureRoot, StorageSlot, StorageSlotName, }; use miden_protocol::asset::AssetAmount; use miden_protocol::utils::sync::LazyLock; diff --git a/crates/miden-standards/src/account/policies/manager.rs b/crates/miden-standards/src/account/policies/manager.rs index 368e1bdb4a..022c616dae 100644 --- a/crates/miden-standards/src/account/policies/manager.rs +++ b/crates/miden-standards/src/account/policies/manager.rs @@ -15,20 +15,11 @@ use alloc::vec::Vec; use miden_protocol::Word; use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - SchemaType, - StorageSchema, - StorageSlotSchema, + AccountComponentCode, AccountComponentMetadata, SchemaType, StorageSchema, StorageSlotSchema, }; use miden_protocol::account::{ - AccountComponent, - AccountComponentName, - AccountProcedureRoot, - StorageMap, - StorageMapKey, - StorageSlot, - StorageSlotName, + AccountComponent, AccountComponentName, AccountProcedureRoot, StorageMap, StorageMapKey, + StorageSlot, StorageSlotName, }; use miden_protocol::asset::AssetCallbacks; use miden_protocol::utils::sync::LazyLock; diff --git a/crates/miden-standards/src/account/policies/mod.rs b/crates/miden-standards/src/account/policies/mod.rs index 97eb8058cf..2fb893ab1a 100644 --- a/crates/miden-standards/src/account/policies/mod.rs +++ b/crates/miden-standards/src/account/policies/mod.rs @@ -40,13 +40,6 @@ pub use burn::{BurnAllowAll, BurnOwnerOnly, BurnPolicy, BurnPolicyError, MinBurn pub use manager::{TokenPolicyManager, TokenPolicyManagerBuilder}; pub use mint::{MintAllowAll, MintOwnerOnly, MintPolicy, MintPolicyError}; pub use transfer::{ - AllowlistManager, - AllowlistStorage, - BasicAllowlist, - BasicBlocklist, - BlocklistManager, - BlocklistStorage, - TransferAllowAll, - TransferPolicy, - TransferPolicyError, + AllowlistManager, AllowlistStorage, BasicAllowlist, BasicBlocklist, BlocklistManager, + BlocklistStorage, TransferAllowAll, TransferPolicy, TransferPolicyError, }; diff --git a/crates/miden-standards/src/account/policies/transfer/basic_allowlist.rs b/crates/miden-standards/src/account/policies/transfer/basic_allowlist.rs index e832257b02..2a3b1ed81d 100644 --- a/crates/miden-standards/src/account/policies/transfer/basic_allowlist.rs +++ b/crates/miden-standards/src/account/policies/transfer/basic_allowlist.rs @@ -1,9 +1,7 @@ use alloc::collections::BTreeSet; use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - StorageSchema, + AccountComponentCode, AccountComponentMetadata, StorageSchema, }; use miden_protocol::account::{AccountComponent, AccountId, AccountProcedureRoot}; diff --git a/crates/miden-standards/src/account/policies/transfer/basic_blocklist.rs b/crates/miden-standards/src/account/policies/transfer/basic_blocklist.rs index 6e25f2869b..3748d530fe 100644 --- a/crates/miden-standards/src/account/policies/transfer/basic_blocklist.rs +++ b/crates/miden-standards/src/account/policies/transfer/basic_blocklist.rs @@ -1,9 +1,7 @@ use alloc::collections::BTreeSet; use miden_protocol::account::component::{ - AccountComponentCode, - AccountComponentMetadata, - StorageSchema, + AccountComponentCode, AccountComponentMetadata, StorageSchema, }; use miden_protocol::account::{AccountComponent, AccountId, AccountProcedureRoot}; diff --git a/crates/miden-standards/src/account/wallets/mod.rs b/crates/miden-standards/src/account/wallets/mod.rs index 6da604b653..e8c7cb9d8b 100644 --- a/crates/miden-standards/src/account/wallets/mod.rs +++ b/crates/miden-standards/src/account/wallets/mod.rs @@ -2,25 +2,15 @@ use alloc::vec::Vec; use miden_protocol::account::component::{AccountComponentCode, AccountComponentMetadata}; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountComponent, - AccountComponentName, - AccountProcedureRoot, + Account, AccountBuilder, AccountComponent, AccountComponentName, AccountProcedureRoot, AccountType, }; use miden_protocol::errors::AccountError; use crate::account::account_component_code; use crate::account::auth::{ - Approver, - ApproverSet, - AuthGuardedMultisig, - AuthGuardedMultisigConfig, - AuthMultisig, - AuthMultisigConfig, - AuthSingleSig, - GuardianConfig, + Approver, ApproverSet, AuthGuardedMultisig, AuthGuardedMultisigConfig, AuthMultisig, + AuthMultisigConfig, AuthSingleSig, GuardianConfig, }; use crate::procedure_root; @@ -236,15 +226,8 @@ mod tests { use miden_protocol::{ONE, Word}; use super::{ - Account, - AccountType, - Approver, - ApproverSet, - AuthMultisig, - GuardianConfig, - create_basic_wallet, - create_guarded_wallet, - create_multisig_wallet, + Account, AccountType, Approver, ApproverSet, AuthMultisig, GuardianConfig, + create_basic_wallet, create_guarded_wallet, create_multisig_wallet, }; use crate::account::wallets::BasicWallet; diff --git a/crates/miden-standards/src/code_builder/mod.rs b/crates/miden-standards/src/code_builder/mod.rs index c3c5ccefb4..99d8905cc4 100644 --- a/crates/miden-standards/src/code_builder/mod.rs +++ b/crates/miden-standards/src/code_builder/mod.rs @@ -7,17 +7,8 @@ use alloc::vec::Vec; use miden_protocol::account::AccountComponentCode; use miden_protocol::assembly::diagnostics::Report; use miden_protocol::assembly::{ - Assembler, - DefaultSourceManager, - Library, - Linkage, - Module, - ModuleKind, - ModuleParser, - Path, - SourceFile, - SourceManager, - SourceManagerSync, + Assembler, DefaultSourceManager, Library, Linkage, Module, ModuleKind, ModuleParser, Path, + SourceFile, SourceManager, SourceManagerSync, }; use miden_protocol::note::NoteScript; use miden_protocol::transaction::{TransactionKernel, TransactionScript}; diff --git a/crates/miden-standards/src/note/burn.rs b/crates/miden-standards/src/note/burn.rs index 21ee87d9bb..c5e1d53731 100644 --- a/crates/miden-standards/src/note/burn.rs +++ b/crates/miden-standards/src/note/burn.rs @@ -7,17 +7,8 @@ use miden_protocol::asset::Asset; use miden_protocol::crypto::rand::FeltRng; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteRecipient, - NoteScript, - NoteScriptRoot, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteRecipient, NoteScript, NoteScriptRoot, + NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::utils::sync::LazyLock; diff --git a/crates/miden-standards/src/note/faucet_policy_action.rs b/crates/miden-standards/src/note/faucet_policy_action.rs index 5c66348e11..3de351300b 100644 --- a/crates/miden-standards/src/note/faucet_policy_action.rs +++ b/crates/miden-standards/src/note/faucet_policy_action.rs @@ -5,17 +5,8 @@ use miden_protocol::assembly::Path; use miden_protocol::crypto::rand::FeltRng; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteRecipient, - NoteScript, - NoteScriptRoot, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteRecipient, NoteScript, NoteScriptRoot, + NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::utils::sync::LazyLock; use miden_protocol::{Felt, Word}; diff --git a/crates/miden-standards/src/note/file.rs b/crates/miden-standards/src/note/file.rs index 5e0821be28..08c08f2f88 100644 --- a/crates/miden-standards/src/note/file.rs +++ b/crates/miden-standards/src/note/file.rs @@ -11,11 +11,7 @@ use miden_protocol::note::{Note, NoteDetails, NoteId, NoteInclusionProof, NoteTa #[cfg(feature = "std")] use miden_protocol::utils::serde::SliceReader; use miden_protocol::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; const MAGIC: &str = "note"; @@ -213,20 +209,11 @@ mod tests { use miden_protocol::asset::{Asset, FungibleAsset}; use miden_protocol::block::BlockNumber; use miden_protocol::note::{ - Note, - NoteAssets, - NoteDetails, - NoteInclusionProof, - NoteRecipient, - NoteScript, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteDetails, NoteInclusionProof, NoteRecipient, NoteScript, NoteStorage, + NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, }; use miden_protocol::utils::serde::{Deserializable, Serializable}; diff --git a/crates/miden-standards/src/note/mint.rs b/crates/miden-standards/src/note/mint.rs index 4aa7666110..f4dbe6281f 100644 --- a/crates/miden-standards/src/note/mint.rs +++ b/crates/miden-standards/src/note/mint.rs @@ -6,17 +6,8 @@ use miden_protocol::asset::{Asset, FungibleAsset, NonFungibleAsset}; use miden_protocol::crypto::rand::FeltRng; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteRecipient, - NoteScript, - NoteScriptRoot, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteRecipient, NoteScript, NoteScriptRoot, + NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::utils::sync::LazyLock; use miden_protocol::{Felt, MAX_NOTE_STORAGE_ITEMS, Word}; diff --git a/crates/miden-standards/src/note/owner_action.rs b/crates/miden-standards/src/note/owner_action.rs index 81f24974e8..44e9268053 100644 --- a/crates/miden-standards/src/note/owner_action.rs +++ b/crates/miden-standards/src/note/owner_action.rs @@ -5,17 +5,8 @@ use miden_protocol::assembly::Path; use miden_protocol::crypto::rand::FeltRng; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteRecipient, - NoteScript, - NoteScriptRoot, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteRecipient, NoteScript, NoteScriptRoot, + NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::utils::sync::LazyLock; use miden_protocol::{Felt, Word}; diff --git a/crates/miden-standards/src/note/p2id.rs b/crates/miden-standards/src/note/p2id.rs index 8f90f58c94..cc4702d806 100644 --- a/crates/miden-standards/src/note/p2id.rs +++ b/crates/miden-standards/src/note/p2id.rs @@ -6,17 +6,8 @@ use miden_protocol::asset::Asset; use miden_protocol::crypto::rand::FeltRng; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteRecipient, - NoteScript, - NoteScriptRoot, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteRecipient, NoteScript, NoteScriptRoot, + NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::utils::sync::LazyLock; use miden_protocol::{Felt, Word}; diff --git a/crates/miden-standards/src/note/p2ide.rs b/crates/miden-standards/src/note/p2ide.rs index 3ea2a27ffe..c1433abb5e 100644 --- a/crates/miden-standards/src/note/p2ide.rs +++ b/crates/miden-standards/src/note/p2ide.rs @@ -7,17 +7,8 @@ use miden_protocol::block::BlockNumber; use miden_protocol::crypto::rand::FeltRng; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteRecipient, - NoteScript, - NoteScriptRoot, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteRecipient, NoteScript, NoteScriptRoot, + NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::utils::sync::LazyLock; use miden_protocol::{Felt, Word}; diff --git a/crates/miden-standards/src/note/pause_action.rs b/crates/miden-standards/src/note/pause_action.rs index ae0cb8829b..313335c2c8 100644 --- a/crates/miden-standards/src/note/pause_action.rs +++ b/crates/miden-standards/src/note/pause_action.rs @@ -5,17 +5,8 @@ use miden_protocol::assembly::Path; use miden_protocol::crypto::rand::FeltRng; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteRecipient, - NoteScript, - NoteScriptRoot, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteRecipient, NoteScript, NoteScriptRoot, + NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::utils::sync::LazyLock; use miden_protocol::{Felt, Word}; diff --git a/crates/miden-standards/src/note/pswap.rs b/crates/miden-standards/src/note/pswap.rs index ba3a29637a..ce90718099 100644 --- a/crates/miden-standards/src/note/pswap.rs +++ b/crates/miden-standards/src/note/pswap.rs @@ -5,18 +5,8 @@ use miden_protocol::assembly::Path; use miden_protocol::asset::{Asset, AssetAmount, FungibleAsset}; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachmentScheme, - NoteAttachments, - NoteRecipient, - NoteScript, - NoteScriptRoot, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachmentScheme, NoteAttachments, NoteRecipient, + NoteScript, NoteScriptRoot, NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::utils::sync::LazyLock; use miden_protocol::{Felt, ONE, Word, ZERO}; @@ -43,7 +33,7 @@ static PSWAP_SCRIPT: LazyLock = LazyLock::new(|| { /// Canonical storage representation for a PSWAP note. /// -/// Maps to the 6-element [`NoteStorage`] layout consumed by the on-chain MASM script: +/// Maps to the 7-element [`NoteStorage`] layout consumed by the on-chain MASM script: /// /// | Slot | Field | /// |---------|-------| @@ -61,6 +51,9 @@ static PSWAP_SCRIPT: LazyLock = LazyLock::new(|| { /// (the asset pair is unchanged, so the tag carries over unchanged). #[derive(Debug, Clone, PartialEq, Eq, bon::Builder)] pub struct PswapNoteStorage { + #[builder(default = 0)] + min_fill_amount: u64, + min_requested_asset: FungibleAsset, creator_account_id: AccountId, @@ -79,7 +72,7 @@ impl PswapNoteStorage { // -------------------------------------------------------------------------------------------- /// Expected number of storage items for the PSWAP note. - pub const NUM_STORAGE_ITEMS: usize = 6; + pub const NUM_STORAGE_ITEMS: usize = 7; /// Consumes the storage and returns a PSWAP [`NoteRecipient`] with the provided serial number. pub fn into_recipient(self, serial_num: Word) -> NoteRecipient { @@ -120,7 +113,7 @@ impl PswapNoteStorage { } } -/// Serializes [`PswapNoteStorage`] into a 6-element [`NoteStorage`]. +/// Serializes [`PswapNoteStorage`] into a 7-element [`NoteStorage`]. impl From for NoteStorage { fn from(storage: PswapNoteStorage) -> Self { let storage_items = vec![ @@ -128,9 +121,11 @@ impl From for NoteStorage { storage.min_requested_asset.faucet_id().suffix(), storage.min_requested_asset.faucet_id().prefix().as_felt(), Felt::from(storage.min_requested_asset.amount()), - // Payback note type [3] + // fill_min [3] + Felt::ZERO, + // Payback note type [4] Felt::from(storage.payback_note_type.as_u8()), - // Creator ID [4-5] + // Creator ID [5-6] storage.creator_account_id.prefix().as_felt(), storage.creator_account_id.suffix(), ]; @@ -139,7 +134,7 @@ impl From for NoteStorage { } } -/// Deserializes [`PswapNoteStorage`] from a slice of exactly 6 [`Felt`]s. +/// Deserializes [`PswapNoteStorage`] from a slice of exactly 7 [`Felt`]s. impl TryFrom<&[Felt]> for PswapNoteStorage { type Error = NoteError; @@ -160,18 +155,22 @@ impl TryFrom<&[Felt]> for PswapNoteStorage { let min_requested_asset = FungibleAsset::new(faucet_id, amount) .map_err(|e| NoteError::other_with_source("failed to create requested asset", e))?; - // [3] = payback_note_type + // [3] = fill_min (ignored for now) + let _fill_min = note_storage[3].as_canonical_u64(); + + // [4] = payback_note_type let payback_note_type = NoteType::try_from( - u8::try_from(note_storage[3].as_canonical_u64()) + u8::try_from(note_storage[4].as_canonical_u64()) .map_err(|_| NoteError::other("payback_note_type exceeds u8"))?, ) .map_err(|e| NoteError::other_with_source("failed to parse payback note type", e))?; - // [4-5] = creator account ID (prefix, suffix) - let creator_account_id = AccountId::try_from_elements(note_storage[5], note_storage[4]) + // [5-6] = creator account ID (prefix, suffix) + let creator_account_id = AccountId::try_from_elements(note_storage[6], note_storage[5]) .map_err(|e| NoteError::other_with_source("failed to parse creator account ID", e))?; Ok(Self { + min_fill_amount: note_storage[3].as_canonical_u64(), min_requested_asset, creator_account_id, payback_note_type, @@ -1034,6 +1033,7 @@ mod tests { min_requested_asset.faucet_id().suffix(), min_requested_asset.faucet_id().prefix().as_felt(), Felt::from(min_requested_asset.amount()), + Felt::ZERO, // fill_min = 0 Felt::from(NoteType::Private.as_u8()), // payback_note_type creator_id.prefix().as_felt(), creator_id.suffix(), diff --git a/crates/miden-standards/src/note/rbac_action.rs b/crates/miden-standards/src/note/rbac_action.rs index 8efa1e1150..d47b54dfdd 100644 --- a/crates/miden-standards/src/note/rbac_action.rs +++ b/crates/miden-standards/src/note/rbac_action.rs @@ -5,17 +5,8 @@ use miden_protocol::assembly::Path; use miden_protocol::crypto::rand::FeltRng; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteRecipient, - NoteScript, - NoteScriptRoot, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteRecipient, NoteScript, NoteScriptRoot, + NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::utils::sync::LazyLock; use miden_protocol::{Felt, Word}; diff --git a/crates/miden-standards/src/note/swap.rs b/crates/miden-standards/src/note/swap.rs index df62234910..f68e196454 100644 --- a/crates/miden-standards/src/note/swap.rs +++ b/crates/miden-standards/src/note/swap.rs @@ -6,17 +6,8 @@ use miden_protocol::asset::Asset; use miden_protocol::crypto::rand::FeltRng; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachments, - NoteDetails, - NoteRecipient, - NoteScript, - NoteScriptRoot, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachments, NoteDetails, NoteRecipient, NoteScript, NoteScriptRoot, + NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::utils::sync::LazyLock; use miden_protocol::{Felt, ONE, Word}; @@ -410,8 +401,7 @@ mod tests { use miden_protocol::asset::{FungibleAsset, NonFungibleAsset, NonFungibleAssetDetails}; use miden_protocol::note::{NoteStorage, NoteType}; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, }; use super::*; diff --git a/crates/miden-standards/src/testing/account_interface.rs b/crates/miden-standards/src/testing/account_interface.rs index fb066973df..ff8edd2e99 100644 --- a/crates/miden-standards/src/testing/account_interface.rs +++ b/crates/miden-standards/src/testing/account_interface.rs @@ -4,11 +4,7 @@ use miden_protocol::Word; use miden_protocol::account::Account; use crate::account::auth::{ - AuthGuardedMultisig, - AuthMultisig, - AuthMultisigSmart, - AuthSingleSig, - AuthSingleSigAcl, + AuthGuardedMultisig, AuthMultisig, AuthMultisigSmart, AuthSingleSig, AuthSingleSigAcl, }; use crate::account::interface::{AccountComponentInterface, AccountInterface, AccountInterfaceExt}; diff --git a/crates/miden-standards/src/testing/faucet.rs b/crates/miden-standards/src/testing/faucet.rs index 5cc1eef9e3..6e14787006 100644 --- a/crates/miden-standards/src/testing/faucet.rs +++ b/crates/miden-standards/src/testing/faucet.rs @@ -5,15 +5,8 @@ use miden_protocol::account::auth::{AuthScheme, PublicKeyCommitment}; use miden_protocol::errors::AccountError; use crate::account::auth::{ - Approver, - ApproverSet, - AuthGuardedMultisig, - AuthGuardedMultisigConfig, - AuthMultisig, - AuthMultisigConfig, - AuthSingleSigAcl, - AuthSingleSigAclConfig, - GuardianConfig, + Approver, ApproverSet, AuthGuardedMultisig, AuthGuardedMultisigConfig, AuthMultisig, + AuthMultisigConfig, AuthSingleSigAcl, AuthSingleSigAclConfig, GuardianConfig, }; use crate::account::faucets::FungibleFaucet; diff --git a/crates/miden-standards/src/testing/mock_account.rs b/crates/miden-standards/src/testing/mock_account.rs index 4cd8ac9edf..78d54a0f23 100644 --- a/crates/miden-standards/src/testing/mock_account.rs +++ b/crates/miden-standards/src/testing/mock_account.rs @@ -1,9 +1,5 @@ use miden_protocol::account::{ - Account, - AccountBuilder, - AccountComponent, - AccountId, - AccountStorage, + Account, AccountBuilder, AccountComponent, AccountId, AccountStorage, }; use miden_protocol::asset::AssetVault; use miden_protocol::testing::noop_auth_component::NoopAuthComponent; diff --git a/crates/miden-standards/src/testing/mock_util_lib.rs b/crates/miden-standards/src/testing/mock_util_lib.rs index 362885a000..b1c824c724 100644 --- a/crates/miden-standards/src/testing/mock_util_lib.rs +++ b/crates/miden-standards/src/testing/mock_util_lib.rs @@ -2,12 +2,7 @@ use alloc::sync::Arc; use miden_protocol::account::AccountCode; use miden_protocol::assembly::{ - DefaultSourceManager, - Library, - Linkage, - ModuleKind, - ModuleParser, - Path, + DefaultSourceManager, Library, Linkage, ModuleKind, ModuleParser, Path, }; use miden_protocol::transaction::TransactionKernel; use miden_protocol::utils::sync::LazyLock; diff --git a/crates/miden-standards/src/testing/note.rs b/crates/miden-standards/src/testing/note.rs index e914938c39..3cf4ecd372 100644 --- a/crates/miden-standards/src/testing/note.rs +++ b/crates/miden-standards/src/testing/note.rs @@ -8,16 +8,8 @@ use miden_protocol::assembly::{DefaultSourceManager, Library}; use miden_protocol::asset::Asset; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteRecipient, - NoteScript, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteRecipient, NoteScript, NoteStorage, + NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::testing::note::DEFAULT_NOTE_SCRIPT; use miden_protocol::vm::{AdviceMap, Package}; diff --git a/crates/miden-testing/src/executor.rs b/crates/miden-testing/src/executor.rs index 007e2e2e8d..96032292c7 100644 --- a/crates/miden-testing/src/executor.rs +++ b/crates/miden-testing/src/executor.rs @@ -4,13 +4,7 @@ use alloc::boxed::Box; use miden_processor::DefaultHost; use miden_processor::advice::AdviceInputs; use miden_processor::{ - ExecutionError, - ExecutionOptions, - ExecutionOutput, - FastProcessor, - Host, - Program, - StackInputs, + ExecutionError, ExecutionOptions, ExecutionOutput, FastProcessor, Host, Program, StackInputs, }; #[cfg(test)] use miden_protocol::assembly::Assembler; diff --git a/crates/miden-testing/src/kernel_tests/batch/proposed_batch.rs b/crates/miden-testing/src/kernel_tests/batch/proposed_batch.rs index 56c56e7b7b..ecbf015f2f 100644 --- a/crates/miden-testing/src/kernel_tests/batch/proposed_batch.rs +++ b/crates/miden-testing/src/kernel_tests/batch/proposed_batch.rs @@ -13,23 +13,12 @@ use miden_protocol::block::BlockNumber; use miden_protocol::crypto::merkle::MerkleError; use miden_protocol::errors::{BatchAccountUpdateError, ProposedBatchError}; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachments, - NoteTag, - NoteType, - PartialNote, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachments, NoteTag, NoteType, PartialNote, PartialNoteMetadata, }; use miden_protocol::testing::account_id::AccountIdBuilder; use miden_protocol::transaction::{ - InputNote, - InputNoteCommitment, - OutputNote, - PartialBlockchain, - ProvenTransaction, - RawOutputNote, - TransactionScript, + InputNote, InputNoteCommitment, OutputNote, PartialBlockchain, ProvenTransaction, + RawOutputNote, TransactionScript, }; use miden_standards::note::P2idNoteStorage; use miden_standards::testing::account_component::MockAccountComponent; diff --git a/crates/miden-testing/src/kernel_tests/batch/proven_tx_builder.rs b/crates/miden-testing/src/kernel_tests/batch/proven_tx_builder.rs index 6a450864ad..efb1174130 100644 --- a/crates/miden-testing/src/kernel_tests/batch/proven_tx_builder.rs +++ b/crates/miden-testing/src/kernel_tests/batch/proven_tx_builder.rs @@ -7,11 +7,7 @@ use miden_protocol::block::{BlockHeader, BlockNumber}; use miden_protocol::crypto::merkle::SparseMerklePath; use miden_protocol::note::{Note, NoteInclusionProof, Nullifier}; use miden_protocol::transaction::{ - InputNote, - InputNoteCommitment, - OutputNote, - ProvenTransaction, - TxAccountUpdate, + InputNote, InputNoteCommitment, OutputNote, ProvenTransaction, TxAccountUpdate, }; use miden_protocol::vm::ExecutionProof; diff --git a/crates/miden-testing/src/kernel_tests/block/header_errors.rs b/crates/miden-testing/src/kernel_tests/block/header_errors.rs index 0b4cb2a745..33579ae544 100644 --- a/crates/miden-testing/src/kernel_tests/block/header_errors.rs +++ b/crates/miden-testing/src/kernel_tests/block/header_errors.rs @@ -4,12 +4,7 @@ use anyhow::Context; use assert_matches::assert_matches; use miden_protocol::Word; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountComponent, - AccountId, - AccountUpdateDetails, - StorageSlot, + Account, AccountBuilder, AccountComponent, AccountId, AccountUpdateDetails, StorageSlot, StorageSlotName, }; use miden_protocol::asset::FungibleAsset; @@ -18,10 +13,7 @@ use miden_protocol::block::{BlockInputs, BlockNumber, ProposedBlock}; use miden_protocol::errors::{AccountTreeError, NullifierTreeError, ProposedBlockError}; use miden_protocol::note::NoteType; use miden_protocol::transaction::{ - InputNoteCommitment, - OutputNote, - ProvenTransaction, - TxAccountUpdate, + InputNoteCommitment, OutputNote, ProvenTransaction, TxAccountUpdate, }; use miden_protocol::vm::ExecutionProof; use miden_standards::testing::account_component::{IncrNonceAuthComponent, MockAccountComponent}; diff --git a/crates/miden-testing/src/kernel_tests/tx/mod.rs b/crates/miden-testing/src/kernel_tests/tx/mod.rs index cc051d0061..e040150859 100644 --- a/crates/miden-testing/src/kernel_tests/tx/mod.rs +++ b/crates/miden-testing/src/kernel_tests/tx/mod.rs @@ -5,9 +5,7 @@ use miden_protocol::account::{Account, AccountId}; use miden_protocol::asset::{Asset, FungibleAsset}; use miden_protocol::note::{Note, NoteType}; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, - ACCOUNT_ID_SENDER, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, ACCOUNT_ID_SENDER, }; use miden_protocol::transaction::memory::{self, MemoryOffset}; use miden_protocol::vm::StackInputs; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_account.rs b/crates/miden-testing/src/kernel_tests/tx/test_account.rs index 91900eddba..0da59a972c 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_account.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_account.rs @@ -10,56 +10,31 @@ use miden_processor::{ExecutionError, Word}; use miden_protocol::account::auth::AuthScheme; use miden_protocol::account::component::AccountComponentMetadata; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountCode, - AccountComponent, - AccountId, - AccountStorage, - AccountType, - StorageMap, - StorageMapKey, - StorageMapPatch, - StorageSlot, - StorageSlotContent, - StorageSlotId, - StorageSlotName, - StorageSlotPatch, - StorageSlotType, - StorageValuePatch, + Account, AccountBuilder, AccountCode, AccountComponent, AccountId, AccountStorage, AccountType, + StorageMap, StorageMapKey, StorageMapPatch, StorageSlot, StorageSlotContent, StorageSlotId, + StorageSlotName, StorageSlotPatch, StorageSlotType, StorageValuePatch, }; use miden_protocol::assembly::diagnostics::reporting::PrintDiagnostic; use miden_protocol::assembly::{ - DefaultSourceManager, - Library, - Linkage, - ModuleKind, - ModuleParser, - Path, + DefaultSourceManager, Library, Linkage, ModuleKind, ModuleParser, Path, }; use miden_protocol::asset::{Asset, AssetId, FungibleAsset}; use miden_protocol::errors::tx_kernel::{ ERR_ACCOUNT_ID_SUFFIX_LEAST_SIGNIFICANT_BYTE_MUST_BE_ZERO, - ERR_ACCOUNT_ID_SUFFIX_MOST_SIGNIFICANT_BIT_MUST_BE_ZERO, - ERR_ACCOUNT_ID_UNKNOWN_VERSION, - ERR_ACCOUNT_NONCE_AT_MAX, - ERR_ACCOUNT_NONCE_CAN_ONLY_BE_INCREMENTED_ONCE, + ERR_ACCOUNT_ID_SUFFIX_MOST_SIGNIFICANT_BIT_MUST_BE_ZERO, ERR_ACCOUNT_ID_UNKNOWN_VERSION, + ERR_ACCOUNT_NONCE_AT_MAX, ERR_ACCOUNT_NONCE_CAN_ONLY_BE_INCREMENTED_ONCE, ERR_ACCOUNT_UNKNOWN_STORAGE_SLOT_NAME, }; use miden_protocol::field::PrimeField64; use miden_protocol::note::NoteType; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, - ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, - ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, - ACCOUNT_ID_SENDER, + ACCOUNT_ID_PRIVATE_NON_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, + ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, ACCOUNT_ID_SENDER, }; use miden_protocol::testing::storage::{MOCK_MAP_SLOT, MOCK_VALUE_SLOT0, MOCK_VALUE_SLOT1}; use miden_protocol::transaction::memory::{ - CODE_UPGRADE_COMMITMENT_PTR, - STORAGE_UPGRADE_COMMITMENT_PTR, + CODE_UPGRADE_COMMITMENT_PTR, STORAGE_UPGRADE_COMMITMENT_PTR, }; use miden_protocol::transaction::{RawOutputNote, TransactionKernel}; use miden_protocol::utils::sync::LazyLock; @@ -73,11 +48,7 @@ use crate::executor::CodeExecutor; use crate::kernel_tests::tx::ExecutionOutputExt; use crate::utils::create_public_p2any_note; use crate::{ - Auth, - ExecError, - MockChain, - TestTransactionBuilder, - TxContextInput, + Auth, ExecError, MockChain, TestTransactionBuilder, TxContextInput, assert_transaction_executor_error, }; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_account_interface.rs b/crates/miden-testing/src/kernel_tests/tx/test_account_interface.rs index 2b8bcd254e..b2d0787705 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_account_interface.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_account_interface.rs @@ -10,19 +10,12 @@ use miden_protocol::asset::{Asset, FungibleAsset}; use miden_protocol::crypto::rand::FeltRng; use miden_protocol::field::PrimeField64; use miden_protocol::note::{ - Note, - NoteAssets, - NoteRecipient, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteRecipient, NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::testing::account_id::{ ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE_2, - ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, - ACCOUNT_ID_SENDER, + ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, ACCOUNT_ID_SENDER, }; use miden_protocol::transaction::{InputNote, RawOutputNote}; use miden_protocol::{Felt, Word}; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_account_update.rs b/crates/miden-testing/src/kernel_tests/tx/test_account_update.rs index df070e9c8d..969aa06dc9 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_account_update.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_account_update.rs @@ -7,26 +7,10 @@ use anyhow::Context; use assert_matches::assert_matches; use miden_crypto::rand::test_utils::rand_value; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountCode, - AccountComponent, - AccountComponentCode, - AccountComponentMetadata, - AccountDelta, - AccountId, - AccountPatch, - AccountStorage, - AccountStoragePatch, - AccountType, - AccountVaultDelta, - AccountVaultPatch, - StorageMap, - StorageMapKey, - StorageMapPatch, - StorageSlot, - StorageSlotName, - StorageSlotPatch, + Account, AccountBuilder, AccountCode, AccountComponent, AccountComponentCode, + AccountComponentMetadata, AccountDelta, AccountId, AccountPatch, AccountStorage, + AccountStoragePatch, AccountType, AccountVaultDelta, AccountVaultPatch, StorageMap, + StorageMapKey, StorageMapPatch, StorageSlot, StorageSlotName, StorageSlotPatch, StorageValuePatch, }; use miden_protocol::asset::{Asset, FungibleAsset, NonFungibleAsset, NonFungibleAssetDetails}; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_active_note.rs b/crates/miden-testing/src/kernel_tests/tx/test_active_note.rs index f656532784..b230ae2008 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_active_note.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_active_note.rs @@ -7,20 +7,12 @@ use miden_protocol::asset::FungibleAsset; use miden_protocol::crypto::rand::{FeltRng, RandomCoin}; use miden_protocol::errors::tx_kernel::ERR_NOTE_ATTEMPT_TO_ACCESS_NOTE_METADATA_WHILE_NO_NOTE_BEING_PROCESSED; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachmentScheme, - NoteRecipient, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachmentScheme, NoteRecipient, NoteStorage, NoteTag, + NoteType, PartialNoteMetadata, }; use miden_protocol::testing::account_id::{ ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, - ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, - ACCOUNT_ID_SENDER, + ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, ACCOUNT_ID_SENDER, }; use miden_protocol::testing::note::DEFAULT_NOTE_SCRIPT; use miden_protocol::transaction::memory::{ASSET_SIZE, ASSET_VALUE_OFFSET}; @@ -34,11 +26,7 @@ use super::StackInputs; use crate::kernel_tests::tx::ExecutionOutputExt; use crate::utils::{create_p2any_note, create_public_p2any_note}; use crate::{ - Auth, - MockChain, - TestTransactionBuilder, - TxContextInput, - assert_transaction_executor_error, + Auth, MockChain, TestTransactionBuilder, TxContextInput, assert_transaction_executor_error, }; #[tokio::test] diff --git a/crates/miden-testing/src/kernel_tests/tx/test_array.rs b/crates/miden-testing/src/kernel_tests/tx/test_array.rs index e95305ada0..ff00baadf9 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_array.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_array.rs @@ -3,12 +3,7 @@ use miden_protocol::Word; use miden_protocol::account::component::AccountComponentMetadata; use miden_protocol::account::{ - AccountBuilder, - AccountComponent, - StorageMap, - StorageMapKey, - StorageSlot, - StorageSlotName, + AccountBuilder, AccountComponent, StorageMap, StorageMapKey, StorageSlot, StorageSlotName, }; use miden_standards::code_builder::CodeBuilder; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_asset.rs b/crates/miden-testing/src/kernel_tests/tx/test_asset.rs index b7880aef8a..e961b5f9d5 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_asset.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_asset.rs @@ -1,28 +1,20 @@ use miden_protocol::account::AccountId; use miden_protocol::asset::{ - AssetClass, - AssetComposition, - AssetId, - FungibleAsset, - NonFungibleAsset, - NonFungibleAssetDetails, + AssetClass, AssetComposition, AssetId, FungibleAsset, NonFungibleAsset, NonFungibleAssetDetails, }; use miden_protocol::errors::MasmError; use miden_protocol::errors::protocol::ERR_VAULT_ASSET_METADATA_NON_ZERO_RESERVED_BITS; use miden_protocol::errors::tx_kernel::{ - ERR_FUNGIBLE_ASSET_AMOUNT_EXCEEDS_MAX_AMOUNT, - ERR_FUNGIBLE_ASSET_ID_ASSET_CLASS_MUST_BE_ZERO, + ERR_FUNGIBLE_ASSET_AMOUNT_EXCEEDS_MAX_AMOUNT, ERR_FUNGIBLE_ASSET_ID_ASSET_CLASS_MUST_BE_ZERO, ERR_FUNGIBLE_ASSET_ID_COMPOSITION_MUST_BE_FUNGIBLE, ERR_FUNGIBLE_ASSET_VALUE_MOST_SIGNIFICANT_ELEMENTS_MUST_BE_ZERO, ERR_NON_FUNGIBLE_ASSET_CLASS_PREFIX_MUST_MATCH_HASH1, ERR_NON_FUNGIBLE_ASSET_CLASS_SUFFIX_MUST_MATCH_HASH0, - ERR_NON_FUNGIBLE_ASSET_ID_COMPOSITION_MUST_BE_NON_FUNGIBLE, - ERR_VAULT_ASSET_METADATA_NOT_U32, + ERR_NON_FUNGIBLE_ASSET_ID_COMPOSITION_MUST_BE_NON_FUNGIBLE, ERR_VAULT_ASSET_METADATA_NOT_U32, ERR_VAULT_ASSET_METADATA_UNKNOWN_COMPOSITION, }; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, }; use miden_protocol::testing::constants::{FUNGIBLE_ASSET_AMOUNT, NON_FUNGIBLE_ASSET_DATA}; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_asset_vault.rs b/crates/miden-testing/src/kernel_tests/tx/test_asset_vault.rs index fabb782b10..6dc0d22a7e 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_asset_vault.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_asset_vault.rs @@ -1,24 +1,17 @@ use assert_matches::assert_matches; use miden_protocol::account::AccountId; use miden_protocol::asset::{ - Asset, - AssetId, - FungibleAsset, - NonFungibleAsset, - NonFungibleAssetDetails, + Asset, AssetId, FungibleAsset, NonFungibleAsset, NonFungibleAssetDetails, }; use miden_protocol::errors::tx_kernel::{ ERR_VAULT_FUNGIBLE_ASSET_AMOUNT_LESS_THAN_AMOUNT_TO_WITHDRAW, - ERR_VAULT_FUNGIBLE_MAX_AMOUNT_EXCEEDED, - ERR_VAULT_NON_FUNGIBLE_ASSET_TO_ADD_ALREADY_EXISTS, + ERR_VAULT_FUNGIBLE_MAX_AMOUNT_EXCEEDED, ERR_VAULT_NON_FUNGIBLE_ASSET_TO_ADD_ALREADY_EXISTS, ERR_VAULT_NON_FUNGIBLE_ASSET_TO_REMOVE_NOT_FOUND, }; use miden_protocol::errors::{AssetError, AssetVaultError}; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET_1, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, + ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET_1, }; use miden_protocol::testing::constants::{FUNGIBLE_ASSET_AMOUNT, NON_FUNGIBLE_ASSET_DATA}; use miden_protocol::transaction::memory; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_callbacks.rs b/crates/miden-testing/src/kernel_tests/tx/test_callbacks.rs index 549a89f64c..2248a69f32 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_callbacks.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_callbacks.rs @@ -6,26 +6,12 @@ use alloc::vec::Vec; use miden_protocol::account::auth::AuthScheme; use miden_protocol::account::component::AccountComponentMetadata; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountComponent, - AccountComponentCode, - AccountId, - AccountProcedureRoot, - AccountType, - AssetCallbackFlag, - StorageMap, - StorageMapKey, - StorageSlot, + Account, AccountBuilder, AccountComponent, AccountComponentCode, AccountId, + AccountProcedureRoot, AccountType, AssetCallbackFlag, StorageMap, StorageMapKey, StorageSlot, StorageSlotName, }; use miden_protocol::asset::{ - Asset, - AssetAmount, - AssetCallbacks, - AssetComposition, - FungibleAsset, - NonFungibleAsset, + Asset, AssetAmount, AssetCallbacks, AssetComposition, FungibleAsset, NonFungibleAsset, NonFungibleAssetDetails, }; use miden_protocol::block::account_tree::AccountIdKey; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_epilogue.rs b/crates/miden-testing/src/kernel_tests/tx/test_epilogue.rs index af3bdf2de5..e3e2b188ff 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_epilogue.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_epilogue.rs @@ -7,22 +7,17 @@ use miden_protocol::account::{Account, AccountPatch, AccountStoragePatch, Accoun use miden_protocol::asset::{Asset, FungibleAsset}; use miden_protocol::errors::tx_kernel::{ ERR_ACCOUNT_PATCH_NONCE_MUST_BE_INCREMENTED_IF_VAULT_OR_STORAGE_CHANGED, - ERR_EPILOGUE_EXECUTED_TRANSACTION_IS_EMPTY, - ERR_EPILOGUE_NONCE_CANNOT_BE_0, - ERR_EPILOGUE_TOTAL_NUMBER_OF_ASSETS_MUST_STAY_THE_SAME, - ERR_TX_INVALID_EXPIRATION_DELTA, + ERR_EPILOGUE_EXECUTED_TRANSACTION_IS_EMPTY, ERR_EPILOGUE_NONCE_CANNOT_BE_0, + ERR_EPILOGUE_TOTAL_NUMBER_OF_ASSETS_MUST_STAY_THE_SAME, ERR_TX_INVALID_EXPIRATION_DELTA, }; use miden_protocol::note::{NoteTag, NoteType}; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, - ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, }; use miden_protocol::testing::storage::MOCK_VALUE_SLOT0; use miden_protocol::transaction::memory::{ - NOTE_MEM_SIZE, - OUTPUT_NOTE_ASSETS_COMMITMENT_OFFSET, - OUTPUT_NOTE_SECTION_OFFSET, + NOTE_MEM_SIZE, OUTPUT_NOTE_ASSETS_COMMITMENT_OFFSET, OUTPUT_NOTE_SECTION_OFFSET, }; use miden_protocol::transaction::{RawOutputNote, RawOutputNotes, TransactionOutputs}; use miden_protocol::{Hasher, Word}; @@ -33,11 +28,7 @@ use miden_standards::testing::note::NoteBuilder; use crate::kernel_tests::tx::ExecutionOutputExt; use crate::utils::{create_p2any_note, create_public_p2any_note}; use crate::{ - Auth, - MockChain, - TestTransactionBuilder, - TxContextInput, - assert_execution_error, + Auth, MockChain, TestTransactionBuilder, TxContextInput, assert_execution_error, assert_transaction_executor_error, }; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_faucet.rs b/crates/miden-testing/src/kernel_tests/tx/test_faucet.rs index 88d672f95d..153812966e 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_faucet.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_faucet.rs @@ -4,30 +4,21 @@ use miden_protocol::Felt; use miden_protocol::account::{Account, AccountBuilder, AccountComponent, AccountId}; use miden_protocol::assembly::DefaultSourceManager; use miden_protocol::asset::{ - AssetClass, - AssetComposition, - AssetId, - FungibleAsset, - NonFungibleAsset, + AssetClass, AssetComposition, AssetId, FungibleAsset, NonFungibleAsset, }; use miden_protocol::errors::tx_kernel::{ - ERR_FAUCET_IS_NOT_ASSET_ORIGIN, - ERR_FUNGIBLE_ASSET_AMOUNT_EXCEEDS_MAX_AMOUNT, + ERR_FAUCET_IS_NOT_ASSET_ORIGIN, ERR_FUNGIBLE_ASSET_AMOUNT_EXCEEDS_MAX_AMOUNT, ERR_VAULT_ASSET_METADATA_NON_ZERO_RESERVED_BITS, ERR_VAULT_FUNGIBLE_ASSET_AMOUNT_LESS_THAN_AMOUNT_TO_WITHDRAW, ERR_VAULT_NON_FUNGIBLE_ASSET_TO_REMOVE_NOT_FOUND, }; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_WITH_CALLBACKS, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET_1, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_WITH_CALLBACKS, ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET_1, ACCOUNT_ID_SENDER, }; use miden_protocol::testing::constants::{ - CONSUMED_ASSET_1_AMOUNT, - FUNGIBLE_ASSET_AMOUNT, - NON_FUNGIBLE_ASSET_DATA, + CONSUMED_ASSET_1_AMOUNT, FUNGIBLE_ASSET_AMOUNT, NON_FUNGIBLE_ASSET_DATA, NON_FUNGIBLE_ASSET_DATA_2, }; use miden_protocol::testing::noop_auth_component::NoopAuthComponent; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_fee.rs b/crates/miden-testing/src/kernel_tests/tx/test_fee.rs index 81f95c322b..75232066ba 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_fee.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_fee.rs @@ -8,8 +8,7 @@ use miden_protocol::errors::MasmError; use miden_protocol::errors::tx_kernel::{ ERR_TX_COMPUTE_FEE_EXCLUDE_NOTE_INDEX_OUT_OF_BOUNDS, ERR_TX_COMPUTE_FEE_EXCLUDE_NOTES_COMMITMENT_MISMATCH, - ERR_TX_COMPUTE_FEE_EXCLUDE_NOTES_COUNT_EXCEEDS_MAX, - ERR_TX_COMPUTE_FEE_EXCLUDE_NOTES_UNSORTED, + ERR_TX_COMPUTE_FEE_EXCLUDE_NOTES_COUNT_EXCEEDS_MAX, ERR_TX_COMPUTE_FEE_EXCLUDE_NOTES_UNSORTED, ERR_TX_COMPUTE_FEE_EXTRA_CYCLES_NOT_U32, }; use miden_protocol::testing::tx::TransactionFee; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_fpi.rs b/crates/miden-testing/src/kernel_tests/tx/test_fpi.rs index 70acb81666..9d6ebe520e 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_fpi.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_fpi.rs @@ -6,49 +6,27 @@ use miden_processor::advice::AdviceInputs; use miden_processor::{EMPTY_WORD, ExecutionOutput, Felt}; use miden_protocol::account::component::AccountComponentMetadata; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountComponent, - AccountHeader, - AccountId, - AccountProcedureRoot, - AccountStorage, - AccountType, - StorageSlot, + Account, AccountBuilder, AccountComponent, AccountHeader, AccountId, AccountProcedureRoot, + AccountStorage, AccountType, StorageSlot, }; use miden_protocol::assembly::DefaultSourceManager; use miden_protocol::asset::{ - Asset, - AssetId, - FungibleAsset, - NonFungibleAsset, - NonFungibleAssetDetails, + Asset, AssetId, FungibleAsset, NonFungibleAsset, NonFungibleAssetDetails, }; use miden_protocol::errors::tx_kernel::{ - ERR_ACCOUNT_IS_NOT_NATIVE, - ERR_FOREIGN_ACCOUNT_CONTEXT_AGAINST_NATIVE_ACCOUNT, - ERR_FOREIGN_ACCOUNT_INVALID_COMMITMENT, - ERR_FOREIGN_ACCOUNT_MAX_NUMBER_EXCEEDED, + ERR_ACCOUNT_IS_NOT_NATIVE, ERR_FOREIGN_ACCOUNT_CONTEXT_AGAINST_NATIVE_ACCOUNT, + ERR_FOREIGN_ACCOUNT_INVALID_COMMITMENT, ERR_FOREIGN_ACCOUNT_MAX_NUMBER_EXCEEDED, }; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, }; use miden_protocol::testing::storage::STORAGE_LEAVES_2; use miden_protocol::transaction::memory::{ - ACCOUNT_DATA_LENGTH, - ACCT_ACTIVE_STORAGE_SLOTS_SECTION_OFFSET, - ACCT_CODE_COMMITMENT_OFFSET, - ACCT_ID_AND_NONCE_OFFSET, - ACCT_NUM_PROCEDURES_OFFSET, - ACCT_NUM_STORAGE_SLOTS_OFFSET, - ACCT_PROCEDURES_SECTION_OFFSET, - ACCT_STORAGE_COMMITMENT_OFFSET, - ACCT_VAULT_ROOT_OFFSET, - NATIVE_ACCOUNT_DATA_PTR, - UPCOMING_FOREIGN_ACCOUNT_PREFIX_PTR, - UPCOMING_FOREIGN_ACCOUNT_SUFFIX_PTR, - UPCOMING_FOREIGN_PROCEDURE_PTR, + ACCOUNT_DATA_LENGTH, ACCT_ACTIVE_STORAGE_SLOTS_SECTION_OFFSET, ACCT_CODE_COMMITMENT_OFFSET, + ACCT_ID_AND_NONCE_OFFSET, ACCT_NUM_PROCEDURES_OFFSET, ACCT_NUM_STORAGE_SLOTS_OFFSET, + ACCT_PROCEDURES_SECTION_OFFSET, ACCT_STORAGE_COMMITMENT_OFFSET, ACCT_VAULT_ROOT_OFFSET, + NATIVE_ACCOUNT_DATA_PTR, UPCOMING_FOREIGN_ACCOUNT_PREFIX_PTR, + UPCOMING_FOREIGN_ACCOUNT_SUFFIX_PTR, UPCOMING_FOREIGN_PROCEDURE_PTR, }; use miden_protocol::{Word, ZERO}; use miden_standards::code_builder::CodeBuilder; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_input_note.rs b/crates/miden-testing/src/kernel_tests/tx/test_input_note.rs index 4ad66ade82..666b3da81c 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_input_note.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_input_note.rs @@ -7,17 +7,14 @@ use miden_protocol::account::{Account, AccountId}; use miden_protocol::asset::{Asset, FungibleAsset, NonFungibleAsset, NonFungibleAssetDetails}; use miden_protocol::crypto::rand::RandomCoin; use miden_protocol::errors::tx_kernel::{ - ERR_INPUT_NOTE_ASSET_INDEX_OUT_OF_BOUNDS, - ERR_INPUT_NOTE_ASSET_TO_REMOVE_NOT_FOUND, + ERR_INPUT_NOTE_ASSET_INDEX_OUT_OF_BOUNDS, ERR_INPUT_NOTE_ASSET_TO_REMOVE_NOT_FOUND, ERR_INPUT_NOTE_NON_FUNGIBLE_ASSET_TO_REMOVE_NOT_FOUND, ERR_VAULT_FUNGIBLE_ASSET_AMOUNT_LESS_THAN_AMOUNT_TO_WITHDRAW, }; use miden_protocol::note::{Note, NoteAssets, NoteType}; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET_1, - ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, + ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET_1, ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, ACCOUNT_ID_SENDER, }; use miden_protocol::transaction::memory::ASSET_SIZE; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_lazy_loading.rs b/crates/miden-testing/src/kernel_tests/tx/test_lazy_loading.rs index b4657bd67c..b2a3d98240 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_lazy_loading.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_lazy_loading.rs @@ -5,8 +5,7 @@ use miden_protocol::account::{AccountId, AccountStorage, StorageMapKey}; use miden_protocol::asset::{Asset, FungibleAsset}; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_2, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_2, }; use miden_protocol::testing::constants::FUNGIBLE_ASSET_AMOUNT; use miden_protocol::testing::storage::MOCK_MAP_SLOT; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_note.rs b/crates/miden-testing/src/kernel_tests/tx/test_note.rs index e659aa2d9b..6220effca8 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_note.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_note.rs @@ -11,21 +11,11 @@ use miden_protocol::crypto::dsa::falcon512_poseidon2::SecretKey; use miden_protocol::crypto::rand::{FeltRng, RandomCoin}; use miden_protocol::errors::MasmError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachmentHeader, - NoteAttachmentScheme, - NoteAttachments, - NoteMetadata, - NoteRecipient, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachmentHeader, NoteAttachmentScheme, NoteAttachments, NoteMetadata, + NoteRecipient, NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, - ACCOUNT_ID_SENDER, + ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE, ACCOUNT_ID_SENDER, }; use miden_protocol::testing::note::DEFAULT_NOTE_SCRIPT; use miden_protocol::transaction::memory::ACTIVE_INPUT_NOTE_PTR; @@ -40,12 +30,7 @@ use rand_chacha::ChaCha20Rng; use crate::executor::CodeExecutor; use crate::kernel_tests::tx::{ExecutionOutputExt, input_note_data_ptr}; use crate::{ - AccountState, - Auth, - MockChain, - TestTransactionBuilder, - TransactionContext, - TxContextInput, + AccountState, Auth, MockChain, TestTransactionBuilder, TransactionContext, TxContextInput, assert_transaction_executor_error, }; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_output_note.rs b/crates/miden-testing/src/kernel_tests/tx/test_output_note.rs index 3c4bb88d92..744737c93d 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_output_note.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_output_note.rs @@ -7,62 +7,35 @@ use miden_protocol::asset::{Asset, FungibleAsset, NonFungibleAsset}; use miden_protocol::crypto::rand::RandomCoin; use miden_protocol::errors::MasmError; use miden_protocol::errors::tx_kernel::{ - ERR_NON_FUNGIBLE_ASSET_ALREADY_EXISTS, - ERR_NOTE_NUM_OF_ASSETS_EXCEED_LIMIT, + ERR_NON_FUNGIBLE_ASSET_ALREADY_EXISTS, ERR_NOTE_NUM_OF_ASSETS_EXCEED_LIMIT, ERR_OUTPUT_NOTE_ATTACHMENT_SCHEME_CANNOT_BE_ZERO, - ERR_OUTPUT_NOTE_ATTACHMENT_SIZE_CANNOT_BE_ZERO, - ERR_OUTPUT_NOTE_ATTACHMENT_SIZE_MAX_EXCEEDED, + ERR_OUTPUT_NOTE_ATTACHMENT_SIZE_CANNOT_BE_ZERO, ERR_OUTPUT_NOTE_ATTACHMENT_SIZE_MAX_EXCEEDED, ERR_OUTPUT_NOTE_ATTACHMENT_SIZE_MUST_BE_MULTIPLE_OF_WORD_SIZE, - ERR_OUTPUT_NOTE_INDEX_OUT_OF_BOUNDS, - ERR_OUTPUT_NOTE_TOO_MANY_ATTACHMENTS, - ERR_OUTPUT_NOTE_TOTAL_ATTACHMENT_WORDS_EXCEEDED, - ERR_TX_NUMBER_OF_OUTPUT_NOTES_EXCEEDS_LIMIT, + ERR_OUTPUT_NOTE_INDEX_OUT_OF_BOUNDS, ERR_OUTPUT_NOTE_TOO_MANY_ATTACHMENTS, + ERR_OUTPUT_NOTE_TOTAL_ATTACHMENT_WORDS_EXCEEDED, ERR_TX_NUMBER_OF_OUTPUT_NOTES_EXCEEDS_LIMIT, }; use miden_protocol::note::{ - Note, - NoteAttachment, - NoteAttachmentScheme, - NoteAttachments, - NoteMetadata, - NoteRecipient, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAttachment, NoteAttachmentScheme, NoteAttachments, NoteMetadata, NoteRecipient, + NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, - ACCOUNT_ID_PRIVATE_SENDER, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_2, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, + ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, ACCOUNT_ID_PRIVATE_SENDER, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_2, ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, - ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, - ACCOUNT_ID_SENDER, + ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, ACCOUNT_ID_SENDER, }; use miden_protocol::testing::constants::NON_FUNGIBLE_ASSET_DATA_2; use miden_protocol::transaction::memory::{ - ASSET_SIZE, - ASSET_VALUE_OFFSET, - NOTE_MEM_SIZE, - NUM_OUTPUT_NOTES_PTR, - OUTPUT_NOTE_ASSETS_OFFSET, - OUTPUT_NOTE_ATTACHMENT_0_OFFSET, - OUTPUT_NOTE_METADATA_OFFSET, - OUTPUT_NOTE_NUM_ASSETS_OFFSET, - OUTPUT_NOTE_RECIPIENT_OFFSET, - OUTPUT_NOTE_SECTION_OFFSET, + ASSET_SIZE, ASSET_VALUE_OFFSET, NOTE_MEM_SIZE, NUM_OUTPUT_NOTES_PTR, OUTPUT_NOTE_ASSETS_OFFSET, + OUTPUT_NOTE_ATTACHMENT_0_OFFSET, OUTPUT_NOTE_METADATA_OFFSET, OUTPUT_NOTE_NUM_ASSETS_OFFSET, + OUTPUT_NOTE_RECIPIENT_OFFSET, OUTPUT_NOTE_SECTION_OFFSET, }; use miden_protocol::transaction::{RawOutputNote, RawOutputNotes}; use miden_protocol::{Felt, WORD_SIZE, Word, ZERO}; use miden_standards::code_builder::CodeBuilder; use miden_standards::note::{ - AccountTargetNetworkNote, - NetworkAccountTarget, - NetworkNoteExt, - NoteExecutionHint, - P2idNote, + AccountTargetNetworkNote, NetworkAccountTarget, NetworkNoteExt, NoteExecutionHint, P2idNote, }; use miden_standards::testing::mock_account::MockAccountExt; use miden_standards::testing::note::NoteBuilder; @@ -72,10 +45,7 @@ use super::{TestSetup, setup_test}; use crate::kernel_tests::tx::ExecutionOutputExt; use crate::utils::{create_public_p2any_note, create_spawn_note}; use crate::{ - Auth, - MockChain, - TestTransactionBuilder, - assert_execution_error, + Auth, MockChain, TestTransactionBuilder, assert_execution_error, assert_transaction_executor_error, }; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_prologue.rs b/crates/miden-testing/src/kernel_tests/tx/test_prologue.rs index af51ec50e7..8a15bb89e0 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_prologue.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_prologue.rs @@ -5,12 +5,7 @@ use anyhow::Context; use miden_processor::advice::AdviceInputs; use miden_processor::{ExecutionOutput, Word}; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountHeader, - AccountProcedureRoot, - AccountType, - StorageSlot, + Account, AccountBuilder, AccountHeader, AccountProcedureRoot, AccountType, StorageSlot, StorageSlotName, }; use miden_protocol::asset::{FungibleAsset, NonFungibleAsset}; @@ -18,61 +13,26 @@ use miden_protocol::block::account_tree::AccountIdKey; use miden_protocol::errors::tx_kernel::ERR_ACCOUNT_SEED_AND_COMMITMENT_DIGEST_MISMATCH; use miden_protocol::note::NoteId; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, - ACCOUNT_ID_SENDER, + ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, ACCOUNT_ID_SENDER, }; use miden_protocol::transaction::memory::{ - ACCT_DB_ROOT_PTR, - ASSET_SIZE, - ASSET_VALUE_OFFSET, - BLOCK_COMMITMENT_PTR, - BLOCK_METADATA_PTR, - BLOCK_NUMBER_IDX, - CHAIN_COMMITMENT_PTR, - FEE_FAUCET_ID_PREFIX_IDX, - FEE_FAUCET_ID_SUFFIX_IDX, - FEE_PARAMETERS_PTR, - GLOBAL_ACCOUNT_ID_PREFIX_PTR, - GLOBAL_ACCOUNT_ID_SUFFIX_PTR, - INIT_ACCT_COMMITMENT_PTR, - INIT_NATIVE_ACCT_STORAGE_COMMITMENT_PTR, - INIT_NATIVE_ACCT_VAULT_ROOT_PTR, - INIT_NONCE_PTR, - INPUT_NOTE_ARGS_OFFSET, - INPUT_NOTE_ASSETS_COMMITMENT_OFFSET, - INPUT_NOTE_ASSETS_OFFSET, - INPUT_NOTE_ATTACHMENTS_COMMITMENT_OFFSET, - INPUT_NOTE_DETAILS_COMMITMENT_OFFSET, - INPUT_NOTE_METADATA_OFFSET, - INPUT_NOTE_NULLIFIER_SECTION_PTR, - INPUT_NOTE_NUM_ASSETS_OFFSET, - INPUT_NOTE_RECIPIENT_OFFSET, - INPUT_NOTE_SCRIPT_ROOT_OFFSET, - INPUT_NOTE_SECTION_PTR, - INPUT_NOTE_SERIAL_NUM_OFFSET, - INPUT_NOTE_STORAGE_COMMITMENT_OFFSET, - INPUT_NOTES_COMMITMENT_PTR, - KERNEL_PROCEDURES_PTR, - NATIVE_ACCT_CODE_COMMITMENT_PTR, - NATIVE_ACCT_ID_AND_NONCE_PTR, - NATIVE_ACCT_PROCEDURES_SECTION_PTR, - NATIVE_ACCT_STORAGE_COMMITMENT_PTR, - NATIVE_ACCT_STORAGE_SLOTS_SECTION_PTR, - NATIVE_ACCT_VAULT_ROOT_PTR, - NATIVE_NUM_ACCT_PROCEDURES_PTR, - NATIVE_NUM_ACCT_STORAGE_SLOTS_PTR, - NOTE_ROOT_PTR, - NULLIFIER_DB_ROOT_PTR, - NUM_KERNEL_PROCEDURES_PTR, - PARTIAL_BLOCKCHAIN_NUM_LEAVES_PTR, - PARTIAL_BLOCKCHAIN_PEAKS_PTR, - PREV_BLOCK_COMMITMENT_PTR, - PROTOCOL_VERSION_IDX, - TIMESTAMP_IDX, - TX_COMMITMENT_PTR, - TX_KERNEL_COMMITMENT_PTR, - TX_SCRIPT_ROOT_PTR, - VALIDATOR_KEY_COMMITMENT_PTR, + ACCT_DB_ROOT_PTR, ASSET_SIZE, ASSET_VALUE_OFFSET, BLOCK_COMMITMENT_PTR, BLOCK_METADATA_PTR, + BLOCK_NUMBER_IDX, CHAIN_COMMITMENT_PTR, FEE_FAUCET_ID_PREFIX_IDX, FEE_FAUCET_ID_SUFFIX_IDX, + FEE_PARAMETERS_PTR, GLOBAL_ACCOUNT_ID_PREFIX_PTR, GLOBAL_ACCOUNT_ID_SUFFIX_PTR, + INIT_ACCT_COMMITMENT_PTR, INIT_NATIVE_ACCT_STORAGE_COMMITMENT_PTR, + INIT_NATIVE_ACCT_VAULT_ROOT_PTR, INIT_NONCE_PTR, INPUT_NOTE_ARGS_OFFSET, + INPUT_NOTE_ASSETS_COMMITMENT_OFFSET, INPUT_NOTE_ASSETS_OFFSET, + INPUT_NOTE_ATTACHMENTS_COMMITMENT_OFFSET, INPUT_NOTE_DETAILS_COMMITMENT_OFFSET, + INPUT_NOTE_METADATA_OFFSET, INPUT_NOTE_NULLIFIER_SECTION_PTR, INPUT_NOTE_NUM_ASSETS_OFFSET, + INPUT_NOTE_RECIPIENT_OFFSET, INPUT_NOTE_SCRIPT_ROOT_OFFSET, INPUT_NOTE_SECTION_PTR, + INPUT_NOTE_SERIAL_NUM_OFFSET, INPUT_NOTE_STORAGE_COMMITMENT_OFFSET, INPUT_NOTES_COMMITMENT_PTR, + KERNEL_PROCEDURES_PTR, NATIVE_ACCT_CODE_COMMITMENT_PTR, NATIVE_ACCT_ID_AND_NONCE_PTR, + NATIVE_ACCT_PROCEDURES_SECTION_PTR, NATIVE_ACCT_STORAGE_COMMITMENT_PTR, + NATIVE_ACCT_STORAGE_SLOTS_SECTION_PTR, NATIVE_ACCT_VAULT_ROOT_PTR, + NATIVE_NUM_ACCT_PROCEDURES_PTR, NATIVE_NUM_ACCT_STORAGE_SLOTS_PTR, NOTE_ROOT_PTR, + NULLIFIER_DB_ROOT_PTR, NUM_KERNEL_PROCEDURES_PTR, PARTIAL_BLOCKCHAIN_NUM_LEAVES_PTR, + PARTIAL_BLOCKCHAIN_PEAKS_PTR, PREV_BLOCK_COMMITMENT_PTR, PROTOCOL_VERSION_IDX, TIMESTAMP_IDX, + TX_COMMITMENT_PTR, TX_KERNEL_COMMITMENT_PTR, TX_SCRIPT_ROOT_PTR, VALIDATOR_KEY_COMMITMENT_PTR, VERIFICATION_BASE_FEE_IDX, }; use miden_protocol::transaction::{ExecutedTransaction, TransactionArgs, TransactionKernel}; diff --git a/crates/miden-testing/src/kernel_tests/tx/test_tx.rs b/crates/miden-testing/src/kernel_tests/tx/test_tx.rs index da2d4f3b78..0ef8390afb 100644 --- a/crates/miden-testing/src/kernel_tests/tx/test_tx.rs +++ b/crates/miden-testing/src/kernel_tests/tx/test_tx.rs @@ -8,62 +8,31 @@ use miden_processor::crypto::random::RandomCoin; use miden_protocol::account::auth::AuthScheme; use miden_protocol::account::component::AccountComponentMetadata; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountCode, - AccountComponent, - AccountDelta, - AccountStorage, - AccountStoragePatch, - AccountType, - AccountVaultDelta, - StorageSlot, - StorageSlotName, + Account, AccountBuilder, AccountCode, AccountComponent, AccountDelta, AccountStorage, + AccountStoragePatch, AccountType, AccountVaultDelta, StorageSlot, StorageSlotName, }; use miden_protocol::assembly::{DefaultSourceManager, Library, ModuleKind, ModuleParser, Path}; use miden_protocol::asset::{Asset, AssetVault, FungibleAsset, NonFungibleAsset}; use miden_protocol::block::BlockNumber; use miden_protocol::errors::ProvenTransactionError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachmentScheme, - NoteAttachments, - NoteDetailsCommitment, - NoteId, - NoteRecipient, - NoteStorage, - NoteTag, - NoteType, - PartialNote, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachmentScheme, NoteAttachments, NoteDetailsCommitment, + NoteId, NoteRecipient, NoteStorage, NoteTag, NoteType, PartialNote, PartialNoteMetadata, }; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PRIVATE_SENDER, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_2, - ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, - ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, - ACCOUNT_ID_SENDER, + ACCOUNT_ID_PRIVATE_SENDER, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_2, ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, + ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, ACCOUNT_ID_SENDER, }; use miden_protocol::testing::constants::{FUNGIBLE_ASSET_AMOUNT, NON_FUNGIBLE_ASSET_DATA}; use miden_protocol::testing::note::DEFAULT_NOTE_SCRIPT; use miden_protocol::transaction::{ - InputNote, - InputNotes, - RawOutputNote, - RawOutputNotes, - TransactionArgs, - TransactionKernel, - TransactionScript, - TransactionSummary, + InputNote, InputNotes, RawOutputNote, RawOutputNotes, TransactionArgs, TransactionKernel, + TransactionScript, TransactionSummary, }; use miden_protocol::{Felt, Hasher, ONE, Word}; use miden_standards::account::interface::{ - AccountComponentInterface, - AccountInterface, - AccountInterfaceExt, + AccountComponentInterface, AccountInterface, AccountInterfaceExt, }; use miden_standards::account::wallets::BasicWallet; use miden_standards::code_builder::CodeBuilder; @@ -73,10 +42,7 @@ use miden_standards::testing::mock_account::MockAccountExt; use miden_standards::tx_script::SendNotesTransactionScript; use miden_tx::auth::UnreachableAuth; use miden_tx::{ - LocalTransactionProver, - TransactionExecutor, - TransactionExecutorError, - TransactionProverError, + LocalTransactionProver, TransactionExecutor, TransactionExecutorError, TransactionProverError, }; use rstest::rstest; diff --git a/crates/miden-testing/src/lib.rs b/crates/miden-testing/src/lib.rs index 6ec302ab36..a4cf8b7cfa 100644 --- a/crates/miden-testing/src/lib.rs +++ b/crates/miden-testing/src/lib.rs @@ -8,22 +8,14 @@ extern crate std; mod mock_chain; pub use mock_chain::{ - AccountState, - Auth, - MockChain, - MockChainBuilder, - MockChainNote, - TxContextInput, + AccountState, Auth, MockChain, MockChainBuilder, MockChainNote, TxContextInput, }; mod tx_context; #[cfg(test)] pub(crate) use tx_context::TestTransactionBuilder; pub use tx_context::{ - ExecError, - MockTransactionBuilder, - TransactionContext, - TransactionContextBuilder, + ExecError, MockTransactionBuilder, TransactionContext, TransactionContextBuilder, }; pub mod asserts; diff --git a/crates/miden-testing/src/mock_chain/auth.rs b/crates/miden-testing/src/mock_chain/auth.rs index b9f011ab0b..473b08c076 100644 --- a/crates/miden-testing/src/mock_chain/auth.rs +++ b/crates/miden-testing/src/mock_chain/auth.rs @@ -11,23 +11,12 @@ use miden_protocol::testing::noop_auth_component::NoopAuthComponent; use miden_protocol::transaction::TransactionScriptRoot; use miden_standards::account::auth::multisig_smart::ProcedurePolicy; use miden_standards::account::auth::{ - Approver, - ApproverSet, - AuthGuardedMultisig, - AuthGuardedMultisigConfig, - AuthMultisig, - AuthMultisigConfig, - AuthMultisigSmart, - AuthMultisigSmartConfig, - AuthNetworkAccount, - AuthSingleSig, - AuthSingleSigAcl, - AuthSingleSigAclConfig, - GuardianConfig, + Approver, ApproverSet, AuthGuardedMultisig, AuthGuardedMultisigConfig, AuthMultisig, + AuthMultisigConfig, AuthMultisigSmart, AuthMultisigSmartConfig, AuthNetworkAccount, + AuthSingleSig, AuthSingleSigAcl, AuthSingleSigAclConfig, GuardianConfig, }; use miden_standards::testing::account_component::{ - ConditionalAuthComponent, - IncrNonceAuthComponent, + ConditionalAuthComponent, IncrNonceAuthComponent, }; use miden_tx::auth::BasicAuthenticator; use rand::SeedableRng; diff --git a/crates/miden-testing/src/mock_chain/chain.rs b/crates/miden-testing/src/mock_chain/chain.rs index 396fa648a1..71fc0c2f4f 100644 --- a/crates/miden-testing/src/mock_chain/chain.rs +++ b/crates/miden-testing/src/mock_chain/chain.rs @@ -10,24 +10,13 @@ use miden_protocol::batch::{ProposedBatch, ProvenBatch}; use miden_protocol::block::account_tree::{AccountTree, AccountWitness}; use miden_protocol::block::nullifier_tree::{NullifierTree, NullifierWitness}; use miden_protocol::block::{ - BlockHeader, - BlockInputs, - BlockNumber, - BlockSignatures, - Blockchain, - ProposedBlock, - ProvenBlock, + BlockHeader, BlockInputs, BlockNumber, BlockSignatures, Blockchain, ProposedBlock, ProvenBlock, ValidatorKeys, }; use miden_protocol::crypto::dsa::ecdsa_k256_keccak::SigningKey; use miden_protocol::note::{Note, NoteHeader, NoteId, NoteInclusionProof, Nullifier}; use miden_protocol::transaction::{ - ExecutedTransaction, - InputNote, - InputNotes, - OutputNote, - PartialBlockchain, - ProvenTransaction, + ExecutedTransaction, InputNote, InputNotes, OutputNote, PartialBlockchain, ProvenTransaction, TransactionInputs, }; use miden_protocol::{MIN_PROOF_SECURITY_LEVEL, Word}; @@ -1321,9 +1310,7 @@ mod tests { use miden_protocol::asset::{Asset, FungibleAsset}; use miden_protocol::note::NoteType; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_SENDER, + ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_SENDER, }; use miden_protocol::testing::random_secret_key::random_secret_key; use miden_standards::account::wallets::BasicWallet; diff --git a/crates/miden-testing/src/mock_chain/chain_builder.rs b/crates/miden-testing/src/mock_chain/chain_builder.rs index 8c3bcf1eee..f3f1fc618a 100644 --- a/crates/miden-testing/src/mock_chain/chain_builder.rs +++ b/crates/miden-testing/src/mock_chain/chain_builder.rs @@ -20,32 +20,15 @@ const DEFAULT_VALIDATOR_COUNT: usize = 3; use itertools::Itertools; use miden_processor::crypto::random::RandomCoin; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountComponent, - AccountId, - AccountPatch, - AccountType, - AccountUpdateDetails, - AssetCallbackFlag, - StorageSlot, + Account, AccountBuilder, AccountComponent, AccountId, AccountPatch, AccountType, + AccountUpdateDetails, AssetCallbackFlag, StorageSlot, }; use miden_protocol::asset::{Asset, AssetAmount, FungibleAsset, TokenSymbol}; use miden_protocol::block::account_tree::AccountTree; use miden_protocol::block::nullifier_tree::NullifierTree; use miden_protocol::block::{ - BlockAccountUpdate, - BlockBody, - BlockHeader, - BlockNoteTree, - BlockNumber, - BlockProof, - BlockSignatures, - Blockchain, - FeeParameters, - OutputNoteBatch, - ProvenBlock, - ValidatorKeys, + BlockAccountUpdate, BlockBody, BlockHeader, BlockNoteTree, BlockNumber, BlockProof, + BlockSignatures, Blockchain, FeeParameters, OutputNoteBatch, ProvenBlock, ValidatorKeys, }; use miden_protocol::crypto::dsa::ecdsa_k256_keccak::SigningKey; use miden_protocol::crypto::merkle::smt::Smt; @@ -58,10 +41,7 @@ use miden_protocol::{MAX_OUTPUT_NOTES_PER_BATCH, Word}; use miden_standards::account::access::{AccessControl, Authority, Pausable, PausableManager}; use miden_standards::account::faucets::{FungibleFaucet, TokenName}; use miden_standards::account::policies::{ - BurnPolicy, - MintPolicy, - TokenPolicyManager, - TransferPolicy, + BurnPolicy, MintPolicy, TokenPolicyManager, TransferPolicy, }; use miden_standards::account::wallets::{BasicWallet, NoteCreator}; use miden_standards::note::{BurnNote, MintNote, P2idNote, P2ideNote, SwapNote}; diff --git a/crates/miden-testing/src/standards/token_metadata.rs b/crates/miden-testing/src/standards/token_metadata.rs index b43e2a7e0f..7164825560 100644 --- a/crates/miden-testing/src/standards/token_metadata.rs +++ b/crates/miden-testing/src/standards/token_metadata.rs @@ -8,12 +8,7 @@ use alloc::vec::Vec; use miden_crypto::hash::poseidon2::Poseidon2; use miden_processor::crypto::random::RandomCoin; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountComponent, - AccountId, - AccountType, - StorageSlotName, + Account, AccountBuilder, AccountComponent, AccountId, AccountType, StorageSlotName, }; use miden_protocol::assembly::DefaultSourceManager; use miden_protocol::asset::{AssetAmount, TokenSymbol}; @@ -23,20 +18,12 @@ use miden_protocol::{Felt, Word}; use miden_standards::account::access::Pausable; use miden_standards::account::auth::NoAuth; use miden_standards::account::faucets::{ - Description, - ExternalLink, - FungibleFaucet, - LogoURI, - TokenMetadata, - TokenName, + Description, ExternalLink, FungibleFaucet, LogoURI, TokenMetadata, TokenName, }; use miden_standards::code_builder::CodeBuilder; use miden_standards::errors::standards::{ - ERR_DESCRIPTION_NOT_MUTABLE, - ERR_EXTERNAL_LINK_NOT_MUTABLE, - ERR_LOGO_URI_NOT_MUTABLE, - ERR_MAX_SUPPLY_NOT_MUTABLE, - ERR_SENDER_NOT_OWNER, + ERR_DESCRIPTION_NOT_MUTABLE, ERR_EXTERNAL_LINK_NOT_MUTABLE, ERR_LOGO_URI_NOT_MUTABLE, + ERR_MAX_SUPPLY_NOT_MUTABLE, ERR_SENDER_NOT_OWNER, }; use miden_standards::testing::note::NoteBuilder; diff --git a/crates/miden-testing/src/tx_context/builder.rs b/crates/miden-testing/src/tx_context/builder.rs index 3ca40ddfe2..9f80f3db5c 100644 --- a/crates/miden-testing/src/tx_context/builder.rs +++ b/crates/miden-testing/src/tx_context/builder.rs @@ -16,10 +16,7 @@ use miden_protocol::assembly::debuginfo::SourceManagerSync; use miden_protocol::block::account_tree::AccountWitness; use miden_protocol::note::{Note, NoteId, NoteScript, NoteScriptRoot}; use miden_protocol::transaction::{ - RawOutputNote, - TransactionArgs, - TransactionInputs, - TransactionScript, + RawOutputNote, TransactionArgs, TransactionInputs, TransactionScript, }; use miden_tx::TransactionMastStore; use miden_tx::auth::BasicAuthenticator; diff --git a/crates/miden-testing/src/tx_context/context.rs b/crates/miden-testing/src/tx_context/context.rs index ea3fff455e..31fb1a0e0b 100644 --- a/crates/miden-testing/src/tx_context/context.rs +++ b/crates/miden-testing/src/tx_context/context.rs @@ -5,12 +5,7 @@ use alloc::vec::Vec; use miden_processor::{ExecutionOutput, FutureMaybeSend, LoadedMastForest, MastForestStore, Word}; use miden_protocol::account::{ - Account, - AccountId, - PartialAccount, - StorageMapKey, - StorageMapWitness, - StorageSlotContent, + Account, AccountId, PartialAccount, StorageMapKey, StorageMapWitness, StorageSlotContent, }; use miden_protocol::assembly::debuginfo::{SourceLanguage, Uri}; use miden_protocol::assembly::{Assembler, SourceManager, SourceManagerSync}; @@ -19,26 +14,14 @@ use miden_protocol::block::account_tree::AccountWitness; use miden_protocol::block::{BlockHeader, BlockNumber}; use miden_protocol::note::{Note, NoteScript, NoteScriptRoot}; use miden_protocol::transaction::{ - AccountInputs, - ExecutedTransaction, - InputNote, - InputNotes, - PartialBlockchain, - TransactionArgs, - TransactionInputs, - TransactionKernel, + AccountInputs, ExecutedTransaction, InputNote, InputNotes, PartialBlockchain, TransactionArgs, + TransactionInputs, TransactionKernel, }; use miden_standards::code_builder::CodeBuilder; use miden_tx::auth::{BasicAuthenticator, UnreachableAuth}; use miden_tx::{ - AccountProcedureIndexMap, - DataStore, - DataStoreError, - ScriptMastForestStore, - TransactionExecutor, - TransactionExecutorError, - TransactionExecutorHost, - TransactionMastStore, + AccountProcedureIndexMap, DataStore, DataStoreError, ScriptMastForestStore, + TransactionExecutor, TransactionExecutorError, TransactionExecutorHost, TransactionMastStore, }; use crate::executor::CodeExecutor; diff --git a/crates/miden-testing/tests/agglayer/asset_conversion.rs b/crates/miden-testing/tests/agglayer/asset_conversion.rs index 4f99027dd6..820df87b8c 100644 --- a/crates/miden-testing/tests/agglayer/asset_conversion.rs +++ b/crates/miden-testing/tests/agglayer/asset_conversion.rs @@ -1,10 +1,7 @@ extern crate alloc; use miden_agglayer::errors::{ - ERR_REMAINDER_TOO_LARGE, - ERR_SCALE_AMOUNT_EXCEEDED_LIMIT, - ERR_UNDERFLOW, - ERR_X_TOO_LARGE, + ERR_REMAINDER_TOO_LARGE, ERR_SCALE_AMOUNT_EXCEEDED_LIMIT, ERR_UNDERFLOW, ERR_X_TOO_LARGE, }; use miden_agglayer::eth_types::amount::EthAmount; use miden_processor::utils::packed_u32_elements_to_bytes; diff --git a/crates/miden-testing/tests/agglayer/bridge_in.rs b/crates/miden-testing/tests/agglayer/bridge_in.rs index dada4b13a3..016ff20659 100644 --- a/crates/miden-testing/tests/agglayer/bridge_in.rs +++ b/crates/miden-testing/tests/agglayer/bridge_in.rs @@ -5,29 +5,14 @@ use alloc::string::String; use anyhow::Context; use miden_agglayer::errors::{ - ERR_CLAIM_ALREADY_SPENT, - ERR_CLAIM_LEAF_DESTINATION_NETWORK_MISMATCH, - ERR_GER_NOT_FOUND, + ERR_CLAIM_ALREADY_SPENT, ERR_CLAIM_LEAF_DESTINATION_NETWORK_MISMATCH, ERR_GER_NOT_FOUND, ERR_TOKEN_NOT_REGISTERED, }; use miden_agglayer::{ - AggLayerBridge, - B2AggNote, - ClaimNote, - ClaimNoteStorage, - ConfigAggBridgeNote, - ConversionMetadata, - EthAddress, - EthEmbeddedAccountId, - ExitRoot, - LeafValue, - RemoveGerNote, - SmtNode, - UpdateGerNote, - agglayer_library, - create_existing_agglayer_faucet, - create_existing_agglayer_faucet_with_callbacks, - create_existing_bridge_account, + AggLayerBridge, B2AggNote, ClaimNote, ClaimNoteStorage, ConfigAggBridgeNote, + ConversionMetadata, EthAddress, EthEmbeddedAccountId, ExitRoot, LeafValue, RemoveGerNote, + SmtNode, UpdateGerNote, agglayer_library, create_existing_agglayer_faucet, + create_existing_agglayer_faucet_with_callbacks, create_existing_bridge_account, }; use miden_protocol::Felt; use miden_protocol::account::auth::AuthScheme; @@ -49,9 +34,7 @@ use miden_tx::utils::hex_to_bytes; use rand::RngExt; use super::test_utils::{ - ClaimDataSource, - MerkleProofVerificationFile, - SOLIDITY_MERKLE_PROOF_VECTORS, + ClaimDataSource, MerkleProofVerificationFile, SOLIDITY_MERKLE_PROOF_VECTORS, }; // CONSTANTS diff --git a/crates/miden-testing/tests/agglayer/bridge_out.rs b/crates/miden-testing/tests/agglayer/bridge_out.rs index de90769686..e29ccdc771 100644 --- a/crates/miden-testing/tests/agglayer/bridge_out.rs +++ b/crates/miden-testing/tests/agglayer/bridge_out.rs @@ -1,22 +1,12 @@ extern crate alloc; use miden_agglayer::errors::{ - ERR_B2AGG_DESTINATION_NETWORK_IS_MIDEN, - ERR_B2AGG_NOTE_MUST_BE_PUBLIC, - ERR_B2AGG_TARGET_ACCOUNT_MISMATCH, - ERR_FAUCET_NOT_REGISTERED, + ERR_B2AGG_DESTINATION_NETWORK_IS_MIDEN, ERR_B2AGG_NOTE_MUST_BE_PUBLIC, + ERR_B2AGG_TARGET_ACCOUNT_MISMATCH, ERR_FAUCET_NOT_REGISTERED, }; use miden_agglayer::{ - AggLayerBridge, - B2AggNote, - ConfigAggBridgeNote, - ConversionMetadata, - EthAddress, - ExitRoot, - Keccak256Output, - MetadataHash, - create_existing_agglayer_faucet, - create_existing_bridge_account, + AggLayerBridge, B2AggNote, ConfigAggBridgeNote, ConversionMetadata, EthAddress, ExitRoot, + Keccak256Output, MetadataHash, create_existing_agglayer_faucet, create_existing_bridge_account, }; use miden_crypto::hash::keccak::Keccak256Digest; use miden_crypto::rand::FeltRng; @@ -25,12 +15,7 @@ use miden_protocol::account::{Account, AccountId, AccountType, StorageMapKey}; use miden_protocol::asset::{Asset, AssetAmount, FungibleAsset}; use miden_protocol::errors::MasmError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteType, PartialNoteMetadata, }; use miden_protocol::transaction::RawOutputNote; use miden_protocol::{Felt, Word}; diff --git a/crates/miden-testing/tests/agglayer/config_bridge.rs b/crates/miden-testing/tests/agglayer/config_bridge.rs index f319c4c6f2..4cde6c5f6d 100644 --- a/crates/miden-testing/tests/agglayer/config_bridge.rs +++ b/crates/miden-testing/tests/agglayer/config_bridge.rs @@ -4,21 +4,12 @@ use alloc::vec::Vec; use miden_agglayer::errors::{ERR_FAUCET_NOT_REGISTERED, ERR_SENDER_NOT_BRIDGE_ADMIN}; use miden_agglayer::{ - AggLayerBridge, - ConfigAggBridgeNote, - ConversionMetadata, - DeregisterAggFaucetNote, - EthAddress, - MetadataHash, - create_existing_bridge_account, + AggLayerBridge, ConfigAggBridgeNote, ConversionMetadata, DeregisterAggFaucetNote, EthAddress, + MetadataHash, create_existing_bridge_account, }; use miden_protocol::account::auth::AuthScheme; use miden_protocol::account::{ - AccountId, - AccountIdVersion, - AccountType, - AssetCallbackFlag, - StorageMapKey, + AccountId, AccountIdVersion, AccountType, AssetCallbackFlag, StorageMapKey, }; use miden_protocol::block::account_tree::AccountIdKey; use miden_protocol::crypto::rand::FeltRng; diff --git a/crates/miden-testing/tests/agglayer/faucet_helpers.rs b/crates/miden-testing/tests/agglayer/faucet_helpers.rs index 1903968220..b79de6bfdd 100644 --- a/crates/miden-testing/tests/agglayer/faucet_helpers.rs +++ b/crates/miden-testing/tests/agglayer/faucet_helpers.rs @@ -1,9 +1,7 @@ extern crate alloc; use miden_agglayer::{ - AggLayerFaucet, - create_existing_agglayer_faucet, - create_existing_bridge_account, + AggLayerFaucet, create_existing_agglayer_faucet, create_existing_bridge_account, }; use miden_protocol::Felt; use miden_protocol::account::auth::AuthScheme; diff --git a/crates/miden-testing/tests/agglayer/global_index.rs b/crates/miden-testing/tests/agglayer/global_index.rs index 03eac89ef9..0727eccae8 100644 --- a/crates/miden-testing/tests/agglayer/global_index.rs +++ b/crates/miden-testing/tests/agglayer/global_index.rs @@ -3,9 +3,7 @@ extern crate alloc; use alloc::sync::Arc; use miden_agglayer::errors::{ - ERR_BRIDGE_NOT_MAINNET, - ERR_BRIDGE_NOT_ROLLUP, - ERR_LEADING_BITS_NON_ZERO, + ERR_BRIDGE_NOT_MAINNET, ERR_BRIDGE_NOT_ROLLUP, ERR_LEADING_BITS_NON_ZERO, ERR_ROLLUP_INDEX_NON_ZERO, }; use miden_agglayer::{GlobalIndex, agglayer_library}; diff --git a/crates/miden-testing/tests/agglayer/leaf_utils.rs b/crates/miden-testing/tests/agglayer/leaf_utils.rs index bc7132a662..4b72f7ad9c 100644 --- a/crates/miden-testing/tests/agglayer/leaf_utils.rs +++ b/crates/miden-testing/tests/agglayer/leaf_utils.rs @@ -13,9 +13,7 @@ use miden_protocol::{Felt, Word}; use miden_tx::utils::hex_to_bytes; use super::test_utils::{ - LEAF_VALUE_VECTORS_JSON, - LeafValueVector, - execute_program_with_default_host, + LEAF_VALUE_VECTORS_JSON, LeafValueVector, execute_program_with_default_host, }; // HELPER FUNCTIONS diff --git a/crates/miden-testing/tests/agglayer/network_account_regression.rs b/crates/miden-testing/tests/agglayer/network_account_regression.rs index 0b9054069e..cad0a530e9 100644 --- a/crates/miden-testing/tests/agglayer/network_account_regression.rs +++ b/crates/miden-testing/tests/agglayer/network_account_regression.rs @@ -12,10 +12,7 @@ use core::slice; use miden_agglayer::{ - ExitRoot, - UpdateGerNote, - create_existing_agglayer_faucet, - create_existing_bridge_account, + ExitRoot, UpdateGerNote, create_existing_agglayer_faucet, create_existing_bridge_account, }; use miden_crypto::rand::FeltRng; use miden_protocol::Felt; @@ -23,8 +20,7 @@ use miden_protocol::account::auth::AuthScheme; use miden_protocol::transaction::RawOutputNote; use miden_standards::code_builder::CodeBuilder; use miden_standards::errors::standards::{ - ERR_NOTE_SCRIPT_ALLOWLIST_NOTE_NOT_ALLOWED, - ERR_TX_SCRIPT_ALLOWLIST_TX_SCRIPT_NOT_ALLOWED, + ERR_NOTE_SCRIPT_ALLOWLIST_NOTE_NOT_ALLOWED, ERR_TX_SCRIPT_ALLOWLIST_TX_SCRIPT_NOT_ALLOWED, }; use miden_standards::testing::note::NoteBuilder; use miden_testing::{Auth, MockChain, assert_transaction_executor_error}; diff --git a/crates/miden-testing/tests/agglayer/remove_ger.rs b/crates/miden-testing/tests/agglayer/remove_ger.rs index d31ee6407c..fb0068569e 100644 --- a/crates/miden-testing/tests/agglayer/remove_ger.rs +++ b/crates/miden-testing/tests/agglayer/remove_ger.rs @@ -2,11 +2,7 @@ extern crate alloc; use miden_agglayer::errors::{ERR_GER_NOT_FOUND, ERR_SENDER_NOT_GER_REMOVER}; use miden_agglayer::{ - AggLayerBridge, - ExitRoot, - RemoveGerNote, - UpdateGerNote, - create_existing_bridge_account, + AggLayerBridge, ExitRoot, RemoveGerNote, UpdateGerNote, create_existing_bridge_account, }; use miden_core_lib::handlers::keccak256::KeccakPreimage; use miden_protocol::account::Account; diff --git a/crates/miden-testing/tests/agglayer/solidity_miden_address_conversion.rs b/crates/miden-testing/tests/agglayer/solidity_miden_address_conversion.rs index 21d136c189..fe8bb79c6e 100644 --- a/crates/miden-testing/tests/agglayer/solidity_miden_address_conversion.rs +++ b/crates/miden-testing/tests/agglayer/solidity_miden_address_conversion.rs @@ -7,21 +7,13 @@ use miden_assembly::{Assembler, DefaultSourceManager, Linkage}; use miden_core_lib::CoreLibrary; use miden_processor::advice::AdviceInputs; use miden_processor::{ - DefaultHost, - ExecutionError, - ExecutionOutput, - FastProcessor, - Program, - StackInputs, + DefaultHost, ExecutionError, ExecutionOutput, FastProcessor, Program, StackInputs, }; use miden_protocol::account::AccountId; use miden_protocol::address::NetworkId; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PRIVATE_SENDER, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, - ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, - AccountIdBuilder, + ACCOUNT_ID_PRIVATE_SENDER, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, ACCOUNT_ID_PUBLIC_NON_FUNGIBLE_FAUCET, AccountIdBuilder, }; use miden_protocol::transaction::TransactionKernel; use miden_protocol::{Felt, ProtocolLib}; diff --git a/crates/miden-testing/tests/agglayer/test_utils.rs b/crates/miden-testing/tests/agglayer/test_utils.rs index ba905d20c5..b07487c754 100644 --- a/crates/miden-testing/tests/agglayer/test_utils.rs +++ b/crates/miden-testing/tests/agglayer/test_utils.rs @@ -4,24 +4,14 @@ use alloc::sync::Arc; use miden_agglayer::agglayer_library; pub use miden_agglayer::testing::{ - ClaimDataSource, - LEAF_VALUE_VECTORS_JSON, - LeafValueVector, - MerkleProofVerificationFile, - MtfVectorsFile, - SOLIDITY_CANONICAL_ZEROS, - SOLIDITY_MERKLE_PROOF_VECTORS, + ClaimDataSource, LEAF_VALUE_VECTORS_JSON, LeafValueVector, MerkleProofVerificationFile, + MtfVectorsFile, SOLIDITY_CANONICAL_ZEROS, SOLIDITY_MERKLE_PROOF_VECTORS, }; use miden_assembly::{Assembler, DefaultSourceManager, Linkage}; use miden_core_lib::CoreLibrary; use miden_processor::advice::AdviceInputs; use miden_processor::{ - DefaultHost, - ExecutionError, - ExecutionOutput, - FastProcessor, - Program, - StackInputs, + DefaultHost, ExecutionError, ExecutionOutput, FastProcessor, Program, StackInputs, }; use miden_protocol::ProtocolLib; use miden_protocol::errors::MasmError; diff --git a/crates/miden-testing/tests/agglayer/update_ger.rs b/crates/miden-testing/tests/agglayer/update_ger.rs index 5c46c92091..82fc4f9b31 100644 --- a/crates/miden-testing/tests/agglayer/update_ger.rs +++ b/crates/miden-testing/tests/agglayer/update_ger.rs @@ -6,11 +6,7 @@ use alloc::vec::Vec; use miden_agglayer::errors::ERR_GER_ALREADY_REGISTERED; use miden_agglayer::{ - AggLayerBridge, - ExitRoot, - UpdateGerNote, - agglayer_library, - create_existing_bridge_account, + AggLayerBridge, ExitRoot, UpdateGerNote, agglayer_library, create_existing_bridge_account, }; use miden_assembly::{Assembler, DefaultSourceManager, Linkage}; use miden_core_lib::CoreLibrary; diff --git a/crates/miden-testing/tests/auth/guarded_multisig.rs b/crates/miden-testing/tests/auth/guarded_multisig.rs index 96f8b3a56b..4261a80af9 100644 --- a/crates/miden-testing/tests/auth/guarded_multisig.rs +++ b/crates/miden-testing/tests/auth/guarded_multisig.rs @@ -1,36 +1,22 @@ use miden_protocol::account::auth::{AuthScheme, AuthSecretKey, PublicKey}; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountProcedureRoot, - AccountType, - StorageMapKey, + Account, AccountBuilder, AccountProcedureRoot, AccountType, StorageMapKey, }; use miden_protocol::asset::FungibleAsset; use miden_protocol::note::{ - Note, - NoteAssets, - NoteRecipient, - NoteStorage, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteRecipient, NoteStorage, NoteType, PartialNoteMetadata, }; use miden_protocol::testing::account_id::ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE; use miden_protocol::testing::note::DEFAULT_NOTE_SCRIPT; use miden_protocol::transaction::RawOutputNote; use miden_protocol::{Felt, Word}; use miden_standards::account::auth::{ - Approver, - ApproverSet, - AuthGuardedMultisig, - AuthGuardedMultisigConfig, - GuardianConfig, + Approver, ApproverSet, AuthGuardedMultisig, AuthGuardedMultisigConfig, GuardianConfig, }; use miden_standards::account::wallets::BasicWallet; use miden_standards::code_builder::CodeBuilder; use miden_standards::errors::standards::{ - ERR_AUTH_PROCEDURE_MUST_BE_CALLED_ALONE, - ERR_AUTH_TRANSACTION_MUST_NOT_INCLUDE_INPUT_NOTES, + ERR_AUTH_PROCEDURE_MUST_BE_CALLED_ALONE, ERR_AUTH_TRANSACTION_MUST_NOT_INCLUDE_INPUT_NOTES, ERR_AUTH_TRANSACTION_MUST_NOT_INCLUDE_OUTPUT_NOTES, }; use miden_testing::{MockChainBuilder, assert_transaction_executor_error}; diff --git a/crates/miden-testing/tests/auth/hybrid_multisig.rs b/crates/miden-testing/tests/auth/hybrid_multisig.rs index ec52559c45..7ae8462788 100644 --- a/crates/miden-testing/tests/auth/hybrid_multisig.rs +++ b/crates/miden-testing/tests/auth/hybrid_multisig.rs @@ -2,11 +2,7 @@ use miden_processor::advice::AdviceInputs; use miden_processor::crypto::random::RandomCoin; use miden_protocol::account::auth::{AuthScheme, AuthSecretKey, PublicKey}; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountProcedureRoot, - AccountType, - StorageMapKey, + Account, AccountBuilder, AccountProcedureRoot, AccountType, StorageMapKey, }; use miden_protocol::asset::FungibleAsset; use miden_protocol::note::{Note, NoteType}; diff --git a/crates/miden-testing/tests/auth/multisig.rs b/crates/miden-testing/tests/auth/multisig.rs index 89aaaf7fde..a6ed80207d 100644 --- a/crates/miden-testing/tests/auth/multisig.rs +++ b/crates/miden-testing/tests/auth/multisig.rs @@ -2,18 +2,12 @@ use miden_processor::advice::AdviceInputs; use miden_processor::crypto::random::RandomCoin; use miden_protocol::account::auth::{AuthScheme, AuthSecretKey, PublicKey}; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountId, - AccountProcedureRoot, - AccountType, - StorageMapKey, + Account, AccountBuilder, AccountId, AccountProcedureRoot, AccountType, StorageMapKey, }; use miden_protocol::asset::{AssetId, FungibleAsset}; use miden_protocol::note::{Note, NoteType}; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_UPDATABLE_CODE, }; use miden_protocol::transaction::{RawOutputNote, TransactionScript}; use miden_protocol::vm::AdviceMap; @@ -22,8 +16,7 @@ use miden_standards::account::auth::{Approver, ApproverSet, AuthMultisig}; use miden_standards::account::wallets::BasicWallet; use miden_standards::code_builder::CodeBuilder; use miden_standards::errors::standards::{ - ERR_DUPLICATE_APPROVER_PUBLIC_KEY, - ERR_PROC_THRESHOLD_EXCEEDS_NUM_APPROVERS, + ERR_DUPLICATE_APPROVER_PUBLIC_KEY, ERR_PROC_THRESHOLD_EXCEEDS_NUM_APPROVERS, ERR_TX_ALREADY_EXECUTED, }; use miden_standards::note::P2idNote; diff --git a/crates/miden-testing/tests/auth/multisig_smart.rs b/crates/miden-testing/tests/auth/multisig_smart.rs index 5e42443142..9f929a0fab 100644 --- a/crates/miden-testing/tests/auth/multisig_smart.rs +++ b/crates/miden-testing/tests/auth/multisig_smart.rs @@ -8,21 +8,16 @@ use miden_protocol::transaction::TransactionScript; use miden_protocol::vm::AdviceMap; use miden_protocol::{Felt, Hasher, Word}; use miden_standards::account::auth::multisig_smart::{ - ProcedurePolicy, - ProcedurePolicyNoteRestriction, + ProcedurePolicy, ProcedurePolicyNoteRestriction, }; use miden_standards::account::auth::{ - Approver, - ApproverSet, - AuthMultisigSmart, - AuthMultisigSmartConfig, + Approver, ApproverSet, AuthMultisigSmart, AuthMultisigSmartConfig, }; use miden_standards::account::wallets::BasicWallet; use miden_standards::code_builder::CodeBuilder; use miden_standards::errors::standards::{ ERR_AUTH_TRANSACTION_MUST_NOT_INCLUDE_INPUT_NOTES, - ERR_AUTH_TRANSACTION_MUST_NOT_INCLUDE_OUTPUT_NOTES, - ERR_DUPLICATE_APPROVER_PUBLIC_KEY, + ERR_AUTH_TRANSACTION_MUST_NOT_INCLUDE_OUTPUT_NOTES, ERR_DUPLICATE_APPROVER_PUBLIC_KEY, ERR_PROC_ROOT_NOT_IN_ACCOUNT, }; use miden_testing::{MockChainBuilder, assert_transaction_executor_error}; @@ -30,8 +25,7 @@ use miden_tx::auth::{SigningInputs, TransactionAuthenticator}; use rstest::rstest; use super::multisig::{ - build_update_signers_config_vector, - setup_keys_and_authenticators_with_scheme, + build_update_signers_config_vector, setup_keys_and_authenticators_with_scheme, }; // ================================================================================================ diff --git a/crates/miden-testing/tests/auth/network_account.rs b/crates/miden-testing/tests/auth/network_account.rs index f80ef110bb..207b3d3845 100644 --- a/crates/miden-testing/tests/auth/network_account.rs +++ b/crates/miden-testing/tests/auth/network_account.rs @@ -11,8 +11,7 @@ use miden_standards::account::auth::AuthNetworkAccount; use miden_standards::account::wallets::BasicWallet; use miden_standards::code_builder::CodeBuilder; use miden_standards::errors::standards::{ - ERR_NOTE_SCRIPT_ALLOWLIST_NOTE_NOT_ALLOWED, - ERR_TX_SCRIPT_ALLOWLIST_TX_SCRIPT_NOT_ALLOWED, + ERR_NOTE_SCRIPT_ALLOWLIST_NOTE_NOT_ALLOWED, ERR_TX_SCRIPT_ALLOWLIST_TX_SCRIPT_NOT_ALLOWED, }; use miden_standards::testing::note::NoteBuilder; use miden_standards::tx_script::ExpirationTransactionScript; diff --git a/crates/miden-testing/tests/auth/singlesig.rs b/crates/miden-testing/tests/auth/singlesig.rs index 3b8fa0ac38..e191ce6640 100644 --- a/crates/miden-testing/tests/auth/singlesig.rs +++ b/crates/miden-testing/tests/auth/singlesig.rs @@ -5,11 +5,7 @@ use miden_processor::ExecutionError; use miden_protocol::Word; use miden_protocol::account::auth::{AuthScheme, AuthSecretKey}; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountComponent, - AccountStorage, - AccountType, + Account, AccountBuilder, AccountComponent, AccountStorage, AccountType, }; use miden_protocol::errors::MasmError; use miden_protocol::note::Note; diff --git a/crates/miden-testing/tests/auth/singlesig_acl.rs b/crates/miden-testing/tests/auth/singlesig_acl.rs index 62d55df475..52650825e2 100644 --- a/crates/miden-testing/tests/auth/singlesig_acl.rs +++ b/crates/miden-testing/tests/auth/singlesig_acl.rs @@ -6,16 +6,8 @@ use miden_processor::ExecutionError; use miden_processor::crypto::random::RandomCoin; use miden_protocol::account::auth::{AuthScheme, AuthSecretKey}; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountComponent, - AccountId, - AccountProcedureRoot, - AccountStorage, - AccountType, - StorageMap, - StorageMapKey, - StorageSlot, + Account, AccountBuilder, AccountComponent, AccountId, AccountProcedureRoot, AccountStorage, + AccountType, StorageMap, StorageMapKey, StorageSlot, }; use miden_protocol::asset::{AssetAmount, FungibleAsset, TokenSymbol}; use miden_protocol::errors::MasmError; @@ -27,10 +19,7 @@ use miden_standards::account::access::{Authority, Pausable, PausableManager}; use miden_standards::account::auth::AuthSingleSigAcl; use miden_standards::account::faucets::{Description, FungibleFaucet, TokenName}; use miden_standards::account::policies::{ - BurnPolicy, - MintPolicy, - TokenPolicyManager, - TransferPolicy, + BurnPolicy, MintPolicy, TokenPolicyManager, TransferPolicy, }; use miden_standards::code_builder::CodeBuilder; use miden_standards::note::BurnNote; diff --git a/crates/miden-testing/tests/lib.rs b/crates/miden-testing/tests/lib.rs index 4410955686..8b931052a9 100644 --- a/crates/miden-testing/tests/lib.rs +++ b/crates/miden-testing/tests/lib.rs @@ -11,12 +11,7 @@ use miden_protocol::asset::FungibleAsset; use miden_protocol::crypto::utils::Serializable; use miden_protocol::errors::TransactionVerifierError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteRecipient, - NoteStorage, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteRecipient, NoteStorage, NoteType, PartialNoteMetadata, }; use miden_protocol::testing::account_id::ACCOUNT_ID_SENDER; use miden_protocol::transaction::{ExecutedTransaction, ProvenTransaction, TransactionVerifier}; diff --git a/crates/miden-testing/tests/scripts/allowlist.rs b/crates/miden-testing/tests/scripts/allowlist.rs index cd7a98650e..1d31b19e01 100644 --- a/crates/miden-testing/tests/scripts/allowlist.rs +++ b/crates/miden-testing/tests/scripts/allowlist.rs @@ -12,12 +12,7 @@ use std::sync::Arc; use miden_processor::crypto::random::RandomCoin; use miden_protocol::account::auth::AuthScheme; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountId, - AccountProcedureRoot, - AccountType, - AssetCallbackFlag, + Account, AccountBuilder, AccountId, AccountProcedureRoot, AccountType, AssetCallbackFlag, RoleSymbol, }; use miden_protocol::assembly::DefaultSourceManager; @@ -28,22 +23,13 @@ use miden_protocol::{Felt, Word}; use miden_standards::account::access::{AccessControl, Authority, Ownable2Step, Pausable}; use miden_standards::account::faucets::{FungibleFaucet, TokenName}; use miden_standards::account::policies::{ - AllowlistManager, - AllowlistStorage, - BurnPolicy, - MintPolicy, - TokenPolicyManager, - TransferPolicy, + AllowlistManager, AllowlistStorage, BurnPolicy, MintPolicy, TokenPolicyManager, TransferPolicy, }; use miden_standards::code_builder::CodeBuilder; use miden_standards::errors::standards::{ERR_ACCOUNT_IS_NOT_ALLOWED, ERR_SENDER_LACKS_ROLE}; use miden_standards::testing::note::NoteBuilder; use miden_testing::{ - AccountState, - Auth, - MockChain, - MockChainBuilder, - assert_transaction_executor_error, + AccountState, Auth, MockChain, MockChainBuilder, assert_transaction_executor_error, }; use super::rbac::{build_grant_role_note, role, test_account_id}; diff --git a/crates/miden-testing/tests/scripts/authority.rs b/crates/miden-testing/tests/scripts/authority.rs index 8d21da986d..8746db15fd 100644 --- a/crates/miden-testing/tests/scripts/authority.rs +++ b/crates/miden-testing/tests/scripts/authority.rs @@ -3,12 +3,7 @@ use std::collections::BTreeMap; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountId, - AccountProcedureRoot, - AccountType, - RoleSymbol, + Account, AccountBuilder, AccountId, AccountProcedureRoot, AccountType, RoleSymbol, }; use miden_protocol::asset::AssetAmount; use miden_protocol::note::Note; @@ -17,24 +12,14 @@ use miden_standards::account::access::pausable::{Pausable, PausableManager}; use miden_standards::account::access::{AccessControl, Authority}; use miden_standards::account::faucets::{FungibleFaucet, TokenName}; use miden_standards::errors::standards::{ - ERR_AUTHORITY_FROZEN, - ERR_SENDER_LACKS_ROLE, - ERR_SENDER_NOT_OWNER, + ERR_AUTHORITY_FROZEN, ERR_SENDER_LACKS_ROLE, ERR_SENDER_NOT_OWNER, }; use miden_testing::{ - AccountState, - Auth, - MockChain, - MockChainBuilder, - assert_transaction_executor_error, + AccountState, Auth, MockChain, MockChainBuilder, assert_transaction_executor_error, }; use super::pausable::{ - ADMIN_ID, - NON_OWNER_ID, - OWNER_ID, - build_pause_note, - build_set_max_supply_note, + ADMIN_ID, NON_OWNER_ID, OWNER_ID, build_pause_note, build_set_max_supply_note, execute_note_on_faucet, }; use super::rbac::{build_grant_role_note, build_note, role, test_account_id}; diff --git a/crates/miden-testing/tests/scripts/blocklist.rs b/crates/miden-testing/tests/scripts/blocklist.rs index 88a351ada1..2808e0ce3b 100644 --- a/crates/miden-testing/tests/scripts/blocklist.rs +++ b/crates/miden-testing/tests/scripts/blocklist.rs @@ -12,12 +12,7 @@ use std::sync::Arc; use miden_processor::crypto::random::RandomCoin; use miden_protocol::account::auth::AuthScheme; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountId, - AccountProcedureRoot, - AccountType, - AssetCallbackFlag, + Account, AccountBuilder, AccountId, AccountProcedureRoot, AccountType, AssetCallbackFlag, RoleSymbol, }; use miden_protocol::assembly::DefaultSourceManager; @@ -28,21 +23,13 @@ use miden_protocol::{Felt, Word}; use miden_standards::account::access::{AccessControl, Authority, Ownable2Step, Pausable}; use miden_standards::account::faucets::{FungibleFaucet, TokenName}; use miden_standards::account::policies::{ - BlocklistManager, - BurnPolicy, - MintPolicy, - TokenPolicyManager, - TransferPolicy, + BlocklistManager, BurnPolicy, MintPolicy, TokenPolicyManager, TransferPolicy, }; use miden_standards::code_builder::CodeBuilder; use miden_standards::errors::standards::{ERR_ACCOUNT_IS_BLOCKED, ERR_SENDER_LACKS_ROLE}; use miden_standards::testing::note::NoteBuilder; use miden_testing::{ - AccountState, - Auth, - MockChain, - MockChainBuilder, - assert_transaction_executor_error, + AccountState, Auth, MockChain, MockChainBuilder, assert_transaction_executor_error, }; use super::rbac::{build_grant_role_note, role, test_account_id}; diff --git a/crates/miden-testing/tests/scripts/faucet.rs b/crates/miden-testing/tests/scripts/faucet.rs index 3c6a2d53f2..c84f1c35f3 100644 --- a/crates/miden-testing/tests/scripts/faucet.rs +++ b/crates/miden-testing/tests/scripts/faucet.rs @@ -7,28 +7,13 @@ use std::collections::BTreeSet; use miden_processor::crypto::random::RandomCoin; use miden_protocol::account::auth::AuthScheme; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountId, - AccountProcedureRoot, - AccountType, - AssetCallbackFlag, + Account, AccountBuilder, AccountId, AccountProcedureRoot, AccountType, AssetCallbackFlag, }; use miden_protocol::assembly::DefaultSourceManager; use miden_protocol::asset::{Asset, AssetAmount, FungibleAsset, TokenSymbol}; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachments, - NoteDetailsCommitment, - NoteId, - NoteMetadata, - NoteRecipient, - NoteScript, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachments, NoteDetailsCommitment, NoteId, NoteMetadata, NoteRecipient, + NoteScript, NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::testing::account_id::ACCOUNT_ID_PRIVATE_SENDER; use miden_protocol::transaction::{ExecutedTransaction, RawOutputNote}; @@ -36,32 +21,21 @@ use miden_protocol::{Felt, Word}; use miden_standards::account::access::{Authority, Ownable2Step, Pausable}; use miden_standards::account::faucets::{FungibleFaucet, TokenName}; use miden_standards::account::policies::{ - BurnAllowAll, - BurnOwnerOnly, - BurnPolicy, - MinBurnAmount, - MintPolicy, - TokenPolicyManager, + BurnAllowAll, BurnOwnerOnly, BurnPolicy, MinBurnAmount, MintPolicy, TokenPolicyManager, TransferPolicy, }; use miden_standards::code_builder::CodeBuilder; use miden_standards::errors::standards::{ - ERR_BURN_AMOUNT_BELOW_MIN_BURN_AMOUNT, - ERR_BURN_POLICY_ROOT_NOT_ALLOWED, + ERR_BURN_AMOUNT_BELOW_MIN_BURN_AMOUNT, ERR_BURN_POLICY_ROOT_NOT_ALLOWED, ERR_FAUCET_BURN_AMOUNT_EXCEEDS_TOKEN_SUPPLY, ERR_FUNGIBLE_ASSET_DISTRIBUTE_AMOUNT_EXCEEDS_MAX_SUPPLY, ERR_FUNGIBLE_ASSET_MAX_SUPPLY_EXCEEDS_FUNGIBLE_ASSET_MAX_AMOUNT, - ERR_MINT_POLICY_ROOT_NOT_ALLOWED, - ERR_SENDER_NOT_OWNER, + ERR_MINT_POLICY_ROOT_NOT_ALLOWED, ERR_SENDER_NOT_OWNER, }; use miden_standards::note::{BurnNote, MintNote, MintNoteStorage, P2idNote, StandardNote}; use miden_standards::testing::note::NoteBuilder; use miden_testing::{ - AccountState, - Auth, - MockChain, - MockChainBuilder, - assert_note_created, + AccountState, Auth, MockChain, MockChainBuilder, assert_note_created, assert_transaction_executor_error, }; use rand::RngExt; diff --git a/crates/miden-testing/tests/scripts/faucet_policy_action.rs b/crates/miden-testing/tests/scripts/faucet_policy_action.rs index 207ca81d52..c2adf11d2a 100644 --- a/crates/miden-testing/tests/scripts/faucet_policy_action.rs +++ b/crates/miden-testing/tests/scripts/faucet_policy_action.rs @@ -21,10 +21,7 @@ use miden_protocol::{Felt, Word}; use miden_standards::account::access::{Authority, Ownable2Step}; use miden_standards::account::faucets::{FungibleFaucet, TokenName}; use miden_standards::account::policies::{ - BurnPolicy, - MintPolicy, - TokenPolicyManager, - TransferPolicy, + BurnPolicy, MintPolicy, TokenPolicyManager, TransferPolicy, }; use miden_standards::errors::standards::{ ERR_FAUCET_POLICY_ACTION_UNEXPECTED_NUMBER_OF_STORAGE_ITEMS, @@ -33,11 +30,7 @@ use miden_standards::errors::standards::{ use miden_standards::note::{FaucetPolicyAction, FaucetPolicyActionNote}; use miden_standards::testing::note::NoteBuilder; use miden_testing::{ - AccountState, - Auth, - MockChain, - MockChainBuilder, - assert_transaction_executor_error, + AccountState, Auth, MockChain, MockChainBuilder, assert_transaction_executor_error, }; // HELPERS diff --git a/crates/miden-testing/tests/scripts/non_fungible_faucet.rs b/crates/miden-testing/tests/scripts/non_fungible_faucet.rs index 760ae439ae..4d946fe198 100644 --- a/crates/miden-testing/tests/scripts/non_fungible_faucet.rs +++ b/crates/miden-testing/tests/scripts/non_fungible_faucet.rs @@ -11,25 +11,15 @@ use miden_protocol::{Felt, Word}; use miden_standards::account::access::{Authority, Ownable2Step, Pausable}; use miden_standards::account::faucets::{AssetStatus, NonFungibleFaucet, TokenName}; use miden_standards::account::policies::{ - BlocklistManager, - BurnPolicy, - MintPolicy, - TokenPolicyManager, - TransferPolicy, + BlocklistManager, BurnPolicy, MintPolicy, TokenPolicyManager, TransferPolicy, }; use miden_standards::code_builder::CodeBuilder; use miden_standards::errors::standards::{ - ERR_ACCOUNT_IS_BLOCKED, - ERR_NFT_ALREADY_ISSUED, - ERR_SENDER_NOT_OWNER, + ERR_ACCOUNT_IS_BLOCKED, ERR_NFT_ALREADY_ISSUED, ERR_SENDER_NOT_OWNER, }; use miden_standards::note::{BurnNote, MintNote, MintNoteStorage}; use miden_testing::{ - AccountState, - Auth, - MockChain, - MockChainBuilder, - assert_transaction_executor_error, + AccountState, Auth, MockChain, MockChainBuilder, assert_transaction_executor_error, }; use rand::RngExt; diff --git a/crates/miden-testing/tests/scripts/ownable2step.rs b/crates/miden-testing/tests/scripts/ownable2step.rs index 1eac82dc53..ea00f17602 100644 --- a/crates/miden-testing/tests/scripts/ownable2step.rs +++ b/crates/miden-testing/tests/scripts/ownable2step.rs @@ -12,9 +12,7 @@ use miden_protocol::testing::account_id::AccountIdBuilder; use miden_protocol::transaction::RawOutputNote; use miden_standards::account::access::Ownable2Step; use miden_standards::errors::standards::{ - ERR_NO_NOMINATED_OWNER, - ERR_SENDER_NOT_NOMINATED_OWNER, - ERR_SENDER_NOT_OWNER, + ERR_NO_NOMINATED_OWNER, ERR_SENDER_NOT_NOMINATED_OWNER, ERR_SENDER_NOT_OWNER, }; use miden_standards::testing::note::NoteBuilder; use miden_testing::{Auth, MockChain, assert_transaction_executor_error}; diff --git a/crates/miden-testing/tests/scripts/owner_action.rs b/crates/miden-testing/tests/scripts/owner_action.rs index da1289ed2d..6ef61742a2 100644 --- a/crates/miden-testing/tests/scripts/owner_action.rs +++ b/crates/miden-testing/tests/scripts/owner_action.rs @@ -9,8 +9,7 @@ use miden_protocol::account::{Account, AccountId}; use miden_protocol::note::Note; use miden_protocol::testing::account_id::AccountIdBuilder; use miden_standards::errors::standards::{ - ERR_OWNER_ACTION_UNEXPECTED_NUMBER_OF_STORAGE_ITEMS, - ERR_OWNER_ACTION_UNKNOWN_SELECTOR, + ERR_OWNER_ACTION_UNEXPECTED_NUMBER_OF_STORAGE_ITEMS, ERR_OWNER_ACTION_UNKNOWN_SELECTOR, }; use miden_standards::note::{OwnerAction, OwnerActionNote}; use miden_standards::testing::note::NoteBuilder; @@ -20,9 +19,7 @@ use miden_testing::{MockChain, assert_transaction_executor_error}; // suite, which owns the exhaustive tests of the underlying component. This suite only checks // that the OwnerAction note dispatches each action and rejects malformed notes. use super::ownable2step::{ - create_ownable_account, - get_nominated_owner_from_storage, - get_owner_from_storage, + create_ownable_account, get_nominated_owner_from_storage, get_owner_from_storage, }; // HELPERS diff --git a/crates/miden-testing/tests/scripts/p2id.rs b/crates/miden-testing/tests/scripts/p2id.rs index 21174a6a66..ad819af754 100644 --- a/crates/miden-testing/tests/scripts/p2id.rs +++ b/crates/miden-testing/tests/scripts/p2id.rs @@ -4,11 +4,9 @@ use miden_protocol::asset::{Asset, AssetVault, FungibleAsset}; use miden_protocol::crypto::rand::RandomCoin; use miden_protocol::note::{Note, NoteTag, NoteType}; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_2, + ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_2, ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE, - ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE_2, - ACCOUNT_ID_SENDER, + ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE_2, ACCOUNT_ID_SENDER, }; use miden_protocol::transaction::RawOutputNote; use miden_protocol::{Felt, Word}; diff --git a/crates/miden-testing/tests/scripts/p2ide.rs b/crates/miden-testing/tests/scripts/p2ide.rs index 911daada92..f82e3cb853 100644 --- a/crates/miden-testing/tests/scripts/p2ide.rs +++ b/crates/miden-testing/tests/scripts/p2ide.rs @@ -6,10 +6,8 @@ use miden_protocol::asset::{Asset, AssetVault, FungibleAsset}; use miden_protocol::block::BlockNumber; use miden_protocol::note::{Note, NoteType}; use miden_standards::errors::standards::{ - ERR_P2IDE_RECLAIM_ACCT_IS_NOT_RECLAIMER, - ERR_P2IDE_RECLAIM_DISABLED, - ERR_P2IDE_RECLAIM_HEIGHT_NOT_REACHED, - ERR_P2IDE_TIMELOCK_HEIGHT_NOT_REACHED, + ERR_P2IDE_RECLAIM_ACCT_IS_NOT_RECLAIMER, ERR_P2IDE_RECLAIM_DISABLED, + ERR_P2IDE_RECLAIM_HEIGHT_NOT_REACHED, ERR_P2IDE_TIMELOCK_HEIGHT_NOT_REACHED, }; use miden_testing::{Auth, MockChain, assert_transaction_executor_error}; diff --git a/crates/miden-testing/tests/scripts/pausable.rs b/crates/miden-testing/tests/scripts/pausable.rs index fa6e65bb41..ae7edd381b 100644 --- a/crates/miden-testing/tests/scripts/pausable.rs +++ b/crates/miden-testing/tests/scripts/pausable.rs @@ -11,12 +11,7 @@ use alloc::collections::BTreeMap; use miden_processor::crypto::random::RandomCoin; use miden_protocol::Word; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountId, - AccountProcedureRoot, - AccountType, - AssetCallbackFlag, + Account, AccountBuilder, AccountId, AccountProcedureRoot, AccountType, AssetCallbackFlag, RoleSymbol, }; use miden_protocol::asset::{Asset, AssetAmount, FungibleAsset}; @@ -27,23 +22,14 @@ use miden_standards::account::access::pausable::{Pausable, PausableManager, Paus use miden_standards::account::access::{AccessControl, Authority}; use miden_standards::account::faucets::{FungibleFaucet, TokenName}; use miden_standards::account::policies::{ - BurnPolicy, - MintPolicy, - TokenPolicyManager, - TransferPolicy, + BurnPolicy, MintPolicy, TokenPolicyManager, TransferPolicy, }; use miden_standards::errors::standards::{ - ERR_PAUSABLE_IS_PAUSED, - ERR_SENDER_LACKS_ROLE, - ERR_SENDER_NOT_OWNER, + ERR_PAUSABLE_IS_PAUSED, ERR_SENDER_LACKS_ROLE, ERR_SENDER_NOT_OWNER, }; use miden_standards::testing::note::NoteBuilder; use miden_testing::{ - AccountState, - Auth, - MockChain, - MockChainBuilder, - assert_transaction_executor_error, + AccountState, Auth, MockChain, MockChainBuilder, assert_transaction_executor_error, }; use super::rbac::{build_grant_role_note, build_note, role, test_account_id}; diff --git a/crates/miden-testing/tests/scripts/pause_action.rs b/crates/miden-testing/tests/scripts/pause_action.rs index 2b7d989a74..22159f890c 100644 --- a/crates/miden-testing/tests/scripts/pause_action.rs +++ b/crates/miden-testing/tests/scripts/pause_action.rs @@ -11,8 +11,7 @@ use miden_protocol::{Felt, Word}; use miden_standards::account::access::AccessControl; use miden_standards::account::access::pausable::{Pausable, PausableManager, PausableStorage}; use miden_standards::errors::standards::{ - ERR_PAUSE_ACTION_UNEXPECTED_NUMBER_OF_STORAGE_ITEMS, - ERR_PAUSE_ACTION_UNKNOWN_SELECTOR, + ERR_PAUSE_ACTION_UNEXPECTED_NUMBER_OF_STORAGE_ITEMS, ERR_PAUSE_ACTION_UNKNOWN_SELECTOR, }; use miden_standards::note::{PauseAction, PauseActionNote}; use miden_standards::testing::note::NoteBuilder; diff --git a/crates/miden-testing/tests/scripts/pswap.rs b/crates/miden-testing/tests/scripts/pswap.rs index f37fa2323b..2a17f2a69a 100644 --- a/crates/miden-testing/tests/scripts/pswap.rs +++ b/crates/miden-testing/tests/scripts/pswap.rs @@ -12,8 +12,7 @@ use miden_protocol::transaction::RawOutputNote; use miden_protocol::{Felt, ONE, Word, ZERO}; use miden_standards::account::wallets::BasicWallet; use miden_standards::errors::standards::{ - ERR_PSWAP_FILL_SUM_OVERFLOW, - ERR_PSWAP_NOT_VALID_ASSET_AMOUNT, + ERR_PSWAP_FILL_SUM_OVERFLOW, ERR_PSWAP_NOT_VALID_ASSET_AMOUNT, }; use miden_standards::note::{PswapNote, PswapNoteAttachment, PswapNoteStorage}; use miden_standards::testing::note::NoteBuilder; diff --git a/crates/miden-testing/tests/scripts/rbac.rs b/crates/miden-testing/tests/scripts/rbac.rs index 3ba566876e..80648826c3 100644 --- a/crates/miden-testing/tests/scripts/rbac.rs +++ b/crates/miden-testing/tests/scripts/rbac.rs @@ -6,20 +6,13 @@ use core::slice; use miden_processor::crypto::random::RandomCoin; use miden_protocol::account::{ - Account, - AccountBuilder, - AccountId, - AccountType, - RoleSymbol, - StorageMapKey, + Account, AccountBuilder, AccountId, AccountType, RoleSymbol, StorageMapKey, }; use miden_protocol::note::{Note, NoteType}; use miden_protocol::{Felt, Word}; use miden_standards::account::access::{AccessControl, RoleBasedAccessControl}; use miden_standards::errors::standards::{ - ERR_ACCOUNT_NOT_IN_ROLE, - ERR_ROLE_SYMBOL_ZERO, - ERR_SENDER_NOT_ROLE_ADMIN, + ERR_ACCOUNT_NOT_IN_ROLE, ERR_ROLE_SYMBOL_ZERO, ERR_SENDER_NOT_ROLE_ADMIN, }; use miden_standards::testing::note::NoteBuilder; use miden_testing::{Auth, MockChain, assert_transaction_executor_error}; diff --git a/crates/miden-testing/tests/scripts/rbac_action.rs b/crates/miden-testing/tests/scripts/rbac_action.rs index 412e0c3b78..e5ed472045 100644 --- a/crates/miden-testing/tests/scripts/rbac_action.rs +++ b/crates/miden-testing/tests/scripts/rbac_action.rs @@ -7,8 +7,7 @@ use miden_protocol::Felt; use miden_protocol::account::{Account, AccountId}; use miden_protocol::note::Note; use miden_standards::errors::standards::{ - ERR_RBAC_ACTION_UNEXPECTED_NUMBER_OF_STORAGE_ITEMS, - ERR_RBAC_ACTION_UNKNOWN_SELECTOR, + ERR_RBAC_ACTION_UNEXPECTED_NUMBER_OF_STORAGE_ITEMS, ERR_RBAC_ACTION_UNKNOWN_SELECTOR, }; use miden_standards::note::{RbacAction, RbacActionNote}; use miden_standards::testing::note::NoteBuilder; diff --git a/crates/miden-testing/tests/scripts/send_note.rs b/crates/miden-testing/tests/scripts/send_note.rs index aaf015b439..177cc65312 100644 --- a/crates/miden-testing/tests/scripts/send_note.rs +++ b/crates/miden-testing/tests/scripts/send_note.rs @@ -6,17 +6,8 @@ use miden_protocol::account::auth::AuthScheme; use miden_protocol::asset::{Asset, FungibleAsset, NonFungibleAsset}; use miden_protocol::crypto::rand::{FeltRng, RandomCoin}; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachmentScheme, - NoteAttachments, - NoteRecipient, - NoteStorage, - NoteTag, - NoteType, - PartialNote, - PartialNoteMetadata, + Note, NoteAssets, NoteAttachment, NoteAttachmentScheme, NoteAttachments, NoteRecipient, + NoteStorage, NoteTag, NoteType, PartialNote, PartialNoteMetadata, }; use miden_protocol::testing::note::DEFAULT_NOTE_SCRIPT; use miden_protocol::transaction::{RawOutputNote, TransactionScript}; diff --git a/crates/miden-testing/tests/scripts/swap.rs b/crates/miden-testing/tests/scripts/swap.rs index 1c37c11c8c..147a310717 100644 --- a/crates/miden-testing/tests/scripts/swap.rs +++ b/crates/miden-testing/tests/scripts/swap.rs @@ -5,9 +5,7 @@ use miden_protocol::account::{Account, AccountId, AccountType}; use miden_protocol::asset::{Asset, FungibleAsset, NonFungibleAsset}; use miden_protocol::note::{Note, NoteDetails, NoteId, NoteType}; use miden_protocol::testing::account_id::{ - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, - ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, - AccountIdBuilder, + ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET_1, AccountIdBuilder, }; use miden_protocol::transaction::RawOutputNote; use miden_standards::code_builder::CodeBuilder; diff --git a/crates/miden-testing/tests/scripts/warden.rs b/crates/miden-testing/tests/scripts/warden.rs index 0a8995f42e..ec11507277 100644 --- a/crates/miden-testing/tests/scripts/warden.rs +++ b/crates/miden-testing/tests/scripts/warden.rs @@ -12,11 +12,7 @@ use miden_standards::account::access::{AccessControl, Warden}; use miden_standards::account::faucets::{FungibleFaucet, TokenName}; use miden_standards::errors::standards::ERR_SENDER_NOT_OWNER; use miden_testing::{ - AccountState, - Auth, - MockChain, - MockChainBuilder, - assert_transaction_executor_error, + AccountState, Auth, MockChain, MockChainBuilder, assert_transaction_executor_error, }; use super::pausable::{NON_OWNER_ID, OWNER_ID, execute_note_on_faucet}; diff --git a/crates/miden-tx/src/auth/mod.rs b/crates/miden-tx/src/auth/mod.rs index 7dd2be0a4c..2b79af6f7d 100644 --- a/crates/miden-tx/src/auth/mod.rs +++ b/crates/miden-tx/src/auth/mod.rs @@ -1,7 +1,4 @@ mod tx_authenticator; pub use tx_authenticator::{ - BasicAuthenticator, - SigningInputs, - TransactionAuthenticator, - UnreachableAuth, + BasicAuthenticator, SigningInputs, TransactionAuthenticator, UnreachableAuth, }; diff --git a/crates/miden-tx/src/auth/tx_authenticator.rs b/crates/miden-tx/src/auth/tx_authenticator.rs index 883b7be980..5f78874a36 100644 --- a/crates/miden-tx/src/auth/tx_authenticator.rs +++ b/crates/miden-tx/src/auth/tx_authenticator.rs @@ -12,11 +12,7 @@ use miden_protocol::{Felt, Hasher, Word}; use crate::errors::AuthenticationError; use crate::utils::serde::{ - ByteReader, - ByteWriter, - Deserializable, - DeserializationError, - Serializable, + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, }; // SIGNATURE DATA diff --git a/crates/miden-tx/src/errors/mod.rs b/crates/miden-tx/src/errors/mod.rs index 9f3ff0b253..ec9cf6429f 100644 --- a/crates/miden-tx/src/errors/mod.rs +++ b/crates/miden-tx/src/errors/mod.rs @@ -12,13 +12,8 @@ use miden_protocol::asset::AssetId; use miden_protocol::block::BlockNumber; use miden_protocol::crypto::merkle::smt::SmtProofError; use miden_protocol::errors::{ - AccountDeltaError, - AssetError, - NoteError, - OutputNoteError, - ProvenTransactionError, - TransactionInputError, - TransactionOutputError, + AccountDeltaError, AssetError, NoteError, OutputNoteError, ProvenTransactionError, + TransactionInputError, TransactionOutputError, }; use miden_protocol::note::{NoteId, PartialNoteMetadata}; use miden_protocol::transaction::{TransactionEventId, TransactionSummary}; diff --git a/crates/miden-tx/src/executor/exec_host.rs b/crates/miden-tx/src/executor/exec_host.rs index b66263de6b..f5ffd22e6d 100644 --- a/crates/miden-tx/src/executor/exec_host.rs +++ b/crates/miden-tx/src/executor/exec_host.rs @@ -8,12 +8,7 @@ use miden_processor::event::EventError; use miden_processor::{BaseHost, FutureMaybeSend, Host, LoadedMastForest, ProcessorState}; use miden_protocol::account::auth::PublicKeyCommitment; use miden_protocol::account::{ - AccountCode, - AccountId, - AccountPatch, - PartialAccount, - StorageMapKey, - StorageSlotId, + AccountCode, AccountId, AccountPatch, PartialAccount, StorageMapKey, StorageSlotId, StorageSlotName, }; use miden_protocol::assembly::debuginfo::Location; @@ -22,18 +17,10 @@ use miden_protocol::asset::{AssetId, AssetWitness}; use miden_protocol::block::BlockNumber; use miden_protocol::crypto::merkle::smt::SmtProof; use miden_protocol::note::{ - NoteRecipient, - NoteScript, - NoteScriptRoot, - NoteStorage, - PartialNoteMetadata, + NoteRecipient, NoteScript, NoteScriptRoot, NoteStorage, PartialNoteMetadata, }; use miden_protocol::transaction::{ - InputNote, - InputNotes, - RawOutputNote, - TransactionAdviceInputs, - TransactionSummary, + InputNote, InputNotes, RawOutputNote, TransactionAdviceInputs, TransactionSummary, }; use miden_protocol::vm::{AdviceMap, EventId, EventName}; use miden_protocol::{Felt, Hasher, Word}; @@ -42,13 +29,8 @@ use miden_standards::note::StandardNote; use crate::auth::{SigningInputs, TransactionAuthenticator}; use crate::errors::TransactionKernelError; use crate::host::{ - RecipientData, - ScriptMastForestStore, - TransactionBaseHost, - TransactionEvent, - TransactionProgress, - TransactionProgressEvent, - TxSummaryOrSignature, + RecipientData, ScriptMastForestStore, TransactionBaseHost, TransactionEvent, + TransactionProgress, TransactionProgressEvent, TxSummaryOrSignature, }; use crate::{AccountProcedureIndexMap, DataStore}; diff --git a/crates/miden-tx/src/executor/mod.rs b/crates/miden-tx/src/executor/mod.rs index 3066babb44..825f10b193 100644 --- a/crates/miden-tx/src/executor/mod.rs +++ b/crates/miden-tx/src/executor/mod.rs @@ -11,13 +11,8 @@ use miden_protocol::assembly::debuginfo::SourceManagerSync; use miden_protocol::asset::{Asset, AssetId}; use miden_protocol::block::BlockNumber; use miden_protocol::transaction::{ - ExecutedTransaction, - InputNote, - InputNotes, - TransactionArgs, - TransactionInputs, - TransactionKernel, - TransactionScript, + ExecutedTransaction, InputNote, InputNotes, TransactionArgs, TransactionInputs, + TransactionKernel, TransactionScript, }; use miden_protocol::vm::{PackageDebugInfo, StackOutputs}; use miden_protocol::{Felt, MAX_TX_EXECUTION_CYCLES, MIN_TX_EXECUTION_CYCLES}; @@ -35,11 +30,7 @@ pub use data_store::DataStore; mod notes_checker; pub use notes_checker::{ - FailedNote, - MAX_NUM_CHECKER_NOTES, - NoteConsumptionChecker, - NoteConsumptionInfo, - SuccessfulNote, + FailedNote, MAX_NUM_CHECKER_NOTES, NoteConsumptionChecker, NoteConsumptionInfo, SuccessfulNote, }; mod program_executor; diff --git a/crates/miden-tx/src/executor/notes_checker.rs b/crates/miden-tx/src/executor/notes_checker.rs index a6926c6f60..7c8d06997c 100644 --- a/crates/miden-tx/src/executor/notes_checker.rs +++ b/crates/miden-tx/src/executor/notes_checker.rs @@ -7,11 +7,7 @@ use miden_protocol::account::AccountId; use miden_protocol::block::BlockNumber; use miden_protocol::note::Note; use miden_protocol::transaction::{ - InputNote, - InputNotes, - TransactionArgs, - TransactionInputs, - TransactionKernel, + InputNote, InputNotes, TransactionArgs, TransactionInputs, TransactionKernel, }; use miden_protocol::vm::PackageDebugInfo; use miden_standards::note::{NoteConsumptionStatus, StandardNote}; diff --git a/crates/miden-tx/src/executor/program_executor.rs b/crates/miden-tx/src/executor/program_executor.rs index 120a15060c..9009081bee 100644 --- a/crates/miden-tx/src/executor/program_executor.rs +++ b/crates/miden-tx/src/executor/program_executor.rs @@ -1,13 +1,7 @@ use miden_processor::advice::AdviceInputs; use miden_processor::{ - ExecutionError, - ExecutionOptions, - ExecutionOutput, - FastProcessor, - FutureMaybeSend, - Host, - Program, - StackInputs, + ExecutionError, ExecutionOptions, ExecutionOutput, FastProcessor, FutureMaybeSend, Host, + Program, StackInputs, }; use miden_protocol::vm::{DebugSourceNodeId, PackageDebugInfo}; diff --git a/crates/miden-tx/src/host/kernel_process.rs b/crates/miden-tx/src/host/kernel_process.rs index dc8ec218aa..4f09a5b425 100644 --- a/crates/miden-tx/src/host/kernel_process.rs +++ b/crates/miden-tx/src/host/kernel_process.rs @@ -3,17 +3,10 @@ use miden_protocol::Word; use miden_protocol::account::{AccountId, StorageSlotId, StorageSlotType}; use miden_protocol::note::{NoteId, NoteStorage}; use miden_protocol::transaction::memory::{ - ACCOUNT_STACK_TOP_PTR, - ACCT_CODE_COMMITMENT_OFFSET, - ACCT_ID_PREFIX_IDX, - ACCT_ID_SUFFIX_IDX, - ACCT_STORAGE_SLOT_ID_PREFIX_OFFSET, - ACCT_STORAGE_SLOT_ID_SUFFIX_OFFSET, - ACCT_STORAGE_SLOT_TYPE_OFFSET, - ACCT_STORAGE_SLOT_VALUE_OFFSET, - ACTIVE_INPUT_NOTE_PTR, - NATIVE_NUM_ACCT_STORAGE_SLOTS_PTR, - NUM_OUTPUT_NOTES_PTR, + ACCOUNT_STACK_TOP_PTR, ACCT_CODE_COMMITMENT_OFFSET, ACCT_ID_PREFIX_IDX, ACCT_ID_SUFFIX_IDX, + ACCT_STORAGE_SLOT_ID_PREFIX_OFFSET, ACCT_STORAGE_SLOT_ID_SUFFIX_OFFSET, + ACCT_STORAGE_SLOT_TYPE_OFFSET, ACCT_STORAGE_SLOT_VALUE_OFFSET, ACTIVE_INPUT_NOTE_PTR, + NATIVE_NUM_ACCT_STORAGE_SLOTS_PTR, NUM_OUTPUT_NOTES_PTR, }; use crate::errors::TransactionKernelError; diff --git a/crates/miden-tx/src/host/mod.rs b/crates/miden-tx/src/host/mod.rs index 9aff27fe90..de09cadc91 100644 --- a/crates/miden-tx/src/host/mod.rs +++ b/crates/miden-tx/src/host/mod.rs @@ -36,33 +36,17 @@ use miden_processor::trace::RowIndex; use miden_processor::{Felt, LoadedMastForest, MastForestStore, ProcessorState}; use miden_protocol::Word; use miden_protocol::account::{ - AccountCode, - AccountDelta, - AccountHeader, - AccountId, - AccountPatch, - AccountStorageHeader, - PartialAccount, - StorageMapKey, - StorageSlotHeader, - StorageSlotId, - StorageSlotName, + AccountCode, AccountDelta, AccountHeader, AccountId, AccountPatch, AccountStorageHeader, + PartialAccount, StorageMapKey, StorageSlotHeader, StorageSlotId, StorageSlotName, }; use miden_protocol::asset::Asset; use miden_protocol::note::{NoteAttachment, NoteId, NoteRecipient, PartialNoteMetadata}; use miden_protocol::transaction::{ - InputNote, - InputNotes, - RawOutputNote, - RawOutputNotes, - TransactionMeasurements, + InputNote, InputNotes, RawOutputNote, RawOutputNotes, TransactionMeasurements, TransactionSummary, }; pub(crate) use tx_event::{ - RecipientData, - TransactionEvent, - TransactionProgressEvent, - TxSummaryOrSignature, + RecipientData, TransactionEvent, TransactionProgressEvent, TxSummaryOrSignature, }; pub use tx_progress::TransactionProgress; diff --git a/crates/miden-tx/src/host/note_builder.rs b/crates/miden-tx/src/host/note_builder.rs index 0e6d8359d1..aba0196798 100644 --- a/crates/miden-tx/src/host/note_builder.rs +++ b/crates/miden-tx/src/host/note_builder.rs @@ -4,12 +4,7 @@ use alloc::vec::Vec; use miden_protocol::asset::Asset; use miden_protocol::errors::NoteError; use miden_protocol::note::{ - Note, - NoteAssets, - NoteAttachment, - NoteAttachments, - NoteRecipient, - PartialNote, + Note, NoteAssets, NoteAttachment, NoteAttachments, NoteRecipient, PartialNote, PartialNoteMetadata, }; diff --git a/crates/miden-tx/src/host/storage_patch_tracker.rs b/crates/miden-tx/src/host/storage_patch_tracker.rs index b8fef55a7b..9753296710 100644 --- a/crates/miden-tx/src/host/storage_patch_tracker.rs +++ b/crates/miden-tx/src/host/storage_patch_tracker.rs @@ -2,16 +2,8 @@ use alloc::collections::BTreeMap; use miden_protocol::Word; use miden_protocol::account::{ - AccountStorageHeader, - AccountStoragePatch, - PartialAccount, - StorageMapKey, - StorageMapPatch, - StorageMapPatchEntries, - StorageSlotName, - StorageSlotPatch, - StorageSlotType, - StorageValuePatch, + AccountStorageHeader, AccountStoragePatch, PartialAccount, StorageMapKey, StorageMapPatch, + StorageMapPatchEntries, StorageSlotName, StorageSlotPatch, StorageSlotType, StorageValuePatch, }; use crate::TransactionKernelError; diff --git a/crates/miden-tx/src/host/tx_event.rs b/crates/miden-tx/src/host/tx_event.rs index e6e5c202bf..d7b2ed59b4 100644 --- a/crates/miden-tx/src/host/tx_event.rs +++ b/crates/miden-tx/src/host/tx_event.rs @@ -6,24 +6,12 @@ use miden_processor::trace::RowIndex; use miden_protocol::account::auth::PublicKeyCommitment; use miden_protocol::account::delta::AssetDeltaOperation; use miden_protocol::account::{ - AccountId, - StorageMap, - StorageMapKey, - StorageSlotName, - StorageSlotType, + AccountId, StorageMap, StorageMapKey, StorageSlotName, StorageSlotType, }; use miden_protocol::asset::{Asset, AssetId, AssetVault}; use miden_protocol::note::{ - NoteAttachment, - NoteAttachmentContent, - NoteAttachmentScheme, - NoteId, - NoteRecipient, - NoteScript, - NoteStorage, - NoteTag, - NoteType, - PartialNoteMetadata, + NoteAttachment, NoteAttachmentContent, NoteAttachmentScheme, NoteId, NoteRecipient, NoteScript, + NoteStorage, NoteTag, NoteType, PartialNoteMetadata, }; use miden_protocol::transaction::memory::{NOTE_MEM_SIZE, OUTPUT_NOTE_SECTION_OFFSET}; use miden_protocol::transaction::{TransactionEventId, TransactionSummary}; diff --git a/crates/miden-tx/src/host/vault_update_tracker.rs b/crates/miden-tx/src/host/vault_update_tracker.rs index 950a4826d0..705f7b7916 100644 --- a/crates/miden-tx/src/host/vault_update_tracker.rs +++ b/crates/miden-tx/src/host/vault_update_tracker.rs @@ -3,10 +3,7 @@ use alloc::collections::BTreeMap; use miden_protocol::Word; use miden_protocol::account::delta::AssetDeltaOperation; use miden_protocol::account::{ - AccountVaultDelta, - AccountVaultPatch, - FungibleAssetDelta, - NonFungibleAssetDelta, + AccountVaultDelta, AccountVaultPatch, FungibleAssetDelta, NonFungibleAssetDelta, NonFungibleDeltaAction, }; use miden_protocol::asset::{Asset, AssetId}; diff --git a/crates/miden-tx/src/lib.rs b/crates/miden-tx/src/lib.rs index f8280af7d8..9b4d9c2581 100644 --- a/crates/miden-tx/src/lib.rs +++ b/crates/miden-tx/src/lib.rs @@ -8,17 +8,9 @@ extern crate std; mod executor; pub use executor::{ - DataStore, - ExecutionOptions, - FailedNote, - MAX_NUM_CHECKER_NOTES, - MastForestStore, - NoteConsumptionChecker, - NoteConsumptionInfo, - ProgramExecutor, - SuccessfulNote, - TransactionExecutor, - TransactionExecutorHost, + DataStore, ExecutionOptions, FailedNote, MAX_NUM_CHECKER_NOTES, MastForestStore, + NoteConsumptionChecker, NoteConsumptionInfo, ProgramExecutor, SuccessfulNote, + TransactionExecutor, TransactionExecutorHost, }; mod host; @@ -26,20 +18,13 @@ pub use host::{AccountProcedureIndexMap, LinkMap, MemoryViewer, ScriptMastForest mod prover; pub use prover::{ - LocalTransactionProver, - ProvingOptions, - TransactionMastStore, - TransactionProverHost, + LocalTransactionProver, ProvingOptions, TransactionMastStore, TransactionProverHost, }; mod errors; pub use errors::{ - AuthenticationError, - DataStoreError, - NoteCheckerError, - TransactionExecutorError, - TransactionKernelError, - TransactionProverError, + AuthenticationError, DataStoreError, NoteCheckerError, TransactionExecutorError, + TransactionKernelError, TransactionProverError, }; pub mod auth; diff --git a/crates/miden-tx/src/prover/mod.rs b/crates/miden-tx/src/prover/mod.rs index 00b5924b38..07bbba9654 100644 --- a/crates/miden-tx/src/prover/mod.rs +++ b/crates/miden-tx/src/prover/mod.rs @@ -4,13 +4,8 @@ use miden_processor::ExecutionOptions; use miden_protocol::account::{AccountPatch, AccountUpdateDetails, PartialAccount}; use miden_protocol::block::BlockNumber; use miden_protocol::transaction::{ - InputNote, - InputNotes, - ProvenTransaction, - TransactionInputs, - TransactionKernel, - TransactionOutputs, - TxAccountUpdate, + InputNote, InputNotes, ProvenTransaction, TransactionInputs, TransactionKernel, + TransactionOutputs, TxAccountUpdate, }; use miden_prover::HashFunction::Poseidon2; pub use miden_prover::ProvingOptions; diff --git a/crates/miden-tx/src/prover/prover_host.rs b/crates/miden-tx/src/prover/prover_host.rs index 99627c26c0..13e628acf7 100644 --- a/crates/miden-tx/src/prover/prover_host.rs +++ b/crates/miden-tx/src/prover/prover_host.rs @@ -13,10 +13,7 @@ use miden_protocol::vm::{EventId, EventName}; use miden_prover::SyncHost; use crate::host::{ - RecipientData, - ScriptMastForestStore, - TransactionBaseHost, - TransactionEvent, + RecipientData, ScriptMastForestStore, TransactionBaseHost, TransactionEvent, TxSummaryOrSignature, }; use crate::{AccountProcedureIndexMap, TransactionKernelError};