Merge branch 'next' into santiagopittella-merge-main-to-next

Author: SantiagoPittella

.cargo/config.toml

@@ -1,3 +1,6 @@
+[alias]
+xtask = "run --locked --package xtask --"
+
 [target.wasm32-unknown-unknown]
 rustflags = ['--cfg', 'getrandom_backend="wasm_js"']
 

.github/workflows/ci.yml

@@ -258,8 +258,15 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           persist-credentials: false
+      - name: Rustup
+        run: rustup toolchain install --no-self-update
       - name: Rustup +nightly
         run: rustup toolchain install --no-self-update nightly --component rustfmt
+      - uses: WarpBuilds/rust-cache@9d0cc3090d9c87de74ea67617b246e978735b1a1 # v2.9.1
+        with:
+          shared-key: ${{ github.job }}
+          prefix-key: ${{ env.CACHE_PREFIX }}
+          save-if: ${{ env.SAVE_CACHE }}
       - name: Fmt
         run: make format-check
 

Cargo.lock

@@ -19,6 +19,7 @@ members = [
   "crates/test-macro",
   "crates/utils",
   "proto",
+  "xtask",
 ]
 
 resolver = "2"
@@ -108,8 +109,10 @@ rand_chacha        = { default-features = false, version = "0.9" }
 rayon              = { version = "1.10" }
 reqwest            = { version = "0.13" }
 rstest             = { version = "0.26" }
+rusqlite           = { features = ["bundled"], version = "0.37" }
 serde              = { features = ["derive"], version = "1" }
 serial_test        = { version = "3.2" }
+sha2               = { version = "0.10" }
 syn                = { version = "2.0" }
 tempfile           = { version = "3.12" }
 thiserror          = { default-features = false, version = "2.0" }

Cargo.toml

@@ -26,12 +26,14 @@ fix: ## Runs Fix with configs
 
 
 .PHONY: format
-format: ## Runs Format using nightly toolchain
+format: ## Runs rustfmt and comment reflow
+	cargo xtask fmt-comments --write
 	cargo +nightly fmt --all
 
 
 .PHONY: format-check
-format-check: ## Runs Format using nightly toolchain but only in check mode
+format-check: ## Checks rustfmt and comment reflow
+	cargo xtask fmt-comments --check
 	cargo +nightly fmt --all --check
 
 

Makefile

@@ -23,22 +23,22 @@ use rand::Rng;
 use rand_chacha::ChaCha20Rng;
 use rand_chacha::rand_core::SeedableRng;
 
-/// Generate canonical Miden genesis accounts (bridge, bridge admin, GER manager)
-/// and a genesis.toml configuration file.
+/// Generate canonical Miden genesis accounts (bridge, bridge admin, GER manager) and a genesis.toml
+/// configuration file.
 #[derive(Parser)]
 #[command(name = "miden-genesis")]
 struct Cli {
     /// Output directory for generated files.
     #[arg(long, default_value = "./genesis")]
     output_dir: PathBuf,
 
-    /// Hex-encoded Falcon512 public key for the bridge admin account.
-    /// If omitted, a new keypair is generated and the secret key is included in the .mac file.
+    /// Hex-encoded Falcon512 public key for the bridge admin account. If omitted, a new keypair is
+    /// generated and the secret key is included in the .mac file.
     #[arg(long, value_name = "HEX", requires = "ger_manager_public_key")]
     bridge_admin_public_key: Option<String>,
 
-    /// Hex-encoded Falcon512 public key for the GER manager account.
-    /// If omitted, a new keypair is generated and the secret key is included in the .mac file.
+    /// Hex-encoded Falcon512 public key for the GER manager account. If omitted, a new keypair is
+    /// generated and the secret key is included in the .mac file.
     #[arg(long, value_name = "HEX", requires = "bridge_admin_public_key")]
     ger_manager_public_key: Option<String>,
 }
@@ -97,9 +97,8 @@ fn run(
     let bridge_seed = Word::from(bridge_seed.map(Felt::new));
     let bridge = create_bridge_account(bridge_seed, bridge_admin_id, ger_manager_id);
 
-    // Bump bridge nonce to 1 (required for genesis accounts).
-    // File-loaded accounts via [[account]] in genesis.toml are included as-is,
-    // so we must set nonce=1 before writing the .mac file.
+    // Bump bridge nonce to 1 (required for genesis accounts). File-loaded accounts via [[account]]
+    // in genesis.toml are included as-is, so we must set nonce=1 before writing the .mac file.
     let bridge = bump_nonce_to_one(bridge).context("failed to bump bridge account nonce")?;
 
     // Write .mac files.
@@ -203,8 +202,8 @@ mod tests {
 
     use super::*;
 
-    /// Parses the generated genesis.toml, builds a genesis block, and asserts the bridge account
-    /// is included with nonce=1.
+    /// Parses the generated genesis.toml, builds a genesis block, and asserts the bridge account is
+    /// included with nonce=1.
     fn assert_valid_genesis_block(dir: &Path) {
         let bridge_id = AccountFile::read(dir.join("bridge.mac")).unwrap().account.id();
 

bin/genesis/src/main.rs

@@ -32,7 +32,7 @@ rand_chacha      = { workspace = true }
 reqwest          = { features = ["json", "query"], workspace = true }
 serde            = { workspace = true }
 serde_json       = { version = "1.0" }
-sha2             = { version = "0.10" }
+sha2             = { workspace = true }
 time             = { features = ["formatting", "macros"], version = "0.3" }
 tokio            = { features = ["full"], workspace = true }
 tonic            = { features = ["codegen", "tls-native-roots", "transport"], workspace = true }

bin/network-monitor/Cargo.toml

@@ -156,8 +156,8 @@ impl IncrementService {
         })
     }
 
-    /// Applies a successful increment: updates the wallet nonce, bumps counters, and returns
-    /// the next expected counter value.
+    /// Applies a successful increment: updates the wallet nonce, bumps counters, and returns the
+    /// next expected counter value.
     fn handle_increment_success(&mut self, final_account: &AccountHeader, tx_id: String) -> u64 {
         let updated_wallet = Account::new(
             self.tx.wallet_account.id(),
@@ -407,9 +407,9 @@ impl CounterTrackingService {
         })
     }
 
-    /// The increment service regenerates accounts on persistent failure and rewrites the
-    /// counter account file. If the file's account ID has changed, switch to the new account
-    /// and reset tracking state.
+    /// The increment service regenerates accounts on persistent failure and rewrites the counter
+    /// account file. If the file's account ID has changed, switch to the new account and reset
+    /// tracking state.
     async fn reload_counter_account_if_changed(&mut self) {
         let reloaded = match load_counter_account(&self.config.counter_filepath) {
             Ok(account) => account,
@@ -523,8 +523,8 @@ impl Service for CounterTrackingService {
     }
 
     fn interval(&self) -> Duration {
-        // Tracking polls twice per increment cadence so it catches freshly-incremented values
-        // soon after submission.
+        // Tracking polls twice per increment cadence so it catches freshly-incremented values soon
+        // after submission.
         self.config.counter_increment_interval / 2
     }
 
@@ -542,8 +542,8 @@ impl Service for CounterTrackingService {
 // SETUP
 // ================================================================================================
 
-/// Load wallet + counter accounts, fetch the genesis block header, and build the data store
-/// and increment script needed to produce network notes.
+/// Load wallet + counter accounts, fetch the genesis block header, and build the data store and
+/// increment script needed to produce network notes.
 async fn setup_increment_task(
     config: MonitorConfig,
     rpc_client: &mut RpcClient,

bin/network-monitor/src/counter.rs

@@ -38,15 +38,14 @@ use crate::deploy::wallet::{create_wallet_account, save_wallet_account};
 pub mod counter;
 pub mod wallet;
 
-/// Create an RPC client configured with the correct genesis metadata in the
-/// `Accept` header so that write RPCs such as `SubmitProvenTx` are
-/// accepted by the node.
+/// Create an RPC client configured with the correct genesis metadata in the `Accept` header so that
+/// write RPCs such as `SubmitProvenTx` are accepted by the node.
 pub async fn create_genesis_aware_rpc_client(
     rpc_url: &Url,
     timeout: Duration,
 ) -> Result<RpcClient> {
-    // First, create a temporary client without genesis metadata to discover the
-    // genesis block header and its commitment.
+    // First, create a temporary client without genesis metadata to discover the genesis block
+    // header and its commitment.
     let mut rpc: RpcClient = Builder::new(rpc_url.clone())
         .with_tls()
         .context("Failed to configure TLS for RPC client")?
@@ -78,8 +77,8 @@ pub async fn create_genesis_aware_rpc_client(
     let genesis_commitment = genesis_header.commitment();
     let genesis = genesis_commitment.to_hex();
 
-    // Rebuild the client, this time including the required genesis metadata so that
-    // write RPCs like SubmitProvenTx are accepted by the node.
+    // Rebuild the client, this time including the required genesis metadata so that write RPCs like
+    // SubmitProvenTx are accepted by the node.
     let rpc_client = Builder::new(rpc_url.clone())
         .with_tls()
         .context("Failed to configure TLS for RPC client")?

bin/network-monitor/src/deploy/mod.rs

@@ -244,8 +244,8 @@ mod tests {
 
     #[test]
     fn truncate_json_multibyte_chars_are_handled() {
-        // Each 'é' is 2 bytes in UTF-8. Build a string whose serialized JSON form
-        // exceeds 60 characters, ensuring truncation lands on a char boundary.
+        // Each 'é' is 2 bytes in UTF-8. Build a string whose serialized JSON form exceeds 60
+        // characters, ensuring truncation lands on a char boundary.
         let multibyte_string = "é".repeat(80);
         let value = json!(multibyte_string);
         // Should not panic and should still truncate correctly.
@@ -255,8 +255,8 @@ mod tests {
 
     #[test]
     fn truncate_json_exactly_60_chars_is_not_truncated() {
-        // Build a JSON string whose serialized form is exactly 60 characters.
-        // json!("x".repeat(58)) serializes as `"xxx...xxx"` (58 chars + 2 quotes = 60).
+        // Build a JSON string whose serialized form is exactly 60 characters. json!("x".repeat(58))
+        // serializes as `"xxx...xxx"` (58 chars + 2 quotes = 60).
         let value = json!("x".repeat(58));
         let result = truncate_json(&value);
         assert_eq!(result.chars().count(), 60);