From e2f0a38f7955efb5e3d4ad94eebb9a72e2adf414 Mon Sep 17 00:00:00 2001 From: varun-doshi Date: Tue, 25 Feb 2025 22:38:45 +0530 Subject: [PATCH 1/2] feat: removed external dependencies from miden-objects --- .../src/account/account_id/account_type.rs | 8 ++++---- .../src/account/account_id/id_prefix.rs | 9 ++------- crates/miden-objects/src/account/account_id/seed.rs | 5 +---- crates/miden-objects/src/account/auth.rs | 6 ++++-- crates/miden-objects/src/account/code/procedure.rs | 11 ++++------- crates/miden-objects/src/account/delta/storage.rs | 5 ++--- crates/miden-objects/src/account/header.rs | 3 +-- crates/miden-objects/src/account/storage/header.rs | 11 ++++------- .../miden-objects/src/account/storage/slot/type.rs | 5 ++--- crates/miden-objects/src/asset/fungible.rs | 8 ++++---- crates/miden-objects/src/asset/nonfungible.rs | 4 +--- crates/miden-objects/src/batch/account_update.rs | 5 ++--- .../src/batch/input_output_note_tracker.rs | 6 ++---- crates/miden-objects/src/batch/note_tree.rs | 9 ++++----- .../src/block/account_update_witness.rs | 12 +++++++----- crates/miden-objects/src/block/account_witness.rs | 3 +-- crates/miden-objects/src/block/note_tree.rs | 9 ++++----- crates/miden-objects/src/block/nullifier_witness.rs | 7 ++++--- .../src/block/partial_nullifier_tree.rs | 6 ++---- crates/miden-objects/src/block/proposed_block.rs | 9 ++------- crates/miden-objects/src/note/assets.rs | 9 +++++---- crates/miden-objects/src/note/details.rs | 8 ++++---- crates/miden-objects/src/note/execution_hint.rs | 4 +--- crates/miden-objects/src/note/inputs.rs | 8 ++++---- crates/miden-objects/src/note/script.rs | 13 +++++++------ crates/miden-objects/src/transaction/chain_mmr.rs | 3 +-- crates/miden-objects/src/transaction/executed_tx.rs | 9 +++++---- crates/miden-objects/src/transaction/outputs.rs | 4 +--- crates/miden-objects/src/transaction/proven_tx.rs | 3 +-- crates/miden-objects/src/transaction/tx_args.rs | 9 +++------ crates/miden-objects/src/transaction/tx_witness.rs | 8 ++++---- 31 files changed, 93 insertions(+), 126 deletions(-) diff --git a/crates/miden-objects/src/account/account_id/account_type.rs b/crates/miden-objects/src/account/account_id/account_type.rs index 940a604b9..525e435f0 100644 --- a/crates/miden-objects/src/account/account_id/account_type.rs +++ b/crates/miden-objects/src/account/account_id/account_type.rs @@ -1,9 +1,9 @@ use core::{fmt, str::FromStr}; -use vm_core::utils::{ByteReader, Deserializable, Serializable}; -use vm_processor::DeserializationError; - -use crate::errors::AccountIdError; +use crate::{ + errors::AccountIdError, + utils::serde::{ByteReader, Deserializable, DeserializationError, Serializable}, +}; // ACCOUNT TYPE // ================================================================================================ diff --git a/crates/miden-objects/src/account/account_id/id_prefix.rs b/crates/miden-objects/src/account/account_id/id_prefix.rs index f06eded20..2efa185b3 100644 --- a/crates/miden-objects/src/account/account_id/id_prefix.rs +++ b/crates/miden-objects/src/account/account_id/id_prefix.rs @@ -1,13 +1,6 @@ use alloc::string::{String, ToString}; use core::fmt; -use miden_crypto::utils::ByteWriter; -use vm_core::{ - utils::{ByteReader, Deserializable, Serializable}, - Felt, -}; -use vm_processor::DeserializationError; - use super::v0; use crate::{ account::{ @@ -15,6 +8,8 @@ use crate::{ AccountType, }, errors::AccountIdError, + utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, + Felt, }; // ACCOUNT ID PREFIX diff --git a/crates/miden-objects/src/account/account_id/seed.rs b/crates/miden-objects/src/account/account_id/seed.rs index 821547d89..66899630c 100644 --- a/crates/miden-objects/src/account/account_id/seed.rs +++ b/crates/miden-objects/src/account/account_id/seed.rs @@ -1,8 +1,5 @@ use alloc::vec::Vec; -use vm_core::{Felt, Word}; -use vm_processor::Digest; - use crate::{ account::{ account_id::{ @@ -11,7 +8,7 @@ use crate::{ }, AccountStorageMode, AccountType, }, - AccountError, + AccountError, Digest, Felt, Word, }; /// Finds and returns a seed suitable for creating an account ID for the specified account type diff --git a/crates/miden-objects/src/account/auth.rs b/crates/miden-objects/src/account/auth.rs index 65a06ee75..e66e246ee 100644 --- a/crates/miden-objects/src/account/auth.rs +++ b/crates/miden-objects/src/account/auth.rs @@ -2,8 +2,10 @@ // ================================================================================================ use miden_crypto::dsa::rpo_falcon512::{self, SecretKey}; -use vm_core::utils::{ByteReader, ByteWriter, Deserializable, Serializable}; -use vm_processor::DeserializationError; + +use crate::utils::serde::{ + ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, +}; /// Types of secret keys used for signing messages #[derive(Clone, Debug)] diff --git a/crates/miden-objects/src/account/code/procedure.rs b/crates/miden-objects/src/account/code/procedure.rs index a2374885d..36932eda7 100644 --- a/crates/miden-objects/src/account/code/procedure.rs +++ b/crates/miden-objects/src/account/code/procedure.rs @@ -1,13 +1,10 @@ use alloc::string::ToString; -use vm_core::{ - utils::{ByteReader, ByteWriter, Deserializable, Serializable}, - FieldElement, -}; -use vm_processor::DeserializationError; - use super::{Digest, Felt}; -use crate::AccountError; +use crate::{ + utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, + AccountError, FieldElement, +}; // ACCOUNT PROCEDURE INFO // ================================================================================================ diff --git a/crates/miden-objects/src/account/delta/storage.rs b/crates/miden-objects/src/account/delta/storage.rs index 9243fc58b..3c9ddf939 100644 --- a/crates/miden-objects/src/account/delta/storage.rs +++ b/crates/miden-objects/src/account/delta/storage.rs @@ -4,15 +4,14 @@ use alloc::{ vec::Vec, }; -use miden_crypto::{merkle::SmtLeaf, EMPTY_WORD}; - use super::{ AccountDeltaError, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, Word, }; use crate::{ account::{AccountStorage, StorageMap, StorageSlot}, - Digest, + crypto::merkle::SmtLeaf, + Digest, EMPTY_WORD, }; // ACCOUNT STORAGE DELTA // ================================================================================================ diff --git a/crates/miden-objects/src/account/header.rs b/crates/miden-objects/src/account/header.rs index adfc84e24..f83ba7c8d 100644 --- a/crates/miden-objects/src/account/header.rs +++ b/crates/miden-objects/src/account/header.rs @@ -1,8 +1,7 @@ use alloc::vec::Vec; -use vm_core::utils::{Deserializable, Serializable}; - use super::{hash_account, Account, AccountId, Digest, Felt, ZERO}; +use crate::utils::serde::{Deserializable, Serializable}; // ACCOUNT HEADER // ================================================================================================ diff --git a/crates/miden-objects/src/account/storage/header.rs b/crates/miden-objects/src/account/storage/header.rs index fa7fd6eda..949f779c6 100644 --- a/crates/miden-objects/src/account/storage/header.rs +++ b/crates/miden-objects/src/account/storage/header.rs @@ -1,13 +1,10 @@ use alloc::vec::Vec; -use vm_core::{ - utils::{ByteReader, ByteWriter, Deserializable, Serializable}, - ZERO, -}; -use vm_processor::DeserializationError; - use super::{AccountStorage, Felt, StorageSlot, StorageSlotType, Word}; -use crate::AccountError; +use crate::{ + utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, + AccountError, ZERO, +}; // ACCOUNT STORAGE HEADER // ================================================================================================ diff --git a/crates/miden-objects/src/account/storage/slot/type.rs b/crates/miden-objects/src/account/storage/slot/type.rs index db5979836..b90f93b73 100644 --- a/crates/miden-objects/src/account/storage/slot/type.rs +++ b/crates/miden-objects/src/account/storage/slot/type.rs @@ -1,10 +1,9 @@ use alloc::string::{String, ToString}; -use vm_core::{ - utils::{ByteReader, ByteWriter, Deserializable, Serializable}, +use crate::{ + utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, Felt, Word, ONE, ZERO, }; -use vm_processor::DeserializationError; // STORAGE SLOT TYPE // ================================================================================================ diff --git a/crates/miden-objects/src/asset/fungible.rs b/crates/miden-objects/src/asset/fungible.rs index 48aefac64..a8ec416aa 100644 --- a/crates/miden-objects/src/asset/fungible.rs +++ b/crates/miden-objects/src/asset/fungible.rs @@ -1,11 +1,11 @@ use alloc::{boxed::Box, string::ToString}; use core::fmt; -use vm_core::utils::{ByteReader, ByteWriter, Deserializable, Serializable}; -use vm_processor::DeserializationError; - use super::{is_not_a_non_fungible_asset, AccountType, Asset, AssetError, Felt, Word, ZERO}; -use crate::account::{AccountId, AccountIdPrefix}; +use crate::{ + account::{AccountId, AccountIdPrefix}, + utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, +}; // FUNGIBLE ASSET // ================================================================================================ diff --git a/crates/miden-objects/src/asset/nonfungible.rs b/crates/miden-objects/src/asset/nonfungible.rs index 731ad20fa..37296d32b 100644 --- a/crates/miden-objects/src/asset/nonfungible.rs +++ b/crates/miden-objects/src/asset/nonfungible.rs @@ -1,12 +1,10 @@ use alloc::{boxed::Box, string::ToString, vec::Vec}; use core::fmt; -use vm_core::{FieldElement, WORD_SIZE}; - use super::{AccountIdPrefix, AccountType, Asset, AssetError, Felt, Hasher, Word}; use crate::{ utils::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, - Digest, + Digest, FieldElement, WORD_SIZE, }; /// Position of the faucet_id inside the [`NonFungibleAsset`] word. diff --git a/crates/miden-objects/src/batch/account_update.rs b/crates/miden-objects/src/batch/account_update.rs index 0dab76cd5..39a87fd46 100644 --- a/crates/miden-objects/src/batch/account_update.rs +++ b/crates/miden-objects/src/batch/account_update.rs @@ -1,12 +1,11 @@ use alloc::vec::Vec; -use vm_core::utils::{ByteReader, ByteWriter, Deserializable, Serializable}; -use vm_processor::{DeserializationError, Digest}; - use crate::{ account::{delta::AccountUpdateDetails, AccountId}, errors::BatchAccountUpdateError, transaction::{ProvenTransaction, TransactionId}, + utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, + Digest, }; // BATCH ACCOUNT UPDATE diff --git a/crates/miden-objects/src/batch/input_output_note_tracker.rs b/crates/miden-objects/src/batch/input_output_note_tracker.rs index efbc155a5..5a602a913 100644 --- a/crates/miden-objects/src/batch/input_output_note_tracker.rs +++ b/crates/miden-objects/src/batch/input_output_note_tracker.rs @@ -1,15 +1,13 @@ use alloc::{collections::BTreeMap, vec::Vec}; -use miden_crypto::merkle::MerkleError; -use vm_processor::Digest; - use crate::{ batch::{BatchId, ProvenBatch}, block::{BlockHeader, BlockNumber}, + crypto::merkle::MerkleError, errors::ProposedBatchError, note::{NoteHeader, NoteId, NoteInclusionProof, Nullifier}, transaction::{ChainMmr, InputNoteCommitment, OutputNote, ProvenTransaction, TransactionId}, - ProposedBlockError, + Digest, ProposedBlockError, }; type BatchInputNotes = Vec; diff --git a/crates/miden-objects/src/batch/note_tree.rs b/crates/miden-objects/src/batch/note_tree.rs index b44d7372c..710627729 100644 --- a/crates/miden-objects/src/batch/note_tree.rs +++ b/crates/miden-objects/src/batch/note_tree.rs @@ -1,11 +1,10 @@ use alloc::vec::Vec; -use miden_crypto::{ - hash::rpo::RpoDigest, - merkle::{LeafIndex, MerkleError, SimpleSmt}, -}; - use crate::{ + crypto::{ + hash::rpo::RpoDigest, + merkle::{LeafIndex, MerkleError, SimpleSmt}, + }, note::{compute_note_hash, NoteId, NoteMetadata}, utils::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, BATCH_NOTE_TREE_DEPTH, EMPTY_WORD, diff --git a/crates/miden-objects/src/block/account_update_witness.rs b/crates/miden-objects/src/block/account_update_witness.rs index 65d9b98e5..e63ac9abe 100644 --- a/crates/miden-objects/src/block/account_update_witness.rs +++ b/crates/miden-objects/src/block/account_update_witness.rs @@ -1,10 +1,12 @@ use alloc::vec::Vec; -use miden_crypto::merkle::MerklePath; -use vm_core::utils::{ByteReader, ByteWriter, Deserializable, Serializable}; -use vm_processor::{DeserializationError, Digest}; - -use crate::{account::delta::AccountUpdateDetails, transaction::TransactionId}; +use crate::{ + account::delta::AccountUpdateDetails, + crypto::merkle::MerklePath, + transaction::TransactionId, + utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, + Digest, +}; /// This type encapsulates essentially three components: /// - The witness is a merkle path of the initial state commitment of the account before the block diff --git a/crates/miden-objects/src/block/account_witness.rs b/crates/miden-objects/src/block/account_witness.rs index 27c5d2882..ad4b7dbde 100644 --- a/crates/miden-objects/src/block/account_witness.rs +++ b/crates/miden-objects/src/block/account_witness.rs @@ -1,5 +1,4 @@ -use miden_crypto::merkle::MerklePath; -use vm_processor::Digest; +use crate::{crypto::merkle::MerklePath, Digest}; // ACCOUNT WITNESS // ================================================================================================ diff --git a/crates/miden-objects/src/block/note_tree.rs b/crates/miden-objects/src/block/note_tree.rs index 59c139b20..0c8b535e5 100644 --- a/crates/miden-objects/src/block/note_tree.rs +++ b/crates/miden-objects/src/block/note_tree.rs @@ -1,12 +1,11 @@ use alloc::string::ToString; -use miden_crypto::{ - hash::rpo::RpoDigest, - merkle::{LeafIndex, MerkleError, MerklePath, SimpleSmt}, -}; - use crate::{ batch::BatchNoteTree, + crypto::{ + hash::rpo::RpoDigest, + merkle::{LeafIndex, MerkleError, MerklePath, SimpleSmt}, + }, note::{compute_note_hash, NoteId, NoteMetadata}, utils::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, BLOCK_NOTE_TREE_DEPTH, MAX_BATCHES_PER_BLOCK, MAX_OUTPUT_NOTES_PER_BATCH, diff --git a/crates/miden-objects/src/block/nullifier_witness.rs b/crates/miden-objects/src/block/nullifier_witness.rs index fae7b61fe..7ebc52b6b 100644 --- a/crates/miden-objects/src/block/nullifier_witness.rs +++ b/crates/miden-objects/src/block/nullifier_witness.rs @@ -1,6 +1,7 @@ -use miden_crypto::merkle::SmtProof; -use vm_core::utils::{ByteReader, ByteWriter, Deserializable, Serializable}; -use vm_processor::DeserializationError; +use crate::{ + crypto::merkle::SmtProof, + utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, +}; // NULLIFIER WITNESS // ================================================================================================ diff --git a/crates/miden-objects/src/block/partial_nullifier_tree.rs b/crates/miden-objects/src/block/partial_nullifier_tree.rs index 9a8b90ee3..9b294d727 100644 --- a/crates/miden-objects/src/block/partial_nullifier_tree.rs +++ b/crates/miden-objects/src/block/partial_nullifier_tree.rs @@ -1,11 +1,9 @@ -use miden_crypto::merkle::PartialSmt; -use vm_core::{Felt, FieldElement, Word, EMPTY_WORD}; -use vm_processor::Digest; - use crate::{ block::{BlockNumber, NullifierWitness}, + crypto::merkle::PartialSmt, errors::NullifierTreeError, note::Nullifier, + Digest, Felt, FieldElement, Word, EMPTY_WORD, }; /// The partial sparse merkle tree containing the nullifiers of consumed notes. diff --git a/crates/miden-objects/src/block/proposed_block.rs b/crates/miden-objects/src/block/proposed_block.rs index 7e25481c4..60d9a4266 100644 --- a/crates/miden-objects/src/block/proposed_block.rs +++ b/crates/miden-objects/src/block/proposed_block.rs @@ -3,12 +3,6 @@ use alloc::{ vec::Vec, }; -use vm_core::{ - utils::{ByteReader, ByteWriter, Deserializable, Serializable}, - EMPTY_WORD, -}; -use vm_processor::{DeserializationError, Digest}; - use crate::{ account::{delta::AccountUpdateDetails, AccountId}, batch::{BatchAccountUpdate, BatchId, InputOutputNoteTracker, ProvenBatch}, @@ -19,7 +13,8 @@ use crate::{ errors::ProposedBlockError, note::{NoteId, Nullifier}, transaction::{ChainMmr, InputNoteCommitment, OutputNote, TransactionId}, - MAX_BATCHES_PER_BLOCK, + utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, + Digest, EMPTY_WORD, MAX_BATCHES_PER_BLOCK, }; // PROPOSED BLOCK diff --git a/crates/miden-objects/src/note/assets.rs b/crates/miden-objects/src/note/assets.rs index e111c39db..0f7c8a7e4 100644 --- a/crates/miden-objects/src/note/assets.rs +++ b/crates/miden-objects/src/note/assets.rs @@ -1,10 +1,11 @@ use alloc::vec::Vec; -use super::{ - Asset, ByteReader, ByteWriter, Deserializable, DeserializationError, Digest, Felt, Hasher, - NoteError, Serializable, Word, WORD_SIZE, ZERO, +use super::Asset; +use crate::{ + errors::NoteError, + utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, + Digest, Felt, Hasher, Word, MAX_ASSETS_PER_NOTE, WORD_SIZE, ZERO, }; -use crate::MAX_ASSETS_PER_NOTE; // NOTE ASSETS // ================================================================================================ diff --git a/crates/miden-objects/src/note/details.rs b/crates/miden-objects/src/note/details.rs index acae4f029..4f0c3043f 100644 --- a/crates/miden-objects/src/note/details.rs +++ b/crates/miden-objects/src/note/details.rs @@ -1,10 +1,10 @@ -use miden_crypto::{ - utils::{ByteReader, ByteWriter, Deserializable, Serializable}, - Word, -}; use vm_processor::DeserializationError; use super::{NoteAssets, NoteId, NoteInputs, NoteRecipient, NoteScript, Nullifier}; +use crate::{ + utils::serde::{ByteReader, ByteWriter, Deserializable, Serializable}, + Word, +}; // NOTE DETAILS // ================================================================================================ diff --git a/crates/miden-objects/src/note/execution_hint.rs b/crates/miden-objects/src/note/execution_hint.rs index 4ca22cde1..c8279e8e7 100644 --- a/crates/miden-objects/src/note/execution_hint.rs +++ b/crates/miden-objects/src/note/execution_hint.rs @@ -1,9 +1,7 @@ // NOTE EXECUTION HINT // ================================================================================================ -use vm_core::Felt; - -use crate::{block::BlockNumber, NoteError}; +use crate::{block::BlockNumber, Felt, NoteError}; /// Specifies the conditions under which a note is ready to be consumed. /// These conditions are meant to be encoded in the note script as well. diff --git a/crates/miden-objects/src/note/inputs.rs b/crates/miden-objects/src/note/inputs.rs index 83581e565..29a4ab300 100644 --- a/crates/miden-objects/src/note/inputs.rs +++ b/crates/miden-objects/src/note/inputs.rs @@ -1,10 +1,10 @@ use alloc::vec::Vec; -use super::{ - ByteReader, ByteWriter, Deserializable, DeserializationError, Digest, Felt, Hasher, NoteError, - Serializable, WORD_SIZE, ZERO, +use crate::{ + errors::NoteError, + utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, + Digest, Felt, Hasher, MAX_INPUTS_PER_NOTE, WORD_SIZE, ZERO, }; -use crate::MAX_INPUTS_PER_NOTE; // NOTE INPUTS // ================================================================================================ diff --git a/crates/miden-objects/src/note/script.rs b/crates/miden-objects/src/note/script.rs index d68d2fbcb..b3cabfb0a 100644 --- a/crates/miden-objects/src/note/script.rs +++ b/crates/miden-objects/src/note/script.rs @@ -1,16 +1,17 @@ use alloc::{sync::Arc, vec::Vec}; use core::fmt::Display; -use assembly::{Assembler, Compile}; -use vm_core::{ - mast::{MastForest, MastNodeId}, - prettier::PrettyPrint, - Program, -}; +use assembly::Compile; +use vm_core::prettier::PrettyPrint; use super::{Digest, Felt}; use crate::{ + assembly::{ + mast::{MastForest, MastNodeId}, + Assembler, + }, utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, + vm::Program, NoteError, }; diff --git a/crates/miden-objects/src/transaction/chain_mmr.rs b/crates/miden-objects/src/transaction/chain_mmr.rs index f6c106957..9f39ddacd 100644 --- a/crates/miden-objects/src/transaction/chain_mmr.rs +++ b/crates/miden-objects/src/transaction/chain_mmr.rs @@ -1,10 +1,9 @@ use alloc::collections::BTreeMap; -use vm_core::utils::{Deserializable, Serializable}; - use crate::{ block::{BlockHeader, BlockNumber}, crypto::merkle::{InnerNodeInfo, MmrPeaks, PartialMmr}, + utils::serde::{Deserializable, Serializable}, ChainMmrError, }; diff --git a/crates/miden-objects/src/transaction/executed_tx.rs b/crates/miden-objects/src/transaction/executed_tx.rs index e17f957c7..d7b2e7419 100644 --- a/crates/miden-objects/src/transaction/executed_tx.rs +++ b/crates/miden-objects/src/transaction/executed_tx.rs @@ -1,15 +1,16 @@ use alloc::vec::Vec; use core::cell::OnceCell; -use vm_core::utils::{ByteReader, ByteWriter, Deserializable, Serializable}; -use vm_processor::DeserializationError; - use super::{ Account, AccountDelta, AccountHeader, AccountId, AdviceInputs, BlockHeader, InputNote, InputNotes, NoteId, OutputNotes, TransactionArgs, TransactionId, TransactionInputs, TransactionOutputs, TransactionWitness, }; -use crate::{account::AccountCode, block::BlockNumber}; +use crate::{ + account::AccountCode, + block::BlockNumber, + utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, +}; // EXECUTED TRANSACTION // ================================================================================================ diff --git a/crates/miden-objects/src/transaction/outputs.rs b/crates/miden-objects/src/transaction/outputs.rs index 57a1bdb7d..e1e0fff52 100644 --- a/crates/miden-objects/src/transaction/outputs.rs +++ b/crates/miden-objects/src/transaction/outputs.rs @@ -1,13 +1,11 @@ use alloc::{collections::BTreeSet, string::ToString, vec::Vec}; use core::fmt::Debug; -use miden_crypto::utils::{ByteReader, ByteWriter, Deserializable, Serializable}; -use vm_processor::DeserializationError; - use crate::{ account::AccountHeader, block::BlockNumber, note::{compute_note_hash, Note, NoteAssets, NoteHeader, NoteId, NoteMetadata, PartialNote}, + utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, Digest, Felt, Hasher, TransactionOutputError, Word, MAX_OUTPUT_NOTES_PER_TX, }; // TRANSACTION OUTPUTS diff --git a/crates/miden-objects/src/transaction/proven_tx.rs b/crates/miden-objects/src/transaction/proven_tx.rs index fe4be0e81..faa5f6849 100644 --- a/crates/miden-objects/src/transaction/proven_tx.rs +++ b/crates/miden-objects/src/transaction/proven_tx.rs @@ -1,7 +1,5 @@ use alloc::{string::ToString, vec::Vec}; -use miden_verifier::ExecutionProof; - use super::{InputNote, ToInputNoteCommitments}; use crate::{ account::delta::AccountUpdateDetails, @@ -11,6 +9,7 @@ use crate::{ AccountId, Digest, InputNotes, Nullifier, OutputNote, OutputNotes, TransactionId, }, utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, + vm::ExecutionProof, ProvenTransactionError, ACCOUNT_UPDATE_MAX_SIZE, }; diff --git a/crates/miden-objects/src/transaction/tx_args.rs b/crates/miden-objects/src/transaction/tx_args.rs index 0373c4678..fc57cc018 100644 --- a/crates/miden-objects/src/transaction/tx_args.rs +++ b/crates/miden-objects/src/transaction/tx_args.rs @@ -3,16 +3,13 @@ use core::ops::Deref; use assembly::{Assembler, Compile}; use miden_crypto::merkle::InnerNodeInfo; -use vm_core::{ - mast::{MastForest, MastNodeId}, - utils::{ByteReader, ByteWriter, Deserializable, Serializable}, - AdviceMap, Program, -}; -use vm_processor::{AdviceInputs, DeserializationError}; +use vm_core::mast::{MastForest, MastNodeId}; use super::{Digest, Felt, Word}; use crate::{ note::{NoteDetails, NoteId}, + utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, + vm::{AdviceInputs, AdviceMap, Program}, TransactionScriptError, }; diff --git a/crates/miden-objects/src/transaction/tx_witness.rs b/crates/miden-objects/src/transaction/tx_witness.rs index e3abe19df..23c7ff145 100644 --- a/crates/miden-objects/src/transaction/tx_witness.rs +++ b/crates/miden-objects/src/transaction/tx_witness.rs @@ -1,10 +1,10 @@ use alloc::vec::Vec; -use vm_core::utils::{ByteReader, Deserializable, Serializable}; -use vm_processor::DeserializationError; - use super::{AdviceInputs, TransactionArgs, TransactionInputs}; -use crate::account::AccountCode; +use crate::{ + account::AccountCode, + utils::serde::{ByteReader, Deserializable, DeserializationError, Serializable}, +}; // TRANSACTION WITNESS // ================================================================================================ From ebcd15922f99f6b2cdc7fd173a743b5bfff615eb Mon Sep 17 00:00:00 2001 From: varun-doshi Date: Wed, 26 Feb 2025 18:48:26 +0530 Subject: [PATCH 2/2] fix suggestions --- crates/miden-objects/src/lib.rs | 8 ++++++-- crates/miden-objects/src/note/assets.rs | 2 +- crates/miden-objects/src/note/mod.rs | 2 +- crates/miden-objects/src/note/script.rs | 7 ++----- crates/miden-objects/src/transaction/tx_args.rs | 3 +-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crates/miden-objects/src/lib.rs b/crates/miden-objects/src/lib.rs index 85781f705..73ca1f01c 100644 --- a/crates/miden-objects/src/lib.rs +++ b/crates/miden-objects/src/lib.rs @@ -30,11 +30,15 @@ pub use errors::{ TransactionScriptError, }; pub use miden_crypto::hash::rpo::{Rpo256 as Hasher, RpoDigest as Digest}; -pub use vm_core::{Felt, FieldElement, StarkField, Word, EMPTY_WORD, ONE, WORD_SIZE, ZERO}; +pub use vm_core::{ + mast::{MastForest, MastNodeId}, + prettier::PrettyPrint, + Felt, FieldElement, StarkField, Word, EMPTY_WORD, ONE, WORD_SIZE, ZERO, +}; pub mod assembly { pub use assembly::{ - mast, Assembler, AssemblyError, DefaultSourceManager, KernelLibrary, Library, + mast, Assembler, AssemblyError, Compile, DefaultSourceManager, KernelLibrary, Library, LibraryNamespace, LibraryPath, SourceManager, Version, }; } diff --git a/crates/miden-objects/src/note/assets.rs b/crates/miden-objects/src/note/assets.rs index 0f7c8a7e4..5bf8a1e25 100644 --- a/crates/miden-objects/src/note/assets.rs +++ b/crates/miden-objects/src/note/assets.rs @@ -1,7 +1,7 @@ use alloc::vec::Vec; -use super::Asset; use crate::{ + asset::Asset, errors::NoteError, utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, Digest, Felt, Hasher, Word, MAX_ASSETS_PER_NOTE, WORD_SIZE, ZERO, diff --git a/crates/miden-objects/src/note/mod.rs b/crates/miden-objects/src/note/mod.rs index c80452360..699b29221 100644 --- a/crates/miden-objects/src/note/mod.rs +++ b/crates/miden-objects/src/note/mod.rs @@ -6,7 +6,7 @@ use miden_crypto::{ }; use vm_processor::DeserializationError; -use crate::{account::AccountId, asset::Asset, Digest, Felt, Hasher, NoteError, WORD_SIZE, ZERO}; +use crate::{account::AccountId, Digest, Felt, Hasher, NoteError, WORD_SIZE, ZERO}; mod assets; pub use assets::NoteAssets; diff --git a/crates/miden-objects/src/note/script.rs b/crates/miden-objects/src/note/script.rs index b3cabfb0a..e7fb508dc 100644 --- a/crates/miden-objects/src/note/script.rs +++ b/crates/miden-objects/src/note/script.rs @@ -1,18 +1,15 @@ use alloc::{sync::Arc, vec::Vec}; use core::fmt::Display; -use assembly::Compile; -use vm_core::prettier::PrettyPrint; - use super::{Digest, Felt}; use crate::{ assembly::{ mast::{MastForest, MastNodeId}, - Assembler, + Assembler, Compile, }, utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, vm::Program, - NoteError, + NoteError, PrettyPrint, }; // NOTE SCRIPT diff --git a/crates/miden-objects/src/transaction/tx_args.rs b/crates/miden-objects/src/transaction/tx_args.rs index fc57cc018..47b5e5c34 100644 --- a/crates/miden-objects/src/transaction/tx_args.rs +++ b/crates/miden-objects/src/transaction/tx_args.rs @@ -3,14 +3,13 @@ use core::ops::Deref; use assembly::{Assembler, Compile}; use miden_crypto::merkle::InnerNodeInfo; -use vm_core::mast::{MastForest, MastNodeId}; use super::{Digest, Felt, Word}; use crate::{ note::{NoteDetails, NoteId}, utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable}, vm::{AdviceInputs, AdviceMap, Program}, - TransactionScriptError, + MastForest, MastNodeId, TransactionScriptError, }; // TRANSACTION ARGS