Merge branch 'next' of github.com:0xMiden/miden-node into sergerad-store-lock-free

Author: sergerad

.gitignore

@@ -40,3 +40,5 @@ node_modules/
 *DS_Store
 *.iml
 book/
+
+.claude/

CHANGELOG.md

@@ -7,6 +7,9 @@
 - [BREAKING] Renamed `GetNoteError` endpoint to `GetNetworkNoteStatus` and extended it to return the full lifecycle status of a network note (`Pending`, `Processed`, `Discarded`, `Committed`) instead of only error information. Consumed notes are now retained in the database after block commit instead of being deleted ([#1892](https://github.com/0xMiden/node/pull/1892)).
 - Extended `ValidatorStatus` proto response with `chain_tip`, `validated_transactions_count`, and `signed_blocks_count`; added Validator card to the network monitor dashboard ([#1900](https://github.com/0xMiden/node/pull/1900)).
 - Updated the RocksDB SMT backend to use budgeted deserialization for bytes read from disk, ported from `0xMiden/crypto` PR [#846](https://github.com/0xMiden/crypto/pull/846) ([#1923](https://github.com/0xMiden/node/pull/1923)).
+- [BREAKING] Network monitor `/status` endpoint now emits a single `RemoteProverStatus` entry per remote prover that bundles status, workers, and test results, instead of separate entries ([#1980](https://github.com/0xMiden/node/pull/1980)).
+- Refactored the validator gRPC API implementation to use the new per-method trait implementations ([#1959](https://github.com/0xMiden/node/pull/1959)).
+- Aligned `SyncNullifiers` list-limit validation in RPC and store with `nullifier_prefix` parameter semantics, extended `GetLimits` test coverage, and documented query parameter limits ([#1986](https://github.com/0xMiden/node/pull/1986)).
 
 ## v0.14.9 (2026-04-21)
 

Cargo.lock

@@ -343,6 +343,10 @@ body {
     background: rgba(0, 0, 0, 0.05);
     border-radius: 4px;
     font-size: 12px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    flex-wrap: wrap;
 }
 
 .worker-name {

bin/network-monitor/assets/index.css

@@ -172,10 +172,11 @@ function collectGrpcWebEndpoints() {
                 });
             }
             // Remote Prover service
-            if (service.details.RemoteProverStatus && service.details.RemoteProverStatus.url) {
+            const proverUrl = service.details.RemoteProverStatus?.status?.url;
+            if (proverUrl) {
                 endpoints.push({
-                    serviceKey: service.details.RemoteProverStatus.url,
-                    baseUrl: service.details.RemoteProverStatus.url,
+                    serviceKey: proverUrl,
+                    baseUrl: proverUrl,
                     grpcPath: '/remote_prover.ProxyStatusApi/Status',
                 });
             }
@@ -303,55 +304,6 @@ async function fetchStatus() {
     }
 }
 
-// Merge Remote Prover status and test entries into a single card per prover.
-function mergeProverStatusAndTests(services) {
-    const testsByName = new Map();
-    const merged = [];
-    const usedTests = new Set();
-
-    services.forEach(service => {
-        if (service.details && service.details.RemoteProverTest) {
-            testsByName.set(service.name, service);
-        }
-    });
-
-    services.forEach(service => {
-        if (service.details && service.details.RemoteProverStatus) {
-            const test = testsByName.get(service.name);
-            if (test) {
-                usedTests.add(service.name);
-            }
-            merged.push({
-                ...service,
-                testDetails: test?.details?.RemoteProverTest ?? null,
-                testStatus: test?.status ?? null,
-                testError: test?.error ?? null
-            });
-        } else if (!(service.details && service.details.RemoteProverTest)) {
-            // Non-prover entries pass through unchanged
-            merged.push(service);
-        }
-    });
-
-    // Add orphaned tests (in case a test arrives before a status)
-    testsByName.forEach((test, name) => {
-        if (!usedTests.has(name)) {
-            merged.push({
-                name,
-                status: test.status,
-                last_checked: test.last_checked,
-                error: test.error,
-                details: null,
-                testDetails: test.details.RemoteProverTest,
-                testStatus: test.status,
-                testError: test.error
-            });
-        }
-    });
-
-    return merged;
-}
-
 function updateDisplay() {
     if (!statusData) return;
 
@@ -364,29 +316,28 @@ function updateDisplay() {
     const lastUpdateTime = new Date(statusData.last_updated * 1000);
     lastUpdated.textContent = lastUpdateTime.toLocaleString();
 
-    // Group remote prover status + test into single cards
-    const processedServices = mergeProverStatusAndTests(statusData.services);
-    const rpcService = processedServices.find(s => s.details && s.details.RpcStatus);
+    const services = statusData.services;
+    const rpcService = services.find(s => s.details && s.details.RpcStatus);
     const rpcChainTip =
         rpcService?.details?.RpcStatus?.store_status?.chain_tip ??
         rpcService?.details?.RpcStatus?.block_producer_status?.chain_tip ??
         null;
 
-    // Compute effective health for a service, considering all signals for remote provers.
+    // Compute effective health
     const isServiceHealthy = (s) => {
-        if (s.details && s.details.RemoteProverStatus) {
-            const statusOk = s.status === 'Healthy';
-            const testOk = s.testStatus == null || s.testStatus === 'Healthy';
-            const probeResult = grpcWebProbeResults.get(s.details.RemoteProverStatus.url);
-            const probeOk = !probeResult || probeResult.ok;
-            return statusOk && testOk && probeOk;
+        if (s.status !== 'Healthy') return false;
+        const probeUrl = s.details?.RemoteProverStatus?.status?.url
+            ?? s.details?.RpcStatus?.url;
+        if (probeUrl) {
+            const probe = grpcWebProbeResults.get(probeUrl);
+            if (probe && !probe.ok) return false;
         }
-        return s.status === 'Healthy';
+        return true;
     };
 
     // Count healthy vs unhealthy services
-    const healthyServices = processedServices.filter(isServiceHealthy).length;
-    const totalServices = processedServices.length;
+    const healthyServices = services.filter(isServiceHealthy).length;
+    const totalServices = services.length;
     const allHealthy = healthyServices === totalServices;
 
     // Update footer
@@ -404,7 +355,7 @@ function updateDisplay() {
     }
 
     // Generate status cards
-    const serviceCardsHtml = processedServices.map(service => {
+    const serviceCardsHtml = services.map(service => {
         const isHealthy = isServiceHealthy(service);
         const statusColor = isHealthy ? COLOR_HEALTHY : COLOR_UNHEALTHY;
         const statusIcon = isHealthy ? '✓' : '✗';
@@ -499,24 +450,32 @@ function updateDisplay() {
                             </div>
                         ` : ''}
                     ` : ''}
-                    ${details.RemoteProverStatus ? `
-                        <div class="detail-item"><strong>URL:</strong> ${details.RemoteProverStatus.url}${renderCopyButton(details.RemoteProverStatus.url, 'URL')}</div>
-                        <div class="detail-item"><strong>Version:</strong> ${details.RemoteProverStatus.version}</div>
-                        <div class="detail-item"><strong>Proof Type:</strong> ${details.RemoteProverStatus.supported_proof_type}</div>
-                        ${renderGrpcWebProbeSection(details.RemoteProverStatus.url)}
-                        ${details.RemoteProverStatus.workers && details.RemoteProverStatus.workers.length > 0 ? `
-                            <div class="nested-status">
-                                <strong>Workers (${details.RemoteProverStatus.workers.length}):</strong>
-                                ${details.RemoteProverStatus.workers.map(worker => `
-                                    <div class="worker-status">
-                                        <span class="worker-name">${worker.name}</span> -
-                                        <span class="worker-version">${worker.version}</span> -
-                                        <span class="worker-status-badge ${worker.status === 'Healthy' ? 'healthy' : worker.status === 'Unhealthy' ? 'unhealthy' : 'unknown'}">${worker.status}</span>
-                                    </div>
-                                `).join('')}
-                            </div>
-                        ` : ''}
-                    ` : ''}
+                    ${details.RemoteProverStatus ? (() => {
+                        const p = details.RemoteProverStatus.status;
+                        return `
+                            <div class="detail-item"><strong>URL:</strong> ${p.url}${renderCopyButton(p.url, 'URL')}</div>
+                            <div class="detail-item"><strong>Version:</strong> ${p.version}</div>
+                            <div class="detail-item"><strong>Proof Type:</strong> ${p.supported_proof_type}</div>
+                            ${renderGrpcWebProbeSection(p.url)}
+                            ${p.workers && p.workers.length > 0 ? `
+                                <div class="nested-status">
+                                    <strong>Workers (${p.workers.length}):</strong>
+                                    ${p.workers.map(worker => {
+                                        const nameDisplay = worker.name.length > 20
+                                            ? `${worker.name.substring(0, 20)}...${renderCopyButton(worker.name, 'worker name')}`
+                                            : worker.name;
+                                        return `
+                                            <div class="worker-status">
+                                                <span class="worker-name">${nameDisplay}</span>
+                                                <span class="worker-version">${worker.version}</span>
+                                                <span class="worker-status-badge ${worker.status === 'Healthy' ? 'healthy' : worker.status === 'Unhealthy' ? 'unhealthy' : 'unknown'}">${worker.status}</span>
+                                            </div>
+                                        `;
+                                    }).join('')}
+                                </div>
+                            ` : ''}
+                        `;
+                    })() : ''}
                     ${details.FaucetTest ? `
                         <div class="nested-status">
                             <strong>Faucet:</strong>
@@ -683,25 +642,29 @@ function updateDisplay() {
                             </div>
                         </div>
                     ` : ''}
-                    ${service.testDetails ? `
-                        <div class="nested-status">
-                            <strong>Proof Generation Testing (${service.testDetails.proof_type}):</strong>
-                            <div class="test-metrics ${service.testStatus === 'Healthy' ? 'healthy' : 'unhealthy'}">
-                                <div class="metric-row">
-                                    <span class="metric-label">Success Rate:</span>
-                                    <span class="metric-value">${formatSuccessRate(service.testDetails.success_count, service.testDetails.failure_count)}</span>
-                                </div>
-                                <div class="metric-row">
-                                    <span class="metric-label">Last Response Time:</span>
-                                    <span class="metric-value">${service.testDetails.test_duration_ms}ms</span>
-                                </div>
-                                <div class="metric-row">
-                                    <span class="metric-label">Last Proof Size:</span>
-                                    <span class="metric-value">${(service.testDetails.proof_size_bytes / 1024).toFixed(2)} KB</span>
+                    ${details.RemoteProverStatus?.test ? (() => {
+                        const t = details.RemoteProverStatus.test.details;
+                        const ts = details.RemoteProverStatus.test.status;
+                        return `
+                            <div class="nested-status">
+                                <strong>Proof Generation Testing (${t.proof_type}):</strong>
+                                <div class="test-metrics ${ts === 'Healthy' ? 'healthy' : 'unhealthy'}">
+                                    <div class="metric-row">
+                                        <span class="metric-label">Success Rate:</span>
+                                        <span class="metric-value">${formatSuccessRate(t.success_count, t.failure_count)}</span>
+                                    </div>
+                                    <div class="metric-row">
+                                        <span class="metric-label">Last Response Time:</span>
+                                        <span class="metric-value">${t.test_duration_ms}ms</span>
+                                    </div>
+                                    <div class="metric-row">
+                                        <span class="metric-label">Last Proof Size:</span>
+                                        <span class="metric-value">${(t.proof_size_bytes / 1024).toFixed(2)} KB</span>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    ` : ''}
+                        `;
+                    })() : ''}
                 </div>
             `;
         }
@@ -864,4 +827,3 @@ window.addEventListener('beforeunload', () => {
         clearInterval(grpcWebProbeInterval);
     }
 });
-

bin/network-monitor/assets/index.js

@@ -92,15 +92,20 @@ pub async fn start_monitor(config: MonitorConfig) -> Result<()> {
 
     // Initialize HTTP server.
     debug!(target: COMPONENT, "Initializing HTTP server");
+
+    // Build the flat services Vec in the order the dashboard expects to render cards.
+    let services = std::iter::once(rpc_rx)
+        .chain(prover_rxs)
+        .chain(faucet_rx)
+        .chain(explorer_rx)
+        .chain(ntx_increment_rx)
+        .chain(ntx_tracking_rx)
+        .chain(note_transport_rx)
+        .chain(validator_rx)
+        .collect();
+
     let server_state = ServerState {
-        rpc: rpc_rx,
-        provers: prover_rxs,
-        faucet: faucet_rx,
-        ntx_increment: ntx_increment_rx,
-        ntx_tracking: ntx_tracking_rx,
-        explorer: explorer_rx,
-        note_transport: note_transport_rx,
-        validator: validator_rx,
+        services,
         monitor_version: env!("CARGO_PKG_VERSION").to_string(),
         network_name: config.network_name.clone(),
     };

bin/network-monitor/src/commands/start.rs

@@ -18,16 +18,13 @@ use crate::status::{NetworkStatus, ServiceStatus};
 // ================================================================================================
 
 /// State for the web server containing watch receivers for all services.
+///
+/// Each entry in `services` is a `ServiceStatus` channel. The frontend simply snapshots every
+/// entry on each `/status` request. Adding a new service is just pushing another receiver into
+/// this Vec at startup; no changes to this struct or `get_status` are required.
 #[derive(Clone)]
 pub struct ServerState {
-    pub rpc: watch::Receiver<ServiceStatus>,
-    pub provers: Vec<(watch::Receiver<ServiceStatus>, watch::Receiver<ServiceStatus>)>,
-    pub faucet: Option<watch::Receiver<ServiceStatus>>,
-    pub ntx_increment: Option<watch::Receiver<ServiceStatus>>,
-    pub ntx_tracking: Option<watch::Receiver<ServiceStatus>>,
-    pub explorer: Option<watch::Receiver<ServiceStatus>>,
-    pub note_transport: Option<watch::Receiver<ServiceStatus>>,
-    pub validator: Option<watch::Receiver<ServiceStatus>>,
+    pub services: Vec<watch::Receiver<ServiceStatus>>,
     pub monitor_version: String,
     pub network_name: String,
 }
@@ -71,60 +68,20 @@ async fn get_dashboard() -> Html<&'static str> {
 async fn get_status(
     axum::extract::State(server_state): axum::extract::State<ServerState>,
 ) -> axum::response::Json<NetworkStatus> {
-    let current_time = SystemTime::now()
+    let services: Vec<ServiceStatus> =
+        server_state.services.iter().map(|rx| rx.borrow().clone()).collect();
+
+    let last_updated = SystemTime::now()
         .duration_since(UNIX_EPOCH)
         .unwrap_or_else(|_| Duration::from_secs(0))
         .as_secs();
 
-    let mut services = Vec::new();
-
-    // Collect RPC status
-    services.push(server_state.rpc.borrow().clone());
-
-    // Collect faucet status if available
-    if let Some(faucet_rx) = &server_state.faucet {
-        services.push(faucet_rx.borrow().clone());
-    }
-
-    // Collect all remote prover statuses
-    for (prover_status_rx, prover_test_rx) in &server_state.provers {
-        services.push(prover_status_rx.borrow().clone());
-        services.push(prover_test_rx.borrow().clone());
-    }
-
-    // Collect explorer status if available
-    if let Some(explorer_rx) = &server_state.explorer {
-        services.push(explorer_rx.borrow().clone());
-    }
-
-    // Collect counter increment status if enabled
-    if let Some(ntx_increment_rx) = &server_state.ntx_increment {
-        services.push(ntx_increment_rx.borrow().clone());
-    }
-
-    // Collect counter tracking status if enabled
-    if let Some(ntx_tracking_rx) = &server_state.ntx_tracking {
-        services.push(ntx_tracking_rx.borrow().clone());
-    }
-
-    // Collect note transport status if available
-    if let Some(note_transport_rx) = &server_state.note_transport {
-        services.push(note_transport_rx.borrow().clone());
-    }
-
-    // Collect validator status if available
-    if let Some(validator_rx) = &server_state.validator {
-        services.push(validator_rx.borrow().clone());
-    }
-
-    let network_status = NetworkStatus {
+    axum::response::Json(NetworkStatus {
         services,
-        last_updated: current_time,
+        last_updated,
         monitor_version: server_state.monitor_version.clone(),
         network_name: server_state.network_name.clone(),
-    };
-
-    axum::response::Json(network_status)
+    })
 }
 
 async fn serve_css() -> Response {