feat: removed external dependencies from miden-objects

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
 // ================================================================================================

crates/miden-objects/src/account/account_id/id_prefix.rs

@@ -1,20 +1,15 @@
 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::{
         account_id::AccountIdPrefixV0, AccountIdV0, AccountIdVersion, AccountStorageMode,
         AccountType,
     },
     errors::AccountIdError,
+    utils::serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable},
+    Felt,
 };
 
 // ACCOUNT ID PREFIX

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

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)]

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
 // ================================================================================================

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
 // ================================================================================================

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
 // ================================================================================================

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
 // ================================================================================================

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
 // ================================================================================================

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
 // ================================================================================================

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.

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

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<InputNoteCommitment>;

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,

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

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
 // ================================================================================================

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,

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
 // ================================================================================================

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.

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

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,
     };
 }

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 crate::{
+    asset::Asset,
+    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
 // ================================================================================================

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
 // ================================================================================================

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.

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
 // ================================================================================================

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;