feat: Make sync compatible with node's next

CHANGELOG.md

@@ -12,6 +12,7 @@
 * [BREAKING] Refactored authentication out of the `Client` and added new separate authenticators (#718).
 * Re-exported RemoteTransactionProver in `rust-client` (#752).
 * Moved error handling to the `TransactionRequestBuilder::build()` (#750).
+* [BREAKING] Added starting block number parameter to `CheckNullifiersByPrefix` and removed nullifiers from `SyncState` (#758).
 
 ## 0.7.0 (2025-01-28)
 

Makefile

@@ -18,7 +18,7 @@ WARNINGS=RUSTDOCFLAGS="-D warnings"
 
 NODE_DIR="miden-node"
 NODE_REPO="https://github.com/0xPolygonMiden/miden-node.git"
-NODE_BRANCH="cf87d340f394d03bf376abff06a4b36149d63b24"
+NODE_BRANCH="next"
 
 PROVER_DIR="miden-base"
 PROVER_REPO="https://github.com/0xPolygonMiden/miden-base.git"

crates/rust-client/src/mock.rs

@@ -34,12 +34,13 @@ use crate::{
         domain::{
             account::{AccountDetails, AccountProofs},
             note::{NetworkNote, NoteSyncInfo},
+            nullifier::NullifierUpdate,
             sync::StateSyncInfo,
         },
         generated::{
             merkle::MerklePath,
             note::NoteSyncRecord,
-            responses::{NullifierUpdate, SyncNoteResponse, SyncStateResponse},
+            responses::{SyncNoteResponse, SyncStateResponse},
         },
         NodeRpcClient, RpcError,
     },
@@ -164,24 +165,13 @@ impl MockRpcApi {
         // Collect notes that are in the next block
         let notes = self.get_notes_in_block(next_block_num).collect();
 
-        // Collect nullifiers from the next block
-        let nullifiers = next_block
-            .created_nullifiers()
-            .iter()
-            .map(|n| NullifierUpdate {
-                nullifier: Some(n.inner().into()),
-                block_num: next_block_num.as_u32(),
-            })
-            .collect();
-
         SyncStateResponse {
             chain_tip: self.get_chain_tip_block_num().as_u32(),
             block_header: Some(next_block.header().into()),
             mmr_delta,
             accounts: vec![],
             transactions: vec![],
             notes,
-            nullifiers,
         }
     }
 
@@ -229,7 +219,6 @@ impl NodeRpcClient for MockRpcApi {
         block_num: BlockNumber,
         _account_ids: &[AccountId],
         _note_tags: &[NoteTag],
-        _nullifiers_tags: &[u16],
     ) -> Result<StateSyncInfo, RpcError> {
         // Match request -> response through block_num
         let response = self.get_sync_state_request(block_num);
@@ -303,7 +292,8 @@ impl NodeRpcClient for MockRpcApi {
     async fn check_nullifiers_by_prefix(
         &mut self,
         _prefix: &[u16],
-    ) -> Result<Vec<(miden_objects::note::Nullifier, u32)>, RpcError> {
+        _block_num: BlockNumber,
+    ) -> Result<Vec<NullifierUpdate>, RpcError> {
         // Always return an empty list for now since it's only used when importing
         Ok(vec![])
     }

crates/rust-client/src/note/import.rs

@@ -153,8 +153,13 @@ impl<R: FeltRng> Client<R> {
             .into(),
         ));
 
-        if let Some(block_height) =
-            self.rpc_api.get_nullifier_commit_height(&note_record.nullifier()).await?
+        if let Some(block_height) = self
+            .rpc_api
+            .get_nullifier_commit_height(
+                &note_record.nullifier(),
+                inclusion_proof.location().block_num(),
+            )
+            .await?
         {
             if note_record.consumed_externally(note_record.nullifier(), block_height)? {
                 return Ok(Some(note_record));

crates/rust-client/src/rpc/domain/nullifier.rs

@@ -1,6 +1,7 @@
 use miden_objects::{crypto::hash::rpo::RpoDigest, note::Nullifier};
 
-use crate::rpc::{errors::RpcConversionError, generated::digest::Digest};
+use super::MissingFieldHelper;
+use crate::rpc::{self, errors::RpcConversionError, generated::digest::Digest};
 
 // NULLIFIER UPDATE
 // ================================================================================================
@@ -24,3 +25,17 @@ impl TryFrom<Digest> for Nullifier {
         Ok(digest.into())
     }
 }
+
+impl TryFrom<&rpc::generated::responses::NullifierUpdate> for NullifierUpdate {
+    type Error = RpcConversionError;
+
+    fn try_from(value: &rpc::generated::responses::NullifierUpdate) -> Result<Self, Self::Error> {
+        Ok(Self {
+            nullifier: value
+                .nullifier
+                .ok_or(rpc::generated::responses::NullifierUpdate::missing_field("nullifier"))?
+                .try_into()?,
+            block_num: value.block_num,
+        })
+    }
+}