chore: Move to latest next (#677)

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

* chore: Update base revision

CHANGELOG.md

@@ -14,6 +14,7 @@
 * 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.toml

@@ -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 }

bin/miden-cli/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/src/commands/new_transactions.rs

@@ -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/main.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/tests.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()),
     };
 

crates/rust-client/src/accounts.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/lib.rs

@@ -45,8 +45,8 @@ pub mod auth {
 }
 
 /// Provides types for working with blocks within the Miden rollup network.
-pub mod blocks {
-    pub use miden_objects::BlockHeader;
+pub mod block {
+    pub use miden_objects::block::BlockHeader;
 }
 
 /// Provides cryptographic types and utilities used within the Miden rollup