refactor: Use BlockNumber instead of u32 and update miden-base

Author: igamigo

CHANGELOG.md

@@ -13,6 +13,8 @@
 * [BREAKING] Added support for specifying map storage slots for FPI (#645)
 * Limited the number of decimals that an asset can have (#666).
 * [BREAKING] Removed the `testing` feature from the CLI (#670).
+* Added per transaction prover support to the web client (#674).
+* [BREAKING] Added `BlockNumber` structure (#677).
 
 ### Fixes
 

Cargo.lock

@@ -22,7 +22,7 @@ async-trait = "0.1"
 miden-lib = { git = "https://github.com/0xPolygonMiden/miden-base", branch = "next", default-features = false }
 miden-objects = { git = "https://github.com/0xPolygonMiden/miden-base", branch = "next", default-features = false }
 miden-tx = { git = "https://github.com/0xPolygonMiden/miden-base", branch = "next", default-features = false, features = ["async"] }
-miden-remote-provers = { git = "https://github.com/0xPolygonMiden/miden-base", branch = "next", features = ["tx-prover"] }
+miden-proving-service-client = { git = "https://github.com/0xPolygonMiden/miden-base", branch = "next", features = ["tx-prover"] }
 rand = { version = "0.8" }
 serde = { version = "1.0", features = ["derive"] }
 thiserror = { version = "2.0", default-features = false }

Cargo.toml

@@ -37,7 +37,7 @@ comfy-table = { version = "7.1" }
 figment = { version = "0.10", features = ["toml", "env"] }
 miden-client = { version = "0.6", path = "../../crates/rust-client", features = ["sqlite", "tonic"] }
 miden-lib = { workspace = true }
-miden-remote-provers = { workspace = true }
+miden-proving-service-client = { workspace = true , features = ["std", "tx-prover"]}
 rand = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 tokio = { workspace = true }

bin/miden-cli/Cargo.toml

@@ -5,14 +5,16 @@ use miden_client::{
     accounts::AccountId,
     assets::{FungibleAsset, NonFungibleDeltaAction},
     crypto::{Digest, FeltRng},
-    notes::{build_swap_tag, get_input_note_with_id_prefix, NoteType as MidenNoteType},
+    notes::{
+        build_swap_tag, get_input_note_with_id_prefix, BlockNumber, NoteType as MidenNoteType,
+    },
     transactions::{
         PaymentTransactionData, SwapTransactionData, TransactionRequest, TransactionRequestBuilder,
         TransactionResult,
     },
     Client,
 };
-use miden_remote_provers::RemoteTransactionProver;
+use miden_proving_service_client::RemoteTransactionProver;
 use tracing::info;
 
 use crate::{
@@ -142,7 +144,7 @@ impl SendCmd {
 
         let transaction_request = TransactionRequestBuilder::pay_to_id(
             payment_transaction,
-            self.recall_height,
+            self.recall_height.map(BlockNumber::from),
             (&self.note_type).into(),
             client.rng(),
         )

bin/miden-cli/src/commands/new_transactions.rs

@@ -1,6 +1,6 @@
 use miden_cli::Cli;
 
-extern crate alloc;
+extern crate std;
 
 #[tokio::main]
 async fn main() -> Result<(), String> {

bin/miden-cli/src/main.rs

@@ -698,7 +698,7 @@ async fn debug_mode_outputs_logs() {
     // Export the note
     let note_file: NoteFile = NoteFile::NoteDetails {
         details: note.clone().into(),
-        after_block_num: 0,
+        after_block_num: 0.into(),
         tag: Some(note.metadata().tag()),
     };
 

bin/miden-cli/src/tests.rs

@@ -184,19 +184,19 @@ impl<R: FeltRng> Client<R> {
 pub struct AccountUpdates {
     /// Updated public accounts.
     updated_public_accounts: Vec<Account>,
-    /// Node account hashes that don't match the tracked information.
-    mismatched_offchain_accounts: Vec<(AccountId, Digest)>,
+    /// Node account hashes that don't match the current tracked state for private accounts.
+    mismatched_private_accounts: Vec<(AccountId, Digest)>,
 }
 
 impl AccountUpdates {
     /// Creates a new instance of `AccountUpdates`.
     pub fn new(
         updated_public_accounts: Vec<Account>,
-        mismatched_offchain_accounts: Vec<(AccountId, Digest)>,
+        mismatched_private_accounts: Vec<(AccountId, Digest)>,
     ) -> Self {
         Self {
             updated_public_accounts,
-            mismatched_offchain_accounts,
+            mismatched_private_accounts,
         }
     }
 
@@ -205,9 +205,9 @@ impl AccountUpdates {
         &self.updated_public_accounts
     }
 
-    /// Returns the mismatched offchain accounts.
-    pub fn mismatched_offchain_accounts(&self) -> &[(AccountId, Digest)] {
-        &self.mismatched_offchain_accounts
+    /// Returns the mismatched private accounts.
+    pub fn mismatched_private_accounts(&self) -> &[(AccountId, Digest)] {
+        &self.mismatched_private_accounts
     }
 }
 

crates/rust-client/src/accounts.rs

@@ -10,7 +10,7 @@ use miden_lib::transaction::TransactionKernel;
 use miden_objects::{
     accounts::{AccountCode, AccountId},
     assets::{FungibleAsset, NonFungibleAsset},
-    block::Block,
+    block::{Block, BlockNumber},
     crypto::{
         merkle::{Mmr, MmrProof},
         rand::RpoRandomCoin,
@@ -127,17 +127,17 @@ impl MockRpcApi {
     }
 
     /// Returns the chain tip block number.
-    fn get_chain_tip_block_num(&self) -> u32 {
+    fn get_chain_tip_block_num(&self) -> BlockNumber {
         self.blocks.last().map(|b| b.header().block_num()).unwrap()
     }
 
     /// Retrieves a block by its block number.
-    fn get_block_by_num(&self, block_num: u32) -> Option<&Block> {
-        self.blocks.get(block_num as usize)
+    fn get_block_by_num(&self, block_num: BlockNumber) -> Option<&Block> {
+        self.blocks.get(block_num.as_usize())
     }
 
     /// Generates a sync state response based on the request block number.
-    pub fn get_sync_state_request(&self, request_block_num: u32) -> SyncStateResponse {
+    pub fn get_sync_state_request(&self, request_block_num: BlockNumber) -> SyncStateResponse {
         // Determine the next block number to sync
         let next_block_num = self
             .notes
@@ -156,7 +156,7 @@ impl MockRpcApi {
         // Prepare the MMR delta
         let mmr_delta = self
             .get_mmr()
-            .get_delta((request_block_num + 1) as usize, next_block_num as usize)
+            .get_delta((request_block_num.as_u32() + 1) as usize, next_block_num.as_usize())
             .ok()
             .map(Into::into);
 
@@ -169,12 +169,12 @@ impl MockRpcApi {
             .iter()
             .map(|n| NullifierUpdate {
                 nullifier: Some(n.inner().into()),
-                block_num: next_block_num,
+                block_num: next_block_num.as_u32(),
             })
             .collect();
 
         SyncStateResponse {
-            chain_tip: self.get_chain_tip_block_num(),
+            chain_tip: self.get_chain_tip_block_num().as_u32(),
             block_header: Some(next_block.header().into()),
             mmr_delta,
             accounts: vec![],
@@ -185,7 +185,10 @@ impl MockRpcApi {
     }
 
     /// Retrieves notes that are included in the specified block number.
-    fn get_notes_in_block(&self, block_num: u32) -> impl Iterator<Item = NoteSyncRecord> + '_ {
+    fn get_notes_in_block(
+        &self,
+        block_num: BlockNumber,
+    ) -> impl Iterator<Item = NoteSyncRecord> + '_ {
         self.notes.values().filter_map(move |note| {
             if note.location().map_or(false, |loc| loc.block_num() == block_num) {
                 let proof = note.proof()?;
@@ -206,7 +209,7 @@ use alloc::boxed::Box;
 impl NodeRpcClient for MockRpcApi {
     async fn sync_notes(
         &mut self,
-        _block_num: u32,
+        _block_num: BlockNumber,
         _note_tags: &[NoteTag],
     ) -> Result<NoteSyncInfo, RpcError> {
         let response = SyncNoteResponse {
@@ -222,7 +225,7 @@ impl NodeRpcClient for MockRpcApi {
     /// Executes the specified sync state request and returns the response.
     async fn sync_state(
         &mut self,
-        block_num: u32,
+        block_num: BlockNumber,
         _account_ids: &[AccountId],
         _note_tags: &[NoteTag],
         _nullifiers_tags: &[u16],
@@ -237,10 +240,10 @@ impl NodeRpcClient for MockRpcApi {
     /// Only used for retrieving genesis block right now so that's the only case we need to cover.
     async fn get_block_header_by_number(
         &mut self,
-        block_num: Option<u32>,
+        block_num: Option<BlockNumber>,
         include_mmr_proof: bool,
     ) -> Result<(BlockHeader, Option<MmrProof>), RpcError> {
-        if block_num == Some(0) {
+        if block_num == Some(0.into()) {
             return Ok((self.blocks.first().unwrap().header(), None));
         }
         let block = self
@@ -250,7 +253,7 @@ impl NodeRpcClient for MockRpcApi {
             .unwrap();
 
         let mmr_proof = if include_mmr_proof {
-            Some(self.get_mmr().open(block_num.unwrap() as usize).unwrap())
+            Some(self.get_mmr().open(block_num.unwrap().as_usize()).unwrap())
         } else {
             None
         };

crates/rust-client/src/mock.rs

@@ -1,6 +1,7 @@
 use alloc::string::ToString;
 
 use miden_objects::{
+    block::BlockNumber,
     crypto::rand::FeltRng,
     notes::{Note, NoteDetails, NoteFile, NoteId, NoteInclusionProof, NoteMetadata, NoteTag},
 };
@@ -185,7 +186,7 @@ impl<R: FeltRng> Client<R> {
         &mut self,
         previous_note: Option<InputNoteRecord>,
         details: NoteDetails,
-        after_block_num: u32,
+        after_block_num: BlockNumber,
         tag: Option<NoteTag>,
     ) -> Result<Option<InputNoteRecord>, ClientError> {
         let mut note_record = previous_note.unwrap_or({
@@ -237,7 +238,7 @@ impl<R: FeltRng> Client<R> {
     /// proof.
     async fn check_expected_note(
         &mut self,
-        mut request_block_num: u32,
+        mut request_block_num: BlockNumber,
         tag: NoteTag,
         expected_note: &miden_objects::notes::NoteDetails,
     ) -> Result<Option<(NoteMetadata, NoteInclusionProof)>, ClientError> {
@@ -249,7 +250,7 @@ impl<R: FeltRng> Client<R> {
 
             let sync_notes = self.rpc_api.sync_notes(request_block_num, &[tag]).await?;
 
-            if sync_notes.block_header.block_num() == sync_notes.chain_tip {
+            if sync_notes.block_header.block_num() == sync_notes.chain_tip.into() {
                 return Ok(None);
             }