0xPolygonMiden · polydez · Apr 5, 2024 · Mar 8, 2024 · Mar 8, 2024 · Mar 8, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/block-producer/src/block_builder/prover/tests.rs b/block-producer/src/block_builder/prover/tests.rs
@@ -383,7 +383,7 @@ async fn test_compute_note_root_success() {
     .map(|(note_digest, &account_id)| {
         NoteEnvelope::new(
             note_digest.into(),
-            NoteMetadata::new(account_id, NoteType::OffChain, Felt::new(1u64)),
+            NoteMetadata::new(account_id, NoteType::OffChain, 0.into(), ONE).unwrap(),
         )
     })
     .collect();

diff --git a/block-producer/src/test_utils/proven_tx.rs b/block-producer/src/test_utils/proven_tx.rs
@@ -6,7 +6,7 @@ use miden_objects::{
     notes::{NoteEnvelope, NoteMetadata, NoteType, Nullifier},
     transaction::{ProvenTransaction, ProvenTransactionBuilder},
     vm::ExecutionProof,
-    Digest, Felt, Hasher, ONE,
+    Digest, Felt, Hasher, ONE, ZERO,
 };
 use winterfell::StarkProof;
 
@@ -84,7 +84,7 @@ impl MockProvenTxBuilder {
 
                 NoteEnvelope::new(
                     note_hash.into(),
-                    NoteMetadata::new(self.account_id, NoteType::OffChain, ONE),
+                    NoteMetadata::new(self.account_id, NoteType::OffChain, 0.into(), ZERO).unwrap(),
                 )
             })
             .collect();

diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
@@ -15,11 +15,11 @@ actix-files = "0.6.5"
 actix-cors = "0.7.0"
 derive_more = "0.99.17"
 figment = { version = "0.10", features = ["toml", "env"] }
-miden-lib = { workspace = true }
+miden-lib = { version = "0.1" } # Need to set older version because client doesn't support newest miden-objects yet
 miden-client = { version = "0.1.0", features = ["concurrent"] }
 miden-node-proto = { path = "../proto", version = "0.2" }
 miden-node-utils = { path = "../utils", version = "0.2" }
-miden-objects = { workspace = true }
+miden-objects = { version = "0.1" } # Need to set older version because client doesn't support newest miden-objects yet
 serde = { version = "1.0", features = ["derive"] }
 clap = { version = "4.5.1", features = ["derive"] }
 async-mutex = "1.4.0"

diff --git a/proto/src/domain/notes.rs b/proto/src/domain/notes.rs
@@ -25,7 +25,7 @@ impl From<(u64, NoteEnvelope)> for note::NoteCreated {
         Self {
             note_id: Some(note.note_id().into()),
             sender: Some(note.metadata().sender().into()),
-            tag: note.metadata().tag().into(),
+            tag: u32::from(note.metadata().tag()).into(),
             note_index: note_idx as u32,
         }
     }

diff --git a/store/src/errors.rs b/store/src/errors.rs
@@ -7,7 +7,7 @@ use miden_objects::{
         utils::DeserializationError,
     },
     notes::Nullifier,
-    AccountError, BlockHeader,
+    AccountError, BlockHeader, NoteError,
 };
 use rusqlite::types::FromSqlError;
 use thiserror::Error;
@@ -108,6 +108,8 @@ pub enum ApplyBlockError {
     DatabaseError(#[from] DatabaseError),
     #[error("Account error: {0}")]
     AccountError(#[from] AccountError),
+    #[error("Note error: {0}")]
+    NoteError(#[from] NoteError),
     #[error("Concurrent write detected")]
     ConcurrentWrite,
     #[error("New block number must be 1 greater than the current block number")]

diff --git a/store/src/state.rs b/store/src/state.rs
@@ -12,7 +12,7 @@ use miden_objects::{
         merkle::{LeafIndex, Mmr, MmrDelta, MmrPeaks, SimpleSmt, SmtProof, ValuePath},
     },
     notes::{NoteMetadata, NoteType, Nullifier, NOTE_LEAF_DEPTH},
-    AccountError, BlockHeader, Word, ACCOUNT_TREE_DEPTH,
+    AccountError, BlockHeader, Word, ACCOUNT_TREE_DEPTH, ZERO,
 };
 use tokio::{
     sync::{oneshot, Mutex, RwLock},
@@ -484,10 +484,11 @@ pub fn build_notes_tree(
         let note_metadata = NoteMetadata::new(
             note.sender.try_into()?,
             NoteType::OffChain, // TODO: provide correct note type
-            note.tag
-                .try_into()
-                .expect("tag value is greater than or equal to the field modulus"),
-        );
+            u32::try_from(note.tag)
+                .expect("tag value is greater than or equal to the field modulus")
+                .into(),
+            ZERO,
+        )?;
         let index = note.note_index as u64;
         entries.push((index, note.note_id.into()));
         entries.push((index + 1, note_metadata.into()));