feat: add check nullifiers request

0xPolygonMiden · Mar 5, 2025 · 3dc16d5 · 3dc16d5
1 parent 02eb0de
commit 3dc16d5
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 136 deletions.
diff --git a/crates/rust-client/src/store/mod.rs b/crates/rust-client/src/store/mod.rs
@@ -33,12 +33,10 @@ use miden_objects::{
     block::{BlockHeader, BlockNumber},
     crypto::merkle::{InOrderIndex, MmrPeaks},
     note::{NoteId, NoteTag, Nullifier},
-    transaction::TransactionId,
     Digest, Word,
 };
 
 use crate::{
-    note::NoteUpdates,
     sync::{NoteTagRecord, StateSyncUpdate},
     transaction::{TransactionRecord, TransactionStoreUpdate},
 };
@@ -313,16 +311,6 @@ pub trait Store: Send + Sync {
     /// - Storing new MMR authentication nodes.
     /// - Updating the tracked public accounts.
     async fn apply_state_sync(&self, state_sync_update: StateSyncUpdate) -> Result<(), StoreError>;
-
-    /// Applies nullifier updates to database.
-    /// Nullifiers are retrieved after completing a `StateSync`.
-    ///
-    /// This operation is temporary, to be removed as part of miden-client/650.
-    async fn apply_nullifiers(
-        &self,
-        note_updates: NoteUpdates,
-        transactions_to_discard: Vec<TransactionId>,
-    ) -> Result<(), StoreError>;
 }
 
 // CHAIN MMR NODE FILTER

diff --git a/crates/rust-client/src/store/sqlite_store/mod.rs b/crates/rust-client/src/store/sqlite_store/mod.rs
@@ -17,7 +17,6 @@ use miden_objects::{
     block::{BlockHeader, BlockNumber},
     crypto::merkle::{InOrderIndex, MmrPeaks},
     note::{NoteTag, Nullifier},
-    transaction::TransactionId,
     Digest, Word,
 };
 use rusqlite::{types::Value, vtab::array, Connection};
@@ -28,7 +27,6 @@ use super::{
     OutputNoteRecord, Store, TransactionFilter,
 };
 use crate::{
-    note::NoteUpdates,
     store::StoreError,
     sync::{NoteTagRecord, StateSyncUpdate},
     transaction::{TransactionRecord, TransactionStoreUpdate},
@@ -329,17 +327,6 @@ impl Store for SqliteStore {
         self.interact_with_connection(SqliteStore::get_unspent_input_note_nullifiers)
             .await
     }
-
-    async fn apply_nullifiers(
-        &self,
-        note_updates: NoteUpdates,
-        transactions_to_discard: Vec<TransactionId>,
-    ) -> Result<(), StoreError> {
-        self.interact_with_connection(move |conn| {
-            SqliteStore::apply_nullifiers(conn, &note_updates, &transactions_to_discard)
-        })
-        .await
-    }
 }
 
 // UTILS

diff --git a/crates/rust-client/src/store/sqlite_store/sync.rs b/crates/rust-client/src/store/sqlite_store/sync.rs
@@ -2,13 +2,12 @@
 
 use alloc::{collections::BTreeSet, vec::Vec};
 
-use miden_objects::{block::BlockNumber, note::NoteTag, transaction::TransactionId};
+use miden_objects::{block::BlockNumber, note::NoteTag};
 use miden_tx::utils::{Deserializable, Serializable};
 use rusqlite::{params, Connection, Transaction};
 
 use super::SqliteStore;
 use crate::{
-    note::NoteUpdates,
     store::{
         sqlite_store::{
             account::{lock_account, update_account},
@@ -172,22 +171,6 @@ impl SqliteStore {
 
         Ok(())
     }
-
-    pub(super) fn apply_nullifiers(
-        conn: &mut Connection,
-        note_updates: &NoteUpdates,
-        transactions_to_discard: &[TransactionId],
-    ) -> Result<(), StoreError> {
-        let tx = conn.transaction()?;
-
-        apply_note_updates_tx(&tx, note_updates)?;
-
-        Self::mark_transactions_as_discarded(&tx, transactions_to_discard)?;
-
-        tx.commit()?;
-
-        Ok(())
-    }
 }
 
 pub(super) fn add_note_tag_tx(tx: &Transaction<'_>, tag: &NoteTagRecord) -> Result<(), StoreError> {

diff --git a/crates/rust-client/src/store/web_store/mod.rs b/crates/rust-client/src/store/web_store/mod.rs
@@ -14,7 +14,6 @@ use miden_objects::{
     block::{BlockHeader, BlockNumber},
     crypto::merkle::{InOrderIndex, MmrPeaks},
     note::Nullifier,
-    transaction::TransactionId,
     Digest, Word,
 };
 use tonic::async_trait;
@@ -26,7 +25,6 @@ use super::{
     OutputNoteRecord, Store, StoreError, TransactionFilter,
 };
 use crate::{
-    note::NoteUpdates,
     sync::{NoteTagRecord, StateSyncUpdate},
     transaction::{TransactionRecord, TransactionStoreUpdate},
 };
@@ -87,14 +85,6 @@ impl Store for WebStore {
         self.apply_state_sync(state_sync_update).await
     }
 
-    async fn apply_nullifiers(
-        &self,
-        note_updates: NoteUpdates,
-        transactions_to_discard: Vec<TransactionId>,
-    ) -> Result<(), StoreError> {
-        self.apply_nullifiers(note_updates, transactions_to_discard).await
-    }
-
     // TRANSACTIONS
     // --------------------------------------------------------------------------------------------
 

diff --git a/crates/rust-client/src/store/web_store/sync/mod.rs b/crates/rust-client/src/store/web_store/sync/mod.rs
@@ -7,7 +7,6 @@ use miden_objects::{
     account::AccountId,
     block::BlockNumber,
     note::{NoteId, NoteTag},
-    transaction::TransactionId,
 };
 use miden_tx::utils::{Deserializable, Serializable};
 use serde_wasm_bindgen::from_value;
@@ -20,7 +19,6 @@ use super::{
     WebStore,
 };
 use crate::{
-    note::NoteUpdates,
     store::StoreError,
     sync::{NoteTagRecord, NoteTagSource, StateSyncUpdate},
 };
@@ -195,12 +193,4 @@ impl WebStore {
 
         Ok(())
     }
-
-    pub(super) async fn apply_nullifiers(
-        &self,
-        note_updates: NoteUpdates,
-        _transactions_to_discard: Vec<TransactionId>,
-    ) -> Result<(), StoreError> {
-        apply_note_updates_tx(&note_updates).await
-    }
 }