From 72dc7d5031cce19921d7ca17a4ee0259511c731b Mon Sep 17 00:00:00 2001
From: Bobbin Threadbare <bobbinth@protonmail.com>
Date: Thu, 28 Aug 2025 23:36:26 -0700
Subject: [PATCH 01/78] chore: increment crate versions to v0.12.0

---
 CHANGELOG.md |  6 ++++++
 Cargo.lock   | 22 +++++++++++-----------
 Cargo.toml   | 22 +++++++++++-----------
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e21b39f3..fcbd2a16c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.12.0 (TBD)
+
+### Changes
+
+- [BREAKING] Updated MSRV to 1.89.
+
 ## v0.11.0 (2025-08-28)
 
 ### Enhancements
diff --git a/Cargo.lock b/Cargo.lock
index 92fadea51..b4b84bf59 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2185,7 +2185,7 @@ dependencies = [
 
 [[package]]
 name = "miden-node"
-version = "0.11.0"
+version = "0.12.0"
 dependencies = [
  "anyhow",
  "clap 4.5.46",
@@ -2204,7 +2204,7 @@ dependencies = [
 
 [[package]]
 name = "miden-node-block-producer"
-version = "0.11.0"
+version = "0.12.0"
 dependencies = [
  "anyhow",
  "assert_matches",
@@ -2239,7 +2239,7 @@ dependencies = [
 
 [[package]]
 name = "miden-node-ntx-builder"
-version = "0.11.0"
+version = "0.12.0"
 dependencies = [
  "anyhow",
  "futures",
@@ -2260,7 +2260,7 @@ dependencies = [
 
 [[package]]
 name = "miden-node-proto"
-version = "0.11.0"
+version = "0.12.0"
 dependencies = [
  "anyhow",
  "hex",
@@ -2280,7 +2280,7 @@ dependencies = [
 
 [[package]]
 name = "miden-node-proto-build"
-version = "0.11.0"
+version = "0.12.0"
 dependencies = [
  "anyhow",
  "prost",
@@ -2290,7 +2290,7 @@ dependencies = [
 
 [[package]]
 name = "miden-node-rpc"
-version = "0.11.0"
+version = "0.12.0"
 dependencies = [
  "anyhow",
  "futures",
@@ -2320,7 +2320,7 @@ dependencies = [
 
 [[package]]
 name = "miden-node-store"
-version = "0.11.0"
+version = "0.12.0"
 dependencies = [
  "anyhow",
  "assert_matches",
@@ -2355,7 +2355,7 @@ dependencies = [
 
 [[package]]
 name = "miden-node-stress-test"
-version = "0.11.0"
+version = "0.12.0"
 dependencies = [
  "clap 4.5.46",
  "fs-err",
@@ -2386,7 +2386,7 @@ dependencies = [
 
 [[package]]
 name = "miden-node-utils"
-version = "0.11.0"
+version = "0.12.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -2468,7 +2468,7 @@ dependencies = [
 
 [[package]]
 name = "miden-remote-prover"
-version = "0.11.0"
+version = "0.12.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2512,7 +2512,7 @@ dependencies = [
 
 [[package]]
 name = "miden-remote-prover-client"
-version = "0.11.0"
+version = "0.12.0"
 dependencies = [
  "getrandom 0.3.3",
  "miden-node-proto-build",
diff --git a/Cargo.toml b/Cargo.toml
index 55377296a..59d597074 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,24 +24,24 @@ homepage     = "https://miden.xyz"
 license      = "MIT"
 readme       = "README.md"
 repository   = "https://github.com/0xMiden/miden-node"
-rust-version = "1.88"
-version      = "0.11.0"
+rust-version = "1.89"
+version      = "0.12.0"
 
-# Optimise the cryptography for faster tests involving account creation.
+# Optimize the cryptography for faster tests involving account creation.
 [profile.test.package.miden-crypto]
 opt-level = 2
 
 [workspace.dependencies]
 # Workspace crates.
-miden-node-block-producer  = { path = "crates/block-producer", version = "0.11" }
-miden-node-ntx-builder     = { path = "crates/ntx-builder", version = "0.11" }
-miden-node-proto           = { path = "crates/proto", version = "0.11" }
-miden-node-proto-build     = { path = "proto", version = "0.11" }
-miden-node-rpc             = { path = "crates/rpc", version = "0.11" }
-miden-node-store           = { path = "crates/store", version = "0.11" }
+miden-node-block-producer  = { path = "crates/block-producer", version = "0.12" }
+miden-node-ntx-builder     = { path = "crates/ntx-builder", version = "0.12" }
+miden-node-proto           = { path = "crates/proto", version = "0.12" }
+miden-node-proto-build     = { path = "proto", version = "0.12" }
+miden-node-rpc             = { path = "crates/rpc", version = "0.12" }
+miden-node-store           = { path = "crates/store", version = "0.12" }
 miden-node-test-macro      = { path = "crates/test-macro" }
-miden-node-utils           = { path = "crates/utils", version = "0.11" }
-miden-remote-prover-client = { path = "crates/remote-prover-client", version = "0.11" }
+miden-node-utils           = { path = "crates/utils", version = "0.12" }
+miden-remote-prover-client = { path = "crates/remote-prover-client", version = "0.12" }
 
 # miden-base aka protocol dependencies. These should be updated in sync.
 miden-block-prover    = { version = "0.11" }

From 480f01b452564711b63312d265736dada8fb3bfc Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Tue, 2 Sep 2025 13:35:34 -0300
Subject: [PATCH 02/78] chore: update Rust version in Dockerfile and README

---
 README.md                         | 2 +-
 bin/node/Dockerfile               | 2 +-
 docs/src/operator/installation.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2993b3ee4..bd5e6973b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/0xMiden/miden-node/blob/main/LICENSE)
 [![test](https://github.com/0xMiden/miden-node/actions/workflows/test.yml/badge.svg)](https://github.com/0xMiden/miden-node/actions/workflows/test.yml)
-[![RUST_VERSION](https://img.shields.io/badge/rustc-1.88+-lightgray.svg)](https://www.rust-lang.org/tools/install)
+[![RUST_VERSION](https://img.shields.io/badge/rustc-1.89+-lightgray.svg)](https://www.rust-lang.org/tools/install)
 [![crates.io](https://img.shields.io/crates/v/miden-node)](https://crates.io/crates/miden-node)
 
 Welcome to the Miden node implementation :) This software is used to operate a Miden ZK-rollup network by
diff --git a/bin/node/Dockerfile b/bin/node/Dockerfile
index 17bbaf283..a43695c92 100644
--- a/bin/node/Dockerfile
+++ b/bin/node/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.88-slim-bullseye AS builder
+FROM rust:1.89-slim-bullseye AS builder
 
 RUN apt-get update && \
     apt-get -y upgrade && \
diff --git a/docs/src/operator/installation.md b/docs/src/operator/installation.md
index 217232fa1..e7694da33 100644
--- a/docs/src/operator/installation.md
+++ b/docs/src/operator/installation.md
@@ -25,7 +25,7 @@ can be used so long as the checksum file and the package file are in the same fo
 
 ## Install using `cargo`
 
-Install Rust version **1.88** or greater using the official Rust installation
+Install Rust version **1.89** or greater using the official Rust installation
 [instructions](https://www.rust-lang.org/tools/install).
 
 Depending on the platform, you may need to install additional libraries. For example, on Ubuntu 22.04 the following

From e14c553fe203a8321f2b11c14f1586f819fbc287 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Wed, 3 Sep 2025 15:06:21 -0300
Subject: [PATCH 03/78] feat: add GetNoteScriptByRoot endpoint (#1196)

---
 CHANGELOG.md                                |  1 +
 crates/proto/src/domain/note.rs             | 13 ++++
 crates/proto/src/generated/note.rs          | 17 +++++
 crates/proto/src/generated/rpc.rs           | 78 ++++++++++++++++++++
 crates/proto/src/generated/rpc_store.rs     | 82 +++++++++++++++++++++
 crates/rpc/README.md                        |  7 ++
 crates/rpc/src/server/api.rs                | 17 +++++
 crates/store/README.md                      |  7 ++
 crates/store/src/db/mod.rs                  | 17 ++++-
 crates/store/src/db/models/queries/notes.rs | 28 ++++++-
 crates/store/src/db/tests.rs                | 38 ++++++++++
 crates/store/src/server/rpc_api.rs          | 33 +++++++++
 crates/store/src/state.rs                   | 10 ++-
 crates/utils/src/tracing/grpc.rs            |  2 +
 docs/src/user/rpc.md                        |  5 ++
 proto/proto/rpc.proto                       |  3 +
 proto/proto/store/rpc.proto                 | 12 +++
 proto/proto/types/note.proto                | 14 ++++
 18 files changed, 381 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcbd2a16c..624089786 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Changes
 
 - [BREAKING] Updated MSRV to 1.89.
+- Added `GetNoteScriptByRoot` gRPC endpoint for retrieving a note script by its root ([#1196](https://github.com/0xMiden/miden-node/pull/1196)).
 
 ## v0.11.0 (2025-08-28)
 
diff --git a/crates/proto/src/domain/note.rs b/crates/proto/src/domain/note.rs
index b88445b25..a61884f69 100644
--- a/crates/proto/src/domain/note.rs
+++ b/crates/proto/src/domain/note.rs
@@ -6,6 +6,7 @@ use miden_objects::note::{
     NoteId,
     NoteInclusionProof,
     NoteMetadata,
+    NoteScript,
     NoteTag,
     NoteType,
     Nullifier,
@@ -349,3 +350,15 @@ pub enum NetworkNoteError {
     #[error("note tag {0} is not a valid network note tag")]
     InvalidExecutionMode(NoteTag),
 }
+
+// NOTE SCRIPT
+// ================================================================================================
+
+impl From<NoteScript> for proto::note::NoteScript {
+    fn from(script: NoteScript) -> Self {
+        Self {
+            entrypoint: script.entrypoint().into(),
+            mast: script.mast().to_bytes(),
+        }
+    }
+}
diff --git a/crates/proto/src/generated/note.rs b/crates/proto/src/generated/note.rs
index 1805d6872..79f404bd5 100644
--- a/crates/proto/src/generated/note.rs
+++ b/crates/proto/src/generated/note.rs
@@ -114,3 +114,20 @@ pub struct NoteSyncRecord {
     #[prost(message, optional, tag = "4")]
     pub inclusion_path: ::core::option::Option<super::primitives::SparseMerklePath>,
 }
+/// Represents a note root.
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+pub struct NoteRoot {
+    /// The root of the note.
+    #[prost(message, optional, tag = "1")]
+    pub root: ::core::option::Option<super::primitives::Digest>,
+}
+/// Represents a note script.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct NoteScript {
+    /// Entrypoint of the script.
+    #[prost(uint32, tag = "1")]
+    pub entrypoint: u32,
+    /// Mast of the script.
+    #[prost(bytes = "vec", tag = "2")]
+    pub mast: ::prost::alloc::vec::Vec<u8>,
+}
diff --git a/crates/proto/src/generated/rpc.rs b/crates/proto/src/generated/rpc.rs
index 6d2723b1d..55e247754 100644
--- a/crates/proto/src/generated/rpc.rs
+++ b/crates/proto/src/generated/rpc.rs
@@ -299,6 +299,31 @@ pub mod api_client {
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "GetNotesById"));
             self.inner.unary(req, path, codec).await
         }
+        /// Returns the script for a note by its root.
+        pub async fn get_note_script_by_root(
+            &mut self,
+            request: impl tonic::IntoRequest<super::super::note::NoteRoot>,
+        ) -> std::result::Result<
+            tonic::Response<super::super::rpc_store::MaybeNoteScript>,
+            tonic::Status,
+        > {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/rpc.Api/GetNoteScriptByRoot",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("rpc.Api", "GetNoteScriptByRoot"));
+            self.inner.unary(req, path, codec).await
+        }
         /// Submits proven transaction to the Miden network.
         pub async fn submit_proven_transaction(
             &mut self,
@@ -558,6 +583,14 @@ pub mod api_server {
             tonic::Response<super::super::note::CommittedNoteList>,
             tonic::Status,
         >;
+        /// Returns the script for a note by its root.
+        async fn get_note_script_by_root(
+            &self,
+            request: tonic::Request<super::super::note::NoteRoot>,
+        ) -> std::result::Result<
+            tonic::Response<super::super::rpc_store::MaybeNoteScript>,
+            tonic::Status,
+        >;
         /// Submits proven transaction to the Miden network.
         async fn submit_proven_transaction(
             &self,
@@ -1086,6 +1119,51 @@ pub mod api_server {
                     };
                     Box::pin(fut)
                 }
+                "/rpc.Api/GetNoteScriptByRoot" => {
+                    #[allow(non_camel_case_types)]
+                    struct GetNoteScriptByRootSvc<T: Api>(pub Arc<T>);
+                    impl<
+                        T: Api,
+                    > tonic::server::UnaryService<super::super::note::NoteRoot>
+                    for GetNoteScriptByRootSvc<T> {
+                        type Response = super::super::rpc_store::MaybeNoteScript;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<super::super::note::NoteRoot>,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as Api>::get_note_script_by_root(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = GetNoteScriptByRootSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
                 "/rpc.Api/SubmitProvenTransaction" => {
                     #[allow(non_camel_case_types)]
                     struct SubmitProvenTransactionSvc<T: Api>(pub Arc<T>);
diff --git a/crates/proto/src/generated/rpc_store.rs b/crates/proto/src/generated/rpc_store.rs
index dd6679f0a..327cac131 100644
--- a/crates/proto/src/generated/rpc_store.rs
+++ b/crates/proto/src/generated/rpc_store.rs
@@ -353,6 +353,13 @@ pub struct StorageMapUpdate {
     #[prost(message, optional, tag = "4")]
     pub value: ::core::option::Option<super::primitives::Digest>,
 }
+/// Represents a note script or nothing.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct MaybeNoteScript {
+    /// The script for a note by its root.
+    #[prost(message, optional, tag = "1")]
+    pub script: ::core::option::Option<super::note::NoteScript>,
+}
 /// Generated client implementations.
 pub mod rpc_client {
     #![allow(
@@ -641,6 +648,31 @@ pub mod rpc_client {
                 .insert(GrpcMethod::new("rpc_store.Rpc", "GetNotesById"));
             self.inner.unary(req, path, codec).await
         }
+        /// Returns the script for a note by its root.
+        pub async fn get_note_script_by_root(
+            &mut self,
+            request: impl tonic::IntoRequest<super::super::note::NoteRoot>,
+        ) -> std::result::Result<
+            tonic::Response<super::MaybeNoteScript>,
+            tonic::Status,
+        > {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/rpc_store.Rpc/GetNoteScriptByRoot",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("rpc_store.Rpc", "GetNoteScriptByRoot"));
+            self.inner.unary(req, path, codec).await
+        }
         /// Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
         ///
         /// Client specifies the `note_tags` they are interested in, and the block height from which to search for new for
@@ -833,6 +865,11 @@ pub mod rpc_server {
             tonic::Response<super::super::note::CommittedNoteList>,
             tonic::Status,
         >;
+        /// Returns the script for a note by its root.
+        async fn get_note_script_by_root(
+            &self,
+            request: tonic::Request<super::super::note::NoteRoot>,
+        ) -> std::result::Result<tonic::Response<super::MaybeNoteScript>, tonic::Status>;
         /// Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
         ///
         /// Client specifies the `note_tags` they are interested in, and the block height from which to search for new for
@@ -1324,6 +1361,51 @@ pub mod rpc_server {
                     };
                     Box::pin(fut)
                 }
+                "/rpc_store.Rpc/GetNoteScriptByRoot" => {
+                    #[allow(non_camel_case_types)]
+                    struct GetNoteScriptByRootSvc<T: Rpc>(pub Arc<T>);
+                    impl<
+                        T: Rpc,
+                    > tonic::server::UnaryService<super::super::note::NoteRoot>
+                    for GetNoteScriptByRootSvc<T> {
+                        type Response = super::MaybeNoteScript;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<super::super::note::NoteRoot>,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as Rpc>::get_note_script_by_root(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = GetNoteScriptByRootSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
                 "/rpc_store.Rpc/SyncNotes" => {
                     #[allow(non_camel_case_types)]
                     struct SyncNotesSvc<T: Rpc>(pub Arc<T>);
diff --git a/crates/rpc/README.md b/crates/rpc/README.md
index f7dab9b3f..a34d61ad5 100644
--- a/crates/rpc/README.md
+++ b/crates/rpc/README.md
@@ -20,6 +20,7 @@ The full gRPC method definitions can be found in the [proto](../proto/README.md)
 - [GetBlockByNumber](#getblockbynumber)
 - [GetBlockHeaderByNumber](#getblockheaderbynumber)
 - [GetNotesById](#getnotesbyid)
+- [GetNoteScriptByRoot](#getnotescriptbyroot)
 - [SubmitProvenTransaction](#submitproventransaction)
 - [SyncAccountVault](#SyncAccountVault)
 - [SyncNotes](#syncnotes)
@@ -76,6 +77,12 @@ Returns a list of notes matching the provided note IDs.
 
 ---
 
+### GetNoteScriptByRoot
+
+Returns the script for a note by its root.
+
+---
+
 ### SubmitProvenTransaction
 
 Submits proven transaction to the Miden network.
diff --git a/crates/rpc/src/server/api.rs b/crates/rpc/src/server/api.rs
index 44428e75e..95febe0fa 100644
--- a/crates/rpc/src/server/api.rs
+++ b/crates/rpc/src/server/api.rs
@@ -506,6 +506,23 @@ impl api_server::Api for RpcService {
             genesis_commitment: self.genesis_commitment.map(Into::into),
         }))
     }
+
+    #[instrument(
+        parent = None,
+        target = COMPONENT,
+        name = "rpc.server.get_note_script_by_root",
+        skip_all,
+        ret(level = "debug"),
+        err
+    )]
+    async fn get_note_script_by_root(
+        &self,
+        request: Request<proto::note::NoteRoot>,
+    ) -> Result<Response<proto::rpc_store::MaybeNoteScript>, Status> {
+        debug!(target: COMPONENT, request = ?request);
+
+        self.store.clone().get_note_script_by_root(request).await
+    }
 }
 
 // LIMIT HELPERS
diff --git a/crates/store/README.md b/crates/store/README.md
index 515ee62a4..68040a527 100644
--- a/crates/store/README.md
+++ b/crates/store/README.md
@@ -23,6 +23,7 @@ The full gRPC API can be found [here](../../proto/proto/store.proto).
 - [GetNoteAuthenticationInfo](#getnoteauthenticationinfo)
 - [GetNotesById](#getnotesbyid)
 - [GetTransactionInputs](#gettransactioninputs)
+- [GetNoteScriptByRoot](#getnotescriptbyroot)
 - [SyncAccountVault](#syncaccountvault)
 - [SyncNotes](#syncnotes)
 - [SyncState](#syncstate)
@@ -102,6 +103,12 @@ Used by the `block-producer` to query state required to verify a submitted trans
 
 ---
 
+### GetNoteScriptByRoot
+
+Returns the script for a note by its root.
+
+---
+
 ### SyncAccountVault
 
 Returns information that allows clients to sync asset values for specific public accounts within a block range.
diff --git a/crates/store/src/db/mod.rs b/crates/store/src/db/mod.rs
index 7367cd2f4..8ca8b0dae 100644
--- a/crates/store/src/db/mod.rs
+++ b/crates/store/src/db/mod.rs
@@ -11,7 +11,14 @@ use miden_objects::account::AccountId;
 use miden_objects::asset::Asset;
 use miden_objects::block::{BlockHeader, BlockNoteIndex, BlockNumber, ProvenBlock};
 use miden_objects::crypto::merkle::SparseMerklePath;
-use miden_objects::note::{NoteDetails, NoteId, NoteInclusionProof, NoteMetadata, Nullifier};
+use miden_objects::note::{
+    NoteDetails,
+    NoteId,
+    NoteInclusionProof,
+    NoteMetadata,
+    NoteScript,
+    Nullifier,
+};
 use miden_objects::transaction::TransactionId;
 use tokio::sync::oneshot;
 use tracing::{info, info_span, instrument};
@@ -538,4 +545,12 @@ impl Db {
         })
         .await
     }
+
+    /// Returns the script for a note by its root.
+    pub async fn select_note_script_by_root(&self, root: Word) -> Result<Option<NoteScript>> {
+        self.transact("note script by root", move |conn| {
+            queries::select_note_script_by_root(conn, root)
+        })
+        .await
+    }
 }
diff --git a/crates/store/src/db/models/queries/notes.rs b/crates/store/src/db/models/queries/notes.rs
index 9d38d3906..0a63dbdf9 100644
--- a/crates/store/src/db/models/queries/notes.rs
+++ b/crates/store/src/db/models/queries/notes.rs
@@ -17,7 +17,7 @@ use diesel::query_dsl::methods::SelectDsl;
 use diesel::query_dsl::{QueryDsl, RunQueryDsl};
 use diesel::sqlite::Sqlite;
 use diesel::{JoinOnDsl, NullableExpressionMethods, OptionalExtension, SqliteConnection};
-use miden_lib::utils::Deserializable;
+use miden_lib::utils::{Deserializable, Serializable};
 use miden_node_utils::limiter::{
     QueryParamAccountIdLimit,
     QueryParamLimiter,
@@ -250,6 +250,32 @@ pub(crate) fn select_note_inclusion_proofs(
     ))
 }
 
+/// Returns the script for a note by its root.
+///
+/// ```sql
+/// SELECT
+///     root,
+///     script
+/// FROM
+///     note_scripts
+/// WHERE
+///     root = ?1;
+/// ```
+pub(crate) fn select_note_script_by_root(
+    conn: &mut SqliteConnection,
+    root: Word,
+) -> Result<Option<NoteScript>, DatabaseError> {
+    let raw = SelectDsl::select(schema::note_scripts::table, schema::note_scripts::script)
+        .filter(schema::note_scripts::script_root.eq(root.to_bytes()))
+        .get_result::<Vec<u8>>(conn)
+        .optional()?;
+
+    raw.as_ref()
+        .map(|bytes| NoteScript::from_bytes(bytes))
+        .transpose()
+        .map_err(Into::into)
+}
+
 /// Returns a paginated batch of network notes that have not yet been consumed.
 ///
 /// # Returns
diff --git a/crates/store/src/db/tests.rs b/crates/store/src/db/tests.rs
index c5d59b616..bf3f70323 100644
--- a/crates/store/src/db/tests.rs
+++ b/crates/store/src/db/tests.rs
@@ -363,6 +363,44 @@ fn sql_select_notes_different_execution_hints() {
     );
 }
 
+#[test]
+#[miden_node_test_macro::enable_logging]
+fn sql_select_note_script_by_root() {
+    let mut conn = create_db();
+    let conn = &mut conn;
+    let block_num = BlockNumber::from(1);
+    create_block(conn, block_num);
+
+    let account_id = AccountId::try_from(ACCOUNT_ID_PRIVATE_SENDER).unwrap();
+
+    queries::upsert_accounts(conn, &[mock_block_account_update(account_id, 0)], block_num).unwrap();
+
+    let new_note = create_note(account_id);
+
+    // test multiple entries
+    let mut state = vec![];
+    let note = NoteRecord {
+        block_num,
+        note_index: BlockNoteIndex::new(0, 0.try_into().unwrap()).unwrap(),
+        note_id: num_to_word(0),
+        metadata: *new_note.metadata(),
+        details: Some(NoteDetails::from(&new_note)),
+        inclusion_path: SparseMerklePath::default(),
+    };
+    state.push(note.clone());
+
+    let res = queries::insert_scripts(conn, [&note]);
+    assert_eq!(res.unwrap(), 1, "One element must have been inserted");
+
+    // test querying the script by the root
+    let note_script = queries::select_note_script_by_root(conn, new_note.script().root()).unwrap();
+    assert_eq!(note_script, Some(new_note.script().clone()));
+
+    // test querying the script by the root that is not in the database
+    let note_script = queries::select_note_script_by_root(conn, [0_u16; 4].into()).unwrap();
+    assert_eq!(note_script, None);
+}
+
 // Generates an account, inserts into the database, and creates a note for it.
 fn make_account_and_note(
     conn: &mut SqliteConnection,
diff --git a/crates/store/src/server/rpc_api.rs b/crates/store/src/server/rpc_api.rs
index 0184a136a..a12a960f8 100644
--- a/crates/store/src/server/rpc_api.rs
+++ b/crates/store/src/server/rpc_api.rs
@@ -1,9 +1,11 @@
 use std::collections::BTreeSet;
 
 use miden_node_proto::domain::account::{AccountInfo, AccountProofRequest};
+use miden_node_proto::errors::ConversionError;
 use miden_node_proto::generated::rpc_store::rpc_server;
 use miden_node_proto::generated::{self as proto};
 use miden_node_proto::{convert, try_convert};
+use miden_node_utils::ErrorReport as _;
 use miden_objects::Word;
 use miden_objects::account::AccountId;
 use miden_objects::block::BlockNumber;
@@ -15,6 +17,7 @@ use crate::COMPONENT;
 use crate::server::api::{
     StoreApi,
     internal_error,
+    invalid_argument,
     read_account_id,
     read_account_ids,
     validate_nullifiers,
@@ -462,4 +465,34 @@ impl rpc_server::Rpc for StoreApi {
             chain_tip: self.state.latest_block_num().await.as_u32(),
         }))
     }
+
+    #[instrument(
+        parent = None,
+        target = COMPONENT,
+        name = "store.rpc_server.get_note_script_by_root",
+        skip_all,
+        ret(level = "debug"),
+        err
+    )]
+    async fn get_note_script_by_root(
+        &self,
+        request: Request<proto::note::NoteRoot>,
+    ) -> Result<Response<proto::rpc_store::MaybeNoteScript>, Status> {
+        debug!(target: COMPONENT, request = ?request);
+
+        let root = request
+            .into_inner()
+            .root
+            .ok_or(invalid_argument("missing root"))?
+            .try_into()
+            .map_err(|err: ConversionError| {
+                invalid_argument(err.as_report_context("invalid root"))
+            })?;
+
+        let note_script = self.state.get_note_script_by_root(root).await.map_err(internal_error)?;
+
+        Ok(Response::new(proto::rpc_store::MaybeNoteScript {
+            script: note_script.map(Into::into),
+        }))
+    }
 }
diff --git a/crates/store/src/state.rs b/crates/store/src/state.rs
index d9858d33d..d4a1c6d47 100644
--- a/crates/store/src/state.rs
+++ b/crates/store/src/state.rs
@@ -39,7 +39,7 @@ use miden_objects::crypto::merkle::{
     PartialMmr,
     SmtProof,
 };
-use miden_objects::note::{NoteDetails, NoteId, Nullifier};
+use miden_objects::note::{NoteDetails, NoteId, NoteScript, Nullifier};
 use miden_objects::transaction::{OutputNote, PartialBlockchain};
 use miden_objects::utils::Serializable;
 use miden_objects::{AccountError, Word};
@@ -1041,6 +1041,14 @@ impl State {
             .select_unconsumed_network_notes_for_account(network_account_id_prefix, block_num, page)
             .await
     }
+
+    /// Returns the script for a note by its root.
+    pub async fn get_note_script_by_root(
+        &self,
+        root: Word,
+    ) -> Result<Option<NoteScript>, DatabaseError> {
+        self.db.select_note_script_by_root(root).await
+    }
 }
 
 // UTILITIES
diff --git a/crates/utils/src/tracing/grpc.rs b/crates/utils/src/tracing/grpc.rs
index 3cf04a176..2ac017491 100644
--- a/crates/utils/src/tracing/grpc.rs
+++ b/crates/utils/src/tracing/grpc.rs
@@ -55,6 +55,7 @@ fn rpc_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
         Some("GetAccountDetails") => rpc_span!("rpc.rpc", "GetAccountDetails"),
         Some("GetBlockByNumber") => rpc_span!("rpc.rpc", "GetBlockByNumber"),
         Some("GetAccountProofs") => rpc_span!("rpc.rpc", "GetAccountProofs"),
+        Some("GetNoteScriptByRoot") => rpc_span!("rpc.rpc", "GetNoteScriptByRoot"),
         Some("Status") => rpc_span!("rpc.rpc", "Status"),
         _ => rpc_span!("rpc.rpc", "Unknown"),
     };
@@ -88,6 +89,7 @@ fn store_rpc_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
         "GetNotesById" => rpc_span!("store.rpc.rpc", "GetNotesById"),
         "SyncNotes" => rpc_span!("store.rpc.rpc", "SyncNotes"),
         "SyncState" => rpc_span!("store.rpc.rpc", "SyncState"),
+        "GetNoteScriptByRoot" => rpc_span!("store.rpc.rpc", "GetNoteScriptByRoot"),
         "Status" => rpc_span!("store.rpc.rpc", "Status"),
         _ => rpc_span!("store.rpc.rpc", "Unknown"),
     };
diff --git a/docs/src/user/rpc.md b/docs/src/user/rpc.md
index 091cced31..7bc6c3720 100644
--- a/docs/src/user/rpc.md
+++ b/docs/src/user/rpc.md
@@ -15,6 +15,7 @@ The gRPC service definition can be found in the Miden node's `proto`
 - [GetBlockByNumber](#getblockbynumber)
 - [GetBlockHeaderByNumber](#getblockheaderbynumber)
 - [GetNotesById](#getnotesbyid)
+- [GetNoteScriptByRoot](#getnotescriptbyroot)
 - [SubmitProvenTransaction](#submitproventransaction)
 - [SyncAccountVault](#syncaccountvault)
 - [SyncNotes](#syncnotes)
@@ -54,6 +55,10 @@ Request a specific block header and its inclusion proof.
 
 Request a set of notes.
 
+## GetNoteScriptByRoot
+
+Request the script for a note by its root.
+
 ## SubmitProvenTransaction
 
 Submit a transaction to the network.
diff --git a/proto/proto/rpc.proto b/proto/proto/rpc.proto
index 3995a2d52..e8335eead 100644
--- a/proto/proto/rpc.proto
+++ b/proto/proto/rpc.proto
@@ -44,6 +44,9 @@ service Api {
     // Returns a list of notes matching the provided note IDs.
     rpc GetNotesById(note.NoteIdList) returns (note.CommittedNoteList) {}
 
+    // Returns the script for a note by its root.
+    rpc GetNoteScriptByRoot(note.NoteRoot) returns (rpc_store.MaybeNoteScript) {}
+
     // Submits proven transaction to the Miden network.
     rpc SubmitProvenTransaction(transaction.ProvenTransaction) returns (block_producer.SubmitProvenTransactionResponse) {}
 
diff --git a/proto/proto/store/rpc.proto b/proto/proto/store/rpc.proto
index eb7ce863d..edf204d66 100644
--- a/proto/proto/store/rpc.proto
+++ b/proto/proto/store/rpc.proto
@@ -44,6 +44,9 @@ service Rpc {
     // Returns a list of committed notes matching the provided note IDs.
     rpc GetNotesById(note.NoteIdList) returns (note.CommittedNoteList) {}
 
+    // Returns the script for a note by its root.
+    rpc GetNoteScriptByRoot(note.NoteRoot) returns (MaybeNoteScript) {}
+
     // Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
     //
     // Client specifies the `note_tags` they are interested in, and the block height from which to search for new for
@@ -402,3 +405,12 @@ message StorageMapUpdate {
     // The storage map value.
     primitives.Digest value = 4;
 }
+
+// GET NOTE SCRIPT BY ROOT
+// ================================================================================================
+
+// Represents a note script or nothing.
+message MaybeNoteScript {
+    // The script for a note by its root.
+    optional note.NoteScript script = 1;
+}
diff --git a/proto/proto/types/note.proto b/proto/proto/types/note.proto
index 5a75ea4d9..709c521f8 100644
--- a/proto/proto/types/note.proto
+++ b/proto/proto/types/note.proto
@@ -112,3 +112,17 @@ message NoteSyncRecord {
     // The note's inclusion proof in the block.
     primitives.SparseMerklePath inclusion_path = 4;
 }
+
+// Represents a note root.
+message NoteRoot {
+    // The root of the note.
+    primitives.Digest root = 1;
+}
+
+// Represents a note script.
+message NoteScript {
+    // Entrypoint of the script.
+    uint32 entrypoint = 1;
+    // Mast of the script.
+    bytes mast = 2;
+}

From 054fed75f9ad16226e3d508196f7fa9959312a11 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Wed, 3 Sep 2025 16:57:47 -0300
Subject: [PATCH 04/78] feat: add pagination to CheckNullifiersByPrefix (#1191)

* feat: add pagination to CheckNullifiersByPrefix

* review:expand docs on block range inclusion

* review: use if let removing unwrap

* review: reorder paginated responses fields

* review: increase limit to 2.5MB

* review: improve wording in readme

* review: move BlockNumber casting to response creation

* review: rename to MAX_ROWS

* review: rename to MAX_ROWS in pre-existing queries

* review: rename CheckNullifiersByPrefix to SyncNullifiers
---
 .github/workflows/stress-test-check.yml       |   4 +-
 CHANGELOG.md                                  |   2 +
 bin/stress-test/README.md                     |   8 +-
 bin/stress-test/src/main.rs                   |   9 +-
 bin/stress-test/src/store/mod.rs              |  23 +-
 crates/proto/src/generated/rpc.rs             | 174 ++++++------
 crates/proto/src/generated/rpc_store.rs       | 250 +++++++++---------
 crates/rpc/README.md                          |  25 +-
 crates/rpc/src/server/api.rs                  |  10 +-
 crates/store/README.md                        |  23 +-
 crates/store/src/db/mod.rs                    |   8 +-
 .../store/src/db/models/queries/accounts.rs   |  16 +-
 .../store/src/db/models/queries/nullifiers.rs |  72 ++++-
 crates/store/src/db/tests.rs                  |  61 ++++-
 crates/store/src/server/rpc_api.rs            |  35 ++-
 crates/store/src/state.rs                     |   9 +-
 crates/utils/src/limiter.rs                   |   2 +-
 crates/utils/src/tracing/grpc.rs              |   4 +-
 docs/src/user/rpc.md                          |  20 +-
 proto/proto/rpc.proto                         |  10 +-
 proto/proto/store/rpc.proto                   |  86 +++---
 21 files changed, 496 insertions(+), 355 deletions(-)

diff --git a/.github/workflows/stress-test-check.yml b/.github/workflows/stress-test-check.yml
index 2b8afd275..02def7747 100644
--- a/.github/workflows/stress-test-check.yml
+++ b/.github/workflows/stress-test-check.yml
@@ -39,5 +39,5 @@ jobs:
         run: miden-node-stress-test benchmark-store --data-directory stress-test-store --iterations 10 --concurrency 1 sync-state
       - name: Run sync notes benchmark
         run: miden-node-stress-test benchmark-store --data-directory stress-test-store --iterations 10 --concurrency 1 sync-notes
-      - name: Run check nullifiers by prefix benchmark
-        run: miden-node-stress-test benchmark-store --data-directory stress-test-store --iterations 10 --concurrency 1 check-nullifiers-by-prefix --prefixes 10
+      - name: Run sync nullifiers benchmark
+        run: miden-node-stress-test benchmark-store --data-directory stress-test-store --iterations 10 --concurrency 1 sync-nullifiers --prefixes 10
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 624089786..71c0906ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 - [BREAKING] Updated MSRV to 1.89.
 - Added `GetNoteScriptByRoot` gRPC endpoint for retrieving a note script by its root ([#1196](https://github.com/0xMiden/miden-node/pull/1196)).
+- [BREAKING] Refactored `CheckNullifiersByPrefix` endpoint adding pagination ([#1191](https://github.com/0xMiden/miden-node/pull/1191)).
+- [BREAKING] Renamed `CheckNullifiersByPrefix` endpoint to `SyncNullifiers` ([#1191](https://github.com/0xMiden/miden-node/pull/1191)).
 
 ## v0.11.0 (2025-08-28)
 
diff --git a/bin/stress-test/README.md b/bin/stress-test/README.md
index ef04ccd13..dee33fa9d 100644
--- a/bin/stress-test/README.md
+++ b/bin/stress-test/README.md
@@ -22,11 +22,11 @@ The endpoints that you can test are:
 - `load_state`
 - `sync_state`
 - `sync_notes`
-- `check_nullifiers_by_prefix`
+- `sync_nullifiers`
 
 Most benchmarks accept options to control the number of iterations and concurrency level. The `load_state` endpoint is different - it simply measures the one-time startup cost of loading the state from disk.
 
-**Note on Concurrency**: For the endpoints that support it (`sync_state`, `sync_notes`, `check_nullifiers_by_prefix`), the concurrency parameter controls how many requests are sent in parallel to the store. Since these benchmarks run against a local store (no network overhead), higher concurrency values can help identify bottlenecks in the store's internal processing. The latency measurements exclude network time and represent pure store processing time.
+**Note on Concurrency**: For the endpoints that support it (`sync_state`, `sync_notes`, `sync_nullifiers`), the concurrency parameter controls how many requests are sent in parallel to the store. Since these benchmarks run against a local store (no network overhead), higher concurrency values can help identify bottlenecks in the store's internal processing. The latency measurements exclude network time and represent pure store processing time.
 
 Example usage:
 
@@ -141,9 +141,9 @@ P99 request latency: 1.528667ms
 P99.9 request latency: 5.247875ms
 ```
 
-- check-nullifiers-by-prefix
+- sync-nullifiers
 ``` bash
-$ miden-node-stress-test benchmark-store --data-directory ./data --iterations 10000 --concurrency 16 check-nullifiers-by-prefix --prefixes 10
+$ miden-node-stress-test benchmark-store --data-directory ./data --iterations 10000 --concurrency 16 sync-nullifiers --prefixes 10
 
 Average request latency: 519.239µs
 P50 request latency: 503.708µs
diff --git a/bin/stress-test/src/main.rs b/bin/stress-test/src/main.rs
index 48b908b5a..62b5ddc6d 100644
--- a/bin/stress-test/src/main.rs
+++ b/bin/stress-test/src/main.rs
@@ -3,7 +3,7 @@ use std::path::PathBuf;
 use clap::{Parser, Subcommand};
 use miden_node_utils::logging::OpenTelemetry;
 use seeding::seed_store;
-use store::{bench_check_nullifiers_by_prefix, bench_sync_notes, bench_sync_state, load_state};
+use store::{bench_sync_notes, bench_sync_nullifiers, bench_sync_state, load_state};
 
 mod seeding;
 mod store;
@@ -58,7 +58,7 @@ pub enum Command {
 
 #[derive(Subcommand, Clone, Copy)]
 pub enum Endpoint {
-    CheckNullifiersByPrefix {
+    SyncNullifiers {
         /// Number of prefixes to send in each request.
         #[arg(short, long, value_name = "PREFIXES", default_value = "10")]
         prefixes: usize,
@@ -89,9 +89,8 @@ async fn main() {
             iterations,
             concurrency,
         } => match endpoint {
-            Endpoint::CheckNullifiersByPrefix { prefixes } => {
-                bench_check_nullifiers_by_prefix(data_directory, iterations, concurrency, prefixes)
-                    .await;
+            Endpoint::SyncNullifiers { prefixes } => {
+                bench_sync_nullifiers(data_directory, iterations, concurrency, prefixes).await;
             },
             Endpoint::SyncState => {
                 bench_sync_state(data_directory, iterations, concurrency).await;
diff --git a/bin/stress-test/src/store/mod.rs b/bin/stress-test/src/store/mod.rs
index 61c20816c..6c25f2390 100644
--- a/bin/stress-test/src/store/mod.rs
+++ b/bin/stress-test/src/store/mod.rs
@@ -28,7 +28,7 @@ const ACCOUNTS_PER_SYNC_STATE: usize = 5;
 /// Number of accounts used in each `sync_notes` call.
 const ACCOUNTS_PER_SYNC_NOTES: usize = 15;
 
-/// Number of note IDs used in each `check_nullifiers_by_prefix` call.
+/// Number of note IDs used in each `sync_nullifiers` call.
 const NOTE_IDS_PER_NULLIFIERS_CHECK: usize = 20;
 
 /// Number of attempts the benchmark will make to reach the store before proceeding.
@@ -165,10 +165,10 @@ pub async fn sync_notes(
     start.elapsed()
 }
 
-// CHECK NULLIFIERS BY PREFIX
+// SYNC NULLIFIERS
 // ================================================================================================
 
-/// Sends multiple `check_nullifiers_by_prefix` requests to the store and prints the performance.
+/// Sends multiple `sync_nullifiers` requests to the store and prints the performance.
 ///
 /// Arguments:
 /// - `data_directory`: directory that contains the database dump file and the accounts ids dump
@@ -176,7 +176,7 @@ pub async fn sync_notes(
 /// - `iterations`: number of requests to send.
 /// - `concurrency`: number of requests to send in parallel.
 /// - `prefixes_per_request`: number of prefixes to send in each request.
-pub async fn bench_check_nullifiers_by_prefix(
+pub async fn bench_sync_nullifiers(
     data_directory: PathBuf,
     iterations: usize,
     concurrency: usize,
@@ -252,7 +252,7 @@ pub async fn bench_check_nullifiers_by_prefix(
 
         let nullifiers_batch: Vec<u32> = nullifiers.by_ref().take(prefixes_per_request).collect();
 
-        tokio::spawn(async move { check_nullifiers_by_prefix(&mut client, nullifiers_batch).await })
+        tokio::spawn(async move { sync_nullifiers(&mut client, nullifiers_batch).await })
     };
 
     // create a stream of tasks to send the requests
@@ -271,21 +271,22 @@ pub async fn bench_check_nullifiers_by_prefix(
     println!("Average nullifiers per response: {average_nullifiers_per_response}");
 }
 
-/// Sends a single `check_nullifiers_by_prefix` request to the store and returns:
+/// Sends a single `sync_nullifiers` request to the store and returns:
 /// - the elapsed time.
 /// - the response.
-async fn check_nullifiers_by_prefix(
+async fn sync_nullifiers(
     api_client: &mut RpcClient<InterceptedService<Channel, OtelInterceptor>>,
     nullifiers_prefixes: Vec<u32>,
-) -> (Duration, proto::rpc_store::CheckNullifiersByPrefixResponse) {
-    let sync_request = proto::rpc_store::CheckNullifiersByPrefixRequest {
+) -> (Duration, proto::rpc_store::SyncNullifiersResponse) {
+    let sync_request = proto::rpc_store::SyncNullifiersRequest {
         nullifiers: nullifiers_prefixes,
         prefix_len: 16,
-        block_num: 0,
+        block_from: 0,
+        block_to: None,
     };
 
     let start = Instant::now();
-    let response = api_client.check_nullifiers_by_prefix(sync_request).await.unwrap();
+    let response = api_client.sync_nullifiers(sync_request).await.unwrap();
     (start.elapsed(), response.into_inner())
 }
 
diff --git a/crates/proto/src/generated/rpc.rs b/crates/proto/src/generated/rpc.rs
index 55e247754..1276e50cc 100644
--- a/crates/proto/src/generated/rpc.rs
+++ b/crates/proto/src/generated/rpc.rs
@@ -150,35 +150,6 @@ pub mod api_client {
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "CheckNullifiers"));
             self.inner.unary(req, path, codec).await
         }
-        /// Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
-        ///
-        /// Note that only 16-bit prefixes are supported at this time.
-        pub async fn check_nullifiers_by_prefix(
-            &mut self,
-            request: impl tonic::IntoRequest<
-                super::super::rpc_store::CheckNullifiersByPrefixRequest,
-            >,
-        ) -> std::result::Result<
-            tonic::Response<super::super::rpc_store::CheckNullifiersByPrefixResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::unknown(
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/rpc.Api/CheckNullifiersByPrefix",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("rpc.Api", "CheckNullifiersByPrefix"));
-            self.inner.unary(req, path, codec).await
-        }
         /// Returns the latest state of an account with the specified ID.
         pub async fn get_account_details(
             &mut self,
@@ -388,6 +359,32 @@ pub mod api_client {
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "SubmitProvenBatch"));
             self.inner.unary(req, path, codec).await
         }
+        /// Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
+        ///
+        /// Note that only 16-bit prefixes are supported at this time.
+        pub async fn sync_nullifiers(
+            &mut self,
+            request: impl tonic::IntoRequest<
+                super::super::rpc_store::SyncNullifiersRequest,
+            >,
+        ) -> std::result::Result<
+            tonic::Response<super::super::rpc_store::SyncNullifiersResponse>,
+            tonic::Status,
+        > {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static("/rpc.Api/SyncNullifiers");
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "SyncNullifiers"));
+            self.inner.unary(req, path, codec).await
+        }
         /// Returns account vault updates for specified account within a block range.
         pub async fn sync_account_vault(
             &mut self,
@@ -530,18 +527,6 @@ pub mod api_server {
             tonic::Response<super::super::rpc_store::CheckNullifiersResponse>,
             tonic::Status,
         >;
-        /// Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
-        ///
-        /// Note that only 16-bit prefixes are supported at this time.
-        async fn check_nullifiers_by_prefix(
-            &self,
-            request: tonic::Request<
-                super::super::rpc_store::CheckNullifiersByPrefixRequest,
-            >,
-        ) -> std::result::Result<
-            tonic::Response<super::super::rpc_store::CheckNullifiersByPrefixResponse>,
-            tonic::Status,
-        >;
         /// Returns the latest state of an account with the specified ID.
         async fn get_account_details(
             &self,
@@ -618,6 +603,16 @@ pub mod api_server {
             tonic::Response<super::super::block_producer::SubmitProvenBatchResponse>,
             tonic::Status,
         >;
+        /// Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
+        ///
+        /// Note that only 16-bit prefixes are supported at this time.
+        async fn sync_nullifiers(
+            &self,
+            request: tonic::Request<super::super::rpc_store::SyncNullifiersRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::super::rpc_store::SyncNullifiersResponse>,
+            tonic::Status,
+        >;
         /// Returns account vault updates for specified account within a block range.
         async fn sync_account_vault(
             &self,
@@ -836,55 +831,6 @@ pub mod api_server {
                     };
                     Box::pin(fut)
                 }
-                "/rpc.Api/CheckNullifiersByPrefix" => {
-                    #[allow(non_camel_case_types)]
-                    struct CheckNullifiersByPrefixSvc<T: Api>(pub Arc<T>);
-                    impl<
-                        T: Api,
-                    > tonic::server::UnaryService<
-                        super::super::rpc_store::CheckNullifiersByPrefixRequest,
-                    > for CheckNullifiersByPrefixSvc<T> {
-                        type Response = super::super::rpc_store::CheckNullifiersByPrefixResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<
-                                super::super::rpc_store::CheckNullifiersByPrefixRequest,
-                            >,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                <T as Api>::check_nullifiers_by_prefix(&inner, request)
-                                    .await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let method = CheckNullifiersByPrefixSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
                 "/rpc.Api/GetAccountDetails" => {
                     #[allow(non_camel_case_types)]
                     struct GetAccountDetailsSvc<T: Api>(pub Arc<T>);
@@ -1260,6 +1206,54 @@ pub mod api_server {
                     };
                     Box::pin(fut)
                 }
+                "/rpc.Api/SyncNullifiers" => {
+                    #[allow(non_camel_case_types)]
+                    struct SyncNullifiersSvc<T: Api>(pub Arc<T>);
+                    impl<
+                        T: Api,
+                    > tonic::server::UnaryService<
+                        super::super::rpc_store::SyncNullifiersRequest,
+                    > for SyncNullifiersSvc<T> {
+                        type Response = super::super::rpc_store::SyncNullifiersResponse;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<
+                                super::super::rpc_store::SyncNullifiersRequest,
+                            >,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as Api>::sync_nullifiers(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = SyncNullifiersSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
                 "/rpc.Api/SyncAccountVault" => {
                     #[allow(non_camel_case_types)]
                     struct SyncAccountVaultSvc<T: Api>(pub Arc<T>);
diff --git a/crates/proto/src/generated/rpc_store.rs b/crates/proto/src/generated/rpc_store.rs
index 327cac131..faddfcca7 100644
--- a/crates/proto/src/generated/rpc_store.rs
+++ b/crates/proto/src/generated/rpc_store.rs
@@ -120,31 +120,56 @@ pub mod account_proofs {
         }
     }
 }
+/// List of nullifiers to return proofs for.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct NullifierList {
+    /// List of nullifiers to return proofs for.
+    #[prost(message, repeated, tag = "1")]
+    pub nullifiers: ::prost::alloc::vec::Vec<super::primitives::Digest>,
+}
+/// Represents the result of checking nullifiers.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct CheckNullifiersResponse {
+    /// Each requested nullifier has its corresponding nullifier proof at the same position.
+    #[prost(message, repeated, tag = "1")]
+    pub proofs: ::prost::alloc::vec::Vec<super::primitives::SmtOpening>,
+}
 /// Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CheckNullifiersByPrefixRequest {
+pub struct SyncNullifiersRequest {
+    /// Block number from which the nullifiers are requested (inclusive).
+    #[prost(fixed32, tag = "1")]
+    pub block_from: u32,
+    /// Block number up to which to check. If not specified, checks up to the latest block.
+    #[prost(fixed32, optional, tag = "2")]
+    pub block_to: ::core::option::Option<u32>,
     /// Number of bits used for nullifier prefix. Currently the only supported value is 16.
-    #[prost(uint32, tag = "1")]
+    #[prost(uint32, tag = "3")]
     pub prefix_len: u32,
     /// List of nullifiers to check. Each nullifier is specified by its prefix with length equal
     /// to `prefix_len`.
-    #[prost(uint32, repeated, tag = "2")]
+    #[prost(uint32, repeated, tag = "4")]
     pub nullifiers: ::prost::alloc::vec::Vec<u32>,
-    /// Block number from which the nullifiers are requested (inclusive).
-    #[prost(fixed32, tag = "3")]
-    pub block_num: u32,
 }
-/// Represents the result of checking nullifiers by prefix.
+/// Represents the result of syncing nullifiers.
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CheckNullifiersByPrefixResponse {
+pub struct SyncNullifiersResponse {
+    /// Current chain tip
+    #[prost(fixed32, tag = "1")]
+    pub chain_tip: u32,
+    /// The block number of the last check included in this response.
+    ///
+    /// For chunked responses, this may be less than request.block_to.
+    /// If it is less than request.block_to, the user is expected to make a subsequent request
+    /// starting from the next block to this one (ie, request.block_from = block_num + 1).
+    #[prost(fixed32, tag = "2")]
+    pub block_num: u32,
     /// List of nullifiers matching the prefixes specified in the request.
-    #[prost(message, repeated, tag = "1")]
-    pub nullifiers: ::prost::alloc::vec::Vec<
-        check_nullifiers_by_prefix_response::NullifierUpdate,
-    >,
+    #[prost(message, repeated, tag = "3")]
+    pub nullifiers: ::prost::alloc::vec::Vec<sync_nullifiers_response::NullifierUpdate>,
 }
-/// Nested message and enum types in `CheckNullifiersByPrefixResponse`.
-pub mod check_nullifiers_by_prefix_response {
+/// Nested message and enum types in `SyncNullifiersResponse`.
+pub mod sync_nullifiers_response {
     /// Represents a single nullifier update.
     #[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct NullifierUpdate {
@@ -156,20 +181,6 @@ pub mod check_nullifiers_by_prefix_response {
         pub block_num: u32,
     }
 }
-/// List of nullifiers to return proofs for.
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct NullifierList {
-    /// List of nullifiers to return proofs for.
-    #[prost(message, repeated, tag = "1")]
-    pub nullifiers: ::prost::alloc::vec::Vec<super::primitives::Digest>,
-}
-/// Represents the result of checking nullifiers.
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct CheckNullifiersResponse {
-    /// Each requested nullifier has its corresponding nullifier proof at the same position.
-    #[prost(message, repeated, tag = "1")]
-    pub proofs: ::prost::alloc::vec::Vec<super::primitives::SmtOpening>,
-}
 /// State synchronization request.
 ///
 /// Specifies state updates the client is interested in. The server will return the first block which
@@ -236,16 +247,16 @@ pub struct SyncAccountVaultRequest {
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncAccountVaultResponse {
+    /// Chain tip at the moment of the request.
+    #[prost(fixed32, tag = "1")]
+    pub chain_tip: u32,
     /// The block number of the last update included in this response.
     ///
     /// For chunked responses, this may be less than request.block_to.
     /// If it is less than request.block_to, the user is expected to make a subsequent request
     /// starting from the next block to this one (ie, request.block_from = block_num + 1).
-    #[prost(fixed32, tag = "1")]
-    pub block_num: u32,
-    /// Chain tip at the moment of the request.
     #[prost(fixed32, tag = "2")]
-    pub chain_tip: u32,
+    pub block_num: u32,
     /// List of asset updates for the account.
     ///
     /// Multiple updates can be returned for a single asset, and the one with a higher `block_num`
@@ -320,16 +331,16 @@ pub struct SyncStorageMapsRequest {
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncStorageMapsResponse {
+    /// Current chain tip
+    #[prost(fixed32, tag = "1")]
+    pub chain_tip: u32,
     /// The block number of the last update included in this response.
     ///
     /// For chunked responses, this may be less than request.block_to.
     /// If it is less than request.block_to, the user is expected to make a subsequent request
     /// starting from the next block to this one (ie, request.block_from = block_num + 1).
-    #[prost(fixed32, tag = "1")]
-    pub block_num: u32,
-    /// Current chain tip
     #[prost(fixed32, tag = "2")]
-    pub chain_tip: u32,
+    pub block_num: u32,
     /// The list of storage map updates.
     ///
     /// Multiple updates can be returned for a single slot index and key combination, and the one
@@ -496,33 +507,6 @@ pub mod rpc_client {
                 .insert(GrpcMethod::new("rpc_store.Rpc", "CheckNullifiers"));
             self.inner.unary(req, path, codec).await
         }
-        /// Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
-        ///
-        /// Note that only 16-bit prefixes are supported at this time.
-        pub async fn check_nullifiers_by_prefix(
-            &mut self,
-            request: impl tonic::IntoRequest<super::CheckNullifiersByPrefixRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::CheckNullifiersByPrefixResponse>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::unknown(
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/rpc_store.Rpc/CheckNullifiersByPrefix",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("rpc_store.Rpc", "CheckNullifiersByPrefix"));
-            self.inner.unary(req, path, codec).await
-        }
         /// Returns the latest state of an account with the specified ID.
         pub async fn get_account_details(
             &mut self,
@@ -673,6 +657,33 @@ pub mod rpc_client {
                 .insert(GrpcMethod::new("rpc_store.Rpc", "GetNoteScriptByRoot"));
             self.inner.unary(req, path, codec).await
         }
+        /// Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
+        ///
+        /// Note that only 16-bit prefixes are supported at this time.
+        pub async fn sync_nullifiers(
+            &mut self,
+            request: impl tonic::IntoRequest<super::SyncNullifiersRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::SyncNullifiersResponse>,
+            tonic::Status,
+        > {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/rpc_store.Rpc/SyncNullifiers",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("rpc_store.Rpc", "SyncNullifiers"));
+            self.inner.unary(req, path, codec).await
+        }
         /// Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
         ///
         /// Client specifies the `note_tags` they are interested in, and the block height from which to search for new for
@@ -817,16 +828,6 @@ pub mod rpc_server {
             tonic::Response<super::CheckNullifiersResponse>,
             tonic::Status,
         >;
-        /// Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
-        ///
-        /// Note that only 16-bit prefixes are supported at this time.
-        async fn check_nullifiers_by_prefix(
-            &self,
-            request: tonic::Request<super::CheckNullifiersByPrefixRequest>,
-        ) -> std::result::Result<
-            tonic::Response<super::CheckNullifiersByPrefixResponse>,
-            tonic::Status,
-        >;
         /// Returns the latest state of an account with the specified ID.
         async fn get_account_details(
             &self,
@@ -870,6 +871,16 @@ pub mod rpc_server {
             &self,
             request: tonic::Request<super::super::note::NoteRoot>,
         ) -> std::result::Result<tonic::Response<super::MaybeNoteScript>, tonic::Status>;
+        /// Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
+        ///
+        /// Note that only 16-bit prefixes are supported at this time.
+        async fn sync_nullifiers(
+            &self,
+            request: tonic::Request<super::SyncNullifiersRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::SyncNullifiersResponse>,
+            tonic::Status,
+        >;
         /// Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
         ///
         /// Client specifies the `note_tags` they are interested in, and the block height from which to search for new for
@@ -1084,54 +1095,6 @@ pub mod rpc_server {
                     };
                     Box::pin(fut)
                 }
-                "/rpc_store.Rpc/CheckNullifiersByPrefix" => {
-                    #[allow(non_camel_case_types)]
-                    struct CheckNullifiersByPrefixSvc<T: Rpc>(pub Arc<T>);
-                    impl<
-                        T: Rpc,
-                    > tonic::server::UnaryService<super::CheckNullifiersByPrefixRequest>
-                    for CheckNullifiersByPrefixSvc<T> {
-                        type Response = super::CheckNullifiersByPrefixResponse;
-                        type Future = BoxFuture<
-                            tonic::Response<Self::Response>,
-                            tonic::Status,
-                        >;
-                        fn call(
-                            &mut self,
-                            request: tonic::Request<
-                                super::CheckNullifiersByPrefixRequest,
-                            >,
-                        ) -> Self::Future {
-                            let inner = Arc::clone(&self.0);
-                            let fut = async move {
-                                <T as Rpc>::check_nullifiers_by_prefix(&inner, request)
-                                    .await
-                            };
-                            Box::pin(fut)
-                        }
-                    }
-                    let accept_compression_encodings = self.accept_compression_encodings;
-                    let send_compression_encodings = self.send_compression_encodings;
-                    let max_decoding_message_size = self.max_decoding_message_size;
-                    let max_encoding_message_size = self.max_encoding_message_size;
-                    let inner = self.inner.clone();
-                    let fut = async move {
-                        let method = CheckNullifiersByPrefixSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
-                        let mut grpc = tonic::server::Grpc::new(codec)
-                            .apply_compression_config(
-                                accept_compression_encodings,
-                                send_compression_encodings,
-                            )
-                            .apply_max_message_size_config(
-                                max_decoding_message_size,
-                                max_encoding_message_size,
-                            );
-                        let res = grpc.unary(method, req).await;
-                        Ok(res)
-                    };
-                    Box::pin(fut)
-                }
                 "/rpc_store.Rpc/GetAccountDetails" => {
                     #[allow(non_camel_case_types)]
                     struct GetAccountDetailsSvc<T: Rpc>(pub Arc<T>);
@@ -1406,6 +1369,51 @@ pub mod rpc_server {
                     };
                     Box::pin(fut)
                 }
+                "/rpc_store.Rpc/SyncNullifiers" => {
+                    #[allow(non_camel_case_types)]
+                    struct SyncNullifiersSvc<T: Rpc>(pub Arc<T>);
+                    impl<
+                        T: Rpc,
+                    > tonic::server::UnaryService<super::SyncNullifiersRequest>
+                    for SyncNullifiersSvc<T> {
+                        type Response = super::SyncNullifiersResponse;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<super::SyncNullifiersRequest>,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as Rpc>::sync_nullifiers(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = SyncNullifiersSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
                 "/rpc_store.Rpc/SyncNotes" => {
                     #[allow(non_camel_case_types)]
                     struct SyncNotesSvc<T: Rpc>(pub Arc<T>);
diff --git a/crates/rpc/README.md b/crates/rpc/README.md
index a34d61ad5..324df012d 100644
--- a/crates/rpc/README.md
+++ b/crates/rpc/README.md
@@ -14,7 +14,7 @@ The full gRPC method definitions can be found in the [proto](../proto/README.md)
 <!--toc:start-->
 
 - [CheckNullifiers](#checknullifiers)
-- [CheckNullifiersByPrefix](#checknullifiersbyprefix)
+- [SyncNullifiers](#syncnullifiers)
 - [GetAccountDetails](#getaccountdetails)
 - [GetAccountProofs](#getaccountproofs)
 - [GetBlockByNumber](#getblockbynumber)
@@ -37,15 +37,6 @@ Returns a nullifier proof for each of the requested nullifiers.
 
 ---
 
-### CheckNullifiersByPrefix
-
-Returns a list of nullifiers recorded in the node that match the specified prefixes and were created at or after
-the given block height.
-
-Only 16-bit prefixes are supported at this time.
-
----
-
 ### GetAccountDetails
 
 Returns the latest state of an account with the specified ID.
@@ -89,6 +80,20 @@ Submits proven transaction to the Miden network.
 
 ---
 
+### SyncNullifiers
+
+Returns nullifier synchronization data for a set of prefixes within a given block range. This method allows
+clients to efficiently track nullifier creation by retrieving only the nullifiers produced between two blocks.
+
+Caller specifies the `prefix_len` (currently only 16), the list of prefix values (`nullifiers`), and the block
+range (`block_from`, optional `block_to`). The response includes all matching nullifiers created within that
+range, the last block included in the response (`block_num`), and the current chain tip (`chain_tip`).
+
+If the response is chunked (i.e., `block_num < block_to`), continue by issuing another request with
+`block_from = block_num + 1` to retrieve subsequent updates.
+
+---
+
 ### SyncAccountVault
 
 Returns information that allows clients to sync asset values for specific public accounts within a block range.
diff --git a/crates/rpc/src/server/api.rs b/crates/rpc/src/server/api.rs
index 95febe0fa..8869326e1 100644
--- a/crates/rpc/src/server/api.rs
+++ b/crates/rpc/src/server/api.rs
@@ -168,20 +168,20 @@ impl api_server::Api for RpcService {
     #[instrument(
         parent = None,
         target = COMPONENT,
-        name = "rpc.server.check_nullifiers_by_prefix",
+        name = "rpc.server.sync_nullifiers",
         skip_all,
         ret(level = "debug"),
         err
     )]
-    async fn check_nullifiers_by_prefix(
+    async fn sync_nullifiers(
         &self,
-        request: Request<proto::rpc_store::CheckNullifiersByPrefixRequest>,
-    ) -> Result<Response<proto::rpc_store::CheckNullifiersByPrefixResponse>, Status> {
+        request: Request<proto::rpc_store::SyncNullifiersRequest>,
+    ) -> Result<Response<proto::rpc_store::SyncNullifiersResponse>, Status> {
         debug!(target: COMPONENT, request = ?request.get_ref());
 
         check::<QueryParamNullifierLimit>(request.get_ref().nullifiers.len())?;
 
-        self.store.clone().check_nullifiers_by_prefix(request).await
+        self.store.clone().sync_nullifiers(request).await
     }
 
     #[instrument(
diff --git a/crates/store/README.md b/crates/store/README.md
index 68040a527..2c0193746 100644
--- a/crates/store/README.md
+++ b/crates/store/README.md
@@ -14,7 +14,6 @@ The full gRPC API can be found [here](../../proto/proto/store.proto).
 <!--toc:start-->
 - [ApplyBlock](#applyblock)
 - [CheckNullifiers](#checknullifiers)
-- [CheckNullifiersByPrefix](#checknullifiersbyprefix)
 - [GetAccountDetails](#getaccountdetails)
 - [GetAccountProofs](#getaccountproofs)
 - [GetBlockByNumber](#getblockbynumber)
@@ -24,6 +23,7 @@ The full gRPC API can be found [here](../../proto/proto/store.proto).
 - [GetNotesById](#getnotesbyid)
 - [GetTransactionInputs](#gettransactioninputs)
 - [GetNoteScriptByRoot](#getnotescriptbyroot)
+- [SyncNullifiers](#syncnullifiers)
 - [SyncAccountVault](#syncaccountvault)
 - [SyncNotes](#syncnotes)
 - [SyncState](#syncstate)
@@ -44,14 +44,6 @@ Returns a nullifier proof for each of the requested nullifiers.
 
 ---
 
-### CheckNullifiersByPrefix
-
-Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
-
-Only 16-bit prefixes are supported at this time.
-
----
-
 ### GetAccountDetails
 
 Returns the latest state of an account with the specified ID.
@@ -109,6 +101,19 @@ Returns the script for a note by its root.
 
 ---
 
+### SyncNullifiers
+
+Returns nullifier synchronization data for a set of prefixes within a given block range. This method allows clients to efficiently track nullifier creation by retrieving only the nullifiers produced within a specific range of blocks.
+
+Caller specifies the `prefix_len` (currently only 16), the list of prefix values (`nullifiers`), and the block
+range (`block_from`, optional `block_to`). The response includes all matching nullifiers created within that
+range, the last block included in the response (`block_num`), and the current chain tip (`chain_tip`).
+
+If the response is chunked (i.e., `block_num < block_to`), continue by issuing another request with
+`block_from = block_num + 1` to retrieve subsequent updates.
+
+---
+
 ### SyncAccountVault
 
 Returns information that allows clients to sync asset values for specific public accounts within a block range.
diff --git a/crates/store/src/db/mod.rs b/crates/store/src/db/mod.rs
index 8ca8b0dae..fb94526fc 100644
--- a/crates/store/src/db/mod.rs
+++ b/crates/store/src/db/mod.rs
@@ -283,8 +283,9 @@ impl Db {
         &self,
         prefix_len: u32,
         nullifier_prefixes: Vec<u32>,
-        block_num: BlockNumber,
-    ) -> Result<Vec<NullifierInfo>> {
+        block_from: BlockNumber,
+        block_to: BlockNumber,
+    ) -> Result<(Vec<NullifierInfo>, BlockNumber)> {
         assert_eq!(prefix_len, 16, "Only 16-bit prefixes are supported");
 
         self.transact("nullifieres by prefix", move |conn| {
@@ -294,7 +295,8 @@ impl Db {
                 conn,
                 prefix_len as u8,
                 &nullifier_prefixes[..],
-                block_num,
+                block_from,
+                block_to,
             )
         })
         .await
diff --git a/crates/store/src/db/models/queries/accounts.rs b/crates/store/src/db/models/queries/accounts.rs
index c312d57ba..b766e0f1c 100644
--- a/crates/store/src/db/models/queries/accounts.rs
+++ b/crates/store/src/db/models/queries/accounts.rs
@@ -170,13 +170,13 @@ pub(crate) fn select_account_vault_assets(
     // ORDER BY
     //     block_num ASC
     // LIMIT
-    //     ROW_LIMIT;
+    //     MAX_ROWS + 1;
 
     // TODO: These limits should be given by the protocol.
     // See miden-base/issues/1770 for more details
     const MAX_PAYLOAD_BYTES: usize = 2 * 1024 * 1024; // 2 MB
     const ROW_OVERHEAD_BYTES: usize = 2 * size_of::<Word>() + size_of::<u32>(); // key + asset + block_num
-    const ROW_LIMIT: usize = (MAX_PAYLOAD_BYTES / ROW_OVERHEAD_BYTES) + 1;
+    const MAX_ROWS: usize = MAX_PAYLOAD_BYTES / ROW_OVERHEAD_BYTES;
 
     if !account_id.is_public() {
         return Err(DatabaseError::AccountNotPublic(account_id));
@@ -195,11 +195,11 @@ pub(crate) fn select_account_vault_assets(
                     .and(t::block_num.le(block_to.to_raw_sql())),
             )
             .order(t::block_num.asc())
-            .limit(i64::try_from(ROW_LIMIT).expect("should fit within i64"))
+            .limit(i64::try_from(MAX_ROWS + 1).expect("should fit within i64"))
             .load::<(i64, Vec<u8>, Option<Vec<u8>>)>(conn)?;
 
     // Discard the last block in the response (assumes more than one block may be present)
-    let (last_block_included, values) = if raw.len() >= ROW_LIMIT {
+    let (last_block_included, values) = if raw.len() > MAX_ROWS {
         // NOTE: If the query contains at least one more row than the amount of storage map updates
         // allowed in a single block for an account, then the response is guaranteed to have at
         // least two blocks
@@ -356,14 +356,14 @@ pub(crate) fn select_account_storage_map_values(
     // ORDER BY
     //     block_num ASC
     // LIMIT
-    //     :row_limit;
+    //     MAX_ROWS + 1;
 
     // TODO: These limits should be given by the protocol.
     // See miden-base/issues/1770 for more details
     pub const MAX_PAYLOAD_BYTES: usize = 2 * 1024 * 1024; // 2 MB
     pub const ROW_OVERHEAD_BYTES: usize =
         2 * size_of::<Word>() + size_of::<u32>() + size_of::<u8>(); // key + value + block_num + slot_idx
-    pub const ROW_LIMIT: usize = (MAX_PAYLOAD_BYTES / ROW_OVERHEAD_BYTES) + 1;
+    pub const MAX_ROWS: usize = MAX_PAYLOAD_BYTES / ROW_OVERHEAD_BYTES;
 
     if !account_id.is_public() {
         return Err(DatabaseError::AccountNotPublic(account_id));
@@ -382,12 +382,12 @@ pub(crate) fn select_account_storage_map_values(
                     .and(t::block_num.le(block_to.to_raw_sql())),
             )
             .order(t::block_num.asc())
-            .limit(i64::try_from(ROW_LIMIT).expect("limit fits within i64"))
+            .limit(i64::try_from(MAX_ROWS + 1).expect("limit fits within i64"))
             .load(conn)?;
 
     // Discard the last block in the response (assumes more than one block may be present)
 
-    let (last_block_included, values) = if raw.len() >= ROW_LIMIT {
+    let (last_block_included, values) = if raw.len() > MAX_ROWS {
         // NOTE: If the query contains at least one more row than the amount of storage map updates
         // allowed in a single block for an account, then the response is guaranteed to have at
         // least two blocks
diff --git a/crates/store/src/db/models/queries/nullifiers.rs b/crates/store/src/db/models/queries/nullifiers.rs
index d5bb54abd..725ba9184 100644
--- a/crates/store/src/db/models/queries/nullifiers.rs
+++ b/crates/store/src/db/models/queries/nullifiers.rs
@@ -23,23 +23,52 @@ use crate::db::models::conv::{SqlTypeConvert, nullifier_prefix_to_raw_sql};
 use crate::db::models::utils::{get_nullifier_prefix, vec_raw_try_into};
 use crate::db::{NullifierInfo, schema};
 
-/// Returns nullifiers filtered by prefix and block creation height.
+/// Returns nullifiers filtered by prefix within a block number range.
 ///
-/// Each value of the `nullifier_prefixes` is only the `prefix_len` most significant bits
-/// of the nullifier of interest to the client. This hides the details of the specific
-/// nullifier being requested. Currently the only supported prefix length is 16 bits.
+/// Each value of the `nullifier_prefixes` is only the `prefix_len` most significant bits of the
+/// nullifier of interest to the client. This hides the details of the specific nullifier being
+/// requested. Currently the only supported prefix length is 16 bits.
 ///
 /// # Returns
 ///
-/// A vector of [`NullifierInfo`] with the nullifiers and the block height at which they were
+/// Range and pagination semantics:
+/// - Both `block_from` and `block_to` are inclusive bounds.
+/// - To keep responses ≤ ~2.5MB, an internal row limit is enforced. When the limit is hit and the
+///   result spans multiple blocks, the last block in the page is dropped entirely, and
+///   `last_block_included` is set to the block number immediately before that dropped block.
+///   Clients should resume with `block_from = last_block_included + 1`.
+/// - If all rows belong to a single block and hit the limit, this function returns an empty
+///   `nullifiers` page with `last_block_included = that_block - 1`. Intra-block pagination is not
+///   supported; callers may need to narrow the range.
+///
+/// A tuple `(nullifiers, last_block_included)` where:
+/// - `nullifiers` is a vector of [`NullifierInfo`] (each contains the nullifier and the block
+///   number at which it was created), ordered by block number ascending.
+/// - `last_block_included` is the last block number fully included in this response. If the
+///   internal row limit is reached (to cap response size), this may be less than `block_to`. In
+///   that case, the caller should re-issue the query with `block_from = last_block_included + 1` to
+///   continue.
 pub(crate) fn select_nullifiers_by_prefix(
     conn: &mut SqliteConnection,
     prefix_len: u8,
     nullifier_prefixes: &[u16],
-    block_num: BlockNumber,
-) -> Result<Vec<NullifierInfo>, DatabaseError> {
+    block_from: BlockNumber,
+    block_to: BlockNumber,
+) -> Result<(Vec<NullifierInfo>, BlockNumber), DatabaseError> {
+    // Size calculation: max 2^16 nullifiers per block × 36 bytes per nullifier = ~2.25MB
+    // We use 2.5MB to provide a safety margin for the unlikely case of hitting the maximum
+    pub const MAX_PAYLOAD_BYTES: usize = 2_500_000; // 2.5 MB - allows for max block size of ~2.25MB
+    pub const NULLIFIER_BYTES: usize = 32; // digest size (nullifier)
+    pub const BLOCK_NUM_BYTES: usize = 4; // 32 bits per block number
+    pub const ROW_OVERHEAD_BYTES: usize = NULLIFIER_BYTES + BLOCK_NUM_BYTES; // 36 bytes
+    pub const MAX_ROWS: usize = MAX_PAYLOAD_BYTES / ROW_OVERHEAD_BYTES;
+
     assert_eq!(prefix_len, 16, "Only 16-bit prefixes are supported");
 
+    if block_from > block_to {
+        return Err(DatabaseError::InvalidBlockRange { from: block_from, to: block_to });
+    }
+
     QueryParamNullifierPrefixLimit::check(nullifier_prefixes.len())?;
 
     // SELECT
@@ -50,17 +79,38 @@ pub(crate) fn select_nullifiers_by_prefix(
     // WHERE
     //     nullifier_prefix IN rarray(?1) AND
     //     block_num >= ?2
+    //     AND block_num <= ?3
     // ORDER BY
     //     block_num ASC
+    // LIMIT
+    //     MAX_ROWS + 1;
 
     let prefixes = nullifier_prefixes.iter().map(|prefix| nullifier_prefix_to_raw_sql(*prefix));
-    let nullifiers_raw =
-        SelectDsl::select(schema::nullifiers::table, NullifierWithoutPrefixRawRow::as_select())
+    let raw = SelectDsl::select(schema::nullifiers::table, NullifierWithoutPrefixRawRow::as_select())
             .filter(schema::nullifiers::nullifier_prefix.eq_any(prefixes))
-            .filter(schema::nullifiers::block_num.ge(block_num.to_raw_sql()))
+            .filter(schema::nullifiers::block_num.ge(block_from.to_raw_sql()))
+            .filter(schema::nullifiers::block_num.le(block_to.to_raw_sql()))
             .order(schema::nullifiers::block_num.asc())
+            // Request an additional row so we can determine whether this is the last page.
+            .limit(i64::try_from(MAX_ROWS + 1).expect("limit fits within i64"))
             .load::<NullifierWithoutPrefixRawRow>(conn)?;
-    vec_raw_try_into(nullifiers_raw)
+
+    // Discard the last block in the response (assumes more than one block may be present)
+    if let Some(last) = raw.last()
+        && raw.len() > MAX_ROWS
+    {
+        let last_block_num_i64 = last.block_num;
+
+        let nullifiers = vec_raw_try_into(
+            raw.into_iter().take_while(|row| row.block_num != last_block_num_i64),
+        )?;
+
+        let last_block_included = BlockNumber::from_raw_sql(last_block_num_i64.saturating_sub(1))?;
+
+        Ok((nullifiers, last_block_included))
+    } else {
+        Ok((vec_raw_try_into(raw)?, block_to))
+    }
 }
 
 /// Select all nullifiers from the DB
diff --git a/crates/store/src/db/tests.rs b/crates/store/src/db/tests.rs
index bf3f70323..b1f394421 100644
--- a/crates/store/src/db/tests.rs
+++ b/crates/store/src/db/tests.rs
@@ -784,9 +784,12 @@ fn select_nullifiers_by_prefix_works() {
     let mut conn = create_db();
     let conn = &mut conn; // test empty table
     let block_number0 = 0.into();
-    let nullifiers =
-        queries::select_nullifiers_by_prefix(conn, PREFIX_LEN, &[], block_number0).unwrap();
+    let block_number10 = 10.into();
+    let (nullifiers, block_number_reached) =
+        queries::select_nullifiers_by_prefix(conn, PREFIX_LEN, &[], block_number0, block_number10)
+            .unwrap();
     assert!(nullifiers.is_empty());
+    assert_eq!(block_number_reached, block_number10);
 
     // test single item
     let nullifier1 = num_to_nullifier(1 << 48);
@@ -795,11 +798,12 @@ fn select_nullifiers_by_prefix_works() {
 
     queries::insert_nullifiers_for_block(conn, &[nullifier1], block_number1).unwrap();
 
-    let nullifiers = queries::select_nullifiers_by_prefix(
+    let (nullifiers, block_number_reached) = queries::select_nullifiers_by_prefix(
         conn,
         PREFIX_LEN,
         &[utils::get_nullifier_prefix(&nullifier1)],
         block_number0,
+        block_number10,
     )
     .unwrap();
     assert_eq!(
@@ -809,6 +813,8 @@ fn select_nullifiers_by_prefix_works() {
             block_num: block_number1
         }]
     );
+    // Block number reached should be the last block number (the block number of the last nullifier)
+    assert_eq!(block_number_reached, block_number10);
 
     // test two elements
     let nullifier2 = num_to_nullifier(2 << 48);
@@ -821,11 +827,12 @@ fn select_nullifiers_by_prefix_works() {
     assert_eq!(nullifiers, vec![(nullifier1, block_number1), (nullifier2, block_number2)]);
 
     // only the nullifiers matching the prefix are included
-    let nullifiers = queries::select_nullifiers_by_prefix(
+    let (nullifiers, _) = queries::select_nullifiers_by_prefix(
         conn,
         PREFIX_LEN,
         &[utils::get_nullifier_prefix(&nullifier1)],
         block_number0,
+        block_number10,
     )
     .unwrap();
     assert_eq!(
@@ -835,11 +842,12 @@ fn select_nullifiers_by_prefix_works() {
             block_num: block_number1
         }]
     );
-    let nullifiers = queries::select_nullifiers_by_prefix(
+    let (nullifiers, _) = queries::select_nullifiers_by_prefix(
         conn,
         PREFIX_LEN,
         &[utils::get_nullifier_prefix(&nullifier2)],
         block_number0,
+        block_number10,
     )
     .unwrap();
     assert_eq!(
@@ -851,7 +859,7 @@ fn select_nullifiers_by_prefix_works() {
     );
 
     // All matching nullifiers are included
-    let nullifiers = queries::select_nullifiers_by_prefix(
+    let (nullifiers, _) = queries::select_nullifiers_by_prefix(
         conn,
         PREFIX_LEN,
         &[
@@ -859,6 +867,7 @@ fn select_nullifiers_by_prefix_works() {
             utils::get_nullifier_prefix(&nullifier2),
         ],
         block_number0,
+        block_number10,
     )
     .unwrap();
     assert_eq!(
@@ -876,18 +885,19 @@ fn select_nullifiers_by_prefix_works() {
     );
 
     // If a non-matching prefix is provided, no nullifiers are returned
-    let nullifiers = queries::select_nullifiers_by_prefix(
+    let (nullifiers, _) = queries::select_nullifiers_by_prefix(
         conn,
         PREFIX_LEN,
         &[utils::get_nullifier_prefix(&num_to_nullifier(3 << 48))],
         block_number0,
+        block_number10,
     )
     .unwrap();
     assert!(nullifiers.is_empty());
 
     // If a block number is provided, only matching nullifiers created at or after that block are
     // returned
-    let nullifiers = queries::select_nullifiers_by_prefix(
+    let (nullifiers, _) = queries::select_nullifiers_by_prefix(
         conn,
         PREFIX_LEN,
         &[
@@ -895,6 +905,7 @@ fn select_nullifiers_by_prefix_works() {
             utils::get_nullifier_prefix(&nullifier2),
         ],
         block_number2,
+        block_number10,
     )
     .unwrap();
     assert_eq!(
@@ -904,6 +915,40 @@ fn select_nullifiers_by_prefix_works() {
             block_num: block_number2
         }]
     );
+
+    // Nullifiers are not returned if the block number is after the last nullifier
+    let nullifier3 = num_to_nullifier(3 << 48);
+    let block_number3 = 3.into();
+    create_block(conn, block_number3);
+
+    queries::insert_nullifiers_for_block(conn, &[nullifier3], block_number3).unwrap();
+
+    let (nullifiers, block_number_reached) = queries::select_nullifiers_by_prefix(
+        conn,
+        PREFIX_LEN,
+        &[
+            utils::get_nullifier_prefix(&nullifier1),
+            utils::get_nullifier_prefix(&nullifier2),
+            utils::get_nullifier_prefix(&nullifier3),
+        ],
+        block_number0,
+        block_number2,
+    )
+    .unwrap();
+    assert_eq!(
+        nullifiers,
+        vec![
+            NullifierInfo {
+                nullifier: nullifier1,
+                block_num: block_number1
+            },
+            NullifierInfo {
+                nullifier: nullifier2,
+                block_num: block_number2
+            }
+        ]
+    );
+    assert_eq!(block_number_reached, block_number2);
 }
 
 #[test]
diff --git a/crates/store/src/server/rpc_api.rs b/crates/store/src/server/rpc_api.rs
index a12a960f8..d5c1b21db 100644
--- a/crates/store/src/server/rpc_api.rs
+++ b/crates/store/src/server/rpc_api.rs
@@ -83,40 +83,47 @@ impl rpc_server::Rpc for StoreApi {
     #[instrument(
         parent = None,
         target = COMPONENT,
-        name = "store.rpc_server.check_nullifiers_by_prefix",
+        name = "store.rpc_server.sync_nullifiers",
         skip_all,
         level = "debug",
         ret(level = "debug"),
         err
     )]
-    async fn check_nullifiers_by_prefix(
+    async fn sync_nullifiers(
         &self,
-        request: Request<proto::rpc_store::CheckNullifiersByPrefixRequest>,
-    ) -> Result<Response<proto::rpc_store::CheckNullifiersByPrefixResponse>, Status> {
+        request: Request<proto::rpc_store::SyncNullifiersRequest>,
+    ) -> Result<Response<proto::rpc_store::SyncNullifiersResponse>, Status> {
         let request = request.into_inner();
 
         if request.prefix_len != 16 {
             return Err(Status::invalid_argument("Only 16-bit prefixes are supported"));
         }
 
-        let nullifiers = self
+        let chain_tip = self.state.latest_block_num().await;
+        let block_to = request.block_to.map_or(chain_tip, BlockNumber::from);
+
+        let (nullifiers, block_num) = self
             .state
-            .check_nullifiers_by_prefix(
+            .sync_nullifiers(
                 request.prefix_len,
                 request.nullifiers,
-                BlockNumber::from(request.block_num),
+                request.block_from.into(),
+                block_to,
             )
-            .await?
+            .await?;
+        let nullifiers = nullifiers
             .into_iter()
-            .map(|nullifier_info| {
-                proto::rpc_store::check_nullifiers_by_prefix_response::NullifierUpdate {
-                    nullifier: Some(nullifier_info.nullifier.into()),
-                    block_num: nullifier_info.block_num.as_u32(),
-                }
+            .map(|nullifier_info| proto::rpc_store::sync_nullifiers_response::NullifierUpdate {
+                nullifier: Some(nullifier_info.nullifier.into()),
+                block_num: nullifier_info.block_num.as_u32(),
             })
             .collect();
 
-        Ok(Response::new(proto::rpc_store::CheckNullifiersByPrefixResponse { nullifiers }))
+        Ok(Response::new(proto::rpc_store::SyncNullifiersResponse {
+            nullifiers,
+            block_num: block_num.as_u32(),
+            chain_tip: chain_tip.as_u32(),
+        }))
     }
 
     /// Returns info which can be used by the client to sync up to the latest state of the chain
diff --git a/crates/store/src/state.rs b/crates/store/src/state.rs
index d4a1c6d47..323ab0e96 100644
--- a/crates/store/src/state.rs
+++ b/crates/store/src/state.rs
@@ -422,14 +422,15 @@ impl State {
         }
     }
 
-    pub async fn check_nullifiers_by_prefix(
+    pub async fn sync_nullifiers(
         &self,
         prefix_len: u32,
         nullifier_prefixes: Vec<u32>,
-        block_num: BlockNumber,
-    ) -> Result<Vec<NullifierInfo>, DatabaseError> {
+        block_from: BlockNumber,
+        block_to: BlockNumber,
+    ) -> Result<(Vec<NullifierInfo>, BlockNumber), DatabaseError> {
         self.db
-            .select_nullifiers_by_prefix(prefix_len, nullifier_prefixes, block_num)
+            .select_nullifiers_by_prefix(prefix_len, nullifier_prefixes, block_from, block_to)
             .await
     }
 
diff --git a/crates/utils/src/limiter.rs b/crates/utils/src/limiter.rs
index d62429879..c7b116fa5 100644
--- a/crates/utils/src/limiter.rs
+++ b/crates/utils/src/limiter.rs
@@ -55,7 +55,7 @@ impl QueryParamLimiter for QueryParamNullifierPrefixLimit {
 
 /// Used for the following RPC endpoints
 /// * `select_nullifiers_by_prefix`
-/// * `check_nullifiers_by_prefix`
+/// * `sync_nullifiers`
 /// * `sync_state`
 pub struct QueryParamNullifierLimit;
 impl QueryParamLimiter for QueryParamNullifierLimit {
diff --git a/crates/utils/src/tracing/grpc.rs b/crates/utils/src/tracing/grpc.rs
index 2ac017491..39c5a216d 100644
--- a/crates/utils/src/tracing/grpc.rs
+++ b/crates/utils/src/tracing/grpc.rs
@@ -44,7 +44,7 @@ pub fn traced_span_fn<T>(component: TracedComponent) -> fn(&http::Request<T>) ->
 fn rpc_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
     let span = match request.uri().path().rsplit('/').next() {
         Some("CheckNullifiers") => rpc_span!("rpc.rpc", "CheckNullifiers"),
-        Some("CheckNullifiersByPrefix") => rpc_span!("rpc.rpc", "CheckNullifiersByPrefix"),
+        Some("SyncNullifiers") => rpc_span!("rpc.rpc", "SyncNullifiers"),
         Some("GetBlockHeaderByNumber") => rpc_span!("rpc.rpc", "GetBlockHeaderByNumber"),
         Some("SyncStorageMaps") => rpc_span!("rpc.rpc", "SyncStorageMaps"),
         Some("SyncAccountVault") => rpc_span!("rpc.rpc", "SyncAccountVault"),
@@ -81,7 +81,7 @@ fn store_rpc_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
     let method = request.uri().path().rsplit('/').next().unwrap_or("Unknown");
     let span = match method {
         "CheckNullifiers" => rpc_span!("store.rpc.rpc", "CheckNullifiers"),
-        "CheckNullifiersByPrefix" => rpc_span!("store.rpc.rpc", "CheckNullifiersByPrefix"),
+        "SyncNullifiers" => rpc_span!("store.rpc.rpc", "SyncNullifiers"),
         "GetAccountDetails" => rpc_span!("store.rpc.rpc", "GetAccountDetails"),
         "GetAccountProofs" => rpc_span!("store.rpc.rpc", "GetAccountProofs"),
         "GetBlockByNumber" => rpc_span!("store.rpc.rpc", "GetBlockByNumber"),
diff --git a/docs/src/user/rpc.md b/docs/src/user/rpc.md
index 7bc6c3720..b70a5f708 100644
--- a/docs/src/user/rpc.md
+++ b/docs/src/user/rpc.md
@@ -9,7 +9,6 @@ The gRPC service definition can be found in the Miden node's `proto`
 <!--toc:start-->
 
 - [CheckNullifiers](#checknullifiers)
-- [CheckNullifiersByPrefix](#checknullifiersbyprefix)
 - [GetAccountDetails](#getaccountdetails)
 - [GetAccountProofs](#getaccountproofs)
 - [GetBlockByNumber](#getblockbynumber)
@@ -17,6 +16,7 @@ The gRPC service definition can be found in the Miden node's `proto`
 - [GetNotesById](#getnotesbyid)
 - [GetNoteScriptByRoot](#getnotescriptbyroot)
 - [SubmitProvenTransaction](#submitproventransaction)
+- [SyncNullifiers](#syncnullifiers)
 - [SyncAccountVault](#syncaccountvault)
 - [SyncNotes](#syncnotes)
 - [SyncState](#syncstate)
@@ -29,12 +29,6 @@ The gRPC service definition can be found in the Miden node's `proto`
 
 Request proofs for a set of nullifiers.
 
-## CheckNullifiersByPrefix
-
-Request nullifiers filtered by prefix and created after some block number.
-
-The prefix is used to obscure the callers interest in a specific nullifier. Currently only 16-bit prefixes are supported.
-
 ## GetAccountDetails
 
 Request the latest state of an account.
@@ -63,6 +57,18 @@ Request the script for a note by its root.
 
 Submit a transaction to the network.
 
+## SyncNullifiers
+
+Returns nullifier synchronization data for a set of prefixes within a given block range. This method allows
+clients to efficiently track nullifier creation by retrieving only the nullifiers produced between two blocks.
+
+Caller specifies the `prefix_len` (currently only 16), the list of prefix values (`nullifiers`), and the block
+range (`block_from`, optional `block_to`). The response includes all matching nullifiers created within that
+range, the last block included in the response (`block_num`), and the current chain tip (`chain_tip`).
+
+If the response is chunked (i.e., `block_num < block_to`), continue by issuing another request with
+`block_from = block_num + 1` to retrieve subsequent updates.
+
 ## SyncAccountVault
 
 Returns information that allows clients to sync asset values for specific public accounts within a block range.
diff --git a/proto/proto/rpc.proto b/proto/proto/rpc.proto
index e8335eead..9023ff92b 100644
--- a/proto/proto/rpc.proto
+++ b/proto/proto/rpc.proto
@@ -23,11 +23,6 @@ service Api {
     // Returns a nullifier proof for each of the requested nullifiers.
     rpc CheckNullifiers(rpc_store.NullifierList) returns (rpc_store.CheckNullifiersResponse) {}
 
-    // Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
-    //
-    // Note that only 16-bit prefixes are supported at this time.
-    rpc CheckNullifiersByPrefix(rpc_store.CheckNullifiersByPrefixRequest) returns (rpc_store.CheckNullifiersByPrefixResponse) {}
-
     // Returns the latest state of an account with the specified ID.
     rpc GetAccountDetails(account.AccountId) returns (account.AccountDetails) {}
 
@@ -62,6 +57,11 @@ service Api {
     // state following normal transaction submission rules.
     rpc SubmitProvenBatch(transaction.ProvenTransactionBatch) returns (block_producer.SubmitProvenBatchResponse) {}
 
+    // Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
+    //
+    // Note that only 16-bit prefixes are supported at this time.
+    rpc SyncNullifiers(rpc_store.SyncNullifiersRequest) returns (rpc_store.SyncNullifiersResponse) {}
+
     // Returns account vault updates for specified account within a block range.
     rpc SyncAccountVault(rpc_store.SyncAccountVaultRequest) returns (rpc_store.SyncAccountVaultResponse) {}
 
diff --git a/proto/proto/store/rpc.proto b/proto/proto/store/rpc.proto
index edf204d66..d407904fd 100644
--- a/proto/proto/store/rpc.proto
+++ b/proto/proto/store/rpc.proto
@@ -23,11 +23,6 @@ service Rpc {
     // Returns a nullifier proof for each of the requested nullifiers.
     rpc CheckNullifiers(NullifierList) returns (CheckNullifiersResponse) {}
 
-    // Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
-    //
-    // Note that only 16-bit prefixes are supported at this time.
-    rpc CheckNullifiersByPrefix(CheckNullifiersByPrefixRequest) returns (CheckNullifiersByPrefixResponse) {}
-
     // Returns the latest state of an account with the specified ID.
     rpc GetAccountDetails(account.AccountId) returns (account.AccountDetails) {}
 
@@ -47,6 +42,11 @@ service Rpc {
     // Returns the script for a note by its root.
     rpc GetNoteScriptByRoot(note.NoteRoot) returns (MaybeNoteScript) {}
 
+    // Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
+    //
+    // Note that only 16-bit prefixes are supported at this time.
+    rpc SyncNullifiers(SyncNullifiersRequest) returns (SyncNullifiersResponse) {}
+
     // Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
     //
     // Client specifies the `note_tags` they are interested in, and the block height from which to search for new for
@@ -178,22 +178,42 @@ message AccountProofs {
     repeated AccountProof account_proofs = 2;
 }
 
-// CHECK NULLIFIERS BY PREFIX
+// CHECK NULLIFIERS
+// ================================================================================================
+
+// List of nullifiers to return proofs for.
+message NullifierList {
+    // List of nullifiers to return proofs for.
+    repeated primitives.Digest nullifiers = 1;
+}
+
+// Represents the result of checking nullifiers.
+message CheckNullifiersResponse {
+    // Each requested nullifier has its corresponding nullifier proof at the same position.
+    repeated primitives.SmtOpening proofs = 1;
+}
+
+// SYNC NULLIFIERS
 // ================================================================================================
 
 // Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
-message CheckNullifiersByPrefixRequest {
+message SyncNullifiersRequest {
+    // Block number from which the nullifiers are requested (inclusive).
+    fixed32 block_from = 1;
+
+    // Block number up to which to check. If not specified, checks up to the latest block.
+    optional fixed32 block_to = 2;
+
     // Number of bits used for nullifier prefix. Currently the only supported value is 16.
-    uint32 prefix_len = 1;
+    uint32 prefix_len = 3;
+
     // List of nullifiers to check. Each nullifier is specified by its prefix with length equal
     // to `prefix_len`.
-    repeated uint32 nullifiers = 2;
-    // Block number from which the nullifiers are requested (inclusive).
-    fixed32 block_num = 3;
+    repeated uint32 nullifiers = 4;
 }
 
-// Represents the result of checking nullifiers by prefix.
-message CheckNullifiersByPrefixResponse {
+// Represents the result of syncing nullifiers.
+message SyncNullifiersResponse {
     // Represents a single nullifier update.
     message NullifierUpdate {
         // Nullifier ID.
@@ -202,23 +222,19 @@ message CheckNullifiersByPrefixResponse {
         // Block number.
         fixed32 block_num = 2;
     }
-    // List of nullifiers matching the prefixes specified in the request.
-    repeated NullifierUpdate nullifiers = 1;
-}
 
-// CHECK NULLIFIERS
-// ================================================================================================
+    // Current chain tip
+    fixed32 chain_tip = 1;
 
-// List of nullifiers to return proofs for.
-message NullifierList {
-    // List of nullifiers to return proofs for.
-    repeated primitives.Digest nullifiers = 1;
-}
+    // The block number of the last check included in this response.
+    //
+    // For chunked responses, this may be less than request.block_to.
+    // If it is less than request.block_to, the user is expected to make a subsequent request
+    // starting from the next block to this one (ie, request.block_from = block_num + 1).
+    fixed32 block_num = 2;
 
-// Represents the result of checking nullifiers.
-message CheckNullifiersResponse {
-    // Each requested nullifier has its corresponding nullifier proof at the same position.
-    repeated primitives.SmtOpening proofs = 1;
+    // List of nullifiers matching the prefixes specified in the request.
+    repeated NullifierUpdate nullifiers = 3;
 }
 
 // SYNC STATE
@@ -289,16 +305,16 @@ message SyncAccountVaultRequest {
 }
 
 message SyncAccountVaultResponse {
+    // Chain tip at the moment of the request.
+    fixed32 chain_tip = 1;
+
     // The block number of the last update included in this response.
     //
     // For chunked responses, this may be less than request.block_to.
     // If it is less than request.block_to, the user is expected to make a subsequent request 
     // starting from the next block to this one (ie, request.block_from = block_num + 1).
-    fixed32 block_num = 1;
+    fixed32 block_num = 2;
 
-    // Chain tip at the moment of the request.
-    fixed32 chain_tip = 2;
-    
     // List of asset updates for the account.
     // 
     // Multiple updates can be returned for a single asset, and the one with a higher `block_num`
@@ -374,15 +390,15 @@ message SyncStorageMapsRequest {
 }
 
 message SyncStorageMapsResponse {
+    // Current chain tip
+    fixed32 chain_tip = 1;
+
     // The block number of the last update included in this response.
     //
     // For chunked responses, this may be less than request.block_to.
     // If it is less than request.block_to, the user is expected to make a subsequent request 
     // starting from the next block to this one (ie, request.block_from = block_num + 1).
-    fixed32 block_num = 1;
-
-    // Current chain tip
-    fixed32 chain_tip = 2;
+    fixed32 block_num = 2;
 
     // The list of storage map updates.
     // 

From e6c9e83bf291d9fba5ea03e7ca0a459973462c83 Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Thu, 4 Sep 2025 12:22:06 +0200
Subject: [PATCH 05/78] store/queries: cleanup naming and use
 `RangeInclusive<BlockRange>`, dissolve `insertions.rs` (#1193)

---
 crates/rpc/README.md                          |  10 +-
 crates/store/README.md                        |   8 +-
 crates/store/src/db/mod.rs                    |  23 +-
 .../store/src/db/models/queries/accounts.rs   | 650 ++++++++++++++----
 .../src/db/models/queries/block_headers.rs    |  97 ++-
 .../store/src/db/models/queries/insertions.rs | 515 --------------
 crates/store/src/db/models/queries/mod.rs     |  54 +-
 crates/store/src/db/models/queries/notes.rs   | 400 +++++++----
 .../store/src/db/models/queries/nullifiers.rs |  84 +--
 .../src/db/models/queries/transactions.rs     |  99 ++-
 crates/store/src/db/tests.rs                  |  67 +-
 crates/store/src/server/rpc_api.rs            |   7 +-
 crates/store/src/state.rs                     |  17 +-
 13 files changed, 1117 insertions(+), 914 deletions(-)
 delete mode 100644 crates/store/src/db/models/queries/insertions.rs

diff --git a/crates/rpc/README.md b/crates/rpc/README.md
index 324df012d..b787195dc 100644
--- a/crates/rpc/README.md
+++ b/crates/rpc/README.md
@@ -86,11 +86,11 @@ Returns nullifier synchronization data for a set of prefixes within a given bloc
 clients to efficiently track nullifier creation by retrieving only the nullifiers produced between two blocks.
 
 Caller specifies the `prefix_len` (currently only 16), the list of prefix values (`nullifiers`), and the block
-range (`block_from`, optional `block_to`). The response includes all matching nullifiers created within that
+range (`from_start_block`, optional `to_end_block`). The response includes all matching nullifiers created within that
 range, the last block included in the response (`block_num`), and the current chain tip (`chain_tip`).
 
-If the response is chunked (i.e., `block_num < block_to`), continue by issuing another request with
-`block_from = block_num + 1` to retrieve subsequent updates.
+If the response is chunked due to exceeding the maximum returned entries, continue by issuing another request with
+consecutive block number to retrieve subsequent updates.
 
 ---
 
@@ -98,7 +98,7 @@ If the response is chunked (i.e., `block_num < block_to`), continue by issuing a
 
 Returns information that allows clients to sync asset values for specific public accounts within a block range.
 
-For any `[block_from..block_to]` range, the latest known set of assets is returned for the requested account ID.
+For any `block_range`, the latest known set of assets is returned for the requested account ID.
 The data can be split and a cutoff block may be selected if there are too many assets to sync. The response contains
 the chain tip so that the caller knows when it has been reached.
 
@@ -139,7 +139,7 @@ notes, client can make additional filtering of that data on its side.
 
 Returns storage map synchronization data for a specified public account within a given block range. This method allows clients to efficiently sync the storage map state of an account by retrieving only the changes that occurred between two blocks.
 
-Caller specifies the `account_id` of the public account and the block range (`block_from`, `block_to`) for which to retrieve storage updates. The response includes all storage map key-value updates that occurred within that range, along with the last block included in the sync and the current chain tip.
+Caller specifies the `account_id` of the public account and the block range `block_range` for which to retrieve storage updates. The response includes all storage map key-value updates that occurred within that range, along with the last block included in the sync and the current chain tip.
 
 This endpoint enables clients to maintain an updated view of account storage.
 
diff --git a/crates/store/README.md b/crates/store/README.md
index 2c0193746..c77c17843 100644
--- a/crates/store/README.md
+++ b/crates/store/README.md
@@ -107,9 +107,9 @@ Returns nullifier synchronization data for a set of prefixes within a given bloc
 
 Caller specifies the `prefix_len` (currently only 16), the list of prefix values (`nullifiers`), and the block
 range (`block_from`, optional `block_to`). The response includes all matching nullifiers created within that
-range, the last block included in the response (`block_num`), and the current chain tip (`chain_tip`).
+range, the last block included in the response (`resp.block_num`), and the current chain tip (`chain_tip`).
 
-If the response is chunked (i.e., `block_num < block_to`), continue by issuing another request with
+If the response is chunked (i.e., `resp.block_num < block_to`), continue by issuing another request with
 `block_from = block_num + 1` to retrieve subsequent updates.
 
 ---
@@ -118,7 +118,7 @@ If the response is chunked (i.e., `block_num < block_to`), continue by issuing a
 
 Returns information that allows clients to sync asset values for specific public accounts within a block range.
 
-For any `[block_from..block_to]` range, the latest known set of assets is returned for the requested account ID.
+For any `block_range`, the latest known set of assets is returned for the requested account ID.
 The data can be split and a cutoff block may be selected if there are too many assets to sync. The response contains
 the chain tip so that the caller knows when it has been reached.
 
@@ -159,7 +159,7 @@ data contains excessive notes and nullifiers, client can make additional filteri
 
 Returns storage map synchronization data for a specified public account within a given block range. This method allows clients to efficiently sync the storage map state of an account by retrieving only the changes that occurred between two blocks.
 
-Caller specifies the `account_id` of the public account and the block range (`block_from`, `block_to`) for which to retrieve storage updates. The response includes all storage map key-value updates that occurred within that range, along with the last block included in the sync and the current chain tip.
+Caller specifies the `account_id` of the public account and the block range `block_range` for which to retrieve storage updates. The response includes all storage map key-value updates that occurred within that range, along with the last block included in the sync and the current chain tip.
 
 This endpoint enables clients to maintain an updated view of account storage.
 
diff --git a/crates/store/src/db/mod.rs b/crates/store/src/db/mod.rs
index fb94526fc..6c733d11a 100644
--- a/crates/store/src/db/mod.rs
+++ b/crates/store/src/db/mod.rs
@@ -1,4 +1,5 @@
 use std::collections::{BTreeMap, BTreeSet, HashSet};
+use std::ops::RangeInclusive;
 use std::path::PathBuf;
 
 use anyhow::Context;
@@ -283,8 +284,7 @@ impl Db {
         &self,
         prefix_len: u32,
         nullifier_prefixes: Vec<u32>,
-        block_from: BlockNumber,
-        block_to: BlockNumber,
+        block_range: RangeInclusive<BlockNumber>,
     ) -> Result<(Vec<NullifierInfo>, BlockNumber)> {
         assert_eq!(prefix_len, 16, "Only 16-bit prefixes are supported");
 
@@ -295,8 +295,7 @@ impl Db {
                 conn,
                 prefix_len as u8,
                 &nullifier_prefixes[..],
-                block_from,
-                block_to,
+                block_range,
             )
         })
         .await
@@ -474,18 +473,15 @@ impl Db {
 
     /// Selects storage map values for syncing storage maps for a specific account ID.
     ///
-    /// The returned values are the latest known values up to `block_to`, and no values earlier
-    /// than `block_from` are returned.
+    /// The returned values are the latest known values up to `block_range.end()`, and no values
+    /// earlier than `block_range.start()` are returned.
     pub(crate) async fn select_storage_map_sync_values(
         &self,
         account_id: AccountId,
-        block_from: BlockNumber,
-        block_to: BlockNumber,
+        block_range: RangeInclusive<BlockNumber>,
     ) -> Result<StorageMapValuesPage> {
         self.transact("select storage map sync values", move |conn| {
-            models::queries::select_account_storage_map_values(
-                conn, account_id, block_from, block_to,
-            )
+            models::queries::select_account_storage_map_values(conn, account_id, block_range)
         })
         .await
     }
@@ -539,11 +535,10 @@ impl Db {
     pub async fn get_account_vault_sync(
         &self,
         account_id: AccountId,
-        block_from: BlockNumber,
-        block_to: BlockNumber,
+        block_range: RangeInclusive<BlockNumber>,
     ) -> Result<(BlockNumber, Vec<AccountVaultValue>)> {
         self.transact("account vault sync", move |conn| {
-            queries::select_account_vault_assets(conn, account_id, block_from, block_to)
+            queries::select_account_vault_assets(conn, account_id, block_range)
         })
         .await
     }
diff --git a/crates/store/src/db/models/queries/accounts.rs b/crates/store/src/db/models/queries/accounts.rs
index b766e0f1c..dd7093b51 100644
--- a/crates/store/src/db/models/queries/accounts.rs
+++ b/crates/store/src/db/models/queries/accounts.rs
@@ -1,9 +1,14 @@
+use std::borrow::Cow;
+use std::ops::RangeInclusive;
+
 use diesel::prelude::{Queryable, QueryableByName};
 use diesel::query_dsl::methods::SelectDsl;
 use diesel::sqlite::Sqlite;
 use diesel::{
+    AsChangeset,
     BoolExpressionMethods,
     ExpressionMethods,
+    Insertable,
     JoinOnDsl,
     NullableExpressionMethods,
     OptionalExtension,
@@ -17,12 +22,27 @@ use miden_lib::utils::{Deserializable, Serializable};
 use miden_node_proto as proto;
 use miden_node_proto::domain::account::{AccountInfo, AccountSummary};
 use miden_node_utils::limiter::{QueryParamAccountIdLimit, QueryParamLimiter};
-use miden_objects::account::{Account, AccountCode, AccountId, AccountStorage};
-use miden_objects::asset::{Asset, AssetVault};
-use miden_objects::block::BlockNumber;
+use miden_objects::account::delta::AccountUpdateDetails;
+use miden_objects::account::{
+    Account,
+    AccountCode,
+    AccountDelta,
+    AccountId,
+    AccountStorage,
+    NonFungibleDeltaAction,
+    StorageSlot,
+};
+use miden_objects::asset::{Asset, AssetVault, FungibleAsset};
+use miden_objects::block::{BlockAccountUpdate, BlockNumber};
 use miden_objects::{Felt, Word};
 
-use crate::db::models::conv::{SqlTypeConvert, raw_sql_to_nonce, raw_sql_to_slot};
+use crate::db::models::conv::{
+    SqlTypeConvert,
+    nonce_to_raw_sql,
+    raw_sql_to_nonce,
+    raw_sql_to_slot,
+    slot_to_raw_sql,
+};
 use crate::db::models::{serialize_vec, vec_raw_try_into};
 use crate::db::{AccountVaultValue, schema};
 use crate::errors::DatabaseError;
@@ -33,21 +53,24 @@ use crate::errors::DatabaseError;
 /// # Returns
 ///
 /// The latest account details, or an error.
+///
+/// # Raw SQL
+///
+/// ```sql
+/// SELECT
+///     account_id,
+///     account_commitment,
+///     block_num,
+///     details
+/// FROM
+///     accounts
+/// WHERE
+///     account_id = ?1;
+/// ```
 pub(crate) fn select_account(
     conn: &mut SqliteConnection,
     account_id: AccountId,
 ) -> Result<proto::domain::account::AccountInfo, DatabaseError> {
-    // SELECT
-    //     account_id,
-    //     account_commitment,
-    //     block_num,
-    //     details
-    // FROM
-    //     accounts
-    // WHERE
-    //     account_id = ?1;
-    //
-
     let raw = SelectDsl::select(
         schema::accounts::table.left_join(schema::account_codes::table.on(
             schema::accounts::code_commitment.eq(schema::account_codes::code_commitment.nullable()),
@@ -58,7 +81,7 @@ pub(crate) fn select_account(
     .get_result::<(AccountRaw, Option<Vec<u8>>)>(conn)
     .optional()?
     .ok_or(DatabaseError::AccountNotFoundInDb(account_id))?;
-    let info = AccountWithCodeRaw::from(raw).try_into()?;
+    let info = AccountWithCodeRawJoined::from(raw).try_into()?;
     Ok(info)
 }
 
@@ -72,19 +95,24 @@ pub(crate) fn select_account(
 /// # Returns
 ///
 /// The latest account details, `None` if the account was not found, or an error.
+///
+/// # Raw SQL
+///
+/// ```sql
+/// SELECT
+///     account_id,
+///     account_commitment,
+///     block_num,
+///     details
+/// FROM
+///     accounts
+/// WHERE
+///     network_account_id_prefix = ?1;
+/// ```
 pub(crate) fn select_account_by_id_prefix(
     conn: &mut SqliteConnection,
     id_prefix: u32,
 ) -> Result<Option<AccountInfo>, DatabaseError> {
-    // SELECT
-    //     account_id,
-    //     account_commitment,
-    //     block_num,
-    //     details
-    // FROM
-    //     accounts
-    // WHERE
-    //     network_account_id_prefix = ?1;
     let maybe_info = SelectDsl::select(
         schema::accounts::table.left_join(schema::account_codes::table.on(
             schema::accounts::code_commitment.eq(schema::account_codes::code_commitment.nullable()),
@@ -97,7 +125,7 @@ pub(crate) fn select_account_by_id_prefix(
     .map_err(DatabaseError::Diesel)?;
 
     let result: Result<Option<AccountInfo>, DatabaseError> = maybe_info
-        .map(AccountWithCodeRaw::from)
+        .map(AccountWithCodeRawJoined::from)
         .map(std::convert::TryInto::<AccountInfo>::try_into)
         .transpose();
 
@@ -127,6 +155,11 @@ pub(crate) fn select_all_account_commitments(
     ))
 }
 
+/// Select accounts by their IDs.
+///
+/// # Parameters
+/// * `account_ids`: List of account IDs to query
+///     - Limit: 0 <= size <= 1000
 pub(crate) fn select_accounts_by_id(
     conn: &mut SqliteConnection,
     account_ids: Vec<AccountId>,
@@ -143,35 +176,45 @@ pub(crate) fn select_accounts_by_id(
     )
     .filter(schema::accounts::account_id.eq_any(account_ids))
     .load::<(AccountRaw, Option<Vec<u8>>)>(conn)?;
-    let account_infos = vec_raw_try_into::<AccountInfo, AccountWithCodeRaw>(
-        accounts_raw.into_iter().map(AccountWithCodeRaw::from),
+    let account_infos = vec_raw_try_into::<AccountInfo, AccountWithCodeRawJoined>(
+        accounts_raw.into_iter().map(AccountWithCodeRawJoined::from),
     )?;
     Ok(account_infos)
 }
 
+/// Select account vault assets within a block range (inclusive).
+///
+/// # Parameters
+/// * `account_id`: Account ID to query
+/// * `block_from`: Starting block number
+/// * `block_to`: Ending block number
+/// * Response payload size: 0 <= size <= 2MB
+/// * Vault assets per response: 0 <= count <= (2MB / (2*Word + u32)) + 1
+///
+/// # Raw SQL
+///
+/// ```sql
+/// SELECT
+///     block_num,
+///     vault_key,
+///     asset
+/// FROM
+///     account_vault_assets
+/// WHERE
+///     account_id = ?
+///     AND block_num >= ?
+///     AND block_num <= ?
+/// ORDER BY
+///     block_num ASC
+/// LIMIT
+///     ROW_LIMIT;
+/// ```
 pub(crate) fn select_account_vault_assets(
     conn: &mut SqliteConnection,
     account_id: AccountId,
-    block_from: BlockNumber,
-    block_to: BlockNumber,
+    block_range: RangeInclusive<BlockNumber>,
 ) -> Result<(BlockNumber, Vec<AccountVaultValue>), DatabaseError> {
     use schema::account_vault_assets as t;
-
-    // SELECT
-    //     block_num,
-    //     vault_key,
-    //     asset
-    // FROM
-    //     account_vault_assets
-    // WHERE
-    //     account_id = ?
-    //     AND block_num >= ?
-    //     AND block_num <= ?
-    // ORDER BY
-    //     block_num ASC
-    // LIMIT
-    //     MAX_ROWS + 1;
-
     // TODO: These limits should be given by the protocol.
     // See miden-base/issues/1770 for more details
     const MAX_PAYLOAD_BYTES: usize = 2 * 1024 * 1024; // 2 MB
@@ -182,8 +225,11 @@ pub(crate) fn select_account_vault_assets(
         return Err(DatabaseError::AccountNotPublic(account_id));
     }
 
-    if block_from > block_to {
-        return Err(DatabaseError::InvalidBlockRange { from: block_from, to: block_to });
+    if block_range.is_empty() {
+        return Err(DatabaseError::InvalidBlockRange {
+            from: *block_range.start(),
+            to: *block_range.end(),
+        });
     }
 
     let raw: Vec<(i64, Vec<u8>, Option<Vec<u8>>)> =
@@ -191,22 +237,21 @@ pub(crate) fn select_account_vault_assets(
             .filter(
                 t::account_id
                     .eq(account_id.to_bytes())
-                    .and(t::block_num.ge(block_from.to_raw_sql()))
-                    .and(t::block_num.le(block_to.to_raw_sql())),
+                    .and(t::block_num.ge(block_range.start().to_raw_sql()))
+                    .and(t::block_num.le(block_range.end().to_raw_sql())),
             )
             .order(t::block_num.asc())
             .limit(i64::try_from(MAX_ROWS + 1).expect("should fit within i64"))
             .load::<(i64, Vec<u8>, Option<Vec<u8>>)>(conn)?;
 
     // Discard the last block in the response (assumes more than one block may be present)
-    let (last_block_included, values) = if raw.len() > MAX_ROWS {
+    let (last_block_included, values) = if let Some(&(last_block_num, ..)) = raw.last()
+        && raw.len() >= MAX_ROWS
+    {
         // NOTE: If the query contains at least one more row than the amount of storage map updates
         // allowed in a single block for an account, then the response is guaranteed to have at
         // least two blocks
 
-        // SAFETY: we checked that the vector is not empty
-        let &(last_block_num, ..) = raw.last().unwrap();
-
         let values = raw
             .into_iter()
             .take_while(|(bn, ..)| *bn != last_block_num)
@@ -216,7 +261,7 @@ pub(crate) fn select_account_vault_assets(
         (BlockNumber::from_raw_sql(last_block_num.saturating_sub(1))?, values)
     } else {
         (
-            block_to,
+            *block_range.end(),
             raw.into_iter().map(AccountVaultValue::from_raw_row).collect::<Result<_, _>>()?,
         )
     };
@@ -225,37 +270,40 @@ pub(crate) fn select_account_vault_assets(
 }
 
 /// Select [`AccountSummary`] from the DB using the given [`SqliteConnection`], given that the
-/// account update was done between `(block_start, block_end]`.
+/// account update was in the given block range (inclusive).
 ///
 /// # Returns
 ///
 /// The vector of [`AccountSummary`] with the matching accounts.
+///
+/// # Raw SQL
+///
+/// ```sql
+/// SELECT
+///     account_id,
+///     account_commitment,
+///     block_num
+/// FROM
+///     accounts
+/// WHERE
+///     block_num > ?1 AND
+///     block_num <= ?2 AND
+///     account_id IN rarray(?3)
+/// ORDER BY
+///     block_num ASC
+/// ```
 pub fn select_accounts_by_block_range(
     conn: &mut SqliteConnection,
     account_ids: &[AccountId],
-    block_start: i64,
-    block_end: i64,
+    block_range: RangeInclusive<BlockNumber>,
 ) -> Result<Vec<AccountSummary>, DatabaseError> {
     QueryParamAccountIdLimit::check(account_ids.len())?;
 
-    // SELECT
-    //     account_id,
-    //     account_commitment,
-    //     block_num
-    // FROM
-    //     accounts
-    // WHERE
-    //     block_num > ?1 AND
-    //     block_num <= ?2 AND
-    //     account_id IN rarray(?3)
-    // ORDER BY
-    //     block_num ASC
-
     let desired_account_ids = serialize_vec(account_ids);
     let raw: Vec<AccountSummaryRaw> =
         SelectDsl::select(schema::accounts::table, AccountSummaryRaw::as_select())
-            .filter(schema::accounts::block_num.gt(block_start))
-            .filter(schema::accounts::block_num.le(block_end))
+            .filter(schema::accounts::block_num.gt(block_range.start().to_raw_sql()))
+            .filter(schema::accounts::block_num.le(block_range.end().to_raw_sql()))
             .filter(schema::accounts::account_id.eq_any(desired_account_ids))
             .order(schema::accounts::block_num.asc())
             .load::<AccountSummaryRaw>(conn)?;
@@ -269,20 +317,24 @@ pub fn select_accounts_by_block_range(
 /// # Returns
 ///
 /// A vector with accounts, or an error.
+///
+/// # Raw SQL
+///
+/// ```sql
+/// SELECT
+///     account_id,
+///     account_commitment,
+///     block_num,
+///     details
+/// FROM
+///     accounts
+/// ORDER BY
+///     block_num ASC;
+/// ```
 #[cfg(test)]
 pub(crate) fn select_all_accounts(
     conn: &mut SqliteConnection,
 ) -> Result<Vec<AccountInfo>, DatabaseError> {
-    // SELECT
-    //     account_id,
-    //     account_commitment,
-    //     block_num,
-    //     details
-    // FROM
-    //     accounts
-    // ORDER BY
-    //     block_num ASC;
-
     let accounts_raw = QueryDsl::select(
         schema::accounts::table.left_join(schema::account_codes::table.on(
             schema::accounts::code_commitment.eq(schema::account_codes::code_commitment.nullable()),
@@ -290,8 +342,8 @@ pub(crate) fn select_all_accounts(
         (AccountRaw::as_select(), schema::account_codes::code.nullable()),
     )
     .load::<(AccountRaw, Option<Vec<u8>>)>(conn)?;
-    let account_infos = vec_raw_try_into::<AccountInfo, AccountWithCodeRaw>(
-        accounts_raw.into_iter().map(AccountWithCodeRaw::from),
+    let account_infos = vec_raw_try_into::<AccountInfo, AccountWithCodeRawJoined>(
+        accounts_raw.into_iter().map(AccountWithCodeRawJoined::from),
     )?;
     Ok(account_infos)
 }
@@ -334,30 +386,44 @@ impl StorageMapValue {
 /// - the historical value for a slot and key specifically on block `block_to`
 /// - the latest updated value for the slot and key combination, alongside the block number in which
 ///   it was updated
+///
+/// # Raw SQL
+///
+/// ```sql
+/// SELECT
+///     block_num,
+///     slot,
+///     key,
+///     value
+/// FROM
+///     account_storage_map_values
+/// WHERE
+///     account_id = ?1
+///     AND block_num >= ?2
+///     AND block_num <= ?3
+/// ORDER BY
+///     block_num ASC
+/// LIMIT
+///     :row_limit;
+/// ```
+/// Select account storage map values within a block range (inclusive).
+///
+/// ## Parameters
+///
+/// * `account_id`: Account ID to query
+/// * `block_range`: Range of block numbers (inclusive)
+///
+/// ## Response
+///
+/// * Response payload size: 0 <= size <= 2MB
+/// * Storage map values per response: 0 <= count <= (2MB / (2*Word + u32 + u8)) + 1
 pub(crate) fn select_account_storage_map_values(
     conn: &mut SqliteConnection,
     account_id: AccountId,
-    block_from: BlockNumber,
-    block_to: BlockNumber,
+    block_range: RangeInclusive<BlockNumber>,
 ) -> Result<StorageMapValuesPage, DatabaseError> {
     use schema::account_storage_map_values as t;
 
-    // SELECT
-    //     block_num,
-    //     slot,
-    //     key,
-    //     value
-    // FROM
-    //     account_storage_map_values
-    // WHERE
-    //     account_id = ?1
-    //     AND block_num >= ?2
-    //     AND block_num <= ?3
-    // ORDER BY
-    //     block_num ASC
-    // LIMIT
-    //     MAX_ROWS + 1;
-
     // TODO: These limits should be given by the protocol.
     // See miden-base/issues/1770 for more details
     pub const MAX_PAYLOAD_BYTES: usize = 2 * 1024 * 1024; // 2 MB
@@ -369,8 +435,11 @@ pub(crate) fn select_account_storage_map_values(
         return Err(DatabaseError::AccountNotPublic(account_id));
     }
 
-    if block_from > block_to {
-        return Err(DatabaseError::InvalidBlockRange { from: block_from, to: block_to });
+    if block_range.is_empty() {
+        return Err(DatabaseError::InvalidBlockRange {
+            from: *block_range.start(),
+            to: *block_range.end(),
+        });
     }
 
     let raw: Vec<(i64, i32, Vec<u8>, Vec<u8>)> =
@@ -378,8 +447,8 @@ pub(crate) fn select_account_storage_map_values(
             .filter(
                 t::account_id
                     .eq(account_id.to_bytes())
-                    .and(t::block_num.ge(block_from.to_raw_sql()))
-                    .and(t::block_num.le(block_to.to_raw_sql())),
+                    .and(t::block_num.ge(block_range.start().to_raw_sql()))
+                    .and(t::block_num.le(block_range.end().to_raw_sql())),
             )
             .order(t::block_num.asc())
             .limit(i64::try_from(MAX_ROWS + 1).expect("limit fits within i64"))
@@ -387,13 +456,13 @@ pub(crate) fn select_account_storage_map_values(
 
     // Discard the last block in the response (assumes more than one block may be present)
 
-    let (last_block_included, values) = if raw.len() > MAX_ROWS {
+    let (last_block_included, values) = if let Some(&(last_block_num, ..)) = raw.last()
+        && raw.len() >= MAX_ROWS
+    {
         // NOTE: If the query contains at least one more row than the amount of storage map updates
         // allowed in a single block for an account, then the response is guaranteed to have at
         // least two blocks
 
-        // SAFETY: we checked that the vector is not empty
-        let &(last_block_num, ..) = raw.last().unwrap();
         let values = raw
             .into_iter()
             .take_while(|(bn, ..)| *bn != last_block_num)
@@ -403,7 +472,7 @@ pub(crate) fn select_account_storage_map_values(
         (BlockNumber::from_raw_sql(last_block_num.saturating_sub(1))?, values)
     } else {
         (
-            block_to,
+            *block_range.end(),
             raw.into_iter().map(StorageMapValue::from_raw_row).collect::<Result<_, _>>()?,
         )
     };
@@ -445,20 +514,20 @@ pub struct AccountRaw {
 }
 
 #[derive(Debug, Clone, QueryableByName)]
-pub struct AccountWithCodeRaw {
+pub struct AccountWithCodeRawJoined {
     #[diesel(embed)]
     pub account: AccountRaw,
     #[diesel(embed)]
     pub code: Option<Vec<u8>>,
 }
 
-impl From<(AccountRaw, Option<Vec<u8>>)> for AccountWithCodeRaw {
+impl From<(AccountRaw, Option<Vec<u8>>)> for AccountWithCodeRawJoined {
     fn from((account, code): (AccountRaw, Option<Vec<u8>>)) -> Self {
         Self { account, code }
     }
 }
 
-impl TryInto<proto::domain::account::AccountInfo> for AccountWithCodeRaw {
+impl TryInto<proto::domain::account::AccountInfo> for AccountWithCodeRawJoined {
     type Error = DatabaseError;
     fn try_into(self) -> Result<proto::domain::account::AccountInfo, Self::Error> {
         use proto::domain::account::{AccountInfo, AccountSummary};
@@ -476,7 +545,7 @@ impl TryInto<proto::domain::account::AccountInfo> for AccountWithCodeRaw {
     }
 }
 
-impl TryInto<Option<Account>> for AccountWithCodeRaw {
+impl TryInto<Option<Account>> for AccountWithCodeRawJoined {
     type Error = DatabaseError;
     fn try_into(self) -> Result<Option<Account>, Self::Error> {
         let account_id = AccountId::read_from_bytes(&self.account.account_id[..])?;
@@ -521,3 +590,354 @@ impl TryInto<AccountSummary> for AccountSummaryRaw {
         })
     }
 }
+
+/// Insert an account vault asset row into the DB using the given [`SqliteConnection`].
+///
+/// This function will set `is_latest_update=true` for the new row and update any existing
+/// row with the same `(account_id, vault_key)` tuple to `is_latest_update=false`.
+///
+/// # Returns
+///
+/// The number of affected rows.
+pub(crate) fn insert_account_vault_asset(
+    conn: &mut SqliteConnection,
+    account_id: AccountId,
+    block_num: BlockNumber,
+    vault_key: Word,
+    asset: Option<Asset>,
+) -> Result<usize, DatabaseError> {
+    let record = AccountAssetRowInsert::new(&account_id, &vault_key, block_num, asset, true);
+
+    diesel::Connection::transaction(conn, |conn| {
+        // First, update any existing rows with the same (account_id, vault_key) to set
+        // is_latest_update=false
+        let update_count = diesel::update(schema::account_vault_assets::table)
+            .filter(
+                schema::account_vault_assets::account_id
+                    .eq(&account_id.to_bytes())
+                    .and(schema::account_vault_assets::vault_key.eq(&vault_key.to_bytes()))
+                    .and(schema::account_vault_assets::is_latest_update.eq(true)),
+            )
+            .set(schema::account_vault_assets::is_latest_update.eq(false))
+            .execute(conn)?;
+
+        // Insert the new latest row
+        let insert_count = diesel::insert_into(schema::account_vault_assets::table)
+            .values(record)
+            .execute(conn)?;
+
+        Ok(update_count + insert_count)
+    })
+}
+
+/// Insert an account storage map value into the DB using the given [`SqliteConnection`].
+///
+/// This function will set `is_latest_update=true` for the new row and update any existing
+/// row with the same `(account_id, slot, key)` tuple to `is_latest_update=false`.
+///
+/// # Returns
+///
+/// The number of affected rows.
+pub(crate) fn insert_account_storage_map_value(
+    conn: &mut SqliteConnection,
+    account_id: AccountId,
+    block_num: BlockNumber,
+    slot: u8,
+    key: Word,
+    value: Word,
+) -> Result<usize, DatabaseError> {
+    let account_id = account_id.to_bytes();
+    let key = key.to_bytes();
+    let value = value.to_bytes();
+    let slot = slot_to_raw_sql(slot);
+    let block_num = block_num.to_raw_sql();
+
+    let update_count = diesel::update(schema::account_storage_map_values::table)
+        .filter(
+            schema::account_storage_map_values::account_id
+                .eq(&account_id)
+                .and(schema::account_storage_map_values::slot.eq(slot))
+                .and(schema::account_storage_map_values::key.eq(&key))
+                .and(schema::account_storage_map_values::is_latest_update.eq(true)),
+        )
+        .set(schema::account_storage_map_values::is_latest_update.eq(false))
+        .execute(conn)?;
+
+    let record = AccountStorageMapRowInsert {
+        account_id,
+        key,
+        value,
+        slot,
+        block_num,
+        is_latest_update: true,
+    };
+    let insert_count = diesel::insert_into(schema::account_storage_map_values::table)
+        .values(record)
+        .execute(conn)?;
+
+    Ok(update_count + insert_count)
+}
+
+/// Attention: Assumes the account details are NOT null! The schema explicitly allows this though!
+#[allow(clippy::too_many_lines)]
+pub(crate) fn upsert_accounts(
+    conn: &mut SqliteConnection,
+    accounts: &[BlockAccountUpdate],
+    block_num: BlockNumber,
+) -> Result<usize, DatabaseError> {
+    use proto::domain::account::NetworkAccountPrefix;
+
+    fn select_details_stmt(
+        conn: &mut SqliteConnection,
+        account_id: AccountId,
+    ) -> Result<Vec<Account>, DatabaseError> {
+        let account_id = account_id.to_bytes();
+        let accounts = SelectDsl::select(
+            schema::accounts::table.left_join(
+                schema::account_codes::table.on(schema::accounts::code_commitment
+                    .eq(schema::account_codes::code_commitment.nullable())),
+            ),
+            (AccountRaw::as_select(), schema::account_codes::code.nullable()),
+        )
+        .filter(schema::accounts::account_id.eq(account_id))
+        .get_results::<(AccountRaw, Option<Vec<u8>>)>(conn)?;
+
+        // SELECT .. FROM accounts LEFT JOIN account_codes
+        // ON accounts.code_commitment == account_codes.code_commitment
+
+        let accounts = Result::from_iter(accounts.into_iter().filter_map(|x| {
+            let account_with_code = AccountWithCodeRawJoined::from(x);
+            account_with_code.try_into().transpose()
+        }))?;
+        Ok(accounts)
+    }
+
+    let mut count = 0;
+    for update in accounts {
+        let account_id = update.account_id();
+        // Extract the 30-bit prefix to provide easy look ups for NTB
+        // Do not store prefix for accounts that are not network
+        let network_account_id_prefix = if account_id.is_network() {
+            Some(NetworkAccountPrefix::try_from(account_id)?)
+        } else {
+            None
+        };
+
+        let full_account = match update.details() {
+            AccountUpdateDetails::Private => None,
+            AccountUpdateDetails::New(account) => {
+                debug_assert_eq!(account_id, account.id());
+
+                if account.commitment() != update.final_state_commitment() {
+                    return Err(DatabaseError::AccountCommitmentsMismatch {
+                        calculated: account.commitment(),
+                        expected: update.final_state_commitment(),
+                    });
+                }
+
+                for (slot_idx, slot) in account.storage().slots().iter().enumerate() {
+                    match slot {
+                        StorageSlot::Value(_) => {},
+                        StorageSlot::Map(storage_map) => {
+                            for (key, value) in storage_map.entries() {
+                                // SAFETY: We can safely unwrap the conversion to u8 because
+                                // accounts have a limit of 255 storage elements
+                                insert_account_storage_map_value(
+                                    conn,
+                                    account_id,
+                                    block_num,
+                                    u8::try_from(slot_idx).unwrap(),
+                                    *key,
+                                    *value,
+                                )?;
+                            }
+                        },
+                    }
+                }
+
+                Some(Cow::Borrowed(account))
+            },
+            AccountUpdateDetails::Delta(delta) => {
+                let mut rows = select_details_stmt(conn, account_id)?.into_iter();
+                let Some(account) = rows.next() else {
+                    return Err(DatabaseError::AccountNotFoundInDb(account_id));
+                };
+
+                // --- process storage map updates ----------------------------
+
+                for (&slot, map_delta) in delta.storage().maps() {
+                    for (key, value) in map_delta.entries() {
+                        insert_account_storage_map_value(
+                            conn,
+                            account_id,
+                            block_num,
+                            slot,
+                            (*key).into(),
+                            *value,
+                        )?;
+                    }
+                }
+
+                // apply delta to the account; we need to do this before we process asset updates
+                // because we currently need to get the current value of fungible assets from the
+                // account
+                let account = apply_delta(account, delta, &update.final_state_commitment())?;
+
+                // --- process asset updates ----------------------------------
+
+                for (faucet_id, _) in delta.vault().fungible().iter() {
+                    let current_amount = account.vault().get_balance(*faucet_id).unwrap();
+                    let asset: Asset = FungibleAsset::new(*faucet_id, current_amount)?.into();
+                    let asset_update_or_removal =
+                        if current_amount == 0 { None } else { Some(asset) };
+
+                    insert_account_vault_asset(
+                        conn,
+                        account.id(),
+                        block_num,
+                        asset.vault_key(),
+                        asset_update_or_removal,
+                    )?;
+                }
+
+                for (asset, delta_action) in delta.vault().non_fungible().iter() {
+                    let asset_update = match delta_action {
+                        NonFungibleDeltaAction::Add => Some(Asset::NonFungible(*asset)),
+                        NonFungibleDeltaAction::Remove => None,
+                    };
+                    insert_account_vault_asset(
+                        conn,
+                        account.id(),
+                        block_num,
+                        asset.vault_key(),
+                        asset_update,
+                    )?;
+                }
+
+                Some(Cow::Owned(account))
+            },
+        };
+
+        if let Some(code) = full_account.as_ref().map(|account| account.code()) {
+            let code_value = AccountCodeRowInsert {
+                code_commitment: code.commitment().to_bytes(),
+                code: code.to_bytes(),
+            };
+            diesel::insert_into(schema::account_codes::table)
+                .values(&code_value)
+                .on_conflict(schema::account_codes::code_commitment)
+                .do_nothing()
+                .execute(conn)?;
+        }
+
+        let account_value = AccountRowInsert {
+            account_id: account_id.to_bytes(),
+            network_account_id_prefix: network_account_id_prefix
+                .map(NetworkAccountPrefix::to_raw_sql),
+            account_commitment: update.final_state_commitment().to_bytes(),
+            block_num: block_num.to_raw_sql(),
+            nonce: full_account.as_ref().map(|account| nonce_to_raw_sql(account.nonce())),
+            storage: full_account.as_ref().map(|account| account.storage().to_bytes()),
+            vault: full_account.as_ref().map(|account| account.vault().to_bytes()),
+            code_commitment: full_account
+                .as_ref()
+                .map(|account| account.code().commitment().to_bytes()),
+        };
+
+        let v = account_value.clone();
+        let inserted = diesel::insert_into(schema::accounts::table)
+            .values(&v)
+            .on_conflict(schema::accounts::account_id)
+            .do_update()
+            .set(account_value)
+            .execute(conn)?;
+
+        debug_assert_eq!(inserted, 1);
+
+        count += inserted;
+    }
+
+    Ok(count)
+}
+
+/// Deserializes account and applies account delta.
+pub(crate) fn apply_delta(
+    mut account: Account,
+    delta: &AccountDelta,
+    final_state_commitment: &Word,
+) -> crate::db::Result<Account, DatabaseError> {
+    account.apply_delta(delta)?;
+
+    let actual_commitment = account.commitment();
+    if &actual_commitment != final_state_commitment {
+        return Err(DatabaseError::AccountCommitmentsMismatch {
+            calculated: actual_commitment,
+            expected: *final_state_commitment,
+        });
+    }
+
+    Ok(account)
+}
+
+#[derive(Insertable, Debug, Clone)]
+#[diesel(table_name = schema::account_codes)]
+pub(crate) struct AccountCodeRowInsert {
+    pub(crate) code_commitment: Vec<u8>,
+    pub(crate) code: Vec<u8>,
+}
+
+#[derive(Insertable, AsChangeset, Debug, Clone)]
+#[diesel(table_name = schema::accounts)]
+pub(crate) struct AccountRowInsert {
+    pub(crate) account_id: Vec<u8>,
+    pub(crate) network_account_id_prefix: Option<i64>,
+    pub(crate) block_num: i64,
+    pub(crate) account_commitment: Vec<u8>,
+    pub(crate) code_commitment: Option<Vec<u8>>,
+    pub(crate) storage: Option<Vec<u8>>,
+    pub(crate) vault: Option<Vec<u8>>,
+    pub(crate) nonce: Option<i64>,
+}
+
+#[derive(Insertable, AsChangeset, Debug, Clone)]
+#[diesel(table_name = schema::account_vault_assets)]
+pub(crate) struct AccountAssetRowInsert {
+    pub(crate) account_id: Vec<u8>,
+    pub(crate) block_num: i64,
+    pub(crate) vault_key: Vec<u8>,
+    pub(crate) asset: Option<Vec<u8>>,
+    pub(crate) is_latest_update: bool,
+}
+
+impl AccountAssetRowInsert {
+    pub(crate) fn new(
+        account_id: &AccountId,
+        vault_key: &Word,
+        block_num: BlockNumber,
+        asset: Option<Asset>,
+        is_latest_update: bool,
+    ) -> Self {
+        let account_id = account_id.to_bytes();
+        let vault_key = vault_key.to_bytes();
+        let block_num = block_num.to_raw_sql();
+        let asset = asset.map(|asset| asset.to_bytes());
+        Self {
+            account_id,
+            block_num,
+            vault_key,
+            asset,
+            is_latest_update,
+        }
+    }
+}
+
+#[derive(Insertable, AsChangeset, Debug, Clone)]
+#[diesel(table_name = schema::account_storage_map_values)]
+pub(crate) struct AccountStorageMapRowInsert {
+    pub(crate) account_id: Vec<u8>,
+    pub(crate) block_num: i64,
+    pub(crate) slot: i32,
+    pub(crate) key: Vec<u8>,
+    pub(crate) value: Vec<u8>,
+    pub(crate) is_latest_update: bool,
+}
diff --git a/crates/store/src/db/models/queries/block_headers.rs b/crates/store/src/db/models/queries/block_headers.rs
index d4bc0b5c8..c071ab34d 100644
--- a/crates/store/src/db/models/queries/block_headers.rs
+++ b/crates/store/src/db/models/queries/block_headers.rs
@@ -1,3 +1,4 @@
+use diesel::prelude::Insertable;
 use diesel::query_dsl::methods::SelectDsl;
 use diesel::{
     ExpressionMethods,
@@ -10,7 +11,7 @@ use diesel::{
     SelectableHelper,
     SqliteConnection,
 };
-use miden_lib::utils::Deserializable;
+use miden_lib::utils::{Deserializable, Serializable};
 use miden_node_utils::limiter::{QueryParamBlockLimit, QueryParamLimiter};
 use miden_objects::block::{BlockHeader, BlockNumber};
 
@@ -23,37 +24,54 @@ use crate::db::schema;
 ///
 /// # Returns
 ///
-/// When `block_number` is [None], the latest block header is returned. Otherwise, the block with
+/// When `block_num` is [None], the latest block header is returned. Otherwise, the block with
 /// the given block height is returned.
+///
+/// ```sql
+/// # with argument
+/// SELECT block_header FROM block_headers WHERE block_num = ?1
+/// # without
+/// SELECT block_header FROM block_headers ORDER BY block_num DESC LIMIT 1
+/// ```
 pub(crate) fn select_block_header_by_block_num(
     conn: &mut SqliteConnection,
-    maybe_block_number: Option<BlockNumber>,
+    maybe_block_num: Option<BlockNumber>,
 ) -> Result<Option<BlockHeader>, DatabaseError> {
-    let sel = SelectDsl::select(schema::block_headers::table, BlockHeaderRaw::as_select());
-    let row = if let Some(block_number) = maybe_block_number {
-        // SELECT block_header FROM block_headers WHERE block_num = ?1
-        sel.filter(schema::block_headers::block_num.eq(block_number.to_raw_sql()))
-            .get_result::<BlockHeaderRaw>(conn)
+    let sel = SelectDsl::select(schema::block_headers::table, BlockHeaderRawRow::as_select());
+    let row = if let Some(block_num) = maybe_block_num {
+        sel.filter(schema::block_headers::block_num.eq(block_num.to_raw_sql()))
+            .get_result::<BlockHeaderRawRow>(conn)
             .optional()?
         // invariant: only one block exists with the given block header, so the length is
         // always zero or one
     } else {
-        // SELECT block_header FROM block_headers ORDER BY block_num DESC LIMIT 1
         sel.order(schema::block_headers::block_num.desc())
             .limit(1)
-            .get_result::<BlockHeaderRaw>(conn)
+            .get_result::<BlockHeaderRawRow>(conn)
             .optional()?
     };
     row.map(std::convert::TryInto::try_into).transpose()
 }
 
-/// Select all the given block headers from the DB using the given [`SqliteConnection`].
+/// Select block headers for the given block numbers.
+///
+/// # Parameters
+/// * `blocks`: Iterator of block numbers to retrieve
+///     - Limit: 0 <= count <= 1000
 ///
 /// # Note
 ///
 /// Only returns the block headers that are actually present.
 ///
 /// # Returns
+///
+/// A vector of [`BlockHeader`] or an error.
+///
+/// # Raw SQL
+///
+/// ```sql
+/// SELECT block_header FROM block_headers WHERE block_num IN (?1)
+/// ```
 pub fn select_block_headers(
     conn: &mut SqliteConnection,
     blocks: impl Iterator<Item = BlockNumber> + Send,
@@ -66,12 +84,11 @@ pub fn select_block_headers(
     // <https://doc.rust-lang.org/src/core/iter/adapters/chain.rs.html#184>
     QueryParamBlockLimit::check(blocks.size_hint().0)?;
 
-    // SELECT block_header FROM block_headers WHERE block_num IN rarray(?1)
     let blocks = Vec::from_iter(blocks.map(SqlTypeConvert::to_raw_sql));
     let raw_block_headers =
-        QueryDsl::select(schema::block_headers::table, BlockHeaderRaw::as_select())
+        QueryDsl::select(schema::block_headers::table, BlockHeaderRawRow::as_select())
             .filter(schema::block_headers::block_num.eq_any(blocks))
-            .load::<BlockHeaderRaw>(conn)?;
+            .load::<BlockHeaderRawRow>(conn)?;
     vec_raw_try_into(raw_block_headers)
 }
 
@@ -80,29 +97,71 @@ pub fn select_block_headers(
 /// # Returns
 ///
 /// A vector of [`BlockHeader`] or an error.
+///
+/// # Raw SQL
+///
+/// ```sql
+/// SELECT block_header FROM block_headers ORDER BY block_num ASC
+/// ```
 pub fn select_all_block_headers(
     conn: &mut SqliteConnection,
 ) -> Result<Vec<BlockHeader>, DatabaseError> {
-    // SELECT block_header FROM block_headers ORDER BY block_num ASC
     let raw_block_headers =
-        QueryDsl::select(schema::block_headers::table, BlockHeaderRaw::as_select())
+        QueryDsl::select(schema::block_headers::table, BlockHeaderRawRow::as_select())
             .order(schema::block_headers::block_num.asc())
-            .load::<BlockHeaderRaw>(conn)?;
+            .load::<BlockHeaderRawRow>(conn)?;
     vec_raw_try_into(raw_block_headers)
 }
 
 #[derive(Debug, Clone, Queryable, QueryableByName, Selectable)]
 #[diesel(table_name = schema::block_headers)]
 #[diesel(check_for_backend(diesel::sqlite::Sqlite))]
-pub struct BlockHeaderRaw {
+pub struct BlockHeaderRawRow {
     #[allow(dead_code)]
     pub block_num: i64,
     pub block_header: Vec<u8>,
 }
-impl TryInto<BlockHeader> for BlockHeaderRaw {
+impl TryInto<BlockHeader> for BlockHeaderRawRow {
     type Error = DatabaseError;
     fn try_into(self) -> Result<BlockHeader, Self::Error> {
         let block_header = BlockHeader::read_from_bytes(&self.block_header[..])?;
         Ok(block_header)
     }
 }
+
+#[derive(Debug, Clone, Insertable)]
+#[diesel(table_name = schema::block_headers)]
+#[diesel(check_for_backend(diesel::sqlite::Sqlite))]
+pub struct BlockHeaderInsert {
+    pub block_num: i64,
+    pub block_header: Vec<u8>,
+}
+impl From<&BlockHeader> for BlockHeaderInsert {
+    fn from(block_header: &BlockHeader) -> Self {
+        Self {
+            block_num: block_header.block_num().to_raw_sql(),
+            block_header: block_header.to_bytes(),
+        }
+    }
+}
+
+/// Insert a [`BlockHeader`] to the DB using the given [`SqliteConnection`].
+///
+/// # Returns
+///
+/// The number of affected rows.
+///
+/// # Note
+///
+/// The [`SqliteConnection`] object is not consumed. It's up to the caller to commit or rollback the
+/// transaction
+pub(crate) fn insert_block_header(
+    conn: &mut SqliteConnection,
+    block_header: &BlockHeader,
+) -> Result<usize, DatabaseError> {
+    let block_header = BlockHeaderInsert::from(block_header);
+    let count = diesel::insert_into(schema::block_headers::table)
+        .values(&[block_header])
+        .execute(conn)?;
+    Ok(count)
+}
diff --git a/crates/store/src/db/models/queries/insertions.rs b/crates/store/src/db/models/queries/insertions.rs
deleted file mode 100644
index 70559b70e..000000000
--- a/crates/store/src/db/models/queries/insertions.rs
+++ /dev/null
@@ -1,515 +0,0 @@
-use std::borrow::Cow;
-
-use diesel::prelude::{AsChangeset, Insertable};
-use diesel::query_dsl::methods::SelectDsl;
-use diesel::query_dsl::{QueryDsl, RunQueryDsl};
-use diesel::{
-    BoolExpressionMethods,
-    ExpressionMethods,
-    JoinOnDsl,
-    NullableExpressionMethods,
-    SelectableHelper,
-    SqliteConnection,
-};
-use miden_lib::utils::Serializable;
-use miden_node_proto as proto;
-use miden_objects::Word;
-use miden_objects::account::delta::AccountUpdateDetails;
-use miden_objects::account::{
-    Account,
-    AccountDelta,
-    AccountId,
-    NonFungibleDeltaAction,
-    StorageSlot,
-};
-use miden_objects::asset::{Asset, FungibleAsset};
-use miden_objects::block::{BlockAccountUpdate, BlockHeader, BlockNumber};
-use miden_objects::note::Nullifier;
-use miden_objects::transaction::OrderedTransactionHeaders;
-
-use super::accounts::{AccountRaw, AccountWithCodeRaw};
-use super::{DatabaseError, NoteRecord};
-use crate::db::models::conv::{
-    SqlTypeConvert,
-    aux_to_raw_sql,
-    execution_hint_to_raw_sql,
-    idx_to_raw_sql,
-    nonce_to_raw_sql,
-    note_type_to_raw_sql,
-    slot_to_raw_sql,
-};
-use crate::db::schema;
-
-/// Insert a [`BlockHeader`] to the DB using the given [`SqliteConnection`].
-///
-/// # Returns
-///
-/// The number of affected rows.
-///
-/// # Note
-///
-/// The [`SqliteConnection`] object is not consumed. It's up to the caller to commit or rollback the
-/// transaction
-pub(crate) fn insert_block_header(
-    conn: &mut SqliteConnection,
-    block_header: &BlockHeader,
-) -> Result<usize, DatabaseError> {
-    let count = diesel::insert_into(schema::block_headers::table)
-        .values(&[(
-            schema::block_headers::block_num.eq(block_header.block_num().to_raw_sql()),
-            schema::block_headers::block_header.eq(block_header.to_bytes()),
-        )])
-        .execute(conn)?;
-    Ok(count)
-}
-
-/// Insert an account vault asset row into the DB using the given [`SqliteConnection`].
-///
-/// This function will set `is_latest_update=true` for the new row and update any existing
-/// row with the same `(account_id, vault_key)` tuple to `is_latest_update=false`.
-///
-/// # Returns
-///
-/// The number of affected rows.
-pub(crate) fn insert_account_vault_asset(
-    conn: &mut SqliteConnection,
-    account_id: AccountId,
-    block_num: BlockNumber,
-    vault_key: Word,
-    asset: Option<Asset>,
-) -> Result<usize, DatabaseError> {
-    let account_id = account_id.to_bytes();
-    let vault_key = vault_key.to_bytes();
-    let block_num = block_num.to_raw_sql();
-    let asset = asset.map(|asset| asset.to_bytes());
-    diesel::Connection::transaction(conn, |conn| {
-        // First, update any existing rows with the same (account_id, vault_key) to set
-        // is_latest_update=false
-        let update_count = diesel::update(schema::account_vault_assets::table)
-            .filter(
-                schema::account_vault_assets::account_id
-                    .eq(&account_id)
-                    .and(schema::account_vault_assets::vault_key.eq(&vault_key))
-                    .and(schema::account_vault_assets::is_latest_update.eq(true)),
-            )
-            .set(schema::account_vault_assets::is_latest_update.eq(false))
-            .execute(conn)?;
-
-        // Insert the new latest row
-        let insert_count = diesel::insert_into(schema::account_vault_assets::table)
-            .values((
-                schema::account_vault_assets::account_id.eq(&account_id),
-                schema::account_vault_assets::block_num.eq(block_num),
-                schema::account_vault_assets::vault_key.eq(&vault_key),
-                schema::account_vault_assets::asset.eq(&asset),
-                schema::account_vault_assets::is_latest_update.eq(true),
-            ))
-            .execute(conn)?;
-
-        Ok(update_count + insert_count)
-    })
-}
-
-/// Deserializes account and applies account delta.
-pub(crate) fn apply_delta(
-    mut account: Account,
-    delta: &AccountDelta,
-    final_state_commitment: &Word,
-) -> crate::db::Result<Account, DatabaseError> {
-    account.apply_delta(delta)?;
-
-    let actual_commitment = account.commitment();
-    if &actual_commitment != final_state_commitment {
-        return Err(DatabaseError::AccountCommitmentsMismatch {
-            calculated: actual_commitment,
-            expected: *final_state_commitment,
-        });
-    }
-
-    Ok(account)
-}
-
-/// Insert an account storage map value into the DB using the given [`SqliteConnection`].
-///
-/// This function will set `is_latest_update=true` for the new row and update any existing
-/// row with the same `(account_id, slot, key)` tuple to `is_latest_update=false`.
-///
-/// # Returns
-///
-/// The number of affected rows.
-pub(crate) fn insert_account_storage_map_value(
-    conn: &mut SqliteConnection,
-    account_id: AccountId,
-    block_num: BlockNumber,
-    slot: u8,
-    key: Word,
-    value: Word,
-) -> Result<usize, DatabaseError> {
-    let account_id = account_id.to_bytes();
-    let key = key.to_bytes();
-    let value = value.to_bytes();
-    let slot_idx = slot_to_raw_sql(slot);
-    let block_num = block_num.to_raw_sql();
-
-    diesel::Connection::transaction(conn, |conn| {
-        // First, update any existing rows with the same (account_id, slot, key) to set
-        // is_latest_update=false
-        let update_count = diesel::update(schema::account_storage_map_values::table)
-            .filter(
-                schema::account_storage_map_values::account_id
-                    .eq(&account_id)
-                    .and(schema::account_storage_map_values::slot.eq(slot_idx))
-                    .and(schema::account_storage_map_values::key.eq(&key))
-                    .and(schema::account_storage_map_values::is_latest_update.eq(true)),
-            )
-            .set(schema::account_storage_map_values::is_latest_update.eq(false))
-            .execute(conn)?;
-
-        let insert_count = diesel::insert_into(schema::account_storage_map_values::table)
-            .values((
-                schema::account_storage_map_values::account_id.eq(&account_id),
-                schema::account_storage_map_values::block_num.eq(block_num),
-                schema::account_storage_map_values::slot.eq(slot_idx),
-                schema::account_storage_map_values::key.eq(&key),
-                schema::account_storage_map_values::value.eq(&value),
-                schema::account_storage_map_values::is_latest_update.eq(true),
-            ))
-            .execute(conn)?;
-
-        Ok(update_count + insert_count)
-    })
-}
-
-/// Attention: Assumes the account details are NOT null! The schema explicitly allows this though!
-#[allow(clippy::too_many_lines)]
-pub(crate) fn upsert_accounts(
-    conn: &mut SqliteConnection,
-    accounts: &[BlockAccountUpdate],
-    block_num: BlockNumber,
-) -> Result<usize, DatabaseError> {
-    use proto::domain::account::NetworkAccountPrefix;
-
-    fn select_details_stmt(
-        conn: &mut SqliteConnection,
-        account_id: AccountId,
-    ) -> Result<Vec<Account>, DatabaseError> {
-        let account_id = account_id.to_bytes();
-        let accounts = SelectDsl::select(
-            schema::accounts::table.left_join(
-                schema::account_codes::table.on(schema::accounts::code_commitment
-                    .eq(schema::account_codes::code_commitment.nullable())),
-            ),
-            (AccountRaw::as_select(), schema::account_codes::code.nullable()),
-        )
-        .filter(schema::accounts::account_id.eq(account_id))
-        .get_results::<(AccountRaw, Option<Vec<u8>>)>(conn)?;
-
-        // SELECT .. FROM accounts LEFT JOIN account_codes
-        // ON accounts.code_commitment == account_codes.code_commitment
-
-        let accounts = Result::from_iter(accounts.into_iter().filter_map(|x| {
-            let account_with_code = AccountWithCodeRaw::from(x);
-            account_with_code.try_into().transpose()
-        }))?;
-        Ok(accounts)
-    }
-
-    let mut count = 0;
-    for update in accounts {
-        let account_id = update.account_id();
-        // Extract the 30-bit prefix to provide easy look ups for NTB
-        // Do not store prefix for accounts that are not network
-        let network_account_id_prefix = if account_id.is_network() {
-            Some(NetworkAccountPrefix::try_from(account_id)?)
-        } else {
-            None
-        };
-
-        let full_account = match update.details() {
-            AccountUpdateDetails::Private => None,
-            AccountUpdateDetails::New(account) => {
-                debug_assert_eq!(account_id, account.id());
-
-                if account.commitment() != update.final_state_commitment() {
-                    return Err(DatabaseError::AccountCommitmentsMismatch {
-                        calculated: account.commitment(),
-                        expected: update.final_state_commitment(),
-                    });
-                }
-
-                for (slot_idx, slot) in account.storage().slots().iter().enumerate() {
-                    match slot {
-                        StorageSlot::Value(_) => {},
-                        StorageSlot::Map(storage_map) => {
-                            for (key, value) in storage_map.entries() {
-                                // SAFETY: We can safely unwrap the conversion to u8 because
-                                // accounts have a limit of 255 storage elements
-                                insert_account_storage_map_value(
-                                    conn,
-                                    account_id,
-                                    block_num,
-                                    u8::try_from(slot_idx).unwrap(),
-                                    *key,
-                                    *value,
-                                )?;
-                            }
-                        },
-                    }
-                }
-
-                Some(Cow::Borrowed(account))
-            },
-            AccountUpdateDetails::Delta(delta) => {
-                let mut rows = select_details_stmt(conn, account_id)?.into_iter();
-                let Some(account) = rows.next() else {
-                    return Err(DatabaseError::AccountNotFoundInDb(account_id));
-                };
-
-                // --- process storage map updates ----------------------------
-
-                for (&slot, map_delta) in delta.storage().maps() {
-                    for (key, value) in map_delta.entries() {
-                        insert_account_storage_map_value(
-                            conn,
-                            account_id,
-                            block_num,
-                            slot,
-                            (*key).into(),
-                            *value,
-                        )?;
-                    }
-                }
-
-                // apply delta to the account; we need to do this before we process asset updates
-                // because we currently need to get the current value of fungible assets from the
-                // account
-                let account = apply_delta(account, delta, &update.final_state_commitment())?;
-
-                // --- process asset updates ----------------------------------
-
-                for (faucet_id, _) in delta.vault().fungible().iter() {
-                    let current_amount = account.vault().get_balance(*faucet_id).unwrap();
-                    let asset: Asset = FungibleAsset::new(*faucet_id, current_amount)?.into();
-                    let asset_update_or_removal =
-                        if current_amount == 0 { None } else { Some(asset) };
-
-                    insert_account_vault_asset(
-                        conn,
-                        account.id(),
-                        block_num,
-                        asset.vault_key(),
-                        asset_update_or_removal,
-                    )?;
-                }
-
-                for (asset, delta_action) in delta.vault().non_fungible().iter() {
-                    let asset_update = match delta_action {
-                        NonFungibleDeltaAction::Add => Some(Asset::NonFungible(*asset)),
-                        NonFungibleDeltaAction::Remove => None,
-                    };
-                    insert_account_vault_asset(
-                        conn,
-                        account.id(),
-                        block_num,
-                        asset.vault_key(),
-                        asset_update,
-                    )?;
-                }
-
-                Some(Cow::Owned(account))
-            },
-        };
-
-        if let Some(code) = full_account.as_ref().map(|account| account.code()) {
-            let code_value = AccountCodeRowInsert {
-                code_commitment: code.commitment().to_bytes(),
-                code: code.to_bytes(),
-            };
-            diesel::insert_into(schema::account_codes::table)
-                .values(&code_value)
-                .on_conflict(schema::account_codes::code_commitment)
-                .do_nothing()
-                .execute(conn)?;
-        }
-
-        let account_value = AccountRowInsert {
-            account_id: account_id.to_bytes(),
-            network_account_id_prefix: network_account_id_prefix
-                .map(NetworkAccountPrefix::to_raw_sql),
-            account_commitment: update.final_state_commitment().to_bytes(),
-            block_num: block_num.to_raw_sql(),
-            nonce: full_account.as_ref().map(|account| nonce_to_raw_sql(account.nonce())),
-            storage: full_account.as_ref().map(|account| account.storage().to_bytes()),
-            vault: full_account.as_ref().map(|account| account.vault().to_bytes()),
-            code_commitment: full_account
-                .as_ref()
-                .map(|account| account.code().commitment().to_bytes()),
-        };
-
-        let v = account_value.clone();
-        let inserted = diesel::insert_into(schema::accounts::table)
-            .values(&v)
-            .on_conflict(schema::accounts::account_id)
-            .do_update()
-            .set(account_value)
-            .execute(conn)?;
-
-        debug_assert_eq!(inserted, 1);
-
-        count += inserted;
-    }
-
-    Ok(count)
-}
-
-/// Insert notes to the DB using the given [`SqliteConnection`]. Public notes should also have a
-/// nullifier.
-///
-/// # Returns
-///
-/// The number of affected rows.
-///
-/// # Note
-///
-/// The [`SqliteConnection`] object is not consumed. It's up to the caller to commit or rollback the
-/// transaction.
-pub(crate) fn insert_notes(
-    conn: &mut SqliteConnection,
-    notes: &[(NoteRecord, Option<Nullifier>)],
-) -> Result<usize, DatabaseError> {
-    let count = diesel::insert_into(schema::notes::table)
-        .values(Vec::from_iter(
-            notes
-                .iter()
-                .map(|(note, nullifier)| NoteInsertRowRaw::from((note.clone(), *nullifier))),
-        ))
-        .execute(conn)?;
-    Ok(count)
-}
-
-/// Insert scripts to the DB using the given [`SqliteConnection`]. It inserts the scripts held by
-/// the notes passed as parameter. If the script root already exists in the DB, it will be ignored.
-///
-/// # Returns
-///
-/// The number of affected rows.
-///
-/// # Note
-///
-/// The [`SqliteConnection`] object is not consumed. It's up to the caller to commit or rollback the
-/// transaction.
-pub(crate) fn insert_scripts<'a>(
-    conn: &mut SqliteConnection,
-    notes: impl IntoIterator<Item = &'a NoteRecord>,
-) -> Result<usize, DatabaseError> {
-    let values = Vec::from_iter(notes.into_iter().filter_map(|note| {
-        let note_details = note.details.as_ref()?;
-        Some((
-            schema::note_scripts::script_root.eq(note_details.script().root().to_bytes()),
-            schema::note_scripts::script.eq(note_details.script().to_bytes()),
-        ))
-    }));
-    let count = diesel::insert_or_ignore_into(schema::note_scripts::table)
-        .values(values)
-        .execute(conn)?;
-
-    Ok(count)
-}
-
-/// Insert transactions to the DB using the given [`SqliteConnection`].
-///
-/// # Returns
-///
-/// The number of affected rows.
-///
-/// # Note
-///
-/// The [`SqliteConnection`] object is not consumed. It's up to the caller to commit or rollback the
-/// transaction.
-pub(crate) fn insert_transactions(
-    conn: &mut SqliteConnection,
-    block_num: BlockNumber,
-    transactions: &OrderedTransactionHeaders,
-) -> Result<usize, DatabaseError> {
-    #[allow(clippy::into_iter_on_ref)] // false positive
-    let count = diesel::insert_into(schema::transactions::table)
-        .values(Vec::from_iter(transactions.as_slice().into_iter().map(|tx| {
-            (
-                schema::transactions::transaction_id.eq(tx.id().to_bytes()),
-                schema::transactions::account_id.eq(tx.account_id().to_bytes()),
-                schema::transactions::block_num.eq(block_num.to_raw_sql()),
-            )
-        })))
-        .execute(conn)?;
-    Ok(count)
-}
-
-#[derive(Debug, Clone, PartialEq, Insertable)]
-#[diesel(table_name = schema::notes)]
-pub struct NoteInsertRowRaw {
-    pub committed_at: i64,
-
-    pub batch_index: i32,
-    pub note_index: i32, // index within batch
-
-    pub note_id: Vec<u8>,
-
-    pub note_type: i32,
-    pub sender: Vec<u8>, // AccountId
-    pub tag: i32,
-    pub aux: i64,
-    pub execution_hint: i64,
-
-    pub consumed_at: Option<i64>,
-    pub assets: Option<Vec<u8>>,
-    pub inputs: Option<Vec<u8>>,
-    pub serial_num: Option<Vec<u8>>,
-    pub nullifier: Option<Vec<u8>>,
-    pub script_root: Option<Vec<u8>>,
-    pub execution_mode: i32,
-    pub inclusion_path: Vec<u8>,
-}
-
-impl From<(NoteRecord, Option<Nullifier>)> for NoteInsertRowRaw {
-    fn from((note, nullifier): (NoteRecord, Option<Nullifier>)) -> Self {
-        Self {
-            committed_at: note.block_num.to_raw_sql(),
-            batch_index: idx_to_raw_sql(note.note_index.batch_idx()),
-            note_index: idx_to_raw_sql(note.note_index.note_idx_in_batch()),
-            note_id: note.note_id.to_bytes(),
-            note_type: note_type_to_raw_sql(note.metadata.note_type() as u8),
-            sender: note.metadata.sender().to_bytes(),
-            tag: note.metadata.tag().to_raw_sql(),
-            execution_mode: note.metadata.tag().execution_mode().to_raw_sql(),
-            aux: aux_to_raw_sql(note.metadata.aux()),
-            execution_hint: execution_hint_to_raw_sql(note.metadata.execution_hint().into()),
-            inclusion_path: note.inclusion_path.to_bytes(),
-            consumed_at: None::<i64>, // New notes are always unconsumed.
-            nullifier: nullifier.as_ref().map(Nullifier::to_bytes), /* Beware: `Option<T>` also implements `to_bytes`, but this is not what you want. */
-            assets: note.details.as_ref().map(|d| d.assets().to_bytes()),
-            inputs: note.details.as_ref().map(|d| d.inputs().to_bytes()),
-            script_root: note.details.as_ref().map(|d| d.script().root().to_bytes()),
-            serial_num: note.details.as_ref().map(|d| d.serial_num().to_bytes()),
-        }
-    }
-}
-
-#[derive(Insertable, Debug, Clone)]
-#[diesel(table_name = schema::account_codes)]
-pub(crate) struct AccountCodeRowInsert {
-    pub(crate) code_commitment: Vec<u8>,
-    pub(crate) code: Vec<u8>,
-}
-
-#[derive(Insertable, AsChangeset, Debug, Clone)]
-#[diesel(table_name = schema::accounts)]
-pub(crate) struct AccountRowInsert {
-    pub(crate) account_id: Vec<u8>,
-    pub(crate) network_account_id_prefix: Option<i64>,
-    pub(crate) block_num: i64,
-    pub(crate) account_commitment: Vec<u8>,
-    pub(crate) code_commitment: Option<Vec<u8>>,
-    pub(crate) storage: Option<Vec<u8>>,
-    pub(crate) vault: Option<Vec<u8>>,
-    pub(crate) nonce: Option<i64>,
-}
diff --git a/crates/store/src/db/models/queries/mod.rs b/crates/store/src/db/models/queries/mod.rs
index d126a2c8f..81ef9b31e 100644
--- a/crates/store/src/db/models/queries/mod.rs
+++ b/crates/store/src/db/models/queries/mod.rs
@@ -1,7 +1,35 @@
+//! Abstracts all relevant queries to individual blocking function calls
+//!
+//! ## Naming
+//!
+//! * `fn *` function names have on of three prefixes: `upsert_`, `insert_` or `select_` denoting
+//!   their nature. If neither fits, then use your best judgment for naming.
+//! * `*Insert` types are used for _inserting_ data into table and _must_ implement
+//!   `diesel::Insertable`.
+//! * `*RawRow` types are used for _querying_ a _single_ table an _without_ an explicit row and must
+//!   implement a `QueryableByName` and `Selectable`.
+//! * `*RawJoined` types are used for _querying_ a _left join_ table _without_ an explicit row and
+//!   must implement a `QueryableByName` and _cannot_ implement `Selectable`.
+//!
+//! ## Type conversion
+//!
+//! The database `*Raw` and `*Joined` types use database primitives. In order to convert to correct
+//! in-memory representations it's preferable to have new-types which implement [`SqlTypeConvert`].
+//! If that is inconvenient, provide two wrapper methods for the conversion each way. There must be
+//! relevant constraints in the table. For convenience, any types that have more complex
+//! serialization may use [`Serializable`] and [`Deserializable`] for convenience.
+//!
+//! ## Assumptions
+//!
+//! Any call that sits insides of `queries/**/*.rs` can assume it's called within the scope of a
+//! transaction, any nesting of further `transaction(conn, || {})` has no effect and should be
+//! considered unnecessary boilerplate by default.
+
 #![allow(
     clippy::needless_pass_by_value,
     reason = "The parent scope does own it, passing by value avoids additional boilerplate"
 )]
+
 use diesel::SqliteConnection;
 use miden_objects::account::AccountId;
 use miden_objects::block::{BlockAccountUpdate, BlockHeader, BlockNumber};
@@ -9,7 +37,6 @@ use miden_objects::note::Nullifier;
 use miden_objects::transaction::OrderedTransactionHeaders;
 
 use super::DatabaseError;
-use crate::db::models::conv::SqlTypeConvert;
 use crate::db::{NoteRecord, StateSyncUpdate};
 use crate::errors::StateSyncError;
 
@@ -24,9 +51,11 @@ pub(crate) use nullifiers::*;
 mod notes;
 pub(crate) use notes::*;
 
-mod insertions;
-pub(crate) use insertions::*;
-
+/// Apply a new block to the state
+///
+/// # Returns
+///
+/// Number of records inserted and/or updated.
 pub(crate) fn apply_block(
     conn: &mut SqliteConnection,
     block_header: &BlockHeader,
@@ -46,17 +75,20 @@ pub(crate) fn apply_block(
     Ok(count)
 }
 
-/// Loads the state necessary for a state sync.
+/// Loads the state necessary for a state sync
+///
+/// The state sync covers from `from_start_block` until the last block that has a note matching the
+/// given `note_tags`.
 pub(crate) fn get_state_sync(
     conn: &mut SqliteConnection,
-    since_block_number: BlockNumber,
+    from_start_block: BlockNumber,
     account_ids: Vec<AccountId>,
     note_tags: Vec<u32>,
 ) -> Result<StateSyncUpdate, StateSyncError> {
     // select notes since block by tag and sender
     let notes = select_notes_since_block_by_tag_and_sender(
         conn,
-        since_block_number,
+        from_start_block,
         &account_ids[..],
         &note_tags[..],
     )?;
@@ -67,17 +99,15 @@ pub(crate) fn get_state_sync(
         .ok_or_else(|| StateSyncError::EmptyBlockHeadersTable)?;
 
     // select accounts by block range
-    let block_start = since_block_number.to_raw_sql();
-    let block_end = block_header.block_num().to_raw_sql();
+    let to_end_block = block_header.block_num();
     let account_updates =
-        select_accounts_by_block_range(conn, &account_ids, block_start, block_end)?;
+        select_accounts_by_block_range(conn, &account_ids, from_start_block..=to_end_block)?;
 
     // select transactions by accounts and block range
     let transactions = select_transactions_by_accounts_and_block_range(
         conn,
         &account_ids,
-        block_start,
-        block_end,
+        from_start_block..=to_end_block,
     )?;
     Ok(StateSyncUpdate {
         notes,
diff --git a/crates/store/src/db/models/queries/notes.rs b/crates/store/src/db/models/queries/notes.rs
index 0a63dbdf9..f572eb116 100644
--- a/crates/store/src/db/models/queries/notes.rs
+++ b/crates/store/src/db/models/queries/notes.rs
@@ -8,15 +8,22 @@ use std::collections::{BTreeMap, BTreeSet};
 use diesel::prelude::{
     BoolExpressionMethods,
     ExpressionMethods,
+    Insertable,
+    QueryDsl,
     Queryable,
     QueryableByName,
     Selectable,
-    SelectableHelper,
 };
 use diesel::query_dsl::methods::SelectDsl;
-use diesel::query_dsl::{QueryDsl, RunQueryDsl};
 use diesel::sqlite::Sqlite;
-use diesel::{JoinOnDsl, NullableExpressionMethods, OptionalExtension, SqliteConnection};
+use diesel::{
+    JoinOnDsl,
+    NullableExpressionMethods,
+    OptionalExtension,
+    RunQueryDsl,
+    SelectableHelper,
+    SqliteConnection,
+};
 use miden_lib::utils::{Deserializable, Serializable};
 use miden_node_utils::limiter::{
     QueryParamAccountIdLimit,
@@ -40,18 +47,30 @@ use miden_objects::note::{
     NoteScript,
     NoteTag,
     NoteType,
+    Nullifier,
 };
 use miden_objects::{Felt, Word};
 
-use super::DatabaseError;
-use crate::db::models::conv::{SqlTypeConvert, raw_sql_to_idx};
+use crate::db::models::conv::{
+    SqlTypeConvert,
+    aux_to_raw_sql,
+    execution_hint_to_raw_sql,
+    idx_to_raw_sql,
+    note_type_to_raw_sql,
+    raw_sql_to_idx,
+};
 use crate::db::models::queries::select_block_header_by_block_num;
 use crate::db::models::{serialize_vec, vec_raw_try_into};
-use crate::db::{NoteRecord, NoteSyncRecord, NoteSyncUpdate, Page, schema};
+use crate::db::{DatabaseError, NoteRecord, NoteSyncRecord, NoteSyncUpdate, Page, schema};
 use crate::errors::NoteSyncError;
 
-/// Select notes matching the tags and account IDs search criteria using the given
-/// [`SqliteConnection`].
+/// Select notes matching the tags and account IDs search criteria.
+///
+/// # Parameters
+/// * `account_ids`: List of account IDs to filter by
+///     - Limit: 0 <= size <= 1000
+/// * `note_tags`: List of note tags to filter by
+///     - Limit: 0 <= count <= 1000
 ///
 /// # Returns
 ///
@@ -63,47 +82,51 @@ use crate::errors::NoteSyncError;
 ///
 /// This method returns notes from a single block. To fetch all notes up to the chain tip,
 /// multiple requests are necessary.
+///
+/// # Raw SQL
+///
+/// ```sql
+/// SELECT
+///     block_num,
+///     batch_index,
+///     note_index,
+///     note_id,
+///     note_type,
+///     sender,
+///     tag,
+///     aux,
+///     execution_hint,
+///     inclusion_path
+/// FROM
+///     notes
+/// WHERE
+///     -- find the next block which contains at least one note with a matching tag or sender
+///     block_num = (
+///         SELECT
+///             block_num
+///         FROM
+///             notes
+///         WHERE
+///             (tag IN (?1) OR sender IN (?2)) AND
+///             block_num > ?3
+///         ORDER BY
+///             block_num ASC
+///     LIMIT 1) AND
+///     -- filter the block's notes and return only the ones matching the requested tags or
+/// senders     (tag IN (?1) OR sender IN (?2))
+/// ```
 pub(crate) fn select_notes_since_block_by_tag_and_sender(
     conn: &mut SqliteConnection,
-    start_block_number: BlockNumber,
+    from_start_block: BlockNumber,
     account_ids: &[AccountId],
     note_tags: &[u32],
 ) -> Result<Vec<NoteSyncRecord>, DatabaseError> {
     QueryParamAccountIdLimit::check(account_ids.len())?;
     QueryParamNoteTagLimit::check(note_tags.len())?;
-    // SELECT
-    //     block_num,
-    //     batch_index,
-    //     note_index,
-    //     note_id,
-    //     note_type,
-    //     sender,
-    //     tag,
-    //     aux,
-    //     execution_hint,
-    //     inclusion_path
-    // FROM
-    //     notes
-    // WHERE
-    //     -- find the next block which contains at least one note with a matching tag or sender
-    //     block_num = (
-    //         SELECT
-    //             block_num
-    //         FROM
-    //             notes
-    //         WHERE
-    //             (tag IN rarray(?1) OR sender IN rarray(?2)) AND
-    //             block_num > ?3
-    //         ORDER BY
-    //             block_num ASC
-    //     LIMIT 1) AND
-    //     -- filter the block's notes and return only the ones matching the requested tags or
-    // senders     (tag IN rarray(?1) OR sender IN rarray(?2))
-
     let desired_note_tags = Vec::from_iter(note_tags.iter().map(|tag| *tag as i32));
     let desired_senders = serialize_vec(account_ids.iter());
 
-    let start_block_num = start_block_number.to_raw_sql();
+    let start_block_num = from_start_block.to_raw_sql();
 
     // find block_num: select notes since block by tag and sender
     let Some(desired_block_num): Option<i64> =
@@ -142,27 +165,34 @@ pub(crate) fn select_notes_since_block_by_tag_and_sender(
     vec_raw_try_into(notes)
 }
 
+/// Select all notes matching the given set of identifiers
+///
+/// # Raw SQL
+///
+/// ```sql
+/// SELECT {}
+/// FROM notes
+/// LEFT JOIN note_scripts ON notes.script_root = note_scripts.script_root
+/// WHERE note_id IN rarray(?1),
+/// ```
 pub(crate) fn select_notes_by_id(
     conn: &mut SqliteConnection,
     note_ids: &[NoteId],
 ) -> Result<Vec<NoteRecord>, DatabaseError> {
     let note_ids = serialize_vec(note_ids);
-    // SELECT {}
-    // FROM notes
-    // LEFT JOIN note_scripts ON notes.script_root = note_scripts.script_root
-    // WHERE note_id IN rarray(?1),
-
     let q = schema::notes::table
         .left_join(
             schema::note_scripts::table
                 .on(schema::notes::script_root.eq(schema::note_scripts::script_root.nullable())),
         )
         .filter(schema::notes::note_id.eq_any(&note_ids));
-    let raw: Vec<_> =
-        SelectDsl::select(q, (NoteRecordRaw::as_select(), schema::note_scripts::script.nullable()))
-            .load::<(NoteRecordRaw, Option<Vec<u8>>)>(conn)?;
-    let records = vec_raw_try_into::<NoteRecord, NoteRecordWithScriptRaw>(
-        raw.into_iter().map(NoteRecordWithScriptRaw::from),
+    let raw: Vec<_> = SelectDsl::select(
+        q,
+        (NoteRecordRawRow::as_select(), schema::note_scripts::script.nullable()),
+    )
+    .load::<(NoteRecordRawRow, Option<Vec<u8>>)>(conn)?;
+    let records = vec_raw_try_into::<NoteRecord, NoteRecordWithScriptRawJoined>(
+        raw.into_iter().map(NoteRecordWithScriptRawJoined::from),
     )?;
     Ok(records)
 }
@@ -173,52 +203,68 @@ pub(crate) fn select_notes_by_id(
 /// # Returns
 ///
 /// A vector with notes, or an error.
+///
+/// # Raw SQL
+///
+/// ```
+/// SELECT {cols}
+/// FROM notes
+/// LEFT JOIN note_scripts ON notes.script_root = note_scripts.script_root
+/// ORDER BY block_num ASC
+/// ```
 #[cfg(test)]
 pub(crate) fn select_all_notes(
     conn: &mut SqliteConnection,
 ) -> Result<Vec<NoteRecord>, DatabaseError> {
-    // SELECT {cols}
-    // FROM notes
-    // LEFT JOIN note_scripts ON notes.script_root = note_scripts.script_root
-    // ORDER BY block_num ASC
     let q = schema::notes::table.left_join(
         schema::note_scripts::table
             .on(schema::notes::script_root.eq(schema::note_scripts::script_root.nullable())),
     );
-    let raw: Vec<_> =
-        SelectDsl::select(q, (NoteRecordRaw::as_select(), schema::note_scripts::script.nullable()))
-            .order(schema::notes::committed_at.asc())
-            .load::<(NoteRecordRaw, Option<Vec<u8>>)>(conn)?;
-    let records = vec_raw_try_into::<NoteRecord, NoteRecordWithScriptRaw>(
-        raw.into_iter().map(NoteRecordWithScriptRaw::from),
+    let raw: Vec<_> = SelectDsl::select(
+        q,
+        (NoteRecordRawRow::as_select(), schema::note_scripts::script.nullable()),
+    )
+    .order(schema::notes::committed_at.asc())
+    .load::<(NoteRecordRawRow, Option<Vec<u8>>)>(conn)?;
+    let records = vec_raw_try_into::<NoteRecord, NoteRecordWithScriptRawJoined>(
+        raw.into_iter().map(NoteRecordWithScriptRawJoined::from),
     )?;
     Ok(records)
 }
 
-/// Select note inclusion proofs matching the `NoteId`, using the given [`SqliteConnection`].
+/// Select note inclusion proofs matching the `NoteId`s.
+///
+/// # Parameters
+/// * `note_ids`: Set of note IDs to query
+///     - Limit: 0 <= count <= 1000
 ///
 /// # Returns
 ///
 /// - Empty map if no matching `note`.
 /// - Otherwise, note inclusion proofs, which `note_id` matches the `NoteId` as bytes.
+///
+/// # Raw SQL
+///
+/// ```sql
+/// SELECT
+///     block_num,
+///     note_id,
+///     batch_index,
+///     note_index,
+///     inclusion_path
+/// FROM
+///     notes
+/// WHERE
+///     note_id IN (?1)
+/// ORDER BY
+///     block_num ASC
+/// ```
 pub(crate) fn select_note_inclusion_proofs(
     conn: &mut SqliteConnection,
     note_ids: &BTreeSet<NoteId>,
 ) -> Result<BTreeMap<NoteId, NoteInclusionProof>, DatabaseError> {
     QueryParamNoteIdLimit::check(note_ids.len())?;
 
-    // SELECT
-    //     block_num,
-    //     note_id,
-    //     batch_index,
-    //     note_index,
-    //     inclusion_path
-    // FROM
-    //     notes
-    // WHERE
-    //     note_id IN rarray(?1)
-    // ORDER BY
-    //     block_num ASC
     let noted_ids_serialized = serialize_vec(note_ids.iter());
 
     let raw_notes = SelectDsl::select(
@@ -282,9 +328,21 @@ pub(crate) fn select_note_script_by_root(
 ///
 /// A set of unconsumed network notes with maximum length of `size` and the page to get
 /// the next set.
-//
-// Attention: uses the _implicit_ column `rowid`, which requires to use a few raw SQL nugget
-// statements
+///
+/// Attention: uses the _implicit_ column `rowid`, which requires to use a few raw SQL nugget
+/// statements
+///
+/// # Raw SQL
+///
+/// ```
+/// SELECT *, rowid
+/// FROM notes
+/// LEFT JOIN note_scripts ON notes.script_root = note_scripts.script_root
+/// WHERE
+///     execution_mode = 0 AND consumed_block_num = NULL AND rowid >= ?
+/// ORDER BY rowid
+/// LIMIT ?
+/// ```
 #[allow(
     clippy::cast_sign_loss,
     reason = "We need custom SQL statements which has given types that we need to convert"
@@ -304,19 +362,12 @@ pub(crate) fn unconsumed_network_notes(
         diesel::dsl::sql::<diesel::sql_types::Bool>("notes.rowid >= ")
             .bind::<diesel::sql_types::BigInt, i64>(page.token.unwrap_or_default() as i64);
 
-    // SELECT {}, rowid
-    // FROM notes
-    // LEFT JOIN note_scripts ON notes.script_root = note_scripts.script_root
-    // WHERE
-    //     execution_mode = 0 AND consumed_block_num = NULL AND rowid >= ?
-    // ORDER BY rowid
-    // LIMIT ?
     #[allow(
         clippy::items_after_statements,
         reason = "It's only relevant for a single call function"
     )]
     type RawLoadedTuple = (
-        NoteRecordRaw,
+        NoteRecordRawRow,
         Option<Vec<u8>>, // script
         i64,             // rowid (from sql::<BigInt>("notes.rowid"))
     );
@@ -327,9 +378,9 @@ pub(crate) fn unconsumed_network_notes(
     )]
     fn split_into_raw_note_record_and_implicit_row_id(
         tuple: RawLoadedTuple,
-    ) -> (NoteRecordWithScriptRaw, i64) {
+    ) -> (NoteRecordWithScriptRawJoined, i64) {
         let (note, script, row) = tuple;
-        let combined = NoteRecordWithScriptRaw::from((note, script));
+        let combined = NoteRecordWithScriptRawJoined::from((note, script));
         (combined, row)
     }
 
@@ -339,7 +390,7 @@ pub(crate) fn unconsumed_network_notes(
                 .on(schema::notes::script_root.eq(schema::note_scripts::script_root.nullable())),
         ),
         (
-            NoteRecordRaw::as_select(),
+            NoteRecordRawRow::as_select(),
             schema::note_scripts::script.nullable(),
             rowid_sel.clone(),
         ),
@@ -374,9 +425,23 @@ pub(crate) fn unconsumed_network_notes(
 ///
 /// A set of unconsumed network notes with maximum length of `size` and the page to get
 /// the next set.
-//
-// Attention: uses the _implicit_ column `rowid`, which requires to use a few raw SQL nugget
-// statements
+///
+/// # Raw SQL
+///
+/// Attention: uses the _implicit_ column `rowid`, which requires to use a few raw SQL nugget
+/// statements.
+///
+/// ```sql
+/// SELECT *, rowid
+/// FROM notes
+/// LEFT JOIN note_scripts ON notes.script_root = note_scripts.script_root
+/// WHERE
+///  execution_mode = 0 AND tag = ?1 AND
+///  block_num <= ?2 AND
+///  (consumed_block_num IS NULL OR consumed_block_num > ?2) AND rowid >= ?3
+/// ORDER BY rowid
+/// LIMIT ?
+/// ```
 #[allow(
     clippy::cast_sign_loss,
     reason = "We need custom SQL statements which has given types that we need to convert"
@@ -402,21 +467,12 @@ pub(crate) fn select_unconsumed_network_notes_by_tag(
         diesel::dsl::sql::<diesel::sql_types::Bool>("notes.rowid >= ")
             .bind::<diesel::sql_types::BigInt, i64>(page.token.unwrap_or_default() as i64);
 
-    // SELECT {}, rowid
-    // FROM notes
-    // LEFT JOIN note_scripts ON notes.script_root = note_scripts.script_root
-    // WHERE
-    //  execution_mode = 0 AND tag = ?1 AND
-    //  block_num <= ?2 AND
-    //  (consumed_block_num IS NULL OR consumed_block_num > ?2) AND rowid >= ?3
-    // ORDER BY rowid
-    // LIMIT ?
     #[allow(
         clippy::items_after_statements,
         reason = "It's only relevant for a single call function"
     )]
     type RawLoadedTuple = (
-        NoteRecordRaw,
+        NoteRecordRawRow,
         Option<Vec<u8>>, // script
         i64,             // rowid (from sql::<BigInt>("notes.rowid"))
     );
@@ -427,9 +483,9 @@ pub(crate) fn select_unconsumed_network_notes_by_tag(
     )]
     fn split_into_raw_note_record_and_implicit_row_id(
         tuple: RawLoadedTuple,
-    ) -> (NoteRecordWithScriptRaw, i64) {
+    ) -> (NoteRecordWithScriptRawJoined, i64) {
         let (note, script, row) = tuple;
-        let combined = NoteRecordWithScriptRaw::from((note, script));
+        let combined = NoteRecordWithScriptRawJoined::from((note, script));
         (combined, row)
     }
 
@@ -439,7 +495,7 @@ pub(crate) fn select_unconsumed_network_notes_by_tag(
                 .on(schema::notes::script_root.eq(schema::note_scripts::script_root.nullable())),
         ),
         (
-            NoteRecordRaw::as_select(),
+            NoteRecordRawRow::as_select(),
             schema::note_scripts::script.nullable(),
             rowid_sel.clone(),
         ),
@@ -493,10 +549,10 @@ pub(crate) fn get_note_sync(
 pub struct NoteSyncRecordRawRow {
     pub committed_at: i64, // BlockNumber
     #[diesel(embed)]
-    pub block_note_index: BlockNoteIndexRaw,
+    pub block_note_index: BlockNoteIndexRawRow,
     pub note_id: Vec<u8>, // BlobDigest
     #[diesel(embed)]
-    pub metadata: NoteMetadataRaw,
+    pub metadata: NoteMetadataRawRow,
     pub inclusion_path: Vec<u8>, // SparseMerklePath
 }
 
@@ -523,7 +579,7 @@ impl TryInto<NoteSyncRecord> for NoteSyncRecordRawRow {
 #[derive(Debug, Clone, PartialEq, Selectable, Queryable, QueryableByName)]
 #[diesel(table_name = schema::notes)]
 #[diesel(check_for_backend(Sqlite))]
-pub struct NoteDetailsRaw {
+pub struct NoteDetailsRawRow {
     pub assets: Option<Vec<u8>>,
     pub inputs: Option<Vec<u8>>,
     pub serial_num: Option<Vec<u8>>,
@@ -534,7 +590,7 @@ pub struct NoteDetailsRaw {
 // when used with join and debugging is painful to put it
 // mildly.
 #[derive(Debug, Clone, PartialEq, Queryable)]
-pub struct NoteRecordWithScriptRaw {
+pub struct NoteRecordWithScriptRawJoined {
     pub committed_at: i64,
 
     pub batch_index: i32,
@@ -560,9 +616,9 @@ pub struct NoteRecordWithScriptRaw {
     pub script: Option<Vec<u8>>, // not part of notes::table!
 }
 
-impl From<(NoteRecordRaw, Option<Vec<u8>>)> for NoteRecordWithScriptRaw {
-    fn from((note, script): (NoteRecordRaw, Option<Vec<u8>>)) -> Self {
-        let NoteRecordRaw {
+impl From<(NoteRecordRawRow, Option<Vec<u8>>)> for NoteRecordWithScriptRawJoined {
+    fn from((note, script): (NoteRecordRawRow, Option<Vec<u8>>)) -> Self {
+        let NoteRecordRawRow {
             committed_at,
             batch_index,
             note_index,
@@ -596,12 +652,12 @@ impl From<(NoteRecordRaw, Option<Vec<u8>>)> for NoteRecordWithScriptRaw {
     }
 }
 
-impl TryInto<NoteRecord> for NoteRecordWithScriptRaw {
+impl TryInto<NoteRecord> for NoteRecordWithScriptRawJoined {
     type Error = DatabaseError;
     fn try_into(self) -> Result<NoteRecord, Self::Error> {
         // let (raw, script) = self;
         let raw = self;
-        let NoteRecordWithScriptRaw {
+        let NoteRecordWithScriptRawJoined {
             committed_at,
 
             batch_index,
@@ -623,21 +679,21 @@ impl TryInto<NoteRecord> for NoteRecordWithScriptRaw {
             script,
             ..
         } = raw;
-        let index = BlockNoteIndexRaw { batch_index, note_index };
-        let metadata = NoteMetadataRaw {
+        let index = BlockNoteIndexRawRow { batch_index, note_index };
+        let metadata = NoteMetadataRawRow {
             note_type,
             sender,
             tag,
             aux,
             execution_hint,
         };
-        let details = NoteDetailsRaw { assets, inputs, serial_num };
+        let details = NoteDetailsRawRow { assets, inputs, serial_num };
 
         let metadata = metadata.try_into()?;
         let committed_at = BlockNumber::from_raw_sql(committed_at)?;
         let note_id = Word::read_from_bytes(&note_id[..])?;
         let script = script.map(|script| NoteScript::read_from_bytes(&script[..])).transpose()?;
-        let details = if let NoteDetailsRaw {
+        let details = if let NoteDetailsRawRow {
             assets: Some(assets),
             inputs: Some(inputs),
             serial_num: Some(serial_num),
@@ -670,7 +726,7 @@ impl TryInto<NoteRecord> for NoteRecordWithScriptRaw {
 #[derive(Debug, Clone, PartialEq, Selectable, Queryable, QueryableByName)]
 #[diesel(table_name = schema::notes)]
 #[diesel(check_for_backend(Sqlite))]
-pub struct NoteRecordRaw {
+pub struct NoteRecordRawRow {
     pub committed_at: i64,
 
     pub batch_index: i32,
@@ -693,7 +749,7 @@ pub struct NoteRecordRaw {
 #[derive(Debug, Clone, PartialEq, Selectable, Queryable, QueryableByName)]
 #[diesel(table_name = schema::notes)]
 #[diesel(check_for_backend(Sqlite))]
-pub struct NoteMetadataRaw {
+pub struct NoteMetadataRawRow {
     note_type: i32,
     sender: Vec<u8>, // AccountId
     tag: i32,
@@ -702,7 +758,7 @@ pub struct NoteMetadataRaw {
 }
 
 #[allow(clippy::cast_sign_loss)]
-impl TryInto<NoteMetadata> for NoteMetadataRaw {
+impl TryInto<NoteMetadata> for NoteMetadataRawRow {
     type Error = DatabaseError;
     fn try_into(self) -> Result<NoteMetadata, Self::Error> {
         let sender = AccountId::read_from_bytes(&self.sender[..])?;
@@ -719,13 +775,13 @@ impl TryInto<NoteMetadata> for NoteMetadataRaw {
 #[derive(Debug, Clone, PartialEq, Selectable, Queryable, QueryableByName)]
 #[diesel(table_name = schema::notes)]
 #[diesel(check_for_backend(Sqlite))]
-pub struct BlockNoteIndexRaw {
+pub struct BlockNoteIndexRawRow {
     pub batch_index: i32,
     pub note_index: i32, // index within batch
 }
 
 #[allow(clippy::cast_sign_loss, reason = "Indices are cast to usize for ease of use")]
-impl TryInto<BlockNoteIndex> for BlockNoteIndexRaw {
+impl TryInto<BlockNoteIndex> for BlockNoteIndexRawRow {
     type Error = DatabaseError;
     fn try_into(self) -> Result<BlockNoteIndex, Self::Error> {
         let batch_index = self.batch_index as usize;
@@ -736,3 +792,107 @@ impl TryInto<BlockNoteIndex> for BlockNoteIndexRaw {
         Ok(index)
     }
 }
+
+/// Insert notes to the DB using the given [`SqliteConnection`]. Public notes should also have a
+/// nullifier.
+///
+/// # Returns
+///
+/// The number of affected rows.
+///
+/// # Note
+///
+/// The [`SqliteConnection`] object is not consumed. It's up to the caller to commit or rollback the
+/// transaction.
+pub(crate) fn insert_notes(
+    conn: &mut SqliteConnection,
+    notes: &[(NoteRecord, Option<Nullifier>)],
+) -> Result<usize, DatabaseError> {
+    let count = diesel::insert_into(schema::notes::table)
+        .values(Vec::from_iter(
+            notes
+                .iter()
+                .map(|(note, nullifier)| NoteInsertRowInsert::from((note.clone(), *nullifier))),
+        ))
+        .execute(conn)?;
+    Ok(count)
+}
+
+/// Insert scripts to the DB using the given [`SqliteConnection`]. It inserts the scripts held by
+/// the notes passed as parameter. If the script root already exists in the DB, it will be ignored.
+///
+/// # Returns
+///
+/// The number of affected rows.
+///
+/// # Note
+///
+/// The [`SqliteConnection`] object is not consumed. It's up to the caller to commit or rollback the
+/// transaction.
+pub(crate) fn insert_scripts<'a>(
+    conn: &mut SqliteConnection,
+    notes: impl IntoIterator<Item = &'a NoteRecord>,
+) -> Result<usize, DatabaseError> {
+    let values = Vec::from_iter(notes.into_iter().filter_map(|note| {
+        let note_details = note.details.as_ref()?;
+        Some((
+            schema::note_scripts::script_root.eq(note_details.script().root().to_bytes()),
+            schema::note_scripts::script.eq(note_details.script().to_bytes()),
+        ))
+    }));
+    let count = diesel::insert_or_ignore_into(schema::note_scripts::table)
+        .values(values)
+        .execute(conn)?;
+
+    Ok(count)
+}
+
+#[derive(Debug, Clone, PartialEq, Insertable)]
+#[diesel(table_name = schema::notes)]
+pub struct NoteInsertRowInsert {
+    pub committed_at: i64,
+
+    pub batch_index: i32,
+    pub note_index: i32, // index within batch
+
+    pub note_id: Vec<u8>,
+
+    pub note_type: i32,
+    pub sender: Vec<u8>, // AccountId
+    pub tag: i32,
+    pub aux: i64,
+    pub execution_hint: i64,
+
+    pub consumed_at: Option<i64>,
+    pub assets: Option<Vec<u8>>,
+    pub inputs: Option<Vec<u8>>,
+    pub serial_num: Option<Vec<u8>>,
+    pub nullifier: Option<Vec<u8>>,
+    pub script_root: Option<Vec<u8>>,
+    pub execution_mode: i32,
+    pub inclusion_path: Vec<u8>,
+}
+
+impl From<(NoteRecord, Option<Nullifier>)> for NoteInsertRowInsert {
+    fn from((note, nullifier): (NoteRecord, Option<Nullifier>)) -> Self {
+        Self {
+            committed_at: note.block_num.to_raw_sql(),
+            batch_index: idx_to_raw_sql(note.note_index.batch_idx()),
+            note_index: idx_to_raw_sql(note.note_index.note_idx_in_batch()),
+            note_id: note.note_id.to_bytes(),
+            note_type: note_type_to_raw_sql(note.metadata.note_type() as u8),
+            sender: note.metadata.sender().to_bytes(),
+            tag: note.metadata.tag().to_raw_sql(),
+            execution_mode: note.metadata.tag().execution_mode().to_raw_sql(),
+            aux: aux_to_raw_sql(note.metadata.aux()),
+            execution_hint: execution_hint_to_raw_sql(note.metadata.execution_hint().into()),
+            inclusion_path: note.inclusion_path.to_bytes(),
+            consumed_at: None::<i64>, // New notes are always unconsumed.
+            nullifier: nullifier.as_ref().map(Nullifier::to_bytes), /* Beware: `Option<T>` also implements `to_bytes`, but this is not what you want. */
+            assets: note.details.as_ref().map(|d| d.assets().to_bytes()),
+            inputs: note.details.as_ref().map(|d| d.inputs().to_bytes()),
+            script_root: note.details.as_ref().map(|d| d.script().root().to_bytes()),
+            serial_num: note.details.as_ref().map(|d| d.serial_num().to_bytes()),
+        }
+    }
+}
diff --git a/crates/store/src/db/models/queries/nullifiers.rs b/crates/store/src/db/models/queries/nullifiers.rs
index 725ba9184..9670ae578 100644
--- a/crates/store/src/db/models/queries/nullifiers.rs
+++ b/crates/store/src/db/models/queries/nullifiers.rs
@@ -1,3 +1,5 @@
+use std::ops::RangeInclusive;
+
 use diesel::query_dsl::methods::SelectDsl;
 use diesel::{
     ExpressionMethods,
@@ -25,35 +27,40 @@ use crate::db::{NullifierInfo, schema};
 
 /// Returns nullifiers filtered by prefix within a block number range.
 ///
-/// Each value of the `nullifier_prefixes` is only the `prefix_len` most significant bits of the
-/// nullifier of interest to the client. This hides the details of the specific nullifier being
-/// requested. Currently the only supported prefix length is 16 bits.
+/// # Parameters
+/// * `prefix_len`: Length of nullifier prefix in bits
+///     - Must be exactly 16 bits
+/// * `nullifier_prefixes`: List of nullifier prefixes to filter by
+///     - Limit: 0 <= count <= 1000
+///
+/// Each value of the `nullifier_prefixes` is only the `prefix_len` most significant bits
+/// of the nullifier of interest to the client. This hides the details of the specific
+/// nullifier being requested. Currently the only supported prefix length is 16 bits.
 ///
 /// # Returns
 ///
-/// Range and pagination semantics:
-/// - Both `block_from` and `block_to` are inclusive bounds.
-/// - To keep responses ≤ ~2.5MB, an internal row limit is enforced. When the limit is hit and the
-///   result spans multiple blocks, the last block in the page is dropped entirely, and
-///   `last_block_included` is set to the block number immediately before that dropped block.
-///   Clients should resume with `block_from = last_block_included + 1`.
-/// - If all rows belong to a single block and hit the limit, this function returns an empty
-///   `nullifiers` page with `last_block_included = that_block - 1`. Intra-block pagination is not
-///   supported; callers may need to narrow the range.
+/// A vector of [`NullifierInfo`] with the nullifiers and the block height at which they were
+///
+/// # Raw SQL
 ///
-/// A tuple `(nullifiers, last_block_included)` where:
-/// - `nullifiers` is a vector of [`NullifierInfo`] (each contains the nullifier and the block
-///   number at which it was created), ordered by block number ascending.
-/// - `last_block_included` is the last block number fully included in this response. If the
-///   internal row limit is reached (to cap response size), this may be less than `block_to`. In
-///   that case, the caller should re-issue the query with `block_from = last_block_included + 1` to
-///   continue.
+/// ```sql
+/// SELECT
+///     nullifier,
+///     block_num
+/// FROM
+///     nullifiers
+/// WHERE
+///     nullifier_prefix IN (?1) AND
+///     block_num >= ?2
+///     block_num <= ?3
+/// ORDER BY
+///     block_num ASC
+/// ```
 pub(crate) fn select_nullifiers_by_prefix(
     conn: &mut SqliteConnection,
     prefix_len: u8,
     nullifier_prefixes: &[u16],
-    block_from: BlockNumber,
-    block_to: BlockNumber,
+    block_range: RangeInclusive<BlockNumber>,
 ) -> Result<(Vec<NullifierInfo>, BlockNumber), DatabaseError> {
     // Size calculation: max 2^16 nullifiers per block × 36 bytes per nullifier = ~2.25MB
     // We use 2.5MB to provide a safety margin for the unlikely case of hitting the maximum
@@ -65,31 +72,20 @@ pub(crate) fn select_nullifiers_by_prefix(
 
     assert_eq!(prefix_len, 16, "Only 16-bit prefixes are supported");
 
-    if block_from > block_to {
-        return Err(DatabaseError::InvalidBlockRange { from: block_from, to: block_to });
+    if block_range.is_empty() {
+        return Err(DatabaseError::InvalidBlockRange {
+            from: *block_range.start(),
+            to: *block_range.end(),
+        });
     }
 
     QueryParamNullifierPrefixLimit::check(nullifier_prefixes.len())?;
 
-    // SELECT
-    //     nullifier,
-    //     block_num
-    // FROM
-    //     nullifiers
-    // WHERE
-    //     nullifier_prefix IN rarray(?1) AND
-    //     block_num >= ?2
-    //     AND block_num <= ?3
-    // ORDER BY
-    //     block_num ASC
-    // LIMIT
-    //     MAX_ROWS + 1;
-
     let prefixes = nullifier_prefixes.iter().map(|prefix| nullifier_prefix_to_raw_sql(*prefix));
     let raw = SelectDsl::select(schema::nullifiers::table, NullifierWithoutPrefixRawRow::as_select())
             .filter(schema::nullifiers::nullifier_prefix.eq_any(prefixes))
-            .filter(schema::nullifiers::block_num.ge(block_from.to_raw_sql()))
-            .filter(schema::nullifiers::block_num.le(block_to.to_raw_sql()))
+            .filter(schema::nullifiers::block_num.ge(block_range.start().to_raw_sql()))
+            .filter(schema::nullifiers::block_num.le(block_range.end().to_raw_sql()))
             .order(schema::nullifiers::block_num.asc())
             // Request an additional row so we can determine whether this is the last page.
             .limit(i64::try_from(MAX_ROWS + 1).expect("limit fits within i64"))
@@ -109,7 +105,7 @@ pub(crate) fn select_nullifiers_by_prefix(
 
         Ok((nullifiers, last_block_included))
     } else {
-        Ok((vec_raw_try_into(raw)?, block_to))
+        Ok((vec_raw_try_into(raw)?, *block_range.end()))
     }
 }
 
@@ -128,8 +124,12 @@ pub(crate) fn select_all_nullifiers(
     vec_raw_try_into(nullifiers_raw)
 }
 
-/// Commit nullifiers to the DB using the given [`SqliteConnection`]. This inserts the nullifiers
-/// into the nullifiers table, and marks the note as consumed (if it was public).
+/// Insert nullifiers for a block into the database.
+///
+/// # Parameters
+/// * `nullifiers`: List of nullifiers to insert
+///     - Limit: 0 <= count <= 1000
+/// * `block_num`: Block number to associate with the nullifiers
 ///
 /// # Returns
 ///
diff --git a/crates/store/src/db/models/queries/transactions.rs b/crates/store/src/db/models/queries/transactions.rs
index c0141b869..d8d490a24 100644
--- a/crates/store/src/db/models/queries/transactions.rs
+++ b/crates/store/src/db/models/queries/transactions.rs
@@ -1,4 +1,6 @@
-use diesel::prelude::Queryable;
+use std::ops::RangeInclusive;
+
+use diesel::prelude::{Insertable, Queryable};
 use diesel::query_dsl::methods::SelectDsl;
 use diesel::{
     ExpressionMethods,
@@ -8,37 +10,50 @@ use diesel::{
     Selectable,
     SqliteConnection,
 };
-use miden_lib::utils::Deserializable;
+use miden_lib::utils::{Deserializable, Serializable};
 use miden_node_utils::limiter::{QueryParamAccountIdLimit, QueryParamLimiter};
 use miden_objects::account::AccountId;
 use miden_objects::block::BlockNumber;
-use miden_objects::transaction::TransactionId;
+use miden_objects::transaction::{OrderedTransactionHeaders, TransactionId};
 
 use super::DatabaseError;
 use crate::db::models::conv::SqlTypeConvert;
 use crate::db::models::{serialize_vec, vec_raw_try_into};
 use crate::db::{TransactionSummary, schema};
 
+/// Select transactions for given accounts in a specified block range
+///
+/// # Parameters
+/// * `account_ids`: List of account IDs to filter by
+///     - Limit: 0 <= size <= 1000
+/// * `block_range`: Range of blocks to include inclusive
+///
+/// # Returns
+///
+/// A vector of [`TransactionSummary`] types or an error.
+///
+/// # Raw SQL
+/// ```sql
+/// SELECT
+///     account_id,
+///     block_num,
+///     transaction_id
+/// FROM
+///     transactions
+/// WHERE
+///     block_num > ?1 AND
+///     block_num <= ?2 AND
+///     account_id IN rarray(?3)
+/// ORDER BY
+///     transaction_id ASC
+/// ```
 pub fn select_transactions_by_accounts_and_block_range(
     conn: &mut SqliteConnection,
     account_ids: &[AccountId],
-    block_start: i64,
-    block_end: i64, // TODO migrate to BlockNumber as argument type
+    block_range: RangeInclusive<BlockNumber>,
 ) -> Result<Vec<TransactionSummary>, DatabaseError> {
     QueryParamAccountIdLimit::check(account_ids.len())?;
 
-    // SELECT
-    //     account_id,
-    //     block_num,
-    //     transaction_id
-    // FROM
-    //     transactions
-    // WHERE
-    //     block_num > ?1 AND
-    //     block_num <= ?2 AND
-    //     account_id IN rarray(?3)
-    // ORDER BY
-    //     transaction_id ASC
     let desired_account_ids = serialize_vec(account_ids);
     let raw = SelectDsl::select(
         schema::transactions::table,
@@ -48,8 +63,8 @@ pub fn select_transactions_by_accounts_and_block_range(
             schema::transactions::transaction_id,
         ),
     )
-    .filter(schema::transactions::block_num.gt(block_start))
-    .filter(schema::transactions::block_num.le(block_end))
+    .filter(schema::transactions::block_num.gt(block_range.start().to_raw_sql()))
+    .filter(schema::transactions::block_num.le(block_range.end().to_raw_sql()))
     .filter(schema::transactions::account_id.eq_any(desired_account_ids))
     .order(schema::transactions::transaction_id.asc())
     .load::<TransactionSummaryRaw>(conn)
@@ -76,3 +91,49 @@ impl TryInto<crate::db::TransactionSummary> for TransactionSummaryRaw {
         })
     }
 }
+
+/// Insert transactions to the DB using the given [`SqliteConnection`].
+///
+/// # Returns
+///
+/// The number of affected rows.
+///
+/// # Note
+///
+/// The [`SqliteConnection`] object is not consumed. It's up to the caller to commit or rollback the
+/// transaction.
+pub(crate) fn insert_transactions(
+    conn: &mut SqliteConnection,
+    block_num: BlockNumber,
+    transactions: &OrderedTransactionHeaders,
+) -> Result<usize, DatabaseError> {
+    #[allow(clippy::into_iter_on_ref)] // false positive
+    let count = diesel::insert_into(schema::transactions::table)
+        .values(Vec::from_iter(
+            transactions
+                .as_slice()
+                .into_iter()
+                .map(|tx| TransactionSummaryRowInsert::new(tx.id(), tx.account_id(), block_num)),
+        ))
+        .execute(conn)?;
+    Ok(count)
+}
+
+#[derive(Debug, Clone, PartialEq, Insertable)]
+#[diesel(table_name = schema::transactions)]
+#[diesel(check_for_backend(diesel::sqlite::Sqlite))]
+pub struct TransactionSummaryRowInsert {
+    transaction_id: Vec<u8>,
+    account_id: Vec<u8>,
+    block_num: i64,
+}
+
+impl TransactionSummaryRowInsert {
+    fn new(transaction_id: TransactionId, account_id: AccountId, block_num: BlockNumber) -> Self {
+        Self {
+            transaction_id: transaction_id.to_bytes(),
+            account_id: account_id.to_bytes(),
+            block_num: block_num.to_raw_sql(),
+        }
+    }
+}
diff --git a/crates/store/src/db/tests.rs b/crates/store/src/db/tests.rs
index b1f394421..174067367 100644
--- a/crates/store/src/db/tests.rs
+++ b/crates/store/src/db/tests.rs
@@ -154,9 +154,7 @@ fn sql_select_transactions() {
         queries::select_transactions_by_accounts_and_block_range(
             conn,
             &[AccountId::try_from(ACCOUNT_ID_PRIVATE_SENDER).unwrap()],
-            // TODO use a Range<BlockNumber> expression
-            0.into(),
-            2.into(),
+            BlockNumber::from(0)..=BlockNumber::from(2),
         )
         .unwrap()
     }
@@ -753,8 +751,11 @@ fn sync_account_vault_basic_validation() {
     .unwrap();
 
     // Test invalid block range - should return error
-    let result =
-        queries::select_account_vault_assets(conn, public_account_id, invalid_block_from, block_to);
+    let result = queries::select_account_vault_assets(
+        conn,
+        public_account_id,
+        invalid_block_from..=block_to,
+    );
     assert!(result.is_err(), "expected error for invalid block range");
 
     let Err(crate::errors::DatabaseError::InvalidBlockRange { .. }) = result else {
@@ -763,7 +764,7 @@ fn sync_account_vault_basic_validation() {
 
     // Test with valid block range - should return vault assets
     let (last_block, values) =
-        queries::select_account_vault_assets(conn, public_account_id, block_from, block_to)
+        queries::select_account_vault_assets(conn, public_account_id, block_from..=block_to)
             .unwrap();
 
     // Should return assets we inserted
@@ -786,7 +787,7 @@ fn select_nullifiers_by_prefix_works() {
     let block_number0 = 0.into();
     let block_number10 = 10.into();
     let (nullifiers, block_number_reached) =
-        queries::select_nullifiers_by_prefix(conn, PREFIX_LEN, &[], block_number0, block_number10)
+        queries::select_nullifiers_by_prefix(conn, PREFIX_LEN, &[], block_number0..=block_number10)
             .unwrap();
     assert!(nullifiers.is_empty());
     assert_eq!(block_number_reached, block_number10);
@@ -802,8 +803,7 @@ fn select_nullifiers_by_prefix_works() {
         conn,
         PREFIX_LEN,
         &[utils::get_nullifier_prefix(&nullifier1)],
-        block_number0,
-        block_number10,
+        block_number0..=block_number10,
     )
     .unwrap();
     assert_eq!(
@@ -831,8 +831,7 @@ fn select_nullifiers_by_prefix_works() {
         conn,
         PREFIX_LEN,
         &[utils::get_nullifier_prefix(&nullifier1)],
-        block_number0,
-        block_number10,
+        block_number0..=block_number10,
     )
     .unwrap();
     assert_eq!(
@@ -846,8 +845,7 @@ fn select_nullifiers_by_prefix_works() {
         conn,
         PREFIX_LEN,
         &[utils::get_nullifier_prefix(&nullifier2)],
-        block_number0,
-        block_number10,
+        block_number0..=block_number10,
     )
     .unwrap();
     assert_eq!(
@@ -866,8 +864,7 @@ fn select_nullifiers_by_prefix_works() {
             utils::get_nullifier_prefix(&nullifier1),
             utils::get_nullifier_prefix(&nullifier2),
         ],
-        block_number0,
-        block_number10,
+        block_number0..=block_number10,
     )
     .unwrap();
     assert_eq!(
@@ -889,8 +886,7 @@ fn select_nullifiers_by_prefix_works() {
         conn,
         PREFIX_LEN,
         &[utils::get_nullifier_prefix(&num_to_nullifier(3 << 48))],
-        block_number0,
-        block_number10,
+        block_number0..=block_number10,
     )
     .unwrap();
     assert!(nullifiers.is_empty());
@@ -904,8 +900,7 @@ fn select_nullifiers_by_prefix_works() {
             utils::get_nullifier_prefix(&nullifier1),
             utils::get_nullifier_prefix(&nullifier2),
         ],
-        block_number2,
-        block_number10,
+        block_number2..=block_number10,
     )
     .unwrap();
     assert_eq!(
@@ -931,8 +926,7 @@ fn select_nullifiers_by_prefix_works() {
             utils::get_nullifier_prefix(&nullifier2),
             utils::get_nullifier_prefix(&nullifier3),
         ],
-        block_number0,
-        block_number2,
+        block_number0..=block_number2,
     )
     .unwrap();
     assert_eq!(
@@ -1036,9 +1030,12 @@ fn db_account() {
             .iter()
             .map(|acc_id| (*acc_id).try_into().unwrap())
             .collect();
-    let res =
-        queries::select_accounts_by_block_range(conn, &account_ids, 0.into(), u32::MAX.into())
-            .unwrap();
+    let res = queries::select_accounts_by_block_range(
+        conn,
+        &account_ids,
+        BlockNumber::from(0)..=u32::MAX.into(),
+    )
+    .unwrap();
     assert!(res.is_empty());
 
     // test insertion
@@ -1059,9 +1056,12 @@ fn db_account() {
     assert_eq!(row_count, 1);
 
     // test successful query
-    let res =
-        queries::select_accounts_by_block_range(conn, &account_ids, 0.into(), u32::MAX.into())
-            .unwrap();
+    let res = queries::select_accounts_by_block_range(
+        conn,
+        &account_ids,
+        BlockNumber::from(0)..=u32::MAX.into(),
+    )
+    .unwrap();
     assert_eq!(
         res,
         vec![AccountSummary {
@@ -1075,8 +1075,7 @@ fn db_account() {
     let res = queries::select_accounts_by_block_range(
         conn,
         &account_ids,
-        (block_num.as_u32() + 1).into(),
-        u32::MAX.into(),
+        (block_num.as_u32() + 1).into()..=u32::MAX.into(),
     )
     .unwrap();
     assert!(res.is_empty());
@@ -1085,8 +1084,7 @@ fn db_account() {
     let res = queries::select_accounts_by_block_range(
         conn,
         &[6.try_into().unwrap(), 7.try_into().unwrap(), 8.try_into().unwrap()],
-        (block_num.as_u32() + 1).into(),
-        u32::MAX.into(),
+        (block_num + 1)..=u32::MAX.into(),
     )
     .unwrap();
     assert!(res.is_empty());
@@ -1267,7 +1265,7 @@ fn sql_account_storage_map_values_insertion() {
     insert_account_delta(conn, account_id, block1, &delta1);
 
     let storage_map_page =
-        queries::select_account_storage_map_values(conn, account_id, BlockNumber::GENESIS, block1)
+        queries::select_account_storage_map_values(conn, account_id, BlockNumber::GENESIS..=block1)
             .unwrap();
     assert_eq!(storage_map_page.values.len(), 2, "expect 2 initial rows");
 
@@ -1282,7 +1280,7 @@ fn sql_account_storage_map_values_insertion() {
     insert_account_delta(conn, account_id, block2, &delta2);
 
     let storage_map_values =
-        queries::select_account_storage_map_values(conn, account_id, BlockNumber::GENESIS, block2)
+        queries::select_account_storage_map_values(conn, account_id, BlockNumber::GENESIS..=block2)
             .unwrap();
 
     assert_eq!(storage_map_values.values.len(), 3, "three rows (with duplicate key)");
@@ -1340,8 +1338,7 @@ fn select_storage_map_sync_values() {
     let page = queries::select_account_storage_map_values(
         &mut conn,
         account_id,
-        BlockNumber::from(2),
-        BlockNumber::from(3),
+        BlockNumber::from(2)..=BlockNumber::from(3),
     )
     .unwrap();
 
diff --git a/crates/store/src/server/rpc_api.rs b/crates/store/src/server/rpc_api.rs
index d5c1b21db..788c0f7fa 100644
--- a/crates/store/src/server/rpc_api.rs
+++ b/crates/store/src/server/rpc_api.rs
@@ -107,8 +107,7 @@ impl rpc_server::Rpc for StoreApi {
             .sync_nullifiers(
                 request.prefix_len,
                 request.nullifiers,
-                request.block_from.into(),
-                block_to,
+                request.block_from.into()..=block_to,
             )
             .await?;
         let nullifiers = nullifiers
@@ -371,7 +370,7 @@ impl rpc_server::Rpc for StoreApi {
 
         let (last_included_block, updates) = self
             .state
-            .sync_account_vault(account_id, block_from, block_to)
+            .sync_account_vault(account_id, block_from..=block_to)
             .await
             .map_err(internal_error)?;
 
@@ -431,7 +430,7 @@ impl rpc_server::Rpc for StoreApi {
 
         let storage_maps_page = self
             .state
-            .get_storage_map_sync_values(account_id, block_from, block_to)
+            .get_storage_map_sync_values(account_id, block_from..=block_to)
             .await
             .map_err(internal_error)?;
 
diff --git a/crates/store/src/state.rs b/crates/store/src/state.rs
index 323ab0e96..ed66efe71 100644
--- a/crates/store/src/state.rs
+++ b/crates/store/src/state.rs
@@ -4,7 +4,7 @@
 //! data is atomically written, and that reads are consistent.
 
 use std::collections::{BTreeMap, BTreeSet, HashSet};
-use std::ops::Not;
+use std::ops::{Not, RangeInclusive};
 use std::path::Path;
 use std::sync::Arc;
 
@@ -426,11 +426,10 @@ impl State {
         &self,
         prefix_len: u32,
         nullifier_prefixes: Vec<u32>,
-        block_from: BlockNumber,
-        block_to: BlockNumber,
+        block_range: RangeInclusive<BlockNumber>,
     ) -> Result<(Vec<NullifierInfo>, BlockNumber), DatabaseError> {
         self.db
-            .select_nullifiers_by_prefix(prefix_len, nullifier_prefixes, block_from, block_to)
+            .select_nullifiers_by_prefix(prefix_len, nullifier_prefixes, block_range)
             .await
     }
 
@@ -985,10 +984,9 @@ impl State {
     pub(crate) async fn get_storage_map_sync_values(
         &self,
         account_id: AccountId,
-        block_from: BlockNumber,
-        block_to: BlockNumber,
+        block_range: RangeInclusive<BlockNumber>,
     ) -> Result<StorageMapValuesPage, DatabaseError> {
-        self.db.select_storage_map_sync_values(account_id, block_from, block_to).await
+        self.db.select_storage_map_sync_values(account_id, block_range).await
     }
 
     /// Loads a block from the block store. Return `Ok(None)` if the block is not found.
@@ -1016,10 +1014,9 @@ impl State {
     pub async fn sync_account_vault(
         &self,
         account_id: AccountId,
-        block_from: BlockNumber,
-        block_to: BlockNumber,
+        block_range: RangeInclusive<BlockNumber>,
     ) -> Result<(BlockNumber, Vec<AccountVaultValue>), DatabaseError> {
-        self.db.get_account_vault_sync(account_id, block_from, block_to).await
+        self.db.get_account_vault_sync(account_id, block_range).await
     }
 
     /// Returns the unprocessed network notes, along with the next pagination token.

From 1ae1965d6e0df25e8d7f63fceb6ff6ff6410781f Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Thu, 4 Sep 2025 15:00:25 -0300
Subject: [PATCH 06/78] chore: improve gRPC spans (#1206)

---
 bin/remote-prover/src/commands/worker.rs |   7 +-
 crates/block-producer/src/server/mod.rs  |   7 +-
 crates/rpc/src/server/mod.rs             |   4 +-
 crates/store/src/server/mod.rs           |  17 +--
 crates/utils/src/tracing/grpc.rs         | 187 +++--------------------
 5 files changed, 29 insertions(+), 193 deletions(-)

diff --git a/bin/remote-prover/src/commands/worker.rs b/bin/remote-prover/src/commands/worker.rs
index 32ee427fe..1417e5baa 100644
--- a/bin/remote-prover/src/commands/worker.rs
+++ b/bin/remote-prover/src/commands/worker.rs
@@ -3,7 +3,7 @@ use std::time::Duration;
 use clap::Parser;
 use miden_node_utils::cors::cors_for_grpc_web_layer;
 use miden_node_utils::panic::{CatchPanicLayer, catch_panic_layer_fn};
-use miden_node_utils::tracing::grpc::{TracedComponent, traced_span_fn};
+use miden_node_utils::tracing::grpc::grpc_trace_fn;
 use miden_remote_prover::COMPONENT;
 use miden_remote_prover::api::{ProofType, RpcListener};
 use miden_remote_prover::generated::api_server::ApiServer;
@@ -66,10 +66,7 @@ impl StartWorker {
         tonic::transport::Server::builder()
             .accept_http1(true)
             .layer(CatchPanicLayer::custom(catch_panic_layer_fn))
-            .layer(
-                TraceLayer::new_for_grpc()
-                    .make_span_with(traced_span_fn(TracedComponent::RemoteProver)),
-            )
+            .layer(TraceLayer::new_for_grpc().make_span_with(grpc_trace_fn))
             .layer(cors_for_grpc_web_layer())
             .layer(GrpcWebLayer::new())
             .timeout(self.timeout)
diff --git a/crates/block-producer/src/server/mod.rs b/crates/block-producer/src/server/mod.rs
index 61d3213ac..b7ac224ec 100644
--- a/crates/block-producer/src/server/mod.rs
+++ b/crates/block-producer/src/server/mod.rs
@@ -11,7 +11,7 @@ use miden_node_proto::generated::{self as proto};
 use miden_node_proto_build::block_producer_api_descriptor;
 use miden_node_utils::formatting::{format_input_notes, format_output_notes};
 use miden_node_utils::panic::{CatchPanicLayer, catch_panic_layer_fn};
-use miden_node_utils::tracing::grpc::{TracedComponent, traced_span_fn};
+use miden_node_utils::tracing::grpc::grpc_trace_fn;
 use miden_objects::batch::ProvenBatch;
 use miden_objects::block::BlockNumber;
 use miden_objects::transaction::ProvenTransaction;
@@ -335,10 +335,7 @@ impl BlockProducerRpcServer {
         // Build the gRPC server with the API service and trace layer.
         tonic::transport::Server::builder()
             .layer(CatchPanicLayer::custom(catch_panic_layer_fn))
-            .layer(
-                TraceLayer::new_for_grpc()
-                    .make_span_with(traced_span_fn(TracedComponent::StoreBlockProducer)),
-            )
+            .layer(TraceLayer::new_for_grpc().make_span_with(grpc_trace_fn))
             .timeout(timeout)
             .add_service(api_server::ApiServer::new(self))
             .add_service(reflection_service)
diff --git a/crates/rpc/src/server/mod.rs b/crates/rpc/src/server/mod.rs
index c6f051213..35d8cf210 100644
--- a/crates/rpc/src/server/mod.rs
+++ b/crates/rpc/src/server/mod.rs
@@ -6,7 +6,7 @@ use miden_node_proto::generated::rpc::api_server;
 use miden_node_proto_build::rpc_api_descriptor;
 use miden_node_utils::cors::cors_for_grpc_web_layer;
 use miden_node_utils::panic::{CatchPanicLayer, catch_panic_layer_fn};
-use miden_node_utils::tracing::grpc::{TracedComponent, traced_span_fn};
+use miden_node_utils::tracing::grpc::grpc_trace_fn;
 use tokio::net::TcpListener;
 use tokio_stream::wrappers::TcpListenerStream;
 use tonic_reflection::server;
@@ -75,7 +75,7 @@ impl Rpc {
             .accept_http1(true)
             .timeout(self.grpc_timeout)
             .layer(CatchPanicLayer::custom(catch_panic_layer_fn))
-            .layer(TraceLayer::new_for_grpc().make_span_with(traced_span_fn(TracedComponent::Rpc)))
+            .layer(TraceLayer::new_for_grpc().make_span_with(grpc_trace_fn))
             .layer(AcceptHeaderLayer::new(&rpc_version, genesis.commitment()))
             .layer(cors_for_grpc_web_layer())
             // Enables gRPC-web support.
diff --git a/crates/store/src/server/mod.rs b/crates/store/src/server/mod.rs
index 03a1c33e0..2dd41fca0 100644
--- a/crates/store/src/server/mod.rs
+++ b/crates/store/src/server/mod.rs
@@ -12,7 +12,7 @@ use miden_node_proto_build::{
     store_shared_api_descriptor,
 };
 use miden_node_utils::panic::{CatchPanicLayer, catch_panic_layer_fn};
-use miden_node_utils::tracing::grpc::{TracedComponent, traced_span_fn};
+use miden_node_utils::tracing::grpc::grpc_trace_fn;
 use tokio::net::TcpListener;
 use tokio::task::JoinSet;
 use tokio_stream::wrappers::TcpListenerStream;
@@ -138,10 +138,7 @@ impl Store {
         join_set.spawn(
             tonic::transport::Server::builder()
                 .layer(CatchPanicLayer::custom(catch_panic_layer_fn))
-                .layer(
-                    TraceLayer::new_for_grpc()
-                        .make_span_with(traced_span_fn(TracedComponent::StoreRpc)),
-                )
+                .layer(TraceLayer::new_for_grpc().make_span_with(grpc_trace_fn))
                 .timeout(self.grpc_timeout)
                 .add_service(rpc_service)
                 .add_service(reflection_service.clone())
@@ -152,10 +149,7 @@ impl Store {
         join_set.spawn(
             tonic::transport::Server::builder()
                 .layer(CatchPanicLayer::custom(catch_panic_layer_fn))
-                .layer(
-                    TraceLayer::new_for_grpc()
-                        .make_span_with(traced_span_fn(TracedComponent::StoreNtxBuilder)),
-                )
+                .layer(TraceLayer::new_for_grpc().make_span_with(grpc_trace_fn))
                 .timeout(self.grpc_timeout)
                 .add_service(ntx_builder_service)
                 .add_service(reflection_service.clone())
@@ -166,10 +160,7 @@ impl Store {
         join_set.spawn(
             tonic::transport::Server::builder()
                 .layer(CatchPanicLayer::custom(catch_panic_layer_fn))
-                .layer(
-                    TraceLayer::new_for_grpc()
-                        .make_span_with(traced_span_fn(TracedComponent::BlockProducer)),
-                )
+                .layer(TraceLayer::new_for_grpc().make_span_with(grpc_trace_fn))
                 .timeout(self.grpc_timeout)
                 .add_service(block_producer_service)
                 .add_service(reflection_service)
diff --git a/crates/utils/src/tracing/grpc.rs b/crates/utils/src/tracing/grpc.rs
index 39c5a216d..d05aea97c 100644
--- a/crates/utils/src/tracing/grpc.rs
+++ b/crates/utils/src/tracing/grpc.rs
@@ -1,171 +1,26 @@
-/// Creates a [`tracing::Span`] based on RPC service and method name.
-macro_rules! rpc_span {
-    ($service:literal, $method:literal) => {
-        tracing::info_span!(
-            concat!($service, "/", $method),
-            rpc.service = $service,
-            rpc.method = $method
-        )
-    };
-}
-
-/// Represents an Otel compatible, traced Miden component.
-///
-/// Used to select an appropriate [`tracing::Span`] for the tonic server to use.
-#[derive(Copy, Clone)]
-pub enum TracedComponent {
-    Rpc,
-    BlockProducer,
-    StoreRpc,
-    StoreBlockProducer,
-    StoreNtxBuilder,
-    RemoteProver,
-    RemoteProverProxy,
-}
+use crate::tracing::OpenTelemetrySpanExt;
 
-/// Returns a [`trace_fn`](tonic::transport::server::Server) implementation for the RPC which
-/// adds open-telemetry information to the span.
+/// Returns a [`trace_fn`](tonic::transport::server::Server) implementation for gRPC requests
+/// which adds open-telemetry information to the span.
 ///
-/// Creates an `info` span following the open-telemetry standard: `{service}.rpc/{method}`.
+/// Creates an `info` span following the open-telemetry standard: `{service}/{method}`.
+/// The span name is dynamically set using the HTTP path via the `otel.name` field.
 /// Additionally also pulls in remote tracing context which allows the server trace to be connected
 /// to the client's origin trace.
-pub fn traced_span_fn<T>(component: TracedComponent) -> fn(&http::Request<T>) -> tracing::Span {
-    match component {
-        TracedComponent::Rpc => rpc_trace_fn,
-        TracedComponent::BlockProducer => block_producer_trace_fn,
-        TracedComponent::StoreRpc => store_rpc_trace_fn,
-        TracedComponent::StoreBlockProducer => store_block_producer_trace_fn,
-        TracedComponent::StoreNtxBuilder => store_ntx_builder_trace_fn,
-        TracedComponent::RemoteProver => remote_prover_trace_fn,
-        TracedComponent::RemoteProverProxy => remote_prover_proxy_trace_fn,
-    }
-}
+pub fn grpc_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
+    // A gRPC request's path ends with `../<service>/<method>`.
+    let mut path_segments = request.uri().path().rsplit('/');
+    let method = path_segments.next().unwrap_or_default();
+    let service = path_segments.next().unwrap_or_default();
 
-fn rpc_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
-    let span = match request.uri().path().rsplit('/').next() {
-        Some("CheckNullifiers") => rpc_span!("rpc.rpc", "CheckNullifiers"),
-        Some("SyncNullifiers") => rpc_span!("rpc.rpc", "SyncNullifiers"),
-        Some("GetBlockHeaderByNumber") => rpc_span!("rpc.rpc", "GetBlockHeaderByNumber"),
-        Some("SyncStorageMaps") => rpc_span!("rpc.rpc", "SyncStorageMaps"),
-        Some("SyncAccountVault") => rpc_span!("rpc.rpc", "SyncAccountVault"),
-        Some("SyncState") => rpc_span!("rpc.rpc", "SyncState"),
-        Some("SyncNotes") => rpc_span!("rpc.rpc", "SyncNotes"),
-        Some("GetNotesById") => rpc_span!("rpc.rpc", "GetNotesById"),
-        Some("SubmitProvenTransaction") => rpc_span!("rpc.rpc", "SubmitProvenTransaction"),
-        Some("GetAccountDetails") => rpc_span!("rpc.rpc", "GetAccountDetails"),
-        Some("GetBlockByNumber") => rpc_span!("rpc.rpc", "GetBlockByNumber"),
-        Some("GetAccountProofs") => rpc_span!("rpc.rpc", "GetAccountProofs"),
-        Some("GetNoteScriptByRoot") => rpc_span!("rpc.rpc", "GetNoteScriptByRoot"),
-        Some("Status") => rpc_span!("rpc.rpc", "Status"),
-        _ => rpc_span!("rpc.rpc", "Unknown"),
-    };
-    add_network_attributes(span, request)
-}
+    // Create a span with a generic name - the actual span name will be set via otel.name
+    let span = tracing::info_span!("grpc_request", rpc.service = service, rpc.method = method);
 
-fn block_producer_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
-    let span = match request.uri().path().rsplit('/').next() {
-        Some("SubmitProvenTransaction") => {
-            rpc_span!("block-producer.rpc", "SubmitProvenTransaction")
-        },
-        Some("Status") => rpc_span!("block-producer.rpc", "Status"),
-        _ => {
-            rpc_span!("block-producer.rpc", "Unknown")
-        },
-    };
+    // Set the dynamic span name that OpenTelemetry will use
+    // This allows us to have the proper <service>/<method> format without hardcoding
+    span.record("otel.name", format!("{service}/{method}"));
 
-    let span = add_otel_span_attributes(span, request);
-    add_network_attributes(span, request)
-}
-
-fn store_rpc_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
-    let method = request.uri().path().rsplit('/').next().unwrap_or("Unknown");
-    let span = match method {
-        "CheckNullifiers" => rpc_span!("store.rpc.rpc", "CheckNullifiers"),
-        "SyncNullifiers" => rpc_span!("store.rpc.rpc", "SyncNullifiers"),
-        "GetAccountDetails" => rpc_span!("store.rpc.rpc", "GetAccountDetails"),
-        "GetAccountProofs" => rpc_span!("store.rpc.rpc", "GetAccountProofs"),
-        "GetBlockByNumber" => rpc_span!("store.rpc.rpc", "GetBlockByNumber"),
-        "GetBlockHeaderByNumber" => rpc_span!("store.rpc.rpc", "GetBlockHeaderByNumber"),
-        "GetNotesById" => rpc_span!("store.rpc.rpc", "GetNotesById"),
-        "SyncNotes" => rpc_span!("store.rpc.rpc", "SyncNotes"),
-        "SyncState" => rpc_span!("store.rpc.rpc", "SyncState"),
-        "GetNoteScriptByRoot" => rpc_span!("store.rpc.rpc", "GetNoteScriptByRoot"),
-        "Status" => rpc_span!("store.rpc.rpc", "Status"),
-        _ => rpc_span!("store.rpc.rpc", "Unknown"),
-    };
-
-    let span = add_otel_span_attributes(span, request);
-    add_network_attributes(span, request)
-}
-
-fn store_block_producer_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
-    let method = request.uri().path().rsplit('/').next().unwrap_or("Unknown");
-    let span = match method {
-        "ApplyBlock" => rpc_span!("store.block-producer.rpc", "ApplyBlock"),
-        "GetBlockHeaderByNumber" => rpc_span!("store.block-producer.rpc", "GetBlockHeaderByNumber"),
-        "GetBlockInputs" => rpc_span!("store.block-producer.rpc", "GetBlockInputs"),
-        "GetBatchInputs" => rpc_span!("store.block-producer.rpc", "GetBatchInputs"),
-        "GetTransactionInputs" => rpc_span!("store.block-producer.rpc", "GetTransactionInputs"),
-        _ => rpc_span!("store.block-producer.rpc", "Unknown"),
-    };
-
-    let span = add_otel_span_attributes(span, request);
-    add_network_attributes(span, request)
-}
-
-fn store_ntx_builder_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
-    let method = request.uri().path().rsplit('/').next().unwrap_or("Unknown");
-    let span = match method {
-        "GetBlockHeaderByNumber" => rpc_span!("store.ntx-builder.rpc", "GetBlockHeaderByNumber"),
-        "GetUnconsumedNetworkNotes" => {
-            rpc_span!("store.ntx-builder.rpc", "GetUnconsumedNetworkNotes")
-        },
-        "GetCurrentBlockchainData" => {
-            rpc_span!("store.ntx-builder.rpc", "GetCurrentBlockchainData")
-        },
-        "GetNetworkAccountDetailsByPrefix" => {
-            rpc_span!("store.ntx-builder.rpc", "GetNetworkAccountDetailsByPrefix")
-        },
-        _ => rpc_span!("store.ntx-builder.rpc", "Unknown"),
-    };
-
-    let span = add_otel_span_attributes(span, request);
-    add_network_attributes(span, request)
-}
-
-fn remote_prover_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
-    let method = request.uri().path().rsplit('/').next().unwrap_or("Unknown");
-    let span = match method {
-        "Prove" => rpc_span!("remote-prover.rpc", "Prove"),
-        "Status" => rpc_span!("remote-prover.rpc", "Status"),
-        _ => rpc_span!("remote-prover.rpc", "Unknown"),
-    };
-
-    let span = add_otel_span_attributes(span, request);
-    add_network_attributes(span, request)
-}
-
-fn remote_prover_proxy_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
-    let method = request.uri().path().rsplit('/').next().unwrap_or("Unknown");
-    let span = if method == "Status" {
-        rpc_span!("remote-prover-proxy.rpc", "Status")
-    } else {
-        rpc_span!("remote-prover-proxy.rpc", "Unknown")
-    };
-
-    let span = add_otel_span_attributes(span, request);
-    add_network_attributes(span, request)
-}
-
-/// Adds remote tracing context to the span.
-///
-/// Could be expanded in the future by adding in more open-telemetry properties.
-fn add_otel_span_attributes<T>(span: tracing::Span, request: &http::Request<T>) -> tracing::Span {
-    // Pull the open-telemetry parent context using the HTTP extractor. We could make a more
-    // generic gRPC extractor by utilising the gRPC metadata. However that
-    //     (a) requires cloning headers,
-    //     (b) we would have to write this ourselves, and
-    //     (c) gRPC metadata is transferred using HTTP headers in any case.
+    // Pull the open-telemetry parent context using the HTTP extractor
     let otel_ctx = opentelemetry::global::get_text_map_propagator(|propagator| {
         propagator.extract(&MetadataExtractor(&tonic::metadata::MetadataMap::from_headers(
             request.headers().clone(),
@@ -173,14 +28,10 @@ fn add_otel_span_attributes<T>(span: tracing::Span, request: &http::Request<T>)
     });
     tracing_opentelemetry::OpenTelemetrySpanExt::set_parent(&span, otel_ctx);
 
-    span
-}
+    // Adds various network attributes to the span, including remote address and port.
+    //
+    // See [server attributes](https://opentelemetry.io/docs/specs/semconv/rpc/rpc-spans/#server-attributes).
 
-/// Adds various network attributes to the span, including remote address and port.
-///
-/// See [server attributes](https://opentelemetry.io/docs/specs/semconv/rpc/rpc-spans/#server-attributes).
-fn add_network_attributes<T>(span: tracing::Span, request: &http::Request<T>) -> tracing::Span {
-    use super::OpenTelemetrySpanExt;
     // Set HTTP attributes.
     span.set_attribute("rpc.system", "grpc");
     if let Some(host) = request.uri().host() {

From 6c7530dc553826c2088fed9362e1c26e5d79fea2 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Fri, 5 Sep 2025 14:35:17 -0300
Subject: [PATCH 07/78] feat: add `BlockRange` and `PaginationInfo` messages
 (#1205)

* feat: add BlockRange message

* feat: add PaginationInfo message

* fix: add PR number in changelog entry

* review: update PaginationInfo docs

* review: add +1 in PaginationInfo docs

* review: implement From and Into for proto::BlockRange

* review: use RangeInclusive in sync_storage_maps

* fix: re-build proto messages
---
 CHANGELOG.md                            |   1 +
 bin/stress-test/src/store/mod.rs        |   3 +-
 crates/proto/src/domain/block.rs        |  31 ++++++-
 crates/proto/src/generated/rpc_store.rs | 115 ++++++++++++------------
 crates/store/src/server/rpc_api.rs      |  53 +++++------
 proto/proto/store/rpc.proto             | 111 ++++++++++++-----------
 6 files changed, 176 insertions(+), 138 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71c0906ba..5e103d0c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Added `GetNoteScriptByRoot` gRPC endpoint for retrieving a note script by its root ([#1196](https://github.com/0xMiden/miden-node/pull/1196)).
 - [BREAKING] Refactored `CheckNullifiersByPrefix` endpoint adding pagination ([#1191](https://github.com/0xMiden/miden-node/pull/1191)).
 - [BREAKING] Renamed `CheckNullifiersByPrefix` endpoint to `SyncNullifiers` ([#1191](https://github.com/0xMiden/miden-node/pull/1191)).
+- [BREAKING] Added `block_range` and `pagination_info` fields to paginated gRPC endpoints ([#1205](https://github.com/0xMiden/miden-node/pull/1205)).
 
 ## v0.11.0 (2025-08-28)
 
diff --git a/bin/stress-test/src/store/mod.rs b/bin/stress-test/src/store/mod.rs
index 6c25f2390..2a571d6a3 100644
--- a/bin/stress-test/src/store/mod.rs
+++ b/bin/stress-test/src/store/mod.rs
@@ -279,10 +279,9 @@ async fn sync_nullifiers(
     nullifiers_prefixes: Vec<u32>,
 ) -> (Duration, proto::rpc_store::SyncNullifiersResponse) {
     let sync_request = proto::rpc_store::SyncNullifiersRequest {
+        block_range: Some(proto::rpc_store::BlockRange { block_from: 0, block_to: None }),
         nullifiers: nullifiers_prefixes,
         prefix_len: 16,
-        block_from: 0,
-        block_to: None,
     };
 
     let start = Instant::now();
diff --git a/crates/proto/src/domain/block.rs b/crates/proto/src/domain/block.rs
index 20565fe34..4967fbeb7 100644
--- a/crates/proto/src/domain/block.rs
+++ b/crates/proto/src/domain/block.rs
@@ -1,7 +1,14 @@
 use std::collections::BTreeMap;
+use std::ops::RangeInclusive;
 
 use miden_objects::account::AccountId;
-use miden_objects::block::{BlockHeader, BlockInputs, FeeParameters, NullifierWitness};
+use miden_objects::block::{
+    BlockHeader,
+    BlockInputs,
+    BlockNumber,
+    FeeParameters,
+    NullifierWitness,
+};
 use miden_objects::note::{NoteId, NoteInclusionProof};
 use miden_objects::transaction::PartialBlockchain;
 use miden_objects::utils::{Deserializable, Serializable};
@@ -207,3 +214,25 @@ impl From<&FeeParameters> for proto::blockchain::FeeParameters {
         }
     }
 }
+
+// BLOCK RANGE
+// ================================================================================================
+
+impl proto::rpc_store::BlockRange {
+    /// Converts the block range into an inclusive range, using the fallback block number if the
+    /// block to is not specified.
+    pub fn into_inclusive_range(self, fallback: BlockNumber) -> RangeInclusive<BlockNumber> {
+        RangeInclusive::new(
+            self.block_from.into(),
+            self.block_to.map_or(fallback, BlockNumber::from),
+        )
+    }
+
+    /// Converts an inclusive range into a [`proto::rpc_store::BlockRange`].
+    pub fn from_range(range: RangeInclusive<BlockNumber>) -> Self {
+        Self {
+            block_from: range.start().as_u32(),
+            block_to: Some(range.end().as_u32()),
+        }
+    }
+}
diff --git a/crates/proto/src/generated/rpc_store.rs b/crates/proto/src/generated/rpc_store.rs
index faddfcca7..1b68ddf9f 100644
--- a/crates/proto/src/generated/rpc_store.rs
+++ b/crates/proto/src/generated/rpc_store.rs
@@ -138,34 +138,24 @@ pub struct CheckNullifiersResponse {
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncNullifiersRequest {
     /// Block number from which the nullifiers are requested (inclusive).
-    #[prost(fixed32, tag = "1")]
-    pub block_from: u32,
-    /// Block number up to which to check. If not specified, checks up to the latest block.
-    #[prost(fixed32, optional, tag = "2")]
-    pub block_to: ::core::option::Option<u32>,
+    #[prost(message, optional, tag = "1")]
+    pub block_range: ::core::option::Option<BlockRange>,
     /// Number of bits used for nullifier prefix. Currently the only supported value is 16.
-    #[prost(uint32, tag = "3")]
+    #[prost(uint32, tag = "2")]
     pub prefix_len: u32,
     /// List of nullifiers to check. Each nullifier is specified by its prefix with length equal
     /// to `prefix_len`.
-    #[prost(uint32, repeated, tag = "4")]
+    #[prost(uint32, repeated, tag = "3")]
     pub nullifiers: ::prost::alloc::vec::Vec<u32>,
 }
 /// Represents the result of syncing nullifiers.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncNullifiersResponse {
-    /// Current chain tip
-    #[prost(fixed32, tag = "1")]
-    pub chain_tip: u32,
-    /// The block number of the last check included in this response.
-    ///
-    /// For chunked responses, this may be less than request.block_to.
-    /// If it is less than request.block_to, the user is expected to make a subsequent request
-    /// starting from the next block to this one (ie, request.block_from = block_num + 1).
-    #[prost(fixed32, tag = "2")]
-    pub block_num: u32,
+    /// Pagination information.
+    #[prost(message, optional, tag = "1")]
+    pub pagination_info: ::core::option::Option<PaginationInfo>,
     /// List of nullifiers matching the prefixes specified in the request.
-    #[prost(message, repeated, tag = "3")]
+    #[prost(message, repeated, tag = "2")]
     pub nullifiers: ::prost::alloc::vec::Vec<sync_nullifiers_response::NullifierUpdate>,
 }
 /// Nested message and enum types in `SyncNullifiersResponse`.
@@ -232,36 +222,26 @@ pub struct SyncStateResponse {
 /// Allows clients to sync asset values for specific public accounts within a block range.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncAccountVaultRequest {
-    /// Block number from which to start synchronizing.
-    #[prost(fixed32, tag = "1")]
-    pub block_from: u32,
-    /// / Block number up to which to sync. If not specified, syncs up to the latest block.
-    /// /
-    /// / If specified, this block must be close to the chain tip (i.e., within 30 blocks),
-    /// / otherwise an error will be returned.
-    #[prost(fixed32, optional, tag = "2")]
-    pub block_to: ::core::option::Option<u32>,
+    /// Block range from which to start synchronizing.
+    ///
+    /// If the `block_to` is specified, this block must be close to the chain tip (i.e., within 30 blocks),
+    /// otherwise an error will be returned.
+    #[prost(message, optional, tag = "1")]
+    pub block_range: ::core::option::Option<BlockRange>,
     /// Account for which we want to sync asset vault.
-    #[prost(message, optional, tag = "3")]
+    #[prost(message, optional, tag = "2")]
     pub account_id: ::core::option::Option<super::account::AccountId>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncAccountVaultResponse {
-    /// Chain tip at the moment of the request.
-    #[prost(fixed32, tag = "1")]
-    pub chain_tip: u32,
-    /// The block number of the last update included in this response.
-    ///
-    /// For chunked responses, this may be less than request.block_to.
-    /// If it is less than request.block_to, the user is expected to make a subsequent request
-    /// starting from the next block to this one (ie, request.block_from = block_num + 1).
-    #[prost(fixed32, tag = "2")]
-    pub block_num: u32,
+    /// Pagination information.
+    #[prost(message, optional, tag = "1")]
+    pub pagination_info: ::core::option::Option<PaginationInfo>,
     /// List of asset updates for the account.
     ///
     /// Multiple updates can be returned for a single asset, and the one with a higher `block_num`
     /// is expected to be retained by the caller.
-    #[prost(message, repeated, tag = "3")]
+    #[prost(message, repeated, tag = "2")]
     pub updates: ::prost::alloc::vec::Vec<AccountVaultUpdate>,
 }
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
@@ -316,36 +296,26 @@ pub struct SyncNotesResponse {
 /// with support for cursor-based pagination to handle large storage maps.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncStorageMapsRequest {
-    /// Block number to start sending updates from (inclusive).
-    #[prost(fixed32, tag = "1")]
-    pub block_from: u32,
-    /// Block number up to which to sync. If not specified, syncs up to the latest block.
+    /// Block range from which to start synchronizing.
     ///
-    /// If specified, this block must be close to the chain tip (i.e., within 30 blocks),
+    /// If the `block_to` is specified, this block must be close to the chain tip (i.e., within 30 blocks),
     /// otherwise an error will be returned.
-    #[prost(fixed32, optional, tag = "2")]
-    pub block_to: ::core::option::Option<u32>,
+    #[prost(message, optional, tag = "1")]
+    pub block_range: ::core::option::Option<BlockRange>,
     /// Account for which we want to sync storage maps.
     #[prost(message, optional, tag = "3")]
     pub account_id: ::core::option::Option<super::account::AccountId>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncStorageMapsResponse {
-    /// Current chain tip
-    #[prost(fixed32, tag = "1")]
-    pub chain_tip: u32,
-    /// The block number of the last update included in this response.
-    ///
-    /// For chunked responses, this may be less than request.block_to.
-    /// If it is less than request.block_to, the user is expected to make a subsequent request
-    /// starting from the next block to this one (ie, request.block_from = block_num + 1).
-    #[prost(fixed32, tag = "2")]
-    pub block_num: u32,
+    /// Pagination information.
+    #[prost(message, optional, tag = "1")]
+    pub pagination_info: ::core::option::Option<PaginationInfo>,
     /// The list of storage map updates.
     ///
     /// Multiple updates can be returned for a single slot index and key combination, and the one
     /// with a higher `block_num` is expected to be retained by the caller.
-    #[prost(message, repeated, tag = "3")]
+    #[prost(message, repeated, tag = "2")]
     pub updates: ::prost::alloc::vec::Vec<StorageMapUpdate>,
 }
 /// Represents a single storage map update.
@@ -371,6 +341,37 @@ pub struct MaybeNoteScript {
     #[prost(message, optional, tag = "1")]
     pub script: ::core::option::Option<super::note::NoteScript>,
 }
+/// Represents a block range.
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+pub struct BlockRange {
+    /// Block number from which to start (inclusive).
+    #[prost(fixed32, tag = "1")]
+    pub block_from: u32,
+    /// Block number up to which to check (inclusive). If not specified, checks up to the latest block.
+    #[prost(fixed32, optional, tag = "2")]
+    pub block_to: ::core::option::Option<u32>,
+}
+/// Represents pagination information for chunked responses.
+///
+/// Pagination is done using block numbers as the axis, allowing clients to request
+/// data in chunks by specifying block ranges and continuing from where the previous
+/// response left off.
+///
+/// To request the next chunk, the client should use `block_num + 1` from the previous response
+/// as the `block_from` for the next request.
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+pub struct PaginationInfo {
+    /// Current chain tip
+    #[prost(fixed32, tag = "1")]
+    pub chain_tip: u32,
+    /// The block number of the last check included in this response.
+    ///
+    /// For chunked responses, this may be less than `request.block_range.block_to`.
+    /// If it is less than request.block_range.block_to, the user is expected to make a subsequent request
+    /// starting from the next block to this one (ie, request.block_range.block_from = block_num + 1).
+    #[prost(fixed32, tag = "2")]
+    pub block_num: u32,
+}
 /// Generated client implementations.
 pub mod rpc_client {
     #![allow(
diff --git a/crates/store/src/server/rpc_api.rs b/crates/store/src/server/rpc_api.rs
index 788c0f7fa..85af1e8b7 100644
--- a/crates/store/src/server/rpc_api.rs
+++ b/crates/store/src/server/rpc_api.rs
@@ -8,7 +8,6 @@ use miden_node_proto::{convert, try_convert};
 use miden_node_utils::ErrorReport as _;
 use miden_objects::Word;
 use miden_objects::account::AccountId;
-use miden_objects::block::BlockNumber;
 use miden_objects::note::NoteId;
 use tonic::{Request, Response, Status};
 use tracing::{debug, info, instrument};
@@ -100,15 +99,14 @@ impl rpc_server::Rpc for StoreApi {
         }
 
         let chain_tip = self.state.latest_block_num().await;
-        let block_to = request.block_to.map_or(chain_tip, BlockNumber::from);
+        let block_range = request
+            .block_range
+            .ok_or(invalid_argument("block_range is required"))?
+            .into_inclusive_range(chain_tip);
 
         let (nullifiers, block_num) = self
             .state
-            .sync_nullifiers(
-                request.prefix_len,
-                request.nullifiers,
-                request.block_from.into()..=block_to,
-            )
+            .sync_nullifiers(request.prefix_len, request.nullifiers, block_range)
             .await?;
         let nullifiers = nullifiers
             .into_iter()
@@ -119,9 +117,11 @@ impl rpc_server::Rpc for StoreApi {
             .collect();
 
         Ok(Response::new(proto::rpc_store::SyncNullifiersResponse {
+            pagination_info: Some(proto::rpc_store::PaginationInfo {
+                chain_tip: chain_tip.as_u32(),
+                block_num: block_num.as_u32(),
+            }),
             nullifiers,
-            block_num: block_num.as_u32(),
-            chain_tip: chain_tip.as_u32(),
         }))
     }
 
@@ -361,16 +361,17 @@ impl rpc_server::Rpc for StoreApi {
             )));
         }
 
-        let block_from = request.block_from.into();
-        let block_to: BlockNumber = request.block_to.map_or(chain_tip, BlockNumber::from);
+        let block_range = request.block_range.ok_or(invalid_argument("block_range is required"))?;
+
+        let block_range = block_range.into_inclusive_range(chain_tip);
 
-        if block_to >= chain_tip {
+        if block_range.end() > &chain_tip {
             return Err(Status::invalid_argument("block_to cannot be higher than the chain tip"));
         }
 
         let (last_included_block, updates) = self
             .state
-            .sync_account_vault(account_id, block_from..=block_to)
+            .sync_account_vault(account_id, block_range)
             .await
             .map_err(internal_error)?;
 
@@ -384,8 +385,10 @@ impl rpc_server::Rpc for StoreApi {
             .collect();
 
         Ok(Response::new(proto::rpc_store::SyncAccountVaultResponse {
-            block_num: last_included_block.as_u32(),
-            chain_tip: chain_tip.as_u32(),
+            pagination_info: Some(proto::rpc_store::PaginationInfo {
+                chain_tip: chain_tip.as_u32(),
+                block_num: last_included_block.as_u32(),
+            }),
             updates,
         }))
     }
@@ -416,21 +419,19 @@ impl rpc_server::Rpc for StoreApi {
             )));
         }
 
-        let block_from = BlockNumber::from(request.block_from);
         let chain_tip = self.state.latest_block_num().await;
+        let block_range = request
+            .block_range
+            .ok_or(invalid_argument("block_range is required"))?
+            .into_inclusive_range(chain_tip);
 
-        let block_to = match request.block_to {
-            Some(block_to) => BlockNumber::from(block_to),
-            None => chain_tip,
-        };
-
-        if block_from > block_to {
+        if block_range.start() > block_range.end() {
             return Err(Status::invalid_argument("block_from cannot be greater than block_to"));
         }
 
         let storage_maps_page = self
             .state
-            .get_storage_map_sync_values(account_id, block_from..=block_to)
+            .get_storage_map_sync_values(account_id, block_range)
             .await
             .map_err(internal_error)?;
 
@@ -446,8 +447,10 @@ impl rpc_server::Rpc for StoreApi {
             .collect();
 
         Ok(Response::new(proto::rpc_store::SyncStorageMapsResponse {
-            block_num: storage_maps_page.last_block_included.as_u32(),
-            chain_tip: chain_tip.as_u32(),
+            pagination_info: Some(proto::rpc_store::PaginationInfo {
+                chain_tip: chain_tip.as_u32(),
+                block_num: storage_maps_page.last_block_included.as_u32(),
+            }),
             updates,
         }))
     }
diff --git a/proto/proto/store/rpc.proto b/proto/proto/store/rpc.proto
index d407904fd..ce2270de1 100644
--- a/proto/proto/store/rpc.proto
+++ b/proto/proto/store/rpc.proto
@@ -199,17 +199,14 @@ message CheckNullifiersResponse {
 // Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
 message SyncNullifiersRequest {
     // Block number from which the nullifiers are requested (inclusive).
-    fixed32 block_from = 1;
-
-    // Block number up to which to check. If not specified, checks up to the latest block.
-    optional fixed32 block_to = 2;
+    BlockRange block_range = 1;
 
     // Number of bits used for nullifier prefix. Currently the only supported value is 16.
-    uint32 prefix_len = 3;
+    uint32 prefix_len = 2;
 
     // List of nullifiers to check. Each nullifier is specified by its prefix with length equal
     // to `prefix_len`.
-    repeated uint32 nullifiers = 4;
+    repeated uint32 nullifiers = 3;
 }
 
 // Represents the result of syncing nullifiers.
@@ -223,18 +220,11 @@ message SyncNullifiersResponse {
         fixed32 block_num = 2;
     }
 
-    // Current chain tip
-    fixed32 chain_tip = 1;
-
-    // The block number of the last check included in this response.
-    //
-    // For chunked responses, this may be less than request.block_to.
-    // If it is less than request.block_to, the user is expected to make a subsequent request
-    // starting from the next block to this one (ie, request.block_from = block_num + 1).
-    fixed32 block_num = 2;
+    // Pagination information.
+    PaginationInfo pagination_info = 1;
 
     // List of nullifiers matching the prefixes specified in the request.
-    repeated NullifierUpdate nullifiers = 3;
+    repeated NullifierUpdate nullifiers = 2;
 }
 
 // SYNC STATE
@@ -291,35 +281,25 @@ message SyncStateResponse {
 //
 // Allows clients to sync asset values for specific public accounts within a block range.
 message SyncAccountVaultRequest {
-    // Block number from which to start synchronizing.
-    fixed32 block_from = 1;
-    
-    /// Block number up to which to sync. If not specified, syncs up to the latest block.
-    ///
-    /// If specified, this block must be close to the chain tip (i.e., within 30 blocks),
-    /// otherwise an error will be returned.
-    optional fixed32 block_to = 2;
-    
+    // Block range from which to start synchronizing.
+    //
+    // If the `block_to` is specified, this block must be close to the chain tip (i.e., within 30 blocks),
+    // otherwise an error will be returned.
+    BlockRange block_range = 1;
+
     // Account for which we want to sync asset vault.
-    account.AccountId account_id = 3;
+    account.AccountId account_id = 2;
 }
 
 message SyncAccountVaultResponse {
-    // Chain tip at the moment of the request.
-    fixed32 chain_tip = 1;
-
-    // The block number of the last update included in this response.
-    //
-    // For chunked responses, this may be less than request.block_to.
-    // If it is less than request.block_to, the user is expected to make a subsequent request 
-    // starting from the next block to this one (ie, request.block_from = block_num + 1).
-    fixed32 block_num = 2;
+    // Pagination information.
+    PaginationInfo pagination_info = 1;
 
     // List of asset updates for the account.
     // 
     // Multiple updates can be returned for a single asset, and the one with a higher `block_num`
     // is expected to be retained by the caller.
-    repeated AccountVaultUpdate updates = 3;
+    repeated AccountVaultUpdate updates = 2;
 }
 
 message AccountVaultUpdate {
@@ -376,35 +356,25 @@ message SyncNotesResponse {
 // Allows clients to sync storage map values for specific public accounts within a block range,
 // with support for cursor-based pagination to handle large storage maps.
 message SyncStorageMapsRequest {
-    // Block number to start sending updates from (inclusive).
-    fixed32 block_from = 1;
-
-    // Block number up to which to sync. If not specified, syncs up to the latest block.
+    // Block range from which to start synchronizing.
     //
-    // If specified, this block must be close to the chain tip (i.e., within 30 blocks),
+    // If the `block_to` is specified, this block must be close to the chain tip (i.e., within 30 blocks),
     // otherwise an error will be returned.
-    optional fixed32 block_to = 2;
-    
+    BlockRange block_range = 1;
+
     // Account for which we want to sync storage maps.
     account.AccountId account_id = 3;
 }
 
 message SyncStorageMapsResponse {
-    // Current chain tip
-    fixed32 chain_tip = 1;
-
-    // The block number of the last update included in this response.
-    //
-    // For chunked responses, this may be less than request.block_to.
-    // If it is less than request.block_to, the user is expected to make a subsequent request 
-    // starting from the next block to this one (ie, request.block_from = block_num + 1).
-    fixed32 block_num = 2;
+    // Pagination information.
+    PaginationInfo pagination_info = 1;
 
     // The list of storage map updates.
     // 
     // Multiple updates can be returned for a single slot index and key combination, and the one
     // with a higher `block_num` is expected to be retained by the caller.
-    repeated StorageMapUpdate updates = 3;
+    repeated StorageMapUpdate updates = 2;
 }
 
 // Represents a single storage map update.
@@ -430,3 +400,38 @@ message MaybeNoteScript {
     // The script for a note by its root.
     optional note.NoteScript script = 1;
 }
+
+// BLOCK RANGE
+// ================================================================================================
+
+// Represents a block range.
+message BlockRange {
+    // Block number from which to start (inclusive).
+    fixed32 block_from = 1;
+
+    // Block number up to which to check (inclusive). If not specified, checks up to the latest block.
+    optional fixed32 block_to = 2;
+}
+
+// PAGINATION INFO
+// ================================================================================================
+
+// Represents pagination information for chunked responses.
+//
+// Pagination is done using block numbers as the axis, allowing clients to request
+// data in chunks by specifying block ranges and continuing from where the previous
+// response left off.
+//
+// To request the next chunk, the client should use `block_num + 1` from the previous response
+// as the `block_from` for the next request.
+message PaginationInfo {
+    // Current chain tip
+    fixed32 chain_tip = 1;
+
+    // The block number of the last check included in this response.
+    //
+    // For chunked responses, this may be less than `request.block_range.block_to`.
+    // If it is less than request.block_range.block_to, the user is expected to make a subsequent request
+    // starting from the next block to this one (ie, request.block_range.block_from = block_num + 1).
+    fixed32 block_num = 2;
+}

From 8d68ac10a95ef135f33735b5b2cef446d5b8bf8b Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Wed, 10 Sep 2025 10:49:42 +0200
Subject: [PATCH 08/78] improve `build.rs` protox errors (#1213)

---
 Cargo.lock              |  5 ++++-
 crates/proto/Cargo.toml |  3 ++-
 crates/proto/build.rs   | 24 +++++++++++++++---------
 proto/Cargo.toml        |  3 ++-
 proto/build.rs          | 31 ++++++++++++++++++++-----------
 5 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3aebde866..1f3297ed2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2275,11 +2275,13 @@ name = "miden-node-proto"
 version = "0.12.0"
 dependencies = [
  "anyhow",
+ "fs-err",
  "hex",
  "http",
  "miden-node-proto-build",
  "miden-node-utils",
  "miden-objects",
+ "miette",
  "proptest",
  "prost",
  "prost-build",
@@ -2294,7 +2296,8 @@ dependencies = [
 name = "miden-node-proto-build"
 version = "0.12.0"
 dependencies = [
- "anyhow",
+ "fs-err",
+ "miette",
  "prost",
  "protox",
  "tonic-build",
diff --git a/crates/proto/Cargo.toml b/crates/proto/Cargo.toml
index 13c13e9c0..bf23a9547 100644
--- a/crates/proto/Cargo.toml
+++ b/crates/proto/Cargo.toml
@@ -29,8 +29,9 @@ url              = { workspace = true }
 proptest = { version = "1.7" }
 
 [build-dependencies]
-anyhow                 = { workspace = true }
+fs-err                 = { workspace = true }
 miden-node-proto-build = { features = ["internal"], workspace = true }
+miette                 = { version = "7.6" }
 prost                  = { workspace = true }
 prost-build            = { version = "0.13" }
 protox                 = { version = "0.8" }
diff --git a/crates/proto/build.rs b/crates/proto/build.rs
index ed4d03dd9..1e73b1db6 100644
--- a/crates/proto/build.rs
+++ b/crates/proto/build.rs
@@ -1,7 +1,7 @@
+use std::env;
 use std::path::{Path, PathBuf};
-use std::{env, fs};
 
-use anyhow::Context;
+use fs_err as fs;
 use miden_node_proto_build::{
     block_producer_api_descriptor,
     rpc_api_descriptor,
@@ -10,13 +10,14 @@ use miden_node_proto_build::{
     store_rpc_api_descriptor,
     store_shared_api_descriptor,
 };
+use miette::{Context, IntoDiagnostic};
 use tonic_build::FileDescriptorSet;
 
 /// Generates Rust protobuf bindings using miden-node-proto-build.
 ///
 /// This is done only if `BUILD_PROTO` environment variable is set to `1` to avoid running the
 /// script on crates.io where repo-level .proto files are not available.
-fn main() -> anyhow::Result<()> {
+fn main() -> miette::Result<()> {
     println!("cargo::rerun-if-changed=../../proto/proto");
     println!("cargo::rerun-if-env-changed=BUILD_PROTO");
 
@@ -30,8 +31,12 @@ fn main() -> anyhow::Result<()> {
     let dst_dir = crate_root.join("src").join("generated");
 
     // Remove all existing files.
-    fs::remove_dir_all(&dst_dir).context("removing existing files")?;
-    fs::create_dir(&dst_dir).context("creating destination folder")?;
+    fs::remove_dir_all(&dst_dir)
+        .into_diagnostic()
+        .wrap_err("removing existing files")?;
+    fs::create_dir(&dst_dir)
+        .into_diagnostic()
+        .wrap_err("creating destination folder")?;
 
     generate_bindings(rpc_api_descriptor(), &dst_dir)?;
     generate_bindings(store_rpc_api_descriptor(), &dst_dir)?;
@@ -40,14 +45,14 @@ fn main() -> anyhow::Result<()> {
     generate_bindings(store_shared_api_descriptor(), &dst_dir)?;
     generate_bindings(block_producer_api_descriptor(), &dst_dir)?;
 
-    generate_mod_rs(&dst_dir).context("generating mod.rs")?;
+    generate_mod_rs(&dst_dir).into_diagnostic().wrap_err("generating mod.rs")?;
 
     Ok(())
 }
 
 /// Generates protobuf bindings from the given file descriptor set and stores them in the
 /// given destination directory.
-fn generate_bindings(file_descriptors: FileDescriptorSet, dst_dir: &Path) -> anyhow::Result<()> {
+fn generate_bindings(file_descriptors: FileDescriptorSet, dst_dir: &Path) -> miette::Result<()> {
     let mut prost_config = prost_build::Config::new();
     prost_config.skip_debug(["AccountId", "Digest"]);
 
@@ -55,7 +60,8 @@ fn generate_bindings(file_descriptors: FileDescriptorSet, dst_dir: &Path) -> any
     tonic_build::configure()
         .out_dir(dst_dir)
         .compile_fds_with_config(prost_config, file_descriptors)
-        .context("compiling protobufs")?;
+        .into_diagnostic()
+        .wrap_err("compiling protobufs")?;
 
     Ok(())
 }
@@ -66,7 +72,7 @@ fn generate_mod_rs(directory: impl AsRef<Path>) -> std::io::Result<()> {
 
     // Discover all submodules by iterating over the folder contents.
     let mut submodules = Vec::new();
-    for entry in fs::read_dir(directory)? {
+    for entry in fs::read_dir(directory.as_ref())? {
         let entry = entry?;
         let path = entry.path();
         if path.is_file() {
diff --git a/proto/Cargo.toml b/proto/Cargo.toml
index aa596f3e6..f82ddd25c 100644
--- a/proto/Cargo.toml
+++ b/proto/Cargo.toml
@@ -24,6 +24,7 @@ protox      = { version = "0.8" }
 tonic-build = { version = "0.13" }
 
 [build-dependencies]
-anyhow = { workspace = true }
+fs-err = { workspace = true }
+miette = { version = "7.6" }
 prost  = { workspace = true }
 protox = { version = "0.8" }
diff --git a/proto/build.rs b/proto/build.rs
index 6f6a58250..0b172c706 100644
--- a/proto/build.rs
+++ b/proto/build.rs
@@ -1,7 +1,8 @@
+use std::env;
 use std::path::PathBuf;
-use std::{env, fs};
 
-use anyhow::Context;
+use fs_err as fs;
+use miette::{Context, IntoDiagnostic};
 use prost::Message;
 
 const RPC_PROTO: &str = "rpc.proto";
@@ -24,11 +25,12 @@ const REMOTE_PROVER_DESCRIPTOR: &str = "remote_prover_file_descriptor.bin";
 ///
 /// This is done only if `BUILD_PROTO` environment variable is set to `1` to avoid running the
 /// script on crates.io where repo-level .proto files are not available.
-fn main() -> anyhow::Result<()> {
+fn main() -> miette::Result<()> {
     println!("cargo::rerun-if-changed=./proto");
     println!("cargo::rerun-if-env-changed=BUILD_PROTO");
 
-    let out = env::var("OUT_DIR").context("env::OUT_DIR not set")?;
+    let out =
+        env::var("OUT_DIR").expect("env::OUT_DIR is always set in build.rs when used with cargo");
 
     let crate_root: PathBuf = env!("CARGO_MANIFEST_DIR").into();
     let proto_dir = crate_root.join("proto");
@@ -37,38 +39,45 @@ fn main() -> anyhow::Result<()> {
     let rpc_file_descriptor = protox::compile([RPC_PROTO], includes)?;
     let rpc_path = PathBuf::from(&out).join(RPC_DESCRIPTOR);
     fs::write(&rpc_path, rpc_file_descriptor.encode_to_vec())
-        .context("writing rpc file descriptor")?;
+        .into_diagnostic()
+        .wrap_err("writing rpc file descriptor")?;
 
     let remote_prover_file_descriptor = protox::compile([REMOTE_PROVER_PROTO], includes)?;
     let remote_prover_path = PathBuf::from(&out).join(REMOTE_PROVER_DESCRIPTOR);
     fs::write(&remote_prover_path, remote_prover_file_descriptor.encode_to_vec())
-        .context("writing remote prover file descriptor")?;
+        .into_diagnostic()
+        .wrap_err("writing remote prover file descriptor")?;
 
     let store_rpc_file_descriptor = protox::compile([STORE_RPC_PROTO], includes)?;
     let store_rpc_path = PathBuf::from(&out).join(STORE_RPC_DESCRIPTOR);
     fs::write(&store_rpc_path, store_rpc_file_descriptor.encode_to_vec())
-        .context("writing store rpc file descriptor")?;
+        .into_diagnostic()
+        .wrap_err("writing store rpc file descriptor")?;
 
     let store_ntx_builder_file_descriptor = protox::compile([STORE_NTX_BUILDER_PROTO], includes)?;
     let store_ntx_builder_path = PathBuf::from(&out).join(STORE_NTX_BUILDER_DESCRIPTOR);
     fs::write(&store_ntx_builder_path, store_ntx_builder_file_descriptor.encode_to_vec())
-        .context("writing store ntx builder file descriptor")?;
+        .into_diagnostic()
+        .wrap_err("writing store ntx builder file descriptor")?;
 
     let store_block_producer_file_descriptor =
         protox::compile([STORE_BLOCK_PRODUCER_PROTO], includes)?;
     let store_block_producer_path = PathBuf::from(&out).join(STORE_BLOCK_PRODUCER_DESCRIPTOR);
     fs::write(&store_block_producer_path, store_block_producer_file_descriptor.encode_to_vec())
-        .context("writing store block producer file descriptor")?;
+        .into_diagnostic()
+        .wrap_err("writing store block producer file descriptor")?;
 
     let store_shared_file_descriptor = protox::compile([STORE_SHARED_PROTO], includes)?;
     let store_shared_path = PathBuf::from(&out).join(STORE_SHARED_DESCRIPTOR);
     fs::write(&store_shared_path, store_shared_file_descriptor.encode_to_vec())
-        .context("writing store shared file descriptor")?;
+        .into_diagnostic()
+        .wrap_err("writing store shared file descriptor")?;
 
     let block_producer_file_descriptor = protox::compile([BLOCK_PRODUCER_PROTO], includes)?;
     let block_producer_path = PathBuf::from(&out).join(BLOCK_PRODUCER_DESCRIPTOR);
     fs::write(&block_producer_path, block_producer_file_descriptor.encode_to_vec())
-        .context("writing block producer file descriptor")?;
+        .into_diagnostic()
+        .wrap_err("writing block producer file descriptor")?;
 
     Ok(())
 }

From ea1239eb5cc9d3277e0ded2abb250857b6db9991 Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Wed, 10 Sep 2025 11:07:03 +0200
Subject: [PATCH 09/78] query/sql: remove dead code (#1220)

---
 ...ct_notes_since_block_by_tag_and_sender.sql |  29 ---
 crates/store/src/db/sql/utils.rs              | 188 ------------------
 2 files changed, 217 deletions(-)
 delete mode 100644 crates/store/src/db/sql/queries/select_notes_since_block_by_tag_and_sender.sql
 delete mode 100644 crates/store/src/db/sql/utils.rs

diff --git a/crates/store/src/db/sql/queries/select_notes_since_block_by_tag_and_sender.sql b/crates/store/src/db/sql/queries/select_notes_since_block_by_tag_and_sender.sql
deleted file mode 100644
index bd6961467..000000000
--- a/crates/store/src/db/sql/queries/select_notes_since_block_by_tag_and_sender.sql
+++ /dev/null
@@ -1,29 +0,0 @@
--- Selects new notes matching the tags and account IDs search criteria.
-SELECT
-    block_num,
-    batch_index,
-    note_index,
-    note_id,
-    note_type,
-    sender,
-    tag,
-    aux,
-    execution_hint,
-    inclusion_path
-FROM
-    notes
-WHERE
-    -- find the next block which contains at least one note with a matching tag or sender
-    block_num = (
-        SELECT
-            block_num
-        FROM
-            notes
-        WHERE
-            (tag IN rarray(?1) OR sender IN rarray(?2)) AND
-            block_num > ?3
-        ORDER BY
-            block_num ASC
-    LIMIT 1) AND
-    -- filter the block's notes and return only the ones matching the requested tags or senders
-    (tag IN rarray(?1) OR sender IN rarray(?2))
diff --git a/crates/store/src/db/sql/utils.rs b/crates/store/src/db/sql/utils.rs
deleted file mode 100644
index 91c8a4217..000000000
--- a/crates/store/src/db/sql/utils.rs
+++ /dev/null
@@ -1,188 +0,0 @@
-use miden_node_proto::domain::account::{AccountInfo, AccountSummary};
-use miden_objects::{
-    Word,
-    account::{Account, AccountDelta, AccountId},
-    block::BlockNumber,
-    note::Nullifier,
-    utils::Deserializable,
-};
-use rusqlite::{
-    OptionalExtension, params,
-    types::{Value, ValueRef},
-};
-
-use crate::{
-    db::{connection::Connection, transaction::Transaction},
-    errors::DatabaseError,
-};
-
-/// Returns the high 16 bits of the provided nullifier.
-pub fn get_nullifier_prefix(nullifier: &Nullifier) -> u32 {
-    (nullifier.most_significant_felt().as_int() >> 48) as u32
-}
-
-/// Checks if a table exists in the database.
-pub fn table_exists(transaction: &Transaction, table_name: &str) -> rusqlite::Result<bool> {
-    Ok(transaction
-        .query_row(
-            "SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = $1",
-            params![table_name],
-            |_| Ok(()),
-        )
-        .optional()?
-        .is_some())
-}
-
-/// Returns the schema version of the database.
-pub fn schema_version(connection: &mut Connection) -> rusqlite::Result<usize> {
-    connection
-        .transaction()?
-        .query_row("SELECT * FROM pragma_schema_version", [], |row| row.get(0))
-}
-
-/// Auxiliary macro which substitutes `$src` token by `$dst` expression.
-macro_rules! subst {
-    ($src:tt, $dst:expr_2021) => {
-        $dst
-    };
-}
-
-/// Generates a simple insert SQL statement with parameters for the provided table name and fields.
-/// Supports optional conflict resolution (adding "| REPLACE" or "| IGNORE" at the end will generate
-/// "OR REPLACE" and "OR IGNORE", correspondingly).
-///
-/// # Usage:
-///
-/// ```ignore
-/// insert_sql!(users { id, first_name, last_name, age } | REPLACE);
-/// ```
-///
-/// which generates:
-/// ```sql
-/// INSERT OR REPLACE INTO `users` (`id`, `first_name`, `last_name`, `age`) VALUES (?, ?, ?, ?)
-/// ```
-macro_rules! insert_sql {
-    ($table:ident { $first_field:ident $(, $($field:ident),+)? $(,)? } $(| $on_conflict:expr)?) => {
-        concat!(
-            stringify!(INSERT $(OR $on_conflict)? INTO ),
-            "`",
-            stringify!($table),
-            "` (`",
-            stringify!($first_field),
-            $($(concat!("`, `", stringify!($field))),+ ,)?
-            "`) VALUES (",
-            subst!($first_field, "?"),
-            $($(subst!($field, ", ?")),+ ,)?
-            ")"
-        )
-    };
-}
-
-/// Converts a `u64` into a [Value].
-///
-/// Sqlite uses `i64` as its internal representation format. Note that the `as` operator performs a
-/// lossless conversion from `u64` to `i64`.
-pub fn u64_to_value(v: u64) -> Value {
-    #[allow(
-        clippy::cast_possible_wrap,
-        reason = "We store u64 as i64 as sqlite only allows the latter."
-    )]
-    Value::Integer(v as i64)
-}
-
-/// Gets a `u64` value from the database.
-///
-/// Sqlite uses `i64` as its internal representation format, and so when retrieving
-/// we need to make sure we cast as `u64` to get the original value
-pub fn column_value_as_u64<I: rusqlite::RowIndex>(
-    row: &rusqlite::Row<'_>,
-    index: I,
-) -> rusqlite::Result<u64> {
-    let value: i64 = row.get(index)?;
-    #[allow(
-        clippy::cast_sign_loss,
-        reason = "We store u64 as i64 as sqlite only allows the latter."
-    )]
-    Ok(value as u64)
-}
-
-/// Gets a `BlockNum` value from the database.
-pub fn read_block_number<I: rusqlite::RowIndex>(
-    row: &rusqlite::Row<'_>,
-    index: I,
-) -> rusqlite::Result<BlockNumber> {
-    let value: u32 = row.get(index)?;
-    Ok(value.into())
-}
-
-/// Gets a blob value from the database and tries to deserialize it into the necessary type.
-pub fn read_from_blob_column<I, T>(row: &rusqlite::Row<'_>, index: I) -> rusqlite::Result<T>
-where
-    I: rusqlite::RowIndex + Copy + Into<usize>,
-    T: Deserializable,
-{
-    let value = row.get_ref(index)?.as_blob()?;
-
-    T::read_from_bytes(value).map_err(|err| {
-        rusqlite::Error::FromSqlConversionFailure(
-            index.into(),
-            rusqlite::types::Type::Blob,
-            Box::new(err),
-        )
-    })
-}
-
-/// Constructs `AccountSummary` from the row of `accounts` table.
-///
-/// Note: field ordering must be the same, as in `accounts` table!
-pub fn account_summary_from_row(row: &rusqlite::Row<'_>) -> crate::db::Result<AccountSummary> {
-    let account_id = read_from_blob_column(row, 0)?;
-    let account_commitment_data = row.get_ref(1)?.as_blob()?;
-    let account_commitment = Word::read_from_bytes(account_commitment_data)?;
-    let block_num = read_block_number(row, 2)?;
-
-    Ok(AccountSummary {
-        account_id,
-        account_commitment,
-        block_num,
-    })
-}
-
-/// Constructs `AccountInfo` from the row of `accounts` table.
-///
-/// Note: field ordering must be the same, as in `accounts` table!
-pub fn account_info_from_row(row: &rusqlite::Row<'_>) -> crate::db::Result<AccountInfo> {
-    let update = account_summary_from_row(row)?;
-
-    let details = row.get_ref(3)?.as_blob_or_null()?;
-    let details = details.map(Account::read_from_bytes).transpose()?;
-
-    Ok(AccountInfo { summary: update, details })
-}
-
-/// Deserializes account and applies account delta.
-pub fn apply_delta(
-    account_id: AccountId,
-    value: &ValueRef<'_>,
-    delta: &AccountDelta,
-    final_state_commitment: &Word,
-) -> crate::db::Result<Account, DatabaseError> {
-    let account = value.as_blob_or_null()?;
-    let account = account.map(Account::read_from_bytes).transpose()?;
-
-    let Some(mut account) = account else {
-        return Err(DatabaseError::AccountNotPublic(account_id));
-    };
-
-    account.apply_delta(delta)?;
-
-    let actual_commitment = account.commitment();
-    if &actual_commitment != final_state_commitment {
-        return Err(DatabaseError::AccountCommitmentsMismatch {
-            calculated: actual_commitment,
-            expected: *final_state_commitment,
-        });
-    }
-
-    Ok(account)
-}

From 2a681f323e7dabaaaf84bb4589a5cb194c244a45 Mon Sep 17 00:00:00 2001
From: Tomas Rodriguez Dala <43424983+tomyrd@users.noreply.github.com>
Date: Wed, 10 Sep 2025 10:07:42 -0300
Subject: [PATCH 10/78] chore: update `miden-base` to `next` (#1215)

---
 Cargo.lock                            | 38 ++++++++++++--------------
 Cargo.toml                            | 12 ++++-----
 bin/stress-test/src/seeding/mod.rs    |  6 ++---
 crates/ntx-builder/src/transaction.rs | 39 ++++++++++++++++++++++-----
 crates/store/src/genesis/mod.rs       |  2 +-
 5 files changed, 59 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1f3297ed2..099dec470 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1510,7 +1510,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.6.0",
+ "socket2 0.5.10",
  "system-configuration",
  "tokio",
  "tower-service",
@@ -2055,9 +2055,8 @@ dependencies = [
 
 [[package]]
 name = "miden-block-prover"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e15ba1a0390685f693dbe1bcc508313c579452eb3ef87fad21030a62c43e56f4"
+version = "0.12.0"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#074d91390d0d4e16a319805736caad27c1a2852f"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2128,9 +2127,8 @@ dependencies = [
 
 [[package]]
 name = "miden-lib"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97cbdddaf0c2edae3b2844db1d2a4746d498e2d865ac0ff5d76b700a9221e71"
+version = "0.12.0"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#074d91390d0d4e16a319805736caad27c1a2852f"
 dependencies = [
  "miden-assembly",
  "miden-objects",
@@ -2430,15 +2428,15 @@ dependencies = [
 
 [[package]]
 name = "miden-objects"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a16bce60bda18cfeaa49e99e35307c6f45297bfe2f0e18c009fa356edd552e70"
+version = "0.12.0"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#074d91390d0d4e16a319805736caad27c1a2852f"
 dependencies = [
  "bech32",
  "getrandom 0.3.3",
  "miden-assembly",
  "miden-core",
  "miden-crypto",
+ "miden-mast-package",
  "miden-processor",
  "miden-utils-sync",
  "miden-verifier",
@@ -2447,7 +2445,7 @@ dependencies = [
  "semver 1.0.26",
  "serde",
  "thiserror 2.0.16",
- "toml 0.8.23",
+ "toml 0.9.5",
  "winter-rand-utils",
 ]
 
@@ -2561,9 +2559,8 @@ dependencies = [
 
 [[package]]
 name = "miden-testing"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "411f9f1ed91b12e167a2d8d648d14f89b2fe6e56d6f76b1046cc26a29563e5ab"
+version = "0.12.0"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#074d91390d0d4e16a319805736caad27c1a2852f"
 dependencies = [
  "anyhow",
  "itertools",
@@ -2572,6 +2569,7 @@ dependencies = [
  "miden-objects",
  "miden-processor",
  "miden-tx",
+ "miden-tx-batch-prover",
  "rand 0.9.2",
  "rand_chacha 0.9.0",
  "thiserror 2.0.16",
@@ -2581,9 +2579,8 @@ dependencies = [
 
 [[package]]
 name = "miden-tx"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e3b4f65ef4d94f071b354e5c8cec01aff311bf9f9376bbf905b98c6955eeb8"
+version = "0.12.0"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#074d91390d0d4e16a319805736caad27c1a2852f"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2597,9 +2594,8 @@ dependencies = [
 
 [[package]]
 name = "miden-tx-batch-prover"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b78d651dccc0ffbc8ca2b4e474d59f2cd29d55d4053d596b1eae9adeee28dad"
+version = "0.12.0"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#074d91390d0d4e16a319805736caad27c1a2852f"
 dependencies = [
  "miden-objects",
  "miden-tx",
@@ -3247,7 +3243,7 @@ dependencies = [
  "serde",
  "serde_yaml",
  "sfv",
- "socket2 0.6.0",
+ "socket2 0.5.10",
  "strum",
  "strum_macros",
  "tokio",
diff --git a/Cargo.toml b/Cargo.toml
index 59d597074..a9c9e2a66 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,12 +44,12 @@ miden-node-utils           = { path = "crates/utils", version = "0.12" }
 miden-remote-prover-client = { path = "crates/remote-prover-client", version = "0.12" }
 
 # miden-base aka protocol dependencies. These should be updated in sync.
-miden-block-prover    = { version = "0.11" }
-miden-lib             = { version = "0.11" }
-miden-objects         = { default-features = false, version = "0.11" }
-miden-testing         = { version = "0.11" }
-miden-tx              = { default-features = false, version = "0.11" }
-miden-tx-batch-prover = { version = "0.11" }
+miden-block-prover    = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
+miden-lib             = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
+miden-objects         = { branch = "next", default-features = false, git = "https://github.com/0xMiden/miden-base" }
+miden-testing         = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
+miden-tx              = { branch = "next", default-features = false, git = "https://github.com/0xMiden/miden-base" }
+miden-tx-batch-prover = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
 
 # Other miden dependencies. These should align with those expected by miden-base.
 miden-air = { version = "0.17" }
diff --git a/bin/stress-test/src/seeding/mod.rs b/bin/stress-test/src/seeding/mod.rs
index ba6c0e487..72604446c 100644
--- a/bin/stress-test/src/seeding/mod.rs
+++ b/bin/stress-test/src/seeding/mod.rs
@@ -241,9 +241,7 @@ async fn apply_block(
     metrics: &mut SeedingMetrics,
 ) -> ProvenBlock {
     let proposed_block = ProposedBlock::new(block_inputs, batches).unwrap();
-    let proven_block = LocalBlockProver::new(0)
-        .prove_without_batch_verification(proposed_block)
-        .unwrap();
+    let proven_block = LocalBlockProver::new(0).prove_dummy(proposed_block).unwrap();
     let block_size: usize = proven_block.to_bytes().len();
 
     let start = Instant::now();
@@ -391,7 +389,7 @@ fn create_consume_note_tx(
     mut account: Account,
     input_note: InputNote,
 ) -> ProvenTransaction {
-    let init_hash = account.init_commitment();
+    let init_hash = account.initial_commitment();
 
     input_note.note().assets().iter().for_each(|asset| {
         account.vault_mut().add_asset(*asset).unwrap();
diff --git a/crates/ntx-builder/src/transaction.rs b/crates/ntx-builder/src/transaction.rs
index c38f96d63..335d12a54 100644
--- a/crates/ntx-builder/src/transaction.rs
+++ b/crates/ntx-builder/src/transaction.rs
@@ -1,7 +1,8 @@
 use std::collections::BTreeSet;
 
 use miden_node_utils::tracing::OpenTelemetrySpanExt;
-use miden_objects::account::{Account, AccountId};
+use miden_objects::account::{Account, AccountId, PartialAccount};
+use miden_objects::asset::AssetWitness;
 use miden_objects::block::{BlockHeader, BlockNumber};
 use miden_objects::note::Note;
 use miden_objects::transaction::{
@@ -158,12 +159,10 @@ impl NtxContext {
             TransactionExecutor::new(data_store);
         let checker = NoteConsumptionChecker::new(&executor);
 
-        let notes = InputNotes::from_unauthenticated_notes(notes).map_err(NtxError::InputNotes)?;
-
         match Box::pin(checker.check_notes_consumability(
             data_store.account.id(),
             data_store.reference_header.block_num(),
-            notes.clone(),
+            notes,
             TransactionArgs::default(),
         ))
         .await
@@ -262,7 +261,7 @@ impl DataStore for NtxDataStore {
         account_id: AccountId,
         ref_blocks: BTreeSet<BlockNumber>,
     ) -> impl FutureMaybeSend<
-        Result<(Account, Option<Word>, BlockHeader, PartialBlockchain), DataStoreError>,
+        Result<(PartialAccount, Option<Word>, BlockHeader, PartialBlockchain), DataStoreError>,
     > {
         let account = self.account.clone();
         async move {
@@ -277,7 +276,35 @@ impl DataStore for NtxDataStore {
                 None => return Err(DataStoreError::other("no reference block requested")),
             }
 
-            Ok((account, None, self.reference_header.clone(), self.chain_mmr.clone()))
+            Ok((account.into(), None, self.reference_header.clone(), self.chain_mmr.clone()))
+        }
+    }
+
+    fn get_vault_asset_witness(
+        &self,
+        account_id: AccountId,
+        vault_root: Word,
+        vault_key: Word,
+    ) -> impl FutureMaybeSend<Result<AssetWitness, DataStoreError>> {
+        let account = self.account.clone();
+        async move {
+            if account.id() != account_id {
+                return Err(DataStoreError::AccountNotFound(account_id));
+            }
+
+            if account.vault().root() != vault_root {
+                return Err(DataStoreError::Other {
+                    error_msg: "vault root mismatch".into(),
+                    source: None,
+                });
+            }
+
+            AssetWitness::new(account.vault().asset_tree().open(&vault_key)).map_err(|err| {
+                DataStoreError::Other {
+                    error_msg: "failed to open vault asset tree".into(),
+                    source: Some(Box::new(err)),
+                }
+            })
         }
     }
 }
diff --git a/crates/store/src/genesis/mod.rs b/crates/store/src/genesis/mod.rs
index f4158ebe0..df4cbd009 100644
--- a/crates/store/src/genesis/mod.rs
+++ b/crates/store/src/genesis/mod.rs
@@ -101,7 +101,7 @@ impl GenesisState {
             empty_nullifier_tree.root(),
             empty_block_note_tree.root(),
             Word::empty(),
-            TransactionKernel::kernel_commitment(),
+            TransactionKernel.to_commitment(),
             Word::empty(),
             self.fee_parameters,
             self.timestamp,

From 8d19c07cdf45cd26d77bec49aa912bee754565b0 Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Fri, 12 Sep 2025 13:09:43 +0200
Subject: [PATCH 11/78] Change `GetAccountProofs` to a single
 `GetAccountProof`, cleanup (#1211)

---
 CHANGELOG.md                                  |   2 +
 crates/proto/src/domain/account.rs            | 425 ++++++++++++++----
 crates/proto/src/errors.rs                    |   2 +
 crates/proto/src/generated/account.rs         |  33 +-
 crates/proto/src/generated/rpc.rs             |  36 +-
 crates/proto/src/generated/rpc_store.rs       | 165 ++++---
 crates/rpc/src/server/api.rs                  |  25 +-
 crates/store/src/db/mod.rs                    |  12 -
 .../store/src/db/models/queries/accounts.rs   |  27 --
 crates/store/src/server/rpc_api.rs            |  39 +-
 crates/store/src/state.rs                     | 144 +++---
 proto/proto/rpc.proto                         |   4 +-
 proto/proto/store/rpc.proto                   | 101 ++---
 proto/proto/types/account.proto               |  26 +-
 14 files changed, 617 insertions(+), 424 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e7237474..19bf047cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@
 - [BREAKING] Refactored `CheckNullifiersByPrefix` endpoint adding pagination ([#1191](https://github.com/0xMiden/miden-node/pull/1191)).
 - [BREAKING] Renamed `CheckNullifiersByPrefix` endpoint to `SyncNullifiers` ([#1191](https://github.com/0xMiden/miden-node/pull/1191)).
 - [BREAKING] Added `block_range` and `pagination_info` fields to paginated gRPC endpoints ([#1205](https://github.com/0xMiden/miden-node/pull/1205)).
+- [BREAKING] Replace `GetAccountProofs` with `GetAccountProof` in the public store API (#[1211](https://github.com/0xMiden/miden-node/pull/1211)).
+
 ## v0.11.1 (2025-09-08)
 
 - Removed decorators from scripts when submitting transactions and batches, and inserting notes into the DB ([#1194](https://github.com/
diff --git a/crates/proto/src/domain/account.rs b/crates/proto/src/domain/account.rs
index 8b209bdf4..d00c88ddd 100644
--- a/crates/proto/src/domain/account.rs
+++ b/crates/proto/src/domain/account.rs
@@ -2,7 +2,13 @@ use std::fmt::{Debug, Display, Formatter};
 
 use miden_node_utils::formatting::format_opt;
 use miden_objects::Word;
-use miden_objects::account::{Account, AccountHeader, AccountId};
+use miden_objects::account::{
+    Account,
+    AccountHeader,
+    AccountId,
+    AccountStorageHeader,
+    StorageSlotType,
+};
 use miden_objects::asset::Asset;
 use miden_objects::block::{AccountWitness, BlockNumber};
 use miden_objects::note::{NoteExecutionMode, NoteTag};
@@ -11,7 +17,7 @@ use thiserror::Error;
 
 use super::try_convert;
 use crate::errors::{ConversionError, MissingFieldHelper};
-use crate::generated as proto;
+use crate::generated::{self as proto};
 
 // ACCOUNT ID
 // ================================================================================================
@@ -32,6 +38,17 @@ impl Debug for proto::account::AccountId {
     }
 }
 
+// FROM PROTO ACCOUNT ID
+// ------------------------------------------------------------------------------------------------
+
+impl TryFrom<proto::account::AccountId> for AccountId {
+    type Error = ConversionError;
+
+    fn try_from(account_id: proto::account::AccountId) -> Result<Self, Self::Error> {
+        AccountId::read_from_bytes(&account_id.id).map_err(|_| ConversionError::NotAValidFelt)
+    }
+}
+
 // INTO PROTO ACCOUNT ID
 // ------------------------------------------------------------------------------------------------
 
@@ -47,17 +64,6 @@ impl From<AccountId> for proto::account::AccountId {
     }
 }
 
-// FROM PROTO ACCOUNT ID
-// ------------------------------------------------------------------------------------------------
-
-impl TryFrom<proto::account::AccountId> for AccountId {
-    type Error = ConversionError;
-
-    fn try_from(account_id: proto::account::AccountId) -> Result<Self, Self::Error> {
-        AccountId::read_from_bytes(&account_id.id).map_err(|_| ConversionError::NotAValidFelt)
-    }
-}
-
 // ACCOUNT UPDATE
 // ================================================================================================
 
@@ -93,33 +99,54 @@ impl From<&AccountInfo> for proto::account::AccountDetails {
     }
 }
 
-// ACCOUNT STORAGE REQUEST
+// ACCOUNT PROOF REQUEST
 // ================================================================================================
 
-/// Represents a request for an account proof alongside specific storage data.
+/// Represents a request for an account proof.
 pub struct AccountProofRequest {
     pub account_id: AccountId,
+    pub account_details: Option<AccountDetailRequest>,
+}
+
+impl TryFrom<proto::rpc_store::AccountProofRequest> for AccountProofRequest {
+    type Error = ConversionError;
+
+    fn try_from(request: proto::rpc_store::AccountProofRequest) -> Result<Self, Self::Error> {
+        let proto::rpc_store::AccountProofRequest { account_id, account_details } = request;
+
+        let account_id = account_id
+            .ok_or(proto::rpc_store::AccountProofRequest::missing_field(stringify!(account_id)))?
+            .try_into()?;
+
+        let account_details = account_details.map(TryFrom::try_from).transpose()?;
+
+        Ok(AccountProofRequest { account_id, account_details })
+    }
+}
+
+/// Represents a request for account details alongside specific storage data.
+pub struct AccountDetailRequest {
+    pub code_commitment: Option<Word>,
     pub storage_requests: Vec<StorageMapKeysProof>,
 }
 
-impl TryInto<AccountProofRequest> for proto::rpc_store::account_proofs_request::AccountRequest {
+impl TryFrom<proto::rpc_store::account_proof_request::AccountDetailsRequest>
+    for AccountDetailRequest
+{
     type Error = ConversionError;
 
-    fn try_into(self) -> Result<AccountProofRequest, Self::Error> {
-        let proto::rpc_store::account_proofs_request::AccountRequest {
-            account_id,
+    fn try_from(
+        request: proto::rpc_store::account_proof_request::AccountDetailsRequest,
+    ) -> Result<Self, Self::Error> {
+        let proto::rpc_store::account_proof_request::AccountDetailsRequest {
+            code_commitment,
             storage_requests,
-        } = self;
-
-        Ok(AccountProofRequest {
-            account_id: account_id
-                .clone()
-                .ok_or(proto::rpc_store::account_proofs_request::AccountRequest::missing_field(
-                    stringify!(account_id),
-                ))?
-                .try_into()?,
-            storage_requests: try_convert(storage_requests).collect::<Result<_, _>>()?,
-        })
+        } = request;
+
+        let storage_requests = try_convert(storage_requests).collect::<Result<_, _>>()?;
+        let code_commitment = code_commitment.map(Word::try_from).transpose()?;
+
+        Ok(AccountDetailRequest { code_commitment, storage_requests })
     }
 }
 
@@ -131,16 +158,18 @@ pub struct StorageMapKeysProof {
     pub storage_keys: Vec<Word>,
 }
 
-impl TryInto<StorageMapKeysProof>
-    for proto::rpc_store::account_proofs_request::account_request::StorageRequest
+impl TryFrom<proto::rpc_store::account_proof_request::account_details_request::StorageRequest>
+    for StorageMapKeysProof
 {
     type Error = ConversionError;
 
-    fn try_into(self) -> Result<StorageMapKeysProof, Self::Error> {
-        let proto::rpc_store::account_proofs_request::account_request::StorageRequest {
+    fn try_from(
+        request: proto::rpc_store::account_proof_request::account_details_request::StorageRequest,
+    ) -> Result<Self, Self::Error> {
+        let proto::rpc_store::account_proof_request::account_details_request::StorageRequest {
             storage_slot_index,
             map_keys,
-        } = self;
+        } = request;
 
         Ok(StorageMapKeysProof {
             storage_index: storage_slot_index.try_into()?,
@@ -149,6 +178,251 @@ impl TryInto<StorageMapKeysProof>
     }
 }
 
+// ACCOUNT HEADER CONVERSIONS
+//================================================================================================
+
+impl TryFrom<proto::account::AccountHeader> for AccountHeader {
+    type Error = ConversionError;
+
+    fn try_from(value: proto::account::AccountHeader) -> Result<Self, Self::Error> {
+        let proto::account::AccountHeader {
+            account_id,
+            vault_root,
+            storage_commitment,
+            code_commitment,
+            nonce,
+        } = value;
+
+        let account_id = account_id
+            .ok_or(proto::account::AccountHeader::missing_field(stringify!(account_id)))?
+            .try_into()?;
+        let vault_root = vault_root
+            .ok_or(proto::account::AccountHeader::missing_field(stringify!(vault_root)))?
+            .try_into()?;
+        let storage_commitment = storage_commitment
+            .ok_or(proto::account::AccountHeader::missing_field(stringify!(storage_commitment)))?
+            .try_into()?;
+        let code_commitment = code_commitment
+            .ok_or(proto::account::AccountHeader::missing_field(stringify!(code_commitment)))?
+            .try_into()?;
+        let nonce = nonce.try_into().map_err(|_e| ConversionError::NotAValidFelt)?;
+
+        Ok(AccountHeader::new(
+            account_id,
+            nonce,
+            vault_root,
+            storage_commitment,
+            code_commitment,
+        ))
+    }
+}
+
+impl From<AccountHeader> for proto::account::AccountHeader {
+    fn from(header: AccountHeader) -> Self {
+        proto::account::AccountHeader {
+            account_id: Some(header.id().into()),
+            vault_root: Some(header.vault_root().into()),
+            storage_commitment: Some(header.storage_commitment().into()),
+            code_commitment: Some(header.code_commitment().into()),
+            nonce: header.nonce().as_int(),
+        }
+    }
+}
+
+impl From<AccountStorageHeader> for proto::account::AccountStorageHeader {
+    fn from(value: AccountStorageHeader) -> Self {
+        let slots = value
+            .slots()
+            .map(|(slot_type, slot_value)| proto::account::account_storage_header::StorageSlot {
+                slot_type: storage_slot_type_to_raw(*slot_type),
+                commitment: Some(proto::primitives::Digest::from(*slot_value)),
+            })
+            .collect();
+
+        Self { slots }
+    }
+}
+
+const fn storage_slot_type_from_raw(slot_type: u32) -> Result<StorageSlotType, ConversionError> {
+    Ok(match slot_type {
+        0 => StorageSlotType::Map,
+        1 => StorageSlotType::Value,
+        _ => return Err(ConversionError::EnumDiscriminantOutOfRange),
+    })
+}
+
+const fn storage_slot_type_to_raw(slot_type: StorageSlotType) -> u32 {
+    match slot_type {
+        StorageSlotType::Map => 0,
+        StorageSlotType::Value => 1,
+    }
+}
+
+/// Represents account details returned in response to an account proof request.
+pub struct AccountDetailsResponse {
+    pub account_header: AccountHeader,
+    pub storage_header: AccountStorageHeader,
+    pub account_code: Option<Vec<u8>>,
+    pub storage_proofs: Vec<StorageSlotMapProof>,
+}
+
+impl TryFrom<proto::rpc_store::account_proof::AccountDetailsResponse> for AccountDetailsResponse {
+    type Error = ConversionError;
+
+    fn try_from(
+        value: proto::rpc_store::account_proof::AccountDetailsResponse,
+    ) -> Result<Self, Self::Error> {
+        let proto::rpc_store::account_proof::AccountDetailsResponse {
+            header,
+            storage_header,
+            account_code,
+            storage_maps,
+        } = value;
+
+        let account_header = header
+            .ok_or(proto::rpc_store::account_proof::AccountDetailsResponse::missing_field(
+                stringify!(header),
+            ))?
+            .try_into()?;
+
+        let storage_header = storage_header.ok_or(
+            proto::rpc_store::account_proof::AccountDetailsResponse::missing_field(stringify!(
+                storage_header
+            )),
+        )?;
+
+        let storage_header_entries = storage_header
+            .slots
+            .into_iter()
+            .map(|slot| {
+                let slot_type = storage_slot_type_from_raw(slot.slot_type)?;
+                let commitment = slot
+                    .commitment
+                    .ok_or(proto::account::account_storage_header::StorageSlot::missing_field(
+                        stringify!(commitment),
+                    ))?
+                    .try_into()?;
+                Ok((slot_type, commitment))
+            })
+            .collect::<Result<Vec<_>, ConversionError>>()?;
+
+        let storage_header = AccountStorageHeader::new(storage_header_entries);
+
+        let storage_proofs = try_convert(storage_maps).collect::<Result<_, _>>()?;
+
+        Ok(AccountDetailsResponse {
+            account_header,
+            storage_header,
+            account_code,
+            storage_proofs,
+        })
+    }
+}
+
+impl From<AccountDetailsResponse> for proto::rpc_store::account_proof::AccountDetailsResponse {
+    fn from(value: AccountDetailsResponse) -> Self {
+        let AccountDetailsResponse {
+            account_header,
+            storage_header,
+            account_code,
+            storage_proofs,
+        } = value;
+
+        let header = Some(proto::account::AccountHeader::from(account_header));
+        let storage_header = Some(proto::account::AccountStorageHeader::from(storage_header));
+
+        let storage_maps = storage_proofs
+            .into_iter()
+            .map(|proof| {
+                let storage_slot = u32::from(proof.storage_slot);
+                let smt_proof = Some(proto::primitives::SmtOpening::from(proof.proof));
+                proto::rpc_store::account_proof::account_details_response::StorageSlotMapProof {
+                    storage_slot,
+                    smt_proof,
+                }
+            })
+            .collect();
+
+        Self {
+            header,
+            storage_header,
+            account_code,
+            storage_maps,
+        }
+    }
+}
+
+/// Represents a storage slot map proof.
+pub struct StorageSlotMapProof {
+    pub storage_slot: u8,
+    pub proof: miden_objects::crypto::merkle::SmtProof,
+}
+
+impl TryFrom<proto::rpc_store::account_proof::account_details_response::StorageSlotMapProof>
+    for StorageSlotMapProof
+{
+    type Error = ConversionError;
+
+    fn try_from(
+        proof: proto::rpc_store::account_proof::account_details_response::StorageSlotMapProof,
+    ) -> Result<Self, Self::Error> {
+        let proto::rpc_store::account_proof::account_details_response::StorageSlotMapProof {
+            storage_slot,
+            smt_proof,
+        } = proof;
+
+        let storage_slot = storage_slot.try_into().map_err(ConversionError::TryFromIntError)?;
+        let proof =
+        smt_proof.ok_or(proto::rpc_store::account_proof::account_details_response::StorageSlotMapProof::missing_field(stringify!(proof)))?.try_into()?;
+
+        Ok(StorageSlotMapProof { storage_slot, proof })
+    }
+}
+
+// ACCOUNT PROOF
+// ================================================================================================
+
+/// Represents an account proof.
+pub struct AccountProofResponse {
+    pub block_num: BlockNumber,
+    pub witness: AccountWitnessRecord,
+    pub account_details: Option<AccountDetailsResponse>,
+}
+
+impl TryFrom<proto::rpc_store::AccountProof> for AccountProofResponse {
+    type Error = ConversionError;
+
+    fn try_from(proof: proto::rpc_store::AccountProof) -> Result<Self, Self::Error> {
+        let proto::rpc_store::AccountProof { block_num, witness, details } = proof;
+
+        let witness =
+            witness.ok_or(proto::rpc_store::AccountProof::missing_field(stringify!(witness)))?;
+
+        let witness = AccountWitnessRecord::try_from(witness)?;
+
+        let account_details = details.map(AccountDetailsResponse::try_from).transpose()?;
+
+        Ok(AccountProofResponse {
+            block_num: block_num.into(),
+            witness,
+            account_details,
+        })
+    }
+}
+
+impl From<AccountProofResponse> for proto::rpc_store::AccountProof {
+    fn from(value: AccountProofResponse) -> Self {
+        let AccountProofResponse { block_num, witness, account_details } = value;
+
+        proto::rpc_store::AccountProof {
+            block_num: block_num.as_u32(),
+            witness: Some(proto::account::AccountWitness::from(witness)),
+            details: account_details
+                .map(proto::rpc_store::account_proof::AccountDetailsResponse::from),
+        }
+    }
+}
+
 // ACCOUNT WITNESS RECORD
 // ================================================================================================
 
@@ -158,17 +432,6 @@ pub struct AccountWitnessRecord {
     pub witness: AccountWitness,
 }
 
-impl From<AccountWitnessRecord> for proto::account::AccountWitness {
-    fn from(from: AccountWitnessRecord) -> Self {
-        Self {
-            account_id: Some(from.account_id.into()),
-            witness_id: Some(from.witness.id().into()),
-            commitment: Some(from.witness.state_commitment().into()),
-            path: Some(from.witness.into_proof().into_parts().0.into()),
-        }
-    }
-}
-
 impl TryFrom<proto::account::AccountWitness> for AccountWitnessRecord {
     type Error = ConversionError;
 
@@ -206,6 +469,17 @@ impl TryFrom<proto::account::AccountWitness> for AccountWitnessRecord {
     }
 }
 
+impl From<AccountWitnessRecord> for proto::account::AccountWitness {
+    fn from(from: AccountWitnessRecord) -> Self {
+        Self {
+            account_id: Some(from.account_id.into()),
+            witness_id: Some(from.witness.id().into()),
+            commitment: Some(from.witness.state_commitment().into()),
+            path: Some(from.witness.into_proof().into_parts().0.into()),
+        }
+    }
+}
+
 // ACCOUNT STATE
 // ================================================================================================
 
@@ -228,28 +502,6 @@ impl Display for AccountState {
     }
 }
 
-impl From<AccountState>
-    for proto::block_producer_store::transaction_inputs::AccountTransactionInputRecord
-{
-    fn from(from: AccountState) -> Self {
-        Self {
-            account_id: Some(from.account_id.into()),
-            account_commitment: from.account_commitment.map(Into::into),
-        }
-    }
-}
-
-impl From<AccountHeader> for proto::account::AccountHeader {
-    fn from(from: AccountHeader) -> Self {
-        Self {
-            vault_root: Some(from.vault_root().into()),
-            storage_commitment: Some(from.storage_commitment().into()),
-            code_commitment: Some(from.code_commitment().into()),
-            nonce: from.nonce().into(),
-        }
-    }
-}
-
 impl TryFrom<proto::block_producer_store::transaction_inputs::AccountTransactionInputRecord>
     for AccountState
 {
@@ -284,17 +536,20 @@ impl TryFrom<proto::block_producer_store::transaction_inputs::AccountTransaction
     }
 }
 
-// ASSET
-// ================================================================================================
-
-impl From<Asset> for proto::primitives::Asset {
-    fn from(asset_from: Asset) -> Self {
-        proto::primitives::Asset {
-            asset: Some(Word::from(asset_from).into()),
+impl From<AccountState>
+    for proto::block_producer_store::transaction_inputs::AccountTransactionInputRecord
+{
+    fn from(from: AccountState) -> Self {
+        Self {
+            account_id: Some(from.account_id.into()),
+            account_commitment: from.account_commitment.map(Into::into),
         }
     }
 }
 
+// ASSET
+// ================================================================================================
+
 impl TryFrom<proto::primitives::Asset> for Asset {
     type Error = ConversionError;
 
@@ -306,6 +561,14 @@ impl TryFrom<proto::primitives::Asset> for Asset {
     }
 }
 
+impl From<Asset> for proto::primitives::Asset {
+    fn from(asset_from: Asset) -> Self {
+        proto::primitives::Asset {
+            asset: Some(Word::from(asset_from).into()),
+        }
+    }
+}
+
 // NETWORK ACCOUNT PREFIX
 // ================================================================================================
 
@@ -328,12 +591,6 @@ impl NetworkAccountPrefix {
     }
 }
 
-impl From<NetworkAccountPrefix> for u32 {
-    fn from(value: NetworkAccountPrefix) -> Self {
-        value.inner()
-    }
-}
-
 impl TryFrom<u32> for NetworkAccountPrefix {
     type Error = NetworkAccountError;
 
@@ -371,6 +628,12 @@ impl TryFrom<NoteTag> for NetworkAccountPrefix {
     }
 }
 
+impl From<NetworkAccountPrefix> for u32 {
+    fn from(value: NetworkAccountPrefix) -> Self {
+        value.inner()
+    }
+}
+
 #[derive(Debug, Error)]
 pub enum NetworkAccountError {
     #[error("account ID {0} is not a valid network account ID")]
diff --git a/crates/proto/src/errors.rs b/crates/proto/src/errors.rs
index 70eeb6165..bef5a1468 100644
--- a/crates/proto/src/errors.rs
+++ b/crates/proto/src/errors.rs
@@ -46,6 +46,8 @@ pub enum ConversionError {
         entity: &'static str,
         source: DeserializationError,
     },
+    #[error("enum variant discriminant out of range")]
+    EnumDiscriminantOutOfRange,
 }
 
 impl ConversionError {
diff --git a/crates/proto/src/generated/account.rs b/crates/proto/src/generated/account.rs
index 1ab7e7456..463f5abf3 100644
--- a/crates/proto/src/generated/account.rs
+++ b/crates/proto/src/generated/account.rs
@@ -24,6 +24,26 @@ pub struct AccountSummary {
     #[prost(uint32, tag = "3")]
     pub block_num: u32,
 }
+/// Represents the storage header of an account.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct AccountStorageHeader {
+    /// Storage slots with their types and commitments.
+    #[prost(message, repeated, tag = "1")]
+    pub slots: ::prost::alloc::vec::Vec<account_storage_header::StorageSlot>,
+}
+/// Nested message and enum types in `AccountStorageHeader`.
+pub mod account_storage_header {
+    /// A single storage slot in the account storage header.
+    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
+    pub struct StorageSlot {
+        /// The type of the storage slot.
+        #[prost(uint32, tag = "1")]
+        pub slot_type: u32,
+        /// The commitment (Word) for this storage slot.
+        #[prost(message, optional, tag = "2")]
+        pub commitment: ::core::option::Option<super::super::primitives::Digest>,
+    }
+}
 /// An account details.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AccountDetails {
@@ -36,19 +56,22 @@ pub struct AccountDetails {
     pub details: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
 }
 /// An account header.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AccountHeader {
-    /// Vault root hash.
+    /// The account ID.
     #[prost(message, optional, tag = "1")]
+    pub account_id: ::core::option::Option<AccountId>,
+    /// Vault root hash.
+    #[prost(message, optional, tag = "2")]
     pub vault_root: ::core::option::Option<super::primitives::Digest>,
     /// Storage root hash.
-    #[prost(message, optional, tag = "2")]
+    #[prost(message, optional, tag = "3")]
     pub storage_commitment: ::core::option::Option<super::primitives::Digest>,
     /// Code root hash.
-    #[prost(message, optional, tag = "3")]
+    #[prost(message, optional, tag = "4")]
     pub code_commitment: ::core::option::Option<super::primitives::Digest>,
     /// Account nonce.
-    #[prost(uint64, tag = "4")]
+    #[prost(uint64, tag = "5")]
     pub nonce: u64,
 }
 /// An account witness.
diff --git a/crates/proto/src/generated/rpc.rs b/crates/proto/src/generated/rpc.rs
index 1276e50cc..c0fe9a4a4 100644
--- a/crates/proto/src/generated/rpc.rs
+++ b/crates/proto/src/generated/rpc.rs
@@ -174,14 +174,14 @@ pub mod api_client {
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "GetAccountDetails"));
             self.inner.unary(req, path, codec).await
         }
-        /// Returns the latest state proofs of the specified accounts.
-        pub async fn get_account_proofs(
+        /// Returns the latest state proof of the specified account.
+        pub async fn get_account_proof(
             &mut self,
             request: impl tonic::IntoRequest<
-                super::super::rpc_store::AccountProofsRequest,
+                super::super::rpc_store::AccountProofRequest,
             >,
         ) -> std::result::Result<
-            tonic::Response<super::super::rpc_store::AccountProofs>,
+            tonic::Response<super::super::rpc_store::AccountProof>,
             tonic::Status,
         > {
             self.inner
@@ -193,9 +193,9 @@ pub mod api_client {
                     )
                 })?;
             let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static("/rpc.Api/GetAccountProofs");
+            let path = http::uri::PathAndQuery::from_static("/rpc.Api/GetAccountProof");
             let mut req = request.into_request();
-            req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "GetAccountProofs"));
+            req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "GetAccountProof"));
             self.inner.unary(req, path, codec).await
         }
         /// Returns raw block data for the specified block number.
@@ -535,12 +535,12 @@ pub mod api_server {
             tonic::Response<super::super::account::AccountDetails>,
             tonic::Status,
         >;
-        /// Returns the latest state proofs of the specified accounts.
-        async fn get_account_proofs(
+        /// Returns the latest state proof of the specified account.
+        async fn get_account_proof(
             &self,
-            request: tonic::Request<super::super::rpc_store::AccountProofsRequest>,
+            request: tonic::Request<super::super::rpc_store::AccountProofRequest>,
         ) -> std::result::Result<
-            tonic::Response<super::super::rpc_store::AccountProofs>,
+            tonic::Response<super::super::rpc_store::AccountProof>,
             tonic::Status,
         >;
         /// Returns raw block data for the specified block number.
@@ -876,15 +876,15 @@ pub mod api_server {
                     };
                     Box::pin(fut)
                 }
-                "/rpc.Api/GetAccountProofs" => {
+                "/rpc.Api/GetAccountProof" => {
                     #[allow(non_camel_case_types)]
-                    struct GetAccountProofsSvc<T: Api>(pub Arc<T>);
+                    struct GetAccountProofSvc<T: Api>(pub Arc<T>);
                     impl<
                         T: Api,
                     > tonic::server::UnaryService<
-                        super::super::rpc_store::AccountProofsRequest,
-                    > for GetAccountProofsSvc<T> {
-                        type Response = super::super::rpc_store::AccountProofs;
+                        super::super::rpc_store::AccountProofRequest,
+                    > for GetAccountProofSvc<T> {
+                        type Response = super::super::rpc_store::AccountProof;
                         type Future = BoxFuture<
                             tonic::Response<Self::Response>,
                             tonic::Status,
@@ -892,12 +892,12 @@ pub mod api_server {
                         fn call(
                             &mut self,
                             request: tonic::Request<
-                                super::super::rpc_store::AccountProofsRequest,
+                                super::super::rpc_store::AccountProofRequest,
                             >,
                         ) -> Self::Future {
                             let inner = Arc::clone(&self.0);
                             let fut = async move {
-                                <T as Api>::get_account_proofs(&inner, request).await
+                                <T as Api>::get_account_proof(&inner, request).await
                             };
                             Box::pin(fut)
                         }
@@ -908,7 +908,7 @@ pub mod api_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let method = GetAccountProofsSvc(inner);
+                        let method = GetAccountProofSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
diff --git a/crates/proto/src/generated/rpc_store.rs b/crates/proto/src/generated/rpc_store.rs
index 1b68ddf9f..77a2abf74 100644
--- a/crates/proto/src/generated/rpc_store.rs
+++ b/crates/proto/src/generated/rpc_store.rs
@@ -12,40 +12,35 @@ pub struct StoreStatus {
     #[prost(fixed32, tag = "3")]
     pub chain_tip: u32,
 }
-/// Returns the latest state proofs of the specified accounts.
+/// Returns the latest state proof of the specified accounts.
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AccountProofsRequest {
-    /// A list of account requests, including map keys + values.
-    #[prost(message, repeated, tag = "1")]
-    pub account_requests: ::prost::alloc::vec::Vec<
-        account_proofs_request::AccountRequest,
+pub struct AccountProofRequest {
+    /// The account ID for this request.
+    #[prost(message, optional, tag = "1")]
+    pub account_id: ::core::option::Option<super::account::AccountId>,
+    /// A account detail requests, including map keys + values.
+    #[prost(message, optional, tag = "2")]
+    pub account_details: ::core::option::Option<
+        account_proof_request::AccountDetailsRequest,
     >,
-    /// Optional flag to include account headers and account code in the response. If false, storage
-    /// requests are also ignored. False by default.
-    #[prost(bool, optional, tag = "2")]
-    pub include_headers: ::core::option::Option<bool>,
-    /// Account code commitments corresponding to the last-known `AccountCode` for requested
-    /// accounts. Responses will include only the ones that are not known to the caller.
-    /// These are not associated with a specific account but rather, they will be matched against
-    /// all requested accounts.
-    #[prost(message, repeated, tag = "3")]
-    pub code_commitments: ::prost::alloc::vec::Vec<super::primitives::Digest>,
 }
-/// Nested message and enum types in `AccountProofsRequest`.
-pub mod account_proofs_request {
-    /// Represents per-account requests where each account ID has its own list of
-    /// (storage_slot_index, map_keys) pairs.
+/// Nested message and enum types in `AccountProofRequest`.
+pub mod account_proof_request {
+    /// Request the details for a public account.
     #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct AccountRequest {
-        /// The account ID for this request.
+    pub struct AccountDetailsRequest {
+        /// Account code commitment corresponding to the last-known `AccountCode` for the requested
+        /// account. The response will include only code that is known.
         #[prost(message, optional, tag = "1")]
-        pub account_id: ::core::option::Option<super::super::account::AccountId>,
+        pub code_commitment: ::core::option::Option<super::super::primitives::Digest>,
         /// List of storage requests for this account.
         #[prost(message, repeated, tag = "2")]
-        pub storage_requests: ::prost::alloc::vec::Vec<account_request::StorageRequest>,
+        pub storage_requests: ::prost::alloc::vec::Vec<
+            account_details_request::StorageRequest,
+        >,
     }
-    /// Nested message and enum types in `AccountRequest`.
-    pub mod account_request {
+    /// Nested message and enum types in `AccountDetailsRequest`.
+    pub mod account_details_request {
         /// Represents a storage slot index and the associated map keys.
         #[derive(Clone, PartialEq, ::prost::Message)]
         pub struct StorageRequest {
@@ -62,62 +57,54 @@ pub mod account_proofs_request {
 }
 /// Represents the result of getting account proofs.
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AccountProofs {
+pub struct AccountProof {
     /// Block number at which the state of the accounts is returned.
     #[prost(fixed32, tag = "1")]
     pub block_num: u32,
-    /// List of account state infos for the requested account keys.
-    #[prost(message, repeated, tag = "2")]
-    pub account_proofs: ::prost::alloc::vec::Vec<account_proofs::AccountProof>,
+    /// The account witness for the current state commitment of one account ID.
+    #[prost(message, optional, tag = "2")]
+    pub witness: ::core::option::Option<super::account::AccountWitness>,
+    /// State header for public accounts. Filled only if the flag `AccountDetailsRequest` was
+    /// present and the account was a public account/the information was available.
+    #[prost(message, optional, tag = "3")]
+    pub details: ::core::option::Option<account_proof::AccountDetailsResponse>,
 }
-/// Nested message and enum types in `AccountProofs`.
-pub mod account_proofs {
-    /// A single account proof returned as a response to `GetAccountProofs`.
+/// Nested message and enum types in `AccountProof`.
+pub mod account_proof {
+    /// State header, available for public accounts only.
     #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct AccountProof {
-        /// The account witness for the current state commitment of one account ID.
+    pub struct AccountDetailsResponse {
+        /// Account header, always included.
         #[prost(message, optional, tag = "1")]
-        pub witness: ::core::option::Option<super::super::account::AccountWitness>,
-        /// State header for public accounts. Filled only if `include_headers` flag is set to `true`.
+        pub header: ::core::option::Option<super::super::account::AccountHeader>,
+        /// Account storage header containing slot types and commitments.
         #[prost(message, optional, tag = "2")]
-        pub state_header: ::core::option::Option<account_proof::AccountStateHeader>,
+        pub storage_header: ::core::option::Option<
+            super::super::account::AccountStorageHeader,
+        >,
+        /// Account code, if the current account code does not match the request provided commitment digest.
+        #[prost(bytes = "vec", optional, tag = "3")]
+        pub account_code: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+        /// Storage slots information for this account
+        #[prost(message, repeated, tag = "4")]
+        pub storage_maps: ::prost::alloc::vec::Vec<
+            account_details_response::StorageSlotMapProof,
+        >,
     }
-    /// Nested message and enum types in `AccountProof`.
-    pub mod account_proof {
-        /// State header for public accounts.
+    /// Nested message and enum types in `AccountDetailsResponse`.
+    pub mod account_details_response {
+        /// Represents a single storage slot with the requested keys and their respective values.
         #[derive(Clone, PartialEq, ::prost::Message)]
-        pub struct AccountStateHeader {
-            /// Account header.
-            #[prost(message, optional, tag = "1")]
-            pub header: ::core::option::Option<
-                super::super::super::account::AccountHeader,
-            >,
-            /// Values of all account storage slots (max 255).
-            #[prost(bytes = "vec", tag = "2")]
-            pub storage_header: ::prost::alloc::vec::Vec<u8>,
-            /// Account code, returned only when none of the request's code commitments match
-            /// the current one.
-            #[prost(bytes = "vec", optional, tag = "3")]
-            pub account_code: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
-            /// Storage slots information for this account
-            #[prost(message, repeated, tag = "4")]
-            pub storage_maps: ::prost::alloc::vec::Vec<
-                account_state_header::StorageSlotMapProof,
+        pub struct StorageSlotMapProof {
+            /// The storage slot index (\[0..255\]).
+            #[prost(uint32, tag = "1")]
+            pub storage_slot: u32,
+            /// Merkle proof of the map value
+            #[prost(message, optional, tag = "2")]
+            pub smt_proof: ::core::option::Option<
+                super::super::super::primitives::SmtOpening,
             >,
         }
-        /// Nested message and enum types in `AccountStateHeader`.
-        pub mod account_state_header {
-            /// Represents a single storage slot with the requested keys and their respective values.
-            #[derive(Clone, PartialEq, ::prost::Message)]
-            pub struct StorageSlotMapProof {
-                /// The storage slot index (\[0..255\]).
-                #[prost(uint32, tag = "1")]
-                pub storage_slot: u32,
-                /// Merkle proof of the map value
-                #[prost(bytes = "vec", tag = "2")]
-                pub smt_proof: ::prost::alloc::vec::Vec<u8>,
-            }
-        }
     }
 }
 /// List of nullifiers to return proofs for.
@@ -533,11 +520,11 @@ pub mod rpc_client {
                 .insert(GrpcMethod::new("rpc_store.Rpc", "GetAccountDetails"));
             self.inner.unary(req, path, codec).await
         }
-        /// Returns the latest state proofs of the specified accounts.
-        pub async fn get_account_proofs(
+        /// Returns the latest state proof of the specified account.
+        pub async fn get_account_proof(
             &mut self,
-            request: impl tonic::IntoRequest<super::AccountProofsRequest>,
-        ) -> std::result::Result<tonic::Response<super::AccountProofs>, tonic::Status> {
+            request: impl tonic::IntoRequest<super::AccountProofRequest>,
+        ) -> std::result::Result<tonic::Response<super::AccountProof>, tonic::Status> {
             self.inner
                 .ready()
                 .await
@@ -548,11 +535,11 @@ pub mod rpc_client {
                 })?;
             let codec = tonic::codec::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
-                "/rpc_store.Rpc/GetAccountProofs",
+                "/rpc_store.Rpc/GetAccountProof",
             );
             let mut req = request.into_request();
             req.extensions_mut()
-                .insert(GrpcMethod::new("rpc_store.Rpc", "GetAccountProofs"));
+                .insert(GrpcMethod::new("rpc_store.Rpc", "GetAccountProof"));
             self.inner.unary(req, path, codec).await
         }
         /// Returns raw block data for the specified block number.
@@ -837,11 +824,11 @@ pub mod rpc_server {
             tonic::Response<super::super::account::AccountDetails>,
             tonic::Status,
         >;
-        /// Returns the latest state proofs of the specified accounts.
-        async fn get_account_proofs(
+        /// Returns the latest state proof of the specified account.
+        async fn get_account_proof(
             &self,
-            request: tonic::Request<super::AccountProofsRequest>,
-        ) -> std::result::Result<tonic::Response<super::AccountProofs>, tonic::Status>;
+            request: tonic::Request<super::AccountProofRequest>,
+        ) -> std::result::Result<tonic::Response<super::AccountProof>, tonic::Status>;
         /// Returns raw block data for the specified block number.
         async fn get_block_by_number(
             &self,
@@ -1141,23 +1128,23 @@ pub mod rpc_server {
                     };
                     Box::pin(fut)
                 }
-                "/rpc_store.Rpc/GetAccountProofs" => {
+                "/rpc_store.Rpc/GetAccountProof" => {
                     #[allow(non_camel_case_types)]
-                    struct GetAccountProofsSvc<T: Rpc>(pub Arc<T>);
-                    impl<T: Rpc> tonic::server::UnaryService<super::AccountProofsRequest>
-                    for GetAccountProofsSvc<T> {
-                        type Response = super::AccountProofs;
+                    struct GetAccountProofSvc<T: Rpc>(pub Arc<T>);
+                    impl<T: Rpc> tonic::server::UnaryService<super::AccountProofRequest>
+                    for GetAccountProofSvc<T> {
+                        type Response = super::AccountProof;
                         type Future = BoxFuture<
                             tonic::Response<Self::Response>,
                             tonic::Status,
                         >;
                         fn call(
                             &mut self,
-                            request: tonic::Request<super::AccountProofsRequest>,
+                            request: tonic::Request<super::AccountProofRequest>,
                         ) -> Self::Future {
                             let inner = Arc::clone(&self.0);
                             let fut = async move {
-                                <T as Rpc>::get_account_proofs(&inner, request).await
+                                <T as Rpc>::get_account_proof(&inner, request).await
                             };
                             Box::pin(fut)
                         }
@@ -1168,7 +1155,7 @@ pub mod rpc_server {
                     let max_encoding_message_size = self.max_encoding_message_size;
                     let inner = self.inner.clone();
                     let fut = async move {
-                        let method = GetAccountProofsSvc(inner);
+                        let method = GetAccountProofSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
diff --git a/crates/rpc/src/server/api.rs b/crates/rpc/src/server/api.rs
index 99889a1c4..cc3b17719 100644
--- a/crates/rpc/src/server/api.rs
+++ b/crates/rpc/src/server/api.rs
@@ -28,7 +28,7 @@ use miden_objects::block::{BlockHeader, BlockNumber};
 use miden_objects::note::{Note, NoteRecipient, NoteScript};
 use miden_objects::transaction::{OutputNote, ProvenTransaction, ProvenTransactionBuilder};
 use miden_objects::utils::serde::{Deserializable, Serializable};
-use miden_objects::{MAX_NUM_FOREIGN_ACCOUNTS, MIN_PROOF_SECURITY_LEVEL, Word};
+use miden_objects::{MIN_PROOF_SECURITY_LEVEL, Word};
 use miden_tx::TransactionVerifier;
 use tonic::{IntoRequest, Request, Response, Status};
 use tracing::{debug, info, instrument};
@@ -500,33 +500,20 @@ impl api_server::Api for RpcService {
     #[instrument(
         parent = None,
         target = COMPONENT,
-        name = "rpc.server.get_account_proofs",
+        name = "rpc.server.get_account_proof",
         skip_all,
         ret(level = "debug"),
         err
     )]
-    async fn get_account_proofs(
+    async fn get_account_proof(
         &self,
-        request: Request<proto::rpc_store::AccountProofsRequest>,
-    ) -> Result<Response<proto::rpc_store::AccountProofs>, Status> {
+        request: Request<proto::rpc_store::AccountProofRequest>,
+    ) -> Result<Response<proto::rpc_store::AccountProof>, Status> {
         let request = request.into_inner();
 
         debug!(target: COMPONENT, ?request);
 
-        if request.account_requests.len() > MAX_NUM_FOREIGN_ACCOUNTS as usize {
-            return Err(Status::invalid_argument(format!(
-                "Too many accounts requested: {}, limit: {MAX_NUM_FOREIGN_ACCOUNTS}",
-                request.account_requests.len()
-            )));
-        }
-
-        if request.account_requests.len() < request.code_commitments.len() {
-            return Err(Status::invalid_argument(
-                "The number of code commitments should not exceed the number of requested accounts.",
-            ));
-        }
-
-        self.store.clone().get_account_proofs(request).await
+        self.store.clone().get_account_proof(request).await
     }
 
     #[instrument(
diff --git a/crates/store/src/db/mod.rs b/crates/store/src/db/mod.rs
index 6c733d11a..f129da300 100644
--- a/crates/store/src/db/mod.rs
+++ b/crates/store/src/db/mod.rs
@@ -367,18 +367,6 @@ impl Db {
         .await
     }
 
-    /// Loads public accounts details from the DB.
-    #[instrument(level = "debug", target = COMPONENT, skip_all, ret(level = "debug"), err)]
-    pub async fn select_accounts_by_ids(
-        &self,
-        account_ids: Vec<AccountId>,
-    ) -> Result<Vec<AccountInfo>> {
-        self.transact("Select account by id set", |conn| {
-            queries::select_accounts_by_id(conn, account_ids)
-        })
-        .await
-    }
-
     #[instrument(level = "debug", target = COMPONENT, skip_all, ret(level = "debug"), err)]
     pub async fn get_state_sync(
         &self,
diff --git a/crates/store/src/db/models/queries/accounts.rs b/crates/store/src/db/models/queries/accounts.rs
index dd7093b51..867fe1df8 100644
--- a/crates/store/src/db/models/queries/accounts.rs
+++ b/crates/store/src/db/models/queries/accounts.rs
@@ -155,33 +155,6 @@ pub(crate) fn select_all_account_commitments(
     ))
 }
 
-/// Select accounts by their IDs.
-///
-/// # Parameters
-/// * `account_ids`: List of account IDs to query
-///     - Limit: 0 <= size <= 1000
-pub(crate) fn select_accounts_by_id(
-    conn: &mut SqliteConnection,
-    account_ids: Vec<AccountId>,
-) -> Result<Vec<AccountInfo>, DatabaseError> {
-    QueryParamAccountIdLimit::check(account_ids.len())?;
-
-    let account_ids = account_ids.iter().map(|account_id| account_id.to_bytes().clone());
-
-    let accounts_raw = SelectDsl::select(
-        schema::accounts::table.left_join(schema::account_codes::table.on(
-            schema::accounts::code_commitment.eq(schema::account_codes::code_commitment.nullable()),
-        )),
-        (AccountRaw::as_select(), schema::account_codes::code.nullable()),
-    )
-    .filter(schema::accounts::account_id.eq_any(account_ids))
-    .load::<(AccountRaw, Option<Vec<u8>>)>(conn)?;
-    let account_infos = vec_raw_try_into::<AccountInfo, AccountWithCodeRawJoined>(
-        accounts_raw.into_iter().map(AccountWithCodeRawJoined::from),
-    )?;
-    Ok(account_infos)
-}
-
 /// Select account vault assets within a block range (inclusive).
 ///
 /// # Parameters
diff --git a/crates/store/src/server/rpc_api.rs b/crates/store/src/server/rpc_api.rs
index 85af1e8b7..f8886969d 100644
--- a/crates/store/src/server/rpc_api.rs
+++ b/crates/store/src/server/rpc_api.rs
@@ -1,6 +1,4 @@
-use std::collections::BTreeSet;
-
-use miden_node_proto::domain::account::{AccountInfo, AccountProofRequest};
+use miden_node_proto::domain::account::AccountInfo;
 use miden_node_proto::errors::ConversionError;
 use miden_node_proto::generated::rpc_store::rpc_server;
 use miden_node_proto::generated::{self as proto};
@@ -300,42 +298,23 @@ impl rpc_server::Rpc for StoreApi {
     #[instrument(
         parent = None,
         target = COMPONENT,
-        name = "store.rpc_server.get_account_proofs",
+        name = "store.rpc_server.get_account_proof",
         skip_all,
         level = "debug",
         ret(level = "debug"),
         err
     )]
-    async fn get_account_proofs(
+    async fn get_account_proof(
         &self,
-        request: Request<proto::rpc_store::AccountProofsRequest>,
-    ) -> Result<Response<proto::rpc_store::AccountProofs>, Status> {
+        request: Request<proto::rpc_store::AccountProofRequest>,
+    ) -> Result<Response<proto::rpc_store::AccountProof>, Status> {
         debug!(target: COMPONENT, ?request);
-        let proto::rpc_store::AccountProofsRequest {
-            account_requests,
-            include_headers,
-            code_commitments,
-        } = request.into_inner();
-
-        let include_headers = include_headers.unwrap_or_default();
-        let request_code_commitments: BTreeSet<Word> = try_convert(code_commitments)
-            .collect::<Result<_, _>>()
-            .map_err(|err| Status::invalid_argument(format!("Invalid code commitment: {err}")))?;
-
-        let account_requests: Vec<AccountProofRequest> =
-            try_convert(account_requests).collect::<Result<_, _>>().map_err(|err| {
-                Status::invalid_argument(format!("Invalid account proofs request: {err}"))
-            })?;
+        let request = request.into_inner();
+        let account_request = request.try_into()?;
 
-        let (block_num, infos) = self
-            .state
-            .get_account_proofs(account_requests, request_code_commitments, include_headers)
-            .await?;
+        let proof = self.state.get_account_proof(account_request).await?;
 
-        Ok(Response::new(proto::rpc_store::AccountProofs {
-            block_num: block_num.as_u32(),
-            account_proofs: infos,
-        }))
+        Ok(Response::new(proto::rpc_store::AccountProof::from(proof)))
     }
 
     #[instrument(
diff --git a/crates/store/src/state.rs b/crates/store/src/state.rs
index ed66efe71..c6a0605f4 100644
--- a/crates/store/src/state.rs
+++ b/crates/store/src/state.rs
@@ -4,18 +4,21 @@
 //! data is atomically written, and that reads are consistent.
 
 use std::collections::{BTreeMap, BTreeSet, HashSet};
-use std::ops::{Not, RangeInclusive};
+use std::ops::RangeInclusive;
 use std::path::Path;
 use std::sync::Arc;
 
+use miden_node_proto::AccountWitnessRecord;
 use miden_node_proto::domain::account::{
+    AccountDetailsResponse,
     AccountInfo,
     AccountProofRequest,
+    AccountProofResponse,
     NetworkAccountPrefix,
     StorageMapKeysProof,
+    StorageSlotMapProof,
 };
 use miden_node_proto::domain::batch::BatchInputs;
-use miden_node_proto::{AccountWitnessRecord, generated as proto};
 use miden_node_utils::ErrorReport;
 use miden_node_utils::formatting::format_array;
 use miden_objects::account::{AccountHeader, AccountId, StorageSlot};
@@ -882,102 +885,83 @@ impl State {
         self.db.select_network_account_by_prefix(id_prefix).await
     }
 
-    /// Returns account proofs with optional account and storage headers.
-    pub async fn get_account_proofs(
+    /// Returns the respective account proof with optional details, such as asset and storage
+    /// entries.
+    pub async fn get_account_proof(
         &self,
-        account_requests: Vec<AccountProofRequest>,
-        known_code_commitments: BTreeSet<Word>,
-        include_headers: bool,
-    ) -> Result<(BlockNumber, Vec<proto::rpc_store::account_proofs::AccountProof>), DatabaseError>
-    {
+        account_request: AccountProofRequest,
+    ) -> Result<AccountProofResponse, DatabaseError> {
         // Lock inner state for the whole operation. We need to hold this lock to prevent the
         // database, account tree and latest block number from changing during the operation,
         // because changing one of them would lead to inconsistent state.
         let inner_state = self.inner.read().await;
 
-        let account_ids: Vec<AccountId> =
-            account_requests.iter().map(|req| req.account_id).collect();
+        let account_id = account_request.account_id;
 
-        let state_headers = if include_headers.not() {
-            BTreeMap::<AccountId, proto::rpc_store::account_proofs::account_proof::AccountStateHeader>::default()
-        } else {
-            let infos = self.db.select_accounts_by_ids(account_ids.clone()).await?;
-            if account_ids.len() > infos.len() {
-                let found_ids = infos.iter().map(|info| info.summary.account_id).collect();
-                return Err(DatabaseError::AccountsNotFoundInDb(
-                    BTreeSet::from_iter(account_ids).difference(&found_ids).copied().collect(),
-                ));
-            }
-
-            let mut headers_map = BTreeMap::new();
-
-            // Iterate and build state headers for public accounts
-            for request in account_requests {
-                let account_info = infos
-                    .iter()
-                    .find(|info| info.summary.account_id == request.account_id)
-                    .expect("retrieved accounts were validated against request");
+        let account_details = if let Some(account_detail_request) = account_request.account_details
+        {
+            let info = self.db.select_account(account_id).await?;
 
-                if let Some(details) = &account_info.details {
-                    let mut storage_slot_map_keys = Vec::new();
+            if let Some(details) = &info.details {
+                let mut storage_proofs = Vec::new();
 
-                    for StorageMapKeysProof { storage_index, storage_keys } in
-                        &request.storage_requests
+                for StorageMapKeysProof { storage_index, storage_keys } in
+                    &account_detail_request.storage_requests
+                {
+                    if let Some(StorageSlot::Map(storage_map)) =
+                        details.storage().slots().get(*storage_index as usize)
                     {
-                        if let Some(StorageSlot::Map(storage_map)) =
-                            details.storage().slots().get(*storage_index as usize)
-                        {
-                            for map_key in storage_keys {
-                                let proof = storage_map.open(map_key);
-
-                                let slot_map_key = proto::rpc_store::account_proofs::account_proof::account_state_header::StorageSlotMapProof {
-                                    storage_slot: u32::from(*storage_index),
-                                    smt_proof: proof.to_bytes(),
-                                };
-                                storage_slot_map_keys.push(slot_map_key);
-                            }
-                        } else {
-                            return Err(AccountError::StorageSlotNotMap(*storage_index).into());
+                        for map_key in storage_keys {
+                            let proof = storage_map.open(map_key);
+
+                            let slot_map_key =
+                                StorageSlotMapProof { storage_slot: *storage_index, proof };
+                            storage_proofs.push(slot_map_key);
                         }
+                    } else {
+                        return Err(AccountError::StorageSlotNotMap(*storage_index).into());
                     }
-
-                    // Only include unknown account codes
-                    let account_code = known_code_commitments
-                        .contains(&details.code().commitment())
-                        .not()
-                        .then(|| details.code().to_bytes());
-
-                    let state_header =
-                        proto::rpc_store::account_proofs::account_proof::AccountStateHeader {
-                            header: Some(AccountHeader::from(details).into()),
-                            storage_header: details.storage().to_header().to_bytes(),
-                            account_code,
-                            storage_maps: storage_slot_map_keys,
-                        };
-
-                    headers_map.insert(account_info.summary.account_id, state_header);
                 }
-            }
 
-            headers_map
-        };
+                // Only include unknown account code blobs
+                let account_code = match account_detail_request.code_commitment {
+                    Some(known_code_commitment)
+                        if known_code_commitment == details.code().commitment() =>
+                    {
+                        // the known code matches the expected commitment, which implies
+                        // the user already has that code
+                        None
+                    },
+                    _ => Some(details.code().to_bytes()),
+                };
 
-        let responses = account_ids
-            .into_iter()
-            .map(|account_id| {
-                let witness = inner_state.account_tree.open(account_id);
-                let state_header = state_headers.get(&account_id).cloned();
+                let account_details_response = AccountDetailsResponse {
+                    account_header: AccountHeader::from(details),
+                    storage_header: details.storage().to_header(),
+                    account_code,
+                    storage_proofs,
+                };
 
-                let witness_record = AccountWitnessRecord { account_id, witness };
+                Some(account_details_response)
+            } else {
+                None
+            }
+        } else {
+            None
+        };
 
-                proto::rpc_store::account_proofs::AccountProof {
-                    witness: Some(witness_record.into()),
-                    state_header,
-                }
-            })
-            .collect();
+        let witness = AccountWitnessRecord {
+            account_id, // FIXME TODO see account.proto we need to triple check this is correct
+            witness: inner_state.account_tree.open(account_id),
+        };
+
+        let response = AccountProofResponse {
+            block_num: inner_state.latest_block_num(),
+            witness,
+            account_details,
+        };
 
-        Ok((inner_state.latest_block_num(), responses))
+        Ok(response)
     }
 
     /// Returns storage map values for syncing within a block range.
diff --git a/proto/proto/rpc.proto b/proto/proto/rpc.proto
index 9023ff92b..05fdb7ddf 100644
--- a/proto/proto/rpc.proto
+++ b/proto/proto/rpc.proto
@@ -26,8 +26,8 @@ service Api {
     // Returns the latest state of an account with the specified ID.
     rpc GetAccountDetails(account.AccountId) returns (account.AccountDetails) {}
 
-    // Returns the latest state proofs of the specified accounts.
-    rpc GetAccountProofs(rpc_store.AccountProofsRequest) returns (rpc_store.AccountProofs) {}
+    // Returns the latest state proof of the specified account.
+    rpc GetAccountProof(rpc_store.AccountProofRequest) returns (rpc_store.AccountProof) {}
 
     // Returns raw block data for the specified block number.
     rpc GetBlockByNumber(blockchain.BlockNumber) returns (blockchain.MaybeBlock) {}
diff --git a/proto/proto/store/rpc.proto b/proto/proto/store/rpc.proto
index ce2270de1..f32598829 100644
--- a/proto/proto/store/rpc.proto
+++ b/proto/proto/store/rpc.proto
@@ -26,8 +26,8 @@ service Rpc {
     // Returns the latest state of an account with the specified ID.
     rpc GetAccountDetails(account.AccountId) returns (account.AccountDetails) {}
 
-    // Returns the latest state proofs of the specified accounts.
-    rpc GetAccountProofs(AccountProofsRequest) returns (AccountProofs) {}
+    // Returns the latest state proof of the specified account.
+    rpc GetAccountProof(AccountProofRequest) returns (AccountProof) {}
 
     // Returns raw block data for the specified block number.
     rpc GetBlockByNumber(blockchain.BlockNumber) returns (blockchain.MaybeBlock) {}
@@ -97,14 +97,13 @@ message StoreStatus {
     fixed32 chain_tip = 3;
 }
 
-// GET ACCOUNT PROOFS
+// GET ACCOUNT PROOF
 // ================================================================================================
 
-// Returns the latest state proofs of the specified accounts.
-message AccountProofsRequest {
-    // Represents per-account requests where each account ID has its own list of
-    // (storage_slot_index, map_keys) pairs.
-    message AccountRequest {
+// Returns the latest state proof of the specified accounts.
+message AccountProofRequest {
+    // Request the details for a public account.
+    message AccountDetailsRequest {
         // Represents a storage slot index and the associated map keys.
         message StorageRequest {
             // Storage slot index ([0..255])
@@ -114,68 +113,56 @@ message AccountProofsRequest {
             repeated primitives.Digest map_keys = 2;
         }
 
-        // The account ID for this request.
-        account.AccountId account_id = 1;
+        // Account code commitment corresponding to the last-known `AccountCode` for the requested
+        // account. The response will include only code that is known.
+        optional primitives.Digest code_commitment = 1;
 
         // List of storage requests for this account.
         repeated StorageRequest storage_requests = 2;
     }
 
-    // A list of account requests, including map keys + values.
-    repeated AccountRequest account_requests = 1;
+    // The account ID for this request.
+    account.AccountId account_id = 1;
 
-    // Optional flag to include account headers and account code in the response. If false, storage
-    // requests are also ignored. False by default.
-    optional bool include_headers = 2;
-
-    // Account code commitments corresponding to the last-known `AccountCode` for requested
-    // accounts. Responses will include only the ones that are not known to the caller.
-    // These are not associated with a specific account but rather, they will be matched against
-    // all requested accounts.
-    repeated primitives.Digest code_commitments = 3;
+    // A account detail requests, including map keys + values.
+    optional AccountDetailsRequest account_details = 2;
 }
 
 // Represents the result of getting account proofs.
-message AccountProofs {
-    // A single account proof returned as a response to `GetAccountProofs`.
-    message AccountProof {
-        // State header for public accounts.
-        message AccountStateHeader {
-            // Represents a single storage slot with the requested keys and their respective values.
-            message StorageSlotMapProof {
-                // The storage slot index ([0..255]).
-                uint32 storage_slot = 1;
-
-                // Merkle proof of the map value
-                bytes smt_proof = 2;
-            }
-
-            // Account header.
-            account.AccountHeader header = 1;
-
-            // Values of all account storage slots (max 255).
-            bytes storage_header = 2;
-
-            // Account code, returned only when none of the request's code commitments match
-            // the current one.
-            optional bytes account_code = 3;
-
-            // Storage slots information for this account
-            repeated StorageSlotMapProof storage_maps = 4;
+message AccountProof {
+    // State header, available for public accounts only.
+    message AccountDetailsResponse {
+        // Represents a single storage slot with the requested keys and their respective values.
+        message StorageSlotMapProof {
+            // The storage slot index ([0..255]).
+            uint32 storage_slot = 1;
+
+            // Merkle proof of the map value
+            primitives.SmtOpening smt_proof = 2;
         }
 
-        // The account witness for the current state commitment of one account ID.
-        account.AccountWitness witness = 1;
+        // Account header, always included.
+        account.AccountHeader header = 1;
+
+        // Account storage header containing slot types and commitments.
+        account.AccountStorageHeader storage_header = 2;
 
-        // State header for public accounts. Filled only if `include_headers` flag is set to `true`.
-        optional AccountStateHeader state_header = 2;
+        // Account code, if the current account code does not match the request provided commitment digest.
+        optional bytes account_code = 3;
+
+        // Storage slots information for this account
+        repeated StorageSlotMapProof storage_maps = 4;
     }
 
     // Block number at which the state of the accounts is returned.
     fixed32 block_num = 1;
 
-    // List of account state infos for the requested account keys.
-    repeated AccountProof account_proofs = 2;
+    // The account witness for the current state commitment of one account ID.
+    account.AccountWitness witness = 2;
+
+    // State header for public accounts. Filled only if the flag `AccountDetailsRequest` was
+    // present and the account was a public account/the information was available.
+    optional AccountDetailsResponse details = 3;
 }
 
 // CHECK NULLIFIERS
@@ -296,7 +283,7 @@ message SyncAccountVaultResponse {
     PaginationInfo pagination_info = 1;
 
     // List of asset updates for the account.
-    // 
+    //
     // Multiple updates can be returned for a single asset, and the one with a higher `block_num`
     // is expected to be retained by the caller.
     repeated AccountVaultUpdate updates = 2;
@@ -371,7 +358,7 @@ message SyncStorageMapsResponse {
     PaginationInfo pagination_info = 1;
 
     // The list of storage map updates.
-    // 
+    //
     // Multiple updates can be returned for a single slot index and key combination, and the one
     // with a higher `block_num` is expected to be retained by the caller.
     repeated StorageMapUpdate updates = 2;
@@ -384,10 +371,10 @@ message StorageMapUpdate {
 
     // Slot index ([0..255]).
     uint32 slot_index = 2;
-    
+
     // The storage map key.
     primitives.Digest key = 3;
-        
+
     // The storage map value.
     primitives.Digest value = 4;
 }
diff --git a/proto/proto/types/account.proto b/proto/proto/types/account.proto
index 403e274b1..d02424607 100644
--- a/proto/proto/types/account.proto
+++ b/proto/proto/types/account.proto
@@ -28,6 +28,21 @@ message AccountSummary {
     uint32 block_num = 3;
 }
 
+// Represents the storage header of an account.
+message AccountStorageHeader {
+    // A single storage slot in the account storage header.
+    message StorageSlot {
+        // The type of the storage slot.
+        uint32 slot_type = 1;
+
+        // The commitment (Word) for this storage slot.
+        primitives.Digest commitment = 2;
+    }
+
+    // Storage slots with their types and commitments.
+    repeated StorageSlot slots = 1;
+}
+
 // An account details.
 message AccountDetails {
     // Account summary.
@@ -40,17 +55,20 @@ message AccountDetails {
 
 // An account header.
 message AccountHeader {
+    // The account ID.
+    AccountId account_id = 1;
+
     // Vault root hash.
-    primitives.Digest vault_root = 1;
+    primitives.Digest vault_root = 2;
 
     // Storage root hash.
-    primitives.Digest storage_commitment = 2;
+    primitives.Digest storage_commitment = 3;
 
     // Code root hash.
-    primitives.Digest code_commitment = 3;
+    primitives.Digest code_commitment = 4;
 
     // Account nonce.
-    uint64 nonce = 4;
+    uint64 nonce = 5;
 }
 
 // An account witness.

From e07e605d60e912876b3b0907c141fa8cad08b222 Mon Sep 17 00:00:00 2001
From: Marti <marti@miden.team>
Date: Fri, 12 Sep 2025 21:55:42 +0200
Subject: [PATCH 12/78] docs: docs should mention native faucet (#1225)

---
 docs/src/operator/usage.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/docs/src/operator/usage.md b/docs/src/operator/usage.md
index d1b509d32..b9eef404d 100644
--- a/docs/src/operator/usage.md
+++ b/docs/src/operator/usage.md
@@ -46,8 +46,8 @@ miden-node bundled bootstrap \
   --genesis-config-file genesis.toml
 ```
 
-The genesis configuration file should contain at least one faucet, and optionally, wallet definitions
-with assets, for example:
+The genesis configuration file should contain fee parameters, the native faucet, optionally other
+fungible faucets, and also optionally, wallet definitions with assets, for example:
 
 ```toml
 # The UNIX timestamp of the genesis block. It will influence the hash of the genesis block.
@@ -55,6 +55,17 @@ timestamp = 1717344256
 # Defines the format of the block protocol to use for the genesis block.
 version   = 1
 
+# The native faucet to use for fees.
+[native_faucet]
+symbol     = "MIDEN"
+decimals   = 6
+max_supply = 100_000_000_000_000_000
+
+# The fee parameters to use for the genesis block.
+[fee_parameters]
+verification_base_fee = 0
+
+# Another fungible faucet (optional) to initialize at genesis.
 [[fungible_faucet]]
 # The token symbol to use for the token
 symbol       = "FUZZY"

From 4d3475158dd155525c1b662bcfdb15db40c5c352 Mon Sep 17 00:00:00 2001
From: igamigo <ignacio.amigo@lambdaclass.com>
Date: Mon, 15 Sep 2025 12:34:01 -0300
Subject: [PATCH 13/78] feat: implement DataStore::get_storage_map_witness
 (#1226)

---
 CHANGELOG.md                          |  1 +
 Cargo.lock                            | 12 +++++-----
 crates/ntx-builder/src/transaction.rs | 34 ++++++++++++++++++++++++++-
 crates/store/src/state.rs             |  6 +++--
 4 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19bf047cd..be2fd5568 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - [BREAKING] Renamed `CheckNullifiersByPrefix` endpoint to `SyncNullifiers` ([#1191](https://github.com/0xMiden/miden-node/pull/1191)).
 - [BREAKING] Added `block_range` and `pagination_info` fields to paginated gRPC endpoints ([#1205](https://github.com/0xMiden/miden-node/pull/1205)).
 - [BREAKING] Replace `GetAccountProofs` with `GetAccountProof` in the public store API (#[1211](https://github.com/0xMiden/miden-node/pull/1211)).
+- Implemented storage map `DataStore` function ([#1226](https://github.com/0xMiden/miden-node/pull/1226)).
 
 ## v0.11.1 (2025-09-08)
 
diff --git a/Cargo.lock b/Cargo.lock
index 099dec470..9d087a447 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2056,7 +2056,7 @@ dependencies = [
 [[package]]
 name = "miden-block-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#074d91390d0d4e16a319805736caad27c1a2852f"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2128,7 +2128,7 @@ dependencies = [
 [[package]]
 name = "miden-lib"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#074d91390d0d4e16a319805736caad27c1a2852f"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
 dependencies = [
  "miden-assembly",
  "miden-objects",
@@ -2429,7 +2429,7 @@ dependencies = [
 [[package]]
 name = "miden-objects"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#074d91390d0d4e16a319805736caad27c1a2852f"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
 dependencies = [
  "bech32",
  "getrandom 0.3.3",
@@ -2560,7 +2560,7 @@ dependencies = [
 [[package]]
 name = "miden-testing"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#074d91390d0d4e16a319805736caad27c1a2852f"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
 dependencies = [
  "anyhow",
  "itertools",
@@ -2580,7 +2580,7 @@ dependencies = [
 [[package]]
 name = "miden-tx"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#074d91390d0d4e16a319805736caad27c1a2852f"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2595,7 +2595,7 @@ dependencies = [
 [[package]]
 name = "miden-tx-batch-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#074d91390d0d4e16a319805736caad27c1a2852f"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
 dependencies = [
  "miden-objects",
  "miden-tx",
diff --git a/crates/ntx-builder/src/transaction.rs b/crates/ntx-builder/src/transaction.rs
index 335d12a54..3aa70408c 100644
--- a/crates/ntx-builder/src/transaction.rs
+++ b/crates/ntx-builder/src/transaction.rs
@@ -1,7 +1,7 @@
 use std::collections::BTreeSet;
 
 use miden_node_utils::tracing::OpenTelemetrySpanExt;
-use miden_objects::account::{Account, AccountId, PartialAccount};
+use miden_objects::account::{Account, AccountId, PartialAccount, StorageMapWitness, StorageSlot};
 use miden_objects::asset::AssetWitness;
 use miden_objects::block::{BlockHeader, BlockNumber};
 use miden_objects::note::Note;
@@ -307,6 +307,38 @@ impl DataStore for NtxDataStore {
             })
         }
     }
+
+    fn get_storage_map_witness(
+        &self,
+        account_id: AccountId,
+        map_root: Word,
+        map_key: Word,
+    ) -> impl FutureMaybeSend<Result<StorageMapWitness, DataStoreError>> {
+        let account = self.account.clone();
+        async move {
+            if account.id() != account_id {
+                return Err(DataStoreError::AccountNotFound(account_id));
+            }
+
+            let mut map_witness = None;
+            for slot in account.storage().slots() {
+                if let StorageSlot::Map(map) = slot {
+                    if map.root() == map_root {
+                        map_witness = Some(map.open(&map_key));
+                    }
+                }
+            }
+
+            if let Some(map_witness) = map_witness {
+                Ok(map_witness)
+            } else {
+                Err(DataStoreError::Other {
+                    error_msg: "account storage does not contain the expected root".into(),
+                    source: None,
+                })
+            }
+        }
+    }
 }
 
 impl MastForestStore for NtxDataStore {
diff --git a/crates/store/src/state.rs b/crates/store/src/state.rs
index c6a0605f4..52831df61 100644
--- a/crates/store/src/state.rs
+++ b/crates/store/src/state.rs
@@ -914,8 +914,10 @@ impl State {
                         for map_key in storage_keys {
                             let proof = storage_map.open(map_key);
 
-                            let slot_map_key =
-                                StorageSlotMapProof { storage_slot: *storage_index, proof };
+                            let slot_map_key = StorageSlotMapProof {
+                                storage_slot: *storage_index,
+                                proof: proof.into(),
+                            };
                             storage_proofs.push(slot_map_key);
                         }
                     } else {

From df04d7d883138b5c5eb118f6a3e6b79586bc3760 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Thu, 18 Sep 2025 04:03:11 -0300
Subject: [PATCH 14/78] feat: add network monitoring application (#1217)

---
 .github/workflows/network-monitor.yml         |   33 +
 .github/workflows/publish-debian-all.yml      |   23 +
 .github/workflows/publish-debian.yml          |    6 +-
 CHANGELOG.md                                  |    1 +
 Cargo.lock                                    |   14 +
 Cargo.toml                                    |    1 +
 Makefile                                      |    4 +
 bin/network-monitor/.env                      |    3 +
 bin/network-monitor/Cargo.toml                |   25 +
 bin/network-monitor/README.md                 |   68 ++
 bin/network-monitor/assets/favicon.ico        |  Bin 0 -> 8347 bytes
 bin/network-monitor/assets/index.css          |  387 +++++++
 bin/network-monitor/assets/index.html         |  236 ++++
 bin/network-monitor/src/frontend.rs           |   70 ++
 bin/network-monitor/src/main.rs               |   77 ++
 bin/network-monitor/src/status.rs             |  456 ++++++++
 bin/remote-prover/Cargo.toml                  |    2 +-
 crates/proto/build.rs                         |    2 +
 crates/proto/src/clients/mod.rs               |   19 +
 crates/proto/src/generated/mod.rs             |    1 +
 crates/proto/src/generated/remote_prover.rs   | 1001 +++++++++++++++++
 .../miden-network-monitor.service             |   15 +
 packaging/network-monitor/postinst            |   26 +
 packaging/network-monitor/postrm              |    9 +
 scripts/publish-crates.sh                     |    1 +
 25 files changed, 2478 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/network-monitor.yml
 create mode 100644 bin/network-monitor/.env
 create mode 100644 bin/network-monitor/Cargo.toml
 create mode 100644 bin/network-monitor/README.md
 create mode 100644 bin/network-monitor/assets/favicon.ico
 create mode 100644 bin/network-monitor/assets/index.css
 create mode 100644 bin/network-monitor/assets/index.html
 create mode 100644 bin/network-monitor/src/frontend.rs
 create mode 100644 bin/network-monitor/src/main.rs
 create mode 100644 bin/network-monitor/src/status.rs
 create mode 100644 crates/proto/src/generated/remote_prover.rs
 create mode 100644 packaging/network-monitor/miden-network-monitor.service
 create mode 100644 packaging/network-monitor/postinst
 create mode 100644 packaging/network-monitor/postrm

diff --git a/.github/workflows/network-monitor.yml b/.github/workflows/network-monitor.yml
new file mode 100644
index 000000000..507980803
--- /dev/null
+++ b/.github/workflows/network-monitor.yml
@@ -0,0 +1,33 @@
+# Runs build and install checks for the network monitor binary.
+
+name: network-monitor
+
+on:
+  push:
+    branches: [main, next]
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+# Limits workflow concurrency to only the latest commit in the PR.
+concurrency:
+  group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  check:
+    name: check
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@v4
+      - name: Rustup
+        run: rustup update --no-self-update
+      - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/next' }}
+      - name: Check network monitor (release)
+        run: |
+          BUILD_PROTO=1 cargo check --locked -p miden-network-monitor --release
diff --git a/.github/workflows/publish-debian-all.yml b/.github/workflows/publish-debian-all.yml
index d05508f43..1539d7b1f 100644
--- a/.github/workflows/publish-debian-all.yml
+++ b/.github/workflows/publish-debian-all.yml
@@ -87,3 +87,26 @@ jobs:
           package: prover-proxy
           crate: miden-remote-prover
           arch: ${{ matrix.arch }}
+
+  publish-network-monitor:
+    name: Publish Network Monitor ${{ matrix.arch }} Debian
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
+    runs-on:
+      labels: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@main
+        with:
+          fetch-depth: 0
+      - name: Build and Publish Network Monitor
+        uses: ./.github/actions/debian
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          gitref: ${{ env.version }}
+          crate_dir: network-monitor
+          service: miden-network-monitor
+          package: network-monitor
+          crate: miden-network-monitor
+          arch: ${{ matrix.arch }}
diff --git a/.github/workflows/publish-debian.yml b/.github/workflows/publish-debian.yml
index 4eefd9fe6..1079bfddb 100644
--- a/.github/workflows/publish-debian.yml
+++ b/.github/workflows/publish-debian.yml
@@ -8,6 +8,7 @@ on:
         required: true
         type: choice
         options:
+          - miden-network-monitor
           - miden-node
           - miden-prover
           - miden-prover-proxy
@@ -16,6 +17,7 @@ on:
         description: "Name of crate directory"
         type: choice
         options:
+          - network-monitor
           - node
           - remote-prover
       package:
@@ -23,6 +25,7 @@ on:
         description: "Name of packaging directory"
         type: choice
         options:
+          - network-monitor
           - node
           - prover
           - prover-proxy
@@ -31,6 +34,7 @@ on:
         required: true
         type: choice
         options:
+          - miden-network-monitor
           - miden-node
           - miden-remote-prover
       version:
@@ -44,7 +48,7 @@ permissions:
 
 jobs:
   publish:
-    name: Publish Prover ${{ matrix.arch }} Debian
+    name: Publish ${{ inputs.service }} ${{ matrix.arch }} Debian
     strategy:
       matrix:
         arch: [amd64, arm64]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index be2fd5568..513f9821d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - Removed decorators from scripts when submitting transactions and batches, and inserting notes into the DB ([#1194](https://github.com/
 0xMiden/miden-node/pull/1194)).
 - Refresh `miden-base` dependencies.
+- Added `miden-network-monitor` binary for monitoring the Miden network ([#1217](https://github.com/0xMiden/miden-node/pull/1217)).
 
 ## v0.11.0 (2025-08-28)
 
diff --git a/Cargo.lock b/Cargo.lock
index 9d087a447..1cd5c8544 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2193,6 +2193,20 @@ dependencies = [
  "syn 2.0.106",
 ]
 
+[[package]]
+name = "miden-network-monitor"
+version = "0.12.0"
+dependencies = [
+ "anyhow",
+ "axum",
+ "miden-node-proto",
+ "miden-node-utils",
+ "serde",
+ "tokio",
+ "tracing",
+ "url",
+]
+
 [[package]]
 name = "miden-node"
 version = "0.12.0"
diff --git a/Cargo.toml b/Cargo.toml
index a9c9e2a66..ea05eebda 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,6 @@
 [workspace]
 members = [
+  "bin/network-monitor",
   "bin/node",
   "bin/remote-prover",
   "bin/stress-test",
diff --git a/Makefile b/Makefile
index ce8bcab60..787070515 100644
--- a/Makefile
+++ b/Makefile
@@ -102,6 +102,10 @@ install-remote-prover: ## Install remote prover's CLI
 install-stress-test: ## Installs stress-test binary
 	cargo install --path bin/stress-test --locked
 
+.PHONY: install-network-monitor
+install-network-monitor: ## Installs network monitor binary
+	cargo install --path bin/network-monitor --locked
+
 # --- docker --------------------------------------------------------------------------------------
 
 .PHONY: docker-build-node
diff --git a/bin/network-monitor/.env b/bin/network-monitor/.env
new file mode 100644
index 000000000..4b9200f06
--- /dev/null
+++ b/bin/network-monitor/.env
@@ -0,0 +1,3 @@
+MIDEN_MONITOR_RPC_URL=http://0.0.0.0:57291
+MIDEN_MONITOR_REMOTE_PROVER_URLS=https://tx-prover.devnet.miden.io/,https://batch-prover.devnet.miden.io/
+MIDEN_MONITOR_PORT=3001
diff --git a/bin/network-monitor/Cargo.toml b/bin/network-monitor/Cargo.toml
new file mode 100644
index 000000000..2a672a9e9
--- /dev/null
+++ b/bin/network-monitor/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+authors.workspace      = true
+description            = "Miden network monitor"
+edition.workspace      = true
+homepage.workspace     = true
+keywords               = ["miden", "monitor", "network"]
+license.workspace      = true
+name                   = "miden-network-monitor"
+readme.workspace       = true
+repository.workspace   = true
+rust-version.workspace = true
+version.workspace      = true
+
+[lints]
+workspace = true
+
+[dependencies]
+anyhow           = { workspace = true }
+axum             = { version = "0.8" }
+miden-node-proto = { workspace = true }
+miden-node-utils = { workspace = true }
+serde            = { features = ["derive"], version = "1.0" }
+tokio            = { features = ["full"], workspace = true }
+tracing          = { workspace = true }
+url              = { features = ["serde"], workspace = true }
diff --git a/bin/network-monitor/README.md b/bin/network-monitor/README.md
new file mode 100644
index 000000000..b1f7438b8
--- /dev/null
+++ b/bin/network-monitor/README.md
@@ -0,0 +1,68 @@
+# Miden network monitor
+
+A monitor app for a Miden network's infrastructure.
+
+## Installation
+
+The binary can be installed using the project's Makefile:
+
+```bash
+make install-network-monitor
+```
+
+## Configuration
+
+The monitor application uses environment variables for configuration:
+
+- `MIDEN_MONITOR_RPC_URL`: RPC service URL (default: `http://localhost:50051`)
+- `MIDEN_MONITOR_REMOTE_PROVER_URLS`: Comma-separated list of remote prover URLs (default: `http://localhost:50052`)
+- `MIDEN_MONITOR_PORT`: Web server port (default: `3000`)
+
+## Usage
+
+```bash
+# Single remote prover
+MIDEN_MONITOR_REMOTE_PROVER_URLS="http://localhost:50052" miden-network-monitor
+
+# Multiple remote provers
+MIDEN_MONITOR_REMOTE_PROVER_URLS="http://localhost:50052,http://localhost:50053,http://localhost:50054" miden-network-monitor
+```
+
+## Currently Supported Monitor
+
+The monitor application provides real-time status monitor for the following Miden network components:
+
+### RPC Service
+- **Service Health**: Overall RPC service availability and status
+- **Version Information**: RPC service version
+- **Genesis Commitment**: Network genesis commitment (with copy-to-clipboard functionality)
+- **Store Status**:
+  - Store service version and health
+  - Chain tip (latest block number)
+- **Block Producer Status**:
+  - Block producer version and health
+
+### Remote Provers
+- **Service Health**: Individual remote prover availability and status
+- **Version Information**: Remote prover service version
+- **Supported Proof Types**: Types of proofs the prover can generate
+- **Worker Status**:
+  - Individual worker addresses and versions
+  - Worker health status (HEALTHY/UNHEALTHY/UNKNOWN)
+  - Worker count per prover
+
+## Future Monitor Items
+
+Planned workflow testing features for future releases:
+
+### Faucet Workflow Testing
+The monitor application will test the faucet service by minting tokens from the official faucet. This test verifies that the faucet is operational and can successfully distribute tokens for testing purposes.
+
+### Prover Workflow Testing
+The application will use the delegated prover to prove transactions, testing the proving infrastructure without requiring network submission. This includes testing with static transactions to validate proof generation capabilities and monitor prover performance under various loads.
+
+### Network Transaction Testing
+The monitor system will submit actual transactions to the network to perform end-to-end testing of the complete workflow. This test covers transaction creation, submission, processing, and confirmation, providing comprehensive validation of network functionality.
+
+## License
+This project is [MIT licensed](../../LICENSE).
diff --git a/bin/network-monitor/assets/favicon.ico b/bin/network-monitor/assets/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..e00374fd65ce73ac64082b85353532ff23072920
GIT binary patch
literal 8347
zcmb_?XE+>T_xJ2ty{_J^7BzY=v3hSo5Cl;p(TUEk-b*BUStN)kK}3&5usV?-h~5$s
zB@%@2pFGd?zus@}m-qcJ*PNNTuX|2EzjJ1iOpLV2Ntj6h03g@Z(YOr&5RilbL<Hc;
z*00+2-<AJuZ8e~Ng7qtSq2Xes>uP8S2!b>b07-ZN!2T@(4`%QH06Yu?zyr^afA=uZ
z|9uJpFnIrm{<qNW8?!C|An<iHRLz4S-|Yz7=svaF!;7x2MwJiN8>hv&QU6kwrq>{6
zpw-B{uem??B+podGzVjx##`Dw^rK&`m4)=4@bC;HjZ@0@d8$@6KZ(q1Z1>MAY4+h?
z%l;F}r$ybr_w&zBPsx`gUFuq{r7ueD=F($d`VhSj)8qImkgF%`lzHyL46HgOZHD6V
z84aH`FlY8_o2faxe0p-*vw-L%bC~~4r@WY>CQhDRn-cfuC0+>a8WS4Ve5*#E2_5{j
zmix<=Vcyz@Q&N}uT1M&7^{36+zw9(HHVg+l->tPVowdorZNityxF&b=lL-YW%{Qem
z6O9JRNexUaK#XdD!uiFZJSeDQsWl&z2Y834fx!}G0wnw4uEpT_jDiXc<wipJU;oSx
z<U&GM6_GHKRDc+Rop75?0yj7S{y%L{F5go)f7X?dwN!pS<R9sIk6<z%(;<SG;$jJ0
z`?27i=A6CYy<J>}KthQIXxR4?hY;*OJlgry$y-)5?X(`r05O(!*(bK*@KodS>Xqa4
ztk#{hm~=CzQ+Pt!*b6I7Y+$fEU-i1?H_A~0RVx)fsDLv$?Nv9VpMV{6h8JLvaDD3p
zBSb2=4Y?R<^#8C#l}4TptWQ_#Y5Cp4dN_~PP&HN>4rs3WXJU1yrP`IGh@!aw+ADGX
z%OJ>e%s$EZgExHHMDG!3Uj+Ikr!~hN4kS+%z)F9WxlFaNPJ$-#e*11k^~Gx<<Yt&^
znYvRV$_5r4)}zjin%ei>i_{ZRfcAE;^fH;B$i|-YL2tnkkTZ?KjzpvbXa}f2(KzS-
z<2|A@pe^=e)#=MuheWZOK$d|}mo^aqKTJeg!CvbaX)fFU&Wozyg2rhf_@RleT*(HM
zpCRlaO;h(Ax06tOFi_la|A5Z1p(sPS%02HJTu9hH6;V1M^(wLSxBL}L!UoCTaSd1^
ziX5s+jdG>qnTlT3RZ(Spk#zRiBRfKm7doJYpjm5OZ}dYXt}3+ERPhD1AdMx{HA_y;
zZ#N6j)_GR%OXDJEOd@%wm3_)&)1Ud&-u<J93u57T3o3YoQLg^JTJ<4kn;iboF`c(x
z(3&*Nmz_#_^nMW6OfD_uvlpfY0o8$dXlYBF>+y{H?T(g~U_NV--pvaq(x--p(`S(6
zMH$?y$HGG5&r5Uw@;1b>{@Xr^fK%02N;i*y^&_8oOY%I{rHX1pa<$&P?@O=gt%V9W
z59D(9kceCCUyha^K|Gl8eVu%350H=SxYW2&4i~^k8H-`=&MNM^&v((Sdc|8+#hH>D
zYfZII?O&5qT+m67y5syLTS7I{-Mi(Tn?YySv>$KF#NzCH#;|3E-D*_^a8xKsdN>~4
z&+kV&&Fo68g(pu4kMOOhV?=5WQ79QxB&^wYKQ3dq(w%FGq$Q3wdJK+w$DJp3a*Jep
z;_PSSU(ce)v6tG}-$zpEOuOu1hvFg11<@3)s`hA{Q)Ej*+0ASiW=gZQOmNXst6Vv(
zf{?#8I(-{V9$!@%EP}Ow7BqwS<|TKRz8=9(rB}ulcCN%o)0Fytu`g2cw4d6Vk7!tC
z3Mvh!pGgr)LpWF-6}ZOsDRQCKUNbH}{*pY1@>*Vdm;I(<1To=U0MPcn_chxLxD1h^
z*mLasRi>`Hx^kpqMgiB+lGwg47|O$d2%F`2_7Og&1PPBp)c9KVKX5t>Ta(>My|QQX
z;~2`^oYguOka2+pToL{uFj6~GfmLpLFt#bbY3BsS8H;2{dBhl_?h?{l6D#8=D{j2@
z4?~_Sst{pxeQ1`erg76d=fj^`{htUyr)tr#60Nl*NYs@@6iX!?;^LM;Et6MuOu3mB
za4^%&OMNEcVrKAhCmo>WB|GR!rcf*vJBcRtxTfwPt4W$MrI|mquR60_rUHnS0BSj+
zbB}SGWj|fu+w)zcbHyu`#QxB5ONR2L_yTO!S*bu35eoJLIXi)~`R%6<eB%!wi%cc1
z>D&;in`k!pg4qxRQ%8;-zoHAQa-{vWgX_p0Ig8SVP?P87gj@Pdh>MNMlp?M<Q!5y?
z93_vB$Y8oe^GK7EOmHPNRADpqVZwTF=LcnL#nLdSNy5|ZD2@!3U+&ZXt^$M6*^Peq
zfABjBzhYKDQX%X7*xgsf7&B9@P-;|IS#Q#!Ao#m+!qryK3@>5rHQsjlTdbT$`F;sN
zJRyfx<&7Oqr#LPk(CVe6o9yLz<4ZhlDaGy4kHOHKo8nt=G)>majHZ&tJ~&E&Od9<;
zPYA;eJ78Ayf#nE)VK`XhP0sSY!~gCkG&tcZX{D-FId`Ck6x0#_7+o-=8=_#jYT-2W
zJsN47ficFEHnJz5reST{2?VcKZR+$R;&=gkIH}5V-*Fk+;m(YR>P>F_IdUZmYOA_2
z>5>tCXoo8hp*PfbIrf-{z5qDs)_=_Xhs#<;Z1hZdiS@WN@iZqe?Uy;jN<pX2(5Igd
z!|5XQ{v5S^vP#Q8>!U$&v3yCPi}lZb7He6^`L|`2e0o2ai#;K+<-v>D=PTUJ_O)*u
zUeyHoN<bb(ehPzj>p=PCZ@io^)HFcLeVv~s=D73Vra5EbH0%5aJyq#;T{&qLRf|{o
zS+5=vS2h;q3>ahq3&DnNp^mAikKXJByqznT$+f+1CxP8!&M^AJVLST6c6kmhrr47a
z^f4XDGq=9IqZqQ9ZB!rDV*usHlV1pwjfVYx&pT=|7lGMO&BRVg+?X#(-qPcL%?@oD
zS9kazE?g~XkkM<}9zr*&jLuJ+_Ni<F{fr%ppT=<=`I%*@$d-afjAoB;umf&cNZVDb
zK<uHEZmZq-lAJs!2r{?QSGr@Fc}7va_LOAqwxS`l8mi3tN4V&%vR6pOh-ccpyUc$n
zvZwhlYgJvmo1QW!>|}AzdaRafhqKBB`~>|fHvh0v)E)0Nov^%?aNgrtMnuLwZS$xj
z@P2>cAk;K4oa4;Qz9iVPzUK?|U}vxq;OAp7%-q1V`WB}=_m&d6FmoDpG(V8f3=N89
z@xEEdRco30)xQ?<5%3O3=t|g9SKOFQ@M!B^wvnpDYPwSx)L0^wC(CAjQY!`BQ=UA|
z|3-w#`9$rvX1S*ee2Qq>^a#iZPfpYMjpXch8P-ivxqmLNvwFWl9KUiz<0I6o2}j`)
zp9Vq{(klT^4L>T9QPIP^FScmLPsfdZ>a{j@VLHQ>H5sfBi{4+i!*G#h7MVcDZsbj2
z_o_VxvmMmlREA+PJhrK42~Ih1n~PF_vsKiYqdIgXMxllX2BAh4rvt>c#MF!lLn;ks
z8aFf2a+W28ZXt7CZEb5E=vHc^q@s!#Se^~+G^0T-AS!5BWd-LH4E~duYUXo=`X*@z
z|FYSifX5Xnd%JA~3885O2IsFxL!QEAKp;l&H|E|6pZJq^-0!=-V5&VbyfaqsXAE#_
zR#6pJId^qP=a<RN*)q{R|A%)Vm(u|uO!kK4BFB7$>w-!1P`haV*G0i~da`Xw8A^Yd
z-dA?ATN@=jejwrU=^rx`QzObx!lfB_9R~|W?ScZloT$cW=JNv7wU29(A;d~CECKx%
zMojg|=8r|60IYvR@`+nnYbF{EeEHvYR|krRsp}%~QuFvuh?Qa|jEXDA1p2q#FD#Kz
zpVW{5$&P&jp8f~93iMy@EO{W%LvSnS!nb^NS6Xg6Q86&1*H4Vwzj7j>V%S>+vF9sh
z;`!Q}8mxEhCn7U1#azjMcx1*=aH&E&?xD=$6%pCrX?OtjYcx#ceeO?W_3MR1=MX8`
zANa)X`_PN$X7Nt%^&CdXLCET4dE=9tZs<(lgKEuhFCr+cLLQ^y4&O>-3-teeVwbsS
z%;crH!=p&D82v1(M;BmcjVr)%SJxlFEUv|F&*Axbs~N7kbD!(Kf159%<TgBP<;6eF
zW$Tw5<%|c(RLB;E9X`89*&+2|YEVnTNlM;Gy-vNgQO0nXIc{rH+vJ!@LAi7)lF}@W
z)+-t`32b&m4Q}h~0%MpKJbC-<z~fMlhrt1H>?}9uHE=)X#_^FD6$0{nHNn|;lEF{W
z{J^pD*5F%<EY_IqgfGdOk{bf^44_c<I;}G_dv~v|bOV<A7w!Dc&2+aBnSkQ1ZFvE=
zH4lomIO$IaPsJA5<%NHq<5o%-XBevv*6*`lGXL#BZX&DhfV6q@Hn-`pD8{>cmYf@R
z;3)Rok|sAP`J~%6a^d-FBOs_0blUhuqT?W^vr56=LUMH^yz3GKllzN(I9M(04$}c3
z?R@!*D+Q@kC$bWIyg0V#ZEWYi%Ix$XK+3pH63%ert1bFhnn4&I_wSg-kEhqEn`V#V
zK>=aAwZTur32pS22xs1kNgS}@JV7<nai7x`!eMfBa!75?Hk``T16iU<<wwrT1(}M3
z;`nbRo)|YWsiI(1)fIZmznP!x$#BzHY8jx1rq0_cvci+c0Wd;P#ZL`ZKO5X|h{xh<
zxz?ky5)zP5X8gRDD5BSt2yP>7&cDPYuL!nYBRq=*<k(~VEwxrL`RO22a?lS6jQg94
z1TAQrvRAq2cl5X`@jKL4BS;xd0x+HsCPU^Dr2VmYzMk|HDQRi}@<&MswEdkAlRwYZ
zu;mK*qOs6X@|v&y4o@C0{T;`?AsSC5HJOnUvaWK#pt$<gP|~Q^m!{3q)x@=Fg$G08
znC*lPKPTZ_)#FLV-3lR$%fUTr<nQpe@9$?KRW9?A`d#@&b8KGwtxi=laT?_LfejU6
z!wa8SI7ZlgXw|)<b__Yy5K%!m&c(u#Z`jxZ_CD44FR%v?;(&yt+*P?joOy9p8^a%t
zTauvW1i;wRAr2;OK}2VBTH;0DJ^Lj)UlwcyLiX0z#S$~B*mX@^KE96y2o(F}5&xA!
z&dLn%M1`voOZA>McoI}XB?@E!f2z*n{;UH{{Lf0Y$zy_!d+K@9H-xQ1N5KW5S}52m
zlaKwkC(k0kXly|0T`^{)JtBOO<NqFNplHxa(cjJJppi-m7I=&5J9`A7bLcVG6Z!C!
z|1N;7!XK^FfH0Umb@c$~2GufKFz`r9_N`>5VO9xfqhP4QP3dWa5RQ&OQr}|fU4>tU
zIW!qLz4iEJB^;nnM*0|8=u1SdSZehpvXGH|O*2jC6#pak&xFj}SR<qpN}ak?_>k$Q
zTRFCbpwspuQk;i9`B`jh>{GXe+iZ|IQPn`tE@l|iy_F-W=3+~1@Rt@(9RghnCK^(%
z3aN54@Fm4+PbXPSTsY8uHDQDzdvXclxUE$8f}-zMA_GjI5ySv#Auv<Ls6r|G?wv-c
zibp4tWoEY($?doHc5n1gh}J!f0p5M+z-jZ5wi{;^q3j4Jd_?o8?Z6J&C&`uGMN?vN
zY~PB)$(d6!pqS_eL=K&$mWY%ATR!I*?;o}4E(}3^3%bdh%mET*)L2?U(Ctl>H+t)x
zKVfiUG!`BC!<ByNNsmYZ<57FQ4sP+LnKz+UI7#Z2?cu5QKirtI0posKfZU*uRt{QU
z%n|(fK?w-gdnyh~2T7-bqeZffU<x^LE4<I&Hpx+9=~pn%hq4b_qO2#PO=*1Fes^n8
z++y6L@FEqQk*XAg*4szdj0B4-!`A!Z(+Aw`^q;O`$ZF4^0Zo+eE<2pyX8$7I8E5^g
zfcXGD<)A-W9K3v=VRh2vOuPJ0<!(bnxQH^S)vt~Rn*LoGwaFNS!s3An8SO;Om}B+t
z>)C&<fdm~3viZgwQx%1`8wm`>6UbcBD3hpD1@7YGeWv|N3`vIuLl;^Lf^ClnqDVq-
zl3d%Ho)I=3Ui_{Ji{JrH^D0H){o(2_r1Lj=YS7|Q@dh_9>3g-v$6nw(z<gCxmficX
z`nNH%YUztucPsjQvO>iXv2f|lf~&;Qg8V-RI^y)~0ux?#E4+*1PG=`jD0!mUq%VN0
zMh7Pw;6aS=jqn186plU}q&Hl-FmB8-Mbdxe{K{K#v}NzWStK!|j;i=4qK3Z`D`$5o
zZ}UNI`LR)d3HHK2%!ls>i4hSoLN52Cmx<EtJ8D+O#SvACK)bPc0SyNZZYp{A%Aj2X
z6#*~>K2*}1Rb4B^`{_v%#gmJuTyYe>WQtJrkSdf$F{4So$~?MkmmgdUjGkmBc>L9G
zx!F0nC@D9lSBVUu(B&aU@OXc8APxOPSY|bWt&0G0)vMNBzhxS+hU@kETeyqne>p}y
zQr-JnE-#EU{RR2h?BlDf-LI|lx5lux$pL8K0<gvGsuH-KvJpymWF=^>U6ZsVM_8XJ
z%SnjQ6%kV9sV@{}!;XS=C+2EGE*_>wipCaozt+a8r*E1X#8WxYAROEV)Q?&YipTaB
z=Wt^gM_U}}eb>*y{7udZnFXMMR0|hEeQzGfJ(iX@ioks#kGnqoS61+dUK3DZve&y^
z0v}{uI4n@6j$N?C!wX-RA6WdiaOePNc@n2fmfXR!IZ27{qM3`a6g{$O|EW2v{7B@4
zn(;NI=~;`im&Mt2Y(bpJj>{S)?%+Xz8dQhouS|#OnKq{C8eVj_ef&Xg)D@-c$pPzl
zW>g!kp7m!ivr(b0P0liqYjYGmE@@-=H|<9pYPYVZbZ!l}(t@}zIbA<GI5kVs^sFJC
z=?=HVDbBAc48)=Z_wT$^FoDez=RI+HlBTfDhks2aNyD}O_w=2?YVs|~SV_@5X%ww3
zBL~X+_|jQ5!)2|9r1NLG+nRB2FVpQ|W|W&7XX21x_5Q=D2~RSM(u6t{zP@(biHAgf
z>>AmCQYgIf&o%j4M<Cm^mX=2g*7&{HN{H5RZsJWtGcV|XFmg3>s6rRVWVQ`zADcZY
z))J&on^lFGs5xv!{+_-^(j(&-%BP+aRDt)?bYCvKn2+)0pg6P^B1iD1NDg*1CAwv9
zYx8a?kZ>nJ{-8H+PUSPYwuVcuIF~uo*{YDmW{cGNR)=MP3nv)q4&>N*YsL+ZjJ^=c
zk5+V7lbm6xxqT|cKWTUP>@VKN*~9nav75@jC@UZR!+IwS?=JbulEZ1tt?1H?5jH_P
z7SWBy4LDJZb96VC$6*}m(<Y7mZ^D;VZ%l^<&W<@Ay00een$0U0h)gnmv*Ka~<2kF8
zCbwvnqy1lwm`^)`J(_6*SOVWmEHv)EUB61_P&YZVe-!rNn>W=0Br~GyS@?({C4?HK
zzP}OiLX_m%Adz*~<WZQZ_xgJW^NZ`&zxXLDXUCLrw&b)U6i%clvm9Nh&n5snvLY>X
z`^I<;XmgDwh2W2d{PVnGKL)$f{;oLBsj;bP(v)#6yF&etKm^tZtAKoXO++#R(2iC4
zE;k*j5S}ZB2wggfWwlxSh@042*vakr83ST&Rr~S?B`W+a;za9Ls-~aVEzdj47gSmo
z4D0K8TbQy4IVS~W&_ZScRjOc)BnJ|IA2BM`uf4gDK~y$tb6|N2%lI!jg8p?2!|@e2
zb<JEo8IJk6AAySl{}4J|s;IWkvjulq7IS%o?29Z(eV8NbbbhuzNBT^-P@-kC@HAKr
zRgAKOb%6S9e<AMMS#qRPpFr`YMt|q5u<8Ttiej0&qQ8qd6&YA$MB1R=|CU&t`6<7<
zR1opX7wP-a#fP#B2rLbWexkEI+;Dgx_HQjM^bz#qZhEkaHKf&}q0MtGW0NfWSH`Ku
zS@wR$!10<6MJ=3UIfol$Qd*A2{_4}FP=1;X;haxcckAx#lFGpB(zQhcDzs#Sb|uv0
z)%SdGOegq2V)k*EU{DsIfMx@Oe2t!MW2GtEhNZpM#-Ag)FUp!*t>e!li2>Osq#b`)
z4;oTYGF7NO80(~dlvM4#oS<pPaPG(k)AN@n_49%EU*z(+73fQ@1-!6}a#K?z`9p1g
z_1EOADyYjjh`|2J4r4j==gZi!4NpXc^>J45z~{`==z5_W#v)GNJFO(TJp-yP>&99>
z8Z{D_KtgFV9rIRy@{8EeU*Yq|a(6LAehHT9i{`bA>w(5=Dy9W(C*b^F&}Bb#P#RJ)
zx3LuGgFICwOIM=B*Qi*wGKwjtWHaQy>=AK_{`Jxcv#L0&m&{|ocyYKxhx2cdpj+bC
zmv&0o?BQv6@q3ZU=lNipznQd1#(G$_-F|dmLj>sqp2e(GDZi(0C$9W>40a#My0Ph!
z2>P-khuMf@PIHBhe)>33c9WmSH0E4OJ1M&i3|-)A=DB_Pn;1fxL|}S(B^Go20xB9%
z6yEyUe0GDSL|qW2Q&d;_<5h>+-LO$BW0xcQ;cwN?o3<^P%IfW{d3Gvh-P_rp@5y{R
z(^w-0_PZtCB`(bLc&6oj3R@&~=aq4MG8y)Z#OK&ncBV3ohNhVZ)_t|uzdR=MlH@Nh
z>gTNbS`;<K8<EQ%)kYTDFIj$TledRQP<6V^rkj3w1)u$%TKBU=sH}HCp(w0ExNT^;
z1Rh^<&liO01Smp1B)3S>7MuLeyBF3I=A6WUWb<QuH`#vQS1gL&1O(KltFudk{8ivc
zHqP-QqfMuq5?wkVHrT_#8pLtws>nk#dUKb4L9v5rO)2j<0Vz8z@G$}$V5z|YFd1Q5
zf8UYwd|)=D>CT{)w;09N7b~$v0qN2<JUoaD!C7%?L8d;>u~A&`zPlU>@mY|!8jb3h
z+v;MM(4@2H&Wtrkfh%(IIezfB$4d;Xpy;j4{~gCcL%gLy_Op1f?>f+Nc(JGPM_QYC
zlXl<TkYStphrm&Zd&Nzi?Gs9g$9eTzD%56Szecf7En)Yv%(7bGAtU#^h=J}m56jo1
zREk>K8~f>1uOR%F%-C#jqKIK?7xl=>KF;a3r3MDiWYt{^gT6LWc>eu0yJSXFKD^l3
zd-;?~Cnr8-DYdlyp#(U~T&-m@VJpRV`z3Tf`K`zJP?HgEsJ~5P^%b-96pqccpGz?4
zb!=CVYO&o;o(4f$+2J*_`(1`B%EO!U&*D^CPG?i@(_X1#+?gpB9i2qm1sZr{rGeCO
z_B7FBUR-5h$+G4e2lW?T(Ps%y-I~*pprA_f4Civ}gam=dg|(z9@_xfpWBQ5DSw;m+
zT))@Knw%AyoUMpWGSWSdMmCAAha1qRI9HjI9o9<Cz)*q(ULSpL7D@NwdHorf6TR+a
z4={~$gGn(zO?`HhIOhX5w~^&k-l=cu7^4PAqP(5;72V?ROq4VW^{DsXmlfXmi_O;{
zAt8WhL|w6~y|IhFyJ^(RxHX(<K#dfDWsB^79>FsjuXamKyfMo6Z*OhbA^co~<nIIi
z%L}AuP)1FR=`(pKmhn2CXuS-~Ji$m)T~}d}p7c}6EdW9rYR4c!gn#Ys>?U_5;@o>Z
z_$;3bkULOuZ2K|UIwH#?cA=t`ijDMhps+l7Ff$zSjdxUiSNjLPtcZBhQnR2(N@MDK
zar&W-H2v`e*xo&VH-5)FZ&^8`s>Ova?8@7d$uoKE-0afI9nVuCYsMA?)7<ix_8gu1
zCx%<|?$m-G1u8$t?7UhXeMh{^Kt5Bqwk+jUx<w!=y~B85ZsH=s?<823*cT;M6hdBq
zQIPgR)K@aS!Do~AWrJ*gW2IyK74-81vaD~(#$VpMxUk-xiU{YyRPH6grtrs}l;w*{
zz%z>CxGkIMI{`fJaX7RLj(i;f=yujcHQD^g@ZXGbjU$4^Av0m9iFYoj56-OIF={D;
zROlj3Dpm;Qa8J0l)7O27oCc17#uLFbffsh6CCErw@i9qF8VHw(8lpD6Wx$VO|Nh#}
zo-Ry@lZqaanELyvcMT_010agk0^+RW23j+SVo^wU7!~x!8#ECu0f@F7ZO2oo(di&`
zSGeCNseus#DUuBj*QZ1Q8YtKloTh{m8VAk_Oc*UCD>N|NVD(DRJ0yei|EpttZ3Rrc
zP&Tli3V0vumWXtu0zZD;Cg-zYY>=#Yz)7`q!Nv@^6u&uXA__l5A$<;ltYB2U7mb|M
zj5Kf@8&tdx{Vg&^^#z6qQNT3=`Ot`TcQoOjX5^Y;gp&U1Hd;Oy+?0z_z*S>)9Wv>e
z5_Pc54@+LcVdc&PI}6y`K|P<V;il5JF2Z&T(!;Kka!Xp;K@>U5?XULbj))Gl`bcxb
z(+&xg&4!lC-Ah&rab{rO8>tiDEKLSG#eV&P=oPxn+g-V^Os=zc7BR2@mf9+xM;o?5
zJVE8juUg0|$vCOZIgs%_qt9Os8)-M%dfpFzW$VS2t7Zs_oY%*KIs9?lkz|pz``E*P
zNgV~t6i<+T<n?NLIU*%>Q>Ms~q&gl%Cd>+5S};Fwnu*w<aQ&T#lm^T7r>Qk*u1tTB
zk`EGV)`r!9Ag(%|q5+OB0zU)e+GFySxlG7G`$z`_rx9(kg46`t*ghQn-zKa7p$1|H
zw3Ocu2iFWDbMVzB<ZSo2q4L@w6aIvfVHy}_&^{i!hs<!CJV+HO=6&XdegYdXbM=I|
zMC1f0z~)l#7(4v`!s75o3w;RXXFs;LVP)YwrCad&uAL-UW)NlTsJ)c>a^K5~#bU30
zH=a4o@uoI$&Ts{CP@V^vl6Mn-8&z?JVos_tm1F%s8T2^h8&&1Qm3U!S9Cjb8Retmm
SPW}5aKv&a9qh8G+`hNg-MC&I2

literal 0
HcmV?d00001

diff --git a/bin/network-monitor/assets/index.css b/bin/network-monitor/assets/index.css
new file mode 100644
index 000000000..13fa89ac3
--- /dev/null
+++ b/bin/network-monitor/assets/index.css
@@ -0,0 +1,387 @@
+* {
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+}
+
+body {
+    font-family: "DM Mono", monospace;
+    background-color: #fafafa;
+    color: rgba(0, 0, 0, 0.4);
+    font-weight: 500;
+    letter-spacing: -0.04em;
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+}
+
+.container {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 60px 20px 0;
+}
+
+.header {
+    margin-bottom: 40px;
+}
+
+.logo {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    flex-direction: column;
+}
+
+.logo-icon {
+    width: 37px;
+    height: 37px;
+    background-image: url('/assets/favicon.ico');
+    background-size: contain;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+
+.logo-text {
+    font-size: 24px;
+    color: #333;
+}
+
+.logo-text .highlight {
+    color: #ff5500;
+}
+
+.main-content {
+    width: 100%;
+    max-width: 400px;
+}
+
+.button-group {
+    margin-top: 36px;
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+}
+
+.button {
+    font-family: "DM Mono", monospace;
+    font-weight: 500;
+    letter-spacing: -0.02em;
+    font-size: 16px;
+    width: 100%;
+    height: 48px;
+    border: 1px solid #e0e0e0;
+    background-color: white;
+    color: #ff5500;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    transition: all 0.2s;
+}
+
+.button:hover {
+    background-color: #eeeeee;
+    border-color: #d0d0d0;
+}
+
+.button-icon {
+    width: 16px;
+    height: 16px;
+    fill: currentColor;
+}
+
+.note {
+    text-align: center;
+    font-size: 12px;
+    margin-top: 24px;
+}
+
+.highlight {
+    color: #ff5500;
+}
+
+.loading-section {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    height: 60px;
+}
+
+.loader {
+    width: 60px;
+    height: 60px;
+    border: 3px solid #ff5500;
+    border-bottom-color: transparent;
+    border-radius: 50%;
+    display: inline-block;
+    box-sizing: border-box;
+    animation: spin 2s linear infinite;
+}
+
+.footer {
+    margin-top: auto;
+    width: 100%;
+    position: relative;
+}
+
+.footer-content {
+    color: rgba(0, 0, 0, 0.4);
+    padding: 30px 24px;
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-end;
+    font-size: 14px;
+    font-weight: 500;
+}
+
+.footer-line {
+    height: 17px;
+    background-color: #ff5500;
+    width: 100%;
+}
+
+.footer-section {
+    display: flex;
+    flex-direction: column;
+}
+
+.footer-label {
+    margin-bottom: 4px;
+}
+
+.footer-value {
+    color: rgba(0, 0, 0, 0.4);
+    font-weight: 400;
+    font-size: 12px;
+}
+
+.tokens-section {
+    text-align: right;
+}
+
+.error-message {
+    background-color: #f8d7da;
+    color: #721c24;
+    padding: 12px 16px;
+    border-radius: 6px;
+    margin-top: 16px;
+    display: none;
+    font-size: 14px;
+    white-space: pre-wrap;
+    z-index: 2;
+}
+
+@media (max-width: 768px) {
+    .container {
+        padding: 40px 16px 0;
+    }
+
+    .footer-content {
+        flex-direction: column;
+        gap: 16px;
+        text-align: center;
+        align-items: center;
+    }
+
+    .tokens-section {
+        text-align: center;
+    }
+}
+
+/* Network Monitor Styles */
+.service-card {
+    background: white;
+    border: 0.5px solid #e0e0e0;
+    border-radius: 8px;
+    padding: 20px;
+    margin-bottom: 16px;
+    transition: all 0.2s;
+}
+
+.service-card:hover {
+    border-color: #d0d0d0;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.service-card.healthy {
+    border-left: 4px solid #22C55D;
+}
+
+.service-card.unhealthy {
+    border-left: 4px solid #ff5500;
+}
+
+.service-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 12px;
+}
+
+.service-name {
+    font-size: 16px;
+    font-weight: 500;
+    color: #333;
+}
+
+.service-status {
+    font-size: 14px;
+    font-weight: 500;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+}
+
+.service-error {
+    background-color: #fef2f2;
+    color: #dc2626;
+    padding: 8px 12px;
+    border-radius: 4px;
+    font-size: 12px;
+    margin-bottom: 12px;
+    border: 1px solid #fecaca;
+}
+
+.service-details {
+    margin: 12px 0;
+    font-size: 12px;
+    color: rgba(0, 0, 0, 0.6);
+}
+
+.detail-item {
+    margin-bottom: 4px;
+    display: flex;
+    align-items: center;
+}
+
+.detail-item strong {
+    color: #333;
+    margin-right: 8px;
+    min-width: 80px;
+}
+
+.genesis-value {
+    font-family: "DM Mono", monospace;
+    font-size: 11px;
+    color: #666;
+    margin-right: 8px;
+}
+
+.copy-button {
+    background: none;
+    border: none;
+    cursor: pointer;
+    padding: 4px;
+    border-radius: 4px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.2s;
+    color: #999;
+}
+
+.copy-button:hover {
+    background-color: #f5f5f5;
+    color: #ff5500;
+}
+
+.copy-icon {
+    width: 14px;
+    height: 14px;
+    fill: none;
+    stroke: currentColor;
+    stroke-width: 2;
+    stroke-linecap: round;
+    stroke-linejoin: round;
+}
+
+.nested-status {
+    margin-top: 8px;
+    padding-left: 12px;
+    border-left: 2px solid #e0e0e0;
+    font-size: 11px;
+}
+
+.service-timestamp {
+    font-size: 11px;
+    color: #999;
+    margin-top: 8px;
+    font-style: italic;
+}
+
+#status-container {
+    min-height: 200px;
+}
+
+.loading-section {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-height: 200px;
+}
+
+/* Responsive adjustments for service cards */
+@media (max-width: 768px) {
+    .service-header {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 8px;
+    }
+    
+    .service-status {
+        align-self: flex-end;
+    }
+    
+    .detail-item {
+        flex-direction: column;
+        align-items: flex-start;
+    }
+    
+    .detail-item strong {
+        margin-bottom: 2px;
+    }
+}
+
+.worker-status {
+    margin: 4px 0;
+    padding: 4px 8px;
+    background: rgba(0, 0, 0, 0.05);
+    border-radius: 4px;
+    font-size: 12px;
+    font-family: "DM Mono", monospace;
+}
+
+.worker-address {
+    font-weight: 500;
+    color: #333;
+}
+
+.worker-version {
+    color: #666;
+}
+
+.worker-status-badge {
+    padding: 2px 6px;
+    border-radius: 3px;
+    font-size: 10px;
+    font-weight: 500;
+    text-transform: uppercase;
+}
+
+.worker-status-badge.healthy {
+    background: #d4edda;
+    color: #155724;
+}
+
+.worker-status-badge.unhealthy {
+    background: #f8d7da;
+    color: #721c24;
+}
+
+.worker-status-badge.unknown {
+    background: #fff3cd;
+    color: #856404;
+}
diff --git a/bin/network-monitor/assets/index.html b/bin/network-monitor/assets/index.html
new file mode 100644
index 000000000..43520d165
--- /dev/null
+++ b/bin/network-monitor/assets/index.html
@@ -0,0 +1,236 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Miden Network Monitor</title>
+    <link rel="stylesheet" href="/assets/index.css">
+    <link rel="icon" href="/assets/favicon.ico" type="image/x-icon">
+</head>
+<body>
+    <div class="container">
+        <div class="header">
+            <div class="logo">
+                <div class="logo-icon"></div>
+                <div class="logo-text">Miden <span class="highlight">Network</span></div>
+            </div>
+        </div>
+
+        <div class="main-content">
+            <div class="form-title">Network Status Dashboard</div>
+            
+            <div id="status-container">
+                <div class="loading-section">
+                    <div class="loader"></div>
+                </div>
+            </div>
+
+            <div class="note">
+                Last updated: <span id="last-updated">-</span>
+            </div>
+        </div>
+    </div>
+
+    <div class="footer">
+        <div class="footer-content">
+            <div class="footer-section">
+                <div class="footer-label">Network Status</div>
+                <div class="footer-value" id="overall-status">Checking...</div>
+            </div>
+            <div class="footer-section tokens-section">
+                <div class="footer-label">Services</div>
+                <div class="footer-value" id="services-count">-</div>
+            </div>
+        </div>
+        <div class="footer-line"></div>
+    </div>
+
+    <script>
+        let statusData = null;
+        let updateInterval = null;
+
+        async function fetchStatus() {
+            try {
+                const response = await fetch('/status');
+                if (!response.ok) {
+                    throw new Error(`HTTP error! status: ${response.status}`);
+                }
+                statusData = await response.json();
+                updateDisplay();
+            } catch (error) {
+                console.error('Error fetching status:', error);
+                showError('Failed to fetch network status: ' + error.message);
+            }
+        }
+
+        function updateDisplay() {
+            if (!statusData) return;
+
+            const container = document.getElementById('status-container');
+            const lastUpdated = document.getElementById('last-updated');
+            const overallStatus = document.getElementById('overall-status');
+            const servicesCount = document.getElementById('services-count');
+
+            // Update last updated time
+            const lastUpdateTime = new Date(statusData.last_updated * 1000);
+            lastUpdated.textContent = lastUpdateTime.toLocaleString();
+
+            // Count healthy vs unhealthy services
+            const healthyServices = statusData.services.filter(s => s.status === 'healthy').length;
+            const totalServices = statusData.services.length;
+            const allHealthy = healthyServices === totalServices;
+
+            // Update footer
+            overallStatus.textContent = allHealthy ? 'All Systems Operational' : `${healthyServices}/${totalServices} Services Healthy`;
+            overallStatus.style.color = allHealthy ? '#22C55D' : '#ff5500';
+            servicesCount.textContent = `${totalServices} Services`;
+
+            // Generate status cards
+            container.innerHTML = statusData.services.map(service => {
+                const isHealthy = service.status === 'healthy';
+                const statusColor = isHealthy ? '#22C55D' : '#ff5500';
+                const statusIcon = isHealthy ? '✓' : '✗';
+                
+                let detailsHtml = '';
+                if (service.details) {
+                    const details = service.details;
+                    detailsHtml = `
+                        <div class="service-details">
+                            ${details.rpc_status ? `
+                                <div class="detail-item"><strong>Version:</strong> ${details.rpc_status.version}</div>
+                                ${details.rpc_status.genesis_commitment ? `
+                                    <div class="detail-item">
+                                        <strong>Genesis:</strong> 
+                                        <span class="genesis-value">${details.rpc_status.genesis_commitment.substring(0, 20)}...</span>
+                                        <button class="copy-button" onclick="copyToClipboard('${details.rpc_status.genesis_commitment}', event)" title="Copy full genesis commitment">
+                                            <svg class="copy-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                                                <rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
+                                                <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
+                                            </svg>
+                                        </button>
+                                    </div>
+                                ` : ''}
+                                ${details.rpc_status.store_status ? `
+                                    <div class="nested-status">
+                                        <strong>Store:</strong> ${details.rpc_status.store_status.version} - ${details.rpc_status.store_status.status}
+                                        ${details.rpc_status.store_status.chain_tip ? ` (Tip: ${details.rpc_status.store_status.chain_tip})` : ''}
+                                    </div>
+                                ` : ''}
+                                ${details.rpc_status.block_producer_status ? `
+                                    <div class="nested-status">
+                                        <strong>Block Producer:</strong> ${details.rpc_status.block_producer_status.version} - ${details.rpc_status.block_producer_status.status}
+                                    </div>
+                                ` : ''}
+                            ` : ''}
+                            ${details.remote_prover_statuses && details.remote_prover_statuses.length > 0 ? `
+                                ${details.remote_prover_statuses.map(prover => `
+                                    <div class="nested-status">
+                                        <strong>${prover.name} (${prover.url}):</strong>
+                                        <div class="detail-item"><strong>Version:</strong> ${prover.version}</div>
+                                        <div class="nested-status">
+                                            <strong>Supported Proof Type:</strong> ${prover.supported_proof_type}
+                                        </div>
+                                        ${prover.workers && prover.workers.length > 0 ? `
+                                            <div class="nested-status">
+                                                <strong>Workers (${prover.workers.length}):</strong>
+                                                ${prover.workers.map(worker => `
+                                                    <div class="worker-status">
+                                                        <span class="worker-address">${worker.address}</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>
+                                        ` : ''}
+                                    </div>
+                                `).join('')}
+                            ` : ''}
+                        </div>
+                    `;
+                }
+
+                return `
+                    <div class="service-card ${isHealthy ? 'healthy' : 'unhealthy'}">
+                        <div class="service-header">
+                            <div class="service-name">${service.name}</div>
+                            <div class="service-status" style="color: ${statusColor}">
+                                ${statusIcon} ${service.status.toUpperCase()}
+                            </div>
+                        </div>
+                        ${service.error ? `<div class="service-error">${service.error}</div>` : ''}
+                        ${detailsHtml}
+                        <div class="service-timestamp">
+                            Last checked: ${new Date(service.last_checked * 1000).toLocaleString()}
+                        </div>
+                    </div>
+                `;
+            }).join('');
+
+            // Add refresh button
+            container.innerHTML += `
+                <div class="button-group" style="margin-top: 20px;">
+                    <button class="button" onclick="fetchStatus()">
+                        <svg class="button-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                            <path d="M23 4v6h-6M1 20v-6h6M20.49 9A9 9 0 0 0 5.64 5.64L1 10m22 4l-4.64 4.36A9 9 0 0 1 3.51 15"/>
+                        </svg>
+                        Refresh Status
+                    </button>
+                </div>
+            `;
+        }
+
+        function showError(message) {
+            const container = document.getElementById('status-container');
+            container.innerHTML = `
+                <div class="error-message" style="display: block;">
+                    ${message}
+                </div>
+                <div class="button-group" style="margin-top: 20px;">
+                    <button class="button" onclick="fetchStatus()">
+                        <svg class="button-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                            <path d="M23 4v6h-6M1 20v-6h6M20.49 9A9 9 0 0 0 5.64 5.64L1 10m22 4l-4.64 4.36A9 9 0 0 1 3.51 15"/>
+                        </svg>
+                        Retry
+                    </button>
+                </div>
+            `;
+        }
+
+        async function copyToClipboard(text, event) {
+            try {
+                await navigator.clipboard.writeText(text);
+                // Show a brief success indicator
+                const button = event.target.closest('.copy-button');
+                const originalContent = button.innerHTML;
+                button.innerHTML = '<svg class="copy-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M20 6L9 17l-5-5"/></svg>';
+                button.style.color = '#22C55D';
+                
+                setTimeout(() => {
+                    button.innerHTML = originalContent;
+                    button.style.color = '';
+                }, 2000);
+            } catch (err) {
+                console.error('Failed to copy: ', err);
+                // Fallback for older browsers
+                const textArea = document.createElement('textarea');
+                textArea.value = text;
+                document.body.appendChild(textArea);
+                textArea.select();
+                document.execCommand('copy');
+                document.body.removeChild(textArea);
+            }
+        }
+
+        // Initial load and set up auto-refresh
+        fetchStatus();
+        updateInterval = setInterval(fetchStatus, 10000); // Refresh every 10 seconds
+
+        // Clean up on page unload
+        window.addEventListener('beforeunload', () => {
+            if (updateInterval) {
+                clearInterval(updateInterval);
+            }
+        });
+    </script>
+</body>
+</html>
diff --git a/bin/network-monitor/src/frontend.rs b/bin/network-monitor/src/frontend.rs
new file mode 100644
index 000000000..ad8d13ea9
--- /dev/null
+++ b/bin/network-monitor/src/frontend.rs
@@ -0,0 +1,70 @@
+//! This file explicitly embeds each of the frontend files into the binary using `include_str!` and
+//! `include_bytes!`.
+
+use anyhow::Context;
+use axum::Router;
+use axum::http::header;
+use axum::response::{Html, IntoResponse, Response};
+use axum::routing::get;
+use tracing::{info, instrument};
+
+use crate::COMPONENT;
+use crate::status::{MonitorConfig, SharedStatus};
+
+/// Runs the frontend server.
+///
+/// This function runs the frontend server that serves the dashboard and the status data.
+///
+/// # Arguments
+///
+/// * `shared_status` - The shared status of the network.
+/// * `config` - The configuration of the network.
+pub async fn serve(shared_status: SharedStatus, config: MonitorConfig) -> anyhow::Result<()> {
+    // build our application with routes
+    let app = Router::new()
+        // Serve embedded assets
+        .route("/assets/index.css", get(serve_css))
+        .route("/assets/favicon.ico", get(serve_favicon))
+        // Main dashboard route
+        .route("/", get(get_dashboard))
+        // API route for status data
+        .route("/status", get(get_status))
+        .with_state(shared_status);
+
+    let bind_address = format!("0.0.0.0:{}", config.port);
+    info!("Starting web server on {bind_address}");
+    info!("Dashboard available at: http://localhost:{}/", config.port);
+    let listener = tokio::net::TcpListener::bind(&bind_address)
+        .await
+        .context("Failed to bind to address")?;
+    axum::serve(listener, app).await.context("Failed to start web server")?;
+    Ok(())
+}
+
+async fn get_dashboard() -> Html<&'static str> {
+    Html(include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/assets/index.html")))
+}
+
+#[instrument(target = COMPONENT, name = "frontend.get-status", skip_all, ret(level = "info"))]
+async fn get_status(
+    axum::extract::State(shared_status): axum::extract::State<SharedStatus>,
+) -> axum::response::Json<crate::status::NetworkStatus> {
+    let status = shared_status.lock().await;
+    axum::response::Json(status.clone())
+}
+
+async fn serve_css() -> Response {
+    (
+        [(header::CONTENT_TYPE, header::HeaderValue::from_static("text/css"))],
+        include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/assets/index.css")),
+    )
+        .into_response()
+}
+
+async fn serve_favicon() -> Response {
+    (
+        [(header::CONTENT_TYPE, header::HeaderValue::from_static("image/x-icon"))],
+        include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/assets/favicon.ico")),
+    )
+        .into_response()
+}
diff --git a/bin/network-monitor/src/main.rs b/bin/network-monitor/src/main.rs
new file mode 100644
index 000000000..ebf7b85f1
--- /dev/null
+++ b/bin/network-monitor/src/main.rs
@@ -0,0 +1,77 @@
+use std::collections::HashMap;
+use std::sync::Arc;
+
+use anyhow::Context;
+use miden_node_utils::logging::OpenTelemetry;
+use tokio::sync::Mutex;
+use tokio::task::JoinSet;
+
+mod frontend;
+mod status;
+
+use frontend::serve;
+use status::{MonitorConfig, NetworkStatus, SharedStatus, check_status};
+use tracing::info;
+
+/// Component identifier for structured logging and tracing
+pub const COMPONENT: &str = "miden-network-monitor";
+
+// MAIN
+// ================================================================================================
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    miden_node_utils::logging::setup_tracing(OpenTelemetry::Disabled)?;
+
+    // Load configuration from environment variables
+    let config = match MonitorConfig::from_env() {
+        Ok(config) => {
+            info!("Loaded configuration: {:?}", config);
+            config
+        },
+        Err(e) => {
+            anyhow::bail!("failed to load configuration: {e}");
+        },
+    };
+
+    // Initialize shared status state
+    let shared_status: SharedStatus =
+        Arc::new(Mutex::new(NetworkStatus { services: Vec::new(), last_updated: 0 }));
+
+    // Start tasks for frontend and status monitoring
+    let mut join_set = JoinSet::new();
+    let mut component_ids = HashMap::new();
+
+    // Spawn frontend task
+    let frontend_status = shared_status.clone();
+    let frontend_config = config.clone();
+    let id = join_set
+        .spawn(async move { serve(frontend_status, frontend_config).await })
+        .id();
+    component_ids.insert(id, "frontend");
+
+    // Spawn status monitoring task
+    let status_status = shared_status.clone();
+    let status_config = config.clone();
+    let id = join_set
+        .spawn(async move { check_status(status_status, status_config).await })
+        .id();
+    component_ids.insert(id, "status");
+
+    // Wait for any task to complete or fail
+    let component_result = join_set.join_next_with_id().await.expect("join set is not empty");
+
+    // We expect components to run indefinitely, so we treat any return as fatal.
+    let (id, err) = match component_result {
+        Ok((id, Ok(_))) => (
+            id,
+            Err::<(), anyhow::Error>(anyhow::anyhow!("component completed unexpectedly")),
+        ), // SAFETY: The JoinSet is definitely not empty.
+        Ok((id, Err(err))) => (id, Err(err)), // SAFETY: The JoinSet is definitely not empty.
+        Err(join_err) => (join_err.id(), Err(join_err).context("joining component task")),
+    };
+    let component = component_ids.get(&id).unwrap_or(&"unknown"); // SAFETY: The JoinSet is definitely not empty.
+
+    // Exit with error context
+    err.context(format!("component {component} failed"))
+}
diff --git a/bin/network-monitor/src/status.rs b/bin/network-monitor/src/status.rs
new file mode 100644
index 000000000..968a5375f
--- /dev/null
+++ b/bin/network-monitor/src/status.rs
@@ -0,0 +1,456 @@
+//! Network monitor status checker.
+//!
+//! This module contains the logic for checking the status of the network monitor.
+//! It is used to check the status of the network monitor and to update the shared status.
+
+use std::sync::Arc;
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
+
+use anyhow::Context;
+use miden_node_proto::clients::{Builder as ClientBuilder, RemoteProverProxy, Rpc};
+use miden_node_proto::generated::block_producer::BlockProducerStatus;
+use miden_node_proto::generated::remote_prover::{
+    ProofType,
+    ProxyStatus,
+    ProxyWorkerStatus,
+    WorkerHealthStatus,
+};
+use miden_node_proto::generated::rpc::RpcStatus;
+use miden_node_proto::generated::rpc_store::StoreStatus;
+use serde::{Deserialize, Serialize};
+use tokio::sync::Mutex;
+use tokio::time::MissedTickBehavior;
+use tracing::instrument;
+use url::Url;
+
+use crate::COMPONENT;
+
+// MONITOR CONFIGURATION
+// ================================================================================================
+
+const DEFAULT_RPC_URL: &str = "http://localhost:50051";
+const DEFAULT_REMOTE_PROVER_URLS: &str = "http://localhost:50052";
+const DEFAULT_PORT: u16 = 3000;
+
+const RPC_URL_ENV_VAR: &str = "MIDEN_MONITOR_RPC_URL";
+const REMOTE_PROVER_URLS_ENV_VAR: &str = "MIDEN_MONITOR_REMOTE_PROVER_URLS";
+const PORT_ENV_VAR: &str = "MIDEN_MONITOR_PORT";
+
+/// Configuration for the monitor.
+///
+/// This struct contains the configuration for the monitor.
+#[derive(Debug, Clone)]
+pub struct MonitorConfig {
+    /// The URL of the RPC service.
+    pub rpc_url: Url,
+    /// The URLs of the remote provers.
+    pub remote_prover_urls: Vec<Url>,
+    /// The port of the monitor.
+    pub port: u16,
+}
+
+impl MonitorConfig {
+    /// Loads the configuration from the environment variables.
+    ///
+    /// This function loads the configuration from the environment variables.
+    /// The environment variables are:
+    /// - `MIDEN_MONITOR_RPC_URL`: The URL of the RPC service.
+    /// - `MIDEN_MONITOR_REMOTE_PROVER_URLS`: The URLs of the remote provers, comma separated.
+    /// - `MIDEN_MONITOR_PORT`: The port of the monitor.
+    pub fn from_env() -> Result<Self, Box<dyn std::error::Error>> {
+        let rpc_url =
+            std::env::var(RPC_URL_ENV_VAR).unwrap_or_else(|_| DEFAULT_RPC_URL.to_string());
+
+        // Parse multiple remote prover URLs from environment variable
+        let remote_prover_urls = std::env::var(REMOTE_PROVER_URLS_ENV_VAR)
+            .unwrap_or_else(|_| DEFAULT_REMOTE_PROVER_URLS.to_string());
+
+        let remote_prover_urls = remote_prover_urls
+            .split(',')
+            .map(str::trim)
+            .filter(|url| !url.is_empty())
+            .map(Url::parse)
+            .collect::<Result<Vec<_>, _>>()?;
+
+        let port = std::env::var(PORT_ENV_VAR)
+            .unwrap_or_else(|_| DEFAULT_PORT.to_string())
+            .parse::<u16>()?;
+
+        Ok(MonitorConfig {
+            rpc_url: Url::parse(&rpc_url)?,
+            remote_prover_urls,
+            port,
+        })
+    }
+}
+
+// SERVICE STATUS CHECKER
+// ================================================================================================
+
+/// Status of a service.
+///
+/// This struct contains the status of a service, the last time it was checked, and any errors that
+/// occurred. It also contains the details of the service, which is a union of the details of the
+/// service.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ServiceStatus {
+    pub name: String,
+    pub status: String,
+    pub last_checked: u64,
+    pub error: Option<String>,
+    pub details: Option<ServiceDetails>,
+}
+
+/// Details of a service.
+///
+/// This struct contains the details of a service, which is a union of the details of the service.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ServiceDetails {
+    pub rpc_status: Option<RpcStatusDetails>,
+    pub remote_prover_statuses: Vec<RemoteProverStatusDetails>,
+}
+
+/// Details of an RPC service.
+///
+/// This struct contains the details of an RPC service, which is a union of the details of the RPC
+/// service.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct RpcStatusDetails {
+    pub version: String,
+    pub genesis_commitment: Option<String>,
+    pub store_status: Option<StoreStatusDetails>,
+    pub block_producer_status: Option<BlockProducerStatusDetails>,
+}
+
+/// Details of a store service.
+///
+/// This struct contains the details of a store service, which is a union of the details of the
+/// store service.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct StoreStatusDetails {
+    pub version: String,
+    pub status: String,
+    pub chain_tip: u32,
+}
+
+/// Details of a block producer service.
+///
+/// This struct contains the details of a block producer service, which is a union of the details
+/// of the block producer service.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct BlockProducerStatusDetails {
+    pub version: String,
+    pub status: String,
+}
+
+/// Details of a remote prover service.
+///
+/// This struct contains the details of a remote prover service, which is a union of the details
+/// of the remote prover service.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct RemoteProverStatusDetails {
+    pub name: String,
+    pub url: String,
+    pub version: String,
+    pub supported_proof_type: String,
+    pub workers: Vec<WorkerStatusDetails>,
+}
+
+/// Details of a worker service.
+///
+/// This struct contains the details of a worker service, which is a union of the details of the
+/// worker service.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct WorkerStatusDetails {
+    pub address: String,
+    pub version: String,
+    pub status: String,
+}
+
+/// Status of a network.
+///
+/// This struct contains the status of a network, which is a union of the status of the network.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct NetworkStatus {
+    pub services: Vec<ServiceStatus>,
+    pub last_updated: u64,
+}
+
+/// Shared status of the network.
+///
+/// This struct contains the shared status of the network, which is a union of the shared status of
+/// the network.
+pub type SharedStatus = Arc<Mutex<NetworkStatus>>;
+
+// FROM IMPLEMENTATIONS
+// ================================================================================================
+
+/// From implementations for converting gRPC types to domain types
+///
+/// This implementation converts a `StoreStatus` to a `StoreStatusDetails`.
+impl From<StoreStatus> for StoreStatusDetails {
+    fn from(status: StoreStatus) -> Self {
+        Self {
+            version: status.version,
+            status: status.status,
+            chain_tip: status.chain_tip,
+        }
+    }
+}
+
+impl From<BlockProducerStatus> for BlockProducerStatusDetails {
+    fn from(status: BlockProducerStatus) -> Self {
+        Self {
+            version: status.version,
+            status: status.status,
+        }
+    }
+}
+
+impl From<ProxyWorkerStatus> for WorkerStatusDetails {
+    fn from(worker: ProxyWorkerStatus) -> Self {
+        let status_str = match WorkerHealthStatus::try_from(worker.status) {
+            Ok(WorkerHealthStatus::Healthy) => "HEALTHY",
+            Ok(WorkerHealthStatus::Unhealthy) => "UNHEALTHY",
+            Ok(WorkerHealthStatus::Unknown) | Err(_) => "UNKNOWN",
+        };
+
+        Self {
+            address: worker.address,
+            version: worker.version,
+            status: status_str.to_string(),
+        }
+    }
+}
+
+impl RemoteProverStatusDetails {
+    pub fn from_proxy_status(status: ProxyStatus, name: String, url: String) -> Self {
+        let proof_type_str = match ProofType::try_from(status.supported_proof_type) {
+            Ok(ProofType::Transaction) => "TRANSACTION",
+            Ok(ProofType::Batch) => "BATCH",
+            Ok(ProofType::Block) => "BLOCK",
+            Err(_) => "UNKNOWN",
+        };
+
+        let workers: Vec<WorkerStatusDetails> =
+            status.workers.into_iter().map(WorkerStatusDetails::from).collect();
+
+        Self {
+            name,
+            url,
+            version: status.version,
+            supported_proof_type: proof_type_str.to_string(),
+            workers,
+        }
+    }
+}
+
+impl From<RpcStatus> for RpcStatusDetails {
+    fn from(status: RpcStatus) -> Self {
+        Self {
+            version: status.version,
+            genesis_commitment: status.genesis_commitment.as_ref().map(|gc| format!("{gc:?}")),
+            store_status: status.store.map(StoreStatusDetails::from),
+            block_producer_status: status.block_producer.map(BlockProducerStatusDetails::from),
+        }
+    }
+}
+
+// RPC STATUS CHECKER
+// ================================================================================================
+
+/// Checks the status of the RPC service.
+///
+/// This function checks the status of the RPC service.
+///
+/// # Arguments
+///
+/// * `rpc` - The RPC client.
+/// * `current_time` - The current time.
+///
+/// # Returns
+///
+/// A `ServiceStatus` containing the status of the RPC service.
+#[instrument(target = COMPONENT, name = "check-status.rpc", skip_all, ret(level = "info"))]
+async fn check_rpc_status(
+    rpc: &mut miden_node_proto::clients::RpcClient,
+    current_time: u64,
+) -> ServiceStatus {
+    match rpc.status(()).await {
+        Ok(response) => {
+            let status = response.into_inner();
+
+            ServiceStatus {
+                name: "RPC".to_string(),
+                status: "healthy".to_string(),
+                last_checked: current_time,
+                error: None,
+                details: Some(ServiceDetails {
+                    rpc_status: Some(status.into()),
+                    remote_prover_statuses: Vec::new(),
+                }),
+            }
+        },
+        Err(e) => ServiceStatus {
+            name: "RPC".to_string(),
+            status: "unhealthy".to_string(),
+            last_checked: current_time,
+            error: Some(e.to_string()),
+            details: None,
+        },
+    }
+}
+
+// REMOTE PROVER STATUS CHECKER
+// ================================================================================================
+
+/// Checks the status of the remote prover service.
+///
+/// This function checks the status of the remote prover service.
+///
+/// # Arguments
+///
+/// * `remote_prover` - The remote prover client.
+/// * `name` - The name of the remote prover.
+/// * `url` - The URL of the remote prover.
+/// * `current_time` - The current time.
+///
+/// # Returns
+///
+/// A `ServiceStatus` containing the status of the remote prover service.
+#[instrument(target = COMPONENT, name = "check-status.remote-prover", skip_all, ret(level = "info"))]
+async fn check_remote_prover_status(
+    remote_prover: &mut miden_node_proto::clients::RemoteProverProxyClient,
+    name: String,
+    url: String,
+    current_time: u64,
+) -> ServiceStatus {
+    match remote_prover.status(()).await {
+        Ok(response) => {
+            let status = response.into_inner();
+
+            // Use the new method to convert gRPC status to domain type
+            let remote_prover_details =
+                RemoteProverStatusDetails::from_proxy_status(status, name.clone(), url);
+
+            // Determine overall health based on worker statuses
+            let overall_health = if remote_prover_details.workers.is_empty() {
+                "unknown"
+            } else if remote_prover_details.workers.iter().any(|w| w.status == "HEALTHY") {
+                "healthy"
+            } else {
+                "unhealthy"
+            };
+
+            ServiceStatus {
+                name: format!("Remote Prover ({name})"),
+                status: overall_health.to_string(),
+                last_checked: current_time,
+                error: None,
+                details: Some(ServiceDetails {
+                    rpc_status: None,
+                    remote_prover_statuses: vec![remote_prover_details],
+                }),
+            }
+        },
+        Err(e) => ServiceStatus {
+            name: format!("Remote Prover ({name})"),
+            status: "unhealthy".to_string(),
+            last_checked: current_time,
+            error: Some(e.to_string()),
+            details: None,
+        },
+    }
+}
+
+// NETWORK STATUS CHECKER
+// ================================================================================================
+
+/// Checks the status of the network.
+///
+/// This function checks the status of the network.
+///
+/// # Arguments
+///
+/// * `shared_status` - The shared status of the network.
+/// * `config` - The configuration for the monitor.
+///
+/// # Returns
+///
+/// A Result containing the status of the network.
+///
+/// # Errors
+///
+/// This function can return an error if the current time cannot be retrieved.
+///
+/// # Panics
+///
+/// This function can panic if the shared status cannot be locked.
+#[instrument(target = COMPONENT, name = "check-status", skip_all, ret(level = "info"), err)]
+pub async fn check_status(
+    shared_status: SharedStatus,
+    config: MonitorConfig,
+) -> anyhow::Result<()> {
+    let mut rpc = ClientBuilder::new(config.rpc_url.clone())
+        .without_tls()
+        .without_timeout()
+        .without_metadata_version()
+        .without_metadata_genesis()
+        .connect_lazy::<Rpc>();
+
+    // Create remote prover clients for each URL
+    let mut remote_provers: Vec<(
+        String,
+        String,
+        miden_node_proto::clients::RemoteProverProxyClient,
+    )> = config
+        .remote_prover_urls
+        .iter()
+        .enumerate()
+        .map(|(i, url)| {
+            let name = format!("Prover-{}", i + 1);
+            let url_str = url.to_string();
+            let client = ClientBuilder::new(url.clone())
+                .without_tls()
+                .without_timeout()
+                .without_metadata_version()
+                .without_metadata_genesis()
+                .connect_lazy::<RemoteProverProxy>();
+            (name, url_str, client)
+        })
+        .collect();
+
+    let mut interval = tokio::time::interval(Duration::from_secs(3));
+    // Don't delay the first tick
+    interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
+
+    loop {
+        interval.tick().await;
+
+        let current_time = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .context("failed to get current time")?
+            .as_secs();
+
+        let mut services = Vec::new();
+
+        // Check RPC status
+        let rpc_status = check_rpc_status(&mut rpc, current_time).await;
+        services.push(rpc_status);
+
+        // Check each Remote Prover status
+        for (name, url, remote_prover) in &mut remote_provers {
+            let remote_prover_status =
+                check_remote_prover_status(remote_prover, name.clone(), url.clone(), current_time)
+                    .await;
+            services.push(remote_prover_status);
+        }
+
+        // Update shared status
+        {
+            let mut status = shared_status.lock().await;
+            status.services = services;
+            status.last_updated = current_time;
+        }
+    }
+}
diff --git a/bin/remote-prover/Cargo.toml b/bin/remote-prover/Cargo.toml
index 131c577e5..c0d2ba1a1 100644
--- a/bin/remote-prover/Cargo.toml
+++ b/bin/remote-prover/Cargo.toml
@@ -52,7 +52,7 @@ tonic                 = { default-features = false, features = ["codegen", "pros
 tonic-health          = { version = "0.13" }
 tonic-web             = { version = "0.13" }
 tower-http            = { features = ["trace"], workspace = true }
-tracing               = { version = "0.1" }
+tracing               = { workspace = true }
 uuid                  = { features = ["v4"], version = "1.16" }
 
 [dev-dependencies]
diff --git a/crates/proto/build.rs b/crates/proto/build.rs
index 1e73b1db6..39e7c908c 100644
--- a/crates/proto/build.rs
+++ b/crates/proto/build.rs
@@ -4,6 +4,7 @@ use std::path::{Path, PathBuf};
 use fs_err as fs;
 use miden_node_proto_build::{
     block_producer_api_descriptor,
+    remote_prover_api_descriptor,
     rpc_api_descriptor,
     store_block_producer_api_descriptor,
     store_ntx_builder_api_descriptor,
@@ -44,6 +45,7 @@ fn main() -> miette::Result<()> {
     generate_bindings(store_block_producer_api_descriptor(), &dst_dir)?;
     generate_bindings(store_shared_api_descriptor(), &dst_dir)?;
     generate_bindings(block_producer_api_descriptor(), &dst_dir)?;
+    generate_bindings(remote_prover_api_descriptor(), &dst_dir)?;
 
     generate_mod_rs(&dst_dir).into_diagnostic().wrap_err("generating mod.rs")?;
 
diff --git a/crates/proto/src/clients/mod.rs b/crates/proto/src/clients/mod.rs
index d46ef274e..1468f8cd3 100644
--- a/crates/proto/src/clients/mod.rs
+++ b/crates/proto/src/clients/mod.rs
@@ -113,6 +113,11 @@ pub type StoreBlockProducerClient =
 pub type StoreRpcClient =
     generated::rpc_store::rpc_client::RpcClient<InterceptedService<Channel, OtelInterceptor>>;
 
+pub type RemoteProverProxyClient =
+    generated::remote_prover::proxy_status_api_client::ProxyStatusApiClient<
+        InterceptedService<Channel, OtelInterceptor>,
+    >;
+
 // GRPC CLIENT BUILDER TRAIT
 // ================================================================================================
 
@@ -153,6 +158,9 @@ pub struct StoreBlockProducer;
 #[derive(Copy, Clone, Debug)]
 pub struct StoreRpc;
 
+#[derive(Copy, Clone, Debug)]
+pub struct RemoteProverProxy;
+
 // CLIENT BUILDER IMPLEMENTATIONS
 // ================================================================================================
 
@@ -210,6 +218,17 @@ impl GrpcClientBuilder for StoreRpc {
     }
 }
 
+impl GrpcClientBuilder for RemoteProverProxy {
+    type Service = RemoteProverProxyClient;
+
+    fn with_interceptor(channel: Channel, _config: &ClientConfig) -> Self::Service {
+        generated::remote_prover::proxy_status_api_client::ProxyStatusApiClient::with_interceptor(
+            channel,
+            OtelInterceptor,
+        )
+    }
+}
+
 // STRICT TYPE-SAFE BUILDER (NO DEFAULTS)
 // ================================================================================================
 
diff --git a/crates/proto/src/generated/mod.rs b/crates/proto/src/generated/mod.rs
index f7567d0b9..799aa1b71 100644
--- a/crates/proto/src/generated/mod.rs
+++ b/crates/proto/src/generated/mod.rs
@@ -8,6 +8,7 @@ pub mod blockchain;
 pub mod note;
 pub mod ntx_builder_store;
 pub mod primitives;
+pub mod remote_prover;
 pub mod rpc;
 pub mod rpc_store;
 pub mod shared;
diff --git a/crates/proto/src/generated/remote_prover.rs b/crates/proto/src/generated/remote_prover.rs
new file mode 100644
index 000000000..7404cb38e
--- /dev/null
+++ b/crates/proto/src/generated/remote_prover.rs
@@ -0,0 +1,1001 @@
+// This file is @generated by prost-build.
+/// Request message for proof generation containing payload and proof type metadata.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ProofRequest {
+    /// Type of proof being requested, determines payload interpretation
+    #[prost(enumeration = "ProofType", tag = "1")]
+    pub proof_type: i32,
+    /// Serialized payload requiring proof generation. The encoding format is
+    /// type-specific:
+    /// - TRANSACTION: TransactionWitness encoded.
+    /// - BATCH: ProposedBatch encoded.
+    /// - BLOCK: ProposedBlock encoded.
+    #[prost(bytes = "vec", tag = "2")]
+    pub payload: ::prost::alloc::vec::Vec<u8>,
+}
+/// Response message containing the generated proof.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Proof {
+    /// Serialized proof bytes.
+    /// - TRANSACTION: Returns an encoded ProvenTransaction.
+    /// - BATCH: Returns an encoded ProvenBatch.
+    /// - BLOCK: Returns an encoded ProvenBlock.
+    #[prost(bytes = "vec", tag = "1")]
+    pub payload: ::prost::alloc::vec::Vec<u8>,
+}
+/// Status of an individual worker in the proxy.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ProxyWorkerStatus {
+    /// The address of the worker.
+    #[prost(string, tag = "1")]
+    pub address: ::prost::alloc::string::String,
+    /// The version of the worker.
+    #[prost(string, tag = "2")]
+    pub version: ::prost::alloc::string::String,
+    /// The health status of the worker.
+    #[prost(enumeration = "WorkerHealthStatus", tag = "3")]
+    pub status: i32,
+}
+/// Response message containing the status of the proxy.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ProxyStatus {
+    /// The version of the proxy.
+    #[prost(string, tag = "1")]
+    pub version: ::prost::alloc::string::String,
+    /// The proof type supported by this proxy.
+    #[prost(enumeration = "ProofType", tag = "2")]
+    pub supported_proof_type: i32,
+    /// The list of workers managed by this proxy.
+    #[prost(message, repeated, tag = "3")]
+    pub workers: ::prost::alloc::vec::Vec<ProxyWorkerStatus>,
+}
+/// Response message containing the status of the worker.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct WorkerStatus {
+    /// The version of the worker.
+    #[prost(string, tag = "1")]
+    pub version: ::prost::alloc::string::String,
+    /// The proof type supported by this worker.
+    #[prost(enumeration = "ProofType", tag = "2")]
+    pub supported_proof_type: i32,
+}
+/// Enumeration of supported proof types.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum ProofType {
+    /// Proof for a single transaction.
+    Transaction = 0,
+    /// Proof covering a batch of transactions.
+    Batch = 1,
+    /// Proof for entire block validity.
+    Block = 2,
+}
+impl ProofType {
+    /// String value of the enum field names used in the ProtoBuf definition.
+    ///
+    /// The values are not transformed in any way and thus are considered stable
+    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
+    pub fn as_str_name(&self) -> &'static str {
+        match self {
+            Self::Transaction => "TRANSACTION",
+            Self::Batch => "BATCH",
+            Self::Block => "BLOCK",
+        }
+    }
+    /// Creates an enum from field names used in the ProtoBuf definition.
+    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
+        match value {
+            "TRANSACTION" => Some(Self::Transaction),
+            "BATCH" => Some(Self::Batch),
+            "BLOCK" => Some(Self::Block),
+            _ => None,
+        }
+    }
+}
+/// Health status of a worker.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum WorkerHealthStatus {
+    /// The worker's health status is unknown.
+    /// This value is used when the proxy is not able to determine the health status of the worker.
+    /// It is only a temporary state and the proxy will eventually determine the health status of the worker.
+    Unknown = 0,
+    /// The worker is healthy.
+    /// This value is used when the worker is able to successfully process requests.
+    Healthy = 1,
+    /// The worker is unhealthy.
+    /// This value is used when the worker is not receiving requests or is not able to successfully process requests.
+    Unhealthy = 2,
+}
+impl WorkerHealthStatus {
+    /// String value of the enum field names used in the ProtoBuf definition.
+    ///
+    /// The values are not transformed in any way and thus are considered stable
+    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
+    pub fn as_str_name(&self) -> &'static str {
+        match self {
+            Self::Unknown => "UNKNOWN",
+            Self::Healthy => "HEALTHY",
+            Self::Unhealthy => "UNHEALTHY",
+        }
+    }
+    /// Creates an enum from field names used in the ProtoBuf definition.
+    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
+        match value {
+            "UNKNOWN" => Some(Self::Unknown),
+            "HEALTHY" => Some(Self::Healthy),
+            "UNHEALTHY" => Some(Self::Unhealthy),
+            _ => None,
+        }
+    }
+}
+/// Generated client implementations.
+pub mod api_client {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
+    use tonic::codegen::*;
+    use tonic::codegen::http::Uri;
+    #[derive(Debug, Clone)]
+    pub struct ApiClient<T> {
+        inner: tonic::client::Grpc<T>,
+    }
+    impl ApiClient<tonic::transport::Channel> {
+        /// Attempt to create a new client by connecting to a given endpoint.
+        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
+        where
+            D: TryInto<tonic::transport::Endpoint>,
+            D::Error: Into<StdError>,
+        {
+            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
+            Ok(Self::new(conn))
+        }
+    }
+    impl<T> ApiClient<T>
+    where
+        T: tonic::client::GrpcService<tonic::body::Body>,
+        T::Error: Into<StdError>,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
+    {
+        pub fn new(inner: T) -> Self {
+            let inner = tonic::client::Grpc::new(inner);
+            Self { inner }
+        }
+        pub fn with_origin(inner: T, origin: Uri) -> Self {
+            let inner = tonic::client::Grpc::with_origin(inner, origin);
+            Self { inner }
+        }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> ApiClient<InterceptedService<T, F>>
+        where
+            F: tonic::service::Interceptor,
+            T::ResponseBody: Default,
+            T: tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+                Response = http::Response<
+                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
+                >,
+            >,
+            <T as tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
+        {
+            ApiClient::new(InterceptedService::new(inner, interceptor))
+        }
+        /// Compress requests with the given encoding.
+        ///
+        /// This requires the server to support it otherwise it might respond with an
+        /// error.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.send_compressed(encoding);
+            self
+        }
+        /// Enable decompressing responses.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.accept_compressed(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_decoding_message_size(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_encoding_message_size(limit);
+            self
+        }
+        /// Generates a proof for the requested payload.
+        pub async fn prove(
+            &mut self,
+            request: impl tonic::IntoRequest<super::ProofRequest>,
+        ) -> std::result::Result<tonic::Response<super::Proof>, tonic::Status> {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static("/remote_prover.Api/Prove");
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new("remote_prover.Api", "Prove"));
+            self.inner.unary(req, path, codec).await
+        }
+    }
+}
+/// Generated client implementations.
+pub mod proxy_status_api_client {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
+    use tonic::codegen::*;
+    use tonic::codegen::http::Uri;
+    #[derive(Debug, Clone)]
+    pub struct ProxyStatusApiClient<T> {
+        inner: tonic::client::Grpc<T>,
+    }
+    impl ProxyStatusApiClient<tonic::transport::Channel> {
+        /// Attempt to create a new client by connecting to a given endpoint.
+        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
+        where
+            D: TryInto<tonic::transport::Endpoint>,
+            D::Error: Into<StdError>,
+        {
+            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
+            Ok(Self::new(conn))
+        }
+    }
+    impl<T> ProxyStatusApiClient<T>
+    where
+        T: tonic::client::GrpcService<tonic::body::Body>,
+        T::Error: Into<StdError>,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
+    {
+        pub fn new(inner: T) -> Self {
+            let inner = tonic::client::Grpc::new(inner);
+            Self { inner }
+        }
+        pub fn with_origin(inner: T, origin: Uri) -> Self {
+            let inner = tonic::client::Grpc::with_origin(inner, origin);
+            Self { inner }
+        }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> ProxyStatusApiClient<InterceptedService<T, F>>
+        where
+            F: tonic::service::Interceptor,
+            T::ResponseBody: Default,
+            T: tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+                Response = http::Response<
+                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
+                >,
+            >,
+            <T as tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
+        {
+            ProxyStatusApiClient::new(InterceptedService::new(inner, interceptor))
+        }
+        /// Compress requests with the given encoding.
+        ///
+        /// This requires the server to support it otherwise it might respond with an
+        /// error.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.send_compressed(encoding);
+            self
+        }
+        /// Enable decompressing responses.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.accept_compressed(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_decoding_message_size(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_encoding_message_size(limit);
+            self
+        }
+        /// Returns the status of the proxy.
+        pub async fn status(
+            &mut self,
+            request: impl tonic::IntoRequest<()>,
+        ) -> std::result::Result<tonic::Response<super::ProxyStatus>, tonic::Status> {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/remote_prover.ProxyStatusApi/Status",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("remote_prover.ProxyStatusApi", "Status"));
+            self.inner.unary(req, path, codec).await
+        }
+    }
+}
+/// Generated client implementations.
+pub mod worker_status_api_client {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
+    use tonic::codegen::*;
+    use tonic::codegen::http::Uri;
+    #[derive(Debug, Clone)]
+    pub struct WorkerStatusApiClient<T> {
+        inner: tonic::client::Grpc<T>,
+    }
+    impl WorkerStatusApiClient<tonic::transport::Channel> {
+        /// Attempt to create a new client by connecting to a given endpoint.
+        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
+        where
+            D: TryInto<tonic::transport::Endpoint>,
+            D::Error: Into<StdError>,
+        {
+            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
+            Ok(Self::new(conn))
+        }
+    }
+    impl<T> WorkerStatusApiClient<T>
+    where
+        T: tonic::client::GrpcService<tonic::body::Body>,
+        T::Error: Into<StdError>,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
+    {
+        pub fn new(inner: T) -> Self {
+            let inner = tonic::client::Grpc::new(inner);
+            Self { inner }
+        }
+        pub fn with_origin(inner: T, origin: Uri) -> Self {
+            let inner = tonic::client::Grpc::with_origin(inner, origin);
+            Self { inner }
+        }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> WorkerStatusApiClient<InterceptedService<T, F>>
+        where
+            F: tonic::service::Interceptor,
+            T::ResponseBody: Default,
+            T: tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+                Response = http::Response<
+                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
+                >,
+            >,
+            <T as tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
+        {
+            WorkerStatusApiClient::new(InterceptedService::new(inner, interceptor))
+        }
+        /// Compress requests with the given encoding.
+        ///
+        /// This requires the server to support it otherwise it might respond with an
+        /// error.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.send_compressed(encoding);
+            self
+        }
+        /// Enable decompressing responses.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.accept_compressed(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_decoding_message_size(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_encoding_message_size(limit);
+            self
+        }
+        /// Returns the status of the worker.
+        pub async fn status(
+            &mut self,
+            request: impl tonic::IntoRequest<()>,
+        ) -> std::result::Result<tonic::Response<super::WorkerStatus>, tonic::Status> {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/remote_prover.WorkerStatusApi/Status",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("remote_prover.WorkerStatusApi", "Status"));
+            self.inner.unary(req, path, codec).await
+        }
+    }
+}
+/// Generated server implementations.
+pub mod api_server {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
+    use tonic::codegen::*;
+    /// Generated trait containing gRPC methods that should be implemented for use with ApiServer.
+    #[async_trait]
+    pub trait Api: std::marker::Send + std::marker::Sync + 'static {
+        /// Generates a proof for the requested payload.
+        async fn prove(
+            &self,
+            request: tonic::Request<super::ProofRequest>,
+        ) -> std::result::Result<tonic::Response<super::Proof>, tonic::Status>;
+    }
+    #[derive(Debug)]
+    pub struct ApiServer<T> {
+        inner: Arc<T>,
+        accept_compression_encodings: EnabledCompressionEncodings,
+        send_compression_encodings: EnabledCompressionEncodings,
+        max_decoding_message_size: Option<usize>,
+        max_encoding_message_size: Option<usize>,
+    }
+    impl<T> ApiServer<T> {
+        pub fn new(inner: T) -> Self {
+            Self::from_arc(Arc::new(inner))
+        }
+        pub fn from_arc(inner: Arc<T>) -> Self {
+            Self {
+                inner,
+                accept_compression_encodings: Default::default(),
+                send_compression_encodings: Default::default(),
+                max_decoding_message_size: None,
+                max_encoding_message_size: None,
+            }
+        }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> InterceptedService<Self, F>
+        where
+            F: tonic::service::Interceptor,
+        {
+            InterceptedService::new(Self::new(inner), interceptor)
+        }
+        /// Enable decompressing requests with the given encoding.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.accept_compression_encodings.enable(encoding);
+            self
+        }
+        /// Compress responses with the given encoding, if the client supports it.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.send_compression_encodings.enable(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.max_decoding_message_size = Some(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.max_encoding_message_size = Some(limit);
+            self
+        }
+    }
+    impl<T, B> tonic::codegen::Service<http::Request<B>> for ApiServer<T>
+    where
+        T: Api,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
+    {
+        type Response = http::Response<tonic::body::Body>;
+        type Error = std::convert::Infallible;
+        type Future = BoxFuture<Self::Response, Self::Error>;
+        fn poll_ready(
+            &mut self,
+            _cx: &mut Context<'_>,
+        ) -> Poll<std::result::Result<(), Self::Error>> {
+            Poll::Ready(Ok(()))
+        }
+        fn call(&mut self, req: http::Request<B>) -> Self::Future {
+            match req.uri().path() {
+                "/remote_prover.Api/Prove" => {
+                    #[allow(non_camel_case_types)]
+                    struct ProveSvc<T: Api>(pub Arc<T>);
+                    impl<T: Api> tonic::server::UnaryService<super::ProofRequest>
+                    for ProveSvc<T> {
+                        type Response = super::Proof;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<super::ProofRequest>,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as Api>::prove(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = ProveSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
+                _ => {
+                    Box::pin(async move {
+                        let mut response = http::Response::new(
+                            tonic::body::Body::default(),
+                        );
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
+                    })
+                }
+            }
+        }
+    }
+    impl<T> Clone for ApiServer<T> {
+        fn clone(&self) -> Self {
+            let inner = self.inner.clone();
+            Self {
+                inner,
+                accept_compression_encodings: self.accept_compression_encodings,
+                send_compression_encodings: self.send_compression_encodings,
+                max_decoding_message_size: self.max_decoding_message_size,
+                max_encoding_message_size: self.max_encoding_message_size,
+            }
+        }
+    }
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "remote_prover.Api";
+    impl<T> tonic::server::NamedService for ApiServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
+    }
+}
+/// Generated server implementations.
+pub mod proxy_status_api_server {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
+    use tonic::codegen::*;
+    /// Generated trait containing gRPC methods that should be implemented for use with ProxyStatusApiServer.
+    #[async_trait]
+    pub trait ProxyStatusApi: std::marker::Send + std::marker::Sync + 'static {
+        /// Returns the status of the proxy.
+        async fn status(
+            &self,
+            request: tonic::Request<()>,
+        ) -> std::result::Result<tonic::Response<super::ProxyStatus>, tonic::Status>;
+    }
+    #[derive(Debug)]
+    pub struct ProxyStatusApiServer<T> {
+        inner: Arc<T>,
+        accept_compression_encodings: EnabledCompressionEncodings,
+        send_compression_encodings: EnabledCompressionEncodings,
+        max_decoding_message_size: Option<usize>,
+        max_encoding_message_size: Option<usize>,
+    }
+    impl<T> ProxyStatusApiServer<T> {
+        pub fn new(inner: T) -> Self {
+            Self::from_arc(Arc::new(inner))
+        }
+        pub fn from_arc(inner: Arc<T>) -> Self {
+            Self {
+                inner,
+                accept_compression_encodings: Default::default(),
+                send_compression_encodings: Default::default(),
+                max_decoding_message_size: None,
+                max_encoding_message_size: None,
+            }
+        }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> InterceptedService<Self, F>
+        where
+            F: tonic::service::Interceptor,
+        {
+            InterceptedService::new(Self::new(inner), interceptor)
+        }
+        /// Enable decompressing requests with the given encoding.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.accept_compression_encodings.enable(encoding);
+            self
+        }
+        /// Compress responses with the given encoding, if the client supports it.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.send_compression_encodings.enable(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.max_decoding_message_size = Some(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.max_encoding_message_size = Some(limit);
+            self
+        }
+    }
+    impl<T, B> tonic::codegen::Service<http::Request<B>> for ProxyStatusApiServer<T>
+    where
+        T: ProxyStatusApi,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
+    {
+        type Response = http::Response<tonic::body::Body>;
+        type Error = std::convert::Infallible;
+        type Future = BoxFuture<Self::Response, Self::Error>;
+        fn poll_ready(
+            &mut self,
+            _cx: &mut Context<'_>,
+        ) -> Poll<std::result::Result<(), Self::Error>> {
+            Poll::Ready(Ok(()))
+        }
+        fn call(&mut self, req: http::Request<B>) -> Self::Future {
+            match req.uri().path() {
+                "/remote_prover.ProxyStatusApi/Status" => {
+                    #[allow(non_camel_case_types)]
+                    struct StatusSvc<T: ProxyStatusApi>(pub Arc<T>);
+                    impl<T: ProxyStatusApi> tonic::server::UnaryService<()>
+                    for StatusSvc<T> {
+                        type Response = super::ProxyStatus;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(&mut self, request: tonic::Request<()>) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as ProxyStatusApi>::status(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = StatusSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
+                _ => {
+                    Box::pin(async move {
+                        let mut response = http::Response::new(
+                            tonic::body::Body::default(),
+                        );
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
+                    })
+                }
+            }
+        }
+    }
+    impl<T> Clone for ProxyStatusApiServer<T> {
+        fn clone(&self) -> Self {
+            let inner = self.inner.clone();
+            Self {
+                inner,
+                accept_compression_encodings: self.accept_compression_encodings,
+                send_compression_encodings: self.send_compression_encodings,
+                max_decoding_message_size: self.max_decoding_message_size,
+                max_encoding_message_size: self.max_encoding_message_size,
+            }
+        }
+    }
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "remote_prover.ProxyStatusApi";
+    impl<T> tonic::server::NamedService for ProxyStatusApiServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
+    }
+}
+/// Generated server implementations.
+pub mod worker_status_api_server {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
+    use tonic::codegen::*;
+    /// Generated trait containing gRPC methods that should be implemented for use with WorkerStatusApiServer.
+    #[async_trait]
+    pub trait WorkerStatusApi: std::marker::Send + std::marker::Sync + 'static {
+        /// Returns the status of the worker.
+        async fn status(
+            &self,
+            request: tonic::Request<()>,
+        ) -> std::result::Result<tonic::Response<super::WorkerStatus>, tonic::Status>;
+    }
+    #[derive(Debug)]
+    pub struct WorkerStatusApiServer<T> {
+        inner: Arc<T>,
+        accept_compression_encodings: EnabledCompressionEncodings,
+        send_compression_encodings: EnabledCompressionEncodings,
+        max_decoding_message_size: Option<usize>,
+        max_encoding_message_size: Option<usize>,
+    }
+    impl<T> WorkerStatusApiServer<T> {
+        pub fn new(inner: T) -> Self {
+            Self::from_arc(Arc::new(inner))
+        }
+        pub fn from_arc(inner: Arc<T>) -> Self {
+            Self {
+                inner,
+                accept_compression_encodings: Default::default(),
+                send_compression_encodings: Default::default(),
+                max_decoding_message_size: None,
+                max_encoding_message_size: None,
+            }
+        }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> InterceptedService<Self, F>
+        where
+            F: tonic::service::Interceptor,
+        {
+            InterceptedService::new(Self::new(inner), interceptor)
+        }
+        /// Enable decompressing requests with the given encoding.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.accept_compression_encodings.enable(encoding);
+            self
+        }
+        /// Compress responses with the given encoding, if the client supports it.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.send_compression_encodings.enable(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.max_decoding_message_size = Some(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.max_encoding_message_size = Some(limit);
+            self
+        }
+    }
+    impl<T, B> tonic::codegen::Service<http::Request<B>> for WorkerStatusApiServer<T>
+    where
+        T: WorkerStatusApi,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
+    {
+        type Response = http::Response<tonic::body::Body>;
+        type Error = std::convert::Infallible;
+        type Future = BoxFuture<Self::Response, Self::Error>;
+        fn poll_ready(
+            &mut self,
+            _cx: &mut Context<'_>,
+        ) -> Poll<std::result::Result<(), Self::Error>> {
+            Poll::Ready(Ok(()))
+        }
+        fn call(&mut self, req: http::Request<B>) -> Self::Future {
+            match req.uri().path() {
+                "/remote_prover.WorkerStatusApi/Status" => {
+                    #[allow(non_camel_case_types)]
+                    struct StatusSvc<T: WorkerStatusApi>(pub Arc<T>);
+                    impl<T: WorkerStatusApi> tonic::server::UnaryService<()>
+                    for StatusSvc<T> {
+                        type Response = super::WorkerStatus;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(&mut self, request: tonic::Request<()>) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as WorkerStatusApi>::status(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = StatusSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
+                _ => {
+                    Box::pin(async move {
+                        let mut response = http::Response::new(
+                            tonic::body::Body::default(),
+                        );
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
+                    })
+                }
+            }
+        }
+    }
+    impl<T> Clone for WorkerStatusApiServer<T> {
+        fn clone(&self) -> Self {
+            let inner = self.inner.clone();
+            Self {
+                inner,
+                accept_compression_encodings: self.accept_compression_encodings,
+                send_compression_encodings: self.send_compression_encodings,
+                max_decoding_message_size: self.max_decoding_message_size,
+                max_encoding_message_size: self.max_encoding_message_size,
+            }
+        }
+    }
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "remote_prover.WorkerStatusApi";
+    impl<T> tonic::server::NamedService for WorkerStatusApiServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
+    }
+}
diff --git a/packaging/network-monitor/miden-network-monitor.service b/packaging/network-monitor/miden-network-monitor.service
new file mode 100644
index 000000000..021c63d6c
--- /dev/null
+++ b/packaging/network-monitor/miden-network-monitor.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Miden network monitor
+Wants=network-online.target
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Type=exec
+EnvironmentFile=/lib/systemd/system/miden-network-monitor.env
+ExecStart=/usr/bin/miden-network-monitor
+WorkingDirectory=/opt/miden-network-monitor
+User=miden-network-monitor
+RestartSec=5
+Restart=always
diff --git a/packaging/network-monitor/postinst b/packaging/network-monitor/postinst
new file mode 100644
index 000000000..728ed0b02
--- /dev/null
+++ b/packaging/network-monitor/postinst
@@ -0,0 +1,26 @@
+#!/bin/bash
+#
+# This is a postinstallation script so the service can be configured and started when requested.
+
+# user is expected by the systemd service file and `/opt/<user>` is its working directory,
+sudo adduser --disabled-password --disabled-login --shell /usr/sbin/nologin --quiet --system --no-create-home --home /nonexistent miden-network-monitor
+
+# Working folder.
+if [ -d "/opt/miden-network-monitor" ]
+then
+    echo "Directory /opt/miden-network-monitor exists."
+else
+    mkdir -p /opt/miden-network-monitor
+fi
+sudo chown -R miden-network-monitor /opt/miden-network-monitor
+
+# Configuration folder
+if [ -d "/etc/opt/miden-network-monitor" ]
+then
+    echo "Directory /etc/opt/miden-network-monitor exists."
+else
+    mkdir -p /etc/opt/miden-network-monitor
+fi
+sudo chown -R miden-network-monitor /etc/opt/miden-network-monitor
+
+sudo systemctl daemon-reload
diff --git a/packaging/network-monitor/postrm b/packaging/network-monitor/postrm
new file mode 100644
index 000000000..f00894da1
--- /dev/null
+++ b/packaging/network-monitor/postrm
@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+###############
+# Remove miden-network-monitor installs
+##############
+sudo rm -rf /lib/systemd/system/miden-network-monitor.service
+sudo rm -rf /etc/opt/miden-network-monitor
+sudo deluser miden-network-monitor
+sudo systemctl daemon-reload
diff --git a/scripts/publish-crates.sh b/scripts/publish-crates.sh
index 8b0b60d1f..b04fdd9ba 100755
--- a/scripts/publish-crates.sh
+++ b/scripts/publish-crates.sh
@@ -34,6 +34,7 @@ miden-node-block-producer
 miden-node-ntx-builder
 miden-node-rpc
 miden-node
+miden-network-monitor
 )
 for crate in ${crates[@]}; do
     echo "Publishing $crate..."

From 59d9016361156250de6d660a0101b43df87fb02d Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Thu, 18 Sep 2025 11:11:32 -0300
Subject: [PATCH 15/78] feat: distributed tracing in remote prover (#1230)

* feat: distributed tracing in remote prover

* review: update tracing warning
---
 Cargo.lock                          |  2 +
 bin/remote-prover/Cargo.toml        |  2 +
 bin/remote-prover/src/api/prover.rs | 59 +++++++++++++++++++----------
 bin/remote-prover/src/proxy/mod.rs  | 39 ++++++++++++++++++-
 4 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1cd5c8544..76f7d71fd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2513,6 +2513,7 @@ dependencies = [
  "miden-tx",
  "miden-tx-batch-prover",
  "miette",
+ "opentelemetry",
  "pingora",
  "pingora-core",
  "pingora-limits",
@@ -2534,6 +2535,7 @@ dependencies = [
  "tonic-web",
  "tower-http",
  "tracing",
+ "tracing-opentelemetry",
  "uuid",
 ]
 
diff --git a/bin/remote-prover/Cargo.toml b/bin/remote-prover/Cargo.toml
index c0d2ba1a1..6823b13b0 100644
--- a/bin/remote-prover/Cargo.toml
+++ b/bin/remote-prover/Cargo.toml
@@ -35,6 +35,7 @@ miden-node-utils      = { workspace = true }
 miden-objects         = { features = ["std"], workspace = true }
 miden-tx              = { features = ["std"], workspace = true }
 miden-tx-batch-prover = { features = ["std"], workspace = true }
+opentelemetry         = { version = "0.30" }
 pingora               = { features = ["lb"], version = "0.5" }
 pingora-core          = { version = "0.5" }
 pingora-limits        = { version = "0.5" }
@@ -53,6 +54,7 @@ tonic-health          = { version = "0.13" }
 tonic-web             = { version = "0.13" }
 tower-http            = { features = ["trace"], workspace = true }
 tracing               = { workspace = true }
+tracing-opentelemetry = { version = "0.31" }
 uuid                  = { features = ["v4"], version = "1.16" }
 
 [dev-dependencies]
diff --git a/bin/remote-prover/src/api/prover.rs b/bin/remote-prover/src/api/prover.rs
index 7452247b6..56eb52354 100644
--- a/bin/remote-prover/src/api/prover.rs
+++ b/bin/remote-prover/src/api/prover.rs
@@ -94,26 +94,31 @@ impl ProverRpcApi {
         name = "remote_prover.prove_tx",
         skip_all,
         ret(level = "debug"),
-        fields(id = tracing::field::Empty),
+        fields(request_id = %request_id, transaction_id = tracing::field::Empty),
         err
     )]
     pub async fn prove_tx(
         &self,
         transaction_witness: TransactionWitness,
+        request_id: &str,
     ) -> Result<Response<proto::remote_prover::Proof>, tonic::Status> {
         let Prover::Transaction(prover) = &self.prover else {
             return Err(Status::unimplemented("Transaction prover is not enabled"));
         };
 
-        let proof = prover
+        let locked_prover = prover
             .try_lock()
-            .map_err(|_| Status::resource_exhausted("Server is busy handling another request"))?
-            .prove(transaction_witness)
-            .map_err(internal_error)?;
+            .map_err(|_| Status::resource_exhausted("Server is busy handling another request"))?;
+
+        // Add a small delay to simulate longer proving time for testing
+        #[cfg(test)]
+        tokio::time::sleep(std::time::Duration::from_millis(100)).await;
+
+        let proof = locked_prover.prove(transaction_witness).map_err(internal_error)?;
 
         // Record the transaction_id in the current tracing span
         let transaction_id = proof.id();
-        tracing::Span::current().record("id", tracing::field::display(&transaction_id));
+        tracing::Span::current().record("transaction_id", tracing::field::display(&transaction_id));
 
         Ok(Response::new(proto::remote_prover::Proof { payload: proof.to_bytes() }))
     }
@@ -124,12 +129,13 @@ impl ProverRpcApi {
         name = "remote_prover.prove_batch",
         skip_all,
         ret(level = "debug"),
-        fields(id = tracing::field::Empty),
+        fields(request_id = %request_id, batch_id = tracing::field::Empty),
         err
     )]
     pub fn prove_batch(
         &self,
         proposed_batch: ProposedBatch,
+        request_id: &str,
     ) -> Result<Response<proto::remote_prover::Proof>, tonic::Status> {
         let Prover::Batch(prover) = &self.prover else {
             return Err(Status::unimplemented("Batch prover is not enabled"));
@@ -143,7 +149,7 @@ impl ProverRpcApi {
 
         // Record the batch_id in the current tracing span
         let batch_id = proven_batch.id();
-        tracing::Span::current().record("id", tracing::field::display(&batch_id));
+        tracing::Span::current().record("batch_id", tracing::field::display(&batch_id));
 
         Ok(Response::new(proto::remote_prover::Proof { payload: proven_batch.to_bytes() }))
     }
@@ -154,12 +160,13 @@ impl ProverRpcApi {
         name = "remote_prover.prove_block",
         skip_all,
         ret(level = "debug"),
-        fields(id = tracing::field::Empty),
+        fields(request_id = %request_id, block_id = tracing::field::Empty),
         err
     )]
     pub fn prove_block(
         &self,
         proposed_block: ProposedBlock,
+        request_id: &str,
     ) -> Result<Response<proto::remote_prover::Proof>, tonic::Status> {
         let Prover::Block(prover) = &self.prover else {
             return Err(Status::unimplemented("Block prover is not enabled"));
@@ -173,8 +180,7 @@ impl ProverRpcApi {
 
         // Record the commitment of the block in the current tracing span
         let block_id = proven_block.commitment();
-
-        tracing::Span::current().record("id", tracing::field::display(&block_id));
+        tracing::Span::current().record("block_id", tracing::field::display(&block_id));
 
         Ok(Response::new(proto::remote_prover::Proof { payload: proven_block.to_bytes() }))
     }
@@ -187,25 +193,40 @@ impl ProverApi for ProverRpcApi {
         name = "remote_prover.prove",
         skip_all,
         ret(level = "debug"),
-        fields(id = tracing::field::Empty),
+        fields(request_id = tracing::field::Empty),
         err
     )]
     async fn prove(
         &self,
         request: Request<proto::remote_prover::ProofRequest>,
     ) -> Result<Response<proto::remote_prover::Proof>, tonic::Status> {
-        match request.get_ref().proof_type() {
+        // Extract X-Request-ID header for trace correlation
+        let request_id = request
+            .metadata()
+            .get("x-request-id")
+            .and_then(|v| v.to_str().ok())
+            .unwrap_or("unknown")
+            .to_string(); // Convert to owned string to avoid lifetime issues
+
+        // Record the request_id in the current tracing span
+        tracing::Span::current().record("request_id", &request_id);
+
+        // Extract the proof type and payload
+        let proof_request = request.into_inner();
+        let proof_type = proof_request.proof_type();
+
+        match proof_type {
             proto::remote_prover::ProofType::Transaction => {
-                let tx_witness = request.into_inner().try_into().map_err(invalid_argument)?;
-                self.prove_tx(tx_witness).await
+                let tx_witness = proof_request.try_into().map_err(invalid_argument)?;
+                self.prove_tx(tx_witness, &request_id).await
             },
             proto::remote_prover::ProofType::Batch => {
-                let proposed_batch = request.into_inner().try_into().map_err(invalid_argument)?;
-                self.prove_batch(proposed_batch)
+                let proposed_batch = proof_request.try_into().map_err(invalid_argument)?;
+                self.prove_batch(proposed_batch, &request_id)
             },
             proto::remote_prover::ProofType::Block => {
-                let proposed_block = request.into_inner().try_into().map_err(invalid_argument)?;
-                self.prove_block(proposed_block)
+                let proposed_block = proof_request.try_into().map_err(invalid_argument)?;
+                self.prove_block(proposed_block, &request_id)
             },
         }
     }
diff --git a/bin/remote-prover/src/proxy/mod.rs b/bin/remote-prover/src/proxy/mod.rs
index b0ca39646..9885cdba0 100644
--- a/bin/remote-prover/src/proxy/mod.rs
+++ b/bin/remote-prover/src/proxy/mod.rs
@@ -294,6 +294,27 @@ impl RequestQueue {
 /// Shared state. It keeps track of the order of the requests to then assign them to the workers.
 static QUEUE: LazyLock<RequestQueue> = LazyLock::new(RequestQueue::new);
 
+// OPENTELEMETRY CONTEXT INJECTION
+// ================================================================================================
+
+/// Pingora `RequestHeader` injector for OpenTelemetry trace context propagation.
+///
+/// This allows the proxy to inject trace context into headers that will be forwarded
+/// to worker nodes, enabling proper parent-child trace relationships.
+struct PingoraHeaderInjector<'a>(&'a mut pingora::http::RequestHeader);
+
+impl opentelemetry::propagation::Injector for PingoraHeaderInjector<'_> {
+    /// Set a key and value in the `RequestHeader` using pingora's API
+    fn set(&mut self, key: &str, value: String) {
+        // Use pingora's insert_header method which handles the proper header insertion
+        // Convert key to owned string to satisfy lifetime requirements
+        if let Err(e) = self.0.insert_header(key.to_string(), value) {
+            // Log error but don't fail the request if header injection fails
+            tracing::warn!(target: COMPONENT, header = %key, err = %e, "Failed to inject OpenTelemetry header");
+        }
+    }
+}
+
 // REQUEST CONTEXT
 // ================================================================================================
 
@@ -510,7 +531,9 @@ impl ProxyHttp for LoadBalancer {
 
     /// Applies the necessary filters to the request before sending it to the upstream server.
     ///
-    /// Here we ensure that the correct headers are forwarded for gRPC requests.
+    /// Here we ensure that the correct headers are forwarded for gRPC requests and inject
+    /// the X-Request-ID header and OpenTelemetry trace context for trace correlation between proxy
+    /// and worker.
     ///
     /// This method is called right after [`Self::upstream_peer()`] returns a [`HttpPeer`] and a
     /// connection is established with the worker.
@@ -532,6 +555,20 @@ impl ProxyHttp for LoadBalancer {
             upstream_request.insert_header("content-type", "application/grpc")?;
         }
 
+        // Always inject X-Request-ID header for trace correlation
+        // This allows the worker traces to be correlated with the proxy traces
+        upstream_request.insert_header("x-request-id", _ctx.request_id.to_string())?;
+
+        // Inject OpenTelemetry trace context for proper trace propagation
+        // This allows the worker trace to be a child of the proxy trace
+        {
+            use tracing_opentelemetry::OpenTelemetrySpanExt;
+            let ctx = tracing::Span::current().context();
+            opentelemetry::global::get_text_map_propagator(|propagator| {
+                propagator.inject_context(&ctx, &mut PingoraHeaderInjector(upstream_request));
+            });
+        }
+
         Ok(())
     }
 

From 44357bf7988126f46875a6fba355acb345e69072 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Thu, 18 Sep 2025 12:17:10 -0300
Subject: [PATCH 16/78] chore: refactor SubmitProvenTransaction proto error
 (#1208)

* chore: add error info in tonic::Status

* review: remove get_error_code_and_grpc_code function

* review: remove unused dep

* review: remove StaleInputs err, reorder errors enum

* chore: move error enum definition to proto file

* fix build after next's merge

* review: simplify tonic::Status creation

* review: use rstest

* chore: add enum default value with UNSPECIFIED

* review: add errors on API docs

* fix: Unspecified is internal error

* chore: add docs on error code serialization
---
 CHANGELOG.md                             |  1 +
 Cargo.lock                               |  1 +
 crates/block-producer/Cargo.toml         |  1 +
 crates/block-producer/src/errors.rs      | 69 ++++++++++++++++++------
 crates/block-producer/src/errors_test.rs | 59 ++++++++++++++++++++
 crates/block-producer/src/lib.rs         |  3 ++
 crates/proto/build.rs                    |  2 +
 crates/proto/src/domain/errors.rs        | 22 ++++++++
 crates/proto/src/domain/mod.rs           |  1 +
 crates/proto/src/generated/errors.rs     | 52 ++++++++++++++++++
 crates/proto/src/generated/mod.rs        |  1 +
 crates/rpc/README.md                     | 22 +++++++-
 docs/src/user/rpc.md                     | 55 ++++++++++++++++---
 proto/build.rs                           |  8 +++
 proto/proto/types/errors.proto           | 14 +++++
 proto/src/lib.rs                         |  7 +++
 16 files changed, 292 insertions(+), 26 deletions(-)
 create mode 100644 crates/block-producer/src/errors_test.rs
 create mode 100644 crates/proto/src/domain/errors.rs
 create mode 100644 crates/proto/src/generated/errors.rs
 create mode 100644 proto/proto/types/errors.proto

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 513f9821d..7f6ef68ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - [BREAKING] Refactored `CheckNullifiersByPrefix` endpoint adding pagination ([#1191](https://github.com/0xMiden/miden-node/pull/1191)).
 - [BREAKING] Renamed `CheckNullifiersByPrefix` endpoint to `SyncNullifiers` ([#1191](https://github.com/0xMiden/miden-node/pull/1191)).
 - [BREAKING] Added `block_range` and `pagination_info` fields to paginated gRPC endpoints ([#1205](https://github.com/0xMiden/miden-node/pull/1205)).
+- Use `tonic` error codes for gRPC errors ([#1208](https://github.com/0xMiden/miden-node/pull/1208)).
 - [BREAKING] Replace `GetAccountProofs` with `GetAccountProof` in the public store API (#[1211](https://github.com/0xMiden/miden-node/pull/1211)).
 - Implemented storage map `DataStore` function ([#1226](https://github.com/0xMiden/miden-node/pull/1226)).
 
diff --git a/Cargo.lock b/Cargo.lock
index 76f7d71fd..c6d8a10c4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2248,6 +2248,7 @@ dependencies = [
  "pretty_assertions",
  "rand 0.9.2",
  "rand_chacha 0.9.0",
+ "rstest",
  "serial_test",
  "tempfile",
  "thiserror 2.0.16",
diff --git a/crates/block-producer/Cargo.toml b/crates/block-producer/Cargo.toml
index 74f598489..eba7c6a13 100644
--- a/crates/block-producer/Cargo.toml
+++ b/crates/block-producer/Cargo.toml
@@ -51,6 +51,7 @@ miden-objects         = { default-features = true, features = ["testing"], works
 miden-tx              = { features = ["testing"], workspace = true }
 pretty_assertions     = "1.4"
 rand_chacha           = { default-features = false, version = "0.9" }
+rstest                = { workspace = true }
 serial_test           = "3.2"
 tempfile              = { version = "3.20" }
 tokio                 = { features = ["test-util"], workspace = true }
diff --git a/crates/block-producer/src/errors.rs b/crates/block-producer/src/errors.rs
index 159cbfe4a..af0654caf 100644
--- a/crates/block-producer/src/errors.rs
+++ b/crates/block-producer/src/errors.rs
@@ -1,5 +1,6 @@
 use miden_block_prover::ProvenBlockError;
 use miden_node_proto::errors::ConversionError;
+use miden_node_proto::generated::errors::SubmitProvenTransactionError;
 use miden_node_utils::ErrorReport;
 use miden_node_utils::formatting::format_opt;
 use miden_objects::account::AccountId;
@@ -100,28 +101,62 @@ pub enum AddTransactionError {
     },
 }
 
-impl From<AddTransactionError> for tonic::Status {
-    fn from(value: AddTransactionError) -> Self {
-        match value {
-            AddTransactionError::VerificationFailed(
-                VerifyTxError::InputNotesAlreadyConsumed(_)
-                | VerifyTxError::UnauthenticatedNotesNotFound(_)
-                | VerifyTxError::OutputNotesAlreadyExist(_)
-                | VerifyTxError::IncorrectAccountInitialCommitment { .. }
-                | VerifyTxError::InvalidTransactionProof(_),
-            )
-            | AddTransactionError::Expired { .. }
-            | AddTransactionError::TransactionDeserializationFailed(_) => {
-                Self::invalid_argument(value.as_report())
-            },
+// Error codes for gRPC Status::details
+// =================================================================================================
 
-            // Internal errors which should not be communicated to the user.
-            AddTransactionError::VerificationFailed(VerifyTxError::StoreConnectionFailed(_))
-            | AddTransactionError::StaleInputs { .. } => Self::internal("Internal error"),
+impl AddTransactionError {
+    fn api_error(&self) -> SubmitProvenTransactionError {
+        match self {
+            AddTransactionError::VerificationFailed(tx_verify_error) => match tx_verify_error {
+                VerifyTxError::InputNotesAlreadyConsumed(_) => {
+                    SubmitProvenTransactionError::InputNotesAlreadyConsumed
+                },
+                VerifyTxError::StoreConnectionFailed(_) => {
+                    SubmitProvenTransactionError::InternalError
+                },
+                VerifyTxError::UnauthenticatedNotesNotFound(_) => {
+                    SubmitProvenTransactionError::UnauthenticatedNotesNotFound
+                },
+                VerifyTxError::OutputNotesAlreadyExist(_) => {
+                    SubmitProvenTransactionError::OutputNotesAlreadyExist
+                },
+                VerifyTxError::IncorrectAccountInitialCommitment { .. } => {
+                    SubmitProvenTransactionError::IncorrectAccountInitialCommitment
+                },
+                VerifyTxError::InvalidTransactionProof(_) => {
+                    SubmitProvenTransactionError::InvalidTransactionProof
+                },
+            },
+            AddTransactionError::StaleInputs { .. } => SubmitProvenTransactionError::InternalError,
+            AddTransactionError::Expired { .. } => SubmitProvenTransactionError::TransactionExpired,
+            AddTransactionError::TransactionDeserializationFailed(_) => {
+                SubmitProvenTransactionError::DeserializationFailed
+            },
         }
     }
 }
 
+impl From<AddTransactionError> for tonic::Status {
+    fn from(value: AddTransactionError) -> Self {
+        let api_error = value.api_error();
+
+        let message = if api_error.is_internal() {
+            "Internal error".to_owned()
+        } else {
+            value.as_report()
+        };
+
+        tonic::Status::with_details(
+            api_error.tonic_code(),
+            message,
+            // Details are serialized as a single byte containing the error code value.
+            // Clients can decode this by reading the first byte of the details field.
+            // Example: details[0] will contain the SubmitProvenTransactionError enum value (0-8)
+            vec![api_error.api_code()].into(),
+        )
+    }
+}
+
 // Submit proven batch by user errors
 // =================================================================================================
 
diff --git a/crates/block-producer/src/errors_test.rs b/crates/block-producer/src/errors_test.rs
new file mode 100644
index 000000000..7f442bdf9
--- /dev/null
+++ b/crates/block-producer/src/errors_test.rs
@@ -0,0 +1,59 @@
+#[cfg(test)]
+mod tests {
+    use miden_node_proto::generated::errors::SubmitProvenTransactionError;
+    use miden_objects::Word;
+    use miden_objects::block::BlockNumber;
+    use miden_objects::note::{NoteId, Nullifier};
+    use miden_tx::utils::DeserializationError;
+
+    use crate::errors::{AddTransactionError, VerifyTxError};
+
+    #[rstest::rstest]
+    #[test]
+    #[case::inputs_already_consumed_error(
+        AddTransactionError::VerificationFailed(
+            VerifyTxError::InputNotesAlreadyConsumed(vec![Nullifier::dummy(1)])
+        ),
+        SubmitProvenTransactionError::InputNotesAlreadyConsumed,
+        "verification failed",
+    )]
+    #[case::unauthenticated_notes_not_found_error(
+        AddTransactionError::VerificationFailed(
+            VerifyTxError::UnauthenticatedNotesNotFound(vec![NoteId::new(Word::default(), Word::default())])
+        ),
+        SubmitProvenTransactionError::UnauthenticatedNotesNotFound,
+        "verification failed",
+    )]
+    #[case::stale_inputs_error(
+        AddTransactionError::StaleInputs { input_block: BlockNumber::from(100), stale_limit: BlockNumber::from(150) },
+        SubmitProvenTransactionError::InternalError,
+        "Internal error",
+    )]
+    #[case::expired_error(
+        AddTransactionError::Expired { expired_at: BlockNumber::from(200), limit: BlockNumber::from(250) },
+        SubmitProvenTransactionError::TransactionExpired,
+        "expired",
+    )]
+    #[case::transaction_deserialization_failed_error(
+        AddTransactionError::TransactionDeserializationFailed(DeserializationError::InvalidValue("test error".to_string())),
+        SubmitProvenTransactionError::DeserializationFailed,
+        "deserialization",
+    )]
+    fn submit_transaction_error_mapping(
+        #[case] uut: AddTransactionError,
+        #[case] expected: SubmitProvenTransactionError,
+        #[case] message: &str,
+    ) {
+        let status = tonic::Status::from(uut);
+        assert_eq!(status.code(), expected.tonic_code());
+        assert!(status.message().contains(message));
+
+        let api_code = match status.details() {
+            &[single] => single,
+            other => panic!(
+                "Details should contain exactly one byte for the api error code, but got {other:?}"
+            ),
+        };
+        assert_eq!(api_code, expected.api_code());
+    }
+}
diff --git a/crates/block-producer/src/lib.rs b/crates/block-producer/src/lib.rs
index 817c03aa0..81482ea08 100644
--- a/crates/block-producer/src/lib.rs
+++ b/crates/block-producer/src/lib.rs
@@ -15,6 +15,9 @@ pub mod errors;
 #[cfg(not(feature = "testing"))]
 mod errors;
 
+#[cfg(test)]
+mod errors_test;
+
 pub mod server;
 pub use server::BlockProducer;
 
diff --git a/crates/proto/build.rs b/crates/proto/build.rs
index 39e7c908c..015fb0f7d 100644
--- a/crates/proto/build.rs
+++ b/crates/proto/build.rs
@@ -4,6 +4,7 @@ use std::path::{Path, PathBuf};
 use fs_err as fs;
 use miden_node_proto_build::{
     block_producer_api_descriptor,
+    errors_api_descriptor,
     remote_prover_api_descriptor,
     rpc_api_descriptor,
     store_block_producer_api_descriptor,
@@ -46,6 +47,7 @@ fn main() -> miette::Result<()> {
     generate_bindings(store_shared_api_descriptor(), &dst_dir)?;
     generate_bindings(block_producer_api_descriptor(), &dst_dir)?;
     generate_bindings(remote_prover_api_descriptor(), &dst_dir)?;
+    generate_bindings(errors_api_descriptor(), &dst_dir)?;
 
     generate_mod_rs(&dst_dir).into_diagnostic().wrap_err("generating mod.rs")?;
 
diff --git a/crates/proto/src/domain/errors.rs b/crates/proto/src/domain/errors.rs
new file mode 100644
index 000000000..3e03d3dd1
--- /dev/null
+++ b/crates/proto/src/domain/errors.rs
@@ -0,0 +1,22 @@
+use crate::generated::errors::SubmitProvenTransactionError;
+
+impl SubmitProvenTransactionError {
+    pub fn api_code(&self) -> u8 {
+        *self as u8
+    }
+
+    pub fn tonic_code(&self) -> tonic::Code {
+        match self {
+            SubmitProvenTransactionError::InternalError
+            | SubmitProvenTransactionError::Unspecified => tonic::Code::Internal,
+            _ => tonic::Code::InvalidArgument,
+        }
+    }
+
+    pub fn is_internal(&self) -> bool {
+        matches!(
+            self,
+            SubmitProvenTransactionError::InternalError | SubmitProvenTransactionError::Unspecified
+        )
+    }
+}
diff --git a/crates/proto/src/domain/mod.rs b/crates/proto/src/domain/mod.rs
index f70c8f738..6d023a1a4 100644
--- a/crates/proto/src/domain/mod.rs
+++ b/crates/proto/src/domain/mod.rs
@@ -2,6 +2,7 @@ pub mod account;
 pub mod batch;
 pub mod block;
 pub mod digest;
+pub mod errors;
 pub mod mempool;
 pub mod merkle;
 pub mod note;
diff --git a/crates/proto/src/generated/errors.rs b/crates/proto/src/generated/errors.rs
new file mode 100644
index 000000000..60d9318e2
--- /dev/null
+++ b/crates/proto/src/generated/errors.rs
@@ -0,0 +1,52 @@
+// This file is @generated by prost-build.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum SubmitProvenTransactionError {
+    Unspecified = 0,
+    InternalError = 1,
+    DeserializationFailed = 2,
+    InvalidTransactionProof = 3,
+    IncorrectAccountInitialCommitment = 4,
+    InputNotesAlreadyConsumed = 5,
+    UnauthenticatedNotesNotFound = 6,
+    OutputNotesAlreadyExist = 7,
+    TransactionExpired = 8,
+}
+impl SubmitProvenTransactionError {
+    /// String value of the enum field names used in the ProtoBuf definition.
+    ///
+    /// The values are not transformed in any way and thus are considered stable
+    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
+    pub fn as_str_name(&self) -> &'static str {
+        match self {
+            Self::Unspecified => "SUBMIT_PROVEN_TRANSACTION_ERROR_UNSPECIFIED",
+            Self::InternalError => "INTERNAL_ERROR",
+            Self::DeserializationFailed => "DESERIALIZATION_FAILED",
+            Self::InvalidTransactionProof => "INVALID_TRANSACTION_PROOF",
+            Self::IncorrectAccountInitialCommitment => {
+                "INCORRECT_ACCOUNT_INITIAL_COMMITMENT"
+            }
+            Self::InputNotesAlreadyConsumed => "INPUT_NOTES_ALREADY_CONSUMED",
+            Self::UnauthenticatedNotesNotFound => "UNAUTHENTICATED_NOTES_NOT_FOUND",
+            Self::OutputNotesAlreadyExist => "OUTPUT_NOTES_ALREADY_EXIST",
+            Self::TransactionExpired => "TRANSACTION_EXPIRED",
+        }
+    }
+    /// Creates an enum from field names used in the ProtoBuf definition.
+    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
+        match value {
+            "SUBMIT_PROVEN_TRANSACTION_ERROR_UNSPECIFIED" => Some(Self::Unspecified),
+            "INTERNAL_ERROR" => Some(Self::InternalError),
+            "DESERIALIZATION_FAILED" => Some(Self::DeserializationFailed),
+            "INVALID_TRANSACTION_PROOF" => Some(Self::InvalidTransactionProof),
+            "INCORRECT_ACCOUNT_INITIAL_COMMITMENT" => {
+                Some(Self::IncorrectAccountInitialCommitment)
+            }
+            "INPUT_NOTES_ALREADY_CONSUMED" => Some(Self::InputNotesAlreadyConsumed),
+            "UNAUTHENTICATED_NOTES_NOT_FOUND" => Some(Self::UnauthenticatedNotesNotFound),
+            "OUTPUT_NOTES_ALREADY_EXIST" => Some(Self::OutputNotesAlreadyExist),
+            "TRANSACTION_EXPIRED" => Some(Self::TransactionExpired),
+            _ => None,
+        }
+    }
+}
diff --git a/crates/proto/src/generated/mod.rs b/crates/proto/src/generated/mod.rs
index 799aa1b71..36812988b 100644
--- a/crates/proto/src/generated/mod.rs
+++ b/crates/proto/src/generated/mod.rs
@@ -5,6 +5,7 @@ pub mod account;
 pub mod block_producer;
 pub mod block_producer_store;
 pub mod blockchain;
+pub mod errors;
 pub mod note;
 pub mod ntx_builder_store;
 pub mod primitives;
diff --git a/crates/rpc/README.md b/crates/rpc/README.md
index b787195dc..75ce7ff82 100644
--- a/crates/rpc/README.md
+++ b/crates/rpc/README.md
@@ -76,7 +76,27 @@ Returns the script for a note by its root.
 
 ### SubmitProvenTransaction
 
-Submits proven transaction to the Miden network.
+Submits a proven transaction to the Miden network for inclusion in future blocks. The transaction must be properly formatted and include a valid execution proof.
+
+#### Error Handling
+
+When transaction submission fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                                    | Value | gRPC Status        | Description                                                   |
+|-----------------------------------------------|-------|--------------------|---------------------------------------------------------------|
+| `SUBMIT_PROVEN_TRANSACTION_ERROR_UNSPECIFIED` | 0     | `INTERNAL`         | Default/unspecified error                                     |
+| `INTERNAL_ERROR`                              | 1     | `INTERNAL`         | Internal server error occurred                                |
+| `DESERIALIZATION_FAILED`                      | 2     | `INVALID_ARGUMENT` | Transaction could not be deserialized                         |
+| `INVALID_TRANSACTION_PROOF`                   | 3     | `INVALID_ARGUMENT` | Transaction execution proof is invalid                        |
+| `INCORRECT_ACCOUNT_INITIAL_COMMITMENT`        | 4     | `INVALID_ARGUMENT` | Account's initial state doesn't match current state           |
+| `INPUT_NOTES_ALREADY_CONSUMED`                | 5     | `INVALID_ARGUMENT` | Input notes have already been consumed by another transaction |
+| `UNAUTHENTICATED_NOTES_NOT_FOUND`             | 6     | `INVALID_ARGUMENT` | Required unauthenticated notes were not found                 |
+| `OUTPUT_NOTES_ALREADY_EXIST`                  | 7     | `INVALID_ARGUMENT` | Output note IDs are already in use                            |
+| `TRANSACTION_EXPIRED`                         | 8     | `INVALID_ARGUMENT` | Transaction has exceeded its expiration block height          |
+
+**Error Details Serialization**: The `Status.details` field contains a single byte with the numeric error code value. Clients can decode this by reading `details[0]` to get the error code (0-8) and mapping it to the corresponding enum value.
+
+Clients should inspect both the gRPC status code and the detailed error code in the `Status.details` field to determine the appropriate response. For `INTERNAL_ERROR` cases, the detailed error message is replaced with a generic message for security reasons.
 
 ---
 
diff --git a/docs/src/user/rpc.md b/docs/src/user/rpc.md
index b70a5f708..8ffbead94 100644
--- a/docs/src/user/rpc.md
+++ b/docs/src/user/rpc.md
@@ -6,6 +6,35 @@ transactions and query the state of the blockchain.
 The gRPC service definition can be found in the Miden node's `proto`
 [directory](https://github.com/0xMiden/miden-node/tree/main/proto) in the `rpc.proto` file.
 
+## Error Handling
+
+The Miden node uses standard gRPC error reporting mechanisms. When an RPC call fails, a `Status` object is returned containing:
+
+- **Status Code**: Standard gRPC status codes (`INVALID_ARGUMENT`, `INTERNAL`, etc.).
+- **Message**: Human-readable error description.
+- **Details**: Additional structured error information (when available).
+
+For critical operations like transaction submission, detailed error codes are provided in the `Status.details` field to help clients understand the specific failure reason and take appropriate action.
+
+### Error Details Format
+
+The `Status.details` field contains the specific error code serialized as raw bytes:
+
+- **Format**: Single byte containing the numeric error code value
+- **Decoding**: Read the first byte to get the error code
+- **Mapping**: Map the numeric value to the corresponding error enum
+
+**Example decoding** (pseudocode):
+```
+if status.details.length > 0:
+    error_code = status.details[0]  // Extract first byte
+    switch error_code:
+        case 1: return "INTERNAL_ERROR"
+        case 2: return "DESERIALIZATION_FAILED"
+        case 5: return "INPUT_NOTES_ALREADY_CONSUMED"
+        // ... etc
+```
+
 <!--toc:start-->
 
 - [CheckNullifiers](#checknullifiers)
@@ -57,6 +86,24 @@ Request the script for a note by its root.
 
 Submit a transaction to the network.
 
+This endpoint accepts a proven transaction and attempts to add it to the mempool for inclusion in future blocks. The transaction must be properly formatted and include a valid execution proof.
+
+### Error Codes
+
+When transaction submission fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                                    | Value | gRPC Status        | Description                                                   |
+|-----------------------------------------------|-------|--------------------|---------------------------------------------------------------|
+| `SUBMIT_PROVEN_TRANSACTION_ERROR_UNSPECIFIED` | 0     | `INTERNAL`         | Default/unspecified error                                     |
+| `INTERNAL_ERROR`                              | 1     | `INTERNAL`         | Internal server error occurred                                |
+| `DESERIALIZATION_FAILED`                      | 2     | `INVALID_ARGUMENT` | Transaction could not be deserialized                         |
+| `INVALID_TRANSACTION_PROOF`                   | 3     | `INVALID_ARGUMENT` | Transaction execution proof is invalid                        |
+| `INCORRECT_ACCOUNT_INITIAL_COMMITMENT`        | 4     | `INVALID_ARGUMENT` | Account's initial state doesn't match current state           |
+| `INPUT_NOTES_ALREADY_CONSUMED`                | 5     | `INVALID_ARGUMENT` | Input notes have already been consumed by another transaction |
+| `UNAUTHENTICATED_NOTES_NOT_FOUND`             | 6     | `INVALID_ARGUMENT` | Required unauthenticated notes were not found                 |
+| `OUTPUT_NOTES_ALREADY_EXIST`                  | 7     | `INVALID_ARGUMENT` | Output note IDs are already in use                            |
+| `TRANSACTION_EXPIRED`                         | 8     | `INVALID_ARGUMENT` | Transaction has exceeded its expiration block height          |
+
 ## SyncNullifiers
 
 Returns nullifier synchronization data for a set of prefixes within a given block range. This method allows
@@ -108,11 +155,3 @@ This endpoint enables clients to maintain an updated view of account storage.
 ## Status
 
 Request the status of the node components. The response contains the current version of the RPC component and the connection status of the other components, including their versions and the number of the most recent block in the chain (chain tip).
-
-## SyncStorageMaps
-
-Returns storage map synchronization data for a specified public account within a given block range. This method allows clients to efficiently sync the storage map state of an account by retrieving only the changes that occurred between two blocks.
-
-Caller specifies the `account_id` of the public account and the block range (`block_from`, `block_to`) for which to retrieve storage updates. The response includes all storage map key-value updates that occurred within that range, along with the last block included in the sync and the current chain tip.
-
-This endpoint enables clients to maintain an updated view of account storage.
diff --git a/proto/build.rs b/proto/build.rs
index 0b172c706..80a9e0ace 100644
--- a/proto/build.rs
+++ b/proto/build.rs
@@ -12,6 +12,7 @@ const STORE_BLOCK_PRODUCER_PROTO: &str = "store/block_producer.proto";
 const STORE_SHARED_PROTO: &str = "store/shared.proto";
 const BLOCK_PRODUCER_PROTO: &str = "block_producer.proto";
 const REMOTE_PROVER_PROTO: &str = "remote_prover.proto";
+const ERRORS_PROTO: &str = "types/errors.proto";
 
 const RPC_DESCRIPTOR: &str = "rpc_file_descriptor.bin";
 const STORE_RPC_DESCRIPTOR: &str = "store_rpc_file_descriptor.bin";
@@ -20,6 +21,7 @@ const STORE_BLOCK_PRODUCER_DESCRIPTOR: &str = "store_block_producer_file_descrip
 const STORE_SHARED_DESCRIPTOR: &str = "store_shared_file_descriptor.bin";
 const BLOCK_PRODUCER_DESCRIPTOR: &str = "block_producer_file_descriptor.bin";
 const REMOTE_PROVER_DESCRIPTOR: &str = "remote_prover_file_descriptor.bin";
+const ERRORS_DESCRIPTOR: &str = "errors_file_descriptor.bin";
 
 /// Generates Rust protobuf bindings from .proto files.
 ///
@@ -79,5 +81,11 @@ fn main() -> miette::Result<()> {
         .into_diagnostic()
         .wrap_err("writing block producer file descriptor")?;
 
+    let errors_file_descriptor = protox::compile([ERRORS_PROTO], includes)?;
+    let errors_path = PathBuf::from(&out).join(ERRORS_DESCRIPTOR);
+    fs::write(&errors_path, errors_file_descriptor.encode_to_vec())
+        .into_diagnostic()
+        .wrap_err("writing errors file descriptor")?;
+
     Ok(())
 }
diff --git a/proto/proto/types/errors.proto b/proto/proto/types/errors.proto
new file mode 100644
index 000000000..2fc105f6c
--- /dev/null
+++ b/proto/proto/types/errors.proto
@@ -0,0 +1,14 @@
+syntax = "proto3";
+package errors;
+
+enum SubmitProvenTransactionError {
+    SUBMIT_PROVEN_TRANSACTION_ERROR_UNSPECIFIED = 0;
+    INTERNAL_ERROR = 1;
+    DESERIALIZATION_FAILED = 2;
+    INVALID_TRANSACTION_PROOF = 3;
+    INCORRECT_ACCOUNT_INITIAL_COMMITMENT = 4;
+    INPUT_NOTES_ALREADY_CONSUMED = 5;
+    UNAUTHENTICATED_NOTES_NOT_FOUND = 6;
+    OUTPUT_NOTES_ALREADY_EXIST = 7;
+    TRANSACTION_EXPIRED = 8;
+}
diff --git a/proto/src/lib.rs b/proto/src/lib.rs
index f7a96cf2f..575b74688 100644
--- a/proto/src/lib.rs
+++ b/proto/src/lib.rs
@@ -56,3 +56,10 @@ pub fn block_producer_api_descriptor() -> FileDescriptorSet {
     FileDescriptorSet::decode(&bytes[..])
         .expect("bytes should be a valid file descriptor created by build.rs")
 }
+
+/// Returns the Protobuf file descriptor for the errors API.
+pub fn errors_api_descriptor() -> FileDescriptorSet {
+    let bytes = include_bytes!(concat!(env!("OUT_DIR"), "/", "errors_file_descriptor.bin"));
+    FileDescriptorSet::decode(&bytes[..])
+        .expect("bytes should be a valid file descriptor created by build.rs")
+}

From 01c1b1370b2544321161a80a468b3e5d70144456 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Fri, 19 Sep 2025 19:01:14 -0300
Subject: [PATCH 17/78] refactor: one task per component in monitor (#1228)

* refactor: use one task per component to check

* review: improve results documentations in status.rs

* review: remove status check overhead using receiver in main server

* review: add constructor for ServiceStatus & refactor naming
---
 bin/network-monitor/src/frontend.rs |  42 +++++-
 bin/network-monitor/src/main.rs     |  86 +++++++----
 bin/network-monitor/src/status.rs   | 217 +++++++++++++++-------------
 3 files changed, 203 insertions(+), 142 deletions(-)

diff --git a/bin/network-monitor/src/frontend.rs b/bin/network-monitor/src/frontend.rs
index ad8d13ea9..8398ed731 100644
--- a/bin/network-monitor/src/frontend.rs
+++ b/bin/network-monitor/src/frontend.rs
@@ -1,15 +1,25 @@
 //! This file explicitly embeds each of the frontend files into the binary using `include_str!` and
 //! `include_bytes!`.
 
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
+
 use anyhow::Context;
 use axum::Router;
 use axum::http::header;
 use axum::response::{Html, IntoResponse, Response};
 use axum::routing::get;
+use tokio::sync::watch;
 use tracing::{info, instrument};
 
 use crate::COMPONENT;
-use crate::status::{MonitorConfig, SharedStatus};
+use crate::status::{MonitorConfig, NetworkStatus, ServiceStatus};
+
+/// State for the web server containing watch receivers for all services.
+#[derive(Clone)]
+pub struct ServerState {
+    pub rpc: watch::Receiver<ServiceStatus>,
+    pub provers: Vec<watch::Receiver<ServiceStatus>>,
+}
 
 /// Runs the frontend server.
 ///
@@ -17,9 +27,9 @@ use crate::status::{MonitorConfig, SharedStatus};
 ///
 /// # Arguments
 ///
-/// * `shared_status` - The shared status of the network.
+/// * `server_state` - The server state containing watch receivers for all services.
 /// * `config` - The configuration of the network.
-pub async fn serve(shared_status: SharedStatus, config: MonitorConfig) -> anyhow::Result<()> {
+pub async fn serve(server_state: ServerState, config: MonitorConfig) -> anyhow::Result<()> {
     // build our application with routes
     let app = Router::new()
         // Serve embedded assets
@@ -29,7 +39,7 @@ pub async fn serve(shared_status: SharedStatus, config: MonitorConfig) -> anyhow
         .route("/", get(get_dashboard))
         // API route for status data
         .route("/status", get(get_status))
-        .with_state(shared_status);
+        .with_state(server_state);
 
     let bind_address = format!("0.0.0.0:{}", config.port);
     info!("Starting web server on {bind_address}");
@@ -47,10 +57,26 @@ async fn get_dashboard() -> Html<&'static str> {
 
 #[instrument(target = COMPONENT, name = "frontend.get-status", skip_all, ret(level = "info"))]
 async fn get_status(
-    axum::extract::State(shared_status): axum::extract::State<SharedStatus>,
-) -> axum::response::Json<crate::status::NetworkStatus> {
-    let status = shared_status.lock().await;
-    axum::response::Json(status.clone())
+    axum::extract::State(server_state): axum::extract::State<ServerState>,
+) -> axum::response::Json<NetworkStatus> {
+    let current_time = 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 all remote prover statuses
+    for prover_rx in &server_state.provers {
+        services.push(prover_rx.borrow().clone());
+    }
+
+    let network_status = NetworkStatus { services, last_updated: current_time };
+
+    axum::response::Json(network_status)
 }
 
 async fn serve_css() -> Response {
diff --git a/bin/network-monitor/src/main.rs b/bin/network-monitor/src/main.rs
index ebf7b85f1..c79d8bf4c 100644
--- a/bin/network-monitor/src/main.rs
+++ b/bin/network-monitor/src/main.rs
@@ -1,16 +1,15 @@
 use std::collections::HashMap;
-use std::sync::Arc;
 
 use anyhow::Context;
 use miden_node_utils::logging::OpenTelemetry;
-use tokio::sync::Mutex;
+use tokio::sync::watch;
 use tokio::task::JoinSet;
 
 mod frontend;
 mod status;
 
-use frontend::serve;
-use status::{MonitorConfig, NetworkStatus, SharedStatus, check_status};
+use frontend::{ServerState, serve};
+use status::{MonitorConfig, ServiceStatus, run_remote_prover_status_task, run_rpc_status_task};
 use tracing::info;
 
 /// Component identifier for structured logging and tracing
@@ -19,6 +18,13 @@ pub const COMPONENT: &str = "miden-network-monitor";
 // MAIN
 // ================================================================================================
 
+/// Network Monitor main function.
+///
+/// This implementation spawns independent status checker tasks for each service (RPC and remote
+/// provers) that communicate via watch channels. Each task continuously monitors its service and
+/// sends status updates through a `watch::Sender`. The web server holds all the `watch::Receiver`
+/// ends and aggregates status on-demand when serving HTTP requests. If any task terminates
+/// unexpectedly, the entire process exits.
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
     miden_node_utils::logging::setup_tracing(OpenTelemetry::Disabled)?;
@@ -34,44 +40,60 @@ async fn main() -> anyhow::Result<()> {
         },
     };
 
-    // Initialize shared status state
-    let shared_status: SharedStatus =
-        Arc::new(Mutex::new(NetworkStatus { services: Vec::new(), last_updated: 0 }));
-
-    // Start tasks for frontend and status monitoring
-    let mut join_set = JoinSet::new();
-    let mut component_ids = HashMap::new();
-
-    // Spawn frontend task
-    let frontend_status = shared_status.clone();
-    let frontend_config = config.clone();
-    let id = join_set
-        .spawn(async move { serve(frontend_status, frontend_config).await })
-        .id();
-    component_ids.insert(id, "frontend");
-
-    // Spawn status monitoring task
-    let status_status = shared_status.clone();
-    let status_config = config.clone();
-    let id = join_set
-        .spawn(async move { check_status(status_status, status_config).await })
-        .id();
-    component_ids.insert(id, "status");
+    let mut tasks = JoinSet::new();
+    let mut component_ids: HashMap<_, String> = HashMap::new();
+
+    // Create initial empty status for services
+    let initial_rpc_status = ServiceStatus::new("RPC".to_string());
+
+    // Spawn the RPC checker
+    let (rpc_tx, rpc_rx) = watch::channel(initial_rpc_status);
+    let rpc_url = config.rpc_url.clone();
+    let id = tasks.spawn(async move { run_rpc_status_task(rpc_url, rpc_tx).await }).id();
+    component_ids.insert(id, "rpc-checker".to_string());
+
+    // Spawn the prover checkers
+    let mut prover_rxs = Vec::new();
+    for (i, prover_url) in config.remote_prover_urls.iter().enumerate() {
+        let name = format!("Prover-{}", i + 1);
+        let initial_prover_status = ServiceStatus::new(format!("Remote Prover ({name})"));
+
+        let (prover_tx, prover_rx) = watch::channel(initial_prover_status);
+        prover_rxs.push(prover_rx);
+
+        let component_name = format!("prover-checker-{}", i + 1);
+        let id = tasks
+            .spawn({
+                let prover_url = prover_url.clone();
+                let name = name.clone();
+
+                run_remote_prover_status_task(prover_url, name, prover_tx)
+            })
+            .id();
+        component_ids.insert(id, component_name);
+    }
+
+    // Create http server
+    let server_state = ServerState { rpc: rpc_rx, provers: prover_rxs };
+
+    let server_config = config.clone();
+    let id = tasks.spawn(async move { serve(server_state, server_config).await }).id();
+    component_ids.insert(id, "frontend".to_string());
 
     // Wait for any task to complete or fail
-    let component_result = join_set.join_next_with_id().await.expect("join set is not empty");
+    let component_result = tasks.join_next_with_id().await.expect("join set is not empty");
 
     // We expect components to run indefinitely, so we treat any return as fatal.
     let (id, err) = match component_result {
         Ok((id, Ok(_))) => (
             id,
             Err::<(), anyhow::Error>(anyhow::anyhow!("component completed unexpectedly")),
-        ), // SAFETY: The JoinSet is definitely not empty.
-        Ok((id, Err(err))) => (id, Err(err)), // SAFETY: The JoinSet is definitely not empty.
+        ),
+        Ok((id, Err(err))) => (id, Err(err)),
         Err(join_err) => (join_err.id(), Err(join_err).context("joining component task")),
     };
-    let component = component_ids.get(&id).unwrap_or(&"unknown"); // SAFETY: The JoinSet is definitely not empty.
+    let component_name = component_ids.get(&id).map_or("unknown", String::as_str);
 
     // Exit with error context
-    err.context(format!("component {component} failed"))
+    err.context(format!("component {component_name} failed"))
 }
diff --git a/bin/network-monitor/src/status.rs b/bin/network-monitor/src/status.rs
index 968a5375f..bd2148aee 100644
--- a/bin/network-monitor/src/status.rs
+++ b/bin/network-monitor/src/status.rs
@@ -1,9 +1,8 @@
 //! Network monitor status checker.
 //!
-//! This module contains the logic for checking the status of the network monitor.
-//! It is used to check the status of the network monitor and to update the shared status.
+//! This module contains the logic for checking the status of network services.
+//! Individual status checker tasks send updates via watch channels to the web server.
 
-use std::sync::Arc;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
 use anyhow::Context;
@@ -18,7 +17,7 @@ use miden_node_proto::generated::remote_prover::{
 use miden_node_proto::generated::rpc::RpcStatus;
 use miden_node_proto::generated::rpc_store::StoreStatus;
 use serde::{Deserialize, Serialize};
-use tokio::sync::Mutex;
+use tokio::sync::watch;
 use tokio::time::MissedTickBehavior;
 use tracing::instrument;
 use url::Url;
@@ -101,6 +100,22 @@ pub struct ServiceStatus {
     pub details: Option<ServiceDetails>,
 }
 
+impl ServiceStatus {
+    /// Creates a new `ServiceStatus` with the given name and default values.
+    ///
+    /// The `status` is initialized as "unknown", `last_checked` as 0, and both `error` and
+    /// `details` as None.
+    pub fn new(name: String) -> Self {
+        Self {
+            name,
+            status: "unknown".to_string(),
+            last_checked: 0,
+            error: None,
+            details: None,
+        }
+    }
+}
+
 /// Details of a service.
 ///
 /// This struct contains the details of a service, which is a union of the details of the service.
@@ -176,12 +191,6 @@ pub struct NetworkStatus {
     pub last_updated: u64,
 }
 
-/// Shared status of the network.
-///
-/// This struct contains the shared status of the network, which is a union of the shared status of
-/// the network.
-pub type SharedStatus = Arc<Mutex<NetworkStatus>>;
-
 // FROM IMPLEMENTATIONS
 // ================================================================================================
 
@@ -259,6 +268,49 @@ impl From<RpcStatus> for RpcStatusDetails {
 // RPC STATUS CHECKER
 // ================================================================================================
 
+/// Runs a task that continuously checks RPC status and updates a watch channel.
+///
+/// This function spawns a task that periodically checks the RPC service status
+/// and sends updates through a watch channel.
+///
+/// # Arguments
+///
+/// * `rpc_url` - The URL of the RPC service.
+/// * `status_sender` - The sender for the watch channel.
+///
+/// # Returns
+///
+/// `Ok(())` if the task completes successfully, or an error if the task fails.
+#[instrument(target = COMPONENT, name = "rpc-status-task", skip_all)]
+pub async fn run_rpc_status_task(
+    rpc_url: Url,
+    status_sender: watch::Sender<ServiceStatus>,
+) -> anyhow::Result<()> {
+    let mut rpc = ClientBuilder::new(rpc_url)
+        .without_tls()
+        .without_timeout()
+        .without_metadata_version()
+        .without_metadata_genesis()
+        .connect_lazy::<Rpc>();
+
+    let mut interval = tokio::time::interval(Duration::from_secs(3));
+    interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
+
+    loop {
+        interval.tick().await;
+
+        let current_time = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .context("failed to get current time")?
+            .as_secs();
+
+        let status = check_rpc_status(&mut rpc, current_time).await;
+
+        // Send the status update (ignore if no receivers)
+        let _ = status_sender.send(status);
+    }
+}
+
 /// Checks the status of the RPC service.
 ///
 /// This function checks the status of the RPC service.
@@ -304,6 +356,59 @@ async fn check_rpc_status(
 // REMOTE PROVER STATUS CHECKER
 // ================================================================================================
 
+/// Runs a task that continuously checks remote prover status and updates a watch channel.
+///
+/// This function spawns a task that periodically checks a remote prover service status
+/// and sends updates through a watch channel.
+///
+/// # Arguments
+///
+/// * `prover_url` - The URL of the remote prover service.
+/// * `name` - The name of the remote prover.
+/// * `status_sender` - The sender for the watch channel.
+///
+/// # Returns
+///
+/// `Ok(())` if the monitoring task runs and completes successfully, or an error if there are
+/// connection issues or failures while checking the remote prover status.
+#[instrument(target = COMPONENT, name = "remote-prover-status-task", skip_all)]
+pub async fn run_remote_prover_status_task(
+    prover_url: Url,
+    name: String,
+    status_sender: watch::Sender<ServiceStatus>,
+) -> anyhow::Result<()> {
+    let url_str = prover_url.to_string();
+    let mut remote_prover = ClientBuilder::new(prover_url)
+        .without_tls()
+        .without_timeout()
+        .without_metadata_version()
+        .without_metadata_genesis()
+        .connect_lazy::<RemoteProverProxy>();
+
+    let mut interval = tokio::time::interval(Duration::from_secs(3));
+    interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
+
+    loop {
+        interval.tick().await;
+
+        let current_time = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .context("failed to get current time")?
+            .as_secs();
+
+        let status = check_remote_prover_status(
+            &mut remote_prover,
+            name.clone(),
+            url_str.clone(),
+            current_time,
+        )
+        .await;
+
+        // Send the status update (ignore if no receivers)
+        let _ = status_sender.send(status);
+    }
+}
+
 /// Checks the status of the remote prover service.
 ///
 /// This function checks the status of the remote prover service.
@@ -362,95 +467,3 @@ async fn check_remote_prover_status(
         },
     }
 }
-
-// NETWORK STATUS CHECKER
-// ================================================================================================
-
-/// Checks the status of the network.
-///
-/// This function checks the status of the network.
-///
-/// # Arguments
-///
-/// * `shared_status` - The shared status of the network.
-/// * `config` - The configuration for the monitor.
-///
-/// # Returns
-///
-/// A Result containing the status of the network.
-///
-/// # Errors
-///
-/// This function can return an error if the current time cannot be retrieved.
-///
-/// # Panics
-///
-/// This function can panic if the shared status cannot be locked.
-#[instrument(target = COMPONENT, name = "check-status", skip_all, ret(level = "info"), err)]
-pub async fn check_status(
-    shared_status: SharedStatus,
-    config: MonitorConfig,
-) -> anyhow::Result<()> {
-    let mut rpc = ClientBuilder::new(config.rpc_url.clone())
-        .without_tls()
-        .without_timeout()
-        .without_metadata_version()
-        .without_metadata_genesis()
-        .connect_lazy::<Rpc>();
-
-    // Create remote prover clients for each URL
-    let mut remote_provers: Vec<(
-        String,
-        String,
-        miden_node_proto::clients::RemoteProverProxyClient,
-    )> = config
-        .remote_prover_urls
-        .iter()
-        .enumerate()
-        .map(|(i, url)| {
-            let name = format!("Prover-{}", i + 1);
-            let url_str = url.to_string();
-            let client = ClientBuilder::new(url.clone())
-                .without_tls()
-                .without_timeout()
-                .without_metadata_version()
-                .without_metadata_genesis()
-                .connect_lazy::<RemoteProverProxy>();
-            (name, url_str, client)
-        })
-        .collect();
-
-    let mut interval = tokio::time::interval(Duration::from_secs(3));
-    // Don't delay the first tick
-    interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
-
-    loop {
-        interval.tick().await;
-
-        let current_time = SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .context("failed to get current time")?
-            .as_secs();
-
-        let mut services = Vec::new();
-
-        // Check RPC status
-        let rpc_status = check_rpc_status(&mut rpc, current_time).await;
-        services.push(rpc_status);
-
-        // Check each Remote Prover status
-        for (name, url, remote_prover) in &mut remote_provers {
-            let remote_prover_status =
-                check_remote_prover_status(remote_prover, name.clone(), url.clone(), current_time)
-                    .await;
-            services.push(remote_prover_status);
-        }
-
-        // Update shared status
-        {
-            let mut status = shared_status.lock().await;
-            status.services = services;
-            status.last_updated = current_time;
-        }
-    }
-}

From 6c87cc01b74b9913609cf75fc8321f85a1f64333 Mon Sep 17 00:00:00 2001
From: Bobbin Threadbare <bobbinth@protonmail.com>
Date: Sat, 20 Sep 2025 00:49:46 -0700
Subject: [PATCH 18/78] docs: minor mdBook updates for gRPC reference

---
 crates/rpc/README.md |  22 ++++----
 docs/src/user/rpc.md | 132 +++++++++++++++++++++----------------------
 2 files changed, 74 insertions(+), 80 deletions(-)

diff --git a/crates/rpc/README.md b/crates/rpc/README.md
index 75ce7ff82..a14ac8063 100644
--- a/crates/rpc/README.md
+++ b/crates/rpc/README.md
@@ -82,17 +82,17 @@ Submits a proven transaction to the Miden network for inclusion in future blocks
 
 When transaction submission fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
 
-| Error Code                                    | Value | gRPC Status        | Description                                                   |
-|-----------------------------------------------|-------|--------------------|---------------------------------------------------------------|
-| `SUBMIT_PROVEN_TRANSACTION_ERROR_UNSPECIFIED` | 0     | `INTERNAL`         | Default/unspecified error                                     |
-| `INTERNAL_ERROR`                              | 1     | `INTERNAL`         | Internal server error occurred                                |
-| `DESERIALIZATION_FAILED`                      | 2     | `INVALID_ARGUMENT` | Transaction could not be deserialized                         |
-| `INVALID_TRANSACTION_PROOF`                   | 3     | `INVALID_ARGUMENT` | Transaction execution proof is invalid                        |
-| `INCORRECT_ACCOUNT_INITIAL_COMMITMENT`        | 4     | `INVALID_ARGUMENT` | Account's initial state doesn't match current state           |
-| `INPUT_NOTES_ALREADY_CONSUMED`                | 5     | `INVALID_ARGUMENT` | Input notes have already been consumed by another transaction |
-| `UNAUTHENTICATED_NOTES_NOT_FOUND`             | 6     | `INVALID_ARGUMENT` | Required unauthenticated notes were not found                 |
-| `OUTPUT_NOTES_ALREADY_EXIST`                  | 7     | `INVALID_ARGUMENT` | Output note IDs are already in use                            |
-| `TRANSACTION_EXPIRED`                         | 8     | `INVALID_ARGUMENT` | Transaction has exceeded its expiration block height          |
+| Error Code                             | Value | gRPC Status        | Description                                                   |
+|----------------------------------------|-------|--------------------|---------------------------------------------------------------|
+| `UNSPECIFIED_ERROR`                    | 0     | `INTERNAL`         | Default/unspecified error                                     |
+| `INTERNAL_ERROR`                       | 1     | `INTERNAL`         | Internal server error occurred                                |
+| `DESERIALIZATION_FAILED`               | 2     | `INVALID_ARGUMENT` | Transaction could not be deserialized                         |
+| `INVALID_TRANSACTION_PROOF`            | 3     | `INVALID_ARGUMENT` | Transaction execution proof is invalid                        |
+| `INCORRECT_ACCOUNT_INITIAL_COMMITMENT` | 4     | `INVALID_ARGUMENT` | Account's initial state doesn't match current state           |
+| `INPUT_NOTES_ALREADY_CONSUMED`         | 5     | `INVALID_ARGUMENT` | Input notes have already been consumed by another transaction |
+| `UNAUTHENTICATED_NOTES_NOT_FOUND`      | 6     | `INVALID_ARGUMENT` | Required unauthenticated notes were not found                 |
+| `OUTPUT_NOTES_ALREADY_EXIST`           | 7     | `INVALID_ARGUMENT` | Output note IDs are already in use                            |
+| `TRANSACTION_EXPIRED`                  | 8     | `INVALID_ARGUMENT` | Transaction has exceeded its expiration block height          |
 
 **Error Details Serialization**: The `Status.details` field contains a single byte with the numeric error code value. Clients can decode this by reading `details[0]` to get the error code (0-8) and mapping it to the corresponding enum value.
 
diff --git a/docs/src/user/rpc.md b/docs/src/user/rpc.md
index 8ffbead94..875d1146a 100644
--- a/docs/src/user/rpc.md
+++ b/docs/src/user/rpc.md
@@ -1,39 +1,8 @@
 # gRPC Reference
 
-This is a reference of the Node's public RPC interface. It consists of a gRPC API which may be used to submit
-transactions and query the state of the blockchain.
+This is a reference of the Node's public RPC interface. It consists of a gRPC API which may be used to submit transactions and query the state of the blockchain.
 
-The gRPC service definition can be found in the Miden node's `proto`
-[directory](https://github.com/0xMiden/miden-node/tree/main/proto) in the `rpc.proto` file.
-
-## Error Handling
-
-The Miden node uses standard gRPC error reporting mechanisms. When an RPC call fails, a `Status` object is returned containing:
-
-- **Status Code**: Standard gRPC status codes (`INVALID_ARGUMENT`, `INTERNAL`, etc.).
-- **Message**: Human-readable error description.
-- **Details**: Additional structured error information (when available).
-
-For critical operations like transaction submission, detailed error codes are provided in the `Status.details` field to help clients understand the specific failure reason and take appropriate action.
-
-### Error Details Format
-
-The `Status.details` field contains the specific error code serialized as raw bytes:
-
-- **Format**: Single byte containing the numeric error code value
-- **Decoding**: Read the first byte to get the error code
-- **Mapping**: Map the numeric value to the corresponding error enum
-
-**Example decoding** (pseudocode):
-```
-if status.details.length > 0:
-    error_code = status.details[0]  // Extract first byte
-    switch error_code:
-        case 1: return "INTERNAL_ERROR"
-        case 2: return "DESERIALIZATION_FAILED"
-        case 5: return "INPUT_NOTES_ALREADY_CONSUMED"
-        // ... etc
-```
+The gRPC service definition can be found in the Miden node's `proto` [directory](https://github.com/0xMiden/miden-node/tree/main/proto) in the `rpc.proto` file.
 
 <!--toc:start-->
 
@@ -54,77 +23,73 @@ if status.details.length > 0:
 
 <!--toc:end-->
 
-## CheckNullifiers
+## API Endpoints
+
+### CheckNullifiers
 
 Request proofs for a set of nullifiers.
 
-## GetAccountDetails
+### GetAccountDetails
 
 Request the latest state of an account.
 
-## GetAccountProofs
+### GetAccountProofs
 
 Request state proofs for accounts, including specific storage slots.
 
-## GetBlockByNumber
+### GetBlockByNumber
 
 Request the raw data for a specific block.
 
-## GetBlockHeaderByNumber
+### GetBlockHeaderByNumber
 
 Request a specific block header and its inclusion proof.
 
-## GetNotesById
+### GetNotesById
 
 Request a set of notes.
 
-## GetNoteScriptByRoot
+### GetNoteScriptByRoot
 
 Request the script for a note by its root.
 
-## SubmitProvenTransaction
+### SubmitProvenTransaction
 
 Submit a transaction to the network.
 
 This endpoint accepts a proven transaction and attempts to add it to the mempool for inclusion in future blocks. The transaction must be properly formatted and include a valid execution proof.
 
-### Error Codes
+#### Error Codes
 
 When transaction submission fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
 
-| Error Code                                    | Value | gRPC Status        | Description                                                   |
-|-----------------------------------------------|-------|--------------------|---------------------------------------------------------------|
-| `SUBMIT_PROVEN_TRANSACTION_ERROR_UNSPECIFIED` | 0     | `INTERNAL`         | Default/unspecified error                                     |
-| `INTERNAL_ERROR`                              | 1     | `INTERNAL`         | Internal server error occurred                                |
-| `DESERIALIZATION_FAILED`                      | 2     | `INVALID_ARGUMENT` | Transaction could not be deserialized                         |
-| `INVALID_TRANSACTION_PROOF`                   | 3     | `INVALID_ARGUMENT` | Transaction execution proof is invalid                        |
-| `INCORRECT_ACCOUNT_INITIAL_COMMITMENT`        | 4     | `INVALID_ARGUMENT` | Account's initial state doesn't match current state           |
-| `INPUT_NOTES_ALREADY_CONSUMED`                | 5     | `INVALID_ARGUMENT` | Input notes have already been consumed by another transaction |
-| `UNAUTHENTICATED_NOTES_NOT_FOUND`             | 6     | `INVALID_ARGUMENT` | Required unauthenticated notes were not found                 |
-| `OUTPUT_NOTES_ALREADY_EXIST`                  | 7     | `INVALID_ARGUMENT` | Output note IDs are already in use                            |
-| `TRANSACTION_EXPIRED`                         | 8     | `INVALID_ARGUMENT` | Transaction has exceeded its expiration block height          |
+| Error Code                             | Value | gRPC Status        | Description                                                   |
+|----------------------------------------|-------|--------------------|---------------------------------------------------------------|
+| `UNSPECIFIED_ERROR`                    | 0     | `INTERNAL`         | Default/unspecified error                                     |
+| `INTERNAL_ERROR`                       | 1     | `INTERNAL`         | Internal server error occurred                                |
+| `DESERIALIZATION_FAILED`               | 2     | `INVALID_ARGUMENT` | Transaction could not be deserialized                         |
+| `INVALID_TRANSACTION_PROOF`            | 3     | `INVALID_ARGUMENT` | Transaction execution proof is invalid                        |
+| `INCORRECT_ACCOUNT_INITIAL_COMMITMENT` | 4     | `INVALID_ARGUMENT` | Account's initial state doesn't match current state           |
+| `INPUT_NOTES_ALREADY_CONSUMED`         | 5     | `INVALID_ARGUMENT` | Input notes have already been consumed by another transaction |
+| `UNAUTHENTICATED_NOTES_NOT_FOUND`      | 6     | `INVALID_ARGUMENT` | Required unauthenticated notes were not found                 |
+| `OUTPUT_NOTES_ALREADY_EXIST`           | 7     | `INVALID_ARGUMENT` | Output note IDs are already in use                            |
+| `TRANSACTION_EXPIRED`                  | 8     | `INVALID_ARGUMENT` | Transaction has exceeded its expiration block height          |
 
-## SyncNullifiers
+### SyncNullifiers
 
-Returns nullifier synchronization data for a set of prefixes within a given block range. This method allows
-clients to efficiently track nullifier creation by retrieving only the nullifiers produced between two blocks.
+Returns nullifier synchronization data for a set of prefixes within a given block range. This method allows clients to efficiently track nullifier creation by retrieving only the nullifiers produced between two blocks.
 
-Caller specifies the `prefix_len` (currently only 16), the list of prefix values (`nullifiers`), and the block
-range (`block_from`, optional `block_to`). The response includes all matching nullifiers created within that
-range, the last block included in the response (`block_num`), and the current chain tip (`chain_tip`).
+Caller specifies the `prefix_len` (currently only 16), the list of prefix values (`nullifiers`), and the block range (`block_from`, optional `block_to`). The response includes all matching nullifiers created within that range, the last block included in the response (`block_num`), and the current chain tip (`chain_tip`).
 
-If the response is chunked (i.e., `block_num < block_to`), continue by issuing another request with
-`block_from = block_num + 1` to retrieve subsequent updates.
+If the response is chunked (i.e., `block_num < block_to`), continue by issuing another request with `block_from = block_num + 1` to retrieve subsequent updates.
 
-## SyncAccountVault
+### SyncAccountVault
 
 Returns information that allows clients to sync asset values for specific public accounts within a block range.
 
-For any `[block_from..block_to]` range, the latest known set of assets is returned for the requested account ID.
-The data can be split and a cutoff block may be selected if there are too many assets to sync. The response contains
-the chain tip so that the caller knows when it has been reached.
+For any `[block_from..block_to]` range, the latest known set of assets is returned for the requested account ID. The data can be split and a cutoff block may be selected if there are too many assets to sync. The response contains the chain tip so that the caller knows when it has been reached.
 
-## SyncNotes
+### SyncNotes
 
 Iteratively sync data for a given set of note tags.
 
@@ -134,7 +99,7 @@ The response includes each note's metadata and inclusion proof.
 
 A basic note sync can be implemented by repeatedly requesting the previous response's block until reaching the tip of the chain.
 
-## SyncState
+### SyncState
 
 Iteratively sync data for specific notes and accounts.
 
@@ -144,7 +109,7 @@ Each update response also contains info about new notes, accounts etc. created.
 
 The low part of note tags are redacted to preserve some degree of privacy. Returned data therefore contains additional notes which should be filtered out by the client.
 
-## SyncStorageMaps
+### SyncStorageMaps
 
 Returns storage map synchronization data for a specified public account within a given block range. This method allows clients to efficiently sync the storage map state of an account by retrieving only the changes that occurred between two blocks.
 
@@ -152,6 +117,35 @@ Caller specifies the `account_id` of the public account and the block range (`bl
 
 This endpoint enables clients to maintain an updated view of account storage.
 
-## Status
+### Status
 
 Request the status of the node components. The response contains the current version of the RPC component and the connection status of the other components, including their versions and the number of the most recent block in the chain (chain tip).
+
+## Error Handling
+
+The Miden node uses standard gRPC error reporting mechanisms. When an RPC call fails, a `Status` object is returned containing:
+
+- **Status Code**: Standard gRPC status codes (`INVALID_ARGUMENT`, `INTERNAL`, etc.).
+- **Message**: Human-readable error description.
+- **Details**: Additional structured error information (when available).
+
+For critical operations like transaction submission, detailed error codes are provided in the `Status.details` field to help clients understand the specific failure reason and take appropriate action.
+
+### Error Details Format
+
+The `Status.details` field contains the specific error code serialized as raw bytes:
+
+- **Format**: Single byte containing the numeric error code value
+- **Decoding**: Read the first byte to get the error code
+- **Mapping**: Map the numeric value to the corresponding error enum
+
+**Example decoding** (pseudocode):
+```
+if status.details.length > 0:
+    error_code = status.details[0]  // Extract first byte
+    switch error_code:
+        case 1: return "INTERNAL_ERROR"
+        case 2: return "DESERIALIZATION_FAILED"
+        case 5: return "INPUT_NOTES_ALREADY_CONSUMED"
+        // ... etc
+```

From 9a36efc34b2a7098e11252363be369ad8cb0dcf3 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Mon, 22 Sep 2025 21:44:58 -0300
Subject: [PATCH 19/78] fix: add env var to enable OTel in network monitor
 (#1237)

---
 bin/network-monitor/.env          |  1 +
 bin/network-monitor/README.md     |  1 +
 bin/network-monitor/src/main.rs   | 12 +++++++++++-
 bin/network-monitor/src/status.rs |  1 +
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/bin/network-monitor/.env b/bin/network-monitor/.env
index 4b9200f06..9d95137f7 100644
--- a/bin/network-monitor/.env
+++ b/bin/network-monitor/.env
@@ -1,3 +1,4 @@
 MIDEN_MONITOR_RPC_URL=http://0.0.0.0:57291
 MIDEN_MONITOR_REMOTE_PROVER_URLS=https://tx-prover.devnet.miden.io/,https://batch-prover.devnet.miden.io/
 MIDEN_MONITOR_PORT=3001
+MIDEN_MONITOR_ENABLE_OTEL=true
diff --git a/bin/network-monitor/README.md b/bin/network-monitor/README.md
index b1f7438b8..7d7dc3d0e 100644
--- a/bin/network-monitor/README.md
+++ b/bin/network-monitor/README.md
@@ -17,6 +17,7 @@ The monitor application uses environment variables for configuration:
 - `MIDEN_MONITOR_RPC_URL`: RPC service URL (default: `http://localhost:50051`)
 - `MIDEN_MONITOR_REMOTE_PROVER_URLS`: Comma-separated list of remote prover URLs (default: `http://localhost:50052`)
 - `MIDEN_MONITOR_PORT`: Web server port (default: `3000`)
+- `MIDEN_MONITOR_ENABLE_OTEL`: Enable OpenTelemetry tracing (default: `false`)
 
 ## Usage
 
diff --git a/bin/network-monitor/src/main.rs b/bin/network-monitor/src/main.rs
index c79d8bf4c..a53df0393 100644
--- a/bin/network-monitor/src/main.rs
+++ b/bin/network-monitor/src/main.rs
@@ -12,6 +12,8 @@ use frontend::{ServerState, serve};
 use status::{MonitorConfig, ServiceStatus, run_remote_prover_status_task, run_rpc_status_task};
 use tracing::info;
 
+use crate::status::ENABLE_OTEL_ENV_VAR;
+
 /// Component identifier for structured logging and tracing
 pub const COMPONENT: &str = "miden-network-monitor";
 
@@ -27,7 +29,15 @@ pub const COMPONENT: &str = "miden-network-monitor";
 /// unexpectedly, the entire process exits.
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    miden_node_utils::logging::setup_tracing(OpenTelemetry::Disabled)?;
+    if std::env::var(ENABLE_OTEL_ENV_VAR)
+        .unwrap_or_default()
+        .parse::<bool>()
+        .unwrap_or_default()
+    {
+        miden_node_utils::logging::setup_tracing(OpenTelemetry::Enabled)?;
+    } else {
+        miden_node_utils::logging::setup_tracing(OpenTelemetry::Disabled)?;
+    }
 
     // Load configuration from environment variables
     let config = match MonitorConfig::from_env() {
diff --git a/bin/network-monitor/src/status.rs b/bin/network-monitor/src/status.rs
index bd2148aee..a77746f5a 100644
--- a/bin/network-monitor/src/status.rs
+++ b/bin/network-monitor/src/status.rs
@@ -34,6 +34,7 @@ const DEFAULT_PORT: u16 = 3000;
 const RPC_URL_ENV_VAR: &str = "MIDEN_MONITOR_RPC_URL";
 const REMOTE_PROVER_URLS_ENV_VAR: &str = "MIDEN_MONITOR_REMOTE_PROVER_URLS";
 const PORT_ENV_VAR: &str = "MIDEN_MONITOR_PORT";
+pub(crate) const ENABLE_OTEL_ENV_VAR: &str = "MIDEN_MONITOR_ENABLE_OTEL";
 
 /// Configuration for the monitor.
 ///

From 69a84bc231799a0716e61da2ea8a955f46eac888 Mon Sep 17 00:00:00 2001
From: igamigo <ignacio.amigo@lambdaclass.com>
Date: Wed, 24 Sep 2025 04:35:03 -0300
Subject: [PATCH 20/78] chore: refresh protocol (#1235)

---
 Cargo.lock                                    | 15 ++++++++------
 bin/stress-test/src/seeding/mod.rs            | 10 ++++------
 crates/ntx-builder/src/transaction.rs         | 18 +++++++++++++----
 .../store/src/db/models/queries/accounts.rs   |  3 ++-
 crates/store/src/genesis/config/mod.rs        | 20 ++++++++-----------
 5 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c6d8a10c4..c6002ac2e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -124,6 +124,9 @@ name = "anyhow"
 version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
+dependencies = [
+ "backtrace",
+]
 
 [[package]]
 name = "arc-swap"
@@ -2056,7 +2059,7 @@ dependencies = [
 [[package]]
 name = "miden-block-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2128,7 +2131,7 @@ dependencies = [
 [[package]]
 name = "miden-lib"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
 dependencies = [
  "miden-assembly",
  "miden-objects",
@@ -2444,7 +2447,7 @@ dependencies = [
 [[package]]
 name = "miden-objects"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
 dependencies = [
  "bech32",
  "getrandom 0.3.3",
@@ -2577,7 +2580,7 @@ dependencies = [
 [[package]]
 name = "miden-testing"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
 dependencies = [
  "anyhow",
  "itertools",
@@ -2597,7 +2600,7 @@ dependencies = [
 [[package]]
 name = "miden-tx"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2612,7 +2615,7 @@ dependencies = [
 [[package]]
 name = "miden-tx-batch-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
 dependencies = [
  "miden-objects",
  "miden-tx",
diff --git a/bin/stress-test/src/seeding/mod.rs b/bin/stress-test/src/seeding/mod.rs
index 72604446c..d9e76d5ed 100644
--- a/bin/stress-test/src/seeding/mod.rs
+++ b/bin/stress-test/src/seeding/mod.rs
@@ -311,14 +311,13 @@ fn create_note(faucet_id: AccountId, target_id: AccountId, rng: &mut RpoRandomCo
 /// the given index.
 fn create_account(public_key: PublicKey, index: u64, storage_mode: AccountStorageMode) -> Account {
     let init_seed: Vec<_> = index.to_be_bytes().into_iter().chain([0u8; 24]).collect();
-    let (new_account, _) = AccountBuilder::new(init_seed.try_into().unwrap())
+    AccountBuilder::new(init_seed.try_into().unwrap())
         .account_type(AccountType::RegularAccountImmutableCode)
         .storage_mode(storage_mode)
         .with_auth_component(AuthRpoFalcon512::new(public_key))
         .with_component(BasicWallet)
         .build()
-        .unwrap();
-    new_account
+        .unwrap()
 }
 
 /// Creates a new faucet account.
@@ -329,14 +328,13 @@ fn create_faucet() -> Account {
     let init_seed = [0_u8; 32];
 
     let token_symbol = TokenSymbol::new("TEST").unwrap();
-    let (new_faucet, _seed) = AccountBuilder::new(init_seed)
+    AccountBuilder::new(init_seed)
         .account_type(AccountType::FungibleFaucet)
         .storage_mode(AccountStorageMode::Private)
         .with_component(BasicFungibleFaucet::new(token_symbol, 2, Felt::new(u64::MAX)).unwrap())
         .with_auth_component(AuthRpoFalcon512::new(key_pair.public_key()))
         .build()
-        .unwrap();
-    new_faucet
+        .unwrap()
 }
 
 /// Creates a proven batch from a list of transactions and a reference block.
diff --git a/crates/ntx-builder/src/transaction.rs b/crates/ntx-builder/src/transaction.rs
index 3aa70408c..849cd5aa2 100644
--- a/crates/ntx-builder/src/transaction.rs
+++ b/crates/ntx-builder/src/transaction.rs
@@ -6,6 +6,7 @@ use miden_objects::asset::AssetWitness;
 use miden_objects::block::{BlockHeader, BlockNumber};
 use miden_objects::note::Note;
 use miden_objects::transaction::{
+    AccountInputs,
     ExecutedTransaction,
     InputNote,
     InputNotes,
@@ -260,9 +261,8 @@ impl DataStore for NtxDataStore {
         &self,
         account_id: AccountId,
         ref_blocks: BTreeSet<BlockNumber>,
-    ) -> impl FutureMaybeSend<
-        Result<(PartialAccount, Option<Word>, BlockHeader, PartialBlockchain), DataStoreError>,
-    > {
+    ) -> impl FutureMaybeSend<Result<(PartialAccount, BlockHeader, PartialBlockchain), DataStoreError>>
+    {
         let account = self.account.clone();
         async move {
             if account.id() != account_id {
@@ -276,10 +276,20 @@ impl DataStore for NtxDataStore {
                 None => return Err(DataStoreError::other("no reference block requested")),
             }
 
-            Ok((account.into(), None, self.reference_header.clone(), self.chain_mmr.clone()))
+            let partial_account = PartialAccount::from(&account);
+
+            Ok((partial_account, self.reference_header.clone(), self.chain_mmr.clone()))
         }
     }
 
+    fn get_foreign_account_inputs(
+        &self,
+        foreign_account_id: AccountId,
+        _ref_block: BlockNumber,
+    ) -> impl FutureMaybeSend<Result<AccountInputs, DataStoreError>> {
+        async move { Err(DataStoreError::AccountNotFound(foreign_account_id)) }
+    }
+
     fn get_vault_asset_witness(
         &self,
         account_id: AccountId,
diff --git a/crates/store/src/db/models/queries/accounts.rs b/crates/store/src/db/models/queries/accounts.rs
index 867fe1df8..4f3946062 100644
--- a/crates/store/src/db/models/queries/accounts.rs
+++ b/crates/store/src/db/models/queries/accounts.rs
@@ -531,7 +531,8 @@ impl TryInto<Option<Account>> for AccountWithCodeRawJoined {
             let code = AccountCode::read_from_bytes(&code)?;
             let nonce = raw_sql_to_nonce(nonce);
             let nonce = Felt::new(nonce);
-            Some(Account::from_parts(account_id, vault, storage, code, nonce))
+            let account = Account::new_unchecked(account_id, vault, storage, code, nonce, None);
+            Some(account)
         } else {
             // a private account
             None
diff --git a/crates/store/src/genesis/config/mod.rs b/crates/store/src/genesis/config/mod.rs
index 531ed696a..3f36676e0 100644
--- a/crates/store/src/genesis/config/mod.rs
+++ b/crates/store/src/genesis/config/mod.rs
@@ -27,7 +27,7 @@ use miden_objects::account::{
 use miden_objects::asset::{FungibleAsset, TokenSymbol};
 use miden_objects::block::FeeParameters;
 use miden_objects::crypto::dsa::rpo_falcon512::SecretKey;
-use miden_objects::{Felt, FieldElement, ONE, TokenSymbolError, Word, ZERO};
+use miden_objects::{Felt, FieldElement, ONE, TokenSymbolError, ZERO};
 use rand::distr::weighted::Weight;
 use rand::{Rng, SeedableRng};
 use rand_chacha::ChaCha20Rng;
@@ -119,8 +119,7 @@ impl GenesisConfig {
             .chain(fungible_faucet_configs.into_iter())
         {
             let symbol = fungible_faucet_config.symbol.clone();
-            let (faucet_account, faucet_account_seed, secret_key) =
-                fungible_faucet_config.build_account()?;
+            let (faucet_account, secret_key) = fungible_faucet_config.build_account()?;
 
             if faucet_accounts.insert(symbol.clone(), faucet_account.clone()).is_some() {
                 return Err(GenesisConfigError::DuplicateFaucetDefinition { symbol });
@@ -130,7 +129,6 @@ impl GenesisConfig {
                 format!("faucet_{symbol}.mac", symbol = symbol.to_string().to_lowercase()),
                 faucet_account.id(),
                 secret_key,
-                faucet_account_seed,
             ));
             // Do _not_ collect the account, only after we know all wallet assets
             // we know the remaining supply in the faucets.
@@ -166,7 +164,7 @@ impl GenesisConfig {
                 AccountType::RegularAccountImmutableCode
             };
             let account_storage_mode = storage_mode.into();
-            let (mut wallet_account, wallet_account_seed) =
+            let mut wallet_account =
                 create_basic_wallet(init_seed, auth, account_type, account_storage_mode)?;
 
             // Add fungible assets and track the faucet adjustments per faucet/asset.
@@ -199,7 +197,6 @@ impl GenesisConfig {
                 format!("wallet_{index:0zero_padding_width$}.mac"),
                 wallet_account.id(),
                 secret_key,
-                wallet_account_seed,
             ));
 
             wallet_accounts.push(wallet_account);
@@ -335,7 +332,7 @@ pub struct FungibleFaucetConfig {
 
 impl FungibleFaucetConfig {
     /// Create a fungible faucet from a config entry
-    fn build_account(self) -> Result<(Account, Word, SecretKey), GenesisConfigError> {
+    fn build_account(self) -> Result<(Account, SecretKey), GenesisConfigError> {
         let FungibleFaucetConfig {
             symbol,
             decimals,
@@ -353,7 +350,7 @@ impl FungibleFaucetConfig {
         let component = BasicFungibleFaucet::new(*symbol.as_ref(), decimals, max_supply)?;
 
         // It's similar to `fn create_basic_fungible_faucet`, but we need to cover more cases.
-        let (faucet_account, faucet_account_seed) = AccountBuilder::new(init_seed)
+        let faucet_account = AccountBuilder::new(init_seed)
             .account_type(AccountType::FungibleFaucet)
             .storage_mode(storage_mode.into())
             .with_auth_component(auth)
@@ -362,7 +359,7 @@ impl FungibleFaucetConfig {
 
         debug_assert_eq!(faucet_account.nonce(), Felt::ZERO);
 
-        Ok((faucet_account, faucet_account_seed, secret_key))
+        Ok((faucet_account, secret_key))
     }
 }
 
@@ -429,7 +426,7 @@ pub struct AccountFileWithName {
 #[derive(Debug, Clone)]
 pub struct AccountSecrets {
     // name, account, private key, account seed
-    pub secrets: Vec<(String, AccountId, SecretKey, Word)>,
+    pub secrets: Vec<(String, AccountId, SecretKey)>,
 }
 
 impl AccountSecrets {
@@ -444,13 +441,12 @@ impl AccountSecrets {
         let account_lut = IndexMap::<AccountId, Account>::from_iter(
             genesis_state.accounts.iter().map(|account| (account.id(), account.clone())),
         );
-        self.secrets.iter().map(move |(name, account_id, secret_key, account_seed)| {
+        self.secrets.iter().map(move |(name, account_id, secret_key)| {
             let account = account_lut
                 .get(account_id)
                 .ok_or(GenesisConfigError::MissingGenesisAccount { account_id: *account_id })?;
             let account_file = AccountFile::new(
                 account.clone(),
-                Some(*account_seed),
                 vec![AuthSecretKey::RpoFalcon512(secret_key.clone())],
             );
             let name = name.to_string();

From 881576e2e3f3e3335c54bfa65f8bad9dfe5602d9 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Thu, 25 Sep 2025 17:52:57 -0300
Subject: [PATCH 21/78] feat: add remote prover tests run on monitor (#1236)

---
 CHANGELOG.md                             |   1 +
 Cargo.lock                               |  22 +-
 bin/network-monitor/Cargo.toml           |   7 +
 bin/network-monitor/README.md            |  48 +++-
 bin/network-monitor/assets/index.css     | 120 ++++++++-
 bin/network-monitor/assets/index.html    | 222 +++++++++++++---
 bin/network-monitor/src/config.rs        |  88 +++++++
 bin/network-monitor/src/faucet.rs        | 257 +++++++++++++++++++
 bin/network-monitor/src/frontend.rs      |  27 +-
 bin/network-monitor/src/main.rs          | 312 +++++++++++++++++++---
 bin/network-monitor/src/remote_prover.rs | 313 +++++++++++++++++++++++
 bin/network-monitor/src/status.rs        | 257 +++++++------------
 crates/proto/src/clients/mod.rs          |  15 +-
 13 files changed, 1433 insertions(+), 256 deletions(-)
 create mode 100644 bin/network-monitor/src/config.rs
 create mode 100644 bin/network-monitor/src/faucet.rs
 create mode 100644 bin/network-monitor/src/remote_prover.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f6ef68ea..d8080984c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Use `tonic` error codes for gRPC errors ([#1208](https://github.com/0xMiden/miden-node/pull/1208)).
 - [BREAKING] Replace `GetAccountProofs` with `GetAccountProof` in the public store API (#[1211](https://github.com/0xMiden/miden-node/pull/1211)).
 - Implemented storage map `DataStore` function ([#1226](https://github.com/0xMiden/miden-node/pull/1226)).
+- [BREAKING] Renamed `RemoteProverProxy` to `RemoteProverClient` ([#1236](https://github.com/0xMiden/miden-node/pull/1236)).
 
 ## v0.11.1 (2025-09-08)
 
diff --git a/Cargo.lock b/Cargo.lock
index c6002ac2e..bee3ecf9b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1513,7 +1513,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.5.10",
+ "socket2 0.6.0",
  "system-configuration",
  "tokio",
  "tower-service",
@@ -2204,8 +2204,15 @@ dependencies = [
  "axum",
  "miden-node-proto",
  "miden-node-utils",
+ "miden-objects",
+ "miden-testing",
+ "miden-tx",
+ "reqwest",
  "serde",
+ "serde_json",
+ "sha2",
  "tokio",
+ "tonic",
  "tracing",
  "url",
 ]
@@ -3263,7 +3270,7 @@ dependencies = [
  "serde",
  "serde_yaml",
  "sfv",
- "socket2 0.5.10",
+ "socket2 0.6.0",
  "strum",
  "strum_macros",
  "tokio",
@@ -4348,6 +4355,17 @@ dependencies = [
  "rust_decimal",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
 [[package]]
 name = "sha3"
 version = "0.10.8"
diff --git a/bin/network-monitor/Cargo.toml b/bin/network-monitor/Cargo.toml
index 2a672a9e9..28d914d16 100644
--- a/bin/network-monitor/Cargo.toml
+++ b/bin/network-monitor/Cargo.toml
@@ -19,7 +19,14 @@ anyhow           = { workspace = true }
 axum             = { version = "0.8" }
 miden-node-proto = { workspace = true }
 miden-node-utils = { workspace = true }
+miden-objects    = { features = ["std", "testing"], workspace = true }
+miden-testing    = { workspace = true }
+miden-tx         = { workspace = true }
+reqwest          = { features = ["json"], version = "0.12" }
 serde            = { features = ["derive"], version = "1.0" }
+serde_json       = { version = "1.0" }
+sha2             = { version = "0.10" }
 tokio            = { features = ["full"], workspace = true }
+tonic            = { features = ["codegen", "prost", "tls-native-roots", "transport"], workspace = true }
 tracing          = { workspace = true }
 url              = { features = ["serde"], workspace = true }
diff --git a/bin/network-monitor/README.md b/bin/network-monitor/README.md
index 7d7dc3d0e..bf8b350d4 100644
--- a/bin/network-monitor/README.md
+++ b/bin/network-monitor/README.md
@@ -16,6 +16,7 @@ The monitor application uses environment variables for configuration:
 
 - `MIDEN_MONITOR_RPC_URL`: RPC service URL (default: `http://localhost:50051`)
 - `MIDEN_MONITOR_REMOTE_PROVER_URLS`: Comma-separated list of remote prover URLs (default: `http://localhost:50052`)
+- `MIDEN_MONITOR_FAUCET_URL`: Faucet service URL for testing (default: `http://localhost:8080`)
 - `MIDEN_MONITOR_PORT`: Web server port (default: `3000`)
 - `MIDEN_MONITOR_ENABLE_OTEL`: Enable OpenTelemetry tracing (default: `false`)
 
@@ -25,13 +26,17 @@ The monitor application uses environment variables for configuration:
 # Single remote prover
 MIDEN_MONITOR_REMOTE_PROVER_URLS="http://localhost:50052" miden-network-monitor
 
-# Multiple remote provers
-MIDEN_MONITOR_REMOTE_PROVER_URLS="http://localhost:50052,http://localhost:50053,http://localhost:50054" miden-network-monitor
+# Multiple remote provers and faucet testing
+MIDEN_MONITOR_REMOTE_PROVER_URLS="http://localhost:50052,http://localhost:50053,http://localhost:50054" \
+MIDEN_MONITOR_FAUCET_URL="http://localhost:8080" \
+miden-network-monitor
 ```
 
+Once running, the monitor will be available at `http://localhost:3000` (or the configured port).
+
 ## Currently Supported Monitor
 
-The monitor application provides real-time status monitor for the following Miden network components:
+The monitor application provides real-time status monitoring for the following Miden network components:
 
 ### RPC Service
 - **Service Health**: Overall RPC service availability and status
@@ -44,24 +49,45 @@ The monitor application provides real-time status monitor for the following Mide
   - Block producer version and health
 
 ### Remote Provers
-- **Service Health**: Individual remote prover availability and status
+- **Service Health**: Individual remote prover availability and status  
 - **Version Information**: Remote prover service version
-- **Supported Proof Types**: Types of proofs the prover can generate
+- **Supported Proof Types**: Types of proofs the prover can generate (Transaction, Block, Batch)
 - **Worker Status**:
   - Individual worker addresses and versions
   - Worker health status (HEALTHY/UNHEALTHY/UNKNOWN)
   - Worker count per prover
+- **Proof Generation Testing**: Real-time testing of proof generation capabilities
+  - Success rate tracking with test/failure counters
+  - Response time measurement for proof generation
+  - Proof size monitoring (in KB)
+  - Automated testing with mock transactions, blocks, or batches based on supported proof type
+  - Combined health status that reflects both connectivity and proof generation capability
+
+### Faucet Service
+- **Service Health**: Faucet service availability and token minting capability
+- **PoW Challenge Testing**: Real-time proof-of-work challenge solving and token minting
+  - Success rate tracking with successful/failed minting attempts
+  - Response time measurement for challenge completion
+  - Challenge difficulty monitoring
+  - Transaction and note ID tracking from successful mints
+  - Automated testing every 30 seconds to verify faucet functionality
+
+## User Interface
+
+The web dashboard provides a clean, responsive interface with the following features:
+
+- **Real-time Updates**: Automatically refreshes service status every 10 seconds
+- **Unified Service Cards**: Each service is displayed in a dedicated card that auto-sizes to show all information
+- **Combined Prover Information**: Remote prover cards integrate both connectivity status and proof generation test results
+- **Faucet Testing Display**: Shows faucet test results with challenge difficulty and minting success metrics
+- **Visual Health Indicators**: Color-coded status indicators and clear success/failure metrics
+- **Interactive Elements**: Copy-to-clipboard functionality for genesis commitments, transaction IDs, and note IDs
+- **Responsive Design**: Optimized for both desktop and mobile viewing
 
 ## Future Monitor Items
 
 Planned workflow testing features for future releases:
 
-### Faucet Workflow Testing
-The monitor application will test the faucet service by minting tokens from the official faucet. This test verifies that the faucet is operational and can successfully distribute tokens for testing purposes.
-
-### Prover Workflow Testing
-The application will use the delegated prover to prove transactions, testing the proving infrastructure without requiring network submission. This includes testing with static transactions to validate proof generation capabilities and monitor prover performance under various loads.
-
 ### Network Transaction Testing
 The monitor system will submit actual transactions to the network to perform end-to-end testing of the complete workflow. This test covers transaction creation, submission, processing, and confirmation, providing comprehensive validation of network functionality.
 
diff --git a/bin/network-monitor/assets/index.css b/bin/network-monitor/assets/index.css
index 13fa89ac3..b375f10e1 100644
--- a/bin/network-monitor/assets/index.css
+++ b/bin/network-monitor/assets/index.css
@@ -54,7 +54,17 @@ body {
 
 .main-content {
     width: 100%;
-    max-width: 400px;
+    max-width: 1200px;
+    padding: 0 20px;
+}
+
+.form-title {
+    font-size: 28px;
+    font-weight: 500;
+    color: #333;
+    text-align: center;
+    margin-bottom: 32px;
+    letter-spacing: -0.02em;
 }
 
 .button-group {
@@ -173,6 +183,7 @@ body {
     font-size: 14px;
     white-space: pre-wrap;
     z-index: 2;
+    grid-column: 1 / -1; /* Span the full width of the grid when in grid context */
 }
 
 @media (max-width: 768px) {
@@ -198,8 +209,9 @@ body {
     border: 0.5px solid #e0e0e0;
     border-radius: 8px;
     padding: 20px;
-    margin-bottom: 16px;
     transition: all 0.2s;
+    display: flex;
+    flex-direction: column;
 }
 
 .service-card:hover {
@@ -220,6 +232,7 @@ body {
     justify-content: space-between;
     align-items: center;
     margin-bottom: 12px;
+    flex-shrink: 0;
 }
 
 .service-name {
@@ -245,6 +258,12 @@ body {
     border: 1px solid #fecaca;
 }
 
+.service-content {
+    flex: 1;
+    margin-bottom: 8px;
+}
+
+
 .service-details {
     margin: 12px 0;
     font-size: 12px;
@@ -308,12 +327,21 @@ body {
 .service-timestamp {
     font-size: 11px;
     color: #999;
-    margin-top: 8px;
+    margin-top: auto;
+    padding-top: 8px;
     font-style: italic;
+    flex-shrink: 0;
+    border-top: 1px solid #f0f0f0;
 }
 
 #status-container {
     min-height: 200px;
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
+    gap: 16px;
+    width: 100%;
+    max-width: 1200px;
+    margin: 0 auto;
 }
 
 .loading-section {
@@ -321,6 +349,7 @@ body {
     align-items: center;
     justify-content: center;
     min-height: 200px;
+    grid-column: 1 / -1; /* Span the full width of the grid when in grid context */
 }
 
 /* Responsive adjustments for service cards */
@@ -385,3 +414,88 @@ body {
     background: #fff3cd;
     color: #856404;
 }
+
+/* Transaction Prover Test Styles */
+.test-metrics {
+    margin-top: 8px;
+    padding: 8px 12px;
+    border-radius: 4px;
+}
+
+.test-metrics.healthy {
+    background: rgba(34, 197, 93, 0.05);
+    border-left: 3px solid #22C55D;
+}
+
+.test-metrics.unhealthy {
+    background: rgba(255, 85, 0, 0.05);
+    border-left: 3px solid #ff5500;
+}
+
+.metric-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 4px 0;
+    font-size: 12px;
+}
+
+.metric-label {
+    color: #333;
+    font-weight: 500;
+}
+
+.metric-value {
+    font-family: "DM Mono", monospace;
+    font-weight: 500;
+}
+
+.test-metrics.healthy .metric-value {
+    color: #22C55D;
+}
+
+.test-metrics.unhealthy .metric-value {
+    color: #ff5500;
+}
+
+/* Refresh button container */
+.refresh-button-container {
+    grid-column: 1 / -1; /* Span the full width of the grid */
+    margin-top: 20px;
+}
+
+/* Responsive adjustments for test metrics */
+@media (max-width: 768px) {
+    .metric-row {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 2px;
+    }
+
+    /* Adjust grid for mobile */
+    #status-container {
+        grid-template-columns: 1fr;
+    }
+
+    .main-content {
+        padding: 0 16px;
+    }
+}
+
+/* Additional responsive breakpoints */
+@media (max-width: 480px) {
+    #status-container {
+        grid-template-columns: 1fr;
+        gap: 12px;
+    }
+
+    .service-card {
+        padding: 16px;
+    }
+}
+
+@media (min-width: 769px) and (max-width: 1024px) {
+    #status-container {
+        grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
+    }
+}
diff --git a/bin/network-monitor/assets/index.html b/bin/network-monitor/assets/index.html
index 43520d165..647bcf694 100644
--- a/bin/network-monitor/assets/index.html
+++ b/bin/network-monitor/assets/index.html
@@ -63,6 +63,81 @@
             }
         }
 
+        function groupServices(services) {
+            const grouped = {};
+            const result = [];
+
+            // First pass: collect all services and group prover-related ones
+            services.forEach(service => {
+                if (service.name.startsWith('Remote Prover (') && service.name.endsWith(')')) {
+                    // Extract prover name from "Remote Prover (Prover-1)" -> "Prover-1"
+                    const match = service.name.match(/Remote Prover \((.*)\)/);
+                    if (match) {
+                        const proverName = match[1];
+                        if (!grouped[proverName]) {
+                            grouped[proverName] = {
+                                name: proverName,
+                                status: service.status,
+                                last_checked: service.last_checked,
+                                error: service.error,
+                                details: service.details,
+                                testDetails: null,
+                                testStatus: null,
+                                testError: null
+                            };
+                        } else {
+                            // Update if this status is newer
+                            if (service.last_checked > grouped[proverName].last_checked) {
+                                grouped[proverName].status = service.status;
+                                grouped[proverName].last_checked = service.last_checked;
+                                grouped[proverName].error = service.error;
+                                grouped[proverName].details = service.details;
+                            }
+                        }
+                    }
+                } else if (service.details && service.details.RemoteProverTest) {
+                    // This is a prover test result - find corresponding prover group
+                    const proverName = service.name;
+                    if (!grouped[proverName]) {
+                        grouped[proverName] = {
+                            name: proverName,
+                            status: service.status,
+                            last_checked: service.last_checked,
+                            error: service.error,
+                            details: null,
+                            testDetails: service.details.RemoteProverTest,
+                            testStatus: service.status,
+                            testError: service.error
+                        };
+                    } else {
+                        grouped[proverName].testDetails = service.details.RemoteProverTest;
+                        grouped[proverName].testStatus = service.status;
+                        grouped[proverName].testError = service.error;
+
+                        // Combine status - if either test or status check is unhealthy, mark as unhealthy
+                        if (service.status === 'Unhealthy' || grouped[proverName].status === 'Unhealthy') {
+                            grouped[proverName].status = 'Unhealthy';
+                        }
+
+                        // Use the most recent timestamp
+                        if (service.last_checked > grouped[proverName].last_checked) {
+                            grouped[proverName].last_checked = service.last_checked;
+                        }
+                    }
+                } else {
+                    // Regular service (RPC, etc.)
+                    result.push(service);
+                }
+            });
+
+            // Add all grouped prover services
+            Object.values(grouped).forEach(proverService => {
+                result.push(proverService);
+            });
+
+            return result;
+        }
+
         function updateDisplay() {
             if (!statusData) return;
 
@@ -75,9 +150,12 @@
             const lastUpdateTime = new Date(statusData.last_updated * 1000);
             lastUpdated.textContent = lastUpdateTime.toLocaleString();
 
+            // Group and process services
+            const processedServices = groupServices(statusData.services);
+
             // Count healthy vs unhealthy services
-            const healthyServices = statusData.services.filter(s => s.status === 'healthy').length;
-            const totalServices = statusData.services.length;
+            const healthyServices = processedServices.filter(s => s.status === 'Healthy').length;
+            const totalServices = processedServices.length;
             const allHealthy = healthyServices === totalServices;
 
             // Update footer
@@ -86,8 +164,8 @@
             servicesCount.textContent = `${totalServices} Services`;
 
             // Generate status cards
-            container.innerHTML = statusData.services.map(service => {
-                const isHealthy = service.status === 'healthy';
+            container.innerHTML = processedServices.map(service => {
+                const isHealthy = service.status === 'Healthy';
                 const statusColor = isHealthy ? '#22C55D' : '#ff5500';
                 const statusIcon = isHealthy ? '✓' : '✗';
                 
@@ -96,13 +174,13 @@
                     const details = service.details;
                     detailsHtml = `
                         <div class="service-details">
-                            ${details.rpc_status ? `
-                                <div class="detail-item"><strong>Version:</strong> ${details.rpc_status.version}</div>
-                                ${details.rpc_status.genesis_commitment ? `
+                            ${details.RpcStatus ? `
+                                <div class="detail-item"><strong>Version:</strong> ${details.RpcStatus.version}</div>
+                                ${details.RpcStatus.genesis_commitment ? `
                                     <div class="detail-item">
                                         <strong>Genesis:</strong> 
-                                        <span class="genesis-value">${details.rpc_status.genesis_commitment.substring(0, 20)}...</span>
-                                        <button class="copy-button" onclick="copyToClipboard('${details.rpc_status.genesis_commitment}', event)" title="Copy full genesis commitment">
+                                        <span class="genesis-value">0x${details.RpcStatus.genesis_commitment.substring(0, 20)}...</span>
+                                        <button class="copy-button" onclick="copyToClipboard('${details.RpcStatus.genesis_commitment}', event)" title="Copy full genesis commitment">
                                             <svg class="copy-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                                                 <rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
                                                 <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
@@ -110,40 +188,112 @@
                                         </button>
                                     </div>
                                 ` : ''}
-                                ${details.rpc_status.store_status ? `
+                                ${details.RpcStatus.store_status ? `
                                     <div class="nested-status">
-                                        <strong>Store:</strong> ${details.rpc_status.store_status.version} - ${details.rpc_status.store_status.status}
-                                        ${details.rpc_status.store_status.chain_tip ? ` (Tip: ${details.rpc_status.store_status.chain_tip})` : ''}
+                                        <strong>Store:</strong> ${details.RpcStatus.store_status.version} - ${details.RpcStatus.store_status.status}
+                                        ${details.RpcStatus.store_status.chain_tip ? ` (Tip: ${details.RpcStatus.store_status.chain_tip})` : ''}
                                     </div>
                                 ` : ''}
-                                ${details.rpc_status.block_producer_status ? `
+                                ${details.RpcStatus.block_producer_status ? `
                                     <div class="nested-status">
-                                        <strong>Block Producer:</strong> ${details.rpc_status.block_producer_status.version} - ${details.rpc_status.block_producer_status.status}
+                                        <strong>Block Producer:</strong> ${details.RpcStatus.block_producer_status.version} - ${details.RpcStatus.block_producer_status.status}
                                     </div>
                                 ` : ''}
                             ` : ''}
-                            ${details.remote_prover_statuses && details.remote_prover_statuses.length > 0 ? `
-                                ${details.remote_prover_statuses.map(prover => `
+                            ${details.RemoteProverStatus ? `
+                                <div class="nested-status">
+                                    <strong>Prover Status (${details.RemoteProverStatus.url}):</strong>
+                                    <div class="detail-item"><strong>Version:</strong> ${details.RemoteProverStatus.version}</div>
                                     <div class="nested-status">
-                                        <strong>${prover.name} (${prover.url}):</strong>
-                                        <div class="detail-item"><strong>Version:</strong> ${prover.version}</div>
+                                        <strong>Supported Proof Type:</strong> ${details.RemoteProverStatus.supported_proof_type}
+                                    </div>
+                                    ${details.RemoteProverStatus.workers && details.RemoteProverStatus.workers.length > 0 ? `
                                         <div class="nested-status">
-                                            <strong>Supported Proof Type:</strong> ${prover.supported_proof_type}
+                                            <strong>Workers (${details.RemoteProverStatus.workers.length}):</strong>
+                                            ${details.RemoteProverStatus.workers.map(worker => `
+                                                <div class="worker-status">
+                                                    <span class="worker-address">${worker.address}</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>
+                                    ` : ''}
+                                </div>
+                            ` : ''}
+                            ${details.FaucetTest ? `
+                                <div class="nested-status">
+                                    <strong>Faucet Testing:</strong>
+                                    <div class="test-metrics ${service.status === 'Healthy' ? 'healthy' : 'unhealthy'}">
+                                        <div class="metric-row">
+                                            <span class="metric-label">Success Rate:</span>
+                                            <span class="metric-value">${details.FaucetTest.success_count}/${details.FaucetTest.success_count + details.FaucetTest.failure_count}</span>
                                         </div>
-                                        ${prover.workers && prover.workers.length > 0 ? `
-                                            <div class="nested-status">
-                                                <strong>Workers (${prover.workers.length}):</strong>
-                                                ${prover.workers.map(worker => `
-                                                    <div class="worker-status">
-                                                        <span class="worker-address">${worker.address}</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 class="metric-row">
+                                            <span class="metric-label">Last Response Time:</span>
+                                            <span class="metric-value">${details.FaucetTest.test_duration_ms}ms</span>
+                                        </div>
+                                        ${details.FaucetTest.last_tx_id ? `
+                                            <div class="metric-row">
+                                                <span class="metric-label">Last TX ID:</span>
+                                                <span class="metric-value">${details.FaucetTest.last_tx_id.substring(0, 16)}...
+                                                    <button class="copy-button" onclick="copyToClipboard('${details.FaucetTest.last_tx_id}', event)" title="Copy full TX ID">
+                                                        <svg class="copy-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                                                            <rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
+                                                            <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
+                                                        </svg>
+                                                    </button>
+                                                </span>
+                                            </div>
+                                        ` : ''}
+                                        ${details.FaucetTest.challenge_difficulty ? `
+                                            <div class="metric-row">
+                                                <span class="metric-label">Last Challenge Difficulty:</span>
+                                                <span class="metric-value">~${details.FaucetTest.challenge_difficulty} bits</span>
                                             </div>
                                         ` : ''}
                                     </div>
-                                `).join('')}
+                                </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">${service.testDetails.success_count}/${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>
+                                        </div>
+                                        ${service.testError ? `
+                                            <div class="metric-row error">
+                                                <span class="metric-label">Test Error:</span>
+                                                <span class="metric-value">
+                                                    ${(() => {
+                                                        try {
+                                                            const errorObj = JSON.parse(service.testError);
+                                                            return errorObj.code || 'Unknown error code';
+                                                        } catch (e) {
+                                                            return service.testError;
+                                                        }
+                                                    })()}
+                                                    <button class="copy-button" data-json="${service.testError.replace(/"/g, '&quot;')}" onclick="copyToClipboard(this.dataset.json, event)" title="Copy error JSON">
+                                                        <svg class="copy-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                                                            <rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
+                                                            <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
+                                                        </svg>
+                                                    </button>
+                                                </span>
+                                            </div>
+                                        ` : ''}
+                                    </div>
+                                </div>
                             ` : ''}
                         </div>
                     `;
@@ -157,8 +307,10 @@
                                 ${statusIcon} ${service.status.toUpperCase()}
                             </div>
                         </div>
-                        ${service.error ? `<div class="service-error">${service.error}</div>` : ''}
-                        ${detailsHtml}
+                        <div class="service-content">
+                            ${service.error ? `<div class="service-error">${service.error}</div>` : ''}
+                            ${detailsHtml}
+                        </div>
                         <div class="service-timestamp">
                             Last checked: ${new Date(service.last_checked * 1000).toLocaleString()}
                         </div>
@@ -166,9 +318,9 @@
                 `;
             }).join('');
 
-            // Add refresh button
+            // Add refresh button that spans the full grid
             container.innerHTML += `
-                <div class="button-group" style="margin-top: 20px;">
+                <div class="refresh-button-container">
                     <button class="button" onclick="fetchStatus()">
                         <svg class="button-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                             <path d="M23 4v6h-6M1 20v-6h6M20.49 9A9 9 0 0 0 5.64 5.64L1 10m22 4l-4.64 4.36A9 9 0 0 1 3.51 15"/>
@@ -185,7 +337,7 @@
                 <div class="error-message" style="display: block;">
                     ${message}
                 </div>
-                <div class="button-group" style="margin-top: 20px;">
+                <div class="refresh-button-container">
                     <button class="button" onclick="fetchStatus()">
                         <svg class="button-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                             <path d="M23 4v6h-6M1 20v-6h6M20.49 9A9 9 0 0 0 5.64 5.64L1 10m22 4l-4.64 4.36A9 9 0 0 1 3.51 15"/>
diff --git a/bin/network-monitor/src/config.rs b/bin/network-monitor/src/config.rs
new file mode 100644
index 000000000..44615d461
--- /dev/null
+++ b/bin/network-monitor/src/config.rs
@@ -0,0 +1,88 @@
+//! Network monitor configuration.
+//!
+//! This module contains the configuration structures and constants for the network monitor.
+
+use url::Url;
+
+// MONITOR CONFIGURATION CONSTANTS
+// ================================================================================================
+
+const DEFAULT_RPC_URL: &str = "http://localhost:50051";
+const DEFAULT_REMOTE_PROVER_URLS: &str = "http://localhost:50052";
+const DEFAULT_FAUCET_URL: &str = "http://localhost:8080";
+const DEFAULT_PORT: u16 = 3000;
+
+const RPC_URL_ENV_VAR: &str = "MIDEN_MONITOR_RPC_URL";
+const REMOTE_PROVER_URLS_ENV_VAR: &str = "MIDEN_MONITOR_REMOTE_PROVER_URLS";
+const FAUCET_URL_ENV_VAR: &str = "MIDEN_MONITOR_FAUCET_URL";
+const PORT_ENV_VAR: &str = "MIDEN_MONITOR_PORT";
+const ENABLE_OTEL_ENV_VAR: &str = "MIDEN_MONITOR_ENABLE_OTEL";
+
+/// Configuration for the monitor.
+///
+/// This struct contains the configuration for the monitor.
+#[derive(Debug, Clone)]
+pub struct MonitorConfig {
+    /// The URL of the RPC service.
+    pub rpc_url: Url,
+    /// The URLs of the remote provers for status checking.
+    pub remote_prover_urls: Vec<Url>,
+    /// The URL of the faucet service for testing.
+    pub faucet_url: Option<Url>,
+    /// The port of the monitor.
+    pub port: u16,
+    /// Whether to enable OpenTelemetry.
+    pub enable_otel: bool,
+}
+
+impl MonitorConfig {
+    /// Loads the configuration from the environment variables.
+    ///
+    /// This function loads the configuration from the environment variables.
+    /// The environment variables are:
+    /// - `MIDEN_MONITOR_RPC_URL`: The URL of the RPC service.
+    /// - `MIDEN_MONITOR_REMOTE_PROVER_URLS`: The URLs of the remote provers for status checking,
+    ///   comma separated.
+    /// - `MIDEN_MONITOR_FAUCET_URL`: The URL of the faucet service for testing (optional).
+    /// - `MIDEN_MONITOR_PORT`: The port of the monitor.
+    /// - `MIDEN_MONITOR_ENABLE_OTEL`: Whether to enable OpenTelemetry.
+    pub fn from_env() -> Result<Self, Box<dyn std::error::Error>> {
+        let rpc_url =
+            std::env::var(RPC_URL_ENV_VAR).unwrap_or_else(|_| DEFAULT_RPC_URL.to_string());
+
+        // Parse multiple remote prover URLs from environment variable for status checking
+        let remote_prover_urls = std::env::var(REMOTE_PROVER_URLS_ENV_VAR)
+            .unwrap_or_else(|_| DEFAULT_REMOTE_PROVER_URLS.to_string());
+
+        let remote_prover_urls = remote_prover_urls
+            .split(',')
+            .map(str::trim)
+            .filter(|url| !url.is_empty())
+            .map(Url::parse)
+            .collect::<Result<Vec<_>, _>>()?;
+
+        // Parse optional faucet URL
+        let faucet_url = if let Ok(url_str) = std::env::var(FAUCET_URL_ENV_VAR) {
+            Some(Url::parse(&url_str)?)
+        } else {
+            Some(Url::parse(DEFAULT_FAUCET_URL)?)
+        };
+
+        let port = std::env::var(PORT_ENV_VAR)
+            .unwrap_or_else(|_| DEFAULT_PORT.to_string())
+            .parse::<u16>()?;
+
+        let enable_otel = std::env::var(ENABLE_OTEL_ENV_VAR)
+            .unwrap_or_default()
+            .parse::<bool>()
+            .unwrap_or_default();
+
+        Ok(MonitorConfig {
+            rpc_url: Url::parse(&rpc_url)?,
+            remote_prover_urls,
+            faucet_url,
+            port,
+            enable_otel,
+        })
+    }
+}
diff --git a/bin/network-monitor/src/faucet.rs b/bin/network-monitor/src/faucet.rs
new file mode 100644
index 000000000..e3f5b22a9
--- /dev/null
+++ b/bin/network-monitor/src/faucet.rs
@@ -0,0 +1,257 @@
+//! Faucet testing functionality.
+//!
+//! This module contains the logic for periodically testing faucet functionality
+//! by requesting proof-of-work challenges, solving them, and submitting token requests.
+
+use std::time::Duration;
+
+use anyhow::Context;
+use miden_objects::account::AccountId;
+use miden_objects::testing::account_id::ACCOUNT_ID_SENDER;
+use reqwest::Client;
+use serde::{Deserialize, Serialize};
+use sha2::{Digest, Sha256};
+use tokio::sync::watch;
+use tokio::time::MissedTickBehavior;
+use tracing::{debug, info, instrument, warn};
+use url::Url;
+
+use crate::status::{ServiceDetails, ServiceStatus, Status};
+use crate::{COMPONENT, current_unix_timestamp_secs};
+
+// CONSTANTS
+// ================================================================================================
+
+/// Maximum number of attempts to solve a `PoW` challenge.
+const MAX_CHALLENGE_ATTEMPTS: u64 = 100_000_000;
+/// Amount of tokens to mint.
+const MINT_AMOUNT: u64 = 1_000_000; // 1 token with 6 decimals
+/// Interval between faucet tests.
+const TEST_INTERVAL: Duration = Duration::from_secs(2 * 60);
+
+// FAUCET TEST TYPES
+// ================================================================================================
+
+/// Details of a faucet test.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct FaucetTestDetails {
+    pub test_duration_ms: u64,
+    pub success_count: u64,
+    pub failure_count: u64,
+    pub last_tx_id: Option<String>,
+    pub challenge_difficulty: Option<u32>,
+}
+
+/// Response from the faucet's `/pow` endpoint.
+#[derive(Debug, Deserialize)]
+struct PowChallengeResponse {
+    challenge: String,
+    target: u64,
+    #[allow(dead_code)] // Timestamp is part of API response but not used
+    timestamp: u64,
+}
+
+/// Response from the faucet's `/get_tokens` endpoint.
+#[derive(Debug, Deserialize)]
+struct GetTokensResponse {
+    tx_id: String,
+    #[allow(dead_code)] // Note ID is part of API response but not used in monitoring
+    note_id: String,
+}
+
+// FAUCET TEST TASK
+// ================================================================================================
+
+/// Runs a task that continuously tests faucet functionality and updates a watch channel.
+///
+/// This function spawns a task that periodically requests proof-of-work challenges from the faucet,
+/// solves them, and submits token requests to verify the faucet is operational.
+///
+/// # Arguments
+///
+/// * `faucet_url` - The URL of the faucet service to test.
+/// * `status_sender` - The sender for the watch channel.
+///
+/// # Returns
+///
+/// `Ok(())` if the task completes successfully, or an error if the task fails.
+#[instrument(target = COMPONENT, name = "faucet-test-task", skip_all)]
+pub async fn run_faucet_test_task(faucet_url: Url, status_sender: watch::Sender<ServiceStatus>) {
+    let client = Client::new();
+    let mut success_count = 0u64;
+    let mut failure_count = 0u64;
+    let mut last_tx_id = None;
+    let mut last_challenge_difficulty = None;
+
+    let mut interval = tokio::time::interval(TEST_INTERVAL);
+    interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
+
+    loop {
+        interval.tick().await;
+
+        let current_time = current_unix_timestamp_secs();
+
+        let start_time = std::time::Instant::now();
+
+        match perform_faucet_test(&client, &faucet_url).await {
+            Ok((result, challenge_difficulty)) => {
+                success_count += 1;
+                last_tx_id = Some(result.tx_id.clone());
+                last_challenge_difficulty = Some(challenge_difficulty);
+                info!("Faucet test successful: tx_id={}", result.tx_id);
+            },
+            Err(e) => {
+                failure_count += 1;
+                warn!("Faucet test failed: {}", e);
+            },
+        }
+
+        let test_duration_ms = start_time.elapsed().as_millis() as u64;
+
+        let test_details = FaucetTestDetails {
+            test_duration_ms,
+            success_count,
+            failure_count,
+            last_tx_id: last_tx_id.clone(),
+            challenge_difficulty: last_challenge_difficulty,
+        };
+
+        let status = ServiceStatus {
+            name: "Faucet".to_string(),
+            status: if success_count > 0 || failure_count == 0 {
+                Status::Healthy
+            } else {
+                Status::Unhealthy
+            },
+            last_checked: current_time,
+            error: None,
+            details: ServiceDetails::FaucetTest(test_details),
+        };
+
+        // Send the status update; exit if no receivers (shutdown signal)
+        if status_sender.send(status).is_err() {
+            info!("No receivers for faucet status updates, shutting down");
+            return;
+        }
+    }
+}
+
+/// Performs a complete faucet test by requesting a `PoW` challenge and submitting the solution.
+///
+/// # Arguments
+///
+/// * `client` - The HTTP client to use.
+/// * `faucet_url` - The URL of the faucet service.
+///
+/// # Returns
+///
+/// The response from the faucet if successful, or an error if the test fails.
+async fn perform_faucet_test(
+    client: &Client,
+    faucet_url: &Url,
+) -> anyhow::Result<(GetTokensResponse, u32)> {
+    // Use a test account ID - convert to AccountId and format properly
+    let account_id = AccountId::try_from(ACCOUNT_ID_SENDER)
+        .context("Failed to create AccountId from test constant")?;
+
+    let account_id = account_id.to_string();
+    debug!("Generated account ID: {} (length: {})", account_id, account_id.len());
+
+    // Step 1: Request PoW challenge
+    let pow_url = faucet_url.join("/pow")?;
+    let response = client.get(pow_url).query(&[("account_id", &account_id)]).send().await?;
+
+    let response_text = response.text().await?;
+    debug!("Faucet PoW response: {}", response_text);
+
+    let challenge_response: PowChallengeResponse = serde_json::from_str(&response_text)
+        .with_context(|| format!("Failed to parse PoW response: {response_text}"))?;
+
+    debug!(
+        "Received PoW challenge: target={}, challenge={}...",
+        challenge_response.target,
+        &challenge_response.challenge[..16.min(challenge_response.challenge.len())]
+    );
+
+    // Step 2: Solve the PoW challenge
+    let nonce = solve_pow_challenge(&challenge_response.challenge, challenge_response.target)
+        .context("Failed to solve PoW challenge")?;
+
+    debug!("Solved PoW challenge with nonce: {}", nonce);
+
+    // Step 3: Request tokens with the solution
+    let tokens_url = faucet_url.join("/get_tokens")?;
+
+    let response = client
+        .get(tokens_url)
+        .query(&[
+            ("account_id", account_id.as_str()),
+            ("is_private_note", "false"),
+            ("asset_amount", &MINT_AMOUNT.to_string()),
+            ("challenge", &challenge_response.challenge),
+            ("nonce", &nonce.to_string()),
+        ])
+        .send()
+        .await?;
+
+    let response_text = response.text().await?;
+
+    let tokens_response: GetTokensResponse = serde_json::from_str(&response_text)
+        .with_context(|| format!("Failed to parse tokens response: {response_text}"))?;
+
+    Ok((tokens_response, challenge_response.target.leading_zeros()))
+}
+
+/// Solves a proof-of-work challenge using SHA-256 hashing.
+///
+/// # Arguments
+///
+/// * `challenge` - The challenge string in hexadecimal format.
+/// * `target` - The target value. A solution is valid if H(challenge, nonce) < target.
+///
+/// # Returns
+///
+/// The nonce that solves the challenge, or an error if no solution is found within reasonable
+/// bounds.
+fn solve_pow_challenge(challenge: &str, target: u64) -> anyhow::Result<u64> {
+    debug!(
+        "Solving PoW challenge: challenge={}, target={} (~{} bits)",
+        challenge,
+        target,
+        target.leading_zeros(),
+    );
+    // Try up to 100 million nonces.
+    for nonce in 0..MAX_CHALLENGE_ATTEMPTS {
+        let mut hasher = Sha256::new();
+        hasher.update(challenge.as_bytes());
+        hasher.update(nonce.to_be_bytes());
+        let hash_result = hasher.finalize();
+
+        // Convert first 8 bytes of hash to u64 for comparison with target
+        let hash_as_u64 = u64::from_be_bytes(hash_result[..8].try_into().unwrap());
+
+        if hash_as_u64 < target {
+            debug!(
+                "PoW solution found! nonce={}, hash={}, target={} (~{} bits)",
+                nonce,
+                hash_as_u64,
+                target,
+                target.leading_zeros(),
+            );
+            return Ok(nonce);
+        }
+
+        // Log progress every 100k attempts
+        if nonce % 100_000 == 0 && nonce > 0 {
+            debug!(
+                "PoW attempt {}: current_hash={}, target={} (~{} bits)",
+                nonce,
+                hash_as_u64,
+                target,
+                target.leading_zeros(),
+            );
+        }
+    }
+
+    anyhow::bail!("Failed to solve PoW challenge within 100M attempts")
+}
diff --git a/bin/network-monitor/src/frontend.rs b/bin/network-monitor/src/frontend.rs
index 8398ed731..ccccdb444 100644
--- a/bin/network-monitor/src/frontend.rs
+++ b/bin/network-monitor/src/frontend.rs
@@ -3,7 +3,6 @@
 
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
-use anyhow::Context;
 use axum::Router;
 use axum::http::header;
 use axum::response::{Html, IntoResponse, Response};
@@ -12,13 +11,18 @@ use tokio::sync::watch;
 use tracing::{info, instrument};
 
 use crate::COMPONENT;
-use crate::status::{MonitorConfig, NetworkStatus, ServiceStatus};
+use crate::config::MonitorConfig;
+use crate::status::{NetworkStatus, ServiceStatus};
+
+// SERVER STATE
+// ================================================================================================
 
 /// State for the web server containing watch receivers for all services.
 #[derive(Clone)]
 pub struct ServerState {
     pub rpc: watch::Receiver<ServiceStatus>,
-    pub provers: Vec<watch::Receiver<ServiceStatus>>,
+    pub provers: Vec<(watch::Receiver<ServiceStatus>, watch::Receiver<ServiceStatus>)>,
+    pub faucet: Option<watch::Receiver<ServiceStatus>>,
 }
 
 /// Runs the frontend server.
@@ -29,7 +33,7 @@ pub struct ServerState {
 ///
 /// * `server_state` - The server state containing watch receivers for all services.
 /// * `config` - The configuration of the network.
-pub async fn serve(server_state: ServerState, config: MonitorConfig) -> anyhow::Result<()> {
+pub async fn serve(server_state: ServerState, config: MonitorConfig) {
     // build our application with routes
     let app = Router::new()
         // Serve embedded assets
@@ -46,9 +50,8 @@ pub async fn serve(server_state: ServerState, config: MonitorConfig) -> anyhow::
     info!("Dashboard available at: http://localhost:{}/", config.port);
     let listener = tokio::net::TcpListener::bind(&bind_address)
         .await
-        .context("Failed to bind to address")?;
-    axum::serve(listener, app).await.context("Failed to start web server")?;
-    Ok(())
+        .expect("Failed to bind to address");
+    axum::serve(listener, app).await.expect("Failed to start web server");
 }
 
 async fn get_dashboard() -> Html<&'static str> {
@@ -70,8 +73,14 @@ async fn get_status(
     services.push(server_state.rpc.borrow().clone());
 
     // Collect all remote prover statuses
-    for prover_rx in &server_state.provers {
-        services.push(prover_rx.borrow().clone());
+    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 faucet status if available
+    if let Some(faucet_rx) = &server_state.faucet {
+        services.push(faucet_rx.borrow().clone());
     }
 
     let network_status = NetworkStatus { services, last_updated: current_time };
diff --git a/bin/network-monitor/src/main.rs b/bin/network-monitor/src/main.rs
index a53df0393..135a0c50d 100644
--- a/bin/network-monitor/src/main.rs
+++ b/bin/network-monitor/src/main.rs
@@ -1,18 +1,27 @@
 use std::collections::HashMap;
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
-use anyhow::Context;
+use miden_node_proto::clients::{Builder as ClientBuilder, RemoteProverProxy, Rpc};
 use miden_node_utils::logging::OpenTelemetry;
 use tokio::sync::watch;
-use tokio::task::JoinSet;
+use tokio::sync::watch::Receiver;
+use tokio::task::{Id, JoinSet};
 
+mod config;
+mod faucet;
 mod frontend;
+mod remote_prover;
 mod status;
 
-use frontend::{ServerState, serve};
-use status::{MonitorConfig, ServiceStatus, run_remote_prover_status_task, run_rpc_status_task};
-use tracing::info;
+use config::MonitorConfig;
+use faucet::run_faucet_test_task;
+use remote_prover::run_remote_prover_test_task;
+use status::{ServiceStatus, run_remote_prover_status_task, run_rpc_status_task};
+use tracing::{debug, info};
 
-use crate::status::ENABLE_OTEL_ENV_VAR;
+use crate::frontend::{ServerState, serve};
+use crate::remote_prover::{ProofType, generate_prover_test_payload};
+use crate::status::{ServiceDetails, Status, check_remote_prover_status, check_rpc_status};
 
 /// Component identifier for structured logging and tracing
 pub const COMPONENT: &str = "miden-network-monitor";
@@ -29,16 +38,6 @@ pub const COMPONENT: &str = "miden-network-monitor";
 /// unexpectedly, the entire process exits.
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    if std::env::var(ENABLE_OTEL_ENV_VAR)
-        .unwrap_or_default()
-        .parse::<bool>()
-        .unwrap_or_default()
-    {
-        miden_node_utils::logging::setup_tracing(OpenTelemetry::Enabled)?;
-    } else {
-        miden_node_utils::logging::setup_tracing(OpenTelemetry::Disabled)?;
-    }
-
     // Load configuration from environment variables
     let config = match MonitorConfig::from_env() {
         Ok(config) => {
@@ -50,60 +49,307 @@ async fn main() -> anyhow::Result<()> {
         },
     };
 
+    if config.enable_otel {
+        miden_node_utils::logging::setup_tracing(OpenTelemetry::Enabled)?;
+    } else {
+        miden_node_utils::logging::setup_tracing(OpenTelemetry::Disabled)?;
+    }
+
     let mut tasks = JoinSet::new();
     let mut component_ids: HashMap<_, String> = HashMap::new();
 
-    // Create initial empty status for services
-    let initial_rpc_status = ServiceStatus::new("RPC".to_string());
+    // Initialize the RPC Status endpoint checker task.
+    let rpc_rx = initialize_rpc_status_checker(&config, &mut tasks, &mut component_ids).await;
+
+    // Initialize the prover checkers & tests tasks.
+    let prover_rxs = initialize_prover_tasks(&config, &mut tasks, &mut component_ids).await;
+
+    // Initialize the faucet testing task.
+    let faucet_rx = initialize_faucet_task(&config, &mut tasks, &mut component_ids);
+
+    // Initialize HTTP server.
+    initialize_http_server(&config, rpc_rx, prover_rxs, faucet_rx, &mut tasks, &mut component_ids);
+
+    handle_failure(tasks, component_ids).await
+}
+
+// RPC CHECKER INITIALIZER
+// ================================================================================================
+
+/// Initializes the RPC status checker.
+///
+/// This function initializes the RPC status checker and returns a receiver for the RPC status.
+///
+/// # Arguments
+///
+/// * `config` - The configuration for the RPC service.
+/// * `tasks` - The join set for the tasks.
+/// * `component_ids` - The component IDs.
+///
+/// # Returns
+///
+/// A receiver for the RPC status.
+pub(crate) async fn initialize_rpc_status_checker(
+    config: &MonitorConfig,
+    tasks: &mut JoinSet<()>,
+    component_ids: &mut HashMap<Id, String>,
+) -> Receiver<ServiceStatus> {
+    // Create initial status for RPC service
+    let mut rpc = ClientBuilder::new(config.rpc_url.clone())
+        .with_tls()
+        .unwrap()
+        .with_timeout(Duration::from_secs(10))
+        .without_metadata_version()
+        .without_metadata_genesis()
+        .connect_lazy::<Rpc>();
+
+    let current_time = current_unix_timestamp_secs();
+
+    let initial_rpc_status = check_rpc_status(&mut rpc, current_time).await;
 
     // Spawn the RPC checker
     let (rpc_tx, rpc_rx) = watch::channel(initial_rpc_status);
     let rpc_url = config.rpc_url.clone();
     let id = tasks.spawn(async move { run_rpc_status_task(rpc_url, rpc_tx).await }).id();
     component_ids.insert(id, "rpc-checker".to_string());
+    rpc_rx
+}
+
+// PROVER TASKS INITIALIZER
+// ================================================================================================
 
-    // Spawn the prover checkers
+/// Initializes the prover tasks.
+///
+/// This function initializes the prover tasks and returns a vector of receivers for the prover
+/// status.
+///
+/// # Arguments
+///
+/// * `config` - The configuration for the provers.
+/// * `tasks` - The join set for the tasks.
+/// * `component_ids` - The component IDs.
+///
+/// # Returns
+///
+/// A vector of receivers for the prover status.
+async fn initialize_prover_tasks(
+    config: &MonitorConfig,
+    tasks: &mut JoinSet<()>,
+    component_ids: &mut HashMap<Id, String>,
+) -> Vec<(watch::Receiver<ServiceStatus>, watch::Receiver<ServiceStatus>)> {
     let mut prover_rxs = Vec::new();
-    for (i, prover_url) in config.remote_prover_urls.iter().enumerate() {
+    for (i, prover_url) in config.remote_prover_urls.clone().into_iter().enumerate() {
         let name = format!("Prover-{}", i + 1);
-        let initial_prover_status = ServiceStatus::new(format!("Remote Prover ({name})"));
 
-        let (prover_tx, prover_rx) = watch::channel(initial_prover_status);
-        prover_rxs.push(prover_rx);
+        let mut remote_prover = ClientBuilder::new(prover_url.clone())
+            .with_tls()
+            .expect("TLS is enabled")
+            .with_timeout(Duration::from_secs(10))
+            .without_metadata_version()
+            .without_metadata_genesis()
+            .connect_lazy::<RemoteProverProxy>();
+
+        let current_time = current_unix_timestamp_secs();
+
+        let initial_prover_status = check_remote_prover_status(
+            &mut remote_prover,
+            name.clone(),
+            prover_url.to_string(),
+            current_time,
+        )
+        .await;
 
+        let (prover_status_tx, prover_status_rx) = watch::channel(initial_prover_status.clone());
+
+        // Spawn the remote prover status check task
         let component_name = format!("prover-checker-{}", i + 1);
         let id = tasks
             .spawn({
                 let prover_url = prover_url.clone();
                 let name = name.clone();
 
-                run_remote_prover_status_task(prover_url, name, prover_tx)
+                run_remote_prover_status_task(prover_url, name, prover_status_tx)
             })
             .id();
         component_ids.insert(id, component_name);
+
+        // Extract proof_type directly from the service status
+        let proof_type = match &initial_prover_status.details {
+            crate::status::ServiceDetails::RemoteProverStatus(details) => {
+                details.supported_proof_type.clone()
+            },
+            _ => unreachable!("This is for remote provers only"),
+        };
+
+        // Only spawn test tasks for transaction provers
+        let prover_test_rx = if matches!(proof_type, ProofType::Transaction) {
+            debug!("Starting transaction proof tests for prover: {}", name);
+            let payload = generate_prover_test_payload().await;
+            let (prover_test_tx, prover_test_rx) = watch::channel(initial_prover_status.clone());
+
+            let id = tasks
+                .spawn(async move {
+                    Box::pin(run_remote_prover_test_task(
+                        prover_url.clone(),
+                        &name,
+                        proof_type,
+                        payload,
+                        prover_test_tx,
+                    ))
+                    .await;
+                })
+                .id();
+            let component_name = format!("prover-test-{}", i + 1);
+            component_ids.insert(id, component_name);
+
+            prover_test_rx
+        } else {
+            debug!(
+                "Skipping prover tests for {} (supports {:?} proofs, only testing Transaction proofs)",
+                name, proof_type
+            );
+            // For non-transaction provers, create a dummy receiver with no test task
+            let (_tx, rx) = watch::channel(initial_prover_status.clone());
+            rx
+        };
+
+        prover_rxs.push((prover_status_rx, prover_test_rx));
     }
 
-    // Create http server
-    let server_state = ServerState { rpc: rpc_rx, provers: prover_rxs };
+    prover_rxs
+}
+
+// FAUCET TASK INITIALIZER
+// ================================================================================================
+
+/// Initializes the faucet testing task.
+///
+/// This function initializes the faucet testing task and returns a receiver for the faucet status.
+///
+/// # Arguments
+///
+/// * `config` - The configuration for the faucet service.
+/// * `tasks` - The join set for the tasks.
+/// * `component_ids` - The component IDs.
+///
+/// # Returns
+///
+/// An optional receiver for the faucet status.
+fn initialize_faucet_task(
+    config: &MonitorConfig,
+    tasks: &mut JoinSet<()>,
+    component_ids: &mut HashMap<Id, String>,
+) -> Option<Receiver<ServiceStatus>> {
+    let Some(faucet_url) = &config.faucet_url else {
+        info!("Faucet URL not configured, skipping faucet testing");
+        return None;
+    };
+
+    let current_time = current_unix_timestamp_secs();
+
+    // Create initial faucet test status
+    let initial_faucet_status = ServiceStatus {
+        name: "Faucet".to_string(),
+        status: Status::Unknown,
+        last_checked: current_time,
+        error: None,
+        details: ServiceDetails::FaucetTest(crate::faucet::FaucetTestDetails {
+            test_duration_ms: 0,
+            success_count: 0,
+            failure_count: 0,
+            last_tx_id: None,
+            challenge_difficulty: None,
+        }),
+    };
+
+    // Spawn the faucet testing task
+    let (faucet_tx, faucet_rx) = watch::channel(initial_faucet_status);
+    let faucet_url = faucet_url.clone();
+    let id = tasks
+        .spawn(async move { run_faucet_test_task(faucet_url, faucet_tx).await })
+        .id();
+    component_ids.insert(id, "faucet-test".to_string());
+
+    Some(faucet_rx)
+}
+
+// HTTP SERVER INITIALIZER
+// ================================================================================================
+
+/// Initializes the HTTP server.
+///
+/// This function initializes the HTTP server and returns a receiver for the HTTP status.
+///
+/// # Arguments
+///
+/// * `config` - The configuration for the HTTP server.
+/// * `rpc_rx` - The receiver for the RPC status.
+/// * `prover_rxs` - The receivers for the prover status.
+/// * `faucet_rx` - The optional receiver for the faucet status.
+/// * `tasks` - The join set for the tasks.
+/// * `component_ids` - The component IDs.
+pub(crate) fn initialize_http_server(
+    config: &MonitorConfig,
+    rpc_rx: Receiver<ServiceStatus>,
+    prover_rxs: Vec<(watch::Receiver<ServiceStatus>, watch::Receiver<ServiceStatus>)>,
+    faucet_rx: Option<Receiver<ServiceStatus>>,
+    tasks: &mut JoinSet<()>,
+    component_ids: &mut HashMap<Id, String>,
+) {
+    let server_state = ServerState {
+        rpc: rpc_rx,
+        provers: prover_rxs,
+        faucet: faucet_rx,
+    };
 
     let server_config = config.clone();
     let id = tasks.spawn(async move { serve(server_state, server_config).await }).id();
     component_ids.insert(id, "frontend".to_string());
+}
 
+// HANDLE FAILURE
+// ================================================================================================
+
+/// Handles the failure of a task.
+///
+/// This function handles the failure of a task.
+///
+/// # Arguments
+///
+/// * `tasks` - The join set for the tasks.
+/// * `component_ids` - The component IDs.
+///
+/// # Returns
+///
+/// An error if the task fails.
+async fn handle_failure(
+    mut tasks: JoinSet<()>,
+    component_ids: HashMap<Id, String>,
+) -> anyhow::Result<()> {
     // Wait for any task to complete or fail
     let component_result = tasks.join_next_with_id().await.expect("join set is not empty");
 
     // We expect components to run indefinitely, so we treat any return as fatal.
     let (id, err) = match component_result {
-        Ok((id, Ok(_))) => (
-            id,
-            Err::<(), anyhow::Error>(anyhow::anyhow!("component completed unexpectedly")),
-        ),
-        Ok((id, Err(err))) => (id, Err(err)),
-        Err(join_err) => (join_err.id(), Err(join_err).context("joining component task")),
+        Ok((id, ())) => (id, anyhow::anyhow!("component completed unexpectedly")),
+        Err(join_err) => (join_err.id(), anyhow::Error::from(join_err)),
     };
     let component_name = component_ids.get(&id).map_or("unknown", String::as_str);
 
     // Exit with error context
-    err.context(format!("component {component_name} failed"))
+    Err(err.context(format!("component {component_name} failed")))
+}
+
+// HELPERS
+// ================================================================================================
+
+/// Gets the current Unix timestamp in seconds.
+///
+/// This function is infallible - if the system time is somehow before Unix epoch
+/// (extremely unlikely), it returns 0.
+pub fn current_unix_timestamp_secs() -> u64 {
+    SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .unwrap_or_else(|_| Duration::from_secs(0))  // Fallback to 0 if before Unix epoch
+        .as_secs()
 }
diff --git a/bin/network-monitor/src/remote_prover.rs b/bin/network-monitor/src/remote_prover.rs
new file mode 100644
index 000000000..e632e8a4f
--- /dev/null
+++ b/bin/network-monitor/src/remote_prover.rs
@@ -0,0 +1,313 @@
+//! Remote transaction prover test functionality.
+//!
+//! This module contains the logic for periodically testing remote transaction prover functionality
+//! by sending mock transactions and checking for successful transaction proof generation.
+
+use std::time::Duration;
+
+use anyhow::Context;
+use miden_node_proto::clients::{Builder as ClientBuilder, RemoteProverClient};
+use miden_node_proto::generated as proto;
+use miden_objects::asset::{Asset, FungibleAsset};
+use miden_objects::note::NoteType;
+use miden_objects::testing::account_id::{ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_SENDER};
+use miden_objects::transaction::TransactionWitness;
+use miden_testing::{Auth, MockChainBuilder};
+use miden_tx::utils::Serializable;
+use serde::{Deserialize, Serialize};
+use tokio::sync::watch;
+use tokio::time::MissedTickBehavior;
+use tonic::Request;
+use tracing::{info, instrument};
+use url::Url;
+
+use crate::status::{ServiceDetails, ServiceStatus, Status};
+use crate::{COMPONENT, current_unix_timestamp_secs};
+
+// PROOF TYPE
+// ================================================================================================
+
+/// Remote prover types
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum ProofType {
+    Transaction,
+    Block,
+    Batch,
+}
+
+impl From<ProofType> for proto::remote_prover::ProofType {
+    fn from(value: ProofType) -> Self {
+        match value {
+            ProofType::Transaction => proto::remote_prover::ProofType::Transaction,
+            ProofType::Block => proto::remote_prover::ProofType::Block,
+            ProofType::Batch => proto::remote_prover::ProofType::Batch,
+        }
+    }
+}
+
+impl From<proto::remote_prover::ProofType> for ProofType {
+    fn from(value: proto::remote_prover::ProofType) -> Self {
+        match value {
+            proto::remote_prover::ProofType::Transaction => ProofType::Transaction,
+            proto::remote_prover::ProofType::Batch => ProofType::Batch,
+            proto::remote_prover::ProofType::Block => ProofType::Block,
+        }
+    }
+}
+
+// REMOTE PROVER TEST TYPES
+// ================================================================================================
+
+/// Details of a remote transaction prover test.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ProverTestDetails {
+    pub test_duration_ms: u64,
+    pub proof_size_bytes: usize,
+    pub success_count: u64,
+    pub failure_count: u64,
+    pub proof_type: ProofType,
+}
+
+// REMOTE TRANSACTION PROVER TEST TASK
+// ================================================================================================
+
+/// Runs a task that continuously tests remote prover functionality and updates a watch channel.
+///
+/// This function spawns a task that periodically sends mock request payloads to a remote prover
+/// and measures the success/failure rate and performance metrics for proof generation.
+///
+/// # Arguments
+///
+/// * `prover_url` - The URL of the remote prover service to test.
+/// * `name` - The name of the remote prover.
+/// * `proof_type` - The type of proof to test.
+/// * `serialized_request_payload` - The serialized request payload to send to the remote prover.
+/// * `status_sender` - The sender for the watch channel.
+///
+/// # Returns
+///
+/// `Ok(())` if the task completes successfully, or an error if the task fails.
+#[instrument(target = COMPONENT, name = "remote-prover-test-task", skip_all)]
+pub async fn run_remote_prover_test_task(
+    prover_url: Url,
+    name: &str,
+    proof_type: ProofType,
+    serialized_request_payload: proto::remote_prover::ProofRequest,
+    status_sender: watch::Sender<ServiceStatus>,
+) {
+    let mut client = ClientBuilder::new(prover_url)
+        .with_tls()
+        .expect("TLS is enabled")
+        .with_timeout(Duration::from_secs(10))
+        .without_metadata_version()
+        .without_metadata_genesis()
+        .connect_lazy::<RemoteProverClient>();
+
+    let mut interval = tokio::time::interval(Duration::from_secs(2 * 60)); // Test every 2 minutes
+    interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
+
+    let mut success_count = 0u64;
+    let mut failure_count = 0u64;
+
+    loop {
+        interval.tick().await;
+
+        let current_time = current_unix_timestamp_secs();
+
+        let status = test_remote_prover(
+            &mut client,
+            name,
+            &proof_type,
+            &serialized_request_payload,
+            current_time,
+            &mut success_count,
+            &mut failure_count,
+        )
+        .await;
+
+        // Send the status update; exit if no receivers (shutdown signal)
+        if status_sender.send(status).is_err() {
+            info!("No receivers for remote prover status updates, shutting down");
+            return;
+        }
+    }
+}
+
+/// Tests the remote prover by sending a mock request payload.
+///
+/// This function sends a mock request payload to the remote prover and measures the response time
+/// and success/failure rate for proof generation.
+///
+/// # Arguments
+///
+/// * `client` - The remote prover gRPC client.
+/// * `name` - The name of the remote prover.
+/// * `proof_type` - The type of proof to test.
+/// * `serialized_request_payload` - The serialized request payload to send to the remote prover.
+/// * `current_time` - The current time in seconds since UNIX epoch.
+/// * `success_count` - Mutable reference to the success counter.
+/// * `failure_count` - Mutable reference to the failure counter.
+///
+/// # Returns
+///
+/// A `ServiceStatus` containing the results of the proof test.
+#[instrument(target = COMPONENT, name = "test-remote-prover", skip_all, ret(level = "info"))]
+async fn test_remote_prover(
+    client: &mut miden_node_proto::clients::RemoteProverClient,
+    name: &str,
+    proof_type: &ProofType,
+    serialized_request_payload: &proto::remote_prover::ProofRequest,
+    current_time: u64,
+    success_count: &mut u64,
+    failure_count: &mut u64,
+) -> ServiceStatus {
+    let start_time = std::time::Instant::now();
+
+    // Create the proof request
+    let request = Request::new(serialized_request_payload.clone());
+
+    // Send the request and measure the time
+    match client.prove(request).await {
+        Ok(response) => {
+            let duration = start_time.elapsed();
+            let response_inner = response.into_inner();
+
+            *success_count += 1;
+
+            ServiceStatus {
+                name: name.to_string(),
+                status: Status::Healthy,
+                last_checked: current_time,
+                error: None,
+                details: ServiceDetails::RemoteProverTest(ProverTestDetails {
+                    test_duration_ms: duration.as_millis() as u64,
+                    proof_size_bytes: response_inner.payload.len(),
+                    success_count: *success_count,
+                    failure_count: *failure_count,
+                    proof_type: proof_type.clone(),
+                }),
+            }
+        },
+        Err(e) => {
+            *failure_count += 1;
+
+            ServiceStatus {
+                name: name.to_string(),
+                status: Status::Unhealthy,
+                last_checked: current_time,
+                error: Some(tonic_status_to_json(&e)),
+                details: ServiceDetails::RemoteProverTest(ProverTestDetails {
+                    test_duration_ms: 0,
+                    proof_size_bytes: 0,
+                    success_count: *success_count,
+                    failure_count: *failure_count,
+                    proof_type: proof_type.clone(),
+                }),
+            }
+        },
+    }
+}
+
+/// Converts a `tonic::Status` error to a JSON string with structured error information.
+///
+/// This function extracts the code, message, details, and metadata from a `tonic::Status`
+/// error and serializes them into a JSON string for structured error reporting.
+///
+/// # Arguments
+///
+/// * `status` - The `tonic::Status` error to convert.
+///
+/// # Returns
+///
+/// A JSON string containing the structured error information.
+fn tonic_status_to_json(status: &tonic::Status) -> String {
+    let error_json = serde_json::json!({
+        "code": format!("{:?}", status.code()),
+        "message": status.message(),
+        "details": if status.details().is_empty() {
+            serde_json::Value::Null
+        } else {
+            serde_json::Value::String(format!("details present ({} bytes)", status.details().len()))
+        },
+        "metadata": {
+            "headers": status.metadata().iter().map(|kv| {
+                match kv {
+                    tonic::metadata::KeyAndValueRef::Ascii(key, value) => {
+                        (key.as_str(), value.to_str().unwrap_or("<invalid ascii>"))
+                    },
+                    tonic::metadata::KeyAndValueRef::Binary(key, _value) => {
+                        (key.as_str(), "<binary data>")
+                    }
+                }
+            }).collect::<std::collections::HashMap<_, _>>()
+        }
+    });
+
+    error_json.to_string()
+}
+
+// TRANSACTION WITNESS GENERATOR
+// ================================================================================================
+
+/// Generates a mock transaction for testing remote prover functionality.
+///
+/// This function creates a mock transaction using `MockChainBuilder` similar to what's done
+/// in the remote prover tests. The transaction is generated once and can be reused for
+/// multiple proof test calls.
+pub async fn generate_mock_transaction() -> anyhow::Result<TransactionWitness> {
+    let mut mock_chain_builder = MockChainBuilder::new();
+
+    // Create an account with basic authentication
+    let account = mock_chain_builder
+        .add_existing_wallet(Auth::BasicAuth)
+        .context("Failed to add wallet to mock chain")?;
+
+    // Create a fungible asset
+    let fungible_asset: Asset = FungibleAsset::new(
+        ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET
+            .try_into()
+            .context("Failed to convert account ID")?,
+        100,
+    )
+    .context("Failed to create fungible asset")?
+    .into();
+
+    // Create a P2ID note
+    let note = mock_chain_builder
+        .add_p2id_note(
+            ACCOUNT_ID_SENDER.try_into().context("Failed to convert sender account ID")?,
+            account.id(),
+            &[fungible_asset],
+            NoteType::Private,
+        )
+        .context("Failed to add P2ID note")?;
+
+    // Build the mock chain
+    let mock_chain = mock_chain_builder.build().context("Failed to build mock chain")?;
+
+    // Build transaction context
+    let tx_context = mock_chain
+        .build_tx_context(account.id(), &[note.id()], &[])
+        .context("Failed to build transaction context")?
+        .build()
+        .context("Failed to build transaction")?;
+
+    // Execute the transaction
+    let executed_transaction =
+        Box::pin(tx_context.execute()).await.context("Failed to execute transaction")?;
+
+    // Create transaction witness
+    let transaction_witness = TransactionWitness::from(executed_transaction);
+
+    Ok(transaction_witness)
+}
+
+// GENERATE TEST REQUEST PAYLOAD
+// ================================================================================================
+
+pub(crate) async fn generate_prover_test_payload() -> proto::remote_prover::ProofRequest {
+    proto::remote_prover::ProofRequest {
+        proof_type: proto::remote_prover::ProofType::Transaction.into(),
+        payload: generate_mock_transaction().await.unwrap().to_bytes(),
+    }
+}
diff --git a/bin/network-monitor/src/status.rs b/bin/network-monitor/src/status.rs
index a77746f5a..aba328449 100644
--- a/bin/network-monitor/src/status.rs
+++ b/bin/network-monitor/src/status.rs
@@ -3,88 +3,54 @@
 //! This module contains the logic for checking the status of network services.
 //! Individual status checker tasks send updates via watch channels to the web server.
 
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
+use std::time::Duration;
 
-use anyhow::Context;
 use miden_node_proto::clients::{Builder as ClientBuilder, RemoteProverProxy, Rpc};
+use miden_node_proto::generated as proto;
 use miden_node_proto::generated::block_producer::BlockProducerStatus;
-use miden_node_proto::generated::remote_prover::{
-    ProofType,
-    ProxyStatus,
-    ProxyWorkerStatus,
-    WorkerHealthStatus,
-};
 use miden_node_proto::generated::rpc::RpcStatus;
 use miden_node_proto::generated::rpc_store::StoreStatus;
 use serde::{Deserialize, Serialize};
 use tokio::sync::watch;
 use tokio::time::MissedTickBehavior;
-use tracing::instrument;
+use tracing::{info, instrument};
 use url::Url;
 
-use crate::COMPONENT;
+use crate::faucet::FaucetTestDetails;
+use crate::remote_prover::{ProofType, ProverTestDetails};
+use crate::{COMPONENT, current_unix_timestamp_secs};
 
-// MONITOR CONFIGURATION
+// STATUS
 // ================================================================================================
 
-const DEFAULT_RPC_URL: &str = "http://localhost:50051";
-const DEFAULT_REMOTE_PROVER_URLS: &str = "http://localhost:50052";
-const DEFAULT_PORT: u16 = 3000;
-
-const RPC_URL_ENV_VAR: &str = "MIDEN_MONITOR_RPC_URL";
-const REMOTE_PROVER_URLS_ENV_VAR: &str = "MIDEN_MONITOR_REMOTE_PROVER_URLS";
-const PORT_ENV_VAR: &str = "MIDEN_MONITOR_PORT";
-pub(crate) const ENABLE_OTEL_ENV_VAR: &str = "MIDEN_MONITOR_ENABLE_OTEL";
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub(crate) enum Status {
+    Healthy,
+    Unhealthy,
+    Unknown,
+}
 
-/// Configuration for the monitor.
-///
-/// This struct contains the configuration for the monitor.
-#[derive(Debug, Clone)]
-pub struct MonitorConfig {
-    /// The URL of the RPC service.
-    pub rpc_url: Url,
-    /// The URLs of the remote provers.
-    pub remote_prover_urls: Vec<Url>,
-    /// The port of the monitor.
-    pub port: u16,
+impl From<String> for Status {
+    fn from(value: String) -> Self {
+        match value.as_str() {
+            "HEALTHY" | "connected" => Status::Healthy,
+            "UNHEALTHY" | "disconnected" => Status::Unhealthy,
+            _ => Status::Unknown,
+        }
+    }
 }
 
-impl MonitorConfig {
-    /// Loads the configuration from the environment variables.
-    ///
-    /// This function loads the configuration from the environment variables.
-    /// The environment variables are:
-    /// - `MIDEN_MONITOR_RPC_URL`: The URL of the RPC service.
-    /// - `MIDEN_MONITOR_REMOTE_PROVER_URLS`: The URLs of the remote provers, comma separated.
-    /// - `MIDEN_MONITOR_PORT`: The port of the monitor.
-    pub fn from_env() -> Result<Self, Box<dyn std::error::Error>> {
-        let rpc_url =
-            std::env::var(RPC_URL_ENV_VAR).unwrap_or_else(|_| DEFAULT_RPC_URL.to_string());
-
-        // Parse multiple remote prover URLs from environment variable
-        let remote_prover_urls = std::env::var(REMOTE_PROVER_URLS_ENV_VAR)
-            .unwrap_or_else(|_| DEFAULT_REMOTE_PROVER_URLS.to_string());
-
-        let remote_prover_urls = remote_prover_urls
-            .split(',')
-            .map(str::trim)
-            .filter(|url| !url.is_empty())
-            .map(Url::parse)
-            .collect::<Result<Vec<_>, _>>()?;
-
-        let port = std::env::var(PORT_ENV_VAR)
-            .unwrap_or_else(|_| DEFAULT_PORT.to_string())
-            .parse::<u16>()?;
-
-        Ok(MonitorConfig {
-            rpc_url: Url::parse(&rpc_url)?,
-            remote_prover_urls,
-            port,
-        })
+impl From<proto::remote_prover::WorkerHealthStatus> for Status {
+    fn from(value: proto::remote_prover::WorkerHealthStatus) -> Self {
+        match value {
+            proto::remote_prover::WorkerHealthStatus::Unknown => Status::Unknown,
+            proto::remote_prover::WorkerHealthStatus::Healthy => Status::Healthy,
+            proto::remote_prover::WorkerHealthStatus::Unhealthy => Status::Unhealthy,
+        }
     }
 }
 
-// SERVICE STATUS CHECKER
+// SERVICE STATUS
 // ================================================================================================
 
 /// Status of a service.
@@ -95,35 +61,20 @@ impl MonitorConfig {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ServiceStatus {
     pub name: String,
-    pub status: String,
+    pub status: Status,
     pub last_checked: u64,
     pub error: Option<String>,
-    pub details: Option<ServiceDetails>,
-}
-
-impl ServiceStatus {
-    /// Creates a new `ServiceStatus` with the given name and default values.
-    ///
-    /// The `status` is initialized as "unknown", `last_checked` as 0, and both `error` and
-    /// `details` as None.
-    pub fn new(name: String) -> Self {
-        Self {
-            name,
-            status: "unknown".to_string(),
-            last_checked: 0,
-            error: None,
-            details: None,
-        }
-    }
+    pub details: ServiceDetails,
 }
 
 /// Details of a service.
-///
-/// This struct contains the details of a service, which is a union of the details of the service.
 #[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ServiceDetails {
-    pub rpc_status: Option<RpcStatusDetails>,
-    pub remote_prover_statuses: Vec<RemoteProverStatusDetails>,
+pub enum ServiceDetails {
+    RpcStatus(RpcStatusDetails),
+    RemoteProverStatus(RemoteProverStatusDetails),
+    RemoteProverTest(ProverTestDetails),
+    FaucetTest(FaucetTestDetails),
+    Error,
 }
 
 /// Details of an RPC service.
@@ -145,7 +96,7 @@ pub struct RpcStatusDetails {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct StoreStatusDetails {
     pub version: String,
-    pub status: String,
+    pub status: Status,
     pub chain_tip: u32,
 }
 
@@ -156,7 +107,7 @@ pub struct StoreStatusDetails {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct BlockProducerStatusDetails {
     pub version: String,
-    pub status: String,
+    pub status: Status,
 }
 
 /// Details of a remote prover service.
@@ -165,10 +116,9 @@ pub struct BlockProducerStatusDetails {
 /// of the remote prover service.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct RemoteProverStatusDetails {
-    pub name: String,
     pub url: String,
     pub version: String,
-    pub supported_proof_type: String,
+    pub supported_proof_type: ProofType,
     pub workers: Vec<WorkerStatusDetails>,
 }
 
@@ -180,7 +130,7 @@ pub struct RemoteProverStatusDetails {
 pub struct WorkerStatusDetails {
     pub address: String,
     pub version: String,
-    pub status: String,
+    pub status: Status,
 }
 
 /// Status of a network.
@@ -199,57 +149,50 @@ pub struct NetworkStatus {
 ///
 /// This implementation converts a `StoreStatus` to a `StoreStatusDetails`.
 impl From<StoreStatus> for StoreStatusDetails {
-    fn from(status: StoreStatus) -> Self {
+    fn from(value: StoreStatus) -> Self {
         Self {
-            version: status.version,
-            status: status.status,
-            chain_tip: status.chain_tip,
+            version: value.version,
+            status: value.status.into(),
+            chain_tip: value.chain_tip,
         }
     }
 }
 
 impl From<BlockProducerStatus> for BlockProducerStatusDetails {
-    fn from(status: BlockProducerStatus) -> Self {
+    fn from(value: BlockProducerStatus) -> Self {
         Self {
-            version: status.version,
-            status: status.status,
+            version: value.version,
+            status: value.status.into(),
         }
     }
 }
 
-impl From<ProxyWorkerStatus> for WorkerStatusDetails {
-    fn from(worker: ProxyWorkerStatus) -> Self {
-        let status_str = match WorkerHealthStatus::try_from(worker.status) {
-            Ok(WorkerHealthStatus::Healthy) => "HEALTHY",
-            Ok(WorkerHealthStatus::Unhealthy) => "UNHEALTHY",
-            Ok(WorkerHealthStatus::Unknown) | Err(_) => "UNKNOWN",
-        };
+impl From<proto::remote_prover::ProxyWorkerStatus> for WorkerStatusDetails {
+    fn from(value: proto::remote_prover::ProxyWorkerStatus) -> Self {
+        let status =
+            proto::remote_prover::WorkerHealthStatus::try_from(value.status).unwrap().into();
 
         Self {
-            address: worker.address,
-            version: worker.version,
-            status: status_str.to_string(),
+            address: value.address,
+            version: value.version,
+            status,
         }
     }
 }
 
 impl RemoteProverStatusDetails {
-    pub fn from_proxy_status(status: ProxyStatus, name: String, url: String) -> Self {
-        let proof_type_str = match ProofType::try_from(status.supported_proof_type) {
-            Ok(ProofType::Transaction) => "TRANSACTION",
-            Ok(ProofType::Batch) => "BATCH",
-            Ok(ProofType::Block) => "BLOCK",
-            Err(_) => "UNKNOWN",
-        };
+    pub fn from_proxy_status(status: proto::remote_prover::ProxyStatus, url: String) -> Self {
+        let proof_type = proto::remote_prover::ProofType::try_from(status.supported_proof_type)
+            .unwrap()
+            .into();
 
         let workers: Vec<WorkerStatusDetails> =
             status.workers.into_iter().map(WorkerStatusDetails::from).collect();
 
         Self {
-            name,
             url,
             version: status.version,
-            supported_proof_type: proof_type_str.to_string(),
+            supported_proof_type: proof_type,
             workers,
         }
     }
@@ -283,13 +226,11 @@ impl From<RpcStatus> for RpcStatusDetails {
 ///
 /// `Ok(())` if the task completes successfully, or an error if the task fails.
 #[instrument(target = COMPONENT, name = "rpc-status-task", skip_all)]
-pub async fn run_rpc_status_task(
-    rpc_url: Url,
-    status_sender: watch::Sender<ServiceStatus>,
-) -> anyhow::Result<()> {
+pub async fn run_rpc_status_task(rpc_url: Url, status_sender: watch::Sender<ServiceStatus>) {
     let mut rpc = ClientBuilder::new(rpc_url)
-        .without_tls()
-        .without_timeout()
+        .with_tls()
+        .expect("TLS is enabled")
+        .with_timeout(Duration::from_secs(10))
         .without_metadata_version()
         .without_metadata_genesis()
         .connect_lazy::<Rpc>();
@@ -300,15 +241,15 @@ pub async fn run_rpc_status_task(
     loop {
         interval.tick().await;
 
-        let current_time = SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .context("failed to get current time")?
-            .as_secs();
+        let current_time = current_unix_timestamp_secs();
 
         let status = check_rpc_status(&mut rpc, current_time).await;
 
-        // Send the status update (ignore if no receivers)
-        let _ = status_sender.send(status);
+        // Send the status update; exit if no receivers (shutdown signal)
+        if status_sender.send(status).is_err() {
+            info!("No receivers for RPC status updates, shutting down");
+            return;
+        }
     }
 }
 
@@ -325,7 +266,7 @@ pub async fn run_rpc_status_task(
 ///
 /// A `ServiceStatus` containing the status of the RPC service.
 #[instrument(target = COMPONENT, name = "check-status.rpc", skip_all, ret(level = "info"))]
-async fn check_rpc_status(
+pub(crate) async fn check_rpc_status(
     rpc: &mut miden_node_proto::clients::RpcClient,
     current_time: u64,
 ) -> ServiceStatus {
@@ -335,21 +276,18 @@ async fn check_rpc_status(
 
             ServiceStatus {
                 name: "RPC".to_string(),
-                status: "healthy".to_string(),
+                status: Status::Healthy,
                 last_checked: current_time,
                 error: None,
-                details: Some(ServiceDetails {
-                    rpc_status: Some(status.into()),
-                    remote_prover_statuses: Vec::new(),
-                }),
+                details: ServiceDetails::RpcStatus(status.into()),
             }
         },
         Err(e) => ServiceStatus {
             name: "RPC".to_string(),
-            status: "unhealthy".to_string(),
+            status: Status::Unhealthy,
             last_checked: current_time,
             error: Some(e.to_string()),
-            details: None,
+            details: ServiceDetails::Error,
         },
     }
 }
@@ -377,11 +315,12 @@ pub async fn run_remote_prover_status_task(
     prover_url: Url,
     name: String,
     status_sender: watch::Sender<ServiceStatus>,
-) -> anyhow::Result<()> {
+) {
     let url_str = prover_url.to_string();
     let mut remote_prover = ClientBuilder::new(prover_url)
-        .without_tls()
-        .without_timeout()
+        .with_tls()
+        .expect("TLS is enabled")
+        .with_timeout(Duration::from_secs(10))
         .without_metadata_version()
         .without_metadata_genesis()
         .connect_lazy::<RemoteProverProxy>();
@@ -392,10 +331,7 @@ pub async fn run_remote_prover_status_task(
     loop {
         interval.tick().await;
 
-        let current_time = SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .context("failed to get current time")?
-            .as_secs();
+        let current_time = current_unix_timestamp_secs();
 
         let status = check_remote_prover_status(
             &mut remote_prover,
@@ -405,8 +341,11 @@ pub async fn run_remote_prover_status_task(
         )
         .await;
 
-        // Send the status update (ignore if no receivers)
-        let _ = status_sender.send(status);
+        // Send the status update; exit if no receivers (shutdown signal)
+        if status_sender.send(status).is_err() {
+            info!("No receivers for remote prover status updates, shutting down");
+            return;
+        }
     }
 }
 
@@ -425,8 +364,8 @@ pub async fn run_remote_prover_status_task(
 ///
 /// A `ServiceStatus` containing the status of the remote prover service.
 #[instrument(target = COMPONENT, name = "check-status.remote-prover", skip_all, ret(level = "info"))]
-async fn check_remote_prover_status(
-    remote_prover: &mut miden_node_proto::clients::RemoteProverProxyClient,
+pub(crate) async fn check_remote_prover_status(
+    remote_prover: &mut miden_node_proto::clients::RemoteProverProxyStatusClient,
     name: String,
     url: String,
     current_time: u64,
@@ -436,35 +375,31 @@ async fn check_remote_prover_status(
             let status = response.into_inner();
 
             // Use the new method to convert gRPC status to domain type
-            let remote_prover_details =
-                RemoteProverStatusDetails::from_proxy_status(status, name.clone(), url);
+            let remote_prover_details = RemoteProverStatusDetails::from_proxy_status(status, url);
 
             // Determine overall health based on worker statuses
             let overall_health = if remote_prover_details.workers.is_empty() {
-                "unknown"
-            } else if remote_prover_details.workers.iter().any(|w| w.status == "HEALTHY") {
-                "healthy"
+                Status::Unknown
+            } else if remote_prover_details.workers.iter().any(|w| w.status == Status::Healthy) {
+                Status::Healthy
             } else {
-                "unhealthy"
+                Status::Unhealthy
             };
 
             ServiceStatus {
                 name: format!("Remote Prover ({name})"),
-                status: overall_health.to_string(),
+                status: overall_health,
                 last_checked: current_time,
                 error: None,
-                details: Some(ServiceDetails {
-                    rpc_status: None,
-                    remote_prover_statuses: vec![remote_prover_details],
-                }),
+                details: ServiceDetails::RemoteProverStatus(remote_prover_details),
             }
         },
         Err(e) => ServiceStatus {
             name: format!("Remote Prover ({name})"),
-            status: "unhealthy".to_string(),
+            status: Status::Unhealthy,
             last_checked: current_time,
             error: Some(e.to_string()),
-            details: None,
+            details: ServiceDetails::Error,
         },
     }
 }
diff --git a/crates/proto/src/clients/mod.rs b/crates/proto/src/clients/mod.rs
index 1468f8cd3..4fb6b622c 100644
--- a/crates/proto/src/clients/mod.rs
+++ b/crates/proto/src/clients/mod.rs
@@ -113,11 +113,14 @@ pub type StoreBlockProducerClient =
 pub type StoreRpcClient =
     generated::rpc_store::rpc_client::RpcClient<InterceptedService<Channel, OtelInterceptor>>;
 
-pub type RemoteProverProxyClient =
+pub type RemoteProverProxyStatusClient =
     generated::remote_prover::proxy_status_api_client::ProxyStatusApiClient<
         InterceptedService<Channel, OtelInterceptor>,
     >;
 
+pub type RemoteProverClient =
+    generated::remote_prover::api_client::ApiClient<InterceptedService<Channel, OtelInterceptor>>;
+
 // GRPC CLIENT BUILDER TRAIT
 // ================================================================================================
 
@@ -219,7 +222,7 @@ impl GrpcClientBuilder for StoreRpc {
 }
 
 impl GrpcClientBuilder for RemoteProverProxy {
-    type Service = RemoteProverProxyClient;
+    type Service = RemoteProverProxyStatusClient;
 
     fn with_interceptor(channel: Channel, _config: &ClientConfig) -> Self::Service {
         generated::remote_prover::proxy_status_api_client::ProxyStatusApiClient::with_interceptor(
@@ -229,6 +232,14 @@ impl GrpcClientBuilder for RemoteProverProxy {
     }
 }
 
+impl GrpcClientBuilder for RemoteProverClient {
+    type Service = RemoteProverClient;
+
+    fn with_interceptor(channel: Channel, _config: &ClientConfig) -> Self::Service {
+        generated::remote_prover::api_client::ApiClient::with_interceptor(channel, OtelInterceptor)
+    }
+}
+
 // STRICT TYPE-SAFE BUILDER (NO DEFAULTS)
 // ================================================================================================
 

From 56d311a5a0e7b1ebef072a450784f7229a64ab82 Mon Sep 17 00:00:00 2001
From: juan518munoz <62400508+juan518munoz@users.noreply.github.com>
Date: Fri, 26 Sep 2025 18:14:55 -0300
Subject: [PATCH 22/78] chore: update miden-base version (#1248)

---
 Cargo.lock                            | 12 ++++++------
 crates/ntx-builder/src/transaction.rs |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bee3ecf9b..fbbb85ad0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2059,7 +2059,7 @@ dependencies = [
 [[package]]
 name = "miden-block-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2131,7 +2131,7 @@ dependencies = [
 [[package]]
 name = "miden-lib"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
 dependencies = [
  "miden-assembly",
  "miden-objects",
@@ -2454,7 +2454,7 @@ dependencies = [
 [[package]]
 name = "miden-objects"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
 dependencies = [
  "bech32",
  "getrandom 0.3.3",
@@ -2587,7 +2587,7 @@ dependencies = [
 [[package]]
 name = "miden-testing"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
 dependencies = [
  "anyhow",
  "itertools",
@@ -2607,7 +2607,7 @@ dependencies = [
 [[package]]
 name = "miden-tx"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "miden-tx-batch-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
 dependencies = [
  "miden-objects",
  "miden-tx",
diff --git a/crates/ntx-builder/src/transaction.rs b/crates/ntx-builder/src/transaction.rs
index 849cd5aa2..2ff3f33f7 100644
--- a/crates/ntx-builder/src/transaction.rs
+++ b/crates/ntx-builder/src/transaction.rs
@@ -309,7 +309,7 @@ impl DataStore for NtxDataStore {
                 });
             }
 
-            AssetWitness::new(account.vault().asset_tree().open(&vault_key)).map_err(|err| {
+            AssetWitness::new(account.vault().open(vault_key).into()).map_err(|err| {
                 DataStoreError::Other {
                     error_msg: "failed to open vault asset tree".into(),
                     source: Some(Box::new(err)),

From 356057350a32f3e9e82aa41a3439f27a679dcb45 Mon Sep 17 00:00:00 2001
From: Mirko <48352201+Mirko-von-Leipzig@users.noreply.github.com>
Date: Sun, 28 Sep 2025 11:20:17 +0200
Subject: [PATCH 23/78] refactor(mempool): state inferred DAG (#1234)

This refactors the mempool from semi-decoupled state, transaction, and batch DAGs, to a
single DAG. This simplifies the overall structure and is a more intuitive mempool model imo.

Nodes in the graph represent a transaction, batch or block and they are replaced as they are
processed i.e. all transaction nodes from a batch will be replaced by that batch's node.

Edges in the graph are inferred via the state. Each node's produced state and consumed state
is tracked, and this let's us establish parent <-> child relations by connecting the producer and
consumer of a note, or account commitment. This acts as a level of indirection, such that we
can remove or replace a node without having to update all the parent/child pointers, since instead
these are computed on-demand.
---
 Cargo.lock                                    |  12 +-
 bin/remote-prover/src/proxy/worker.rs         |  16 +-
 .../block-producer/src/batch_builder/mod.rs   |  31 +-
 .../block-producer/src/block_builder/mod.rs   |  32 +-
 .../block-producer/src/domain/transaction.rs  |   7 +-
 crates/block-producer/src/errors.rs           |   7 +-
 crates/block-producer/src/lib.rs              |   2 +-
 .../block-producer/src/mempool/batch_graph.rs | 379 ---------
 crates/block-producer/src/mempool/budget.rs   | 102 +++
 .../block-producer/src/mempool/graph/mod.rs   | 437 ----------
 .../block-producer/src/mempool/graph/tests.rs | 577 -------------
 .../mempool/inflight_state/account_state.rs   | 325 --------
 .../src/mempool/inflight_state/mod.rs         | 729 ----------------
 crates/block-producer/src/mempool/mod.rs      | 775 ++++++++++--------
 crates/block-producer/src/mempool/nodes.rs    | 305 +++++++
 crates/block-producer/src/mempool/state.rs    | 240 ++++++
 .../src/mempool/subscription.rs               |   2 +
 crates/block-producer/src/mempool/tests.rs    |   2 +-
 .../src/mempool/transaction_expiration.rs     |  75 --
 .../src/mempool/transaction_graph.rs          | 208 -----
 crates/block-producer/src/server/mod.rs       |  24 +-
 .../src/test_utils/proven_tx.rs               |   5 +-
 crates/ntx-builder/src/transaction.rs         |   2 +-
 crates/store/src/db/tests.rs                  |   2 +-
 crates/store/src/genesis/config/mod.rs        |  13 +-
 25 files changed, 1172 insertions(+), 3137 deletions(-)
 delete mode 100644 crates/block-producer/src/mempool/batch_graph.rs
 create mode 100644 crates/block-producer/src/mempool/budget.rs
 delete mode 100644 crates/block-producer/src/mempool/graph/mod.rs
 delete mode 100644 crates/block-producer/src/mempool/graph/tests.rs
 delete mode 100644 crates/block-producer/src/mempool/inflight_state/account_state.rs
 delete mode 100644 crates/block-producer/src/mempool/inflight_state/mod.rs
 create mode 100644 crates/block-producer/src/mempool/nodes.rs
 create mode 100644 crates/block-producer/src/mempool/state.rs
 delete mode 100644 crates/block-producer/src/mempool/transaction_expiration.rs
 delete mode 100644 crates/block-producer/src/mempool/transaction_graph.rs

diff --git a/Cargo.lock b/Cargo.lock
index bee3ecf9b..fbbb85ad0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2059,7 +2059,7 @@ dependencies = [
 [[package]]
 name = "miden-block-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2131,7 +2131,7 @@ dependencies = [
 [[package]]
 name = "miden-lib"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
 dependencies = [
  "miden-assembly",
  "miden-objects",
@@ -2454,7 +2454,7 @@ dependencies = [
 [[package]]
 name = "miden-objects"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
 dependencies = [
  "bech32",
  "getrandom 0.3.3",
@@ -2587,7 +2587,7 @@ dependencies = [
 [[package]]
 name = "miden-testing"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
 dependencies = [
  "anyhow",
  "itertools",
@@ -2607,7 +2607,7 @@ dependencies = [
 [[package]]
 name = "miden-tx"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "miden-tx-batch-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#c5a7457c9fdf042e541db5bf5b33c1cb75ea4217"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
 dependencies = [
  "miden-objects",
  "miden-tx",
diff --git a/bin/remote-prover/src/proxy/worker.rs b/bin/remote-prover/src/proxy/worker.rs
index ac91efe11..bf181c613 100644
--- a/bin/remote-prover/src/proxy/worker.rs
+++ b/bin/remote-prover/src/proxy/worker.rs
@@ -196,18 +196,10 @@ impl Worker {
 
         self.version = worker_status.version;
 
-        let worker_supported_proof_type =
-            match ProofType::try_from(worker_status.supported_proof_type) {
-                Ok(proof_type) => proof_type,
-                Err(e) => {
-                    error!(
-                        "Failed to convert worker supported proof type ({}): {}",
-                        self.address(),
-                        e
-                    );
-                    return Err(e.to_string());
-                },
-            };
+        let worker_supported_proof_type = ProofType::try_from(worker_status.supported_proof_type)
+            .inspect_err(|err| {
+            error!(%err, address=%self.address(), "Failed to convert worker supported proof type");
+        })?;
 
         if supported_proof_type != worker_supported_proof_type {
             return Err(format!("Unsupported proof type: {supported_proof_type}"));
diff --git a/crates/block-producer/src/batch_builder/mod.rs b/crates/block-producer/src/batch_builder/mod.rs
index 90b586f6a..7974093f7 100644
--- a/crates/block-producer/src/batch_builder/mod.rs
+++ b/crates/block-producer/src/batch_builder/mod.rs
@@ -1,4 +1,6 @@
 use std::num::NonZeroUsize;
+use std::ops::Deref;
+use std::sync::Arc;
 use std::time::Duration;
 
 use futures::never::Never;
@@ -198,12 +200,16 @@ impl BatchJob {
     async fn get_batch_inputs(
         &self,
         batch: SelectedBatch,
-    ) -> Result<(Vec<AuthenticatedTransaction>, BatchInputs), BuildBatchError> {
-        let block_references =
-            batch.transactions.iter().map(AuthenticatedTransaction::reference_block);
+    ) -> Result<(Vec<Arc<AuthenticatedTransaction>>, BatchInputs), BuildBatchError> {
+        let block_references = batch
+            .transactions
+            .iter()
+            .map(Deref::deref)
+            .map(AuthenticatedTransaction::reference_block);
         let unauthenticated_notes = batch
             .transactions
             .iter()
+            .map(Deref::deref)
             .flat_map(AuthenticatedTransaction::unauthenticated_notes);
 
         self.store
@@ -215,11 +221,14 @@ impl BatchJob {
 
     #[instrument(target = COMPONENT, name = "batch_builder.propose_batch", skip_all, err)]
     async fn propose_batch(
-        transactions: Vec<AuthenticatedTransaction>,
+        transactions: Vec<Arc<AuthenticatedTransaction>>,
         inputs: BatchInputs,
     ) -> Result<ProposedBatch, BuildBatchError> {
-        let transactions =
-            transactions.iter().map(AuthenticatedTransaction::proven_transaction).collect();
+        let transactions = transactions
+            .iter()
+            .map(Deref::deref)
+            .map(AuthenticatedTransaction::proven_transaction)
+            .collect();
 
         ProposedBatch::new(
             transactions,
@@ -234,7 +243,7 @@ impl BatchJob {
     async fn prove_batch(
         &self,
         proposed_batch: ProposedBatch,
-    ) -> Result<ProvenBatch, BuildBatchError> {
+    ) -> Result<Arc<ProvenBatch>, BuildBatchError> {
         Span::current().set_attribute("prover.kind", self.batch_prover.kind());
 
         let proven_batch = match &self.batch_prover {
@@ -256,7 +265,7 @@ impl BatchJob {
                 MIN_PROOF_SECURITY_LEVEL,
             ))
         } else {
-            Ok(proven_batch)
+            Ok(Arc::new(proven_batch))
         }
     }
 
@@ -275,7 +284,7 @@ impl BatchJob {
     }
 
     #[instrument(target = COMPONENT, name = "batch_builder.commit_batch", skip_all)]
-    async fn commit_batch(&self, batch: ProvenBatch) {
+    async fn commit_batch(&self, batch: Arc<ProvenBatch>) {
         self.mempool.lock().await.commit_batch(batch);
     }
 
@@ -287,7 +296,7 @@ impl BatchJob {
 
 struct SelectedBatch {
     id: BatchId,
-    transactions: Vec<AuthenticatedTransaction>,
+    transactions: Vec<Arc<AuthenticatedTransaction>>,
 }
 
 // BATCH PROVER
@@ -328,6 +337,7 @@ impl TelemetryInjectorExt for SelectedBatch {
             "transactions.input_notes.count",
             self.transactions
                 .iter()
+                .map(Deref::deref)
                 .map(AuthenticatedTransaction::input_note_count)
                 .sum::<usize>(),
         );
@@ -335,6 +345,7 @@ impl TelemetryInjectorExt for SelectedBatch {
             "transactions.output_notes.count",
             self.transactions
                 .iter()
+                .map(Deref::deref)
                 .map(AuthenticatedTransaction::output_note_count)
                 .sum::<usize>(),
         );
diff --git a/crates/block-producer/src/block_builder/mod.rs b/crates/block-producer/src/block_builder/mod.rs
index 177d59dbf..2f6834d31 100644
--- a/crates/block-producer/src/block_builder/mod.rs
+++ b/crates/block-producer/src/block_builder/mod.rs
@@ -1,4 +1,5 @@
-use std::ops::Range;
+use std::ops::{Deref, Range};
+use std::sync::Arc;
 
 use futures::FutureExt;
 use futures::never::Never;
@@ -104,9 +105,10 @@ impl BlockBuilder {
     async fn build_block(&self, mempool: &SharedMempool) {
         use futures::TryFutureExt;
 
-        Self::select_block(mempool)
-            .inspect(SelectedBlock::inject_telemetry)
-            .then(|selected| self.get_block_inputs(selected))
+        let selected = Self::select_block(mempool).inspect(SelectedBlock::inject_telemetry).await;
+        let block_num = selected.block_number;
+
+        self.get_block_inputs(selected)
             .inspect_ok(BlockBatchesAndInputs::inject_telemetry)
             .and_then(|inputs| self.propose_block(inputs))
             .inspect_ok(ProposedBlock::inject_telemetry)
@@ -118,7 +120,7 @@ impl BlockBuilder {
             .and_then(|proven_block| self.commit_block(mempool, proven_block))
             // Handle errors by propagating the error to the root span and rolling back the block.
             .inspect_err(|err| Span::current().set_error(err))
-            .or_else(|_err| self.rollback_block(mempool).never_error())
+            .or_else(|_err| self.rollback_block(mempool, block_num).never_error())
             // All errors were handled and discarded above, so this is just type juggling
             // to drop the result.
             .unwrap_or_else(|_: Never| ())
@@ -169,9 +171,12 @@ impl BlockBuilder {
                 .cloned()
                 .filter_map(|note| note.header().map(NoteHeader::id))
         });
-        let block_references_iter = batch_iter.clone().map(ProvenBatch::reference_block_num);
-        let account_ids_iter = batch_iter.clone().flat_map(ProvenBatch::updated_accounts);
-        let created_nullifiers_iter = batch_iter.flat_map(ProvenBatch::created_nullifiers);
+        let block_references_iter =
+            batch_iter.clone().map(Deref::deref).map(ProvenBatch::reference_block_num);
+        let account_ids_iter =
+            batch_iter.clone().map(Deref::deref).flat_map(ProvenBatch::updated_accounts);
+        let created_nullifiers_iter =
+            batch_iter.map(Deref::deref).flat_map(ProvenBatch::created_nullifiers);
 
         let inputs = self
             .store
@@ -193,6 +198,7 @@ impl BlockBuilder {
         batches_inputs: BlockBatchesAndInputs,
     ) -> Result<ProposedBlock, BuildBlockError> {
         let BlockBatchesAndInputs { batches, inputs } = batches_inputs;
+        let batches = batches.into_iter().map(Arc::unwrap_or_clone).collect();
 
         let proposed_block =
             ProposedBlock::new(inputs, batches).map_err(BuildBlockError::ProposeBlockFailed)?;
@@ -230,14 +236,14 @@ impl BlockBuilder {
             .await
             .map_err(BuildBlockError::StoreApplyBlockFailed)?;
 
-        mempool.lock().await.commit_block(built_block.header().clone());
+        mempool.lock().await.commit_block(built_block.header().block_num());
 
         Ok(())
     }
 
     #[instrument(target = COMPONENT, name = "block_builder.rollback_block", skip_all)]
-    async fn rollback_block(&self, mempool: &SharedMempool) {
-        mempool.lock().await.rollback_block();
+    async fn rollback_block(&self, mempool: &SharedMempool, block: BlockNumber) {
+        mempool.lock().await.rollback_block(block);
     }
 
     #[instrument(target = COMPONENT, name = "block_builder.simulate_proving", skip_all)]
@@ -270,7 +276,7 @@ impl BlockBuilder {
 /// telemetry in-between the selection and fetching the required [`BlockInputs`].
 struct SelectedBlock {
     block_number: BlockNumber,
-    batches: Vec<ProvenBatch>,
+    batches: Vec<Arc<ProvenBatch>>,
 }
 
 impl TelemetryInjectorExt for SelectedBlock {
@@ -289,7 +295,7 @@ impl TelemetryInjectorExt for SelectedBlock {
 /// A wrapper around the inputs needed to build a [`ProposedBlock`], primarily used to be able to
 /// inject telemetry in-between fetching block inputs and proposing the block.
 struct BlockBatchesAndInputs {
-    batches: Vec<ProvenBatch>,
+    batches: Vec<Arc<ProvenBatch>>,
     inputs: BlockInputs,
 }
 
diff --git a/crates/block-producer/src/domain/transaction.rs b/crates/block-producer/src/domain/transaction.rs
index 43c7daed9..26d62def3 100644
--- a/crates/block-producer/src/domain/transaction.rs
+++ b/crates/block-producer/src/domain/transaction.rs
@@ -1,3 +1,5 @@
+#![allow(dead_code, reason = "WIP: mempoool refactor")]
+
 use std::collections::HashSet;
 use std::sync::Arc;
 
@@ -45,7 +47,7 @@ impl AuthenticatedTransaction {
     /// # Errors
     ///
     /// Returns an error if any of the transaction's nullifiers are marked as spent by the inputs.
-    pub fn new(
+    pub fn new_unchecked(
         tx: ProvenTransaction,
         inputs: TransactionInputs,
     ) -> Result<AuthenticatedTransaction, VerifyTxError> {
@@ -123,7 +125,6 @@ impl AuthenticatedTransaction {
         Arc::clone(&self.inner)
     }
 
-    #[cfg(test)]
     pub fn raw_proven_transaction(&self) -> &ProvenTransaction {
         &self.inner
     }
@@ -154,7 +155,7 @@ impl AuthenticatedTransaction {
             current_block_height: 0.into(),
         };
         // SAFETY: nullifiers were set to None aka are definitely unspent.
-        Self::new(inner, inputs).unwrap()
+        Self::new_unchecked(inner, inputs).unwrap()
     }
 
     /// Overrides the authentication height with the given value.
diff --git a/crates/block-producer/src/errors.rs b/crates/block-producer/src/errors.rs
index af0654caf..63a217120 100644
--- a/crates/block-producer/src/errors.rs
+++ b/crates/block-producer/src/errors.rs
@@ -2,7 +2,6 @@ use miden_block_prover::ProvenBlockError;
 use miden_node_proto::errors::ConversionError;
 use miden_node_proto::generated::errors::SubmitProvenTransactionError;
 use miden_node_utils::ErrorReport;
-use miden_node_utils::formatting::format_opt;
 use miden_objects::account::AccountId;
 use miden_objects::block::BlockNumber;
 use miden_objects::note::{NoteId, Nullifier};
@@ -55,10 +54,12 @@ pub enum VerifyTxError {
     OutputNotesAlreadyExist(Vec<NoteId>),
 
     /// The account's initial commitment did not match the current account's commitment
-    #[error("transaction's initial state commitment {tx_initial_account_commitment} does not match the account's current value of {}", format_opt(.current_account_commitment.as_ref()))]
+    #[error(
+        "transaction's initial state commitment {tx_initial_account_commitment} does not match the account's current value of {current_account_commitment}"
+    )]
     IncorrectAccountInitialCommitment {
         tx_initial_account_commitment: Word,
-        current_account_commitment: Option<Word>,
+        current_account_commitment: Word,
     },
 
     /// Failed to retrieve transaction inputs from the store
diff --git a/crates/block-producer/src/lib.rs b/crates/block-producer/src/lib.rs
index 81482ea08..4b1070958 100644
--- a/crates/block-producer/src/lib.rs
+++ b/crates/block-producer/src/lib.rs
@@ -40,7 +40,7 @@ const SERVER_NUM_BATCH_BUILDERS: NonZeroUsize = NonZeroUsize::new(2).unwrap();
 ///
 /// This determines the grace period incoming transactions have between fetching their input from
 /// the store and verification in the mempool.
-const SERVER_MEMPOOL_STATE_RETENTION: usize = 5;
+const SERVER_MEMPOOL_STATE_RETENTION: NonZeroUsize = NonZeroUsize::new(5).unwrap();
 
 /// Transactions are rejected by the mempool if there is less than this amount of blocks between the
 /// chain tip and the transaction's expiration block.
diff --git a/crates/block-producer/src/mempool/batch_graph.rs b/crates/block-producer/src/mempool/batch_graph.rs
deleted file mode 100644
index 1c4730e5d..000000000
--- a/crates/block-producer/src/mempool/batch_graph.rs
+++ /dev/null
@@ -1,379 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet};
-
-use miden_objects::account::AccountId;
-use miden_objects::batch::{BatchId, ProvenBatch};
-use miden_objects::transaction::TransactionId;
-
-use super::graph::{DependencyGraph, GraphError};
-use super::{BlockBudget, BudgetStatus};
-
-// BATCH GRAPH
-// ================================================================================================
-
-/// Tracks the dependencies between batches, transactions and their parents.
-///
-/// Batches are inserted with their transaction and parent transaction sets which defines the edges
-/// of the dependency graph. Batches are initially inserted in a pending state while we wait on
-/// their proofs to be generated. The dependencies are still tracked in this state.
-///
-/// Batches can then be promoted to ready by [submitting their proofs](Self::submit_proof) once
-/// available. Proven batches are considered for inclusion in blocks once _all_ parent batches have
-/// been selected.
-///
-/// Committed batches (i.e. included in blocks) may be [pruned](Self::prune_committed) from the
-/// graph to bound the graph's size.
-///
-/// Batches may also be outright [purged](Self::remove_batches) from the graph. This is useful for
-/// batches which may have become invalid due to external considerations e.g. expired transactions.
-///
-/// # Batch lifecycle
-/// ```text
-///                           │                           
-///                     insert│                           
-///                     ┌─────▼─────┐                     
-///                     │  pending  ┼────┐                
-///                     └─────┬─────┘    │                
-///                           │          │                
-///               submit_proof│          │                
-///                     ┌─────▼─────┐    │                
-///                     │   proved  ┼────┤                
-///                     └─────┬─────┘    │                
-///                           │          │                
-///               select_block│          │                
-///                     ┌─────▼─────┐    │                
-///                     │ committed ┼────┤                
-///                     └─────┬─────┘    │                
-///                           │          │                
-///            prune_committed│          │remove_batches
-///                     ┌─────▼─────┐    │                
-///                     │  <null>   ◄────┘                
-///                     └───────────┘                     
-/// ```
-#[derive(Default, Debug, Clone, PartialEq)]
-pub struct BatchGraph {
-    /// Tracks the interdependencies between batches.
-    inner: DependencyGraph<BatchId, ProvenBatch>,
-
-    /// Maps each transaction to its batch, allowing for reverse lookups.
-    ///
-    /// Incoming batches are defined entirely in terms of transactions, including parent edges.
-    /// This let's us transform these parent transactions into the relevant parent batches.
-    transactions: BTreeMap<TransactionId, BatchId>,
-
-    /// Maps each batch to its transaction set.
-    ///
-    /// Required because the dependency graph is defined in terms of batches. This let's us
-    /// translate between batches and their transactions when required.
-    batches: BTreeMap<BatchId, Vec<TransactionId>>,
-}
-
-#[derive(thiserror::Error, Debug, Clone, PartialEq, Eq)]
-pub enum BatchInsertError {
-    #[error("Transactions are already in the graph: {0:?}")]
-    DuplicateTransactions(BTreeSet<TransactionId>),
-    #[error("Unknown parent transaction {0}")]
-    UnknownParentTransaction(TransactionId),
-    #[error(transparent)]
-    GraphError(#[from] GraphError<BatchId>),
-}
-
-impl BatchGraph {
-    /// Inserts a new batch into the graph.
-    ///
-    /// Parents are the transactions on which the given transactions have a direct dependency. This
-    /// includes transactions within the same batch i.e. a transaction and parent transaction may
-    /// both be in this batch.
-    ///
-    /// # Returns
-    ///
-    /// The new batch's ID.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if:
-    ///   - the batch ID is already in use
-    ///   - any transactions are already in the graph
-    ///   - any parent transactions are _not_ in the graph
-    pub fn insert(
-        &mut self,
-        transactions: Vec<(TransactionId, AccountId)>,
-        mut parents: BTreeSet<TransactionId>,
-    ) -> Result<BatchId, BatchInsertError> {
-        let duplicates = transactions
-            .iter()
-            .filter_map(|(tx, _)| self.transactions.contains_key(tx).then_some(tx))
-            .copied()
-            .collect::<BTreeSet<_>>();
-        if !duplicates.is_empty() {
-            return Err(BatchInsertError::DuplicateTransactions(duplicates));
-        }
-
-        // Reverse lookup parent batch IDs. Take care to allow for parent transactions within this
-        // batch i.e. internal dependencies.
-        for (tx, _) in &transactions {
-            parents.remove(tx);
-        }
-        let parent_batches = parents
-            .into_iter()
-            .map(|tx| {
-                self.transactions
-                    .get(&tx)
-                    .copied()
-                    .ok_or(BatchInsertError::UnknownParentTransaction(tx))
-            })
-            .collect::<Result<_, _>>()?;
-
-        let id = BatchId::from_ids(transactions.iter().copied());
-        self.inner.insert_pending(id, parent_batches)?;
-
-        for (tx, _) in transactions.iter().copied() {
-            self.transactions.insert(tx, id);
-        }
-
-        self.batches.insert(id, transactions.into_iter().map(|(tx, _)| tx).collect());
-
-        Ok(id)
-    }
-
-    /// Removes the batches and their descendants from the graph.
-    ///
-    /// # Returns
-    ///
-    /// Returns all removed batches and their transactions.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if any of the batches are not currently in the graph.
-    pub fn remove_batches(
-        &mut self,
-        batch_ids: BTreeSet<BatchId>,
-    ) -> Result<BTreeMap<BatchId, Vec<TransactionId>>, GraphError<BatchId>> {
-        // This returns all descendent batches as well.
-        let batch_ids = self.inner.purge_subgraphs(batch_ids)?;
-
-        // SAFETY: These batches must all have been inserted since they are emitted from the inner
-        // dependency graph, and therefore must all be in the batches mapping.
-        let batches = batch_ids
-            .into_iter()
-            .map(|batch_id| {
-                (batch_id, self.batches.remove(&batch_id).expect("batch should be removed"))
-            })
-            .collect::<BTreeMap<_, _>>();
-
-        for tx in batches.values().flatten() {
-            self.transactions.remove(tx);
-        }
-
-        Ok(batches)
-    }
-
-    /// Remove all batches associated with the given transactions (and their descendents).
-    ///
-    /// Transactions not currently associated with a batch are allowed, but have no impact.
-    ///
-    /// # Returns
-    ///
-    /// Returns all removed batches and their transactions.
-    ///
-    /// Unlike [`remove_batches`](Self::remove_batches), this has no error condition as batches are
-    /// derived internally.
-    pub fn remove_batches_with_transactions<'a>(
-        &mut self,
-        txs: impl Iterator<Item = &'a TransactionId>,
-    ) -> BTreeMap<BatchId, Vec<TransactionId>> {
-        let batches = txs.filter_map(|tx| self.transactions.get(tx)).copied().collect();
-
-        self.remove_batches(batches)
-            .expect("batches must exist as they have been taken from internal map")
-    }
-
-    /// Removes the set of committed batches from the graph.
-    ///
-    /// The batches _must_ have been previously selected for inclusion in a block using
-    /// [`select_block`](Self::select_block). This is intended for limiting the size of the graph by
-    /// culling committed data.
-    ///
-    /// # Returns
-    ///
-    /// Returns the transactions of the pruned batches.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if
-    ///   - any batch was not previously selected for inclusion in a block
-    ///   - any batch is unknown
-    ///   - any parent batch would be left dangling in the graph
-    ///
-    /// The last point implies that batches should be removed in block order.
-    pub fn prune_committed(
-        &mut self,
-        batch_ids: &BTreeSet<BatchId>,
-    ) -> Result<Vec<TransactionId>, GraphError<BatchId>> {
-        // This clone could be elided by moving this call to the end. This would lose the atomic
-        // property of this method though its unclear what value (if any) that has.
-        self.inner.prune_processed(batch_ids.clone())?;
-        let mut transactions = Vec::new();
-
-        for batch_id in batch_ids {
-            transactions.extend(self.batches.remove(batch_id).into_iter().flatten());
-        }
-
-        for tx in &transactions {
-            self.transactions.remove(tx);
-        }
-
-        Ok(transactions)
-    }
-
-    /// Submits a proof for the given batch, promoting it from pending to ready for inclusion in a
-    /// block once all its parents have themselves been included.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if the batch is not in the graph or if it was already previously proven.
-    pub fn submit_proof(&mut self, batch: ProvenBatch) -> Result<(), GraphError<BatchId>> {
-        self.inner.promote_pending(batch.id(), batch)
-    }
-
-    /// Selects the next set of batches ready for inclusion in a block while adhering to the given
-    /// budget.
-    ///
-    /// Note that batch order should be maintained to allow for inter-batch dependencies to be
-    /// correctly resolved.
-    pub fn select_block(&mut self, mut budget: BlockBudget) -> Vec<ProvenBatch> {
-        let mut batches = Vec::with_capacity(budget.batches);
-
-        while let Some(batch_id) = self.inner.roots().first().copied() {
-            // SAFETY: Since it was a root batch, it must definitely have a processed batch
-            // associated with it.
-            let batch = self.inner.get(&batch_id).expect("root should be in graph");
-
-            // Adhere to block's budget.
-            if budget.check_then_subtract(batch) == BudgetStatus::Exceeded {
-                break;
-            }
-
-            // Clone is required to avoid multiple borrows of self. We delay this clone until after
-            // the budget check, which is why this looks so out of place.
-            let batch = batch.clone();
-
-            // SAFETY: This is definitely a root since we just selected it from the set of roots.
-            self.inner.process_root(batch_id).expect("root should be processed");
-
-            batches.push(batch);
-        }
-
-        batches
-    }
-
-    /// Returns `true` if the graph contains the given batch.
-    pub fn contains(&self, id: &BatchId) -> bool {
-        self.batches.contains_key(id)
-    }
-
-    /// Returns the transactions associated with the given batch, otherwise returns `None` if the
-    /// batch does not exist.
-    pub fn get_transactions(&self, id: &BatchId) -> Option<&[TransactionId]> {
-        self.batches.get(id).map(Vec::as_slice)
-    }
-
-    // Amount of inflight batches without a submitted proof.
-    pub fn num_pending(&self) -> usize {
-        self.inner.num_pending()
-    }
-
-    // Amount of inflight batches with a submitted proof.
-    pub fn num_proven(&self) -> usize {
-        self.inner.num_processed()
-    }
-
-    // The total number of batches in the graph.
-    pub fn len(&self) -> usize {
-        self.inner.len()
-    }
-
-    /// The amount of batches which are root nodes.
-    pub fn num_roots(&self) -> usize {
-        self.inner.num_roots()
-    }
-}
-
-#[cfg(any(test, doctest))]
-mod tests {
-    use super::*;
-    use crate::test_utils::Random;
-
-    // INSERT TESTS
-    // ================================================================================================
-
-    #[test]
-    fn insert_rejects_duplicate_transactions() {
-        let mut rng = Random::with_random_seed();
-        let tx_dup = (rng.draw_tx_id(), rng.draw_account_id());
-        let tx_non_dup = (rng.draw_tx_id(), rng.draw_account_id());
-
-        let mut uut = BatchGraph::default();
-
-        uut.insert(vec![tx_dup], BTreeSet::default()).unwrap();
-        let err = uut.insert(vec![tx_dup, tx_non_dup], BTreeSet::default()).unwrap_err();
-        let expected = BatchInsertError::DuplicateTransactions([tx_dup.0].into());
-
-        assert_eq!(err, expected);
-    }
-
-    #[test]
-    fn insert_rejects_missing_parents() {
-        let mut rng = Random::with_random_seed();
-        let tx = (rng.draw_tx_id(), rng.draw_account_id());
-        let missing = (rng.draw_tx_id(), rng.draw_account_id());
-
-        let mut uut = BatchGraph::default();
-
-        let err = uut.insert(vec![tx], [missing.0].into()).unwrap_err();
-        let expected = BatchInsertError::UnknownParentTransaction(missing.0);
-
-        assert_eq!(err, expected);
-    }
-
-    #[test]
-    fn insert_with_internal_parent_succeeds() {
-        // Ensure that a batch with internal dependencies can be inserted.
-        let mut rng = Random::with_random_seed();
-        let parent = (rng.draw_tx_id(), rng.draw_account_id());
-        let child = (rng.draw_tx_id(), rng.draw_account_id());
-
-        let mut uut = BatchGraph::default();
-        uut.insert(vec![parent, child], [parent.0].into()).unwrap();
-    }
-
-    // PURGE_SUBGRAPHS TESTS
-    // ================================================================================================
-
-    #[test]
-    fn purge_subgraphs_returns_all_purged_transaction_sets() {
-        // Ensure that purge_subgraphs returns both parent and child batches when the parent is
-        // pruned. Further ensure that a disjoint batch is not pruned.
-        let mut rng = Random::with_random_seed();
-        let parent_batch_txs =
-            (0..5).map(|_| (rng.draw_tx_id(), rng.draw_account_id())).collect::<Vec<_>>();
-        let child_batch_txs =
-            (0..5).map(|_| (rng.draw_tx_id(), rng.draw_account_id())).collect::<Vec<_>>();
-        let disjoint_batch_txs =
-            (0..5).map(|_| (rng.draw_tx_id(), rng.draw_account_id())).collect();
-
-        let mut uut = BatchGraph::default();
-        let parent_batch_id = uut.insert(parent_batch_txs.clone(), BTreeSet::default()).unwrap();
-        let child_batch_id =
-            uut.insert(child_batch_txs.clone(), [parent_batch_txs[0].0].into()).unwrap();
-        uut.insert(disjoint_batch_txs, BTreeSet::default()).unwrap();
-
-        let result = uut.remove_batches([parent_batch_id].into()).unwrap();
-        let expected = [
-            (parent_batch_id, parent_batch_txs.into_iter().map(|(tx, _)| tx).collect()),
-            (child_batch_id, child_batch_txs.into_iter().map(|(tx, _)| tx).collect()),
-        ]
-        .into();
-
-        assert_eq!(result, expected);
-    }
-}
diff --git a/crates/block-producer/src/mempool/budget.rs b/crates/block-producer/src/mempool/budget.rs
new file mode 100644
index 000000000..05a743284
--- /dev/null
+++ b/crates/block-producer/src/mempool/budget.rs
@@ -0,0 +1,102 @@
+use miden_objects::batch::ProvenBatch;
+use miden_objects::{
+    MAX_ACCOUNTS_PER_BATCH,
+    MAX_INPUT_NOTES_PER_BATCH,
+    MAX_OUTPUT_NOTES_PER_BATCH,
+};
+
+use crate::domain::transaction::AuthenticatedTransaction;
+use crate::{DEFAULT_MAX_BATCHES_PER_BLOCK, DEFAULT_MAX_TXS_PER_BATCH};
+
+/// Constraints placed on the batches proposed by the [`Mempool`](super::Mempool).
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct BatchBudget {
+    /// Maximum number of transactions allowed in a batch.
+    pub transactions: usize,
+    /// Maximum number of input notes allowed.
+    pub input_notes: usize,
+    /// Maximum number of output notes allowed.
+    pub output_notes: usize,
+    /// Maximum number of updated accounts.
+    pub accounts: usize,
+}
+
+/// Constraints placed on the blocks proposed by the [`Mempool`](super::Mempool).
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct BlockBudget {
+    /// Maximum number of batches allowed in a block.
+    pub batches: usize,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub(crate) enum BudgetStatus {
+    /// The operation remained within the budget.
+    WithinScope,
+    /// The operation exceeded the budget.
+    Exceeded,
+}
+
+impl Default for BatchBudget {
+    fn default() -> Self {
+        Self {
+            transactions: DEFAULT_MAX_TXS_PER_BATCH,
+            input_notes: MAX_INPUT_NOTES_PER_BATCH,
+            output_notes: MAX_OUTPUT_NOTES_PER_BATCH,
+            accounts: MAX_ACCOUNTS_PER_BATCH,
+        }
+    }
+}
+
+impl Default for BlockBudget {
+    fn default() -> Self {
+        Self { batches: DEFAULT_MAX_BATCHES_PER_BLOCK }
+    }
+}
+
+impl BatchBudget {
+    /// Attempts to consume the transaction's resources from the budget.
+    ///
+    /// Returns [`BudgetStatus::Exceeded`] if the transaction would exceed the remaining budget,
+    /// otherwise returns [`BudgetStatus::Ok`] and subtracts the resources from the budget.
+    #[must_use]
+    pub(crate) fn check_then_subtract(&mut self, tx: &AuthenticatedTransaction) -> BudgetStatus {
+        // This type assertion reminds us to update the account check if we ever support
+        // multiple account updates per tx.
+        pub(crate) const ACCOUNT_UPDATES_PER_TX: usize = 1;
+        let _: miden_objects::account::AccountId = tx.account_update().account_id();
+
+        let output_notes = tx.output_note_count();
+        let input_notes = tx.input_note_count();
+
+        if self.transactions == 0
+            || self.accounts < ACCOUNT_UPDATES_PER_TX
+            || self.input_notes < input_notes
+            || self.output_notes < output_notes
+        {
+            return BudgetStatus::Exceeded;
+        }
+
+        self.transactions -= 1;
+        self.accounts -= ACCOUNT_UPDATES_PER_TX;
+        self.input_notes -= input_notes;
+        self.output_notes -= output_notes;
+
+        BudgetStatus::WithinScope
+    }
+}
+
+impl BlockBudget {
+    /// Attempts to consume the batch's resources from the budget.
+    ///
+    /// Returns [`BudgetStatus::Exceeded`] if the batch would exceed the remaining budget,
+    /// otherwise returns [`BudgetStatus::Ok`].
+    #[must_use]
+    pub(crate) fn check_then_subtract(&mut self, _batch: &ProvenBatch) -> BudgetStatus {
+        if self.batches == 0 {
+            BudgetStatus::Exceeded
+        } else {
+            self.batches -= 1;
+            BudgetStatus::WithinScope
+        }
+    }
+}
diff --git a/crates/block-producer/src/mempool/graph/mod.rs b/crates/block-producer/src/mempool/graph/mod.rs
deleted file mode 100644
index 956a8d5f8..000000000
--- a/crates/block-producer/src/mempool/graph/mod.rs
+++ /dev/null
@@ -1,437 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet};
-use std::fmt::{Debug, Display};
-
-#[cfg(test)]
-mod tests;
-
-// DEPENDENCY GRAPH
-// ================================================================================================
-
-/// A dependency graph structure where nodes are inserted, and then made available for processing
-/// once all parent nodes have been processed.
-///
-/// Forms the basis of our transaction and batch dependency graphs.
-///
-/// # Node lifecycle
-/// ```text
-///                                    │
-///                                    │
-///                      insert_pending│
-///                              ┌─────▼─────┐
-///                              │  pending  │────┐
-///                              └─────┬─────┘    │
-///                                    │          │
-///                     promote_pending│          │
-///                              ┌─────▼─────┐    │
-///                   ┌──────────► in queue  │────│
-///                   │          └─────┬─────┘    │
-///   revert_processed│                │          │
-///                   │    process_root│          │
-///                   │          ┌─────▼─────┐    │
-///                   └──────────┼ processed │────│
-///                              └─────┬─────┘    │
-///                                    │          │
-///                     prune_processed│          │purge_subgraphs
-///                              ┌─────▼─────┐    │
-///                              │  <null>   ◄────┘
-///                              └───────────┘
-/// ```
-#[derive(Clone, PartialEq, Eq)]
-pub struct DependencyGraph<K, V> {
-    /// Node's who's data is still pending.
-    pending: BTreeSet<K>,
-
-    /// Each node's data.
-    vertices: BTreeMap<K, V>,
-
-    /// Each node's parents. This is redundant with `children`,
-    /// but we require both for efficient lookups.
-    parents: BTreeMap<K, BTreeSet<K>>,
-
-    /// Each node's children. This is redundant with `parents`,
-    /// but we require both for efficient lookups.
-    children: BTreeMap<K, BTreeSet<K>>,
-
-    /// Nodes that are available to process next.
-    ///
-    /// Effectively this is the set of nodes which are
-    /// unprocessed and whose parent's _are_ all processed.
-    roots: BTreeSet<K>,
-
-    /// Set of nodes that are already processed.
-    processed: BTreeSet<K>,
-}
-
-impl<K, V> Debug for DependencyGraph<K, V>
-where
-    K: Debug,
-{
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("DependencyGraph")
-            .field("pending", &self.pending)
-            .field("vertices", &self.vertices.keys())
-            .field("processed", &self.processed)
-            .field("roots", &self.roots)
-            .field("parents", &self.parents)
-            .field("children", &self.children)
-            .finish()
-    }
-}
-
-#[derive(thiserror::Error, Debug, Clone, PartialEq, Eq)]
-pub enum GraphError<K> {
-    #[error("node {0} already exists")]
-    DuplicateKey(K),
-
-    #[error("parents not found: {0:?}")]
-    MissingParents(BTreeSet<K>),
-
-    #[error("nodes not found: {0:?}")]
-    UnknownNodes(BTreeSet<K>),
-
-    #[error("nodes were not yet processed: {0:?}")]
-    UnprocessedNodes(BTreeSet<K>),
-
-    #[error("nodes would be left dangling: {0:?}")]
-    DanglingNodes(BTreeSet<K>),
-
-    #[error("node {0} is not a root node")]
-    InvalidRootNode(K),
-
-    #[error("node {0} is not a pending node")]
-    InvalidPendingNode(K),
-}
-
-/// This cannot be derived without enforcing `Default` bounds on K and V.
-impl<K, V> Default for DependencyGraph<K, V> {
-    fn default() -> Self {
-        Self {
-            vertices: BTreeMap::default(),
-            pending: BTreeSet::default(),
-            parents: BTreeMap::default(),
-            children: BTreeMap::default(),
-            roots: BTreeSet::default(),
-            processed: BTreeSet::default(),
-        }
-    }
-}
-
-impl<K: Ord + Copy + Display + Debug, V: Clone> DependencyGraph<K, V> {
-    /// Inserts a new pending node into the graph.
-    ///
-    /// # Errors
-    ///
-    /// Errors if the node already exists, or if any of the parents are not part of the graph.
-    ///
-    /// This method is atomic.
-    pub fn insert_pending(&mut self, key: K, parents: BTreeSet<K>) -> Result<(), GraphError<K>> {
-        if self.contains(&key) {
-            return Err(GraphError::DuplicateKey(key));
-        }
-
-        let missing_parents = parents
-            .iter()
-            .filter(|parent| !self.contains(parent))
-            .copied()
-            .collect::<BTreeSet<_>>();
-        if !missing_parents.is_empty() {
-            return Err(GraphError::MissingParents(missing_parents));
-        }
-
-        // Inform parents of their new child.
-        for parent in &parents {
-            self.children.entry(*parent).or_default().insert(key);
-        }
-        self.pending.insert(key);
-        self.parents.insert(key, parents);
-        self.children.insert(key, BTreeSet::default());
-
-        Ok(())
-    }
-
-    /// Promotes a pending node, associating it with the provided value and allowing it to be
-    /// considered for processing.
-    ///
-    /// # Errors
-    ///
-    /// Errors if the given node is not pending.
-    ///
-    /// This method is atomic.
-    pub fn promote_pending(&mut self, key: K, value: V) -> Result<(), GraphError<K>> {
-        if !self.pending.remove(&key) {
-            return Err(GraphError::InvalidPendingNode(key));
-        }
-
-        self.vertices.insert(key, value);
-        self.try_make_root(key);
-
-        Ok(())
-    }
-
-    /// Reverts the nodes __and their descendents__, requeuing them for processing.
-    ///
-    /// Descendents which are pending remain unchanged.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if any of the given nodes:
-    ///
-    ///   - are not part of the graph, or
-    ///   - were not previously processed
-    ///
-    /// This method is atomic.
-    pub fn revert_subgraphs(&mut self, keys: BTreeSet<K>) -> Result<(), GraphError<K>> {
-        let missing_nodes = keys
-            .iter()
-            .filter(|key| !self.vertices.contains_key(key))
-            .copied()
-            .collect::<BTreeSet<_>>();
-        if !missing_nodes.is_empty() {
-            return Err(GraphError::UnknownNodes(missing_nodes));
-        }
-        let unprocessed = keys.difference(&self.processed).copied().collect::<BTreeSet<_>>();
-        if !unprocessed.is_empty() {
-            return Err(GraphError::UnprocessedNodes(unprocessed));
-        }
-
-        let mut reverted = BTreeSet::new();
-        let mut to_revert = keys.clone();
-
-        while let Some(key) = to_revert.pop_first() {
-            self.processed.remove(&key);
-
-            let unprocessed_children = self
-                .children
-                .get(&key)
-                .map(|children| children.difference(&reverted))
-                .into_iter()
-                .flatten()
-                // We should not revert children which are pending.
-                .filter(|child| self.vertices.contains_key(child))
-                .copied();
-
-            to_revert.extend(unprocessed_children);
-
-            reverted.insert(key);
-        }
-
-        // Only the original keys and the current roots need to be considered as roots.
-        //
-        // The children of the input keys are disqualified by definition (they're descendents),
-        // and current roots must be re-evaluated since their parents may have been requeued.
-        std::mem::take(&mut self.roots)
-            .into_iter()
-            .chain(keys)
-            .for_each(|key| self.try_make_root(key));
-
-        Ok(())
-    }
-
-    /// Removes a set of previously processed nodes from the graph.
-    ///
-    /// This is used to bound the size of the graph by removing nodes once they are no longer
-    /// required.
-    ///
-    /// # Errors
-    ///
-    /// Errors if
-    ///   - any node is unknown
-    ///   - any node is __not__ processed
-    ///   - any parent node would be left unpruned
-    ///
-    /// The last point implies that all parents of the given nodes must either be part of the set,
-    /// or already been pruned.
-    ///
-    /// This method is atomic.
-    pub fn prune_processed(&mut self, keys: BTreeSet<K>) -> Result<Vec<V>, GraphError<K>> {
-        let missing_nodes =
-            keys.iter().filter(|key| !self.contains(key)).copied().collect::<BTreeSet<_>>();
-        if !missing_nodes.is_empty() {
-            return Err(GraphError::UnknownNodes(missing_nodes));
-        }
-
-        let unprocessed = keys.difference(&self.processed).copied().collect::<BTreeSet<_>>();
-        if !unprocessed.is_empty() {
-            return Err(GraphError::UnprocessedNodes(unprocessed));
-        }
-
-        // No parent may be left dangling i.e. all parents must be part of this prune set.
-        let dangling = keys
-            .iter()
-            .filter_map(|key| self.parents.get(key))
-            .flatten()
-            .filter(|parent| !keys.contains(parent))
-            .copied()
-            .collect::<BTreeSet<_>>();
-        if !dangling.is_empty() {
-            return Err(GraphError::DanglingNodes(dangling));
-        }
-
-        let mut pruned = Vec::with_capacity(keys.len());
-
-        for key in keys {
-            let value = self.vertices.remove(&key).expect("Checked in precondition");
-            pruned.push(value);
-            self.processed.remove(&key);
-            self.parents.remove(&key);
-
-            let children = self.children.remove(&key).unwrap_or_default();
-
-            // Remove edges from children to this node.
-            for child in children {
-                if let Some(child) = self.parents.get_mut(&child) {
-                    child.remove(&key);
-                }
-            }
-        }
-
-        Ok(pruned)
-    }
-
-    /// Removes the set of nodes __and all descendents__ from the graph, returning all removed
-    /// nodes. This __includes__ pending nodes.
-    ///
-    /// # Returns
-    ///
-    /// All nodes removed.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if any of the given nodes does not exist.
-    ///
-    /// This method is atomic.
-    pub fn purge_subgraphs(&mut self, keys: BTreeSet<K>) -> Result<BTreeSet<K>, GraphError<K>> {
-        let missing_nodes =
-            keys.iter().filter(|key| !self.contains(key)).copied().collect::<BTreeSet<_>>();
-        if !missing_nodes.is_empty() {
-            return Err(GraphError::UnknownNodes(missing_nodes));
-        }
-
-        let visited = keys.clone();
-        let mut to_remove = keys;
-        let mut removed = BTreeSet::new();
-
-        while let Some(key) = to_remove.pop_first() {
-            self.vertices.remove(&key);
-            self.pending.remove(&key);
-            removed.insert(key);
-
-            self.processed.remove(&key);
-            self.roots.remove(&key);
-
-            // Children must also be purged. Take care not to visit them twice which is
-            // possible since children can have multiple purged parents.
-            let unvisited_children = self.children.remove(&key).unwrap_or_default();
-            let unvisited_children = unvisited_children.difference(&visited);
-            to_remove.extend(unvisited_children);
-
-            // Inform parents that this child no longer exists.
-            let parents = self.parents.remove(&key).unwrap_or_default();
-            for parent in parents {
-                if let Some(parent) = self.children.get_mut(&parent) {
-                    parent.remove(&key);
-                }
-            }
-        }
-
-        Ok(removed)
-    }
-
-    /// Adds the node to the `roots` list _IFF_ all of its parents are processed.
-    ///
-    /// # SAFETY
-    ///
-    /// This method assumes the node exists. Caller is responsible for ensuring this is true.
-    fn try_make_root(&mut self, key: K) {
-        if self.pending.contains(&key) {
-            return;
-        }
-        debug_assert!(
-            self.vertices.contains_key(&key),
-            "Potential root {key} must exist in the graph"
-        );
-        debug_assert!(
-            !self.processed.contains(&key),
-            "Potential root {key} cannot already be processed"
-        );
-
-        let all_parents_processed = self
-            .parents
-            .get(&key)
-            .into_iter()
-            .flatten()
-            .all(|parent| self.processed.contains(parent));
-
-        if all_parents_processed {
-            self.roots.insert(key);
-        }
-    }
-
-    /// Returns the set of nodes that are ready for processing.
-    ///
-    /// Nodes can be selected from here and marked as processed using [`Self::process_root`].
-    pub fn roots(&self) -> &BTreeSet<K> {
-        &self.roots
-    }
-
-    /// Marks a root node as processed, removing it from the roots list.
-    ///
-    /// The node's children are [evaluated](Self::try_make_root) as possible roots.
-    ///
-    /// # Error
-    ///
-    /// Errors if the node is not in the roots list.
-    ///
-    /// This method is atomic.
-    pub fn process_root(&mut self, key: K) -> Result<(), GraphError<K>> {
-        if !self.roots.remove(&key) {
-            return Err(GraphError::InvalidRootNode(key));
-        }
-
-        self.processed.insert(key);
-
-        self.children
-            .get(&key)
-            .cloned()
-            .unwrap_or_default()
-            .into_iter()
-            .for_each(|child| self.try_make_root(child));
-
-        Ok(())
-    }
-
-    /// Returns the value of a node.
-    pub fn get(&self, key: &K) -> Option<&V> {
-        self.vertices.get(key)
-    }
-
-    /// Returns the parents of the node, or `None` if the node does not exist.
-    pub fn parents(&self, key: &K) -> Option<&BTreeSet<K>> {
-        self.parents.get(key)
-    }
-
-    /// Returns true if the node exists, in either the pending or non-pending sets.
-    fn contains(&self, key: &K) -> bool {
-        self.pending.contains(key) || self.vertices.contains_key(key)
-    }
-
-    /// The amount of nodes which are in the pending state.
-    pub fn num_pending(&self) -> usize {
-        self.pending.len()
-    }
-
-    /// The amount of nodes which are in the processed state.
-    pub fn num_processed(&self) -> usize {
-        self.processed.len()
-    }
-
-    /// The total amount of nodes in the graph.
-    pub fn len(&self) -> usize {
-        self.vertices.len()
-    }
-
-    /// The amount of root nodes.
-    pub fn num_roots(&self) -> usize {
-        self.roots.len()
-    }
-}
diff --git a/crates/block-producer/src/mempool/graph/tests.rs b/crates/block-producer/src/mempool/graph/tests.rs
deleted file mode 100644
index af8acdc18..000000000
--- a/crates/block-producer/src/mempool/graph/tests.rs
+++ /dev/null
@@ -1,577 +0,0 @@
-use super::*;
-
-// TEST UTILITIES
-// ================================================================================================
-
-/// Simplified graph variant where a node's key always equals its value. This is done to make
-/// generating test values simpler.
-type TestGraph = DependencyGraph<u32, u32>;
-
-impl TestGraph {
-    /// Alias for inserting a node with no parents.
-    fn insert_with_no_parents(&mut self, node: u32) -> Result<(), GraphError<u32>> {
-        self.insert_with_parents(node, BTreeSet::default())
-    }
-
-    /// Alias for inserting a node with a single parent.
-    fn insert_with_parent(&mut self, node: u32, parent: u32) -> Result<(), GraphError<u32>> {
-        self.insert_with_parents(node, [parent].into())
-    }
-
-    /// Alias for inserting a node with multiple parents.
-    fn insert_with_parents(
-        &mut self,
-        node: u32,
-        parents: BTreeSet<u32>,
-    ) -> Result<(), GraphError<u32>> {
-        self.insert_pending(node, parents)
-    }
-
-    /// Alias for promoting nodes with the same value as the key.
-    fn promote(&mut self, nodes: impl IntoIterator<Item = u32>) -> Result<(), GraphError<u32>> {
-        for node in nodes {
-            self.promote_pending(node, node)?;
-        }
-        Ok(())
-    }
-
-    /// Promotes all nodes in the pending list with value=key.
-    fn promote_all(&mut self) {
-        // SAFETY: these are definitely pending nodes.
-        self.promote(self.pending.clone()).unwrap();
-    }
-
-    /// Calls `process_root` until all nodes have been processed.
-    fn process_all(&mut self) {
-        while let Some(root) = self.roots().first().copied() {
-            // SAFETY: this is definitely a root since we just took it from there :)
-            self.process_root(root).unwrap();
-        }
-    }
-}
-
-// PROMOTE TESTS
-// ================================================================================================
-
-#[test]
-fn promoted_nodes_are_considered_for_root() {
-    //! Ensure that a promoted node is added to the root list if all parents are already
-    //! processed.
-    let parent_a = 1;
-    let parent_b = 2;
-    let child_a = 3;
-    let child_b = 4;
-    let child_c = 5;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(parent_a).unwrap();
-    uut.insert_with_no_parents(parent_b).unwrap();
-    uut.promote_all();
-
-    // Only process one parent so that some children remain unrootable.
-    uut.process_root(parent_a).unwrap();
-
-    uut.insert_with_parent(child_a, parent_a).unwrap();
-    uut.insert_with_parent(child_b, parent_b).unwrap();
-    uut.insert_with_parents(child_c, [parent_a, parent_b].into()).unwrap();
-
-    uut.promote_all();
-
-    // Only child_a should be added (in addition to the parents), since the other children
-    // are dependent on parent_b which is incomplete.
-    let expected_roots = [parent_b, child_a].into();
-
-    assert_eq!(uut.roots, expected_roots);
-}
-
-#[test]
-fn pending_nodes_are_not_considered_for_root() {
-    //! Ensure that an unpromoted node is _not_ added to the root list even if all parents are
-    //! already processed.
-    let parent_a = 1;
-    let parent_b = 2;
-    let child_a = 3;
-    let child_b = 4;
-    let child_c = 5;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(parent_a).unwrap();
-    uut.insert_with_no_parents(parent_b).unwrap();
-    uut.promote_all();
-    uut.process_all();
-
-    uut.insert_with_parent(child_a, parent_a).unwrap();
-    uut.insert_with_parent(child_b, parent_b).unwrap();
-    uut.insert_with_parents(child_c, [parent_a, parent_b].into()).unwrap();
-
-    uut.promote([child_b]).unwrap();
-
-    // Only child b is valid as it was promoted.
-    let expected = [child_b].into();
-
-    assert_eq!(uut.roots, expected);
-}
-
-#[test]
-fn promoted_nodes_are_moved() {
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(123).unwrap();
-
-    assert!(uut.pending.contains(&123));
-    assert!(!uut.vertices.contains_key(&123));
-
-    uut.promote_pending(123, 123).unwrap();
-
-    assert!(!uut.pending.contains(&123));
-    assert!(uut.vertices.contains_key(&123));
-}
-
-#[test]
-fn promote_rejects_already_promoted_nodes() {
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(123).unwrap();
-    uut.promote_all();
-
-    let err = uut.promote_pending(123, 123).unwrap_err();
-    let expected = GraphError::InvalidPendingNode(123);
-    assert_eq!(err, expected);
-}
-
-#[test]
-fn promote_rejects_unknown_nodes() {
-    let err = TestGraph::default().promote_pending(123, 123).unwrap_err();
-    let expected = GraphError::InvalidPendingNode(123);
-    assert_eq!(err, expected);
-}
-
-// INSERT TESTS
-// ================================================================================================
-
-#[test]
-fn insert_with_known_parents_succeeds() {
-    let parent_a = 10;
-    let parent_b = 20;
-    let grandfather = 123;
-    let uncle = 222;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(grandfather).unwrap();
-    uut.insert_with_no_parents(parent_a).unwrap();
-    uut.insert_with_parent(parent_b, grandfather).unwrap();
-    uut.insert_with_parent(uncle, grandfather).unwrap();
-    uut.insert_with_parents(1, [parent_a, parent_b].into()).unwrap();
-}
-
-#[test]
-fn insert_duplicate_is_rejected() {
-    //! Ensure that inserting a duplicate node
-    //!   - results in an error, and
-    //!   - does not mutate the state (atomicity)
-    const KEY: u32 = 123;
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(KEY).unwrap();
-
-    let err = uut.insert_with_no_parents(KEY).unwrap_err();
-    let expected = GraphError::DuplicateKey(KEY);
-    assert_eq!(err, expected);
-
-    let mut atomic_reference = TestGraph::default();
-    atomic_reference.insert_with_no_parents(KEY).unwrap();
-    assert_eq!(uut, atomic_reference);
-}
-
-#[test]
-fn insert_with_all_parents_missing_is_rejected() {
-    //! Ensure that inserting a node with unknown parents
-    //!   - results in an error, and
-    //!   - does not mutate the state (atomicity)
-    const MISSING: [u32; 4] = [1, 2, 3, 4];
-    let mut uut = TestGraph::default();
-
-    let err = uut.insert_with_parents(0xABC, MISSING.into()).unwrap_err();
-    let expected = GraphError::MissingParents(MISSING.into());
-    assert_eq!(err, expected);
-
-    let atomic_reference = TestGraph::default();
-    assert_eq!(uut, atomic_reference);
-}
-
-#[test]
-fn insert_with_some_parents_missing_is_rejected() {
-    //! Ensure that inserting a node with unknown parents
-    //!   - results in an error, and
-    //!   - does not mutate the state (atomicity)
-    const MISSING: u32 = 123;
-    let mut uut = TestGraph::default();
-
-    uut.insert_with_no_parents(1).unwrap();
-    uut.insert_with_no_parents(2).unwrap();
-    uut.insert_with_no_parents(3).unwrap();
-
-    let atomic_reference = uut.clone();
-
-    let err = uut.insert_with_parents(0xABC, [1, 2, 3, MISSING].into()).unwrap_err();
-    let expected = GraphError::MissingParents([MISSING].into());
-    assert_eq!(err, expected);
-    assert_eq!(uut, atomic_reference);
-}
-
-// REVERT TESTS
-// ================================================================================================
-
-#[test]
-fn reverting_unprocessed_nodes_is_rejected() {
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(1).unwrap();
-    uut.insert_with_no_parents(2).unwrap();
-    uut.insert_with_no_parents(3).unwrap();
-    uut.promote_all();
-    uut.process_root(1).unwrap();
-
-    let err = uut.revert_subgraphs([1, 2, 3].into()).unwrap_err();
-    let expected = GraphError::UnprocessedNodes([2, 3].into());
-
-    assert_eq!(err, expected);
-}
-
-#[test]
-fn reverting_unknown_nodes_is_rejected() {
-    let err = TestGraph::default().revert_subgraphs([1].into()).unwrap_err();
-    let expected = GraphError::UnknownNodes([1].into());
-    assert_eq!(err, expected);
-}
-
-#[test]
-fn reverting_resets_the_entire_subgraph() {
-    //! Reverting should reset the state to before any of the nodes where processed.
-    let grandparent = 1;
-    let parent_a = 2;
-    let parent_b = 3;
-    let child_a = 4;
-    let child_b = 5;
-    let child_c = 6;
-
-    let disjoint = 7;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(grandparent).unwrap();
-    uut.insert_with_no_parents(disjoint).unwrap();
-    uut.insert_with_parent(parent_a, grandparent).unwrap();
-    uut.insert_with_parent(parent_b, grandparent).unwrap();
-    uut.insert_with_parent(child_a, parent_a).unwrap();
-    uut.insert_with_parent(child_b, parent_b).unwrap();
-    uut.insert_with_parents(child_c, [parent_a, parent_b].into()).unwrap();
-
-    uut.promote([disjoint, grandparent, parent_a, parent_b, child_a, child_c])
-        .unwrap();
-    uut.process_root(disjoint).unwrap();
-
-    let reference = uut.clone();
-
-    uut.process_all();
-    uut.revert_subgraphs([grandparent].into()).unwrap();
-
-    assert_eq!(uut, reference);
-}
-
-#[test]
-fn reverting_reevaluates_roots() {
-    //! Node reverting from processed to unprocessed should cause the root nodes to be
-    //! re-evaluated. Only nodes with all parents processed should remain in the set.
-    let disjoint_parent = 1;
-    let disjoint_child = 2;
-
-    let parent_a = 3;
-    let parent_b = 4;
-    let child_a = 5;
-    let child_b = 6;
-
-    let partially_disjoin_child = 7;
-
-    let mut uut = TestGraph::default();
-    // This pair of nodes should not be impacted by the reverted subgraph.
-    uut.insert_with_no_parents(disjoint_parent).unwrap();
-    uut.insert_with_parent(disjoint_child, disjoint_parent).unwrap();
-
-    uut.insert_with_no_parents(parent_a).unwrap();
-    uut.insert_with_no_parents(parent_b).unwrap();
-    uut.insert_with_parent(child_a, parent_a).unwrap();
-    uut.insert_with_parent(child_b, parent_b).unwrap();
-    uut.insert_with_parents(partially_disjoin_child, [disjoint_parent, parent_a].into())
-        .unwrap();
-
-    // Since we are reverting the other parents, we expect the roots to match the current state.
-    uut.promote_all();
-    uut.process_root(disjoint_parent).unwrap();
-    let reference = uut.roots().clone();
-
-    uut.process_root(parent_a).unwrap();
-    uut.process_root(parent_b).unwrap();
-    uut.revert_subgraphs([parent_a, parent_b].into()).unwrap();
-
-    assert_eq!(uut.roots(), &reference);
-}
-
-// PRUNING TESTS
-// ================================================================================================
-
-#[test]
-fn pruned_nodes_are_nonextant() {
-    //! Checks that processed and then pruned nodes behave as if they never existed in the
-    //! graph. We test this by comparing it to a reference graph created without these ancestor
-    //! nodes.
-    let ancestor_a = 1;
-    let ancestor_b = 2;
-
-    let child_a = 3;
-    let child_b = 4;
-    let child_both = 5;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(ancestor_a).unwrap();
-    uut.insert_with_no_parents(ancestor_b).unwrap();
-    uut.insert_with_parent(child_a, ancestor_a).unwrap();
-    uut.insert_with_parent(child_b, ancestor_b).unwrap();
-    uut.insert_with_parents(child_both, [ancestor_a, ancestor_b].into()).unwrap();
-    uut.promote_all();
-
-    uut.process_root(ancestor_a).unwrap();
-    uut.process_root(ancestor_b).unwrap();
-    uut.prune_processed([ancestor_a, ancestor_b].into()).unwrap();
-
-    let mut reference = TestGraph::default();
-    reference.insert_with_no_parents(child_a).unwrap();
-    reference.insert_with_no_parents(child_b).unwrap();
-    reference.insert_with_no_parents(child_both).unwrap();
-    reference.promote_all();
-
-    assert_eq!(uut, reference);
-}
-
-#[test]
-fn pruning_unknown_nodes_is_rejected() {
-    let err = TestGraph::default().prune_processed([1].into()).unwrap_err();
-    let expected = GraphError::UnknownNodes([1].into());
-    assert_eq!(err, expected);
-}
-
-#[test]
-fn pruning_unprocessed_nodes_is_rejected() {
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(1).unwrap();
-    uut.promote_all();
-
-    let err = uut.prune_processed([1].into()).unwrap_err();
-    let expected = GraphError::UnprocessedNodes([1].into());
-    assert_eq!(err, expected);
-}
-
-#[test]
-fn pruning_cannot_leave_parents_dangling() {
-    //! Pruning processed nodes must always prune all parent nodes as well. No parent node may
-    //! be left behind.
-    let dangling = 1;
-    let pruned = 2;
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(dangling).unwrap();
-    uut.insert_with_parent(pruned, dangling).unwrap();
-    uut.promote_all();
-    uut.process_all();
-
-    let err = uut.prune_processed([pruned].into()).unwrap_err();
-    let expected = GraphError::DanglingNodes([dangling].into());
-    assert_eq!(err, expected);
-}
-
-// PURGING TESTS
-// ================================================================================================
-
-#[test]
-fn purging_subgraph_handles_internal_nodes() {
-    //! Purging a subgraph should correctly handle nodes already deleted within that subgraph.
-    //!
-    //! This is a concern for errors as we are deleting parts of the subgraph while we are
-    //! iterating through the nodes to purge. This means its likely a node will already have
-    //! been deleted before processing it as an input.
-    //!
-    //! We can force this to occur by re-ordering the inputs relative to the actual dependency
-    //! order. This means this test is a bit weaker because it relies on implementation details.
-
-    let ancestor_a = 1;
-    let ancestor_b = 2;
-    let parent_a = 3;
-    let parent_b = 4;
-    let child_a = 5;
-    // This should be purged prior to parent_a. Relies on the fact that we are iterating over a
-    // btree which is ordered by value.
-    let child_b = 0;
-    let child_c = 6;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(ancestor_a).unwrap();
-    uut.insert_with_no_parents(ancestor_b).unwrap();
-    uut.insert_with_parent(parent_a, ancestor_a).unwrap();
-    uut.insert_with_parent(parent_b, ancestor_b).unwrap();
-    uut.insert_with_parents(child_a, [ancestor_a, parent_a].into()).unwrap();
-    uut.insert_with_parents(child_b, [parent_a, parent_b].into()).unwrap();
-    uut.insert_with_parent(child_c, parent_b).unwrap();
-
-    uut.purge_subgraphs([child_b, parent_a].into()).unwrap();
-
-    let mut reference = TestGraph::default();
-    reference.insert_with_no_parents(ancestor_a).unwrap();
-    reference.insert_with_no_parents(ancestor_b).unwrap();
-    reference.insert_with_parent(parent_b, ancestor_b).unwrap();
-    reference.insert_with_parent(child_c, parent_b).unwrap();
-
-    assert_eq!(uut, reference);
-}
-
-#[test]
-fn purging_removes_all_descendents() {
-    let ancestor_a = 1;
-    let ancestor_b = 2;
-    let parent_a = 3;
-    let parent_b = 4;
-    let child_a = 5;
-    let child_b = 6;
-    let child_c = 7;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(ancestor_a).unwrap();
-    uut.insert_with_no_parents(ancestor_b).unwrap();
-    uut.insert_with_parent(parent_a, ancestor_a).unwrap();
-    uut.insert_with_parent(parent_b, ancestor_b).unwrap();
-    uut.insert_with_parents(child_a, [ancestor_a, parent_a].into()).unwrap();
-    uut.insert_with_parents(child_b, [parent_a, parent_b].into()).unwrap();
-    uut.insert_with_parent(child_c, parent_b).unwrap();
-
-    uut.purge_subgraphs([parent_a].into()).unwrap();
-
-    let mut reference = TestGraph::default();
-    reference.insert_with_no_parents(ancestor_a).unwrap();
-    reference.insert_with_no_parents(ancestor_b).unwrap();
-    reference.insert_with_parent(parent_b, ancestor_b).unwrap();
-    reference.insert_with_parent(child_c, parent_b).unwrap();
-
-    assert_eq!(uut, reference);
-}
-
-// PROCESSING TESTS
-// ================================================================================================
-
-#[test]
-fn process_root_evaluates_children_as_roots() {
-    let parent_a = 1;
-    let parent_b = 2;
-    let child_a = 3;
-    let child_b = 4;
-    let child_c = 5;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(parent_a).unwrap();
-    uut.insert_with_no_parents(parent_b).unwrap();
-    uut.insert_with_parent(child_a, parent_a).unwrap();
-    uut.insert_with_parent(child_b, parent_b).unwrap();
-    uut.insert_with_parents(child_c, [parent_a, parent_b].into()).unwrap();
-    uut.promote_all();
-
-    uut.process_root(parent_a).unwrap();
-    assert_eq!(uut.roots(), &[parent_b, child_a].into());
-}
-
-#[test]
-fn process_root_rejects_non_root_node() {
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(1).unwrap();
-    uut.insert_with_parent(2, 1).unwrap();
-    uut.promote_all();
-
-    let err = uut.process_root(2).unwrap_err();
-    let expected = GraphError::InvalidRootNode(2);
-    assert_eq!(err, expected);
-}
-
-#[test]
-fn process_root_cannot_reprocess_same_node() {
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(1).unwrap();
-    uut.promote_all();
-    uut.process_root(1).unwrap();
-
-    let err = uut.process_root(1).unwrap_err();
-    let expected = GraphError::InvalidRootNode(1);
-    assert_eq!(err, expected);
-}
-
-#[test]
-fn processing_a_queue_graph() {
-    //! Creates a queue graph and ensures that nodes processed in FIFO order.
-    let nodes = (0..10).collect::<Vec<_>>();
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(nodes[0]).unwrap();
-    for pairs in nodes.windows(2) {
-        let (parent, id) = (pairs[0], pairs[1]);
-        uut.insert_with_parent(id, parent).unwrap();
-    }
-    uut.promote_all();
-
-    let mut ordered_roots = Vec::<u32>::new();
-    for _ in &nodes {
-        let current_roots = uut.roots().clone();
-        ordered_roots.extend(&current_roots);
-
-        for root in current_roots {
-            uut.process_root(root).unwrap();
-        }
-    }
-
-    assert_eq!(ordered_roots, nodes);
-}
-
-#[test]
-fn processing_and_root_tracking() {
-    //! Creates a somewhat arbitrarily connected graph and ensures that roots are tracked as
-    //! expected as the they are processed.
-    let ancestor_a = 1;
-    let ancestor_b = 2;
-    let parent_a = 3;
-    let parent_b = 4;
-    let child_a = 5;
-    let child_b = 6;
-    let child_c = 7;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(ancestor_a).unwrap();
-    uut.insert_with_no_parents(ancestor_b).unwrap();
-    uut.insert_with_parent(parent_a, ancestor_a).unwrap();
-    uut.insert_with_parent(parent_b, ancestor_b).unwrap();
-    uut.insert_with_parents(child_a, [ancestor_a, parent_a].into()).unwrap();
-    uut.insert_with_parents(child_b, [parent_a, parent_b].into()).unwrap();
-    uut.insert_with_parent(child_c, parent_b).unwrap();
-    uut.promote_all();
-
-    assert_eq!(uut.roots(), &[ancestor_a, ancestor_b].into());
-
-    uut.process_root(ancestor_a).unwrap();
-    assert_eq!(uut.roots(), &[ancestor_b, parent_a].into());
-
-    uut.process_root(ancestor_b).unwrap();
-    assert_eq!(uut.roots(), &[parent_a, parent_b].into());
-
-    uut.process_root(parent_a).unwrap();
-    assert_eq!(uut.roots(), &[parent_b, child_a].into());
-
-    uut.process_root(parent_b).unwrap();
-    assert_eq!(uut.roots(), &[child_a, child_b, child_c].into());
-
-    uut.process_root(child_a).unwrap();
-    assert_eq!(uut.roots(), &[child_b, child_c].into());
-
-    uut.process_root(child_b).unwrap();
-    assert_eq!(uut.roots(), &[child_c].into());
-
-    uut.process_root(child_c).unwrap();
-    assert!(uut.roots().is_empty());
-}
diff --git a/crates/block-producer/src/mempool/inflight_state/account_state.rs b/crates/block-producer/src/mempool/inflight_state/account_state.rs
deleted file mode 100644
index e33a796e9..000000000
--- a/crates/block-producer/src/mempool/inflight_state/account_state.rs
+++ /dev/null
@@ -1,325 +0,0 @@
-use std::collections::VecDeque;
-
-use miden_objects::Word;
-use miden_objects::transaction::TransactionId;
-
-// IN-FLIGHT ACCOUNT STATE
-// ================================================================================================
-
-/// Tracks the inflight state of an account.
-#[derive(Clone, Default, Debug, PartialEq)]
-pub struct InflightAccountState {
-    /// This account's state transitions due to inflight transactions.
-    ///
-    /// Ordering is chronological from front (oldest) to back (newest).
-    states: VecDeque<(Word, TransactionId)>,
-
-    /// The number of inflight states that have been committed.
-    ///
-    /// This acts as a pivot index for `self.states`, splitting it into two segments. The first
-    /// contains committed states and the second those that are uncommitted.
-    committed: usize,
-}
-
-impl InflightAccountState {
-    /// Appends the new state, returning the previous state's transaction ID __IFF__ it is
-    /// uncommitted.
-    pub fn insert(&mut self, state: Word, tx: TransactionId) -> Option<TransactionId> {
-        let mut parent = self.states.back().map(|(_, tx)| tx).copied();
-
-        // Only return uncommitted parent ID.
-        //
-        // Since this is the latest state's ID, we need at least one uncommitted state.
-        if self.uncommitted_count() == 0 {
-            parent.take();
-        }
-
-        self.states.push_back((state, tx));
-
-        parent
-    }
-
-    /// The latest state of this account.
-    pub fn current_state(&self) -> Option<&Word> {
-        self.states.back().map(|(state, _)| state)
-    }
-
-    /// Reverts the most recent `n` uncommitted inflight transactions.
-    ///
-    /// # Returns
-    ///
-    /// Returns the emptiness state of the account.
-    ///
-    /// # Panics
-    ///
-    /// Panics if there are less than `n` uncommitted inflight transactions.
-    pub fn revert(&mut self, n: usize) -> AccountStatus {
-        let uncommitted = self.uncommitted_count();
-        assert!(
-            uncommitted >= n,
-            "Attempted to revert {n} transactions which is more than the {uncommitted} which are uncommitted.",
-        );
-
-        self.states.drain(self.states.len() - n..);
-
-        self.emptiness()
-    }
-
-    /// Commits the next `n` uncommitted inflight transactions.
-    ///
-    /// # Panics
-    ///
-    /// Panics if there are less than `n` uncommitted inflight transactions.
-    pub fn commit(&mut self, n: usize) {
-        let uncommitted = self.uncommitted_count();
-        assert!(
-            uncommitted >= n,
-            "Attempted to revert {n} transactions which is more than the {uncommitted} which are uncommitted."
-        );
-
-        self.committed += n;
-    }
-
-    /// Removes `n` committed transactions.
-    ///
-    /// # Returns
-    ///
-    /// Returns the emptiness state of the account.
-    ///
-    /// # Panics
-    ///
-    /// Panics if there are less than `n` committed transactions.
-    pub fn prune_committed(&mut self, n: usize) -> AccountStatus {
-        assert!(
-            self.committed >= n,
-            "Attempted to prune {n} transactions, which is more than the {} which are committed",
-            self.committed
-        );
-
-        self.committed -= n;
-        self.states.drain(..n);
-
-        self.emptiness()
-    }
-
-    /// This is essentially `is_empty` with the additional benefit that [`AccountStatus`] is marked
-    /// as `#[must_use]`, forcing callers to handle empty accounts (which should be pruned).
-    fn emptiness(&self) -> AccountStatus {
-        if self.states.is_empty() {
-            AccountStatus::Empty
-        } else {
-            AccountStatus::NonEmpty
-        }
-    }
-
-    /// The number of uncommitted inflight transactions.
-    fn uncommitted_count(&self) -> usize {
-        self.states.len() - self.committed
-    }
-}
-
-/// Describes the emptiness of an [`InflightAccountState`].
-///
-/// Is marked as `#[must_use]` so that callers handle prune empty accounts.
-#[must_use]
-#[derive(Clone, Copy, PartialEq, Eq)]
-pub enum AccountStatus {
-    /// [`InflightAccountState`] contains no state and should be pruned.
-    Empty,
-    /// [`InflightAccountState`] contains state and should be kept.
-    NonEmpty,
-}
-
-impl AccountStatus {
-    pub fn is_empty(self) -> bool {
-        self == Self::Empty
-    }
-}
-
-// TESTS
-// ================================================================================================
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::test_utils::Random;
-
-    #[test]
-    fn current_state_is_the_most_recently_inserted() {
-        let mut rng = Random::with_random_seed();
-        let mut uut = InflightAccountState::default();
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-
-        let expected = rng.draw_digest();
-        uut.insert(expected, rng.draw_tx_id());
-
-        assert_eq!(uut.current_state(), Some(&expected));
-    }
-
-    #[test]
-    fn parent_is_the_most_recently_inserted() {
-        let mut rng = Random::with_random_seed();
-        let mut uut = InflightAccountState::default();
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-
-        let expected = rng.draw_tx_id();
-        uut.insert(rng.draw_digest(), expected);
-
-        let parent = uut.insert(rng.draw_digest(), rng.draw_tx_id());
-
-        assert_eq!(parent, Some(expected));
-    }
-
-    #[test]
-    fn empty_account_has_no_parent() {
-        let mut rng = Random::with_random_seed();
-        let mut uut = InflightAccountState::default();
-        let parent = uut.insert(rng.draw_digest(), rng.draw_tx_id());
-
-        assert!(parent.is_none());
-    }
-
-    #[test]
-    fn fully_committed_account_has_no_parent() {
-        let mut rng = Random::with_random_seed();
-        let mut uut = InflightAccountState::default();
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        uut.commit(1);
-        let parent = uut.insert(rng.draw_digest(), rng.draw_tx_id());
-
-        assert!(parent.is_none());
-    }
-
-    #[test]
-    fn uncommitted_account_has_a_parent() {
-        let mut rng = Random::with_random_seed();
-        let expected_parent = rng.draw_tx_id();
-
-        let mut uut = InflightAccountState::default();
-        uut.insert(rng.draw_digest(), expected_parent);
-
-        let parent = uut.insert(rng.draw_digest(), rng.draw_tx_id());
-
-        assert_eq!(parent, Some(expected_parent));
-    }
-
-    #[test]
-    fn partially_committed_account_has_a_parent() {
-        let mut rng = Random::with_random_seed();
-        let expected_parent = rng.draw_tx_id();
-
-        let mut uut = InflightAccountState::default();
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        uut.insert(rng.draw_digest(), expected_parent);
-        uut.commit(1);
-
-        let parent = uut.insert(rng.draw_digest(), rng.draw_tx_id());
-
-        assert_eq!(parent, Some(expected_parent));
-    }
-
-    #[test]
-    fn reverted_txs_are_nonextant() {
-        const N: usize = 5;
-        const REVERT: usize = 2;
-        let mut rng = Random::with_random_seed();
-
-        let states = (0..N).map(|_| (rng.draw_digest(), rng.draw_tx_id())).collect::<Vec<_>>();
-
-        let mut uut = InflightAccountState::default();
-        for (state, tx) in &states {
-            uut.insert(*state, *tx);
-        }
-        let _ = uut.revert(REVERT);
-
-        let mut expected = InflightAccountState::default();
-        for (state, tx) in states.iter().rev().skip(REVERT).rev() {
-            expected.insert(*state, *tx);
-        }
-
-        assert_eq!(uut, expected);
-    }
-
-    #[test]
-    fn pruned_txs_are_nonextant() {
-        const N: usize = 5;
-        const PRUNE: usize = 2;
-        let mut rng = Random::with_random_seed();
-
-        let states = (0..N).map(|_| (rng.draw_digest(), rng.draw_tx_id())).collect::<Vec<_>>();
-
-        let mut uut = InflightAccountState::default();
-        for (state, tx) in &states {
-            uut.insert(*state, *tx);
-        }
-        uut.commit(PRUNE);
-        let _ = uut.prune_committed(PRUNE);
-
-        let mut expected = InflightAccountState::default();
-        for (state, tx) in states.iter().skip(PRUNE) {
-            expected.insert(*state, *tx);
-        }
-
-        assert_eq!(uut, expected);
-    }
-
-    #[test]
-    fn is_empty_after_full_commit_and_prune() {
-        const N: usize = 5;
-        let mut rng = Random::with_random_seed();
-        let mut uut = InflightAccountState::default();
-        for _ in 0..N {
-            uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        }
-
-        uut.commit(N);
-        let _ = uut.prune_committed(N);
-
-        assert_eq!(uut, InflightAccountState::default());
-    }
-
-    #[test]
-    fn is_empty_after_full_revert() {
-        const N: usize = 5;
-        let mut uut = InflightAccountState::default();
-        let mut rng = Random::with_random_seed();
-        for _ in 0..N {
-            uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        }
-
-        let _ = uut.revert(N);
-
-        assert_eq!(uut, InflightAccountState::default());
-    }
-
-    #[test]
-    #[should_panic]
-    fn revert_panics_on_out_of_bounds() {
-        const N: usize = 5;
-        let mut rng = Random::with_random_seed();
-        let mut uut = InflightAccountState::default();
-        for _ in 0..N {
-            uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        }
-
-        uut.commit(1);
-        let _ = uut.revert(N);
-    }
-
-    #[test]
-    #[should_panic]
-    fn commit_panics_on_out_of_bounds() {
-        const N: usize = 5;
-        let mut rng = Random::with_random_seed();
-        let mut uut = InflightAccountState::default();
-        for _ in 0..N {
-            uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        }
-
-        uut.commit(N + 1);
-    }
-}
diff --git a/crates/block-producer/src/mempool/inflight_state/mod.rs b/crates/block-producer/src/mempool/inflight_state/mod.rs
deleted file mode 100644
index b836dd1e2..000000000
--- a/crates/block-producer/src/mempool/inflight_state/mod.rs
+++ /dev/null
@@ -1,729 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet, VecDeque};
-
-use miden_objects::account::AccountId;
-use miden_objects::block::BlockNumber;
-use miden_objects::note::{NoteId, Nullifier};
-use miden_objects::transaction::TransactionId;
-
-use crate::domain::transaction::AuthenticatedTransaction;
-use crate::errors::{AddTransactionError, VerifyTxError};
-
-mod account_state;
-
-use account_state::InflightAccountState;
-
-// IN-FLIGHT STATE
-// ================================================================================================
-
-/// Tracks the inflight state of the mempool. This includes recently committed blocks.
-///
-/// Allows appending and reverting transactions as well as marking them as part of a committed
-/// block. Committed state can also be pruned once the state is considered past the stale
-/// threshold.
-#[derive(Clone, Debug, PartialEq)]
-pub struct InflightState {
-    /// Account states from inflight transactions.
-    ///
-    /// Accounts which are empty are immediately pruned.
-    accounts: BTreeMap<AccountId, InflightAccountState>,
-
-    /// Nullifiers produced by the input notes of inflight transactions.
-    nullifiers: BTreeSet<Nullifier>,
-
-    /// Notes created by inflight transactions.
-    ///
-    /// Some of these may already be consumed - check the nullifiers.
-    output_notes: BTreeMap<NoteId, OutputNoteState>,
-
-    /// Inflight transaction deltas.
-    ///
-    /// This _excludes_ deltas in committed blocks.
-    transaction_deltas: BTreeMap<TransactionId, Delta>,
-
-    /// Committed block deltas.
-    committed_blocks: VecDeque<BTreeMap<TransactionId, Delta>>,
-
-    /// Amount of recently committed blocks we retain in addition to the inflight state.
-    ///
-    /// This provides an overlap between committed and inflight state, giving a grace
-    /// period for incoming transactions to be verified against both without requiring it
-    /// to be an atomic action.
-    num_retained_blocks: usize,
-
-    /// The latest committed block height.
-    chain_tip: BlockNumber,
-
-    /// Number of blocks to allow between chain tip and a transaction's expiration block height
-    /// before rejecting it.
-    ///
-    /// A new transaction is rejected if its expiration block is this close to the chain tip.
-    expiration_slack: u32,
-}
-
-/// A summary of a transaction's impact on the state.
-#[derive(Clone, Debug, PartialEq)]
-struct Delta {
-    /// The account this transaction updated.
-    account: AccountId,
-    /// The nullifiers produced by this transaction.
-    nullifiers: BTreeSet<Nullifier>,
-    /// The output notes created by this transaction.
-    output_notes: BTreeSet<NoteId>,
-}
-
-impl Delta {
-    fn new(tx: &AuthenticatedTransaction) -> Self {
-        Self {
-            account: tx.account_id(),
-            nullifiers: tx.nullifiers().collect(),
-            output_notes: tx.output_note_ids().collect(),
-        }
-    }
-}
-
-impl InflightState {
-    /// Creates an [`InflightState`] which will retain committed state for the given
-    /// amount of blocks before pruning them.
-    pub fn new(chain_tip: BlockNumber, num_retained_blocks: usize, expiration_slack: u32) -> Self {
-        Self {
-            num_retained_blocks,
-            chain_tip,
-            expiration_slack,
-            accounts: BTreeMap::default(),
-            nullifiers: BTreeSet::default(),
-            output_notes: BTreeMap::default(),
-            transaction_deltas: BTreeMap::default(),
-            committed_blocks: VecDeque::default(),
-        }
-    }
-
-    /// Appends the transaction to the inflight state.
-    ///
-    /// This operation is atomic i.e. a rejected transaction has no impact of the state.
-    pub fn add_transaction(
-        &mut self,
-        tx: &AuthenticatedTransaction,
-    ) -> Result<BTreeSet<TransactionId>, AddTransactionError> {
-        // Separate verification and state mutation so that a rejected transaction
-        // does not impact the state (atomicity).
-        self.verify_transaction(tx)?;
-
-        let parents = self.insert_transaction(tx);
-
-        Ok(parents)
-    }
-
-    fn oldest_committed_state(&self) -> BlockNumber {
-        let committed_len: u32 = self
-            .committed_blocks
-            .len()
-            .try_into()
-            .expect("We should not be storing many blocks");
-        self.chain_tip
-            .checked_sub(committed_len)
-            .expect("Chain height cannot be less than number of committed blocks")
-    }
-
-    fn verify_transaction(&self, tx: &AuthenticatedTransaction) -> Result<(), AddTransactionError> {
-        // Check that the transaction hasn't already expired.
-        if tx.expires_at() <= self.chain_tip + self.expiration_slack {
-            return Err(AddTransactionError::Expired {
-                expired_at: tx.expires_at(),
-                limit: self.chain_tip + self.expiration_slack,
-            });
-        }
-
-        // The mempool retains recently committed blocks, in addition to the state that is currently
-        // inflight. This overlap with the committed state allows us to verify incoming
-        // transactions against the current state (committed + inflight). Transactions are
-        // first authenticated against the committed state prior to being submitted to the
-        // mempool. The overlap provides a grace period between transaction authentication
-        // against committed state and verification against inflight state.
-        //
-        // Here we just ensure that this authentication point is still within this overlap zone.
-        // This should only fail if the grace period is too restrictive for the current
-        // combination of block rate, transaction throughput and database IO.
-        let stale_limit = self.oldest_committed_state();
-        if tx.authentication_height() < stale_limit {
-            return Err(AddTransactionError::StaleInputs {
-                input_block: tx.authentication_height(),
-                stale_limit,
-            });
-        }
-
-        // Ensure current account state is correct.
-        let current = self
-            .accounts
-            .get(&tx.account_id())
-            .and_then(|account_state| account_state.current_state())
-            .copied()
-            .or(tx.store_account_state());
-        let expected = tx.account_update().initial_state_commitment();
-
-        // SAFETY: a new accounts state is set to zero ie default.
-        if expected != current.unwrap_or_default() {
-            return Err(VerifyTxError::IncorrectAccountInitialCommitment {
-                tx_initial_account_commitment: expected,
-                current_account_commitment: current,
-            }
-            .into());
-        }
-
-        // Ensure nullifiers aren't already present.
-        //
-        // We don't need to check the store state here because that was
-        // already performed as part of authenticated the transaction.
-        let double_spend = tx
-            .nullifiers()
-            .filter(|nullifier| self.nullifiers.contains(nullifier))
-            .collect::<Vec<_>>();
-        if !double_spend.is_empty() {
-            return Err(VerifyTxError::InputNotesAlreadyConsumed(double_spend).into());
-        }
-
-        // Ensure output notes aren't already present.
-        let duplicates = tx
-            .output_note_ids()
-            .filter(|note| self.output_notes.contains_key(note))
-            .collect::<Vec<_>>();
-        if !duplicates.is_empty() {
-            return Err(VerifyTxError::OutputNotesAlreadyExist(duplicates).into());
-        }
-
-        // Ensure that all unauthenticated notes have an inflight output note to consume.
-        //
-        // We don't need to worry about double spending them since we already checked for
-        // that using the nullifiers.
-        //
-        // Note that the authenticated transaction already filters out notes that were
-        // previously unauthenticated, but were authenticated by the store.
-        let missing = tx
-            .unauthenticated_notes()
-            .filter(|note_id| !self.output_notes.contains_key(note_id))
-            .collect::<Vec<_>>();
-        if !missing.is_empty() {
-            return Err(VerifyTxError::UnauthenticatedNotesNotFound(missing).into());
-        }
-
-        Ok(())
-    }
-
-    /// Aggregate the transaction into the state, returning its parent transactions.
-    fn insert_transaction(&mut self, tx: &AuthenticatedTransaction) -> BTreeSet<TransactionId> {
-        self.transaction_deltas.insert(tx.id(), Delta::new(tx));
-        let account_parent = self
-            .accounts
-            .entry(tx.account_id())
-            .or_default()
-            .insert(tx.account_update().final_state_commitment(), tx.id());
-
-        self.nullifiers.extend(tx.nullifiers());
-        self.output_notes
-            .extend(tx.output_note_ids().map(|note_id| (note_id, OutputNoteState::new(tx.id()))));
-
-        // Authenticated input notes (provably) consume notes that are already committed
-        // on chain. They therefore cannot form part of the inflight dependency chain.
-        //
-        // Additionally, we only care about parents which have not been committed yet.
-        let note_parents = tx
-            .unauthenticated_notes()
-            .filter_map(|note_id| self.output_notes.get(&note_id))
-            .filter_map(|note| note.transaction())
-            .copied();
-
-        account_parent.into_iter().chain(note_parents).collect()
-    }
-
-    /// Reverts the given set of _uncommitted_ transactions.
-    ///
-    /// # Panics
-    ///
-    /// Panics if any transactions is not part of the uncommitted state. Callers should take care to
-    /// only revert transaction sets who's ancestors are all either committed or reverted.
-    pub fn revert_transactions(&mut self, txs: BTreeSet<TransactionId>) {
-        for tx in txs {
-            let delta = self.transaction_deltas.remove(&tx).expect("Transaction delta must exist");
-
-            // SAFETY: Since the delta exists, so must the account.
-            let account_status = self.accounts.get_mut(&delta.account).unwrap().revert(1);
-            // Prune empty accounts.
-            if account_status.is_empty() {
-                self.accounts.remove(&delta.account);
-            }
-
-            for nullifier in delta.nullifiers {
-                assert!(self.nullifiers.remove(&nullifier), "Nullifier must exist");
-            }
-
-            for note in delta.output_notes {
-                assert!(self.output_notes.remove(&note).is_some(), "Output note must exist");
-            }
-        }
-    }
-
-    /// Marks the given state diff as committed.
-    ///
-    /// These transactions are no longer considered inflight. Callers should take care to only
-    /// commit transactions who's ancestors are all committed.
-    ///
-    /// Note that this state is still retained for the configured number of blocks. The oldest
-    /// retained block is also pruned from the state.
-    ///
-    /// # Panics
-    ///
-    /// Panics if any transactions is not part of the uncommitted state.
-    pub fn commit_block(&mut self, txs: impl IntoIterator<Item = TransactionId>) {
-        let mut block_deltas = BTreeMap::new();
-        for tx in txs {
-            let delta = self.transaction_deltas.remove(&tx).expect("Transaction delta must exist");
-
-            // SAFETY: Since the delta exists, so must the account.
-            self.accounts.get_mut(&delta.account).unwrap().commit(1);
-
-            for note in &delta.output_notes {
-                self.output_notes.get_mut(note).expect("Output note must exist").commit();
-            }
-
-            block_deltas.insert(tx, delta);
-        }
-
-        self.committed_blocks.push_back(block_deltas);
-        self.prune_block();
-        self.chain_tip = self.chain_tip.child();
-    }
-
-    /// Prunes the state from the oldest committed block _IFF_ there are more than the number we
-    /// wish to retain.
-    ///
-    /// This is used to bound the size of the inflight state.
-    fn prune_block(&mut self) {
-        // Keep the required number of committed blocks.
-        //
-        // This would occur on startup until we have accumulated enough blocks.
-        if self.committed_blocks.len() <= self.num_retained_blocks {
-            return;
-        }
-        // SAFETY: The length check above guarantees that we have at least one committed block.
-        let block = self.committed_blocks.pop_front().unwrap();
-
-        for (_, delta) in block {
-            // SAFETY: Since the delta exists, so must the account.
-            let status = self.accounts.get_mut(&delta.account).unwrap().prune_committed(1);
-
-            // Prune empty accounts.
-            if status.is_empty() {
-                self.accounts.remove(&delta.account);
-            }
-
-            for nullifier in delta.nullifiers {
-                self.nullifiers.remove(&nullifier);
-            }
-
-            for output_note in delta.output_notes {
-                self.output_notes.remove(&output_note);
-            }
-        }
-    }
-
-    /// The number of accounts affected by inflight transactions _and_ transactions in recently
-    /// committed blocks.
-    pub fn num_accounts(&self) -> usize {
-        self.accounts.len()
-    }
-
-    /// The number of nullifiers produced by inflight transactions _and_ transactions in recently
-    /// committed blocks.
-    pub fn num_nullifiers(&self) -> usize {
-        self.nullifiers.len()
-    }
-
-    /// The number of notes produced by inflight transactions _and_ transactions in recently
-    /// committed blocks.
-    pub fn num_notes_created(&self) -> usize {
-        self.output_notes.len()
-    }
-}
-
-/// Describes the state of an inflight output note.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum OutputNoteState {
-    /// Output note is part of a committed block, and its source transaction should no longer be
-    /// considered for dependency tracking.
-    Committed,
-    /// Output note is still inflight and should be considered for dependency tracking.
-    Inflight(TransactionId),
-}
-
-impl OutputNoteState {
-    /// Creates a new inflight output note state.
-    fn new(tx: TransactionId) -> Self {
-        Self::Inflight(tx)
-    }
-
-    /// Commits the output note, removing the source transaction.
-    fn commit(&mut self) {
-        *self = Self::Committed;
-    }
-
-    /// Returns the source transaction ID if the output note is not yet committed.
-    fn transaction(&self) -> Option<&TransactionId> {
-        if let Self::Inflight(tx) = self { Some(tx) } else { None }
-    }
-}
-
-// TESTS
-// ================================================================================================
-
-#[cfg(test)]
-mod tests {
-    use assert_matches::assert_matches;
-    use miden_node_utils::ErrorReport;
-    use miden_objects::Word;
-
-    use super::*;
-    use crate::test_utils::note::{mock_note, mock_output_note};
-    use crate::test_utils::{MockProvenTxBuilder, mock_account_id};
-
-    #[test]
-    fn rejects_expired_transaction() {
-        let chain_tip = BlockNumber::from(123);
-        let mut uut = InflightState::new(chain_tip, 5, 0u32);
-
-        let expired = MockProvenTxBuilder::with_account_index(0)
-            .expiration_block_num(chain_tip)
-            .build();
-        let expired =
-            AuthenticatedTransaction::from_inner(expired).with_authentication_height(chain_tip);
-
-        let err = uut.add_transaction(&expired).unwrap_err();
-        assert_matches!(err, AddTransactionError::Expired { .. });
-    }
-
-    /// Ensures that the specified expiration slack is adhered to.
-    #[test]
-    fn expiration_slack_is_respected() {
-        let slack = 3;
-        let chain_tip = BlockNumber::from(123);
-        let expiration_limit = chain_tip + slack;
-        let mut uut = InflightState::new(chain_tip, 5, slack);
-
-        let unexpired = MockProvenTxBuilder::with_account_index(0)
-            .expiration_block_num(expiration_limit + 1)
-            .build();
-        let unexpired =
-            AuthenticatedTransaction::from_inner(unexpired).with_authentication_height(chain_tip);
-
-        uut.add_transaction(&unexpired).unwrap();
-
-        let expired = MockProvenTxBuilder::with_account_index(1)
-            .expiration_block_num(expiration_limit)
-            .build();
-        let expired =
-            AuthenticatedTransaction::from_inner(expired).with_authentication_height(chain_tip);
-
-        let err = uut.add_transaction(&expired).unwrap_err();
-        assert_matches!(err, AddTransactionError::Expired { .. });
-    }
-
-    #[test]
-    fn rejects_duplicate_nullifiers() {
-        let account = mock_account_id(1);
-        let states = (1u8..=4).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-
-        let note_seed = 123;
-        // We need to make the note available first, in order for it to be consumed at all.
-        let tx0 = MockProvenTxBuilder::with_account(account, states[0], states[1])
-            .output_notes(vec![mock_output_note(note_seed)])
-            .build();
-        let tx1 = MockProvenTxBuilder::with_account(account, states[1], states[2])
-            .unauthenticated_notes(vec![mock_note(note_seed)])
-            .build();
-        let tx2 = MockProvenTxBuilder::with_account(account, states[2], states[3])
-            .unauthenticated_notes(vec![mock_note(note_seed)])
-            .build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx0)).unwrap();
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx1)).unwrap();
-
-        let err = uut.add_transaction(&AuthenticatedTransaction::from_inner(tx2)).unwrap_err();
-
-        assert_matches!(
-            err,
-            AddTransactionError::VerificationFailed(VerifyTxError::InputNotesAlreadyConsumed(
-                notes
-            )) if notes == vec![mock_note(note_seed).nullifier()]
-        );
-    }
-
-    #[test]
-    fn rejects_duplicate_output_notes() {
-        let account = mock_account_id(1);
-        let states = (1u8..=3).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-
-        let note = mock_output_note(123);
-        let tx0 = MockProvenTxBuilder::with_account(account, states[0], states[1])
-            .output_notes(vec![note.clone()])
-            .build();
-        let tx1 = MockProvenTxBuilder::with_account(account, states[1], states[2])
-            .output_notes(vec![note.clone()])
-            .build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx0)).unwrap();
-
-        let err = uut.add_transaction(&AuthenticatedTransaction::from_inner(tx1)).unwrap_err();
-
-        assert_matches!(
-            err,
-            AddTransactionError::VerificationFailed(VerifyTxError::OutputNotesAlreadyExist(
-                notes
-            )) if notes == vec![note.id()]
-        );
-    }
-
-    #[test]
-    fn rejects_account_state_mismatch() {
-        let account = mock_account_id(1);
-        let states = (1u8..=3).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-
-        let tx = MockProvenTxBuilder::with_account(account, states[0], states[1]).build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        let err = uut
-            .add_transaction(&AuthenticatedTransaction::from_inner(tx).with_store_state(states[2]))
-            .unwrap_err();
-
-        assert_matches!(
-            err,
-            AddTransactionError::VerificationFailed(VerifyTxError::IncorrectAccountInitialCommitment {
-                tx_initial_account_commitment: init_state,
-                current_account_commitment: current_state,
-            }) if init_state == states[0] && current_state == states[2].into()
-        );
-    }
-
-    #[test]
-    fn account_state_transitions() {
-        let account = mock_account_id(1);
-        let states = (1u8..=3).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-
-        let tx0 = MockProvenTxBuilder::with_account(account, states[0], states[1]).build();
-        let tx1 = MockProvenTxBuilder::with_account(account, states[1], states[2]).build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx0)).unwrap();
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx1).with_empty_store_state())
-            .unwrap();
-    }
-
-    #[test]
-    fn new_account_state_defaults_to_zero() {
-        let account = mock_account_id(1);
-
-        let tx = MockProvenTxBuilder::with_account(
-            account,
-            [0u8, 0, 0, 0].into(),
-            [1u8, 0, 0, 0].into(),
-        )
-        .build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx).with_empty_store_state())
-            .unwrap();
-    }
-
-    #[test]
-    fn inflight_account_state_overrides_input_state() {
-        let account = mock_account_id(1);
-        let states = (1u8..=3).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-
-        let tx0 = MockProvenTxBuilder::with_account(account, states[0], states[1]).build();
-        let tx1 = MockProvenTxBuilder::with_account(account, states[1], states[2]).build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx0)).unwrap();
-
-        // Feed in an old state via input. This should be ignored, and the previous tx's final
-        // state should be used.
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx1).with_store_state(states[0]))
-            .unwrap();
-    }
-
-    #[test]
-    fn dependency_tracking() {
-        let account = mock_account_id(1);
-        let states = (1u8..=3).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-        let note_seed = 123;
-
-        // Parent via account state.
-        let tx0 = MockProvenTxBuilder::with_account(account, states[0], states[1]).build();
-        // Parent via output note.
-        let tx1 = MockProvenTxBuilder::with_account(mock_account_id(2), states[0], states[1])
-            .output_notes(vec![mock_output_note(note_seed)])
-            .build();
-
-        let tx = MockProvenTxBuilder::with_account(account, states[1], states[2])
-            .unauthenticated_notes(vec![mock_note(note_seed)])
-            .build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx0.clone())).unwrap();
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx1.clone())).unwrap();
-
-        let parents = uut
-            .add_transaction(&AuthenticatedTransaction::from_inner(tx).with_empty_store_state())
-            .unwrap();
-        let expected = BTreeSet::from([tx0.id(), tx1.id()]);
-
-        assert_eq!(parents, expected);
-    }
-
-    #[test]
-    fn committed_parents_are_not_tracked() {
-        let account = mock_account_id(1);
-        let states = (1u8..=3).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-        let note_seed = 123;
-
-        // Parent via account state.
-        let tx0 = MockProvenTxBuilder::with_account(account, states[0], states[1]).build();
-        let tx0 = AuthenticatedTransaction::from_inner(tx0);
-        // Parent via output note.
-        let tx1 = MockProvenTxBuilder::with_account(mock_account_id(2), states[0], states[1])
-            .output_notes(vec![mock_output_note(note_seed)])
-            .build();
-        let tx1 = AuthenticatedTransaction::from_inner(tx1);
-
-        let tx = MockProvenTxBuilder::with_account(account, states[1], states[2])
-            .unauthenticated_notes(vec![mock_note(note_seed)])
-            .build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        uut.add_transaction(&tx0.clone()).unwrap();
-        uut.add_transaction(&tx1.clone()).unwrap();
-
-        // Commit the parents, which should remove them from dependency tracking.
-        uut.commit_block([tx0.id(), tx1.id()]);
-
-        let parents = uut
-            .add_transaction(&AuthenticatedTransaction::from_inner(tx).with_empty_store_state())
-            .unwrap();
-
-        assert!(parents.is_empty());
-    }
-
-    #[test]
-    fn tx_insertions_and_reversions_cancel_out() {
-        // Reverting txs should be equivalent to them never being inserted.
-        //
-        // We test this by reverting some txs and equating it to the remaining set.
-        // This is a form of property test.
-        let states = (1u8..=5).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-        let txs = vec![
-            MockProvenTxBuilder::with_account(mock_account_id(1), states[0], states[1]),
-            MockProvenTxBuilder::with_account(mock_account_id(1), states[1], states[2])
-                .output_notes(vec![mock_output_note(111), mock_output_note(222)]),
-            MockProvenTxBuilder::with_account(mock_account_id(2), states[0], states[1])
-                .unauthenticated_notes(vec![mock_note(222)]),
-            MockProvenTxBuilder::with_account(mock_account_id(1), states[2], states[3]),
-            MockProvenTxBuilder::with_account(mock_account_id(2), states[1], states[2])
-                .unauthenticated_notes(vec![mock_note(111)])
-                .output_notes(vec![mock_output_note(45)]),
-        ];
-
-        let txs = txs
-            .into_iter()
-            .map(MockProvenTxBuilder::build)
-            .map(AuthenticatedTransaction::from_inner)
-            .collect::<Vec<_>>();
-
-        for i in 0..states.len() {
-            // Insert all txs and then revert the last `i` of them.
-            // This should match only inserting the first `N-i` of them.
-            let mut reverted = InflightState::new(BlockNumber::default(), 1, 0u32);
-            for (idx, tx) in txs.iter().enumerate() {
-                reverted.add_transaction(tx).unwrap_or_else(|err| {
-                    panic!(
-                        "Inserting tx #{idx} in iteration {i} should succeed: {}",
-                        err.as_report()
-                    )
-                });
-            }
-            reverted.revert_transactions(
-                txs.iter().rev().take(i).rev().map(AuthenticatedTransaction::id).collect(),
-            );
-
-            let mut inserted = InflightState::new(BlockNumber::default(), 1, 0u32);
-            for (idx, tx) in txs.iter().rev().skip(i).rev().enumerate() {
-                inserted.add_transaction(tx).unwrap_or_else(|err| {
-                    panic!(
-                        "Inserting tx #{idx} in iteration {i} should succeed: {}",
-                        err.as_report()
-                    )
-                });
-            }
-
-            assert_eq!(reverted, inserted, "Iteration {i}");
-        }
-    }
-
-    #[test]
-    fn pruning_committed_state() {
-        //! This is a form of property test, where we assert that pruning the first `i` of `N`
-        //! transactions is equivalent to only inserting the last `N-i` transactions.
-        let states = (1u8..=5).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-
-        // Skipping initial txs means that output notes required for subsequent unauthenticated
-        // input notes wont' always be present. To work around this, we instead only use
-        // authenticated input notes.
-        let txs = vec![
-            MockProvenTxBuilder::with_account(mock_account_id(1), states[0], states[1]),
-            MockProvenTxBuilder::with_account(mock_account_id(1), states[1], states[2])
-                .output_notes(vec![mock_output_note(111), mock_output_note(222)]),
-            MockProvenTxBuilder::with_account(mock_account_id(2), states[0], states[1])
-                .nullifiers(vec![mock_note(222).nullifier()]),
-            MockProvenTxBuilder::with_account(mock_account_id(1), states[2], states[3]),
-            MockProvenTxBuilder::with_account(mock_account_id(2), states[1], states[2])
-                .nullifiers(vec![mock_note(111).nullifier()])
-                .output_notes(vec![mock_output_note(45)]),
-        ];
-
-        let txs = txs
-            .into_iter()
-            .map(MockProvenTxBuilder::build)
-            .map(AuthenticatedTransaction::from_inner)
-            .collect::<Vec<_>>();
-
-        for i in 0..states.len() {
-            // Insert all txs and then commit and prune the first `i` of them.
-            //
-            // This should match only inserting the final `N-i` transactions.
-            // Note: we force all committed state to immediately be pruned by setting
-            // it to zero.
-            let mut committed = InflightState::new(BlockNumber::default(), 0, 0u32);
-            for (idx, tx) in txs.iter().enumerate() {
-                committed.add_transaction(tx).unwrap_or_else(|err| {
-                    panic!(
-                        "Inserting tx #{idx} in iteration {i} should succeed: {}",
-                        err.as_report()
-                    )
-                });
-            }
-            committed.commit_block(txs.iter().take(i).map(AuthenticatedTransaction::id));
-
-            let mut inserted = InflightState::new(BlockNumber::from(1), 0, 0u32);
-            for (idx, tx) in txs.iter().skip(i).enumerate() {
-                // We need to adjust the height since we are effectively at block "1" now.
-                let tx = tx.clone().with_authentication_height(1.into());
-                inserted.add_transaction(&tx).unwrap_or_else(|err| {
-                    panic!(
-                        "Inserting tx #{idx} in iteration {i} should succeed: {}",
-                        err.as_report()
-                    )
-                });
-            }
-
-            assert_eq!(committed, inserted, "Iteration {i}");
-        }
-    }
-}
diff --git a/crates/block-producer/src/mempool/mod.rs b/crates/block-producer/src/mempool/mod.rs
index 0a88d8956..335a34603 100644
--- a/crates/block-producer/src/mempool/mod.rs
+++ b/crates/block-producer/src/mempool/mod.rs
@@ -1,141 +1,117 @@
-use std::collections::BTreeSet;
+//! The [`Mempool`] is responsible for receiving transactions, and proposing transactions for
+//! inclusion in batches, and proposing batches for inclusion in the next block.
+//!
+//! It performs these tasks by maintaining a dependency graph between all inflight transactions,
+//! batches and blocks. A parent-child dependency edge between two nodes exists whenever the child
+//! consumes a piece of state that the parent node created. To be more specific, node `A` is a
+//! child of node `B`:
+//!
+//! - if `B` created an output note which is the input note of `A`, or
+//! - if `B` updated an account to state `x'`, and `A` is updating this account from `x' -> x''`.
+//!
+//! Note that note dependency can only be tracked for unauthenticated input notes, because
+//! authenticated notes have their IDs erased. This isn't a problem because authenticated notes are
+//! guaranteed to be part of the committed state already by definition, and therefore we don't need
+//! to concern ourselves with them. Double spending is also not possible because of nullifiers.
+//!
+//! Maintaining this dependency graph simplifies selecting transactions for new batches, and
+//! selecting batches for new blocks. This follows from the blockchain requirement that each block
+//! must build on the state of the previous block. This in turn implies that a child node can never
+//! be committed in a block before all of its parents.
+//!
+//! The mempool also enforces that the graph contains no cycles i.e. that the dependency graph
+//! is always a directed acyclic graph (DAG). While technically not illegal from a protocol
+//! perspective, allowing cycles between nodes would require that all nodes within the cycle be
+//! committed within the same block.
+//!
+//! While this is technically possible, the bookkeeping and implementation to allow this are
+//! infeasible, and both blocks and batches have constraints. This is also undersireable since if
+//! one component of such a cycle fails or expires, then all others would likewise need to be
+//! reverted.
+//!
+//! The DAG nature of the graph is maintained by:
+//!
+//! - Ensuring incoming transactions are only ever appended to the current graph. This in turn
+//!   implies that the transaction's state transition must build on top of the current mempool
+//!   state.
+//! - Parent/child edges between nodes in the graph are formed via state dependency.
+//! - Transactions are proposed for batch inclusion only once _all_ its ancestors have already been
+//!   included in a batch (or are part of the currently proposed batch).
+//! - Similarly, batches are proposed for block inclusion once _all_ ancestors have been included in
+//!   a block (or are part of the currently proposed block).
+//! - Reverting a node reverts all descendents as well.
+
+use std::collections::HashMap;
+use std::num::NonZeroUsize;
 use std::sync::Arc;
 
-use batch_graph::BatchGraph;
-use graph::GraphError;
-use inflight_state::InflightState;
 use miden_node_proto::domain::mempool::MempoolEvent;
-use miden_node_utils::tracing::OpenTelemetrySpanExt;
 use miden_objects::batch::{BatchId, ProvenBatch};
-use miden_objects::block::{BlockHeader, BlockNumber};
-use miden_objects::transaction::TransactionId;
-use miden_objects::{
-    MAX_ACCOUNTS_PER_BATCH,
-    MAX_INPUT_NOTES_PER_BATCH,
-    MAX_OUTPUT_NOTES_PER_BATCH,
-};
+use miden_objects::block::BlockNumber;
 use subscription::SubscriptionProvider;
 use tokio::sync::{Mutex, MutexGuard, mpsc};
 use tracing::{instrument, warn};
-use transaction_expiration::TransactionExpirations;
-use transaction_graph::TransactionGraph;
 
 use crate::domain::transaction::AuthenticatedTransaction;
-use crate::errors::AddTransactionError;
-use crate::{COMPONENT, DEFAULT_MAX_BATCHES_PER_BLOCK, DEFAULT_MAX_TXS_PER_BATCH};
+use crate::errors::{AddTransactionError, VerifyTxError};
+use crate::mempool::budget::BudgetStatus;
+use crate::mempool::nodes::{BlockNode, Node, NodeId, ProposedBatchNode, TransactionNode};
+use crate::{COMPONENT, SERVER_MEMPOOL_EXPIRATION_SLACK, SERVER_MEMPOOL_STATE_RETENTION};
 
-mod batch_graph;
-mod graph;
-mod inflight_state;
+mod budget;
+pub use budget::{BatchBudget, BlockBudget};
+
+mod nodes;
+mod state;
 mod subscription;
-mod transaction_expiration;
-mod transaction_graph;
 
-#[cfg(test)]
+// FIXME(Mirko): Re-enable these once mempool refactor is completed.
+#[cfg(all(false, test))]
 mod tests;
 
-// MEMPOOL BUDGET
-// ================================================================================================
-
-/// Limits placed on a batch's contents.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct BatchBudget {
-    /// Maximum number of transactions allowed in a batch.
-    pub transactions: usize,
-    /// Maximum number of input notes allowed.
-    pub input_notes: usize,
-    /// Maximum number of output notes allowed.
-    pub output_notes: usize,
-    /// Maximum number of updated accounts.
-    pub accounts: usize,
-}
-
-/// Limits placed on a blocks's contents.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct BlockBudget {
-    /// Maximum number of batches allowed in a block.
-    pub batches: usize,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum BudgetStatus {
-    /// The operation remained within the budget.
-    WithinScope,
-    /// The operation exceeded the budget.
-    Exceeded,
-}
+#[derive(Clone)]
+pub struct SharedMempool(Arc<Mutex<Mempool>>);
 
-impl Default for BatchBudget {
-    fn default() -> Self {
-        Self {
-            transactions: DEFAULT_MAX_TXS_PER_BATCH,
-            input_notes: MAX_INPUT_NOTES_PER_BATCH,
-            output_notes: MAX_OUTPUT_NOTES_PER_BATCH,
-            accounts: MAX_ACCOUNTS_PER_BATCH,
-        }
-    }
-}
+#[derive(Debug, Clone)]
+pub struct MempoolConfig {
+    /// The constraints each proposed block must adhere to.
+    pub block_budget: BlockBudget,
 
-impl Default for BlockBudget {
-    fn default() -> Self {
-        Self { batches: DEFAULT_MAX_BATCHES_PER_BLOCK }
-    }
-}
+    /// The constraints each proposed batch must adhere to.
+    pub batch_budget: BatchBudget,
 
-impl BatchBudget {
-    /// Attempts to consume the transaction's resources from the budget.
+    /// How close to the chain tip the mempool will allow submitted transactions and batches to
+    /// expire.
     ///
-    /// Returns [`BudgetStatus::Exceeded`] if the transaction would exceed the remaining budget,
-    /// otherwise returns [`BudgetStatus::Ok`] and subtracts the resources from the budger.
-    #[must_use]
-    fn check_then_subtract(&mut self, tx: &AuthenticatedTransaction) -> BudgetStatus {
-        // This type assertion reminds us to update the account check if we ever support multiple
-        // account updates per tx.
-        const ACCOUNT_UPDATES_PER_TX: usize = 1;
-        let _: miden_objects::account::AccountId = tx.account_update().account_id();
-
-        let output_notes = tx.output_note_count();
-        let input_notes = tx.input_note_count();
-
-        if self.transactions == 0
-            || self.accounts < ACCOUNT_UPDATES_PER_TX
-            || self.input_notes < input_notes
-            || self.output_notes < output_notes
-        {
-            return BudgetStatus::Exceeded;
-        }
+    /// Submitted data which expires within this number of blocks to the chain tip will be
+    /// rejected. This prevents accepting data which will likely expire before it can be
+    /// included in a block.
+    pub expiration_slack: u32,
 
-        self.transactions -= 1;
-        self.accounts -= ACCOUNT_UPDATES_PER_TX;
-        self.input_notes -= input_notes;
-        self.output_notes -= output_notes;
-
-        BudgetStatus::WithinScope
-    }
+    /// The number of recently committed blocks retained by the mempool.
+    ///
+    /// This retained state provides an overlap with the committed chain state in the store which
+    /// mitigates race conditions for transaction and batch authentication.
+    ///
+    /// Authentication is done against the store state _before_ arriving at the mempool, and there
+    /// is therefore opportunity for the chain state to have changed between authentication and the
+    /// mempool handling the authenticated data. Retaining the recent blocks locally therefore
+    /// guarantees that the mempool can verify the data against the additional changes so long as
+    /// the data was authenticated against one of the retained blocks.
+    pub state_retention: NonZeroUsize,
 }
 
-impl BlockBudget {
-    /// Attempts to consume the batch's resources from the budget.
-    ///
-    /// Returns [`BudgetStatus::Exceeded`] if the batch would exceed the remaining budget,
-    /// otherwise returns [`BudgetStatus::Ok`].
-    #[must_use]
-    fn check_then_subtract(&mut self, _batch: &ProvenBatch) -> BudgetStatus {
-        if self.batches == 0 {
-            BudgetStatus::Exceeded
-        } else {
-            self.batches -= 1;
-            BudgetStatus::WithinScope
+impl Default for MempoolConfig {
+    fn default() -> Self {
+        Self {
+            block_budget: BlockBudget::default(),
+            batch_budget: BatchBudget::default(),
+            expiration_slack: SERVER_MEMPOOL_EXPIRATION_SLACK,
+            state_retention: SERVER_MEMPOOL_STATE_RETENTION,
         }
     }
 }
 
-// MEMPOOL
-// ================================================================================================
-
-#[derive(Clone)]
-pub struct SharedMempool(Arc<Mutex<Mempool>>);
-
 impl SharedMempool {
     #[instrument(target = COMPONENT, name = "mempool.lock", skip_all)]
     pub async fn lock(&self) -> MutexGuard<'_, Mempool> {
@@ -145,98 +121,39 @@ impl SharedMempool {
 
 #[derive(Clone, Debug)]
 pub struct Mempool {
-    /// The latest inflight state of each account.
-    ///
-    /// Accounts without inflight transactions are not stored.
-    state: InflightState,
+    /// Contains the aggregated state of all transactions, batches and blocks currently inflight in
+    /// the mempool. Combines with `nodes` to describe the mempool's state graph.
+    state: state::InflightState,
 
-    /// Inflight transactions.
-    transactions: TransactionGraph,
-
-    /// Tracks inflight transaction expirations.
-    ///
-    /// This is used to identify inflight transactions that have become invalid once their
-    /// expiration block constraint has been violated. This occurs naturally as blocks get
-    /// committed and the chain grows.
-    expirations: TransactionExpirations,
+    /// Contains all the transactions, batches and blocks currently in the mempool.
+    nodes: nodes::Nodes,
 
-    /// Inflight batches.
-    batches: BatchGraph,
-
-    /// The current block height of the chain.
     chain_tip: BlockNumber,
 
-    /// The current inflight block, if any.
-    block_in_progress: Option<BTreeSet<BatchId>>,
-
-    block_budget: BlockBudget,
-    batch_budget: BatchBudget,
-
+    config: MempoolConfig,
     subscription: subscription::SubscriptionProvider,
 }
 
-// We have to implement this manually since the event's channel does not implement PartialEq.
+// We have to implement this manually since the subscription channel does not implement PartialEq.
 impl PartialEq for Mempool {
     fn eq(&self, other: &Self) -> bool {
-        // We use this deconstructive pattern to ensure we adapt this whenever fields are changed.
-        let Self {
-            state,
-            transactions,
-            expirations,
-            batches,
-            chain_tip,
-            block_in_progress,
-            block_budget,
-            batch_budget,
-            subscription: _,
-        } = self;
-
-        state == &other.state
-            && transactions == &other.transactions
-            && expirations == &other.expirations
-            && batches == &other.batches
-            && chain_tip == &other.chain_tip
-            && block_in_progress == &other.block_in_progress
-            && block_budget == &other.block_budget
-            && batch_budget == &other.batch_budget
+        self.state == other.state && self.nodes == other.nodes
     }
 }
 
 impl Mempool {
     /// Creates a new [`SharedMempool`] with the provided configuration.
-    pub fn shared(
-        chain_tip: BlockNumber,
-        batch_budget: BatchBudget,
-        block_budget: BlockBudget,
-        state_retention: usize,
-        expiration_slack: u32,
-    ) -> SharedMempool {
-        SharedMempool(Arc::new(Mutex::new(Self::new(
-            chain_tip,
-            batch_budget,
-            block_budget,
-            state_retention,
-            expiration_slack,
-        ))))
+    pub fn shared(chain_tip: BlockNumber, config: MempoolConfig) -> SharedMempool {
+        SharedMempool(Arc::new(Mutex::new(Self::new(chain_tip, config))))
     }
 
-    fn new(
-        chain_tip: BlockNumber,
-        batch_budget: BatchBudget,
-        block_budget: BlockBudget,
-        state_retention: usize,
-        expiration_slack: u32,
-    ) -> Mempool {
+    fn new(chain_tip: BlockNumber, config: MempoolConfig) -> Mempool {
         Self {
+            config,
             chain_tip,
-            batch_budget,
-            block_budget,
-            state: InflightState::new(chain_tip, state_retention, expiration_slack),
-            block_in_progress: None,
-            transactions: TransactionGraph::default(),
-            batches: BatchGraph::default(),
-            expirations: TransactionExpirations::default(),
             subscription: SubscriptionProvider::new(chain_tip),
+            state: state::InflightState::default(),
+            nodes: nodes::Nodes::default(),
         }
     }
 
@@ -251,18 +168,50 @@ impl Mempool {
     /// # Errors
     ///
     /// Returns an error if the transaction's initial conditions don't match the current state.
-    #[instrument(target = COMPONENT, name = "mempool.add_transaction", skip_all, fields(tx=%transaction.id()))]
+    #[instrument(target = COMPONENT, name = "mempool.add_transaction", skip_all, fields(tx=%tx.id()))]
     pub fn add_transaction(
         &mut self,
-        transaction: AuthenticatedTransaction,
+        tx: Arc<AuthenticatedTransaction>,
     ) -> Result<BlockNumber, AddTransactionError> {
-        // Add transaction to inflight state.
-        let parents = self.state.add_transaction(&transaction)?;
-        self.subscription.transaction_added(&transaction);
-        self.expirations.insert(transaction.id(), transaction.expires_at());
-        self.transactions
-            .insert(transaction, parents)
-            .expect("Transaction should insert after passing inflight state");
+        self.authentication_staleness_check(tx.authentication_height())?;
+        self.expiration_check(tx.expires_at())?;
+
+        // The transaction should append to the existing mempool state. This means:
+        //
+        // - The current account commitment should match the tx's initial state.
+        // - No duplicate nullifiers are created.
+        // - No duplicate notes are created.
+        // - All unauthenticated notes exist as output notes.
+        let account_commitment = self
+            .state
+            .account_commitment(&tx.account_id())
+            .or(tx.store_account_state())
+            .unwrap_or_default();
+        if tx.account_update().initial_state_commitment() != account_commitment {
+            return Err(VerifyTxError::IncorrectAccountInitialCommitment {
+                tx_initial_account_commitment: tx.account_update().initial_state_commitment(),
+                current_account_commitment: account_commitment,
+            }
+            .into());
+        }
+        let double_spend = self.state.nullifiers_exist(tx.nullifiers());
+        if !double_spend.is_empty() {
+            return Err(VerifyTxError::InputNotesAlreadyConsumed(double_spend).into());
+        }
+        let duplicates = self.state.output_notes_exist(tx.output_note_ids());
+        if !duplicates.is_empty() {
+            return Err(VerifyTxError::OutputNotesAlreadyExist(duplicates).into());
+        }
+        let missing = self.state.output_notes_missing(tx.unauthenticated_notes());
+        if !missing.is_empty() {
+            return Err(VerifyTxError::UnauthenticatedNotesNotFound(missing).into());
+        }
+
+        // Insert the transaction node.
+        let tx = TransactionNode::new(tx);
+        self.state.insert(NodeId::Transaction(tx.id()), &tx);
+        self.nodes.txs.insert(tx.id(), tx);
+
         self.inject_telemetry();
 
         Ok(self.chain_tip)
@@ -274,55 +223,119 @@ impl Mempool {
     ///
     /// Returns `None` if no transactions are available.
     #[instrument(target = COMPONENT, name = "mempool.select_batch", skip_all)]
-    pub fn select_batch(&mut self) -> Option<(BatchId, Vec<AuthenticatedTransaction>)> {
-        let (batch, parents) = self.transactions.select_batch(self.batch_budget);
-        if batch.is_empty() {
+    pub fn select_batch(&mut self) -> Option<(BatchId, Vec<Arc<AuthenticatedTransaction>>)> {
+        // The selection algorithm is fairly neanderthal in nature.
+        //
+        // We iterate over all transaction nodes, each time selecting the first transaction which
+        // has no parent nodes that are unselected transactions. This is fairly primitive, but
+        // avoids the manual bookkeeping of which transactions are selectable.
+        //
+        // Note that selecting a transaction can unblock other transactions. This implementation
+        // handles this by resetting the iteration whenever a transaction is selected.
+        //
+        // This is still reasonably performant given that we only retain unselected transactions as
+        // transaction nodes i.e. selected transactions become batch nodes.
+        //
+        // The additional bookkeeping can be implemented once we have fee related strategies. KISS.
+
+        let mut selected = ProposedBatchNode::default();
+        let mut budget = self.config.batch_budget;
+
+        let mut candidates = self.nodes.txs.values();
+
+        'next: while let Some(candidate) = candidates.next() {
+            if selected.contains(candidate.id()) {
+                continue 'next;
+            }
+
+            // A transaction may be placed in a batch IFF all parents were already in a batch (or
+            // are part of this one).
+            for parent in self.state.parents(NodeId::Transaction(candidate.id()), candidate) {
+                match parent {
+                    // TODO(mirko): Once user batches are supported, they will also need to be
+                    // checked here.
+                    NodeId::Transaction(parent) if !selected.contains(parent) => continue 'next,
+                    NodeId::Transaction(_)
+                    | NodeId::ProposedBatch(_)
+                    | NodeId::ProvenBatch(_)
+                    | NodeId::Block(_) => {},
+                }
+            }
+
+            if budget.check_then_subtract(candidate.inner()) == BudgetStatus::Exceeded {
+                break;
+            }
+
+            candidates = self.nodes.txs.values();
+            selected.push(candidate.inner().clone());
+        }
+
+        if selected.is_empty() {
             return None;
         }
-        let tx_ids = batch.iter().map(|tx| (tx.id(), tx.account_id())).collect::<Vec<_>>();
 
-        let batch_id = self.batches.insert(tx_ids, parents).expect("Selected batch should insert");
-        self.inject_telemetry();
+        let batch_id = selected.calculate_id();
+        let batch_txs = selected.transactions().cloned().collect::<Vec<_>>();
+
+        for tx in &batch_txs {
+            let node =
+                self.nodes.txs.remove(&tx.id()).expect("selected transaction node must exist");
+            self.state.remove(&node);
+        }
+        self.state.insert(NodeId::ProposedBatch(batch_id), &selected);
+        self.nodes.proposed_batches.insert(batch_id, selected);
 
-        Some((batch_id, batch))
+        // TODO(mirko): Selecting a batch can unblock user batches, which should be checked here.
+
+        self.inject_telemetry();
+        Some((batch_id, batch_txs))
     }
 
-    /// Drops the failed batch and all of its descendants.
+    /// Drops the proposed batch and all of its descendants.
     ///
-    /// Transactions are placed back in the queue.
+    /// Transactions are re-queued.
     #[instrument(target = COMPONENT, name = "mempool.rollback_batch", skip_all)]
     pub fn rollback_batch(&mut self, batch: BatchId) {
-        // Batch may already have been removed as part of a parent batches failure.
-        if !self.batches.contains(&batch) {
+        // Due to the distributed nature of the system, its possible that a proposed batch was
+        // already proven, or already reverted. This guards against this eventuality.
+        if !self.nodes.proposed_batches.contains_key(&batch) {
             return;
         }
 
-        let removed_batches =
-            self.batches.remove_batches([batch].into()).expect("Batch was not present");
+        // TODO(mirko): This will be somewhat complicated by the introduction of user batches
+        // since these don't have all inner txs present and therefore must at least partially
+        // revert their own tx descendents.
 
-        let transactions = removed_batches.values().flatten().copied().collect();
+        // Remove all descendents and reinsert their transactions. This is safe to do since
+        // a batch's state impact is the aggregation of its transactions.
+        let reverted = self.revert_subtree(NodeId::ProposedBatch(batch));
 
-        self.transactions
-            .requeue_transactions(transactions)
-            .expect("Transaction should requeue");
+        for (_, node) in reverted {
+            for tx in node.transactions() {
+                let tx = TransactionNode::new(Arc::clone(tx));
+                self.state.insert(NodeId::Transaction(tx.id()), &tx);
+                self.nodes.txs.insert(tx.id(), tx);
+            }
+        }
 
-        tracing::warn!(
-            %batch,
-            descendents=?removed_batches.keys(),
-            "Batch failed, dropping all inflight descendent batches, impacted transactions are back in queue."
-        );
         self.inject_telemetry();
     }
 
     /// Marks a batch as proven if it exists.
     #[instrument(target = COMPONENT, name = "mempool.commit_batch", skip_all)]
-    pub fn commit_batch(&mut self, batch: ProvenBatch) {
-        // Batch may have been removed as part of a parent batches failure.
-        if !self.batches.contains(&batch.id()) {
+    pub fn commit_batch(&mut self, proof: Arc<ProvenBatch>) {
+        // Due to the distributed nature of the system, its possible that a proposed batch was
+        // already proven, or already reverted. This guards against this eventuality.
+        let Some(proposed) = self.nodes.proposed_batches.remove(&proof.id()) else {
             return;
-        }
+        };
+
+        self.state.remove(&proposed);
+
+        let proven = proposed.into_proven_batch_node(proof);
+        self.state.insert(NodeId::ProvenBatch(proven.id()), &proven);
+        self.nodes.proven_batches.insert(proven.id(), proven);
 
-        self.batches.submit_proof(batch).expect("Batch proof should submit");
         self.inject_telemetry();
     }
 
@@ -336,14 +349,64 @@ impl Mempool {
     ///
     /// Panics if there is already a block in flight.
     #[instrument(target = COMPONENT, name = "mempool.select_block", skip_all)]
-    pub fn select_block(&mut self) -> (BlockNumber, Vec<ProvenBatch>) {
-        assert!(self.block_in_progress.is_none(), "Cannot have two blocks inflight.");
+    pub fn select_block(&mut self) -> (BlockNumber, Vec<Arc<ProvenBatch>>) {
+        // The selection algorithm is fairly neanderthal in nature.
+        //
+        // We iterate over all proven batch nodes, each time selecting the first which has no
+        // parent nodes that are unselected batches.
+        //
+        // Note that selecting a batch can unblock other batches. This implementation handles this
+        // by resetting the iteration whenever a batch is selected.
 
-        let batches = self.batches.select_block(self.block_budget);
-        self.block_in_progress = Some(batches.iter().map(ProvenBatch::id).collect());
-        self.inject_telemetry();
+        assert!(
+            self.nodes.proposed_block.is_none(),
+            "block {} is already in progress",
+            self.nodes.proposed_block.as_ref().unwrap().0
+        );
+
+        let mut selected = BlockNode::default();
+        let mut budget = self.config.block_budget;
+        let mut candidates = self.nodes.proven_batches.values();
+
+        'next: while let Some(candidate) = candidates.next() {
+            if selected.contains(candidate.id()) {
+                continue 'next;
+            }
+
+            // A batch is selectable if all parents are already blocks, or if the batch is part of
+            // the current block selection.
+            for parent in self.state.parents(NodeId::ProvenBatch(candidate.id()), candidate) {
+                match parent {
+                    NodeId::Block(_) => {},
+                    NodeId::ProvenBatch(parent) if selected.contains(parent) => {},
+                    _ => continue 'next,
+                }
+            }
+
+            if budget.check_then_subtract(candidate.inner()) == BudgetStatus::Exceeded {
+                break;
+            }
+
+            // Reset iteration as this batch could have unblocked previous batches.
+            candidates = self.nodes.proven_batches.values();
+            selected.push(candidate.clone());
+        }
+
+        // Replace the batches with the block in state and nodes.
+        for batch in selected.batches() {
+            // SAFETY: Selected batches came from nodes, and are unique.
+            let batch = self.nodes.proven_batches.remove(&batch.id()).unwrap();
+            self.state.remove(&batch);
+        }
+
+        let block_number = self.chain_tip.child();
+        let batches = selected.batches().to_vec();
 
-        (self.chain_tip.child(), batches)
+        self.state.insert(NodeId::Block(block_number), &selected);
+        self.nodes.proposed_block = Some((block_number, selected));
+
+        self.inject_telemetry();
+        (block_number, batches)
     }
 
     /// Notify the pool that the in flight block was successfully committed to the chain.
@@ -357,32 +420,27 @@ impl Mempool {
     /// # Returns
     ///
     /// Returns a set of transactions that were purged from the mempool because they can no longer
-    /// be included in in the chain (e.g., expired transactions and their descendants).
+    /// be included in the chain (e.g., expired transactions and their descendants).
     ///
     /// # Panics
     ///
     /// Panics if there is no block in flight.
     #[instrument(target = COMPONENT, name = "mempool.commit_block", skip_all)]
-    pub fn commit_block(&mut self, header: BlockHeader) {
-        // Remove committed batches and transactions from graphs.
-        let batches = self.block_in_progress.take().expect("No block in progress to commit");
-        let transactions =
-            self.batches.prune_committed(&batches).expect("Batches failed to commit");
-        self.transactions
-            .commit_transactions(&transactions)
-            .expect("Transaction graph malformed");
-
-        // Remove the committed transactions from expiration tracking.
-        self.expirations.remove(transactions.iter());
-
-        // Inform inflight state about committed data.
-        self.state.commit_block(transactions.clone());
+    pub fn commit_block(&mut self, to_commit: BlockNumber) {
+        let block = self
+            .nodes
+            .proposed_block
+            .take_if(|(proposed, _)| proposed == &to_commit)
+            .expect("block must be in progress to commit");
+
+        self.nodes.committed_blocks.push_back(block);
         self.chain_tip = self.chain_tip.child();
 
-        self.subscription.block_committed(header, transactions);
-
-        // Revert expired transactions and their descendents.
-        self.revert_expired_transactions();
+        if self.nodes.committed_blocks.len() > self.config.state_retention.get() {
+            let (_number, node) = self.nodes.committed_blocks.pop_front().unwrap();
+            self.state.remove(&node);
+        }
+        self.revert_expired_nodes();
         self.inject_telemetry();
     }
 
@@ -401,83 +459,37 @@ impl Mempool {
     ///
     /// Panics if there is no block in flight.
     #[instrument(target = COMPONENT, name = "mempool.rollback_block", skip_all)]
-    pub fn rollback_block(&mut self) {
-        let batches = self.block_in_progress.take().expect("No block in progress to be failed");
-
-        // Revert all transactions. This is the nuclear (but simplest) solution.
+    pub fn rollback_block(&mut self, block: BlockNumber) {
+        // Only revert if the given block is actually inflight.
         //
-        // We currently don't have a way of determining why this block failed so take the safe route
-        // and just nuke all associated transactions.
+        // This guards against extreme circumstances where multiple block proofs may be inflight at
+        // once. Due to the distributed nature of the node, one can imagine a scenario where
+        // multiple provers get the same job for example.
         //
-        // TODO: improve this strategy, e.g. count txn failures (as well as in e.g. batch failures),
-        // and only revert upon exceeding some threshold.
-        let txs = batches
-            .into_iter()
-            .flat_map(|batch_id| {
-                self.batches
-                    .get_transactions(&batch_id)
-                    .expect("batch from a block must be in the mempool")
-            })
-            .copied()
-            .collect();
-        self.revert_transactions(txs)
-            .expect("transactions from a block must be part of the mempool");
-        self.inject_telemetry();
-    }
-
-    /// Gets all transactions that expire at the new chain tip and reverts them (and their
-    /// descendants) from the mempool. Returns the set of transactions that were purged.
-    #[instrument(target = COMPONENT, name = "mempool.revert_expired_transactions", skip_all)]
-    fn revert_expired_transactions(&mut self) -> BTreeSet<TransactionId> {
-        let expired = self.expirations.get(self.chain_tip);
-
-        self.revert_transactions(expired.iter().copied().collect())
-            .expect("expired transactions must be part of the mempool");
+        // FIXME: We should consider a more robust check here to identify the block by a hash.
+        //        If multiple jobs are possible, then so are multiple variants with the same block
+        //        number.
+        if self
+            .nodes
+            .proposed_block
+            .as_ref()
+            .is_none_or(|(proposed, _)| proposed != &block)
+        {
+            return;
+        }
 
-        expired
-    }
+        // Remove all descendents _without_ reinserting the transactions.
+        //
+        // This is done to prevent a system bug from causing repeated failures if we keep retrying
+        // the same transactions. Since we can't trivially identify the cause of the block
+        // failure, we take the safe route and nuke all associated state.
+        //
+        // A more refined approach could be to tag the offending transactions and then evict them
+        // once a certain failure threshold has been met.
+        let _reverted = self.revert_subtree(NodeId::Block(block));
+        // TODO(mirko): Add reverted nodes as events.
 
-    /// Reverts the given transactions and their descendents from the mempool.
-    ///
-    /// This includes removing them from the transaction and batch graphs, as well as cleaning up
-    /// their inflight state and expiration mappings.
-    ///
-    /// Transactions that were in reverted batches but that are disjoint from the reverted
-    /// transactions (i.e. not descendents) are requeued and _not_ reverted.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if any transaction was not in the transaction graph i.e. if the transaction
-    /// is unknown.
-    #[instrument(target = COMPONENT, name = "mempool.revert_transactions", skip_all, fields(transactions.expired.ids))]
-    fn revert_transactions(
-        &mut self,
-        txs: Vec<TransactionId>,
-    ) -> Result<BTreeSet<TransactionId>, GraphError<TransactionId>> {
-        tracing::Span::current().record("transactions.expired.ids", tracing::field::debug(&txs));
-
-        // Revert all transactions and their descendents, and their associated batches.
-        let reverted = self.transactions.remove_transactions(txs)?;
-        let batches_reverted = self.batches.remove_batches_with_transactions(reverted.iter());
-
-        // Requeue transactions that are disjoint from the reverted set, but were part of the
-        // reverted batches.
-        let to_requeue = batches_reverted
-            .into_values()
-            .flatten()
-            .filter(|tx| !reverted.contains(tx))
-            .collect();
-        self.transactions
-            .requeue_transactions(to_requeue)
-            .expect("transactions from batches must be requeueable");
-
-        // Cleanup state.
-        self.expirations.remove(reverted.iter());
-        self.state.revert_transactions(reverted.clone());
-
-        self.subscription.txs_reverted(reverted.clone());
-
-        Ok(reverted)
+        self.inject_telemetry();
     }
 
     /// Creates a subscription to [`MempoolEvent`] which will be emitted in the order they occur.
@@ -500,17 +512,118 @@ impl Mempool {
     ///
     /// Note that these are only visible in the OpenTelemetry context, as conventional tracing
     /// does not track fields added dynamically.
+    #[allow(clippy::unused_self, reason = "wip: mempool refactor")]
     fn inject_telemetry(&self) {
-        let span = tracing::Span::current();
-
-        span.set_attribute("mempool.transactions.total", self.transactions.len());
-        span.set_attribute("mempool.transactions.roots", self.transactions.num_roots());
-        span.set_attribute("mempool.accounts", self.state.num_accounts());
-        span.set_attribute("mempool.nullifiers", self.state.num_nullifiers());
-        span.set_attribute("mempool.output_notes", self.state.num_notes_created());
-        span.set_attribute("mempool.batches.pending", self.batches.num_pending());
-        span.set_attribute("mempool.batches.proven", self.batches.num_proven());
-        span.set_attribute("mempool.batches.total", self.batches.len());
-        span.set_attribute("mempool.batches.roots", self.batches.num_roots());
+        let _span = tracing::Span::current();
+
+        // span.set_attribute("mempool.transactions.total", self.transactions.len());
+        // span.set_attribute("mempool.transactions.roots", self.transactions.num_roots());
+        // span.set_attribute("mempool.accounts", self.state.num_accounts());
+        // span.set_attribute("mempool.nullifiers", self.state.num_nullifiers());
+        // span.set_attribute("mempool.output_notes", self.state.num_notes_created());
+        // span.set_attribute("mempool.batches.pending", self.batches.num_pending());
+        // span.set_attribute("mempool.batches.proven", self.batches.num_proven());
+        // span.set_attribute("mempool.batches.total", self.batches.len());
+        // span.set_attribute("mempool.batches.roots", self.batches.num_roots());
+    }
+
+    /// Reverts expired transactions and batches as per the current `chain_tip`.
+    fn revert_expired_nodes(&mut self) {
+        let expired_txs = self.nodes.txs.iter().filter_map(|(id, node)| {
+            (node.expires_at() <= self.chain_tip).then_some(NodeId::Transaction(*id))
+        });
+        let expired_proposed_batches =
+            self.nodes.proposed_batches.iter().filter_map(|(id, node)| {
+                (node.expires_at() <= self.chain_tip).then_some(NodeId::ProposedBatch(*id))
+            });
+        let expired_proven_batches = self.nodes.proven_batches.iter().filter_map(|(id, node)| {
+            (node.expires_at() <= self.chain_tip).then_some(NodeId::ProvenBatch(*id))
+        });
+
+        let expired = expired_proven_batches
+            .chain(expired_proposed_batches)
+            .chain(expired_txs)
+            .collect::<Vec<_>>();
+        for node in expired {
+            // TODO(mirko): Log these nicely somehow.
+            let _reverted = self.revert_subtree(node);
+        }
+    }
+
+    /// Reverts the subtree with the given root and returns the reverted nodes. Does nothing if the
+    /// root node does not exist to allow using this in cases where multiple overlapping calls to
+    /// this are made.
+    fn revert_subtree(&mut self, root: NodeId) -> HashMap<NodeId, Box<dyn Node>> {
+        let root_exists = match root {
+            NodeId::Transaction(id) => self.nodes.txs.contains_key(&id),
+            NodeId::ProposedBatch(id) => self.nodes.proposed_batches.contains_key(&id),
+            NodeId::ProvenBatch(id) => self.nodes.proven_batches.contains_key(&id),
+            NodeId::Block(id) => {
+                self.nodes.proposed_block.as_ref().is_some_and(|(number, _)| *number == id)
+            },
+        };
+        if !root_exists {
+            return HashMap::default();
+        }
+
+        let mut to_process = vec![root];
+        let mut reverted = HashMap::default();
+
+        while let Some(id) = to_process.pop() {
+            if reverted.contains_key(&id) {
+                continue;
+            }
+
+            // SAFETY: all IDs come from the state DAG and must therefore exist. The processed check
+            // above also prevents removing a node twice.
+            let node: Box<dyn Node> = match id {
+                NodeId::Transaction(id) => {
+                    self.nodes.txs.remove(&id).map(|x| Box::new(x) as Box<dyn Node>)
+                },
+                NodeId::ProposedBatch(id) => {
+                    self.nodes.proposed_batches.remove(&id).map(|x| Box::new(x) as Box<dyn Node>)
+                },
+                NodeId::ProvenBatch(id) => {
+                    self.nodes.proven_batches.remove(&id).map(|x| Box::new(x) as Box<dyn Node>)
+                },
+                NodeId::Block(id) => self
+                    .nodes
+                    .proposed_block
+                    .take_if(|(number, _)| number == &id)
+                    .map(|(_, x)| Box::new(x) as Box<dyn Node>),
+            }
+            .unwrap();
+
+            to_process.extend(self.state.children(id, node.as_ref()));
+            self.state.remove(node.as_ref());
+            reverted.insert(id, node);
+        }
+
+        reverted
+    }
+
+    fn authentication_staleness_check(
+        &self,
+        authentication_height: BlockNumber,
+    ) -> Result<(), AddTransactionError> {
+        let oldest = self.nodes.oldest_committed_block().unwrap_or_default();
+
+        if authentication_height < oldest {
+            return Err(AddTransactionError::StaleInputs {
+                input_block: authentication_height,
+                stale_limit: oldest,
+            });
+        }
+
+        Ok(())
+    }
+
+    fn expiration_check(&self, expired_at: BlockNumber) -> Result<(), AddTransactionError> {
+        let limit = self.chain_tip + self.config.expiration_slack;
+        if expired_at <= limit {
+            return Err(AddTransactionError::Expired { expired_at, limit });
+        }
+
+        Ok(())
     }
 }
diff --git a/crates/block-producer/src/mempool/nodes.rs b/crates/block-producer/src/mempool/nodes.rs
new file mode 100644
index 000000000..d1dfffa8f
--- /dev/null
+++ b/crates/block-producer/src/mempool/nodes.rs
@@ -0,0 +1,305 @@
+use std::collections::{HashMap, VecDeque};
+use std::sync::Arc;
+
+use miden_objects::Word;
+use miden_objects::account::AccountId;
+use miden_objects::batch::{BatchId, ProvenBatch};
+use miden_objects::block::BlockNumber;
+use miden_objects::note::{NoteHeader, NoteId, Nullifier};
+use miden_objects::transaction::{TransactionHeader, TransactionId};
+
+use crate::domain::transaction::AuthenticatedTransaction;
+
+/// Uniquely identifies a node in the mempool.
+///
+/// This effectively describes the lifecycle of a transaction in the mempool.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+pub(crate) enum NodeId {
+    Transaction(TransactionId),
+    // UserBatch(BatchId),
+    ProposedBatch(BatchId),
+    ProvenBatch(BatchId),
+    Block(BlockNumber),
+}
+
+/// A node representing a [`AuthenticatedTransaction`] which is waiting for inclusion in a batch.
+///
+/// Once this is selected for inclusion in a batch it will be moved inside a [`ProposedBatchNode`].
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) struct TransactionNode(Arc<AuthenticatedTransaction>);
+
+impl TransactionNode {
+    pub fn new(inner: Arc<AuthenticatedTransaction>) -> Self {
+        Self(inner)
+    }
+
+    pub fn id(&self) -> TransactionId {
+        self.0.id()
+    }
+
+    pub fn inner(&self) -> &Arc<AuthenticatedTransaction> {
+        &self.0
+    }
+
+    pub fn expires_at(&self) -> BlockNumber {
+        self.0.expires_at()
+    }
+}
+
+/// Represents a batch which has been proposed by the mempool and which is undergoing proving.
+///
+/// Once proven it transitions to a [`ProvenBatchNode`].
+#[derive(Clone, Debug, PartialEq, Default)]
+pub(crate) struct ProposedBatchNode(Vec<Arc<AuthenticatedTransaction>>);
+
+impl ProposedBatchNode {
+    pub fn push(&mut self, tx: Arc<AuthenticatedTransaction>) {
+        self.0.push(tx);
+    }
+
+    pub fn contains(&mut self, id: TransactionId) -> bool {
+        self.0.iter().any(|tx| tx.id() == id)
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    pub fn calculate_id(&self) -> BatchId {
+        BatchId::from_transactions(
+            self.0
+                .iter()
+                .map(AsRef::as_ref)
+                .map(AuthenticatedTransaction::raw_proven_transaction),
+        )
+    }
+
+    pub fn into_proven_batch_node(self, proof: Arc<ProvenBatch>) -> ProvenBatchNode {
+        let Self(txs) = self;
+        ProvenBatchNode { txs, inner: proof }
+    }
+
+    pub fn expires_at(&self) -> BlockNumber {
+        self.0.iter().map(|tx| tx.expires_at()).min().unwrap_or_default()
+    }
+}
+
+/// Represents a [`ProvenBatch`] which is waiting for inclusion in a block.
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) struct ProvenBatchNode {
+    /// We need to store this in addition to the proven batch because [`ProvenBatch`] erases the
+    /// transaction information. We need the original information if we want to rollback the batch
+    /// but retain the transactions.
+    txs: Vec<Arc<AuthenticatedTransaction>>,
+    inner: Arc<ProvenBatch>,
+}
+
+impl ProvenBatchNode {
+    pub(crate) fn tx_headers(&self) -> impl Iterator<Item = &TransactionHeader> {
+        self.inner.transactions().as_slice().iter()
+    }
+
+    pub(crate) fn id(&self) -> BatchId {
+        self.inner.id()
+    }
+
+    pub fn inner(&self) -> &Arc<ProvenBatch> {
+        &self.inner
+    }
+
+    pub fn expires_at(&self) -> BlockNumber {
+        self.inner.batch_expiration_block_num()
+    }
+}
+
+/// Represents a block - both committed and in-progress.
+#[derive(Clone, Debug, PartialEq, Default)]
+pub(crate) struct BlockNode {
+    txs: Vec<Arc<AuthenticatedTransaction>>,
+    batches: Vec<Arc<ProvenBatch>>,
+}
+
+impl BlockNode {
+    pub fn push(&mut self, batch: ProvenBatchNode) {
+        let ProvenBatchNode { txs, inner } = batch;
+        self.txs.extend(txs);
+        self.batches.push(inner);
+    }
+
+    pub fn contains(&self, id: BatchId) -> bool {
+        self.batches.iter().any(|batch| batch.id() == id)
+    }
+
+    pub fn batches(&self) -> &[Arc<ProvenBatch>] {
+        &self.batches
+    }
+}
+
+/// Describes a node's impact on the state.
+///
+/// This is used to determine what state data is created or consumed by this node.
+pub(crate) trait Node {
+    /// All [`Nullifier`]s created by this node, **including** nullifiers for erased notes. This
+    /// may not be strictly necessary but it removes having to worry about reverting batches and
+    /// blocks with erased notes -- since these would otherwise have different state impact than
+    /// the transactions within them.
+    fn nullifiers(&self) -> Box<dyn Iterator<Item = Nullifier> + '_>;
+
+    /// All output notes created by this node, **including** erased notes. This may not be strictly
+    /// necessary but it removes having to worry about reverting batches and blocks with erased
+    /// notes -- since these would otherwise have different state impact than the transactions
+    /// within them.
+    fn output_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_>;
+    fn unauthenticated_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_>;
+    /// The account state commitment updates caused by this node.
+    ///
+    /// Output tuple represents each updates `(account ID, initial commitment, final commitment)`.
+    fn account_updates(&self) -> Box<dyn Iterator<Item = (AccountId, Word, Word)> + '_>;
+    fn transactions(&self) -> Box<dyn Iterator<Item = &Arc<AuthenticatedTransaction>> + '_>;
+}
+
+impl Node for TransactionNode {
+    fn nullifiers(&self) -> Box<dyn Iterator<Item = Nullifier> + '_> {
+        Box::new(self.0.nullifiers())
+    }
+
+    fn output_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(self.0.output_note_ids())
+    }
+
+    fn unauthenticated_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(self.0.unauthenticated_notes())
+    }
+
+    fn account_updates(&self) -> Box<dyn Iterator<Item = (AccountId, Word, Word)> + '_> {
+        let update = self.0.account_update();
+        Box::new(std::iter::once((
+            update.account_id(),
+            update.initial_state_commitment(),
+            update.final_state_commitment(),
+        )))
+    }
+
+    fn transactions(&self) -> Box<dyn Iterator<Item = &Arc<AuthenticatedTransaction>> + '_> {
+        Box::new(std::iter::once(&self.0))
+    }
+}
+
+impl Node for ProposedBatchNode {
+    fn nullifiers(&self) -> Box<dyn Iterator<Item = Nullifier> + '_> {
+        Box::new(self.0.iter().flat_map(|tx| tx.nullifiers()))
+    }
+
+    fn output_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(self.0.iter().flat_map(|tx| tx.output_note_ids()))
+    }
+
+    fn unauthenticated_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(self.0.iter().flat_map(|tx| tx.unauthenticated_notes()))
+    }
+
+    fn account_updates(&self) -> Box<dyn Iterator<Item = (AccountId, Word, Word)> + '_> {
+        Box::new(self.0.iter().flat_map(|tx| {
+            let update = tx.account_update();
+            std::iter::once((
+                update.account_id(),
+                update.initial_state_commitment(),
+                update.final_state_commitment(),
+            ))
+        }))
+    }
+
+    fn transactions(&self) -> Box<dyn Iterator<Item = &Arc<AuthenticatedTransaction>> + '_> {
+        Box::new(self.0.iter())
+    }
+}
+
+impl Node for ProvenBatchNode {
+    fn nullifiers(&self) -> Box<dyn Iterator<Item = Nullifier> + '_> {
+        Box::new(self.tx_headers().flat_map(|tx| tx.input_notes().iter().copied()))
+    }
+
+    fn output_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(self.tx_headers().flat_map(|tx| tx.output_notes().iter().copied()))
+    }
+
+    fn unauthenticated_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(
+            self.inner
+                .input_notes()
+                .iter()
+                .filter_map(|note| note.header())
+                .map(NoteHeader::id),
+        )
+    }
+
+    fn account_updates(&self) -> Box<dyn Iterator<Item = (AccountId, Word, Word)> + '_> {
+        Box::new(self.inner.account_updates().values().map(|update| {
+            (
+                update.account_id(),
+                update.initial_state_commitment(),
+                update.final_state_commitment(),
+            )
+        }))
+    }
+
+    fn transactions(&self) -> Box<dyn Iterator<Item = &Arc<AuthenticatedTransaction>> + '_> {
+        Box::new(self.txs.iter())
+    }
+}
+
+impl Node for BlockNode {
+    fn nullifiers(&self) -> Box<dyn Iterator<Item = Nullifier> + '_> {
+        Box::new(self.txs.iter().flat_map(|tx| tx.nullifiers()))
+    }
+
+    fn output_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(self.txs.iter().flat_map(|tx| tx.output_note_ids()))
+    }
+
+    fn unauthenticated_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(self.batches.iter().flat_map(|batch| {
+            batch.input_notes().iter().filter_map(|note| note.header().map(NoteHeader::id))
+        }))
+    }
+
+    fn account_updates(&self) -> Box<dyn Iterator<Item = (AccountId, Word, Word)> + '_> {
+        Box::new(self.batches.iter().flat_map(|batch| batch.account_updates()).map(
+            |(_, update)| {
+                (
+                    update.account_id(),
+                    update.initial_state_commitment(),
+                    update.final_state_commitment(),
+                )
+            },
+        ))
+    }
+
+    fn transactions(&self) -> Box<dyn Iterator<Item = &Arc<AuthenticatedTransaction>> + '_> {
+        Box::new(self.txs.iter())
+    }
+}
+
+/// Contains the current nodes of the state DAG.
+///
+/// Nodes are purposefully not stored as a single collection since we often want to iterate
+/// through specific node types e.g. all available transactions.
+///
+/// This data _must_ be kept in sync with the [`InflightState's`] [`NodeIds`] since these are
+/// used as the edges of the graph.
+#[derive(Clone, Debug, PartialEq, Default)]
+pub(crate) struct Nodes {
+    // Nodes in the DAG
+    pub(crate) txs: HashMap<TransactionId, TransactionNode>,
+    // user_batches: HashMap<BatchId, ProvenBatchNode>,
+    pub(crate) proposed_batches: HashMap<BatchId, ProposedBatchNode>,
+    pub(crate) proven_batches: HashMap<BatchId, ProvenBatchNode>,
+    pub(crate) proposed_block: Option<(BlockNumber, BlockNode)>,
+    pub(crate) committed_blocks: VecDeque<(BlockNumber, BlockNode)>,
+}
+
+impl Nodes {
+    pub(crate) fn oldest_committed_block(&self) -> Option<BlockNumber> {
+        self.committed_blocks.front().map(|(number, _)| *number)
+    }
+}
diff --git a/crates/block-producer/src/mempool/state.rs b/crates/block-producer/src/mempool/state.rs
new file mode 100644
index 000000000..975577500
--- /dev/null
+++ b/crates/block-producer/src/mempool/state.rs
@@ -0,0 +1,240 @@
+use std::collections::hash_map::Entry;
+use std::collections::{HashMap, HashSet};
+
+use miden_objects::Word;
+use miden_objects::account::AccountId;
+use miden_objects::note::{NoteId, Nullifier};
+
+use crate::mempool::nodes::{Node, NodeId};
+
+/// Tracks the inflight state of the mempool and the [`NodeId`]s associated with each piece of it.
+///
+/// This allows it to track the dependency relationships between nodes in the mempool's state DAG by
+/// checking which [`NodeId`]s created or consumed the data the node relies on.
+///
+/// Note that the user is responsible for ensuring that the inserted nodes adhere to a DAG
+/// structure. No attempt is made to verify this internally here as it requires more information
+/// than is available at this level.
+#[derive(Clone, Debug, PartialEq, Default)]
+pub(crate) struct InflightState {
+    /// All nullifiers created by inflight state.
+    ///
+    /// This _includes_ nullifiers from erased notes to simpify reverting nodes and requeuing
+    /// their transactions. If this weren't the case, then its possible that a batch contains an
+    /// erased note which can clash with another inflight transaction. If we were to revert this
+    /// batch and requeue its transactions, then this would be illegal. This is possible to handle
+    /// but would be painful ito bookkeeping.
+    ///
+    /// Instead we opt to include erased notes in the tracking here, which allows us to revert the
+    /// batch and requeue its transactions without having to worry about note clashes.
+    nullifiers: HashSet<Nullifier>,
+
+    /// All created notes and the ID of the node that created it.
+    ///
+    /// This _includes_ erased notes, see `nullifiers` for more information.
+    output_notes: HashMap<NoteId, NodeId>,
+
+    /// Maps all unauthenticated notes to the node ID that consumed them.
+    ///
+    /// This can be combined with `output_notes` to infer a parent<->child relationship between
+    /// nodes i.e. the parent node that created a note and the child node that consumed the note.
+    ///
+    /// It is the callers responsibility to ensure that all unauthenticated notes exist as output
+    /// notes at the time when a new transaction or batch node is inserted.
+    unauthenticated_notes: HashMap<NoteId, NodeId>,
+
+    /// All inflight account commitment transitions.
+    accounts: HashMap<AccountId, AccountUpdates>,
+}
+
+impl InflightState {
+    /// Returns all nullifiers which already exist.
+    pub(crate) fn nullifiers_exist(
+        &self,
+        nullifiers: impl Iterator<Item = Nullifier>,
+    ) -> Vec<Nullifier> {
+        nullifiers.filter(|nullifier| self.nullifiers.contains(nullifier)).collect()
+    }
+
+    /// Returns all output notes which already exist.
+    pub(crate) fn output_notes_exist(&self, notes: impl Iterator<Item = NoteId>) -> Vec<NoteId> {
+        notes.filter(|note| self.output_notes.contains_key(note)).collect()
+    }
+
+    /// Returns all output notes which don't exist.
+    pub(crate) fn output_notes_missing(&self, notes: impl Iterator<Item = NoteId>) -> Vec<NoteId> {
+        notes.filter(|note| !self.output_notes.contains_key(note)).collect()
+    }
+
+    /// The latest account commitment tracked by the inflight state.
+    ///
+    /// A [`None`] value _does not_ mean this account doesn't exist at all, but rather that it
+    /// has no inflight nodes.
+    pub(crate) fn account_commitment(&self, account: &AccountId) -> Option<Word> {
+        self.accounts.get(account).map(AccountUpdates::latest_commitment)
+    }
+
+    /// Removes all the state of the node from tracking.
+    ///
+    /// Note that this simply removes the data and does not check that the data was associated with
+    /// the [`Node`] at the time of removal. The caller is responsible for ensuring that the given
+    /// node was still active in the state.
+    pub(crate) fn remove(&mut self, node: &dyn Node) {
+        for nullifier in node.nullifiers() {
+            assert!(
+                self.nullifiers.remove(&nullifier),
+                "Nullifier {nullifier} was not present for removal"
+            );
+        }
+
+        for note in node.output_notes() {
+            assert!(
+                self.output_notes.remove(&note).is_some(),
+                "Output note {note} was not present for removal"
+            );
+        }
+
+        for note in node.unauthenticated_notes() {
+            assert!(
+                self.unauthenticated_notes.remove(&note).is_some(),
+                "Unauthenticated note {note} was not present for removal"
+            );
+        }
+
+        for (account, from, to) in node.account_updates() {
+            let Entry::Occupied(entry) =
+                self.accounts.entry(account).and_modify(|entry| entry.remove(from, to))
+            else {
+                panic!("Account {account} update ({from} -> {to}) was not present for removal");
+            };
+
+            if entry.get().is_empty() {
+                entry.remove_entry();
+            }
+        }
+    }
+
+    /// Inserts the node into the state, associating the data with the node's ID. This powers the
+    /// parent and child relationship lookups.
+    pub(crate) fn insert(&mut self, id: NodeId, node: &dyn Node) {
+        self.nullifiers.extend(node.nullifiers());
+        self.output_notes.extend(node.output_notes().map(|note| (note, id)));
+        self.unauthenticated_notes
+            .extend(node.unauthenticated_notes().map(|note| (note, id)));
+
+        for (account, from, to) in node.account_updates() {
+            self.accounts.entry(account).or_default().insert(id, from, to);
+        }
+    }
+
+    /// The [`NodeId`]s which the given node directly depends on.
+    ///
+    /// Note that the result is invalidated by mutating the state.
+    pub(crate) fn parents(&self, id: NodeId, node: &dyn Node) -> HashSet<NodeId> {
+        let note_parents =
+            node.unauthenticated_notes().filter_map(|note| self.output_notes.get(&note));
+
+        let account_parents = node
+            .account_updates()
+            .filter_map(|(account, from, _to)| {
+                self.accounts.get(&account).map(|account| account.parent(&from))
+            })
+            .flatten();
+
+        account_parents
+            .chain(note_parents)
+            .copied()
+            // Its possible for a node to have internal state connecting to itself. For example,
+            // a proposed batch has not erased the internally produced and consumed notes.
+            .filter(|parent| parent != &id)
+            .collect()
+    }
+
+    /// The [`NodeId`]s which depend directly on the given node.
+    ///
+    /// Note that the result is invalidated by mutating the state.
+    pub(crate) fn children(&self, id: NodeId, node: &dyn Node) -> HashSet<NodeId> {
+        let note_children =
+            node.output_notes().filter_map(|note| self.unauthenticated_notes.get(&note));
+
+        let account_children = node
+            .account_updates()
+            .filter_map(|(account, _from, to)| {
+                self.accounts.get(&account).map(|account| account.child(&to))
+            })
+            .flatten();
+
+        account_children
+            .chain(note_children)
+            .copied()
+            // Its possible for a node to have internal state connecting to itself. For example,
+            // a proposed batch has not erased the internally produced and consumed notes.
+            .filter(|child| child != &id)
+            .collect()
+    }
+}
+
+/// The commitment updates made to a account.
+#[derive(Clone, Debug, PartialEq, Default)]
+struct AccountUpdates {
+    from: HashMap<Word, NodeId>,
+    to: HashMap<Word, NodeId>,
+}
+
+impl AccountUpdates {
+    fn latest_commitment(&self) -> Word {
+        // The latest commitment will be whichever commitment isn't consumed aka a `to` which has
+        // no `from`. This breaks if this isn't in a valid state.
+        self.to
+            .keys()
+            .find(|commitment| !self.from.contains_key(commitment))
+            .copied()
+            .unwrap_or_default()
+    }
+
+    fn is_empty(&self) -> bool {
+        self.from.is_empty() && self.to.is_empty()
+    }
+
+    fn remove(&mut self, from: Word, to: Word) {
+        let from_removed = self
+            .from
+            .remove(&from)
+            .expect("should only be removing account updates from nodes that are present");
+        let to_removed = self
+            .to
+            .remove(&to)
+            .expect("should only be removing account updates from nodes that are present");
+        assert_eq!(
+            from_removed, to_removed,
+            "Account updates should be removed as a pair with the same node ID"
+        );
+    }
+
+    fn insert(&mut self, id: NodeId, from: Word, to: Word) {
+        assert!(
+            self.from.insert(from, id).is_none(),
+            "Account already contained the commitment {from} when inserting {id:?}"
+        );
+        assert!(
+            self.to.insert(to, id).is_none(),
+            "Account already contained the commitment {to} when inserting {id:?}"
+        );
+    }
+
+    /// Returns the node ID that updated this account's commitment to the given value.
+    ///
+    /// In other words, this returns the ID of `node` where `node.to == from`. This infers the
+    /// parent-child relationship where `parent.to == child.from`.
+    fn parent(&self, from: &Word) -> Option<&NodeId> {
+        self.to.get(from)
+    }
+
+    /// Returns the node ID that consumed the given commitment.
+    ///
+    /// In other words, this returns the ID of `node` where `node.from == to`. This infers the
+    /// parent-child relationship where `parent.to == child.from`.
+    fn child(&self, to: &Word) -> Option<&NodeId> {
+        self.from.get(to)
+    }
+}
diff --git a/crates/block-producer/src/mempool/subscription.rs b/crates/block-producer/src/mempool/subscription.rs
index 5b4752cb2..ebbca6efe 100644
--- a/crates/block-producer/src/mempool/subscription.rs
+++ b/crates/block-producer/src/mempool/subscription.rs
@@ -1,3 +1,5 @@
+#![allow(dead_code, reason = "WIP: mempoool refactor")]
+
 use std::collections::{BTreeMap, BTreeSet};
 use std::ops::Mul;
 
diff --git a/crates/block-producer/src/mempool/tests.rs b/crates/block-producer/src/mempool/tests.rs
index fa672b20d..9c4db532b 100644
--- a/crates/block-producer/src/mempool/tests.rs
+++ b/crates/block-producer/src/mempool/tests.rs
@@ -13,7 +13,7 @@ impl Mempool {
             BlockNumber::GENESIS,
             BatchBudget::default(),
             BlockBudget::default(),
-            5,
+            NonZeroUsize::new(5).unwrap(),
             u32::default(),
         )
     }
diff --git a/crates/block-producer/src/mempool/transaction_expiration.rs b/crates/block-producer/src/mempool/transaction_expiration.rs
deleted file mode 100644
index cd5bd96e6..000000000
--- a/crates/block-producer/src/mempool/transaction_expiration.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use std::collections::hash_map::Entry;
-use std::collections::{BTreeSet, HashMap};
-
-use miden_objects::block::BlockNumber;
-use miden_objects::transaction::TransactionId;
-
-/// Tracks transactions and their expiration block heights.
-///
-/// Implemented as a bi-directional map internally to allow for efficient lookups via both
-/// transaction ID and block number.
-#[derive(Debug, Clone, Default, PartialEq, Eq)]
-pub struct TransactionExpirations {
-    /// Transaction lookup index.
-    by_tx: HashMap<TransactionId, BlockNumber>,
-    /// Block number lookup index.
-    by_block: HashMap<BlockNumber, BTreeSet<TransactionId>>,
-}
-
-impl TransactionExpirations {
-    /// Add the transaction to the tracker.
-    pub fn insert(&mut self, tx: TransactionId, block: BlockNumber) {
-        self.by_tx.insert(tx, block);
-        self.by_block.entry(block).or_default().insert(tx);
-    }
-
-    /// Returns all transactions that are expiring at the given block number.
-    pub fn get(&mut self, block: BlockNumber) -> BTreeSet<TransactionId> {
-        self.by_block.get(&block).cloned().unwrap_or_default()
-    }
-
-    /// Removes the transactions from the tracker.
-    ///
-    /// Unknown transactions are ignored.
-    pub fn remove<'a>(&mut self, txs: impl Iterator<Item = &'a TransactionId>) {
-        for tx in txs {
-            if let Some(block) = self.by_tx.remove(tx) {
-                let Entry::Occupied(entry) = self.by_block.entry(block).and_modify(|x| {
-                    x.remove(tx);
-                }) else {
-                    panic!("block entry must exist as this is a bidirectional mapping");
-                };
-
-                // Prune the entire block's entry if no transactions are tracked.
-                if entry.get().is_empty() {
-                    entry.remove();
-                }
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::test_utils::Random;
-
-    /// Removing a transaction may result in a block's mapping being empty. This test ensures that
-    /// such maps are pruned to prevent endless growth.
-    #[test]
-    fn remove_prunes_empty_block_maps() {
-        let tx = Random::with_random_seed().draw_tx_id();
-        let block = BlockNumber::from(123);
-
-        let mut uut = TransactionExpirations::default();
-        uut.insert(tx, block);
-        uut.remove(std::iter::once(&tx));
-
-        assert_eq!(uut, TransactionExpirations::default());
-    }
-
-    #[test]
-    fn get_empty() {
-        assert!(TransactionExpirations::default().get(BlockNumber::from(123)).is_empty());
-    }
-}
diff --git a/crates/block-producer/src/mempool/transaction_graph.rs b/crates/block-producer/src/mempool/transaction_graph.rs
deleted file mode 100644
index 89eb59db0..000000000
--- a/crates/block-producer/src/mempool/transaction_graph.rs
+++ /dev/null
@@ -1,208 +0,0 @@
-use std::collections::BTreeSet;
-
-use miden_objects::transaction::TransactionId;
-
-use super::graph::{DependencyGraph, GraphError};
-use super::{BatchBudget, BudgetStatus};
-use crate::domain::transaction::AuthenticatedTransaction;
-
-// TRANSACTION GRAPH
-// ================================================================================================
-
-/// Tracks the dependency graph and status of transactions.
-///
-/// It handles insertion of transactions, locking them inqueue until they are ready to be processed.
-/// A transaction is considered eligible for batch selection once all of its parents have also been
-/// selected. Essentially this graph ensures that transaction dependency ordering is adhered to.
-///
-/// Transactions from failed batches may be [re-queued](Self::requeue_transactions) for batch
-/// selection. Successful batches will eventually form part of a committed block at which point the
-/// transaction data may be safely [pruned](Self::commit_transactions).
-///
-/// Transactions may also be outright [purged](Self::remove_transactions) from the graph. This is
-/// useful for transactions which may have become invalid due to external considerations e.g.
-/// expired transactions.
-///
-/// # Transaction lifecycle:
-/// ```text
-///                                        │                                   
-///                                  insert│                                   
-///                                  ┌─────▼─────┐                             
-///                        ┌─────────►           ┼────┐                        
-///                        │         └─────┬─────┘    │                        
-///                        │               │          │                        
-///    requeue_transactions│   select_batch│          │                        
-///                        │         ┌─────▼─────┐    │                        
-///                        └─────────┼ in batch  ┼────┤                        
-///                                  └─────┬─────┘    │                        
-///                                        │          │                        
-///                     commit_transactions│          │remove_transactions     
-///                                  ┌─────▼─────┐    │                        
-///                                  │  <null>   ◄────┘                        
-///                                  └───────────┘                             
-/// ```
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct TransactionGraph {
-    inner: DependencyGraph<TransactionId, AuthenticatedTransaction>,
-}
-
-impl TransactionGraph {
-    /// Inserts a new transaction node, with edges to the given parent nodes.
-    ///
-    /// # Errors
-    ///
-    /// Follows the error conditions of [`DependencyGraph::insert_pending`].
-    pub fn insert(
-        &mut self,
-        transaction: AuthenticatedTransaction,
-        parents: BTreeSet<TransactionId>,
-    ) -> Result<(), GraphError<TransactionId>> {
-        self.inner.insert_pending(transaction.id(), parents)?;
-        self.inner.promote_pending(transaction.id(), transaction)
-    }
-
-    /// Selects a set transactions for the next batch such that they adhere to the given budget.
-    ///
-    /// Also returns the transactions' parents.
-    ///
-    /// Internally these transactions are considered processed and cannot be emitted in future
-    /// batches.
-    ///
-    /// Note: this may emit empty batches.
-    ///
-    /// See also:
-    ///   - [`Self::requeue_transactions`]
-    ///   - [`Self::commit_transactions`]
-    pub fn select_batch(
-        &mut self,
-        mut budget: BatchBudget,
-    ) -> (Vec<AuthenticatedTransaction>, BTreeSet<TransactionId>) {
-        // This strategy just selects arbitrary roots for now. This is valid but not very
-        // interesting or efficient.
-        let mut batch = Vec::with_capacity(budget.transactions);
-        let mut parents = BTreeSet::new();
-
-        while let Some(root) = self.inner.roots().first().copied() {
-            // SAFETY: Since it was a root batch, it must definitely have a processed batch
-            // associated with it.
-            let tx = self.inner.get(&root).unwrap().clone();
-
-            // Adhere to batch budget.
-            if budget.check_then_subtract(&tx) == BudgetStatus::Exceeded {
-                break;
-            }
-
-            // SAFETY: This is definitely a root since we just selected it from the set of roots.
-            self.inner.process_root(root).unwrap();
-            let tx_parents = self.inner.parents(&root).unwrap();
-
-            batch.push(tx);
-            parents.extend(tx_parents);
-        }
-
-        (batch, parents)
-    }
-
-    /// Marks the given transactions as being back in queue.
-    ///
-    /// # Errors
-    ///
-    /// Follows the error conditions of [`DependencyGraph::revert_subgraphs`].
-    pub fn requeue_transactions(
-        &mut self,
-        transactions: BTreeSet<TransactionId>,
-    ) -> Result<(), GraphError<TransactionId>> {
-        self.inner.revert_subgraphs(transactions)
-    }
-
-    /// Removes the provided transactions from the graph.
-    ///
-    /// # Errors
-    ///
-    /// Follows the error conditions of [`DependencyGraph::prune_processed`].
-    pub fn commit_transactions(
-        &mut self,
-        tx_ids: &[TransactionId],
-    ) -> Result<(), GraphError<TransactionId>> {
-        // TODO: revisit this api.
-        let tx_ids = tx_ids.iter().copied().collect();
-        self.inner.prune_processed(tx_ids)?;
-        Ok(())
-    }
-
-    /// Removes the transactions and all their descendants from the graph.
-    ///
-    /// Returns the removed transactions.
-    ///
-    /// # Errors
-    ///
-    /// Follows the error conditions of [`DependencyGraph::purge_subgraphs`].
-    pub fn remove_transactions(
-        &mut self,
-        transactions: Vec<TransactionId>,
-    ) -> Result<BTreeSet<TransactionId>, GraphError<TransactionId>> {
-        // TODO: revisit this api.
-        let transactions = transactions.into_iter().collect();
-        self.inner.purge_subgraphs(transactions)
-    }
-
-    /// The total number of transactions in the graph.
-    pub fn len(&self) -> usize {
-        self.inner.len()
-    }
-
-    /// The amount of transactions which are root nodes.
-    pub fn num_roots(&self) -> usize {
-        self.inner.num_roots()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::test_utils::mock_proven_tx;
-
-    // BATCH SELECTION TESTS
-    // ================================================================================================
-
-    #[test]
-    fn select_batch_respects_transaction_limit() {
-        // These transactions are independent and just used to ensure we have more available
-        // transactions than we want in the batch.
-        let txs = (0..10)
-            .map(|i| mock_proven_tx(i, vec![], vec![]))
-            .map(AuthenticatedTransaction::from_inner);
-
-        let mut uut = TransactionGraph::default();
-        for tx in txs {
-            uut.insert(tx, [].into()).unwrap();
-        }
-
-        let (batch, parents) =
-            uut.select_batch(BatchBudget { transactions: 0, ..Default::default() });
-        assert!(batch.is_empty());
-        assert!(parents.is_empty());
-
-        let (batch, parents) =
-            uut.select_batch(BatchBudget { transactions: 3, ..Default::default() });
-        assert_eq!(batch.len(), 3);
-        assert!(parents.is_empty());
-
-        let (batch, parents) =
-            uut.select_batch(BatchBudget { transactions: 4, ..Default::default() });
-        assert_eq!(batch.len(), 4);
-        assert!(parents.is_empty());
-
-        // We expect this to be partially filled.
-        let (batch, parents) =
-            uut.select_batch(BatchBudget { transactions: 4, ..Default::default() });
-        assert_eq!(batch.len(), 3);
-        assert!(parents.is_empty());
-
-        // And thereafter empty.
-        let (batch, parents) =
-            uut.select_batch(BatchBudget { transactions: 100, ..Default::default() });
-        assert!(batch.is_empty());
-        assert!(parents.is_empty());
-    }
-}
diff --git a/crates/block-producer/src/server/mod.rs b/crates/block-producer/src/server/mod.rs
index b7ac224ec..af88910e8 100644
--- a/crates/block-producer/src/server/mod.rs
+++ b/crates/block-producer/src/server/mod.rs
@@ -34,14 +34,9 @@ use crate::errors::{
     SubmitProvenBatchError,
     VerifyTxError,
 };
-use crate::mempool::{BatchBudget, BlockBudget, Mempool, SharedMempool};
+use crate::mempool::{BatchBudget, BlockBudget, Mempool, MempoolConfig, SharedMempool};
 use crate::store::StoreClient;
-use crate::{
-    COMPONENT,
-    SERVER_MEMPOOL_EXPIRATION_SLACK,
-    SERVER_MEMPOOL_STATE_RETENTION,
-    SERVER_NUM_BATCH_BUILDERS,
-};
+use crate::{COMPONENT, SERVER_NUM_BATCH_BUILDERS};
 
 /// The block producer server.
 ///
@@ -130,16 +125,15 @@ impl BlockProducer {
             self.batch_prover_url,
             self.batch_interval,
         );
-        let mempool = Mempool::shared(
-            chain_tip,
-            BatchBudget {
+        let mempool = MempoolConfig {
+            batch_budget: BatchBudget {
                 transactions: self.max_txs_per_batch,
                 ..BatchBudget::default()
             },
-            BlockBudget { batches: self.max_batches_per_block },
-            SERVER_MEMPOOL_STATE_RETENTION,
-            SERVER_MEMPOOL_EXPIRATION_SLACK,
-        );
+            block_budget: BlockBudget { batches: self.max_batches_per_block },
+            ..Default::default()
+        };
+        let mempool = Mempool::shared(chain_tip, mempool);
 
         // Spawn rpc server and batch and block provers.
         //
@@ -378,7 +372,7 @@ impl BlockProducerRpcServer {
         let inputs = self.store.get_tx_inputs(&tx).await.map_err(VerifyTxError::from)?;
 
         // SAFETY: we assume that the rpc component has verified the transaction proof already.
-        let tx = AuthenticatedTransaction::new(tx, inputs)?;
+        let tx = AuthenticatedTransaction::new_unchecked(tx, inputs).map(Arc::new)?;
 
         self.mempool.lock().await.lock().await.add_transaction(tx).map(|block_height| {
             proto::block_producer::SubmitProvenTransactionResponse {
diff --git a/crates/block-producer/src/test_utils/proven_tx.rs b/crates/block-producer/src/test_utils/proven_tx.rs
index 69b3295a4..c5d9e26fb 100644
--- a/crates/block-producer/src/test_utils/proven_tx.rs
+++ b/crates/block-producer/src/test_utils/proven_tx.rs
@@ -1,4 +1,5 @@
 use std::ops::Range;
+use std::sync::Arc;
 
 use itertools::Itertools;
 use miden_node_utils::fee::test_fee;
@@ -38,7 +39,7 @@ impl MockProvenTxBuilder {
     }
 
     /// Generates 3 random, sequential transactions acting on the same account.
-    pub fn sequential() -> [AuthenticatedTransaction; 3] {
+    pub fn sequential() -> [Arc<AuthenticatedTransaction>; 3] {
         let mut rng = rand::rng();
         let mock_account: MockPrivateAccount<4> = rng.random::<u32>().into();
 
@@ -50,7 +51,7 @@ impl MockProvenTxBuilder {
                     mock_account.states[i + 1],
                 )
             })
-            .map(|tx| AuthenticatedTransaction::from_inner(tx.build()))
+            .map(|tx| Arc::new(AuthenticatedTransaction::from_inner(tx.build())))
             .collect_vec()
             .try_into()
             .expect("Sizes should match")
diff --git a/crates/ntx-builder/src/transaction.rs b/crates/ntx-builder/src/transaction.rs
index 849cd5aa2..2ff3f33f7 100644
--- a/crates/ntx-builder/src/transaction.rs
+++ b/crates/ntx-builder/src/transaction.rs
@@ -309,7 +309,7 @@ impl DataStore for NtxDataStore {
                 });
             }
 
-            AssetWitness::new(account.vault().asset_tree().open(&vault_key)).map_err(|err| {
+            AssetWitness::new(account.vault().open(vault_key).into()).map_err(|err| {
                 DataStoreError::Other {
                     error_msg: "failed to open vault asset tree".into(),
                     source: Some(Box::new(err)),
diff --git a/crates/store/src/db/tests.rs b/crates/store/src/db/tests.rs
index 174067367..590349d0e 100644
--- a/crates/store/src/db/tests.rs
+++ b/crates/store/src/db/tests.rs
@@ -444,7 +444,7 @@ fn sql_unconsumed_network_notes() {
     // An arbitrary public account (network note tag requires public account).
     create_block(conn, block_num);
 
-    let account_notes = vec![
+    let account_notes = [
         make_account_and_note(conn, block_num, [0u8; 32], AccountStorageMode::Public),
         make_account_and_note(conn, block_num, [1u8; 32], AccountStorageMode::Network),
     ];
diff --git a/crates/store/src/genesis/config/mod.rs b/crates/store/src/genesis/config/mod.rs
index 3f36676e0..913e96137 100644
--- a/crates/store/src/genesis/config/mod.rs
+++ b/crates/store/src/genesis/config/mod.rs
@@ -441,15 +441,12 @@ impl AccountSecrets {
         let account_lut = IndexMap::<AccountId, Account>::from_iter(
             genesis_state.accounts.iter().map(|account| (account.id(), account.clone())),
         );
-        self.secrets.iter().map(move |(name, account_id, secret_key)| {
+        self.secrets.iter().cloned().map(move |(name, account_id, secret_key)| {
             let account = account_lut
-                .get(account_id)
-                .ok_or(GenesisConfigError::MissingGenesisAccount { account_id: *account_id })?;
-            let account_file = AccountFile::new(
-                account.clone(),
-                vec![AuthSecretKey::RpoFalcon512(secret_key.clone())],
-            );
-            let name = name.to_string();
+                .get(&account_id)
+                .ok_or(GenesisConfigError::MissingGenesisAccount { account_id })?;
+            let account_file =
+                AccountFile::new(account.clone(), vec![AuthSecretKey::RpoFalcon512(secret_key)]);
             Ok(AccountFileWithName { name, account_file })
         })
     }

From 56fbadd6b525746959c264a22957066291c27f41 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Sun, 28 Sep 2025 19:10:55 -0300
Subject: [PATCH 24/78] chore: add SubmitProvenBatch error in proto (#1231)

---
 crates/block-producer/src/errors.rs      | 113 +++++++++++++++++++----
 crates/block-producer/src/errors_test.rs |  15 ++-
 crates/proto/build.rs                    |   2 -
 crates/proto/src/domain/errors.rs        |  22 -----
 crates/proto/src/domain/mod.rs           |   1 -
 crates/proto/src/generated/errors.rs     |  52 -----------
 crates/proto/src/generated/mod.rs        |   1 -
 crates/rpc/README.md                     |  21 ++---
 docs/src/developer/rpc.md                |  48 ++++++++++
 docs/src/user/rpc.md                     |  21 ++---
 proto/build.rs                           |   8 --
 proto/proto/types/errors.proto           |  14 ---
 proto/src/lib.rs                         |   7 --
 13 files changed, 172 insertions(+), 153 deletions(-)
 delete mode 100644 crates/proto/src/domain/errors.rs
 delete mode 100644 crates/proto/src/generated/errors.rs
 delete mode 100644 proto/proto/types/errors.proto

diff --git a/crates/block-producer/src/errors.rs b/crates/block-producer/src/errors.rs
index af0654caf..6b948d29d 100644
--- a/crates/block-producer/src/errors.rs
+++ b/crates/block-producer/src/errors.rs
@@ -1,6 +1,5 @@
 use miden_block_prover::ProvenBlockError;
 use miden_node_proto::errors::ConversionError;
-use miden_node_proto::generated::errors::SubmitProvenTransactionError;
 use miden_node_utils::ErrorReport;
 use miden_node_utils::formatting::format_opt;
 use miden_objects::account::AccountId;
@@ -101,36 +100,35 @@ pub enum AddTransactionError {
     },
 }
 
-// Error codes for gRPC Status::details
-// =================================================================================================
-
 impl AddTransactionError {
-    fn api_error(&self) -> SubmitProvenTransactionError {
+    fn api_error(&self) -> SubmitProvenTransactionGrpcError {
         match self {
             AddTransactionError::VerificationFailed(tx_verify_error) => match tx_verify_error {
                 VerifyTxError::InputNotesAlreadyConsumed(_) => {
-                    SubmitProvenTransactionError::InputNotesAlreadyConsumed
+                    SubmitProvenTransactionGrpcError::InputNotesAlreadyConsumed
                 },
                 VerifyTxError::StoreConnectionFailed(_) => {
-                    SubmitProvenTransactionError::InternalError
+                    SubmitProvenTransactionGrpcError::Internal
                 },
                 VerifyTxError::UnauthenticatedNotesNotFound(_) => {
-                    SubmitProvenTransactionError::UnauthenticatedNotesNotFound
+                    SubmitProvenTransactionGrpcError::UnauthenticatedNotesNotFound
                 },
                 VerifyTxError::OutputNotesAlreadyExist(_) => {
-                    SubmitProvenTransactionError::OutputNotesAlreadyExist
+                    SubmitProvenTransactionGrpcError::OutputNotesAlreadyExist
                 },
                 VerifyTxError::IncorrectAccountInitialCommitment { .. } => {
-                    SubmitProvenTransactionError::IncorrectAccountInitialCommitment
+                    SubmitProvenTransactionGrpcError::IncorrectAccountInitialCommitment
                 },
                 VerifyTxError::InvalidTransactionProof(_) => {
-                    SubmitProvenTransactionError::InvalidTransactionProof
+                    SubmitProvenTransactionGrpcError::InvalidTransactionProof
                 },
             },
-            AddTransactionError::StaleInputs { .. } => SubmitProvenTransactionError::InternalError,
-            AddTransactionError::Expired { .. } => SubmitProvenTransactionError::TransactionExpired,
+            AddTransactionError::StaleInputs { .. } => SubmitProvenTransactionGrpcError::Internal,
+            AddTransactionError::Expired { .. } => {
+                SubmitProvenTransactionGrpcError::TransactionExpired
+            },
             AddTransactionError::TransactionDeserializationFailed(_) => {
-                SubmitProvenTransactionError::DeserializationFailed
+                SubmitProvenTransactionGrpcError::DeserializationFailed
             },
         }
     }
@@ -157,6 +155,40 @@ impl From<AddTransactionError> for tonic::Status {
     }
 }
 
+// Submit proven transaction error codes for gRPC Status::details
+// =================================================================================================
+
+#[derive(Debug, Copy, Clone)]
+#[repr(u8)]
+pub(crate) enum SubmitProvenTransactionGrpcError {
+    Internal = 0,
+    DeserializationFailed = 1,
+    InvalidTransactionProof = 2,
+    IncorrectAccountInitialCommitment = 3,
+    InputNotesAlreadyConsumed = 4,
+    UnauthenticatedNotesNotFound = 5,
+    OutputNotesAlreadyExist = 6,
+    TransactionExpired = 7,
+}
+
+impl SubmitProvenTransactionGrpcError {
+    pub fn api_code(self) -> u8 {
+        self as u8
+    }
+
+    pub fn tonic_code(self) -> tonic::Code {
+        if self.is_internal() {
+            tonic::Code::Internal
+        } else {
+            tonic::Code::InvalidArgument
+        }
+    }
+
+    pub fn is_internal(self) -> bool {
+        matches!(self, SubmitProvenTransactionGrpcError::Internal)
+    }
+}
+
 // Submit proven batch by user errors
 // =================================================================================================
 
@@ -166,12 +198,61 @@ pub enum SubmitProvenBatchError {
     Deserialization(#[source] miden_objects::utils::DeserializationError),
 }
 
+impl SubmitProvenBatchError {
+    fn api_error(&self) -> SubmitProvenBatchGrpcError {
+        match self {
+            SubmitProvenBatchError::Deserialization(_) => {
+                SubmitProvenBatchGrpcError::DeserializationFailed
+            },
+        }
+    }
+}
+
 impl From<SubmitProvenBatchError> for tonic::Status {
     fn from(value: SubmitProvenBatchError) -> Self {
-        match value {
-            SubmitProvenBatchError::Deserialization(_) => Self::invalid_argument(value.as_report()),
+        let api_error = value.api_error();
+
+        let message = if api_error.is_internal() {
+            "Internal error".to_owned()
+        } else {
+            value.as_report()
+        };
+
+        tonic::Status::with_details(
+            api_error.tonic_code(),
+            message,
+            vec![api_error.api_code()].into(),
+        )
+    }
+}
+
+// Submit proven batch error codes for gRPC Status::details
+// =================================================================================================
+
+#[derive(Debug, Copy, Clone)]
+#[repr(u8)]
+pub(crate) enum SubmitProvenBatchGrpcError {
+    #[allow(dead_code)]
+    Internal = 0,
+    DeserializationFailed = 1,
+}
+
+impl SubmitProvenBatchGrpcError {
+    pub fn api_code(self) -> u8 {
+        self as u8
+    }
+
+    pub fn tonic_code(self) -> tonic::Code {
+        if self.is_internal() {
+            tonic::Code::Internal
+        } else {
+            tonic::Code::InvalidArgument
         }
     }
+
+    pub fn is_internal(self) -> bool {
+        matches!(self, SubmitProvenBatchGrpcError::Internal)
+    }
 }
 
 // Batch building errors
diff --git a/crates/block-producer/src/errors_test.rs b/crates/block-producer/src/errors_test.rs
index 7f442bdf9..0d6f519c9 100644
--- a/crates/block-producer/src/errors_test.rs
+++ b/crates/block-producer/src/errors_test.rs
@@ -1,12 +1,11 @@
 #[cfg(test)]
 mod tests {
-    use miden_node_proto::generated::errors::SubmitProvenTransactionError;
     use miden_objects::Word;
     use miden_objects::block::BlockNumber;
     use miden_objects::note::{NoteId, Nullifier};
     use miden_tx::utils::DeserializationError;
 
-    use crate::errors::{AddTransactionError, VerifyTxError};
+    use crate::errors::{AddTransactionError, SubmitProvenTransactionGrpcError, VerifyTxError};
 
     #[rstest::rstest]
     #[test]
@@ -14,34 +13,34 @@ mod tests {
         AddTransactionError::VerificationFailed(
             VerifyTxError::InputNotesAlreadyConsumed(vec![Nullifier::dummy(1)])
         ),
-        SubmitProvenTransactionError::InputNotesAlreadyConsumed,
+        SubmitProvenTransactionGrpcError::InputNotesAlreadyConsumed,
         "verification failed",
     )]
     #[case::unauthenticated_notes_not_found_error(
         AddTransactionError::VerificationFailed(
             VerifyTxError::UnauthenticatedNotesNotFound(vec![NoteId::new(Word::default(), Word::default())])
         ),
-        SubmitProvenTransactionError::UnauthenticatedNotesNotFound,
+        SubmitProvenTransactionGrpcError::UnauthenticatedNotesNotFound,
         "verification failed",
     )]
     #[case::stale_inputs_error(
         AddTransactionError::StaleInputs { input_block: BlockNumber::from(100), stale_limit: BlockNumber::from(150) },
-        SubmitProvenTransactionError::InternalError,
+        SubmitProvenTransactionGrpcError::Internal,
         "Internal error",
     )]
     #[case::expired_error(
         AddTransactionError::Expired { expired_at: BlockNumber::from(200), limit: BlockNumber::from(250) },
-        SubmitProvenTransactionError::TransactionExpired,
+        SubmitProvenTransactionGrpcError::TransactionExpired,
         "expired",
     )]
     #[case::transaction_deserialization_failed_error(
         AddTransactionError::TransactionDeserializationFailed(DeserializationError::InvalidValue("test error".to_string())),
-        SubmitProvenTransactionError::DeserializationFailed,
+        SubmitProvenTransactionGrpcError::DeserializationFailed,
         "deserialization",
     )]
     fn submit_transaction_error_mapping(
         #[case] uut: AddTransactionError,
-        #[case] expected: SubmitProvenTransactionError,
+        #[case] expected: SubmitProvenTransactionGrpcError,
         #[case] message: &str,
     ) {
         let status = tonic::Status::from(uut);
diff --git a/crates/proto/build.rs b/crates/proto/build.rs
index 015fb0f7d..39e7c908c 100644
--- a/crates/proto/build.rs
+++ b/crates/proto/build.rs
@@ -4,7 +4,6 @@ use std::path::{Path, PathBuf};
 use fs_err as fs;
 use miden_node_proto_build::{
     block_producer_api_descriptor,
-    errors_api_descriptor,
     remote_prover_api_descriptor,
     rpc_api_descriptor,
     store_block_producer_api_descriptor,
@@ -47,7 +46,6 @@ fn main() -> miette::Result<()> {
     generate_bindings(store_shared_api_descriptor(), &dst_dir)?;
     generate_bindings(block_producer_api_descriptor(), &dst_dir)?;
     generate_bindings(remote_prover_api_descriptor(), &dst_dir)?;
-    generate_bindings(errors_api_descriptor(), &dst_dir)?;
 
     generate_mod_rs(&dst_dir).into_diagnostic().wrap_err("generating mod.rs")?;
 
diff --git a/crates/proto/src/domain/errors.rs b/crates/proto/src/domain/errors.rs
deleted file mode 100644
index 3e03d3dd1..000000000
--- a/crates/proto/src/domain/errors.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use crate::generated::errors::SubmitProvenTransactionError;
-
-impl SubmitProvenTransactionError {
-    pub fn api_code(&self) -> u8 {
-        *self as u8
-    }
-
-    pub fn tonic_code(&self) -> tonic::Code {
-        match self {
-            SubmitProvenTransactionError::InternalError
-            | SubmitProvenTransactionError::Unspecified => tonic::Code::Internal,
-            _ => tonic::Code::InvalidArgument,
-        }
-    }
-
-    pub fn is_internal(&self) -> bool {
-        matches!(
-            self,
-            SubmitProvenTransactionError::InternalError | SubmitProvenTransactionError::Unspecified
-        )
-    }
-}
diff --git a/crates/proto/src/domain/mod.rs b/crates/proto/src/domain/mod.rs
index 6d023a1a4..f70c8f738 100644
--- a/crates/proto/src/domain/mod.rs
+++ b/crates/proto/src/domain/mod.rs
@@ -2,7 +2,6 @@ pub mod account;
 pub mod batch;
 pub mod block;
 pub mod digest;
-pub mod errors;
 pub mod mempool;
 pub mod merkle;
 pub mod note;
diff --git a/crates/proto/src/generated/errors.rs b/crates/proto/src/generated/errors.rs
deleted file mode 100644
index 60d9318e2..000000000
--- a/crates/proto/src/generated/errors.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-// This file is @generated by prost-build.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum SubmitProvenTransactionError {
-    Unspecified = 0,
-    InternalError = 1,
-    DeserializationFailed = 2,
-    InvalidTransactionProof = 3,
-    IncorrectAccountInitialCommitment = 4,
-    InputNotesAlreadyConsumed = 5,
-    UnauthenticatedNotesNotFound = 6,
-    OutputNotesAlreadyExist = 7,
-    TransactionExpired = 8,
-}
-impl SubmitProvenTransactionError {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            Self::Unspecified => "SUBMIT_PROVEN_TRANSACTION_ERROR_UNSPECIFIED",
-            Self::InternalError => "INTERNAL_ERROR",
-            Self::DeserializationFailed => "DESERIALIZATION_FAILED",
-            Self::InvalidTransactionProof => "INVALID_TRANSACTION_PROOF",
-            Self::IncorrectAccountInitialCommitment => {
-                "INCORRECT_ACCOUNT_INITIAL_COMMITMENT"
-            }
-            Self::InputNotesAlreadyConsumed => "INPUT_NOTES_ALREADY_CONSUMED",
-            Self::UnauthenticatedNotesNotFound => "UNAUTHENTICATED_NOTES_NOT_FOUND",
-            Self::OutputNotesAlreadyExist => "OUTPUT_NOTES_ALREADY_EXIST",
-            Self::TransactionExpired => "TRANSACTION_EXPIRED",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "SUBMIT_PROVEN_TRANSACTION_ERROR_UNSPECIFIED" => Some(Self::Unspecified),
-            "INTERNAL_ERROR" => Some(Self::InternalError),
-            "DESERIALIZATION_FAILED" => Some(Self::DeserializationFailed),
-            "INVALID_TRANSACTION_PROOF" => Some(Self::InvalidTransactionProof),
-            "INCORRECT_ACCOUNT_INITIAL_COMMITMENT" => {
-                Some(Self::IncorrectAccountInitialCommitment)
-            }
-            "INPUT_NOTES_ALREADY_CONSUMED" => Some(Self::InputNotesAlreadyConsumed),
-            "UNAUTHENTICATED_NOTES_NOT_FOUND" => Some(Self::UnauthenticatedNotesNotFound),
-            "OUTPUT_NOTES_ALREADY_EXIST" => Some(Self::OutputNotesAlreadyExist),
-            "TRANSACTION_EXPIRED" => Some(Self::TransactionExpired),
-            _ => None,
-        }
-    }
-}
diff --git a/crates/proto/src/generated/mod.rs b/crates/proto/src/generated/mod.rs
index 36812988b..799aa1b71 100644
--- a/crates/proto/src/generated/mod.rs
+++ b/crates/proto/src/generated/mod.rs
@@ -5,7 +5,6 @@ pub mod account;
 pub mod block_producer;
 pub mod block_producer_store;
 pub mod blockchain;
-pub mod errors;
 pub mod note;
 pub mod ntx_builder_store;
 pub mod primitives;
diff --git a/crates/rpc/README.md b/crates/rpc/README.md
index a14ac8063..4ab94d7eb 100644
--- a/crates/rpc/README.md
+++ b/crates/rpc/README.md
@@ -82,17 +82,16 @@ Submits a proven transaction to the Miden network for inclusion in future blocks
 
 When transaction submission fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
 
-| Error Code                             | Value | gRPC Status        | Description                                                   |
-|----------------------------------------|-------|--------------------|---------------------------------------------------------------|
-| `UNSPECIFIED_ERROR`                    | 0     | `INTERNAL`         | Default/unspecified error                                     |
-| `INTERNAL_ERROR`                       | 1     | `INTERNAL`         | Internal server error occurred                                |
-| `DESERIALIZATION_FAILED`               | 2     | `INVALID_ARGUMENT` | Transaction could not be deserialized                         |
-| `INVALID_TRANSACTION_PROOF`            | 3     | `INVALID_ARGUMENT` | Transaction execution proof is invalid                        |
-| `INCORRECT_ACCOUNT_INITIAL_COMMITMENT` | 4     | `INVALID_ARGUMENT` | Account's initial state doesn't match current state           |
-| `INPUT_NOTES_ALREADY_CONSUMED`         | 5     | `INVALID_ARGUMENT` | Input notes have already been consumed by another transaction |
-| `UNAUTHENTICATED_NOTES_NOT_FOUND`      | 6     | `INVALID_ARGUMENT` | Required unauthenticated notes were not found                 |
-| `OUTPUT_NOTES_ALREADY_EXIST`           | 7     | `INVALID_ARGUMENT` | Output note IDs are already in use                            |
-| `TRANSACTION_EXPIRED`                  | 8     | `INVALID_ARGUMENT` | Transaction has exceeded its expiration block height          |
+| Error Code                                    | Value | gRPC Status        | Description                                                   |
+|-----------------------------------------------|-------|--------------------|---------------------------------------------------------------|
+| `INTERNAL_ERROR`                              | 0     | `INTERNAL`         | Internal server error occurred                                |
+| `DESERIALIZATION_FAILED`                      | 1     | `INVALID_ARGUMENT` | Transaction could not be deserialized                         |
+| `INVALID_TRANSACTION_PROOF`                   | 2     | `INVALID_ARGUMENT` | Transaction execution proof is invalid                        |
+| `INCORRECT_ACCOUNT_INITIAL_COMMITMENT`        | 3     | `INVALID_ARGUMENT` | Account's initial state doesn't match current state           |
+| `INPUT_NOTES_ALREADY_CONSUMED`                | 4     | `INVALID_ARGUMENT` | Input notes have already been consumed by another transaction |
+| `UNAUTHENTICATED_NOTES_NOT_FOUND`             | 5     | `INVALID_ARGUMENT` | Required unauthenticated notes were not found                 |
+| `OUTPUT_NOTES_ALREADY_EXIST`                  | 6     | `INVALID_ARGUMENT` | Output note IDs are already in use                            |
+| `TRANSACTION_EXPIRED`                         | 7     | `INVALID_ARGUMENT` | Transaction has exceeded its expiration block height          |
 
 **Error Details Serialization**: The `Status.details` field contains a single byte with the numeric error code value. Clients can decode this by reading `details[0]` to get the error code (0-8) and mapping it to the corresponding enum value.
 
diff --git a/docs/src/developer/rpc.md b/docs/src/developer/rpc.md
index e37d04e55..bf561d008 100644
--- a/docs/src/developer/rpc.md
+++ b/docs/src/developer/rpc.md
@@ -18,3 +18,51 @@ If there is a mismatch in version, clients will encounter an error while executi
 - gRPC message: Missing required ACCEPT header
 
 The server will reject any version that does not have the same major and minor version to it. This behaviour will change after v1.0.0., at which point only the major version will be taken into account.
+
+## Error Handling
+
+The RPC component uses domain-specific error enums for structured error reporting instead of proto-generated error types. This provides better control over error codes and makes error handling more maintainable.
+
+### Error Architecture
+
+Error handling follows this pattern:
+
+1. **Domain Errors**: Business logic errors are defined in domain-specific enums
+2. **gRPC Conversion**: Domain errors are converted to gRPC `Status` objects with structured details
+3. **Error Details**: Specific error codes are embedded in `Status.details` as single bytes
+
+### SubmitProvenTransaction Errors
+
+Transaction submission errors are:
+
+```rust
+enum SubmitProvenTransactionGrpcError {
+    Internal = 0,
+    DeserializationFailed = 1,
+    InvalidTransactionProof = 2,
+    IncorrectAccountInitialCommitment = 3,
+    InputNotesAlreadyConsumed = 4,
+    UnauthenticatedNotesNotFound = 5,
+    OutputNotesAlreadyExist = 6,
+    TransactionExpired = 7,
+}
+```
+
+Error codes are embedded as single bytes in `Status.details`
+
+<!--
+
+TODO: show this once the endpoint is public
+
+### SubmitProvenBatch Errors
+
+Batch submission errors are:
+
+```rust
+enum SubmitProvenBatchGrpcError {
+    Internal = 0,
+    DeserializationFailed = 1,
+}
+```
+
+-->
diff --git a/docs/src/user/rpc.md b/docs/src/user/rpc.md
index 875d1146a..79e270d9a 100644
--- a/docs/src/user/rpc.md
+++ b/docs/src/user/rpc.md
@@ -63,17 +63,16 @@ This endpoint accepts a proven transaction and attempts to add it to the mempool
 
 When transaction submission fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
 
-| Error Code                             | Value | gRPC Status        | Description                                                   |
-|----------------------------------------|-------|--------------------|---------------------------------------------------------------|
-| `UNSPECIFIED_ERROR`                    | 0     | `INTERNAL`         | Default/unspecified error                                     |
-| `INTERNAL_ERROR`                       | 1     | `INTERNAL`         | Internal server error occurred                                |
-| `DESERIALIZATION_FAILED`               | 2     | `INVALID_ARGUMENT` | Transaction could not be deserialized                         |
-| `INVALID_TRANSACTION_PROOF`            | 3     | `INVALID_ARGUMENT` | Transaction execution proof is invalid                        |
-| `INCORRECT_ACCOUNT_INITIAL_COMMITMENT` | 4     | `INVALID_ARGUMENT` | Account's initial state doesn't match current state           |
-| `INPUT_NOTES_ALREADY_CONSUMED`         | 5     | `INVALID_ARGUMENT` | Input notes have already been consumed by another transaction |
-| `UNAUTHENTICATED_NOTES_NOT_FOUND`      | 6     | `INVALID_ARGUMENT` | Required unauthenticated notes were not found                 |
-| `OUTPUT_NOTES_ALREADY_EXIST`           | 7     | `INVALID_ARGUMENT` | Output note IDs are already in use                            |
-| `TRANSACTION_EXPIRED`                  | 8     | `INVALID_ARGUMENT` | Transaction has exceeded its expiration block height          |
+| Error Code                                    | Value | gRPC Status        | Description                                                   |
+|-----------------------------------------------|-------|--------------------|---------------------------------------------------------------|
+| `INTERNAL_ERROR`                              | 0     | `INTERNAL`         | Internal server error occurred                                |
+| `DESERIALIZATION_FAILED`                      | 1     | `INVALID_ARGUMENT` | Transaction could not be deserialized                         |
+| `INVALID_TRANSACTION_PROOF`                   | 2     | `INVALID_ARGUMENT` | Transaction execution proof is invalid                        |
+| `INCORRECT_ACCOUNT_INITIAL_COMMITMENT`        | 3     | `INVALID_ARGUMENT` | Account's initial state doesn't match current state           |
+| `INPUT_NOTES_ALREADY_CONSUMED`                | 4     | `INVALID_ARGUMENT` | Input notes have already been consumed by another transaction |
+| `UNAUTHENTICATED_NOTES_NOT_FOUND`             | 5     | `INVALID_ARGUMENT` | Required unauthenticated notes were not found                 |
+| `OUTPUT_NOTES_ALREADY_EXIST`                  | 6     | `INVALID_ARGUMENT` | Output note IDs are already in use                            |
+| `TRANSACTION_EXPIRED`                         | 7     | `INVALID_ARGUMENT` | Transaction has exceeded its expiration block height          |
 
 ### SyncNullifiers
 
diff --git a/proto/build.rs b/proto/build.rs
index 80a9e0ace..0b172c706 100644
--- a/proto/build.rs
+++ b/proto/build.rs
@@ -12,7 +12,6 @@ const STORE_BLOCK_PRODUCER_PROTO: &str = "store/block_producer.proto";
 const STORE_SHARED_PROTO: &str = "store/shared.proto";
 const BLOCK_PRODUCER_PROTO: &str = "block_producer.proto";
 const REMOTE_PROVER_PROTO: &str = "remote_prover.proto";
-const ERRORS_PROTO: &str = "types/errors.proto";
 
 const RPC_DESCRIPTOR: &str = "rpc_file_descriptor.bin";
 const STORE_RPC_DESCRIPTOR: &str = "store_rpc_file_descriptor.bin";
@@ -21,7 +20,6 @@ const STORE_BLOCK_PRODUCER_DESCRIPTOR: &str = "store_block_producer_file_descrip
 const STORE_SHARED_DESCRIPTOR: &str = "store_shared_file_descriptor.bin";
 const BLOCK_PRODUCER_DESCRIPTOR: &str = "block_producer_file_descriptor.bin";
 const REMOTE_PROVER_DESCRIPTOR: &str = "remote_prover_file_descriptor.bin";
-const ERRORS_DESCRIPTOR: &str = "errors_file_descriptor.bin";
 
 /// Generates Rust protobuf bindings from .proto files.
 ///
@@ -81,11 +79,5 @@ fn main() -> miette::Result<()> {
         .into_diagnostic()
         .wrap_err("writing block producer file descriptor")?;
 
-    let errors_file_descriptor = protox::compile([ERRORS_PROTO], includes)?;
-    let errors_path = PathBuf::from(&out).join(ERRORS_DESCRIPTOR);
-    fs::write(&errors_path, errors_file_descriptor.encode_to_vec())
-        .into_diagnostic()
-        .wrap_err("writing errors file descriptor")?;
-
     Ok(())
 }
diff --git a/proto/proto/types/errors.proto b/proto/proto/types/errors.proto
deleted file mode 100644
index 2fc105f6c..000000000
--- a/proto/proto/types/errors.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-syntax = "proto3";
-package errors;
-
-enum SubmitProvenTransactionError {
-    SUBMIT_PROVEN_TRANSACTION_ERROR_UNSPECIFIED = 0;
-    INTERNAL_ERROR = 1;
-    DESERIALIZATION_FAILED = 2;
-    INVALID_TRANSACTION_PROOF = 3;
-    INCORRECT_ACCOUNT_INITIAL_COMMITMENT = 4;
-    INPUT_NOTES_ALREADY_CONSUMED = 5;
-    UNAUTHENTICATED_NOTES_NOT_FOUND = 6;
-    OUTPUT_NOTES_ALREADY_EXIST = 7;
-    TRANSACTION_EXPIRED = 8;
-}
diff --git a/proto/src/lib.rs b/proto/src/lib.rs
index 575b74688..f7a96cf2f 100644
--- a/proto/src/lib.rs
+++ b/proto/src/lib.rs
@@ -56,10 +56,3 @@ pub fn block_producer_api_descriptor() -> FileDescriptorSet {
     FileDescriptorSet::decode(&bytes[..])
         .expect("bytes should be a valid file descriptor created by build.rs")
 }
-
-/// Returns the Protobuf file descriptor for the errors API.
-pub fn errors_api_descriptor() -> FileDescriptorSet {
-    let bytes = include_bytes!(concat!(env!("OUT_DIR"), "/", "errors_file_descriptor.bin"));
-    FileDescriptorSet::decode(&bytes[..])
-        .expect("bytes should be a valid file descriptor created by build.rs")
-}

From aaffbb53ff4b63406e94b645a118ca4e48fe7094 Mon Sep 17 00:00:00 2001
From: keinberger <philipp.keinberger@gmail.com>
Date: Mon, 29 Sep 2025 11:59:30 +0300
Subject: [PATCH 25/78] chore: migrate docs from mdbook to docusaurus

---
 .github/workflows/book.yml                    |     8 +-
 .github/workflows/trigger-deploy-docs.yml     |    21 +
 docs/external/.gitignore                      |     3 +
 docs/external/docusaurus.config.ts            |    31 +
 docs/external/package-lock.json               | 19469 ++++++++++++++++
 docs/external/package.json                    |    15 +
 docs/external/sidebars.ts                     |    13 +
 docs/external/src/_category_.json             |     5 +
 .../src/img}/node_architecture.svg            |     0
 .../src/img}/operator_architecture.svg        |     0
 .../src/img}/workspace_tree.svg               |     0
 docs/{ => external}/src/index.md              |     4 +
 docs/external/src/operator/_category_.json    |     5 +
 .../src/operator/architecture.md              |     7 +-
 docs/{ => external}/src/operator/index.md     |     0
 .../src/operator/installation.md              |    15 +-
 .../{ => external}/src/operator/monitoring.md |    32 +-
 docs/{ => external}/src/operator/usage.md     |     6 +-
 .../{ => external}/src/operator/versioning.md |     4 +
 docs/{src/user => external/src}/rpc.md        |     8 +-
 docs/external/tsconfig.json                   |     8 +
 docs/internal/.gitignore                      |     1 +
 docs/{ => internal}/book.toml                 |     4 +-
 docs/internal/src/SUMMARY.md                  |    14 +
 .../src}/block-producer.md                    |     0
 docs/internal/src/codebase.md                 |    28 +
 docs/internal/src/components.md               |     8 +
 .../src}/contributing.md                      |     0
 docs/{src/developer => internal/src}/index.md |     2 +-
 .../developer => internal/src}/monitoring.md  |     2 +-
 .../developer => internal/src}/ntx-builder.md |     0
 .../developer => internal/src}/oddities.md    |     0
 docs/{src/developer => internal/src}/rpc.md   |     0
 docs/{src/developer => internal/src}/store.md |     0
 docs/src/EXPORTED.md                          |    12 -
 docs/src/SUMMARY.md                           |    37 -
 docs/src/developer/codebase.md                |    30 -
 docs/src/developer/components.md              |     8 -
 38 files changed, 19691 insertions(+), 109 deletions(-)
 create mode 100644 .github/workflows/trigger-deploy-docs.yml
 create mode 100644 docs/external/.gitignore
 create mode 100644 docs/external/docusaurus.config.ts
 create mode 100644 docs/external/package-lock.json
 create mode 100644 docs/external/package.json
 create mode 100644 docs/external/sidebars.ts
 create mode 100644 docs/external/src/_category_.json
 rename docs/{src/resources => external/src/img}/node_architecture.svg (100%)
 rename docs/{src/resources => external/src/img}/operator_architecture.svg (100%)
 rename docs/{src/resources => external/src/img}/workspace_tree.svg (100%)
 rename docs/{ => external}/src/index.md (97%)
 create mode 100644 docs/external/src/operator/_category_.json
 rename docs/{ => external}/src/operator/architecture.md (95%)
 rename docs/{ => external}/src/operator/index.md (100%)
 rename docs/{ => external}/src/operator/installation.md (87%)
 rename docs/{ => external}/src/operator/monitoring.md (95%)
 rename docs/{ => external}/src/operator/usage.md (97%)
 rename docs/{ => external}/src/operator/versioning.md (95%)
 rename docs/{src/user => external/src}/rpc.md (97%)
 create mode 100644 docs/external/tsconfig.json
 create mode 100644 docs/internal/.gitignore
 rename docs/{ => internal}/book.toml (82%)
 create mode 100644 docs/internal/src/SUMMARY.md
 rename docs/{src/developer => internal/src}/block-producer.md (100%)
 create mode 100644 docs/internal/src/codebase.md
 create mode 100644 docs/internal/src/components.md
 rename docs/{src/developer => internal/src}/contributing.md (100%)
 rename docs/{src/developer => internal/src}/index.md (92%)
 rename docs/{src/developer => internal/src}/monitoring.md (99%)
 rename docs/{src/developer => internal/src}/ntx-builder.md (100%)
 rename docs/{src/developer => internal/src}/oddities.md (100%)
 rename docs/{src/developer => internal/src}/rpc.md (100%)
 rename docs/{src/developer => internal/src}/store.md (100%)
 delete mode 100644 docs/src/EXPORTED.md
 delete mode 100644 docs/src/SUMMARY.md
 delete mode 100644 docs/src/developer/codebase.md
 delete mode 100644 docs/src/developer/components.md

diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml
index 1cdd372b4..f93d105e1 100644
--- a/.github/workflows/book.yml
+++ b/.github/workflows/book.yml
@@ -11,10 +11,10 @@ name: book
 on:
   workflow_dispatch:
   pull_request:
-    path: ['docs/**']
+    path: ["docs/internal/**"]
   push:
     branches: [next]
-    path: ['docs/**']
+    path: ["docs/internal/**"]
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
@@ -45,7 +45,7 @@ jobs:
           tool: mdbook, mdbook-linkcheck, mdbook-alerts, mdbook-katex
 
       - name: Build book
-        run: mdbook build docs/
+        run: mdbook build docs/internal/
 
       # Only Upload documentation if we want to deploy (i.e. push to next).
       - name: Setup Pages
@@ -58,7 +58,7 @@ jobs:
         uses: actions/upload-pages-artifact@v3
         with:
           # We specify multiple [output] sections in our book.toml which causes mdbook to create separate folders for each. This moves the generated `html` into its own `html` subdirectory.
-          path: ./docs/book/html
+          path: ./docs/internal/book/html
 
   # Deployment job only runs on push to next.
   deploy:
diff --git a/.github/workflows/trigger-deploy-docs.yml b/.github/workflows/trigger-deploy-docs.yml
new file mode 100644
index 000000000..d6b795817
--- /dev/null
+++ b/.github/workflows/trigger-deploy-docs.yml
@@ -0,0 +1,21 @@
+name: Trigger Aggregator Docs Rebuild
+
+on:
+  push:
+    branches: [next]
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+
+    steps:
+      - name: Send repository_dispatch to aggregator
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          # PAT that can access the central aggregator repository
+          token: ${{ secrets.DOCS_REPO_TOKEN }}
+          repository: ${{ vars.DOCS_AGGREGATOR_REPO }}
+          event-type: rebuild
diff --git a/docs/external/.gitignore b/docs/external/.gitignore
new file mode 100644
index 000000000..e4068b5b4
--- /dev/null
+++ b/docs/external/.gitignore
@@ -0,0 +1,3 @@
+.docusaurus/
+build/
+node_modules/
diff --git a/docs/external/docusaurus.config.ts b/docs/external/docusaurus.config.ts
new file mode 100644
index 000000000..ba607d361
--- /dev/null
+++ b/docs/external/docusaurus.config.ts
@@ -0,0 +1,31 @@
+import type { Config } from "@docusaurus/types";
+
+// If your content lives in docs/src, set DOCS_PATH='src'; else '.'
+const DOCS_PATH =
+  process.env.DOCS_PATH || (require("fs").existsSync("src") ? "src" : ".");
+
+const config: Config = {
+  title: "Docs Dev Preview",
+  url: "http://localhost:3000",
+  baseUrl: "/",
+  trailingSlash: false,
+
+  // Minimal classic preset: docs only, autogenerated sidebars, same math plugins as prod
+  presets: [
+    [
+      "classic",
+      {
+        docs: {
+          path: DOCS_PATH, // '../docs' is implied because we are already inside docs/
+          routeBasePath: "/", // mount docs at root for quick preview
+          sidebarPath: "./sidebars.ts",
+          remarkPlugins: [require("remark-math")],
+          rehypePlugins: [require("rehype-katex")],
+        },
+        blog: false,
+        pages: false,
+      },
+    ],
+  ],
+};
+export default config;
diff --git a/docs/external/package-lock.json b/docs/external/package-lock.json
new file mode 100644
index 000000000..2bedc86c6
--- /dev/null
+++ b/docs/external/package-lock.json
@@ -0,0 +1,19469 @@
+{
+  "name": "@miden/docs-dev",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@miden/docs-dev",
+      "devDependencies": {
+        "@docusaurus/core": "^3",
+        "@docusaurus/preset-classic": "^3",
+        "rehype-katex": "^7",
+        "remark-math": "^6"
+      }
+    },
+    "node_modules/@ai-sdk/gateway": {
+      "version": "1.0.30",
+      "resolved": "https://registry.npmjs.org/@ai-sdk/gateway/-/gateway-1.0.30.tgz",
+      "integrity": "sha512-QdrSUryr/CLcsCISokLHOImcHj1adGXk1yy4B3qipqLhcNc33Kj/O/3crI790Qp85oDx7sc4vm7R4raf9RA/kg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@ai-sdk/provider": "2.0.0",
+        "@ai-sdk/provider-utils": "3.0.10"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "zod": "^3.25.76 || ^4.1.8"
+      }
+    },
+    "node_modules/@ai-sdk/provider": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@ai-sdk/provider/-/provider-2.0.0.tgz",
+      "integrity": "sha512-6o7Y2SeO9vFKB8lArHXehNuusnpddKPk7xqL7T2/b+OvXMRIXUO1rR4wcv1hAFUAT9avGZshty3Wlua/XA7TvA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "json-schema": "^0.4.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@ai-sdk/provider-utils": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@ai-sdk/provider-utils/-/provider-utils-3.0.10.tgz",
+      "integrity": "sha512-T1gZ76gEIwffep6MWI0QNy9jgoybUHE7TRaHB5k54K8mF91ciGFlbtCGxDYhMH3nCRergKwYFIDeFF0hJSIQHQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@ai-sdk/provider": "2.0.0",
+        "@standard-schema/spec": "^1.0.0",
+        "eventsource-parser": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "zod": "^3.25.76 || ^4.1.8"
+      }
+    },
+    "node_modules/@ai-sdk/react": {
+      "version": "2.0.54",
+      "resolved": "https://registry.npmjs.org/@ai-sdk/react/-/react-2.0.54.tgz",
+      "integrity": "sha512-wbszephe+WR7y8DXwYN/SMr56pwU1N505/h3fOTz4NPHCW0sex6LzZ7DuhFR0J6ij3n3sLA11aEliFEa6B2FiA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@ai-sdk/provider-utils": "3.0.10",
+        "ai": "5.0.54",
+        "swr": "^2.2.5",
+        "throttleit": "2.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "react": "^18 || ^19 || ^19.0.0-rc",
+        "zod": "^3.25.76 || ^4.1.8"
+      },
+      "peerDependenciesMeta": {
+        "zod": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@algolia/abtesting": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@algolia/abtesting/-/abtesting-1.4.0.tgz",
+      "integrity": "sha512-N0blWT/C0KOZ/OJ9GXBX66odJZlrYjMj3M+01y8ob1mjBFnBaBo7gOCyHBDQy60+H4pJXp3pSGlJOqJIueBH+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.38.0",
+        "@algolia/requester-browser-xhr": "5.38.0",
+        "@algolia/requester-fetch": "5.38.0",
+        "@algolia/requester-node-http": "5.38.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/autocomplete-core": {
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.19.2.tgz",
+      "integrity": "sha512-mKv7RyuAzXvwmq+0XRK8HqZXt9iZ5Kkm2huLjgn5JoCPtDy+oh9yxUMfDDaVCw0oyzZ1isdJBc7l9nuCyyR7Nw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/autocomplete-plugin-algolia-insights": "1.19.2",
+        "@algolia/autocomplete-shared": "1.19.2"
+      }
+    },
+    "node_modules/@algolia/autocomplete-plugin-algolia-insights": {
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.19.2.tgz",
+      "integrity": "sha512-TjxbcC/r4vwmnZaPwrHtkXNeqvlpdyR+oR9Wi2XyfORkiGkLTVhX2j+O9SaCCINbKoDfc+c2PB8NjfOnz7+oKg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/autocomplete-shared": "1.19.2"
+      },
+      "peerDependencies": {
+        "search-insights": ">= 1 < 3"
+      }
+    },
+    "node_modules/@algolia/autocomplete-shared": {
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.19.2.tgz",
+      "integrity": "sha512-jEazxZTVD2nLrC+wYlVHQgpBoBB5KPStrJxLzsIFl6Kqd1AlG9sIAGl39V5tECLpIQzB3Qa2T6ZPJ1ChkwMK/w==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@algolia/client-search": ">= 4.9.1 < 6",
+        "algoliasearch": ">= 4.9.1 < 6"
+      }
+    },
+    "node_modules/@algolia/client-abtesting": {
+      "version": "5.38.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-abtesting/-/client-abtesting-5.38.0.tgz",
+      "integrity": "sha512-15d6zv8vtj2l9pnnp/EH7Rhq3/snCCHRz56NnX6xIUPrbJl5gCsIYXAz8C2IEkwOpoDb0r5G6ArY2gKdVMNezw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.38.0",
+        "@algolia/requester-browser-xhr": "5.38.0",
+        "@algolia/requester-fetch": "5.38.0",
+        "@algolia/requester-node-http": "5.38.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/client-analytics": {
+      "version": "5.38.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-5.38.0.tgz",
+      "integrity": "sha512-jJIbYAhYvTG3+gEAP5Q5Dp6PFJfUR+atz5rsqm5KjAKK+faLFdHJbM2IbOo0xdyGd+SH259MzfQKLJ9mZZ27dQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.38.0",
+        "@algolia/requester-browser-xhr": "5.38.0",
+        "@algolia/requester-fetch": "5.38.0",
+        "@algolia/requester-node-http": "5.38.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/client-common": {
+      "version": "5.38.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-5.38.0.tgz",
+      "integrity": "sha512-aMCXzVPGJTeQnVU3Sdf30TfMN2+QyWcjfPTCCHyqVVgjPipb6RnK40aISGoO+rlYjh9LunDsNVFLwv+JEIF8bQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/client-insights": {
+      "version": "5.38.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-insights/-/client-insights-5.38.0.tgz",
+      "integrity": "sha512-4c3FbpMiJX+VcaAj0rYaQdTLS/CkrdOn4hW+5y1plPov7KC7iSHai/VBbirmHuAfW1hVPCIh1w/4erKKTKuo+Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.38.0",
+        "@algolia/requester-browser-xhr": "5.38.0",
+        "@algolia/requester-fetch": "5.38.0",
+        "@algolia/requester-node-http": "5.38.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/client-personalization": {
+      "version": "5.38.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-5.38.0.tgz",
+      "integrity": "sha512-FzLs6c8TBL4FSgNfnH2NL7O33ktecGiaKO4ZFG51QYORUzD5d6YwB9UBteaIYu/sgFoEdY57diYU4vyBH8R6iA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.38.0",
+        "@algolia/requester-browser-xhr": "5.38.0",
+        "@algolia/requester-fetch": "5.38.0",
+        "@algolia/requester-node-http": "5.38.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/client-query-suggestions": {
+      "version": "5.38.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-query-suggestions/-/client-query-suggestions-5.38.0.tgz",
+      "integrity": "sha512-7apiahlgZLvOqrh0+hAYAp/UWjqz6AfSJrCwnsoQNzgIT09dLSPIKREelkuQeUrKy38vHWWpSQE3M0zWSp/YrA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.38.0",
+        "@algolia/requester-browser-xhr": "5.38.0",
+        "@algolia/requester-fetch": "5.38.0",
+        "@algolia/requester-node-http": "5.38.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/client-search": {
+      "version": "5.38.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-5.38.0.tgz",
+      "integrity": "sha512-PTAFMJOpVtJweExEYYgdmSCC6n4V/R+ctDL3fRQy77ulZM/p+zMLIQC9c7HCQE1zqpauvVck3f2zYSejaUTtrw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.38.0",
+        "@algolia/requester-browser-xhr": "5.38.0",
+        "@algolia/requester-fetch": "5.38.0",
+        "@algolia/requester-node-http": "5.38.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/events": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@algolia/events/-/events-4.0.1.tgz",
+      "integrity": "sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@algolia/ingestion": {
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/@algolia/ingestion/-/ingestion-1.38.0.tgz",
+      "integrity": "sha512-qGSUGgceJHGyJLZ06bFLwVe2Tpf9KwabmoBjFvFscVmMmU5scKya6voCYd9bdX7V0Xy1qya9MGbmTm4zlLuveQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.38.0",
+        "@algolia/requester-browser-xhr": "5.38.0",
+        "@algolia/requester-fetch": "5.38.0",
+        "@algolia/requester-node-http": "5.38.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/monitoring": {
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/@algolia/monitoring/-/monitoring-1.38.0.tgz",
+      "integrity": "sha512-VnCtAUcHirvv/dDHg9jK1Z5oo4QOC5FKDxe40x8qloru2qDcjueT34jiAsB0gRos3VWf9v4iPSYTqMIFOcADpQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.38.0",
+        "@algolia/requester-browser-xhr": "5.38.0",
+        "@algolia/requester-fetch": "5.38.0",
+        "@algolia/requester-node-http": "5.38.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/recommend": {
+      "version": "5.38.0",
+      "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-5.38.0.tgz",
+      "integrity": "sha512-fqgeU9GqxQorFUeGP4et1MyY28ccf9PCeciHwDPSbPYYiTqBItHdUIiytsNpjC5Dnc0RWtuXWCltLwSw9wN/bQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.38.0",
+        "@algolia/requester-browser-xhr": "5.38.0",
+        "@algolia/requester-fetch": "5.38.0",
+        "@algolia/requester-node-http": "5.38.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/requester-browser-xhr": {
+      "version": "5.38.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.38.0.tgz",
+      "integrity": "sha512-nAUKbv4YQIXbpPi02AQvSPisD5FDDbT8XeYSh9HFoYP0Z3IpBLLDg7R4ahPvzd7gGsVKgEbXzRPWESXSji5yIg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.38.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/requester-fetch": {
+      "version": "5.38.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-fetch/-/requester-fetch-5.38.0.tgz",
+      "integrity": "sha512-bkuAHaadC6OxJd3SVyQQnU1oJ9G/zdCqua7fwr1tJDrA/v7KzeS5np4/m6BuRUpTgVgFZHSewGnMcgj9DLBoaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.38.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/requester-node-http": {
+      "version": "5.38.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-5.38.0.tgz",
+      "integrity": "sha512-yHDKZTnMPR3/4bY0CVC1/uRnnbAaJ+pctRuX7G/HflBkKOrnUBDEGtQQHzEfMz2FHZ/tbCL+Q9r6mvwTSGp8nw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.38.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.4.tgz",
+      "integrity": "sha512-YsmSKC29MJwf0gF8Rjjrg5LQCmyh+j/nD8/eP7f+BeoQTKYqs9RoWbjGOdy0+1Ekr68RJZMUOPVQaQisnIo4Rw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.4.tgz",
+      "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.3",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-module-transforms": "^7.28.3",
+        "@babel/helpers": "^7.28.4",
+        "@babel/parser": "^7.28.4",
+        "@babel/template": "^7.27.2",
+        "@babel/traverse": "^7.28.4",
+        "@babel/types": "^7.28.4",
+        "@jridgewell/remapping": "^2.3.5",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/core/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz",
+      "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.28.3",
+        "@babel/types": "^7.28.2",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
+        "jsesc": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
+      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.27.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
+      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.27.2",
+        "@babel/helper-validator-option": "^7.27.1",
+        "browserslist": "^4.24.0",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-create-class-features-plugin": {
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.3.tgz",
+      "integrity": "sha512-V9f6ZFIYSLNEbuGA/92uOvYsGCJNsuA8ESZ4ldc09bWk/j8H8TKiPw8Mk1eG6olpnO0ALHJmYfZvF4MEE4gajg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-member-expression-to-functions": "^7.27.1",
+        "@babel/helper-optimise-call-expression": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/traverse": "^7.28.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.27.1.tgz",
+      "integrity": "sha512-uVDC72XVf8UbrH5qQTc18Agb8emwjTiZrQE11Nv3CuBEZmVvTwwE9CBUEvHku06gQCAyYf8Nv6ja1IN+6LMbxQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "regexpu-core": "^6.2.0",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.5.tgz",
+      "integrity": "sha512-uJnGFcPsWQK8fvjgGP5LZUZZsYGIoPeRjSF5PGwrelYgq7Q15/Ft9NGFp1zglwgIv//W0uG4BevRuSJRyylZPg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "debug": "^4.4.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.22.10"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@babel/helper-globals": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-member-expression-to-functions": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.27.1.tgz",
+      "integrity": "sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
+      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
+      "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/traverse": "^7.28.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz",
+      "integrity": "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
+      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.27.1.tgz",
+      "integrity": "sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-wrap-function": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.27.1.tgz",
+      "integrity": "sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-member-expression-to-functions": "^7.27.1",
+        "@babel/helper-optimise-call-expression": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz",
+      "integrity": "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.28.3.tgz",
+      "integrity": "sha512-zdf983tNfLZFletc0RRXYrHrucBEg95NIFMkn6K9dbeMYnsgHaSBGcQqdsCSStG2PYwRre0Qc2NNSCXbG+xc6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.27.2",
+        "@babel/traverse": "^7.28.3",
+        "@babel/types": "^7.28.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
+      "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz",
+      "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.28.4"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz",
+      "integrity": "sha512-QPG3C9cCVRQLxAVwmefEmwdTanECuUBMQZ/ym5kiw3XKCGA7qkuQLcjWWHcrD/GKbn/WmJwaezfuuAOcyKlRPA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.27.1.tgz",
+      "integrity": "sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.27.1.tgz",
+      "integrity": "sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz",
+      "integrity": "sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/plugin-transform-optional-chaining": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.13.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.28.3.tgz",
+      "integrity": "sha512-b6YTX108evsvE4YgWyQ921ZAFFQm3Bn+CA3+ZXlNVnPhx+UfsVURoPjfGAPCjBgrqo30yX/C2nZGX96DxvR9Iw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.28.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-assertions": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.27.1.tgz",
+      "integrity": "sha512-UT/Jrhw57xg4ILHLFnzFpPDlMbcdEicaAtjPQpbj9wa8T4r5KVWCimHcL/460g8Ht0DMxDyjsLgiWSkVjnwPFg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
+      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
+      "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
+      "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz",
+      "integrity": "sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-generator-functions": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.28.0.tgz",
+      "integrity": "sha512-BEOdvX4+M765icNPZeidyADIvQ1m1gmunXufXxvRESy/jNNyfovIqUyE7MVgGBjWktCoJlzvFA1To2O4ymIO3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-remap-async-to-generator": "^7.27.1",
+        "@babel/traverse": "^7.28.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.27.1.tgz",
+      "integrity": "sha512-NREkZsZVJS4xmTr8qzE5y8AfIPqsdQfRuUiLRTEzb7Qii8iFWCyDKaUV2c0rCuh4ljDZ98ALHP/PetiBV2nddA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-remap-async-to-generator": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.27.1.tgz",
+      "integrity": "sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.4.tgz",
+      "integrity": "sha512-1yxmvN0MJHOhPVmAsmoW5liWwoILobu/d/ShymZmj867bAdxGbehIrew1DuLpw2Ukv+qDSSPQdYW1dLNE7t11A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-class-properties": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.27.1.tgz",
+      "integrity": "sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-class-static-block": {
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.3.tgz",
+      "integrity": "sha512-LtPXlBbRoc4Njl/oh1CeD/3jC+atytbnf/UqLoqTDcEYGUPj022+rvfkbDYieUrSj3CaV4yHDByPE+T2HwfsJg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.28.3",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.4.tgz",
+      "integrity": "sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.27.1",
+        "@babel/traverse": "^7.28.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.27.1.tgz",
+      "integrity": "sha512-lj9PGWvMTVksbWiDT2tW68zGS/cyo4AkZ/QTp0sQT0mjPopCmrSkzxeXkznjqBxzDI6TclZhOJbBmbBLjuOZUw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/template": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.0.tgz",
+      "integrity": "sha512-v1nrSMBiKcodhsyJ4Gf+Z0U/yawmJDBOTpEB3mcQY52r9RIyPneGyAS/yM6seP/8I+mWI3elOMtT5dB8GJVs+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.28.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.27.1.tgz",
+      "integrity": "sha512-gEbkDVGRvjj7+T1ivxrfgygpT7GUd4vmODtYpbs0gZATdkX8/iSnOtZSxiZnsgm1YjTgjI6VKBGSJJevkrclzw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.27.1.tgz",
+      "integrity": "sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.27.1.tgz",
+      "integrity": "sha512-hkGcueTEzuhB30B3eJCbCYeCaaEQOmQR0AdvzpD4LoN0GXMWzzGSuRrxR2xTnCrvNbVwK9N6/jQ92GSLfiZWoQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dynamic-import": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.27.1.tgz",
+      "integrity": "sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-explicit-resource-management": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.28.0.tgz",
+      "integrity": "sha512-K8nhUcn3f6iB+P3gwCv/no7OdzOZQcKchW6N389V6PD8NUWKZHzndOd9sPDVbMoBsbmjMqlB4L9fm+fEFNVlwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-transform-destructuring": "^7.28.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.27.1.tgz",
+      "integrity": "sha512-uspvXnhHvGKf2r4VVtBpeFnuDWsJLQ6MF6lGJLC89jBR1uoVeqM416AZtTuhTezOfgHicpJQmoD5YUakO/YmXQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-export-namespace-from": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.27.1.tgz",
+      "integrity": "sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.27.1.tgz",
+      "integrity": "sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-function-name": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.27.1.tgz",
+      "integrity": "sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-json-strings": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.27.1.tgz",
+      "integrity": "sha512-6WVLVJiTjqcQauBhn1LkICsR2H+zm62I3h9faTDKt1qP4jn2o72tSvqMwtGFKGTpojce0gJs+76eZ2uCHRZh0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-literals": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.27.1.tgz",
+      "integrity": "sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.27.1.tgz",
+      "integrity": "sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.27.1.tgz",
+      "integrity": "sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.27.1.tgz",
+      "integrity": "sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz",
+      "integrity": "sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.27.1.tgz",
+      "integrity": "sha512-w5N1XzsRbc0PQStASMksmUeqECuzKuTJer7kFagK8AXgpCMkeDMO5S+aaFb7A51ZYDF7XI34qsTX+fkHiIm5yA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-umd": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.27.1.tgz",
+      "integrity": "sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.27.1.tgz",
+      "integrity": "sha512-SstR5JYy8ddZvD6MhV0tM/j16Qds4mIpJTOd1Yu9J9pJjH93bxHECF7pgtc28XvkzTD6Pxcm/0Z73Hvk7kb3Ng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-new-target": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.27.1.tgz",
+      "integrity": "sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.27.1.tgz",
+      "integrity": "sha512-aGZh6xMo6q9vq1JGcw58lZ1Z0+i0xB2x0XaauNIUXd6O1xXc3RwoWEBlsTQrY4KQ9Jf0s5rgD6SiNkaUdJegTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-numeric-separator": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.27.1.tgz",
+      "integrity": "sha512-fdPKAcujuvEChxDBJ5c+0BTaS6revLV7CJL08e4m3de8qJfNIuCc2nc7XJYOjBoTMJeqSmwXJ0ypE14RCjLwaw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-rest-spread": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.4.tgz",
+      "integrity": "sha512-373KA2HQzKhQCYiRVIRr+3MjpCObqzDlyrM6u4I201wL8Mp2wHf7uB8GhDwis03k2ti8Zr65Zyyqs1xOxUF/Ew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-transform-destructuring": "^7.28.0",
+        "@babel/plugin-transform-parameters": "^7.27.7",
+        "@babel/traverse": "^7.28.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-super": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.27.1.tgz",
+      "integrity": "sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.27.1.tgz",
+      "integrity": "sha512-txEAEKzYrHEX4xSZN4kJ+OfKXFVSWKB2ZxM9dpcE3wT7smwkNmXo5ORRlVzMVdJbD+Q8ILTgSD7959uj+3Dm3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-chaining": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz",
+      "integrity": "sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.27.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.7.tgz",
+      "integrity": "sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-methods": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.27.1.tgz",
+      "integrity": "sha512-10FVt+X55AjRAYI9BrdISN9/AQWHqldOeZDUoLyif1Kn05a56xVBXb8ZouL8pZ9jem8QpXaOt8TS7RHUIS+GPA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-property-in-object": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.27.1.tgz",
+      "integrity": "sha512-5J+IhqTi1XPa0DXF83jYOaARrX+41gOewWbkPyjMNRDqgOCqdffGh8L3f/Ek5utaEBZExjSAzcyjmV9SSAWObQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-property-literals": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.27.1.tgz",
+      "integrity": "sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-constant-elements": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.27.1.tgz",
+      "integrity": "sha512-edoidOjl/ZxvYo4lSBOQGDSyToYVkTAwyVoa2tkuYTSmjrB1+uAedoL5iROVLXkxH+vRgA7uP4tMg2pUJpZ3Ug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-display-name": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.28.0.tgz",
+      "integrity": "sha512-D6Eujc2zMxKjfa4Zxl4GHMsmhKKZ9VpcqIchJLvwTxad9zWIYulwYItBovpDOoNLISpcZSXoDJ5gaGbQUDqViA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-jsx": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz",
+      "integrity": "sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-syntax-jsx": "^7.27.1",
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-jsx-development": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.27.1.tgz",
+      "integrity": "sha512-ykDdF5yI4f1WrAolLqeF3hmYU12j9ntLQl/AOG1HAS21jxyg1Q0/J/tpREuYLfatGdGmXp/3yS0ZA76kOlVq9Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/plugin-transform-react-jsx": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-pure-annotations": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.27.1.tgz",
+      "integrity": "sha512-JfuinvDOsD9FVMTHpzA/pBLisxpv1aSf+OIV8lgH3MuWrks19R27e6a6DipIg4aX1Zm9Wpb04p8wljfKrVSnPA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.4.tgz",
+      "integrity": "sha512-+ZEdQlBoRg9m2NnzvEeLgtvBMO4tkFBw5SQIUgLICgTrumLoU7lr+Oghi6km2PFj+dbUt2u1oby2w3BDO9YQnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-regexp-modifiers": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.27.1.tgz",
+      "integrity": "sha512-TtEciroaiODtXvLZv4rmfMhkCv8jx3wgKpL68PuiPh2M4fvz5jhsA7697N1gMvkvr/JTF13DrFYyEbY9U7cVPA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.27.1.tgz",
+      "integrity": "sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-runtime": {
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.28.3.tgz",
+      "integrity": "sha512-Y6ab1kGqZ0u42Zv/4a7l0l72n9DKP/MKoKWaUSBylrhNZO2prYuqFOLbn5aW5SIFXwSH93yfjbgllL8lxuGKLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "babel-plugin-polyfill-corejs2": "^0.4.14",
+        "babel-plugin-polyfill-corejs3": "^0.13.0",
+        "babel-plugin-polyfill-regenerator": "^0.6.5",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.27.1.tgz",
+      "integrity": "sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.27.1.tgz",
+      "integrity": "sha512-kpb3HUqaILBJcRFVhFUs6Trdd4mkrzcGXss+6/mxUd273PfbWqSDHRzMT2234gIg2QYfAjvXLSquP1xECSg09Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-sticky-regex": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.27.1.tgz",
+      "integrity": "sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-template-literals": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.27.1.tgz",
+      "integrity": "sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.1.tgz",
+      "integrity": "sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-typescript": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.28.0.tgz",
+      "integrity": "sha512-4AEiDEBPIZvLQaWlc9liCavE0xRM0dNca41WtBeM3jgFptfUOSG9z0uteLhq6+3rq+WB6jIvUwKDTpXEHPJ2Vg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/plugin-syntax-typescript": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-escapes": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.27.1.tgz",
+      "integrity": "sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-property-regex": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.27.1.tgz",
+      "integrity": "sha512-uW20S39PnaTImxp39O5qFlHLS9LJEmANjMG7SxIhap8rCHqu0Ik+tLEPX5DKmHn6CsWQ7j3lix2tFOa5YtL12Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-regex": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.27.1.tgz",
+      "integrity": "sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.27.1.tgz",
+      "integrity": "sha512-EtkOujbc4cgvb0mlpQefi4NTPBzhSIevblFevACNLUspmrALgmEBdL/XfnyyITfd8fKBZrZys92zOWcik7j9Tw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/preset-env": {
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.28.3.tgz",
+      "integrity": "sha512-ROiDcM+GbYVPYBOeCR6uBXKkQpBExLl8k9HO1ygXEyds39j+vCCsjmj7S8GOniZQlEs81QlkdJZe76IpLSiqpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.28.0",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.27.1",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.28.3",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
+        "@babel/plugin-syntax-import-assertions": "^7.27.1",
+        "@babel/plugin-syntax-import-attributes": "^7.27.1",
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.27.1",
+        "@babel/plugin-transform-async-generator-functions": "^7.28.0",
+        "@babel/plugin-transform-async-to-generator": "^7.27.1",
+        "@babel/plugin-transform-block-scoped-functions": "^7.27.1",
+        "@babel/plugin-transform-block-scoping": "^7.28.0",
+        "@babel/plugin-transform-class-properties": "^7.27.1",
+        "@babel/plugin-transform-class-static-block": "^7.28.3",
+        "@babel/plugin-transform-classes": "^7.28.3",
+        "@babel/plugin-transform-computed-properties": "^7.27.1",
+        "@babel/plugin-transform-destructuring": "^7.28.0",
+        "@babel/plugin-transform-dotall-regex": "^7.27.1",
+        "@babel/plugin-transform-duplicate-keys": "^7.27.1",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.27.1",
+        "@babel/plugin-transform-dynamic-import": "^7.27.1",
+        "@babel/plugin-transform-explicit-resource-management": "^7.28.0",
+        "@babel/plugin-transform-exponentiation-operator": "^7.27.1",
+        "@babel/plugin-transform-export-namespace-from": "^7.27.1",
+        "@babel/plugin-transform-for-of": "^7.27.1",
+        "@babel/plugin-transform-function-name": "^7.27.1",
+        "@babel/plugin-transform-json-strings": "^7.27.1",
+        "@babel/plugin-transform-literals": "^7.27.1",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.27.1",
+        "@babel/plugin-transform-member-expression-literals": "^7.27.1",
+        "@babel/plugin-transform-modules-amd": "^7.27.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.27.1",
+        "@babel/plugin-transform-modules-systemjs": "^7.27.1",
+        "@babel/plugin-transform-modules-umd": "^7.27.1",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.27.1",
+        "@babel/plugin-transform-new-target": "^7.27.1",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.27.1",
+        "@babel/plugin-transform-numeric-separator": "^7.27.1",
+        "@babel/plugin-transform-object-rest-spread": "^7.28.0",
+        "@babel/plugin-transform-object-super": "^7.27.1",
+        "@babel/plugin-transform-optional-catch-binding": "^7.27.1",
+        "@babel/plugin-transform-optional-chaining": "^7.27.1",
+        "@babel/plugin-transform-parameters": "^7.27.7",
+        "@babel/plugin-transform-private-methods": "^7.27.1",
+        "@babel/plugin-transform-private-property-in-object": "^7.27.1",
+        "@babel/plugin-transform-property-literals": "^7.27.1",
+        "@babel/plugin-transform-regenerator": "^7.28.3",
+        "@babel/plugin-transform-regexp-modifiers": "^7.27.1",
+        "@babel/plugin-transform-reserved-words": "^7.27.1",
+        "@babel/plugin-transform-shorthand-properties": "^7.27.1",
+        "@babel/plugin-transform-spread": "^7.27.1",
+        "@babel/plugin-transform-sticky-regex": "^7.27.1",
+        "@babel/plugin-transform-template-literals": "^7.27.1",
+        "@babel/plugin-transform-typeof-symbol": "^7.27.1",
+        "@babel/plugin-transform-unicode-escapes": "^7.27.1",
+        "@babel/plugin-transform-unicode-property-regex": "^7.27.1",
+        "@babel/plugin-transform-unicode-regex": "^7.27.1",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.27.1",
+        "@babel/preset-modules": "0.1.6-no-external-plugins",
+        "babel-plugin-polyfill-corejs2": "^0.4.14",
+        "babel-plugin-polyfill-corejs3": "^0.13.0",
+        "babel-plugin-polyfill-regenerator": "^0.6.5",
+        "core-js-compat": "^3.43.0",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/preset-modules": {
+      "version": "0.1.6-no-external-plugins",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/@babel/preset-react": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.27.1.tgz",
+      "integrity": "sha512-oJHWh2gLhU9dW9HHr42q0cI0/iHHXTLGe39qvpAZZzagHy0MzYLCnCVV0symeRvzmjHyVU7mw2K06E6u/JwbhA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/plugin-transform-react-display-name": "^7.27.1",
+        "@babel/plugin-transform-react-jsx": "^7.27.1",
+        "@babel/plugin-transform-react-jsx-development": "^7.27.1",
+        "@babel/plugin-transform-react-pure-annotations": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-typescript": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.27.1.tgz",
+      "integrity": "sha512-l7WfQfX0WK4M0v2RudjuQK4u99BS6yLHYEmdtVPP7lKV013zr9DygFuWNlnbvQ9LR+LS0Egz/XAvGx5U9MX0fQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/plugin-syntax-jsx": "^7.27.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.27.1",
+        "@babel/plugin-transform-typescript": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
+      "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/runtime-corejs3": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.28.4.tgz",
+      "integrity": "sha512-h7iEYiW4HebClDEhtvFObtPmIvrd1SSfpI9EhOeKk4CtIK/ngBWFpuhCzhdmRKtg71ylcue+9I6dv54XYO1epQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "core-js-pure": "^3.43.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@babel/parser": "^7.27.2",
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz",
+      "integrity": "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.3",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/parser": "^7.28.4",
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.4",
+        "debug": "^4.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz",
+      "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@colors/colors": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/@csstools/cascade-layer-name-parser": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-2.0.5.tgz",
+      "integrity": "sha512-p1ko5eHgV+MgXFVa4STPKpvPxr6ReS8oS2jzTukjR74i5zJNyWO1ZM1m8YKBXnzDKWfBN1ztLYlHxbVemDD88A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/color-helpers": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
+      "integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@csstools/css-calc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz",
+      "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/css-color-parser": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz",
+      "integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/color-helpers": "^5.1.0",
+        "@csstools/css-calc": "^2.1.4"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/css-parser-algorithms": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
+      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/css-tokenizer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
+      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@csstools/media-query-list-parser": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.3.tgz",
+      "integrity": "sha512-HAYH7d3TLRHDOUQK4mZKf9k9Ph/m8Akstg66ywKR4SFAigjs3yBiUeZtFxywiTm5moZMAp/5W/ZuFnNXXYLuuQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/postcss-alpha-function": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-alpha-function/-/postcss-alpha-function-1.0.1.tgz",
+      "integrity": "sha512-isfLLwksH3yHkFXfCI2Gcaqg7wGGHZZwunoJzEZk0yKYIokgre6hYVFibKL3SYAoR1kBXova8LB+JoO5vZzi9w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-color-parser": "^3.1.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-cascade-layers": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-5.0.2.tgz",
+      "integrity": "sha512-nWBE08nhO8uWl6kSAeCx4im7QfVko3zLrtgWZY4/bP87zrSPpSyN/3W3TDqz1jJuH+kbKOHXg5rJnK+ZVYcFFg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/selector-specificity": "^5.0.0",
+        "postcss-selector-parser": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-cascade-layers/node_modules/@csstools/selector-specificity": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz",
+      "integrity": "sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      }
+    },
+    "node_modules/@csstools/postcss-cascade-layers/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@csstools/postcss-color-function": {
+      "version": "4.0.12",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-4.0.12.tgz",
+      "integrity": "sha512-yx3cljQKRaSBc2hfh8rMZFZzChaFgwmO2JfFgFr1vMcF3C/uyy5I4RFIBOIWGq1D+XbKCG789CGkG6zzkLpagA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-color-parser": "^3.1.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-color-function-display-p3-linear": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function-display-p3-linear/-/postcss-color-function-display-p3-linear-1.0.1.tgz",
+      "integrity": "sha512-E5qusdzhlmO1TztYzDIi8XPdPoYOjoTY6HBYBCYSj+Gn4gQRBlvjgPQXzfzuPQqt8EhkC/SzPKObg4Mbn8/xMg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-color-parser": "^3.1.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-color-mix-function": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-3.0.12.tgz",
+      "integrity": "sha512-4STERZfCP5Jcs13P1U5pTvI9SkgLgfMUMhdXW8IlJWkzOOOqhZIjcNhWtNJZes2nkBDsIKJ0CJtFtuaZ00moag==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-color-parser": "^3.1.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-color-mix-variadic-function-arguments": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-mix-variadic-function-arguments/-/postcss-color-mix-variadic-function-arguments-1.0.2.tgz",
+      "integrity": "sha512-rM67Gp9lRAkTo+X31DUqMEq+iK+EFqsidfecmhrteErxJZb6tUoJBVQca1Vn1GpDql1s1rD1pKcuYzMsg7Z1KQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-color-parser": "^3.1.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-content-alt-text": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-content-alt-text/-/postcss-content-alt-text-2.0.8.tgz",
+      "integrity": "sha512-9SfEW9QCxEpTlNMnpSqFaHyzsiRpZ5J5+KqCu1u5/eEJAWsMhzT40qf0FIbeeglEvrGRMdDzAxMIz3wqoGSb+Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-contrast-color-function": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-contrast-color-function/-/postcss-contrast-color-function-2.0.12.tgz",
+      "integrity": "sha512-YbwWckjK3qwKjeYz/CijgcS7WDUCtKTd8ShLztm3/i5dhh4NaqzsbYnhm4bjrpFpnLZ31jVcbK8YL77z3GBPzA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-color-parser": "^3.1.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-exponential-functions": {
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-2.0.9.tgz",
+      "integrity": "sha512-abg2W/PI3HXwS/CZshSa79kNWNZHdJPMBXeZNyPQFbbj8sKO3jXxOt/wF7juJVjyDTc6JrvaUZYFcSBZBhaxjw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-calc": "^2.1.4",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-font-format-keywords": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-4.0.0.tgz",
+      "integrity": "sha512-usBzw9aCRDvchpok6C+4TXC57btc4bJtmKQWOHQxOVKen1ZfVqBUuCZ/wuqdX5GHsD0NRSr9XTP+5ID1ZZQBXw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/utilities": "^2.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-gamut-mapping": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-gamut-mapping/-/postcss-gamut-mapping-2.0.11.tgz",
+      "integrity": "sha512-fCpCUgZNE2piVJKC76zFsgVW1apF6dpYsqGyH8SIeCcM4pTEsRTWTLCaJIMKFEundsCKwY1rwfhtrio04RJ4Dw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-color-parser": "^3.1.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-gradients-interpolation-method": {
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-5.0.12.tgz",
+      "integrity": "sha512-jugzjwkUY0wtNrZlFeyXzimUL3hN4xMvoPnIXxoZqxDvjZRiSh+itgHcVUWzJ2VwD/VAMEgCLvtaJHX+4Vj3Ow==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-color-parser": "^3.1.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-hwb-function": {
+      "version": "4.0.12",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-4.0.12.tgz",
+      "integrity": "sha512-mL/+88Z53KrE4JdePYFJAQWFrcADEqsLprExCM04GDNgHIztwFzj0Mbhd/yxMBngq0NIlz58VVxjt5abNs1VhA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-color-parser": "^3.1.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-ic-unit": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-4.0.4.tgz",
+      "integrity": "sha512-yQ4VmossuOAql65sCPppVO1yfb7hDscf4GseF0VCA/DTDaBc0Wtf8MTqVPfjGYlT5+2buokG0Gp7y0atYZpwjg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-initial": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-initial/-/postcss-initial-2.0.1.tgz",
+      "integrity": "sha512-L1wLVMSAZ4wovznquK0xmC7QSctzO4D0Is590bxpGqhqjboLXYA16dWZpfwImkdOgACdQ9PqXsuRroW6qPlEsg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-is-pseudo-class": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-5.0.3.tgz",
+      "integrity": "sha512-jS/TY4SpG4gszAtIg7Qnf3AS2pjcUM5SzxpApOrlndMeGhIbaTzWBzzP/IApXoNWEW7OhcjkRT48jnAUIFXhAQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/selector-specificity": "^5.0.0",
+        "postcss-selector-parser": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-is-pseudo-class/node_modules/@csstools/selector-specificity": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz",
+      "integrity": "sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      }
+    },
+    "node_modules/@csstools/postcss-is-pseudo-class/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@csstools/postcss-light-dark-function": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-light-dark-function/-/postcss-light-dark-function-2.0.11.tgz",
+      "integrity": "sha512-fNJcKXJdPM3Lyrbmgw2OBbaioU7yuKZtiXClf4sGdQttitijYlZMD5K7HrC/eF83VRWRrYq6OZ0Lx92leV2LFA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-logical-float-and-clear": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-logical-float-and-clear/-/postcss-logical-float-and-clear-3.0.0.tgz",
+      "integrity": "sha512-SEmaHMszwakI2rqKRJgE+8rpotFfne1ZS6bZqBoQIicFyV+xT1UF42eORPxJkVJVrH9C0ctUgwMSn3BLOIZldQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-logical-overflow": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-logical-overflow/-/postcss-logical-overflow-2.0.0.tgz",
+      "integrity": "sha512-spzR1MInxPuXKEX2csMamshR4LRaSZ3UXVaRGjeQxl70ySxOhMpP2252RAFsg8QyyBXBzuVOOdx1+bVO5bPIzA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-logical-overscroll-behavior": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-logical-overscroll-behavior/-/postcss-logical-overscroll-behavior-2.0.0.tgz",
+      "integrity": "sha512-e/webMjoGOSYfqLunyzByZj5KKe5oyVg/YSbie99VEaSDE2kimFm0q1f6t/6Jo+VVCQ/jbe2Xy+uX+C4xzWs4w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-logical-resize": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-logical-resize/-/postcss-logical-resize-3.0.0.tgz",
+      "integrity": "sha512-DFbHQOFW/+I+MY4Ycd/QN6Dg4Hcbb50elIJCfnwkRTCX05G11SwViI5BbBlg9iHRl4ytB7pmY5ieAFk3ws7yyg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-logical-viewport-units": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-3.0.4.tgz",
+      "integrity": "sha512-q+eHV1haXA4w9xBwZLKjVKAWn3W2CMqmpNpZUk5kRprvSiBEGMgrNH3/sJZ8UA3JgyHaOt3jwT9uFa4wLX4EqQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-media-minmax": {
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-media-minmax/-/postcss-media-minmax-2.0.9.tgz",
+      "integrity": "sha512-af9Qw3uS3JhYLnCbqtZ9crTvvkR+0Se+bBqSr7ykAnl9yKhk6895z9rf+2F4dClIDJWxgn0iZZ1PSdkhrbs2ig==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/css-calc": "^2.1.4",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/media-query-list-parser": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-media-queries-aspect-ratio-number-values": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-3.0.5.tgz",
+      "integrity": "sha512-zhAe31xaaXOY2Px8IYfoVTB3wglbJUVigGphFLj6exb7cjZRH9A6adyE22XfFK3P2PzwRk0VDeTJmaxpluyrDg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/media-query-list-parser": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-nested-calc": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-4.0.0.tgz",
+      "integrity": "sha512-jMYDdqrQQxE7k9+KjstC3NbsmC063n1FTPLCgCRS2/qHUbHM0mNy9pIn4QIiQGs9I/Bg98vMqw7mJXBxa0N88A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/utilities": "^2.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-normalize-display-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.0.tgz",
+      "integrity": "sha512-HlEoG0IDRoHXzXnkV4in47dzsxdsjdz6+j7MLjaACABX2NfvjFS6XVAnpaDyGesz9gK2SC7MbNwdCHusObKJ9Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-oklab-function": {
+      "version": "4.0.12",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-4.0.12.tgz",
+      "integrity": "sha512-HhlSmnE1NKBhXsTnNGjxvhryKtO7tJd1w42DKOGFD6jSHtYOrsJTQDKPMwvOfrzUAk8t7GcpIfRyM7ssqHpFjg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-color-parser": "^3.1.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-progressive-custom-properties": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-4.2.1.tgz",
+      "integrity": "sha512-uPiiXf7IEKtUQXsxu6uWtOlRMXd2QWWy5fhxHDnPdXKCQckPP3E34ZgDoZ62r2iT+UOgWsSbM4NvHE5m3mAEdw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-random-function": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-random-function/-/postcss-random-function-2.0.1.tgz",
+      "integrity": "sha512-q+FQaNiRBhnoSNo+GzqGOIBKoHQ43lYz0ICrV+UudfWnEF6ksS6DsBIJSISKQT2Bvu3g4k6r7t0zYrk5pDlo8w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-calc": "^2.1.4",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-relative-color-syntax": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-3.0.12.tgz",
+      "integrity": "sha512-0RLIeONxu/mtxRtf3o41Lq2ghLimw0w9ByLWnnEVuy89exmEEq8bynveBxNW3nyHqLAFEeNtVEmC1QK9MZ8Huw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-color-parser": "^3.1.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-scope-pseudo-class": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-scope-pseudo-class/-/postcss-scope-pseudo-class-4.0.1.tgz",
+      "integrity": "sha512-IMi9FwtH6LMNuLea1bjVMQAsUhFxJnyLSgOp/cpv5hrzWmrUYU5fm0EguNDIIOHUqzXode8F/1qkC/tEo/qN8Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-scope-pseudo-class/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@csstools/postcss-sign-functions": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-sign-functions/-/postcss-sign-functions-1.1.4.tgz",
+      "integrity": "sha512-P97h1XqRPcfcJndFdG95Gv/6ZzxUBBISem0IDqPZ7WMvc/wlO+yU0c5D/OCpZ5TJoTt63Ok3knGk64N+o6L2Pg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-calc": "^2.1.4",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-stepped-value-functions": {
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-4.0.9.tgz",
+      "integrity": "sha512-h9btycWrsex4dNLeQfyU3y3w40LMQooJWFMm/SK9lrKguHDcFl4VMkncKKoXi2z5rM9YGWbUQABI8BT2UydIcA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-calc": "^2.1.4",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-text-decoration-shorthand": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-4.0.3.tgz",
+      "integrity": "sha512-KSkGgZfx0kQjRIYnpsD7X2Om9BUXX/Kii77VBifQW9Ih929hK0KNjVngHDH0bFB9GmfWcR9vJYJJRvw/NQjkrA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/color-helpers": "^5.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-trigonometric-functions": {
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-4.0.9.tgz",
+      "integrity": "sha512-Hnh5zJUdpNrJqK9v1/E3BbrQhaDTj5YiX7P61TOvUhoDHnUmsNNxcDAgkQ32RrcWx9GVUvfUNPcUkn8R3vIX6A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-calc": "^2.1.4",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/postcss-unset-value": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-4.0.0.tgz",
+      "integrity": "sha512-cBz3tOCI5Fw6NIFEwU3RiwK6mn3nKegjpJuzCndoGq3BZPkUjnsq7uQmIeMNeMbMk7YD2MfKcgCpZwX5jyXqCA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@csstools/utilities": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/utilities/-/utilities-2.0.0.tgz",
+      "integrity": "sha512-5VdOr0Z71u+Yp3ozOx8T11N703wIFGVRgOWbOZMKgglPJsWA54MRIoMNVMa7shUToIhx5J8vX4sOZgD2XiihiQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@docsearch/css": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-4.1.0.tgz",
+      "integrity": "sha512-nuNKGjHj/FQeWgE9t+i83QD/V67QiaAmGY7xS9TVCRUiCqSljOgIKlsLoQZKKVwEG8f+OWKdznzZkJxGZ7d06A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@docsearch/react": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-4.1.0.tgz",
+      "integrity": "sha512-4GHI7TT3sJZ2Vs4Kjadv7vAkMrTsJqHvzvxO3JA7UT8iPRKaDottG5o5uNshPWhVVaBYPC35Ukf8bfCotGpjSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@ai-sdk/react": "^2.0.30",
+        "@algolia/autocomplete-core": "1.19.2",
+        "@docsearch/css": "4.1.0",
+        "ai": "^5.0.30",
+        "algoliasearch": "^5.28.0",
+        "marked": "^16.3.0",
+        "zod": "^4.1.8"
+      },
+      "peerDependencies": {
+        "@types/react": ">= 16.8.0 < 20.0.0",
+        "react": ">= 16.8.0 < 20.0.0",
+        "react-dom": ">= 16.8.0 < 20.0.0",
+        "search-insights": ">= 1 < 3"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "react": {
+          "optional": true
+        },
+        "react-dom": {
+          "optional": true
+        },
+        "search-insights": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@docusaurus/babel": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/babel/-/babel-3.9.0.tgz",
+      "integrity": "sha512-QcZ+Rey0OvlLK9SPN4/+VWL+ut/tuADVdunA1fmC96fytdYjatdJrcw1koYdp/c+3k6lVYlwg9DDVNDecyLCAA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.25.9",
+        "@babel/generator": "^7.25.9",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-transform-runtime": "^7.25.9",
+        "@babel/preset-env": "^7.25.9",
+        "@babel/preset-react": "^7.25.9",
+        "@babel/preset-typescript": "^7.25.9",
+        "@babel/runtime": "^7.25.9",
+        "@babel/runtime-corejs3": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@docusaurus/logger": "3.9.0",
+        "@docusaurus/utils": "3.9.0",
+        "babel-plugin-dynamic-import-node": "^2.3.3",
+        "fs-extra": "^11.1.1",
+        "tslib": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      }
+    },
+    "node_modules/@docusaurus/bundler": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/bundler/-/bundler-3.9.0.tgz",
+      "integrity": "sha512-HaRLSmiwnJQ3uHBV3rd/BRDM9S/nHAshRk54djRZ+RX9ze4ONuFAovdD5es20ZDj7PRTjo38GVnBtHvuL/SwsQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.25.9",
+        "@docusaurus/babel": "3.9.0",
+        "@docusaurus/cssnano-preset": "3.9.0",
+        "@docusaurus/logger": "3.9.0",
+        "@docusaurus/types": "3.9.0",
+        "@docusaurus/utils": "3.9.0",
+        "babel-loader": "^9.2.1",
+        "clean-css": "^5.3.3",
+        "copy-webpack-plugin": "^11.0.0",
+        "css-loader": "^6.11.0",
+        "css-minimizer-webpack-plugin": "^5.0.1",
+        "cssnano": "^6.1.2",
+        "file-loader": "^6.2.0",
+        "html-minifier-terser": "^7.2.0",
+        "mini-css-extract-plugin": "^2.9.2",
+        "null-loader": "^4.0.1",
+        "postcss": "^8.5.4",
+        "postcss-loader": "^7.3.4",
+        "postcss-preset-env": "^10.2.1",
+        "terser-webpack-plugin": "^5.3.9",
+        "tslib": "^2.6.0",
+        "url-loader": "^4.1.1",
+        "webpack": "^5.95.0",
+        "webpackbar": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "@docusaurus/faster": "*"
+      },
+      "peerDependenciesMeta": {
+        "@docusaurus/faster": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@docusaurus/core": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/core/-/core-3.9.0.tgz",
+      "integrity": "sha512-sEJ4MW/zuh1MfPORCRbSwnW/PjsVmOigWwBU6clcxm221/CNdnI/XqgfBrl2jj/zocSdNoQM8E3IP2W8dygi6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/babel": "3.9.0",
+        "@docusaurus/bundler": "3.9.0",
+        "@docusaurus/logger": "3.9.0",
+        "@docusaurus/mdx-loader": "3.9.0",
+        "@docusaurus/utils": "3.9.0",
+        "@docusaurus/utils-common": "3.9.0",
+        "@docusaurus/utils-validation": "3.9.0",
+        "boxen": "^6.2.1",
+        "chalk": "^4.1.2",
+        "chokidar": "^3.5.3",
+        "cli-table3": "^0.6.3",
+        "combine-promises": "^1.1.0",
+        "commander": "^5.1.0",
+        "core-js": "^3.31.1",
+        "detect-port": "^1.5.1",
+        "escape-html": "^1.0.3",
+        "eta": "^2.2.0",
+        "eval": "^0.1.8",
+        "execa": "5.1.1",
+        "fs-extra": "^11.1.1",
+        "html-tags": "^3.3.1",
+        "html-webpack-plugin": "^5.6.0",
+        "leven": "^3.1.0",
+        "lodash": "^4.17.21",
+        "open": "^8.4.0",
+        "p-map": "^4.0.0",
+        "prompts": "^2.4.2",
+        "react-helmet-async": "npm:@slorber/react-helmet-async@1.3.0",
+        "react-loadable": "npm:@docusaurus/react-loadable@6.0.0",
+        "react-loadable-ssr-addon-v5-slorber": "^1.0.1",
+        "react-router": "^5.3.4",
+        "react-router-config": "^5.1.1",
+        "react-router-dom": "^5.3.4",
+        "semver": "^7.5.4",
+        "serve-handler": "^6.1.6",
+        "tinypool": "^1.0.2",
+        "tslib": "^2.6.0",
+        "update-notifier": "^6.0.2",
+        "webpack": "^5.95.0",
+        "webpack-bundle-analyzer": "^4.10.2",
+        "webpack-dev-server": "^5.2.2",
+        "webpack-merge": "^6.0.1"
+      },
+      "bin": {
+        "docusaurus": "bin/docusaurus.mjs"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "@mdx-js/react": "^3.0.0",
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/cssnano-preset": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/cssnano-preset/-/cssnano-preset-3.9.0.tgz",
+      "integrity": "sha512-prCJXUcoJZBlovJzSFkfnfWr1gXd53VZfE+17fIpUWS6Zioc7WE4FPoXPi5ldAGZ8brhXre5xQ8NWDE90XP9yw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssnano-preset-advanced": "^6.1.2",
+        "postcss": "^8.5.4",
+        "postcss-sort-media-queries": "^5.2.0",
+        "tslib": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      }
+    },
+    "node_modules/@docusaurus/logger": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/logger/-/logger-3.9.0.tgz",
+      "integrity": "sha512-lDtThsocWTF8ZrVF01ltfctA/xgtD/3oXWqEkKIDzF4fCWsWXH7hC4LCqT23xSuxZTIo8N+y02XSPvA/8DLInw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.2",
+        "tslib": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      }
+    },
+    "node_modules/@docusaurus/mdx-loader": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-3.9.0.tgz",
+      "integrity": "sha512-9bfJYdkZFE+REwevkT4CYdTJ2f6ydgkbUFylkzTXrNGtBXtx25TRJGdn2cVzm3eVkeWdJrGkG/ypwrIWnbu5UA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/logger": "3.9.0",
+        "@docusaurus/utils": "3.9.0",
+        "@docusaurus/utils-validation": "3.9.0",
+        "@mdx-js/mdx": "^3.0.0",
+        "@slorber/remark-comment": "^1.0.0",
+        "escape-html": "^1.0.3",
+        "estree-util-value-to-estree": "^3.0.1",
+        "file-loader": "^6.2.0",
+        "fs-extra": "^11.1.1",
+        "image-size": "^2.0.2",
+        "mdast-util-mdx": "^3.0.0",
+        "mdast-util-to-string": "^4.0.0",
+        "rehype-raw": "^7.0.0",
+        "remark-directive": "^3.0.0",
+        "remark-emoji": "^4.0.0",
+        "remark-frontmatter": "^5.0.0",
+        "remark-gfm": "^4.0.0",
+        "stringify-object": "^3.3.0",
+        "tslib": "^2.6.0",
+        "unified": "^11.0.3",
+        "unist-util-visit": "^5.0.0",
+        "url-loader": "^4.1.1",
+        "vfile": "^6.0.1",
+        "webpack": "^5.88.1"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/module-type-aliases": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/module-type-aliases/-/module-type-aliases-3.9.0.tgz",
+      "integrity": "sha512-0ucYr79FpTCebN+l3ZlKqoW7HbMqSKT8JdsEg6QoUtxD3C7trF6KZiK/X6Yh+xekO1w3zzXYgPcIYTF2DV81tQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/types": "3.9.0",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "@types/react-router-config": "*",
+        "@types/react-router-dom": "*",
+        "react-helmet-async": "npm:@slorber/react-helmet-async@1.3.0",
+        "react-loadable": "npm:@docusaurus/react-loadable@6.0.0"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-dom": "*"
+      }
+    },
+    "node_modules/@docusaurus/plugin-content-blog": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.9.0.tgz",
+      "integrity": "sha512-XZXJ/rQgi2jT0XWNXOnSKooJgtGHPzkjaBjww6K9PD+YevNMTP9U8Y5sA7cLA5Bwuqrpee4i8NO3tSrjhhDW5w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/core": "3.9.0",
+        "@docusaurus/logger": "3.9.0",
+        "@docusaurus/mdx-loader": "3.9.0",
+        "@docusaurus/theme-common": "3.9.0",
+        "@docusaurus/types": "3.9.0",
+        "@docusaurus/utils": "3.9.0",
+        "@docusaurus/utils-common": "3.9.0",
+        "@docusaurus/utils-validation": "3.9.0",
+        "cheerio": "1.0.0-rc.12",
+        "feed": "^4.2.2",
+        "fs-extra": "^11.1.1",
+        "lodash": "^4.17.21",
+        "schema-dts": "^1.1.2",
+        "srcset": "^4.0.0",
+        "tslib": "^2.6.0",
+        "unist-util-visit": "^5.0.0",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.88.1"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "@docusaurus/plugin-content-docs": "*",
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/plugin-content-docs": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.9.0.tgz",
+      "integrity": "sha512-PP+iDJg+lj4cn/7GbbmiguaQ8OX08YxnzQ17KqRC4ufJm11jdyXD33wA7vVtbeG/BkkgkiB/K7YyPHCPwmfVhg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/core": "3.9.0",
+        "@docusaurus/logger": "3.9.0",
+        "@docusaurus/mdx-loader": "3.9.0",
+        "@docusaurus/module-type-aliases": "3.9.0",
+        "@docusaurus/theme-common": "3.9.0",
+        "@docusaurus/types": "3.9.0",
+        "@docusaurus/utils": "3.9.0",
+        "@docusaurus/utils-common": "3.9.0",
+        "@docusaurus/utils-validation": "3.9.0",
+        "@types/react-router-config": "^5.0.7",
+        "combine-promises": "^1.1.0",
+        "fs-extra": "^11.1.1",
+        "js-yaml": "^4.1.0",
+        "lodash": "^4.17.21",
+        "schema-dts": "^1.1.2",
+        "tslib": "^2.6.0",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.88.1"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/plugin-content-pages": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.9.0.tgz",
+      "integrity": "sha512-ngetCpAZuivlaHC0l8a5KoK6PQWGuZ8742VwK7dbXeIW0Y70P4xwuocBdsCIQ9J6nB9rlTXRYMpNVyYyCpD7/Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/core": "3.9.0",
+        "@docusaurus/mdx-loader": "3.9.0",
+        "@docusaurus/types": "3.9.0",
+        "@docusaurus/utils": "3.9.0",
+        "@docusaurus/utils-validation": "3.9.0",
+        "fs-extra": "^11.1.1",
+        "tslib": "^2.6.0",
+        "webpack": "^5.88.1"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/plugin-css-cascade-layers": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-css-cascade-layers/-/plugin-css-cascade-layers-3.9.0.tgz",
+      "integrity": "sha512-giPTCjEzeaamMn8EHY/oDvsPDxF5ei1/q5lPUFQLldbc65jFQ1k6pPwKjtOznYy3TSfClCF1F1DNpYWIx7B5LA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/core": "3.9.0",
+        "@docusaurus/types": "3.9.0",
+        "@docusaurus/utils": "3.9.0",
+        "@docusaurus/utils-validation": "3.9.0",
+        "tslib": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      }
+    },
+    "node_modules/@docusaurus/plugin-debug": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-3.9.0.tgz",
+      "integrity": "sha512-DuFOZya+bcrYiL54qBEn2rdKuoWWNyOV5IoHI2MURLzwuYaKu/J9Gi618XUsj3N3qvqG2uxWQiXZcs9ecfMadA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/core": "3.9.0",
+        "@docusaurus/types": "3.9.0",
+        "@docusaurus/utils": "3.9.0",
+        "fs-extra": "^11.1.1",
+        "react-json-view-lite": "^2.3.0",
+        "tslib": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/plugin-google-analytics": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.9.0.tgz",
+      "integrity": "sha512-mUXvpasTDR2pXdnkkhGxEgB9frVAvLGc+T3fp6SGT2F+YoEQtjcmz9D43zubQawLn+W1KEhoj+vPusYe+HAl+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/core": "3.9.0",
+        "@docusaurus/types": "3.9.0",
+        "@docusaurus/utils-validation": "3.9.0",
+        "tslib": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/plugin-google-gtag": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.9.0.tgz",
+      "integrity": "sha512-L4tCKYnmcyLV6VQs7XWQ3r7YSllagAU2GylZzdvz7NRMcXE12uSW5MCC2aSltbk09MYlqrYv1Ntp+ESsMvptYw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/core": "3.9.0",
+        "@docusaurus/types": "3.9.0",
+        "@docusaurus/utils-validation": "3.9.0",
+        "@types/gtag.js": "^0.0.12",
+        "tslib": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/plugin-google-tag-manager": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.9.0.tgz",
+      "integrity": "sha512-+jWO3tkrvsMUKQ69KTIj9ZBf8sKY5kodLcP4yIaEkPzfWq9IEpE+ekQCtFWlrAmkJUtSxbjHK6HNZZkUNwwq7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/core": "3.9.0",
+        "@docusaurus/types": "3.9.0",
+        "@docusaurus/utils-validation": "3.9.0",
+        "tslib": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/plugin-sitemap": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.9.0.tgz",
+      "integrity": "sha512-QOyLooWuF+On4q2RDGVZtKY0tlfdZwD9e/p7g1sJLUfOwN518V2Bo+kZtU82Or42SCKjyJ0lhSqAUOZfbeFhFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/core": "3.9.0",
+        "@docusaurus/logger": "3.9.0",
+        "@docusaurus/types": "3.9.0",
+        "@docusaurus/utils": "3.9.0",
+        "@docusaurus/utils-common": "3.9.0",
+        "@docusaurus/utils-validation": "3.9.0",
+        "fs-extra": "^11.1.1",
+        "sitemap": "^7.1.1",
+        "tslib": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/plugin-svgr": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/plugin-svgr/-/plugin-svgr-3.9.0.tgz",
+      "integrity": "sha512-pUZIfnhFtAYDmDwimFiBY+sxNUigyJnKbCwI9pTiXr3uGp43CsSsN8gwl/i8jBmqfsZzvNnGZNxc75wy9v6RXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/core": "3.9.0",
+        "@docusaurus/types": "3.9.0",
+        "@docusaurus/utils": "3.9.0",
+        "@docusaurus/utils-validation": "3.9.0",
+        "@svgr/core": "8.1.0",
+        "@svgr/webpack": "^8.1.0",
+        "tslib": "^2.6.0",
+        "webpack": "^5.88.1"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/preset-classic": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-3.9.0.tgz",
+      "integrity": "sha512-nLoiDxf8bDNNxDSZ28+pFfSfT+QRi08Pn2K0zIvbjkM/X/otMs4ho0K8+2FpoLOoGApifaSuNfJXpGYnQV3rGA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/core": "3.9.0",
+        "@docusaurus/plugin-content-blog": "3.9.0",
+        "@docusaurus/plugin-content-docs": "3.9.0",
+        "@docusaurus/plugin-content-pages": "3.9.0",
+        "@docusaurus/plugin-css-cascade-layers": "3.9.0",
+        "@docusaurus/plugin-debug": "3.9.0",
+        "@docusaurus/plugin-google-analytics": "3.9.0",
+        "@docusaurus/plugin-google-gtag": "3.9.0",
+        "@docusaurus/plugin-google-tag-manager": "3.9.0",
+        "@docusaurus/plugin-sitemap": "3.9.0",
+        "@docusaurus/plugin-svgr": "3.9.0",
+        "@docusaurus/theme-classic": "3.9.0",
+        "@docusaurus/theme-common": "3.9.0",
+        "@docusaurus/theme-search-algolia": "3.9.0",
+        "@docusaurus/types": "3.9.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/theme-classic": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-3.9.0.tgz",
+      "integrity": "sha512-RToUIabJOyX41nMIxkFn8LPeA+uHgySzyd6Ak/gsINqWHHTLDMoYPxBUmNm3S+okcfuMI54kNYvD6TY+6TIYDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/core": "3.9.0",
+        "@docusaurus/logger": "3.9.0",
+        "@docusaurus/mdx-loader": "3.9.0",
+        "@docusaurus/module-type-aliases": "3.9.0",
+        "@docusaurus/plugin-content-blog": "3.9.0",
+        "@docusaurus/plugin-content-docs": "3.9.0",
+        "@docusaurus/plugin-content-pages": "3.9.0",
+        "@docusaurus/theme-common": "3.9.0",
+        "@docusaurus/theme-translations": "3.9.0",
+        "@docusaurus/types": "3.9.0",
+        "@docusaurus/utils": "3.9.0",
+        "@docusaurus/utils-common": "3.9.0",
+        "@docusaurus/utils-validation": "3.9.0",
+        "@mdx-js/react": "^3.0.0",
+        "clsx": "^2.0.0",
+        "infima": "0.2.0-alpha.45",
+        "lodash": "^4.17.21",
+        "nprogress": "^0.2.0",
+        "postcss": "^8.5.4",
+        "prism-react-renderer": "^2.3.0",
+        "prismjs": "^1.29.0",
+        "react-router-dom": "^5.3.4",
+        "rtlcss": "^4.1.0",
+        "tslib": "^2.6.0",
+        "utility-types": "^3.10.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/theme-common": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-3.9.0.tgz",
+      "integrity": "sha512-pqNoQgttIpk7Ndm6N8OGbhi+1wBIQXQPYM7bPf1HDraXfvVpOzhcDty1yyK4coPWl0M7NxednZvKw4atfQ70Ew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/mdx-loader": "3.9.0",
+        "@docusaurus/module-type-aliases": "3.9.0",
+        "@docusaurus/utils": "3.9.0",
+        "@docusaurus/utils-common": "3.9.0",
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "@types/react-router-config": "*",
+        "clsx": "^2.0.0",
+        "parse-numeric-range": "^1.3.0",
+        "prism-react-renderer": "^2.3.0",
+        "tslib": "^2.6.0",
+        "utility-types": "^3.10.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "@docusaurus/plugin-content-docs": "*",
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/theme-search-algolia": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.9.0.tgz",
+      "integrity": "sha512-nbY7ZJVA10kTiBLJtscxK1aECeYvYFz+Sno9PkCE9KeFXqRDr6omtNmLVkbvyl4b6xgz+6yOIBdO/idLPVDpWg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docsearch/react": "^3.9.0 || ^4.1.0",
+        "@docusaurus/core": "3.9.0",
+        "@docusaurus/logger": "3.9.0",
+        "@docusaurus/plugin-content-docs": "3.9.0",
+        "@docusaurus/theme-common": "3.9.0",
+        "@docusaurus/theme-translations": "3.9.0",
+        "@docusaurus/utils": "3.9.0",
+        "@docusaurus/utils-validation": "3.9.0",
+        "algoliasearch": "^5.37.0",
+        "algoliasearch-helper": "^3.26.0",
+        "clsx": "^2.0.0",
+        "eta": "^2.2.0",
+        "fs-extra": "^11.1.1",
+        "lodash": "^4.17.21",
+        "tslib": "^2.6.0",
+        "utility-types": "^3.10.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/theme-translations": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/theme-translations/-/theme-translations-3.9.0.tgz",
+      "integrity": "sha512-4HUELBsE+rhtlnR1MsaNB9nJXPFZANeDQa5If1GfFVlis5mWUfdmXmbGangR7PfpK2tc56UETMtzjKrX5L5UWw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fs-extra": "^11.1.1",
+        "tslib": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      }
+    },
+    "node_modules/@docusaurus/types": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-3.9.0.tgz",
+      "integrity": "sha512-0klJLhHFHqkYoxIVp1LD7dnU1ASRTfSX+HFDiELOdz+YQUkOSfuU5hDa46zD8bLxrYffCb8FtJI7Z6BWAmVodg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@mdx-js/mdx": "^3.0.0",
+        "@types/history": "^4.7.11",
+        "@types/mdast": "^4.0.2",
+        "@types/react": "*",
+        "commander": "^5.1.0",
+        "joi": "^17.9.2",
+        "react-helmet-async": "npm:@slorber/react-helmet-async@1.3.0",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.95.0",
+        "webpack-merge": "^5.9.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@docusaurus/types/node_modules/webpack-merge": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
+      "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "flat": "^5.0.2",
+        "wildcard": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@docusaurus/utils": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-3.9.0.tgz",
+      "integrity": "sha512-wpVRQbDhXxqbb1llhkpu++aD4UdHHQ5M7J8DmJELDphlwmpI44TdS5elQZOsjzPfGyITZyQLekcDXjyteJ0/bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/logger": "3.9.0",
+        "@docusaurus/types": "3.9.0",
+        "@docusaurus/utils-common": "3.9.0",
+        "escape-string-regexp": "^4.0.0",
+        "execa": "5.1.1",
+        "file-loader": "^6.2.0",
+        "fs-extra": "^11.1.1",
+        "github-slugger": "^1.5.0",
+        "globby": "^11.1.0",
+        "gray-matter": "^4.0.3",
+        "jiti": "^1.20.0",
+        "js-yaml": "^4.1.0",
+        "lodash": "^4.17.21",
+        "micromatch": "^4.0.5",
+        "p-queue": "^6.6.2",
+        "prompts": "^2.4.2",
+        "resolve-pathname": "^3.0.0",
+        "tslib": "^2.6.0",
+        "url-loader": "^4.1.1",
+        "utility-types": "^3.10.0",
+        "webpack": "^5.88.1"
+      },
+      "engines": {
+        "node": ">=20.0"
+      }
+    },
+    "node_modules/@docusaurus/utils-common": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/utils-common/-/utils-common-3.9.0.tgz",
+      "integrity": "sha512-zpmzRn2mniMnrx8ZEYyyDsr0/7EksVgUXL9IuODp0DSK+R19nDGCY7w2NaMGRmGnrQQKsT3t0NDZzBk0V6N9Iw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/types": "3.9.0",
+        "tslib": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      }
+    },
+    "node_modules/@docusaurus/utils-validation": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-3.9.0.tgz",
+      "integrity": "sha512-xpVLdFPpsE5dYuE7hOtghccCrRWRhM6tUQ4YpfSy5snCDWgROITG5Mj22fGstd/HBqTzKD8NFs7qPPs42qjgWg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docusaurus/logger": "3.9.0",
+        "@docusaurus/utils": "3.9.0",
+        "@docusaurus/utils-common": "3.9.0",
+        "fs-extra": "^11.2.0",
+        "joi": "^17.9.2",
+        "js-yaml": "^4.1.0",
+        "lodash": "^4.17.21",
+        "tslib": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      }
+    },
+    "node_modules/@hapi/hoek": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@hapi/topo": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/hoek": "^9.0.0"
+      }
+    },
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.27.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jest/types": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "node_modules/@jridgewell/remapping": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.11",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
+      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@jsonjoy.com/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/@jsonjoy.com/buffers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/buffers/-/buffers-1.0.0.tgz",
+      "integrity": "sha512-NDigYR3PHqCnQLXYyoLbnEdzMMvzeiCWo1KOut7Q0CoIqg9tUAPKJ1iq/2nFhc5kZtexzutNY0LFjdwWL3Dw3Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/@jsonjoy.com/codegen": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/codegen/-/codegen-1.0.0.tgz",
+      "integrity": "sha512-E8Oy+08cmCf0EK/NMxpaJZmOxPqM+6iSe2S4nlSBrPZOORoDJILxtbSUEDKQyTamm/BVAhIGllOBNU79/dwf0g==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/@jsonjoy.com/json-pack": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.14.0.tgz",
+      "integrity": "sha512-LpWbYgVnKzphN5S6uss4M25jJ/9+m6q6UJoeN6zTkK4xAGhKsiBRPVeF7OYMWonn5repMQbE5vieRXcMUrKDKw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@jsonjoy.com/base64": "^1.1.2",
+        "@jsonjoy.com/buffers": "^1.0.0",
+        "@jsonjoy.com/codegen": "^1.0.0",
+        "@jsonjoy.com/json-pointer": "^1.0.1",
+        "@jsonjoy.com/util": "^1.9.0",
+        "hyperdyperid": "^1.2.0",
+        "thingies": "^2.5.0"
+      },
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/@jsonjoy.com/json-pointer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pointer/-/json-pointer-1.0.2.tgz",
+      "integrity": "sha512-Fsn6wM2zlDzY1U+v4Nc8bo3bVqgfNTGcn6dMgs6FjrEnt4ZCe60o6ByKRjOGlI2gow0aE/Q41QOigdTqkyK5fg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@jsonjoy.com/codegen": "^1.0.0",
+        "@jsonjoy.com/util": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/@jsonjoy.com/util": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.9.0.tgz",
+      "integrity": "sha512-pLuQo+VPRnN8hfPqUTLTHk126wuYdXVxE6aDmjSeV4NCAgyxWbiOIeNJVtID3h1Vzpoi9m4jXezf73I6LgabgQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@jsonjoy.com/buffers": "^1.0.0",
+        "@jsonjoy.com/codegen": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/@leichtgewicht/ip-codec": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
+      "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@mdx-js/mdx": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-3.1.1.tgz",
+      "integrity": "sha512-f6ZO2ifpwAQIpzGWaBQT2TXxPv6z3RBzQKpVftEWN78Vl/YweF1uwussDx8ECAXVtr3Rs89fKyG9YlzUs9DyGQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "@types/estree-jsx": "^1.0.0",
+        "@types/hast": "^3.0.0",
+        "@types/mdx": "^2.0.0",
+        "acorn": "^8.0.0",
+        "collapse-white-space": "^2.0.0",
+        "devlop": "^1.0.0",
+        "estree-util-is-identifier-name": "^3.0.0",
+        "estree-util-scope": "^1.0.0",
+        "estree-walker": "^3.0.0",
+        "hast-util-to-jsx-runtime": "^2.0.0",
+        "markdown-extensions": "^2.0.0",
+        "recma-build-jsx": "^1.0.0",
+        "recma-jsx": "^1.0.0",
+        "recma-stringify": "^1.0.0",
+        "rehype-recma": "^1.0.0",
+        "remark-mdx": "^3.0.0",
+        "remark-parse": "^11.0.0",
+        "remark-rehype": "^11.0.0",
+        "source-map": "^0.7.0",
+        "unified": "^11.0.0",
+        "unist-util-position-from-estree": "^2.0.0",
+        "unist-util-stringify-position": "^4.0.0",
+        "unist-util-visit": "^5.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/@mdx-js/react": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-3.1.1.tgz",
+      "integrity": "sha512-f++rKLQgUVYDAtECQ6fn/is15GkEH9+nZPM3MS0RcxVqoTfawHvDlSCH7JbMhAM6uJ32v3eXLvLmLvjGu7PTQw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdx": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      },
+      "peerDependencies": {
+        "@types/react": ">=16",
+        "react": ">=16"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@opentelemetry/api": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
+      "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@pnpm/config.env-replace": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz",
+      "integrity": "sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.22.0"
+      }
+    },
+    "node_modules/@pnpm/network.ca-file": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz",
+      "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "4.2.10"
+      },
+      "engines": {
+        "node": ">=12.22.0"
+      }
+    },
+    "node_modules/@pnpm/network.ca-file/node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/@pnpm/npm-conf": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.3.1.tgz",
+      "integrity": "sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@pnpm/config.env-replace": "^1.1.0",
+        "@pnpm/network.ca-file": "^1.0.1",
+        "config-chain": "^1.1.11"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@polka/url": {
+      "version": "1.0.0-next.29",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
+      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@sideway/address": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
+      "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/hoek": "^9.0.0"
+      }
+    },
+    "node_modules/@sideway/formula": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
+      "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@sideway/pinpoint": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
+      "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@sindresorhus/is": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
+      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
+      }
+    },
+    "node_modules/@slorber/remark-comment": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@slorber/remark-comment/-/remark-comment-1.0.0.tgz",
+      "integrity": "sha512-RCE24n7jsOj1M0UPvIQCHTe7fI0sFL4S2nwKVWwHyVr/wI/H8GosgsJGyhnsZoGFnD/P2hLf1mSbrrgSLN93NA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.1.0",
+        "micromark-util-symbol": "^1.0.1"
+      }
+    },
+    "node_modules/@standard-schema/spec": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz",
+      "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@svgr/babel-plugin-add-jsx-attribute": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz",
+      "integrity": "sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-remove-jsx-attribute": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz",
+      "integrity": "sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-remove-jsx-empty-expression": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz",
+      "integrity": "sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-replace-jsx-attribute-value": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-8.0.0.tgz",
+      "integrity": "sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-svg-dynamic-title": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-8.0.0.tgz",
+      "integrity": "sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-svg-em-dimensions": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-8.0.0.tgz",
+      "integrity": "sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-transform-react-native-svg": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-8.1.0.tgz",
+      "integrity": "sha512-Tx8T58CHo+7nwJ+EhUwx3LfdNSG9R2OKfaIXXs5soiy5HtgoAEkDay9LIimLOcG8dJQH1wPZp/cnAv6S9CrR1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-plugin-transform-svg-component": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-8.0.0.tgz",
+      "integrity": "sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/babel-preset": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-8.1.0.tgz",
+      "integrity": "sha512-7EYDbHE7MxHpv4sxvnVPngw5fuR6pw79SkcrILHJ/iMpuKySNCl5W1qcwPEpU+LgyRXOaAFgH0KhwD18wwg6ug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@svgr/babel-plugin-add-jsx-attribute": "8.0.0",
+        "@svgr/babel-plugin-remove-jsx-attribute": "8.0.0",
+        "@svgr/babel-plugin-remove-jsx-empty-expression": "8.0.0",
+        "@svgr/babel-plugin-replace-jsx-attribute-value": "8.0.0",
+        "@svgr/babel-plugin-svg-dynamic-title": "8.0.0",
+        "@svgr/babel-plugin-svg-em-dimensions": "8.0.0",
+        "@svgr/babel-plugin-transform-react-native-svg": "8.1.0",
+        "@svgr/babel-plugin-transform-svg-component": "8.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@svgr/core": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-8.1.0.tgz",
+      "integrity": "sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.21.3",
+        "@svgr/babel-preset": "8.1.0",
+        "camelcase": "^6.2.0",
+        "cosmiconfig": "^8.1.3",
+        "snake-case": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/hast-util-to-babel-ast": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-8.0.0.tgz",
+      "integrity": "sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.21.3",
+        "entities": "^4.4.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@svgr/plugin-jsx": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-8.1.0.tgz",
+      "integrity": "sha512-0xiIyBsLlr8quN+WyuxooNW9RJ0Dpr8uOnH/xrCVO8GLUcwHISwj1AG0k+LFzteTkAA0GbX0kj9q6Dk70PTiPA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.21.3",
+        "@svgr/babel-preset": "8.1.0",
+        "@svgr/hast-util-to-babel-ast": "8.0.0",
+        "svg-parser": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@svgr/core": "*"
+      }
+    },
+    "node_modules/@svgr/plugin-svgo": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-8.1.0.tgz",
+      "integrity": "sha512-Ywtl837OGO9pTLIN/onoWLmDQ4zFUycI1g76vuKGEz6evR/ZTJlJuz3G/fIkb6OVBJ2g0o6CGJzaEjfmEo3AHA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cosmiconfig": "^8.1.3",
+        "deepmerge": "^4.3.1",
+        "svgo": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@svgr/core": "*"
+      }
+    },
+    "node_modules/@svgr/webpack": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-8.1.0.tgz",
+      "integrity": "sha512-LnhVjMWyMQV9ZmeEy26maJk+8HTIbd59cH4F2MJ439k9DqejRisfFNGAPvRYlKETuh9LrImlS8aKsBgKjMA8WA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.21.3",
+        "@babel/plugin-transform-react-constant-elements": "^7.21.3",
+        "@babel/preset-env": "^7.20.2",
+        "@babel/preset-react": "^7.18.6",
+        "@babel/preset-typescript": "^7.21.0",
+        "@svgr/core": "8.1.0",
+        "@svgr/plugin-jsx": "8.1.0",
+        "@svgr/plugin-svgo": "8.1.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      }
+    },
+    "node_modules/@szmarczak/http-timer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
+      "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "defer-to-connect": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/@trysound/sax": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@types/body-parser": {
+      "version": "1.19.6",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
+      "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/connect": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/bonjour": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
+      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/connect": {
+      "version": "3.4.38",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/connect-history-api-fallback": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
+      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/express-serve-static-core": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/debug": {
+      "version": "4.1.12",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
+      "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/ms": "*"
+      }
+    },
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/estree-jsx": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.5.tgz",
+      "integrity": "sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/express": {
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.23.tgz",
+      "integrity": "sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.33",
+        "@types/qs": "*",
+        "@types/serve-static": "*"
+      }
+    },
+    "node_modules/@types/express-serve-static-core": {
+      "version": "4.19.6",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
+      "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/gtag.js": {
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/@types/gtag.js/-/gtag.js-0.0.12.tgz",
+      "integrity": "sha512-YQV9bUsemkzG81Ea295/nF/5GijnD2Af7QhEofh7xu+kvCN6RdodgNwwGWXB5GMI3NoyvQo0odNctoH/qLMIpg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/hast": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
+    "node_modules/@types/history": {
+      "version": "4.7.11",
+      "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
+      "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/http-cache-semantics": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
+      "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/http-errors": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
+      "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/http-proxy": {
+      "version": "1.17.16",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz",
+      "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/katex": {
+      "version": "0.16.7",
+      "resolved": "https://registry.npmjs.org/@types/katex/-/katex-0.16.7.tgz",
+      "integrity": "sha512-HMwFiRujE5PjrgwHQ25+bsLJgowjGjm5Z8FVSf0N6PwgJrwxH0QxzHYDcKsTfV3wva0vzrpqMTJS2jXPr5BMEQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/mdast": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",
+      "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
+    "node_modules/@types/mdx": {
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.13.tgz",
+      "integrity": "sha512-+OWZQfAYyio6YkJb3HLxDrvnx6SWWDbC0zVPfBRzUk0/nqoDyf6dNxQi3eArPe8rJ473nobTMQ/8Zk+LxJ+Yuw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/mime": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/ms": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz",
+      "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "24.5.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.2.tgz",
+      "integrity": "sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~7.12.0"
+      }
+    },
+    "node_modules/@types/node-forge": {
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.14.tgz",
+      "integrity": "sha512-mhVF2BnD4BO+jtOp7z1CdzaK4mbuK0LLQYAvdOLqHTavxFNq4zA1EmYkpnFjP8HOUzedfQkRnp0E2ulSAYSzAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/prismjs": {
+      "version": "1.26.5",
+      "resolved": "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.26.5.tgz",
+      "integrity": "sha512-AUZTa7hQ2KY5L7AmtSiqxlhWxb4ina0yd8hNbl4TWuqnv/pFP0nDMb3YrfSBf4hJVGLh2YEIBfKaBW/9UEl6IQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/qs": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/range-parser": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/react": {
+      "version": "19.1.13",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.13.tgz",
+      "integrity": "sha512-hHkbU/eoO3EG5/MZkuFSKmYqPbSVk5byPFa3e7y/8TybHiLMACgI8seVYlicwk7H5K/rI2px9xrQp/C+AUDTiQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "csstype": "^3.0.2"
+      }
+    },
+    "node_modules/@types/react-router": {
+      "version": "5.1.20",
+      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.20.tgz",
+      "integrity": "sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/history": "^4.7.11",
+        "@types/react": "*"
+      }
+    },
+    "node_modules/@types/react-router-config": {
+      "version": "5.0.11",
+      "resolved": "https://registry.npmjs.org/@types/react-router-config/-/react-router-config-5.0.11.tgz",
+      "integrity": "sha512-WmSAg7WgqW7m4x8Mt4N6ZyKz0BubSj/2tVUMsAHp+Yd2AMwcSbeFq9WympT19p5heCFmF97R9eD5uUR/t4HEqw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "@types/react-router": "^5.1.0"
+      }
+    },
+    "node_modules/@types/react-router-dom": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
+      "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "@types/react-router": "*"
+      }
+    },
+    "node_modules/@types/retry": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
+      "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/sax": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@types/sax/-/sax-1.2.7.tgz",
+      "integrity": "sha512-rO73L89PJxeYM3s3pPPjiPgVVcymqU490g0YO5n5By0k2Erzj6tay/4lr1CHAAU4JyOWd1rpQ8bCf6cZfHU96A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/send": {
+      "version": "0.17.5",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz",
+      "integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mime": "^1",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/serve-index": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
+      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/express": "*"
+      }
+    },
+    "node_modules/@types/serve-static": {
+      "version": "1.15.8",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.8.tgz",
+      "integrity": "sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/http-errors": "*",
+        "@types/node": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/sockjs": {
+      "version": "0.3.36",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/unist": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
+      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/ws": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/yargs": {
+      "version": "17.0.33",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+      "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/accepts/node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/accepts/node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/accepts/node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-import-phases": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz",
+      "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "peerDependencies": {
+        "acorn": "^8.14.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.11.0"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/address": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz",
+      "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ai": {
+      "version": "5.0.54",
+      "resolved": "https://registry.npmjs.org/ai/-/ai-5.0.54.tgz",
+      "integrity": "sha512-eM3EH4VVCWRMfs17r8HF8RtCN/+vBdpWOQoHSVooIfB0BZerOHyrktrVoDP6G6xatUzGLTvJT3rMKLkbPTLPBg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@ai-sdk/gateway": "1.0.30",
+        "@ai-sdk/provider": "2.0.0",
+        "@ai-sdk/provider-utils": "3.0.10",
+        "@opentelemetry/api": "1.9.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "zod": "^3.25.76 || ^4.1.8"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/algoliasearch": {
+      "version": "5.38.0",
+      "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.38.0.tgz",
+      "integrity": "sha512-8VJKIzheeI9cjuVJhU1hYEVetOTe7LvA+CujAI7yqvYsPtZfVEvv1pg9AeFNtHBg/ZoSLGU5LPijhcY5l3Ea9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/abtesting": "1.4.0",
+        "@algolia/client-abtesting": "5.38.0",
+        "@algolia/client-analytics": "5.38.0",
+        "@algolia/client-common": "5.38.0",
+        "@algolia/client-insights": "5.38.0",
+        "@algolia/client-personalization": "5.38.0",
+        "@algolia/client-query-suggestions": "5.38.0",
+        "@algolia/client-search": "5.38.0",
+        "@algolia/ingestion": "1.38.0",
+        "@algolia/monitoring": "1.38.0",
+        "@algolia/recommend": "5.38.0",
+        "@algolia/requester-browser-xhr": "5.38.0",
+        "@algolia/requester-fetch": "5.38.0",
+        "@algolia/requester-node-http": "5.38.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/algoliasearch-helper": {
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.26.0.tgz",
+      "integrity": "sha512-Rv2x3GXleQ3ygwhkhJubhhYGsICmShLAiqtUuJTUkr9uOCOXyF2E71LVT4XDnVffbknv8XgScP4U0Oxtgm+hIw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/events": "^4.0.1"
+      },
+      "peerDependencies": {
+        "algoliasearch": ">= 3.1 < 6"
+      }
+    },
+    "node_modules/ansi-align": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
+      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.1.0"
+      }
+    },
+    "node_modules/ansi-align/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ansi-align/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-html-community": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "license": "Apache-2.0",
+      "bin": {
+        "ansi-html": "bin/ansi-html"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/arg": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
+      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/astring": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/astring/-/astring-1.9.0.tgz",
+      "integrity": "sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "astring": "bin/astring"
+      }
+    },
+    "node_modules/autoprefixer": {
+      "version": "10.4.21",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.21.tgz",
+      "integrity": "sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.24.4",
+        "caniuse-lite": "^1.0.30001702",
+        "fraction.js": "^4.3.7",
+        "normalize-range": "^0.1.2",
+        "picocolors": "^1.1.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/babel-loader": {
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.2.1.tgz",
+      "integrity": "sha512-fqe8naHt46e0yIdkjUZYqddSXfej3AHajX+CSO5X7oy0EmPc6o5Xh+RClNoHjnieWz9AW4kZxW9yyFMhVB1QLA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-cache-dir": "^4.0.0",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0",
+        "webpack": ">=5"
+      }
+    },
+    "node_modules/babel-plugin-dynamic-import-node": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "object.assign": "^4.1.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs2": {
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.14.tgz",
+      "integrity": "sha512-Co2Y9wX854ts6U8gAAPXfn0GmAyctHuK8n0Yhfjd6t30g7yvKjspvvOo9yG+z52PZRgFErt7Ka2pYnXCjLKEpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.27.7",
+        "@babel/helper-define-polyfill-provider": "^0.6.5",
+        "semver": "^6.3.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.13.0.tgz",
+      "integrity": "sha512-U+GNwMdSFgzVmfhNm8GJUX88AadB3uo9KpJqS3FaqNIPKgySuvMb+bHPsOmmuWyIcuqZj/pzt1RUIUZns4y2+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.6.5",
+        "core-js-compat": "^3.43.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.5.tgz",
+      "integrity": "sha512-ISqQ2frbiNU9vIJkzg7dlPpznPZ4jOiUQ1uSmB0fEHeowtN3COYRsXr/xexn64NpU13P06jc/L5TgiJXOgrbEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.6.5"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/bail": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
+      "integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/baseline-browser-mapping": {
+      "version": "2.8.7",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.7.tgz",
+      "integrity": "sha512-bxxN2M3a4d1CRoQC//IqsR5XrLh0IJ8TCv2x6Y9N0nckNz/rTjZB3//GGscZziZOxmjP55rzxg/ze7usFI9FqQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "baseline-browser-mapping": "dist/cli.js"
+      }
+    },
+    "node_modules/batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/body-parser": {
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.5",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.13.0",
+        "raw-body": "2.5.2",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/body-parser/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/bonjour-service": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
+      "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "multicast-dns": "^7.2.5"
+      }
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/boxen": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-6.2.1.tgz",
+      "integrity": "sha512-H4PEsJXfFI/Pt8sjDWbHlQPx4zL/bvSQjcilJmaulGt5mLDorHOHpmdXAJcBcmru7PhYSp/cDMWRko4ZUMFkSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-align": "^3.0.1",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.1.2",
+        "cli-boxes": "^3.0.0",
+        "string-width": "^5.0.1",
+        "type-fest": "^2.5.0",
+        "widest-line": "^4.0.1",
+        "wrap-ansi": "^8.0.1"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.26.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.2.tgz",
+      "integrity": "sha512-ECFzp6uFOSB+dcZ5BK/IBaGWssbSYBHvuMeMt3MMFyhI0Z8SqGgEkBLARgpRH3hutIgPVsALcMwbDrJqPxQ65A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "baseline-browser-mapping": "^2.8.3",
+        "caniuse-lite": "^1.0.30001741",
+        "electron-to-chromium": "^1.5.218",
+        "node-releases": "^2.0.21",
+        "update-browserslist-db": "^1.1.3"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/bundle-name": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
+      "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "run-applescript": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/cacheable-lookup": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
+      "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/cacheable-request": {
+      "version": "10.2.14",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz",
+      "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/http-cache-semantics": "^4.0.2",
+        "get-stream": "^6.0.1",
+        "http-cache-semantics": "^4.1.1",
+        "keyv": "^4.5.3",
+        "mimic-response": "^4.0.0",
+        "normalize-url": "^8.0.0",
+        "responselike": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camel-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001745",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001745.tgz",
+      "integrity": "sha512-ywt6i8FzvdgrrrGbr1jZVObnVv6adj+0if2/omv9cmR2oiZs30zL4DIyaptKcbOrBdOIc74QTMoJvSE2QHh5UQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
+    "node_modules/ccount": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
+      "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/character-entities": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
+      "integrity": "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-entities-html4": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
+      "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-entities-legacy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
+      "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-reference-invalid": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-2.0.1.tgz",
+      "integrity": "sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/cheerio": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz",
+      "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cheerio-select": "^2.1.0",
+        "dom-serializer": "^2.0.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.0.1",
+        "htmlparser2": "^8.0.1",
+        "parse5": "^7.0.0",
+        "parse5-htmlparser2-tree-adapter": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/cheerio?sponsor=1"
+      }
+    },
+    "node_modules/cheerio-select": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz",
+      "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-select": "^5.1.0",
+        "css-what": "^6.1.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/ci-info": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/clean-css": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
+      "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "source-map": "~0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.0"
+      }
+    },
+    "node_modules/clean-css/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cli-boxes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz",
+      "integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-table3": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz",
+      "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "string-width": "^4.2.0"
+      },
+      "engines": {
+        "node": "10.* || >= 12.*"
+      },
+      "optionalDependencies": {
+        "@colors/colors": "1.5.0"
+      }
+    },
+    "node_modules/cli-table3/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cli-table3/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clsx": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+      "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/collapse-white-space": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-2.1.0.tgz",
+      "integrity": "sha512-loKTxY1zCOuG4j9f6EPnuyyYkf58RnhhWTvRoZEokgB+WbdXehfjFviyOVYkqzEWz1Q5kRiZdBYS5SwxbQYwzw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/colord": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/combine-promises": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/combine-promises/-/combine-promises-1.2.0.tgz",
+      "integrity": "sha512-VcQB1ziGD0NXrhKxiwyNbCDmRzs/OShMs2GqW2DlU2A/Sd0nQxE1oWDAE5O0ygSx5mgQOn9eIFh7yKPgFRVkPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/comma-separated-tokens": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
+      "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/commander": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/common-path-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
+      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": ">= 1.43.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/compressible/node_modules/mime-db": {
+      "version": "1.54.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
+      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/compression": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz",
+      "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "compressible": "~2.0.18",
+        "debug": "2.6.9",
+        "negotiator": "~0.6.4",
+        "on-headers": "~1.1.0",
+        "safe-buffer": "5.2.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/compression/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/compression/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/compression/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/config-chain": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ini": "^1.3.4",
+        "proto-list": "~1.2.1"
+      }
+    },
+    "node_modules/config-chain/node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/configstore": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-6.0.0.tgz",
+      "integrity": "sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "dot-prop": "^6.0.1",
+        "graceful-fs": "^4.2.6",
+        "unique-string": "^3.0.0",
+        "write-file-atomic": "^3.0.3",
+        "xdg-basedir": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/yeoman/configstore?sponsor=1"
+      }
+    },
+    "node_modules/connect-history-api-fallback": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/consola": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz",
+      "integrity": "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14.18.0 || >=16.10.0"
+      }
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha512-kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cookie": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/copy-webpack-plugin": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
+      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-glob": "^3.2.11",
+        "glob-parent": "^6.0.1",
+        "globby": "^13.1.1",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/globby": {
+      "version": "13.2.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
+      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.3.0",
+        "ignore": "^5.2.4",
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/slash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.45.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.45.1.tgz",
+      "integrity": "sha512-L4NPsJlCfZsPeXukyzHFlg/i7IIVwHSItR0wg0FLNqYClJ4MQYTYLbC7EkjKYRLZF2iof2MUgN0EGy7MdQFChg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat": {
+      "version": "3.45.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.45.1.tgz",
+      "integrity": "sha512-tqTt5T4PzsMIZ430XGviK4vzYSoeNJ6CXODi6c/voxOT6IZqBht5/EKaSNnYiEjjRYxjVz7DQIsOsY0XNi8PIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.25.3"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-pure": {
+      "version": "3.45.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.45.1.tgz",
+      "integrity": "sha512-OHnWFKgTUshEU8MK+lOs1H8kC8GkTi9Z1tvNkxrCcw9wl3MJIO7q2ld77wjWn4/xuGrVu2X+nME1iIIPBSdyEQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cosmiconfig": {
+      "version": "8.3.6",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
+      "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0",
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/crypto-random-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz",
+      "integrity": "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/crypto-random-string/node_modules/type-fest": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/css-blank-pseudo": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-7.0.1.tgz",
+      "integrity": "sha512-jf+twWGDf6LDoXDUode+nc7ZlrqfaNphrBIBrcmeP3D8yw1uPaix1gCC8LUQUGQ6CycuK2opkbFFWFuq/a94ag==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-blank-pseudo/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/css-declaration-sorter": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.3.0.tgz",
+      "integrity": "sha512-LQF6N/3vkAMYF4xoHLJfG718HRJh34Z8BnNhd6bosOMIVjMlhuZK5++oZa3uYAgrI5+7x2o27gUqTR2U/KjUOQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.9"
+      }
+    },
+    "node_modules/css-has-pseudo": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-7.0.3.tgz",
+      "integrity": "sha512-oG+vKuGyqe/xvEMoxAQrhi7uY16deJR3i7wwhBerVrGQKSqUC5GiOVxTpM9F9B9hw0J+eKeOWLH7E9gZ1Dr5rA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/selector-specificity": "^5.0.0",
+        "postcss-selector-parser": "^7.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-has-pseudo/node_modules/@csstools/selector-specificity": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz",
+      "integrity": "sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      }
+    },
+    "node_modules/css-has-pseudo/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/css-loader": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
+      "integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.33",
+        "postcss-modules-extract-imports": "^3.1.0",
+        "postcss-modules-local-by-default": "^4.0.5",
+        "postcss-modules-scope": "^3.2.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/css-minimizer-webpack-plugin": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-5.0.1.tgz",
+      "integrity": "sha512-3caImjKFQkS+ws1TGcFn0V1HyDJFq1Euy589JlD6/3rV2kj+w7r5G9WDMgSHvpvXHNZ2calVypZWuEDQd9wfLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.18",
+        "cssnano": "^6.0.1",
+        "jest-worker": "^29.4.3",
+        "postcss": "^8.4.24",
+        "schema-utils": "^4.0.1",
+        "serialize-javascript": "^6.0.1"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@parcel/css": {
+          "optional": true
+        },
+        "@swc/css": {
+          "optional": true
+        },
+        "clean-css": {
+          "optional": true
+        },
+        "csso": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/css-prefers-color-scheme": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-10.0.0.tgz",
+      "integrity": "sha512-VCtXZAWivRglTZditUfB4StnsWr6YVZ2PRtuxQLKTNRdtAf8tpzaVPE9zXIF3VaSc7O70iK/j1+NXxyQCqdPjQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz",
+      "integrity": "sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-tree": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mdn-data": "2.0.30",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz",
+      "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/cssdb": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-8.4.2.tgz",
+      "integrity": "sha512-PzjkRkRUS+IHDJohtxkIczlxPPZqRo0nXplsYXOMBRPjcVRjj1W4DfvRgshUYTVuUigU7ptVYkFJQ7abUB0nyg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        }
+      ],
+      "license": "MIT-0"
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cssnano": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.1.2.tgz",
+      "integrity": "sha512-rYk5UeX7VAM/u0lNqewCdasdtPK81CgX8wJFLEIXHbV2oldWRgJAsZrdhRXkV1NJzA2g850KiFm9mMU2HxNxMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssnano-preset-default": "^6.1.2",
+        "lilconfig": "^3.1.1"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/cssnano"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/cssnano-preset-advanced": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-advanced/-/cssnano-preset-advanced-6.1.2.tgz",
+      "integrity": "sha512-Nhao7eD8ph2DoHolEzQs5CfRpiEP0xa1HBdnFZ82kvqdmbwVBUr2r1QuQ4t1pi+D1ZpqpcO4T+wy/7RxzJ/WPQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "autoprefixer": "^10.4.19",
+        "browserslist": "^4.23.0",
+        "cssnano-preset-default": "^6.1.2",
+        "postcss-discard-unused": "^6.0.5",
+        "postcss-merge-idents": "^6.0.3",
+        "postcss-reduce-idents": "^6.0.3",
+        "postcss-zindex": "^6.0.2"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/cssnano-preset-default": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.1.2.tgz",
+      "integrity": "sha512-1C0C+eNaeN8OcHQa193aRgYexyJtU8XwbdieEjClw+J9d94E41LwT6ivKH0WT+fYwYWB0Zp3I3IZ7tI/BbUbrg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "css-declaration-sorter": "^7.2.0",
+        "cssnano-utils": "^4.0.2",
+        "postcss-calc": "^9.0.1",
+        "postcss-colormin": "^6.1.0",
+        "postcss-convert-values": "^6.1.0",
+        "postcss-discard-comments": "^6.0.2",
+        "postcss-discard-duplicates": "^6.0.3",
+        "postcss-discard-empty": "^6.0.3",
+        "postcss-discard-overridden": "^6.0.2",
+        "postcss-merge-longhand": "^6.0.5",
+        "postcss-merge-rules": "^6.1.1",
+        "postcss-minify-font-values": "^6.1.0",
+        "postcss-minify-gradients": "^6.0.3",
+        "postcss-minify-params": "^6.1.0",
+        "postcss-minify-selectors": "^6.0.4",
+        "postcss-normalize-charset": "^6.0.2",
+        "postcss-normalize-display-values": "^6.0.2",
+        "postcss-normalize-positions": "^6.0.2",
+        "postcss-normalize-repeat-style": "^6.0.2",
+        "postcss-normalize-string": "^6.0.2",
+        "postcss-normalize-timing-functions": "^6.0.2",
+        "postcss-normalize-unicode": "^6.1.0",
+        "postcss-normalize-url": "^6.0.2",
+        "postcss-normalize-whitespace": "^6.0.2",
+        "postcss-ordered-values": "^6.0.2",
+        "postcss-reduce-initial": "^6.1.0",
+        "postcss-reduce-transforms": "^6.0.2",
+        "postcss-svgo": "^6.0.3",
+        "postcss-unique-selectors": "^6.0.4"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/cssnano-utils": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.2.tgz",
+      "integrity": "sha512-ZR1jHg+wZ8o4c3zqf1SIUSTIvm/9mU343FMR6Obe/unskbvpGhZOo1J6d/r8D1pzkRQYuwbcH3hToOuoA2G7oQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/csso": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
+      "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "css-tree": "~2.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
+    "node_modules/csso/node_modules/css-tree": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
+      "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mdn-data": "2.0.28",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
+      }
+    },
+    "node_modules/csso/node_modules/mdn-data": {
+      "version": "2.0.28",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
+      "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
+    "node_modules/csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/debounce": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
+      "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decode-named-character-reference": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.2.0.tgz",
+      "integrity": "sha512-c6fcElNV6ShtZXmsgNgFFV5tVX2PaV4g+MOAkb8eXHvn6sryJBrZa9r0zV6+dtTyoCKxtDy5tyQ5ZwQuidtd+Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "character-entities": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/decompress-response/node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-browser": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
+      "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bundle-name": "^4.1.0",
+        "default-browser-id": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser-id": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz",
+      "integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/defer-to-connect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
+      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/detect-node": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/detect-port": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.6.1.tgz",
+      "integrity": "sha512-CmnVc+Hek2egPx1PeTFVta2W78xy2K/9Rkf6cC4T59S50tVnzKj+tnx5mmx5lwvCkujZ4uRrpRSuV+IVs3f90Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "address": "^1.0.1",
+        "debug": "4"
+      },
+      "bin": {
+        "detect": "bin/detect-port.js",
+        "detect-port": "bin/detect-port.js"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/devlop": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
+      "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dequal": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dns-packet": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
+      "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@leichtgewicht/ip-codec": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "utila": "~0.4"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "domelementtype": "^2.3.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
+      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/dot-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/dot-prop": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz",
+      "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-obj": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/dot-prop/node_modules/is-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/duplexer": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.224",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.224.tgz",
+      "integrity": "sha512-kWAoUu/bwzvnhpdZSIc6KUyvkI1rbRXMT0Eq8pKReyOyaPZcctMli+EgvcN1PAvwVc7Tdo4Fxi2PsLNDU05mdg==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/emojilib": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/emojilib/-/emojilib-2.4.0.tgz",
+      "integrity": "sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/emoticon": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/emoticon/-/emoticon-4.1.0.tgz",
+      "integrity": "sha512-VWZfnxqwNcc51hIy/sbOdEem6D+cVtpPzEEtVAFdaas30+1dgkyaOQ4sQ6Bp0tOMqWO1v+HQfYaoodOkdhK6SQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.18.3",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz",
+      "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
+      "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
+      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/esast-util-from-estree": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/esast-util-from-estree/-/esast-util-from-estree-2.0.0.tgz",
+      "integrity": "sha512-4CyanoAudUSBAn5K13H4JhsMH6L9ZP7XbLVe/dKybkxMO7eDyLsT8UHl9TRNrU2Gr9nz+FovfSIjuXWJ81uVwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree-jsx": "^1.0.0",
+        "devlop": "^1.0.0",
+        "estree-util-visit": "^2.0.0",
+        "unist-util-position-from-estree": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/esast-util-from-js": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/esast-util-from-js/-/esast-util-from-js-2.0.1.tgz",
+      "integrity": "sha512-8Ja+rNJ0Lt56Pcf3TAmpBZjmx8ZcK5Ts4cAzIOjsjevg9oSXJnl6SUQ2EevU8tv3h6ZLWmoKL5H4fgWvdvfETw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree-jsx": "^1.0.0",
+        "acorn": "^8.0.0",
+        "esast-util-from-estree": "^2.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-goat": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz",
+      "integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estree-util-attach-comments": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/estree-util-attach-comments/-/estree-util-attach-comments-3.0.0.tgz",
+      "integrity": "sha512-cKUwm/HUcTDsYh/9FgnuFqpfquUbwIqwKM26BVCGDPVgvaCl/nDCCjUfiLlx6lsEZ3Z4RFxNbOQ60pkaEwFxGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/estree-util-build-jsx": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/estree-util-build-jsx/-/estree-util-build-jsx-3.0.1.tgz",
+      "integrity": "sha512-8U5eiL6BTrPxp/CHbs2yMgP8ftMhR5ww1eIKoWRMlqvltHF8fZn5LRDvTKuxD3DUn+shRbLGqXemcP51oFCsGQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree-jsx": "^1.0.0",
+        "devlop": "^1.0.0",
+        "estree-util-is-identifier-name": "^3.0.0",
+        "estree-walker": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/estree-util-is-identifier-name": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-3.0.0.tgz",
+      "integrity": "sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/estree-util-scope": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/estree-util-scope/-/estree-util-scope-1.0.0.tgz",
+      "integrity": "sha512-2CAASclonf+JFWBNJPndcOpA8EMJwa0Q8LUFJEKqXLW6+qBvbFZuF5gItbQOs/umBUkjviCSDCbBwU2cXbmrhQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "devlop": "^1.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/estree-util-to-js": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/estree-util-to-js/-/estree-util-to-js-2.0.0.tgz",
+      "integrity": "sha512-WDF+xj5rRWmD5tj6bIqRi6CkLIXbbNQUcxQHzGysQzvHmdYG2G7p/Tf0J0gpxGgkeMZNTIjT/AoSvC9Xehcgdg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree-jsx": "^1.0.0",
+        "astring": "^1.8.0",
+        "source-map": "^0.7.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/estree-util-value-to-estree": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/estree-util-value-to-estree/-/estree-util-value-to-estree-3.4.0.tgz",
+      "integrity": "sha512-Zlp+gxis+gCfK12d3Srl2PdX2ybsEA8ZYy6vQGVQTNNYLEGRQQ56XB64bjemN8kxIKXP1nC9ip4Z+ILy9LGzvQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/remcohaszing"
+      }
+    },
+    "node_modules/estree-util-visit": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/estree-util-visit/-/estree-util-visit-2.0.0.tgz",
+      "integrity": "sha512-m5KgiH85xAhhW8Wta0vShLcUvOsh3LLPI2YVwcbio1l7E09NTLL1EyMZFM1OyWowoH0skScNbhOPl4kcBgzTww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree-jsx": "^1.0.0",
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eta": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/eta/-/eta-2.2.0.tgz",
+      "integrity": "sha512-UVQ72Rqjy/ZKQalzV5dCCJP80GrmPrMxh6NlNf+erV6ObL0ZFkhCstWRawS85z3smdr3d2wXPsZEY7rDPfGd2g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/eta-dev/eta?sponsor=1"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/eval": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/eval/-/eval-0.1.8.tgz",
+      "integrity": "sha512-EzV94NYKoO09GLXGjXj9JIlXijVck4ONSr5wiCWDvhsvj5jxSrzTmRU/9C1DyB6uToszLs8aifA6NQ7lEQdvFw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "require-like": ">= 0.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/eventsource-parser": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.6.tgz",
+      "integrity": "sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/express": {
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.3",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.7.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~2.0.0",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.3.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.3",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.12",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.13.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "node_modules/express/node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/express/node_modules/path-to-regexp": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/express/node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.8"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
+      "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/fastq": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/fault": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fault/-/fault-2.0.1.tgz",
+      "integrity": "sha512-WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "format": "^0.2.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/faye-websocket": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/feed": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/feed/-/feed-4.2.2.tgz",
+      "integrity": "sha512-u5/sxGfiMfZNtJ3OvQpXcvotFpYkL0n9u9mM2vkui2nGo8b4wvDkJ8gAkYqbA8QpGyFCv3RK0Z+Iv+9veCS9bQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "xml-js": "^1.6.11"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/figures/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/file-loader": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/file-loader/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/file-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/file-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/file-loader/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~2.0.0",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/find-cache-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
+      "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "common-path-prefix": "^3.0.0",
+        "pkg-dir": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+      "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^7.1.0",
+        "path-exists": "^5.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.11",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
+      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/form-data-encoder": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz",
+      "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.17"
+      }
+    },
+    "node_modules/format": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
+      "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fraction.js": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+      "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://github.com/sponsors/rawify"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "11.3.2",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz",
+      "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-own-enumerable-property-symbols": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
+      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/github-slugger": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.5.0.tgz",
+      "integrity": "sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/glob-to-regex.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regex.js/-/glob-to-regex.js-1.0.1.tgz",
+      "integrity": "sha512-CG/iEvgQqfzoVsMUbxSJcwbG2JwyZ3naEqPkeltwl0BSS8Bp83k3xlGms+0QdWFUAwV+uvo80wNswKF6FWEkKg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/global-dirs": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
+      "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ini": "2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/got": {
+      "version": "12.6.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz",
+      "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sindresorhus/is": "^5.2.0",
+        "@szmarczak/http-timer": "^5.0.1",
+        "cacheable-lookup": "^7.0.0",
+        "cacheable-request": "^10.2.8",
+        "decompress-response": "^6.0.0",
+        "form-data-encoder": "^2.1.2",
+        "get-stream": "^6.0.1",
+        "http2-wrapper": "^2.1.10",
+        "lowercase-keys": "^3.0.0",
+        "p-cancelable": "^3.0.0",
+        "responselike": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
+      }
+    },
+    "node_modules/got/node_modules/@sindresorhus/is": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz",
+      "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/gray-matter": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.3.tgz",
+      "integrity": "sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "js-yaml": "^3.13.1",
+        "kind-of": "^6.0.2",
+        "section-matter": "^1.0.0",
+        "strip-bom-string": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/gray-matter/node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/gray-matter/node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/gzip-size": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "duplexer": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/handle-thing": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-yarn": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-3.0.0.tgz",
+      "integrity": "sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hast-util-from-dom": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/hast-util-from-dom/-/hast-util-from-dom-5.0.1.tgz",
+      "integrity": "sha512-N+LqofjR2zuzTjCPzyDUdSshy4Ma6li7p/c3pA78uTwzFgENbgbUrm2ugwsOdcjI1muO+o6Dgzp9p8WHtn/39Q==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "hastscript": "^9.0.0",
+        "web-namespaces": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-from-html": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/hast-util-from-html/-/hast-util-from-html-2.0.3.tgz",
+      "integrity": "sha512-CUSRHXyKjzHov8yKsQjGOElXy/3EKpyX56ELnkHH34vDVw1N1XSQ1ZcAvTyAPtGqLTuKP/uxM+aLkSPqF/EtMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "devlop": "^1.1.0",
+        "hast-util-from-parse5": "^8.0.0",
+        "parse5": "^7.0.0",
+        "vfile": "^6.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-from-html-isomorphic": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-from-html-isomorphic/-/hast-util-from-html-isomorphic-2.0.0.tgz",
+      "integrity": "sha512-zJfpXq44yff2hmE0XmwEOzdWin5xwH+QIhMLOScpX91e/NSGPsAzNCvLQDIEPyO2TXi+lBmU6hjLIhV8MwP2kw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "hast-util-from-dom": "^5.0.0",
+        "hast-util-from-html": "^2.0.0",
+        "unist-util-remove-position": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-from-parse5": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-8.0.3.tgz",
+      "integrity": "sha512-3kxEVkEKt0zvcZ3hCRYI8rqrgwtlIOFMWkbclACvjlDw8Li9S2hk/d51OI0nr/gIpdMHNepwgOKqZ/sy0Clpyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/unist": "^3.0.0",
+        "devlop": "^1.0.0",
+        "hastscript": "^9.0.0",
+        "property-information": "^7.0.0",
+        "vfile": "^6.0.0",
+        "vfile-location": "^5.0.0",
+        "web-namespaces": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-is-element": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz",
+      "integrity": "sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-parse-selector": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-4.0.0.tgz",
+      "integrity": "sha512-wkQCkSYoOGCRKERFWcxMVMOcYE2K1AaNLU8DXS9arxnLOUEWbOXKXiJUNzEpqZ3JOKpnha3jkFrumEjVliDe7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-raw": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-9.1.0.tgz",
+      "integrity": "sha512-Y8/SBAHkZGoNkpzqqfCldijcuUKh7/su31kEBp67cFY09Wy0mTRgtsLYsiIxMJxlu0f6AA5SUTbDR8K0rxnbUw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/unist": "^3.0.0",
+        "@ungap/structured-clone": "^1.0.0",
+        "hast-util-from-parse5": "^8.0.0",
+        "hast-util-to-parse5": "^8.0.0",
+        "html-void-elements": "^3.0.0",
+        "mdast-util-to-hast": "^13.0.0",
+        "parse5": "^7.0.0",
+        "unist-util-position": "^5.0.0",
+        "unist-util-visit": "^5.0.0",
+        "vfile": "^6.0.0",
+        "web-namespaces": "^2.0.0",
+        "zwitch": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-to-estree": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/hast-util-to-estree/-/hast-util-to-estree-3.1.3.tgz",
+      "integrity": "sha512-48+B/rJWAp0jamNbAAf9M7Uf//UVqAoMmgXhBdxTDJLGKY+LRnZ99qcG+Qjl5HfMpYNzS5v4EAwVEF34LeAj7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "@types/estree-jsx": "^1.0.0",
+        "@types/hast": "^3.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "devlop": "^1.0.0",
+        "estree-util-attach-comments": "^3.0.0",
+        "estree-util-is-identifier-name": "^3.0.0",
+        "hast-util-whitespace": "^3.0.0",
+        "mdast-util-mdx-expression": "^2.0.0",
+        "mdast-util-mdx-jsx": "^3.0.0",
+        "mdast-util-mdxjs-esm": "^2.0.0",
+        "property-information": "^7.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "style-to-js": "^1.0.0",
+        "unist-util-position": "^5.0.0",
+        "zwitch": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-to-jsx-runtime": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/hast-util-to-jsx-runtime/-/hast-util-to-jsx-runtime-2.3.6.tgz",
+      "integrity": "sha512-zl6s8LwNyo1P9uw+XJGvZtdFF1GdAkOg8ujOw+4Pyb76874fLps4ueHXDhXWdk6YHQ6OgUtinliG7RsYvCbbBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "@types/hast": "^3.0.0",
+        "@types/unist": "^3.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "devlop": "^1.0.0",
+        "estree-util-is-identifier-name": "^3.0.0",
+        "hast-util-whitespace": "^3.0.0",
+        "mdast-util-mdx-expression": "^2.0.0",
+        "mdast-util-mdx-jsx": "^3.0.0",
+        "mdast-util-mdxjs-esm": "^2.0.0",
+        "property-information": "^7.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "style-to-js": "^1.0.0",
+        "unist-util-position": "^5.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-to-parse5": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-8.0.0.tgz",
+      "integrity": "sha512-3KKrV5ZVI8if87DVSi1vDeByYrkGzg4mEfeu4alwgmmIeARiBLKCZS2uw5Gb6nU9x9Yufyj3iudm6i7nl52PFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "devlop": "^1.0.0",
+        "property-information": "^6.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "web-namespaces": "^2.0.0",
+        "zwitch": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-to-parse5/node_modules/property-information": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz",
+      "integrity": "sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/hast-util-to-text": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/hast-util-to-text/-/hast-util-to-text-4.0.2.tgz",
+      "integrity": "sha512-KK6y/BN8lbaq654j7JgBydev7wuNMcID54lkRav1P0CaE1e47P72AWWPiGKXTJU271ooYzcvTAn/Zt0REnvc7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/unist": "^3.0.0",
+        "hast-util-is-element": "^3.0.0",
+        "unist-util-find-after": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-whitespace": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
+      "integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hastscript": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-9.0.1.tgz",
+      "integrity": "sha512-g7df9rMFX/SPi34tyGCyUBREQoKkapwdY/T04Qn9TDWfHhAYt4/I0gMVirzK5wEzeUqIjEB+LXC/ypb7Aqno5w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "hast-util-parse-selector": "^4.0.0",
+        "property-information": "^7.0.0",
+        "space-separated-tokens": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/history": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
+      "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.1.2",
+        "loose-envify": "^1.2.0",
+        "resolve-pathname": "^3.0.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0",
+        "value-equal": "^1.0.1"
+      }
+    },
+    "node_modules/hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "react-is": "^16.7.0"
+      }
+    },
+    "node_modules/hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "node_modules/hpack.js/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/hpack.js/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/hpack.js/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/hpack.js/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/html-minifier-terser": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.2.0.tgz",
+      "integrity": "sha512-tXgn3QfqPIpGl9o+K5tpcj3/MN4SfLtsx2GWwBC3SSd0tXQGyF3gsSqad8loJgKZGM3ZxbYDd5yhiBIdWpmvLA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "camel-case": "^4.1.2",
+        "clean-css": "~5.3.2",
+        "commander": "^10.0.0",
+        "entities": "^4.4.0",
+        "param-case": "^3.0.4",
+        "relateurl": "^0.2.7",
+        "terser": "^5.15.1"
+      },
+      "bin": {
+        "html-minifier-terser": "cli.js"
+      },
+      "engines": {
+        "node": "^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/html-minifier-terser/node_modules/commander": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/html-tags": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
+      "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/html-void-elements": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz",
+      "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/html-webpack-plugin": {
+      "version": "5.6.4",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.4.tgz",
+      "integrity": "sha512-V/PZeWsqhfpE27nKeX9EO2sbR+D17A+tLf6qU+ht66jdUsN0QLKJN27Z+1+gHrVMKgndBahes0PU6rRihDgHTw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/html-minifier-terser": "^6.0.0",
+        "html-minifier-terser": "^6.0.2",
+        "lodash": "^4.17.21",
+        "pretty-error": "^4.0.0",
+        "tapable": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/html-webpack-plugin"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "webpack": "^5.20.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/html-webpack-plugin/node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/html-webpack-plugin/node_modules/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "camel-case": "^4.1.2",
+        "clean-css": "^5.2.2",
+        "commander": "^8.3.0",
+        "he": "^1.2.0",
+        "param-case": "^3.0.4",
+        "relateurl": "^0.2.7",
+        "terser": "^5.10.0"
+      },
+      "bin": {
+        "html-minifier-terser": "cli.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/htmlparser2": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
+      "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.0.1",
+        "entities": "^4.4.0"
+      }
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
+      "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-parser-js": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz",
+      "integrity": "sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/http-proxy-middleware": {
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz",
+      "integrity": "sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/http2-wrapper": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
+      "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/hyperdyperid": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz",
+      "integrity": "sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.18"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/icss-utils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/image-size": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-2.0.2.tgz",
+      "integrity": "sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "image-size": "bin/image-size.js"
+      },
+      "engines": {
+        "node": ">=16.x"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-lazy": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/infima": {
+      "version": "0.2.0-alpha.45",
+      "resolved": "https://registry.npmjs.org/infima/-/infima-0.2.0-alpha.45.tgz",
+      "integrity": "sha512-uyH0zfr1erU1OohLk0fT4Rrb94AOhguWNOcD9uGrSpRvNB+6gZXUoJX5J0NtvzBO10YZ9PgvA4NFgt+fYg8ojw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/ini": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
+      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/inline-style-parser": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.2.4.tgz",
+      "integrity": "sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "node_modules/ipaddr.js": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
+      "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/is-alphabetical": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-2.0.1.tgz",
+      "integrity": "sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/is-alphanumerical": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-2.0.1.tgz",
+      "integrity": "sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-alphabetical": "^2.0.0",
+        "is-decimal": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-ci": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
+      "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ci-info": "^3.2.0"
+      },
+      "bin": {
+        "is-ci": "bin.js"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-decimal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-2.0.1.tgz",
+      "integrity": "sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-hexadecimal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz",
+      "integrity": "sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/is-inside-container": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
+      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^3.0.0"
+      },
+      "bin": {
+        "is-inside-container": "cli.js"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-inside-container/node_modules/is-docker": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-installed-globally": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
+      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "global-dirs": "^3.0.0",
+        "is-path-inside": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-network-error": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.3.0.tgz",
+      "integrity": "sha512-6oIwpsgRfnDiyEDLMay/GqCl3HoAtH5+RUKW29gYkL0QA+ipzpDLA16yQs7/RHCSu+BwgbJaOUqa4A99qNVQVw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-npm": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-6.1.0.tgz",
+      "integrity": "sha512-O2z4/kNgyjhQwVR1Wpkbfc19JIhggF97NZNCpWTnjH7kVcZMUrnut9XSN7txI7VdyIYk5ZatOq3zvSuWpU8hoA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
+      "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-yarn-global": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.4.1.tgz",
+      "integrity": "sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.7.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jiti": {
+      "version": "1.21.7",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
+      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jiti": "bin/jiti.js"
+      }
+    },
+    "node_modules/joi": {
+      "version": "17.13.3",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz",
+      "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/hoek": "^9.3.0",
+        "@hapi/topo": "^5.1.0",
+        "@sideway/address": "^4.1.5",
+        "@sideway/formula": "^3.0.1",
+        "@sideway/pinpoint": "^2.0.0"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-schema": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
+      "dev": true,
+      "license": "(AFL-2.1 OR BSD-3-Clause)"
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/katex": {
+      "version": "0.16.22",
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.22.tgz",
+      "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==",
+      "dev": true,
+      "funding": [
+        "https://opencollective.com/katex",
+        "https://github.com/sponsors/katex"
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "commander": "^8.3.0"
+      },
+      "bin": {
+        "katex": "cli.js"
+      }
+    },
+    "node_modules/katex/node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/latest-version": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-7.0.0.tgz",
+      "integrity": "sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "package-json": "^8.1.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/launch-editor": {
+      "version": "2.11.1",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.11.1.tgz",
+      "integrity": "sha512-SEET7oNfgSaB6Ym0jufAdCeo3meJVeCaaDyzRygy0xsp2BFKCprcfHljTq4QkzTLUxEKkFK6OK4811YM2oSrRg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picocolors": "^1.1.1",
+        "shell-quote": "^1.8.3"
+      }
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/lilconfig": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
+      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antonk52"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+      "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^6.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/longest-streak": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz",
+      "integrity": "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/lower-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/lowercase-keys": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
+      "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/markdown-extensions": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-2.0.0.tgz",
+      "integrity": "sha512-o5vL7aDWatOTX8LzaS1WMoaoxIiLRQJuIKKe2wAw6IeULDHaqbiqiggmx+pKvZDb1Sj+pE46Sn1T7lCqfFtg1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/markdown-table": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.4.tgz",
+      "integrity": "sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/marked": {
+      "version": "16.3.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-16.3.0.tgz",
+      "integrity": "sha512-K3UxuKu6l6bmA5FUwYho8CfJBlsUWAooKtdGgMcERSpF7gcBUrCGsLH7wDaaNOzwq18JzSUDyoEb/YsrqMac3w==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/mdast-util-directive": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-directive/-/mdast-util-directive-3.1.0.tgz",
+      "integrity": "sha512-I3fNFt+DHmpWCYAT7quoM6lHf9wuqtI+oCOfvILnoicNIqjh5E3dEJWiXuYME2gNe8vl1iMQwyUHa7bgFmak6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "@types/unist": "^3.0.0",
+        "ccount": "^2.0.0",
+        "devlop": "^1.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0",
+        "parse-entities": "^4.0.0",
+        "stringify-entities": "^4.0.0",
+        "unist-util-visit-parents": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-find-and-replace": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-3.0.2.tgz",
+      "integrity": "sha512-Tmd1Vg/m3Xz43afeNxDIhWRtFZgM2VLyaf4vSTYwudTyeuTneoL3qtWMA5jeLyz/O1vDJmmV4QuScFCA2tBPwg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "escape-string-regexp": "^5.0.0",
+        "unist-util-is": "^6.0.0",
+        "unist-util-visit-parents": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-find-and-replace/node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mdast-util-from-markdown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.2.tgz",
+      "integrity": "sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "@types/unist": "^3.0.0",
+        "decode-named-character-reference": "^1.0.0",
+        "devlop": "^1.0.0",
+        "mdast-util-to-string": "^4.0.0",
+        "micromark": "^4.0.0",
+        "micromark-util-decode-numeric-character-reference": "^2.0.0",
+        "micromark-util-decode-string": "^2.0.0",
+        "micromark-util-normalize-identifier": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0",
+        "unist-util-stringify-position": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-from-markdown/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/mdast-util-frontmatter": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-2.0.1.tgz",
+      "integrity": "sha512-LRqI9+wdgC25P0URIJY9vwocIzCcksduHQ9OF2joxQoyTNVduwLAFUzjoopuRJbJAReaKrNQKAZKL3uCMugWJA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "devlop": "^1.0.0",
+        "escape-string-regexp": "^5.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0",
+        "micromark-extension-frontmatter": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-frontmatter/node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mdast-util-gfm": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-3.1.0.tgz",
+      "integrity": "sha512-0ulfdQOM3ysHhCJ1p06l0b0VKlhU0wuQs3thxZQagjcjPrlFRqY215uZGHHJan9GEAXd9MbfPjFJz+qMkVR6zQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-gfm-autolink-literal": "^2.0.0",
+        "mdast-util-gfm-footnote": "^2.0.0",
+        "mdast-util-gfm-strikethrough": "^2.0.0",
+        "mdast-util-gfm-table": "^2.0.0",
+        "mdast-util-gfm-task-list-item": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-autolink-literal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-2.0.1.tgz",
+      "integrity": "sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "ccount": "^2.0.0",
+        "devlop": "^1.0.0",
+        "mdast-util-find-and-replace": "^3.0.0",
+        "micromark-util-character": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-autolink-literal/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/mdast-util-gfm-autolink-literal/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/mdast-util-gfm-footnote": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-2.1.0.tgz",
+      "integrity": "sha512-sqpDWlsHn7Ac9GNZQMeUzPQSMzR6Wv0WKRNvQRg0KqHh02fpTz69Qc1QSseNX29bhz1ROIyNyxExfawVKTm1GQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "devlop": "^1.1.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0",
+        "micromark-util-normalize-identifier": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-strikethrough": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-2.0.0.tgz",
+      "integrity": "sha512-mKKb915TF+OC5ptj5bJ7WFRPdYtuHv0yTRxK2tJvi+BDqbkiG7h7u/9SI89nRAYcmap2xHQL9D+QG/6wSrTtXg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-table": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-2.0.0.tgz",
+      "integrity": "sha512-78UEvebzz/rJIxLvE7ZtDd/vIQ0RHv+3Mh5DR96p7cS7HsBhYIICDBCu8csTNWNO6tBWfqXPWekRuj2FNOGOZg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "devlop": "^1.0.0",
+        "markdown-table": "^3.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-task-list-item": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-2.0.0.tgz",
+      "integrity": "sha512-IrtvNvjxC1o06taBAVJznEnkiHxLFTzgonUdy8hzFVeDun0uTjxxrRGVaNFqkU1wJR3RBPEfsxmU6jDWPofrTQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "devlop": "^1.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-math": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-math/-/mdast-util-math-3.0.0.tgz",
+      "integrity": "sha512-Tl9GBNeG/AhJnQM221bJR2HPvLOSnLE/T9cJI9tlc6zwQk2nPk/4f0cHkOdEixQPC/j8UtKDdITswvLAy1OZ1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/mdast": "^4.0.0",
+        "devlop": "^1.0.0",
+        "longest-streak": "^3.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.1.0",
+        "unist-util-remove-position": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-mdx": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-mdx/-/mdast-util-mdx-3.0.0.tgz",
+      "integrity": "sha512-JfbYLAW7XnYTTbUsmpu0kdBUVe+yKVJZBItEjwyYJiDJuZ9w4eeaqks4HQO+R7objWgS2ymV60GYpI14Ug554w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-mdx-expression": "^2.0.0",
+        "mdast-util-mdx-jsx": "^3.0.0",
+        "mdast-util-mdxjs-esm": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-mdx-expression": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-2.0.1.tgz",
+      "integrity": "sha512-J6f+9hUp+ldTZqKRSg7Vw5V6MqjATc+3E4gf3CFNcuZNWD8XdyI6zQ8GqH7f8169MM6P7hMBRDVGnn7oHB9kXQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree-jsx": "^1.0.0",
+        "@types/hast": "^3.0.0",
+        "@types/mdast": "^4.0.0",
+        "devlop": "^1.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-mdx-jsx": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-3.2.0.tgz",
+      "integrity": "sha512-lj/z8v0r6ZtsN/cGNNtemmmfoLAFZnjMbNyLzBafjzikOM+glrjNHPlf6lQDOTccj9n5b0PPihEBbhneMyGs1Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree-jsx": "^1.0.0",
+        "@types/hast": "^3.0.0",
+        "@types/mdast": "^4.0.0",
+        "@types/unist": "^3.0.0",
+        "ccount": "^2.0.0",
+        "devlop": "^1.1.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0",
+        "parse-entities": "^4.0.0",
+        "stringify-entities": "^4.0.0",
+        "unist-util-stringify-position": "^4.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-mdxjs-esm": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-2.0.1.tgz",
+      "integrity": "sha512-EcmOpxsZ96CvlP03NghtH1EsLtr0n9Tm4lPUJUBccV9RwUOneqSycg19n5HGzCf+10LozMRSObtVr3ee1WoHtg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree-jsx": "^1.0.0",
+        "@types/hast": "^3.0.0",
+        "@types/mdast": "^4.0.0",
+        "devlop": "^1.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-phrasing": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-4.1.0.tgz",
+      "integrity": "sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "unist-util-is": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-to-hast": {
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz",
+      "integrity": "sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/mdast": "^4.0.0",
+        "@ungap/structured-clone": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "trim-lines": "^3.0.0",
+        "unist-util-position": "^5.0.0",
+        "unist-util-visit": "^5.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-to-markdown": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.2.tgz",
+      "integrity": "sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "@types/unist": "^3.0.0",
+        "longest-streak": "^3.0.0",
+        "mdast-util-phrasing": "^4.0.0",
+        "mdast-util-to-string": "^4.0.0",
+        "micromark-util-classify-character": "^2.0.0",
+        "micromark-util-decode-string": "^2.0.0",
+        "unist-util-visit": "^5.0.0",
+        "zwitch": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-to-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-4.0.0.tgz",
+      "integrity": "sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdn-data": {
+      "version": "2.0.30",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/memfs": {
+      "version": "4.46.1",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.46.1.tgz",
+      "integrity": "sha512-2wjHDg7IjP+ufAqqqSxjiNePFDrvWviA79ajUwG9lkHhk3HzZOLBzzoUG8cx9vCagj6VvBQD7oXuLuFz5LaAOQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@jsonjoy.com/json-pack": "^1.11.0",
+        "@jsonjoy.com/util": "^1.9.0",
+        "glob-to-regex.js": "^1.0.1",
+        "thingies": "^2.5.0",
+        "tree-dump": "^1.0.3",
+        "tslib": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromark": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.2.tgz",
+      "integrity": "sha512-zpe98Q6kvavpCr1NPVSCMebCKfD7CA2NqZ+rykeNhONIJBpc1tFKt9hucLGwha3jNTNI8lHpctWJWoimVF4PfA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@types/debug": "^4.0.0",
+        "debug": "^4.0.0",
+        "decode-named-character-reference": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-core-commonmark": "^2.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-chunked": "^2.0.0",
+        "micromark-util-combine-extensions": "^2.0.0",
+        "micromark-util-decode-numeric-character-reference": "^2.0.0",
+        "micromark-util-encode": "^2.0.0",
+        "micromark-util-normalize-identifier": "^2.0.0",
+        "micromark-util-resolve-all": "^2.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "micromark-util-subtokenize": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-core-commonmark": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-2.0.3.tgz",
+      "integrity": "sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "decode-named-character-reference": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-factory-destination": "^2.0.0",
+        "micromark-factory-label": "^2.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-factory-title": "^2.0.0",
+        "micromark-factory-whitespace": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-chunked": "^2.0.0",
+        "micromark-util-classify-character": "^2.0.0",
+        "micromark-util-html-tag-name": "^2.0.0",
+        "micromark-util-normalize-identifier": "^2.0.0",
+        "micromark-util-resolve-all": "^2.0.0",
+        "micromark-util-subtokenize": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-core-commonmark/node_modules/micromark-factory-space": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
+      "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-core-commonmark/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-core-commonmark/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-extension-directive": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-extension-directive/-/micromark-extension-directive-3.0.2.tgz",
+      "integrity": "sha512-wjcXHgk+PPdmvR58Le9d7zQYWy+vKEU9Se44p2CrCDPiLr2FMyiT4Fyb5UFKFC66wGB3kPlgD7q3TnoqPS7SZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-factory-whitespace": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0",
+        "parse-entities": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-directive/node_modules/micromark-factory-space": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
+      "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-directive/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-directive/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-extension-frontmatter": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-frontmatter/-/micromark-extension-frontmatter-2.0.0.tgz",
+      "integrity": "sha512-C4AkuM3dA58cgZha7zVnuVxBhDsbttIMiytjgsM2XbHAB2faRVaHRle40558FBN+DJcrLNCoqG5mlrpdU4cRtg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fault": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-frontmatter/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-frontmatter/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-extension-gfm": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-3.0.0.tgz",
+      "integrity": "sha512-vsKArQsicm7t0z2GugkCKtZehqUm31oeGBV/KVSorWSy8ZlNAv7ytjFhvaryUiCUJYqs+NoE6AFhpQvBTM6Q4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "micromark-extension-gfm-autolink-literal": "^2.0.0",
+        "micromark-extension-gfm-footnote": "^2.0.0",
+        "micromark-extension-gfm-strikethrough": "^2.0.0",
+        "micromark-extension-gfm-table": "^2.0.0",
+        "micromark-extension-gfm-tagfilter": "^2.0.0",
+        "micromark-extension-gfm-task-list-item": "^2.0.0",
+        "micromark-util-combine-extensions": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-autolink-literal": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-2.1.0.tgz",
+      "integrity": "sha512-oOg7knzhicgQ3t4QCjCWgTmfNhvQbDDnJeVu9v81r7NltNCVmhPy1fJRX27pISafdjL+SVc4d3l48Gb6pbRypw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-autolink-literal/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-gfm-autolink-literal/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-extension-gfm-footnote": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-2.1.0.tgz",
+      "integrity": "sha512-/yPhxI1ntnDNsiHtzLKYnE3vf9JZ6cAisqVDauhp4CEHxlb4uoOTxOCJ+9s51bIB8U1N1FJ1RXOKTIlD5B/gqw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-core-commonmark": "^2.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-normalize-identifier": "^2.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-footnote/node_modules/micromark-factory-space": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
+      "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-gfm-footnote/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-gfm-footnote/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-extension-gfm-strikethrough": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-2.1.0.tgz",
+      "integrity": "sha512-ADVjpOOkjz1hhkZLlBiYA9cR2Anf8F4HqZUO6e5eDcPQd0Txw5fxLzzxnEkSkfnD0wziSGiv7sYhk/ktvbf1uw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-util-chunked": "^2.0.0",
+        "micromark-util-classify-character": "^2.0.0",
+        "micromark-util-resolve-all": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-strikethrough/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-extension-gfm-table": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-2.1.1.tgz",
+      "integrity": "sha512-t2OU/dXXioARrC6yWfJ4hqB7rct14e8f7m0cbI5hUmDyyIlwv5vEtooptH8INkbLzOatzKuVbQmAYcbWoyz6Dg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-table/node_modules/micromark-factory-space": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
+      "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-gfm-table/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-gfm-table/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-extension-gfm-tagfilter": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-2.0.0.tgz",
+      "integrity": "sha512-xHlTOmuCSotIA8TW1mDIM6X2O1SiX5P9IuDtqGonFhEK0qgRI4yeC6vMxEV2dgyr2TiD+2PQ10o+cOhdVAcwfg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-task-list-item": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-2.1.0.tgz",
+      "integrity": "sha512-qIBZhqxqI6fjLDYFTBIa4eivDMnP+OZqsNwmQ3xNLE4Cxwc+zfQEfbs6tzAo2Hjq+bh6q5F+Z8/cksrLFYWQQw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-task-list-item/node_modules/micromark-factory-space": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
+      "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-gfm-task-list-item/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-gfm-task-list-item/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-extension-math": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-math/-/micromark-extension-math-3.1.0.tgz",
+      "integrity": "sha512-lvEqd+fHjATVs+2v/8kg9i5Q0AP2k85H0WUOwpIVvUML8BapsMvh1XAogmQjOCsLpoKRCVQqEkQBB3NhVBcsOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/katex": "^0.16.0",
+        "devlop": "^1.0.0",
+        "katex": "^0.16.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-math/node_modules/micromark-factory-space": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
+      "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-math/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-math/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-extension-mdx-expression": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-3.0.1.tgz",
+      "integrity": "sha512-dD/ADLJ1AeMvSAKBwO22zG22N4ybhe7kFIZ3LsDI0GlsNr2A3KYxb0LdC1u5rj4Nw+CHKY0RVdnHX8vj8ejm4Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-factory-mdx-expression": "^2.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-events-to-acorn": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-mdx-expression/node_modules/micromark-factory-space": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
+      "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-mdx-expression/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-mdx-expression/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-extension-mdx-jsx": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-3.0.2.tgz",
+      "integrity": "sha512-e5+q1DjMh62LZAJOnDraSSbDMvGJ8x3cbjygy2qFEi7HCeUT4BDKCvMozPozcD6WmOt6sVvYDNBKhFSz3kjOVQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "devlop": "^1.0.0",
+        "estree-util-is-identifier-name": "^3.0.0",
+        "micromark-factory-mdx-expression": "^2.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-events-to-acorn": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-mdx-jsx/node_modules/micromark-factory-space": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
+      "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-mdx-jsx/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-mdx-jsx/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-extension-mdx-md": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-mdx-md/-/micromark-extension-mdx-md-2.0.0.tgz",
+      "integrity": "sha512-EpAiszsB3blw4Rpba7xTOUptcFeBFi+6PY8VnJ2hhimH+vCQDirWgsMpz7w1XcZE7LVrSAUGb9VJpG9ghlYvYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-mdxjs": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-mdxjs/-/micromark-extension-mdxjs-3.0.0.tgz",
+      "integrity": "sha512-A873fJfhnJ2siZyUrJ31l34Uqwy4xIFmvPY1oj+Ean5PHcPBYzEsvqvWGaWcfEIr11O5Dlw3p2y0tZWpKHDejQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.0.0",
+        "acorn-jsx": "^5.0.0",
+        "micromark-extension-mdx-expression": "^3.0.0",
+        "micromark-extension-mdx-jsx": "^3.0.0",
+        "micromark-extension-mdx-md": "^2.0.0",
+        "micromark-extension-mdxjs-esm": "^3.0.0",
+        "micromark-util-combine-extensions": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-mdxjs-esm": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-mdxjs-esm/-/micromark-extension-mdxjs-esm-3.0.0.tgz",
+      "integrity": "sha512-DJFl4ZqkErRpq/dAPyeWp15tGrcrrJho1hKK5uBS70BCtfrIFg81sqcTVu3Ta+KD1Tk5vAtBNElWxtAa+m8K9A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-core-commonmark": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-events-to-acorn": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0",
+        "unist-util-position-from-estree": "^2.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-mdxjs-esm/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-mdxjs-esm/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-factory-destination": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-2.0.1.tgz",
+      "integrity": "sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-destination/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-destination/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-factory-label": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-2.0.1.tgz",
+      "integrity": "sha512-VFMekyQExqIW7xIChcXn4ok29YE3rnuyveW3wZQWWqF4Nv9Wk5rgJ99KzPvHjkmPXF93FXIbBp6YdW3t71/7Vg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-label/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-label/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-factory-mdx-expression": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-2.0.3.tgz",
+      "integrity": "sha512-kQnEtA3vzucU2BkrIa8/VaSAsP+EJ3CKOvhMuJgOEGg9KDC6OAY6nSnNDVRiVNRqj7Y4SlSzcStaH/5jge8JdQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-events-to-acorn": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0",
+        "unist-util-position-from-estree": "^2.0.0",
+        "vfile-message": "^4.0.0"
+      }
+    },
+    "node_modules/micromark-factory-mdx-expression/node_modules/micromark-factory-space": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
+      "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-mdx-expression/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-mdx-expression/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-factory-space": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-1.1.0.tgz",
+      "integrity": "sha512-cRzEj7c0OL4Mw2v6nwzttyOZe8XY/Z8G0rzmWQZTBi/jjwyw/U4uqKtUORXQrR5bAZZnbTI/feRV/R7hc4jQYQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "node_modules/micromark-factory-space/node_modules/micromark-util-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.1.0.tgz",
+      "integrity": "sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-factory-title": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-2.0.1.tgz",
+      "integrity": "sha512-5bZ+3CjhAd9eChYTHsjy6TGxpOFSKgKKJPJxr293jTbfry2KDoWkhBb6TcPVB4NmzaPhMs1Frm9AZH7OD4Cjzw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-title/node_modules/micromark-factory-space": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
+      "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-title/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-title/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-factory-whitespace": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-2.0.1.tgz",
+      "integrity": "sha512-Ob0nuZ3PKt/n0hORHyvoD9uZhr+Za8sFoP+OnMcnWK5lngSzALgQYKMr9RJVOWLqQYuyn6ulqGWSXdwf6F80lQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-whitespace/node_modules/micromark-factory-space": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
+      "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-whitespace/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-whitespace/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-character": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.2.0.tgz",
+      "integrity": "sha512-lXraTwcX3yH/vMDaFWCQJP1uIszLVebzUa3ZHdrgxr7KEU/9mL4mVgCpGbyhvNLNlauROiNUq7WN5u7ndbY6xg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "node_modules/micromark-util-character/node_modules/micromark-util-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.1.0.tgz",
+      "integrity": "sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-chunked": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-2.0.1.tgz",
+      "integrity": "sha512-QUNFEOPELfmvv+4xiNg2sRYeS/P84pTW0TCgP5zc9FpXetHY0ab7SxKyAQCNCc1eK0459uoLI1y5oO5Vc1dbhA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-chunked/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-classify-character": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-2.0.1.tgz",
+      "integrity": "sha512-K0kHzM6afW/MbeWYWLjoHQv1sgg2Q9EccHEDzSkxiP/EaagNzCm7T/WMKZ3rjMbvIpvBiZgwR3dKMygtA4mG1Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-classify-character/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-classify-character/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-combine-extensions": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-2.0.1.tgz",
+      "integrity": "sha512-OnAnH8Ujmy59JcyZw8JSbK9cGpdVY44NKgSM7E9Eh7DiLS2E9RNQf0dONaGDzEG9yjEl5hcqeIsj4hfRkLH/Bg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-chunked": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-decode-numeric-character-reference": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-2.0.2.tgz",
+      "integrity": "sha512-ccUbYk6CwVdkmCQMyr64dXz42EfHGkPQlBj5p7YVGzq8I7CtjXZJrubAYezf7Rp+bjPseiROqe7G6foFd+lEuw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-decode-numeric-character-reference/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-decode-string": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-2.0.1.tgz",
+      "integrity": "sha512-nDV/77Fj6eH1ynwscYTOsbK7rR//Uj0bZXBwJZRfaLEJ1iGBR6kIfNmlNqaqJf649EP0F3NWNdeJi03elllNUQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "decode-named-character-reference": "^1.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-decode-numeric-character-reference": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-decode-string/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-decode-string/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-encode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz",
+      "integrity": "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-events-to-acorn": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-2.0.3.tgz",
+      "integrity": "sha512-jmsiEIiZ1n7X1Rr5k8wVExBQCg5jy4UXVADItHmNk1zkwEVhBuIUKRu3fqv+hs4nxLISi2DQGlqIOGiFxgbfHg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "@types/unist": "^3.0.0",
+        "devlop": "^1.0.0",
+        "estree-util-visit": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0",
+        "vfile-message": "^4.0.0"
+      }
+    },
+    "node_modules/micromark-util-events-to-acorn/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-html-tag-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-2.0.1.tgz",
+      "integrity": "sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-normalize-identifier": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-2.0.1.tgz",
+      "integrity": "sha512-sxPqmo70LyARJs0w2UclACPUUEqltCkJ6PhKdMIDuJ3gSf/Q+/GIe3WKl0Ijb/GyH9lOpUkRAO2wp0GVkLvS9Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-normalize-identifier/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-resolve-all": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-2.0.1.tgz",
+      "integrity": "sha512-VdQyxFWFT2/FGJgwQnJYbe1jjQoNTS4RjglmSjTUlpUMa95Htx9NHeYW4rGDJzbjvCsl9eLjMQwGeElsqmzcHg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-sanitize-uri": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz",
+      "integrity": "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-encode": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-sanitize-uri/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-sanitize-uri/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-subtokenize": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-2.1.0.tgz",
+      "integrity": "sha512-XQLu552iSctvnEcgXw6+Sx75GflAPNED1qx7eBJ+wydBb2KCbRZe+NwvIEEMM83uml1+2WSXpBAcp9IUCgCYWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-util-chunked": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-subtokenize/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-symbol": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.1.0.tgz",
+      "integrity": "sha512-uEjpEYY6KMs1g7QfJ2eX1SQEV+ZT4rUD3UcF6l57acZvLNK7PBZL+ty82Z1qhK1/yXIY4bdx04FKMgR0g4IAag==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-types": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.2.tgz",
+      "integrity": "sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark/node_modules/micromark-factory-space": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
+      "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark/node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark/node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.18",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
+      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "~1.33.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
+      "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mini-css-extract-plugin": {
+      "version": "2.9.4",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.4.tgz",
+      "integrity": "sha512-ZWYT7ln73Hptxqxk2DxPU9MmapXRhxkJD6tkSR04dnQxm8BGu2hzgKLugK5yySD97u/8yy7Ma7E76k9ZdvtjkQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "schema-utils": "^4.0.0",
+        "tapable": "^2.2.1"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/mrmime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz",
+      "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/multicast-dns": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dns-packet": "^5.2.2",
+        "thunky": "^1.0.2"
+      },
+      "bin": {
+        "multicast-dns": "cli.js"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/no-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/node-emoji": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-2.2.0.tgz",
+      "integrity": "sha512-Z3lTE9pLaJF47NyMhd4ww1yFTAP8YhYI8SleJiHzM46Fgpm5cnNzSl9XfzFNqbaz+VlJrIj3fXQ4DeN1Rjm6cw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sindresorhus/is": "^4.6.0",
+        "char-regex": "^1.0.2",
+        "emojilib": "^2.4.0",
+        "skin-tone": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "dev": true,
+      "license": "(BSD-3-Clause OR GPL-2.0)",
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.21",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.21.tgz",
+      "integrity": "sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.1.0.tgz",
+      "integrity": "sha512-X06Mfd/5aKsRHc0O0J5CUedwnPmnDtLF2+nq+KN9KSDlJHkPuh0JUviWjEWMe0SW/9TDdSLVPuk7L5gGTIA1/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nprogress": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz",
+      "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/null-loader": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/null-loader/-/null-loader-4.0.1.tgz",
+      "integrity": "sha512-pxqVbi4U6N26lq+LmgIbB5XATP0VdZKOG25DhHi8btMmJJefGArFyDg1yc4U3hWCJbMqSrw0qyrz1UQX+qYXqg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/null-loader/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/null-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/null-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/null-loader/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/on-headers": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
+      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/opener": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
+      "dev": true,
+      "license": "(WTFPL OR MIT)",
+      "bin": {
+        "opener": "bin/opener-bin.js"
+      }
+    },
+    "node_modules/p-cancelable": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
+      "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^1.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-queue": {
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
+      "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^4.0.4",
+        "p-timeout": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-retry": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz",
+      "integrity": "sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/retry": "0.12.2",
+        "is-network-error": "^1.0.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=16.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-timeout": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
+      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-finally": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/package-json": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.1.tgz",
+      "integrity": "sha512-cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "got": "^12.1.0",
+        "registry-auth-token": "^5.0.1",
+        "registry-url": "^6.0.0",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/param-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-entities": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-4.0.2.tgz",
+      "integrity": "sha512-GG2AQYWoLgL877gQIKeRPGO1xF9+eG1ujIb5soS5gPvLQ1y2o8FL90w2QWNdf9I361Mpp7726c+lj3U0qK1uGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^2.0.0",
+        "character-entities-legacy": "^3.0.0",
+        "character-reference-invalid": "^2.0.0",
+        "decode-named-character-reference": "^1.0.0",
+        "is-alphanumerical": "^2.0.0",
+        "is-decimal": "^2.0.0",
+        "is-hexadecimal": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/parse-entities/node_modules/@types/unist": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
+      "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse-numeric-range": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/parse-numeric-range/-/parse-numeric-range-1.3.0.tgz",
+      "integrity": "sha512-twN+njEipszzlMJd4ONUYgSfZPDxgHhT9Ahed5uTigpQn90FggW4SA/AIPq/6a149fTbE9qBEcSwE3FAEp6wQQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/parse5": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",
+      "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "entities": "^6.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/parse5-htmlparser2-tree-adapter": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.1.0.tgz",
+      "integrity": "sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "domhandler": "^5.0.3",
+        "parse5": "^7.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/parse5/node_modules/entities": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
+      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/pascal-case": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
+      "dev": true,
+      "license": "(WTFPL OR MIT)"
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/path-to-regexp": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz",
+      "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isarray": "0.0.1"
+      }
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
+      "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.11",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-attribute-case-insensitive": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-7.0.1.tgz",
+      "integrity": "sha512-Uai+SupNSqzlschRyNx3kbCTWgY/2hcwtHEI/ej2LJWc9JJ77qKgGptd8DHwY1mXtZ7Aoh4z4yxfwMBue9eNgw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-attribute-case-insensitive/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-calc": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz",
+      "integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.11",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.2"
+      }
+    },
+    "node_modules/postcss-clamp": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
+      "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=7.6.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.6"
+      }
+    },
+    "node_modules/postcss-color-functional-notation": {
+      "version": "7.0.12",
+      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-7.0.12.tgz",
+      "integrity": "sha512-TLCW9fN5kvO/u38/uesdpbx3e8AkTYhMvDZYa9JpmImWuTE99bDQ7GU7hdOADIZsiI9/zuxfAJxny/khknp1Zw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-color-parser": "^3.1.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-10.0.0.tgz",
+      "integrity": "sha512-1kervM2cnlgPs2a8Vt/Qbe5cQ++N7rkYo/2rz2BkqJZIHQwaVuJgQH38REHrAi4uM0b1fqxMkWYmese94iMp3w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/utilities": "^2.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-color-rebeccapurple": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-10.0.0.tgz",
+      "integrity": "sha512-JFta737jSP+hdAIEhk1Vs0q0YF5P8fFcj+09pweS8ktuGuZ8pPlykHsk6mPxZ8awDl4TrcxUqJo9l1IhVr/OjQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/utilities": "^2.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-colormin": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.1.0.tgz",
+      "integrity": "sha512-x9yX7DOxeMAR+BgGVnNSAxmAj98NX/YxEMNFP+SDCEeNLb2r3i6Hh1ksMsnW8Ub5SLCpbescQqn9YEbE9554Sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "caniuse-api": "^3.0.0",
+        "colord": "^2.9.3",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-convert-values": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.1.0.tgz",
+      "integrity": "sha512-zx8IwP/ts9WvUM6NkVSkiU902QZL1bwPhaVaLynPtCsOTqp+ZKbNi+s6XJg3rfqpKGA/oc7Oxk5t8pOQJcwl/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-custom-media": {
+      "version": "11.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-11.0.6.tgz",
+      "integrity": "sha512-C4lD4b7mUIw+RZhtY7qUbf4eADmb7Ey8BFA2px9jUbwg7pjTZDl4KY4bvlUV+/vXQvzQRfiGEVJyAbtOsCMInw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/cascade-layer-name-parser": "^2.0.5",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/media-query-list-parser": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-custom-properties": {
+      "version": "14.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-14.0.6.tgz",
+      "integrity": "sha512-fTYSp3xuk4BUeVhxCSJdIPhDLpJfNakZKoiTDx7yRGCdlZrSJR7mWKVOBS4sBF+5poPQFMj2YdXx1VHItBGihQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/cascade-layer-name-parser": "^2.0.5",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/utilities": "^2.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-custom-selectors": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-8.0.5.tgz",
+      "integrity": "sha512-9PGmckHQswiB2usSO6XMSswO2yFWVoCAuih1yl9FVcwkscLjRKjwsjM3t+NIWpSU2Jx3eOiK2+t4vVTQaoCHHg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@csstools/cascade-layer-name-parser": "^2.0.5",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "postcss-selector-parser": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-custom-selectors/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-dir-pseudo-class": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-9.0.1.tgz",
+      "integrity": "sha512-tRBEK0MHYvcMUrAuYMEOa0zg9APqirBcgzi6P21OhxtJyJADo/SWBwY1CAwEohQ/6HDaa9jCjLRG7K3PVQYHEA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-dir-pseudo-class/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-discard-comments": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.2.tgz",
+      "integrity": "sha512-65w/uIqhSBBfQmYnG92FO1mWZjJ4GL5b8atm5Yw2UgrwD7HiNiSSNwJor1eCFGzUgYnN/iIknhNRVqjrrpuglw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-duplicates": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.3.tgz",
+      "integrity": "sha512-+JA0DCvc5XvFAxwx6f/e68gQu/7Z9ud584VLmcgto28eB8FqSFZwtrLwB5Kcp70eIoWP/HXqz4wpo8rD8gpsTw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-empty": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.3.tgz",
+      "integrity": "sha512-znyno9cHKQsK6PtxL5D19Fj9uwSzC2mB74cpT66fhgOadEUPyXFkbgwm5tvc3bt3NAy8ltE5MrghxovZRVnOjQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-overridden": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.2.tgz",
+      "integrity": "sha512-j87xzI4LUggC5zND7KdjsI25APtyMuynXZSujByMaav2roV6OZX+8AaCUcZSWqckZpjAjRyFDdpqybgjFO0HJQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-discard-unused": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-6.0.5.tgz",
+      "integrity": "sha512-wHalBlRHkaNnNwfC8z+ppX57VhvS+HWgjW508esjdaEYr3Mx7Gnn2xA4R/CKf5+Z9S5qsqC+Uzh4ueENWwCVUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.16"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-double-position-gradients": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-6.0.4.tgz",
+      "integrity": "sha512-m6IKmxo7FxSP5nF2l63QbCC3r+bWpFUWmZXZf096WxG0m7Vl1Q1+ruFOhpdDRmKrRS+S3Jtk+TVk/7z0+BVK6g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-focus-visible": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-10.0.1.tgz",
+      "integrity": "sha512-U58wyjS/I1GZgjRok33aE8juW9qQgQUNwTSdxQGuShHzwuYdcklnvK/+qOWX1Q9kr7ysbraQ6ht6r+udansalA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-focus-visible/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-focus-within": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-9.0.1.tgz",
+      "integrity": "sha512-fzNUyS1yOYa7mOjpci/bR+u+ESvdar6hk8XNK/TRR0fiGTp2QT5N+ducP0n3rfH/m9I7H/EQU6lsa2BrgxkEjw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-focus-within/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-font-variant": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
+      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-gap-properties": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-6.0.0.tgz",
+      "integrity": "sha512-Om0WPjEwiM9Ru+VhfEDPZJAKWUd0mV1HmNXqp2C29z80aQ2uP9UVhLc7e3aYMIor/S5cVhoPgYQ7RtfeZpYTRw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-image-set-function": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-7.0.0.tgz",
+      "integrity": "sha512-QL7W7QNlZuzOwBTeXEmbVckNt1FSmhQtbMRvGGqqU4Nf4xk6KUEQhAoWuMzwbSv5jxiRiSZ5Tv7eiDB9U87znA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/utilities": "^2.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-lab-function": {
+      "version": "7.0.12",
+      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-7.0.12.tgz",
+      "integrity": "sha512-tUcyRk1ZTPec3OuKFsqtRzW2Go5lehW29XA21lZ65XmzQkz43VY2tyWEC202F7W3mILOjw0voOiuxRGTsN+J9w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/css-color-parser": "^3.1.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/utilities": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-loader": {
+      "version": "7.3.4",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.4.tgz",
+      "integrity": "sha512-iW5WTTBSC5BfsBJ9daFMPVrLT36MrNiC6fqOZTTaHjBNX6Pfd5p+hSBqe/fEeNd7pc13QiAyGt7VdGMw4eRC4A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cosmiconfig": "^8.3.5",
+        "jiti": "^1.20.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/postcss-logical": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-8.1.0.tgz",
+      "integrity": "sha512-pL1hXFQ2fEXNKiNiAgtfA005T9FBxky5zkX6s4GZM2D8RkVgRqz3f4g1JUoq925zXv495qk8UNldDwh8uGEDoA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-merge-idents": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-6.0.3.tgz",
+      "integrity": "sha512-1oIoAsODUs6IHQZkLQGO15uGEbK3EAl5wi9SS8hs45VgsxQfMnxvt+L+zIr7ifZFIH14cfAeVe2uCTa+SPRa3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-merge-longhand": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.5.tgz",
+      "integrity": "sha512-5LOiordeTfi64QhICp07nzzuTDjNSO8g5Ksdibt44d+uvIIAE1oZdRn8y/W5ZtYgRH/lnLDlvi9F8btZcVzu3w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0",
+        "stylehacks": "^6.1.1"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-merge-rules": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.1.1.tgz",
+      "integrity": "sha512-KOdWF0gju31AQPZiD+2Ar9Qjowz1LTChSjFFbS+e2sFgc4uHOp3ZvVX4sNeTlk0w2O31ecFGgrFzhO0RSWbWwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "caniuse-api": "^3.0.0",
+        "cssnano-utils": "^4.0.2",
+        "postcss-selector-parser": "^6.0.16"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-font-values": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.1.0.tgz",
+      "integrity": "sha512-gklfI/n+9rTh8nYaSJXlCo3nOKqMNkxuGpTn/Qm0gstL3ywTr9/WRKznE+oy6fvfolH6dF+QM4nCo8yPLdvGJg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-gradients": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.3.tgz",
+      "integrity": "sha512-4KXAHrYlzF0Rr7uc4VrfwDJ2ajrtNEpNEuLxFgwkhFZ56/7gaE4Nr49nLsQDZyUe+ds+kEhf+YAUolJiYXF8+Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "colord": "^2.9.3",
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-params": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.1.0.tgz",
+      "integrity": "sha512-bmSKnDtyyE8ujHQK0RQJDIKhQ20Jq1LYiez54WiaOoBtcSuflfK3Nm596LvbtlFcpipMjgClQGyGr7GAs+H1uA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-minify-selectors": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.4.tgz",
+      "integrity": "sha512-L8dZSwNLgK7pjTto9PzWRoMbnLq5vsZSTu8+j1P/2GB8qdtGQfn+K1uSvFgYvgh83cbyxT5m43ZZhUMTJDSClQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.16"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+      "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
+      "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^7.0.0",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+      "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-scope/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "icss-utils": "^5.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-nesting": {
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-13.0.2.tgz",
+      "integrity": "sha512-1YCI290TX+VP0U/K/aFxzHzQWHWURL+CtHMSbex1lCdpXD1SoR2sYuxDu5aNI9lPoXpKTCggFZiDJbwylU0LEQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/selector-resolve-nested": "^3.1.0",
+        "@csstools/selector-specificity": "^5.0.0",
+        "postcss-selector-parser": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-nesting/node_modules/@csstools/selector-resolve-nested": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-3.1.0.tgz",
+      "integrity": "sha512-mf1LEW0tJLKfWyvn5KdDrhpxHyuxpbNwTIwOYLIvsTffeyOf85j5oIzfG0yosxDgx/sswlqBnESYUcQH0vgZ0g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      }
+    },
+    "node_modules/postcss-nesting/node_modules/@csstools/selector-specificity": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz",
+      "integrity": "sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      }
+    },
+    "node_modules/postcss-nesting/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-normalize-charset": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.2.tgz",
+      "integrity": "sha512-a8N9czmdnrjPHa3DeFlwqst5eaL5W8jYu3EBbTTkI5FHkfMhFZh1EGbku6jhHhIzTA6tquI2P42NtZ59M/H/kQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-display-values": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.2.tgz",
+      "integrity": "sha512-8H04Mxsb82ON/aAkPeq8kcBbAtI5Q2a64X/mnRRfPXBq7XeogoQvReqxEfc0B4WPq1KimjezNC8flUtC3Qz6jg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-positions": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.2.tgz",
+      "integrity": "sha512-/JFzI441OAB9O7VnLA+RtSNZvQ0NCFZDOtp6QPFo1iIyawyXg0YI3CYM9HBy1WvwCRHnPep/BvI1+dGPKoXx/Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-repeat-style": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.2.tgz",
+      "integrity": "sha512-YdCgsfHkJ2jEXwR4RR3Tm/iOxSfdRt7jplS6XRh9Js9PyCR/aka/FCb6TuHT2U8gQubbm/mPmF6L7FY9d79VwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-string": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.2.tgz",
+      "integrity": "sha512-vQZIivlxlfqqMp4L9PZsFE4YUkWniziKjQWUtsxUiVsSSPelQydwS8Wwcuw0+83ZjPWNTl02oxlIvXsmmG+CiQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-timing-functions": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.2.tgz",
+      "integrity": "sha512-a+YrtMox4TBtId/AEwbA03VcJgtyW4dGBizPl7e88cTFULYsprgHWTbfyjSLyHeBcK/Q9JhXkt2ZXiwaVHoMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-unicode": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.1.0.tgz",
+      "integrity": "sha512-QVC5TQHsVj33otj8/JD869Ndr5Xcc/+fwRh4HAsFsAeygQQXm+0PySrKbr/8tkDKzW+EVT3QkqZMfFrGiossDg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-url": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.2.tgz",
+      "integrity": "sha512-kVNcWhCeKAzZ8B4pv/DnrU1wNh458zBNp8dh4y5hhxih5RZQ12QWMuQrDgPRw3LRl8mN9vOVfHl7uhvHYMoXsQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-normalize-whitespace": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.2.tgz",
+      "integrity": "sha512-sXZ2Nj1icbJOKmdjXVT9pnyHQKiSAyuNQHSgRCUgThn2388Y9cGVDR+E9J9iAYbSbLHI+UUwLVl1Wzco/zgv0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-opacity-percentage": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-3.0.0.tgz",
+      "integrity": "sha512-K6HGVzyxUxd/VgZdX04DCtdwWJ4NGLG212US4/LA1TLAbHgmAsTWVR86o+gGIbFtnTkfOpb9sCRBx8K7HO66qQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "kofi",
+          "url": "https://ko-fi.com/mrcgrtz"
+        },
+        {
+          "type": "liberapay",
+          "url": "https://liberapay.com/mrcgrtz"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-ordered-values": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.2.tgz",
+      "integrity": "sha512-VRZSOB+JU32RsEAQrO94QPkClGPKJEL/Z9PCBImXMhIeK5KAYo6slP/hBYlLgrCjFxyqvn5VC81tycFEDBLG1Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssnano-utils": "^4.0.2",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-overflow-shorthand": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-6.0.0.tgz",
+      "integrity": "sha512-BdDl/AbVkDjoTofzDQnwDdm/Ym6oS9KgmO7Gr+LHYjNWJ6ExORe4+3pcLQsLA9gIROMkiGVjjwZNoL/mpXHd5Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-page-break": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
+      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "postcss": "^8"
+      }
+    },
+    "node_modules/postcss-place": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-10.0.0.tgz",
+      "integrity": "sha512-5EBrMzat2pPAxQNWYavwAfoKfYcTADJ8AXGVPcUZ2UkNloUTWzJQExgrzrDkh3EKzmAx1evfTAzF9I8NGcc+qw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-preset-env": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-10.4.0.tgz",
+      "integrity": "sha512-2kqpOthQ6JhxqQq1FSAAZGe9COQv75Aw8WbsOvQVNJ2nSevc9Yx/IKZGuZ7XJ+iOTtVon7LfO7ELRzg8AZ+sdw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "@csstools/postcss-alpha-function": "^1.0.1",
+        "@csstools/postcss-cascade-layers": "^5.0.2",
+        "@csstools/postcss-color-function": "^4.0.12",
+        "@csstools/postcss-color-function-display-p3-linear": "^1.0.1",
+        "@csstools/postcss-color-mix-function": "^3.0.12",
+        "@csstools/postcss-color-mix-variadic-function-arguments": "^1.0.2",
+        "@csstools/postcss-content-alt-text": "^2.0.8",
+        "@csstools/postcss-contrast-color-function": "^2.0.12",
+        "@csstools/postcss-exponential-functions": "^2.0.9",
+        "@csstools/postcss-font-format-keywords": "^4.0.0",
+        "@csstools/postcss-gamut-mapping": "^2.0.11",
+        "@csstools/postcss-gradients-interpolation-method": "^5.0.12",
+        "@csstools/postcss-hwb-function": "^4.0.12",
+        "@csstools/postcss-ic-unit": "^4.0.4",
+        "@csstools/postcss-initial": "^2.0.1",
+        "@csstools/postcss-is-pseudo-class": "^5.0.3",
+        "@csstools/postcss-light-dark-function": "^2.0.11",
+        "@csstools/postcss-logical-float-and-clear": "^3.0.0",
+        "@csstools/postcss-logical-overflow": "^2.0.0",
+        "@csstools/postcss-logical-overscroll-behavior": "^2.0.0",
+        "@csstools/postcss-logical-resize": "^3.0.0",
+        "@csstools/postcss-logical-viewport-units": "^3.0.4",
+        "@csstools/postcss-media-minmax": "^2.0.9",
+        "@csstools/postcss-media-queries-aspect-ratio-number-values": "^3.0.5",
+        "@csstools/postcss-nested-calc": "^4.0.0",
+        "@csstools/postcss-normalize-display-values": "^4.0.0",
+        "@csstools/postcss-oklab-function": "^4.0.12",
+        "@csstools/postcss-progressive-custom-properties": "^4.2.1",
+        "@csstools/postcss-random-function": "^2.0.1",
+        "@csstools/postcss-relative-color-syntax": "^3.0.12",
+        "@csstools/postcss-scope-pseudo-class": "^4.0.1",
+        "@csstools/postcss-sign-functions": "^1.1.4",
+        "@csstools/postcss-stepped-value-functions": "^4.0.9",
+        "@csstools/postcss-text-decoration-shorthand": "^4.0.3",
+        "@csstools/postcss-trigonometric-functions": "^4.0.9",
+        "@csstools/postcss-unset-value": "^4.0.0",
+        "autoprefixer": "^10.4.21",
+        "browserslist": "^4.26.0",
+        "css-blank-pseudo": "^7.0.1",
+        "css-has-pseudo": "^7.0.3",
+        "css-prefers-color-scheme": "^10.0.0",
+        "cssdb": "^8.4.2",
+        "postcss-attribute-case-insensitive": "^7.0.1",
+        "postcss-clamp": "^4.1.0",
+        "postcss-color-functional-notation": "^7.0.12",
+        "postcss-color-hex-alpha": "^10.0.0",
+        "postcss-color-rebeccapurple": "^10.0.0",
+        "postcss-custom-media": "^11.0.6",
+        "postcss-custom-properties": "^14.0.6",
+        "postcss-custom-selectors": "^8.0.5",
+        "postcss-dir-pseudo-class": "^9.0.1",
+        "postcss-double-position-gradients": "^6.0.4",
+        "postcss-focus-visible": "^10.0.1",
+        "postcss-focus-within": "^9.0.1",
+        "postcss-font-variant": "^5.0.0",
+        "postcss-gap-properties": "^6.0.0",
+        "postcss-image-set-function": "^7.0.0",
+        "postcss-lab-function": "^7.0.12",
+        "postcss-logical": "^8.1.0",
+        "postcss-nesting": "^13.0.2",
+        "postcss-opacity-percentage": "^3.0.0",
+        "postcss-overflow-shorthand": "^6.0.0",
+        "postcss-page-break": "^3.0.4",
+        "postcss-place": "^10.0.0",
+        "postcss-pseudo-class-any-link": "^10.0.1",
+        "postcss-replace-overflow-wrap": "^4.0.0",
+        "postcss-selector-not": "^8.0.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-pseudo-class-any-link": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-10.0.1.tgz",
+      "integrity": "sha512-3el9rXlBOqTFaMFkWDOkHUTQekFIYnaQY55Rsp8As8QQkpiSgIYEcF/6Ond93oHiDsGb4kad8zjt+NPlOC1H0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "dependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-pseudo-class-any-link/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-reduce-idents": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-6.0.3.tgz",
+      "integrity": "sha512-G3yCqZDpsNPoQgbDUy3T0E6hqOQ5xigUtBQyrmq3tn2GxlyiL0yyl7H+T8ulQR6kOcHJ9t7/9H4/R2tv8tJbMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-reduce-initial": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.1.0.tgz",
+      "integrity": "sha512-RarLgBK/CrL1qZags04oKbVbrrVK2wcxhvta3GCxrZO4zveibqbRPmm2VI8sSgCXwoUHEliRSbOfpR0b/VIoiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "caniuse-api": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-reduce-transforms": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.2.tgz",
+      "integrity": "sha512-sB+Ya++3Xj1WaT9+5LOOdirAxP7dJZms3GRcYheSPi1PiTMigsxHAdkrbItHxwYHr4kt1zL7mmcHstgMYT+aiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-replace-overflow-wrap": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
+      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "postcss": "^8.0.3"
+      }
+    },
+    "node_modules/postcss-selector-not": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-8.0.1.tgz",
+      "integrity": "sha512-kmVy/5PYVb2UOhy0+LqUYAhKj7DUGDpSWa5LZqlkWJaaAV+dxxsOG3+St0yNLu6vsKD7Dmqx+nWQt0iil89+WA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-selector-not/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-sort-media-queries": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-sort-media-queries/-/postcss-sort-media-queries-5.2.0.tgz",
+      "integrity": "sha512-AZ5fDMLD8SldlAYlvi8NIqo0+Z8xnXU2ia0jxmuhxAU+Lqt9K+AlmLNJ/zWEnE9x+Zx3qL3+1K20ATgNOr3fAA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sort-css-media-queries": "2.2.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.23"
+      }
+    },
+    "node_modules/postcss-svgo": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.3.tgz",
+      "integrity": "sha512-dlrahRmxP22bX6iKEjOM+c8/1p+81asjKT+V5lrgOH944ryx/OHpclnIbGsKVd3uWOXFLYJwCVf0eEkJGvO96g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0",
+        "svgo": "^3.2.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >= 18"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-unique-selectors": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.4.tgz",
+      "integrity": "sha512-K38OCaIrO8+PzpArzkLKB42dSARtC2tmG6PvD4b1o1Q2E9Os8jzfWFfSy/rixsHwohtsDdFtAWGjFVFUdwYaMg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.16"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/postcss-zindex": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-6.0.2.tgz",
+      "integrity": "sha512-5BxW9l1evPB/4ZIc+2GobEBoKC+h8gPGCMi+jxsYvd2x0mjq7wazk6DrP71pStqxE9Foxh5TVnonbWpFZzXaYg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/pretty-error": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
+      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lodash": "^4.17.20",
+        "renderkid": "^3.0.0"
+      }
+    },
+    "node_modules/pretty-time": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz",
+      "integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/prism-react-renderer": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-2.4.1.tgz",
+      "integrity": "sha512-ey8Ls/+Di31eqzUxC46h8MksNuGx/n0AAC8uKpwFau4RPDYLuE3EXTp8N8G2vX2N7UC/+IXeNUnlWBGGcAG+Ig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/prismjs": "^1.26.0",
+        "clsx": "^2.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.0.0"
+      }
+    },
+    "node_modules/prismjs": {
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.30.0.tgz",
+      "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "node_modules/property-information": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.1.0.tgz",
+      "integrity": "sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/proxy-addr/node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pupa": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.3.0.tgz",
+      "integrity": "sha512-LjgDO2zPtoXP2wJpDjZrGdojii1uqO0cnwKoIoUzkfS98HDmbeiGmYiXo3lXeFlq2xvne1QFQhwYXSUCLKtEuA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escape-goat": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/quick-lru": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+      "integrity": "sha512-kA5WQoNVo4t9lNx2kQNFCxKeBl5IbbSNBl1M/tLkw9WCn+hxNBAW5Qh8gdhs63CJnhjJ2zQWFoqPJP2sK1AV5A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-body/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dev": true,
+      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
+    "node_modules/rc/node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/rc/node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react": {
+      "version": "19.1.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.1.1.tgz",
+      "integrity": "sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "19.1.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.1.tgz",
+      "integrity": "sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "scheduler": "^0.26.0"
+      },
+      "peerDependencies": {
+        "react": "^19.1.1"
+      }
+    },
+    "node_modules/react-fast-compare": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
+      "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/react-helmet-async": {
+      "name": "@slorber/react-helmet-async",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@slorber/react-helmet-async/-/react-helmet-async-1.3.0.tgz",
+      "integrity": "sha512-e9/OK8VhwUSc67diWI8Rb3I0YgI9/SBQtnhe9aEuK6MhZm7ntZZimXgwXnd8W96YTmSOb9M4d8LwhRZyhWr/1A==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "invariant": "^2.2.4",
+        "prop-types": "^15.7.2",
+        "react-fast-compare": "^3.2.0",
+        "shallowequal": "^1.1.0"
+      },
+      "peerDependencies": {
+        "react": "^16.6.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.6.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/react-json-view-lite": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/react-json-view-lite/-/react-json-view-lite-2.5.0.tgz",
+      "integrity": "sha512-tk7o7QG9oYyELWHL8xiMQ8x4WzjCzbWNyig3uexmkLb54r8jO0yH3WCWx8UZS0c49eSA4QUmG5caiRJ8fAn58g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/react-loadable": {
+      "name": "@docusaurus/react-loadable",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@docusaurus/react-loadable/-/react-loadable-6.0.0.tgz",
+      "integrity": "sha512-YMMxTUQV/QFSnbgrP3tjDzLHRg7vsbMn8e9HAa8o/1iXoiomo48b7sk/kkmWEuWNDPJVlKSJRB6Y2fHqdJk+SQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/react": "*"
+      },
+      "peerDependencies": {
+        "react": "*"
+      }
+    },
+    "node_modules/react-loadable-ssr-addon-v5-slorber": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/react-loadable-ssr-addon-v5-slorber/-/react-loadable-ssr-addon-v5-slorber-1.0.1.tgz",
+      "integrity": "sha512-lq3Lyw1lGku8zUEJPDxsNm1AfYHBrO9Y1+olAYwpUJ2IGFBskM0DMKok97A6LWUpHm+o7IvQBOWu9MLenp9Z+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.10.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "peerDependencies": {
+        "react-loadable": "*",
+        "webpack": ">=4.41.1 || 5.x"
+      }
+    },
+    "node_modules/react-router": {
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz",
+      "integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.12.13",
+        "history": "^4.9.0",
+        "hoist-non-react-statics": "^3.1.0",
+        "loose-envify": "^1.3.1",
+        "path-to-regexp": "^1.7.0",
+        "prop-types": "^15.6.2",
+        "react-is": "^16.6.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=15"
+      }
+    },
+    "node_modules/react-router-config": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/react-router-config/-/react-router-config-5.1.1.tgz",
+      "integrity": "sha512-DuanZjaD8mQp1ppHjgnnUnyOlqYXZVjnov/JzFhjLEwd3Z4dYjMSnqrEzzGThH47vpCOqPPwJM2FtthLeJ8Pbg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.1.2"
+      },
+      "peerDependencies": {
+        "react": ">=15",
+        "react-router": ">=5"
+      }
+    },
+    "node_modules/react-router-dom": {
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz",
+      "integrity": "sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.12.13",
+        "history": "^4.9.0",
+        "loose-envify": "^1.3.1",
+        "prop-types": "^15.6.2",
+        "react-router": "5.3.4",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=15"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/recma-build-jsx": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/recma-build-jsx/-/recma-build-jsx-1.0.0.tgz",
+      "integrity": "sha512-8GtdyqaBcDfva+GUKDr3nev3VpKAhup1+RvkMvUxURHpW7QyIvk9F5wz7Vzo06CEMSilw6uArgRqhpiUcWp8ew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "estree-util-build-jsx": "^3.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/recma-jsx": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/recma-jsx/-/recma-jsx-1.0.1.tgz",
+      "integrity": "sha512-huSIy7VU2Z5OLv6oFLosQGGDqPqdO1iq6bWNAdhzMxSJP7RAso4fCZ1cKu8j9YHCZf3TPrq4dw3okhrylgcd7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn-jsx": "^5.0.0",
+        "estree-util-to-js": "^2.0.0",
+        "recma-parse": "^1.0.0",
+        "recma-stringify": "^1.0.0",
+        "unified": "^11.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      },
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/recma-parse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/recma-parse/-/recma-parse-1.0.0.tgz",
+      "integrity": "sha512-OYLsIGBB5Y5wjnSnQW6t3Xg7q3fQ7FWbw/vcXtORTnyaSFscOtABg+7Pnz6YZ6c27fG1/aN8CjfwoUEUIdwqWQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "esast-util-from-js": "^2.0.0",
+        "unified": "^11.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/recma-stringify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/recma-stringify/-/recma-stringify-1.0.0.tgz",
+      "integrity": "sha512-cjwII1MdIIVloKvC9ErQ+OgAtwHBmcZ0Bg4ciz78FtbT8In39aAYbaA7zvxQ61xVMSPE8WxhLwLbhif4Js2C+g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "estree-util-to-js": "^2.0.0",
+        "unified": "^11.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/regenerate-unicode-properties": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.2.tgz",
+      "integrity": "sha512-m03P+zhBeQd1RGnYxrGyDAPpWX/epKirLrp8e3qevZdVkKtnCrjjWczIbYc8+xd6vcTStVlqfycTx1KR4LOr0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "regenerate": "^1.4.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regexpu-core": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.4.0.tgz",
+      "integrity": "sha512-0ghuzq67LI9bLXpOX/ISfve/Mq33a4aFRzoQYhnnok1JOFpmE/A2TBGkNVenOGEeSBCjIiWcc6MVOG5HEQv0sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.2.2",
+        "regjsgen": "^0.8.0",
+        "regjsparser": "^0.13.0",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/registry-auth-token": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.1.0.tgz",
+      "integrity": "sha512-GdekYuwLXLxMuFTwAPg5UKGLW/UXzQrZvH/Zj791BQif5T05T0RsaLfHc9q3ZOKi7n+BoprPD9mJ0O0k4xzUlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@pnpm/npm-conf": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/registry-url": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz",
+      "integrity": "sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "rc": "1.2.8"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/regjsparser": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.0.tgz",
+      "integrity": "sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "jsesc": "~3.1.0"
+      },
+      "bin": {
+        "regjsparser": "bin/parser"
+      }
+    },
+    "node_modules/rehype-katex": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/rehype-katex/-/rehype-katex-7.0.1.tgz",
+      "integrity": "sha512-OiM2wrZ/wuhKkigASodFoo8wimG3H12LWQaH8qSPVJn9apWKFSH3YOCtbKpBorTVw/eI7cuT21XBbvwEswbIOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/katex": "^0.16.0",
+        "hast-util-from-html-isomorphic": "^2.0.0",
+        "hast-util-to-text": "^4.0.0",
+        "katex": "^0.16.0",
+        "unist-util-visit-parents": "^6.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/rehype-raw": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/rehype-raw/-/rehype-raw-7.0.0.tgz",
+      "integrity": "sha512-/aE8hCfKlQeA8LmyeyQvQF3eBiLRGNlfBJEvWH7ivp9sBqs7TNqBL5X3v157rM4IFETqDnIOO+z5M/biZbo9Ww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "hast-util-raw": "^9.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/rehype-recma": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rehype-recma/-/rehype-recma-1.0.0.tgz",
+      "integrity": "sha512-lqA4rGUf1JmacCNWWZx0Wv1dHqMwxzsDWYMTowuplHF3xH0N/MmrZ/G3BDZnzAkRmxDadujCjaKM2hqYdCBOGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "@types/hast": "^3.0.0",
+        "hast-util-to-estree": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/remark-directive": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/remark-directive/-/remark-directive-3.0.1.tgz",
+      "integrity": "sha512-gwglrEQEZcZYgVyG1tQuA+h58EZfq5CSULw7J90AFuCTyib1thgHPoqQ+h9iFvU6R+vnZ5oNFQR5QKgGpk741A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "mdast-util-directive": "^3.0.0",
+        "micromark-extension-directive": "^3.0.0",
+        "unified": "^11.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-emoji": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/remark-emoji/-/remark-emoji-4.0.1.tgz",
+      "integrity": "sha512-fHdvsTR1dHkWKev9eNyhTo4EFwbUvJ8ka9SgeWkMPYFX4WoI7ViVBms3PjlQYgw5TLvNQso3GUB/b/8t3yo+dg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.2",
+        "emoticon": "^4.0.1",
+        "mdast-util-find-and-replace": "^3.0.1",
+        "node-emoji": "^2.1.0",
+        "unified": "^11.0.4"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/remark-frontmatter": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-5.0.0.tgz",
+      "integrity": "sha512-XTFYvNASMe5iPN0719nPrdItC9aU0ssC4v14mH1BCi1u0n1gAocqcujWUrByftZTbLhRtiKRyjYTSIOcr69UVQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "mdast-util-frontmatter": "^2.0.0",
+        "micromark-extension-frontmatter": "^2.0.0",
+        "unified": "^11.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-gfm": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-4.0.1.tgz",
+      "integrity": "sha512-1quofZ2RQ9EWdeN34S79+KExV1764+wCUGop5CPL1WGdD0ocPpu91lzPGbwWMECpEpd42kJGQwzRfyov9j4yNg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "mdast-util-gfm": "^3.0.0",
+        "micromark-extension-gfm": "^3.0.0",
+        "remark-parse": "^11.0.0",
+        "remark-stringify": "^11.0.0",
+        "unified": "^11.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-math": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/remark-math/-/remark-math-6.0.0.tgz",
+      "integrity": "sha512-MMqgnP74Igy+S3WwnhQ7kqGlEerTETXMvJhrUzDikVZ2/uogJCb+WHUg97hK9/jcfc0dkD73s3LN8zU49cTEtA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "mdast-util-math": "^3.0.0",
+        "micromark-extension-math": "^3.0.0",
+        "unified": "^11.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-mdx": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-3.1.1.tgz",
+      "integrity": "sha512-Pjj2IYlUY3+D8x00UJsIOg5BEvfMyeI+2uLPn9VO9Wg4MEtN/VTIq2NEJQfde9PnX15KgtHyl9S0BcTnWrIuWg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mdast-util-mdx": "^3.0.0",
+        "micromark-extension-mdxjs": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-parse": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz",
+      "integrity": "sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "micromark-util-types": "^2.0.0",
+        "unified": "^11.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-rehype": {
+      "version": "11.1.2",
+      "resolved": "https://registry.npmjs.org/remark-rehype/-/remark-rehype-11.1.2.tgz",
+      "integrity": "sha512-Dh7l57ianaEoIpzbp0PC9UKAdCSVklD8E5Rpw7ETfbTl3FqcOOgq5q2LVDhgGCkaBv7p24JXikPdvhhmHvKMsw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/mdast": "^4.0.0",
+        "mdast-util-to-hast": "^13.0.0",
+        "unified": "^11.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-stringify": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-11.0.0.tgz",
+      "integrity": "sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "mdast-util-to-markdown": "^2.0.0",
+        "unified": "^11.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/renderkid": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
+      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "css-select": "^4.1.3",
+        "dom-converter": "^0.2.0",
+        "htmlparser2": "^6.1.0",
+        "lodash": "^4.17.21",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "node_modules/renderkid/node_modules/css-select": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/renderkid/node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/renderkid/node_modules/domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/renderkid/node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/renderkid/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/renderkid/node_modules/htmlparser2": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.5.2",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-like": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz",
+      "integrity": "sha512-oyrU88skkMtDdauHDuKVrgR+zuItqr6/c//FXzvmxRGMexSDc6hNvJInGW3LL46n+8b50RykrvwSUIIQH2LQ5A==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/resolve": {
+      "version": "1.22.10",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.16.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-alpn": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/resolve-pathname": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
+      "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/responselike": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
+      "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lowercase-keys": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rtlcss": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-4.3.0.tgz",
+      "integrity": "sha512-FI+pHEn7Wc4NqKXMXFM+VAYKEj/mRIcW4h24YVwVtyjI+EqGrLc2Hx/Ny0lrZ21cBWU2goLy36eqMcNj3AQJig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.21",
+        "strip-json-comments": "^3.1.1"
+      },
+      "bin": {
+        "rtlcss": "bin/rtlcss.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/run-applescript": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.1.0.tgz",
+      "integrity": "sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/sax": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/scheduler": {
+      "version": "0.26.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.26.0.tgz",
+      "integrity": "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/schema-dts": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/schema-dts/-/schema-dts-1.1.5.tgz",
+      "integrity": "sha512-RJr9EaCmsLzBX2NDiO5Z3ux2BVosNZN5jo0gWgsyKvxKIUL5R3swNvoorulAeL9kLB0iTSX7V6aokhla2m7xbg==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/schema-utils": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+      "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/search-insights": {
+      "version": "2.17.3",
+      "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.17.3.tgz",
+      "integrity": "sha512-RQPdCYTa8A68uM2jwxoY842xDhvx3E5LFL1LxvxCNMev4o5mLuokczhzjAgGwUZBAmOKZknArSxLKmXtIi2AxQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/section-matter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz",
+      "integrity": "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/selfsigned": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
+      "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node-forge": "^1.3.0",
+        "node-forge": "^1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-4.0.0.tgz",
+      "integrity": "sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/send/node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/serve-handler": {
+      "version": "6.1.6",
+      "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.6.tgz",
+      "integrity": "sha512-x5RL9Y2p5+Sh3D38Fh9i/iQ5ZK+e4xuXRd/pGbM4D13tgo/MGwbttUk8emytcr1YYzBYs+apnUngBDFYfpjPuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.0.0",
+        "content-disposition": "0.5.2",
+        "mime-types": "2.1.18",
+        "minimatch": "3.1.2",
+        "path-is-inside": "1.0.2",
+        "path-to-regexp": "3.3.0",
+        "range-parser": "1.2.0"
+      }
+    },
+    "node_modules/serve-handler/node_modules/path-to-regexp": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.3.0.tgz",
+      "integrity": "sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/serve-index/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/serve-index/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/serve-index/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-static": {
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "encodeurl": "~2.0.0",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.19.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shallowequal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
+      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shell-quote": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
+      "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/sirv": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
+      "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@polka/url": "^1.0.0-next.24",
+        "mrmime": "^2.0.0",
+        "totalist": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/sitemap": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/sitemap/-/sitemap-7.1.2.tgz",
+      "integrity": "sha512-ARCqzHJ0p4gWt+j7NlU5eDlIO9+Rkr/JhPFZKKQ1l5GCus7rJH4UdrlVAh0xC/gDS/Qir2UMxqYNHtsKr2rpCw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "^17.0.5",
+        "@types/sax": "^1.2.1",
+        "arg": "^5.0.0",
+        "sax": "^1.2.4"
+      },
+      "bin": {
+        "sitemap": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=12.0.0",
+        "npm": ">=5.6.0"
+      }
+    },
+    "node_modules/sitemap/node_modules/@types/node": {
+      "version": "17.0.45",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
+      "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/skin-tone": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/skin-tone/-/skin-tone-2.0.0.tgz",
+      "integrity": "sha512-kUMbT1oBJCpgrnKoSr0o6wPtvRWT9W9UKvGLwfJYO2WuahZRHOpEyL1ckyMGgMWh0UdpmaoFqKKD29WTomNEGA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "unicode-emoji-modifier-base": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/snake-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz",
+      "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/sockjs": {
+      "version": "0.3.24",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "faye-websocket": "^0.11.3",
+        "uuid": "^8.3.2",
+        "websocket-driver": "^0.7.4"
+      }
+    },
+    "node_modules/sort-css-media-queries": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/sort-css-media-queries/-/sort-css-media-queries-2.2.0.tgz",
+      "integrity": "sha512-0xtkGhWCC9MGt/EzgnvbbbKhqWjl1+/rncmhTh5qCpbYguXh6S/qwePfv/JQ8jePXXmqingylxoC49pCkSPIbA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6.3.0"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.7.6",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz",
+      "integrity": "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/space-separated-tokens": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
+      "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/spdy": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/srcset": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/srcset/-/srcset-4.0.0.tgz",
+      "integrity": "sha512-wvLeHgcVHKO8Sc/H/5lkGreJQVeYMm9rlmt8PuR1xE31rIuXhuzznUUqAt8MqLhB3MqJdFzlNAfpcWnxiFUcPw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/std-env": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.9.0.tgz",
+      "integrity": "sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width/node_modules/ansi-regex": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/stringify-entities": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
+      "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "character-entities-html4": "^2.0.0",
+        "character-entities-legacy": "^3.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/stringify-object": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
+      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "get-own-enumerable-property-symbols": "^3.0.0",
+        "is-obj": "^1.0.1",
+        "is-regexp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
+      "integrity": "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/style-to-js": {
+      "version": "1.1.17",
+      "resolved": "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.17.tgz",
+      "integrity": "sha512-xQcBGDxJb6jjFCTzvQtfiPn6YvvP2O8U1MDIPNfJQlWMYfktPy+iGsHE7cssjs7y84d9fQaK4UF3RIJaAHSoYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "style-to-object": "1.0.9"
+      }
+    },
+    "node_modules/style-to-object": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.9.tgz",
+      "integrity": "sha512-G4qppLgKu/k6FwRpHiGiKPaPTFcG3g4wNVX/Qsfu+RqQM30E7Tyu/TEgxcL9PNLF5pdRLwQdE3YKKf+KF2Dzlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inline-style-parser": "0.2.4"
+      }
+    },
+    "node_modules/stylehacks": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.1.1.tgz",
+      "integrity": "sha512-gSTTEQ670cJNoaeIp9KX6lZmm8LJ3jPB5yJmX8Zq/wQxOsAFXV3qjWzHas3YYk1qesuVIyYWWUpZ0vSE/dTSGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.23.0",
+        "postcss-selector-parser": "^6.0.16"
+      },
+      "engines": {
+        "node": "^14 || ^16 || >=18.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.31"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/svg-parser": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
+      "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/svgo": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz",
+      "integrity": "sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@trysound/sax": "0.2.0",
+        "commander": "^7.2.0",
+        "css-select": "^5.1.0",
+        "css-tree": "^2.3.1",
+        "css-what": "^6.1.0",
+        "csso": "^5.0.5",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "svgo": "bin/svgo"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/svgo"
+      }
+    },
+    "node_modules/svgo/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/swr": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/swr/-/swr-2.3.6.tgz",
+      "integrity": "sha512-wfHRmHWk/isGNMwlLGlZX5Gzz/uTgo0o2IRuTMcf4CPuPFJZlq0rDaKUx+ozB5nBOReNV1kiOyzMfj+MBMikLw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dequal": "^2.0.3",
+        "use-sync-external-store": "^1.4.0"
+      },
+      "peerDependencies": {
+        "react": "^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.3.tgz",
+      "integrity": "sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.44.0.tgz",
+      "integrity": "sha512-nIVck8DK+GM/0Frwd+nIhZ84pR/BX7rmXMfYwyg+Sri5oGVE99/E3KvXqpC2xHFxyqXyGHTKBSioxxplrO4I4w==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.15.0",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.14",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
+      "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^4.3.0",
+        "serialize-javascript": "^6.0.2",
+        "terser": "^5.31.1"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/thingies": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/thingies/-/thingies-2.5.0.tgz",
+      "integrity": "sha512-s+2Bwztg6PhWUD7XMfeYm5qliDdSiZm7M7n8KjTkIsm3l/2lgVRc2/Gx/v+ZX8lT4FMA+i8aQvhcWylldc+ZNw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "^2"
+      }
+    },
+    "node_modules/throttleit": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-2.1.0.tgz",
+      "integrity": "sha512-nt6AMGKW1p/70DF/hGBdJB57B8Tspmbp5gfJ8ilhLnt7kkr2ye7hzD6NVG8GGErk2HWF34igrL2CXmNIkzKqKw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tiny-invariant": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
+      "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tiny-warning": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
+      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tinypool": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
+      "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/totalist": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
+      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tree-dump": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/tree-dump/-/tree-dump-1.1.0.tgz",
+      "integrity": "sha512-rMuvhU4MCDbcbnleZTFezWsaZXRFemSqAM+7jPnzUl1fo9w3YEKOxAeui0fz3OI4EU4hf23iyA7uQRVko+UaBA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/trim-lines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
+      "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/trough": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-2.2.0.tgz",
+      "integrity": "sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/type-is/node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/type-is/node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "7.12.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.12.0.tgz",
+      "integrity": "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/unicode-canonical-property-names-ecmascript": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+      "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-emoji-modifier-base": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-emoji-modifier-base/-/unicode-emoji-modifier-base-1.0.0.tgz",
+      "integrity": "sha512-yLSH4py7oFH3oG/9K+XWrz1pSi3dfUrWEnInbxMfArOfc1+33BlGPQtLsOYwvdMy11AwUBetYuaRxSPqgkq+8g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-value-ecmascript": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.1.tgz",
+      "integrity": "sha512-JQ84qTuMg4nVkx8ga4A16a1epI9H6uTXAknqxkGF/aFfRLw1xC/Bp24HNLaZhHSkWd3+84t8iXnp1J0kYcZHhg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-property-aliases-ecmascript": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.2.0.tgz",
+      "integrity": "sha512-hpbDzxUY9BFwX+UeBnxv3Sh1q7HFxj48DTmXchNgRa46lO8uj3/1iEn3MiNUYTg1g9ctIqXCCERn8gYZhHC5lQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unified": {
+      "version": "11.0.5",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-11.0.5.tgz",
+      "integrity": "sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "bail": "^2.0.0",
+        "devlop": "^1.0.0",
+        "extend": "^3.0.0",
+        "is-plain-obj": "^4.0.0",
+        "trough": "^2.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unique-string": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz",
+      "integrity": "sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "crypto-random-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/unist-util-find-after": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-find-after/-/unist-util-find-after-5.0.0.tgz",
+      "integrity": "sha512-amQa0Ep2m6hE2g72AugUItjbuM8X8cGQnFoHk0pGfrFeT9GZhzN5SW8nRsiGKK7Aif4CrACPENkA6P/Lw6fHGQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-is": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz",
+      "integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-position": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz",
+      "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-position-from-estree": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-position-from-estree/-/unist-util-position-from-estree-2.0.0.tgz",
+      "integrity": "sha512-KaFVRjoqLyF6YXCbVLNad/eS4+OfPQQn2yOd7zF/h5T/CSL2v8NpN6a5TPvtbXthAGw5nG+PuTtq+DdIZr+cRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-remove-position": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-5.0.0.tgz",
+      "integrity": "sha512-Hp5Kh3wLxv0PHj9m2yZhhLt58KzPtEYKQQ4yxfYFEO7EvHwzyDYnduhHnY1mDxoqr7VUwVuHXk9RXKIiYS1N8Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-visit": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-stringify-position": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
+      "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-visit": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
+      "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0",
+        "unist-util-visit-parents": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-visit-parents": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz",
+      "integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/update-notifier": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-6.0.2.tgz",
+      "integrity": "sha512-EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boxen": "^7.0.0",
+        "chalk": "^5.0.1",
+        "configstore": "^6.0.0",
+        "has-yarn": "^3.0.0",
+        "import-lazy": "^4.0.0",
+        "is-ci": "^3.0.1",
+        "is-installed-globally": "^0.4.0",
+        "is-npm": "^6.0.0",
+        "is-yarn-global": "^0.4.0",
+        "latest-version": "^7.0.0",
+        "pupa": "^3.1.0",
+        "semver": "^7.3.7",
+        "semver-diff": "^4.0.0",
+        "xdg-basedir": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/yeoman/update-notifier?sponsor=1"
+      }
+    },
+    "node_modules/update-notifier/node_modules/boxen": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-7.1.1.tgz",
+      "integrity": "sha512-2hCgjEmP8YLWQ130n2FerGv7rYpfBmnmp9Uy2Le1vge6X3gZIfSmEzP5QTDElFxcvVcXlEn8Aq6MU/PZygIOog==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-align": "^3.0.1",
+        "camelcase": "^7.0.1",
+        "chalk": "^5.2.0",
+        "cli-boxes": "^3.0.0",
+        "string-width": "^5.1.2",
+        "type-fest": "^2.13.0",
+        "widest-line": "^4.0.1",
+        "wrap-ansi": "^8.1.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/update-notifier/node_modules/camelcase": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-7.0.1.tgz",
+      "integrity": "sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/update-notifier/node_modules/chalk": {
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
+      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/url-loader": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
+      "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "mime-types": "^2.1.27",
+        "schema-utils": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "file-loader": "*",
+        "webpack": "^4.0.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "file-loader": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/url-loader/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/url-loader/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/url-loader/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/url-loader/node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/url-loader/node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/url-loader/node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/use-sync-external-store": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz",
+      "integrity": "sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/utility-types": {
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.11.0.tgz",
+      "integrity": "sha512-6Z7Ma2aVEWisaL6TvBCy7P8rm2LQoPv6dJ7ecIaIixHcwfbJ0x7mWdbcwlIM5IGQxPZSFYeqRCqlOOeKoJYMkw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/value-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
+      "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/vfile": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
+      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vfile-location": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-5.0.3.tgz",
+      "integrity": "sha512-5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vfile-message": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.3.tgz",
+      "integrity": "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-stringify-position": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz",
+      "integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/web-namespaces": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz",
+      "integrity": "sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "5.101.3",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.101.3.tgz",
+      "integrity": "sha512-7b0dTKR3Ed//AD/6kkx/o7duS8H3f1a4w3BYpIriX4BzIhjkn4teo05cptsxvLesHFKK5KObnadmCHBwGc+51A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.8",
+        "@types/json-schema": "^7.0.15",
+        "@webassemblyjs/ast": "^1.14.1",
+        "@webassemblyjs/wasm-edit": "^1.14.1",
+        "@webassemblyjs/wasm-parser": "^1.14.1",
+        "acorn": "^8.15.0",
+        "acorn-import-phases": "^1.0.3",
+        "browserslist": "^4.24.0",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.17.3",
+        "es-module-lexer": "^1.2.1",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.11",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^4.3.2",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.11",
+        "watchpack": "^2.4.1",
+        "webpack-sources": "^3.3.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-bundle-analyzer": {
+      "version": "4.10.2",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz",
+      "integrity": "sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@discoveryjs/json-ext": "0.5.7",
+        "acorn": "^8.0.4",
+        "acorn-walk": "^8.0.0",
+        "commander": "^7.2.0",
+        "debounce": "^1.2.1",
+        "escape-string-regexp": "^4.0.0",
+        "gzip-size": "^6.0.0",
+        "html-escaper": "^2.0.2",
+        "opener": "^1.5.2",
+        "picocolors": "^1.0.0",
+        "sirv": "^2.0.3",
+        "ws": "^7.3.1"
+      },
+      "bin": {
+        "webpack-bundle-analyzer": "lib/bin/analyzer.js"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/webpack-bundle-analyzer/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/webpack-dev-middleware": {
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.4.5.tgz",
+      "integrity": "sha512-uxQ6YqGdE4hgDKNf7hUiPXOdtkXvBJXrfEGYSx7P7LC8hnUYGK70X6xQXUvXeNyBDDcsiQXpG2m3G9vxowaEuA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "colorette": "^2.0.10",
+        "memfs": "^4.43.1",
+        "mime-types": "^3.0.1",
+        "on-finished": "^2.4.1",
+        "range-parser": "^1.2.1",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 18.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-middleware/node_modules/mime-db": {
+      "version": "1.54.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
+      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/webpack-dev-middleware/node_modules/mime-types": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
+      "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "^1.54.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/webpack-dev-middleware/node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/webpack-dev-server": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.2.2.tgz",
+      "integrity": "sha512-QcQ72gh8a+7JO63TAx/6XZf/CWhgMzu5m0QirvPfGvptOusAxG12w2+aua1Jkjr7hzaWDnJ2n6JFeexMHI+Zjg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/bonjour": "^3.5.13",
+        "@types/connect-history-api-fallback": "^1.5.4",
+        "@types/express": "^4.17.21",
+        "@types/express-serve-static-core": "^4.17.21",
+        "@types/serve-index": "^1.9.4",
+        "@types/serve-static": "^1.15.5",
+        "@types/sockjs": "^0.3.36",
+        "@types/ws": "^8.5.10",
+        "ansi-html-community": "^0.0.8",
+        "bonjour-service": "^1.2.1",
+        "chokidar": "^3.6.0",
+        "colorette": "^2.0.10",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^2.0.0",
+        "express": "^4.21.2",
+        "graceful-fs": "^4.2.6",
+        "http-proxy-middleware": "^2.0.9",
+        "ipaddr.js": "^2.1.0",
+        "launch-editor": "^2.6.1",
+        "open": "^10.0.3",
+        "p-retry": "^6.2.0",
+        "schema-utils": "^4.2.0",
+        "selfsigned": "^2.4.1",
+        "serve-index": "^1.9.1",
+        "sockjs": "^0.3.24",
+        "spdy": "^4.0.2",
+        "webpack-dev-middleware": "^7.4.2",
+        "ws": "^8.18.0"
+      },
+      "bin": {
+        "webpack-dev-server": "bin/webpack-dev-server.js"
+      },
+      "engines": {
+        "node": ">= 18.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        },
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/define-lazy-prop": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
+      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/open": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-10.2.0.tgz",
+      "integrity": "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "default-browser": "^5.2.1",
+        "define-lazy-prop": "^3.0.0",
+        "is-inside-container": "^1.0.0",
+        "wsl-utils": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ws": {
+      "version": "8.18.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-merge": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
+      "integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "flat": "^5.0.2",
+        "wildcard": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.3.tgz",
+      "integrity": "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack/node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/webpack/node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/webpackbar": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/webpackbar/-/webpackbar-6.0.1.tgz",
+      "integrity": "sha512-TnErZpmuKdwWBdMoexjio3KKX6ZtoKHRVvLIU0A47R0VVBDtx3ZyOJDktgYixhoJokZTYTt1Z37OkO9pnGJa9Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^4.3.2",
+        "chalk": "^4.1.2",
+        "consola": "^3.2.3",
+        "figures": "^3.2.0",
+        "markdown-table": "^2.0.0",
+        "pretty-time": "^1.1.0",
+        "std-env": "^3.7.0",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=14.21.3"
+      },
+      "peerDependencies": {
+        "webpack": "3 || 4 || 5"
+      }
+    },
+    "node_modules/webpackbar/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/webpackbar/node_modules/markdown-table": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz",
+      "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "repeat-string": "^1.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/webpackbar/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webpackbar/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/websocket-driver": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "http-parser-js": ">=0.5.1",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/websocket-extensions": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/widest-line": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-4.0.1.tgz",
+      "integrity": "sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "string-width": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/wildcard": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
+      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "node_modules/ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/wsl-utils": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/wsl-utils/-/wsl-utils-0.1.0.tgz",
+      "integrity": "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-wsl": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/wsl-utils/node_modules/is-wsl": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
+      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-inside-container": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/xdg-basedir": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz",
+      "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/xml-js": {
+      "version": "1.6.11",
+      "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
+      "integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sax": "^1.2.4"
+      },
+      "bin": {
+        "xml-js": "bin/cli.js"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/yocto-queue": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.1.tgz",
+      "integrity": "sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/zod": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.1.11.tgz",
+      "integrity": "sha512-WPsqwxITS2tzx1bzhIKsEs19ABD5vmCVa4xBo2tq/SrV4RNZtfws1EnCWQXM6yh8bD08a1idvkB5MZSBiZsjwg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
+    "node_modules/zwitch": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+      "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    }
+  }
+}
diff --git a/docs/external/package.json b/docs/external/package.json
new file mode 100644
index 000000000..14b45b175
--- /dev/null
+++ b/docs/external/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@miden/docs-dev",
+  "private": true,
+  "scripts": {
+    "start:dev": "docusaurus start --port 3000 --host 0.0.0.0",
+    "build:dev": "docusaurus build",
+    "serve:dev": "docusaurus serve build"
+  },
+  "devDependencies": {
+    "@docusaurus/core": "^3",
+    "@docusaurus/preset-classic": "^3",
+    "remark-math": "^6",
+    "rehype-katex": "^7"
+  }
+}
diff --git a/docs/external/sidebars.ts b/docs/external/sidebars.ts
new file mode 100644
index 000000000..da531529d
--- /dev/null
+++ b/docs/external/sidebars.ts
@@ -0,0 +1,13 @@
+import type { SidebarsConfig } from "@docusaurus/plugin-content-docs";
+
+/**
+ * Autogenerate entire sidebar tree from /docs
+ * This will include:
+ * - Static docs from this aggregator repo
+ * - All vendor repos' docs synced into subfolders
+ */
+const sidebars: SidebarsConfig = {
+  docs: [{ type: "autogenerated", dirName: "." }],
+};
+
+export default sidebars;
diff --git a/docs/external/src/_category_.json b/docs/external/src/_category_.json
new file mode 100644
index 000000000..51d0d28e5
--- /dev/null
+++ b/docs/external/src/_category_.json
@@ -0,0 +1,5 @@
+{
+  "label": "Node",
+  "position": 6,
+  "collapsed": true
+}
diff --git a/docs/src/resources/node_architecture.svg b/docs/external/src/img/node_architecture.svg
similarity index 100%
rename from docs/src/resources/node_architecture.svg
rename to docs/external/src/img/node_architecture.svg
diff --git a/docs/src/resources/operator_architecture.svg b/docs/external/src/img/operator_architecture.svg
similarity index 100%
rename from docs/src/resources/operator_architecture.svg
rename to docs/external/src/img/operator_architecture.svg
diff --git a/docs/src/resources/workspace_tree.svg b/docs/external/src/img/workspace_tree.svg
similarity index 100%
rename from docs/src/resources/workspace_tree.svg
rename to docs/external/src/img/workspace_tree.svg
diff --git a/docs/src/index.md b/docs/external/src/index.md
similarity index 97%
rename from docs/src/index.md
rename to docs/external/src/index.md
index 30e2b5e3c..b53f7a753 100644
--- a/docs/src/index.md
+++ b/docs/external/src/index.md
@@ -1,3 +1,7 @@
+---
+sidebar_position: 0
+---
+
 # Introduction
 
 Welcome to the Miden node documentation.
diff --git a/docs/external/src/operator/_category_.json b/docs/external/src/operator/_category_.json
new file mode 100644
index 000000000..01a891a78
--- /dev/null
+++ b/docs/external/src/operator/_category_.json
@@ -0,0 +1,5 @@
+{
+  "label": "Node Operator Guide",
+  "position": 1,
+  "collapsed": true
+}
diff --git a/docs/src/operator/architecture.md b/docs/external/src/operator/architecture.md
similarity index 95%
rename from docs/src/operator/architecture.md
rename to docs/external/src/operator/architecture.md
index e54e7131e..9bc9ac0a3 100644
--- a/docs/src/operator/architecture.md
+++ b/docs/external/src/operator/architecture.md
@@ -1,3 +1,8 @@
+---
+title: "Architecture"
+sidebar_position: 2
+---
+
 # Node architecture
 
 The node itself consists of four distributed components: store, block-producer, network transaction builder, and RPC.
@@ -10,7 +15,7 @@ mode.
 The inter-component communication is done using a gRPC API which is assumed trusted. In other words this _must not_ be
 public. External communication is handled by the RPC component with a separate external-only gRPC API.
 
-[![node architecture](../resources/operator_architecture.svg)](../resources/operator_architecture.svg)
+[![node architecture](../img/operator_architecture.svg)](../img/operator_architecture.svg)
 
 ## RPC
 
diff --git a/docs/src/operator/index.md b/docs/external/src/operator/index.md
similarity index 100%
rename from docs/src/operator/index.md
rename to docs/external/src/operator/index.md
diff --git a/docs/src/operator/installation.md b/docs/external/src/operator/installation.md
similarity index 87%
rename from docs/src/operator/installation.md
rename to docs/external/src/operator/installation.md
index e7694da33..1f27c639d 100644
--- a/docs/src/operator/installation.md
+++ b/docs/external/src/operator/installation.md
@@ -1,3 +1,7 @@
+---
+sidebar_position: 3
+---
+
 # Installation
 
 We provide Debian packages for official releases for the node software. Alternatively, it also can be installed from source on most systems using the Rust package manager `cargo`.
@@ -67,9 +71,10 @@ More information on the various `cargo install` options can be found
 
 ## Updating
 
-> [!WARNING]
-> We currently have no backwards compatibility guarantees. This means updating your node is destructive - your
-> existing chain will not work with the new version. This will change as our protocol and database schema mature and
-> settle.
+:::warning
+We currently have no backwards compatibility guarantees. This means updating your node is destructive - your
+existing chain will not work with the new version. This will change as our protocol and database schema mature and
+settle.
+:::
 
-Updating the node to a new version is as simply as re-running the install process and repeating the [bootstrapping](./usage.md#bootstrapping) instructions.
+Updating the node to a new version is as simply as re-running the install process and repeating the [bootstrapping](./usage#bootstrapping) instructions.
diff --git a/docs/src/operator/monitoring.md b/docs/external/src/operator/monitoring.md
similarity index 95%
rename from docs/src/operator/monitoring.md
rename to docs/external/src/operator/monitoring.md
index 2c712b67a..0e67b2999 100644
--- a/docs/src/operator/monitoring.md
+++ b/docs/external/src/operator/monitoring.md
@@ -1,3 +1,8 @@
+---
+title: "Monitoring"
+sidebar_position: 5
+---
+
 # Monitoring & telemetry
 
 We provide logging to `stdout` and an optional [OpenTelemetry](https://opentelemetry.io/) exporter for our traces.
@@ -158,6 +163,7 @@ miden-node bundled start --enable-otel
 Here are some useful Honeycomb queries to help monitor your Miden node:
 
 **Block building performance**:
+
 ```honeycomb
 VISUALIZE
 HEATMAP(duration_ms) AVG(duration_ms)
@@ -169,6 +175,7 @@ LIMIT 100
 ```
 
 **Batch processing latency**:
+
 ```honeycomb
 VISUALIZE
 HEATMAP(duration_ms) AVG(duration_ms) P95(duration_ms)
@@ -179,6 +186,7 @@ LIMIT 100
 ```
 
 **Block proving failures**:
+
 ```honeycomb
 VISUALIZE
 COUNT
@@ -189,6 +197,7 @@ CALCULATE RATE
 ```
 
 **Transaction volume by block**:
+
 ```honeycomb
 VISUALIZE
 MAX(transactions.count)
@@ -198,7 +207,9 @@ GROUP BY block.number
 ORDER BY block.number DESC
 LIMIT 100
 ```
+
 **RPC request rate by endpoint**:
+
 ```honeycomb
 VISUALIZE
 COUNT
@@ -208,6 +219,7 @@ GROUP BY name
 ```
 
 **RPC latency by endpoint**:
+
 ```honeycomb
 VISUALIZE
 AVG(duration_ms) P95(duration_ms)
@@ -217,6 +229,7 @@ GROUP BY name
 ```
 
 **RPC errors by status code**:
+
 ```honeycomb
 VISUALIZE
 COUNT
@@ -230,26 +243,32 @@ GROUP BY status_code
 Create triggers in Honeycomb to alert you when important thresholds are crossed:
 
 **Slow block building**:
-* Query:
+
+- Query:
+
 ```honeycomb
 VISUALIZE
 AVG(duration_ms)
 WHERE
 name = "block_builder.build_block"
 ```
-* Trigger condition: `AVG(duration_ms) > 30000` (adjust based on your expected block time)
-* Description: Alert when blocks take too long to build (more than 30 seconds on average)
+
+- Trigger condition: `AVG(duration_ms) > 30000` (adjust based on your expected block time)
+- Description: Alert when blocks take too long to build (more than 30 seconds on average)
 
 **High failure rate**:
-* Query:
+
+- Query:
+
 ```honeycomb
 VISUALIZE
 COUNT
 WHERE
 name = "block_builder.build_block" AND error = true
 ```
-* Trigger condition: `COUNT > 100 WHERE error = true`
-* Description: Alert when more than 100 block builds are failing
+
+- Trigger condition: `COUNT > 100 WHERE error = true`
+- Description: Alert when more than 100 block builds are failing
 
 #### Advanced investigation with BubbleUp
 
@@ -261,6 +280,7 @@ To identify the root cause of performance issues or errors, use Honeycomb's Bubb
 4. Inspect the related spans in the trace to pinpoint the exact step causing problems
 
 This approach helps identify patterns like:
+
 - Which types of transactions are causing slow blocks
 - Which specific operations within block/batch processing take the most time
 - Correlations between resource usage and performance
diff --git a/docs/src/operator/usage.md b/docs/external/src/operator/usage.md
similarity index 97%
rename from docs/src/operator/usage.md
rename to docs/external/src/operator/usage.md
index b9eef404d..fa4861723 100644
--- a/docs/src/operator/usage.md
+++ b/docs/external/src/operator/usage.md
@@ -1,6 +1,10 @@
+---
+sidebar_position: 4
+---
+
 # Configuration and Usage
 
-As outlined in the [Architecture](./architecture.md) chapter, the node consists of several components which can be run
+As outlined in the [Architecture](./architecture) chapter, the node consists of several components which can be run
 separately or as a single bundled process. At present, the recommended way to operate a node is in bundled mode and is
 what this guide will focus on. Operating the components separately is very similar and should be relatively
 straight-forward to derive from these instructions.
diff --git a/docs/src/operator/versioning.md b/docs/external/src/operator/versioning.md
similarity index 95%
rename from docs/src/operator/versioning.md
rename to docs/external/src/operator/versioning.md
index ede27c578..d678d69b6 100644
--- a/docs/src/operator/versioning.md
+++ b/docs/external/src/operator/versioning.md
@@ -1,3 +1,7 @@
+---
+sidebar_position: 6
+---
+
 # Versioning
 
 We follow the [semver](https://semver.org/) standard for versioning.
diff --git a/docs/src/user/rpc.md b/docs/external/src/rpc.md
similarity index 97%
rename from docs/src/user/rpc.md
rename to docs/external/src/rpc.md
index 875d1146a..258d77b36 100644
--- a/docs/src/user/rpc.md
+++ b/docs/external/src/rpc.md
@@ -1,3 +1,8 @@
+---
+title: "Node gRPC Reference"
+sidebar_position: 1
+---
+
 # gRPC Reference
 
 This is a reference of the Node's public RPC interface. It consists of a gRPC API which may be used to submit transactions and query the state of the blockchain.
@@ -64,7 +69,7 @@ This endpoint accepts a proven transaction and attempts to add it to the mempool
 When transaction submission fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
 
 | Error Code                             | Value | gRPC Status        | Description                                                   |
-|----------------------------------------|-------|--------------------|---------------------------------------------------------------|
+| -------------------------------------- | ----- | ------------------ | ------------------------------------------------------------- |
 | `UNSPECIFIED_ERROR`                    | 0     | `INTERNAL`         | Default/unspecified error                                     |
 | `INTERNAL_ERROR`                       | 1     | `INTERNAL`         | Internal server error occurred                                |
 | `DESERIALIZATION_FAILED`               | 2     | `INVALID_ARGUMENT` | Transaction could not be deserialized                         |
@@ -140,6 +145,7 @@ The `Status.details` field contains the specific error code serialized as raw by
 - **Mapping**: Map the numeric value to the corresponding error enum
 
 **Example decoding** (pseudocode):
+
 ```
 if status.details.length > 0:
     error_code = status.details[0]  // Extract first byte
diff --git a/docs/external/tsconfig.json b/docs/external/tsconfig.json
new file mode 100644
index 000000000..920d7a652
--- /dev/null
+++ b/docs/external/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  // This file is not used in compilation. It is here just for a nice editor experience.
+  "extends": "@docusaurus/tsconfig",
+  "compilerOptions": {
+    "baseUrl": "."
+  },
+  "exclude": [".docusaurus", "build"]
+}
diff --git a/docs/internal/.gitignore b/docs/internal/.gitignore
new file mode 100644
index 000000000..4e42a1bcd
--- /dev/null
+++ b/docs/internal/.gitignore
@@ -0,0 +1 @@
+book/
\ No newline at end of file
diff --git a/docs/book.toml b/docs/internal/book.toml
similarity index 82%
rename from docs/book.toml
rename to docs/internal/book.toml
index 10ee44cd5..09a76af96 100644
--- a/docs/book.toml
+++ b/docs/internal/book.toml
@@ -3,7 +3,7 @@ authors      = ["Miden contributors"]
 description  = "Manual for the Miden node software which is responsible for aggregating transactions into blocks for the Miden blockchain."
 language     = "en"
 multilingual = false
-title        = "The Miden Node Operator and Developer Guide"
+title        = "The Miden Node Developer Guide"
 
 [output.html]
 git-repository-url = "https://github.com/0xMiden/miden-node"
@@ -13,4 +13,4 @@ after = ["links"]
 
 [preprocessor.alerts]
 
-[output.linkcheck]
+[output.linkcheck]
\ No newline at end of file
diff --git a/docs/internal/src/SUMMARY.md b/docs/internal/src/SUMMARY.md
new file mode 100644
index 000000000..a8bf4eb82
--- /dev/null
+++ b/docs/internal/src/SUMMARY.md
@@ -0,0 +1,14 @@
+<!-- This file is used to represent aggregate documentation for the Miden book -->
+
+# Summary
+
+- [Overview](./index.md)
+- [Contributing](./contributing.md)
+- [Navigating the codebase](./codebase.md)
+- [Monitoring](./monitoring.md)
+- [Components](./components.md)
+  - [RPC](./rpc.md)
+  - [Store](./store.md)
+  - [Block producer](./block-producer.md)
+  - [Network transaction builder](./ntx-builder.md)
+- [Common issues other oddities](./oddities.md)
diff --git a/docs/src/developer/block-producer.md b/docs/internal/src/block-producer.md
similarity index 100%
rename from docs/src/developer/block-producer.md
rename to docs/internal/src/block-producer.md
diff --git a/docs/internal/src/codebase.md b/docs/internal/src/codebase.md
new file mode 100644
index 000000000..459ab03ed
--- /dev/null
+++ b/docs/internal/src/codebase.md
@@ -0,0 +1,28 @@
+# Navigating the codebase
+
+The code is organised using a Rust workspace with separate crates for the node and remote prover binaries, a crate for each node
+component, a couple of gRPC-related codegen crates, and a catch-all utilities crate.
+
+The primary artifacts are the node and remote prover binaries. The library crates are not intended for external usage, but
+instead simply serve to enforce code organisation and decoupling.
+
+| Crate                  | Description                                                                                                                                              |
+| ---------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `node`                 | The node executable. Configure and run the node and its components.                                                                                      |
+| `remote-prover`        | Remote prover executables. Includes workers and proxies.                                                                                                 |
+| `remote-prover-client` | Remote prover client implementation.                                                                                                                     |
+| `block-producer`       | Block-producer component implementation.                                                                                                                 |
+| `store`                | Store component implementation.                                                                                                                          |
+| `ntx-builder`          | Network transaction builder component implementation.                                                                                                    |
+| `rpc`                  | RPC component implementation.                                                                                                                            |
+| `proto`                | Contains and exports all protobuf definitions.                                                                                                           |
+| `rpc-proto`            | Contains the RPC protobuf definitions. Currently this is an awkward clone of `proto` because we re-use the definitions from the internal protobuf types. |
+| `utils`                | Variety of utility functionality.                                                                                                                        |
+| `test-macro`           | Provides a procedural macro to enable tracing in tests.                                                                                                  |
+
+---
+
+> [!NOTE] > [`miden-base`](https://github.com/0xMiden/miden-base) is an important dependency which
+> contains the core Miden protocol definitions e.g. accounts, notes, transactions etc.
+
+[![workspace dependency tree](../../external/src/img/workspace_tree.svg)](../../external/src/img/workspace_tree.svg)
diff --git a/docs/internal/src/components.md b/docs/internal/src/components.md
new file mode 100644
index 000000000..3137df423
--- /dev/null
+++ b/docs/internal/src/components.md
@@ -0,0 +1,8 @@
+# Node components
+
+The node is split into three distinct components that communicate via gRPC. See the
+[Operator guide#architecture](../../external/src/operator/architecture.md) chapter for an overview of each component.
+
+The following sections will describe the inner architecture of each component.
+
+[![node internal architecture](../../external/src/img/node_architecture.svg)](../../external/src/img/node_architecture.svg)
diff --git a/docs/src/developer/contributing.md b/docs/internal/src/contributing.md
similarity index 100%
rename from docs/src/developer/contributing.md
rename to docs/internal/src/contributing.md
diff --git a/docs/src/developer/index.md b/docs/internal/src/index.md
similarity index 92%
rename from docs/src/developer/index.md
rename to docs/internal/src/index.md
index 4460bb524..dd6802b19 100644
--- a/docs/src/developer/index.md
+++ b/docs/internal/src/index.md
@@ -7,7 +7,7 @@ architectural decisions.
 
 This is _not_ intended for dApp developers or users of the node, but for development of the node itself.
 
-It is also a good idea to familiarise yourself with the [operator manual](../operator/index.md).
+It is also a good idea to familiarise yourself with the [operator manual](../../external/src/operator/index.md).
 
 <div class="warning">
 
diff --git a/docs/src/developer/monitoring.md b/docs/internal/src/monitoring.md
similarity index 99%
rename from docs/src/developer/monitoring.md
rename to docs/internal/src/monitoring.md
index d0cdae273..e6bbad83c 100644
--- a/docs/src/developer/monitoring.md
+++ b/docs/internal/src/monitoring.md
@@ -3,7 +3,7 @@
 Developer level overview of how we aim to use `tracing` and `open-telemetry` to provide monitoring and telemetry for the
 node.
 
-Please begin by reading through the [monitoring operator guide](../operator/monitoring.md) as this will
+Please begin by reading through the [monitoring operator guide](../../external/src/operator/monitoring.md) as this will
 provide some much needed context.
 
 ## Approach and philosophy
diff --git a/docs/src/developer/ntx-builder.md b/docs/internal/src/ntx-builder.md
similarity index 100%
rename from docs/src/developer/ntx-builder.md
rename to docs/internal/src/ntx-builder.md
diff --git a/docs/src/developer/oddities.md b/docs/internal/src/oddities.md
similarity index 100%
rename from docs/src/developer/oddities.md
rename to docs/internal/src/oddities.md
diff --git a/docs/src/developer/rpc.md b/docs/internal/src/rpc.md
similarity index 100%
rename from docs/src/developer/rpc.md
rename to docs/internal/src/rpc.md
diff --git a/docs/src/developer/store.md b/docs/internal/src/store.md
similarity index 100%
rename from docs/src/developer/store.md
rename to docs/internal/src/store.md
diff --git a/docs/src/EXPORTED.md b/docs/src/EXPORTED.md
deleted file mode 100644
index 0015e1260..000000000
--- a/docs/src/EXPORTED.md
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- This file is used to represent aggregate documentation for the Miden book -->
-
-# Summary
-
-- [Node](./index.md)
-    - [Node Operator Guide](./operator/index.md)
-        - [Architecture](./operator/architecture.md)
-        - [Installation](./operator/installation.md)
-        - [Configuration and Usage](./operator/usage.md)
-        - [Monitoring](./operator/monitoring.md)
-        - [Versioning](./operator/versioning.md)
-    - [Node gRPC Reference](./user/rpc.md)
diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
deleted file mode 100644
index a51c50257..000000000
--- a/docs/src/SUMMARY.md
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- This file is used to represent local documentation -->
-
-# Summary
-
-[Introduction](./index.md)
-
----
-
-# Operator Guide
-
-- [Overview](./operator/index.md)
-- [Architecture](./operator/architecture.md)
-- [Installation](./operator/installation.md)
-- [Configuration and Usage](./operator/usage.md)
-- [Monitoring](./operator/monitoring.md)
-- [Versioning](./operator/versioning.md)
-
----
-
-# Developer Guide
-
-- [Overview](./developer/index.md)
-- [Contributing](./developer/contributing.md)
-- [Navigating the codebase](./developer/codebase.md)
-- [Monitoring](./developer/monitoring.md)
-- [Components](./developer/components.md)
-  - [RPC](./developer/rpc.md)
-  - [Store](./developer/store.md)
-  - [Block producer](./developer/block-producer.md)
-  - [Network transaction builder](./developer/ntx-builder.md)
-- [Common issues other oddities](./developer/oddities.md)
-
----
-
-# gRPC Reference
-
-- [RPC Reference](./user/rpc.md)
diff --git a/docs/src/developer/codebase.md b/docs/src/developer/codebase.md
deleted file mode 100644
index 70fe2504c..000000000
--- a/docs/src/developer/codebase.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Navigating the codebase
-
-The code is organised using a Rust workspace with separate crates for the node and remote prover binaries, a crate for each node
-component, a couple of gRPC-related codegen crates, and a catch-all utilities crate.
-
-The primary artifacts are the node and remote prover binaries. The library crates are not intended for external usage, but
-instead simply serve to enforce code organisation and decoupling.
-
-| Crate                     | Description                                                                                                                                              |
-| ------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `node`                    | The node executable. Configure and run the node and its components.                                                                                      |
-| `remote-prover`           | Remote prover executables. Includes workers and proxies.                                                                                                 |
-| `remote-prover-client`    | Remote prover client implementation.                                                                                                                     |
-| `block-producer`          | Block-producer component implementation.                                                                                                                 |
-| `store`                   | Store component implementation.                                                                                                                          |
-| `ntx-builder`             | Network transaction builder component implementation.                                                                                                    |
-| `rpc`                     | RPC component implementation.                                                                                                                            |
-| `proto`                   | Contains and exports all protobuf definitions.                                                                                                           |
-| `rpc-proto`               | Contains the RPC protobuf definitions. Currently this is an awkward clone of `proto` because we re-use the definitions from the internal protobuf types. |
-| `utils`                   | Variety of utility functionality.                                                                                                                        |
-| `test-macro`              | Provides a procedural macro to enable tracing in tests.                                                                                                  |
-
-
--------
-
-> [!NOTE]
-> [`miden-base`](https://github.com/0xMiden/miden-base) is an important dependency which
-> contains the core Miden protocol definitions e.g. accounts, notes, transactions etc.
-
-[![workspace dependency tree](../resources/workspace_tree.svg)](../resources/workspace_tree.svg)
diff --git a/docs/src/developer/components.md b/docs/src/developer/components.md
deleted file mode 100644
index aa63a3c63..000000000
--- a/docs/src/developer/components.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Node components
-
-The node is split into three distinct components that communicate via gRPC. See the
-[Operator guide#architecture](../operator/architecture.md) chapter for an overview of each component.
-
-The following sections will describe the inner architecture of each component.
-
-[![node internal architecture](../resources/node_architecture.svg)](../resources/node_architecture.svg)

From 24c36348f551c9abc9d194b652125913d7c7b6c3 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Mon, 29 Sep 2025 11:32:52 -0300
Subject: [PATCH 26/78] chore: improve monitor configurations (#1246)

* chore: create Tasks struct to manage tasks

* chore: add clap for easier configuration

* docs: update README

* chore: make handle_failure method of Tasks

* chore: move clap to workspace dependency

* review: add help output to module docs

* fix: explicit code block type

* chore: add configs for checks intervals

* review: remove help output from mod docs

* review: pass monitor as reference to spawn_*

* review: faucet not set log as warn

* review: replace unwrap with expect
---
 Cargo.lock                        |   2 +
 Cargo.toml                        |   1 +
 bin/network-monitor/.env          |   4 +
 bin/network-monitor/Cargo.toml    |   2 +
 bin/network-monitor/README.md     |  65 ++++-
 bin/network-monitor/src/config.rs | 135 +++++----
 bin/network-monitor/src/faucet.rs |  11 +-
 bin/network-monitor/src/main.rs   | 469 ++++++++++++++----------------
 bin/network-monitor/src/status.rs |  13 +-
 bin/node/Cargo.toml               |   2 +-
 bin/remote-prover/Cargo.toml      |   2 +-
 11 files changed, 378 insertions(+), 328 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fbbb85ad0..8e21183d5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2202,6 +2202,8 @@ version = "0.12.0"
 dependencies = [
  "anyhow",
  "axum",
+ "clap 4.5.47",
+ "humantime",
  "miden-node-proto",
  "miden-node-utils",
  "miden-objects",
diff --git a/Cargo.toml b/Cargo.toml
index ea05eebda..815afbc11 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,6 +59,7 @@ miden-air = { version = "0.17" }
 anyhow             = { version = "1.0" }
 assert_matches     = { version = "1.5" }
 async-trait        = { version = "0.1" }
+clap               = { features = ["derive"], version = "4.5" }
 fs-err             = { version = "3" }
 futures            = { version = "0.3" }
 hex                = { version = "0.4" }
diff --git a/bin/network-monitor/.env b/bin/network-monitor/.env
index 9d95137f7..1edc9c4c0 100644
--- a/bin/network-monitor/.env
+++ b/bin/network-monitor/.env
@@ -1,4 +1,8 @@
 MIDEN_MONITOR_RPC_URL=http://0.0.0.0:57291
 MIDEN_MONITOR_REMOTE_PROVER_URLS=https://tx-prover.devnet.miden.io/,https://batch-prover.devnet.miden.io/
+MIDEN_MONITOR_FAUCET_URL=http://localhost:8080
+MIDEN_MONITOR_REMOTE_PROVER_TEST_INTERVAL=2m
+MIDEN_MONITOR_FAUCET_TEST_INTERVAL=2m
+MIDEN_MONITOR_STATUS_CHECK_INTERVAL=30s
 MIDEN_MONITOR_PORT=3001
 MIDEN_MONITOR_ENABLE_OTEL=true
diff --git a/bin/network-monitor/Cargo.toml b/bin/network-monitor/Cargo.toml
index 28d914d16..8ed1053c9 100644
--- a/bin/network-monitor/Cargo.toml
+++ b/bin/network-monitor/Cargo.toml
@@ -17,6 +17,8 @@ workspace = true
 [dependencies]
 anyhow           = { workspace = true }
 axum             = { version = "0.8" }
+clap             = { features = ["env"], workspace = true }
+humantime        = { workspace = true }
 miden-node-proto = { workspace = true }
 miden-node-utils = { workspace = true }
 miden-objects    = { features = ["std", "testing"], workspace = true }
diff --git a/bin/network-monitor/README.md b/bin/network-monitor/README.md
index bf8b350d4..a4df421ac 100644
--- a/bin/network-monitor/README.md
+++ b/bin/network-monitor/README.md
@@ -12,16 +12,69 @@ make install-network-monitor
 
 ## Configuration
 
-The monitor application uses environment variables for configuration:
+The monitor application supports configuration through both command-line arguments and environment variables. Command-line arguments take precedence over environment variables.
 
-- `MIDEN_MONITOR_RPC_URL`: RPC service URL (default: `http://localhost:50051`)
-- `MIDEN_MONITOR_REMOTE_PROVER_URLS`: Comma-separated list of remote prover URLs (default: `http://localhost:50052`)
-- `MIDEN_MONITOR_FAUCET_URL`: Faucet service URL for testing (default: `http://localhost:8080`)
-- `MIDEN_MONITOR_PORT`: Web server port (default: `3000`)
-- `MIDEN_MONITOR_ENABLE_OTEL`: Enable OpenTelemetry tracing (default: `false`)
+### Command-line Arguments
+
+```bash
+# View all available options
+miden-network-monitor --help
+
+# Common usage examples
+miden-network-monitor --port 8080 --rpc-url http://localhost:50051
+miden-network-monitor --remote-prover-urls http://prover1.com:50052,http://prover2.com:50053
+miden-network-monitor --faucet-url http://localhost:8080 --enable-otel
+```
+
+**Available Options:**
+- `--rpc-url`: RPC service URL (default: `http://localhost:50051`)
+- `--remote-prover-urls`: Comma-separated list of remote prover URLs (default: `http://localhost:50052`)
+- `--faucet-url`: Faucet service URL for testing (default: `http://localhost:8080`)
+- `--remote-prover-test-interval`: Interval at which to test the remote provers services (default: `2m`)
+- `--faucet-test-interval`: Interval at which to test the faucet services (default: `2m`)
+- `--status-check-interval`: Interval at which to check the status of the services (default: `3s`)
+- `--port, -p`: Web server port (default: `3000`)
+- `--enable-otel`: Enable OpenTelemetry tracing
+- `--help, -h`: Show help information
+- `--version, -V`: Show version information
+
+### Environment Variables
+
+If command-line arguments are not provided, the application falls back to environment variables:
+
+- `MIDEN_MONITOR_RPC_URL`: RPC service URL
+- `MIDEN_MONITOR_REMOTE_PROVER_URLS`: Comma-separated list of remote prover URLs
+- `MIDEN_MONITOR_FAUCET_URL`: Faucet service URL for testing
+- `MIDEN_MONITOR_REMOTE_PROVER_TEST_INTERVAL`: Interval at which to test the remote provers services
+- `MIDEN_MONITOR_FAUCET_TEST_INTERVAL`: Interval at which to test the faucet services
+- `MIDEN_MONITOR_STATUS_CHECK_INTERVAL`: Interval at which to check the status of the services
+- `MIDEN_MONITOR_PORT`: Web server port
+- `MIDEN_MONITOR_ENABLE_OTEL`: Enable OpenTelemetry tracing
 
 ## Usage
 
+### Using Command-line Arguments
+
+```bash
+# Single remote prover
+miden-network-monitor --remote-prover-urls http://localhost:50052
+
+# Multiple remote provers and custom configuration
+miden-network-monitor \
+  --remote-prover-urls http://localhost:50052,http://localhost:50053,http://localhost:50054 \
+  --faucet-url http://localhost:8080 \
+  --remote-prover-test-interval 2m \
+  --faucet-test-interval 2m \
+  --status-check-interval 3s \
+  --port 8080 \
+  --enable-otel
+
+# Get help
+miden-network-monitor --help
+```
+
+### Using Environment Variables
+
 ```bash
 # Single remote prover
 MIDEN_MONITOR_REMOTE_PROVER_URLS="http://localhost:50052" miden-network-monitor
diff --git a/bin/network-monitor/src/config.rs b/bin/network-monitor/src/config.rs
index 44615d461..24394186e 100644
--- a/bin/network-monitor/src/config.rs
+++ b/bin/network-monitor/src/config.rs
@@ -1,7 +1,11 @@
 //! Network monitor configuration.
 //!
 //! This module contains the configuration structures and constants for the network monitor.
+//! Configuration for the monitor.
 
+use std::time::Duration;
+
+use clap::Parser;
 use url::Url;
 
 // MONITOR CONFIGURATION CONSTANTS
@@ -12,77 +16,88 @@ const DEFAULT_REMOTE_PROVER_URLS: &str = "http://localhost:50052";
 const DEFAULT_FAUCET_URL: &str = "http://localhost:8080";
 const DEFAULT_PORT: u16 = 3000;
 
-const RPC_URL_ENV_VAR: &str = "MIDEN_MONITOR_RPC_URL";
-const REMOTE_PROVER_URLS_ENV_VAR: &str = "MIDEN_MONITOR_REMOTE_PROVER_URLS";
-const FAUCET_URL_ENV_VAR: &str = "MIDEN_MONITOR_FAUCET_URL";
-const PORT_ENV_VAR: &str = "MIDEN_MONITOR_PORT";
-const ENABLE_OTEL_ENV_VAR: &str = "MIDEN_MONITOR_ENABLE_OTEL";
-
 /// Configuration for the monitor.
 ///
 /// This struct contains the configuration for the monitor.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Parser)]
+#[command(name = "miden-network-monitor")]
+#[command(about = "A network monitor for Miden node services")]
+#[command(version)]
 pub struct MonitorConfig {
     /// The URL of the RPC service.
+    #[arg(
+        long = "rpc-url",
+        env = "MIDEN_MONITOR_RPC_URL",
+        default_value = DEFAULT_RPC_URL,
+        help = "The URL of the RPC service"
+    )]
     pub rpc_url: Url,
-    /// The URLs of the remote provers for status checking.
-    pub remote_prover_urls: Vec<Url>,
-    /// The URL of the faucet service for testing.
-    pub faucet_url: Option<Url>,
-    /// The port of the monitor.
-    pub port: u16,
-    /// Whether to enable OpenTelemetry.
-    pub enable_otel: bool,
-}
 
-impl MonitorConfig {
-    /// Loads the configuration from the environment variables.
-    ///
-    /// This function loads the configuration from the environment variables.
-    /// The environment variables are:
-    /// - `MIDEN_MONITOR_RPC_URL`: The URL of the RPC service.
-    /// - `MIDEN_MONITOR_REMOTE_PROVER_URLS`: The URLs of the remote provers for status checking,
-    ///   comma separated.
-    /// - `MIDEN_MONITOR_FAUCET_URL`: The URL of the faucet service for testing (optional).
-    /// - `MIDEN_MONITOR_PORT`: The port of the monitor.
-    /// - `MIDEN_MONITOR_ENABLE_OTEL`: Whether to enable OpenTelemetry.
-    pub fn from_env() -> Result<Self, Box<dyn std::error::Error>> {
-        let rpc_url =
-            std::env::var(RPC_URL_ENV_VAR).unwrap_or_else(|_| DEFAULT_RPC_URL.to_string());
+    /// The URLs of the remote provers for status checking (comma-separated).
+    #[arg(
+        long = "remote-prover-urls",
+        env = "MIDEN_MONITOR_REMOTE_PROVER_URLS",
+        default_value = DEFAULT_REMOTE_PROVER_URLS,
+        value_delimiter = ',',
+        help = "The URLs of the remote provers for status checking (comma-separated)"
+    )]
+    pub remote_prover_urls: Vec<Url>,
 
-        // Parse multiple remote prover URLs from environment variable for status checking
-        let remote_prover_urls = std::env::var(REMOTE_PROVER_URLS_ENV_VAR)
-            .unwrap_or_else(|_| DEFAULT_REMOTE_PROVER_URLS.to_string());
+    /// The URL of the faucet service for testing (optional).
+    #[arg(
+        long = "faucet-url",
+        env = "MIDEN_MONITOR_FAUCET_URL",
+        default_value = DEFAULT_FAUCET_URL,
+        help = "The URL of the faucet service for testing (optional)"
+    )]
+    pub faucet_url: Option<Url>,
 
-        let remote_prover_urls = remote_prover_urls
-            .split(',')
-            .map(str::trim)
-            .filter(|url| !url.is_empty())
-            .map(Url::parse)
-            .collect::<Result<Vec<_>, _>>()?;
+    /// The interval at which to test the remote provers services.
+    #[arg(
+        long = "remote-prover-test-interval",
+        env = "MIDEN_MONITOR_REMOTE_PROVER_TEST_INTERVAL",
+        default_value = "2m",
+        value_parser = humantime::parse_duration,
+        help = "The interval at which to test the remote provers services"
+    )]
+    pub remote_prover_test_interval: Duration,
 
-        // Parse optional faucet URL
-        let faucet_url = if let Ok(url_str) = std::env::var(FAUCET_URL_ENV_VAR) {
-            Some(Url::parse(&url_str)?)
-        } else {
-            Some(Url::parse(DEFAULT_FAUCET_URL)?)
-        };
+    /// The interval at which to test the faucet services.
+    #[arg(
+        long = "faucet-test-interval",
+        env = "MIDEN_MONITOR_FAUCET_TEST_INTERVAL",
+        default_value = "2m",
+        value_parser = humantime::parse_duration,
+        help = "The interval at which to test the faucet services"
+    )]
+    pub faucet_test_interval: Duration,
 
-        let port = std::env::var(PORT_ENV_VAR)
-            .unwrap_or_else(|_| DEFAULT_PORT.to_string())
-            .parse::<u16>()?;
+    /// The interval at which to check the status of the services.
+    #[arg(
+        long = "status-check-interval",
+        env = "MIDEN_MONITOR_STATUS_CHECK_INTERVAL",
+        default_value = "3s",
+        value_parser = humantime::parse_duration,
+        help = "The interval at which to check the status of the services"
+    )]
+    pub status_check_interval: Duration,
 
-        let enable_otel = std::env::var(ENABLE_OTEL_ENV_VAR)
-            .unwrap_or_default()
-            .parse::<bool>()
-            .unwrap_or_default();
+    /// The port of the monitor.
+    #[arg(
+        long = "port",
+        short = 'p',
+        env = "MIDEN_MONITOR_PORT",
+        default_value_t = DEFAULT_PORT,
+        help = "The port of the monitor"
+    )]
+    pub port: u16,
 
-        Ok(MonitorConfig {
-            rpc_url: Url::parse(&rpc_url)?,
-            remote_prover_urls,
-            faucet_url,
-            port,
-            enable_otel,
-        })
-    }
+    /// Whether to enable OpenTelemetry.
+    #[arg(
+        long = "enable-otel",
+        env = "MIDEN_MONITOR_ENABLE_OTEL",
+        action = clap::ArgAction::SetTrue,
+        help = "Whether to enable OpenTelemetry"
+    )]
+    pub enable_otel: bool,
 }
diff --git a/bin/network-monitor/src/faucet.rs b/bin/network-monitor/src/faucet.rs
index e3f5b22a9..911fc9712 100644
--- a/bin/network-monitor/src/faucet.rs
+++ b/bin/network-monitor/src/faucet.rs
@@ -26,8 +26,6 @@ use crate::{COMPONENT, current_unix_timestamp_secs};
 const MAX_CHALLENGE_ATTEMPTS: u64 = 100_000_000;
 /// Amount of tokens to mint.
 const MINT_AMOUNT: u64 = 1_000_000; // 1 token with 6 decimals
-/// Interval between faucet tests.
-const TEST_INTERVAL: Duration = Duration::from_secs(2 * 60);
 
 // FAUCET TEST TYPES
 // ================================================================================================
@@ -71,19 +69,24 @@ struct GetTokensResponse {
 ///
 /// * `faucet_url` - The URL of the faucet service to test.
 /// * `status_sender` - The sender for the watch channel.
+/// * `test_interval` - The interval at which to test the faucet services.
 ///
 /// # Returns
 ///
 /// `Ok(())` if the task completes successfully, or an error if the task fails.
 #[instrument(target = COMPONENT, name = "faucet-test-task", skip_all)]
-pub async fn run_faucet_test_task(faucet_url: Url, status_sender: watch::Sender<ServiceStatus>) {
+pub async fn run_faucet_test_task(
+    faucet_url: Url,
+    status_sender: watch::Sender<ServiceStatus>,
+    test_interval: Duration,
+) {
     let client = Client::new();
     let mut success_count = 0u64;
     let mut failure_count = 0u64;
     let mut last_tx_id = None;
     let mut last_challenge_difficulty = None;
 
-    let mut interval = tokio::time::interval(TEST_INTERVAL);
+    let mut interval = tokio::time::interval(test_interval);
     interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
 
     loop {
diff --git a/bin/network-monitor/src/main.rs b/bin/network-monitor/src/main.rs
index 135a0c50d..d9ead9b72 100644
--- a/bin/network-monitor/src/main.rs
+++ b/bin/network-monitor/src/main.rs
@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
+use clap::Parser;
 use miden_node_proto::clients::{Builder as ClientBuilder, RemoteProverProxy, Rpc};
 use miden_node_utils::logging::OpenTelemetry;
 use tokio::sync::watch;
@@ -17,7 +18,7 @@ use config::MonitorConfig;
 use faucet::run_faucet_test_task;
 use remote_prover::run_remote_prover_test_task;
 use status::{ServiceStatus, run_remote_prover_status_task, run_rpc_status_task};
-use tracing::{debug, info};
+use tracing::{debug, info, warn};
 
 use crate::frontend::{ServerState, serve};
 use crate::remote_prover::{ProofType, generate_prover_test_payload};
@@ -38,16 +39,9 @@ pub const COMPONENT: &str = "miden-network-monitor";
 /// unexpectedly, the entire process exits.
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    // Load configuration from environment variables
-    let config = match MonitorConfig::from_env() {
-        Ok(config) => {
-            info!("Loaded configuration: {:?}", config);
-            config
-        },
-        Err(e) => {
-            anyhow::bail!("failed to load configuration: {e}");
-        },
-    };
+    // Load configuration from command-line arguments and environment variables
+    let config = MonitorConfig::parse();
+    info!("Loaded configuration: {:?}", config);
 
     if config.enable_otel {
         miden_node_utils::logging::setup_tracing(OpenTelemetry::Enabled)?;
@@ -55,289 +49,258 @@ async fn main() -> anyhow::Result<()> {
         miden_node_utils::logging::setup_tracing(OpenTelemetry::Disabled)?;
     }
 
-    let mut tasks = JoinSet::new();
-    let mut component_ids: HashMap<_, String> = HashMap::new();
+    let mut tasks = Tasks::new();
 
     // Initialize the RPC Status endpoint checker task.
-    let rpc_rx = initialize_rpc_status_checker(&config, &mut tasks, &mut component_ids).await;
+    let rpc_rx = tasks.spawn_rpc_checker(&config).await?;
 
     // Initialize the prover checkers & tests tasks.
-    let prover_rxs = initialize_prover_tasks(&config, &mut tasks, &mut component_ids).await;
+    let prover_rxs = tasks.spawn_prover_tasks(&config).await?;
 
     // Initialize the faucet testing task.
-    let faucet_rx = initialize_faucet_task(&config, &mut tasks, &mut component_ids);
+    let faucet_rx = if config.faucet_url.is_some() {
+        Some(tasks.spawn_faucet(&config))
+    } else {
+        warn!("Faucet URL not configured, skipping faucet testing");
+        None
+    };
 
     // Initialize HTTP server.
-    initialize_http_server(&config, rpc_rx, prover_rxs, faucet_rx, &mut tasks, &mut component_ids);
+    let server_state = ServerState {
+        rpc: rpc_rx,
+        provers: prover_rxs,
+        faucet: faucet_rx,
+    };
+    tasks.spawn_http_server(server_state, &config);
 
-    handle_failure(tasks, component_ids).await
+    tasks.handle_failure().await
 }
 
-// RPC CHECKER INITIALIZER
+// TASKS MANAGEMENT
 // ================================================================================================
 
-/// Initializes the RPC status checker.
-///
-/// This function initializes the RPC status checker and returns a receiver for the RPC status.
-///
-/// # Arguments
-///
-/// * `config` - The configuration for the RPC service.
-/// * `tasks` - The join set for the tasks.
-/// * `component_ids` - The component IDs.
-///
-/// # Returns
-///
-/// A receiver for the RPC status.
-pub(crate) async fn initialize_rpc_status_checker(
-    config: &MonitorConfig,
-    tasks: &mut JoinSet<()>,
-    component_ids: &mut HashMap<Id, String>,
-) -> Receiver<ServiceStatus> {
-    // Create initial status for RPC service
-    let mut rpc = ClientBuilder::new(config.rpc_url.clone())
-        .with_tls()
-        .unwrap()
-        .with_timeout(Duration::from_secs(10))
-        .without_metadata_version()
-        .without_metadata_genesis()
-        .connect_lazy::<Rpc>();
-
-    let current_time = current_unix_timestamp_secs();
-
-    let initial_rpc_status = check_rpc_status(&mut rpc, current_time).await;
-
-    // Spawn the RPC checker
-    let (rpc_tx, rpc_rx) = watch::channel(initial_rpc_status);
-    let rpc_url = config.rpc_url.clone();
-    let id = tasks.spawn(async move { run_rpc_status_task(rpc_url, rpc_tx).await }).id();
-    component_ids.insert(id, "rpc-checker".to_string());
-    rpc_rx
+/// Task management structure that encapsulates `JoinSet` and component names.
+#[derive(Default)]
+struct Tasks {
+    handles: JoinSet<()>,
+    names: HashMap<Id, String>,
 }
 
-// PROVER TASKS INITIALIZER
-// ================================================================================================
+impl Tasks {
+    /// Create a new Tasks instance.
+    fn new() -> Self {
+        Self {
+            handles: JoinSet::new(),
+            names: HashMap::new(),
+        }
+    }
 
-/// Initializes the prover tasks.
-///
-/// This function initializes the prover tasks and returns a vector of receivers for the prover
-/// status.
-///
-/// # Arguments
-///
-/// * `config` - The configuration for the provers.
-/// * `tasks` - The join set for the tasks.
-/// * `component_ids` - The component IDs.
-///
-/// # Returns
-///
-/// A vector of receivers for the prover status.
-async fn initialize_prover_tasks(
-    config: &MonitorConfig,
-    tasks: &mut JoinSet<()>,
-    component_ids: &mut HashMap<Id, String>,
-) -> Vec<(watch::Receiver<ServiceStatus>, watch::Receiver<ServiceStatus>)> {
-    let mut prover_rxs = Vec::new();
-    for (i, prover_url) in config.remote_prover_urls.clone().into_iter().enumerate() {
-        let name = format!("Prover-{}", i + 1);
-
-        let mut remote_prover = ClientBuilder::new(prover_url.clone())
+    /// Spawn the RPC status checker task.
+    async fn spawn_rpc_checker(
+        &mut self,
+        config: &MonitorConfig,
+    ) -> anyhow::Result<Receiver<ServiceStatus>> {
+        // Create initial status for RPC service
+        let mut rpc = ClientBuilder::new(config.rpc_url.clone())
             .with_tls()
             .expect("TLS is enabled")
             .with_timeout(Duration::from_secs(10))
             .without_metadata_version()
             .without_metadata_genesis()
-            .connect_lazy::<RemoteProverProxy>();
+            .connect_lazy::<Rpc>();
 
         let current_time = current_unix_timestamp_secs();
-
-        let initial_prover_status = check_remote_prover_status(
-            &mut remote_prover,
-            name.clone(),
-            prover_url.to_string(),
-            current_time,
-        )
-        .await;
-
-        let (prover_status_tx, prover_status_rx) = watch::channel(initial_prover_status.clone());
-
-        // Spawn the remote prover status check task
-        let component_name = format!("prover-checker-{}", i + 1);
-        let id = tasks
-            .spawn({
-                let prover_url = prover_url.clone();
-                let name = name.clone();
-
-                run_remote_prover_status_task(prover_url, name, prover_status_tx)
+        let initial_rpc_status = check_rpc_status(&mut rpc, current_time).await;
+
+        // Spawn the RPC checker
+        let (rpc_tx, rpc_rx) = watch::channel(initial_rpc_status);
+        let rpc_url = config.rpc_url.clone();
+        let status_check_interval = config.status_check_interval;
+        let id = self
+            .handles
+            .spawn(async move {
+                run_rpc_status_task(rpc_url, rpc_tx, status_check_interval).await;
             })
             .id();
-        component_ids.insert(id, component_name);
-
-        // Extract proof_type directly from the service status
-        let proof_type = match &initial_prover_status.details {
-            crate::status::ServiceDetails::RemoteProverStatus(details) => {
-                details.supported_proof_type.clone()
-            },
-            _ => unreachable!("This is for remote provers only"),
-        };
+        self.names.insert(id, "rpc-checker".to_string());
 
-        // Only spawn test tasks for transaction provers
-        let prover_test_rx = if matches!(proof_type, ProofType::Transaction) {
-            debug!("Starting transaction proof tests for prover: {}", name);
-            let payload = generate_prover_test_payload().await;
-            let (prover_test_tx, prover_test_rx) = watch::channel(initial_prover_status.clone());
+        Ok(rpc_rx)
+    }
 
-            let id = tasks
+    /// Spawn prover status and test tasks for all configured provers.
+    async fn spawn_prover_tasks(
+        &mut self,
+        config: &MonitorConfig,
+    ) -> anyhow::Result<Vec<(watch::Receiver<ServiceStatus>, watch::Receiver<ServiceStatus>)>> {
+        let mut prover_rxs = Vec::new();
+
+        for (i, prover_url) in config.remote_prover_urls.iter().enumerate() {
+            let name = format!("Prover-{}", i + 1);
+
+            let mut remote_prover = ClientBuilder::new(prover_url.clone())
+                .with_tls()
+                .expect("TLS is enabled")
+                .with_timeout(Duration::from_secs(10))
+                .without_metadata_version()
+                .without_metadata_genesis()
+                .connect_lazy::<RemoteProverProxy>();
+
+            let current_time = current_unix_timestamp_secs();
+
+            let initial_prover_status = check_remote_prover_status(
+                &mut remote_prover,
+                name.clone(),
+                prover_url.to_string(),
+                current_time,
+            )
+            .await;
+
+            let (prover_status_tx, prover_status_rx) =
+                watch::channel(initial_prover_status.clone());
+
+            // Spawn the remote prover status check task
+            let component_name = format!("prover-checker-{}", i + 1);
+            let prover_url_clone = prover_url.clone();
+            let name_clone = name.clone();
+            let status_check_interval = config.status_check_interval;
+            let id = self
+                .handles
                 .spawn(async move {
-                    Box::pin(run_remote_prover_test_task(
-                        prover_url.clone(),
-                        &name,
-                        proof_type,
-                        payload,
-                        prover_test_tx,
-                    ))
+                    run_remote_prover_status_task(
+                        prover_url_clone,
+                        name_clone,
+                        prover_status_tx,
+                        status_check_interval,
+                    )
                     .await;
                 })
                 .id();
-            let component_name = format!("prover-test-{}", i + 1);
-            component_ids.insert(id, component_name);
-
-            prover_test_rx
-        } else {
-            debug!(
-                "Skipping prover tests for {} (supports {:?} proofs, only testing Transaction proofs)",
-                name, proof_type
-            );
-            // For non-transaction provers, create a dummy receiver with no test task
-            let (_tx, rx) = watch::channel(initial_prover_status.clone());
-            rx
-        };
-
-        prover_rxs.push((prover_status_rx, prover_test_rx));
+            self.names.insert(id, component_name);
+
+            // Extract proof_type directly from the service status
+            let proof_type = match &initial_prover_status.details {
+                crate::status::ServiceDetails::RemoteProverStatus(details) => {
+                    details.supported_proof_type.clone()
+                },
+                _ => unreachable!("This is for remote provers only"),
+            };
+
+            // Only spawn test tasks for transaction provers
+            let prover_test_rx = if matches!(proof_type, ProofType::Transaction) {
+                debug!("Starting transaction proof tests for prover: {}", name);
+                let payload = generate_prover_test_payload().await;
+                let (prover_test_tx, prover_test_rx) =
+                    watch::channel(initial_prover_status.clone());
+
+                let prover_url_clone = prover_url.clone();
+                let name_clone = name.clone();
+                let id = self
+                    .handles
+                    .spawn(async move {
+                        Box::pin(run_remote_prover_test_task(
+                            prover_url_clone,
+                            &name_clone,
+                            proof_type,
+                            payload,
+                            prover_test_tx,
+                        ))
+                        .await;
+                    })
+                    .id();
+                let component_name = format!("prover-test-{}", i + 1);
+                self.names.insert(id, component_name);
+
+                prover_test_rx
+            } else {
+                debug!(
+                    "Skipping prover tests for {} (supports {:?} proofs, only testing Transaction proofs)",
+                    name, proof_type
+                );
+                // For non-transaction provers, create a dummy receiver with no test task
+                let (_tx, rx) = watch::channel(initial_prover_status.clone());
+                rx
+            };
+
+            prover_rxs.push((prover_status_rx, prover_test_rx));
+        }
+
+        Ok(prover_rxs)
     }
 
-    prover_rxs
-}
-
-// FAUCET TASK INITIALIZER
-// ================================================================================================
-
-/// Initializes the faucet testing task.
-///
-/// This function initializes the faucet testing task and returns a receiver for the faucet status.
-///
-/// # Arguments
-///
-/// * `config` - The configuration for the faucet service.
-/// * `tasks` - The join set for the tasks.
-/// * `component_ids` - The component IDs.
-///
-/// # Returns
-///
-/// An optional receiver for the faucet status.
-fn initialize_faucet_task(
-    config: &MonitorConfig,
-    tasks: &mut JoinSet<()>,
-    component_ids: &mut HashMap<Id, String>,
-) -> Option<Receiver<ServiceStatus>> {
-    let Some(faucet_url) = &config.faucet_url else {
-        info!("Faucet URL not configured, skipping faucet testing");
-        return None;
-    };
-
-    let current_time = current_unix_timestamp_secs();
-
-    // Create initial faucet test status
-    let initial_faucet_status = ServiceStatus {
-        name: "Faucet".to_string(),
-        status: Status::Unknown,
-        last_checked: current_time,
-        error: None,
-        details: ServiceDetails::FaucetTest(crate::faucet::FaucetTestDetails {
-            test_duration_ms: 0,
-            success_count: 0,
-            failure_count: 0,
-            last_tx_id: None,
-            challenge_difficulty: None,
-        }),
-    };
+    /// Spawn the faucet testing task.
+    fn spawn_faucet(&mut self, config: &MonitorConfig) -> Receiver<ServiceStatus> {
+        let current_time = current_unix_timestamp_secs();
 
-    // Spawn the faucet testing task
-    let (faucet_tx, faucet_rx) = watch::channel(initial_faucet_status);
-    let faucet_url = faucet_url.clone();
-    let id = tasks
-        .spawn(async move { run_faucet_test_task(faucet_url, faucet_tx).await })
-        .id();
-    component_ids.insert(id, "faucet-test".to_string());
+        // Create initial faucet test status
+        let initial_faucet_status = ServiceStatus {
+            name: "Faucet".to_string(),
+            status: Status::Unknown,
+            last_checked: current_time,
+            error: None,
+            details: ServiceDetails::FaucetTest(crate::faucet::FaucetTestDetails {
+                test_duration_ms: 0,
+                success_count: 0,
+                failure_count: 0,
+                last_tx_id: None,
+                challenge_difficulty: None,
+            }),
+        };
 
-    Some(faucet_rx)
-}
+        // Spawn the faucet testing task
+        let (faucet_tx, faucet_rx) = watch::channel(initial_faucet_status);
+        // SAFETY: config.faucet_url is Some
+        let faucet_url = config.faucet_url.clone().unwrap();
+        let faucet_test_interval = config.faucet_test_interval;
+        let id = self
+            .handles
+            .spawn(async move {
+                run_faucet_test_task(faucet_url, faucet_tx, faucet_test_interval).await;
+            })
+            .id();
+        self.names.insert(id, "faucet-test".to_string());
 
-// HTTP SERVER INITIALIZER
-// ================================================================================================
+        faucet_rx
+    }
 
-/// Initializes the HTTP server.
-///
-/// This function initializes the HTTP server and returns a receiver for the HTTP status.
-///
-/// # Arguments
-///
-/// * `config` - The configuration for the HTTP server.
-/// * `rpc_rx` - The receiver for the RPC status.
-/// * `prover_rxs` - The receivers for the prover status.
-/// * `faucet_rx` - The optional receiver for the faucet status.
-/// * `tasks` - The join set for the tasks.
-/// * `component_ids` - The component IDs.
-pub(crate) fn initialize_http_server(
-    config: &MonitorConfig,
-    rpc_rx: Receiver<ServiceStatus>,
-    prover_rxs: Vec<(watch::Receiver<ServiceStatus>, watch::Receiver<ServiceStatus>)>,
-    faucet_rx: Option<Receiver<ServiceStatus>>,
-    tasks: &mut JoinSet<()>,
-    component_ids: &mut HashMap<Id, String>,
-) {
-    let server_state = ServerState {
-        rpc: rpc_rx,
-        provers: prover_rxs,
-        faucet: faucet_rx,
-    };
+    /// Spawn the HTTP frontend server.
+    fn spawn_http_server(&mut self, server_state: ServerState, config: &MonitorConfig) {
+        let config = config.clone();
+        let id = self.handles.spawn(async move { serve(server_state, config).await }).id();
+        self.names.insert(id, "frontend".to_string());
+    }
 
-    let server_config = config.clone();
-    let id = tasks.spawn(async move { serve(server_state, server_config).await }).id();
-    component_ids.insert(id, "frontend".to_string());
-}
+    /// Wait for any task to complete or fail and return the result.
+    async fn join_next_with_id(&mut self) -> Option<Result<(Id, ()), tokio::task::JoinError>> {
+        self.handles.join_next_with_id().await
+    }
 
-// HANDLE FAILURE
-// ================================================================================================
+    /// Get the component name for a given task ID.
+    fn get_component_name(&self, id: Id) -> Option<&String> {
+        self.names.get(&id)
+    }
 
-/// Handles the failure of a task.
-///
-/// This function handles the failure of a task.
-///
-/// # Arguments
-///
-/// * `tasks` - The join set for the tasks.
-/// * `component_ids` - The component IDs.
-///
-/// # Returns
-///
-/// An error if the task fails.
-async fn handle_failure(
-    mut tasks: JoinSet<()>,
-    component_ids: HashMap<Id, String>,
-) -> anyhow::Result<()> {
-    // Wait for any task to complete or fail
-    let component_result = tasks.join_next_with_id().await.expect("join set is not empty");
-
-    // We expect components to run indefinitely, so we treat any return as fatal.
-    let (id, err) = match component_result {
-        Ok((id, ())) => (id, anyhow::anyhow!("component completed unexpectedly")),
-        Err(join_err) => (join_err.id(), anyhow::Error::from(join_err)),
-    };
-    let component_name = component_ids.get(&id).map_or("unknown", String::as_str);
+    /// Handles the failure of a task.
+    ///
+    /// This method waits for any task to complete or fail and returns an error.
+    /// Since we expect components to run indefinitely, any task completion is treated as fatal.
+    ///
+    /// # Returns
+    ///
+    /// An error if any task fails or completes unexpectedly.
+    async fn handle_failure(&mut self) -> anyhow::Result<()> {
+        // Wait for any task to complete or fail
+        let component_result = self.join_next_with_id().await.expect("join set is not empty");
+
+        // We expect components to run indefinitely, so we treat any return as fatal.
+        let (id, err) = match component_result {
+            Ok((id, ())) => (id, anyhow::anyhow!("component completed unexpectedly")),
+            Err(join_err) => (join_err.id(), anyhow::Error::from(join_err)),
+        };
+        let component_name = self.get_component_name(id).map_or("unknown", String::as_str);
 
-    // Exit with error context
-    Err(err.context(format!("component {component_name} failed")))
+        // Exit with error context
+        Err(err.context(format!("component {component_name} failed")))
+    }
 }
 
 // HELPERS
diff --git a/bin/network-monitor/src/status.rs b/bin/network-monitor/src/status.rs
index aba328449..ccd350991 100644
--- a/bin/network-monitor/src/status.rs
+++ b/bin/network-monitor/src/status.rs
@@ -221,12 +221,17 @@ impl From<RpcStatus> for RpcStatusDetails {
 ///
 /// * `rpc_url` - The URL of the RPC service.
 /// * `status_sender` - The sender for the watch channel.
+/// * `status_check_interval` - The interval at which to check the status of the services.
 ///
 /// # Returns
 ///
 /// `Ok(())` if the task completes successfully, or an error if the task fails.
 #[instrument(target = COMPONENT, name = "rpc-status-task", skip_all)]
-pub async fn run_rpc_status_task(rpc_url: Url, status_sender: watch::Sender<ServiceStatus>) {
+pub async fn run_rpc_status_task(
+    rpc_url: Url,
+    status_sender: watch::Sender<ServiceStatus>,
+    status_check_interval: Duration,
+) {
     let mut rpc = ClientBuilder::new(rpc_url)
         .with_tls()
         .expect("TLS is enabled")
@@ -235,7 +240,7 @@ pub async fn run_rpc_status_task(rpc_url: Url, status_sender: watch::Sender<Serv
         .without_metadata_genesis()
         .connect_lazy::<Rpc>();
 
-    let mut interval = tokio::time::interval(Duration::from_secs(3));
+    let mut interval = tokio::time::interval(status_check_interval);
     interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
 
     loop {
@@ -305,6 +310,7 @@ pub(crate) async fn check_rpc_status(
 /// * `prover_url` - The URL of the remote prover service.
 /// * `name` - The name of the remote prover.
 /// * `status_sender` - The sender for the watch channel.
+/// * `status_check_interval` - The interval at which to check the status of the services.
 ///
 /// # Returns
 ///
@@ -315,6 +321,7 @@ pub async fn run_remote_prover_status_task(
     prover_url: Url,
     name: String,
     status_sender: watch::Sender<ServiceStatus>,
+    status_check_interval: Duration,
 ) {
     let url_str = prover_url.to_string();
     let mut remote_prover = ClientBuilder::new(prover_url)
@@ -325,7 +332,7 @@ pub async fn run_remote_prover_status_task(
         .without_metadata_genesis()
         .connect_lazy::<RemoteProverProxy>();
 
-    let mut interval = tokio::time::interval(Duration::from_secs(3));
+    let mut interval = tokio::time::interval(status_check_interval);
     interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
 
     loop {
diff --git a/bin/node/Cargo.toml b/bin/node/Cargo.toml
index 1b7b0bf72..0ddaaba58 100644
--- a/bin/node/Cargo.toml
+++ b/bin/node/Cargo.toml
@@ -19,7 +19,7 @@ tracing-forest = ["miden-node-block-producer/tracing-forest"]
 
 [dependencies]
 anyhow                    = { workspace = true }
-clap                      = { features = ["derive", "env", "string"], version = "4.5" }
+clap                      = { features = ["env", "string"], workspace = true }
 fs-err                    = { workspace = true }
 humantime                 = { workspace = true }
 miden-node-block-producer = { workspace = true }
diff --git a/bin/remote-prover/Cargo.toml b/bin/remote-prover/Cargo.toml
index 6823b13b0..a05fcdb42 100644
--- a/bin/remote-prover/Cargo.toml
+++ b/bin/remote-prover/Cargo.toml
@@ -27,7 +27,7 @@ anyhow                = { workspace = true }
 async-trait           = { version = "0.1" }
 axum                  = { version = "0.8" }
 bytes                 = { version = "1.0" }
-clap                  = { features = ["derive", "env"], version = "4.5" }
+clap                  = { features = ["env"], workspace = true }
 http                  = { workspace = true }
 humantime             = { workspace = true }
 miden-block-prover    = { workspace = true }

From 6e34324243517d5836072e9940de3527a9c49e50 Mon Sep 17 00:00:00 2001
From: Serge Radinovich <47865535+sergerad@users.noreply.github.com>
Date: Tue, 30 Sep 2025 08:30:50 +1300
Subject: [PATCH 27/78] chore: Add tx, block, and batch metrics (#1244)

---
 .../block-producer/src/batch_builder/mod.rs   | 45 ++++++++++---------
 .../block-producer/src/block_builder/mod.rs   | 17 +++++--
 crates/store/src/blocks.rs                    |  7 +++
 crates/utils/src/tracing/span_ext.rs          | 16 ++++++-
 4 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/crates/block-producer/src/batch_builder/mod.rs b/crates/block-producer/src/batch_builder/mod.rs
index 90b586f6a..c963cc807 100644
--- a/crates/block-producer/src/batch_builder/mod.rs
+++ b/crates/block-producer/src/batch_builder/mod.rs
@@ -172,6 +172,7 @@ impl BatchJob {
             .and_then(|(txs, inputs)| Self::propose_batch(txs, inputs) )
             .inspect_ok(TelemetryInjectorExt::inject_telemetry)
             .and_then(|proposed| self.prove_batch(proposed))
+
             // Failure must be injected before the final pipeline stage i.e. before commit is called. The system cannot
             // handle errors after it considers the process complete (which makes sense).
             .and_then(|x| self.inject_failure(x))
@@ -324,27 +325,29 @@ impl TelemetryInjectorExt for SelectedBatch {
     fn inject_telemetry(&self) {
         Span::current().set_attribute("batch.id", self.id);
         Span::current().set_attribute("transactions.count", self.transactions.len());
-        Span::current().set_attribute(
-            "transactions.input_notes.count",
-            self.transactions
-                .iter()
-                .map(AuthenticatedTransaction::input_note_count)
-                .sum::<usize>(),
-        );
-        Span::current().set_attribute(
-            "transactions.output_notes.count",
-            self.transactions
-                .iter()
-                .map(AuthenticatedTransaction::output_note_count)
-                .sum::<usize>(),
-        );
-        Span::current().set_attribute(
-            "transactions.unauthenticated_notes.count",
-            self.transactions
-                .iter()
-                .map(|tx| tx.unauthenticated_notes().count())
-                .sum::<usize>(),
-        );
+        // Accumulate all telemetry based on transactions.
+        let (tx_ids, input_notes_count, output_notes_count, unauth_notes_count) =
+            self.transactions.iter().fold(
+                (vec![], 0, 0, 0),
+                |(
+                    mut tx_ids,
+                    mut input_notes_count,
+                    mut output_notes_count,
+                    mut unauth_notes_count,
+                ),
+                 tx| {
+                    tx_ids.push(tx.id());
+                    input_notes_count += tx.input_note_count();
+                    output_notes_count += tx.output_note_count();
+                    unauth_notes_count += tx.unauthenticated_notes().count();
+                    (tx_ids, input_notes_count, output_notes_count, unauth_notes_count)
+                },
+            );
+        Span::current().set_attribute("transactions.ids", tx_ids);
+        Span::current().set_attribute("transactions.input_notes.count", input_notes_count);
+        Span::current().set_attribute("transactions.output_notes.count", output_notes_count);
+        Span::current()
+            .set_attribute("transactions.unauthenticated_notes.count", unauth_notes_count);
     }
 }
 
diff --git a/crates/block-producer/src/block_builder/mod.rs b/crates/block-producer/src/block_builder/mod.rs
index 177d59dbf..ce4c3db84 100644
--- a/crates/block-producer/src/block_builder/mod.rs
+++ b/crates/block-producer/src/block_builder/mod.rs
@@ -8,6 +8,7 @@ use miden_objects::MIN_PROOF_SECURITY_LEVEL;
 use miden_objects::batch::ProvenBatch;
 use miden_objects::block::{BlockInputs, BlockNumber, ProposedBlock, ProvenBlock};
 use miden_objects::note::NoteHeader;
+use miden_objects::transaction::TransactionHeader;
 use miden_remote_prover_client::remote_prover::block_prover::RemoteBlockProver;
 use rand::Rng;
 use tokio::time::Duration;
@@ -278,10 +279,18 @@ impl TelemetryInjectorExt for SelectedBlock {
         let span = Span::current();
         span.set_attribute("block.number", self.block_number);
         span.set_attribute("block.batches.count", self.batches.len() as u32);
-        let tx_count = self
-            .batches
-            .iter()
-            .fold(0, |acc, batch| acc + batch.transactions().as_slice().len());
+        // Accumulate all telemetry based on batches.
+        let (batch_ids, tx_ids, tx_count) = self.batches.iter().fold(
+            (Vec::new(), Vec::new(), 0),
+            |(mut batch_ids, mut tx_ids, tx_count), batch| {
+                let tx_count = tx_count + batch.transactions().as_slice().len();
+                tx_ids.extend(batch.transactions().as_slice().iter().map(TransactionHeader::id));
+                batch_ids.push(batch.id());
+                (batch_ids, tx_ids, tx_count)
+            },
+        );
+        span.set_attribute("block.batch.ids", batch_ids);
+        span.set_attribute("block.transactions.ids", tx_ids);
         span.set_attribute("block.transactions.count", tx_count);
     }
 }
diff --git a/crates/store/src/blocks.rs b/crates/store/src/blocks.rs
index 43c2fa8d2..5c9570252 100644
--- a/crates/store/src/blocks.rs
+++ b/crates/store/src/blocks.rs
@@ -74,6 +74,13 @@ impl BlockStore {
         }
     }
 
+    #[instrument(
+        target = COMPONENT,
+        name = "store.block_store.save_block",
+        skip(self, data),
+        err,
+        fields(block_size = data.len())
+    )]
     pub async fn save_block(
         &self,
         block_num: BlockNumber,
diff --git a/crates/utils/src/tracing/span_ext.rs b/crates/utils/src/tracing/span_ext.rs
index ca73d3f8a..c887346b2 100644
--- a/crates/utils/src/tracing/span_ext.rs
+++ b/crates/utils/src/tracing/span_ext.rs
@@ -5,8 +5,9 @@ use miden_objects::Word;
 use miden_objects::account::AccountId;
 use miden_objects::batch::BatchId;
 use miden_objects::block::BlockNumber;
+use miden_objects::transaction::TransactionId;
 use opentelemetry::trace::Status;
-use opentelemetry::{Key, Value};
+use opentelemetry::{Key, StringValue, Value};
 
 use crate::ErrorReport;
 
@@ -15,6 +16,13 @@ pub trait ToValue {
     fn to_value(&self) -> Value;
 }
 
+impl<T: ToValue> ToValue for Vec<T> {
+    fn to_value(&self) -> Value {
+        let string_values = self.iter().map(|v| v.to_value().into()).collect::<Vec<StringValue>>();
+        Value::Array(string_values.into())
+    }
+}
+
 impl ToValue for Duration {
     fn to_value(&self) -> Value {
         self.as_secs_f64().into()
@@ -45,6 +53,12 @@ impl ToValue for BatchId {
     }
 }
 
+impl ToValue for TransactionId {
+    fn to_value(&self) -> Value {
+        self.to_hex().into()
+    }
+}
+
 impl ToValue for usize {
     fn to_value(&self) -> Value {
         i64::try_from(*self).unwrap_or(i64::MAX).into()

From 311287561a1eb9f64bf331a4f43569d07f7529e3 Mon Sep 17 00:00:00 2001
From: keinberger <philipp.keinberger@gmail.com>
Date: Tue, 30 Sep 2025 16:36:54 +0300
Subject: [PATCH 28/78] docs: remove redundant sidebar explainer comments

chore: improve explanation of PAT inside of new trigger-deploy-docs workflow
---
 .github/workflows/trigger-deploy-docs.yml | 2 +-
 docs/external/sidebars.ts                 | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/trigger-deploy-docs.yml b/.github/workflows/trigger-deploy-docs.yml
index d6b795817..292c85df8 100644
--- a/.github/workflows/trigger-deploy-docs.yml
+++ b/.github/workflows/trigger-deploy-docs.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Send repository_dispatch to aggregator
         uses: peter-evans/repository-dispatch@v3
         with:
-          # PAT that can access the central aggregator repository
+          # PAT (Personal Access Token) that grants permission to trigger the rebuild workflow at the docs repository
           token: ${{ secrets.DOCS_REPO_TOKEN }}
           repository: ${{ vars.DOCS_AGGREGATOR_REPO }}
           event-type: rebuild
diff --git a/docs/external/sidebars.ts b/docs/external/sidebars.ts
index da531529d..040e34de6 100644
--- a/docs/external/sidebars.ts
+++ b/docs/external/sidebars.ts
@@ -1,11 +1,5 @@
 import type { SidebarsConfig } from "@docusaurus/plugin-content-docs";
 
-/**
- * Autogenerate entire sidebar tree from /docs
- * This will include:
- * - Static docs from this aggregator repo
- * - All vendor repos' docs synced into subfolders
- */
 const sidebars: SidebarsConfig = {
   docs: [{ type: "autogenerated", dirName: "." }],
 };

From 7f517659db1e9157501676a1850c84857ab2d1f9 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Tue, 30 Sep 2025 17:13:30 -0300
Subject: [PATCH 29/78] feat: add SyncTransaction endpoint (#1224)

* feat: add SyncTransaction endpoint

* review: add missing fields to transaction table in DB

* review: add raw sql query

* review: add docs to proto message

* review: add limit to transaction headers in response

* review: add docs to transaction table fields

* review: update comments on proto message

* chore: remove load_block_data

* refactor: entries limit

* chore: remove unwrap

* review: rename TransacionHeader to TransactionRecord

* review: improve size estimation, improve sql docs

* review: use chunks loading approach

* review: refactor sql query in docs

* review: replace query size limit to 4MB

* review: add note on the size of note records

* review: simplify chunks processing

* review: simplify total size calculation

* review: add order by transaction ID

* review: order by transaction ID

* review: rename to NUM_TXS_PER_CHUNK

* review: simplify transaction chunking loop termination logic

* review: remove block num check loop

* review: fix block removal condition

* review: use cursor-based pagination

* review: use more standard approach

* Review: use if/else approach

* review: add TransactionHeader message & HEAD_BASE_SIZE constant

* review: create vector with capacity

* review: reduce type conversions

* review: remove duplicated reference

* review: rename to into_proto_with_note_recods

* review: use inclusive range

* review: remove unused clones

* review: remove collect call

* review: use block_range.end

* review: allow lint rule only in function

* review: remove if
---
 CHANGELOG.md                                  |   1 +
 crates/proto/src/generated/rpc.rs             |  80 ++++++
 crates/proto/src/generated/rpc_store.rs       | 112 ++++++++
 crates/proto/src/generated/transaction.rs     |  19 ++
 crates/rpc/README.md                          |   7 +
 crates/rpc/src/server/api.rs                  |  17 ++
 crates/store/README.md                        |   7 +
 .../db/migrations/2025062000000_setup/up.sql  |  11 +-
 crates/store/src/db/mod.rs                    |  68 +++++
 .../src/db/models/queries/transactions.rs     | 264 +++++++++++++++++-
 crates/store/src/db/schema.rs                 |   5 +
 crates/store/src/server/rpc_api.rs            |  53 ++++
 crates/store/src/state.rs                     |  10 +
 docs/src/user/rpc.md                          |   5 +
 proto/proto/rpc.proto                         |   3 +
 proto/proto/store/rpc.proto                   |  35 +++
 proto/proto/types/transaction.proto           |  21 +-
 17 files changed, 701 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8080984c..e975f5957 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - Removed decorators from scripts when submitting transactions and batches, and inserting notes into the DB ([#1194](https://github.com/
 0xMiden/miden-node/pull/1194)).
 - Refresh `miden-base` dependencies.
+- Added `SyncTransactions` gRPC endpoint for retrieving transactions for specific accounts within a block range ([#1224](https://github.com/0xMiden/miden-node/pull/1224)).
 - Added `miden-network-monitor` binary for monitoring the Miden network ([#1217](https://github.com/0xMiden/miden-node/pull/1217)).
 
 ## v0.11.0 (2025-08-28)
diff --git a/crates/proto/src/generated/rpc.rs b/crates/proto/src/generated/rpc.rs
index c0fe9a4a4..2abaaf999 100644
--- a/crates/proto/src/generated/rpc.rs
+++ b/crates/proto/src/generated/rpc.rs
@@ -499,6 +499,30 @@ pub mod api_client {
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "SyncStorageMaps"));
             self.inner.unary(req, path, codec).await
         }
+        /// Returns transactions records for specific accounts within a block range.
+        pub async fn sync_transactions(
+            &mut self,
+            request: impl tonic::IntoRequest<
+                super::super::rpc_store::SyncTransactionsRequest,
+            >,
+        ) -> std::result::Result<
+            tonic::Response<super::super::rpc_store::SyncTransactionsResponse>,
+            tonic::Status,
+        > {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static("/rpc.Api/SyncTransactions");
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "SyncTransactions"));
+            self.inner.unary(req, path, codec).await
+        }
     }
 }
 /// Generated server implementations.
@@ -667,6 +691,14 @@ pub mod api_server {
             tonic::Response<super::super::rpc_store::SyncStorageMapsResponse>,
             tonic::Status,
         >;
+        /// Returns transactions records for specific accounts within a block range.
+        async fn sync_transactions(
+            &self,
+            request: tonic::Request<super::super::rpc_store::SyncTransactionsRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::super::rpc_store::SyncTransactionsResponse>,
+            tonic::Status,
+        >;
     }
     /// RPC API for the RPC component
     #[derive(Debug)]
@@ -1446,6 +1478,54 @@ pub mod api_server {
                     };
                     Box::pin(fut)
                 }
+                "/rpc.Api/SyncTransactions" => {
+                    #[allow(non_camel_case_types)]
+                    struct SyncTransactionsSvc<T: Api>(pub Arc<T>);
+                    impl<
+                        T: Api,
+                    > tonic::server::UnaryService<
+                        super::super::rpc_store::SyncTransactionsRequest,
+                    > for SyncTransactionsSvc<T> {
+                        type Response = super::super::rpc_store::SyncTransactionsResponse;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<
+                                super::super::rpc_store::SyncTransactionsRequest,
+                            >,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as Api>::sync_transactions(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = SyncTransactionsSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
                 _ => {
                     Box::pin(async move {
                         let mut response = http::Response::new(
diff --git a/crates/proto/src/generated/rpc_store.rs b/crates/proto/src/generated/rpc_store.rs
index 77a2abf74..235113b59 100644
--- a/crates/proto/src/generated/rpc_store.rs
+++ b/crates/proto/src/generated/rpc_store.rs
@@ -359,6 +359,40 @@ pub struct PaginationInfo {
     #[prost(fixed32, tag = "2")]
     pub block_num: u32,
 }
+/// Transactions synchronization request.
+///
+/// Allows clients to sync transactions for specific accounts within a block range.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SyncTransactionsRequest {
+    /// Block range from which to start synchronizing.
+    #[prost(message, optional, tag = "1")]
+    pub block_range: ::core::option::Option<BlockRange>,
+    /// Accounts to sync transactions for.
+    #[prost(message, repeated, tag = "2")]
+    pub account_ids: ::prost::alloc::vec::Vec<super::account::AccountId>,
+}
+/// Represents the result of syncing transactions request.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SyncTransactionsResponse {
+    /// Pagination information.
+    #[prost(message, optional, tag = "1")]
+    pub pagination_info: ::core::option::Option<PaginationInfo>,
+    /// List of transaction records.
+    #[prost(message, repeated, tag = "2")]
+    pub transaction_records: ::prost::alloc::vec::Vec<TransactionRecord>,
+}
+/// Represents a transaction record.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TransactionRecord {
+    /// Block number in which the transaction was executed.
+    #[prost(fixed32, tag = "1")]
+    pub block_num: u32,
+    /// A transaction header.
+    #[prost(message, optional, tag = "2")]
+    pub transaction_header: ::core::option::Option<
+        super::transaction::TransactionHeader,
+    >,
+}
 /// Generated client implementations.
 pub mod rpc_client {
     #![allow(
@@ -788,6 +822,31 @@ pub mod rpc_client {
                 .insert(GrpcMethod::new("rpc_store.Rpc", "SyncStorageMaps"));
             self.inner.unary(req, path, codec).await
         }
+        /// Returns transactions records for specific accounts within a block range.
+        pub async fn sync_transactions(
+            &mut self,
+            request: impl tonic::IntoRequest<super::SyncTransactionsRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::SyncTransactionsResponse>,
+            tonic::Status,
+        > {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/rpc_store.Rpc/SyncTransactions",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("rpc_store.Rpc", "SyncTransactions"));
+            self.inner.unary(req, path, codec).await
+        }
     }
 }
 /// Generated server implementations.
@@ -923,6 +982,14 @@ pub mod rpc_server {
             tonic::Response<super::SyncStorageMapsResponse>,
             tonic::Status,
         >;
+        /// Returns transactions records for specific accounts within a block range.
+        async fn sync_transactions(
+            &self,
+            request: tonic::Request<super::SyncTransactionsRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::SyncTransactionsResponse>,
+            tonic::Status,
+        >;
     }
     /// Store API for the RPC component
     #[derive(Debug)]
@@ -1578,6 +1645,51 @@ pub mod rpc_server {
                     };
                     Box::pin(fut)
                 }
+                "/rpc_store.Rpc/SyncTransactions" => {
+                    #[allow(non_camel_case_types)]
+                    struct SyncTransactionsSvc<T: Rpc>(pub Arc<T>);
+                    impl<
+                        T: Rpc,
+                    > tonic::server::UnaryService<super::SyncTransactionsRequest>
+                    for SyncTransactionsSvc<T> {
+                        type Response = super::SyncTransactionsResponse;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<super::SyncTransactionsRequest>,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as Rpc>::sync_transactions(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = SyncTransactionsSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
                 _ => {
                     Box::pin(async move {
                         let mut response = http::Response::new(
diff --git a/crates/proto/src/generated/transaction.rs b/crates/proto/src/generated/transaction.rs
index e550340af..78ba28f31 100644
--- a/crates/proto/src/generated/transaction.rs
+++ b/crates/proto/src/generated/transaction.rs
@@ -34,3 +34,22 @@ pub struct TransactionSummary {
     #[prost(message, optional, tag = "3")]
     pub account_id: ::core::option::Option<super::account::AccountId>,
 }
+/// Represents a transaction header.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TransactionHeader {
+    /// ID of the account against which the transaction was executed.
+    #[prost(message, optional, tag = "1")]
+    pub account_id: ::core::option::Option<super::account::AccountId>,
+    /// State commitment of the account before the transaction was executed.
+    #[prost(message, optional, tag = "2")]
+    pub initial_state_commitment: ::core::option::Option<super::primitives::Digest>,
+    /// State commitment of the account after the transaction was executed.
+    #[prost(message, optional, tag = "3")]
+    pub final_state_commitment: ::core::option::Option<super::primitives::Digest>,
+    /// Nullifiers of the input notes of the transaction.
+    #[prost(message, repeated, tag = "4")]
+    pub input_notes: ::prost::alloc::vec::Vec<super::primitives::Digest>,
+    /// Output notes of the transaction.
+    #[prost(message, repeated, tag = "5")]
+    pub output_notes: ::prost::alloc::vec::Vec<super::note::NoteSyncRecord>,
+}
diff --git a/crates/rpc/README.md b/crates/rpc/README.md
index 4ab94d7eb..f2a0042ff 100644
--- a/crates/rpc/README.md
+++ b/crates/rpc/README.md
@@ -26,6 +26,7 @@ The full gRPC method definitions can be found in the [proto](../proto/README.md)
 - [SyncNotes](#syncnotes)
 - [SyncState](#syncstate)
 - [SyncStorageMaps](#syncstoragemaps)
+- [SyncTransactions](#synctransactions)
 
 <!--toc:end-->
 
@@ -164,6 +165,12 @@ This endpoint enables clients to maintain an updated view of account storage.
 
 ---
 
+### SyncTransactions
+
+Returns transaction records for specific accounts within a block range.
+
+---
+
 ## License
 
 This project is [MIT licensed](../../LICENSE).
diff --git a/crates/rpc/src/server/api.rs b/crates/rpc/src/server/api.rs
index cc3b17719..f2b750b62 100644
--- a/crates/rpc/src/server/api.rs
+++ b/crates/rpc/src/server/api.rs
@@ -576,6 +576,23 @@ impl api_server::Api for RpcService {
 
         self.store.clone().get_note_script_by_root(request).await
     }
+
+    #[instrument(
+        parent = None,
+        target = COMPONENT,
+        name = "rpc.server.sync_transactions",
+        skip_all,
+        ret(level = "debug"),
+        err
+    )]
+    async fn sync_transactions(
+        &self,
+        request: Request<proto::rpc_store::SyncTransactionsRequest>,
+    ) -> Result<Response<proto::rpc_store::SyncTransactionsResponse>, Status> {
+        debug!(target: COMPONENT, request = ?request);
+
+        self.store.clone().sync_transactions(request).await
+    }
 }
 
 // LIMIT HELPERS
diff --git a/crates/store/README.md b/crates/store/README.md
index c77c17843..3e5af2624 100644
--- a/crates/store/README.md
+++ b/crates/store/README.md
@@ -28,6 +28,7 @@ The full gRPC API can be found [here](../../proto/proto/store.proto).
 - [SyncNotes](#syncnotes)
 - [SyncState](#syncstate)
 - [SyncStorageMaps](#syncstoragemaps)
+- [SyncTransactions](#synctransactions)
 <!--toc:end-->
 
 ---
@@ -165,6 +166,12 @@ This endpoint enables clients to maintain an updated view of account storage.
 
 ---
 
+### SyncTransactions
+
+Returns transaction records for specific accounts within a block range.
+
+---
+
 ## License
 
 This project is [MIT licensed](../../LICENSE).
diff --git a/crates/store/src/db/migrations/2025062000000_setup/up.sql b/crates/store/src/db/migrations/2025062000000_setup/up.sql
index 071906857..1eb7a9728 100644
--- a/crates/store/src/db/migrations/2025062000000_setup/up.sql
+++ b/crates/store/src/db/migrations/2025062000000_setup/up.sql
@@ -119,9 +119,14 @@ CREATE INDEX idx_nullifiers_prefix ON nullifiers(nullifier_prefix);
 CREATE INDEX idx_nullifiers_block_num ON nullifiers(block_num);
 
 CREATE TABLE transactions (
-    transaction_id BLOB    NOT NULL,
-    account_id     BLOB    NOT NULL,
-    block_num      INTEGER NOT NULL,
+    transaction_id               BLOB    NOT NULL,
+    account_id                   BLOB    NOT NULL,
+    block_num                    INTEGER NOT NULL, -- Block number in which the transaction was included.
+    initial_state_commitment     BLOB    NOT NULL, -- State of the account before applying the transaction.
+    final_state_commitment       BLOB    NOT NULL, -- State of the account after applying the transaction.
+    input_notes                  BLOB    NOT NULL, -- Serialized vector with the Nullifier of the input notes.
+    output_notes                 BLOB    NOT NULL, -- Serialized vector with the NoteId of the output notes.
+    size_in_bytes                INTEGER NOT NULL, -- Estimated size of the row in bytes, considering the size of the input and output notes.
 
     PRIMARY KEY (transaction_id),
     FOREIGN KEY (account_id) REFERENCES accounts(account_id),
diff --git a/crates/store/src/db/mod.rs b/crates/store/src/db/mod.rs
index f129da300..8805f31ed 100644
--- a/crates/store/src/db/mod.rs
+++ b/crates/store/src/db/mod.rs
@@ -92,6 +92,41 @@ pub struct TransactionSummary {
     pub transaction_id: TransactionId,
 }
 
+#[derive(Debug, PartialEq)]
+pub struct TransactionRecord {
+    pub block_num: BlockNumber,
+    pub transaction_id: TransactionId,
+    pub account_id: AccountId,
+    pub initial_state_commitment: Word,
+    pub final_state_commitment: Word,
+    pub input_notes: Vec<Nullifier>, // Store nullifiers for input notes
+    pub output_notes: Vec<NoteId>,   // Store note IDs for output notes
+}
+
+impl TransactionRecord {
+    /// Convert to proto `TransactionRecord`, but requires note sync records for output notes.
+    /// For `sync_transactions` RPC, we need to fetch note sync records separately since we only
+    /// store note IDs in the database.
+    pub fn into_proto_with_note_records(
+        self,
+        note_records: Vec<NoteRecord>,
+    ) -> proto::rpc_store::TransactionRecord {
+        let output_notes: Vec<proto::note::NoteSyncRecord> =
+            note_records.into_iter().map(Into::into).collect();
+
+        proto::rpc_store::TransactionRecord {
+            transaction_header: Some(proto::transaction::TransactionHeader {
+                account_id: Some(self.account_id.into()),
+                initial_state_commitment: Some(self.initial_state_commitment.into()),
+                final_state_commitment: Some(self.final_state_commitment.into()),
+                input_notes: self.input_notes.into_iter().map(From::from).collect(),
+                output_notes,
+            }),
+            block_num: self.block_num.as_u32(),
+        }
+    }
+}
+
 #[derive(Debug, Clone, PartialEq)]
 pub struct NoteRecord {
     pub block_num: BlockNumber,
@@ -118,6 +153,22 @@ impl From<NoteRecord> for proto::note::CommittedNote {
     }
 }
 
+impl From<NoteRecord> for proto::note::NoteSyncRecord {
+    fn from(value: NoteRecord) -> Self {
+        let note_id = value.note_id.into();
+        let note_index_in_block = value.note_index.leaf_index_value().into();
+        let metadata = value.metadata.into();
+        let inclusion_path = value.inclusion_path.into();
+
+        proto::note::NoteSyncRecord {
+            note_id: Some(note_id),
+            note_index_in_block,
+            metadata: Some(metadata),
+            inclusion_path: Some(inclusion_path),
+        }
+    }
+}
+
 #[derive(Debug, PartialEq)]
 pub struct StateSyncUpdate {
     pub notes: Vec<NoteSyncRecord>,
@@ -538,4 +589,21 @@ impl Db {
         })
         .await
     }
+
+    /// Returns the complete transaction records for the specified accounts within the specified
+    /// block range, including state commitments and note IDs.
+    ///
+    /// Note: This method is size-limited (~5MB) and may not return all matching transactions
+    /// if the limit is exceeded. Transactions from partial blocks are excluded to maintain
+    /// consistency.
+    pub async fn select_transactions_records(
+        &self,
+        account_ids: Vec<AccountId>,
+        block_range: RangeInclusive<BlockNumber>,
+    ) -> Result<(BlockNumber, Vec<TransactionRecord>)> {
+        self.transact("full transactions records", move |conn| {
+            queries::select_transactions_records(conn, &account_ids, block_range)
+        })
+        .await
+    }
 }
diff --git a/crates/store/src/db/models/queries/transactions.rs b/crates/store/src/db/models/queries/transactions.rs
index d8d490a24..50b979a6b 100644
--- a/crates/store/src/db/models/queries/transactions.rs
+++ b/crates/store/src/db/models/queries/transactions.rs
@@ -3,17 +3,20 @@ use std::ops::RangeInclusive;
 use diesel::prelude::{Insertable, Queryable};
 use diesel::query_dsl::methods::SelectDsl;
 use diesel::{
+    BoolExpressionMethods,
     ExpressionMethods,
     QueryDsl,
     QueryableByName,
     RunQueryDsl,
     Selectable,
+    SelectableHelper,
     SqliteConnection,
 };
-use miden_lib::utils::{Deserializable, Serializable};
+use miden_lib::utils::Deserializable;
 use miden_node_utils::limiter::{QueryParamAccountIdLimit, QueryParamLimiter};
 use miden_objects::account::AccountId;
 use miden_objects::block::BlockNumber;
+use miden_objects::note::{NoteId, Nullifier};
 use miden_objects::transaction::{OrderedTransactionHeaders, TransactionId};
 
 use super::DatabaseError;
@@ -69,7 +72,7 @@ pub fn select_transactions_by_accounts_and_block_range(
     .order(schema::transactions::transaction_id.asc())
     .load::<TransactionSummaryRaw>(conn)
     .map_err(DatabaseError::from)?;
-    Ok(vec_raw_try_into(raw).unwrap())
+    vec_raw_try_into(raw)
 }
 
 #[derive(Debug, Clone, PartialEq, Queryable, Selectable, QueryableByName)]
@@ -81,6 +84,20 @@ pub struct TransactionSummaryRaw {
     transaction_id: Vec<u8>,
 }
 
+#[derive(Debug, Clone, PartialEq, Queryable, Selectable, QueryableByName)]
+#[diesel(table_name = schema::transactions)]
+#[diesel(check_for_backend(diesel::sqlite::Sqlite))]
+pub struct TransactionRecordRaw {
+    account_id: Vec<u8>,
+    block_num: i64,
+    transaction_id: Vec<u8>,
+    initial_state_commitment: Vec<u8>,
+    final_state_commitment: Vec<u8>,
+    input_notes: Vec<u8>,
+    output_notes: Vec<u8>,
+    size_in_bytes: i64,
+}
+
 impl TryInto<crate::db::TransactionSummary> for TransactionSummaryRaw {
     type Error = DatabaseError;
     fn try_into(self) -> Result<crate::db::TransactionSummary, Self::Error> {
@@ -92,6 +109,33 @@ impl TryInto<crate::db::TransactionSummary> for TransactionSummaryRaw {
     }
 }
 
+impl TryInto<crate::db::TransactionRecord> for TransactionRecordRaw {
+    type Error = DatabaseError;
+    fn try_into(self) -> Result<crate::db::TransactionRecord, Self::Error> {
+        use miden_lib::utils::Deserializable;
+        use miden_objects::Word;
+
+        let initial_state_commitment = self.initial_state_commitment;
+        let final_state_commitment = self.final_state_commitment;
+        let input_notes_binary = self.input_notes;
+        let output_notes_binary = self.output_notes;
+
+        // Deserialize input notes as nullifiers and output notes as note IDs
+        let input_notes: Vec<Nullifier> = Deserializable::read_from_bytes(&input_notes_binary)?;
+        let output_notes: Vec<NoteId> = Deserializable::read_from_bytes(&output_notes_binary)?;
+
+        Ok(crate::db::TransactionRecord {
+            account_id: AccountId::read_from_bytes(&self.account_id[..])?,
+            block_num: BlockNumber::from_raw_sql(self.block_num)?,
+            transaction_id: TransactionId::read_from_bytes(&self.transaction_id[..])?,
+            initial_state_commitment: Word::read_from_bytes(&initial_state_commitment)?,
+            final_state_commitment: Word::read_from_bytes(&final_state_commitment)?,
+            input_notes,
+            output_notes,
+        })
+    }
+}
+
 /// Insert transactions to the DB using the given [`SqliteConnection`].
 ///
 /// # Returns
@@ -108,14 +152,13 @@ pub(crate) fn insert_transactions(
     transactions: &OrderedTransactionHeaders,
 ) -> Result<usize, DatabaseError> {
     #[allow(clippy::into_iter_on_ref)] // false positive
-    let count = diesel::insert_into(schema::transactions::table)
-        .values(Vec::from_iter(
-            transactions
-                .as_slice()
-                .into_iter()
-                .map(|tx| TransactionSummaryRowInsert::new(tx.id(), tx.account_id(), block_num)),
-        ))
-        .execute(conn)?;
+    let rows: Vec<_> = transactions
+        .as_slice()
+        .into_iter()
+        .map(|tx| TransactionSummaryRowInsert::new(tx, block_num))
+        .collect();
+
+    let count = diesel::insert_into(schema::transactions::table).values(rows).execute(conn)?;
     Ok(count)
 }
 
@@ -126,14 +169,209 @@ pub struct TransactionSummaryRowInsert {
     transaction_id: Vec<u8>,
     account_id: Vec<u8>,
     block_num: i64,
+    initial_state_commitment: Vec<u8>,
+    final_state_commitment: Vec<u8>,
+    input_notes: Vec<u8>,
+    output_notes: Vec<u8>,
+    size_in_bytes: i64,
 }
 
 impl TransactionSummaryRowInsert {
-    fn new(transaction_id: TransactionId, account_id: AccountId, block_num: BlockNumber) -> Self {
+    #[allow(
+        clippy::cast_possible_wrap,
+        reason = "We will not approach the item count where i64 and usize cause issues"
+    )]
+    fn new(
+        transaction_header: &miden_objects::transaction::TransactionHeader,
+        block_num: BlockNumber,
+    ) -> Self {
+        use miden_lib::utils::Serializable;
+
+        const HEADER_BASE_SIZE: usize = 4 + 32 + 16 + 64; // block_num + tx_id + account_id + commitments
+
+        // Serialize input notes using binary format (store nullifiers)
+        let input_notes_binary = transaction_header.input_notes().to_bytes();
+
+        // Serialize output notes using binary format (store note IDs)
+        let output_notes_binary = transaction_header.output_notes().to_bytes();
+
+        // Manually calculate the estimated size of the transaction header to avoid
+        // the cost of serialization. The size estimation includes:
+        // - 4 bytes for block number
+        // - 32 bytes for transaction ID
+        // - 16 bytes for account ID
+        // - 64 bytes for initial + final state commitments (32 bytes each)
+        // - 32 bytes per input note (nullifier size)
+        // - 500 bytes per output note (estimated size when converted to NoteSyncRecord)
+        //
+        // Note: 500 bytes per output note is an over-estimate but ensures we don't
+        // exceed memory limits when these transactions are later converted to proto records.
+        let input_notes_size = transaction_header.input_notes().len() * 32;
+        let output_notes_size = transaction_header.output_notes().len() * 500;
+        let size_in_bytes = (HEADER_BASE_SIZE + input_notes_size + output_notes_size) as i64;
+
         Self {
-            transaction_id: transaction_id.to_bytes(),
-            account_id: account_id.to_bytes(),
+            transaction_id: transaction_header.id().to_bytes(),
+            account_id: transaction_header.account_id().to_bytes(),
             block_num: block_num.to_raw_sql(),
+            initial_state_commitment: transaction_header.initial_state_commitment().to_bytes(),
+            final_state_commitment: transaction_header.final_state_commitment().to_bytes(),
+            input_notes: input_notes_binary,
+            output_notes: output_notes_binary,
+            size_in_bytes,
         }
     }
 }
+
+/// Select complete transaction records for the given accounts and block range.
+///
+/// # Parameters
+/// * `account_ids`: List of account IDs to filter by
+///     - Limit: 0 <= size <= 1000
+/// * `block_range`: Range of blocks to include inclusive
+///
+/// # Returns
+/// A tuple of (`last_block_included`, `transaction_records`) where:
+/// - `last_block_included`: The highest block number included in the response
+/// - `transaction_records`: Vector of transaction records, limited by payload size
+///
+/// # Note
+/// This function returns complete transaction record information including state commitments
+/// and note IDs, allowing for direct conversion to proto `TransactionRecord` without loading
+/// full block data. We use a chunked loading strategy to prevent memory exhaustion attacks and
+/// ensure predictable resource usage.
+///
+/// # Raw SQL
+/// ```sql
+/// SELECT
+///     account_id,
+///     block_num,
+///     transaction_id,
+///     initial_state_commitment,
+///     final_state_commitment,
+///     input_notes,
+///     output_notes,
+///     size_in_bytes
+/// FROM
+///     transactions
+/// WHERE
+///     block_num >= ?1
+///     AND block_num <= ?2
+///     AND account_id IN rarray(?3)
+///     AND (
+///         block_num > ?4 OR (block_num = ?4 AND transaction_id > ?5)
+///     )  -- cursor-based pagination
+/// ORDER BY
+///     block_num ASC,
+///     transaction_id ASC
+/// LIMIT
+///     ?6
+/// ```
+/// Notes:
+/// - Uses stable ordering (`block_num`, `transaction_id`) to ensure consistent results across
+///   paginated queries.
+/// - Uses cursor-based pagination.
+/// - The query is executed in chunks of 1000 transactions to prevent loading excessive data and to
+///   stop as soon as the accumulated size approaches the 4MB limit.
+/// - Given the size of note records, 1000 records are guaranteed never to return more than about
+///   60MB of data.
+pub fn select_transactions_records(
+    conn: &mut SqliteConnection,
+    account_ids: &[AccountId],
+    block_range: RangeInclusive<BlockNumber>,
+) -> Result<(BlockNumber, Vec<crate::db::TransactionRecord>), DatabaseError> {
+    const MAX_PAYLOAD_BYTES: i64 = 4 * 1024 * 1024; // 4 MB
+    const NUM_TXS_PER_CHUNK: i64 = 1000; // Read 1000 transactions at a time
+
+    QueryParamAccountIdLimit::check(account_ids.len())?;
+
+    if block_range.is_empty() {
+        return Err(DatabaseError::InvalidBlockRange {
+            from: *block_range.start(),
+            to: *block_range.end(),
+        });
+    }
+
+    let desired_account_ids = serialize_vec(account_ids);
+
+    // Read transactions in chunks to prevent loading excessive data and to stop
+    // as soon as we approach the size limit
+    let mut all_transactions = Vec::new();
+    let mut total_size = 0i64;
+    let mut last_block_num: Option<i64> = None;
+    let mut last_transaction_id: Option<Vec<u8>> = None;
+
+    loop {
+        let mut query =
+            SelectDsl::select(schema::transactions::table, TransactionRecordRaw::as_select())
+                .filter(schema::transactions::block_num.ge(block_range.start().to_raw_sql()))
+                .filter(schema::transactions::block_num.le(block_range.end().to_raw_sql()))
+                .filter(schema::transactions::account_id.eq_any(&desired_account_ids))
+                .into_boxed();
+
+        // Apply cursor-based pagination using the last seen (block_num, transaction_id)
+        if let (Some(last_block), Some(last_tx_id)) = (last_block_num, &last_transaction_id) {
+            query = query.filter(
+                schema::transactions::block_num
+                    .gt(last_block)
+                    .or(schema::transactions::block_num
+                        .eq(last_block)
+                        .and(schema::transactions::transaction_id.gt(last_tx_id))),
+            );
+        }
+
+        let chunk = query
+            .order((
+                schema::transactions::block_num.asc(),
+                schema::transactions::transaction_id.asc(),
+            ))
+            .limit(NUM_TXS_PER_CHUNK)
+            .load::<TransactionRecordRaw>(conn)
+            .map_err(DatabaseError::from)?;
+
+        // Add transactions from this chunk one by one until we hit the limit
+        let mut added_from_chunk = 0;
+        let mut last_added_tx: Option<TransactionRecordRaw> = None;
+
+        for tx in chunk {
+            if total_size + tx.size_in_bytes <= MAX_PAYLOAD_BYTES {
+                total_size += tx.size_in_bytes;
+                last_added_tx = Some(tx);
+                added_from_chunk += 1;
+            } else {
+                // Can't fit this transaction, stop here
+                break;
+            }
+        }
+
+        // Update cursor position only for the last transaction that was actually added
+        if let Some(tx) = last_added_tx {
+            last_block_num = Some(tx.block_num);
+            last_transaction_id = Some(tx.transaction_id.clone());
+            all_transactions.push(tx);
+        }
+
+        // Break if chunk incomplete (size limit hit or data exhausted)
+        if added_from_chunk < NUM_TXS_PER_CHUNK {
+            break;
+        }
+    }
+
+    // Ensure block consistency: remove the last block if it's incomplete
+    // (we may have stopped loading mid-block due to size constraints)
+    if total_size >= MAX_PAYLOAD_BYTES {
+        // SAFETY: We're guaranteed to have at least one transaction since total_size > 0
+        let last_block_num = last_block_num.expect(
+            "guaranteed to have processed at least one transaction when size limit is reached",
+        );
+        let filtered_transactions = vec_raw_try_into(
+            all_transactions.into_iter().take_while(|row| row.block_num != last_block_num),
+        )?;
+
+        // SAFETY: block_num came from the database and was previously validated
+        let last_included_block = BlockNumber::from_raw_sql(last_block_num.saturating_sub(1))?;
+        Ok((last_included_block, filtered_transactions))
+    } else {
+        Ok((*block_range.end(), vec_raw_try_into(all_transactions)?))
+    }
+}
diff --git a/crates/store/src/db/schema.rs b/crates/store/src/db/schema.rs
index bc907e826..be7fdedee 100644
--- a/crates/store/src/db/schema.rs
+++ b/crates/store/src/db/schema.rs
@@ -90,6 +90,11 @@ diesel::table! {
         transaction_id -> Binary,
         account_id -> Binary,
         block_num -> BigInt,
+        initial_state_commitment -> Binary,
+        final_state_commitment -> Binary,
+        input_notes -> Binary,
+        output_notes -> Binary,
+        size_in_bytes -> BigInt,
     }
 }
 
diff --git a/crates/store/src/server/rpc_api.rs b/crates/store/src/server/rpc_api.rs
index f8886969d..070546c33 100644
--- a/crates/store/src/server/rpc_api.rs
+++ b/crates/store/src/server/rpc_api.rs
@@ -483,4 +483,57 @@ impl rpc_server::Rpc for StoreApi {
             script: note_script.map(Into::into),
         }))
     }
+
+    #[instrument(
+        parent = None,
+        target = COMPONENT,
+        name = "store.rpc_server.sync_transactions",
+        skip_all,
+        ret(level = "debug"),
+        err
+    )]
+    async fn sync_transactions(
+        &self,
+        request: Request<proto::rpc_store::SyncTransactionsRequest>,
+    ) -> Result<Response<proto::rpc_store::SyncTransactionsResponse>, Status> {
+        debug!(target: COMPONENT, request = ?request);
+
+        let request = request.into_inner();
+
+        let chain_tip = self.state.latest_block_num().await;
+        let block_range = request.block_range.ok_or(invalid_argument("block_range is required"))?;
+        let block_range = block_range.into_inclusive_range(chain_tip);
+
+        let account_ids: Vec<AccountId> = read_account_ids(&request.account_ids)?;
+
+        let (last_block_included, transaction_records_db) = self
+            .state
+            .sync_transactions(account_ids, block_range.clone())
+            .await
+            .map_err(internal_error)?;
+
+        // Convert database TransactionRecord to proto TransactionRecord
+        let mut transaction_records = Vec::with_capacity(transaction_records_db.len());
+
+        for tx_header in transaction_records_db {
+            // Retrieve full note data for output notes from the database
+            let note_records = self
+                .state
+                .get_notes_by_id(tx_header.output_notes.clone())
+                .await
+                .map_err(internal_error)?;
+
+            // Convert to proto using the helper method
+            let proto_record = tx_header.into_proto_with_note_records(note_records);
+            transaction_records.push(proto_record);
+        }
+
+        Ok(Response::new(proto::rpc_store::SyncTransactionsResponse {
+            pagination_info: Some(proto::rpc_store::PaginationInfo {
+                chain_tip: chain_tip.as_u32(),
+                block_num: last_block_included.as_u32(),
+            }),
+            transaction_records,
+        }))
+    }
 }
diff --git a/crates/store/src/state.rs b/crates/store/src/state.rs
index 52831df61..75890848c 100644
--- a/crates/store/src/state.rs
+++ b/crates/store/src/state.rs
@@ -1033,6 +1033,16 @@ impl State {
     ) -> Result<Option<NoteScript>, DatabaseError> {
         self.db.select_note_script_by_root(root).await
     }
+
+    /// Returns the complete transaction records for the specified accounts within the specified
+    /// block range, including state commitments and note IDs.
+    pub async fn sync_transactions(
+        &self,
+        account_ids: Vec<AccountId>,
+        block_range: RangeInclusive<BlockNumber>,
+    ) -> Result<(BlockNumber, Vec<crate::db::TransactionRecord>), DatabaseError> {
+        self.db.select_transactions_records(account_ids, block_range).await
+    }
 }
 
 // UTILITIES
diff --git a/docs/src/user/rpc.md b/docs/src/user/rpc.md
index 79e270d9a..22d9622e2 100644
--- a/docs/src/user/rpc.md
+++ b/docs/src/user/rpc.md
@@ -19,6 +19,7 @@ The gRPC service definition can be found in the Miden node's `proto` [directory]
 - [SyncNotes](#syncnotes)
 - [SyncState](#syncstate)
 - [SyncStorageMaps](#syncstoragemaps)
+- [SyncTransactions](#synctransactions)
 - [Status](#status)
 
 <!--toc:end-->
@@ -116,6 +117,10 @@ Caller specifies the `account_id` of the public account and the block range (`bl
 
 This endpoint enables clients to maintain an updated view of account storage.
 
+### SyncTransactions
+
+Returns transaction records for specific accounts within a block range.
+
 ### Status
 
 Request the status of the node components. The response contains the current version of the RPC component and the connection status of the other components, including their versions and the number of the most recent block in the chain (chain tip).
diff --git a/proto/proto/rpc.proto b/proto/proto/rpc.proto
index 05fdb7ddf..2188b54e1 100644
--- a/proto/proto/rpc.proto
+++ b/proto/proto/rpc.proto
@@ -95,6 +95,9 @@ service Api {
 
     // Returns storage map updates for specified account and storage slots within a block range.
     rpc SyncStorageMaps(rpc_store.SyncStorageMapsRequest) returns (rpc_store.SyncStorageMapsResponse) {}
+
+    // Returns transactions records for specific accounts within a block range.
+    rpc SyncTransactions(rpc_store.SyncTransactionsRequest) returns (rpc_store.SyncTransactionsResponse) {}
 }
 
 // RPC STATUS
diff --git a/proto/proto/store/rpc.proto b/proto/proto/store/rpc.proto
index f32598829..61342701a 100644
--- a/proto/proto/store/rpc.proto
+++ b/proto/proto/store/rpc.proto
@@ -80,6 +80,9 @@ service Rpc {
 
     // Returns storage map updates for specified account and storage slots within a block range.
     rpc SyncStorageMaps(SyncStorageMapsRequest) returns (SyncStorageMapsResponse) {}
+
+    // Returns transactions records for specific accounts within a block range.
+    rpc SyncTransactions(SyncTransactionsRequest) returns (SyncTransactionsResponse) {}
 }
 
 // STORE STATUS
@@ -422,3 +425,35 @@ message PaginationInfo {
     // starting from the next block to this one (ie, request.block_range.block_from = block_num + 1).
     fixed32 block_num = 2;
 }
+
+// SYNC TRANSACTIONS
+// ================================================================================================
+
+// Transactions synchronization request.
+//
+// Allows clients to sync transactions for specific accounts within a block range.
+message SyncTransactionsRequest {
+    // Block range from which to start synchronizing.
+    BlockRange block_range = 1;
+
+    // Accounts to sync transactions for.
+    repeated account.AccountId account_ids = 2;
+}
+
+// Represents the result of syncing transactions request.
+message SyncTransactionsResponse {
+    // Pagination information.
+    PaginationInfo pagination_info = 1;
+
+    // List of transaction records.
+    repeated TransactionRecord transaction_records = 2;
+}
+
+// Represents a transaction record.
+message TransactionRecord {
+    // Block number in which the transaction was executed.
+    fixed32 block_num = 1;
+
+    // A transaction header.
+    transaction.TransactionHeader transaction_header = 2;
+}
diff --git a/proto/proto/types/transaction.proto b/proto/proto/types/transaction.proto
index 841815349..1c57ae10b 100644
--- a/proto/proto/types/transaction.proto
+++ b/proto/proto/types/transaction.proto
@@ -1,8 +1,9 @@
 syntax = "proto3";
 package transaction;
 
-import "types/primitives.proto";
 import "types/account.proto";
+import "types/note.proto";
+import "types/primitives.proto";
 
 // TRANSACTION
 // ================================================================================================
@@ -37,3 +38,21 @@ message TransactionSummary {
     // The ID of the account affected by the transaction.
     account.AccountId account_id = 3;
 }
+
+// Represents a transaction header.
+message TransactionHeader {
+    // ID of the account against which the transaction was executed.
+    account.AccountId account_id = 1;
+
+    // State commitment of the account before the transaction was executed.
+    primitives.Digest initial_state_commitment = 2;
+
+    // State commitment of the account after the transaction was executed.
+    primitives.Digest final_state_commitment = 3;
+
+    // Nullifiers of the input notes of the transaction.
+    repeated primitives.Digest input_notes = 4;
+
+    // Output notes of the transaction.
+    repeated note.NoteSyncRecord output_notes = 5;
+}

From b0c167eb146450a823201aa1e4cea8b4d90ccef8 Mon Sep 17 00:00:00 2001
From: Serge Radinovich <47865535+sergerad@users.noreply.github.com>
Date: Wed, 1 Oct 2025 11:06:43 +1300
Subject: [PATCH 30/78] chore: Display URI directly in span field (#1259)

---
 crates/utils/src/tracing/grpc.rs | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/crates/utils/src/tracing/grpc.rs b/crates/utils/src/tracing/grpc.rs
index d05aea97c..ae0e6fd2f 100644
--- a/crates/utils/src/tracing/grpc.rs
+++ b/crates/utils/src/tracing/grpc.rs
@@ -8,17 +8,8 @@ use crate::tracing::OpenTelemetrySpanExt;
 /// Additionally also pulls in remote tracing context which allows the server trace to be connected
 /// to the client's origin trace.
 pub fn grpc_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
-    // A gRPC request's path ends with `../<service>/<method>`.
-    let mut path_segments = request.uri().path().rsplit('/');
-    let method = path_segments.next().unwrap_or_default();
-    let service = path_segments.next().unwrap_or_default();
-
-    // Create a span with a generic name - the actual span name will be set via otel.name
-    let span = tracing::info_span!("grpc_request", rpc.service = service, rpc.method = method);
-
-    // Set the dynamic span name that OpenTelemetry will use
-    // This allows us to have the proper <service>/<method> format without hardcoding
-    span.record("otel.name", format!("{service}/{method}"));
+    // Create a span with a generic, static name.
+    let span = tracing::info_span!("rpc", rpc.uri = %request.uri());
 
     // Pull the open-telemetry parent context using the HTTP extractor
     let otel_ctx = opentelemetry::global::get_text_map_propagator(|propagator| {

From c733577cd45efe2966e11fba2102a2bbcaf80e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Garillot?=
 <4142+huitseeker@users.noreply.github.com>
Date: Wed, 1 Oct 2025 17:03:24 +0900
Subject: [PATCH 31/78] ci: add a rust-toolchain.toml, MSRV ci & check script
 (#1252)

---
 .github/workflows/msrv.yml |  33 ++++++++
 rust-toolchain.toml        |   5 ++
 scripts/check-msrv.sh      | 153 +++++++++++++++++++++++++++++++++++++
 3 files changed, 191 insertions(+)
 create mode 100644 .github/workflows/msrv.yml
 create mode 100644 rust-toolchain.toml
 create mode 100755 scripts/check-msrv.sh

diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
new file mode 100644
index 000000000..354e2afa9
--- /dev/null
+++ b/.github/workflows/msrv.yml
@@ -0,0 +1,33 @@
+name: Check MSRV
+
+on:
+  push:
+    branches: [next]
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+# Limits workflow concurrency to only the latest commit in the PR.
+concurrency:
+  group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  # Check MSRV (aka `rust-version`) in `Cargo.toml` is valid for workspace members
+  msrv:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install -y jq
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/next' }}
+      - name: Install cargo-msrv
+        run: cargo install cargo-msrv
+      - name: Check MSRV for each workspace member
+        run: |
+          ./scripts/check-msrv.sh
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 000000000..6744e56e1
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,5 @@
+[toolchain]
+channel    = "1.90"
+components = ["clippy", "rust-src", "rustfmt"]
+profile    = "minimal"
+targets    = ["wasm32-unknown-unknown"]
diff --git a/scripts/check-msrv.sh b/scripts/check-msrv.sh
new file mode 100755
index 000000000..0bde2955f
--- /dev/null
+++ b/scripts/check-msrv.sh
@@ -0,0 +1,153 @@
+#!/bin/bash
+set -e
+set -o pipefail
+
+# Enhanced MSRV checking script for workspace repository
+# Checks MSRV for each workspace member and provides helpful error messages
+
+# ---- utilities --------------------------------------------------------------
+
+check_command() {
+  if ! command -v "$1" >/dev/null 2>&1; then
+    echo "ERROR: Required command '$1' is not installed or not in PATH"
+    exit 1
+  fi
+}
+
+# Check required commands
+check_command "cargo"
+check_command "jq"
+check_command "rustup"
+check_command "sed"
+check_command "grep"
+check_command "awk"
+
+# Portable in-place sed (GNU/macOS); usage: sed_i 's/foo/bar/' file
+# shellcheck disable=SC2329  # used quoted
+sed_i() {
+  if sed --version >/dev/null 2>&1; then
+    sed -i "$@"
+  else
+    sed -i '' "$@"
+  fi
+}
+
+# ---- repo root --------------------------------------------------------------
+
+# Get the directory where this script is located and change to the parent directory
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd "$DIR/.."
+
+echo "Checking MSRV for workspace members..."
+
+# ---- metadata --------------------------------------------------------------
+
+metadata_json="$(cargo metadata --no-deps --format-version 1)"
+workspace_root="$(printf '%s' "$metadata_json" | jq -r '.workspace_root')"
+
+failed_packages=""
+
+# Iterate actual workspace packages with manifest paths and (maybe) rust_version
+# Fields per line (TSV): id  name  manifest_path  rust_version_or_empty
+while IFS=$'\t' read -r pkg_id package_name manifest_path rust_version; do
+  # Derive package directory (avoid external dirname for portability)
+  package_dir="${manifest_path%/*}"
+  if [[ -z "$package_dir" || "$package_dir" == "$manifest_path" ]]; then
+    package_dir="."
+  fi
+
+  echo "Checking $package_name ($pkg_id) in $package_dir"
+
+  if [[ ! -f "$package_dir/Cargo.toml" ]]; then
+    echo "WARNING: No Cargo.toml found in $package_dir, skipping..."
+    continue
+  fi
+
+  # Prefer cargo metadata's effective rust_version if present
+  current_msrv="$rust_version"
+  if [[ -z "$current_msrv" ]]; then
+    # If the crate inherits: rust-version.workspace = true
+    if grep -Eq '^\s*rust-version\.workspace\s*=\s*true\b' "$package_dir/Cargo.toml"; then
+      # Read from workspace root [workspace.package]
+      current_msrv="$(grep -Eo '^\s*rust-version\s*=\s*"[^"]+"' "$workspace_root/Cargo.toml" | head -n1 | sed -E 's/.*"([^"]+)".*/\1/')"
+      if [[ -n "$current_msrv" ]]; then
+        echo "   Using workspace MSRV: $current_msrv"
+      fi
+    fi
+  fi
+
+  if [[ -z "$current_msrv" ]]; then
+    echo "WARNING: No rust-version found (package or workspace) for $package_name"
+    continue
+  fi
+
+  echo "   Current MSRV: $current_msrv"
+
+  # Try to verify the MSRV
+  if ! cargo msrv verify --manifest-path "$package_dir/Cargo.toml" >/dev/null 2>&1; then
+    echo "ERROR: MSRV check failed for $package_name"
+    failed_packages="$failed_packages $package_name"
+
+    echo "Searching for correct MSRV for $package_name..."
+
+    # Determine the currently-installed stable toolchain version (e.g., "1.81.0")
+    latest_stable="$(rustup run stable rustc --version 2>/dev/null | awk '{print $2}')"
+    if [[ -z "$latest_stable" ]]; then latest_stable="1.81.0"; fi
+
+    # Search for the actual MSRV starting from the current one
+    if actual_msrv=$(cargo msrv find \
+          --manifest-path "$package_dir/Cargo.toml" \
+          --min "$current_msrv" \
+          --max "$latest_stable" \
+          --output-format minimal 2>/dev/null); then
+      echo "   Found actual MSRV: $actual_msrv"
+      echo ""
+      echo "ERROR SUMMARY for $package_name:"
+      echo "   Package:   $package_name"
+      echo "   Directory: $package_dir"
+      echo "   Current (incorrect) MSRV: $current_msrv"
+      echo "   Correct MSRV:             $actual_msrv"
+      echo ""
+      echo "TO FIX:"
+      echo "   Update rust-version in $package_dir/Cargo.toml from \"$current_msrv\" to \"$actual_msrv\""
+      echo ""
+      echo "   Or run this command (portable in-place edit):"
+      echo "     sed_i 's/^\\s*rust-version\\s*=\\s*\"$current_msrv\"/rust-version = \"$actual_msrv\"/' \"$package_dir/Cargo.toml\""
+    else
+      echo "   Could not determine correct MSRV automatically"
+      echo ""
+      echo "ERROR SUMMARY for $package_name:"
+      echo "   Package:   $package_name"
+      echo "   Directory: $package_dir"
+      echo "   Current (incorrect) MSRV: $current_msrv"
+      echo "   Could not automatically determine correct MSRV"
+      echo ""
+      echo "TO FIX:"
+      echo "   Run manually: cargo msrv find --manifest-path \"$package_dir/Cargo.toml\""
+    fi
+    echo "-------------------------------------------------------------------------------"
+  else
+    echo "OK: MSRV check passed for $package_name"
+  fi
+  echo ""
+
+done < <(
+  printf '%s' "$metadata_json" \
+  | jq -r '. as $m
+           | $m.workspace_members[]
+           | . as $id
+           | ($m.packages[] | select(.id == $id)
+              | [ .id, .name, .manifest_path, (.rust_version // "") ] | @tsv)'
+)
+
+if [[ -n "$failed_packages" ]]; then
+  echo "MSRV CHECK FAILED"
+  echo ""
+  echo "The following packages have incorrect MSRV settings:$failed_packages"
+  echo ""
+  echo "Please fix the rust-version fields in the affected Cargo.toml files as shown above."
+  exit 1
+else
+  echo "ALL WORKSPACE MEMBERS PASSED MSRV CHECKS!"
+  exit 0
+fi
\ No newline at end of file

From e6464b8283eca91182c081229152a17537316a1b Mon Sep 17 00:00:00 2001
From: Mirko <48352201+Mirko-von-Leipzig@users.noreply.github.com>
Date: Wed, 1 Oct 2025 10:28:29 +0200
Subject: [PATCH 32/78] feat(mempool): re-add mempool stats to telemetry
 (#1250)

Merging this so long to keep, but since this is a feature branch reviews post-merge will still handled.
---
 crates/block-producer/src/mempool/mod.rs   | 77 ++++++++++++++++------
 crates/block-producer/src/mempool/nodes.rs | 68 ++++++++++---------
 crates/block-producer/src/mempool/state.rs | 26 +++++---
 3 files changed, 113 insertions(+), 58 deletions(-)

diff --git a/crates/block-producer/src/mempool/mod.rs b/crates/block-producer/src/mempool/mod.rs
index 335a34603..1316616c1 100644
--- a/crates/block-producer/src/mempool/mod.rs
+++ b/crates/block-producer/src/mempool/mod.rs
@@ -281,6 +281,11 @@ impl Mempool {
             let node =
                 self.nodes.txs.remove(&tx.id()).expect("selected transaction node must exist");
             self.state.remove(&node);
+            tracing::info!(
+                batch.id = %batch_id,
+                transaction.id = %tx.id(),
+                "Transaction selected for inclusion in batch"
+            );
         }
         self.state.insert(NodeId::ProposedBatch(batch_id), &selected);
         self.nodes.proposed_batches.insert(batch_id, selected);
@@ -313,8 +318,14 @@ impl Mempool {
         for (_, node) in reverted {
             for tx in node.transactions() {
                 let tx = TransactionNode::new(Arc::clone(tx));
-                self.state.insert(NodeId::Transaction(tx.id()), &tx);
-                self.nodes.txs.insert(tx.id(), tx);
+                let tx_id = tx.id();
+                self.state.insert(NodeId::Transaction(tx_id), &tx);
+                self.nodes.txs.insert(tx_id, tx);
+                tracing::info!(
+                    batch.id = %batch,
+                    transaction.id = %tx_id,
+                    "Transaction requeued as part of batch rollback"
+                );
             }
         }
 
@@ -392,11 +403,17 @@ impl Mempool {
             selected.push(candidate.clone());
         }
 
+        let block_number = self.chain_tip.child();
         // Replace the batches with the block in state and nodes.
         for batch in selected.batches() {
             // SAFETY: Selected batches came from nodes, and are unique.
             let batch = self.nodes.proven_batches.remove(&batch.id()).unwrap();
             self.state.remove(&batch);
+            tracing::info!(
+                block.number = %block_number,
+                batch.id = %batch.id(),
+                "Batch selected for inclusion in block",
+            );
         }
 
         let block_number = self.chain_tip.child();
@@ -486,8 +503,24 @@ impl Mempool {
         //
         // A more refined approach could be to tag the offending transactions and then evict them
         // once a certain failure threshold has been met.
-        let _reverted = self.revert_subtree(NodeId::Block(block));
-        // TODO(mirko): Add reverted nodes as events.
+        let reverted = self.revert_subtree(NodeId::Block(block));
+
+        // Log reverted batches and transactions.
+        for (id, node) in reverted {
+            match id {
+                NodeId::ProposedBatch(batch_id) | NodeId::ProvenBatch(batch_id) => {
+                    tracing::info!(block.number = %block, batch.id = %batch_id, "Reverted batch as part of block rollback");
+                },
+                NodeId::Transaction(_) => {},
+                NodeId::Block(block_number) => panic!(
+                    "Found block {block_number} descendent while reverting a block which shouldn't be possible since only one block is in progress"
+                ),
+            }
+
+            for tx in node.transactions() {
+                tracing::info!(block.number = %block, transaction.id = %tx.id(), "Reverted transaction as part of block rollback");
+            }
+        }
 
         self.inject_telemetry();
     }
@@ -512,19 +545,11 @@ impl Mempool {
     ///
     /// Note that these are only visible in the OpenTelemetry context, as conventional tracing
     /// does not track fields added dynamically.
-    #[allow(clippy::unused_self, reason = "wip: mempool refactor")]
     fn inject_telemetry(&self) {
-        let _span = tracing::Span::current();
-
-        // span.set_attribute("mempool.transactions.total", self.transactions.len());
-        // span.set_attribute("mempool.transactions.roots", self.transactions.num_roots());
-        // span.set_attribute("mempool.accounts", self.state.num_accounts());
-        // span.set_attribute("mempool.nullifiers", self.state.num_nullifiers());
-        // span.set_attribute("mempool.output_notes", self.state.num_notes_created());
-        // span.set_attribute("mempool.batches.pending", self.batches.num_pending());
-        // span.set_attribute("mempool.batches.proven", self.batches.num_proven());
-        // span.set_attribute("mempool.batches.total", self.batches.len());
-        // span.set_attribute("mempool.batches.roots", self.batches.num_roots());
+        let span = tracing::Span::current();
+
+        self.nodes.inject_telemetry(&span);
+        self.state.inject_telemetry(&span);
     }
 
     /// Reverts expired transactions and batches as per the current `chain_tip`.
@@ -544,9 +569,23 @@ impl Mempool {
             .chain(expired_proposed_batches)
             .chain(expired_txs)
             .collect::<Vec<_>>();
-        for node in expired {
-            // TODO(mirko): Log these nicely somehow.
-            let _reverted = self.revert_subtree(node);
+        for expired_id in expired {
+            let reverted = self.revert_subtree(expired_id);
+            for (id, node) in reverted {
+                match id {
+                    NodeId::ProposedBatch(batch_id) | NodeId::ProvenBatch(batch_id) => {
+                        tracing::info!(ancestor = ?expired_id, batch.id = %batch_id, "Reverted batch due to expiration of ancestor");
+                    },
+                    NodeId::Transaction(_) => {},
+                    NodeId::Block(block_number) => panic!(
+                        "Found block {block_number} descendent while reverting a block which shouldn't be possible since only one block is in progress"
+                    ),
+                }
+
+                for tx in node.transactions() {
+                    tracing::info!(ancestor = ?expired_id, transaction.id = %tx.id(), "Reverted transaction due to expiration of ancestor");
+                }
+            }
         }
     }
 
diff --git a/crates/block-producer/src/mempool/nodes.rs b/crates/block-producer/src/mempool/nodes.rs
index d1dfffa8f..9db15f426 100644
--- a/crates/block-producer/src/mempool/nodes.rs
+++ b/crates/block-producer/src/mempool/nodes.rs
@@ -14,7 +14,7 @@ use crate::domain::transaction::AuthenticatedTransaction;
 ///
 /// This effectively describes the lifecycle of a transaction in the mempool.
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub(crate) enum NodeId {
+pub(super) enum NodeId {
     Transaction(TransactionId),
     // UserBatch(BatchId),
     ProposedBatch(BatchId),
@@ -26,22 +26,22 @@ pub(crate) enum NodeId {
 ///
 /// Once this is selected for inclusion in a batch it will be moved inside a [`ProposedBatchNode`].
 #[derive(Clone, Debug, PartialEq)]
-pub(crate) struct TransactionNode(Arc<AuthenticatedTransaction>);
+pub(super) struct TransactionNode(Arc<AuthenticatedTransaction>);
 
 impl TransactionNode {
-    pub fn new(inner: Arc<AuthenticatedTransaction>) -> Self {
+    pub(super) fn new(inner: Arc<AuthenticatedTransaction>) -> Self {
         Self(inner)
     }
 
-    pub fn id(&self) -> TransactionId {
+    pub(super) fn id(&self) -> TransactionId {
         self.0.id()
     }
 
-    pub fn inner(&self) -> &Arc<AuthenticatedTransaction> {
+    pub(super) fn inner(&self) -> &Arc<AuthenticatedTransaction> {
         &self.0
     }
 
-    pub fn expires_at(&self) -> BlockNumber {
+    pub(super) fn expires_at(&self) -> BlockNumber {
         self.0.expires_at()
     }
 }
@@ -50,22 +50,22 @@ impl TransactionNode {
 ///
 /// Once proven it transitions to a [`ProvenBatchNode`].
 #[derive(Clone, Debug, PartialEq, Default)]
-pub(crate) struct ProposedBatchNode(Vec<Arc<AuthenticatedTransaction>>);
+pub(super) struct ProposedBatchNode(Vec<Arc<AuthenticatedTransaction>>);
 
 impl ProposedBatchNode {
-    pub fn push(&mut self, tx: Arc<AuthenticatedTransaction>) {
+    pub(super) fn push(&mut self, tx: Arc<AuthenticatedTransaction>) {
         self.0.push(tx);
     }
 
-    pub fn contains(&mut self, id: TransactionId) -> bool {
+    pub(super) fn contains(&mut self, id: TransactionId) -> bool {
         self.0.iter().any(|tx| tx.id() == id)
     }
 
-    pub fn is_empty(&self) -> bool {
+    pub(super) fn is_empty(&self) -> bool {
         self.0.is_empty()
     }
 
-    pub fn calculate_id(&self) -> BatchId {
+    pub(super) fn calculate_id(&self) -> BatchId {
         BatchId::from_transactions(
             self.0
                 .iter()
@@ -74,19 +74,19 @@ impl ProposedBatchNode {
         )
     }
 
-    pub fn into_proven_batch_node(self, proof: Arc<ProvenBatch>) -> ProvenBatchNode {
+    pub(super) fn into_proven_batch_node(self, proof: Arc<ProvenBatch>) -> ProvenBatchNode {
         let Self(txs) = self;
         ProvenBatchNode { txs, inner: proof }
     }
 
-    pub fn expires_at(&self) -> BlockNumber {
+    pub(super) fn expires_at(&self) -> BlockNumber {
         self.0.iter().map(|tx| tx.expires_at()).min().unwrap_or_default()
     }
 }
 
 /// Represents a [`ProvenBatch`] which is waiting for inclusion in a block.
 #[derive(Clone, Debug, PartialEq)]
-pub(crate) struct ProvenBatchNode {
+pub(super) struct ProvenBatchNode {
     /// We need to store this in addition to the proven batch because [`ProvenBatch`] erases the
     /// transaction information. We need the original information if we want to rollback the batch
     /// but retain the transactions.
@@ -95,42 +95,42 @@ pub(crate) struct ProvenBatchNode {
 }
 
 impl ProvenBatchNode {
-    pub(crate) fn tx_headers(&self) -> impl Iterator<Item = &TransactionHeader> {
+    pub(super) fn tx_headers(&self) -> impl Iterator<Item = &TransactionHeader> {
         self.inner.transactions().as_slice().iter()
     }
 
-    pub(crate) fn id(&self) -> BatchId {
+    pub(super) fn id(&self) -> BatchId {
         self.inner.id()
     }
 
-    pub fn inner(&self) -> &Arc<ProvenBatch> {
+    pub(super) fn inner(&self) -> &Arc<ProvenBatch> {
         &self.inner
     }
 
-    pub fn expires_at(&self) -> BlockNumber {
+    pub(super) fn expires_at(&self) -> BlockNumber {
         self.inner.batch_expiration_block_num()
     }
 }
 
 /// Represents a block - both committed and in-progress.
 #[derive(Clone, Debug, PartialEq, Default)]
-pub(crate) struct BlockNode {
+pub(super) struct BlockNode {
     txs: Vec<Arc<AuthenticatedTransaction>>,
     batches: Vec<Arc<ProvenBatch>>,
 }
 
 impl BlockNode {
-    pub fn push(&mut self, batch: ProvenBatchNode) {
+    pub(super) fn push(&mut self, batch: ProvenBatchNode) {
         let ProvenBatchNode { txs, inner } = batch;
         self.txs.extend(txs);
         self.batches.push(inner);
     }
 
-    pub fn contains(&self, id: BatchId) -> bool {
+    pub(super) fn contains(&self, id: BatchId) -> bool {
         self.batches.iter().any(|batch| batch.id() == id)
     }
 
-    pub fn batches(&self) -> &[Arc<ProvenBatch>] {
+    pub(super) fn batches(&self) -> &[Arc<ProvenBatch>] {
         &self.batches
     }
 }
@@ -138,7 +138,7 @@ impl BlockNode {
 /// Describes a node's impact on the state.
 ///
 /// This is used to determine what state data is created or consumed by this node.
-pub(crate) trait Node {
+pub(super) trait Node {
     /// All [`Nullifier`]s created by this node, **including** nullifiers for erased notes. This
     /// may not be strictly necessary but it removes having to worry about reverting batches and
     /// blocks with erased notes -- since these would otherwise have different state impact than
@@ -288,18 +288,26 @@ impl Node for BlockNode {
 /// This data _must_ be kept in sync with the [`InflightState's`] [`NodeIds`] since these are
 /// used as the edges of the graph.
 #[derive(Clone, Debug, PartialEq, Default)]
-pub(crate) struct Nodes {
+pub(super) struct Nodes {
     // Nodes in the DAG
-    pub(crate) txs: HashMap<TransactionId, TransactionNode>,
+    pub(super) txs: HashMap<TransactionId, TransactionNode>,
     // user_batches: HashMap<BatchId, ProvenBatchNode>,
-    pub(crate) proposed_batches: HashMap<BatchId, ProposedBatchNode>,
-    pub(crate) proven_batches: HashMap<BatchId, ProvenBatchNode>,
-    pub(crate) proposed_block: Option<(BlockNumber, BlockNode)>,
-    pub(crate) committed_blocks: VecDeque<(BlockNumber, BlockNode)>,
+    pub(super) proposed_batches: HashMap<BatchId, ProposedBatchNode>,
+    pub(super) proven_batches: HashMap<BatchId, ProvenBatchNode>,
+    pub(super) proposed_block: Option<(BlockNumber, BlockNode)>,
+    pub(super) committed_blocks: VecDeque<(BlockNumber, BlockNode)>,
 }
 
 impl Nodes {
-    pub(crate) fn oldest_committed_block(&self) -> Option<BlockNumber> {
+    pub(super) fn oldest_committed_block(&self) -> Option<BlockNumber> {
         self.committed_blocks.front().map(|(number, _)| *number)
     }
+
+    pub(super) fn inject_telemetry(&self, span: &tracing::Span) {
+        use miden_node_utils::tracing::OpenTelemetrySpanExt;
+
+        span.set_attribute("mempool.transactions.unbatched", self.txs.len());
+        span.set_attribute("mempool.batches.proposed", self.proposed_batches.len());
+        span.set_attribute("mempool.batches.proven", self.proven_batches.len());
+    }
 }
diff --git a/crates/block-producer/src/mempool/state.rs b/crates/block-producer/src/mempool/state.rs
index 975577500..9d8a25794 100644
--- a/crates/block-producer/src/mempool/state.rs
+++ b/crates/block-producer/src/mempool/state.rs
@@ -16,7 +16,7 @@ use crate::mempool::nodes::{Node, NodeId};
 /// structure. No attempt is made to verify this internally here as it requires more information
 /// than is available at this level.
 #[derive(Clone, Debug, PartialEq, Default)]
-pub(crate) struct InflightState {
+pub(super) struct InflightState {
     /// All nullifiers created by inflight state.
     ///
     /// This _includes_ nullifiers from erased notes to simpify reverting nodes and requeuing
@@ -49,7 +49,7 @@ pub(crate) struct InflightState {
 
 impl InflightState {
     /// Returns all nullifiers which already exist.
-    pub(crate) fn nullifiers_exist(
+    pub(super) fn nullifiers_exist(
         &self,
         nullifiers: impl Iterator<Item = Nullifier>,
     ) -> Vec<Nullifier> {
@@ -57,12 +57,12 @@ impl InflightState {
     }
 
     /// Returns all output notes which already exist.
-    pub(crate) fn output_notes_exist(&self, notes: impl Iterator<Item = NoteId>) -> Vec<NoteId> {
+    pub(super) fn output_notes_exist(&self, notes: impl Iterator<Item = NoteId>) -> Vec<NoteId> {
         notes.filter(|note| self.output_notes.contains_key(note)).collect()
     }
 
     /// Returns all output notes which don't exist.
-    pub(crate) fn output_notes_missing(&self, notes: impl Iterator<Item = NoteId>) -> Vec<NoteId> {
+    pub(super) fn output_notes_missing(&self, notes: impl Iterator<Item = NoteId>) -> Vec<NoteId> {
         notes.filter(|note| !self.output_notes.contains_key(note)).collect()
     }
 
@@ -70,7 +70,7 @@ impl InflightState {
     ///
     /// A [`None`] value _does not_ mean this account doesn't exist at all, but rather that it
     /// has no inflight nodes.
-    pub(crate) fn account_commitment(&self, account: &AccountId) -> Option<Word> {
+    pub(super) fn account_commitment(&self, account: &AccountId) -> Option<Word> {
         self.accounts.get(account).map(AccountUpdates::latest_commitment)
     }
 
@@ -79,7 +79,7 @@ impl InflightState {
     /// Note that this simply removes the data and does not check that the data was associated with
     /// the [`Node`] at the time of removal. The caller is responsible for ensuring that the given
     /// node was still active in the state.
-    pub(crate) fn remove(&mut self, node: &dyn Node) {
+    pub(super) fn remove(&mut self, node: &dyn Node) {
         for nullifier in node.nullifiers() {
             assert!(
                 self.nullifiers.remove(&nullifier),
@@ -116,7 +116,7 @@ impl InflightState {
 
     /// Inserts the node into the state, associating the data with the node's ID. This powers the
     /// parent and child relationship lookups.
-    pub(crate) fn insert(&mut self, id: NodeId, node: &dyn Node) {
+    pub(super) fn insert(&mut self, id: NodeId, node: &dyn Node) {
         self.nullifiers.extend(node.nullifiers());
         self.output_notes.extend(node.output_notes().map(|note| (note, id)));
         self.unauthenticated_notes
@@ -130,7 +130,7 @@ impl InflightState {
     /// The [`NodeId`]s which the given node directly depends on.
     ///
     /// Note that the result is invalidated by mutating the state.
-    pub(crate) fn parents(&self, id: NodeId, node: &dyn Node) -> HashSet<NodeId> {
+    pub(super) fn parents(&self, id: NodeId, node: &dyn Node) -> HashSet<NodeId> {
         let note_parents =
             node.unauthenticated_notes().filter_map(|note| self.output_notes.get(&note));
 
@@ -153,7 +153,7 @@ impl InflightState {
     /// The [`NodeId`]s which depend directly on the given node.
     ///
     /// Note that the result is invalidated by mutating the state.
-    pub(crate) fn children(&self, id: NodeId, node: &dyn Node) -> HashSet<NodeId> {
+    pub(super) fn children(&self, id: NodeId, node: &dyn Node) -> HashSet<NodeId> {
         let note_children =
             node.output_notes().filter_map(|note| self.unauthenticated_notes.get(&note));
 
@@ -172,6 +172,14 @@ impl InflightState {
             .filter(|child| child != &id)
             .collect()
     }
+
+    pub(super) fn inject_telemetry(&self, span: &tracing::Span) {
+        use miden_node_utils::tracing::OpenTelemetrySpanExt;
+
+        span.set_attribute("mempool.accounts", self.accounts.len());
+        span.set_attribute("mempool.nullifiers", self.nullifiers.len());
+        span.set_attribute("mempool.output_notes", self.output_notes.len());
+    }
 }
 
 /// The commitment updates made to a account.

From 956ab4566a5b3dddb30889262d32b0b8ff28270d Mon Sep 17 00:00:00 2001
From: Mirko <48352201+Mirko-von-Leipzig@users.noreply.github.com>
Date: Wed, 1 Oct 2025 10:51:46 +0200
Subject: [PATCH 33/78] feat(mempool): re-add event subscription (#1251)

---
 .../block-producer/src/block_builder/mod.rs   |  2 +-
 crates/block-producer/src/mempool/mod.rs      | 50 +++++++++++++++----
 .../src/mempool/subscription.rs               |  6 +--
 crates/proto/src/domain/mempool.rs            |  4 +-
 4 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/crates/block-producer/src/block_builder/mod.rs b/crates/block-producer/src/block_builder/mod.rs
index 2f6834d31..30ab7b7ca 100644
--- a/crates/block-producer/src/block_builder/mod.rs
+++ b/crates/block-producer/src/block_builder/mod.rs
@@ -236,7 +236,7 @@ impl BlockBuilder {
             .await
             .map_err(BuildBlockError::StoreApplyBlockFailed)?;
 
-        mempool.lock().await.commit_block(built_block.header().block_num());
+        mempool.lock().await.commit_block(built_block.header().clone());
 
         Ok(())
     }
diff --git a/crates/block-producer/src/mempool/mod.rs b/crates/block-producer/src/mempool/mod.rs
index 1316616c1..70d2378c0 100644
--- a/crates/block-producer/src/mempool/mod.rs
+++ b/crates/block-producer/src/mempool/mod.rs
@@ -41,13 +41,14 @@
 //!   a block (or are part of the currently proposed block).
 //! - Reverting a node reverts all descendents as well.
 
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::num::NonZeroUsize;
 use std::sync::Arc;
 
 use miden_node_proto::domain::mempool::MempoolEvent;
 use miden_objects::batch::{BatchId, ProvenBatch};
-use miden_objects::block::BlockNumber;
+use miden_objects::block::{BlockHeader, BlockNumber};
+use miden_objects::transaction::TransactionId;
 use subscription::SubscriptionProvider;
 use tokio::sync::{Mutex, MutexGuard, mpsc};
 use tracing::{instrument, warn};
@@ -208,6 +209,7 @@ impl Mempool {
         }
 
         // Insert the transaction node.
+        self.subscription.transaction_added(&tx);
         let tx = TransactionNode::new(tx);
         self.state.insert(NodeId::Transaction(tx.id()), &tx);
         self.nodes.txs.insert(tx.id(), tx);
@@ -443,21 +445,24 @@ impl Mempool {
     ///
     /// Panics if there is no block in flight.
     #[instrument(target = COMPONENT, name = "mempool.commit_block", skip_all)]
-    pub fn commit_block(&mut self, to_commit: BlockNumber) {
+    pub fn commit_block(&mut self, to_commit: BlockHeader) {
         let block = self
             .nodes
             .proposed_block
-            .take_if(|(proposed, _)| proposed == &to_commit)
+            .take_if(|(proposed, _)| proposed == &to_commit.block_num())
             .expect("block must be in progress to commit");
+        let tx_ids = block.1.transactions().map(|tx| tx.id()).collect();
 
         self.nodes.committed_blocks.push_back(block);
         self.chain_tip = self.chain_tip.child();
+        self.subscription.block_committed(to_commit, tx_ids);
 
         if self.nodes.committed_blocks.len() > self.config.state_retention.get() {
             let (_number, node) = self.nodes.committed_blocks.pop_front().unwrap();
             self.state.remove(&node);
         }
-        self.revert_expired_nodes();
+        let reverted_tx_ids = self.revert_expired_nodes();
+        self.subscription.txs_reverted(reverted_tx_ids);
         self.inject_telemetry();
     }
 
@@ -504,12 +509,17 @@ impl Mempool {
         // A more refined approach could be to tag the offending transactions and then evict them
         // once a certain failure threshold has been met.
         let reverted = self.revert_subtree(NodeId::Block(block));
+        let mut reverted_txs = HashSet::default();
 
         // Log reverted batches and transactions.
         for (id, node) in reverted {
             match id {
                 NodeId::ProposedBatch(batch_id) | NodeId::ProvenBatch(batch_id) => {
-                    tracing::info!(block.number = %block, batch.id = %batch_id, "Reverted batch as part of block rollback");
+                    tracing::info!(
+                        block.number=%block,
+                        batch.id=%batch_id,
+                        "Reverted batch as part of block rollback"
+                    );
                 },
                 NodeId::Transaction(_) => {},
                 NodeId::Block(block_number) => panic!(
@@ -518,9 +528,15 @@ impl Mempool {
             }
 
             for tx in node.transactions() {
-                tracing::info!(block.number = %block, transaction.id = %tx.id(), "Reverted transaction as part of block rollback");
+                reverted_txs.insert(tx.id());
+                tracing::info!(
+                    block.number=%block,
+                    transaction.id=%tx.id(),
+                    "Reverted transaction as part of block rollback"
+                );
             }
         }
+        self.subscription.txs_reverted(reverted_txs);
 
         self.inject_telemetry();
     }
@@ -553,7 +569,9 @@ impl Mempool {
     }
 
     /// Reverts expired transactions and batches as per the current `chain_tip`.
-    fn revert_expired_nodes(&mut self) {
+    ///
+    /// Returns the list of all transactions that were reverted.
+    fn revert_expired_nodes(&mut self) -> HashSet<TransactionId> {
         let expired_txs = self.nodes.txs.iter().filter_map(|(id, node)| {
             (node.expires_at() <= self.chain_tip).then_some(NodeId::Transaction(*id))
         });
@@ -569,12 +587,17 @@ impl Mempool {
             .chain(expired_proposed_batches)
             .chain(expired_txs)
             .collect::<Vec<_>>();
+        let mut reverted_txs = HashSet::default();
         for expired_id in expired {
             let reverted = self.revert_subtree(expired_id);
             for (id, node) in reverted {
                 match id {
                     NodeId::ProposedBatch(batch_id) | NodeId::ProvenBatch(batch_id) => {
-                        tracing::info!(ancestor = ?expired_id, batch.id = %batch_id, "Reverted batch due to expiration of ancestor");
+                        tracing::info!(
+                            ancestor=?expired_id,
+                            batch.id=%batch_id,
+                            "Reverted batch due to expiration of ancestor"
+                        );
                     },
                     NodeId::Transaction(_) => {},
                     NodeId::Block(block_number) => panic!(
@@ -583,10 +606,17 @@ impl Mempool {
                 }
 
                 for tx in node.transactions() {
-                    tracing::info!(ancestor = ?expired_id, transaction.id = %tx.id(), "Reverted transaction due to expiration of ancestor");
+                    reverted_txs.insert(tx.id());
+                    tracing::info!(
+                        ancestor=?expired_id,
+                        transaction.id=%tx.id(),
+                        "Reverted transaction due to expiration of ancestor"
+                    );
                 }
             }
         }
+
+        reverted_txs
     }
 
     /// Reverts the subtree with the given root and returns the reverted nodes. Does nothing if the
diff --git a/crates/block-producer/src/mempool/subscription.rs b/crates/block-producer/src/mempool/subscription.rs
index ebbca6efe..70789bdd8 100644
--- a/crates/block-producer/src/mempool/subscription.rs
+++ b/crates/block-producer/src/mempool/subscription.rs
@@ -1,6 +1,4 @@
-#![allow(dead_code, reason = "WIP: mempoool refactor")]
-
-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::{BTreeMap, HashSet};
 use std::ops::Mul;
 
 use miden_node_proto::domain::mempool::MempoolEvent;
@@ -111,7 +109,7 @@ impl SubscriptionProvider {
         Self::send_event(&mut self.subscription, MempoolEvent::BlockCommitted { header, txs });
     }
 
-    pub(super) fn txs_reverted(&mut self, txs: BTreeSet<TransactionId>) {
+    pub(super) fn txs_reverted(&mut self, txs: HashSet<TransactionId>) {
         for tx in &txs {
             self.inflight_txs.remove(tx);
         }
diff --git a/crates/proto/src/domain/mempool.rs b/crates/proto/src/domain/mempool.rs
index 16a291e54..6e9e56322 100644
--- a/crates/proto/src/domain/mempool.rs
+++ b/crates/proto/src/domain/mempool.rs
@@ -1,4 +1,4 @@
-use std::collections::BTreeSet;
+use std::collections::HashSet;
 
 use miden_objects::account::delta::AccountUpdateDetails;
 use miden_objects::block::BlockHeader;
@@ -22,7 +22,7 @@ pub enum MempoolEvent {
         header: BlockHeader,
         txs: Vec<TransactionId>,
     },
-    TransactionsReverted(BTreeSet<TransactionId>),
+    TransactionsReverted(HashSet<TransactionId>),
 }
 
 impl MempoolEvent {

From 5758a0be49e95aa8ebf7a3bf8eabe48f08117b24 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Wed, 1 Oct 2025 16:10:19 -0300
Subject: [PATCH 34/78] fix: predefine otel.name field with empty value (#1264)

* fix: predefine otel.name field with empty value

* review: remove service.uri, re-add service and method
---
 crates/utils/src/tracing/grpc.rs | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/crates/utils/src/tracing/grpc.rs b/crates/utils/src/tracing/grpc.rs
index ae0e6fd2f..7160c4854 100644
--- a/crates/utils/src/tracing/grpc.rs
+++ b/crates/utils/src/tracing/grpc.rs
@@ -1,3 +1,5 @@
+use tracing::field;
+
 use crate::tracing::OpenTelemetrySpanExt;
 
 /// Returns a [`trace_fn`](tonic::transport::server::Server) implementation for gRPC requests
@@ -8,8 +10,24 @@ use crate::tracing::OpenTelemetrySpanExt;
 /// Additionally also pulls in remote tracing context which allows the server trace to be connected
 /// to the client's origin trace.
 pub fn grpc_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
-    // Create a span with a generic, static name.
-    let span = tracing::info_span!("rpc", rpc.uri = %request.uri());
+    // A gRPC request's path ends with `../<service>/<method>`.
+    let mut path_segments = request.uri().path().rsplit('/');
+
+    let service = path_segments.next().unwrap_or_default();
+    let method = path_segments.next().unwrap_or_default();
+
+    // Create a span with a generic, static name. Fields to be recorded after needs to be
+    // initialized as empty since otherwise the assignment will have no effect.
+    let span = tracing::info_span!(
+        "rpc",
+        otel.name = field::Empty,
+        rpc.service = service,
+        rpc.method = method
+    );
+
+    // Set the span name via otel.name
+    let otel_name = format!("{service}/{method}");
+    span.record("otel.name", otel_name);
 
     // Pull the open-telemetry parent context using the HTTP extractor
     let otel_ctx = opentelemetry::global::get_text_map_propagator(|propagator| {

From cfd64aadb6a9bebdfb5c1af24748a9c43fe9e747 Mon Sep 17 00:00:00 2001
From: MozirDmitriy <dmitriymozir@gmail.com>
Date: Wed, 1 Oct 2025 22:23:57 +0300
Subject: [PATCH 35/78] fix: align account_storage_map_values PK with migration
 (#1239)

---
 crates/store/src/db/schema.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/store/src/db/schema.rs b/crates/store/src/db/schema.rs
index be7fdedee..2b81eb52d 100644
--- a/crates/store/src/db/schema.rs
+++ b/crates/store/src/db/schema.rs
@@ -1,7 +1,7 @@
 // @generated automatically by Diesel CLI.
 
 diesel::table! {
-    account_storage_map_values (account_id, block_num, slot, key, is_latest_update) {
+    account_storage_map_values (account_id, block_num, slot, key) {
         account_id -> Binary,
         block_num -> BigInt,
         slot -> Integer,

From 01b5b0bb6844ce8d7389244e1142a4678a356729 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Wed, 1 Oct 2025 16:41:41 -0300
Subject: [PATCH 36/78] fix: correct service and method retreival (#1265)

---
 crates/utils/src/tracing/grpc.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/utils/src/tracing/grpc.rs b/crates/utils/src/tracing/grpc.rs
index 7160c4854..a4721cd73 100644
--- a/crates/utils/src/tracing/grpc.rs
+++ b/crates/utils/src/tracing/grpc.rs
@@ -13,8 +13,8 @@ pub fn grpc_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
     // A gRPC request's path ends with `../<service>/<method>`.
     let mut path_segments = request.uri().path().rsplit('/');
 
-    let service = path_segments.next().unwrap_or_default();
     let method = path_segments.next().unwrap_or_default();
+    let service = path_segments.next().unwrap_or_default();
 
     // Create a span with a generic, static name. Fields to be recorded after needs to be
     // initialized as empty since otherwise the assignment will have no effect.

From 538a7770a5ee2f7af6aa42cad13957e584d4d05c Mon Sep 17 00:00:00 2001
From: keinberger <philipp.keinberger@gmail.com>
Date: Thu, 2 Oct 2025 13:50:23 +0300
Subject: [PATCH 37/78] chore: amend category Docusaurus files to YML to
 support comments

---
 docs/external/src/_category_.json          | 5 -----
 docs/external/src/_category_.yml           | 4 ++++
 docs/external/src/operator/_category_.json | 5 -----
 docs/external/src/operator/_category_.yml  | 4 ++++
 4 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 docs/external/src/_category_.json
 create mode 100644 docs/external/src/_category_.yml
 delete mode 100644 docs/external/src/operator/_category_.json
 create mode 100644 docs/external/src/operator/_category_.yml

diff --git a/docs/external/src/_category_.json b/docs/external/src/_category_.json
deleted file mode 100644
index 51d0d28e5..000000000
--- a/docs/external/src/_category_.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "label": "Node",
-  "position": 6,
-  "collapsed": true
-}
diff --git a/docs/external/src/_category_.yml b/docs/external/src/_category_.yml
new file mode 100644
index 000000000..5bd2d6482
--- /dev/null
+++ b/docs/external/src/_category_.yml
@@ -0,0 +1,4 @@
+label: "Node"
+# Determines where this documentation section appears relative to other sections on the main documentation page (which is the parent of this folder in the miden-docs repository)
+position: 6
+collapsed: true
diff --git a/docs/external/src/operator/_category_.json b/docs/external/src/operator/_category_.json
deleted file mode 100644
index 01a891a78..000000000
--- a/docs/external/src/operator/_category_.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "label": "Node Operator Guide",
-  "position": 1,
-  "collapsed": true
-}
diff --git a/docs/external/src/operator/_category_.yml b/docs/external/src/operator/_category_.yml
new file mode 100644
index 000000000..397a6a7e2
--- /dev/null
+++ b/docs/external/src/operator/_category_.yml
@@ -0,0 +1,4 @@
+label: "Node Operator Guide"
+# Determines where this documentation section appears relative to other sections in the parent folder
+position: 1
+collapsed: true

From 30ec4a6d83c1960fe2bddb2575e6a0044bbfd225 Mon Sep 17 00:00:00 2001
From: keinberger <philipp.keinberger@gmail.com>
Date: Thu, 2 Oct 2025 13:50:36 +0300
Subject: [PATCH 38/78] docs(README): add external docs section explainer

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index bd5e6973b..696cb1990 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,8 @@ your one-stop-shop for all things Miden.
 For node operators living on the development edge, we also host the latest unreleased documentation
 [here](https://0xMiden.github.io/miden-node/index.html).
 
+The documentation in the `docs/external` folder is built using Docusaurus and is automatically absorbed into the main [miden-docs](https://github.com/0xMiden/miden-docs) repository for the main documentation website. Changes to the `next` branch trigger an automated deployment workflow. The docs folder requires npm packages to be installed before building.
+
 ## Contributing
 
 Developer documentation and onboarding guide is available

From e58167a3d5c3783c7c7c503eb527a9b1937f4f74 Mon Sep 17 00:00:00 2001
From: keinberger <philipp.keinberger@gmail.com>
Date: Thu, 2 Oct 2025 13:50:46 +0300
Subject: [PATCH 39/78] chore: add build-docs workflow to check Docusaurus md
 syntax

---
 .github/workflows/build-docs.yml | 46 ++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 .github/workflows/build-docs.yml

diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
new file mode 100644
index 000000000..72d4c28d3
--- /dev/null
+++ b/.github/workflows/build-docs.yml
@@ -0,0 +1,46 @@
+name: build-docs
+
+# Limits workflow concurrency to only the latest commit in the PR.
+concurrency:
+  group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
+  cancel-in-progress: true
+
+on:
+  push:
+    branches: [main, next]
+    paths:
+      - "docs/external/**"
+      - ".github/workflows/build-docs.yml"
+  pull_request:
+    types: [opened, reopened, synchronize]
+    paths:
+      - "docs/external/**"
+      - ".github/workflows/build-docs.yml"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build-docs:
+    name: Build Documentation
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+          cache-dependency-path: docs/external/package-lock.json
+
+      - name: Install dependencies
+        working-directory: ./docs/external
+        run: npm ci
+
+      - name: Build documentation
+        working-directory: ./docs/external
+        run: npm run build:dev

From 3028ce3c726138420f04fe7bfb5098389c397d1f Mon Sep 17 00:00:00 2001
From: keinberger <philipp.keinberger@gmail.com>
Date: Thu, 2 Oct 2025 13:51:04 +0300
Subject: [PATCH 40/78] chore(Makefile): add serve-docs command and checking
 for npm tool

---
 Makefile | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 787070515..7a968862c 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,11 @@ doc: ## Generates & checks documentation
 
 .PHONY: book
 book: ## Builds the book & serves documentation site
-	mdbook serve --open docs
+	mdbook serve --open docs/internal
+
+.PHONY: serve-docs
+serve-docs: ## Serves the docs
+	cd docs/external && npm run start:dev
 
 # --- testing -------------------------------------------------------------------------------------
 
@@ -137,6 +141,7 @@ check-tools: ## Checks if development tools are installed
 	@command -v cargo nextest >/dev/null 2>&1 && echo "[OK] cargo-nextest is installed" || echo "[MISSING] cargo-nextest(make install-tools)"
 	@command -v taplo         >/dev/null 2>&1 && echo "[OK] taplo is installed"         || echo "[MISSING] taplo        (make install-tools)"
 	@command -v cargo-machete >/dev/null 2>&1 && echo "[OK] cargo-machete is installed" || echo "[MISSING] cargo-machete (make install-tools)"
+	@command -v npm >/dev/null 2>&1 && echo "[OK] npm is installed" || echo "[MISSING] npm is not installed (run: make install-tools)"
 
 .PHONY: install-tools
 install-tools: ## Installs tools required by the Makefile
@@ -147,4 +152,11 @@ install-tools: ## Installs tools required by the Makefile
 	cargo install cargo-nextest --locked
 	cargo install taplo-cli --locked
 	cargo install cargo-machete --locked
+	@if ! command -v node >/dev/null 2>&1; then \
+		echo "Node.js not found. Please install Node.js from https://nodejs.org/ or using your package manager"; \
+		echo "On macOS: brew install node"; \
+		echo "On Ubuntu/Debian: sudo apt install nodejs npm"; \
+		echo "On Windows: Download from https://nodejs.org/"; \
+		exit 1; \
+	fi
 	@echo "Development tools installation complete!"

From e8d64eeef3f6ea6243451d3d5e9c9c7c33f7eb49 Mon Sep 17 00:00:00 2001
From: keinberger <philipp.keinberger@gmail.com>
Date: Thu, 2 Oct 2025 13:51:24 +0300
Subject: [PATCH 41/78] chore: use specific ref for trigger deploy docs
 workflow

chore: only trigger deployment workflow upon changes to docs folder
---
 .github/workflows/trigger-deploy-docs.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/trigger-deploy-docs.yml b/.github/workflows/trigger-deploy-docs.yml
index 292c85df8..6de20e978 100644
--- a/.github/workflows/trigger-deploy-docs.yml
+++ b/.github/workflows/trigger-deploy-docs.yml
@@ -3,6 +3,8 @@ name: Trigger Aggregator Docs Rebuild
 on:
   push:
     branches: [next]
+    paths:
+      - "docs/external**"
 
 jobs:
   notify:
@@ -13,7 +15,7 @@ jobs:
 
     steps:
       - name: Send repository_dispatch to aggregator
-        uses: peter-evans/repository-dispatch@v3
+        uses: peter-evans/repository-dispatch@a628c95fd17070f003ea24579a56e6bc89b25766
         with:
           # PAT (Personal Access Token) that grants permission to trigger the rebuild workflow at the docs repository
           token: ${{ secrets.DOCS_REPO_TOKEN }}

From f42f0dbd5ff8c5a53bb68aed2a71e3d610d36ad6 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Thu, 2 Oct 2025 11:37:53 -0300
Subject: [PATCH 42/78] chore: add pagination to SyncNotes (#1257)

* chore: add pagination to SyncNotes

* review: move message validation before store call

* review: remove block_to doc, remove chain_tip parameter

* fix: rebuild proto files
---
 CHANGELOG.md                                |  1 +
 bin/stress-test/src/store/mod.rs            |  5 +-
 crates/proto/src/generated/rpc_store.rs     | 13 +++--
 crates/rpc/README.md                        |  7 ++-
 crates/store/README.md                      |  6 +--
 crates/store/src/db/mod.rs                  |  6 +--
 crates/store/src/db/models/queries/mod.rs   | 11 +++-
 crates/store/src/db/models/queries/notes.rs | 30 ++++++-----
 crates/store/src/db/tests.rs                | 58 ++++++++++++---------
 crates/store/src/server/rpc_api.rs          | 15 ++++--
 crates/store/src/state.rs                   | 11 ++--
 docs/src/user/rpc.md                        |  2 +-
 proto/proto/store/rpc.proto                 |  9 ++--
 13 files changed, 103 insertions(+), 71 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f1e84192..dfc930b1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - [BREAKING] Replace `GetAccountProofs` with `GetAccountProof` in the public store API (#[1211](https://github.com/0xMiden/miden-node/pull/1211)).
 - Implemented storage map `DataStore` function ([#1226](https://github.com/0xMiden/miden-node/pull/1226)).
 - [BREAKING] Renamed `RemoteProverProxy` to `RemoteProverClient` ([#1236](https://github.com/0xMiden/miden-node/pull/1236)).
+- Added pagination to `SyncNotes` endpoint ([#1257](https://github.com/0xMiden/miden-node/pull/1257)).
 
 ## v0.11.2 (2025-09-10)
 
diff --git a/bin/stress-test/src/store/mod.rs b/bin/stress-test/src/store/mod.rs
index 2a571d6a3..d21826521 100644
--- a/bin/stress-test/src/store/mod.rs
+++ b/bin/stress-test/src/store/mod.rs
@@ -158,7 +158,10 @@ pub async fn sync_notes(
         .iter()
         .map(|id| u32::from(NoteTag::from_account_id(*id)))
         .collect::<Vec<_>>();
-    let sync_request = proto::rpc_store::SyncNotesRequest { block_num: 0, note_tags };
+    let sync_request = proto::rpc_store::SyncNotesRequest {
+        block_range: Some(proto::rpc_store::BlockRange { block_from: 0, block_to: None }),
+        note_tags,
+    };
 
     let start = Instant::now();
     api_client.sync_notes(sync_request).await.unwrap();
diff --git a/crates/proto/src/generated/rpc_store.rs b/crates/proto/src/generated/rpc_store.rs
index 235113b59..4045666dc 100644
--- a/crates/proto/src/generated/rpc_store.rs
+++ b/crates/proto/src/generated/rpc_store.rs
@@ -250,10 +250,9 @@ pub struct AccountVaultUpdate {
 /// contains a note matching `note_tags` or the chain tip.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncNotesRequest {
-    /// Last block known by the client. The response will contain data starting from the next block,
-    /// until the first block which contains a note of matching the requested tag.
-    #[prost(fixed32, tag = "1")]
-    pub block_num: u32,
+    /// Block range from which to start synchronizing.
+    #[prost(message, optional, tag = "1")]
+    pub block_range: ::core::option::Option<BlockRange>,
     /// Specifies the tags which the client is interested in.
     #[prost(fixed32, repeated, tag = "2")]
     pub note_tags: ::prost::alloc::vec::Vec<u32>,
@@ -261,9 +260,9 @@ pub struct SyncNotesRequest {
 /// Represents the result of syncing notes request.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncNotesResponse {
-    /// Number of the latest block in the chain.
-    #[prost(fixed32, tag = "1")]
-    pub chain_tip: u32,
+    /// Pagination information.
+    #[prost(message, optional, tag = "1")]
+    pub pagination_info: ::core::option::Option<PaginationInfo>,
     /// Block header of the block with the first note matching the specified criteria.
     #[prost(message, optional, tag = "2")]
     pub block_header: ::core::option::Option<super::blockchain::BlockHeader>,
diff --git a/crates/rpc/README.md b/crates/rpc/README.md
index f2a0042ff..2d5ee75e3 100644
--- a/crates/rpc/README.md
+++ b/crates/rpc/README.md
@@ -128,13 +128,12 @@ the chain tip so that the caller knows when it has been reached.
 
 Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
 
-Client specifies the `note_tags` they are interested in, and the block height from which to search for new for matching
-notes for. The request will then return the next block containing any note matching the provided tags.
+Client specifies the `note_tags` they are interested in, and the block range from which to search for matching notes. The request will then return the next block containing any note matching the provided tags within the specified range.
+
 
 The response includes each note's metadata and inclusion proof.
 
-A basic note sync can be implemented by repeatedly requesting the previous response's block until reaching the tip of
-the chain.
+A basic note sync can be implemented by repeatedly requesting the previous response's block until reaching the tip of the chain.
 
 ---
 
diff --git a/crates/store/README.md b/crates/store/README.md
index 3e5af2624..e55f555ff 100644
--- a/crates/store/README.md
+++ b/crates/store/README.md
@@ -129,13 +129,11 @@ the chain tip so that the caller knows when it has been reached.
 
 Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
 
-Client specifies the `note_tags` they are interested in, and the block height from which to search for new for matching
-notes for. The request will then return the next block containing any note matching the provided tags.
+Client specifies the `note_tags` they are interested in, and the block range from which to search for matching notes. The request will then return the next block containing any note matching the provided tags within the specified range.
 
 The response includes each note's metadata and inclusion proof.
 
-A basic note sync can be implemented by repeatedly requesting the previous response's block until reaching the tip of
-the chain.
+A basic note sync can be implemented by repeatedly requesting the previous response's block until reaching the tip of the chain.
 
 ---
 
diff --git a/crates/store/src/db/mod.rs b/crates/store/src/db/mod.rs
index 8805f31ed..74277ee83 100644
--- a/crates/store/src/db/mod.rs
+++ b/crates/store/src/db/mod.rs
@@ -434,11 +434,11 @@ impl Db {
     #[instrument(level = "debug", target = COMPONENT, skip_all, ret(level = "debug"), err)]
     pub async fn get_note_sync(
         &self,
-        block_num: BlockNumber,
+        block_range: RangeInclusive<BlockNumber>,
         note_tags: Vec<u32>,
-    ) -> Result<NoteSyncUpdate, NoteSyncError> {
+    ) -> Result<(NoteSyncUpdate, BlockNumber), NoteSyncError> {
         self.transact("notes sync task", move |conn| {
-            queries::get_note_sync(conn, block_num, note_tags.as_slice())
+            queries::get_note_sync(conn, note_tags.as_slice(), block_range)
         })
         .await
     }
diff --git a/crates/store/src/db/models/queries/mod.rs b/crates/store/src/db/models/queries/mod.rs
index 81ef9b31e..0d40dd8c4 100644
--- a/crates/store/src/db/models/queries/mod.rs
+++ b/crates/store/src/db/models/queries/mod.rs
@@ -85,12 +85,19 @@ pub(crate) fn get_state_sync(
     account_ids: Vec<AccountId>,
     note_tags: Vec<u32>,
 ) -> Result<StateSyncUpdate, StateSyncError> {
+    let chain_tip = select_block_header_by_block_num(conn, None)?
+        .expect("Chain tip is not found")
+        .block_num();
+
+    // Sync notes from the starting block to the latest in the chain.
+    let block_range = from_start_block..=chain_tip;
+
     // select notes since block by tag and sender
-    let notes = select_notes_since_block_by_tag_and_sender(
+    let (notes, _) = select_notes_since_block_by_tag_and_sender(
         conn,
-        from_start_block,
         &account_ids[..],
         &note_tags[..],
+        block_range,
     )?;
 
     // select block header by block num
diff --git a/crates/store/src/db/models/queries/notes.rs b/crates/store/src/db/models/queries/notes.rs
index f572eb116..17c585c35 100644
--- a/crates/store/src/db/models/queries/notes.rs
+++ b/crates/store/src/db/models/queries/notes.rs
@@ -4,6 +4,7 @@
 )]
 
 use std::collections::{BTreeMap, BTreeSet};
+use std::ops::RangeInclusive;
 
 use diesel::prelude::{
     BoolExpressionMethods,
@@ -64,17 +65,18 @@ use crate::db::models::{serialize_vec, vec_raw_try_into};
 use crate::db::{DatabaseError, NoteRecord, NoteSyncRecord, NoteSyncUpdate, Page, schema};
 use crate::errors::NoteSyncError;
 
-/// Select notes matching the tags and account IDs search criteria.
+/// Select notes matching the tags and account IDs search criteria within a block range.
 ///
 /// # Parameters
 /// * `account_ids`: List of account IDs to filter by
 ///     - Limit: 0 <= size <= 1000
 /// * `note_tags`: List of note tags to filter by
 ///     - Limit: 0 <= count <= 1000
+/// * `block_range`: Range of blocks to search (inclusive)
 ///
 /// # Returns
 ///
-/// All matching notes from the first block greater than `block_num` containing a matching note.
+/// All matching notes from the first block within the range containing a matching note.
 /// A note is considered a match if it has any of the given tags, or if its sender is one of the
 /// given account IDs. If no matching notes are found at all, then an empty vector is returned.
 ///
@@ -108,7 +110,8 @@ use crate::errors::NoteSyncError;
 ///             notes
 ///         WHERE
 ///             (tag IN (?1) OR sender IN (?2)) AND
-///             block_num > ?3
+///             block_num > ?3 AND
+///             block_num <= ?4
 ///         ORDER BY
 ///             block_num ASC
 ///     LIMIT 1) AND
@@ -117,16 +120,17 @@ use crate::errors::NoteSyncError;
 /// ```
 pub(crate) fn select_notes_since_block_by_tag_and_sender(
     conn: &mut SqliteConnection,
-    from_start_block: BlockNumber,
     account_ids: &[AccountId],
     note_tags: &[u32],
-) -> Result<Vec<NoteSyncRecord>, DatabaseError> {
+    block_range: RangeInclusive<BlockNumber>,
+) -> Result<(Vec<NoteSyncRecord>, BlockNumber), DatabaseError> {
     QueryParamAccountIdLimit::check(account_ids.len())?;
     QueryParamNoteTagLimit::check(note_tags.len())?;
     let desired_note_tags = Vec::from_iter(note_tags.iter().map(|tag| *tag as i32));
     let desired_senders = serialize_vec(account_ids.iter());
 
-    let start_block_num = from_start_block.to_raw_sql();
+    let start_block_num = block_range.start().to_raw_sql();
+    let end_block_num = block_range.end().to_raw_sql();
 
     // find block_num: select notes since block by tag and sender
     let Some(desired_block_num): Option<i64> =
@@ -137,12 +141,13 @@ pub(crate) fn select_notes_since_block_by_tag_and_sender(
                     .or(schema::notes::sender.eq_any(&desired_senders[..])),
             )
             .filter(schema::notes::committed_at.gt(start_block_num))
+            .filter(schema::notes::committed_at.le(end_block_num))
             .order_by(schema::notes::committed_at.asc())
             .limit(1)
             .get_result(conn)
             .optional()?
     else {
-        return Ok(Vec::new());
+        return Ok((Vec::new(), *block_range.end()));
     };
 
     let notes = SelectDsl::select(schema::notes::table, NoteSyncRecordRawRow::as_select())
@@ -162,7 +167,7 @@ pub(crate) fn select_notes_since_block_by_tag_and_sender(
             .get_results::<NoteSyncRecordRawRow>(conn)
             .map_err(DatabaseError::from)?;
 
-    vec_raw_try_into(notes)
+    Ok((vec_raw_try_into(notes)?, BlockNumber::from_raw_sql(desired_block_num)?))
 }
 
 /// Select all notes matching the given set of identifiers
@@ -530,17 +535,18 @@ pub(crate) fn select_unconsumed_network_notes_by_tag(
 /// Loads the data necessary for a note sync.
 pub(crate) fn get_note_sync(
     conn: &mut SqliteConnection,
-    block_num: BlockNumber,
     note_tags: &[u32],
-) -> Result<NoteSyncUpdate, NoteSyncError> {
+    block_range: RangeInclusive<BlockNumber>,
+) -> Result<(NoteSyncUpdate, BlockNumber), NoteSyncError> {
     QueryParamNoteTagLimit::check(note_tags.len()).map_err(DatabaseError::from)?;
 
-    let notes = select_notes_since_block_by_tag_and_sender(conn, block_num, &[], note_tags)?;
+    let (notes, last_included_block) =
+        select_notes_since_block_by_tag_and_sender(conn, &[], note_tags, block_range)?;
 
     let block_header =
         select_block_header_by_block_num(conn, notes.first().map(|note| note.block_num))?
             .ok_or(NoteSyncError::EmptyBlockHeadersTable)?;
-    Ok(NoteSyncUpdate { notes, block_header })
+    Ok((NoteSyncUpdate { notes, block_header }, last_included_block))
 }
 
 #[derive(Debug, Clone, PartialEq, Selectable, Queryable, QueryableByName)]
diff --git a/crates/store/src/db/tests.rs b/crates/store/src/db/tests.rs
index 174067367..3951f7c7d 100644
--- a/crates/store/src/db/tests.rs
+++ b/crates/store/src/db/tests.rs
@@ -1098,21 +1098,25 @@ fn notes() {
     let block_num_1 = 1.into();
     create_block(conn, block_num_1);
 
+    let block_range = BlockNumber::from(0)..=BlockNumber::from(1);
+
     // test empty table
-    let res =
-        queries::select_notes_since_block_by_tag_and_sender(conn, BlockNumber::from(0), &[], &[])
+    let (res, last_included_block) =
+        queries::select_notes_since_block_by_tag_and_sender(conn, &[], &[], block_range.clone())
             .unwrap();
 
     assert!(res.is_empty());
+    assert_eq!(last_included_block, 1.into());
 
-    let res = queries::select_notes_since_block_by_tag_and_sender(
+    let (res, last_included_block) = queries::select_notes_since_block_by_tag_and_sender(
         conn,
-        BlockNumber::from(0),
         &[],
         &[1, 2, 3],
+        block_range.clone(),
     )
     .unwrap();
     assert!(res.is_empty());
+    assert_eq!(last_included_block, 1.into());
 
     let sender = AccountId::try_from(ACCOUNT_ID_PRIVATE_SENDER).unwrap();
 
@@ -1151,25 +1155,27 @@ fn notes() {
     queries::insert_notes(conn, &[(note.clone(), None)]).unwrap();
 
     // test empty tags
-    let res =
-        queries::select_notes_since_block_by_tag_and_sender(conn, BlockNumber::from(0), &[], &[])
+    let (res, last_included_block) =
+        queries::select_notes_since_block_by_tag_and_sender(conn, &[], &[], block_range.clone())
             .unwrap();
     assert!(res.is_empty());
+    assert_eq!(last_included_block, 1.into());
+
+    let block_range_1 = 1.into()..=1.into();
 
     // test no updates
-    let res = queries::select_notes_since_block_by_tag_and_sender(conn, block_num_1, &[], &[tag])
-        .unwrap();
+    let (res, last_included_block) =
+        queries::select_notes_since_block_by_tag_and_sender(conn, &[], &[tag], block_range_1)
+            .unwrap();
     assert!(res.is_empty());
+    assert_eq!(last_included_block, 1.into());
 
     // test match
-    let res = queries::select_notes_since_block_by_tag_and_sender(
-        conn,
-        block_num_1.parent().unwrap(),
-        &[],
-        &[tag],
-    )
-    .unwrap();
+    let (res, last_included_block) =
+        queries::select_notes_since_block_by_tag_and_sender(conn, &[], &[tag], block_range.clone())
+            .unwrap();
     assert_eq!(res, vec![note.clone().into()]);
+    assert_eq!(last_included_block, 1.into());
 
     let block_num_2 = note.block_num + 1;
     create_block(conn, block_num_2);
@@ -1186,20 +1192,24 @@ fn notes() {
 
     queries::insert_notes(conn, &[(note2.clone(), None)]).unwrap();
 
+    let block_range = 0.into()..=2.into();
+
     // only first note is returned
-    let res = queries::select_notes_since_block_by_tag_and_sender(
-        conn,
-        block_num_1.parent().unwrap(),
-        &[],
-        &[tag],
-    )
-    .unwrap();
+    let (res, last_included_block) =
+        queries::select_notes_since_block_by_tag_and_sender(conn, &[], &[tag], block_range)
+            .unwrap();
     assert_eq!(res, vec![note.clone().into()]);
+    assert_eq!(last_included_block, 1.into());
+
+    let block_range = 1.into()..=2.into();
 
     // only the second note is returned
-    let res = queries::select_notes_since_block_by_tag_and_sender(conn, block_num_1, &[], &[tag])
-        .unwrap();
+    let (res, last_included_block) =
+        queries::select_notes_since_block_by_tag_and_sender(conn, &[], &[tag], block_range)
+            .unwrap();
     assert_eq!(res, vec![note2.clone().into()]);
+    assert_eq!(last_included_block, 2.into());
+
     // test query notes by id
     let notes = vec![note.clone(), note2];
 
diff --git a/crates/store/src/server/rpc_api.rs b/crates/store/src/server/rpc_api.rs
index 070546c33..73a0b0307 100644
--- a/crates/store/src/server/rpc_api.rs
+++ b/crates/store/src/server/rpc_api.rs
@@ -196,16 +196,25 @@ impl rpc_server::Rpc for StoreApi {
     ) -> Result<Response<proto::rpc_store::SyncNotesResponse>, Status> {
         let request = request.into_inner();
 
-        let (state, mmr_proof) = self
+        let block_range = request.block_range.ok_or(invalid_argument("block_range is required"))?;
+
+        let chain_tip = self.state.latest_block_num().await;
+
+        let block_range = block_range.into_inclusive_range(chain_tip);
+
+        let (state, mmr_proof, last_block_included) = self
             .state
-            .sync_notes(request.block_num.into(), request.note_tags)
+            .sync_notes(request.note_tags, block_range)
             .await
             .map_err(internal_error)?;
 
         let notes = state.notes.into_iter().map(Into::into).collect();
 
         Ok(Response::new(proto::rpc_store::SyncNotesResponse {
-            chain_tip: self.state.latest_block_num().await.as_u32(),
+            pagination_info: Some(proto::rpc_store::PaginationInfo {
+                chain_tip: chain_tip.as_u32(),
+                block_num: last_block_included.as_u32(),
+            }),
             block_header: Some(state.block_header.into()),
             mmr_path: Some(mmr_proof.merkle_path.into()),
             notes,
diff --git a/crates/store/src/state.rs b/crates/store/src/state.rs
index 75890848c..044df44a7 100644
--- a/crates/store/src/state.rs
+++ b/crates/store/src/state.rs
@@ -668,22 +668,23 @@ impl State {
     ///
     /// # Arguments
     ///
-    /// - `block_num`: The last block *known* by the client, updates start from the next block.
     /// - `note_tags`: The tags the client is interested in, resulting notes are restricted to the
     ///   first block containing a matching note.
+    /// - `block_range`: The range of blocks from which to synchronize notes.
     #[instrument(level = "debug", target = COMPONENT, skip_all, ret(level = "debug"), err)]
     pub async fn sync_notes(
         &self,
-        block_num: BlockNumber,
         note_tags: Vec<u32>,
-    ) -> Result<(NoteSyncUpdate, MmrProof), NoteSyncError> {
+        block_range: RangeInclusive<BlockNumber>,
+    ) -> Result<(NoteSyncUpdate, MmrProof, BlockNumber), NoteSyncError> {
         let inner = self.inner.read().await;
 
-        let note_sync = self.db.get_note_sync(block_num, note_tags).await?;
+        let (note_sync, last_included_block) =
+            self.db.get_note_sync(block_range, note_tags).await?;
 
         let mmr_proof = inner.blockchain.open(note_sync.block_header.block_num())?;
 
-        Ok((note_sync, mmr_proof))
+        Ok((note_sync, mmr_proof, last_included_block))
     }
 
     /// Returns data needed by the block producer to construct and prove the next block.
diff --git a/docs/src/user/rpc.md b/docs/src/user/rpc.md
index 22d9622e2..326286afb 100644
--- a/docs/src/user/rpc.md
+++ b/docs/src/user/rpc.md
@@ -93,7 +93,7 @@ For any `[block_from..block_to]` range, the latest known set of assets is return
 
 Iteratively sync data for a given set of note tags.
 
-Client specify the note tags of interest and the block height from which to search. The response returns the next block containing note matching the provided tags.
+Client specifies the `note_tags` they are interested in, and the block range from which to search for matching notes. The request will then return the next block containing any note matching the provided tags within the specified range.
 
 The response includes each note's metadata and inclusion proof.
 
diff --git a/proto/proto/store/rpc.proto b/proto/proto/store/rpc.proto
index 61342701a..47c71475d 100644
--- a/proto/proto/store/rpc.proto
+++ b/proto/proto/store/rpc.proto
@@ -312,9 +312,8 @@ message AccountVaultUpdate {
 // Specifies note tags that client is interested in. The server will return the first block which
 // contains a note matching `note_tags` or the chain tip.
 message SyncNotesRequest {
-    // Last block known by the client. The response will contain data starting from the next block,
-    // until the first block which contains a note of matching the requested tag.
-    fixed32 block_num = 1;
+    // Block range from which to start synchronizing.
+    BlockRange block_range = 1;
 
     // Specifies the tags which the client is interested in.
     repeated fixed32 note_tags = 2;
@@ -322,8 +321,8 @@ message SyncNotesRequest {
 
 // Represents the result of syncing notes request.
 message SyncNotesResponse {
-    // Number of the latest block in the chain.
-    fixed32 chain_tip = 1;
+    // Pagination information.
+    PaginationInfo pagination_info = 1;
 
     // Block header of the block with the first note matching the specified criteria.
     blockchain.BlockHeader block_header = 2;

From f04acc6002757f3975fa22d76e9d090e088be05e Mon Sep 17 00:00:00 2001
From: Serge Radinovich <47865535+sergerad@users.noreply.github.com>
Date: Tue, 7 Oct 2025 09:21:20 +1300
Subject: [PATCH 43/78] chore: Reinstate #[from] for GrpcClientError (#1267)

---
 crates/block-producer/src/errors.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/block-producer/src/errors.rs b/crates/block-producer/src/errors.rs
index 6b948d29d..22062f4ac 100644
--- a/crates/block-producer/src/errors.rs
+++ b/crates/block-producer/src/errors.rs
@@ -317,7 +317,7 @@ pub enum StoreError {
     #[error("account Id prefix already exists: {0}")]
     DuplicateAccountIdPrefix(AccountId),
     #[error("gRPC client error")]
-    GrpcClientError(Box<tonic::Status>),
+    GrpcClientError(#[from] Box<tonic::Status>),
     #[error("malformed response from store: {0}")]
     MalformedResponse(String),
     #[error("failed to parse response")]

From 40529f16b1fa50a3ec4ebb3feeafd985cf52e231 Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Tue, 7 Oct 2025 18:05:12 +0200
Subject: [PATCH 44/78] feat: optimize `GetAccountProof` for small accounts
 (#1214)

---
 CHANGELOG.md                            |   2 +
 crates/proto/src/domain/account.rs      | 569 ++++++++++++++++++------
 crates/proto/src/generated/rpc.rs       |   6 +-
 crates/proto/src/generated/rpc_store.rs | 209 ++++++---
 crates/rpc/src/server/api.rs            |   2 +-
 crates/store/src/server/rpc_api.rs      |   8 +-
 crates/store/src/state.rs               | 131 +++---
 proto/proto/rpc.proto                   |   2 +-
 proto/proto/store/rpc.proto             | 137 ++++--
 9 files changed, 755 insertions(+), 311 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfc930b1f..7f636deb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@
 ## v0.11.2 (2025-09-10)
 
 - Added support for keepalive requests against base path `/` of RPC server ([#1212](https://github.com/0xMiden/miden-node/pull/1212)).
+- [BREAKING] Replace `GetAccountProofs` with `GetAccountProof` in the public store API ([#1211](https://github.com/0xMiden/miden-node/pull/1211)).
+- [BREAKING] Optimize `GetAccountProof` for small accounts ([#1185](https://github.com/0xMiden/miden-node/pull/1185)).
 
 ## v0.11.1 (2025-09-08)
 
diff --git a/crates/proto/src/domain/account.rs b/crates/proto/src/domain/account.rs
index d00c88ddd..1e4d5256b 100644
--- a/crates/proto/src/domain/account.rs
+++ b/crates/proto/src/domain/account.rs
@@ -7,9 +7,10 @@ use miden_objects::account::{
     AccountHeader,
     AccountId,
     AccountStorageHeader,
+    StorageMap,
     StorageSlotType,
 };
-use miden_objects::asset::Asset;
+use miden_objects::asset::{Asset, AssetVault};
 use miden_objects::block::{AccountWitness, BlockNumber};
 use miden_objects::note::{NoteExecutionMode, NoteTag};
 use miden_objects::utils::{Deserializable, DeserializationError, Serializable};
@@ -105,75 +106,180 @@ impl From<&AccountInfo> for proto::account::AccountDetails {
 /// Represents a request for an account proof.
 pub struct AccountProofRequest {
     pub account_id: AccountId,
-    pub account_details: Option<AccountDetailRequest>,
+    pub block_num: BlockNumber,
+    pub details: Option<AccountDetailRequest>,
 }
 
 impl TryFrom<proto::rpc_store::AccountProofRequest> for AccountProofRequest {
     type Error = ConversionError;
 
-    fn try_from(request: proto::rpc_store::AccountProofRequest) -> Result<Self, Self::Error> {
-        let proto::rpc_store::AccountProofRequest { account_id, account_details } = request;
+    fn try_from(value: proto::rpc_store::AccountProofRequest) -> Result<Self, Self::Error> {
+        let proto::rpc_store::AccountProofRequest { account_id, block_num, details } = value;
 
         let account_id = account_id
             .ok_or(proto::rpc_store::AccountProofRequest::missing_field(stringify!(account_id)))?
             .try_into()?;
 
-        let account_details = account_details.map(TryFrom::try_from).transpose()?;
+        let details = details.map(TryFrom::try_from).transpose()?;
 
-        Ok(AccountProofRequest { account_id, account_details })
+        Ok(AccountProofRequest {
+            account_id,
+            block_num: block_num.into(),
+            details,
+        })
     }
 }
 
 /// Represents a request for account details alongside specific storage data.
 pub struct AccountDetailRequest {
     pub code_commitment: Option<Word>,
-    pub storage_requests: Vec<StorageMapKeysProof>,
+    pub asset_vault_commitment: Option<Word>,
+    pub storage_requests: Vec<StorageMapRequest>,
 }
 
-impl TryFrom<proto::rpc_store::account_proof_request::AccountDetailsRequest>
+impl TryFrom<proto::rpc_store::account_proof_request::AccountDetailRequest>
     for AccountDetailRequest
 {
     type Error = ConversionError;
 
     fn try_from(
-        request: proto::rpc_store::account_proof_request::AccountDetailsRequest,
+        value: proto::rpc_store::account_proof_request::AccountDetailRequest,
     ) -> Result<Self, Self::Error> {
-        let proto::rpc_store::account_proof_request::AccountDetailsRequest {
+        let proto::rpc_store::account_proof_request::AccountDetailRequest {
             code_commitment,
+            asset_vault_commitment,
+            storage_maps,
+        } = value;
+
+        let code_commitment = code_commitment.map(TryFrom::try_from).transpose()?;
+        let asset_vault_commitment = asset_vault_commitment.map(TryFrom::try_from).transpose()?;
+        let storage_requests = try_convert(storage_maps).collect::<Result<_, _>>()?;
+
+        Ok(AccountDetailRequest {
+            code_commitment,
+            asset_vault_commitment,
             storage_requests,
-        } = request;
+        })
+    }
+}
 
-        let storage_requests = try_convert(storage_requests).collect::<Result<_, _>>()?;
-        let code_commitment = code_commitment.map(Word::try_from).transpose()?;
+impl TryFrom<proto::account::AccountStorageHeader> for AccountStorageHeader {
+    type Error = ConversionError;
 
-        Ok(AccountDetailRequest { code_commitment, storage_requests })
+    fn try_from(value: proto::account::AccountStorageHeader) -> Result<Self, Self::Error> {
+        let proto::account::AccountStorageHeader { slots } = value;
+
+        let items = slots
+            .into_iter()
+            .map(|slot| {
+                let slot_type = storage_slot_type_from_raw(slot.slot_type)?;
+                let commitment =
+                    slot.commitment.ok_or(ConversionError::NotAValidFelt)?.try_into()?;
+                Ok((slot_type, commitment))
+            })
+            .collect::<Result<Vec<_>, ConversionError>>()?;
+
+        Ok(AccountStorageHeader::new(items))
     }
 }
 
-/// Represents a request for an account's storage map values and its proof of existence.
-pub struct StorageMapKeysProof {
-    /// Index of the storage map
-    pub storage_index: u8,
-    /// List of requested keys in the map
-    pub storage_keys: Vec<Word>,
+impl TryFrom<proto::rpc_store::account_storage_details::AccountStorageMapDetails>
+    for AccountStorageMapDetails
+{
+    type Error = ConversionError;
+
+    fn try_from(
+        value: proto::rpc_store::account_storage_details::AccountStorageMapDetails,
+    ) -> Result<Self, Self::Error> {
+        let proto::rpc_store::account_storage_details::AccountStorageMapDetails {
+            slot_index,
+            too_many_entries,
+            entries,
+        } = value;
+
+        let slot_index = slot_index.try_into().map_err(ConversionError::TryFromIntError)?;
+
+        // Extract map_entries from the entries field
+        let map_entries = match entries {
+            Some(entries) => entries
+                .entries
+                .into_iter()
+                .map(|entry| {
+                    let key = entry
+                        .key
+                        .ok_or(proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry::missing_field(
+                            stringify!(key),
+                        ))?
+                        .try_into()?;
+                    let value = entry
+                        .value
+                        .ok_or(proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry::missing_field(
+                            stringify!(value),
+                        ))?
+                        .try_into()?;
+                    Ok((key, value))
+                })
+                .collect::<Result<Vec<_>, ConversionError>>()?,
+            None => Vec::new(),
+        };
+
+        Ok(Self {
+            slot_index,
+            too_many_entries,
+            map_entries,
+        })
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct StorageMapRequest {
+    pub slot_index: u8,
+    pub slot_data: SlotData,
 }
 
-impl TryFrom<proto::rpc_store::account_proof_request::account_details_request::StorageRequest>
-    for StorageMapKeysProof
+impl
+    TryFrom<
+        proto::rpc_store::account_proof_request::account_detail_request::StorageMapDetailRequest,
+    > for StorageMapRequest
 {
     type Error = ConversionError;
 
     fn try_from(
-        request: proto::rpc_store::account_proof_request::account_details_request::StorageRequest,
+        value: proto::rpc_store::account_proof_request::account_detail_request::StorageMapDetailRequest,
     ) -> Result<Self, Self::Error> {
-        let proto::rpc_store::account_proof_request::account_details_request::StorageRequest {
-            storage_slot_index,
-            map_keys,
-        } = request;
-
-        Ok(StorageMapKeysProof {
-            storage_index: storage_slot_index.try_into()?,
-            storage_keys: try_convert(map_keys).collect::<Result<_, _>>()?,
+        let proto::rpc_store::account_proof_request::account_detail_request::StorageMapDetailRequest {
+            slot_index,
+            slot_data,
+        } = value;
+
+        let slot_index = slot_index.try_into()?;
+        let slot_data = slot_data.ok_or(proto::rpc_store::account_proof_request::account_detail_request::StorageMapDetailRequest::missing_field(stringify!(slot_data)))?.try_into()?;
+
+        Ok(StorageMapRequest { slot_index, slot_data })
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum SlotData {
+    All,
+    MapKeys(Vec<Word>),
+}
+
+impl TryFrom<proto::rpc_store::account_proof_request::account_detail_request::storage_map_detail_request::SlotData>
+    for SlotData
+{
+    type Error = ConversionError;
+
+    fn try_from(value: proto::rpc_store::account_proof_request::account_detail_request::storage_map_detail_request::SlotData) -> Result<Self, Self::Error> {
+        use proto::rpc_store::account_proof_request::account_detail_request::storage_map_detail_request::SlotData as ProtoSlotData;
+
+        Ok(match value {
+            ProtoSlotData::AllEntries(true) => SlotData::All,
+            ProtoSlotData::AllEntries(false) => return Err(ConversionError::EnumDiscriminantOutOfRange),
+            ProtoSlotData::MapKeys(keys) => {
+                let keys = try_convert(keys.map_keys).collect::<Result<Vec<_>, _>>()?;
+                SlotData::MapKeys(keys)
+            },
         })
     }
 }
@@ -243,6 +349,147 @@ impl From<AccountStorageHeader> for proto::account::AccountStorageHeader {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct AccountVaultDetails {
+    pub too_many_assets: bool,
+    pub assets: Vec<Asset>,
+}
+impl AccountVaultDetails {
+    const MAX_RETURN_ENTRIES: usize = 1000;
+
+    pub fn new(vault: &AssetVault) -> Self {
+        if vault.assets().nth(Self::MAX_RETURN_ENTRIES).is_some() {
+            Self::too_many()
+        } else {
+            Self {
+                too_many_assets: false,
+                assets: Vec::from_iter(vault.assets()),
+            }
+        }
+    }
+    pub fn empty() -> Self {
+        Self {
+            too_many_assets: false,
+            assets: Vec::new(),
+        }
+    }
+    fn too_many() -> Self {
+        Self {
+            too_many_assets: true,
+            assets: Vec::new(),
+        }
+    }
+}
+
+impl TryFrom<proto::rpc_store::AccountVaultDetails> for AccountVaultDetails {
+    type Error = ConversionError;
+
+    fn try_from(value: proto::rpc_store::AccountVaultDetails) -> Result<Self, Self::Error> {
+        let proto::rpc_store::AccountVaultDetails { too_many_assets, assets } = value;
+
+        let assets =
+            Result::<Vec<_>, ConversionError>::from_iter(assets.into_iter().map(|asset| {
+                let asset = asset
+                    .asset
+                    .ok_or(proto::primitives::Asset::missing_field(stringify!(asset)))?;
+                let asset = Word::try_from(asset)?;
+                Asset::try_from(asset).map_err(ConversionError::AssetError)
+            }))?;
+        Ok(Self { too_many_assets, assets })
+    }
+}
+
+impl From<AccountVaultDetails> for proto::rpc_store::AccountVaultDetails {
+    fn from(value: AccountVaultDetails) -> Self {
+        let AccountVaultDetails { too_many_assets, assets } = value;
+
+        Self {
+            too_many_assets,
+            assets: Vec::from_iter(assets.into_iter().map(|asset| proto::primitives::Asset {
+                asset: Some(proto::primitives::Digest::from(Word::from(asset))),
+            })),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct AccountStorageMapDetails {
+    pub slot_index: u8,
+    pub too_many_entries: bool,
+    pub map_entries: Vec<(Word, Word)>,
+}
+
+impl AccountStorageMapDetails {
+    const MAX_RETURN_ENTRIES: usize = 1000;
+
+    pub fn new(slot_index: u8, slot_data: SlotData, storage_map: &StorageMap) -> Self {
+        let exceeds = if let SlotData::MapKeys(keys) = &slot_data {
+            keys.len() > Self::MAX_RETURN_ENTRIES
+        } else {
+            storage_map.entries().nth(Self::MAX_RETURN_ENTRIES).is_some()
+        };
+        if exceeds {
+            Self::too_many_entries(slot_index)
+        } else {
+            Self::from_slot_data(slot_index, slot_data, storage_map)
+        }
+    }
+
+    pub fn from_slot_data(slot_index: u8, slot_data: SlotData, storage_map: &StorageMap) -> Self {
+        let map_entries = match slot_data {
+            SlotData::All => Vec::from_iter(storage_map.entries().map(|(k, v)| (*k, *v))),
+            SlotData::MapKeys(keys) => {
+                Vec::from_iter(keys.iter().map(|key| (*key, storage_map.get(key))))
+            },
+        };
+        Self {
+            slot_index,
+            too_many_entries: false,
+            map_entries,
+        }
+    }
+    pub fn too_many_entries(slot_index: u8) -> Self {
+        Self {
+            slot_index,
+            too_many_entries: true,
+            map_entries: Vec::new(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct AccountStorageDetails {
+    pub header: AccountStorageHeader,
+    pub map_details: Vec<AccountStorageMapDetails>,
+}
+
+impl TryFrom<proto::rpc_store::AccountStorageDetails> for AccountStorageDetails {
+    type Error = ConversionError;
+
+    fn try_from(value: proto::rpc_store::AccountStorageDetails) -> Result<Self, Self::Error> {
+        let proto::rpc_store::AccountStorageDetails { header, map_details } = value;
+
+        let header = header
+            .ok_or(proto::rpc_store::AccountStorageDetails::missing_field(stringify!(header)))?
+            .try_into()?;
+
+        let map_details = try_convert(map_details).collect::<Result<Vec<_>, _>>()?;
+
+        Ok(Self { header, map_details })
+    }
+}
+
+impl From<AccountStorageDetails> for proto::rpc_store::AccountStorageDetails {
+    fn from(value: AccountStorageDetails) -> Self {
+        let AccountStorageDetails { header, map_details } = value;
+
+        Self {
+            header: Some(header.into()),
+            map_details: map_details.into_iter().map(Into::into).collect(),
+        }
+    }
+}
+
 const fn storage_slot_type_from_raw(slot_type: u32) -> Result<StorageSlotType, ConversionError> {
     Ok(match slot_type {
         0 => StorageSlotType::Map,
@@ -259,166 +506,218 @@ const fn storage_slot_type_to_raw(slot_type: StorageSlotType) -> u32 {
 }
 
 /// Represents account details returned in response to an account proof request.
-pub struct AccountDetailsResponse {
+pub struct AccountDetails {
     pub account_header: AccountHeader,
-    pub storage_header: AccountStorageHeader,
     pub account_code: Option<Vec<u8>>,
-    pub storage_proofs: Vec<StorageSlotMapProof>,
+    pub vault_details: AccountVaultDetails,
+    pub storage_details: AccountStorageDetails,
+}
+
+/// Represents the response to an account proof request.
+pub struct AccountProofResponse {
+    pub witness: AccountWitness,
+    pub details: Option<AccountDetails>,
+}
+
+impl TryFrom<proto::rpc_store::AccountProofResponse> for AccountProofResponse {
+    type Error = ConversionError;
+
+    fn try_from(value: proto::rpc_store::AccountProofResponse) -> Result<Self, Self::Error> {
+        let proto::rpc_store::AccountProofResponse { witness, details } = value;
+
+        let witness = witness
+            .ok_or(proto::rpc_store::AccountProofResponse::missing_field(stringify!(witness)))?
+            .try_into()?;
+
+        let details = details.map(TryFrom::try_from).transpose()?;
+
+        Ok(AccountProofResponse { witness, details })
+    }
+}
+
+impl From<AccountProofResponse> for proto::rpc_store::AccountProofResponse {
+    fn from(value: AccountProofResponse) -> Self {
+        let AccountProofResponse { witness, details } = value;
+
+        Self {
+            witness: Some(witness.into()),
+            details: details.map(Into::into),
+        }
+    }
 }
 
-impl TryFrom<proto::rpc_store::account_proof::AccountDetailsResponse> for AccountDetailsResponse {
+impl TryFrom<proto::rpc_store::account_proof_response::AccountDetails> for AccountDetails {
     type Error = ConversionError;
 
     fn try_from(
-        value: proto::rpc_store::account_proof::AccountDetailsResponse,
+        value: proto::rpc_store::account_proof_response::AccountDetails,
     ) -> Result<Self, Self::Error> {
-        let proto::rpc_store::account_proof::AccountDetailsResponse {
+        let proto::rpc_store::account_proof_response::AccountDetails {
             header,
-            storage_header,
-            account_code,
-            storage_maps,
+            code,
+            vault_details,
+            storage_details,
         } = value;
 
         let account_header = header
-            .ok_or(proto::rpc_store::account_proof::AccountDetailsResponse::missing_field(
+            .ok_or(proto::rpc_store::account_proof_response::AccountDetails::missing_field(
                 stringify!(header),
             ))?
             .try_into()?;
 
-        let storage_header = storage_header.ok_or(
-            proto::rpc_store::account_proof::AccountDetailsResponse::missing_field(stringify!(
-                storage_header
-            )),
-        )?;
-
-        let storage_header_entries = storage_header
-            .slots
-            .into_iter()
-            .map(|slot| {
-                let slot_type = storage_slot_type_from_raw(slot.slot_type)?;
-                let commitment = slot
-                    .commitment
-                    .ok_or(proto::account::account_storage_header::StorageSlot::missing_field(
-                        stringify!(commitment),
-                    ))?
-                    .try_into()?;
-                Ok((slot_type, commitment))
-            })
-            .collect::<Result<Vec<_>, ConversionError>>()?;
-
-        let storage_header = AccountStorageHeader::new(storage_header_entries);
+        let storage_details = storage_details
+            .ok_or(proto::rpc_store::account_proof_response::AccountDetails::missing_field(
+                stringify!(storage_details),
+            ))?
+            .try_into()?;
 
-        let storage_proofs = try_convert(storage_maps).collect::<Result<_, _>>()?;
+        let vault_details = vault_details
+            .ok_or(proto::rpc_store::account_proof_response::AccountDetails::missing_field(
+                stringify!(vault_details),
+            ))?
+            .try_into()?;
+        let account_code = code;
 
-        Ok(AccountDetailsResponse {
+        Ok(AccountDetails {
             account_header,
-            storage_header,
             account_code,
-            storage_proofs,
+            vault_details,
+            storage_details,
         })
     }
 }
 
-impl From<AccountDetailsResponse> for proto::rpc_store::account_proof::AccountDetailsResponse {
-    fn from(value: AccountDetailsResponse) -> Self {
-        let AccountDetailsResponse {
+impl From<AccountDetails> for proto::rpc_store::account_proof_response::AccountDetails {
+    fn from(value: AccountDetails) -> Self {
+        let AccountDetails {
             account_header,
-            storage_header,
+            storage_details,
             account_code,
-            storage_proofs,
+            vault_details,
         } = value;
 
         let header = Some(proto::account::AccountHeader::from(account_header));
-        let storage_header = Some(proto::account::AccountStorageHeader::from(storage_header));
-
-        let storage_maps = storage_proofs
-            .into_iter()
-            .map(|proof| {
-                let storage_slot = u32::from(proof.storage_slot);
-                let smt_proof = Some(proto::primitives::SmtOpening::from(proof.proof));
-                proto::rpc_store::account_proof::account_details_response::StorageSlotMapProof {
-                    storage_slot,
-                    smt_proof,
-                }
-            })
-            .collect();
+        let storage_details = Some(storage_details.into());
+        let code = account_code;
+        let vault_details = Some(vault_details.into());
 
         Self {
             header,
-            storage_header,
-            account_code,
-            storage_maps,
+            storage_details,
+            code,
+            vault_details,
+        }
+    }
+}
+
+// ACCOUNT PROOF
+impl From<AccountStorageMapDetails>
+    for proto::rpc_store::account_storage_details::AccountStorageMapDetails
+{
+    fn from(value: AccountStorageMapDetails) -> Self {
+        let AccountStorageMapDetails {
+            slot_index,
+            too_many_entries,
+            map_entries,
+        } = value;
+
+        // Create the entries wrapped in MapEntries message
+        let entries = proto::rpc_store::account_storage_details::account_storage_map_details::MapEntries {
+            entries: map_entries
+                .into_iter()
+                .map(|(key, value)| {
+                    proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry {
+                        key: Some(key.into()),
+                        value: Some(value.into()),
+                    }
+                })
+                .collect(),
+        };
+
+        Self {
+            slot_index: u32::from(slot_index),
+            too_many_entries,
+            entries: Some(entries),
         }
     }
 }
 
-/// Represents a storage slot map proof.
-pub struct StorageSlotMapProof {
-    pub storage_slot: u8,
-    pub proof: miden_objects::crypto::merkle::SmtProof,
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct StorageMapEntry {
+    pub key: Word,
+    pub value: Word,
 }
 
-impl TryFrom<proto::rpc_store::account_proof::account_details_response::StorageSlotMapProof>
-    for StorageSlotMapProof
+impl
+    TryFrom<proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry>
+    for StorageMapEntry
 {
     type Error = ConversionError;
 
     fn try_from(
-        proof: proto::rpc_store::account_proof::account_details_response::StorageSlotMapProof,
+        value: proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry,
     ) -> Result<Self, Self::Error> {
-        let proto::rpc_store::account_proof::account_details_response::StorageSlotMapProof {
-            storage_slot,
-            smt_proof,
-        } = proof;
-
-        let storage_slot = storage_slot.try_into().map_err(ConversionError::TryFromIntError)?;
-        let proof =
-        smt_proof.ok_or(proto::rpc_store::account_proof::account_details_response::StorageSlotMapProof::missing_field(stringify!(proof)))?.try_into()?;
+        let proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry {
+            key,
+            value
+        } = value;
 
-        Ok(StorageSlotMapProof { storage_slot, proof })
+        Ok(Self {
+            key: key.ok_or(proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry::missing_field(stringify!(key)))?.try_into()?,
+            value: value.ok_or(proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry::missing_field(stringify!(value)))?.try_into()?,
+        })
     }
 }
 
-// ACCOUNT PROOF
-// ================================================================================================
+impl From<StorageMapEntry>
+    for proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry
+{
+    fn from(value: StorageMapEntry) -> Self {
+        let StorageMapEntry { key, value } = value;
 
-/// Represents an account proof.
-pub struct AccountProofResponse {
-    pub block_num: BlockNumber,
-    pub witness: AccountWitnessRecord,
-    pub account_details: Option<AccountDetailsResponse>,
+        Self {
+            key: Some(proto::primitives::Digest::from(key)),
+            value: Some(proto::primitives::Digest::from(value)),
+        }
+    }
 }
 
-impl TryFrom<proto::rpc_store::AccountProof> for AccountProofResponse {
-    type Error = ConversionError;
-
-    fn try_from(proof: proto::rpc_store::AccountProof) -> Result<Self, Self::Error> {
-        let proto::rpc_store::AccountProof { block_num, witness, details } = proof;
-
-        let witness =
-            witness.ok_or(proto::rpc_store::AccountProof::missing_field(stringify!(witness)))?;
+// ACCOUNT WITNESS
+// ================================================================================================
 
-        let witness = AccountWitnessRecord::try_from(witness)?;
+impl TryFrom<proto::account::AccountWitness> for AccountWitness {
+    type Error = ConversionError;
 
-        let account_details = details.map(AccountDetailsResponse::try_from).transpose()?;
+    fn try_from(account_witness: proto::account::AccountWitness) -> Result<Self, Self::Error> {
+        let witness_id = account_witness
+            .witness_id
+            .ok_or(proto::account::AccountWitness::missing_field(stringify!(witness_id)))?
+            .try_into()?;
+        let commitment = account_witness
+            .commitment
+            .ok_or(proto::account::AccountWitness::missing_field(stringify!(commitment)))?
+            .try_into()?;
+        let path = account_witness
+            .path
+            .ok_or(proto::account::AccountWitness::missing_field(stringify!(path)))?
+            .try_into()?;
 
-        Ok(AccountProofResponse {
-            block_num: block_num.into(),
-            witness,
-            account_details,
+        AccountWitness::new(witness_id, commitment, path).map_err(|err| {
+            ConversionError::deserialization_error(
+                "AccountWitness",
+                DeserializationError::InvalidValue(err.to_string()),
+            )
         })
     }
 }
 
-impl From<AccountProofResponse> for proto::rpc_store::AccountProof {
-    fn from(value: AccountProofResponse) -> Self {
-        let AccountProofResponse { block_num, witness, account_details } = value;
-
-        proto::rpc_store::AccountProof {
-            block_num: block_num.as_u32(),
-            witness: Some(proto::account::AccountWitness::from(witness)),
-            details: account_details
-                .map(proto::rpc_store::account_proof::AccountDetailsResponse::from),
+impl From<AccountWitness> for proto::account::AccountWitness {
+    fn from(witness: AccountWitness) -> Self {
+        Self {
+            account_id: Some(witness.id().into()),
+            witness_id: Some(witness.id().into()),
+            commitment: Some(witness.state_commitment().into()),
+            path: Some(witness.into_proof().into_parts().0.into()),
         }
     }
 }
@@ -426,7 +725,7 @@ impl From<AccountProofResponse> for proto::rpc_store::AccountProof {
 // ACCOUNT WITNESS RECORD
 // ================================================================================================
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct AccountWitnessRecord {
     pub account_id: AccountId,
     pub witness: AccountWitness,
diff --git a/crates/proto/src/generated/rpc.rs b/crates/proto/src/generated/rpc.rs
index 2abaaf999..9d4968b6f 100644
--- a/crates/proto/src/generated/rpc.rs
+++ b/crates/proto/src/generated/rpc.rs
@@ -181,7 +181,7 @@ pub mod api_client {
                 super::super::rpc_store::AccountProofRequest,
             >,
         ) -> std::result::Result<
-            tonic::Response<super::super::rpc_store::AccountProof>,
+            tonic::Response<super::super::rpc_store::AccountProofResponse>,
             tonic::Status,
         > {
             self.inner
@@ -564,7 +564,7 @@ pub mod api_server {
             &self,
             request: tonic::Request<super::super::rpc_store::AccountProofRequest>,
         ) -> std::result::Result<
-            tonic::Response<super::super::rpc_store::AccountProof>,
+            tonic::Response<super::super::rpc_store::AccountProofResponse>,
             tonic::Status,
         >;
         /// Returns raw block data for the specified block number.
@@ -916,7 +916,7 @@ pub mod api_server {
                     > tonic::server::UnaryService<
                         super::super::rpc_store::AccountProofRequest,
                     > for GetAccountProofSvc<T> {
-                        type Response = super::super::rpc_store::AccountProof;
+                        type Response = super::super::rpc_store::AccountProofResponse;
                         type Future = BoxFuture<
                             tonic::Response<Self::Response>,
                             tonic::Status,
diff --git a/crates/proto/src/generated/rpc_store.rs b/crates/proto/src/generated/rpc_store.rs
index 4045666dc..da0af6342 100644
--- a/crates/proto/src/generated/rpc_store.rs
+++ b/crates/proto/src/generated/rpc_store.rs
@@ -12,98 +12,169 @@ pub struct StoreStatus {
     #[prost(fixed32, tag = "3")]
     pub chain_tip: u32,
 }
-/// Returns the latest state proof of the specified accounts.
+/// Returns the latest state proof of the specified account.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AccountProofRequest {
-    /// The account ID for this request.
+    /// ID of the account for which we want to get data
     #[prost(message, optional, tag = "1")]
     pub account_id: ::core::option::Option<super::account::AccountId>,
-    /// A account detail requests, including map keys + values.
-    #[prost(message, optional, tag = "2")]
-    pub account_details: ::core::option::Option<
-        account_proof_request::AccountDetailsRequest,
-    >,
+    /// Block at which we'd like to get this data. Must be close to the chain tip.
+    #[prost(fixed32, tag = "2")]
+    pub block_num: u32,
+    /// Request for additional account details; valid only for public accounts.
+    #[prost(message, optional, tag = "3")]
+    pub details: ::core::option::Option<account_proof_request::AccountDetailRequest>,
 }
 /// Nested message and enum types in `AccountProofRequest`.
 pub mod account_proof_request {
     /// Request the details for a public account.
     #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct AccountDetailsRequest {
-        /// Account code commitment corresponding to the last-known `AccountCode` for the requested
-        /// account. The response will include only code that is known.
+    pub struct AccountDetailRequest {
+        /// Last known code commitment to the client. The response will include account code
+        /// only if its commitment is different from this value or if the value is not present.
         #[prost(message, optional, tag = "1")]
         pub code_commitment: ::core::option::Option<super::super::primitives::Digest>,
-        /// List of storage requests for this account.
-        #[prost(message, repeated, tag = "2")]
-        pub storage_requests: ::prost::alloc::vec::Vec<
-            account_details_request::StorageRequest,
+        /// Last known asset vault commitment to the client. The response will include asset vault data
+        /// only if its commitment is different from this value. If the value is not present in the
+        /// request, the response will not contain one either.
+        /// If the number of to-be-returned asset entries exceed a threshold, they have to be requested
+        /// separately, which is signaled in the response message with dedicated flag.
+        #[prost(message, optional, tag = "2")]
+        pub asset_vault_commitment: ::core::option::Option<
+            super::super::primitives::Digest,
+        >,
+        /// Additional request per storage map.
+        #[prost(message, repeated, tag = "3")]
+        pub storage_maps: ::prost::alloc::vec::Vec<
+            account_detail_request::StorageMapDetailRequest,
         >,
     }
-    /// Nested message and enum types in `AccountDetailsRequest`.
-    pub mod account_details_request {
+    /// Nested message and enum types in `AccountDetailRequest`.
+    pub mod account_detail_request {
         /// Represents a storage slot index and the associated map keys.
         #[derive(Clone, PartialEq, ::prost::Message)]
-        pub struct StorageRequest {
-            /// Storage slot index (\[0..255\])
+        pub struct StorageMapDetailRequest {
+            /// Storage slot index (`\[0..255\]`).
             #[prost(uint32, tag = "1")]
-            pub storage_slot_index: u32,
-            /// A list of map keys (Digests) associated with this storage slot.
-            #[prost(message, repeated, tag = "2")]
-            pub map_keys: ::prost::alloc::vec::Vec<
-                super::super::super::primitives::Digest,
-            >,
+            pub slot_index: u32,
+            #[prost(oneof = "storage_map_detail_request::SlotData", tags = "2, 3")]
+            pub slot_data: ::core::option::Option<storage_map_detail_request::SlotData>,
+        }
+        /// Nested message and enum types in `StorageMapDetailRequest`.
+        pub mod storage_map_detail_request {
+            /// Indirection required for use in `oneof {..}` block.
+            #[derive(Clone, PartialEq, ::prost::Message)]
+            pub struct MapKeys {
+                /// A list of map keys associated with this storage slot.
+                #[prost(message, repeated, tag = "1")]
+                pub map_keys: ::prost::alloc::vec::Vec<
+                    super::super::super::super::primitives::Digest,
+                >,
+            }
+            #[derive(Clone, PartialEq, ::prost::Oneof)]
+            pub enum SlotData {
+                /// Request to return all storage map data. If the number exceeds a threshold of 1000 entries,
+                /// the response will not contain them but must be requested separately.
+                #[prost(bool, tag = "2")]
+                AllEntries(bool),
+                /// A list of map keys associated with the given storage slot identified by `slot_index`.
+                #[prost(message, tag = "3")]
+                MapKeys(MapKeys),
+            }
         }
     }
 }
-/// Represents the result of getting account proofs.
+/// Represents the result of getting account proof.
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AccountProof {
-    /// Block number at which the state of the accounts is returned.
-    #[prost(fixed32, tag = "1")]
-    pub block_num: u32,
-    /// The account witness for the current state commitment of one account ID.
-    #[prost(message, optional, tag = "2")]
+pub struct AccountProofResponse {
+    /// Account ID, current state commitment, and SMT path
+    #[prost(message, optional, tag = "1")]
     pub witness: ::core::option::Option<super::account::AccountWitness>,
-    /// State header for public accounts. Filled only if the flag `AccountDetailsRequest` was
-    /// present and the account was a public account/the information was available.
-    #[prost(message, optional, tag = "3")]
-    pub details: ::core::option::Option<account_proof::AccountDetailsResponse>,
+    /// Additional details for public accounts
+    #[prost(message, optional, tag = "2")]
+    pub details: ::core::option::Option<account_proof_response::AccountDetails>,
 }
-/// Nested message and enum types in `AccountProof`.
-pub mod account_proof {
-    /// State header, available for public accounts only.
+/// Nested message and enum types in `AccountProofResponse`.
+pub mod account_proof_response {
     #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct AccountDetailsResponse {
-        /// Account header, always included.
+    pub struct AccountDetails {
+        /// Account header.
         #[prost(message, optional, tag = "1")]
         pub header: ::core::option::Option<super::super::account::AccountHeader>,
-        /// Account storage header containing slot types and commitments.
+        /// Account storage data
         #[prost(message, optional, tag = "2")]
-        pub storage_header: ::core::option::Option<
-            super::super::account::AccountStorageHeader,
-        >,
-        /// Account code, if the current account code does not match the request provided commitment digest.
+        pub storage_details: ::core::option::Option<super::AccountStorageDetails>,
+        /// Account code; empty if code commitments matched or none was requested
         #[prost(bytes = "vec", optional, tag = "3")]
-        pub account_code: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
-        /// Storage slots information for this account
-        #[prost(message, repeated, tag = "4")]
-        pub storage_maps: ::prost::alloc::vec::Vec<
-            account_details_response::StorageSlotMapProof,
-        >,
+        pub code: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+        /// Account asset vault data; empty if vault commitments matched
+        #[prost(message, optional, tag = "4")]
+        pub vault_details: ::core::option::Option<super::AccountVaultDetails>,
     }
-    /// Nested message and enum types in `AccountDetailsResponse`.
-    pub mod account_details_response {
-        /// Represents a single storage slot with the requested keys and their respective values.
+}
+/// Account vault details for AccountProofResponse
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct AccountVaultDetails {
+    /// A flag that is set to true if the account contains too many assets. This indicates
+    /// to the user that `SyncAccountVault` endpoint should be used to retrieve the
+    /// account's assets
+    #[prost(bool, tag = "1")]
+    pub too_many_assets: bool,
+    /// When too_many_assets == false, this will contain the list of assets in the
+    /// account's vault
+    #[prost(message, repeated, tag = "2")]
+    pub assets: ::prost::alloc::vec::Vec<super::primitives::Asset>,
+}
+/// Account storage details for AccountProofResponse
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct AccountStorageDetails {
+    /// Account storage header (storage slot info for up to 256 slots)
+    #[prost(message, optional, tag = "1")]
+    pub header: ::core::option::Option<super::account::AccountStorageHeader>,
+    /// Additional data for the requested storage maps
+    #[prost(message, repeated, tag = "2")]
+    pub map_details: ::prost::alloc::vec::Vec<
+        account_storage_details::AccountStorageMapDetails,
+    >,
+}
+/// Nested message and enum types in `AccountStorageDetails`.
+pub mod account_storage_details {
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct AccountStorageMapDetails {
+        /// slot index of the storage map
+        #[prost(uint32, tag = "1")]
+        pub slot_index: u32,
+        /// A flag that is set to `true` if the number of to-be-returned entries in the
+        /// storage map would exceed a threshold. This indicates to the user that `SyncStorageMaps`
+        /// endpoint should be used to get all storage map data.
+        #[prost(bool, tag = "2")]
+        pub too_many_entries: bool,
+        /// By default we provide all storage entries.
+        #[prost(message, optional, tag = "3")]
+        pub entries: ::core::option::Option<account_storage_map_details::MapEntries>,
+    }
+    /// Nested message and enum types in `AccountStorageMapDetails`.
+    pub mod account_storage_map_details {
+        /// Wrapper for repeated storage map entries
         #[derive(Clone, PartialEq, ::prost::Message)]
-        pub struct StorageSlotMapProof {
-            /// The storage slot index (\[0..255\]).
-            #[prost(uint32, tag = "1")]
-            pub storage_slot: u32,
-            /// Merkle proof of the map value
-            #[prost(message, optional, tag = "2")]
-            pub smt_proof: ::core::option::Option<
-                super::super::super::primitives::SmtOpening,
-            >,
+        pub struct MapEntries {
+            #[prost(message, repeated, tag = "1")]
+            pub entries: ::prost::alloc::vec::Vec<map_entries::StorageMapEntry>,
+        }
+        /// Nested message and enum types in `MapEntries`.
+        pub mod map_entries {
+            /// Definition of individual storage entries.
+            #[derive(Clone, Copy, PartialEq, ::prost::Message)]
+            pub struct StorageMapEntry {
+                #[prost(message, optional, tag = "1")]
+                pub key: ::core::option::Option<
+                    super::super::super::super::primitives::Digest,
+                >,
+                #[prost(message, optional, tag = "2")]
+                pub value: ::core::option::Option<
+                    super::super::super::super::primitives::Digest,
+                >,
+            }
         }
     }
 }
@@ -557,7 +628,10 @@ pub mod rpc_client {
         pub async fn get_account_proof(
             &mut self,
             request: impl tonic::IntoRequest<super::AccountProofRequest>,
-        ) -> std::result::Result<tonic::Response<super::AccountProof>, tonic::Status> {
+        ) -> std::result::Result<
+            tonic::Response<super::AccountProofResponse>,
+            tonic::Status,
+        > {
             self.inner
                 .ready()
                 .await
@@ -886,7 +960,10 @@ pub mod rpc_server {
         async fn get_account_proof(
             &self,
             request: tonic::Request<super::AccountProofRequest>,
-        ) -> std::result::Result<tonic::Response<super::AccountProof>, tonic::Status>;
+        ) -> std::result::Result<
+            tonic::Response<super::AccountProofResponse>,
+            tonic::Status,
+        >;
         /// Returns raw block data for the specified block number.
         async fn get_block_by_number(
             &self,
@@ -1199,7 +1276,7 @@ pub mod rpc_server {
                     struct GetAccountProofSvc<T: Rpc>(pub Arc<T>);
                     impl<T: Rpc> tonic::server::UnaryService<super::AccountProofRequest>
                     for GetAccountProofSvc<T> {
-                        type Response = super::AccountProof;
+                        type Response = super::AccountProofResponse;
                         type Future = BoxFuture<
                             tonic::Response<Self::Response>,
                             tonic::Status,
diff --git a/crates/rpc/src/server/api.rs b/crates/rpc/src/server/api.rs
index f2b750b62..ddc1c9313 100644
--- a/crates/rpc/src/server/api.rs
+++ b/crates/rpc/src/server/api.rs
@@ -508,7 +508,7 @@ impl api_server::Api for RpcService {
     async fn get_account_proof(
         &self,
         request: Request<proto::rpc_store::AccountProofRequest>,
-    ) -> Result<Response<proto::rpc_store::AccountProof>, Status> {
+    ) -> Result<Response<proto::rpc_store::AccountProofResponse>, Status> {
         let request = request.into_inner();
 
         debug!(target: COMPONENT, ?request);
diff --git a/crates/store/src/server/rpc_api.rs b/crates/store/src/server/rpc_api.rs
index 73a0b0307..1f5aa021f 100644
--- a/crates/store/src/server/rpc_api.rs
+++ b/crates/store/src/server/rpc_api.rs
@@ -316,14 +316,14 @@ impl rpc_server::Rpc for StoreApi {
     async fn get_account_proof(
         &self,
         request: Request<proto::rpc_store::AccountProofRequest>,
-    ) -> Result<Response<proto::rpc_store::AccountProof>, Status> {
+    ) -> Result<Response<proto::rpc_store::AccountProofResponse>, Status> {
         debug!(target: COMPONENT, ?request);
         let request = request.into_inner();
-        let account_request = request.try_into()?;
+        let account_proof_request = request.try_into()?;
 
-        let proof = self.state.get_account_proof(account_request).await?;
+        let proof = self.state.get_account_proof(account_proof_request).await?;
 
-        Ok(Response::new(proto::rpc_store::AccountProof::from(proof)))
+        Ok(Response::new(proof.into()))
     }
 
     #[instrument(
diff --git a/crates/store/src/state.rs b/crates/store/src/state.rs
index 044df44a7..effccc31d 100644
--- a/crates/store/src/state.rs
+++ b/crates/store/src/state.rs
@@ -8,15 +8,17 @@ use std::ops::RangeInclusive;
 use std::path::Path;
 use std::sync::Arc;
 
-use miden_node_proto::AccountWitnessRecord;
 use miden_node_proto::domain::account::{
-    AccountDetailsResponse,
+    AccountDetailRequest,
+    AccountDetails,
     AccountInfo,
     AccountProofRequest,
     AccountProofResponse,
+    AccountStorageDetails,
+    AccountStorageMapDetails,
+    AccountVaultDetails,
     NetworkAccountPrefix,
-    StorageMapKeysProof,
-    StorageSlotMapProof,
+    StorageMapRequest,
 };
 use miden_node_proto::domain::batch::BatchInputs;
 use miden_node_utils::ErrorReport;
@@ -888,6 +890,7 @@ impl State {
 
     /// Returns the respective account proof with optional details, such as asset and storage
     /// entries.
+    #[allow(clippy::too_many_lines)]
     pub async fn get_account_proof(
         &self,
         account_request: AccountProofRequest,
@@ -898,70 +901,80 @@ impl State {
         let inner_state = self.inner.read().await;
 
         let account_id = account_request.account_id;
-
-        let account_details = if let Some(account_detail_request) = account_request.account_details
+        let account_details = if let Some(AccountDetailRequest {
+            code_commitment,
+            asset_vault_commitment,
+            storage_requests,
+        }) = account_request.details
         {
-            let info = self.db.select_account(account_id).await?;
-
-            if let Some(details) = &info.details {
-                let mut storage_proofs = Vec::new();
-
-                for StorageMapKeysProof { storage_index, storage_keys } in
-                    &account_detail_request.storage_requests
-                {
-                    if let Some(StorageSlot::Map(storage_map)) =
-                        details.storage().slots().get(*storage_index as usize)
-                    {
-                        for map_key in storage_keys {
-                            let proof = storage_map.open(map_key);
-
-                            let slot_map_key = StorageSlotMapProof {
-                                storage_slot: *storage_index,
-                                proof: proof.into(),
-                            };
-                            storage_proofs.push(slot_map_key);
-                        }
-                    } else {
-                        return Err(AccountError::StorageSlotNotMap(*storage_index).into());
-                    }
-                }
-
-                // Only include unknown account code blobs
-                let account_code = match account_detail_request.code_commitment {
-                    Some(known_code_commitment)
-                        if known_code_commitment == details.code().commitment() =>
-                    {
-                        // the known code matches the expected commitment, which implies
-                        // the user already has that code
-                        None
-                    },
-                    _ => Some(details.code().to_bytes()),
-                };
+            let account_info = self.db.select_account(account_id).await?;
 
-                let account_details_response = AccountDetailsResponse {
-                    account_header: AccountHeader::from(details),
-                    storage_header: details.storage().to_header(),
-                    account_code,
-                    storage_proofs,
-                };
+            // if we get a query for a _private_ account _with_ details requested, we'll error out
+            let Some(account) = account_info.details else {
+                return Err(DatabaseError::AccountNotPublic(account_id));
+            };
 
-                Some(account_details_response)
-            } else {
-                None
+            let storage_header = account.storage().to_header();
+
+            let mut storage_map_details =
+                Vec::<AccountStorageMapDetails>::with_capacity(storage_requests.len());
+
+            for StorageMapRequest { slot_index, slot_data } in storage_requests {
+                let Some(StorageSlot::Map(storage_map)) =
+                    account.storage().slots().get(slot_index as usize)
+                else {
+                    return Err(AccountError::StorageSlotNotMap(slot_index).into());
+                };
+                let details = AccountStorageMapDetails::new(slot_index, slot_data, storage_map);
+                storage_map_details.push(details);
             }
+
+            // Only include unknown account code blobs, which is equal to a account code digest
+            // mismatch. If `None` was requested, don't return any.
+            let account_code = code_commitment
+                .is_some_and(|code_commitment| code_commitment != account.code().commitment())
+                .then(|| account.code().to_bytes());
+
+            // storage details
+            let storage_details = AccountStorageDetails {
+                header: storage_header,
+                map_details: storage_map_details,
+            };
+
+            // Handle vault details based on the `asset_vault_commitment`.
+            // Similar to `code_commitment`, if the provided commitment matches, we don't return
+            // vault data. If no commitment is provided or it doesn't match, we return
+            // the vault data. If the number of vault contained assets are exceeding a
+            // limit, we signal this back in the response and the user must handle that
+            // in follow-up request.
+            let vault_details = match asset_vault_commitment {
+                Some(commitment) if commitment == account.vault().root() => {
+                    // The client already has the correct vault data
+                    AccountVaultDetails::empty()
+                },
+                Some(_) => {
+                    // The commitment doesn't match, so return vault data
+                    AccountVaultDetails::new(account.vault())
+                },
+                None => {
+                    // No commitment provided, so don't return vault data
+                    AccountVaultDetails::empty()
+                },
+            };
+
+            Some(AccountDetails {
+                account_header: AccountHeader::from(account),
+                account_code,
+                vault_details,
+                storage_details,
+            })
         } else {
             None
         };
 
-        let witness = AccountWitnessRecord {
-            account_id, // FIXME TODO see account.proto we need to triple check this is correct
-            witness: inner_state.account_tree.open(account_id),
-        };
-
         let response = AccountProofResponse {
-            block_num: inner_state.latest_block_num(),
-            witness,
-            account_details,
+            witness: inner_state.account_tree.open(account_id),
+            details: account_details,
         };
 
         Ok(response)
diff --git a/proto/proto/rpc.proto b/proto/proto/rpc.proto
index 2188b54e1..6669d407a 100644
--- a/proto/proto/rpc.proto
+++ b/proto/proto/rpc.proto
@@ -27,7 +27,7 @@ service Api {
     rpc GetAccountDetails(account.AccountId) returns (account.AccountDetails) {}
 
     // Returns the latest state proof of the specified account.
-    rpc GetAccountProof(rpc_store.AccountProofRequest) returns (rpc_store.AccountProof) {}
+    rpc GetAccountProof(rpc_store.AccountProofRequest) returns (rpc_store.AccountProofResponse) {}
 
     // Returns raw block data for the specified block number.
     rpc GetBlockByNumber(blockchain.BlockNumber) returns (blockchain.MaybeBlock) {}
diff --git a/proto/proto/store/rpc.proto b/proto/proto/store/rpc.proto
index 47c71475d..1da00771c 100644
--- a/proto/proto/store/rpc.proto
+++ b/proto/proto/store/rpc.proto
@@ -27,7 +27,7 @@ service Rpc {
     rpc GetAccountDetails(account.AccountId) returns (account.AccountDetails) {}
 
     // Returns the latest state proof of the specified account.
-    rpc GetAccountProof(AccountProofRequest) returns (AccountProof) {}
+    rpc GetAccountProof(AccountProofRequest) returns (AccountProofResponse) {}
 
     // Returns raw block data for the specified block number.
     rpc GetBlockByNumber(blockchain.BlockNumber) returns (blockchain.MaybeBlock) {}
@@ -103,71 +103,124 @@ message StoreStatus {
 // GET ACCOUNT PROOF
 // ================================================================================================
 
-// Returns the latest state proof of the specified accounts.
+// Returns the latest state proof of the specified account.
 message AccountProofRequest {
     // Request the details for a public account.
-    message AccountDetailsRequest {
+    message AccountDetailRequest {
         // Represents a storage slot index and the associated map keys.
-        message StorageRequest {
-            // Storage slot index ([0..255])
-            uint32 storage_slot_index = 1;
-
-            // A list of map keys (Digests) associated with this storage slot.
-            repeated primitives.Digest map_keys = 2;
+        message StorageMapDetailRequest {
+            // Indirection required for use in `oneof {..}` block.
+            message MapKeys {
+                // A list of map keys associated with this storage slot.
+                repeated primitives.Digest map_keys = 1;
+            }
+            // Storage slot index (`[0..255]`).
+            uint32 slot_index = 1;
+
+            oneof slot_data {
+                // Request to return all storage map data. If the number exceeds a threshold of 1000 entries,
+                // the response will not contain them but must be requested separately.
+                bool all_entries = 2;
+
+                // A list of map keys associated with the given storage slot identified by `slot_index`.
+                MapKeys map_keys = 3;
+            }
         }
 
-        // Account code commitment corresponding to the last-known `AccountCode` for the requested
-        // account. The response will include only code that is known.
+        // Last known code commitment to the client. The response will include account code
+        // only if its commitment is different from this value or if the value is not present.
         optional primitives.Digest code_commitment = 1;
 
-        // List of storage requests for this account.
-        repeated StorageRequest storage_requests = 2;
+        // Last known asset vault commitment to the client. The response will include asset vault data
+        // only if its commitment is different from this value. If the value is not present in the
+        // request, the response will not contain one either.
+        // If the number of to-be-returned asset entries exceed a threshold, they have to be requested
+        // separately, which is signaled in the response message with dedicated flag.
+        optional primitives.Digest asset_vault_commitment = 2;
+
+        // Additional request per storage map.
+        repeated StorageMapDetailRequest storage_maps = 3;
     }
 
-    // The account ID for this request.
+    // ID of the account for which we want to get data
     account.AccountId account_id = 1;
 
-    // A account detail requests, including map keys + values.
-    optional AccountDetailsRequest account_details = 2;
+    // Block at which we'd like to get this data. Must be close to the chain tip.
+    fixed32 block_num = 2;
+
+    // Request for additional account details; valid only for public accounts.
+    optional AccountDetailRequest details = 3;
 }
 
-// Represents the result of getting account proofs.
-message AccountProof {
-    // State header, available for public accounts only.
-    message AccountDetailsResponse {
-        // Represents a single storage slot with the requested keys and their respective values.
-        message StorageSlotMapProof {
-            // The storage slot index ([0..255]).
-            uint32 storage_slot = 1;
-
-            // Merkle proof of the map value
-            primitives.SmtOpening smt_proof = 2;
-        }
+// Represents the result of getting account proof.
+message AccountProofResponse {
 
-        // Account header, always included.
+    message AccountDetails {
+        // Account header.
         account.AccountHeader header = 1;
 
-        // Account storage header containing slot types and commitments.
-        account.AccountStorageHeader storage_header = 2;
+        // Account storage data
+        AccountStorageDetails storage_details = 2;
 
-        // Account code, if the current account code does not match the request provided commitment digest.
-        optional bytes account_code = 3;
+        // Account code; empty if code commitments matched or none was requested
+        optional bytes code = 3;
 
-        // Storage slots information for this account
-        repeated StorageSlotMapProof storage_maps = 4;
+        // Account asset vault data; empty if vault commitments matched
+        optional AccountVaultDetails vault_details = 4;
     }
 
-    // Block number at which the state of the accounts is returned.
-    fixed32 block_num = 1;
+    // Account ID, current state commitment, and SMT path
+    account.AccountWitness witness = 1;
+
+    // Additional details for public accounts
+    optional AccountDetails details = 2;
+}
 
-    // The account witness for the current state commitment of one account ID.
-    account.AccountWitness witness = 2;
+// Account vault details for AccountProofResponse
+message AccountVaultDetails {
+    // A flag that is set to true if the account contains too many assets. This indicates
+    // to the user that `SyncAccountVault` endpoint should be used to retrieve the
+    // account's assets
+    bool too_many_assets = 1;
 
-    // State header for public accounts. Filled only if the flag `AccountDetailsRequest` was
-    // present and the account was a public account/the information was available.
-    optional AccountDetailsResponse details = 3;
+    // When too_many_assets == false, this will contain the list of assets in the
+    // account's vault
+    repeated primitives.Asset assets = 2;
 }
 
+// Account storage details for AccountProofResponse
+message AccountStorageDetails {
+    message AccountStorageMapDetails {
+        // Wrapper for repeated storage map entries
+        message MapEntries {
+            // Definition of individual storage entries.
+            message StorageMapEntry {
+                primitives.Digest key = 1;
+                primitives.Digest value = 2;
+            }
+
+            repeated StorageMapEntry entries = 1;
+        }
+        // slot index of the storage map
+        uint32 slot_index = 1;
+
+        // A flag that is set to `true` if the number of to-be-returned entries in the
+        // storage map would exceed a threshold. This indicates to the user that `SyncStorageMaps`
+        // endpoint should be used to get all storage map data.
+        bool too_many_entries = 2;
+
+        // By default we provide all storage entries.
+        MapEntries entries = 3;
+    }
+
+    // Account storage header (storage slot info for up to 256 slots)
+    account.AccountStorageHeader header = 1;
+
+    // Additional data for the requested storage maps
+    repeated AccountStorageMapDetails map_details = 2;
+}
+
+
 // CHECK NULLIFIERS
 // ================================================================================================
 

From c99e200016942fd45f57415de819444891857003 Mon Sep 17 00:00:00 2001
From: juan518munoz <62400508+juan518munoz@users.noreply.github.com>
Date: Tue, 7 Oct 2025 16:18:47 -0300
Subject: [PATCH 45/78] chore: update `miden-base` (#1273)

* chore: update `miden-base`

* chore: address comments

* chore: point miden-base to `next` branch

* chore: remove unused deps

* fix: add `miden-air` testing feature tu stress-test

* chore: toml format

* refactor: remove needless clone
---
 Cargo.lock                                    | 413 ++++++++++++++++--
 Cargo.toml                                    |   2 +-
 bin/stress-test/Cargo.toml                    |   5 +-
 bin/stress-test/src/seeding/mod.rs            |  12 +-
 crates/proto/src/domain/account.rs            |   6 +-
 crates/proto/src/domain/merkle.rs             |   6 +-
 crates/proto/src/generated/account.rs         |   2 +-
 crates/proto/src/generated/primitives.rs      |   2 +-
 .../src/remote_prover/batch_prover.rs         |  12 +-
 .../src/db/models/queries/transactions.rs     |   2 +-
 crates/store/src/db/tests.rs                  |  38 +-
 crates/store/src/genesis/config/mod.rs        |   4 +-
 proto/proto/types/account.proto               |   2 +-
 proto/proto/types/primitives.proto            |   2 +-
 14 files changed, 434 insertions(+), 74 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8e21183d5..4411401ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,16 @@
 # It is not intended for manual editing.
 version = 4
 
+[[package]]
+name = "Inflector"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
+dependencies = [
+ "lazy_static",
+ "regex",
+]
+
 [[package]]
 name = "addr2line"
 version = "0.24.2"
@@ -17,6 +27,16 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
 [[package]]
 name = "ahash"
 version = "0.8.12"
@@ -304,12 +324,24 @@ dependencies = [
  "backtrace",
 ]
 
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
 [[package]]
 name = "base64"
 version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "base64ct"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
+
 [[package]]
 name = "bech32"
 version = "0.11.0"
@@ -516,6 +548,30 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
 
+[[package]]
+name = "chacha20"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "chacha20poly1305"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
+dependencies = [
+ "aead",
+ "chacha20",
+ "cipher",
+ "poly1305",
+ "zeroize",
+]
+
 [[package]]
 name = "chrono"
 version = "0.4.42"
@@ -529,6 +585,17 @@ dependencies = [
  "windows-link 0.2.0",
 ]
 
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+ "zeroize",
+]
+
 [[package]]
 name = "clap"
 version = "3.2.25"
@@ -623,6 +690,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
 [[package]]
 name = "constant_time_eq"
 version = "0.3.1"
@@ -707,6 +780,18 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
+[[package]]
+name = "crypto-bigint"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -714,6 +799,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
  "generic-array",
+ "rand_core 0.6.4",
  "typenum",
 ]
 
@@ -802,6 +888,16 @@ dependencies = [
  "deadpool-runtime",
 ]
 
+[[package]]
+name = "der"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
 [[package]]
 name = "deranged"
 version = "0.5.3"
@@ -934,6 +1030,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
+ "const-oid",
  "crypto-common",
  "subtle",
 ]
@@ -969,12 +1066,46 @@ dependencies = [
  "syn 2.0.106",
 ]
 
+[[package]]
+name = "ecdsa"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+dependencies = [
+ "der",
+ "digest",
+ "elliptic-curve",
+ "rfc6979",
+ "signature",
+ "spki",
+]
+
 [[package]]
 name = "either"
 version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
+[[package]]
+name = "elliptic-curve"
+version = "0.13.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "digest",
+ "ff",
+ "generic-array",
+ "group",
+ "hkdf",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "sec1",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "ena"
 version = "0.14.3"
@@ -993,6 +1124,18 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "enum_dispatch"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "env_filter"
 version = "0.1.3"
@@ -1038,6 +1181,16 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
+[[package]]
+name = "ff"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "figment"
 version = "0.10.19"
@@ -1077,6 +1230,18 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "flume"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "nanorand",
+ "spin",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -1245,6 +1410,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
+ "zeroize",
 ]
 
 [[package]]
@@ -1254,8 +1420,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -1284,6 +1452,17 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "h2"
 version = "0.4.12"
@@ -1364,6 +1543,24 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
 [[package]]
 name = "hostname"
 version = "0.4.1"
@@ -1690,6 +1887,15 @@ version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb"
 
+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "io-uring"
 version = "0.7.10"
@@ -1788,6 +1994,20 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "k256"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b"
+dependencies = [
+ "cfg-if",
+ "ecdsa",
+ "elliptic-curve",
+ "once_cell",
+ "sha2",
+ "signature",
+]
+
 [[package]]
 name = "keccak"
 version = "0.1.5"
@@ -2011,9 +2231,9 @@ dependencies = [
 
 [[package]]
 name = "miden-air"
-version = "0.17.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db750ce0c58f51ba786c7391f392c4b77e0c83a44c5096672d4d0270d3cc7763"
+checksum = "de4f41b69be0ed3fd236525bb731188bb8d902cb99009f5c2ef12c6570a9b1ef"
 dependencies = [
  "miden-core",
  "thiserror 2.0.16",
@@ -2023,9 +2243,9 @@ dependencies = [
 
 [[package]]
 name = "miden-assembly"
-version = "0.17.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82575d8479aad3966be3defdc17911264bfdc99f9a7bb185180eec57c6bda9f5"
+checksum = "6707e889509193d5e503becb0edc054be598b60e58dba27c65e81df5b93d0f37"
 dependencies = [
  "log",
  "miden-assembly-syntax",
@@ -2037,9 +2257,9 @@ dependencies = [
 
 [[package]]
 name = "miden-assembly-syntax"
-version = "0.17.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7b3588ce15920c0bff47e8bf8c6ca9e0a7a539ff93014cb5ec3c665f60bc0f1"
+checksum = "654c557877f7bcdef7fb31db683fdbc4ee70c27c0f302920113eba68b690d5d9"
 dependencies = [
  "aho-corasick",
  "lalrpop",
@@ -2049,6 +2269,7 @@ dependencies = [
  "miden-debug-types",
  "miden-utils-diagnostics",
  "midenc-hir-type",
+ "proptest",
  "regex",
  "rustc_version 0.4.1",
  "semver 1.0.26",
@@ -2059,7 +2280,7 @@ dependencies = [
 [[package]]
 name = "miden-block-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#d07f46e5a2e9e95e96c6dd26e62e7071687af005"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2068,10 +2289,11 @@ dependencies = [
 
 [[package]]
 name = "miden-core"
-version = "0.17.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "571a943a923e5fb3f1bed534f41a1542c531ad2aec87dc0d5699af1709fbcea6"
+checksum = "97d53557ea0e5e529675c562c1a90eb5afc242fdac14d1f85b98d770304f9a24"
 dependencies = [
+ "enum_dispatch",
  "miden-crypto",
  "miden-debug-types",
  "miden-formatting",
@@ -2084,29 +2306,37 @@ dependencies = [
 
 [[package]]
 name = "miden-crypto"
-version = "0.15.9"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4329275a11c7d8328b14a7129b21d40183056dcd0d871c3069be6e550d6ca40"
+checksum = "4b8c283ed3017d58d9b648d9b1099f26abff52b185ecbb7b91ff4fb406c286b7"
 dependencies = [
  "blake3",
  "cc",
+ "chacha20poly1305",
+ "flume",
+ "getrandom 0.2.16",
  "glob",
+ "hkdf",
+ "k256",
  "num",
  "num-complex",
  "rand 0.9.2",
+ "rand_chacha 0.9.0",
  "rand_core 0.9.3",
+ "rand_hc",
  "sha3",
  "thiserror 2.0.16",
  "winter-crypto",
  "winter-math",
  "winter-utils",
+ "zeroize",
 ]
 
 [[package]]
 name = "miden-debug-types"
-version = "0.17.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93a4b53092da70aa4c9b75acc85e1c7b4d8202ce89487d2271ebdc2defcb08d6"
+checksum = "188d28a5d7df27e4735095e717845a4558b2d121f822f66e8cc2ddfddf92d5bc"
 dependencies = [
  "memchr",
  "miden-crypto",
@@ -2131,9 +2361,12 @@ dependencies = [
 [[package]]
 name = "miden-lib"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#d07f46e5a2e9e95e96c6dd26e62e7071687af005"
 dependencies = [
+ "Inflector",
+ "fs-err",
  "miden-assembly",
+ "miden-core",
  "miden-objects",
  "miden-processor",
  "miden-stdlib",
@@ -2145,13 +2378,14 @@ dependencies = [
 
 [[package]]
 name = "miden-mast-package"
-version = "0.17.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57efbfaea75eeb07d448c04aefce241bf8f23ea11600a669d897280551819992"
+checksum = "6e1777c12930a070feed3f5c777db8374ba71bc36f153223c48cd9ee82cde3f4"
 dependencies = [
  "derive_more",
  "miden-assembly-syntax",
  "miden-core",
+ "thiserror 2.0.16",
 ]
 
 [[package]]
@@ -2413,7 +2647,6 @@ dependencies = [
  "tokio",
  "tonic",
  "url",
- "winterfell",
 ]
 
 [[package]]
@@ -2456,7 +2689,7 @@ dependencies = [
 [[package]]
 name = "miden-objects"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#d07f46e5a2e9e95e96c6dd26e62e7071687af005"
 dependencies = [
  "bech32",
  "getrandom 0.3.3",
@@ -2478,14 +2711,15 @@ dependencies = [
 
 [[package]]
 name = "miden-processor"
-version = "0.17.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c033f51b575b5a70b763dc0bc05062b6562a8286c6d0c144eaff92da8f214f"
+checksum = "eac41df96664be720b0fbffd9c132a35a0432b5d2e625ba191a83b0d89646a2c"
 dependencies = [
  "miden-air",
  "miden-core",
  "miden-debug-types",
  "miden-utils-diagnostics",
+ "paste",
  "thiserror 2.0.16",
  "tokio",
  "tracing",
@@ -2494,9 +2728,9 @@ dependencies = [
 
 [[package]]
 name = "miden-prover"
-version = "0.17.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d2479d594077a0f66b50a5bb1441bdf3824426a6c6b5ddda0b4df3031b0f2f"
+checksum = "5ab58a684b0133195fbf2583d3759635fbf1fd796d3a1608752509f279be0b30"
 dependencies = [
  "miden-air",
  "miden-debug-types",
@@ -2574,13 +2808,15 @@ dependencies = [
 
 [[package]]
 name = "miden-stdlib"
-version = "0.17.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6d69ecc86e53b9e732b66ef198d444a7c853676fd79e875dc3523dba33d70d"
+checksum = "c09061431876b4cf6b2a3cfdf876bd8fde129233effd5906d3bfda8ec2602e29"
 dependencies = [
  "env_logger",
+ "fs-err",
  "miden-assembly",
  "miden-core",
+ "miden-crypto",
  "miden-processor",
  "miden-utils-sync",
  "thiserror 2.0.16",
@@ -2589,7 +2825,7 @@ dependencies = [
 [[package]]
 name = "miden-testing"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#d07f46e5a2e9e95e96c6dd26e62e7071687af005"
 dependencies = [
  "anyhow",
  "itertools",
@@ -2602,14 +2838,13 @@ dependencies = [
  "rand 0.9.2",
  "rand_chacha 0.9.0",
  "thiserror 2.0.16",
- "tokio",
  "winterfell",
 ]
 
 [[package]]
 name = "miden-tx"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#d07f46e5a2e9e95e96c6dd26e62e7071687af005"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2624,7 +2859,7 @@ dependencies = [
 [[package]]
 name = "miden-tx-batch-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#62feca75399d54f0d840f3aa3d5d345fe2f87e85"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#d07f46e5a2e9e95e96c6dd26e62e7071687af005"
 dependencies = [
  "miden-objects",
  "miden-tx",
@@ -2632,9 +2867,9 @@ dependencies = [
 
 [[package]]
 name = "miden-utils-diagnostics"
-version = "0.17.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d640d80ce3438275b13d0d400901e5bbf3179737818d91d4e84f747a480fd8b"
+checksum = "fa555f9ee912ca23317d75fab2a65380b8191de66715237c228cf09165266dec"
 dependencies = [
  "miden-crypto",
  "miden-debug-types",
@@ -2645,9 +2880,9 @@ dependencies = [
 
 [[package]]
 name = "miden-utils-sync"
-version = "0.17.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf49e1fbfefeb58de992767ae7b0b6200885e342f4dd43c510daefce9539b95"
+checksum = "e1873b21e18ba6ab6c697f155a2adb8f35f5ac386f6bb41ae7c207b2ad683642"
 dependencies = [
  "lock_api",
  "loom",
@@ -2656,9 +2891,9 @@ dependencies = [
 
 [[package]]
 name = "miden-verifier"
-version = "0.17.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3104dce8b4668639aa97aa748a98aab0ea33c103e06ef5c3fd12445ab3bd2387"
+checksum = "759989d95534d658ad6a9d7946bbe617814611a1b89b42e944462ea8ffb4de9d"
 dependencies = [
  "miden-air",
  "miden-core",
@@ -2669,9 +2904,9 @@ dependencies = [
 
 [[package]]
 name = "midenc-hir-type"
-version = "0.1.5"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e381ba23e4f57ffa0d6039113f6d6004e5b8c7ae6cb909329b48f2ab525e8680"
+checksum = "7798671ffbf6596de00619a9abaec67dc26965b891328c9d65c4cb6007597d50"
 dependencies = [
  "miden-formatting",
  "smallvec",
@@ -2761,6 +2996,15 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
 
+[[package]]
+name = "nanorand"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
+dependencies = [
+ "getrandom 0.2.16",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.2.14"
@@ -2961,6 +3205,12 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
 
+[[package]]
+name = "opaque-debug"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+
 [[package]]
 name = "openssl"
 version = "0.10.73"
@@ -3429,12 +3679,33 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
+[[package]]
+name = "poly1305"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
+dependencies = [
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
 [[package]]
 name = "portable-atomic"
 version = "1.11.1"
@@ -3587,9 +3858,9 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f"
+checksum = "2bb0be07becd10686a0bb407298fb425360a5c44a663774406340c59a22de4ce"
 dependencies = [
  "bit-set",
  "bit-vec",
@@ -3802,6 +4073,15 @@ dependencies = [
  "getrandom 0.3.3",
 ]
 
+[[package]]
+name = "rand_hc"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b363d4f6370f88d62bf586c80405657bde0f0e1b8945d47d2ad59b906cb4f54"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "rand_xorshift"
 version = "0.4.0"
@@ -3924,6 +4204,16 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
 [[package]]
 name = "ring"
 version = "0.17.14"
@@ -4166,6 +4456,20 @@ version = "3.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"
 
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct",
+ "der",
+ "generic-array",
+ "pkcs8",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "security-framework"
 version = "2.11.1"
@@ -4402,6 +4706,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "siphasher"
 version = "1.0.1"
@@ -4451,6 +4765,19 @@ name = "spin"
 version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+]
 
 [[package]]
 name = "stable_deref_trait"
@@ -5315,6 +5642,16 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
diff --git a/Cargo.toml b/Cargo.toml
index 815afbc11..0932d007c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -53,7 +53,7 @@ miden-tx              = { branch = "next", default-features = false, git = "http
 miden-tx-batch-prover = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
 
 # Other miden dependencies. These should align with those expected by miden-base.
-miden-air = { version = "0.17" }
+miden-air = { features = ["std", "testing"], version = "0.18" }
 
 # External dependencies
 anyhow             = { version = "1.0" }
diff --git a/bin/stress-test/Cargo.toml b/bin/stress-test/Cargo.toml
index 65e7bad01..7add1676a 100644
--- a/bin/stress-test/Cargo.toml
+++ b/bin/stress-test/Cargo.toml
@@ -19,17 +19,16 @@ workspace = true
 clap                      = { features = ["derive"], version = "4.5" }
 fs-err                    = { workspace = true }
 futures                   = { workspace = true }
-miden-air                 = { workspace = true }
+miden-air                 = { features = ["testing"], workspace = true }
 miden-block-prover        = { features = ["testing"], workspace = true }
 miden-lib                 = { workspace = true }
 miden-node-block-producer = { workspace = true }
 miden-node-proto          = { workspace = true }
 miden-node-store          = { workspace = true }
 miden-node-utils          = { workspace = true }
-miden-objects             = { features = ["testing"], workspace = true }
+miden-objects             = { workspace = true }
 rand                      = { workspace = true }
 rayon                     = { version = "1.10" }
 tokio                     = { workspace = true }
 tonic                     = { workspace = true }
 url                       = { workspace = true }
-winterfell                = { version = "0.13" }
diff --git a/bin/stress-test/src/seeding/mod.rs b/bin/stress-test/src/seeding/mod.rs
index d9e76d5ed..34671e1f4 100644
--- a/bin/stress-test/src/seeding/mod.rs
+++ b/bin/stress-test/src/seeding/mod.rs
@@ -4,7 +4,7 @@ use std::sync::{Arc, Mutex};
 use std::time::{Duration, Instant};
 
 use metrics::SeedingMetrics;
-use miden_air::HashFunction;
+use miden_air::ExecutionProof;
 use miden_block_prover::LocalBlockProver;
 use miden_lib::account::auth::AuthRpoFalcon512;
 use miden_lib::account::faucets::BasicFungibleFaucet;
@@ -40,7 +40,6 @@ use miden_objects::transaction::{
     ProvenTransactionBuilder,
     TransactionHeader,
 };
-use miden_objects::vm::ExecutionProof;
 use miden_objects::{AssetError, Felt, ONE, Word};
 use rand::Rng;
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
@@ -51,7 +50,6 @@ use tokio::{fs, task};
 use tonic::service::interceptor::InterceptedService;
 use tonic::transport::Channel;
 use url::Url;
-use winterfell::Proof;
 
 mod metrics;
 
@@ -314,7 +312,7 @@ fn create_account(public_key: PublicKey, index: u64, storage_mode: AccountStorag
     AccountBuilder::new(init_seed.try_into().unwrap())
         .account_type(AccountType::RegularAccountImmutableCode)
         .storage_mode(storage_mode)
-        .with_auth_component(AuthRpoFalcon512::new(public_key))
+        .with_auth_component(AuthRpoFalcon512::new(public_key.into()))
         .with_component(BasicWallet)
         .build()
         .unwrap()
@@ -332,7 +330,7 @@ fn create_faucet() -> Account {
         .account_type(AccountType::FungibleFaucet)
         .storage_mode(AccountStorageMode::Private)
         .with_component(BasicFungibleFaucet::new(token_symbol, 2, Felt::new(u64::MAX)).unwrap())
-        .with_auth_component(AuthRpoFalcon512::new(key_pair.public_key()))
+        .with_auth_component(AuthRpoFalcon512::new(key_pair.public_key().into()))
         .build()
         .unwrap()
 }
@@ -410,7 +408,7 @@ fn create_consume_note_tx(
         block_ref.commitment(),
         fee_from_block(block_ref).unwrap(),
         u32::MAX.into(),
-        ExecutionProof::new(Proof::new_dummy(), HashFunction::default()),
+        ExecutionProof::new_dummy(),
     )
     .add_input_notes(vec![input_note])
     .account_update_details(details)
@@ -448,7 +446,7 @@ fn create_emit_note_tx(
         )
         .unwrap(),
         u32::MAX.into(),
-        ExecutionProof::new(Proof::new_dummy(), HashFunction::default()),
+        ExecutionProof::new_dummy(),
     )
     .add_output_notes(output_notes.into_iter().map(OutputNote::Full).collect::<Vec<OutputNote>>())
     .build()
diff --git a/crates/proto/src/domain/account.rs b/crates/proto/src/domain/account.rs
index 1e4d5256b..825fd759f 100644
--- a/crates/proto/src/domain/account.rs
+++ b/crates/proto/src/domain/account.rs
@@ -12,6 +12,7 @@ use miden_objects::account::{
 };
 use miden_objects::asset::{Asset, AssetVault};
 use miden_objects::block::{AccountWitness, BlockNumber};
+use miden_objects::crypto::merkle::SparseMerklePath;
 use miden_objects::note::{NoteExecutionMode, NoteTag};
 use miden_objects::utils::{Deserializable, DeserializationError, Serializable};
 use thiserror::Error;
@@ -745,10 +746,11 @@ impl TryFrom<proto::account::AccountWitness> for AccountWitnessRecord {
             .commitment
             .ok_or(proto::account::AccountWitness::missing_field(stringify!(commitment)))?
             .try_into()?;
-        let path = account_witness_record
+        let path: SparseMerklePath = account_witness_record
             .path
             .as_ref()
             .ok_or(proto::account::AccountWitness::missing_field(stringify!(path)))?
+            .clone()
             .try_into()?;
 
         let witness = AccountWitness::new(witness_id, commitment, path).map_err(|err| {
@@ -774,7 +776,7 @@ impl From<AccountWitnessRecord> for proto::account::AccountWitness {
             account_id: Some(from.account_id.into()),
             witness_id: Some(from.witness.id().into()),
             commitment: Some(from.witness.state_commitment().into()),
-            path: Some(from.witness.into_proof().into_parts().0.into()),
+            path: Some(from.witness.path().clone().into()),
         }
     }
 }
diff --git a/crates/proto/src/domain/merkle.rs b/crates/proto/src/domain/merkle.rs
index ca1ca551a..61b49c9e8 100644
--- a/crates/proto/src/domain/merkle.rs
+++ b/crates/proto/src/domain/merkle.rs
@@ -183,10 +183,11 @@ impl TryFrom<proto::primitives::SmtOpening> for SmtProof {
     type Error = ConversionError;
 
     fn try_from(opening: proto::primitives::SmtOpening) -> Result<Self, Self::Error> {
-        let path: MerklePath = opening
+        let path = opening
             .path
             .as_ref()
             .ok_or(proto::primitives::SmtOpening::missing_field(stringify!(path)))?
+            .clone()
             .try_into()?;
         let leaf: SmtLeaf = opening
             .leaf
@@ -199,7 +200,8 @@ impl TryFrom<proto::primitives::SmtOpening> for SmtProof {
 
 impl From<SmtProof> for proto::primitives::SmtOpening {
     fn from(proof: SmtProof) -> Self {
-        let (ref path, leaf) = proof.into_parts();
+        let (path, leaf) = proof.into_parts();
+
         Self {
             path: Some(path.into()),
             leaf: Some(leaf.into()),
diff --git a/crates/proto/src/generated/account.rs b/crates/proto/src/generated/account.rs
index 463f5abf3..2048e5128 100644
--- a/crates/proto/src/generated/account.rs
+++ b/crates/proto/src/generated/account.rs
@@ -90,5 +90,5 @@ pub struct AccountWitness {
     pub commitment: ::core::option::Option<super::primitives::Digest>,
     /// The merkle path of the state commitment in the account tree.
     #[prost(message, optional, tag = "4")]
-    pub path: ::core::option::Option<super::primitives::MerklePath>,
+    pub path: ::core::option::Option<super::primitives::SparseMerklePath>,
 }
diff --git a/crates/proto/src/generated/primitives.rs b/crates/proto/src/generated/primitives.rs
index 6a0e2b5c7..bc55a90b7 100644
--- a/crates/proto/src/generated/primitives.rs
+++ b/crates/proto/src/generated/primitives.rs
@@ -48,7 +48,7 @@ pub mod smt_leaf {
 pub struct SmtOpening {
     /// The Merkle path to the leaf.
     #[prost(message, optional, tag = "1")]
-    pub path: ::core::option::Option<MerklePath>,
+    pub path: ::core::option::Option<SparseMerklePath>,
     /// The leaf itself.
     #[prost(message, optional, tag = "2")]
     pub leaf: ::core::option::Option<SmtLeaf>,
diff --git a/crates/remote-prover-client/src/remote_prover/batch_prover.rs b/crates/remote-prover-client/src/remote_prover/batch_prover.rs
index e72fdfc44..a8109ad9c 100644
--- a/crates/remote-prover-client/src/remote_prover/batch_prover.rs
+++ b/crates/remote-prover-client/src/remote_prover/batch_prover.rs
@@ -170,8 +170,8 @@ impl RemoteBatchProver {
             }
 
             // Check input notes
-            let num_notes = proposed_header.input_notes().num_notes() as usize;
-            if num_notes != proven_header.input_notes().len() {
+            let num_notes = proposed_header.input_notes().num_notes();
+            if num_notes != proven_header.input_notes().num_notes() {
                 return Err(RemoteProverClientError::other(format!(
                     "transaction header of {} has a different number of input notes than the proposed transaction",
                     proposed_header.id()
@@ -180,10 +180,10 @@ impl RemoteBatchProver {
 
             // Because we checked the length matches we can zip the iterators up.
             // We expect the nullifiers to be in the same order.
-            for (proposed_nullifier, header_nullifier) in
+            for (proposed_nullifier, input_note_commitment) in
                 proposed_header.nullifiers().zip(proven_header.input_notes().iter())
             {
-                if proposed_nullifier != *header_nullifier {
+                if proposed_nullifier != input_note_commitment.nullifier() {
                     return Err(RemoteProverClientError::other(format!(
                         "transaction header of {} has a different set of input notes than the proposed transaction",
                         proposed_header.id()
@@ -201,13 +201,13 @@ impl RemoteBatchProver {
 
             // Because we checked the length matches we can zip the iterators up.
             // We expect the note IDs to be in the same order.
-            for (proposed_note_id, header_note_id) in proposed_header
+            for (proposed_note_id, header_note) in proposed_header
                 .output_notes()
                 .iter()
                 .map(OutputNote::id)
                 .zip(proven_header.output_notes().iter())
             {
-                if proposed_note_id != *header_note_id {
+                if proposed_note_id != header_note.id() {
                     return Err(RemoteProverClientError::other(format!(
                         "transaction header of {} has a different set of input notes than the proposed transaction",
                         proposed_header.id()
diff --git a/crates/store/src/db/models/queries/transactions.rs b/crates/store/src/db/models/queries/transactions.rs
index 50b979a6b..73672efb9 100644
--- a/crates/store/src/db/models/queries/transactions.rs
+++ b/crates/store/src/db/models/queries/transactions.rs
@@ -206,7 +206,7 @@ impl TransactionSummaryRowInsert {
         //
         // Note: 500 bytes per output note is an over-estimate but ensures we don't
         // exceed memory limits when these transactions are later converted to proto records.
-        let input_notes_size = transaction_header.input_notes().len() * 32;
+        let input_notes_size = (transaction_header.input_notes().num_notes() * 32) as usize;
         let output_notes_size = transaction_header.output_notes().len() * 500;
         let size_in_bytes = (HEADER_BASE_SIZE + input_notes_size + output_notes_size) as i64;
 
diff --git a/crates/store/src/db/tests.rs b/crates/store/src/db/tests.rs
index 3951f7c7d..f8aa34eef 100644
--- a/crates/store/src/db/tests.rs
+++ b/crates/store/src/db/tests.rs
@@ -22,6 +22,7 @@ use miden_objects::account::{
     AccountStorageMode,
     AccountType,
     AccountVaultDelta,
+    PublicKeyCommitment,
     StorageSlot,
 };
 use miden_objects::asset::{Asset, FungibleAsset};
@@ -32,13 +33,13 @@ use miden_objects::block::{
     BlockNoteTree,
     BlockNumber,
 };
-use miden_objects::crypto::dsa::rpo_falcon512::PublicKey;
 use miden_objects::crypto::merkle::SparseMerklePath;
 use miden_objects::crypto::rand::RpoRandomCoin;
 use miden_objects::note::{
     Note,
     NoteDetails,
     NoteExecutionHint,
+    NoteHeader,
     NoteId,
     NoteMetadata,
     NoteTag,
@@ -52,7 +53,13 @@ use miden_objects::testing::account_id::{
     ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE,
     ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE_2,
 };
-use miden_objects::transaction::{OrderedTransactionHeaders, TransactionHeader, TransactionId};
+use miden_objects::transaction::{
+    InputNoteCommitment,
+    InputNotes,
+    OrderedTransactionHeaders,
+    TransactionHeader,
+    TransactionId,
+};
 use miden_objects::{EMPTY_WORD, Felt, FieldElement, Word, ZERO};
 use pretty_assertions::assert_eq;
 use rand::Rng;
@@ -1399,6 +1406,24 @@ fn mock_block_transaction(account_id: AccountId, num: u64) -> TransactionHeader
     let input_notes_commitment = Word::try_from([0, 0, num, 0]).unwrap();
     let output_notes_commitment = Word::try_from([0, 0, 0, num]).unwrap();
 
+    let notes = vec![InputNoteCommitment::from(num_to_nullifier(num))];
+    let input_notes = InputNotes::new_unchecked(notes);
+
+    let output_notes = vec![NoteHeader::new(
+        NoteId::new(
+            Word::try_from([num, num, 0, 0]).unwrap(),
+            Word::try_from([0, 0, num, num]).unwrap(),
+        ),
+        NoteMetadata::new(
+            account_id,
+            NoteType::Public,
+            NoteTag::LocalAny(num as u32),
+            NoteExecutionHint::None,
+            Felt::default(),
+        )
+        .unwrap(),
+    )];
+
     TransactionHeader::new_unchecked(
         TransactionId::new(
             initial_state_commitment,
@@ -1409,11 +1434,8 @@ fn mock_block_transaction(account_id: AccountId, num: u64) -> TransactionHeader
         account_id,
         initial_state_commitment,
         final_account_commitment,
-        vec![num_to_nullifier(num)],
-        vec![NoteId::new(
-            Word::try_from([num, num, 0, 0]).unwrap(),
-            Word::try_from([0, 0, num, num]).unwrap(),
-        )],
+        input_notes,
+        output_notes,
     )
 }
 
@@ -1475,7 +1497,7 @@ fn mock_account_code_and_storage(
         .storage_mode(storage_mode)
         .with_assets(assets)
         .with_component(component)
-        .with_auth_component(AuthRpoFalcon512::new(PublicKey::new(EMPTY_WORD)))
+        .with_auth_component(AuthRpoFalcon512::new(PublicKeyCommitment::from(EMPTY_WORD)))
         .build_existing()
         .unwrap()
 }
diff --git a/crates/store/src/genesis/config/mod.rs b/crates/store/src/genesis/config/mod.rs
index 3f36676e0..688981225 100644
--- a/crates/store/src/genesis/config/mod.rs
+++ b/crates/store/src/genesis/config/mod.rs
@@ -155,7 +155,7 @@ impl GenesisConfig {
 
             let mut rng = ChaCha20Rng::from_seed(rand::random());
             let secret_key = SecretKey::with_rng(&mut get_rpo_random_coin(&mut rng));
-            let auth = AuthScheme::RpoFalcon512 { pub_key: secret_key.public_key() };
+            let auth = AuthScheme::RpoFalcon512 { pub_key: secret_key.public_key().into() };
             let init_seed: [u8; 32] = rng.random();
 
             let account_type = if has_updatable_code {
@@ -341,7 +341,7 @@ impl FungibleFaucetConfig {
         } = self;
         let mut rng = ChaCha20Rng::from_seed(rand::random());
         let secret_key = SecretKey::with_rng(&mut get_rpo_random_coin(&mut rng));
-        let auth = AuthRpoFalcon512::new(secret_key.public_key());
+        let auth = AuthRpoFalcon512::new(secret_key.public_key().into());
         let init_seed: [u8; 32] = rng.random();
 
         let max_supply = Felt::try_from(max_supply)
diff --git a/proto/proto/types/account.proto b/proto/proto/types/account.proto
index d02424607..6953c228b 100644
--- a/proto/proto/types/account.proto
+++ b/proto/proto/types/account.proto
@@ -85,5 +85,5 @@ message AccountWitness {
     primitives.Digest commitment = 3;
 
     // The merkle path of the state commitment in the account tree.
-    primitives.MerklePath path = 4;
+    primitives.SparseMerklePath path = 4;
 }
diff --git a/proto/proto/types/primitives.proto b/proto/proto/types/primitives.proto
index cace5112b..aed31cec0 100644
--- a/proto/proto/types/primitives.proto
+++ b/proto/proto/types/primitives.proto
@@ -44,7 +44,7 @@ message SmtLeaf {
 // The opening of a leaf in an SMT.
 message SmtOpening {
     // The Merkle path to the leaf.
-    MerklePath path = 1;
+    SparseMerklePath path = 1;
 
     // The leaf itself.
     SmtLeaf leaf = 2;

From 8b0980c2144d01974488dfad897aabb15073a34e Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Wed, 8 Oct 2025 22:52:39 +0200
Subject: [PATCH 46/78] fix: simplify logic in store.rpc for partial queries  
 (#1277)

---
 CHANGELOG.md                            |   1 +
 crates/proto/src/domain/account.rs      | 117 ++++++++----------------
 crates/proto/src/generated/rpc_store.rs |  59 ++++++------
 crates/store/src/state.rs               |   5 +
 proto/proto/store/rpc.proto             |  45 ++++-----
 5 files changed, 101 insertions(+), 126 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f636deb4..602fd9bd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - Implemented storage map `DataStore` function ([#1226](https://github.com/0xMiden/miden-node/pull/1226)).
 - [BREAKING] Renamed `RemoteProverProxy` to `RemoteProverClient` ([#1236](https://github.com/0xMiden/miden-node/pull/1236)).
 - Added pagination to `SyncNotes` endpoint ([#1257](https://github.com/0xMiden/miden-node/pull/1257)).
+- [BREAKING] Response type nuances of `GetAccountProof` in the public store API (#[1277](https://github.com/0xMiden/miden-node/pull/1277)).
 
 ## v0.11.2 (2025-09-10)
 
diff --git a/crates/proto/src/domain/account.rs b/crates/proto/src/domain/account.rs
index 825fd759f..494f16671 100644
--- a/crates/proto/src/domain/account.rs
+++ b/crates/proto/src/domain/account.rs
@@ -200,9 +200,9 @@ impl TryFrom<proto::rpc_store::account_storage_details::AccountStorageMapDetails
 
         let slot_index = slot_index.try_into().map_err(ConversionError::TryFromIntError)?;
 
-        // Extract map_entries from the entries field
-        let map_entries = match entries {
-            Some(entries) => entries
+        // Extract map_entries from the MapEntries message
+        let map_entries = if let Some(entries) = entries {
+            entries
                 .entries
                 .into_iter()
                 .map(|entry| {
@@ -220,8 +220,9 @@ impl TryFrom<proto::rpc_store::account_storage_details::AccountStorageMapDetails
                         .try_into()?;
                     Ok((key, value))
                 })
-                .collect::<Result<Vec<_>, ConversionError>>()?,
-            None => Vec::new(),
+                .collect::<Result<Vec<_>, ConversionError>>()?
+        } else {
+            Vec::new()
         };
 
         Ok(Self {
@@ -368,12 +369,14 @@ impl AccountVaultDetails {
             }
         }
     }
+
     pub fn empty() -> Self {
         Self {
             too_many_assets: false,
             assets: Vec::new(),
         }
     }
+
     fn too_many() -> Self {
         Self {
             too_many_assets: true,
@@ -424,31 +427,34 @@ impl AccountStorageMapDetails {
     const MAX_RETURN_ENTRIES: usize = 1000;
 
     pub fn new(slot_index: u8, slot_data: SlotData, storage_map: &StorageMap) -> Self {
-        let exceeds = if let SlotData::MapKeys(keys) = &slot_data {
-            keys.len() > Self::MAX_RETURN_ENTRIES
-        } else {
-            storage_map.entries().nth(Self::MAX_RETURN_ENTRIES).is_some()
-        };
-        if exceeds {
+        match slot_data {
+            SlotData::All => Self::from_all_entries(slot_index, storage_map),
+            SlotData::MapKeys(keys) => Self::from_specific_keys(slot_index, &keys[..], storage_map),
+        }
+    }
+
+    fn from_all_entries(slot_index: u8, storage_map: &StorageMap) -> Self {
+        if storage_map.num_entries() > Self::MAX_RETURN_ENTRIES {
             Self::too_many_entries(slot_index)
         } else {
-            Self::from_slot_data(slot_index, slot_data, storage_map)
+            let map_entries = Vec::from_iter(storage_map.entries().map(|(k, v)| (*k, *v)));
+            Self {
+                slot_index,
+                too_many_entries: false,
+                map_entries,
+            }
         }
     }
 
-    pub fn from_slot_data(slot_index: u8, slot_data: SlotData, storage_map: &StorageMap) -> Self {
-        let map_entries = match slot_data {
-            SlotData::All => Vec::from_iter(storage_map.entries().map(|(k, v)| (*k, *v))),
-            SlotData::MapKeys(keys) => {
-                Vec::from_iter(keys.iter().map(|key| (*key, storage_map.get(key))))
-            },
-        };
-        Self {
-            slot_index,
-            too_many_entries: false,
-            map_entries,
+    fn from_specific_keys(slot_index: u8, keys: &[Word], storage_map: &StorageMap) -> Self {
+        if keys.len() > Self::MAX_RETURN_ENTRIES {
+            Self::too_many_entries(slot_index)
+        } else {
+            // TODO For now, we return all entries instead of specific keys with proofs
+            Self::from_all_entries(slot_index, storage_map)
         }
     }
+
     pub fn too_many_entries(slot_index: u8) -> Self {
         Self {
             slot_index,
@@ -611,74 +617,31 @@ impl From<AccountDetails> for proto::rpc_store::account_proof_response::AccountD
     }
 }
 
-// ACCOUNT PROOF
 impl From<AccountStorageMapDetails>
     for proto::rpc_store::account_storage_details::AccountStorageMapDetails
 {
     fn from(value: AccountStorageMapDetails) -> Self {
+        use proto::rpc_store::account_storage_details::account_storage_map_details;
+
         let AccountStorageMapDetails {
             slot_index,
             too_many_entries,
             map_entries,
         } = value;
 
-        // Create the entries wrapped in MapEntries message
-        let entries = proto::rpc_store::account_storage_details::account_storage_map_details::MapEntries {
-            entries: map_entries
-                .into_iter()
-                .map(|(key, value)| {
-                    proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry {
-                        key: Some(key.into()),
-                        value: Some(value.into()),
-                    }
-                })
-                .collect(),
-        };
+        let entries = Some(account_storage_map_details::MapEntries {
+            entries: Vec::from_iter(map_entries.into_iter().map(|(key, value)| {
+                account_storage_map_details::map_entries::StorageMapEntry {
+                    key: Some(key.into()),
+                    value: Some(value.into()),
+                }
+            })),
+        });
 
         Self {
             slot_index: u32::from(slot_index),
             too_many_entries,
-            entries: Some(entries),
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct StorageMapEntry {
-    pub key: Word,
-    pub value: Word,
-}
-
-impl
-    TryFrom<proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry>
-    for StorageMapEntry
-{
-    type Error = ConversionError;
-
-    fn try_from(
-        value: proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry,
-    ) -> Result<Self, Self::Error> {
-        let proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry {
-            key,
-            value
-        } = value;
-
-        Ok(Self {
-            key: key.ok_or(proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry::missing_field(stringify!(key)))?.try_into()?,
-            value: value.ok_or(proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry::missing_field(stringify!(value)))?.try_into()?,
-        })
-    }
-}
-
-impl From<StorageMapEntry>
-    for proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry
-{
-    fn from(value: StorageMapEntry) -> Self {
-        let StorageMapEntry { key, value } = value;
-
-        Self {
-            key: Some(proto::primitives::Digest::from(key)),
-            value: Some(proto::primitives::Digest::from(value)),
+            entries,
         }
     }
 }
diff --git a/crates/proto/src/generated/rpc_store.rs b/crates/proto/src/generated/rpc_store.rs
index da0af6342..5f6f05816 100644
--- a/crates/proto/src/generated/rpc_store.rs
+++ b/crates/proto/src/generated/rpc_store.rs
@@ -30,11 +30,13 @@ pub mod account_proof_request {
     /// Request the details for a public account.
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct AccountDetailRequest {
-        /// Last known code commitment to the client. The response will include account code
-        /// only if its commitment is different from this value or if the value is not present.
+        /// Last known code commitment to the requester. The response will include account code
+        /// only if its commitment is different from this value.
+        ///
+        /// If the field is ommiteed, the response will not include the account code.
         #[prost(message, optional, tag = "1")]
         pub code_commitment: ::core::option::Option<super::super::primitives::Digest>,
-        /// Last known asset vault commitment to the client. The response will include asset vault data
+        /// Last known asset vault commitment to the requester. The response will include asset vault data
         /// only if its commitment is different from this value. If the value is not present in the
         /// request, the response will not contain one either.
         /// If the number of to-be-returned asset entries exceed a threshold, they have to be requested
@@ -107,7 +109,8 @@ pub mod account_proof_response {
         /// Account code; empty if code commitments matched or none was requested
         #[prost(bytes = "vec", optional, tag = "3")]
         pub code: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
-        /// Account asset vault data; empty if vault commitments matched
+        /// Account asset vault data; empty if vault commitments matched or the requester
+        /// omitted it in the request.
         #[prost(message, optional, tag = "4")]
         pub vault_details: ::core::option::Option<super::AccountVaultDetails>,
     }
@@ -231,12 +234,12 @@ pub mod sync_nullifiers_response {
 }
 /// State synchronization request.
 ///
-/// Specifies state updates the client is interested in. The server will return the first block which
+/// Specifies state updates the requester is interested in. The server will return the first block which
 /// contains a note matching `note_tags` or the chain tip. And the corresponding updates to
 /// `account_ids` for that block range.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncStateRequest {
-    /// Last block known by the client. The response will contain data starting from the next block,
+    /// Last block known by the requester. The response will contain data starting from the next block,
     /// until the first block which contains a note of matching the requested tag, or the chain tip
     /// if there are no notes.
     #[prost(fixed32, tag = "1")]
@@ -248,7 +251,7 @@ pub struct SyncStateRequest {
     /// it won't be included in the response.
     #[prost(message, repeated, tag = "2")]
     pub account_ids: ::prost::alloc::vec::Vec<super::account::AccountId>,
-    /// Specifies the tags which the client is interested in.
+    /// Specifies the tags which the requester is interested in.
     #[prost(fixed32, repeated, tag = "3")]
     pub note_tags: ::prost::alloc::vec::Vec<u32>,
 }
@@ -277,7 +280,7 @@ pub struct SyncStateResponse {
 }
 /// Account vault synchronization request.
 ///
-/// Allows clients to sync asset values for specific public accounts within a block range.
+/// Allows requesters to sync asset values for specific public accounts within a block range.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncAccountVaultRequest {
     /// Block range from which to start synchronizing.
@@ -317,14 +320,14 @@ pub struct AccountVaultUpdate {
 }
 /// Note synchronization request.
 ///
-/// Specifies note tags that client is interested in. The server will return the first block which
+/// Specifies note tags that requester is interested in. The server will return the first block which
 /// contains a note matching `note_tags` or the chain tip.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncNotesRequest {
     /// Block range from which to start synchronizing.
     #[prost(message, optional, tag = "1")]
     pub block_range: ::core::option::Option<BlockRange>,
-    /// Specifies the tags which the client is interested in.
+    /// Specifies the tags which the requester is interested in.
     #[prost(fixed32, repeated, tag = "2")]
     pub note_tags: ::prost::alloc::vec::Vec<u32>,
 }
@@ -349,7 +352,7 @@ pub struct SyncNotesResponse {
 }
 /// Storage map synchronization request.
 ///
-/// Allows clients to sync storage map values for specific public accounts within a block range,
+/// Allows requesters to sync storage map values for specific public accounts within a block range,
 /// with support for cursor-based pagination to handle large storage maps.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncStorageMapsRequest {
@@ -410,11 +413,11 @@ pub struct BlockRange {
 }
 /// Represents pagination information for chunked responses.
 ///
-/// Pagination is done using block numbers as the axis, allowing clients to request
+/// Pagination is done using block numbers as the axis, allowing requesters to request
 /// data in chunks by specifying block ranges and continuing from where the previous
 /// response left off.
 ///
-/// To request the next chunk, the client should use `block_num + 1` from the previous response
+/// To request the next chunk, the requester should use `block_num + 1` from the previous response
 /// as the `block_from` for the next request.
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct PaginationInfo {
@@ -431,7 +434,7 @@ pub struct PaginationInfo {
 }
 /// Transactions synchronization request.
 ///
-/// Allows clients to sync transactions for specific accounts within a block range.
+/// Allows requesters to sync transactions for specific accounts within a block range.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncTransactionsRequest {
     /// Block range from which to start synchronizing.
@@ -779,9 +782,9 @@ pub mod rpc_client {
                 .insert(GrpcMethod::new("rpc_store.Rpc", "SyncNullifiers"));
             self.inner.unary(req, path, codec).await
         }
-        /// Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
+        /// Returns info which can be used by the requester to sync up to the tip of chain for the notes they are interested in.
         ///
-        /// Client specifies the `note_tags` they are interested in, and the block height from which to search for new for
+        /// requester specifies the `note_tags` they are interested in, and the block height from which to search for new for
         /// matching notes for. The request will then return the next block containing any note matching the provided tags.
         ///
         /// The response includes each note's metadata and inclusion proof.
@@ -809,20 +812,20 @@ pub mod rpc_client {
             req.extensions_mut().insert(GrpcMethod::new("rpc_store.Rpc", "SyncNotes"));
             self.inner.unary(req, path, codec).await
         }
-        /// Returns info which can be used by the client to sync up to the latest state of the chain
-        /// for the objects (accounts, notes, nullifiers) the client is interested in.
+        /// Returns info which can be used by the requester to sync up to the latest state of the chain
+        /// for the objects (accounts, notes, nullifiers) the requester is interested in.
         ///
         /// This request returns the next block containing requested data. It also returns `chain_tip`
-        /// which is the latest block number in the chain. Client is expected to repeat these requests
+        /// which is the latest block number in the chain. requester is expected to repeat these requests
         /// in a loop until `response.block_header.block_num == response.chain_tip`, at which point
-        /// the client is fully synchronized with the chain.
+        /// the requester is fully synchronized with the chain.
         ///
         /// Each request also returns info about new notes, nullifiers etc. created. It also returns
         /// Chain MMR delta that can be used to update the state of Chain MMR. This includes both chain
         /// MMR peaks and chain MMR nodes.
         ///
         /// For preserving some degree of privacy, note tags and nullifiers filters contain only high
-        /// part of hashes. Thus, returned data contains excessive notes and nullifiers, client can make
+        /// part of hashes. Thus, returned data contains excessive notes and nullifiers, requester can make
         /// additional filtering of that data on its side.
         pub async fn sync_state(
             &mut self,
@@ -1004,9 +1007,9 @@ pub mod rpc_server {
             tonic::Response<super::SyncNullifiersResponse>,
             tonic::Status,
         >;
-        /// Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
+        /// Returns info which can be used by the requester to sync up to the tip of chain for the notes they are interested in.
         ///
-        /// Client specifies the `note_tags` they are interested in, and the block height from which to search for new for
+        /// requester specifies the `note_tags` they are interested in, and the block height from which to search for new for
         /// matching notes for. The request will then return the next block containing any note matching the provided tags.
         ///
         /// The response includes each note's metadata and inclusion proof.
@@ -1020,20 +1023,20 @@ pub mod rpc_server {
             tonic::Response<super::SyncNotesResponse>,
             tonic::Status,
         >;
-        /// Returns info which can be used by the client to sync up to the latest state of the chain
-        /// for the objects (accounts, notes, nullifiers) the client is interested in.
+        /// Returns info which can be used by the requester to sync up to the latest state of the chain
+        /// for the objects (accounts, notes, nullifiers) the requester is interested in.
         ///
         /// This request returns the next block containing requested data. It also returns `chain_tip`
-        /// which is the latest block number in the chain. Client is expected to repeat these requests
+        /// which is the latest block number in the chain. requester is expected to repeat these requests
         /// in a loop until `response.block_header.block_num == response.chain_tip`, at which point
-        /// the client is fully synchronized with the chain.
+        /// the requester is fully synchronized with the chain.
         ///
         /// Each request also returns info about new notes, nullifiers etc. created. It also returns
         /// Chain MMR delta that can be used to update the state of Chain MMR. This includes both chain
         /// MMR peaks and chain MMR nodes.
         ///
         /// For preserving some degree of privacy, note tags and nullifiers filters contain only high
-        /// part of hashes. Thus, returned data contains excessive notes and nullifiers, client can make
+        /// part of hashes. Thus, returned data contains excessive notes and nullifiers, requester can make
         /// additional filtering of that data on its side.
         async fn sync_state(
             &self,
diff --git a/crates/store/src/state.rs b/crates/store/src/state.rs
index effccc31d..69546170f 100644
--- a/crates/store/src/state.rs
+++ b/crates/store/src/state.rs
@@ -890,6 +890,9 @@ impl State {
 
     /// Returns the respective account proof with optional details, such as asset and storage
     /// entries.
+    ///
+    /// Note: The `block_num` parameter in the request is currently ignored and will always
+    /// return the current state. Historical block support will be implemented in a future update.
     #[allow(clippy::too_many_lines)]
     pub async fn get_account_proof(
         &self,
@@ -901,6 +904,8 @@ impl State {
         let inner_state = self.inner.read().await;
 
         let account_id = account_request.account_id;
+        // TODO: Implement historical block support using account_request.block_num
+        // For now, we always return the current state
         let account_details = if let Some(AccountDetailRequest {
             code_commitment,
             asset_vault_commitment,
diff --git a/proto/proto/store/rpc.proto b/proto/proto/store/rpc.proto
index 1da00771c..1bbc37f67 100644
--- a/proto/proto/store/rpc.proto
+++ b/proto/proto/store/rpc.proto
@@ -47,9 +47,9 @@ service Rpc {
     // Note that only 16-bit prefixes are supported at this time.
     rpc SyncNullifiers(SyncNullifiersRequest) returns (SyncNullifiersResponse) {}
 
-    // Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
+    // Returns info which can be used by the requester to sync up to the tip of chain for the notes they are interested in.
     //
-    // Client specifies the `note_tags` they are interested in, and the block height from which to search for new for
+    // requester specifies the `note_tags` they are interested in, and the block height from which to search for new for
     // matching notes for. The request will then return the next block containing any note matching the provided tags.
     //
     // The response includes each note's metadata and inclusion proof.
@@ -58,20 +58,20 @@ service Rpc {
     // tip of the chain.
     rpc SyncNotes(SyncNotesRequest) returns (SyncNotesResponse) {}
 
-    // Returns info which can be used by the client to sync up to the latest state of the chain
-    // for the objects (accounts, notes, nullifiers) the client is interested in.
+    // Returns info which can be used by the requester to sync up to the latest state of the chain
+    // for the objects (accounts, notes, nullifiers) the requester is interested in.
     //
     // This request returns the next block containing requested data. It also returns `chain_tip`
-    // which is the latest block number in the chain. Client is expected to repeat these requests
+    // which is the latest block number in the chain. requester is expected to repeat these requests
     // in a loop until `response.block_header.block_num == response.chain_tip`, at which point
-    // the client is fully synchronized with the chain.
+    // the requester is fully synchronized with the chain.
     //
     // Each request also returns info about new notes, nullifiers etc. created. It also returns
     // Chain MMR delta that can be used to update the state of Chain MMR. This includes both chain
     // MMR peaks and chain MMR nodes.
     //
     // For preserving some degree of privacy, note tags and nullifiers filters contain only high
-    // part of hashes. Thus, returned data contains excessive notes and nullifiers, client can make
+    // part of hashes. Thus, returned data contains excessive notes and nullifiers, requester can make
     // additional filtering of that data on its side.
     rpc SyncState(SyncStateRequest) returns (SyncStateResponse) {}
 
@@ -127,11 +127,13 @@ message AccountProofRequest {
             }
         }
 
-        // Last known code commitment to the client. The response will include account code
-        // only if its commitment is different from this value or if the value is not present.
+        // Last known code commitment to the requester. The response will include account code
+        // only if its commitment is different from this value.
+        //
+        // If the field is ommiteed, the response will not include the account code.
         optional primitives.Digest code_commitment = 1;
 
-        // Last known asset vault commitment to the client. The response will include asset vault data
+        // Last known asset vault commitment to the requester. The response will include asset vault data
         // only if its commitment is different from this value. If the value is not present in the
         // request, the response will not contain one either.
         // If the number of to-be-returned asset entries exceed a threshold, they have to be requested
@@ -165,7 +167,8 @@ message AccountProofResponse {
         // Account code; empty if code commitments matched or none was requested
         optional bytes code = 3;
 
-        // Account asset vault data; empty if vault commitments matched
+        // Account asset vault data; empty if vault commitments matched or the requester
+        // omitted it in the request.
         optional AccountVaultDetails vault_details = 4;
     }
 
@@ -275,11 +278,11 @@ message SyncNullifiersResponse {
 
 // State synchronization request.
 //
-// Specifies state updates the client is interested in. The server will return the first block which
+// Specifies state updates the requester is interested in. The server will return the first block which
 // contains a note matching `note_tags` or the chain tip. And the corresponding updates to
 // `account_ids` for that block range.
 message SyncStateRequest {
-    // Last block known by the client. The response will contain data starting from the next block,
+    // Last block known by the requester. The response will contain data starting from the next block,
     // until the first block which contains a note of matching the requested tag, or the chain tip
     // if there are no notes.
     fixed32 block_num = 1;
@@ -291,7 +294,7 @@ message SyncStateRequest {
     // it won't be included in the response.
     repeated account.AccountId account_ids = 2;
 
-    // Specifies the tags which the client is interested in.
+    // Specifies the tags which the requester is interested in.
     repeated fixed32 note_tags = 3;
 }
 
@@ -322,7 +325,7 @@ message SyncStateResponse {
 
 // Account vault synchronization request.
 //
-// Allows clients to sync asset values for specific public accounts within a block range.
+// Allows requesters to sync asset values for specific public accounts within a block range.
 message SyncAccountVaultRequest {
     // Block range from which to start synchronizing.
     //
@@ -362,13 +365,13 @@ message AccountVaultUpdate {
 
 // Note synchronization request.
 //
-// Specifies note tags that client is interested in. The server will return the first block which
+// Specifies note tags that requester is interested in. The server will return the first block which
 // contains a note matching `note_tags` or the chain tip.
 message SyncNotesRequest {
     // Block range from which to start synchronizing.
     BlockRange block_range = 1;
 
-    // Specifies the tags which the client is interested in.
+    // Specifies the tags which the requester is interested in.
     repeated fixed32 note_tags = 2;
 }
 
@@ -395,7 +398,7 @@ message SyncNotesResponse {
 
 // Storage map synchronization request.
 //
-// Allows clients to sync storage map values for specific public accounts within a block range,
+// Allows requesters to sync storage map values for specific public accounts within a block range,
 // with support for cursor-based pagination to handle large storage maps.
 message SyncStorageMapsRequest {
     // Block range from which to start synchronizing.
@@ -460,11 +463,11 @@ message BlockRange {
 
 // Represents pagination information for chunked responses.
 //
-// Pagination is done using block numbers as the axis, allowing clients to request
+// Pagination is done using block numbers as the axis, allowing requesters to request
 // data in chunks by specifying block ranges and continuing from where the previous
 // response left off.
 //
-// To request the next chunk, the client should use `block_num + 1` from the previous response
+// To request the next chunk, the requester should use `block_num + 1` from the previous response
 // as the `block_from` for the next request.
 message PaginationInfo {
     // Current chain tip
@@ -483,7 +486,7 @@ message PaginationInfo {
 
 // Transactions synchronization request.
 //
-// Allows clients to sync transactions for specific accounts within a block range.
+// Allows requesters to sync transactions for specific accounts within a block range.
 message SyncTransactionsRequest {
     // Block range from which to start synchronizing.
     BlockRange block_range = 1;

From d85bbde95a99f67d0fa8ebe757d0f2f45622fc95 Mon Sep 17 00:00:00 2001
From: Mirko <48352201+Mirko-von-Leipzig@users.noreply.github.com>
Date: Fri, 10 Oct 2025 00:41:00 +0200
Subject: [PATCH 47/78] tests: add new mempool tests (#1271)

---
 crates/block-producer/src/mempool/mod.rs      |  34 +-
 crates/block-producer/src/mempool/state.rs    |   2 +-
 crates/block-producer/src/mempool/tests.rs    | 162 +++---
 .../src/mempool/tests/add_transaction.rs      | 520 ++++++++++++++++++
 crates/block-producer/src/test_utils/batch.rs |   6 +-
 crates/block-producer/src/test_utils/mod.rs   |   2 +-
 .../src/test_utils/proven_tx.rs               |  38 +-
 7 files changed, 637 insertions(+), 127 deletions(-)
 create mode 100644 crates/block-producer/src/mempool/tests/add_transaction.rs

diff --git a/crates/block-producer/src/mempool/mod.rs b/crates/block-producer/src/mempool/mod.rs
index 70d2378c0..af8ce1c3e 100644
--- a/crates/block-producer/src/mempool/mod.rs
+++ b/crates/block-producer/src/mempool/mod.rs
@@ -66,8 +66,7 @@ mod nodes;
 mod state;
 mod subscription;
 
-// FIXME(Mirko): Re-enable these once mempool refactor is completed.
-#[cfg(all(false, test))]
+#[cfg(test)]
 mod tests;
 
 #[derive(Clone)]
@@ -521,10 +520,7 @@ impl Mempool {
                         "Reverted batch as part of block rollback"
                     );
                 },
-                NodeId::Transaction(_) => {},
-                NodeId::Block(block_number) => panic!(
-                    "Found block {block_number} descendent while reverting a block which shouldn't be possible since only one block is in progress"
-                ),
+                NodeId::Transaction(_) | NodeId::Block(_) => {},
             }
 
             for tx in node.transactions() {
@@ -601,7 +597,7 @@ impl Mempool {
                     },
                     NodeId::Transaction(_) => {},
                     NodeId::Block(block_number) => panic!(
-                        "Found block {block_number} descendent while reverting a block which shouldn't be possible since only one block is in progress"
+                        "Found block {block_number} descendent while reverting expired nodes which shouldn't be possible since only one block is in progress"
                     ),
                 }
 
@@ -671,19 +667,39 @@ impl Mempool {
         reverted
     }
 
+    /// Rejects authentication height's which we cannot guarantee are correct from the locally
+    /// retained state.
+    ///
+    /// In other words, this returns an error if the authentication height is more than one block
+    /// older than the locally retained state. One block is allowed because this means block `N-1`
+    /// was authenticated by the store, and we can check blocks `N..chain_tip`.
+    ///
+    /// # Panics
+    ///
+    /// This panics if the authentication height exceeds the latest locally known block. This
+    /// includes any proposed block since the block is committed to the mempool and store
+    /// concurrently (or at least can be).
     fn authentication_staleness_check(
         &self,
         authentication_height: BlockNumber,
     ) -> Result<(), AddTransactionError> {
         let oldest = self.nodes.oldest_committed_block().unwrap_or_default();
+        let limit = oldest.parent().unwrap_or_default();
 
-        if authentication_height < oldest {
+        if authentication_height < limit {
             return Err(AddTransactionError::StaleInputs {
                 input_block: authentication_height,
-                stale_limit: oldest,
+                stale_limit: limit,
             });
         }
 
+        let latest_block =
+            self.nodes.proposed_block.as_ref().map_or(self.chain_tip, |(number, _)| *number);
+        assert!(
+            authentication_height <= latest_block,
+            "Authentication height {authentication_height} exceeded the latest known block {latest_block}"
+        );
+
         Ok(())
     }
 
diff --git a/crates/block-producer/src/mempool/state.rs b/crates/block-producer/src/mempool/state.rs
index 9d8a25794..c5dc52b81 100644
--- a/crates/block-producer/src/mempool/state.rs
+++ b/crates/block-producer/src/mempool/state.rs
@@ -19,7 +19,7 @@ use crate::mempool::nodes::{Node, NodeId};
 pub(super) struct InflightState {
     /// All nullifiers created by inflight state.
     ///
-    /// This _includes_ nullifiers from erased notes to simpify reverting nodes and requeuing
+    /// This _includes_ nullifiers from erased notes to simplify reverting nodes and requeuing
     /// their transactions. If this weren't the case, then its possible that a batch contains an
     /// erased note which can clash with another inflight transaction. If we were to revert this
     /// batch and requeue its transactions, then this would be illegal. This is possible to handle
diff --git a/crates/block-producer/src/mempool/tests.rs b/crates/block-producer/src/mempool/tests.rs
index 9c4db532b..a2666b53a 100644
--- a/crates/block-producer/src/mempool/tests.rs
+++ b/crates/block-producer/src/mempool/tests.rs
@@ -1,5 +1,7 @@
+use std::sync::Arc;
+
 use miden_objects::Word;
-use miden_objects::block::BlockNumber;
+use miden_objects::block::{BlockHeader, BlockNumber};
 use pretty_assertions::assert_eq;
 use serial_test::serial;
 
@@ -7,15 +9,26 @@ use super::*;
 use crate::test_utils::MockProvenTxBuilder;
 use crate::test_utils::batch::TransactionBatchConstructor;
 
+mod add_transaction;
+
 impl Mempool {
-    fn for_tests() -> Self {
-        Self::new(
+    /// Returns an empty [`Mempool`] and a perfect clone intended for use as the Unit Under Test and
+    /// the reference instance.
+    ///
+    /// The clone is important as this guarantees that the internal _hash_ state is the same. This
+    /// is relevant for internal `HashMap`s which would otherwise give different iteration order
+    /// which in turn doesn't let different mempool instances give the same results.
+    fn for_tests() -> (Self, Self) {
+        let uut = Self::new(
             BlockNumber::GENESIS,
-            BatchBudget::default(),
-            BlockBudget::default(),
-            NonZeroUsize::new(5).unwrap(),
-            u32::default(),
-        )
+            MempoolConfig {
+                expiration_slack: 3,
+                state_retention: NonZeroUsize::new(5).unwrap(),
+                ..Default::default()
+            },
+        );
+
+        (uut.clone(), uut)
     }
 }
 
@@ -27,7 +40,7 @@ impl Mempool {
 async fn add_transaction_traces_are_correct() {
     let (mut rx_export, _rx_shutdown) = miden_node_utils::logging::setup_test_tracing().unwrap();
 
-    let mut uut = Mempool::for_tests();
+    let (mut uut, _) = Mempool::for_tests();
     let txs = MockProvenTxBuilder::sequential();
     uut.add_transaction(txs[0].clone()).unwrap();
 
@@ -43,31 +56,6 @@ async fn add_transaction_traces_are_correct() {
     );
 }
 
-#[tokio::test]
-#[serial(open_telemetry_tracing)]
-async fn revert_transactions_traces_are_correct() {
-    let (mut rx_export, _rx_shutdown) = miden_node_utils::logging::setup_test_tracing().unwrap();
-
-    let mut uut = Mempool::for_tests();
-    let txs = MockProvenTxBuilder::sequential();
-    uut.add_transaction(txs[0].clone()).unwrap();
-    let span_data = rx_export.recv().await.unwrap();
-    assert_eq!(span_data.name, "mempool.add_transaction");
-
-    uut.revert_transactions(vec![txs[0].id()]).unwrap();
-    let span_data = rx_export.recv().await.unwrap();
-    assert_eq!(span_data.name, "mempool.revert_transactions");
-    assert!(span_data.attributes.iter().any(|kv| kv.key == "code.namespace".into()
-        && kv.value == "miden_node_block_producer::mempool".into()));
-
-    assert!(
-        span_data
-            .attributes
-            .iter()
-            .any(|kv| kv.key == "transactions.expired.ids".into())
-    );
-}
-
 // BATCH FAILED TESTS
 // ================================================================================================
 
@@ -78,7 +66,7 @@ fn children_of_failed_batches_are_ignored() {
     // should be ignored.
     let txs = MockProvenTxBuilder::sequential();
 
-    let mut uut = Mempool::for_tests();
+    let (mut uut, _) = Mempool::for_tests();
     uut.add_transaction(txs[0].clone()).unwrap();
     let (parent_batch, batch_txs) = uut.select_batch().unwrap();
     assert_eq!(batch_txs, vec![txs[0].clone()]);
@@ -99,7 +87,8 @@ fn children_of_failed_batches_are_ignored() {
     uut.rollback_batch(child_batch_a);
     assert_eq!(uut, reference);
 
-    let proven_batch = ProvenBatch::mocked_from_transactions([txs[2].raw_proven_transaction()]);
+    let proven_batch =
+        Arc::new(ProvenBatch::mocked_from_transactions([txs[2].raw_proven_transaction()]));
     uut.commit_batch(proven_batch);
     assert_eq!(uut, reference);
 }
@@ -108,7 +97,7 @@ fn children_of_failed_batches_are_ignored() {
 fn failed_batch_transactions_are_requeued() {
     let txs = MockProvenTxBuilder::sequential();
 
-    let mut uut = Mempool::for_tests();
+    let (mut uut, mut reference) = Mempool::for_tests();
     uut.add_transaction(txs[0].clone()).unwrap();
     uut.select_batch().unwrap();
 
@@ -121,7 +110,6 @@ fn failed_batch_transactions_are_requeued() {
     // Middle batch failed, so it and its child transaction should be re-entered into the queue.
     uut.rollback_batch(failed_batch);
 
-    let mut reference = Mempool::for_tests();
     reference.add_transaction(txs[0].clone()).unwrap();
     reference.select_batch().unwrap();
     reference.add_transaction(txs[1].clone()).unwrap();
@@ -136,17 +124,18 @@ fn failed_batch_transactions_are_requeued() {
 /// Expired transactions should be reverted once their expiration block is committed.
 #[test]
 fn block_commit_reverts_expired_txns() {
-    let mut uut = Mempool::for_tests();
+    let (mut uut, _) = Mempool::for_tests();
+    uut.config.expiration_slack = 0;
 
     let tx_to_commit = MockProvenTxBuilder::with_account_index(0).build();
-    let tx_to_commit = AuthenticatedTransaction::from_inner(tx_to_commit);
+    let tx_to_commit = Arc::new(AuthenticatedTransaction::from_inner(tx_to_commit));
 
     // Force the tx into a pending block.
     uut.add_transaction(tx_to_commit.clone()).unwrap();
     uut.select_batch().unwrap();
-    uut.commit_batch(ProvenBatch::mocked_from_transactions(
-        [tx_to_commit.raw_proven_transaction()],
-    ));
+    uut.commit_batch(Arc::new(ProvenBatch::mocked_from_transactions([
+        tx_to_commit.raw_proven_transaction()
+    ])));
     let (block, _) = uut.select_block();
     // A reverted transaction behaves as if it never existed, the current state is the expected
     // outcome, plus an extra committed block at the end.
@@ -155,11 +144,11 @@ fn block_commit_reverts_expired_txns() {
     // Add a new transaction which will expire when the pending block is committed.
     let tx_to_revert =
         MockProvenTxBuilder::with_account_index(1).expiration_block_num(block).build();
-    let tx_to_revert = AuthenticatedTransaction::from_inner(tx_to_revert);
+    let tx_to_revert = Arc::new(AuthenticatedTransaction::from_inner(tx_to_revert));
     uut.add_transaction(tx_to_revert).unwrap();
 
     // Commit the pending block which should revert the above tx.
-    let arb_header = BlockHeader::mock(0, None, None, &[], Word::empty());
+    let arb_header = BlockHeader::mock(block, None, None, &[], Word::empty());
     uut.commit_block(arb_header.clone());
     reference.commit_block(arb_header);
 
@@ -168,12 +157,12 @@ fn block_commit_reverts_expired_txns() {
 
 #[test]
 fn empty_block_commitment() {
-    let mut uut = Mempool::for_tests();
+    let (mut uut, _) = Mempool::for_tests();
 
-    let arb_header = BlockHeader::mock(0, None, None, &[], Word::empty());
     for _ in 0..3 {
-        let (_block, _) = uut.select_block();
-        uut.commit_block(arb_header.clone());
+        let (number, _) = uut.select_block();
+        let arb_header = BlockHeader::mock(number, None, None, &[], Word::empty());
+        uut.commit_block(arb_header);
     }
 }
 
@@ -181,13 +170,13 @@ fn empty_block_commitment() {
 #[should_panic]
 fn block_commitment_is_rejected_if_no_block_is_in_flight() {
     let arb_header = BlockHeader::mock(0, None, None, &[], Word::empty());
-    Mempool::for_tests().commit_block(arb_header);
+    Mempool::for_tests().0.commit_block(arb_header);
 }
 
 #[test]
 #[should_panic]
 fn cannot_have_multiple_inflight_blocks() {
-    let mut uut = Mempool::for_tests();
+    let (mut uut, _) = Mempool::for_tests();
 
     uut.select_block();
     uut.select_block();
@@ -199,20 +188,19 @@ fn cannot_have_multiple_inflight_blocks() {
 /// A failed block should have all of its transactions reverted.
 #[test]
 fn block_failure_reverts_its_transactions() {
-    let mut uut = Mempool::for_tests();
     // We will revert everything so the reference should be the empty mempool.
-    let reference = uut.clone();
+    let (mut uut, reference) = Mempool::for_tests();
 
     let reverted_txs = MockProvenTxBuilder::sequential();
 
     uut.add_transaction(reverted_txs[0].clone()).unwrap();
     uut.select_batch().unwrap();
-    uut.commit_batch(ProvenBatch::mocked_from_transactions([
+    uut.commit_batch(Arc::new(ProvenBatch::mocked_from_transactions([
         reverted_txs[0].raw_proven_transaction()
-    ]));
+    ])));
 
     // Block 1 will contain just the first batch.
-    let (_number, _batches) = uut.select_block();
+    let (number, _batches) = uut.select_block();
 
     // Create another dependent batch.
     uut.add_transaction(reverted_txs[1].clone()).unwrap();
@@ -221,21 +209,16 @@ fn block_failure_reverts_its_transactions() {
     uut.add_transaction(reverted_txs[2].clone()).unwrap();
 
     // Fail the block which should result in everything reverting.
-    uut.rollback_block();
+    uut.rollback_block(number);
 
     assert_eq!(uut, reference);
 }
 
-// TRANSACTION REVERSION TESTS
-// ================================================================================================
-
-/// Ensures that reverting transactions is equivalent to them never being inserted at all.
-///
-/// This checks that there are no forgotten links to them exist anywhere in the mempool by
-/// comparing to a reference mempool that never had them inserted.
+/// Ensures that reverting a subtree removes the node and all its descendents. We test this by
+/// comparing against a reference mempool that never had the subtree inserted at all.
 #[test]
-fn reverted_transactions_and_descendents_are_non_existent() {
-    let mut uut = Mempool::for_tests();
+fn subtree_reversion_removes_all_descendents() {
+    let (mut uut, mut reference) = Mempool::for_tests();
 
     let reverted_txs = MockProvenTxBuilder::sequential();
 
@@ -243,47 +226,48 @@ fn reverted_transactions_and_descendents_are_non_existent() {
     uut.select_batch().unwrap();
 
     uut.add_transaction(reverted_txs[1].clone()).unwrap();
-    uut.select_batch().unwrap();
+    let (to_revert, _) = uut.select_batch().unwrap();
 
     uut.add_transaction(reverted_txs[2].clone()).unwrap();
-    uut.revert_transactions(vec![reverted_txs[1].id()]).unwrap();
+    uut.revert_subtree(NodeId::ProposedBatch(to_revert));
 
     // We expect the second batch and the latter reverted txns to be non-existent.
-    let mut reference = Mempool::for_tests();
     reference.add_transaction(reverted_txs[0].clone()).unwrap();
     reference.select_batch().unwrap();
 
     assert_eq!(uut, reference);
 }
 
-/// Reverting transactions causes their batches to also revert. These batches in turn contain
-/// non-reverted transactions which should be requeued (and not reverted).
+/// We've decided that transactions from a rolled back batch should be requeued.
+///
+/// This test checks this at a basic level by ensuring that rolling back a batch is the same as
+/// never selecting that batch i.e. that the set of unbatched transactions remains the same.
 #[test]
-fn reverted_transaction_batches_are_requeued() {
-    let mut uut = Mempool::for_tests();
+fn transactions_from_reverted_batches_are_requeued() {
+    let (mut uut, mut reference) = Mempool::for_tests();
 
-    let unrelated_txs = MockProvenTxBuilder::sequential();
-    let reverted_txs = MockProvenTxBuilder::sequential();
+    let tx_set_a = MockProvenTxBuilder::sequential();
+    let tx_set_b = MockProvenTxBuilder::sequential();
 
-    uut.add_transaction(reverted_txs[0].clone()).unwrap();
-    uut.add_transaction(unrelated_txs[0].clone()).unwrap();
+    uut.add_transaction(tx_set_b[0].clone()).unwrap();
+    uut.add_transaction(tx_set_a[0].clone()).unwrap();
     uut.select_batch().unwrap();
 
-    uut.add_transaction(reverted_txs[1].clone()).unwrap();
-    uut.add_transaction(unrelated_txs[1].clone()).unwrap();
-    uut.select_batch().unwrap();
+    uut.add_transaction(tx_set_b[1].clone()).unwrap();
+    uut.add_transaction(tx_set_a[1].clone()).unwrap();
+    let (batch_id, _) = uut.select_batch().unwrap();
 
-    uut.add_transaction(reverted_txs[2].clone()).unwrap();
-    uut.add_transaction(unrelated_txs[2].clone()).unwrap();
-    uut.revert_transactions(vec![reverted_txs[1].id()]).unwrap();
+    uut.add_transaction(tx_set_b[2].clone()).unwrap();
+    uut.add_transaction(tx_set_a[2].clone()).unwrap();
+    uut.rollback_batch(batch_id);
 
-    // We expect the second batch and the latter reverted txns to be non-existent.
-    let mut reference = Mempool::for_tests();
-    reference.add_transaction(reverted_txs[0].clone()).unwrap();
-    reference.add_transaction(unrelated_txs[0].clone()).unwrap();
+    reference.add_transaction(tx_set_b[0].clone()).unwrap();
+    reference.add_transaction(tx_set_a[0].clone()).unwrap();
     reference.select_batch().unwrap();
-    reference.add_transaction(unrelated_txs[1].clone()).unwrap();
-    reference.add_transaction(unrelated_txs[2].clone()).unwrap();
+    reference.add_transaction(tx_set_b[1].clone()).unwrap();
+    reference.add_transaction(tx_set_a[1].clone()).unwrap();
+    reference.add_transaction(tx_set_b[2].clone()).unwrap();
+    reference.add_transaction(tx_set_a[2].clone()).unwrap();
 
     assert_eq!(uut, reference);
 }
diff --git a/crates/block-producer/src/mempool/tests/add_transaction.rs b/crates/block-producer/src/mempool/tests/add_transaction.rs
new file mode 100644
index 000000000..97820a8bb
--- /dev/null
+++ b/crates/block-producer/src/mempool/tests/add_transaction.rs
@@ -0,0 +1,520 @@
+use std::sync::Arc;
+
+use assert_matches::assert_matches;
+use miden_objects::Word;
+use miden_objects::block::BlockHeader;
+
+use crate::domain::transaction::AuthenticatedTransaction;
+use crate::errors::AddTransactionError;
+use crate::mempool::Mempool;
+use crate::test_utils::{MockProvenTxBuilder, mock_account_id};
+
+#[test]
+fn valid_with_state_from_multiple_parents() {
+    let (mut uut, _) = Mempool::for_tests();
+
+    let parent_a = MockProvenTxBuilder::with_account(
+        mock_account_id(1),
+        Word::empty(),
+        Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .private_notes_created_range(0..1)
+    .build();
+
+    let parent_b = MockProvenTxBuilder::with_account(
+        mock_account_id(2),
+        Word::empty(),
+        Word::new([300u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .private_notes_created_range(1..2)
+    .build();
+
+    let parent_c = MockProvenTxBuilder::with_account(
+        mock_account_id(3),
+        Word::empty(),
+        Word::new([4500u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .private_notes_created_range(2..3)
+    .build();
+
+    let child = MockProvenTxBuilder::with_account(
+        parent_a.account_id(),
+        parent_a.account_update().final_state_commitment(),
+        Word::new([4u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .unauthenticated_notes_range(0..3)
+    .build();
+
+    for tx in [parent_a, parent_b, parent_c, child] {
+        let tx = AuthenticatedTransaction::from_inner(tx);
+        let tx = Arc::new(tx);
+
+        uut.add_transaction(tx).unwrap();
+    }
+}
+
+/// Ensures that transactions that expire before or within the expiration slack of the chain tip
+/// are rejected.
+mod tx_expiration {
+    use super::*;
+
+    fn setup() -> Mempool {
+        let (mut uut, _) = Mempool::for_tests();
+        assert!(
+            uut.config.expiration_slack > 0,
+            "Test is only useful if there is some expiration slack"
+        );
+
+        // Create at least some locally retained state.
+        let slack = uut.config.expiration_slack;
+        for _ in 0..slack + 10 {
+            let (number, _) = uut.select_block();
+            let header = BlockHeader::mock(number, None, None, &[], Word::default());
+            uut.commit_block(header);
+        }
+
+        uut
+    }
+
+    #[test]
+    fn expiration_after_slack_limit_is_accepted() {
+        let mut uut = setup();
+        let limit = uut.chain_tip + uut.config.expiration_slack;
+
+        let tx = MockProvenTxBuilder::with_account_index(0)
+            .expiration_block_num(limit.child())
+            .build();
+        let tx = AuthenticatedTransaction::from_inner(tx).with_authentication_height(uut.chain_tip);
+        let tx = Arc::new(tx);
+        uut.add_transaction(tx).unwrap();
+    }
+
+    #[test]
+    fn expiration_within_slack_limit_is_rejected() {
+        let mut uut = setup();
+        let limit = uut.chain_tip + uut.config.expiration_slack;
+
+        for i in uut.chain_tip.child().as_u32()..=limit.as_u32() {
+            let tx = MockProvenTxBuilder::with_account_index(0)
+                .expiration_block_num(i.into())
+                .build();
+            let tx =
+                AuthenticatedTransaction::from_inner(tx).with_authentication_height(uut.chain_tip);
+            let tx = Arc::new(tx);
+            let result = uut.add_transaction(tx);
+
+            assert_matches!(
+                result,
+                Err(AddTransactionError::Expired { .. }),
+                "Failed run with expiration {i} and limit {limit}"
+            );
+        }
+    }
+
+    #[test]
+    fn already_expired_is_rejected() {
+        let mut uut = setup();
+        let tx = MockProvenTxBuilder::with_account_index(0)
+            .expiration_block_num(uut.chain_tip)
+            .build();
+        let tx = AuthenticatedTransaction::from_inner(tx).with_authentication_height(uut.chain_tip);
+        let tx = Arc::new(tx);
+        let result = uut.add_transaction(tx);
+
+        assert_matches!(result, Err(AddTransactionError::Expired { .. }));
+    }
+}
+
+/// Ensures that a transaction's authentication height is always within the overlap between the
+/// store chain tip and the locally retained state.
+mod authentication_height {
+    use super::*;
+
+    fn setup() -> Mempool {
+        let (mut uut, _) = Mempool::for_tests();
+        assert!(
+            uut.config.state_retention.get() > 0,
+            "Test is only useful if there is some retained state"
+        );
+
+        // Create at least some locally retained state.
+        let retention = uut.config.state_retention.get();
+        for _ in 0..retention + 10 {
+            let (number, _) = uut.select_block();
+            let header = BlockHeader::mock(number, None, None, &[], Word::default());
+            uut.commit_block(header);
+        }
+
+        uut
+    }
+
+    /// We expect a rejection if the tx was authenticated in some gap between the store and local
+    /// state i.e. `oldest_local - 2`.
+    #[test]
+    fn stale_inputs_are_rejected() {
+        let mut uut = setup();
+
+        let oldest_local = uut.chain_tip.as_u32() - uut.config.state_retention.get() as u32 + 1;
+
+        let tx = MockProvenTxBuilder::with_account_index(0).build();
+        let tx = AuthenticatedTransaction::from_inner(tx)
+            .with_authentication_height((oldest_local - 2).into());
+        let tx = Arc::new(tx);
+        uut.add_transaction(tx).unwrap_err();
+    }
+
+    /// Ensures that we guard against authentication height from lying about imaginary blocks beyond
+    /// the chain tip. Since the authentication height is determined by the store, and this is
+    /// considered internal, we panic as this is completely abnormal.
+    #[test]
+    #[should_panic]
+    fn inputs_from_beyond_the_chain_tip_are_rejected() {
+        let mut uut = setup();
+
+        let tx = MockProvenTxBuilder::with_account_index(0).build();
+        let tx = AuthenticatedTransaction::from_inner(tx)
+            .with_authentication_height(uut.chain_tip.child());
+        let tx = Arc::new(tx);
+        let _ = uut.add_transaction(tx);
+    }
+
+    /// We expect transactions to be accepted in the `oldest-1..` range. We already test `>
+    /// chain_tip` above. The `-1` is because we only require that there is _no gap_ between the
+    /// authentication height and the local state, which would mean we are unable to authenticate
+    /// against those blocks.
+    #[test]
+    fn inputs_from_within_overlap_are_accepted() {
+        let mut uut = setup();
+
+        let oldest_local = uut.chain_tip.as_u32() - uut.config.state_retention.get() as u32 + 1;
+
+        for i in oldest_local - 1..=uut.chain_tip.as_u32() {
+            let tx = MockProvenTxBuilder::with_account_index(i).build();
+            let tx = AuthenticatedTransaction::from_inner(tx).with_authentication_height(i.into());
+            let tx = Arc::new(tx);
+
+            let result = uut.add_transaction(tx);
+
+            assert_matches!(
+                result,
+                Ok(..),
+                "Failed run with authentication height {i}, chain tip {} and oldest local {oldest_local}",
+                uut.chain_tip
+            );
+        }
+    }
+}
+
+#[test]
+fn duplicate_nullifiers_are_rejected() {
+    let (mut uut, _) = Mempool::for_tests();
+
+    let tx_a = MockProvenTxBuilder::with_account(
+        mock_account_id(111),
+        Word::empty(),
+        Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .nullifiers_range(1..11)
+    .build();
+    let tx_a = AuthenticatedTransaction::from_inner(tx_a);
+    let tx_a = Arc::new(tx_a);
+
+    let tx_b = MockProvenTxBuilder::with_account(
+        mock_account_id(222),
+        Word::empty(),
+        Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .nullifiers_range(10..20)
+    .build();
+    let tx_b = AuthenticatedTransaction::from_inner(tx_b);
+    let tx_b = Arc::new(tx_b);
+
+    uut.add_transaction(tx_a).unwrap();
+    let result = uut.add_transaction(tx_b);
+
+    // We overlap with one nullifier.
+    assert_matches!(
+        result,
+        Err(AddTransactionError::VerificationFailed(
+            crate::errors::VerifyTxError::InputNotesAlreadyConsumed { .. }
+        ))
+    );
+}
+
+#[test]
+fn duplicate_output_notes_are_rejected() {
+    let (mut uut, _) = Mempool::for_tests();
+
+    let tx_a = MockProvenTxBuilder::with_account(
+        mock_account_id(111),
+        Word::empty(),
+        Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .private_notes_created_range(0..11)
+    .build();
+    let tx_a = AuthenticatedTransaction::from_inner(tx_a);
+    let tx_a = Arc::new(tx_a);
+
+    let tx_b = MockProvenTxBuilder::with_account(
+        mock_account_id(222),
+        Word::empty(),
+        Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .private_notes_created_range(10..20)
+    .build();
+    let tx_b = AuthenticatedTransaction::from_inner(tx_b);
+    let tx_b = Arc::new(tx_b);
+
+    uut.add_transaction(tx_a).unwrap();
+    let result = uut.add_transaction(tx_b);
+
+    assert_matches!(
+        result,
+        Err(AddTransactionError::VerificationFailed(
+            crate::errors::VerifyTxError::OutputNotesAlreadyExist { .. }
+        ))
+    );
+}
+
+#[test]
+fn unknown_unauthenticated_notes_are_rejected() {
+    let (mut uut, _) = Mempool::for_tests();
+
+    let tx_a = MockProvenTxBuilder::with_account(
+        mock_account_id(111),
+        Word::empty(),
+        Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .private_notes_created_range(0..11)
+    .build();
+    let tx_a = AuthenticatedTransaction::from_inner(tx_a);
+    let tx_a = Arc::new(tx_a);
+
+    let tx_b = MockProvenTxBuilder::with_account(
+        mock_account_id(222),
+        Word::empty(),
+        Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .unauthenticated_notes_range(0..12)
+    .build();
+    let tx_b = AuthenticatedTransaction::from_inner(tx_b);
+    let tx_b = Arc::new(tx_b);
+
+    uut.add_transaction(tx_a).unwrap();
+    let result = uut.add_transaction(tx_b);
+
+    assert_matches!(
+        result,
+        Err(AddTransactionError::VerificationFailed(
+            crate::errors::VerifyTxError::UnauthenticatedNotesNotFound { .. }
+        ))
+    );
+}
+
+mod account_state {
+    use super::*;
+
+    #[test]
+    fn matches_mempool_state() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let txs = MockProvenTxBuilder::sequential();
+        for tx in txs {
+            uut.add_transaction(tx).unwrap();
+        }
+    }
+
+    #[test]
+    fn matches_store_state() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let account_id = mock_account_id(123);
+
+        let tx = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::new([0u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+            Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+        )
+        .build();
+        let tx = AuthenticatedTransaction::from_inner(tx);
+        let tx = Arc::new(tx);
+
+        uut.add_transaction(tx).unwrap();
+    }
+
+    /// An inflight account state takes preference over the store's account state as the mempool's
+    /// will also consider inflight transaction effects. This test ensures that this is the case.
+    #[test]
+    fn mempool_commitment_overrides_store() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let account_id = mock_account_id(123);
+
+        let tx_a = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::empty(),
+            Word::new([0u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+        )
+        .build();
+        let tx_b = MockProvenTxBuilder::with_account(
+            account_id,
+            tx_a.account_update().final_state_commitment(),
+            Word::new([10u32.into(), 11u32.into(), 12u32.into(), 13u32.into()]),
+        )
+        .build();
+        let tx_a = AuthenticatedTransaction::from_inner(tx_a);
+        let tx_b = AuthenticatedTransaction::from_inner(tx_b).with_store_state(Word::new([
+            30u32.into(),
+            31u32.into(),
+            32u32.into(),
+            33u32.into(),
+        ]));
+
+        let tx_a = Arc::new(tx_a);
+        let tx_b = Arc::new(tx_b);
+
+        uut.add_transaction(tx_a).unwrap();
+        // We expect this to succeed because the local mempool account state will be correct, even
+        // though the store's account state is a mismatch.
+        uut.add_transaction(tx_b).unwrap();
+    }
+
+    #[test]
+    fn mismatch_with_mempool_is_rejected() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let account_id = mock_account_id(123);
+
+        let tx_a = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::empty(),
+            Word::new([0u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+        )
+        .build();
+        let tx_b = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::new([10u32.into(), 11u32.into(), 12u32.into(), 13u32.into()]),
+            Word::new([20u32.into(), 11u32.into(), 12u32.into(), 13u32.into()]),
+        )
+        .build();
+        let tx_a = AuthenticatedTransaction::from_inner(tx_a);
+        let tx_b = AuthenticatedTransaction::from_inner(tx_b);
+        let tx_a = Arc::new(tx_a);
+        let tx_b = Arc::new(tx_b);
+
+        uut.add_transaction(tx_a).unwrap();
+        let result = uut.add_transaction(tx_b);
+
+        assert_matches!(
+            result,
+            Err(AddTransactionError::VerificationFailed(
+                crate::errors::VerifyTxError::IncorrectAccountInitialCommitment { .. }
+            ))
+        );
+    }
+
+    /// Ensures that store state is checked if there is no local mempool state.
+    #[test]
+    fn mismatch_with_store_is_rejected() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let account_id = mock_account_id(123);
+
+        let tx = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::new([0u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+            Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+        )
+        .build();
+        let tx = AuthenticatedTransaction::from_inner(tx).with_store_state(Word::new([
+            6u32.into(),
+            1u32.into(),
+            2u32.into(),
+            3u32.into(),
+        ]));
+        let tx = Arc::new(tx);
+
+        let result = uut.add_transaction(tx);
+        assert_matches!(
+            result,
+            Err(AddTransactionError::VerificationFailed(
+                crate::errors::VerifyTxError::IncorrectAccountInitialCommitment { .. }
+            ))
+        );
+    }
+}
+
+mod new_account {
+    use super::*;
+
+    #[test]
+    fn is_valid() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let account_id = mock_account_id(123);
+
+        let tx = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::empty(),
+            Word::new([0u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+        )
+        .build();
+        let tx = AuthenticatedTransaction::from_inner(tx);
+        let tx = Arc::new(tx);
+        uut.add_transaction(tx).unwrap();
+    }
+
+    #[test]
+    fn already_exists_in_store() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let account_id = mock_account_id(123);
+
+        let tx = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::empty(),
+            Word::new([0u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+        )
+        .build();
+        let tx = AuthenticatedTransaction::from_inner(tx).with_store_state(Word::new([
+            5u32.into(),
+            1u32.into(),
+            2u32.into(),
+            3u32.into(),
+        ]));
+        let tx = Arc::new(tx);
+        let result = uut.add_transaction(tx);
+        assert_matches!(
+            result,
+            Err(AddTransactionError::VerificationFailed(
+                crate::errors::VerifyTxError::IncorrectAccountInitialCommitment { .. }
+            ))
+        );
+    }
+
+    #[test]
+    fn already_exists_in_mempool() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let account_id = mock_account_id(123);
+
+        let tx = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::empty(),
+            Word::new([0u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+        )
+        .build();
+        let tx = AuthenticatedTransaction::from_inner(tx);
+        let tx = Arc::new(tx);
+
+        uut.add_transaction(tx.clone()).unwrap();
+
+        let result = uut.add_transaction(tx);
+        assert_matches!(
+            result,
+            Err(AddTransactionError::VerificationFailed(
+                crate::errors::VerifyTxError::IncorrectAccountInitialCommitment { .. }
+            ))
+        );
+    }
+}
diff --git a/crates/block-producer/src/test_utils/batch.rs b/crates/block-producer/src/test_utils/batch.rs
index 770611793..878b155db 100644
--- a/crates/block-producer/src/test_utils/batch.rs
+++ b/crates/block-producer/src/test_utils/batch.rs
@@ -26,7 +26,7 @@ pub trait TransactionBatchConstructor {
 
     /// Returns a `TransactionBatch` with `notes_per_tx.len()` transactions, where the i'th
     /// transaction has `notes_per_tx[i]` notes created
-    fn from_notes_created(starting_account_index: u32, notes_per_tx: &[u64]) -> Self;
+    fn from_notes_created(starting_account_index: u32, notes_per_tx: &[u32]) -> Self;
 
     /// Returns a `TransactionBatch` which contains `num_txs_in_batch` transactions
     fn from_txs(starting_account_index: u32, num_txs_in_batch: u64) -> Self;
@@ -74,12 +74,12 @@ impl TransactionBatchConstructor for ProvenBatch {
         .unwrap()
     }
 
-    fn from_notes_created(starting_account_index: u32, notes_per_tx: &[u64]) -> Self {
+    fn from_notes_created(starting_account_index: u32, notes_per_tx: &[u32]) -> Self {
         let txs: Vec<_> = notes_per_tx
             .iter()
             .enumerate()
             .map(|(index, &num_notes)| {
-                let starting_note_index = u64::from(starting_account_index) + index as u64;
+                let starting_note_index = starting_account_index + index as u32;
                 MockProvenTxBuilder::with_account_index(starting_account_index + index as u32)
                     .private_notes_created_range(
                         starting_note_index..(starting_note_index + num_notes),
diff --git a/crates/block-producer/src/test_utils/mod.rs b/crates/block-producer/src/test_utils/mod.rs
index a3ef2ff3a..0695ceadf 100644
--- a/crates/block-producer/src/test_utils/mod.rs
+++ b/crates/block-producer/src/test_utils/mod.rs
@@ -6,7 +6,7 @@ use miden_objects::transaction::TransactionId;
 
 mod proven_tx;
 
-pub use proven_tx::{MockProvenTxBuilder, mock_proven_tx};
+pub use proven_tx::MockProvenTxBuilder;
 
 mod account;
 
diff --git a/crates/block-producer/src/test_utils/proven_tx.rs b/crates/block-producer/src/test_utils/proven_tx.rs
index c5d9e26fb..22bf1d4ca 100644
--- a/crates/block-producer/src/test_utils/proven_tx.rs
+++ b/crates/block-producer/src/test_utils/proven_tx.rs
@@ -6,7 +6,7 @@ use miden_node_utils::fee::test_fee;
 use miden_objects::account::AccountId;
 use miden_objects::asset::FungibleAsset;
 use miden_objects::block::BlockNumber;
-use miden_objects::note::{Note, NoteExecutionHint, NoteHeader, NoteMetadata, NoteType, Nullifier};
+use miden_objects::note::{Note, Nullifier};
 use miden_objects::transaction::{
     InputNote,
     OutputNote,
@@ -14,7 +14,7 @@ use miden_objects::transaction::{
     ProvenTransactionBuilder,
 };
 use miden_objects::vm::ExecutionProof;
-use miden_objects::{Felt, Hasher, ONE, Word};
+use miden_objects::{Felt, ONE, Word};
 use rand::Rng;
 
 use super::MockPrivateAccount;
@@ -116,20 +116,21 @@ impl MockProvenTxBuilder {
     }
 
     #[must_use]
-    pub fn private_notes_created_range(self, range: Range<u64>) -> Self {
+    pub fn unauthenticated_notes_range(self, range: Range<u32>) -> Self {
+        let notes = range
+            .map(|note_index| Note::mock_noop(Word::from([0, 0, 0, note_index])))
+            .collect();
+
+        self.unauthenticated_notes(notes)
+    }
+
+    #[must_use]
+    pub fn private_notes_created_range(self, range: Range<u32>) -> Self {
         let notes = range
             .map(|note_index| {
-                let note_id = Hasher::hash(&note_index.to_be_bytes());
-                let note_metadata = NoteMetadata::new(
-                    self.account_id,
-                    NoteType::Private,
-                    0.into(),
-                    NoteExecutionHint::none(),
-                    ONE,
-                )
-                .unwrap();
+                let note = Note::mock_noop(Word::from([0, 0, 0, note_index]));
 
-                OutputNote::Header(NoteHeader::new(note_id.into(), note_metadata))
+                OutputNote::Header(*note.header())
             })
             .collect();
 
@@ -155,14 +156,3 @@ impl MockProvenTxBuilder {
         .unwrap()
     }
 }
-
-pub fn mock_proven_tx(
-    account_index: u8,
-    unauthenticated_notes: Vec<Note>,
-    output_notes: Vec<OutputNote>,
-) -> ProvenTransaction {
-    MockProvenTxBuilder::with_account_index(account_index.into())
-        .unauthenticated_notes(unauthenticated_notes)
-        .output_notes(output_notes)
-        .build()
-}

From 0cbde7ef19adbdcbcff648d5409466b5a9e8b0f3 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Mon, 13 Oct 2025 15:22:34 -0300
Subject: [PATCH 48/78] fix: enable OTel by default in network monitor (#1286)

---
 bin/network-monitor/src/config.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/network-monitor/src/config.rs b/bin/network-monitor/src/config.rs
index 24394186e..f79dce52a 100644
--- a/bin/network-monitor/src/config.rs
+++ b/bin/network-monitor/src/config.rs
@@ -97,6 +97,7 @@ pub struct MonitorConfig {
         long = "enable-otel",
         env = "MIDEN_MONITOR_ENABLE_OTEL",
         action = clap::ArgAction::SetTrue,
+        default_value_t = true,
         help = "Whether to enable OpenTelemetry"
     )]
     pub enable_otel: bool,

From 006bb05522fc3fdc587df605ea31f8ba384bb2e4 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Mon, 13 Oct 2025 17:28:17 -0300
Subject: [PATCH 49/78] feat: application level errors (#1266)

* wip: application level errors

* review: add macro to impl trait, add Eq to enums, move trait definition

* chore: create domain error enum, create into_tonic_status macro

* feat: return app-level errors from grpc methods

* docs: add CHANGELOG entry

* fix: bad block range calculation

* docs: add errors to readmes

* review: add empty range error

* review: add error section on crates/proto/README

* chore: use proc_macro

* chore: add license and workspace lints

* fix: lints

* review: remove aliasing on GrpcError

* review: flatten VerifyTxError variants in AddTransactionError

* review: clean up grpc conversion for ADdTransactionError
---
 CHANGELOG.md                                  |   1 +
 Cargo.lock                                    |   9 +
 Cargo.toml                                    |  20 +-
 crates/block-producer/src/errors.rs           | 195 +++++-------------
 crates/block-producer/src/errors_test.rs      |  58 ------
 crates/block-producer/src/lib.rs              |   3 -
 .../src/mempool/inflight_state/mod.rs         |  12 +-
 crates/grpc-error-macro/Cargo.toml            |  23 +++
 crates/grpc-error-macro/README.md             | 111 ++++++++++
 crates/grpc-error-macro/src/lib.rs            | 180 ++++++++++++++++
 crates/proto/Cargo.toml                       |  19 +-
 crates/proto/README.md                        |   9 +
 crates/proto/src/domain/block.rs              |  43 +++-
 crates/proto/src/{errors.rs => errors/mod.rs} |   5 +
 crates/proto/src/errors/test_macro.rs         |  69 +++++++
 crates/rpc/README.md                          |  89 +++++++-
 crates/store/README.md                        |  89 ++++++++
 crates/store/src/errors.rs                    | 143 ++++++++++++-
 crates/store/src/server/api.rs                |  95 +++++++--
 crates/store/src/server/block_producer.rs     |  11 +-
 crates/store/src/server/rpc_api.rs            | 176 ++++++++++------
 docs/src/developer/rpc.md                     |  16 --
 22 files changed, 1032 insertions(+), 344 deletions(-)
 delete mode 100644 crates/block-producer/src/errors_test.rs
 create mode 100644 crates/grpc-error-macro/Cargo.toml
 create mode 100644 crates/grpc-error-macro/README.md
 create mode 100644 crates/grpc-error-macro/src/lib.rs
 rename crates/proto/src/{errors.rs => errors/mod.rs} (94%)
 create mode 100644 crates/proto/src/errors/test_macro.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 602fd9bd5..20187f38b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - Implemented storage map `DataStore` function ([#1226](https://github.com/0xMiden/miden-node/pull/1226)).
 - [BREAKING] Renamed `RemoteProverProxy` to `RemoteProverClient` ([#1236](https://github.com/0xMiden/miden-node/pull/1236)).
 - Added pagination to `SyncNotes` endpoint ([#1257](https://github.com/0xMiden/miden-node/pull/1257)).
+- Added application level error in gRPC endpoints ([#1266](https://github.com/0xMiden/miden-node/pull/1266)).
 - [BREAKING] Response type nuances of `GetAccountProof` in the public store API (#[1277](https://github.com/0xMiden/miden-node/pull/1277)).
 
 ## v0.11.2 (2025-09-10)
diff --git a/Cargo.lock b/Cargo.lock
index 4411401ea..e5e4b2555 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2508,6 +2508,14 @@ dependencies = [
  "winterfell",
 ]
 
+[[package]]
+name = "miden-node-grpc-error-macro"
+version = "0.12.0"
+dependencies = [
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "miden-node-ntx-builder"
 version = "0.12.0"
@@ -2537,6 +2545,7 @@ dependencies = [
  "fs-err",
  "hex",
  "http",
+ "miden-node-grpc-error-macro",
  "miden-node-proto-build",
  "miden-node-utils",
  "miden-objects",
diff --git a/Cargo.toml b/Cargo.toml
index 0932d007c..5a59a71a8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,6 +5,7 @@ members = [
   "bin/remote-prover",
   "bin/stress-test",
   "crates/block-producer",
+  "crates/grpc-error-macro",
   "crates/ntx-builder",
   "crates/proto",
   "crates/remote-prover-client",
@@ -34,15 +35,16 @@ opt-level = 2
 
 [workspace.dependencies]
 # Workspace crates.
-miden-node-block-producer  = { path = "crates/block-producer", version = "0.12" }
-miden-node-ntx-builder     = { path = "crates/ntx-builder", version = "0.12" }
-miden-node-proto           = { path = "crates/proto", version = "0.12" }
-miden-node-proto-build     = { path = "proto", version = "0.12" }
-miden-node-rpc             = { path = "crates/rpc", version = "0.12" }
-miden-node-store           = { path = "crates/store", version = "0.12" }
-miden-node-test-macro      = { path = "crates/test-macro" }
-miden-node-utils           = { path = "crates/utils", version = "0.12" }
-miden-remote-prover-client = { path = "crates/remote-prover-client", version = "0.12" }
+miden-node-block-producer   = { path = "crates/block-producer", version = "0.12" }
+miden-node-grpc-error-macro = { path = "crates/grpc-error-macro" }
+miden-node-ntx-builder      = { path = "crates/ntx-builder", version = "0.12" }
+miden-node-proto            = { path = "crates/proto", version = "0.12" }
+miden-node-proto-build      = { path = "proto", version = "0.12" }
+miden-node-rpc              = { path = "crates/rpc", version = "0.12" }
+miden-node-store            = { path = "crates/store", version = "0.12" }
+miden-node-test-macro       = { path = "crates/test-macro" }
+miden-node-utils            = { path = "crates/utils", version = "0.12" }
+miden-remote-prover-client  = { path = "crates/remote-prover-client", version = "0.12" }
 
 # miden-base aka protocol dependencies. These should be updated in sync.
 miden-block-prover    = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
diff --git a/crates/block-producer/src/errors.rs b/crates/block-producer/src/errors.rs
index 22062f4ac..79a6a9597 100644
--- a/crates/block-producer/src/errors.rs
+++ b/crates/block-producer/src/errors.rs
@@ -1,6 +1,5 @@
 use miden_block_prover::ProvenBlockError;
-use miden_node_proto::errors::ConversionError;
-use miden_node_utils::ErrorReport;
+use miden_node_proto::errors::{ConversionError, GrpcError};
 use miden_node_utils::formatting::format_opt;
 use miden_objects::account::AccountId;
 use miden_objects::block::BlockNumber;
@@ -75,14 +74,38 @@ pub enum VerifyTxError {
 // Transaction adding errors
 // =================================================================================================
 
-#[derive(Debug, Error)]
+#[derive(Debug, Error, GrpcError)]
 pub enum AddTransactionError {
-    #[error("transaction verification failed")]
-    VerificationFailed(#[from] VerifyTxError),
+    #[error(
+        "input notes with given nullifiers were already consumed by another transaction: {0:?}"
+    )]
+    InputNotesAlreadyConsumed(Vec<Nullifier>),
+
+    #[error(
+        "unauthenticated transaction notes were not found in the store or in outputs of in-flight transactions: {0:?}"
+    )]
+    UnauthenticatedNotesNotFound(Vec<NoteId>),
+
+    #[error("output note IDs already used: {0:?}")]
+    OutputNotesAlreadyExist(Vec<NoteId>),
+
+    #[error("transaction's initial state commitment {tx_initial_account_commitment} does not match the account's current value of {}", format_opt(.current_account_commitment.as_ref()))]
+    IncorrectAccountInitialCommitment {
+        tx_initial_account_commitment: Word,
+        current_account_commitment: Option<Word>,
+    },
+
+    #[error("failed to retrieve transaction inputs from the store")]
+    #[grpc(internal)]
+    StoreConnectionFailed(#[from] StoreError),
+
+    #[error("invalid transaction proof error for transaction: {0}")]
+    InvalidTransactionProof(TransactionId),
 
     #[error(
         "transaction input data from block {input_block} is rejected as stale because it is older than the limit of {stale_limit}"
     )]
+    #[grpc(internal)]
     StaleInputs {
         input_block: BlockNumber,
         stale_limit: BlockNumber,
@@ -100,161 +123,43 @@ pub enum AddTransactionError {
     },
 }
 
-impl AddTransactionError {
-    fn api_error(&self) -> SubmitProvenTransactionGrpcError {
-        match self {
-            AddTransactionError::VerificationFailed(tx_verify_error) => match tx_verify_error {
-                VerifyTxError::InputNotesAlreadyConsumed(_) => {
-                    SubmitProvenTransactionGrpcError::InputNotesAlreadyConsumed
-                },
-                VerifyTxError::StoreConnectionFailed(_) => {
-                    SubmitProvenTransactionGrpcError::Internal
-                },
-                VerifyTxError::UnauthenticatedNotesNotFound(_) => {
-                    SubmitProvenTransactionGrpcError::UnauthenticatedNotesNotFound
-                },
-                VerifyTxError::OutputNotesAlreadyExist(_) => {
-                    SubmitProvenTransactionGrpcError::OutputNotesAlreadyExist
-                },
-                VerifyTxError::IncorrectAccountInitialCommitment { .. } => {
-                    SubmitProvenTransactionGrpcError::IncorrectAccountInitialCommitment
-                },
-                VerifyTxError::InvalidTransactionProof(_) => {
-                    SubmitProvenTransactionGrpcError::InvalidTransactionProof
-                },
+impl From<VerifyTxError> for AddTransactionError {
+    fn from(err: VerifyTxError) -> Self {
+        match err {
+            VerifyTxError::InputNotesAlreadyConsumed(nullifiers) => {
+                Self::InputNotesAlreadyConsumed(nullifiers)
             },
-            AddTransactionError::StaleInputs { .. } => SubmitProvenTransactionGrpcError::Internal,
-            AddTransactionError::Expired { .. } => {
-                SubmitProvenTransactionGrpcError::TransactionExpired
+            VerifyTxError::UnauthenticatedNotesNotFound(note_ids) => {
+                Self::UnauthenticatedNotesNotFound(note_ids)
             },
-            AddTransactionError::TransactionDeserializationFailed(_) => {
-                SubmitProvenTransactionGrpcError::DeserializationFailed
+            VerifyTxError::OutputNotesAlreadyExist(note_ids) => {
+                Self::OutputNotesAlreadyExist(note_ids)
             },
+            VerifyTxError::IncorrectAccountInitialCommitment {
+                tx_initial_account_commitment,
+                current_account_commitment,
+            } => Self::IncorrectAccountInitialCommitment {
+                tx_initial_account_commitment,
+                current_account_commitment,
+            },
+            VerifyTxError::StoreConnectionFailed(store_err) => {
+                Self::StoreConnectionFailed(store_err)
+            },
+            VerifyTxError::InvalidTransactionProof(tx_id) => Self::InvalidTransactionProof(tx_id),
         }
     }
 }
 
-impl From<AddTransactionError> for tonic::Status {
-    fn from(value: AddTransactionError) -> Self {
-        let api_error = value.api_error();
-
-        let message = if api_error.is_internal() {
-            "Internal error".to_owned()
-        } else {
-            value.as_report()
-        };
-
-        tonic::Status::with_details(
-            api_error.tonic_code(),
-            message,
-            // Details are serialized as a single byte containing the error code value.
-            // Clients can decode this by reading the first byte of the details field.
-            // Example: details[0] will contain the SubmitProvenTransactionError enum value (0-8)
-            vec![api_error.api_code()].into(),
-        )
-    }
-}
-
-// Submit proven transaction error codes for gRPC Status::details
-// =================================================================================================
-
-#[derive(Debug, Copy, Clone)]
-#[repr(u8)]
-pub(crate) enum SubmitProvenTransactionGrpcError {
-    Internal = 0,
-    DeserializationFailed = 1,
-    InvalidTransactionProof = 2,
-    IncorrectAccountInitialCommitment = 3,
-    InputNotesAlreadyConsumed = 4,
-    UnauthenticatedNotesNotFound = 5,
-    OutputNotesAlreadyExist = 6,
-    TransactionExpired = 7,
-}
-
-impl SubmitProvenTransactionGrpcError {
-    pub fn api_code(self) -> u8 {
-        self as u8
-    }
-
-    pub fn tonic_code(self) -> tonic::Code {
-        if self.is_internal() {
-            tonic::Code::Internal
-        } else {
-            tonic::Code::InvalidArgument
-        }
-    }
-
-    pub fn is_internal(self) -> bool {
-        matches!(self, SubmitProvenTransactionGrpcError::Internal)
-    }
-}
-
 // Submit proven batch by user errors
 // =================================================================================================
 
-#[derive(Debug, Error)]
+#[derive(Debug, Error, GrpcError)]
+#[grpc(internal)]
 pub enum SubmitProvenBatchError {
     #[error("batch deserialization failed")]
     Deserialization(#[source] miden_objects::utils::DeserializationError),
 }
 
-impl SubmitProvenBatchError {
-    fn api_error(&self) -> SubmitProvenBatchGrpcError {
-        match self {
-            SubmitProvenBatchError::Deserialization(_) => {
-                SubmitProvenBatchGrpcError::DeserializationFailed
-            },
-        }
-    }
-}
-
-impl From<SubmitProvenBatchError> for tonic::Status {
-    fn from(value: SubmitProvenBatchError) -> Self {
-        let api_error = value.api_error();
-
-        let message = if api_error.is_internal() {
-            "Internal error".to_owned()
-        } else {
-            value.as_report()
-        };
-
-        tonic::Status::with_details(
-            api_error.tonic_code(),
-            message,
-            vec![api_error.api_code()].into(),
-        )
-    }
-}
-
-// Submit proven batch error codes for gRPC Status::details
-// =================================================================================================
-
-#[derive(Debug, Copy, Clone)]
-#[repr(u8)]
-pub(crate) enum SubmitProvenBatchGrpcError {
-    #[allow(dead_code)]
-    Internal = 0,
-    DeserializationFailed = 1,
-}
-
-impl SubmitProvenBatchGrpcError {
-    pub fn api_code(self) -> u8 {
-        self as u8
-    }
-
-    pub fn tonic_code(self) -> tonic::Code {
-        if self.is_internal() {
-            tonic::Code::Internal
-        } else {
-            tonic::Code::InvalidArgument
-        }
-    }
-
-    pub fn is_internal(self) -> bool {
-        matches!(self, SubmitProvenBatchGrpcError::Internal)
-    }
-}
-
 // Batch building errors
 // =================================================================================================
 
diff --git a/crates/block-producer/src/errors_test.rs b/crates/block-producer/src/errors_test.rs
deleted file mode 100644
index 0d6f519c9..000000000
--- a/crates/block-producer/src/errors_test.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-#[cfg(test)]
-mod tests {
-    use miden_objects::Word;
-    use miden_objects::block::BlockNumber;
-    use miden_objects::note::{NoteId, Nullifier};
-    use miden_tx::utils::DeserializationError;
-
-    use crate::errors::{AddTransactionError, SubmitProvenTransactionGrpcError, VerifyTxError};
-
-    #[rstest::rstest]
-    #[test]
-    #[case::inputs_already_consumed_error(
-        AddTransactionError::VerificationFailed(
-            VerifyTxError::InputNotesAlreadyConsumed(vec![Nullifier::dummy(1)])
-        ),
-        SubmitProvenTransactionGrpcError::InputNotesAlreadyConsumed,
-        "verification failed",
-    )]
-    #[case::unauthenticated_notes_not_found_error(
-        AddTransactionError::VerificationFailed(
-            VerifyTxError::UnauthenticatedNotesNotFound(vec![NoteId::new(Word::default(), Word::default())])
-        ),
-        SubmitProvenTransactionGrpcError::UnauthenticatedNotesNotFound,
-        "verification failed",
-    )]
-    #[case::stale_inputs_error(
-        AddTransactionError::StaleInputs { input_block: BlockNumber::from(100), stale_limit: BlockNumber::from(150) },
-        SubmitProvenTransactionGrpcError::Internal,
-        "Internal error",
-    )]
-    #[case::expired_error(
-        AddTransactionError::Expired { expired_at: BlockNumber::from(200), limit: BlockNumber::from(250) },
-        SubmitProvenTransactionGrpcError::TransactionExpired,
-        "expired",
-    )]
-    #[case::transaction_deserialization_failed_error(
-        AddTransactionError::TransactionDeserializationFailed(DeserializationError::InvalidValue("test error".to_string())),
-        SubmitProvenTransactionGrpcError::DeserializationFailed,
-        "deserialization",
-    )]
-    fn submit_transaction_error_mapping(
-        #[case] uut: AddTransactionError,
-        #[case] expected: SubmitProvenTransactionGrpcError,
-        #[case] message: &str,
-    ) {
-        let status = tonic::Status::from(uut);
-        assert_eq!(status.code(), expected.tonic_code());
-        assert!(status.message().contains(message));
-
-        let api_code = match status.details() {
-            &[single] => single,
-            other => panic!(
-                "Details should contain exactly one byte for the api error code, but got {other:?}"
-            ),
-        };
-        assert_eq!(api_code, expected.api_code());
-    }
-}
diff --git a/crates/block-producer/src/lib.rs b/crates/block-producer/src/lib.rs
index 81482ea08..817c03aa0 100644
--- a/crates/block-producer/src/lib.rs
+++ b/crates/block-producer/src/lib.rs
@@ -15,9 +15,6 @@ pub mod errors;
 #[cfg(not(feature = "testing"))]
 mod errors;
 
-#[cfg(test)]
-mod errors_test;
-
 pub mod server;
 pub use server::BlockProducer;
 
diff --git a/crates/block-producer/src/mempool/inflight_state/mod.rs b/crates/block-producer/src/mempool/inflight_state/mod.rs
index b836dd1e2..3f8e45ec9 100644
--- a/crates/block-producer/src/mempool/inflight_state/mod.rs
+++ b/crates/block-producer/src/mempool/inflight_state/mod.rs
@@ -450,9 +450,9 @@ mod tests {
 
         assert_matches!(
             err,
-            AddTransactionError::VerificationFailed(VerifyTxError::InputNotesAlreadyConsumed(
+            AddTransactionError::InputNotesAlreadyConsumed(
                 notes
-            )) if notes == vec![mock_note(note_seed).nullifier()]
+            ) if notes == vec![mock_note(note_seed).nullifier()]
         );
     }
 
@@ -476,9 +476,9 @@ mod tests {
 
         assert_matches!(
             err,
-            AddTransactionError::VerificationFailed(VerifyTxError::OutputNotesAlreadyExist(
+            AddTransactionError::OutputNotesAlreadyExist(
                 notes
-            )) if notes == vec![note.id()]
+            ) if notes == vec![note.id()]
         );
     }
 
@@ -496,10 +496,10 @@ mod tests {
 
         assert_matches!(
             err,
-            AddTransactionError::VerificationFailed(VerifyTxError::IncorrectAccountInitialCommitment {
+            AddTransactionError::IncorrectAccountInitialCommitment {
                 tx_initial_account_commitment: init_state,
                 current_account_commitment: current_state,
-            }) if init_state == states[0] && current_state == states[2].into()
+            } if init_state == states[0] && current_state == states[2].into()
         );
     }
 
diff --git a/crates/grpc-error-macro/Cargo.toml b/crates/grpc-error-macro/Cargo.toml
new file mode 100644
index 000000000..2524e1b35
--- /dev/null
+++ b/crates/grpc-error-macro/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+categories  = ["no-std"]
+description = "Procedural macro for deriving GrpcError trait (internal implementation detail - use miden-node-proto)"
+keywords    = ["grpc", "miden", "node"]
+name        = "miden-node-grpc-error-macro"
+publish     = false                                                                                                   # Internal implementation detail
+
+edition.workspace      = true
+license.workspace      = true
+readme.workspace       = true
+repository.workspace   = true
+rust-version.workspace = true
+version.workspace      = true
+
+[lints]
+workspace = true
+
+[lib]
+proc-macro = true
+
+[dependencies]
+quote = "1.0"
+syn   = { features = ["full"], version = "2.0" }
diff --git a/crates/grpc-error-macro/README.md b/crates/grpc-error-macro/README.md
new file mode 100644
index 000000000..ea835ef2c
--- /dev/null
+++ b/crates/grpc-error-macro/README.md
@@ -0,0 +1,111 @@
+# miden-node-grpc-error-macro
+
+Procedural macro for deriving the `GrpcError` trait on error enums, reducing boilerplate in gRPC error handling.
+
+## Overview
+
+This macro automatically generates:
+1. A companion `*GrpcError` enum with `#[repr(u8)]` for wire serialization
+2. An `api_error()` method that maps error variants to their gRPC representations
+3. Implementation of the `GrpcError` trait for the companion enum
+
+## Usage
+
+### Basic Example
+
+```rust
+use miden_node_grpc_error_macro::GrpcError;
+use thiserror::Error;
+
+#[derive(Debug, Error, GrpcError)]
+pub enum GetNoteScriptByRootError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    
+    #[error("malformed script root")]
+    DeserializationFailed(#[from] ConversionError),
+    
+    #[error("script with given root doesn't exist")]
+    ScriptNotFound,
+}
+```
+
+### Generated Code
+
+The above example generates:
+
+```rust
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[repr(u8)]
+pub enum GetNoteScriptByRootGrpcError {
+    /// Internal server error
+    Internal = 0,
+    /// Malformed script root
+    DeserializationFailed = 1,
+    /// Script with given root doesn't exist
+    ScriptNotFound = 2,
+}
+
+impl GrpcError for GetNoteScriptByRootGrpcError {
+    fn api_code(self) -> u8 {
+        self as u8
+    }
+    
+    fn is_internal(&self) -> bool {
+        matches!(self, Self::Internal)
+    }
+}
+
+impl GetNoteScriptByRootError {
+    pub fn api_error(&self) -> GetNoteScriptByRootGrpcError {
+        match self {
+            GetNoteScriptByRootError::DatabaseError(_) => 
+                GetNoteScriptByRootGrpcError::Internal,
+            GetNoteScriptByRootError::DeserializationFailed(_) => 
+                GetNoteScriptByRootGrpcError::DeserializationFailed,
+            GetNoteScriptByRootError::ScriptNotFound => 
+                GetNoteScriptByRootGrpcError::ScriptNotFound,
+        }
+    }
+}
+
+impl From<GetNoteScriptByRootError> for tonic::Status {
+    fn from(value: GetNoteScriptByRootError) -> Self {
+        let api_error = value.api_error();
+        let message = if api_error.is_internal() {
+            "Internal error".to_owned()
+        } else {
+            value.as_report()
+        };
+        tonic::Status::with_details(
+            api_error.tonic_code(),
+            message,
+            vec![api_error.api_code()].into(),
+        )
+    }
+}
+```
+
+## Attributes
+
+### `#[grpc(internal)]`
+
+Mark a variant as an internal error. This will:
+- Map the variant to `*GrpcError::Internal` instead of creating a separate variant
+- Result in the error being serialized with `tonic::Code::Internal` instead of `tonic::Code::InvalidArgument`
+
+```rust
+#[derive(Debug, Error, GrpcError)]
+pub enum MyError {
+    #[error("database connection failed")]
+    #[grpc(internal)]  // Maps to MyGrpcError::Internal
+    DatabaseError(#[from] DatabaseError),
+    
+    #[error("invalid input")]
+    InvalidInput,  // Creates MyGrpcError::InvalidInput variant
+}
+```
+
+## License
+This project is [MIT licensed](../../LICENSE).
diff --git a/crates/grpc-error-macro/src/lib.rs b/crates/grpc-error-macro/src/lib.rs
new file mode 100644
index 000000000..a898d49dc
--- /dev/null
+++ b/crates/grpc-error-macro/src/lib.rs
@@ -0,0 +1,180 @@
+//! Procedural macro for deriving the `GrpcError` trait on error enums.
+//!
+//! This macro simplifies the creation of gRPC-compatible error enums by automatically:
+//! - Generating a companion error enum for gRPC serialization
+//! - Implementing the `GrpcError` trait
+//! - Providing proper error code mappings
+//! - Generating `From<Error> for tonic::Status` conversion
+//!
+//! # Example
+//!
+//! ```rust,ignore
+//! use miden_node_grpc_error_macro::GrpcError;
+//! use thiserror::Error;
+//!
+//! #[derive(Debug, Error, GrpcError)]
+//! pub enum GetNoteScriptByRootError {
+//!     #[error("database error")]
+//!     #[grpc(internal)]
+//!     DatabaseError(#[from] DatabaseError),
+//!     
+//!     #[error("malformed script root")]
+//!     DeserializationFailed,
+//!     
+//!     #[error("script with given root doesn't exist")]
+//!     ScriptNotFound,
+//! }
+//! ```
+
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::{Data, DeriveInput, Fields, Ident, parse_macro_input};
+
+/// Derives the `GrpcError` trait for an error enum.
+///
+/// # Attributes
+///
+/// - `#[grpc(internal)]` - Marks a variant as an internal error (will map to
+///   `tonic::Code::Internal`)
+///
+/// # Generated Code
+///
+/// This macro generates:
+/// 1. A companion `*GrpcError` enum with `#[repr(u8)]` for wire serialization
+/// 2. An implementation of the `GrpcError` trait for the companion enum
+/// 3. A method `api_error()` on the original enum that maps to the companion enum
+/// 4. An implementation of `From<Error> for tonic::Status` for automatic error conversion
+#[proc_macro_derive(GrpcError, attributes(grpc))]
+pub fn derive_grpc_error(input: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(input as DeriveInput);
+
+    let name = &input.ident;
+    let vis = &input.vis;
+    let grpc_name = Ident::new(&format!("{name}GrpcError"), name.span());
+
+    let variants = match &input.data {
+        Data::Enum(data) => &data.variants,
+        _ => {
+            return syn::Error::new_spanned(name, "GrpcError can only be derived for enums")
+                .to_compile_error()
+                .into();
+        },
+    };
+
+    // Build the GrpcError enum variants
+    let mut grpc_variants = Vec::new();
+    let mut api_error_arms = Vec::new();
+
+    // Always add Internal variant (standard practice for gRPC errors)
+    grpc_variants.push(quote! {
+        /// Internal server error
+        Internal = 0
+    });
+    let mut discriminant = 1u8;
+
+    for variant in variants {
+        let variant_name = &variant.ident;
+
+        // Check if this variant is marked as internal
+        let is_internal = variant.attrs.iter().any(|attr| {
+            attr.path().is_ident("grpc")
+                && attr.parse_args::<Ident>().map(|i| i == "internal").unwrap_or(false)
+        });
+
+        // Extract doc comments
+        let docs: Vec<_> =
+            variant.attrs.iter().filter(|attr| attr.path().is_ident("doc")).collect();
+
+        if is_internal {
+            // Map to Internal variant
+            let pattern = match &variant.fields {
+                Fields::Unit => quote! { #name::#variant_name },
+                Fields::Unnamed(_) => quote! { #name::#variant_name(..) },
+                Fields::Named(_) => quote! { #name::#variant_name { .. } },
+            };
+
+            api_error_arms.push(quote! {
+                #pattern => #grpc_name::Internal
+            });
+        } else {
+            // Create a corresponding variant in GrpcError enum
+            grpc_variants.push(quote! {
+                #(#docs)*
+                #variant_name = #discriminant
+            });
+
+            let pattern = match &variant.fields {
+                Fields::Unit => quote! { #name::#variant_name },
+                Fields::Unnamed(_) => quote! { #name::#variant_name(..) },
+                Fields::Named(_) => quote! { #name::#variant_name { .. } },
+            };
+
+            api_error_arms.push(quote! {
+                #pattern => #grpc_name::#variant_name
+            });
+
+            discriminant += 1;
+        }
+    }
+
+    let expanded = quote! {
+        #[derive(Debug, Copy, Clone, PartialEq, Eq)]
+        #[repr(u8)]
+        #vis enum #grpc_name {
+            #(#grpc_variants,)*
+        }
+
+        impl #grpc_name {
+            /// Returns the error code for this gRPC error.
+            pub fn api_code(self) -> u8 {
+                self as u8
+            }
+
+            /// Returns true if this is an internal server error.
+            pub fn is_internal(&self) -> bool {
+                matches!(self, Self::Internal)
+            }
+
+            /// Returns the appropriate tonic code for this error.
+            pub fn tonic_code(&self) -> tonic::Code {
+                if self.is_internal() {
+                    tonic::Code::Internal
+                } else {
+                    tonic::Code::InvalidArgument
+                }
+            }
+        }
+
+        impl #name {
+            /// Maps this error to its gRPC error code representation.
+            pub fn api_error(&self) -> #grpc_name {
+                match self {
+                    #(#api_error_arms,)*
+                }
+            }
+        }
+
+        // Automatically implement From<Error> for tonic::Status
+        impl From<#name> for tonic::Status {
+            fn from(value: #name) -> Self {
+                let api_error = value.api_error();
+
+                let message = if api_error.is_internal() {
+                    "Internal error".to_owned()
+                } else {
+                    // Use ErrorReport trait to get detailed error message
+                    use miden_node_utils::ErrorReport as _;
+                    value.as_report()
+                };
+
+                tonic::Status::with_details(
+                    api_error.tonic_code(),
+                    message,
+                    vec![api_error.api_code()].into(),
+                )
+            }
+        }
+    };
+
+    TokenStream::from(expanded)
+}
diff --git a/crates/proto/Cargo.toml b/crates/proto/Cargo.toml
index bf23a9547..1b806581b 100644
--- a/crates/proto/Cargo.toml
+++ b/crates/proto/Cargo.toml
@@ -15,15 +15,16 @@ version.workspace      = true
 workspace = true
 
 [dependencies]
-anyhow           = { workspace = true }
-hex              = { version = "0.4" }
-http             = { workspace = true }
-miden-node-utils = { workspace = true }
-miden-objects    = { workspace = true }
-prost            = { workspace = true }
-thiserror        = { workspace = true }
-tonic            = { workspace = true }
-url              = { workspace = true }
+anyhow                      = { workspace = true }
+hex                         = { version = "0.4" }
+http                        = { workspace = true }
+miden-node-grpc-error-macro = { workspace = true }
+miden-node-utils            = { workspace = true }
+miden-objects               = { workspace = true }
+prost                       = { workspace = true }
+thiserror                   = { workspace = true }
+tonic                       = { workspace = true }
+url                         = { workspace = true }
 
 [dev-dependencies]
 proptest = { version = "1.7" }
diff --git a/crates/proto/README.md b/crates/proto/README.md
index 7a1a1d646..41edaae06 100644
--- a/crates/proto/README.md
+++ b/crates/proto/README.md
@@ -6,5 +6,14 @@ This crate contains protobuf bindings for the APIs exposed by the components of
 > This crate is intended for internal use only. For gRPC bindings please see the [miden-node-proto-build](../../proto/README.md) crate.\
 > This crate does not support TLS and cannot be used as a client for the official RPC endpoints.
 
+## Error handling
+
+The node's gRPC endpoints return rich error information using gRPC status details. Each component exposes its own set of error codes which are included in the response details.
+
+- Error types are defined in this crate's `src/errors/` directory:
+  - `src/errors/mod.rs` - Common error traits and conversion utilities
+  - `src/errors/store.rs` - Store component gRPC error enums
+  - `src/errors/block_producer.rs` - Block producer component gRPC error enums
+
 ## License
 This project is [MIT licensed](../../LICENSE).
diff --git a/crates/proto/src/domain/block.rs b/crates/proto/src/domain/block.rs
index 4967fbeb7..dd449e2b9 100644
--- a/crates/proto/src/domain/block.rs
+++ b/crates/proto/src/domain/block.rs
@@ -12,6 +12,7 @@ use miden_objects::block::{
 use miden_objects::note::{NoteId, NoteInclusionProof};
 use miden_objects::transaction::PartialBlockchain;
 use miden_objects::utils::{Deserializable, Serializable};
+use thiserror::Error;
 
 use crate::errors::{ConversionError, MissingFieldHelper};
 use crate::{AccountWitnessRecord, NullifierWitnessRecord, generated as proto};
@@ -218,18 +219,48 @@ impl From<&FeeParameters> for proto::blockchain::FeeParameters {
 // BLOCK RANGE
 // ================================================================================================
 
+#[derive(Debug, Clone, Error, PartialEq, Eq)]
+pub enum InvalidBlockRange {
+    #[error("start ({start}) greater than end ({end})")]
+    StartGreaterThanEnd { start: BlockNumber, end: BlockNumber },
+    #[error("empty range: start ({start})..end ({end})")]
+    EmptyRange { start: BlockNumber, end: BlockNumber },
+}
+
 impl proto::rpc_store::BlockRange {
     /// Converts the block range into an inclusive range, using the fallback block number if the
     /// block to is not specified.
-    pub fn into_inclusive_range(self, fallback: BlockNumber) -> RangeInclusive<BlockNumber> {
-        RangeInclusive::new(
+    pub fn into_inclusive_range<T: From<InvalidBlockRange>>(
+        self,
+        fallback: &BlockNumber,
+    ) -> Result<RangeInclusive<BlockNumber>, T> {
+        let block_range = RangeInclusive::new(
             self.block_from.into(),
-            self.block_to.map_or(fallback, BlockNumber::from),
-        )
+            self.block_to.map_or(*fallback, BlockNumber::from),
+        );
+
+        if block_range.start() > block_range.end() {
+            return Err(InvalidBlockRange::StartGreaterThanEnd {
+                start: *block_range.start(),
+                end: *block_range.end(),
+            }
+            .into());
+        }
+
+        if block_range.is_empty() {
+            return Err(InvalidBlockRange::EmptyRange {
+                start: *block_range.start(),
+                end: *block_range.end(),
+            }
+            .into());
+        }
+
+        Ok(block_range)
     }
+}
 
-    /// Converts an inclusive range into a [`proto::rpc_store::BlockRange`].
-    pub fn from_range(range: RangeInclusive<BlockNumber>) -> Self {
+impl From<RangeInclusive<BlockNumber>> for proto::rpc_store::BlockRange {
+    fn from(range: RangeInclusive<BlockNumber>) -> Self {
         Self {
             block_from: range.start().as_u32(),
             block_to: Some(range.end().as_u32()),
diff --git a/crates/proto/src/errors.rs b/crates/proto/src/errors/mod.rs
similarity index 94%
rename from crates/proto/src/errors.rs
rename to crates/proto/src/errors/mod.rs
index bef5a1468..5e461315c 100644
--- a/crates/proto/src/errors.rs
+++ b/crates/proto/src/errors/mod.rs
@@ -1,6 +1,8 @@
 use std::any::type_name;
 use std::num::TryFromIntError;
 
+// Re-export the GrpcError derive macro for convenience
+pub use miden_node_grpc_error_macro::GrpcError;
 use miden_objects::crypto::merkle::{SmtLeafError, SmtProofError};
 use miden_objects::utils::DeserializationError;
 use miden_objects::{AssetError, FeeError};
@@ -8,6 +10,9 @@ use thiserror::Error;
 
 use crate::domain::note::NetworkNoteError;
 
+#[cfg(test)]
+mod test_macro;
+
 #[derive(Debug, Error)]
 pub enum ConversionError {
     #[error("asset error")]
diff --git a/crates/proto/src/errors/test_macro.rs b/crates/proto/src/errors/test_macro.rs
new file mode 100644
index 000000000..abfc9ddcc
--- /dev/null
+++ b/crates/proto/src/errors/test_macro.rs
@@ -0,0 +1,69 @@
+//! Test to verify the `GrpcError` macro generates correct code
+
+use thiserror::Error;
+
+use crate::errors::GrpcError;
+
+#[derive(Debug, Error, GrpcError)]
+pub enum TestError {
+    #[error("internal error 1")]
+    #[grpc(internal)]
+    InternalError1,
+
+    #[error("client error 1")]
+    ClientError1,
+
+    #[error("internal error 2")]
+    #[grpc(internal)]
+    InternalError2,
+
+    #[error("client error 2")]
+    ClientError2,
+
+    #[error("client error 3")]
+    ClientError3,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_all_variants_mapped() {
+        // Test that all variants map correctly
+        assert_eq!(TestError::InternalError1.api_error(), TestErrorGrpcError::Internal);
+        assert_eq!(TestError::ClientError1.api_error(), TestErrorGrpcError::ClientError1);
+        assert_eq!(TestError::InternalError2.api_error(), TestErrorGrpcError::Internal);
+        assert_eq!(TestError::ClientError2.api_error(), TestErrorGrpcError::ClientError2);
+        assert_eq!(TestError::ClientError3.api_error(), TestErrorGrpcError::ClientError3);
+    }
+
+    #[test]
+    fn test_grpc_error_codes() {
+        // Verify the discriminant values
+        assert_eq!(TestErrorGrpcError::Internal.api_code(), 0);
+        assert_eq!(TestErrorGrpcError::ClientError1.api_code(), 1);
+        assert_eq!(TestErrorGrpcError::ClientError2.api_code(), 2);
+        assert_eq!(TestErrorGrpcError::ClientError3.api_code(), 3);
+    }
+
+    #[test]
+    fn test_is_internal() {
+        assert!(TestErrorGrpcError::Internal.is_internal());
+        assert!(!TestErrorGrpcError::ClientError1.is_internal());
+        assert!(!TestErrorGrpcError::ClientError2.is_internal());
+        assert!(!TestErrorGrpcError::ClientError3.is_internal());
+    }
+
+    #[test]
+    fn test_tonic_status_conversion() {
+        // Test that the automatic From<Error> for tonic::Status implementation works
+        let internal_status: tonic::Status = TestError::InternalError1.into();
+        assert_eq!(internal_status.code(), tonic::Code::Internal);
+        assert_eq!(internal_status.message(), "Internal error");
+
+        let client_status: tonic::Status = TestError::ClientError1.into();
+        assert_eq!(client_status.code(), tonic::Code::InvalidArgument);
+        assert_eq!(client_status.message(), "client error 1");
+    }
+}
diff --git a/crates/rpc/README.md b/crates/rpc/README.md
index 2d5ee75e3..408f0affb 100644
--- a/crates/rpc/README.md
+++ b/crates/rpc/README.md
@@ -36,6 +36,16 @@ The full gRPC method definitions can be found in the [proto](../proto/README.md)
 
 Returns a nullifier proof for each of the requested nullifiers.
 
+#### Error Handling
+
+When nullifier checking fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed nullifier format            |
+| `TOO_MANY_NULLIFIERS`     | 2     | `INVALID_ARGUMENT` | Too many nullifiers in request        |
+
 ---
 
 ### GetAccountDetails
@@ -67,12 +77,34 @@ authenticate the block's inclusion.
 
 Returns a list of notes matching the provided note IDs.
 
+#### Error Handling
+
+When note retrieval fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed note ID format              |
+| `NOTE_NOT_FOUND`          | 2     | `NOT_FOUND`        | One or more note IDs don't exist     |
+| `TOO_MANY_NOTE_IDS`       | 3     | `INVALID_ARGUMENT` | Too many note IDs in request          |
+| `NOTE_NOT_PUBLIC`         | 4     | `PERMISSION_DENIED`| Note details not publicly accessible  |
+
 ---
 
 ### GetNoteScriptByRoot
 
 Returns the script for a note by its root.
 
+#### Error Handling
+
+When script retrieval fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed script root format          |
+| `SCRIPT_NOT_FOUND`        | 2     | `NOT_FOUND`        | Script with given root doesn't exist  |
+
 ---
 
 ### SubmitProvenTransaction
@@ -112,6 +144,16 @@ range, the last block included in the response (`block_num`), and the current ch
 If the response is chunked due to exceeding the maximum returned entries, continue by issuing another request with
 consecutive block number to retrieve subsequent updates.
 
+#### Error Handling
+
+When nullifier synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed nullifier prefix format     |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `INVALID_PREFIX_LENGTH`   | 3     | `INVALID_ARGUMENT` | Unsupported prefix length (only 16)   |
 ---
 
 ### SyncAccountVault
@@ -122,6 +164,17 @@ For any `block_range`, the latest known set of assets is returned for the reques
 The data can be split and a cutoff block may be selected if there are too many assets to sync. The response contains
 the chain tip so that the caller knows when it has been reached.
 
+#### Error Handling
+
+When account vault synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed account ID format           |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `ACCOUNT_NOT_PUBLIC`      | 3     | `INVALID_ARGUMENT` | Account is not public (no vault sync) |
+
 ---
 
 ### SyncNotes
@@ -130,11 +183,21 @@ Returns info which can be used by the client to sync up to the tip of chain for
 
 Client specifies the `note_tags` they are interested in, and the block range from which to search for matching notes. The request will then return the next block containing any note matching the provided tags within the specified range.
 
-
 The response includes each note's metadata and inclusion proof.
 
 A basic note sync can be implemented by repeatedly requesting the previous response's block until reaching the tip of the chain.
 
+#### Error Handling
+
+When note synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed note tags format            |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `TOO_MANY_TAGS`           | 3     | `INVALID_ARGUMENT` | Too many note tags in request         |
+
 ---
 
 ### SyncState
@@ -162,12 +225,36 @@ Caller specifies the `account_id` of the public account and the block range `blo
 
 This endpoint enables clients to maintain an updated view of account storage.
 
+#### Error Handling
+
+When storage map synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed account ID format           |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `ACCOUNT_NOT_FOUND`       | 3     | `NOT_FOUND`        | Account ID does not exist             |
+| `ACCOUNT_NOT_PUBLIC`      | 4     | `INVALID_ARGUMENT` | Account storage not publicly accessible |
+
 ---
 
 ### SyncTransactions
 
 Returns transaction records for specific accounts within a block range.
 
+#### Error Handling
+
+When transaction synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed account ID format           |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `ACCOUNT_NOT_FOUND`       | 3     | `NOT_FOUND`        | Account ID does not exist             |
+| `TOO_MANY_ACCOUNT_IDS`    | 4     | `INVALID_ARGUMENT` | Too many account IDs in request       |
+
 ---
 
 ## License
diff --git a/crates/store/README.md b/crates/store/README.md
index e55f555ff..0b12487c1 100644
--- a/crates/store/README.md
+++ b/crates/store/README.md
@@ -43,6 +43,16 @@ Applies changes of a new block to the DB and in-memory data structures. Raw bloc
 
 Returns a nullifier proof for each of the requested nullifiers.
 
+#### Error Handling
+
+When nullifier checking fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed nullifier format            |
+| `TOO_MANY_NULLIFIERS`     | 2     | `INVALID_ARGUMENT` | Too many nullifiers in request        |
+
 ---
 
 ### GetAccountDetails
@@ -88,6 +98,18 @@ This is used by the `block-producer` as part of the batch proving process.
 
 Returns a list of notes matching the provided note IDs.
 
+#### Error Handling
+
+When note retrieval fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed note ID format              |
+| `NOTE_NOT_FOUND`          | 2     | `NOT_FOUND`        | One or more note IDs don't exist     |
+| `TOO_MANY_NOTE_IDS`       | 3     | `INVALID_ARGUMENT` | Too many note IDs in request          |
+| `NOTE_NOT_PUBLIC`         | 4     | `PERMISSION_DENIED`| Note details not publicly accessible  |
+
 ---
 
 ### GetTransactionInputs
@@ -100,6 +122,16 @@ Used by the `block-producer` to query state required to verify a submitted trans
 
 Returns the script for a note by its root.
 
+#### Error Handling
+
+When script retrieval fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed script root format          |
+| `SCRIPT_NOT_FOUND`        | 2     | `NOT_FOUND`        | Script with given root doesn't exist  |
+
 ---
 
 ### SyncNullifiers
@@ -113,6 +145,17 @@ range, the last block included in the response (`resp.block_num`), and the curre
 If the response is chunked (i.e., `resp.block_num < block_to`), continue by issuing another request with
 `block_from = block_num + 1` to retrieve subsequent updates.
 
+#### Error Handling
+
+When nullifier synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed nullifier prefix format     |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `INVALID_PREFIX_LENGTH`   | 3     | `INVALID_ARGUMENT` | Unsupported prefix length (only 16)   |
+
 ---
 
 ### SyncAccountVault
@@ -123,6 +166,17 @@ For any `block_range`, the latest known set of assets is returned for the reques
 The data can be split and a cutoff block may be selected if there are too many assets to sync. The response contains
 the chain tip so that the caller knows when it has been reached.
 
+#### Error Handling
+
+When account vault synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed account ID format           |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `ACCOUNT_NOT_PUBLIC`      | 3     | `INVALID_ARGUMENT` | Account is not public (no vault sync) |
+
 ---
 
 ### SyncNotes
@@ -135,6 +189,17 @@ The response includes each note's metadata and inclusion proof.
 
 A basic note sync can be implemented by repeatedly requesting the previous response's block until reaching the tip of the chain.
 
+#### Error Handling
+
+When note synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed note tags format            |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `TOO_MANY_TAGS`           | 3     | `INVALID_ARGUMENT` | Too many note tags in request         |
+
 ---
 
 ### SyncState
@@ -162,12 +227,36 @@ Caller specifies the `account_id` of the public account and the block range `blo
 
 This endpoint enables clients to maintain an updated view of account storage.
 
+#### Error Handling
+
+When storage map synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed account ID format           |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `ACCOUNT_NOT_FOUND`       | 3     | `NOT_FOUND`        | Account ID does not exist             |
+| `ACCOUNT_NOT_PUBLIC`      | 4     | `INVALID_ARGUMENT` | Account storage not publicly accessible |
+
 ---
 
 ### SyncTransactions
 
 Returns transaction records for specific accounts within a block range.
 
+#### Error Handling
+
+When transaction synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed account ID format           |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `ACCOUNT_NOT_FOUND`       | 3     | `NOT_FOUND`        | Account ID does not exist             |
+| `TOO_MANY_ACCOUNT_IDS`    | 4     | `INVALID_ARGUMENT` | Too many account IDs in request       |
+
 ---
 
 ## License
diff --git a/crates/store/src/errors.rs b/crates/store/src/errors.rs
index 353cb215a..f24b3ae20 100644
--- a/crates/store/src/errors.rs
+++ b/crates/store/src/errors.rs
@@ -3,6 +3,8 @@ use std::io;
 
 use deadpool_sync::InteractError;
 use miden_node_proto::domain::account::NetworkAccountError;
+use miden_node_proto::domain::block::InvalidBlockRange;
+use miden_node_proto::errors::{ConversionError, GrpcError};
 use miden_node_utils::limiter::QueryLimitError;
 use miden_objects::account::AccountId;
 use miden_objects::block::BlockNumber;
@@ -271,11 +273,13 @@ impl From<ApplyBlockError> for Status {
     }
 }
 
-#[derive(Error, Debug)]
+#[derive(Error, Debug, GrpcError)]
 pub enum GetBlockHeaderError {
     #[error("database error")]
+    #[grpc(internal)]
     DatabaseError(#[from] DatabaseError),
     #[error("error retrieving the merkle proof for the block")]
+    #[grpc(internal)]
     MmrError(#[from] MmrError),
 }
 
@@ -310,14 +314,23 @@ impl From<diesel::result::Error> for StateSyncError {
     }
 }
 
-#[derive(Error, Debug)]
+#[derive(Error, Debug, GrpcError)]
 pub enum NoteSyncError {
     #[error("database error")]
+    #[grpc(internal)]
     DatabaseError(#[from] DatabaseError),
     #[error("block headers table is empty")]
+    #[grpc(internal)]
     EmptyBlockHeadersTable,
     #[error("error retrieving the merkle proof for the block")]
+    #[grpc(internal)]
     MmrError(#[from] MmrError),
+    #[error("invalid block range")]
+    InvalidBlockRange(#[from] InvalidBlockRange),
+    #[error("too many note tags: received {0}, max {1}")]
+    TooManyNoteTags(usize, usize),
+    #[error("malformed note tags")]
+    DeserializationFailed(#[from] ConversionError),
 }
 
 impl From<diesel::result::Error> for NoteSyncError {
@@ -351,6 +364,132 @@ pub enum GetBatchInputsError {
     },
 }
 
+// SYNC NULLIFIERS ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum SyncNullifiersError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("invalid block range")]
+    InvalidBlockRange(#[from] InvalidBlockRange),
+    #[error("unsupported prefix length: {0} (only 16-bit prefixes are supported)")]
+    InvalidPrefixLength(u32),
+    #[error("malformed nullifier prefix")]
+    DeserializationFailed(#[from] ConversionError),
+}
+
+// SYNC ACCOUNT VAULT ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum SyncAccountVaultError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("invalid block range")]
+    InvalidBlockRange(#[from] InvalidBlockRange),
+    #[error("malformed account ID")]
+    DeserializationFailed(#[from] ConversionError),
+    #[error("account {0} is not public")]
+    AccountNotPublic(AccountId),
+}
+
+// SYNC STORAGE MAPS ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum SyncStorageMapsError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("invalid block range")]
+    InvalidBlockRange(#[from] InvalidBlockRange),
+    #[error("malformed account ID")]
+    DeserializationFailed(#[from] ConversionError),
+    #[error("account {0} not found")]
+    AccountNotFound(AccountId),
+    #[error("account {0} is not public")]
+    AccountNotPublic(AccountId),
+}
+
+// GET BLOCK BY NUMBER ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum GetBlockByNumberError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("malformed block number")]
+    DeserializationFailed(#[from] DeserializationError),
+}
+
+// GET NOTES BY ID ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum GetNotesByIdError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("malformed note ID")]
+    DeserializationFailed(#[from] ConversionError),
+    #[error("note {0} not found")]
+    NoteNotFound(miden_objects::note::NoteId),
+    #[error("too many note IDs: received {0}, max {1}")]
+    TooManyNoteIds(usize, usize),
+    #[error("note {0} is not public")]
+    NoteNotPublic(miden_objects::note::NoteId),
+}
+
+// GET NOTE SCRIPT BY ROOT ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum GetNoteScriptByRootError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("malformed script root")]
+    DeserializationFailed(#[from] ConversionError),
+    #[error("script with given root not found")]
+    ScriptNotFound,
+}
+
+// CHECK NULLIFIERS ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum CheckNullifiersError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("malformed nullifier")]
+    DeserializationFailed(#[from] ConversionError),
+    #[error("too many nullifiers: received {0}, maximum {1}")]
+    TooManyNullifiers(usize, usize),
+}
+
+// SYNC TRANSACTIONS ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum SyncTransactionsError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("invalid block range")]
+    InvalidBlockRange(#[from] InvalidBlockRange),
+    #[error("malformed account ID")]
+    DeserializationFailed(#[from] ConversionError),
+    #[error("account {0} not found")]
+    AccountNotFound(AccountId),
+    #[error("too many account IDs: received {0}, max {1}")]
+    TooManyAccountIds(usize, usize),
+}
+
 // Do not scope for `cfg(test)` - if it the traitbounds don't suffice the issue will already appear
 // in the compilation of the library or binary, which would prevent getting to compiling the
 // following code.
diff --git a/crates/store/src/server/api.rs b/crates/store/src/server/api.rs
index f59aac355..87d529bc5 100644
--- a/crates/store/src/server/api.rs
+++ b/crates/store/src/server/api.rs
@@ -34,8 +34,7 @@ impl StoreApi {
         let (block_header, mmr_proof) = self
             .state
             .get_block_header(block_num, request.include_mmr_proof.unwrap_or(false))
-            .await
-            .map_err(internal_error)?;
+            .await?;
 
         Ok(Response::new(proto::shared::BlockHeaderByNumberResponse {
             block_header: block_header.map(Into::into),
@@ -58,38 +57,98 @@ pub fn invalid_argument<E: core::fmt::Display>(err: E) -> Status {
     Status::invalid_argument(err.to_string())
 }
 
-pub fn read_account_id(id: Option<proto::account::AccountId>) -> Result<AccountId, Box<Status>> {
-    id.ok_or(invalid_argument("missing account ID"))?
-        .try_into()
-        .map_err(|err: ConversionError| {
-            invalid_argument(err.as_report_context("invalid account ID")).into()
-        })
+/// Converts `ConversionError` to Status for nullifier validation
+pub fn conversion_error_to_status(value: &ConversionError) -> Status {
+    invalid_argument(value.as_report_context("Invalid nullifier format"))
 }
 
-#[allow(clippy::result_large_err)]
-#[instrument(level = "debug", target = COMPONENT, skip_all, err)]
-pub fn read_account_ids(
-    account_ids: &[proto::account::AccountId],
-) -> Result<Vec<AccountId>, Status> {
+/// Reads a block range from a request, returning a specific error type if the field is missing
+pub fn read_block_range<E>(
+    block_range: Option<proto::rpc_store::BlockRange>,
+    entity: &'static str,
+) -> Result<proto::rpc_store::BlockRange, E>
+where
+    E: From<ConversionError>,
+{
+    block_range.ok_or_else(|| {
+        ConversionError::MissingFieldInProtobufRepresentation { entity, field_name: "block_range" }
+            .into()
+    })
+}
+
+/// Reads and converts a root field from a request to Word, returning a specific error type if
+/// conversion fails
+pub fn read_root<E>(
+    root: Option<proto::primitives::Digest>,
+    entity: &'static str,
+) -> Result<Word, E>
+where
+    E: From<ConversionError>,
+{
+    root.ok_or_else(|| ConversionError::MissingFieldInProtobufRepresentation {
+        entity,
+        field_name: "root",
+    })?
+    .try_into()
+    .map_err(Into::into)
+}
+
+/// Converts a collection of proto primitives to Words, returning a specific error type if
+/// conversion fails
+pub fn convert_digests_to_words<E, I>(digests: I) -> Result<Vec<Word>, E>
+where
+    E: From<ConversionError>,
+    I: IntoIterator,
+    I::Item: TryInto<Word, Error = ConversionError>,
+{
+    digests
+        .into_iter()
+        .map(TryInto::try_into)
+        .collect::<Result<Vec<_>, ConversionError>>()
+        .map_err(Into::into)
+}
+
+/// Reads account IDs from a request, returning a specific error type if conversion fails
+pub fn read_account_ids<E>(account_ids: &[proto::account::AccountId]) -> Result<Vec<AccountId>, E>
+where
+    E: From<ConversionError>,
+{
     account_ids
         .iter()
         .cloned()
         .map(AccountId::try_from)
         .collect::<Result<_, ConversionError>>()
-        .map_err(|_| invalid_argument("Byte array is not a valid AccountId"))
+        .map_err(Into::into)
+}
+
+pub fn read_account_id<E>(id: Option<proto::account::AccountId>) -> Result<AccountId, E>
+where
+    E: From<ConversionError>,
+{
+    id.ok_or_else(|| {
+        ConversionError::deserialization_error(
+            "AccountId",
+            miden_objects::crypto::utils::DeserializationError::InvalidValue(
+                "Missing account ID".to_string(),
+            ),
+        )
+    })?
+    .try_into()
+    .map_err(Into::into)
 }
 
 #[allow(clippy::result_large_err)]
 #[instrument(level = "debug", target = COMPONENT, skip_all, err)]
-pub fn validate_nullifiers(
-    nullifiers: &[proto::primitives::Digest],
-) -> Result<Vec<Nullifier>, Status> {
+pub fn validate_nullifiers<E>(nullifiers: &[proto::primitives::Digest]) -> Result<Vec<Nullifier>, E>
+where
+    E: From<ConversionError> + std::fmt::Display,
+{
     nullifiers
         .iter()
         .copied()
         .map(TryInto::try_into)
         .collect::<Result<_, ConversionError>>()
-        .map_err(|_| invalid_argument("Digest field is not in the modulus range"))
+        .map_err(Into::into)
 }
 
 #[allow(clippy::result_large_err)]
diff --git a/crates/store/src/server/block_producer.rs b/crates/store/src/server/block_producer.rs
index 8e2b7d221..9e4255ab0 100644
--- a/crates/store/src/server/block_producer.rs
+++ b/crates/store/src/server/block_producer.rs
@@ -14,6 +14,7 @@ use tracing::{debug, info, instrument};
 use crate::COMPONENT;
 use crate::server::api::{
     StoreApi,
+    conversion_error_to_status,
     internal_error,
     read_account_id,
     read_account_ids,
@@ -97,8 +98,9 @@ impl block_producer_server::BlockProducer for StoreApi {
     ) -> Result<Response<proto::block_producer_store::BlockInputs>, Status> {
         let request = request.into_inner();
 
-        let account_ids = read_account_ids(&request.account_ids)?;
-        let nullifiers = validate_nullifiers(&request.nullifiers)?;
+        let account_ids = read_account_ids::<Status>(&request.account_ids)?;
+        let nullifiers = validate_nullifiers(&request.nullifiers)
+            .map_err(|err| conversion_error_to_status(&err))?;
         let unauthenticated_notes = validate_notes(&request.unauthenticated_notes)?;
         let reference_blocks = read_block_numbers(&request.reference_blocks);
         let unauthenticated_notes = unauthenticated_notes.into_iter().collect();
@@ -163,8 +165,9 @@ impl block_producer_server::BlockProducer for StoreApi {
 
         debug!(target: COMPONENT, ?request);
 
-        let account_id = read_account_id(request.account_id).map_err(|err| *err)?;
-        let nullifiers = validate_nullifiers(&request.nullifiers)?;
+        let account_id = read_account_id::<Status>(request.account_id)?;
+        let nullifiers = validate_nullifiers(&request.nullifiers)
+            .map_err(|err| conversion_error_to_status(&err))?;
         let unauthenticated_notes = validate_notes(&request.unauthenticated_notes)?;
 
         let tx_inputs = self
diff --git a/crates/store/src/server/rpc_api.rs b/crates/store/src/server/rpc_api.rs
index 1f5aa021f..66125365a 100644
--- a/crates/store/src/server/rpc_api.rs
+++ b/crates/store/src/server/rpc_api.rs
@@ -1,9 +1,7 @@
+use miden_node_proto::convert;
 use miden_node_proto::domain::account::AccountInfo;
-use miden_node_proto::errors::ConversionError;
 use miden_node_proto::generated::rpc_store::rpc_server;
 use miden_node_proto::generated::{self as proto};
-use miden_node_proto::{convert, try_convert};
-use miden_node_utils::ErrorReport as _;
 use miden_objects::Word;
 use miden_objects::account::AccountId;
 use miden_objects::note::NoteId;
@@ -11,15 +9,36 @@ use tonic::{Request, Response, Status};
 use tracing::{debug, info, instrument};
 
 use crate::COMPONENT;
+use crate::errors::{
+    CheckNullifiersError,
+    GetBlockByNumberError,
+    GetNoteScriptByRootError,
+    GetNotesByIdError,
+    NoteSyncError,
+    SyncAccountVaultError,
+    SyncNullifiersError,
+    SyncStorageMapsError,
+    SyncTransactionsError,
+};
 use crate::server::api::{
     StoreApi,
+    convert_digests_to_words,
     internal_error,
-    invalid_argument,
     read_account_id,
     read_account_ids,
+    read_block_range,
+    read_root,
     validate_nullifiers,
 };
 
+// CONSTANTS
+// ================================================================================================
+
+const MAX_ACCOUNT_IDS: usize = 100;
+const MAX_NULLIFIERS: usize = 100;
+const MAX_NOTE_TAGS: usize = 100;
+const MAX_NOTE_IDS: usize = 100;
+
 // CLIENT ENDPOINTS
 // ================================================================================================
 
@@ -64,7 +83,16 @@ impl rpc_server::Rpc for StoreApi {
         // Validate the nullifiers and convert them to Word values. Stop on first error.
         let request = request.into_inner();
 
-        let nullifiers = validate_nullifiers(&request.nullifiers)?;
+        // Validate nullifiers count
+        if request.nullifiers.len() > MAX_NULLIFIERS {
+            return Err(CheckNullifiersError::TooManyNullifiers(
+                request.nullifiers.len(),
+                MAX_NULLIFIERS,
+            )
+            .into());
+        }
+
+        let nullifiers = validate_nullifiers::<CheckNullifiersError>(&request.nullifiers)?;
 
         // Query the state for the request's nullifiers
         let proofs = self.state.check_nullifiers(&nullifiers).await;
@@ -93,19 +121,20 @@ impl rpc_server::Rpc for StoreApi {
         let request = request.into_inner();
 
         if request.prefix_len != 16 {
-            return Err(Status::invalid_argument("Only 16-bit prefixes are supported"));
+            return Err(SyncNullifiersError::InvalidPrefixLength(request.prefix_len).into());
         }
 
         let chain_tip = self.state.latest_block_num().await;
-        let block_range = request
-            .block_range
-            .ok_or(invalid_argument("block_range is required"))?
-            .into_inclusive_range(chain_tip);
+        let block_range =
+            read_block_range::<SyncNullifiersError>(request.block_range, "SyncNullifiersRequest")?
+                .into_inclusive_range::<SyncNullifiersError>(&chain_tip)?;
 
         let (nullifiers, block_num) = self
             .state
             .sync_nullifiers(request.prefix_len, request.nullifiers, block_range)
-            .await?;
+            .await
+            .map_err(SyncNullifiersError::from)?;
+
         let nullifiers = nullifiers
             .into_iter()
             .map(|nullifier_info| proto::rpc_store::sync_nullifiers_response::NullifierUpdate {
@@ -140,7 +169,7 @@ impl rpc_server::Rpc for StoreApi {
     ) -> Result<Response<proto::rpc_store::SyncStateResponse>, Status> {
         let request = request.into_inner();
 
-        let account_ids: Vec<AccountId> = read_account_ids(&request.account_ids)?;
+        let account_ids: Vec<AccountId> = read_account_ids::<Status>(&request.account_ids)?;
 
         let (state, delta) = self
             .state
@@ -196,17 +225,20 @@ impl rpc_server::Rpc for StoreApi {
     ) -> Result<Response<proto::rpc_store::SyncNotesResponse>, Status> {
         let request = request.into_inner();
 
-        let block_range = request.block_range.ok_or(invalid_argument("block_range is required"))?;
-
         let chain_tip = self.state.latest_block_num().await;
+        let block_range =
+            read_block_range::<NoteSyncError>(request.block_range, "SyncNotesRequest")?
+                .into_inclusive_range::<NoteSyncError>(&chain_tip)?;
+
+        // Validate note tags count
+        if request.note_tags.len() > MAX_NOTE_TAGS {
+            return Err(
+                NoteSyncError::TooManyNoteTags(request.note_tags.len(), MAX_NOTE_TAGS).into()
+            );
+        }
 
-        let block_range = block_range.into_inclusive_range(chain_tip);
-
-        let (state, mmr_proof, last_block_included) = self
-            .state
-            .sync_notes(request.note_tags, block_range)
-            .await
-            .map_err(internal_error)?;
+        let (state, mmr_proof, last_block_included) =
+            self.state.sync_notes(request.note_tags, block_range).await?;
 
         let notes = state.notes.into_iter().map(Into::into).collect();
 
@@ -242,16 +274,20 @@ impl rpc_server::Rpc for StoreApi {
 
         let note_ids = request.into_inner().ids;
 
-        let note_ids: Vec<Word> = try_convert(note_ids)
-            .collect::<Result<_, _>>()
-            .map_err(|err| Status::invalid_argument(format!("Invalid NoteId: {err}")))?;
+        // Validate note IDs count
+        if note_ids.len() > MAX_NOTE_IDS {
+            return Err(GetNotesByIdError::TooManyNoteIds(note_ids.len(), MAX_NOTE_IDS).into());
+        }
+
+        let note_ids: Vec<Word> = convert_digests_to_words::<GetNotesByIdError, _>(note_ids)?;
 
         let note_ids: Vec<NoteId> = note_ids.into_iter().map(From::from).collect();
 
         let notes = self
             .state
             .get_notes_by_id(note_ids)
-            .await?
+            .await
+            .map_err(GetNotesByIdError::from)?
             .into_iter()
             .map(Into::into)
             .collect();
@@ -274,7 +310,7 @@ impl rpc_server::Rpc for StoreApi {
         request: Request<proto::account::AccountId>,
     ) -> Result<Response<proto::account::AccountDetails>, Status> {
         let request = request.into_inner();
-        let account_id = read_account_id(Some(request)).map_err(|err| *err)?;
+        let account_id = read_account_id::<Status>(Some(request))?;
         let account_info: AccountInfo = self.state.get_account_details(account_id).await?;
 
         // TODO: revisit this, previous implementation was just returning only the summary, but it
@@ -299,7 +335,11 @@ impl rpc_server::Rpc for StoreApi {
 
         debug!(target: COMPONENT, ?request);
 
-        let block = self.state.load_block(request.block_num.into()).await?;
+        let block = self
+            .state
+            .load_block(request.block_num.into())
+            .await
+            .map_err(GetBlockByNumberError::from)?;
 
         Ok(Response::new(proto::blockchain::MaybeBlock { block }))
     }
@@ -342,26 +382,23 @@ impl rpc_server::Rpc for StoreApi {
         let request = request.into_inner();
         let chain_tip = self.state.latest_block_num().await;
 
-        let account_id: AccountId = read_account_id(request.account_id).map_err(|e| *e)?;
+        let account_id: AccountId = read_account_id::<SyncAccountVaultError>(request.account_id)?;
+
         if !account_id.is_public() {
-            return Err(Status::invalid_argument(format!(
-                "account with ID {account_id} is not public",
-            )));
+            return Err(SyncAccountVaultError::AccountNotPublic(account_id).into());
         }
 
-        let block_range = request.block_range.ok_or(invalid_argument("block_range is required"))?;
-
-        let block_range = block_range.into_inclusive_range(chain_tip);
-
-        if block_range.end() > &chain_tip {
-            return Err(Status::invalid_argument("block_to cannot be higher than the chain tip"));
-        }
+        let block_range = read_block_range::<SyncAccountVaultError>(
+            request.block_range,
+            "SyncAccountVaultRequest",
+        )?
+        .into_inclusive_range::<SyncAccountVaultError>(&chain_tip)?;
 
         let (last_included_block, updates) = self
             .state
             .sync_account_vault(account_id, block_range)
             .await
-            .map_err(internal_error)?;
+            .map_err(SyncAccountVaultError::from)?;
 
         let updates = updates
             .into_iter()
@@ -399,29 +436,24 @@ impl rpc_server::Rpc for StoreApi {
     ) -> Result<Response<proto::rpc_store::SyncStorageMapsResponse>, Status> {
         let request = request.into_inner();
 
-        let account_id = read_account_id(request.account_id).map_err(|e| *e)?;
+        let account_id = read_account_id::<SyncStorageMapsError>(request.account_id)?;
 
         if !account_id.is_public() {
-            return Err(Status::invalid_argument(format!(
-                "account with ID {account_id} is not public"
-            )));
+            Err(SyncStorageMapsError::AccountNotPublic(account_id))?;
         }
 
         let chain_tip = self.state.latest_block_num().await;
-        let block_range = request
-            .block_range
-            .ok_or(invalid_argument("block_range is required"))?
-            .into_inclusive_range(chain_tip);
-
-        if block_range.start() > block_range.end() {
-            return Err(Status::invalid_argument("block_from cannot be greater than block_to"));
-        }
+        let block_range = read_block_range::<SyncStorageMapsError>(
+            request.block_range,
+            "SyncStorageMapsRequest",
+        )?
+        .into_inclusive_range::<SyncStorageMapsError>(&chain_tip)?;
 
         let storage_maps_page = self
             .state
             .get_storage_map_sync_values(account_id, block_range)
             .await
-            .map_err(internal_error)?;
+            .map_err(SyncStorageMapsError::from)?;
 
         let updates = storage_maps_page
             .values
@@ -477,16 +509,13 @@ impl rpc_server::Rpc for StoreApi {
     ) -> Result<Response<proto::rpc_store::MaybeNoteScript>, Status> {
         debug!(target: COMPONENT, request = ?request);
 
-        let root = request
-            .into_inner()
-            .root
-            .ok_or(invalid_argument("missing root"))?
-            .try_into()
-            .map_err(|err: ConversionError| {
-                invalid_argument(err.as_report_context("invalid root"))
-            })?;
+        let root = read_root::<GetNoteScriptByRootError>(request.into_inner().root, "NoteRoot")?;
 
-        let note_script = self.state.get_note_script_by_root(root).await.map_err(internal_error)?;
+        let note_script = self
+            .state
+            .get_note_script_by_root(root)
+            .await
+            .map_err(GetNoteScriptByRootError::from)?;
 
         Ok(Response::new(proto::rpc_store::MaybeNoteScript {
             script: note_script.map(Into::into),
@@ -510,16 +539,29 @@ impl rpc_server::Rpc for StoreApi {
         let request = request.into_inner();
 
         let chain_tip = self.state.latest_block_num().await;
-        let block_range = request.block_range.ok_or(invalid_argument("block_range is required"))?;
-        let block_range = block_range.into_inclusive_range(chain_tip);
-
-        let account_ids: Vec<AccountId> = read_account_ids(&request.account_ids)?;
+        let block_range = read_block_range::<SyncTransactionsError>(
+            request.block_range,
+            "SyncTransactionsRequest",
+        )?
+        .into_inclusive_range::<SyncTransactionsError>(&chain_tip)?;
+
+        let account_ids: Vec<AccountId> =
+            read_account_ids::<SyncTransactionsError>(&request.account_ids)?;
+
+        // Validate account IDs count
+        if account_ids.len() > MAX_ACCOUNT_IDS {
+            return Err(SyncTransactionsError::TooManyAccountIds(
+                account_ids.len(),
+                MAX_ACCOUNT_IDS,
+            )
+            .into());
+        }
 
         let (last_block_included, transaction_records_db) = self
             .state
             .sync_transactions(account_ids, block_range.clone())
             .await
-            .map_err(internal_error)?;
+            .map_err(SyncTransactionsError::from)?;
 
         // Convert database TransactionRecord to proto TransactionRecord
         let mut transaction_records = Vec::with_capacity(transaction_records_db.len());
@@ -530,7 +572,7 @@ impl rpc_server::Rpc for StoreApi {
                 .state
                 .get_notes_by_id(tx_header.output_notes.clone())
                 .await
-                .map_err(internal_error)?;
+                .map_err(SyncTransactionsError::from)?;
 
             // Convert to proto using the helper method
             let proto_record = tx_header.into_proto_with_note_records(note_records);
diff --git a/docs/src/developer/rpc.md b/docs/src/developer/rpc.md
index bf561d008..dcc9c379a 100644
--- a/docs/src/developer/rpc.md
+++ b/docs/src/developer/rpc.md
@@ -50,19 +50,3 @@ enum SubmitProvenTransactionGrpcError {
 
 Error codes are embedded as single bytes in `Status.details`
 
-<!--
-
-TODO: show this once the endpoint is public
-
-### SubmitProvenBatch Errors
-
-Batch submission errors are:
-
-```rust
-enum SubmitProvenBatchGrpcError {
-    Internal = 0,
-    DeserializationFailed = 1,
-}
-```
-
--->

From eba297572d6467de03fcf4e5d0ccdcf954ba39f1 Mon Sep 17 00:00:00 2001
From: Serge Radinovich <47865535+sergerad@users.noreply.github.com>
Date: Tue, 14 Oct 2025 13:49:19 +1300
Subject: [PATCH 50/78] chore: Update base and remove TransactionWitness
 (#1288)

---
 Cargo.lock                                    | 838 ++++++++++--------
 bin/network-monitor/src/remote_prover.rs      |  10 +-
 bin/remote-prover/src/api/prover.rs           |  19 +-
 .../src/generated/conversions.rs              |   6 +-
 .../src/generated/remote_prover.rs            |   2 +-
 crates/ntx-builder/src/transaction.rs         |  17 +-
 crates/proto/src/generated/remote_prover.rs   |   2 +-
 .../generated/nostd/remote_prover.rs          |   2 +-
 .../generated/std/remote_prover.rs            |   2 +-
 .../src/remote_prover/tx_prover.rs            |  12 +-
 proto/proto/remote_prover.proto               |   2 +-
 11 files changed, 522 insertions(+), 390 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e5e4b2555..9d7f2215e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,9 +14,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.24.2"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
 dependencies = [
  "gimli",
 ]
@@ -91,9 +91,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.20"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -106,9 +106,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.11"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
 
 [[package]]
 name = "anstyle-parse"
@@ -141,9 +141,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.99"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 dependencies = [
  "backtrace",
 ]
@@ -248,9 +248,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "axum"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5"
+checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871"
 dependencies = [
  "axum-core",
  "bytes",
@@ -267,8 +267,7 @@ dependencies = [
  "mime",
  "percent-encoding",
  "pin-project-lite",
- "rustversion",
- "serde",
+ "serde_core",
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
@@ -282,9 +281,9 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.5.2"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6"
+checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22"
 dependencies = [
  "bytes",
  "futures-core",
@@ -293,7 +292,6 @@ dependencies = [
  "http-body-util",
  "mime",
  "pin-project-lite",
- "rustversion",
  "sync_wrapper",
  "tower-layer",
  "tower-service",
@@ -302,9 +300,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.75"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
 dependencies = [
  "addr2line",
  "cfg-if",
@@ -312,7 +310,7 @@ dependencies = [
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-targets 0.52.6",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -454,9 +452,9 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "bytemuck"
-version = "1.23.2"
+version = "1.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677"
+checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
 
 [[package]]
 name = "byteorder"
@@ -472,11 +470,11 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "camino"
-version = "1.1.12"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0b03af37dad7a14518b7691d81acb0f8222604ad3d1b02f6b4bed5188c0cd5"
+checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -496,17 +494,17 @@ checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.26",
+ "semver 1.0.27",
  "serde",
  "serde_json",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "cc"
-version = "1.2.36"
+version = "1.2.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5252b3d2648e5eedbc1a6f501e3c795e07025c1e93bbf8bbdd6eef7f447a6d54"
+checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -516,9 +514,9 @@ dependencies = [
 
 [[package]]
 name = "cf-rustracing"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8911ac33364d043fa741f0d393e85c6f23b55015b97c3e3e14b51bc46edb4437"
+checksum = "2eb9972cb0c088499d4f4df938512cf5e1ec07b52528dec5f8148d188dd61ba9"
 dependencies = [
  "backtrace",
  "rand 0.8.5",
@@ -582,7 +580,7 @@ dependencies = [
  "js-sys",
  "num-traits",
  "wasm-bindgen",
- "windows-link 0.2.0",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -615,23 +613,23 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.47"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931"
+checksum = "f4512b90fa68d3a9932cea5184017c5d200f5921df706d45e853537dea51508f"
 dependencies = [
  "clap_builder",
- "clap_derive 4.5.47",
+ "clap_derive 4.5.49",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.47"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6"
+checksum = "0025e98baa12e766c67ba13ff4695a887a1eba19569aad00a472546795bd6730"
 dependencies = [
  "anstream",
  "anstyle",
- "clap_lex 0.7.5",
+ "clap_lex 0.7.6",
  "strsim 0.11.1",
 ]
 
@@ -650,9 +648,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.47"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
+checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -671,9 +669,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "cmake"
@@ -818,8 +816,18 @@ version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.20.11",
+ "darling_macro 0.20.11",
+]
+
+[[package]]
+name = "darling"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+dependencies = [
+ "darling_core 0.21.3",
+ "darling_macro 0.21.3",
 ]
 
 [[package]]
@@ -836,13 +844,38 @@ dependencies = [
  "syn 2.0.106",
 ]
 
+[[package]]
+name = "darling_core"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.11.1",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "darling_macro"
 version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
- "darling_core",
+ "darling_core 0.20.11",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+dependencies = [
+ "darling_core 0.21.3",
  "quote",
  "syn 2.0.106",
 ]
@@ -900,9 +933,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
+checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071"
 dependencies = [
  "powerfmt",
 ]
@@ -933,7 +966,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
 dependencies = [
- "darling",
+ "darling 0.20.11",
  "proc-macro2",
  "quote",
  "syn 2.0.106",
@@ -971,24 +1004,26 @@ dependencies = [
 
 [[package]]
 name = "diesel"
-version = "2.2.12"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229850a212cd9b84d4f0290ad9d294afc0ae70fccaa8949dbe8b43ffafa1e20c"
+checksum = "e8496eeb328dce26ee9d9b73275d396d9bddb433fa30106cf6056dd8c3c2764c"
 dependencies = [
  "bigdecimal",
  "diesel_derives",
+ "downcast-rs",
  "libsqlite3-sys",
  "num-bigint",
  "num-integer",
  "num-traits",
+ "sqlite-wasm-rs",
  "time",
 ]
 
 [[package]]
 name = "diesel_derives"
-version = "2.2.7"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b96984c469425cb577bf6f17121ecb3e4fe1e81de5d8f780dd372802858d756"
+checksum = "09af0e983035368439f1383011cd87c46f41da81d0f21dc3727e2857d5a43c8e"
 dependencies = [
  "diesel_table_macro_syntax",
  "dsl_auto_type",
@@ -999,9 +1034,9 @@ dependencies = [
 
 [[package]]
 name = "diesel_migrations"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a73ce704bad4231f001bff3314d91dce4aba0770cee8b233991859abc15c1f6"
+checksum = "ee060f709c3e3b1cadd83fcd0f61711f7a8cf493348f758d3a1c1147d70b3c97"
 dependencies = [
  "diesel",
  "migrations_internals",
@@ -1010,9 +1045,9 @@ dependencies = [
 
 [[package]]
 name = "diesel_table_macro_syntax"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25"
+checksum = "fe2444076b48641147115697648dc743c2c00b61adade0f01ce67133c7babe8c"
 dependencies = [
  "syn 2.0.106",
 ]
@@ -1052,13 +1087,19 @@ version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8975ffdaa0ef3661bfe02dbdcc06c9f829dfafe6a3c474de366a8d5e44276921"
 
+[[package]]
+name = "downcast-rs"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "117240f60069e65410b3ae1bb213295bd828f707b5bec6596a1afc8793ce0cbc"
+
 [[package]]
 name = "dsl_auto_type"
-version = "0.1.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "139ae9aca7527f85f26dd76483eb38533fd84bd571065da1739656ef71c5ff5b"
+checksum = "dd122633e4bef06db27737f21d3738fb89c8f6d5360d6d9d7635dda142a7757e"
 dependencies = [
- "darling",
+ "darling 0.21.3",
  "either",
  "heck 0.5.0",
  "proc-macro2",
@@ -1138,9 +1179,9 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
+checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2"
 dependencies = [
  "log",
  "regex",
@@ -1167,12 +1208,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1209,9 +1250,9 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.1"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
 
 [[package]]
 name = "fixedbitset"
@@ -1221,9 +1262,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "flate2"
-version = "1.1.2"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
 dependencies = [
  "crc32fast",
  "libz-ng-sys",
@@ -1286,9 +1327,9 @@ dependencies = [
 
 [[package]]
 name = "fs-err"
-version = "3.1.1"
+version = "3.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d7be93788013f265201256d58f04936a8079ad5dc898743aa20525f503b683"
+checksum = "6ad492b2cf1d89d568a43508ab24f98501fe03f2f31c01e1d0fe7366a71745d2"
 dependencies = [
  "autocfg",
 ]
@@ -1404,9 +1445,9 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.7"
+version = "0.14.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
 dependencies = [
  "typenum",
  "version_check",
@@ -1436,15 +1477,15 @@ dependencies = [
  "js-sys",
  "libc",
  "r-efi",
- "wasi 0.14.4+wasi-0.2.4",
+ "wasi 0.14.7+wasi-0.2.4",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.31.1"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
 
 [[package]]
 name = "glob"
@@ -1475,7 +1516,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http",
- "indexmap 2.11.0",
+ "indexmap 2.11.4",
  "slab",
  "tokio",
  "tokio-util",
@@ -1620,9 +1661,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
+checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
 
 [[package]]
 name = "hyper"
@@ -1694,9 +1735,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e"
+checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
 dependencies = [
  "base64",
  "bytes",
@@ -1710,7 +1751,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.6.0",
+ "socket2 0.6.1",
  "system-configuration",
  "tokio",
  "tower-service",
@@ -1720,9 +1761,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.63"
+version = "0.1.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1730,7 +1771,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core",
+ "windows-core 0.62.2",
 ]
 
 [[package]]
@@ -1873,12 +1914,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.11.0"
+version = "2.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
+checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.0",
 ]
 
 [[package]]
@@ -1986,9 +2027,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.78"
+version = "0.3.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738"
+checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -2055,9 +2096,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.175"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "libm"
@@ -2099,9 +2140,9 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 
 [[package]]
 name = "litemap"
@@ -2117,17 +2158,16 @@ checksum = "656b3b27f8893f7bbf9485148ff9a65f019e3f33bd5cdc87c83cab16b3fd9ec8"
 dependencies = [
  "libc",
  "neli",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "lock_api"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "autocfg",
  "scopeguard",
 ]
 
@@ -2216,9 +2256,9 @@ checksum = "f490ea2ae935dd8ac89c472d4df28c7f6b87cc20767e1b21fd5ed6a16e7f61e4"
 
 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "memoffset"
@@ -2231,35 +2271,35 @@ dependencies = [
 
 [[package]]
 name = "miden-air"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de4f41b69be0ed3fd236525bb731188bb8d902cb99009f5c2ef12c6570a9b1ef"
+checksum = "28b72121bacf147becf7eadcfc7bcd62d41c1e97c0d2cfdc1fd5dba2531721a8"
 dependencies = [
  "miden-core",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "winter-air",
  "winter-prover",
 ]
 
 [[package]]
 name = "miden-assembly"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6707e889509193d5e503becb0edc054be598b60e58dba27c65e81df5b93d0f37"
+checksum = "bc57c069054e1f34052e60b55e7c7e066c09fe6f23fc6ca747b25b9afa9b6abd"
 dependencies = [
  "log",
  "miden-assembly-syntax",
  "miden-core",
  "miden-mast-package",
  "smallvec",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "miden-assembly-syntax"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "654c557877f7bcdef7fb31db683fdbc4ee70c27c0f302920113eba68b690d5d9"
+checksum = "b73b2c264d5f65a3f62f49a6c4dfedf37152454d6d963330bd0c5b183b2e2e6c"
 dependencies = [
  "aho-corasick",
  "lalrpop",
@@ -2272,26 +2312,26 @@ dependencies = [
  "proptest",
  "regex",
  "rustc_version 0.4.1",
- "semver 1.0.26",
+ "semver 1.0.27",
  "smallvec",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "miden-block-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#d07f46e5a2e9e95e96c6dd26e62e7071687af005"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
 dependencies = [
  "miden-lib",
  "miden-objects",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "miden-core"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d53557ea0e5e529675c562c1a90eb5afc242fdac14d1f85b98d770304f9a24"
+checksum = "996f8d8e2a4dd4eef54225f6f116c73b14f03256bc23ea5d4260fe803dd103e2"
 dependencies = [
  "enum_dispatch",
  "miden-crypto",
@@ -2299,16 +2339,16 @@ dependencies = [
  "miden-formatting",
  "num-derive",
  "num-traits",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "winter-math",
  "winter-utils",
 ]
 
 [[package]]
 name = "miden-crypto"
-version = "0.17.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8c283ed3017d58d9b648d9b1099f26abff52b185ecbb7b91ff4fb406c286b7"
+checksum = "87b287c7a76b95be7ef5588e98a9dbe1973395dbb19eb59dd34d82b06e47f02a"
 dependencies = [
  "blake3",
  "cc",
@@ -2325,7 +2365,7 @@ dependencies = [
  "rand_core 0.9.3",
  "rand_hc",
  "sha3",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "winter-crypto",
  "winter-math",
  "winter-utils",
@@ -2334,9 +2374,9 @@ dependencies = [
 
 [[package]]
 name = "miden-debug-types"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "188d28a5d7df27e4735095e717845a4558b2d121f822f66e8cc2ddfddf92d5bc"
+checksum = "3c24f4040fd3a5b714f2492c723b91dffe29b1af591d15f393dd102063725cd0"
 dependencies = [
  "memchr",
  "miden-crypto",
@@ -2345,8 +2385,8 @@ dependencies = [
  "miden-utils-sync",
  "paste",
  "serde",
- "serde_spanned 1.0.0",
- "thiserror 2.0.16",
+ "serde_spanned 1.0.3",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -2361,7 +2401,7 @@ dependencies = [
 [[package]]
 name = "miden-lib"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#d07f46e5a2e9e95e96c6dd26e62e7071687af005"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
 dependencies = [
  "Inflector",
  "fs-err",
@@ -2372,20 +2412,20 @@ dependencies = [
  "miden-stdlib",
  "rand 0.9.2",
  "regex",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "walkdir",
 ]
 
 [[package]]
 name = "miden-mast-package"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e1777c12930a070feed3f5c777db8374ba71bc36f153223c48cd9ee82cde3f4"
+checksum = "c25726075ff6b7262fbb12d4914672ae6999fbeaa6e3883c9cff69348ad1c09c"
 dependencies = [
  "derive_more",
  "miden-assembly-syntax",
  "miden-core",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -2414,7 +2454,7 @@ dependencies = [
  "syn 2.0.106",
  "terminal_size 0.3.0",
  "textwrap",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "trybuild",
  "unicode-width 0.1.14",
 ]
@@ -2436,7 +2476,7 @@ version = "0.12.0"
 dependencies = [
  "anyhow",
  "axum",
- "clap 4.5.47",
+ "clap 4.5.49",
  "humantime",
  "miden-node-proto",
  "miden-node-utils",
@@ -2458,7 +2498,7 @@ name = "miden-node"
 version = "0.12.0"
 dependencies = [
  "anyhow",
- "clap 4.5.47",
+ "clap 4.5.49",
  "figment",
  "fs-err",
  "humantime",
@@ -2497,7 +2537,7 @@ dependencies = [
  "rstest",
  "serial_test",
  "tempfile",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
  "tonic",
@@ -2529,7 +2569,7 @@ dependencies = [
  "miden-remote-prover-client",
  "miden-tx",
  "rstest",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
  "tonic",
@@ -2554,7 +2594,7 @@ dependencies = [
  "prost",
  "prost-build",
  "protox",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tonic",
  "tonic-build",
  "url",
@@ -2587,9 +2627,9 @@ dependencies = [
  "miden-tx",
  "reqwest",
  "rstest",
- "semver 1.0.26",
+ "semver 1.0.27",
  "tempfile",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
  "tonic",
@@ -2613,7 +2653,7 @@ dependencies = [
  "diesel",
  "diesel_migrations",
  "hex",
- "indexmap 2.11.0",
+ "indexmap 2.11.4",
  "miden-lib",
  "miden-node-proto",
  "miden-node-proto-build",
@@ -2626,7 +2666,7 @@ dependencies = [
  "regex",
  "serde",
  "termtree",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
  "toml 0.8.23",
@@ -2640,7 +2680,7 @@ dependencies = [
 name = "miden-node-stress-test"
 version = "0.12.0"
 dependencies = [
- "clap 4.5.47",
+ "clap 4.5.49",
  "fs-err",
  "futures",
  "miden-air",
@@ -2682,7 +2722,7 @@ dependencies = [
  "opentelemetry_sdk",
  "rand 0.9.2",
  "serde",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tonic",
  "tower-http",
@@ -2698,7 +2738,7 @@ dependencies = [
 [[package]]
 name = "miden-objects"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#d07f46e5a2e9e95e96c6dd26e62e7071687af005"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
 dependencies = [
  "bech32",
  "getrandom 0.3.3",
@@ -2711,25 +2751,25 @@ dependencies = [
  "miden-verifier",
  "rand 0.9.2",
  "rand_xoshiro",
- "semver 1.0.26",
+ "semver 1.0.27",
  "serde",
- "thiserror 2.0.16",
- "toml 0.9.5",
+ "thiserror 2.0.17",
+ "toml 0.9.8",
  "winter-rand-utils",
 ]
 
 [[package]]
 name = "miden-processor"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac41df96664be720b0fbffd9c132a35a0432b5d2e625ba191a83b0d89646a2c"
+checksum = "943b22d826ce116cbaf8633c699e45eece83dc4c2facb1677e067b42f433aba8"
 dependencies = [
  "miden-air",
  "miden-core",
  "miden-debug-types",
  "miden-utils-diagnostics",
  "paste",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tracing",
  "winter-prover",
@@ -2737,9 +2777,9 @@ dependencies = [
 
 [[package]]
 name = "miden-prover"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab58a684b0133195fbf2583d3759635fbf1fd796d3a1608752509f279be0b30"
+checksum = "743e27899f2a56e92da93efc287fe76a635446251dbecc2138e8b85ecdcfd0bd"
 dependencies = [
  "miden-air",
  "miden-debug-types",
@@ -2757,7 +2797,7 @@ dependencies = [
  "async-trait",
  "axum",
  "bytes",
- "clap 4.5.47",
+ "clap 4.5.49",
  "http",
  "humantime",
  "miden-block-prover",
@@ -2779,10 +2819,10 @@ dependencies = [
  "prost-build",
  "protox",
  "reqwest",
- "semver 1.0.26",
+ "semver 1.0.27",
  "serde",
  "serde_qs",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
  "tonic",
@@ -2807,7 +2847,7 @@ dependencies = [
  "prost",
  "prost-build",
  "protox",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tonic",
  "tonic-build",
@@ -2817,9 +2857,9 @@ dependencies = [
 
 [[package]]
 name = "miden-stdlib"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c09061431876b4cf6b2a3cfdf876bd8fde129233effd5906d3bfda8ec2602e29"
+checksum = "7cebf10ea08fc7e015e4391953e8953ed689104973084e1c4f057473017e6518"
 dependencies = [
  "env_logger",
  "fs-err",
@@ -2828,13 +2868,13 @@ dependencies = [
  "miden-crypto",
  "miden-processor",
  "miden-utils-sync",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "miden-testing"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#d07f46e5a2e9e95e96c6dd26e62e7071687af005"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
 dependencies = [
  "anyhow",
  "itertools",
@@ -2846,14 +2886,14 @@ dependencies = [
  "miden-tx-batch-prover",
  "rand 0.9.2",
  "rand_chacha 0.9.0",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "winterfell",
 ]
 
 [[package]]
 name = "miden-tx"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#d07f46e5a2e9e95e96c6dd26e62e7071687af005"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2861,14 +2901,14 @@ dependencies = [
  "miden-prover",
  "miden-verifier",
  "rand 0.9.2",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
 ]
 
 [[package]]
 name = "miden-tx-batch-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#d07f46e5a2e9e95e96c6dd26e62e7071687af005"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
 dependencies = [
  "miden-objects",
  "miden-tx",
@@ -2876,9 +2916,9 @@ dependencies = [
 
 [[package]]
 name = "miden-utils-diagnostics"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa555f9ee912ca23317d75fab2a65380b8191de66715237c228cf09165266dec"
+checksum = "9da59c10824c85d585145aff6ef760f0baaaf6c4576c8ad241c281ce2e345b79"
 dependencies = [
  "miden-crypto",
  "miden-debug-types",
@@ -2889,9 +2929,9 @@ dependencies = [
 
 [[package]]
 name = "miden-utils-sync"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1873b21e18ba6ab6c697f155a2adb8f35f5ac386f6bb41ae7c207b2ad683642"
+checksum = "498138c030b4bf3808e2ef87ba1170b22d5572a8ef6a0acd5a5f10d2bfc91e72"
 dependencies = [
  "lock_api",
  "loom",
@@ -2900,13 +2940,13 @@ dependencies = [
 
 [[package]]
 name = "miden-verifier"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759989d95534d658ad6a9d7946bbe617814611a1b89b42e944462ea8ffb4de9d"
+checksum = "edf15bf92a77f8f7d0291b155af55bb5576fe4277d897dc035e73dc39275bace"
 dependencies = [
  "miden-air",
  "miden-core",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tracing",
  "winter-verifier",
 ]
@@ -2919,7 +2959,7 @@ checksum = "7798671ffbf6596de00619a9abaec67dc26965b891328c9d65c4cb6007597d50"
 dependencies = [
  "miden-formatting",
  "smallvec",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -2954,19 +2994,19 @@ dependencies = [
 
 [[package]]
 name = "migrations_internals"
-version = "2.2.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bda1634d70d5bd53553cf15dca9842a396e8c799982a3ad22998dc44d961f24"
+checksum = "36c791ecdf977c99f45f23280405d7723727470f6689a5e6dbf513ac547ae10d"
 dependencies = [
  "serde",
- "toml 0.9.5",
+ "toml 0.9.8",
 ]
 
 [[package]]
 name = "migrations_macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb161cc72176cb37aa47f1fc520d3ef02263d67d661f44f05d05a079e1237fd"
+checksum = "36fc5ac76be324cfd2d3f2cf0fdf5d5d3c4f14ed8aaebadb09e304ba42282703"
 dependencies = [
  "migrations_internals",
  "proc-macro2",
@@ -2986,6 +3026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
@@ -3076,11 +3117,11 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.50.1"
+version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3195,9 +3236,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.7"
+version = "0.37.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
 dependencies = [
  "memchr",
 ]
@@ -3274,7 +3315,7 @@ dependencies = [
  "futures-sink",
  "js-sys",
  "pin-project-lite",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tracing",
 ]
 
@@ -3289,7 +3330,7 @@ dependencies = [
  "opentelemetry-proto",
  "opentelemetry_sdk",
  "prost",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tonic",
 ]
@@ -3319,7 +3360,7 @@ dependencies = [
  "percent-encoding",
  "rand 0.9.2",
  "serde_json",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
 ]
@@ -3332,15 +3373,15 @@ checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
 
 [[package]]
 name = "owo-colors"
-version = "4.2.2"
+version = "4.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48dd4f4a2c8405440fd0462561f0e5806bd0f77e86f51c761481bdd4018b545e"
+checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -3348,15 +3389,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.11"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -3401,7 +3442,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
 dependencies = [
  "fixedbitset",
- "indexmap 2.11.0",
+ "indexmap 2.11.4",
 ]
 
 [[package]]
@@ -3531,7 +3572,7 @@ dependencies = [
  "serde",
  "serde_yaml",
  "sfv",
- "socket2 0.6.0",
+ "socket2 0.6.1",
  "strum",
  "strum_macros",
  "tokio",
@@ -3782,11 +3823,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
 dependencies = [
- "toml_edit",
+ "toml_edit 0.23.7",
 ]
 
 [[package]]
@@ -3862,7 +3903,7 @@ dependencies = [
  "memchr",
  "parking_lot",
  "protobuf 3.7.2",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -3987,7 +4028,7 @@ dependencies = [
  "prost-reflect",
  "prost-types",
  "protox-parse",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -3999,7 +4040,7 @@ dependencies = [
  "logos",
  "miette",
  "prost-types",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -4010,9 +4051,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
  "proc-macro2",
 ]
@@ -4131,18 +4172,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.17"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
  "bitflags 2.9.4",
 ]
 
 [[package]]
 name = "regex"
-version = "1.11.2"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4152,9 +4193,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.10"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4163,9 +4204,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "relative-path"
@@ -4175,9 +4216,9 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 
 [[package]]
 name = "reqwest"
-version = "0.12.23"
+version = "0.12.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb"
+checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
 dependencies = [
  "base64",
  "bytes",
@@ -4291,9 +4332,9 @@ dependencies = [
 
 [[package]]
 name = "rust_decimal"
-version = "1.37.2"
+version = "1.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b203a6425500a03e0919c42d3c47caca51e79f1132046626d2c8871c5092035d"
+checksum = "35affe401787a9bd846712274d97654355d21b2a2c092a3139aabe31e9022282"
 dependencies = [
  "arrayvec",
  "num-traits",
@@ -4320,7 +4361,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
- "semver 1.0.26",
+ "semver 1.0.27",
 ]
 
 [[package]]
@@ -4338,22 +4379,22 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.8"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
  "bitflags 2.9.4",
  "errno",
  "libc",
- "linux-raw-sys 0.9.4",
- "windows-sys 0.60.2",
+ "linux-raw-sys 0.11.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.31"
+version = "0.23.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
+checksum = "cd3c25631629d034ce7cd9940adc9d45762d46de2b0f57193c4443b92c6d4d40"
 dependencies = [
  "log",
  "once_cell",
@@ -4373,7 +4414,7 @@ dependencies = [
  "openssl-probe",
  "rustls-pki-types",
  "schannel",
- "security-framework 3.4.0",
+ "security-framework 3.5.1",
 ]
 
 [[package]]
@@ -4387,9 +4428,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.4"
+version = "0.103.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
+checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -4404,9 +4445,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "rusty-fork"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2"
 dependencies = [
  "fnv",
  "quick-error",
@@ -4440,11 +4481,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4494,9 +4535,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "3.4.0"
+version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b369d18893388b345804dc0007963c99b7d665ae71d275812d828c6f089640"
+checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
 dependencies = [
  "bitflags 2.9.4",
  "core-foundation 0.10.1",
@@ -4526,11 +4567,12 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
 dependencies = [
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -4541,18 +4583,28 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4561,24 +4613,26 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.143"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
  "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.17"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a"
+checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
 dependencies = [
  "itoa",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -4589,7 +4643,7 @@ checksum = "f3faaf9e727533a19351a43cc5a8de957372163c7d35cc48c90b75cdda13c352"
 dependencies = [
  "percent-encoding",
  "serde",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -4603,11 +4657,11 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
+checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -4666,7 +4720,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fa1f336066b758b7c9df34ed049c0e693a426afe2b27ff7d5b14f410ab1a132"
 dependencies = [
  "base64",
- "indexmap 2.11.0",
+ "indexmap 2.11.4",
  "rust_decimal",
 ]
 
@@ -4725,6 +4779,12 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
 [[package]]
 name = "siphasher"
 version = "1.0.1"
@@ -4761,12 +4821,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -4788,11 +4848,26 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "sqlite-wasm-rs"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aead1c279716985b981b7940ef9b652d3f93d70a7296853c633b7ce8fa8088a"
+dependencies = [
+ "js-sys",
+ "once_cell",
+ "thiserror 2.0.17",
+ "tokio",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "string_cache"
@@ -4947,24 +5022,24 @@ checksum = "1ac9aa371f599d22256307c24a9d748c041e548cbf599f35d890f9d365361790"
 
 [[package]]
 name = "tempfile"
-version = "3.21.0"
+version = "3.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
 dependencies = [
  "fastrand",
  "getrandom 0.3.3",
  "once_cell",
- "rustix 1.0.8",
- "windows-sys 0.60.2",
+ "rustix 1.1.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "term"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a43bddab41f8626c7bdaab872bbba75f8df5847b516d77c569c746e2ae5eb746"
+checksum = "2111ef44dae28680ae9752bb89409e7310ca33a8c621ebe7b106cf5c928b3ac0"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4992,7 +5067,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0"
 dependencies = [
- "rustix 1.0.8",
+ "rustix 1.1.2",
  "windows-sys 0.60.2",
 ]
 
@@ -5010,7 +5085,7 @@ checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
 dependencies = [
  "smawk",
  "unicode-linebreak",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
@@ -5024,11 +5099,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.16"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 dependencies = [
- "thiserror-impl 2.0.16",
+ "thiserror-impl 2.0.17",
 ]
 
 [[package]]
@@ -5044,9 +5119,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.16"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5074,11 +5149,12 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.43"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
 dependencies = [
  "deranged",
+ "itoa",
  "libc",
  "num-conv",
  "num_threads",
@@ -5129,7 +5205,7 @@ dependencies = [
  "pin-project-lite",
  "signal-hook-registry",
  "slab",
- "socket2 0.6.0",
+ "socket2 0.6.1",
  "tokio-macros",
  "windows-sys 0.59.0",
 ]
@@ -5157,9 +5233,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
  "rustls",
  "tokio",
@@ -5212,19 +5288,19 @@ dependencies = [
  "serde",
  "serde_spanned 0.6.9",
  "toml_datetime 0.6.11",
- "toml_edit",
+ "toml_edit 0.22.27",
 ]
 
 [[package]]
 name = "toml"
-version = "0.9.5"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
+checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
 dependencies = [
- "indexmap 2.11.0",
- "serde",
- "serde_spanned 1.0.0",
- "toml_datetime 0.7.0",
+ "indexmap 2.11.4",
+ "serde_core",
+ "serde_spanned 1.0.3",
+ "toml_datetime 0.7.3",
  "toml_parser",
  "toml_writer",
  "winnow",
@@ -5241,11 +5317,11 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.7.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -5254,7 +5330,7 @@ version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "indexmap 2.11.0",
+ "indexmap 2.11.4",
  "serde",
  "serde_spanned 0.6.9",
  "toml_datetime 0.6.11",
@@ -5262,11 +5338,23 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.23.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
+dependencies = [
+ "indexmap 2.11.4",
+ "toml_datetime 0.7.3",
+ "toml_parser",
+ "winnow",
+]
+
 [[package]]
 name = "toml_parser"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
+checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
 dependencies = [
  "winnow",
 ]
@@ -5279,9 +5367,9 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
 
 [[package]]
 name = "toml_writer"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
+checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
 
 [[package]]
 name = "tonic"
@@ -5387,7 +5475,7 @@ dependencies = [
  "httparse",
  "js-sys",
  "pin-project",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tonic",
  "tower-service",
  "wasm-bindgen",
@@ -5404,7 +5492,7 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "indexmap 2.11.0",
+ "indexmap 2.11.4",
  "pin-project-lite",
  "slab",
  "sync_wrapper",
@@ -5580,9 +5668,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "trybuild"
-version = "1.0.110"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e257d7246e7a9fd015fb0b28b330a8d4142151a33f03e6a497754f4b1f6a8e"
+checksum = "0ded9fdb81f30a5708920310bfcd9ea7482ff9cba5f54601f7a19a877d5c2392"
 dependencies = [
  "dissimilar",
  "glob",
@@ -5591,14 +5679,14 @@ dependencies = [
  "serde_json",
  "target-triple",
  "termcolor",
- "toml 0.9.5",
+ "toml 0.9.8",
 ]
 
 [[package]]
 name = "typenum"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
 [[package]]
 name = "unarray"
@@ -5623,9 +5711,9 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 
 [[package]]
 name = "unicode-linebreak"
@@ -5641,9 +5729,9 @@ checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-width"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
 [[package]]
 name = "unicode-xid"
@@ -5805,18 +5893,27 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
-version = "0.14.4+wasi-0.2.4"
+version = "0.14.7+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c"
+dependencies = [
+ "wasip2",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a5f4a424faf49c3c2c344f166f0662341d470ea185e939657aaff130f0ec4a"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
  "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.101"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b"
+checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -5827,9 +5924,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.101"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb"
+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
 dependencies = [
  "bumpalo",
  "log",
@@ -5841,9 +5938,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.51"
+version = "0.4.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca85039a9b469b38336411d6d6ced91f3fc87109a2a27b0c197663f5144dffe"
+checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5854,9 +5951,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.101"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d"
+checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5864,9 +5961,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.101"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa"
+checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5877,9 +5974,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.101"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1"
+checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
 dependencies = [
  "unicode-ident",
 ]
@@ -5899,9 +5996,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.78"
+version = "0.3.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77e4b637749ff0d92b8fad63aa1f7cff3cbe125fd49c175cd6345e7272638b12"
+checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5939,7 +6036,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5955,7 +6052,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
 dependencies = [
  "windows-collections",
- "windows-core",
+ "windows-core 0.61.2",
  "windows-future",
  "windows-link 0.1.3",
  "windows-numerics",
@@ -5967,7 +6064,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
 dependencies = [
- "windows-core",
+ "windows-core 0.61.2",
 ]
 
 [[package]]
@@ -5979,8 +6076,21 @@ dependencies = [
  "windows-implement",
  "windows-interface",
  "windows-link 0.1.3",
- "windows-result",
- "windows-strings",
+ "windows-result 0.3.4",
+ "windows-strings 0.4.2",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link 0.2.1",
+ "windows-result 0.4.1",
+ "windows-strings 0.5.1",
 ]
 
 [[package]]
@@ -5989,16 +6099,16 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
- "windows-core",
+ "windows-core 0.61.2",
  "windows-link 0.1.3",
  "windows-threading",
 ]
 
 [[package]]
 name = "windows-implement"
-version = "0.60.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6007,9 +6117,9 @@ dependencies = [
 
 [[package]]
 name = "windows-interface"
-version = "0.59.1"
+version = "0.59.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6024,9 +6134,9 @@ checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
 [[package]]
 name = "windows-link"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-numerics"
@@ -6034,7 +6144,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
 dependencies = [
- "windows-core",
+ "windows-core 0.61.2",
  "windows-link 0.1.3",
 ]
 
@@ -6045,8 +6155,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
 dependencies = [
  "windows-link 0.1.3",
- "windows-result",
- "windows-strings",
+ "windows-result 0.3.4",
+ "windows-strings 0.4.2",
 ]
 
 [[package]]
@@ -6058,6 +6168,15 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-strings"
 version = "0.4.2"
@@ -6067,6 +6186,15 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -6100,16 +6228,16 @@ version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets 0.53.3",
+ "windows-targets 0.53.5",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.61.0"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows-link 0.2.0",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -6145,19 +6273,19 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.3"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
- "windows-link 0.1.3",
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
+ "windows-link 0.2.1",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
 ]
 
 [[package]]
@@ -6183,9 +6311,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -6201,9 +6329,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -6219,9 +6347,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
 
 [[package]]
 name = "windows_i686_gnullvm"
@@ -6231,9 +6359,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -6249,9 +6377,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -6267,9 +6395,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -6285,9 +6413,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -6303,9 +6431,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winnow"
@@ -6431,9 +6559,9 @@ dependencies = [
 
 [[package]]
 name = "wit-bindgen"
-version = "0.45.1"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "writeable"
@@ -6523,9 +6651,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 
 [[package]]
 name = "zerotrie"
diff --git a/bin/network-monitor/src/remote_prover.rs b/bin/network-monitor/src/remote_prover.rs
index e632e8a4f..33a2fcf3d 100644
--- a/bin/network-monitor/src/remote_prover.rs
+++ b/bin/network-monitor/src/remote_prover.rs
@@ -11,7 +11,7 @@ use miden_node_proto::generated as proto;
 use miden_objects::asset::{Asset, FungibleAsset};
 use miden_objects::note::NoteType;
 use miden_objects::testing::account_id::{ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_SENDER};
-use miden_objects::transaction::TransactionWitness;
+use miden_objects::transaction::TransactionInputs;
 use miden_testing::{Auth, MockChainBuilder};
 use miden_tx::utils::Serializable;
 use serde::{Deserialize, Serialize};
@@ -254,7 +254,7 @@ fn tonic_status_to_json(status: &tonic::Status) -> String {
 /// This function creates a mock transaction using `MockChainBuilder` similar to what's done
 /// in the remote prover tests. The transaction is generated once and can be reused for
 /// multiple proof test calls.
-pub async fn generate_mock_transaction() -> anyhow::Result<TransactionWitness> {
+pub async fn generate_mock_transaction() -> anyhow::Result<TransactionInputs> {
     let mut mock_chain_builder = MockChainBuilder::new();
 
     // Create an account with basic authentication
@@ -295,11 +295,7 @@ pub async fn generate_mock_transaction() -> anyhow::Result<TransactionWitness> {
     // Execute the transaction
     let executed_transaction =
         Box::pin(tx_context.execute()).await.context("Failed to execute transaction")?;
-
-    // Create transaction witness
-    let transaction_witness = TransactionWitness::from(executed_transaction);
-
-    Ok(transaction_witness)
+    Ok(executed_transaction.into())
 }
 
 // GENERATE TEST REQUEST PAYLOAD
diff --git a/bin/remote-prover/src/api/prover.rs b/bin/remote-prover/src/api/prover.rs
index 56eb52354..a40b83341 100644
--- a/bin/remote-prover/src/api/prover.rs
+++ b/bin/remote-prover/src/api/prover.rs
@@ -3,7 +3,7 @@ use miden_node_utils::ErrorReport;
 use miden_objects::MIN_PROOF_SECURITY_LEVEL;
 use miden_objects::batch::ProposedBatch;
 use miden_objects::block::ProposedBlock;
-use miden_objects::transaction::TransactionWitness;
+use miden_objects::transaction::TransactionInputs;
 use miden_objects::utils::Serializable;
 use miden_tx::LocalTransactionProver;
 use miden_tx_batch_prover::LocalBatchProver;
@@ -99,7 +99,7 @@ impl ProverRpcApi {
     )]
     pub async fn prove_tx(
         &self,
-        transaction_witness: TransactionWitness,
+        tx_inputs: TransactionInputs,
         request_id: &str,
     ) -> Result<Response<proto::remote_prover::Proof>, tonic::Status> {
         let Prover::Transaction(prover) = &self.prover else {
@@ -114,7 +114,7 @@ impl ProverRpcApi {
         #[cfg(test)]
         tokio::time::sleep(std::time::Duration::from_millis(100)).await;
 
-        let proof = locked_prover.prove(transaction_witness).map_err(internal_error)?;
+        let proof = locked_prover.prove(tx_inputs).map_err(internal_error)?;
 
         // Record the transaction_id in the current tracing span
         let transaction_id = proof.id();
@@ -217,8 +217,8 @@ impl ProverApi for ProverRpcApi {
 
         match proof_type {
             proto::remote_prover::ProofType::Transaction => {
-                let tx_witness = proof_request.try_into().map_err(invalid_argument)?;
-                self.prove_tx(tx_witness, &request_id).await
+                let tx_inputs = proof_request.try_into().map_err(invalid_argument)?;
+                self.prove_tx(tx_inputs, &request_id).await
             },
             proto::remote_prover::ProofType::Batch => {
                 let proposed_batch = proof_request.try_into().map_err(invalid_argument)?;
@@ -257,7 +257,7 @@ mod test {
         ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET,
         ACCOUNT_ID_SENDER,
     };
-    use miden_objects::transaction::{ProvenTransaction, TransactionWitness};
+    use miden_objects::transaction::{ProvenTransaction, TransactionInputs};
     use miden_testing::{Auth, MockChainBuilder};
     use miden_tx::utils::Serializable;
     use tokio::net::TcpListener;
@@ -323,17 +323,16 @@ mod test {
             .unwrap();
 
         let executed_transaction = Box::pin(tx_context.execute()).await.unwrap();
-
-        let transaction_witness = TransactionWitness::from(executed_transaction);
+        let tx_inputs = TransactionInputs::from(executed_transaction);
 
         let request_1 = Request::new(proto::remote_prover::ProofRequest {
             proof_type: proto::remote_prover::ProofType::Transaction.into(),
-            payload: transaction_witness.to_bytes(),
+            payload: tx_inputs.to_bytes(),
         });
 
         let request_2 = Request::new(proto::remote_prover::ProofRequest {
             proof_type: proto::remote_prover::ProofType::Transaction.into(),
-            payload: transaction_witness.to_bytes(),
+            payload: tx_inputs.to_bytes(),
         });
 
         // Send both requests concurrently
diff --git a/bin/remote-prover/src/generated/conversions.rs b/bin/remote-prover/src/generated/conversions.rs
index 31e696e08..885d1e06b 100644
--- a/bin/remote-prover/src/generated/conversions.rs
+++ b/bin/remote-prover/src/generated/conversions.rs
@@ -3,7 +3,7 @@
 
 use miden_objects::batch::ProposedBatch;
 use miden_objects::block::ProposedBlock;
-use miden_objects::transaction::{ProvenTransaction, TransactionWitness};
+use miden_objects::transaction::{ProvenTransaction, TransactionInputs};
 use miden_tx::utils::{Deserializable, DeserializationError, Serializable};
 
 use crate::api::ProofType;
@@ -23,11 +23,11 @@ impl TryFrom<proto::Proof> for ProvenTransaction {
     }
 }
 
-impl TryFrom<proto::ProofRequest> for TransactionWitness {
+impl TryFrom<proto::ProofRequest> for TransactionInputs {
     type Error = DeserializationError;
 
     fn try_from(request: proto::ProofRequest) -> Result<Self, Self::Error> {
-        TransactionWitness::read_from_bytes(&request.payload)
+        TransactionInputs::read_from_bytes(&request.payload)
     }
 }
 
diff --git a/bin/remote-prover/src/generated/remote_prover.rs b/bin/remote-prover/src/generated/remote_prover.rs
index 7404cb38e..373859bef 100644
--- a/bin/remote-prover/src/generated/remote_prover.rs
+++ b/bin/remote-prover/src/generated/remote_prover.rs
@@ -7,7 +7,7 @@ pub struct ProofRequest {
     pub proof_type: i32,
     /// Serialized payload requiring proof generation. The encoding format is
     /// type-specific:
-    /// - TRANSACTION: TransactionWitness encoded.
+    /// - TRANSACTION: TransactionInputs encoded.
     /// - BATCH: ProposedBatch encoded.
     /// - BLOCK: ProposedBlock encoded.
     #[prost(bytes = "vec", tag = "2")]
diff --git a/crates/ntx-builder/src/transaction.rs b/crates/ntx-builder/src/transaction.rs
index 2ff3f33f7..db7ef2b3c 100644
--- a/crates/ntx-builder/src/transaction.rs
+++ b/crates/ntx-builder/src/transaction.rs
@@ -13,6 +13,7 @@ use miden_objects::transaction::{
     PartialBlockchain,
     ProvenTransaction,
     TransactionArgs,
+    TransactionInputs,
 };
 use miden_objects::vm::FutureMaybeSend;
 use miden_objects::{TransactionInputError, Word};
@@ -122,7 +123,7 @@ impl NtxContext {
                 let notes = notes.into_iter().map(Note::from).collect::<Vec<_>>();
                 let (successful, failed) = self.filter_notes(&data_store, notes).await?;
                 let executed = Box::pin(self.execute(&data_store, successful)).await?;
-                let proven = Box::pin(self.prove(executed)).await?;
+                let proven = Box::pin(self.prove(executed.into())).await?;
                 self.submit(proven).await?;
                 Ok(failed)
             }
@@ -207,11 +208,11 @@ impl NtxContext {
     /// Delegates the transaction proof to the remote prover if configured, otherwise performs the
     /// proof locally.
     #[instrument(target = COMPONENT, name = "ntx.execute_transaction.prove", skip_all, err)]
-    async fn prove(&self, tx: ExecutedTransaction) -> NtxResult<ProvenTransaction> {
+    async fn prove(&self, tx_inputs: TransactionInputs) -> NtxResult<ProvenTransaction> {
         if let Some(remote) = &self.prover {
-            remote.prove(tx.into()).await
+            remote.prove(tx_inputs).await
         } else {
-            tokio::task::spawn_blocking(move || LocalTransactionProver::default().prove(tx.into()))
+            tokio::task::spawn_blocking(move || LocalTransactionProver::default().prove(tx_inputs))
                 .await
                 .map_err(NtxError::Panic)?
         }
@@ -349,6 +350,14 @@ impl DataStore for NtxDataStore {
             }
         }
     }
+
+    fn get_note_script(
+        &self,
+        script_root: Word,
+    ) -> impl FutureMaybeSend<Result<miden_objects::note::NoteScript, DataStoreError>> {
+        // TODO: Add implementation for getting note script from NtxDataStore.
+        async move { Err(DataStoreError::NoteScriptNotFound(script_root)) }
+    }
 }
 
 impl MastForestStore for NtxDataStore {
diff --git a/crates/proto/src/generated/remote_prover.rs b/crates/proto/src/generated/remote_prover.rs
index 7404cb38e..373859bef 100644
--- a/crates/proto/src/generated/remote_prover.rs
+++ b/crates/proto/src/generated/remote_prover.rs
@@ -7,7 +7,7 @@ pub struct ProofRequest {
     pub proof_type: i32,
     /// Serialized payload requiring proof generation. The encoding format is
     /// type-specific:
-    /// - TRANSACTION: TransactionWitness encoded.
+    /// - TRANSACTION: TransactionInputs encoded.
     /// - BATCH: ProposedBatch encoded.
     /// - BLOCK: ProposedBlock encoded.
     #[prost(bytes = "vec", tag = "2")]
diff --git a/crates/remote-prover-client/src/remote_prover/generated/nostd/remote_prover.rs b/crates/remote-prover-client/src/remote_prover/generated/nostd/remote_prover.rs
index 0549a5df8..e10a0603c 100644
--- a/crates/remote-prover-client/src/remote_prover/generated/nostd/remote_prover.rs
+++ b/crates/remote-prover-client/src/remote_prover/generated/nostd/remote_prover.rs
@@ -7,7 +7,7 @@ pub struct ProofRequest {
     pub proof_type: i32,
     /// Serialized payload requiring proof generation. The encoding format is
     /// type-specific:
-    /// - TRANSACTION: TransactionWitness encoded.
+    /// - TRANSACTION: TransactionInputs encoded.
     /// - BATCH: ProposedBatch encoded.
     /// - BLOCK: ProposedBlock encoded.
     #[prost(bytes = "vec", tag = "2")]
diff --git a/crates/remote-prover-client/src/remote_prover/generated/std/remote_prover.rs b/crates/remote-prover-client/src/remote_prover/generated/std/remote_prover.rs
index 4568d463a..87deb784a 100644
--- a/crates/remote-prover-client/src/remote_prover/generated/std/remote_prover.rs
+++ b/crates/remote-prover-client/src/remote_prover/generated/std/remote_prover.rs
@@ -7,7 +7,7 @@ pub struct ProofRequest {
     pub proof_type: i32,
     /// Serialized payload requiring proof generation. The encoding format is
     /// type-specific:
-    /// - TRANSACTION: TransactionWitness encoded.
+    /// - TRANSACTION: TransactionInputs encoded.
     /// - BATCH: ProposedBatch encoded.
     /// - BLOCK: ProposedBlock encoded.
     #[prost(bytes = "vec", tag = "2")]
diff --git a/crates/remote-prover-client/src/remote_prover/tx_prover.rs b/crates/remote-prover-client/src/remote_prover/tx_prover.rs
index 705e8e814..6bdc63a04 100644
--- a/crates/remote-prover-client/src/remote_prover/tx_prover.rs
+++ b/crates/remote-prover-client/src/remote_prover/tx_prover.rs
@@ -3,7 +3,7 @@ use alloc::string::{String, ToString};
 use alloc::sync::Arc;
 use core::time::Duration;
 
-use miden_objects::transaction::{ProvenTransaction, TransactionWitness};
+use miden_objects::transaction::{ExecutedTransaction, ProvenTransaction, TransactionInputs};
 use miden_objects::utils::{Deserializable, DeserializationError, Serializable};
 use miden_objects::vm::FutureMaybeSend;
 use miden_tx::TransactionProverError;
@@ -82,7 +82,7 @@ impl RemoteTransactionProver {
 impl RemoteTransactionProver {
     pub fn prove(
         &self,
-        tx_witness: TransactionWitness,
+        tx_inputs: TransactionInputs,
     ) -> impl FutureMaybeSend<Result<ProvenTransaction, TransactionProverError>> {
         async move {
             use miden_objects::utils::Serializable;
@@ -101,7 +101,7 @@ impl RemoteTransactionProver {
                 .ok_or_else(|| TransactionProverError::other("client should be connected"))?
                 .clone();
 
-            let request = tonic::Request::new(tx_witness.into());
+            let request = tonic::Request::new(tx_inputs.into());
 
             let response = client.prove(request).await.map_err(|err| {
                 TransactionProverError::other_with_source("failed to prove transaction", err)
@@ -131,11 +131,11 @@ impl TryFrom<proto::Proof> for ProvenTransaction {
     }
 }
 
-impl From<TransactionWitness> for proto::ProofRequest {
-    fn from(witness: TransactionWitness) -> Self {
+impl From<TransactionInputs> for proto::ProofRequest {
+    fn from(tx_inputs: TransactionInputs) -> Self {
         proto::ProofRequest {
             proof_type: proto::ProofType::Transaction.into(),
-            payload: witness.to_bytes(),
+            payload: tx_inputs.to_bytes(),
         }
     }
 }
diff --git a/proto/proto/remote_prover.proto b/proto/proto/remote_prover.proto
index 7f8544fc7..49132fd6f 100644
--- a/proto/proto/remote_prover.proto
+++ b/proto/proto/remote_prover.proto
@@ -31,7 +31,7 @@ message ProofRequest {
 
     // Serialized payload requiring proof generation. The encoding format is
     // type-specific:
-    // - TRANSACTION: TransactionWitness encoded.
+    // - TRANSACTION: TransactionInputs encoded.
     // - BATCH: ProposedBatch encoded.
     // - BLOCK: ProposedBlock encoded.
     bytes payload = 2;

From ab4a5581ec5f560a687dcb961ede92c3f569a74f Mon Sep 17 00:00:00 2001
From: Tomas <tomas.arrachea@lambdaclass.com>
Date: Thu, 16 Oct 2025 02:08:49 -0300
Subject: [PATCH 51/78] feat: shutdown otel provider on exit (#1275)

---
 bin/network-monitor/src/main.rs |  8 ++--
 bin/node/src/main.rs            |  2 +-
 bin/remote-prover/src/main.rs   |  2 +-
 crates/utils/src/logging.rs     | 73 ++++++++++++++++++++-------------
 4 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/bin/network-monitor/src/main.rs b/bin/network-monitor/src/main.rs
index d9ead9b72..c3d78359b 100644
--- a/bin/network-monitor/src/main.rs
+++ b/bin/network-monitor/src/main.rs
@@ -43,11 +43,11 @@ async fn main() -> anyhow::Result<()> {
     let config = MonitorConfig::parse();
     info!("Loaded configuration: {:?}", config);
 
-    if config.enable_otel {
-        miden_node_utils::logging::setup_tracing(OpenTelemetry::Enabled)?;
+    let _otel_guard = if config.enable_otel {
+        miden_node_utils::logging::setup_tracing(OpenTelemetry::Enabled)?
     } else {
-        miden_node_utils::logging::setup_tracing(OpenTelemetry::Disabled)?;
-    }
+        miden_node_utils::logging::setup_tracing(OpenTelemetry::Disabled)?
+    };
 
     let mut tasks = Tasks::new();
 
diff --git a/bin/node/src/main.rs b/bin/node/src/main.rs
index d2b264097..d20b66e57 100644
--- a/bin/node/src/main.rs
+++ b/bin/node/src/main.rs
@@ -74,7 +74,7 @@ async fn main() -> anyhow::Result<()> {
     let cli = Cli::parse();
 
     // Configure tracing with optional OpenTelemetry exporting support.
-    miden_node_utils::logging::setup_tracing(cli.command.open_telemetry())?;
+    let _otel_guard = miden_node_utils::logging::setup_tracing(cli.command.open_telemetry())?;
 
     cli.command.execute().await
 }
diff --git a/bin/remote-prover/src/main.rs b/bin/remote-prover/src/main.rs
index 1ec1ee558..d4fc42f6d 100644
--- a/bin/remote-prover/src/main.rs
+++ b/bin/remote-prover/src/main.rs
@@ -11,7 +11,7 @@ pub(crate) mod utils;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    setup_tracing(OpenTelemetry::Enabled)?;
+    let _otel_guard = setup_tracing(OpenTelemetry::Enabled)?;
     info!(target: COMPONENT, "Tracing initialized");
 
     // read command-line args
diff --git a/crates/utils/src/logging.rs b/crates/utils/src/logging.rs
index 1452d48c3..b1425d0f2 100644
--- a/crates/utils/src/logging.rs
+++ b/crates/utils/src/logging.rs
@@ -3,7 +3,7 @@ use std::str::FromStr;
 use opentelemetry::trace::TracerProvider as _;
 use opentelemetry_otlp::WithTonicConfig;
 use opentelemetry_sdk::propagation::TraceContextPropagator;
-use opentelemetry_sdk::trace::SpanExporter;
+use opentelemetry_sdk::trace::SdkTracerProvider;
 use tracing::subscriber::Subscriber;
 use tracing_opentelemetry::OpenTelemetryLayer;
 use tracing_subscriber::layer::{Filter, SubscriberExt};
@@ -22,6 +22,20 @@ impl OpenTelemetry {
     }
 }
 
+/// A guard that shuts down the tracer provider when dropped. This ensures that the logs are flushed
+/// to the exporter before the program exits.
+pub struct OtelGuard {
+    tracer_provider: SdkTracerProvider,
+}
+
+impl Drop for OtelGuard {
+    fn drop(&mut self) {
+        if let Err(err) = self.tracer_provider.shutdown() {
+            eprintln!("{err:?}");
+        }
+    }
+}
+
 /// Initializes tracing to stdout and optionally an open-telemetry exporter.
 ///
 /// Trace filtering defaults to `INFO` and can be configured using the conventional `RUST_LOG`
@@ -31,7 +45,10 @@ impl OpenTelemetry {
 /// [specification](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#opentelemetry-protocol-exporter)
 ///
 /// Registers a panic hook so that panic errors are reported to the open-telemetry exporter.
-pub fn setup_tracing(otel: OpenTelemetry) -> anyhow::Result<()> {
+///
+/// Returns an [`OtelGuard`] if open-telemetry is enabled, otherwise `None`. When this guard is
+/// dropped, the tracer provider is shutdown.
+pub fn setup_tracing(otel: OpenTelemetry) -> anyhow::Result<Option<OtelGuard>> {
     if otel.is_enabled() {
         opentelemetry::global::set_text_map_propagator(TraceContextPropagator::new());
     }
@@ -39,17 +56,14 @@ pub fn setup_tracing(otel: OpenTelemetry) -> anyhow::Result<()> {
     // Note: open-telemetry requires a tokio-runtime, so this _must_ be lazily evaluated (aka not
     // `then_some`) to avoid crashing sync callers (with OpenTelemetry::Disabled set). Examples of
     // such callers are tests with logging enabled.
-    let otel_layer = {
-        if otel.is_enabled() {
-            let exporter = opentelemetry_otlp::SpanExporter::builder()
-                .with_tonic()
-                .with_tls_config(tonic::transport::ClientTlsConfig::new().with_native_roots())
-                .build()?;
-            Some(open_telemetry_layer(exporter))
-        } else {
-            None
-        }
+    let tracer_provider = if otel.is_enabled() {
+        Some(init_tracer_provider()?)
+    } else {
+        None
     };
+    let otel_layer = tracer_provider.as_ref().map(|provider| {
+        OpenTelemetryLayer::new(provider.tracer("tracing-otel-subscriber")).boxed()
+    });
 
     let subscriber = Registry::default()
         .with(stdout_layer().with_filter(env_or_default_filter()))
@@ -60,7 +74,19 @@ pub fn setup_tracing(otel: OpenTelemetry) -> anyhow::Result<()> {
     std::panic::set_hook(Box::new(|info| {
         tracing::error!(panic = true, "{info}");
     }));
-    Ok(())
+
+    Ok(tracer_provider.map(|tracer_provider| OtelGuard { tracer_provider }))
+}
+
+fn init_tracer_provider() -> anyhow::Result<SdkTracerProvider> {
+    let exporter = opentelemetry_otlp::SpanExporter::builder()
+        .with_tonic()
+        .with_tls_config(tonic::transport::ClientTlsConfig::new().with_native_roots())
+        .build()?;
+
+    Ok(opentelemetry_sdk::trace::SdkTracerProvider::builder()
+        .with_batch_exporter(exporter)
+        .build())
 }
 
 /// Initializes tracing to a test exporter.
@@ -79,7 +105,11 @@ pub fn setup_test_tracing() -> anyhow::Result<(
     let (exporter, rx_export, rx_shutdown) =
         opentelemetry_sdk::testing::trace::new_tokio_test_exporter();
 
-    let otel_layer = open_telemetry_layer(exporter);
+    let tracer_provider = opentelemetry_sdk::trace::SdkTracerProvider::builder()
+        .with_batch_exporter(exporter)
+        .build();
+    let otel_layer =
+        OpenTelemetryLayer::new(tracer_provider.tracer("tracing-otel-subscriber")).boxed();
     let subscriber = Registry::default()
         .with(stdout_layer().with_filter(env_or_default_filter()))
         .with(otel_layer.with_filter(env_or_default_filter()));
@@ -87,21 +117,6 @@ pub fn setup_test_tracing() -> anyhow::Result<(
     Ok((rx_export, rx_shutdown))
 }
 
-fn open_telemetry_layer<S>(
-    exporter: impl SpanExporter + 'static,
-) -> Box<dyn tracing_subscriber::Layer<S> + Send + Sync + 'static>
-where
-    S: Subscriber + Sync + Send,
-    for<'a> S: tracing_subscriber::registry::LookupSpan<'a>,
-{
-    let tracer = opentelemetry_sdk::trace::SdkTracerProvider::builder()
-        .with_batch_exporter(exporter)
-        .build();
-
-    let tracer = tracer.tracer("tracing-otel-subscriber");
-    OpenTelemetryLayer::new(tracer).boxed()
-}
-
 #[cfg(not(feature = "tracing-forest"))]
 fn stdout_layer<S>() -> Box<dyn tracing_subscriber::Layer<S> + Send + Sync + 'static>
 where

From 2f374d66111b7ca0c03b7cd321fb24e3b032b966 Mon Sep 17 00:00:00 2001
From: Bobbin Threadbare <bobbinth@protonmail.com>
Date: Sun, 19 Oct 2025 18:15:24 -0700
Subject: [PATCH 52/78] chore: update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20187f38b..76f51789a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,8 @@
 - [BREAKING] Renamed `CheckNullifiersByPrefix` endpoint to `SyncNullifiers` ([#1191](https://github.com/0xMiden/miden-node/pull/1191)).
 - [BREAKING] Added `block_range` and `pagination_info` fields to paginated gRPC endpoints ([#1205](https://github.com/0xMiden/miden-node/pull/1205)).
 - Use `tonic` error codes for gRPC errors ([#1208](https://github.com/0xMiden/miden-node/pull/1208)).
-- [BREAKING] Replace `GetAccountProofs` with `GetAccountProof` in the public store API (#[1211](https://github.com/0xMiden/miden-node/pull/1211)).
+- [BREAKING] Replaced `GetAccountProofs` with `GetAccountProof` in the public store API (#[1211](https://github.com/0xMiden/miden-node/pull/1211)).
+- [BREAKING] Refactored the mempool to use a single DAG across transactions and batches ([#1234](https://github.com/0xMiden/miden-node/pull/1234)).
 - Implemented storage map `DataStore` function ([#1226](https://github.com/0xMiden/miden-node/pull/1226)).
 - [BREAKING] Renamed `RemoteProverProxy` to `RemoteProverClient` ([#1236](https://github.com/0xMiden/miden-node/pull/1236)).
 - Added pagination to `SyncNotes` endpoint ([#1257](https://github.com/0xMiden/miden-node/pull/1257)).

From 32ec07b4ce35a06f60e5e1ee6f012e6792f6c8cc Mon Sep 17 00:00:00 2001
From: keinberger <philipp.keinberger@gmail.com>
Date: Mon, 20 Oct 2025 18:54:14 +0300
Subject: [PATCH 53/78] chore: resolve merge conflicts

---
 .github/workflows/msrv.yml                    |   33 +
 CHANGELOG.md                                  |   14 +-
 Cargo.lock                                    | 1215 ++++++++++++-----
 Cargo.toml                                    |   23 +-
 bin/network-monitor/.env                      |    4 +
 bin/network-monitor/Cargo.toml                |    9 +
 bin/network-monitor/README.md                 |  111 +-
 bin/network-monitor/assets/index.css          |  120 +-
 bin/network-monitor/assets/index.html         |  222 ++-
 bin/network-monitor/src/config.rs             |  104 ++
 bin/network-monitor/src/faucet.rs             |  260 ++++
 bin/network-monitor/src/frontend.rs           |   27 +-
 bin/network-monitor/src/main.rs               |  339 ++++-
 bin/network-monitor/src/remote_prover.rs      |  309 +++++
 bin/network-monitor/src/status.rs             |  262 ++--
 bin/node/Cargo.toml                           |    2 +-
 bin/node/src/main.rs                          |    2 +-
 bin/remote-prover/Cargo.toml                  |    2 +-
 bin/remote-prover/src/api/prover.rs           |   19 +-
 .../src/generated/conversions.rs              |    6 +-
 .../src/generated/remote_prover.rs            |    2 +-
 bin/remote-prover/src/main.rs                 |    2 +-
 bin/remote-prover/src/proxy/worker.rs         |   16 +-
 bin/stress-test/Cargo.toml                    |    5 +-
 bin/stress-test/src/seeding/mod.rs            |   22 +-
 bin/stress-test/src/store/mod.rs              |    5 +-
 .../block-producer/src/batch_builder/mod.rs   |   74 +-
 .../block-producer/src/block_builder/mod.rs   |   47 +-
 .../block-producer/src/domain/transaction.rs  |    7 +-
 crates/block-producer/src/errors.rs           |  127 +-
 crates/block-producer/src/errors_test.rs      |   59 -
 crates/block-producer/src/lib.rs              |    5 +-
 .../block-producer/src/mempool/batch_graph.rs |  379 -----
 crates/block-producer/src/mempool/budget.rs   |  102 ++
 .../block-producer/src/mempool/graph/mod.rs   |  437 ------
 .../block-producer/src/mempool/graph/tests.rs |  577 --------
 .../mempool/inflight_state/account_state.rs   |  325 -----
 .../src/mempool/inflight_state/mod.rs         |  729 ----------
 crates/block-producer/src/mempool/mod.rs      |  856 +++++++-----
 crates/block-producer/src/mempool/nodes.rs    |  316 +++++
 crates/block-producer/src/mempool/state.rs    |  248 ++++
 .../src/mempool/subscription.rs               |    4 +-
 crates/block-producer/src/mempool/tests.rs    |  162 +--
 .../src/mempool/tests/add_transaction.rs      |  485 +++++++
 .../src/mempool/transaction_expiration.rs     |   75 -
 .../src/mempool/transaction_graph.rs          |  208 ---
 crates/block-producer/src/server/mod.rs       |   24 +-
 crates/block-producer/src/test_utils/batch.rs |    6 +-
 crates/block-producer/src/test_utils/mod.rs   |    2 +-
 .../src/test_utils/proven_tx.rs               |   43 +-
 crates/grpc-error-macro/Cargo.toml            |   23 +
 crates/grpc-error-macro/README.md             |  111 ++
 crates/grpc-error-macro/src/lib.rs            |  180 +++
 crates/ntx-builder/src/transaction.rs         |   37 +-
 crates/proto/Cargo.toml                       |   19 +-
 crates/proto/README.md                        |    9 +
 crates/proto/build.rs                         |    2 -
 crates/proto/src/clients/mod.rs               |   15 +-
 crates/proto/src/domain/account.rs            |  548 ++++++--
 crates/proto/src/domain/block.rs              |   43 +-
 crates/proto/src/domain/errors.rs             |   22 -
 crates/proto/src/domain/mempool.rs            |    4 +-
 crates/proto/src/domain/merkle.rs             |    6 +-
 crates/proto/src/domain/mod.rs                |    1 -
 crates/proto/src/{errors.rs => errors/mod.rs} |    5 +
 crates/proto/src/errors/test_macro.rs         |   69 +
 crates/proto/src/generated/account.rs         |    2 +-
 crates/proto/src/generated/errors.rs          |   52 -
 crates/proto/src/generated/mod.rs             |    1 -
 crates/proto/src/generated/primitives.rs      |    2 +-
 crates/proto/src/generated/remote_prover.rs   |    2 +-
 crates/proto/src/generated/rpc.rs             |   86 +-
 crates/proto/src/generated/rpc_store.rs       |  383 ++++--
 crates/proto/src/generated/transaction.rs     |   19 +
 .../src/remote_prover/batch_prover.rs         |   12 +-
 .../generated/nostd/remote_prover.rs          |    2 +-
 .../generated/std/remote_prover.rs            |    2 +-
 .../src/remote_prover/tx_prover.rs            |   12 +-
 crates/rpc/README.md                          |  122 +-
 crates/rpc/src/server/api.rs                  |   19 +-
 crates/rpc/src/server/health.rs               |   54 +
 crates/rpc/src/server/mod.rs                  |    3 +
 crates/store/README.md                        |  102 +-
 crates/store/src/blocks.rs                    |    7 +
 .../db/migrations/2025062000000_setup/up.sql  |   11 +-
 crates/store/src/db/mod.rs                    |   74 +-
 .../store/src/db/models/queries/accounts.rs   |    3 +-
 crates/store/src/db/models/queries/mod.rs     |   11 +-
 crates/store/src/db/models/queries/notes.rs   |   30 +-
 .../src/db/models/queries/transactions.rs     |  264 +++-
 crates/store/src/db/schema.rs                 |    7 +-
 crates/store/src/db/tests.rs                  |   98 +-
 crates/store/src/errors.rs                    |  143 +-
 crates/store/src/genesis/config/mod.rs        |   35 +-
 crates/store/src/server/api.rs                |   95 +-
 crates/store/src/server/block_producer.rs     |   11 +-
 crates/store/src/server/rpc_api.rs            |  228 +++-
 crates/store/src/state.rs                     |  157 ++-
 crates/utils/src/logging.rs                   |   73 +-
 crates/utils/src/tracing/grpc.rs              |   19 +-
 crates/utils/src/tracing/span_ext.rs          |   16 +-
 docs/external/src/rpc.md                      |   28 +-
 docs/internal/src/rpc.md                      |   32 +
 proto/build.rs                                |    8 -
 proto/proto/remote_prover.proto               |    2 +-
 proto/proto/rpc.proto                         |    5 +-
 proto/proto/store/rpc.proto                   |  216 ++-
 proto/proto/types/account.proto               |    2 +-
 proto/proto/types/errors.proto                |   14 -
 proto/proto/types/primitives.proto            |    2 +-
 proto/proto/types/transaction.proto           |   21 +-
 proto/src/lib.rs                              |    7 -
 rust-toolchain.toml                           |    5 +
 scripts/check-msrv.sh                         |  153 +++
 114 files changed, 7327 insertions(+), 4851 deletions(-)
 create mode 100644 .github/workflows/msrv.yml
 create mode 100644 bin/network-monitor/src/config.rs
 create mode 100644 bin/network-monitor/src/faucet.rs
 create mode 100644 bin/network-monitor/src/remote_prover.rs
 delete mode 100644 crates/block-producer/src/errors_test.rs
 delete mode 100644 crates/block-producer/src/mempool/batch_graph.rs
 create mode 100644 crates/block-producer/src/mempool/budget.rs
 delete mode 100644 crates/block-producer/src/mempool/graph/mod.rs
 delete mode 100644 crates/block-producer/src/mempool/graph/tests.rs
 delete mode 100644 crates/block-producer/src/mempool/inflight_state/account_state.rs
 delete mode 100644 crates/block-producer/src/mempool/inflight_state/mod.rs
 create mode 100644 crates/block-producer/src/mempool/nodes.rs
 create mode 100644 crates/block-producer/src/mempool/state.rs
 create mode 100644 crates/block-producer/src/mempool/tests/add_transaction.rs
 delete mode 100644 crates/block-producer/src/mempool/transaction_expiration.rs
 delete mode 100644 crates/block-producer/src/mempool/transaction_graph.rs
 create mode 100644 crates/grpc-error-macro/Cargo.toml
 create mode 100644 crates/grpc-error-macro/README.md
 create mode 100644 crates/grpc-error-macro/src/lib.rs
 delete mode 100644 crates/proto/src/domain/errors.rs
 rename crates/proto/src/{errors.rs => errors/mod.rs} (94%)
 create mode 100644 crates/proto/src/errors/test_macro.rs
 delete mode 100644 crates/proto/src/generated/errors.rs
 create mode 100644 crates/rpc/src/server/health.rs
 delete mode 100644 proto/proto/types/errors.proto
 create mode 100644 rust-toolchain.toml
 create mode 100755 scripts/check-msrv.sh

diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
new file mode 100644
index 000000000..354e2afa9
--- /dev/null
+++ b/.github/workflows/msrv.yml
@@ -0,0 +1,33 @@
+name: Check MSRV
+
+on:
+  push:
+    branches: [next]
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+# Limits workflow concurrency to only the latest commit in the PR.
+concurrency:
+  group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  # Check MSRV (aka `rust-version`) in `Cargo.toml` is valid for workspace members
+  msrv:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install -y jq
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/next' }}
+      - name: Install cargo-msrv
+        run: cargo install cargo-msrv
+      - name: Check MSRV for each workspace member
+        run: |
+          ./scripts/check-msrv.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f6ef68ea..76f51789a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,14 +10,26 @@
 - [BREAKING] Renamed `CheckNullifiersByPrefix` endpoint to `SyncNullifiers` ([#1191](https://github.com/0xMiden/miden-node/pull/1191)).
 - [BREAKING] Added `block_range` and `pagination_info` fields to paginated gRPC endpoints ([#1205](https://github.com/0xMiden/miden-node/pull/1205)).
 - Use `tonic` error codes for gRPC errors ([#1208](https://github.com/0xMiden/miden-node/pull/1208)).
-- [BREAKING] Replace `GetAccountProofs` with `GetAccountProof` in the public store API (#[1211](https://github.com/0xMiden/miden-node/pull/1211)).
+- [BREAKING] Replaced `GetAccountProofs` with `GetAccountProof` in the public store API (#[1211](https://github.com/0xMiden/miden-node/pull/1211)).
+- [BREAKING] Refactored the mempool to use a single DAG across transactions and batches ([#1234](https://github.com/0xMiden/miden-node/pull/1234)).
 - Implemented storage map `DataStore` function ([#1226](https://github.com/0xMiden/miden-node/pull/1226)).
+- [BREAKING] Renamed `RemoteProverProxy` to `RemoteProverClient` ([#1236](https://github.com/0xMiden/miden-node/pull/1236)).
+- Added pagination to `SyncNotes` endpoint ([#1257](https://github.com/0xMiden/miden-node/pull/1257)).
+- Added application level error in gRPC endpoints ([#1266](https://github.com/0xMiden/miden-node/pull/1266)).
+- [BREAKING] Response type nuances of `GetAccountProof` in the public store API (#[1277](https://github.com/0xMiden/miden-node/pull/1277)).
+
+## v0.11.2 (2025-09-10)
+
+- Added support for keepalive requests against base path `/` of RPC server ([#1212](https://github.com/0xMiden/miden-node/pull/1212)).
+- [BREAKING] Replace `GetAccountProofs` with `GetAccountProof` in the public store API ([#1211](https://github.com/0xMiden/miden-node/pull/1211)).
+- [BREAKING] Optimize `GetAccountProof` for small accounts ([#1185](https://github.com/0xMiden/miden-node/pull/1185)).
 
 ## v0.11.1 (2025-09-08)
 
 - Removed decorators from scripts when submitting transactions and batches, and inserting notes into the DB ([#1194](https://github.com/
 0xMiden/miden-node/pull/1194)).
 - Refresh `miden-base` dependencies.
+- Added `SyncTransactions` gRPC endpoint for retrieving transactions for specific accounts within a block range ([#1224](https://github.com/0xMiden/miden-node/pull/1224)).
 - Added `miden-network-monitor` binary for monitoring the Miden network ([#1217](https://github.com/0xMiden/miden-node/pull/1217)).
 
 ## v0.11.0 (2025-08-28)
diff --git a/Cargo.lock b/Cargo.lock
index c6d8a10c4..9d7f2215e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,11 +2,21 @@
 # It is not intended for manual editing.
 version = 4
 
+[[package]]
+name = "Inflector"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
+dependencies = [
+ "lazy_static",
+ "regex",
+]
+
 [[package]]
 name = "addr2line"
-version = "0.24.2"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
 dependencies = [
  "gimli",
 ]
@@ -17,6 +27,16 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
 [[package]]
 name = "ahash"
 version = "0.8.12"
@@ -71,9 +91,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.20"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -86,9 +106,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.11"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
 
 [[package]]
 name = "anstyle-parse"
@@ -121,9 +141,12 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.99"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+dependencies = [
+ "backtrace",
+]
 
 [[package]]
 name = "arc-swap"
@@ -225,9 +248,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "axum"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5"
+checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871"
 dependencies = [
  "axum-core",
  "bytes",
@@ -244,8 +267,7 @@ dependencies = [
  "mime",
  "percent-encoding",
  "pin-project-lite",
- "rustversion",
- "serde",
+ "serde_core",
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
@@ -259,9 +281,9 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.5.2"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6"
+checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22"
 dependencies = [
  "bytes",
  "futures-core",
@@ -270,7 +292,6 @@ dependencies = [
  "http-body-util",
  "mime",
  "pin-project-lite",
- "rustversion",
  "sync_wrapper",
  "tower-layer",
  "tower-service",
@@ -279,9 +300,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.75"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
 dependencies = [
  "addr2line",
  "cfg-if",
@@ -289,7 +310,7 @@ dependencies = [
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-targets 0.52.6",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -301,12 +322,24 @@ dependencies = [
  "backtrace",
 ]
 
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
 [[package]]
 name = "base64"
 version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "base64ct"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
+
 [[package]]
 name = "bech32"
 version = "0.11.0"
@@ -419,9 +452,9 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "bytemuck"
-version = "1.23.2"
+version = "1.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677"
+checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
 
 [[package]]
 name = "byteorder"
@@ -437,11 +470,11 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "camino"
-version = "1.1.12"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0b03af37dad7a14518b7691d81acb0f8222604ad3d1b02f6b4bed5188c0cd5"
+checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -461,17 +494,17 @@ checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.26",
+ "semver 1.0.27",
  "serde",
  "serde_json",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "cc"
-version = "1.2.36"
+version = "1.2.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5252b3d2648e5eedbc1a6f501e3c795e07025c1e93bbf8bbdd6eef7f447a6d54"
+checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -481,9 +514,9 @@ dependencies = [
 
 [[package]]
 name = "cf-rustracing"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8911ac33364d043fa741f0d393e85c6f23b55015b97c3e3e14b51bc46edb4437"
+checksum = "2eb9972cb0c088499d4f4df938512cf5e1ec07b52528dec5f8148d188dd61ba9"
 dependencies = [
  "backtrace",
  "rand 0.8.5",
@@ -513,6 +546,30 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
 
+[[package]]
+name = "chacha20"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "chacha20poly1305"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
+dependencies = [
+ "aead",
+ "chacha20",
+ "cipher",
+ "poly1305",
+ "zeroize",
+]
+
 [[package]]
 name = "chrono"
 version = "0.4.42"
@@ -523,7 +580,18 @@ dependencies = [
  "js-sys",
  "num-traits",
  "wasm-bindgen",
- "windows-link 0.2.0",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+ "zeroize",
 ]
 
 [[package]]
@@ -545,23 +613,23 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.47"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931"
+checksum = "f4512b90fa68d3a9932cea5184017c5d200f5921df706d45e853537dea51508f"
 dependencies = [
  "clap_builder",
- "clap_derive 4.5.47",
+ "clap_derive 4.5.49",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.47"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6"
+checksum = "0025e98baa12e766c67ba13ff4695a887a1eba19569aad00a472546795bd6730"
 dependencies = [
  "anstream",
  "anstyle",
- "clap_lex 0.7.5",
+ "clap_lex 0.7.6",
  "strsim 0.11.1",
 ]
 
@@ -580,9 +648,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.47"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
+checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -601,9 +669,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "cmake"
@@ -620,6 +688,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
 [[package]]
 name = "constant_time_eq"
 version = "0.3.1"
@@ -704,6 +778,18 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
+[[package]]
+name = "crypto-bigint"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -711,6 +797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
  "generic-array",
+ "rand_core 0.6.4",
  "typenum",
 ]
 
@@ -729,8 +816,18 @@ version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.20.11",
+ "darling_macro 0.20.11",
+]
+
+[[package]]
+name = "darling"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+dependencies = [
+ "darling_core 0.21.3",
+ "darling_macro 0.21.3",
 ]
 
 [[package]]
@@ -747,13 +844,38 @@ dependencies = [
  "syn 2.0.106",
 ]
 
+[[package]]
+name = "darling_core"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.11.1",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "darling_macro"
 version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
- "darling_core",
+ "darling_core 0.20.11",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+dependencies = [
+ "darling_core 0.21.3",
  "quote",
  "syn 2.0.106",
 ]
@@ -799,11 +921,21 @@ dependencies = [
  "deadpool-runtime",
 ]
 
+[[package]]
+name = "der"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
 [[package]]
 name = "deranged"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
+checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071"
 dependencies = [
  "powerfmt",
 ]
@@ -834,7 +966,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
 dependencies = [
- "darling",
+ "darling 0.20.11",
  "proc-macro2",
  "quote",
  "syn 2.0.106",
@@ -872,24 +1004,26 @@ dependencies = [
 
 [[package]]
 name = "diesel"
-version = "2.2.12"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229850a212cd9b84d4f0290ad9d294afc0ae70fccaa8949dbe8b43ffafa1e20c"
+checksum = "e8496eeb328dce26ee9d9b73275d396d9bddb433fa30106cf6056dd8c3c2764c"
 dependencies = [
  "bigdecimal",
  "diesel_derives",
+ "downcast-rs",
  "libsqlite3-sys",
  "num-bigint",
  "num-integer",
  "num-traits",
+ "sqlite-wasm-rs",
  "time",
 ]
 
 [[package]]
 name = "diesel_derives"
-version = "2.2.7"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b96984c469425cb577bf6f17121ecb3e4fe1e81de5d8f780dd372802858d756"
+checksum = "09af0e983035368439f1383011cd87c46f41da81d0f21dc3727e2857d5a43c8e"
 dependencies = [
  "diesel_table_macro_syntax",
  "dsl_auto_type",
@@ -900,9 +1034,9 @@ dependencies = [
 
 [[package]]
 name = "diesel_migrations"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a73ce704bad4231f001bff3314d91dce4aba0770cee8b233991859abc15c1f6"
+checksum = "ee060f709c3e3b1cadd83fcd0f61711f7a8cf493348f758d3a1c1147d70b3c97"
 dependencies = [
  "diesel",
  "migrations_internals",
@@ -911,9 +1045,9 @@ dependencies = [
 
 [[package]]
 name = "diesel_table_macro_syntax"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25"
+checksum = "fe2444076b48641147115697648dc743c2c00b61adade0f01ce67133c7babe8c"
 dependencies = [
  "syn 2.0.106",
 ]
@@ -931,6 +1065,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
+ "const-oid",
  "crypto-common",
  "subtle",
 ]
@@ -952,13 +1087,19 @@ version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8975ffdaa0ef3661bfe02dbdcc06c9f829dfafe6a3c474de366a8d5e44276921"
 
+[[package]]
+name = "downcast-rs"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "117240f60069e65410b3ae1bb213295bd828f707b5bec6596a1afc8793ce0cbc"
+
 [[package]]
 name = "dsl_auto_type"
-version = "0.1.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "139ae9aca7527f85f26dd76483eb38533fd84bd571065da1739656ef71c5ff5b"
+checksum = "dd122633e4bef06db27737f21d3738fb89c8f6d5360d6d9d7635dda142a7757e"
 dependencies = [
- "darling",
+ "darling 0.21.3",
  "either",
  "heck 0.5.0",
  "proc-macro2",
@@ -966,12 +1107,46 @@ dependencies = [
  "syn 2.0.106",
 ]
 
+[[package]]
+name = "ecdsa"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+dependencies = [
+ "der",
+ "digest",
+ "elliptic-curve",
+ "rfc6979",
+ "signature",
+ "spki",
+]
+
 [[package]]
 name = "either"
 version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
+[[package]]
+name = "elliptic-curve"
+version = "0.13.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "digest",
+ "ff",
+ "generic-array",
+ "group",
+ "hkdf",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "sec1",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "ena"
 version = "0.14.3"
@@ -990,11 +1165,23 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "enum_dispatch"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "env_filter"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
+checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2"
 dependencies = [
  "log",
  "regex",
@@ -1021,12 +1208,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1035,6 +1222,16 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
+[[package]]
+name = "ff"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "figment"
 version = "0.10.19"
@@ -1053,9 +1250,9 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.1"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
 
 [[package]]
 name = "fixedbitset"
@@ -1065,15 +1262,27 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "flate2"
-version = "1.1.2"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
 dependencies = [
  "crc32fast",
  "libz-ng-sys",
  "miniz_oxide",
 ]
 
+[[package]]
+name = "flume"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "nanorand",
+ "spin",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -1118,9 +1327,9 @@ dependencies = [
 
 [[package]]
 name = "fs-err"
-version = "3.1.1"
+version = "3.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d7be93788013f265201256d58f04936a8079ad5dc898743aa20525f503b683"
+checksum = "6ad492b2cf1d89d568a43508ab24f98501fe03f2f31c01e1d0fe7366a71745d2"
 dependencies = [
  "autocfg",
 ]
@@ -1236,12 +1445,13 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.7"
+version = "0.14.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
 dependencies = [
  "typenum",
  "version_check",
+ "zeroize",
 ]
 
 [[package]]
@@ -1251,8 +1461,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -1265,15 +1477,15 @@ dependencies = [
  "js-sys",
  "libc",
  "r-efi",
- "wasi 0.14.4+wasi-0.2.4",
+ "wasi 0.14.7+wasi-0.2.4",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.31.1"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
 
 [[package]]
 name = "glob"
@@ -1281,6 +1493,17 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "h2"
 version = "0.4.12"
@@ -1293,7 +1516,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http",
- "indexmap 2.11.0",
+ "indexmap 2.11.4",
  "slab",
  "tokio",
  "tokio-util",
@@ -1361,6 +1584,24 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
 [[package]]
 name = "hostname"
 version = "0.4.1"
@@ -1420,9 +1661,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
+checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
 
 [[package]]
 name = "hyper"
@@ -1494,9 +1735,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e"
+checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
 dependencies = [
  "base64",
  "bytes",
@@ -1510,7 +1751,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.5.10",
+ "socket2 0.6.1",
  "system-configuration",
  "tokio",
  "tower-service",
@@ -1520,9 +1761,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.63"
+version = "0.1.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1530,7 +1771,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core",
+ "windows-core 0.62.2",
 ]
 
 [[package]]
@@ -1673,12 +1914,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.11.0"
+version = "2.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
+checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.0",
 ]
 
 [[package]]
@@ -1687,6 +1928,15 @@ version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb"
 
+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "io-uring"
 version = "0.7.10"
@@ -1777,14 +2027,28 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.78"
+version = "0.3.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738"
+checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "k256"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b"
+dependencies = [
+ "cfg-if",
+ "ecdsa",
+ "elliptic-curve",
+ "once_cell",
+ "sha2",
+ "signature",
+]
+
 [[package]]
 name = "keccak"
 version = "0.1.5"
@@ -1832,9 +2096,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.175"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "libm"
@@ -1876,9 +2140,9 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 
 [[package]]
 name = "litemap"
@@ -1894,17 +2158,16 @@ checksum = "656b3b27f8893f7bbf9485148ff9a65f019e3f33bd5cdc87c83cab16b3fd9ec8"
 dependencies = [
  "libc",
  "neli",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "lock_api"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "autocfg",
  "scopeguard",
 ]
 
@@ -1993,9 +2256,9 @@ checksum = "f490ea2ae935dd8ac89c472d4df28c7f6b87cc20767e1b21fd5ed6a16e7f61e4"
 
 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "memoffset"
@@ -2008,35 +2271,35 @@ dependencies = [
 
 [[package]]
 name = "miden-air"
-version = "0.17.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db750ce0c58f51ba786c7391f392c4b77e0c83a44c5096672d4d0270d3cc7763"
+checksum = "28b72121bacf147becf7eadcfc7bcd62d41c1e97c0d2cfdc1fd5dba2531721a8"
 dependencies = [
  "miden-core",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "winter-air",
  "winter-prover",
 ]
 
 [[package]]
 name = "miden-assembly"
-version = "0.17.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82575d8479aad3966be3defdc17911264bfdc99f9a7bb185180eec57c6bda9f5"
+checksum = "bc57c069054e1f34052e60b55e7c7e066c09fe6f23fc6ca747b25b9afa9b6abd"
 dependencies = [
  "log",
  "miden-assembly-syntax",
  "miden-core",
  "miden-mast-package",
  "smallvec",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "miden-assembly-syntax"
-version = "0.17.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7b3588ce15920c0bff47e8bf8c6ca9e0a7a539ff93014cb5ec3c665f60bc0f1"
+checksum = "b73b2c264d5f65a3f62f49a6c4dfedf37152454d6d963330bd0c5b183b2e2e6c"
 dependencies = [
  "aho-corasick",
  "lalrpop",
@@ -2046,64 +2309,74 @@ dependencies = [
  "miden-debug-types",
  "miden-utils-diagnostics",
  "midenc-hir-type",
+ "proptest",
  "regex",
  "rustc_version 0.4.1",
- "semver 1.0.26",
+ "semver 1.0.27",
  "smallvec",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "miden-block-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
 dependencies = [
  "miden-lib",
  "miden-objects",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "miden-core"
-version = "0.17.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "571a943a923e5fb3f1bed534f41a1542c531ad2aec87dc0d5699af1709fbcea6"
+checksum = "996f8d8e2a4dd4eef54225f6f116c73b14f03256bc23ea5d4260fe803dd103e2"
 dependencies = [
+ "enum_dispatch",
  "miden-crypto",
  "miden-debug-types",
  "miden-formatting",
  "num-derive",
  "num-traits",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "winter-math",
  "winter-utils",
 ]
 
 [[package]]
 name = "miden-crypto"
-version = "0.15.9"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4329275a11c7d8328b14a7129b21d40183056dcd0d871c3069be6e550d6ca40"
+checksum = "87b287c7a76b95be7ef5588e98a9dbe1973395dbb19eb59dd34d82b06e47f02a"
 dependencies = [
  "blake3",
  "cc",
+ "chacha20poly1305",
+ "flume",
+ "getrandom 0.2.16",
  "glob",
+ "hkdf",
+ "k256",
  "num",
  "num-complex",
  "rand 0.9.2",
+ "rand_chacha 0.9.0",
  "rand_core 0.9.3",
+ "rand_hc",
  "sha3",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "winter-crypto",
  "winter-math",
  "winter-utils",
+ "zeroize",
 ]
 
 [[package]]
 name = "miden-debug-types"
-version = "0.17.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93a4b53092da70aa4c9b75acc85e1c7b4d8202ce89487d2271ebdc2defcb08d6"
+checksum = "3c24f4040fd3a5b714f2492c723b91dffe29b1af591d15f393dd102063725cd0"
 dependencies = [
  "memchr",
  "miden-crypto",
@@ -2112,8 +2385,8 @@ dependencies = [
  "miden-utils-sync",
  "paste",
  "serde",
- "serde_spanned 1.0.0",
- "thiserror 2.0.16",
+ "serde_spanned 1.0.3",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -2128,27 +2401,31 @@ dependencies = [
 [[package]]
 name = "miden-lib"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
 dependencies = [
+ "Inflector",
+ "fs-err",
  "miden-assembly",
+ "miden-core",
  "miden-objects",
  "miden-processor",
  "miden-stdlib",
  "rand 0.9.2",
  "regex",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "walkdir",
 ]
 
 [[package]]
 name = "miden-mast-package"
-version = "0.17.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57efbfaea75eeb07d448c04aefce241bf8f23ea11600a669d897280551819992"
+checksum = "c25726075ff6b7262fbb12d4914672ae6999fbeaa6e3883c9cff69348ad1c09c"
 dependencies = [
  "derive_more",
  "miden-assembly-syntax",
  "miden-core",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -2177,7 +2454,7 @@ dependencies = [
  "syn 2.0.106",
  "terminal_size 0.3.0",
  "textwrap",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "trybuild",
  "unicode-width 0.1.14",
 ]
@@ -2199,10 +2476,19 @@ version = "0.12.0"
 dependencies = [
  "anyhow",
  "axum",
+ "clap 4.5.49",
+ "humantime",
  "miden-node-proto",
  "miden-node-utils",
+ "miden-objects",
+ "miden-testing",
+ "miden-tx",
+ "reqwest",
  "serde",
+ "serde_json",
+ "sha2",
  "tokio",
+ "tonic",
  "tracing",
  "url",
 ]
@@ -2212,7 +2498,7 @@ name = "miden-node"
 version = "0.12.0"
 dependencies = [
  "anyhow",
- "clap 4.5.47",
+ "clap 4.5.49",
  "figment",
  "fs-err",
  "humantime",
@@ -2251,7 +2537,7 @@ dependencies = [
  "rstest",
  "serial_test",
  "tempfile",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
  "tonic",
@@ -2262,6 +2548,14 @@ dependencies = [
  "winterfell",
 ]
 
+[[package]]
+name = "miden-node-grpc-error-macro"
+version = "0.12.0"
+dependencies = [
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "miden-node-ntx-builder"
 version = "0.12.0"
@@ -2275,7 +2569,7 @@ dependencies = [
  "miden-remote-prover-client",
  "miden-tx",
  "rstest",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
  "tonic",
@@ -2291,6 +2585,7 @@ dependencies = [
  "fs-err",
  "hex",
  "http",
+ "miden-node-grpc-error-macro",
  "miden-node-proto-build",
  "miden-node-utils",
  "miden-objects",
@@ -2299,7 +2594,7 @@ dependencies = [
  "prost",
  "prost-build",
  "protox",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tonic",
  "tonic-build",
  "url",
@@ -2332,9 +2627,9 @@ dependencies = [
  "miden-tx",
  "reqwest",
  "rstest",
- "semver 1.0.26",
+ "semver 1.0.27",
  "tempfile",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
  "tonic",
@@ -2358,7 +2653,7 @@ dependencies = [
  "diesel",
  "diesel_migrations",
  "hex",
- "indexmap 2.11.0",
+ "indexmap 2.11.4",
  "miden-lib",
  "miden-node-proto",
  "miden-node-proto-build",
@@ -2371,7 +2666,7 @@ dependencies = [
  "regex",
  "serde",
  "termtree",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
  "toml 0.8.23",
@@ -2385,7 +2680,7 @@ dependencies = [
 name = "miden-node-stress-test"
 version = "0.12.0"
 dependencies = [
- "clap 4.5.47",
+ "clap 4.5.49",
  "fs-err",
  "futures",
  "miden-air",
@@ -2401,7 +2696,6 @@ dependencies = [
  "tokio",
  "tonic",
  "url",
- "winterfell",
 ]
 
 [[package]]
@@ -2428,7 +2722,7 @@ dependencies = [
  "opentelemetry_sdk",
  "rand 0.9.2",
  "serde",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tonic",
  "tower-http",
@@ -2444,7 +2738,7 @@ dependencies = [
 [[package]]
 name = "miden-objects"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
 dependencies = [
  "bech32",
  "getrandom 0.3.3",
@@ -2457,24 +2751,25 @@ dependencies = [
  "miden-verifier",
  "rand 0.9.2",
  "rand_xoshiro",
- "semver 1.0.26",
+ "semver 1.0.27",
  "serde",
- "thiserror 2.0.16",
- "toml 0.9.5",
+ "thiserror 2.0.17",
+ "toml 0.9.8",
  "winter-rand-utils",
 ]
 
 [[package]]
 name = "miden-processor"
-version = "0.17.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c033f51b575b5a70b763dc0bc05062b6562a8286c6d0c144eaff92da8f214f"
+checksum = "943b22d826ce116cbaf8633c699e45eece83dc4c2facb1677e067b42f433aba8"
 dependencies = [
  "miden-air",
  "miden-core",
  "miden-debug-types",
  "miden-utils-diagnostics",
- "thiserror 2.0.16",
+ "paste",
+ "thiserror 2.0.17",
  "tokio",
  "tracing",
  "winter-prover",
@@ -2482,9 +2777,9 @@ dependencies = [
 
 [[package]]
 name = "miden-prover"
-version = "0.17.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d2479d594077a0f66b50a5bb1441bdf3824426a6c6b5ddda0b4df3031b0f2f"
+checksum = "743e27899f2a56e92da93efc287fe76a635446251dbecc2138e8b85ecdcfd0bd"
 dependencies = [
  "miden-air",
  "miden-debug-types",
@@ -2502,7 +2797,7 @@ dependencies = [
  "async-trait",
  "axum",
  "bytes",
- "clap 4.5.47",
+ "clap 4.5.49",
  "http",
  "humantime",
  "miden-block-prover",
@@ -2524,10 +2819,10 @@ dependencies = [
  "prost-build",
  "protox",
  "reqwest",
- "semver 1.0.26",
+ "semver 1.0.27",
  "serde",
  "serde_qs",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
  "tonic",
@@ -2552,7 +2847,7 @@ dependencies = [
  "prost",
  "prost-build",
  "protox",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tonic",
  "tonic-build",
@@ -2562,22 +2857,24 @@ dependencies = [
 
 [[package]]
 name = "miden-stdlib"
-version = "0.17.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6d69ecc86e53b9e732b66ef198d444a7c853676fd79e875dc3523dba33d70d"
+checksum = "7cebf10ea08fc7e015e4391953e8953ed689104973084e1c4f057473017e6518"
 dependencies = [
  "env_logger",
+ "fs-err",
  "miden-assembly",
  "miden-core",
+ "miden-crypto",
  "miden-processor",
  "miden-utils-sync",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "miden-testing"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
 dependencies = [
  "anyhow",
  "itertools",
@@ -2589,15 +2886,14 @@ dependencies = [
  "miden-tx-batch-prover",
  "rand 0.9.2",
  "rand_chacha 0.9.0",
- "thiserror 2.0.16",
- "tokio",
+ "thiserror 2.0.17",
  "winterfell",
 ]
 
 [[package]]
 name = "miden-tx"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2605,14 +2901,14 @@ dependencies = [
  "miden-prover",
  "miden-verifier",
  "rand 0.9.2",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
 ]
 
 [[package]]
 name = "miden-tx-batch-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#fdf7c0e47191277a95f0ce29abb7b2d7f0a9d754"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
 dependencies = [
  "miden-objects",
  "miden-tx",
@@ -2620,9 +2916,9 @@ dependencies = [
 
 [[package]]
 name = "miden-utils-diagnostics"
-version = "0.17.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d640d80ce3438275b13d0d400901e5bbf3179737818d91d4e84f747a480fd8b"
+checksum = "9da59c10824c85d585145aff6ef760f0baaaf6c4576c8ad241c281ce2e345b79"
 dependencies = [
  "miden-crypto",
  "miden-debug-types",
@@ -2633,9 +2929,9 @@ dependencies = [
 
 [[package]]
 name = "miden-utils-sync"
-version = "0.17.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf49e1fbfefeb58de992767ae7b0b6200885e342f4dd43c510daefce9539b95"
+checksum = "498138c030b4bf3808e2ef87ba1170b22d5572a8ef6a0acd5a5f10d2bfc91e72"
 dependencies = [
  "lock_api",
  "loom",
@@ -2644,26 +2940,26 @@ dependencies = [
 
 [[package]]
 name = "miden-verifier"
-version = "0.17.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3104dce8b4668639aa97aa748a98aab0ea33c103e06ef5c3fd12445ab3bd2387"
+checksum = "edf15bf92a77f8f7d0291b155af55bb5576fe4277d897dc035e73dc39275bace"
 dependencies = [
  "miden-air",
  "miden-core",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tracing",
  "winter-verifier",
 ]
 
 [[package]]
 name = "midenc-hir-type"
-version = "0.1.5"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e381ba23e4f57ffa0d6039113f6d6004e5b8c7ae6cb909329b48f2ab525e8680"
+checksum = "7798671ffbf6596de00619a9abaec67dc26965b891328c9d65c4cb6007597d50"
 dependencies = [
  "miden-formatting",
  "smallvec",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -2698,19 +2994,19 @@ dependencies = [
 
 [[package]]
 name = "migrations_internals"
-version = "2.2.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bda1634d70d5bd53553cf15dca9842a396e8c799982a3ad22998dc44d961f24"
+checksum = "36c791ecdf977c99f45f23280405d7723727470f6689a5e6dbf513ac547ae10d"
 dependencies = [
  "serde",
- "toml 0.9.5",
+ "toml 0.9.8",
 ]
 
 [[package]]
 name = "migrations_macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb161cc72176cb37aa47f1fc520d3ef02263d67d661f44f05d05a079e1237fd"
+checksum = "36fc5ac76be324cfd2d3f2cf0fdf5d5d3c4f14ed8aaebadb09e304ba42282703"
 dependencies = [
  "migrations_internals",
  "proc-macro2",
@@ -2730,6 +3026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
@@ -2749,6 +3046,15 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
 
+[[package]]
+name = "nanorand"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
+dependencies = [
+ "getrandom 0.2.16",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.2.14"
@@ -2811,11 +3117,11 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.50.1"
+version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2930,9 +3236,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.7"
+version = "0.37.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
 dependencies = [
  "memchr",
 ]
@@ -2949,6 +3255,12 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
 
+[[package]]
+name = "opaque-debug"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+
 [[package]]
 name = "openssl"
 version = "0.10.73"
@@ -3003,7 +3315,7 @@ dependencies = [
  "futures-sink",
  "js-sys",
  "pin-project-lite",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tracing",
 ]
 
@@ -3018,7 +3330,7 @@ dependencies = [
  "opentelemetry-proto",
  "opentelemetry_sdk",
  "prost",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tonic",
 ]
@@ -3048,7 +3360,7 @@ dependencies = [
  "percent-encoding",
  "rand 0.9.2",
  "serde_json",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
 ]
@@ -3061,15 +3373,15 @@ checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
 
 [[package]]
 name = "owo-colors"
-version = "4.2.2"
+version = "4.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48dd4f4a2c8405440fd0462561f0e5806bd0f77e86f51c761481bdd4018b545e"
+checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -3077,15 +3389,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.11"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -3130,7 +3442,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
 dependencies = [
  "fixedbitset",
- "indexmap 2.11.0",
+ "indexmap 2.11.4",
 ]
 
 [[package]]
@@ -3260,7 +3572,7 @@ dependencies = [
  "serde",
  "serde_yaml",
  "sfv",
- "socket2 0.5.10",
+ "socket2 0.6.1",
  "strum",
  "strum_macros",
  "tokio",
@@ -3417,12 +3729,33 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
+[[package]]
+name = "poly1305"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
+dependencies = [
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
 [[package]]
 name = "portable-atomic"
 version = "1.11.1"
@@ -3490,11 +3823,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
 dependencies = [
- "toml_edit",
+ "toml_edit 0.23.7",
 ]
 
 [[package]]
@@ -3570,14 +3903,14 @@ dependencies = [
  "memchr",
  "parking_lot",
  "protobuf 3.7.2",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "proptest"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f"
+checksum = "2bb0be07becd10686a0bb407298fb425360a5c44a663774406340c59a22de4ce"
 dependencies = [
  "bit-set",
  "bit-vec",
@@ -3695,7 +4028,7 @@ dependencies = [
  "prost-reflect",
  "prost-types",
  "protox-parse",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -3707,7 +4040,7 @@ dependencies = [
  "logos",
  "miette",
  "prost-types",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -3718,9 +4051,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
  "proc-macro2",
 ]
@@ -3790,6 +4123,15 @@ dependencies = [
  "getrandom 0.3.3",
 ]
 
+[[package]]
+name = "rand_hc"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b363d4f6370f88d62bf586c80405657bde0f0e1b8945d47d2ad59b906cb4f54"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "rand_xorshift"
 version = "0.4.0"
@@ -3830,18 +4172,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.17"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
  "bitflags 2.9.4",
 ]
 
 [[package]]
 name = "regex"
-version = "1.11.2"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3851,9 +4193,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.10"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3862,9 +4204,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "relative-path"
@@ -3874,9 +4216,9 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 
 [[package]]
 name = "reqwest"
-version = "0.12.23"
+version = "0.12.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb"
+checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
 dependencies = [
  "base64",
  "bytes",
@@ -3912,6 +4254,16 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
 [[package]]
 name = "ring"
 version = "0.17.14"
@@ -3980,9 +4332,9 @@ dependencies = [
 
 [[package]]
 name = "rust_decimal"
-version = "1.37.2"
+version = "1.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b203a6425500a03e0919c42d3c47caca51e79f1132046626d2c8871c5092035d"
+checksum = "35affe401787a9bd846712274d97654355d21b2a2c092a3139aabe31e9022282"
 dependencies = [
  "arrayvec",
  "num-traits",
@@ -4009,7 +4361,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
- "semver 1.0.26",
+ "semver 1.0.27",
 ]
 
 [[package]]
@@ -4027,22 +4379,22 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.8"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
  "bitflags 2.9.4",
  "errno",
  "libc",
- "linux-raw-sys 0.9.4",
- "windows-sys 0.60.2",
+ "linux-raw-sys 0.11.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.31"
+version = "0.23.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
+checksum = "cd3c25631629d034ce7cd9940adc9d45762d46de2b0f57193c4443b92c6d4d40"
 dependencies = [
  "log",
  "once_cell",
@@ -4062,7 +4414,7 @@ dependencies = [
  "openssl-probe",
  "rustls-pki-types",
  "schannel",
- "security-framework 3.4.0",
+ "security-framework 3.5.1",
 ]
 
 [[package]]
@@ -4076,9 +4428,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.4"
+version = "0.103.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
+checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -4093,9 +4445,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "rusty-fork"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2"
 dependencies = [
  "fnv",
  "quick-error",
@@ -4129,11 +4481,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4154,6 +4506,20 @@ version = "3.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"
 
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct",
+ "der",
+ "generic-array",
+ "pkcs8",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "security-framework"
 version = "2.11.1"
@@ -4169,9 +4535,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "3.4.0"
+version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b369d18893388b345804dc0007963c99b7d665ae71d275812d828c6f089640"
+checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
 dependencies = [
  "bitflags 2.9.4",
  "core-foundation 0.10.1",
@@ -4201,11 +4567,12 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
 dependencies = [
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -4216,18 +4583,28 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4236,24 +4613,26 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.143"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
  "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.17"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a"
+checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
 dependencies = [
  "itoa",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -4264,7 +4643,7 @@ checksum = "f3faaf9e727533a19351a43cc5a8de957372163c7d35cc48c90b75cdda13c352"
 dependencies = [
  "percent-encoding",
  "serde",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -4278,11 +4657,11 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
+checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -4341,10 +4720,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fa1f336066b758b7c9df34ed049c0e693a426afe2b27ff7d5b14f410ab1a132"
 dependencies = [
  "base64",
- "indexmap 2.11.0",
+ "indexmap 2.11.4",
  "rust_decimal",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
 [[package]]
 name = "sha3"
 version = "0.10.8"
@@ -4379,6 +4769,22 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
 [[package]]
 name = "siphasher"
 version = "1.0.1"
@@ -4415,12 +4821,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -4428,12 +4834,40 @@ name = "spin"
 version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+name = "sqlite-wasm-rs"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aead1c279716985b981b7940ef9b652d3f93d70a7296853c633b7ce8fa8088a"
+dependencies = [
+ "js-sys",
+ "once_cell",
+ "thiserror 2.0.17",
+ "tokio",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
 
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "string_cache"
@@ -4588,24 +5022,24 @@ checksum = "1ac9aa371f599d22256307c24a9d748c041e548cbf599f35d890f9d365361790"
 
 [[package]]
 name = "tempfile"
-version = "3.21.0"
+version = "3.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
 dependencies = [
  "fastrand",
  "getrandom 0.3.3",
  "once_cell",
- "rustix 1.0.8",
- "windows-sys 0.60.2",
+ "rustix 1.1.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "term"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a43bddab41f8626c7bdaab872bbba75f8df5847b516d77c569c746e2ae5eb746"
+checksum = "2111ef44dae28680ae9752bb89409e7310ca33a8c621ebe7b106cf5c928b3ac0"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4633,7 +5067,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0"
 dependencies = [
- "rustix 1.0.8",
+ "rustix 1.1.2",
  "windows-sys 0.60.2",
 ]
 
@@ -4651,7 +5085,7 @@ checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
 dependencies = [
  "smawk",
  "unicode-linebreak",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
@@ -4665,11 +5099,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.16"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 dependencies = [
- "thiserror-impl 2.0.16",
+ "thiserror-impl 2.0.17",
 ]
 
 [[package]]
@@ -4685,9 +5119,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.16"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4715,11 +5149,12 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.43"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
 dependencies = [
  "deranged",
+ "itoa",
  "libc",
  "num-conv",
  "num_threads",
@@ -4770,7 +5205,7 @@ dependencies = [
  "pin-project-lite",
  "signal-hook-registry",
  "slab",
- "socket2 0.6.0",
+ "socket2 0.6.1",
  "tokio-macros",
  "windows-sys 0.59.0",
 ]
@@ -4798,9 +5233,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
  "rustls",
  "tokio",
@@ -4853,19 +5288,19 @@ dependencies = [
  "serde",
  "serde_spanned 0.6.9",
  "toml_datetime 0.6.11",
- "toml_edit",
+ "toml_edit 0.22.27",
 ]
 
 [[package]]
 name = "toml"
-version = "0.9.5"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
+checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
 dependencies = [
- "indexmap 2.11.0",
- "serde",
- "serde_spanned 1.0.0",
- "toml_datetime 0.7.0",
+ "indexmap 2.11.4",
+ "serde_core",
+ "serde_spanned 1.0.3",
+ "toml_datetime 0.7.3",
  "toml_parser",
  "toml_writer",
  "winnow",
@@ -4882,11 +5317,11 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.7.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -4895,7 +5330,7 @@ version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "indexmap 2.11.0",
+ "indexmap 2.11.4",
  "serde",
  "serde_spanned 0.6.9",
  "toml_datetime 0.6.11",
@@ -4903,11 +5338,23 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.23.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
+dependencies = [
+ "indexmap 2.11.4",
+ "toml_datetime 0.7.3",
+ "toml_parser",
+ "winnow",
+]
+
 [[package]]
 name = "toml_parser"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
+checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
 dependencies = [
  "winnow",
 ]
@@ -4920,9 +5367,9 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
 
 [[package]]
 name = "toml_writer"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
+checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
 
 [[package]]
 name = "tonic"
@@ -5028,7 +5475,7 @@ dependencies = [
  "httparse",
  "js-sys",
  "pin-project",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tonic",
  "tower-service",
  "wasm-bindgen",
@@ -5045,7 +5492,7 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "indexmap 2.11.0",
+ "indexmap 2.11.4",
  "pin-project-lite",
  "slab",
  "sync_wrapper",
@@ -5221,9 +5668,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "trybuild"
-version = "1.0.110"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e257d7246e7a9fd015fb0b28b330a8d4142151a33f03e6a497754f4b1f6a8e"
+checksum = "0ded9fdb81f30a5708920310bfcd9ea7482ff9cba5f54601f7a19a877d5c2392"
 dependencies = [
  "dissimilar",
  "glob",
@@ -5232,14 +5679,14 @@ dependencies = [
  "serde_json",
  "target-triple",
  "termcolor",
- "toml 0.9.5",
+ "toml 0.9.8",
 ]
 
 [[package]]
 name = "typenum"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
 [[package]]
 name = "unarray"
@@ -5264,9 +5711,9 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 
 [[package]]
 name = "unicode-linebreak"
@@ -5282,9 +5729,9 @@ checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-width"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
 [[package]]
 name = "unicode-xid"
@@ -5292,6 +5739,16 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -5436,18 +5893,27 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
-version = "0.14.4+wasi-0.2.4"
+version = "0.14.7+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a5f4a424faf49c3c2c344f166f0662341d470ea185e939657aaff130f0ec4a"
+checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c"
+dependencies = [
+ "wasip2",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
  "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.101"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b"
+checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -5458,9 +5924,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.101"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb"
+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
 dependencies = [
  "bumpalo",
  "log",
@@ -5472,9 +5938,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.51"
+version = "0.4.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca85039a9b469b38336411d6d6ced91f3fc87109a2a27b0c197663f5144dffe"
+checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5485,9 +5951,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.101"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d"
+checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5495,9 +5961,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.101"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa"
+checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5508,9 +5974,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.101"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1"
+checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
 dependencies = [
  "unicode-ident",
 ]
@@ -5530,9 +5996,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.78"
+version = "0.3.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77e4b637749ff0d92b8fad63aa1f7cff3cbe125fd49c175cd6345e7272638b12"
+checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5570,7 +6036,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5586,7 +6052,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
 dependencies = [
  "windows-collections",
- "windows-core",
+ "windows-core 0.61.2",
  "windows-future",
  "windows-link 0.1.3",
  "windows-numerics",
@@ -5598,7 +6064,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
 dependencies = [
- "windows-core",
+ "windows-core 0.61.2",
 ]
 
 [[package]]
@@ -5610,8 +6076,21 @@ dependencies = [
  "windows-implement",
  "windows-interface",
  "windows-link 0.1.3",
- "windows-result",
- "windows-strings",
+ "windows-result 0.3.4",
+ "windows-strings 0.4.2",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link 0.2.1",
+ "windows-result 0.4.1",
+ "windows-strings 0.5.1",
 ]
 
 [[package]]
@@ -5620,16 +6099,16 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
- "windows-core",
+ "windows-core 0.61.2",
  "windows-link 0.1.3",
  "windows-threading",
 ]
 
 [[package]]
 name = "windows-implement"
-version = "0.60.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5638,9 +6117,9 @@ dependencies = [
 
 [[package]]
 name = "windows-interface"
-version = "0.59.1"
+version = "0.59.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5655,9 +6134,9 @@ checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
 [[package]]
 name = "windows-link"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-numerics"
@@ -5665,7 +6144,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
 dependencies = [
- "windows-core",
+ "windows-core 0.61.2",
  "windows-link 0.1.3",
 ]
 
@@ -5676,8 +6155,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
 dependencies = [
  "windows-link 0.1.3",
- "windows-result",
- "windows-strings",
+ "windows-result 0.3.4",
+ "windows-strings 0.4.2",
 ]
 
 [[package]]
@@ -5689,6 +6168,15 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-strings"
 version = "0.4.2"
@@ -5698,6 +6186,15 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -5731,16 +6228,16 @@ version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets 0.53.3",
+ "windows-targets 0.53.5",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.61.0"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows-link 0.2.0",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -5776,19 +6273,19 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.3"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
- "windows-link 0.1.3",
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
+ "windows-link 0.2.1",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
 ]
 
 [[package]]
@@ -5814,9 +6311,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -5832,9 +6329,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -5850,9 +6347,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
 
 [[package]]
 name = "windows_i686_gnullvm"
@@ -5862,9 +6359,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -5880,9 +6377,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -5898,9 +6395,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -5916,9 +6413,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -5934,9 +6431,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winnow"
@@ -6062,9 +6559,9 @@ dependencies = [
 
 [[package]]
 name = "wit-bindgen"
-version = "0.45.1"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "writeable"
@@ -6154,9 +6651,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 
 [[package]]
 name = "zerotrie"
diff --git a/Cargo.toml b/Cargo.toml
index ea05eebda..5a59a71a8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,6 +5,7 @@ members = [
   "bin/remote-prover",
   "bin/stress-test",
   "crates/block-producer",
+  "crates/grpc-error-macro",
   "crates/ntx-builder",
   "crates/proto",
   "crates/remote-prover-client",
@@ -34,15 +35,16 @@ opt-level = 2
 
 [workspace.dependencies]
 # Workspace crates.
-miden-node-block-producer  = { path = "crates/block-producer", version = "0.12" }
-miden-node-ntx-builder     = { path = "crates/ntx-builder", version = "0.12" }
-miden-node-proto           = { path = "crates/proto", version = "0.12" }
-miden-node-proto-build     = { path = "proto", version = "0.12" }
-miden-node-rpc             = { path = "crates/rpc", version = "0.12" }
-miden-node-store           = { path = "crates/store", version = "0.12" }
-miden-node-test-macro      = { path = "crates/test-macro" }
-miden-node-utils           = { path = "crates/utils", version = "0.12" }
-miden-remote-prover-client = { path = "crates/remote-prover-client", version = "0.12" }
+miden-node-block-producer   = { path = "crates/block-producer", version = "0.12" }
+miden-node-grpc-error-macro = { path = "crates/grpc-error-macro" }
+miden-node-ntx-builder      = { path = "crates/ntx-builder", version = "0.12" }
+miden-node-proto            = { path = "crates/proto", version = "0.12" }
+miden-node-proto-build      = { path = "proto", version = "0.12" }
+miden-node-rpc              = { path = "crates/rpc", version = "0.12" }
+miden-node-store            = { path = "crates/store", version = "0.12" }
+miden-node-test-macro       = { path = "crates/test-macro" }
+miden-node-utils            = { path = "crates/utils", version = "0.12" }
+miden-remote-prover-client  = { path = "crates/remote-prover-client", version = "0.12" }
 
 # miden-base aka protocol dependencies. These should be updated in sync.
 miden-block-prover    = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
@@ -53,12 +55,13 @@ miden-tx              = { branch = "next", default-features = false, git = "http
 miden-tx-batch-prover = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
 
 # Other miden dependencies. These should align with those expected by miden-base.
-miden-air = { version = "0.17" }
+miden-air = { features = ["std", "testing"], version = "0.18" }
 
 # External dependencies
 anyhow             = { version = "1.0" }
 assert_matches     = { version = "1.5" }
 async-trait        = { version = "0.1" }
+clap               = { features = ["derive"], version = "4.5" }
 fs-err             = { version = "3" }
 futures            = { version = "0.3" }
 hex                = { version = "0.4" }
diff --git a/bin/network-monitor/.env b/bin/network-monitor/.env
index 9d95137f7..1edc9c4c0 100644
--- a/bin/network-monitor/.env
+++ b/bin/network-monitor/.env
@@ -1,4 +1,8 @@
 MIDEN_MONITOR_RPC_URL=http://0.0.0.0:57291
 MIDEN_MONITOR_REMOTE_PROVER_URLS=https://tx-prover.devnet.miden.io/,https://batch-prover.devnet.miden.io/
+MIDEN_MONITOR_FAUCET_URL=http://localhost:8080
+MIDEN_MONITOR_REMOTE_PROVER_TEST_INTERVAL=2m
+MIDEN_MONITOR_FAUCET_TEST_INTERVAL=2m
+MIDEN_MONITOR_STATUS_CHECK_INTERVAL=30s
 MIDEN_MONITOR_PORT=3001
 MIDEN_MONITOR_ENABLE_OTEL=true
diff --git a/bin/network-monitor/Cargo.toml b/bin/network-monitor/Cargo.toml
index 2a672a9e9..8ed1053c9 100644
--- a/bin/network-monitor/Cargo.toml
+++ b/bin/network-monitor/Cargo.toml
@@ -17,9 +17,18 @@ workspace = true
 [dependencies]
 anyhow           = { workspace = true }
 axum             = { version = "0.8" }
+clap             = { features = ["env"], workspace = true }
+humantime        = { workspace = true }
 miden-node-proto = { workspace = true }
 miden-node-utils = { workspace = true }
+miden-objects    = { features = ["std", "testing"], workspace = true }
+miden-testing    = { workspace = true }
+miden-tx         = { workspace = true }
+reqwest          = { features = ["json"], version = "0.12" }
 serde            = { features = ["derive"], version = "1.0" }
+serde_json       = { version = "1.0" }
+sha2             = { version = "0.10" }
 tokio            = { features = ["full"], workspace = true }
+tonic            = { features = ["codegen", "prost", "tls-native-roots", "transport"], workspace = true }
 tracing          = { workspace = true }
 url              = { features = ["serde"], workspace = true }
diff --git a/bin/network-monitor/README.md b/bin/network-monitor/README.md
index 7d7dc3d0e..a4df421ac 100644
--- a/bin/network-monitor/README.md
+++ b/bin/network-monitor/README.md
@@ -12,26 +12,84 @@ make install-network-monitor
 
 ## Configuration
 
-The monitor application uses environment variables for configuration:
+The monitor application supports configuration through both command-line arguments and environment variables. Command-line arguments take precedence over environment variables.
 
-- `MIDEN_MONITOR_RPC_URL`: RPC service URL (default: `http://localhost:50051`)
-- `MIDEN_MONITOR_REMOTE_PROVER_URLS`: Comma-separated list of remote prover URLs (default: `http://localhost:50052`)
-- `MIDEN_MONITOR_PORT`: Web server port (default: `3000`)
-- `MIDEN_MONITOR_ENABLE_OTEL`: Enable OpenTelemetry tracing (default: `false`)
+### Command-line Arguments
+
+```bash
+# View all available options
+miden-network-monitor --help
+
+# Common usage examples
+miden-network-monitor --port 8080 --rpc-url http://localhost:50051
+miden-network-monitor --remote-prover-urls http://prover1.com:50052,http://prover2.com:50053
+miden-network-monitor --faucet-url http://localhost:8080 --enable-otel
+```
+
+**Available Options:**
+- `--rpc-url`: RPC service URL (default: `http://localhost:50051`)
+- `--remote-prover-urls`: Comma-separated list of remote prover URLs (default: `http://localhost:50052`)
+- `--faucet-url`: Faucet service URL for testing (default: `http://localhost:8080`)
+- `--remote-prover-test-interval`: Interval at which to test the remote provers services (default: `2m`)
+- `--faucet-test-interval`: Interval at which to test the faucet services (default: `2m`)
+- `--status-check-interval`: Interval at which to check the status of the services (default: `3s`)
+- `--port, -p`: Web server port (default: `3000`)
+- `--enable-otel`: Enable OpenTelemetry tracing
+- `--help, -h`: Show help information
+- `--version, -V`: Show version information
+
+### Environment Variables
+
+If command-line arguments are not provided, the application falls back to environment variables:
+
+- `MIDEN_MONITOR_RPC_URL`: RPC service URL
+- `MIDEN_MONITOR_REMOTE_PROVER_URLS`: Comma-separated list of remote prover URLs
+- `MIDEN_MONITOR_FAUCET_URL`: Faucet service URL for testing
+- `MIDEN_MONITOR_REMOTE_PROVER_TEST_INTERVAL`: Interval at which to test the remote provers services
+- `MIDEN_MONITOR_FAUCET_TEST_INTERVAL`: Interval at which to test the faucet services
+- `MIDEN_MONITOR_STATUS_CHECK_INTERVAL`: Interval at which to check the status of the services
+- `MIDEN_MONITOR_PORT`: Web server port
+- `MIDEN_MONITOR_ENABLE_OTEL`: Enable OpenTelemetry tracing
 
 ## Usage
 
+### Using Command-line Arguments
+
+```bash
+# Single remote prover
+miden-network-monitor --remote-prover-urls http://localhost:50052
+
+# Multiple remote provers and custom configuration
+miden-network-monitor \
+  --remote-prover-urls http://localhost:50052,http://localhost:50053,http://localhost:50054 \
+  --faucet-url http://localhost:8080 \
+  --remote-prover-test-interval 2m \
+  --faucet-test-interval 2m \
+  --status-check-interval 3s \
+  --port 8080 \
+  --enable-otel
+
+# Get help
+miden-network-monitor --help
+```
+
+### Using Environment Variables
+
 ```bash
 # Single remote prover
 MIDEN_MONITOR_REMOTE_PROVER_URLS="http://localhost:50052" miden-network-monitor
 
-# Multiple remote provers
-MIDEN_MONITOR_REMOTE_PROVER_URLS="http://localhost:50052,http://localhost:50053,http://localhost:50054" miden-network-monitor
+# Multiple remote provers and faucet testing
+MIDEN_MONITOR_REMOTE_PROVER_URLS="http://localhost:50052,http://localhost:50053,http://localhost:50054" \
+MIDEN_MONITOR_FAUCET_URL="http://localhost:8080" \
+miden-network-monitor
 ```
 
+Once running, the monitor will be available at `http://localhost:3000` (or the configured port).
+
 ## Currently Supported Monitor
 
-The monitor application provides real-time status monitor for the following Miden network components:
+The monitor application provides real-time status monitoring for the following Miden network components:
 
 ### RPC Service
 - **Service Health**: Overall RPC service availability and status
@@ -44,24 +102,45 @@ The monitor application provides real-time status monitor for the following Mide
   - Block producer version and health
 
 ### Remote Provers
-- **Service Health**: Individual remote prover availability and status
+- **Service Health**: Individual remote prover availability and status  
 - **Version Information**: Remote prover service version
-- **Supported Proof Types**: Types of proofs the prover can generate
+- **Supported Proof Types**: Types of proofs the prover can generate (Transaction, Block, Batch)
 - **Worker Status**:
   - Individual worker addresses and versions
   - Worker health status (HEALTHY/UNHEALTHY/UNKNOWN)
   - Worker count per prover
+- **Proof Generation Testing**: Real-time testing of proof generation capabilities
+  - Success rate tracking with test/failure counters
+  - Response time measurement for proof generation
+  - Proof size monitoring (in KB)
+  - Automated testing with mock transactions, blocks, or batches based on supported proof type
+  - Combined health status that reflects both connectivity and proof generation capability
+
+### Faucet Service
+- **Service Health**: Faucet service availability and token minting capability
+- **PoW Challenge Testing**: Real-time proof-of-work challenge solving and token minting
+  - Success rate tracking with successful/failed minting attempts
+  - Response time measurement for challenge completion
+  - Challenge difficulty monitoring
+  - Transaction and note ID tracking from successful mints
+  - Automated testing every 30 seconds to verify faucet functionality
+
+## User Interface
+
+The web dashboard provides a clean, responsive interface with the following features:
+
+- **Real-time Updates**: Automatically refreshes service status every 10 seconds
+- **Unified Service Cards**: Each service is displayed in a dedicated card that auto-sizes to show all information
+- **Combined Prover Information**: Remote prover cards integrate both connectivity status and proof generation test results
+- **Faucet Testing Display**: Shows faucet test results with challenge difficulty and minting success metrics
+- **Visual Health Indicators**: Color-coded status indicators and clear success/failure metrics
+- **Interactive Elements**: Copy-to-clipboard functionality for genesis commitments, transaction IDs, and note IDs
+- **Responsive Design**: Optimized for both desktop and mobile viewing
 
 ## Future Monitor Items
 
 Planned workflow testing features for future releases:
 
-### Faucet Workflow Testing
-The monitor application will test the faucet service by minting tokens from the official faucet. This test verifies that the faucet is operational and can successfully distribute tokens for testing purposes.
-
-### Prover Workflow Testing
-The application will use the delegated prover to prove transactions, testing the proving infrastructure without requiring network submission. This includes testing with static transactions to validate proof generation capabilities and monitor prover performance under various loads.
-
 ### Network Transaction Testing
 The monitor system will submit actual transactions to the network to perform end-to-end testing of the complete workflow. This test covers transaction creation, submission, processing, and confirmation, providing comprehensive validation of network functionality.
 
diff --git a/bin/network-monitor/assets/index.css b/bin/network-monitor/assets/index.css
index 13fa89ac3..b375f10e1 100644
--- a/bin/network-monitor/assets/index.css
+++ b/bin/network-monitor/assets/index.css
@@ -54,7 +54,17 @@ body {
 
 .main-content {
     width: 100%;
-    max-width: 400px;
+    max-width: 1200px;
+    padding: 0 20px;
+}
+
+.form-title {
+    font-size: 28px;
+    font-weight: 500;
+    color: #333;
+    text-align: center;
+    margin-bottom: 32px;
+    letter-spacing: -0.02em;
 }
 
 .button-group {
@@ -173,6 +183,7 @@ body {
     font-size: 14px;
     white-space: pre-wrap;
     z-index: 2;
+    grid-column: 1 / -1; /* Span the full width of the grid when in grid context */
 }
 
 @media (max-width: 768px) {
@@ -198,8 +209,9 @@ body {
     border: 0.5px solid #e0e0e0;
     border-radius: 8px;
     padding: 20px;
-    margin-bottom: 16px;
     transition: all 0.2s;
+    display: flex;
+    flex-direction: column;
 }
 
 .service-card:hover {
@@ -220,6 +232,7 @@ body {
     justify-content: space-between;
     align-items: center;
     margin-bottom: 12px;
+    flex-shrink: 0;
 }
 
 .service-name {
@@ -245,6 +258,12 @@ body {
     border: 1px solid #fecaca;
 }
 
+.service-content {
+    flex: 1;
+    margin-bottom: 8px;
+}
+
+
 .service-details {
     margin: 12px 0;
     font-size: 12px;
@@ -308,12 +327,21 @@ body {
 .service-timestamp {
     font-size: 11px;
     color: #999;
-    margin-top: 8px;
+    margin-top: auto;
+    padding-top: 8px;
     font-style: italic;
+    flex-shrink: 0;
+    border-top: 1px solid #f0f0f0;
 }
 
 #status-container {
     min-height: 200px;
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
+    gap: 16px;
+    width: 100%;
+    max-width: 1200px;
+    margin: 0 auto;
 }
 
 .loading-section {
@@ -321,6 +349,7 @@ body {
     align-items: center;
     justify-content: center;
     min-height: 200px;
+    grid-column: 1 / -1; /* Span the full width of the grid when in grid context */
 }
 
 /* Responsive adjustments for service cards */
@@ -385,3 +414,88 @@ body {
     background: #fff3cd;
     color: #856404;
 }
+
+/* Transaction Prover Test Styles */
+.test-metrics {
+    margin-top: 8px;
+    padding: 8px 12px;
+    border-radius: 4px;
+}
+
+.test-metrics.healthy {
+    background: rgba(34, 197, 93, 0.05);
+    border-left: 3px solid #22C55D;
+}
+
+.test-metrics.unhealthy {
+    background: rgba(255, 85, 0, 0.05);
+    border-left: 3px solid #ff5500;
+}
+
+.metric-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 4px 0;
+    font-size: 12px;
+}
+
+.metric-label {
+    color: #333;
+    font-weight: 500;
+}
+
+.metric-value {
+    font-family: "DM Mono", monospace;
+    font-weight: 500;
+}
+
+.test-metrics.healthy .metric-value {
+    color: #22C55D;
+}
+
+.test-metrics.unhealthy .metric-value {
+    color: #ff5500;
+}
+
+/* Refresh button container */
+.refresh-button-container {
+    grid-column: 1 / -1; /* Span the full width of the grid */
+    margin-top: 20px;
+}
+
+/* Responsive adjustments for test metrics */
+@media (max-width: 768px) {
+    .metric-row {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 2px;
+    }
+
+    /* Adjust grid for mobile */
+    #status-container {
+        grid-template-columns: 1fr;
+    }
+
+    .main-content {
+        padding: 0 16px;
+    }
+}
+
+/* Additional responsive breakpoints */
+@media (max-width: 480px) {
+    #status-container {
+        grid-template-columns: 1fr;
+        gap: 12px;
+    }
+
+    .service-card {
+        padding: 16px;
+    }
+}
+
+@media (min-width: 769px) and (max-width: 1024px) {
+    #status-container {
+        grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
+    }
+}
diff --git a/bin/network-monitor/assets/index.html b/bin/network-monitor/assets/index.html
index 43520d165..647bcf694 100644
--- a/bin/network-monitor/assets/index.html
+++ b/bin/network-monitor/assets/index.html
@@ -63,6 +63,81 @@
             }
         }
 
+        function groupServices(services) {
+            const grouped = {};
+            const result = [];
+
+            // First pass: collect all services and group prover-related ones
+            services.forEach(service => {
+                if (service.name.startsWith('Remote Prover (') && service.name.endsWith(')')) {
+                    // Extract prover name from "Remote Prover (Prover-1)" -> "Prover-1"
+                    const match = service.name.match(/Remote Prover \((.*)\)/);
+                    if (match) {
+                        const proverName = match[1];
+                        if (!grouped[proverName]) {
+                            grouped[proverName] = {
+                                name: proverName,
+                                status: service.status,
+                                last_checked: service.last_checked,
+                                error: service.error,
+                                details: service.details,
+                                testDetails: null,
+                                testStatus: null,
+                                testError: null
+                            };
+                        } else {
+                            // Update if this status is newer
+                            if (service.last_checked > grouped[proverName].last_checked) {
+                                grouped[proverName].status = service.status;
+                                grouped[proverName].last_checked = service.last_checked;
+                                grouped[proverName].error = service.error;
+                                grouped[proverName].details = service.details;
+                            }
+                        }
+                    }
+                } else if (service.details && service.details.RemoteProverTest) {
+                    // This is a prover test result - find corresponding prover group
+                    const proverName = service.name;
+                    if (!grouped[proverName]) {
+                        grouped[proverName] = {
+                            name: proverName,
+                            status: service.status,
+                            last_checked: service.last_checked,
+                            error: service.error,
+                            details: null,
+                            testDetails: service.details.RemoteProverTest,
+                            testStatus: service.status,
+                            testError: service.error
+                        };
+                    } else {
+                        grouped[proverName].testDetails = service.details.RemoteProverTest;
+                        grouped[proverName].testStatus = service.status;
+                        grouped[proverName].testError = service.error;
+
+                        // Combine status - if either test or status check is unhealthy, mark as unhealthy
+                        if (service.status === 'Unhealthy' || grouped[proverName].status === 'Unhealthy') {
+                            grouped[proverName].status = 'Unhealthy';
+                        }
+
+                        // Use the most recent timestamp
+                        if (service.last_checked > grouped[proverName].last_checked) {
+                            grouped[proverName].last_checked = service.last_checked;
+                        }
+                    }
+                } else {
+                    // Regular service (RPC, etc.)
+                    result.push(service);
+                }
+            });
+
+            // Add all grouped prover services
+            Object.values(grouped).forEach(proverService => {
+                result.push(proverService);
+            });
+
+            return result;
+        }
+
         function updateDisplay() {
             if (!statusData) return;
 
@@ -75,9 +150,12 @@
             const lastUpdateTime = new Date(statusData.last_updated * 1000);
             lastUpdated.textContent = lastUpdateTime.toLocaleString();
 
+            // Group and process services
+            const processedServices = groupServices(statusData.services);
+
             // Count healthy vs unhealthy services
-            const healthyServices = statusData.services.filter(s => s.status === 'healthy').length;
-            const totalServices = statusData.services.length;
+            const healthyServices = processedServices.filter(s => s.status === 'Healthy').length;
+            const totalServices = processedServices.length;
             const allHealthy = healthyServices === totalServices;
 
             // Update footer
@@ -86,8 +164,8 @@
             servicesCount.textContent = `${totalServices} Services`;
 
             // Generate status cards
-            container.innerHTML = statusData.services.map(service => {
-                const isHealthy = service.status === 'healthy';
+            container.innerHTML = processedServices.map(service => {
+                const isHealthy = service.status === 'Healthy';
                 const statusColor = isHealthy ? '#22C55D' : '#ff5500';
                 const statusIcon = isHealthy ? '✓' : '✗';
                 
@@ -96,13 +174,13 @@
                     const details = service.details;
                     detailsHtml = `
                         <div class="service-details">
-                            ${details.rpc_status ? `
-                                <div class="detail-item"><strong>Version:</strong> ${details.rpc_status.version}</div>
-                                ${details.rpc_status.genesis_commitment ? `
+                            ${details.RpcStatus ? `
+                                <div class="detail-item"><strong>Version:</strong> ${details.RpcStatus.version}</div>
+                                ${details.RpcStatus.genesis_commitment ? `
                                     <div class="detail-item">
                                         <strong>Genesis:</strong> 
-                                        <span class="genesis-value">${details.rpc_status.genesis_commitment.substring(0, 20)}...</span>
-                                        <button class="copy-button" onclick="copyToClipboard('${details.rpc_status.genesis_commitment}', event)" title="Copy full genesis commitment">
+                                        <span class="genesis-value">0x${details.RpcStatus.genesis_commitment.substring(0, 20)}...</span>
+                                        <button class="copy-button" onclick="copyToClipboard('${details.RpcStatus.genesis_commitment}', event)" title="Copy full genesis commitment">
                                             <svg class="copy-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                                                 <rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
                                                 <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
@@ -110,40 +188,112 @@
                                         </button>
                                     </div>
                                 ` : ''}
-                                ${details.rpc_status.store_status ? `
+                                ${details.RpcStatus.store_status ? `
                                     <div class="nested-status">
-                                        <strong>Store:</strong> ${details.rpc_status.store_status.version} - ${details.rpc_status.store_status.status}
-                                        ${details.rpc_status.store_status.chain_tip ? ` (Tip: ${details.rpc_status.store_status.chain_tip})` : ''}
+                                        <strong>Store:</strong> ${details.RpcStatus.store_status.version} - ${details.RpcStatus.store_status.status}
+                                        ${details.RpcStatus.store_status.chain_tip ? ` (Tip: ${details.RpcStatus.store_status.chain_tip})` : ''}
                                     </div>
                                 ` : ''}
-                                ${details.rpc_status.block_producer_status ? `
+                                ${details.RpcStatus.block_producer_status ? `
                                     <div class="nested-status">
-                                        <strong>Block Producer:</strong> ${details.rpc_status.block_producer_status.version} - ${details.rpc_status.block_producer_status.status}
+                                        <strong>Block Producer:</strong> ${details.RpcStatus.block_producer_status.version} - ${details.RpcStatus.block_producer_status.status}
                                     </div>
                                 ` : ''}
                             ` : ''}
-                            ${details.remote_prover_statuses && details.remote_prover_statuses.length > 0 ? `
-                                ${details.remote_prover_statuses.map(prover => `
+                            ${details.RemoteProverStatus ? `
+                                <div class="nested-status">
+                                    <strong>Prover Status (${details.RemoteProverStatus.url}):</strong>
+                                    <div class="detail-item"><strong>Version:</strong> ${details.RemoteProverStatus.version}</div>
                                     <div class="nested-status">
-                                        <strong>${prover.name} (${prover.url}):</strong>
-                                        <div class="detail-item"><strong>Version:</strong> ${prover.version}</div>
+                                        <strong>Supported Proof Type:</strong> ${details.RemoteProverStatus.supported_proof_type}
+                                    </div>
+                                    ${details.RemoteProverStatus.workers && details.RemoteProverStatus.workers.length > 0 ? `
                                         <div class="nested-status">
-                                            <strong>Supported Proof Type:</strong> ${prover.supported_proof_type}
+                                            <strong>Workers (${details.RemoteProverStatus.workers.length}):</strong>
+                                            ${details.RemoteProverStatus.workers.map(worker => `
+                                                <div class="worker-status">
+                                                    <span class="worker-address">${worker.address}</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>
+                                    ` : ''}
+                                </div>
+                            ` : ''}
+                            ${details.FaucetTest ? `
+                                <div class="nested-status">
+                                    <strong>Faucet Testing:</strong>
+                                    <div class="test-metrics ${service.status === 'Healthy' ? 'healthy' : 'unhealthy'}">
+                                        <div class="metric-row">
+                                            <span class="metric-label">Success Rate:</span>
+                                            <span class="metric-value">${details.FaucetTest.success_count}/${details.FaucetTest.success_count + details.FaucetTest.failure_count}</span>
                                         </div>
-                                        ${prover.workers && prover.workers.length > 0 ? `
-                                            <div class="nested-status">
-                                                <strong>Workers (${prover.workers.length}):</strong>
-                                                ${prover.workers.map(worker => `
-                                                    <div class="worker-status">
-                                                        <span class="worker-address">${worker.address}</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 class="metric-row">
+                                            <span class="metric-label">Last Response Time:</span>
+                                            <span class="metric-value">${details.FaucetTest.test_duration_ms}ms</span>
+                                        </div>
+                                        ${details.FaucetTest.last_tx_id ? `
+                                            <div class="metric-row">
+                                                <span class="metric-label">Last TX ID:</span>
+                                                <span class="metric-value">${details.FaucetTest.last_tx_id.substring(0, 16)}...
+                                                    <button class="copy-button" onclick="copyToClipboard('${details.FaucetTest.last_tx_id}', event)" title="Copy full TX ID">
+                                                        <svg class="copy-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                                                            <rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
+                                                            <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
+                                                        </svg>
+                                                    </button>
+                                                </span>
+                                            </div>
+                                        ` : ''}
+                                        ${details.FaucetTest.challenge_difficulty ? `
+                                            <div class="metric-row">
+                                                <span class="metric-label">Last Challenge Difficulty:</span>
+                                                <span class="metric-value">~${details.FaucetTest.challenge_difficulty} bits</span>
                                             </div>
                                         ` : ''}
                                     </div>
-                                `).join('')}
+                                </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">${service.testDetails.success_count}/${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>
+                                        </div>
+                                        ${service.testError ? `
+                                            <div class="metric-row error">
+                                                <span class="metric-label">Test Error:</span>
+                                                <span class="metric-value">
+                                                    ${(() => {
+                                                        try {
+                                                            const errorObj = JSON.parse(service.testError);
+                                                            return errorObj.code || 'Unknown error code';
+                                                        } catch (e) {
+                                                            return service.testError;
+                                                        }
+                                                    })()}
+                                                    <button class="copy-button" data-json="${service.testError.replace(/"/g, '&quot;')}" onclick="copyToClipboard(this.dataset.json, event)" title="Copy error JSON">
+                                                        <svg class="copy-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                                                            <rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
+                                                            <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
+                                                        </svg>
+                                                    </button>
+                                                </span>
+                                            </div>
+                                        ` : ''}
+                                    </div>
+                                </div>
                             ` : ''}
                         </div>
                     `;
@@ -157,8 +307,10 @@
                                 ${statusIcon} ${service.status.toUpperCase()}
                             </div>
                         </div>
-                        ${service.error ? `<div class="service-error">${service.error}</div>` : ''}
-                        ${detailsHtml}
+                        <div class="service-content">
+                            ${service.error ? `<div class="service-error">${service.error}</div>` : ''}
+                            ${detailsHtml}
+                        </div>
                         <div class="service-timestamp">
                             Last checked: ${new Date(service.last_checked * 1000).toLocaleString()}
                         </div>
@@ -166,9 +318,9 @@
                 `;
             }).join('');
 
-            // Add refresh button
+            // Add refresh button that spans the full grid
             container.innerHTML += `
-                <div class="button-group" style="margin-top: 20px;">
+                <div class="refresh-button-container">
                     <button class="button" onclick="fetchStatus()">
                         <svg class="button-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                             <path d="M23 4v6h-6M1 20v-6h6M20.49 9A9 9 0 0 0 5.64 5.64L1 10m22 4l-4.64 4.36A9 9 0 0 1 3.51 15"/>
@@ -185,7 +337,7 @@
                 <div class="error-message" style="display: block;">
                     ${message}
                 </div>
-                <div class="button-group" style="margin-top: 20px;">
+                <div class="refresh-button-container">
                     <button class="button" onclick="fetchStatus()">
                         <svg class="button-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                             <path d="M23 4v6h-6M1 20v-6h6M20.49 9A9 9 0 0 0 5.64 5.64L1 10m22 4l-4.64 4.36A9 9 0 0 1 3.51 15"/>
diff --git a/bin/network-monitor/src/config.rs b/bin/network-monitor/src/config.rs
new file mode 100644
index 000000000..f79dce52a
--- /dev/null
+++ b/bin/network-monitor/src/config.rs
@@ -0,0 +1,104 @@
+//! Network monitor configuration.
+//!
+//! This module contains the configuration structures and constants for the network monitor.
+//! Configuration for the monitor.
+
+use std::time::Duration;
+
+use clap::Parser;
+use url::Url;
+
+// MONITOR CONFIGURATION CONSTANTS
+// ================================================================================================
+
+const DEFAULT_RPC_URL: &str = "http://localhost:50051";
+const DEFAULT_REMOTE_PROVER_URLS: &str = "http://localhost:50052";
+const DEFAULT_FAUCET_URL: &str = "http://localhost:8080";
+const DEFAULT_PORT: u16 = 3000;
+
+/// Configuration for the monitor.
+///
+/// This struct contains the configuration for the monitor.
+#[derive(Debug, Clone, Parser)]
+#[command(name = "miden-network-monitor")]
+#[command(about = "A network monitor for Miden node services")]
+#[command(version)]
+pub struct MonitorConfig {
+    /// The URL of the RPC service.
+    #[arg(
+        long = "rpc-url",
+        env = "MIDEN_MONITOR_RPC_URL",
+        default_value = DEFAULT_RPC_URL,
+        help = "The URL of the RPC service"
+    )]
+    pub rpc_url: Url,
+
+    /// The URLs of the remote provers for status checking (comma-separated).
+    #[arg(
+        long = "remote-prover-urls",
+        env = "MIDEN_MONITOR_REMOTE_PROVER_URLS",
+        default_value = DEFAULT_REMOTE_PROVER_URLS,
+        value_delimiter = ',',
+        help = "The URLs of the remote provers for status checking (comma-separated)"
+    )]
+    pub remote_prover_urls: Vec<Url>,
+
+    /// The URL of the faucet service for testing (optional).
+    #[arg(
+        long = "faucet-url",
+        env = "MIDEN_MONITOR_FAUCET_URL",
+        default_value = DEFAULT_FAUCET_URL,
+        help = "The URL of the faucet service for testing (optional)"
+    )]
+    pub faucet_url: Option<Url>,
+
+    /// The interval at which to test the remote provers services.
+    #[arg(
+        long = "remote-prover-test-interval",
+        env = "MIDEN_MONITOR_REMOTE_PROVER_TEST_INTERVAL",
+        default_value = "2m",
+        value_parser = humantime::parse_duration,
+        help = "The interval at which to test the remote provers services"
+    )]
+    pub remote_prover_test_interval: Duration,
+
+    /// The interval at which to test the faucet services.
+    #[arg(
+        long = "faucet-test-interval",
+        env = "MIDEN_MONITOR_FAUCET_TEST_INTERVAL",
+        default_value = "2m",
+        value_parser = humantime::parse_duration,
+        help = "The interval at which to test the faucet services"
+    )]
+    pub faucet_test_interval: Duration,
+
+    /// The interval at which to check the status of the services.
+    #[arg(
+        long = "status-check-interval",
+        env = "MIDEN_MONITOR_STATUS_CHECK_INTERVAL",
+        default_value = "3s",
+        value_parser = humantime::parse_duration,
+        help = "The interval at which to check the status of the services"
+    )]
+    pub status_check_interval: Duration,
+
+    /// The port of the monitor.
+    #[arg(
+        long = "port",
+        short = 'p',
+        env = "MIDEN_MONITOR_PORT",
+        default_value_t = DEFAULT_PORT,
+        help = "The port of the monitor"
+    )]
+    pub port: u16,
+
+    /// Whether to enable OpenTelemetry.
+    #[arg(
+        long = "enable-otel",
+        env = "MIDEN_MONITOR_ENABLE_OTEL",
+        action = clap::ArgAction::SetTrue,
+        default_value_t = true,
+        help = "Whether to enable OpenTelemetry"
+    )]
+    pub enable_otel: bool,
+}
diff --git a/bin/network-monitor/src/faucet.rs b/bin/network-monitor/src/faucet.rs
new file mode 100644
index 000000000..911fc9712
--- /dev/null
+++ b/bin/network-monitor/src/faucet.rs
@@ -0,0 +1,260 @@
+//! Faucet testing functionality.
+//!
+//! This module contains the logic for periodically testing faucet functionality
+//! by requesting proof-of-work challenges, solving them, and submitting token requests.
+
+use std::time::Duration;
+
+use anyhow::Context;
+use miden_objects::account::AccountId;
+use miden_objects::testing::account_id::ACCOUNT_ID_SENDER;
+use reqwest::Client;
+use serde::{Deserialize, Serialize};
+use sha2::{Digest, Sha256};
+use tokio::sync::watch;
+use tokio::time::MissedTickBehavior;
+use tracing::{debug, info, instrument, warn};
+use url::Url;
+
+use crate::status::{ServiceDetails, ServiceStatus, Status};
+use crate::{COMPONENT, current_unix_timestamp_secs};
+
+// CONSTANTS
+// ================================================================================================
+
+/// Maximum number of attempts to solve a `PoW` challenge.
+const MAX_CHALLENGE_ATTEMPTS: u64 = 100_000_000;
+/// Amount of tokens to mint.
+const MINT_AMOUNT: u64 = 1_000_000; // 1 token with 6 decimals
+
+// FAUCET TEST TYPES
+// ================================================================================================
+
+/// Details of a faucet test.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct FaucetTestDetails {
+    pub test_duration_ms: u64,
+    pub success_count: u64,
+    pub failure_count: u64,
+    pub last_tx_id: Option<String>,
+    pub challenge_difficulty: Option<u32>,
+}
+
+/// Response from the faucet's `/pow` endpoint.
+#[derive(Debug, Deserialize)]
+struct PowChallengeResponse {
+    challenge: String,
+    target: u64,
+    #[allow(dead_code)] // Timestamp is part of API response but not used
+    timestamp: u64,
+}
+
+/// Response from the faucet's `/get_tokens` endpoint.
+#[derive(Debug, Deserialize)]
+struct GetTokensResponse {
+    tx_id: String,
+    #[allow(dead_code)] // Note ID is part of API response but not used in monitoring
+    note_id: String,
+}
+
+// FAUCET TEST TASK
+// ================================================================================================
+
+/// Runs a task that continuously tests faucet functionality and updates a watch channel.
+///
+/// This function spawns a task that periodically requests proof-of-work challenges from the faucet,
+/// solves them, and submits token requests to verify the faucet is operational.
+///
+/// # Arguments
+///
+/// * `faucet_url` - The URL of the faucet service to test.
+/// * `status_sender` - The sender for the watch channel.
+/// * `test_interval` - The interval at which to test the faucet services.
+///
+/// # Returns
+///
+/// `Ok(())` if the task completes successfully, or an error if the task fails.
+#[instrument(target = COMPONENT, name = "faucet-test-task", skip_all)]
+pub async fn run_faucet_test_task(
+    faucet_url: Url,
+    status_sender: watch::Sender<ServiceStatus>,
+    test_interval: Duration,
+) {
+    let client = Client::new();
+    let mut success_count = 0u64;
+    let mut failure_count = 0u64;
+    let mut last_tx_id = None;
+    let mut last_challenge_difficulty = None;
+
+    let mut interval = tokio::time::interval(test_interval);
+    interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
+
+    loop {
+        interval.tick().await;
+
+        let current_time = current_unix_timestamp_secs();
+
+        let start_time = std::time::Instant::now();
+
+        match perform_faucet_test(&client, &faucet_url).await {
+            Ok((result, challenge_difficulty)) => {
+                success_count += 1;
+                last_tx_id = Some(result.tx_id.clone());
+                last_challenge_difficulty = Some(challenge_difficulty);
+                info!("Faucet test successful: tx_id={}", result.tx_id);
+            },
+            Err(e) => {
+                failure_count += 1;
+                warn!("Faucet test failed: {}", e);
+            },
+        }
+
+        let test_duration_ms = start_time.elapsed().as_millis() as u64;
+
+        let test_details = FaucetTestDetails {
+            test_duration_ms,
+            success_count,
+            failure_count,
+            last_tx_id: last_tx_id.clone(),
+            challenge_difficulty: last_challenge_difficulty,
+        };
+
+        let status = ServiceStatus {
+            name: "Faucet".to_string(),
+            status: if success_count > 0 || failure_count == 0 {
+                Status::Healthy
+            } else {
+                Status::Unhealthy
+            },
+            last_checked: current_time,
+            error: None,
+            details: ServiceDetails::FaucetTest(test_details),
+        };
+
+        // Send the status update; exit if no receivers (shutdown signal)
+        if status_sender.send(status).is_err() {
+            info!("No receivers for faucet status updates, shutting down");
+            return;
+        }
+    }
+}
+
+/// Performs a complete faucet test by requesting a `PoW` challenge and submitting the solution.
+///
+/// # Arguments
+///
+/// * `client` - The HTTP client to use.
+/// * `faucet_url` - The URL of the faucet service.
+///
+/// # Returns
+///
+/// The response from the faucet if successful, or an error if the test fails.
+async fn perform_faucet_test(
+    client: &Client,
+    faucet_url: &Url,
+) -> anyhow::Result<(GetTokensResponse, u32)> {
+    // Use a test account ID - convert to AccountId and format properly
+    let account_id = AccountId::try_from(ACCOUNT_ID_SENDER)
+        .context("Failed to create AccountId from test constant")?;
+
+    let account_id = account_id.to_string();
+    debug!("Generated account ID: {} (length: {})", account_id, account_id.len());
+
+    // Step 1: Request PoW challenge
+    let pow_url = faucet_url.join("/pow")?;
+    let response = client.get(pow_url).query(&[("account_id", &account_id)]).send().await?;
+
+    let response_text = response.text().await?;
+    debug!("Faucet PoW response: {}", response_text);
+
+    let challenge_response: PowChallengeResponse = serde_json::from_str(&response_text)
+        .with_context(|| format!("Failed to parse PoW response: {response_text}"))?;
+
+    debug!(
+        "Received PoW challenge: target={}, challenge={}...",
+        challenge_response.target,
+        &challenge_response.challenge[..16.min(challenge_response.challenge.len())]
+    );
+
+    // Step 2: Solve the PoW challenge
+    let nonce = solve_pow_challenge(&challenge_response.challenge, challenge_response.target)
+        .context("Failed to solve PoW challenge")?;
+
+    debug!("Solved PoW challenge with nonce: {}", nonce);
+
+    // Step 3: Request tokens with the solution
+    let tokens_url = faucet_url.join("/get_tokens")?;
+
+    let response = client
+        .get(tokens_url)
+        .query(&[
+            ("account_id", account_id.as_str()),
+            ("is_private_note", "false"),
+            ("asset_amount", &MINT_AMOUNT.to_string()),
+            ("challenge", &challenge_response.challenge),
+            ("nonce", &nonce.to_string()),
+        ])
+        .send()
+        .await?;
+
+    let response_text = response.text().await?;
+
+    let tokens_response: GetTokensResponse = serde_json::from_str(&response_text)
+        .with_context(|| format!("Failed to parse tokens response: {response_text}"))?;
+
+    Ok((tokens_response, challenge_response.target.leading_zeros()))
+}
+
+/// Solves a proof-of-work challenge using SHA-256 hashing.
+///
+/// # Arguments
+///
+/// * `challenge` - The challenge string in hexadecimal format.
+/// * `target` - The target value. A solution is valid if H(challenge, nonce) < target.
+///
+/// # Returns
+///
+/// The nonce that solves the challenge, or an error if no solution is found within reasonable
+/// bounds.
+fn solve_pow_challenge(challenge: &str, target: u64) -> anyhow::Result<u64> {
+    debug!(
+        "Solving PoW challenge: challenge={}, target={} (~{} bits)",
+        challenge,
+        target,
+        target.leading_zeros(),
+    );
+    // Try up to 100 million nonces.
+    for nonce in 0..MAX_CHALLENGE_ATTEMPTS {
+        let mut hasher = Sha256::new();
+        hasher.update(challenge.as_bytes());
+        hasher.update(nonce.to_be_bytes());
+        let hash_result = hasher.finalize();
+
+        // Convert first 8 bytes of hash to u64 for comparison with target
+        let hash_as_u64 = u64::from_be_bytes(hash_result[..8].try_into().unwrap());
+
+        if hash_as_u64 < target {
+            debug!(
+                "PoW solution found! nonce={}, hash={}, target={} (~{} bits)",
+                nonce,
+                hash_as_u64,
+                target,
+                target.leading_zeros(),
+            );
+            return Ok(nonce);
+        }
+
+        // Log progress every 100k attempts
+        if nonce % 100_000 == 0 && nonce > 0 {
+            debug!(
+                "PoW attempt {}: current_hash={}, target={} (~{} bits)",
+                nonce,
+                hash_as_u64,
+                target,
+                target.leading_zeros(),
+            );
+        }
+    }
+
+    anyhow::bail!("Failed to solve PoW challenge within 100M attempts")
+}
diff --git a/bin/network-monitor/src/frontend.rs b/bin/network-monitor/src/frontend.rs
index 8398ed731..ccccdb444 100644
--- a/bin/network-monitor/src/frontend.rs
+++ b/bin/network-monitor/src/frontend.rs
@@ -3,7 +3,6 @@
 
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
-use anyhow::Context;
 use axum::Router;
 use axum::http::header;
 use axum::response::{Html, IntoResponse, Response};
@@ -12,13 +11,18 @@ use tokio::sync::watch;
 use tracing::{info, instrument};
 
 use crate::COMPONENT;
-use crate::status::{MonitorConfig, NetworkStatus, ServiceStatus};
+use crate::config::MonitorConfig;
+use crate::status::{NetworkStatus, ServiceStatus};
+
+// SERVER STATE
+// ================================================================================================
 
 /// State for the web server containing watch receivers for all services.
 #[derive(Clone)]
 pub struct ServerState {
     pub rpc: watch::Receiver<ServiceStatus>,
-    pub provers: Vec<watch::Receiver<ServiceStatus>>,
+    pub provers: Vec<(watch::Receiver<ServiceStatus>, watch::Receiver<ServiceStatus>)>,
+    pub faucet: Option<watch::Receiver<ServiceStatus>>,
 }
 
 /// Runs the frontend server.
@@ -29,7 +33,7 @@ pub struct ServerState {
 ///
 /// * `server_state` - The server state containing watch receivers for all services.
 /// * `config` - The configuration of the network.
-pub async fn serve(server_state: ServerState, config: MonitorConfig) -> anyhow::Result<()> {
+pub async fn serve(server_state: ServerState, config: MonitorConfig) {
     // build our application with routes
     let app = Router::new()
         // Serve embedded assets
@@ -46,9 +50,8 @@ pub async fn serve(server_state: ServerState, config: MonitorConfig) -> anyhow::
     info!("Dashboard available at: http://localhost:{}/", config.port);
     let listener = tokio::net::TcpListener::bind(&bind_address)
         .await
-        .context("Failed to bind to address")?;
-    axum::serve(listener, app).await.context("Failed to start web server")?;
-    Ok(())
+        .expect("Failed to bind to address");
+    axum::serve(listener, app).await.expect("Failed to start web server");
 }
 
 async fn get_dashboard() -> Html<&'static str> {
@@ -70,8 +73,14 @@ async fn get_status(
     services.push(server_state.rpc.borrow().clone());
 
     // Collect all remote prover statuses
-    for prover_rx in &server_state.provers {
-        services.push(prover_rx.borrow().clone());
+    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 faucet status if available
+    if let Some(faucet_rx) = &server_state.faucet {
+        services.push(faucet_rx.borrow().clone());
     }
 
     let network_status = NetworkStatus { services, last_updated: current_time };
diff --git a/bin/network-monitor/src/main.rs b/bin/network-monitor/src/main.rs
index a53df0393..c3d78359b 100644
--- a/bin/network-monitor/src/main.rs
+++ b/bin/network-monitor/src/main.rs
@@ -1,18 +1,28 @@
 use std::collections::HashMap;
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
-use anyhow::Context;
+use clap::Parser;
+use miden_node_proto::clients::{Builder as ClientBuilder, RemoteProverProxy, Rpc};
 use miden_node_utils::logging::OpenTelemetry;
 use tokio::sync::watch;
-use tokio::task::JoinSet;
+use tokio::sync::watch::Receiver;
+use tokio::task::{Id, JoinSet};
 
+mod config;
+mod faucet;
 mod frontend;
+mod remote_prover;
 mod status;
 
-use frontend::{ServerState, serve};
-use status::{MonitorConfig, ServiceStatus, run_remote_prover_status_task, run_rpc_status_task};
-use tracing::info;
+use config::MonitorConfig;
+use faucet::run_faucet_test_task;
+use remote_prover::run_remote_prover_test_task;
+use status::{ServiceStatus, run_remote_prover_status_task, run_rpc_status_task};
+use tracing::{debug, info, warn};
 
-use crate::status::ENABLE_OTEL_ENV_VAR;
+use crate::frontend::{ServerState, serve};
+use crate::remote_prover::{ProofType, generate_prover_test_payload};
+use crate::status::{ServiceDetails, Status, check_remote_prover_status, check_rpc_status};
 
 /// Component identifier for structured logging and tracing
 pub const COMPONENT: &str = "miden-network-monitor";
@@ -29,81 +39,280 @@ pub const COMPONENT: &str = "miden-network-monitor";
 /// unexpectedly, the entire process exits.
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    if std::env::var(ENABLE_OTEL_ENV_VAR)
-        .unwrap_or_default()
-        .parse::<bool>()
-        .unwrap_or_default()
-    {
-        miden_node_utils::logging::setup_tracing(OpenTelemetry::Enabled)?;
+    // Load configuration from command-line arguments and environment variables
+    let config = MonitorConfig::parse();
+    info!("Loaded configuration: {:?}", config);
+
+    let _otel_guard = if config.enable_otel {
+        miden_node_utils::logging::setup_tracing(OpenTelemetry::Enabled)?
     } else {
-        miden_node_utils::logging::setup_tracing(OpenTelemetry::Disabled)?;
-    }
+        miden_node_utils::logging::setup_tracing(OpenTelemetry::Disabled)?
+    };
+
+    let mut tasks = Tasks::new();
+
+    // Initialize the RPC Status endpoint checker task.
+    let rpc_rx = tasks.spawn_rpc_checker(&config).await?;
+
+    // Initialize the prover checkers & tests tasks.
+    let prover_rxs = tasks.spawn_prover_tasks(&config).await?;
 
-    // Load configuration from environment variables
-    let config = match MonitorConfig::from_env() {
-        Ok(config) => {
-            info!("Loaded configuration: {:?}", config);
-            config
-        },
-        Err(e) => {
-            anyhow::bail!("failed to load configuration: {e}");
-        },
+    // Initialize the faucet testing task.
+    let faucet_rx = if config.faucet_url.is_some() {
+        Some(tasks.spawn_faucet(&config))
+    } else {
+        warn!("Faucet URL not configured, skipping faucet testing");
+        None
     };
 
-    let mut tasks = JoinSet::new();
-    let mut component_ids: HashMap<_, String> = HashMap::new();
+    // Initialize HTTP server.
+    let server_state = ServerState {
+        rpc: rpc_rx,
+        provers: prover_rxs,
+        faucet: faucet_rx,
+    };
+    tasks.spawn_http_server(server_state, &config);
 
-    // Create initial empty status for services
-    let initial_rpc_status = ServiceStatus::new("RPC".to_string());
+    tasks.handle_failure().await
+}
 
-    // Spawn the RPC checker
-    let (rpc_tx, rpc_rx) = watch::channel(initial_rpc_status);
-    let rpc_url = config.rpc_url.clone();
-    let id = tasks.spawn(async move { run_rpc_status_task(rpc_url, rpc_tx).await }).id();
-    component_ids.insert(id, "rpc-checker".to_string());
+// TASKS MANAGEMENT
+// ================================================================================================
 
-    // Spawn the prover checkers
-    let mut prover_rxs = Vec::new();
-    for (i, prover_url) in config.remote_prover_urls.iter().enumerate() {
-        let name = format!("Prover-{}", i + 1);
-        let initial_prover_status = ServiceStatus::new(format!("Remote Prover ({name})"));
+/// Task management structure that encapsulates `JoinSet` and component names.
+#[derive(Default)]
+struct Tasks {
+    handles: JoinSet<()>,
+    names: HashMap<Id, String>,
+}
 
-        let (prover_tx, prover_rx) = watch::channel(initial_prover_status);
-        prover_rxs.push(prover_rx);
+impl Tasks {
+    /// Create a new Tasks instance.
+    fn new() -> Self {
+        Self {
+            handles: JoinSet::new(),
+            names: HashMap::new(),
+        }
+    }
 
-        let component_name = format!("prover-checker-{}", i + 1);
-        let id = tasks
-            .spawn({
-                let prover_url = prover_url.clone();
-                let name = name.clone();
+    /// Spawn the RPC status checker task.
+    async fn spawn_rpc_checker(
+        &mut self,
+        config: &MonitorConfig,
+    ) -> anyhow::Result<Receiver<ServiceStatus>> {
+        // Create initial status for RPC service
+        let mut rpc = ClientBuilder::new(config.rpc_url.clone())
+            .with_tls()
+            .expect("TLS is enabled")
+            .with_timeout(Duration::from_secs(10))
+            .without_metadata_version()
+            .without_metadata_genesis()
+            .connect_lazy::<Rpc>();
 
-                run_remote_prover_status_task(prover_url, name, prover_tx)
+        let current_time = current_unix_timestamp_secs();
+        let initial_rpc_status = check_rpc_status(&mut rpc, current_time).await;
+
+        // Spawn the RPC checker
+        let (rpc_tx, rpc_rx) = watch::channel(initial_rpc_status);
+        let rpc_url = config.rpc_url.clone();
+        let status_check_interval = config.status_check_interval;
+        let id = self
+            .handles
+            .spawn(async move {
+                run_rpc_status_task(rpc_url, rpc_tx, status_check_interval).await;
             })
             .id();
-        component_ids.insert(id, component_name);
+        self.names.insert(id, "rpc-checker".to_string());
+
+        Ok(rpc_rx)
     }
 
-    // Create http server
-    let server_state = ServerState { rpc: rpc_rx, provers: prover_rxs };
+    /// Spawn prover status and test tasks for all configured provers.
+    async fn spawn_prover_tasks(
+        &mut self,
+        config: &MonitorConfig,
+    ) -> anyhow::Result<Vec<(watch::Receiver<ServiceStatus>, watch::Receiver<ServiceStatus>)>> {
+        let mut prover_rxs = Vec::new();
 
-    let server_config = config.clone();
-    let id = tasks.spawn(async move { serve(server_state, server_config).await }).id();
-    component_ids.insert(id, "frontend".to_string());
+        for (i, prover_url) in config.remote_prover_urls.iter().enumerate() {
+            let name = format!("Prover-{}", i + 1);
 
-    // Wait for any task to complete or fail
-    let component_result = tasks.join_next_with_id().await.expect("join set is not empty");
+            let mut remote_prover = ClientBuilder::new(prover_url.clone())
+                .with_tls()
+                .expect("TLS is enabled")
+                .with_timeout(Duration::from_secs(10))
+                .without_metadata_version()
+                .without_metadata_genesis()
+                .connect_lazy::<RemoteProverProxy>();
 
-    // We expect components to run indefinitely, so we treat any return as fatal.
-    let (id, err) = match component_result {
-        Ok((id, Ok(_))) => (
-            id,
-            Err::<(), anyhow::Error>(anyhow::anyhow!("component completed unexpectedly")),
-        ),
-        Ok((id, Err(err))) => (id, Err(err)),
-        Err(join_err) => (join_err.id(), Err(join_err).context("joining component task")),
-    };
-    let component_name = component_ids.get(&id).map_or("unknown", String::as_str);
+            let current_time = current_unix_timestamp_secs();
+
+            let initial_prover_status = check_remote_prover_status(
+                &mut remote_prover,
+                name.clone(),
+                prover_url.to_string(),
+                current_time,
+            )
+            .await;
+
+            let (prover_status_tx, prover_status_rx) =
+                watch::channel(initial_prover_status.clone());
+
+            // Spawn the remote prover status check task
+            let component_name = format!("prover-checker-{}", i + 1);
+            let prover_url_clone = prover_url.clone();
+            let name_clone = name.clone();
+            let status_check_interval = config.status_check_interval;
+            let id = self
+                .handles
+                .spawn(async move {
+                    run_remote_prover_status_task(
+                        prover_url_clone,
+                        name_clone,
+                        prover_status_tx,
+                        status_check_interval,
+                    )
+                    .await;
+                })
+                .id();
+            self.names.insert(id, component_name);
+
+            // Extract proof_type directly from the service status
+            let proof_type = match &initial_prover_status.details {
+                crate::status::ServiceDetails::RemoteProverStatus(details) => {
+                    details.supported_proof_type.clone()
+                },
+                _ => unreachable!("This is for remote provers only"),
+            };
+
+            // Only spawn test tasks for transaction provers
+            let prover_test_rx = if matches!(proof_type, ProofType::Transaction) {
+                debug!("Starting transaction proof tests for prover: {}", name);
+                let payload = generate_prover_test_payload().await;
+                let (prover_test_tx, prover_test_rx) =
+                    watch::channel(initial_prover_status.clone());
+
+                let prover_url_clone = prover_url.clone();
+                let name_clone = name.clone();
+                let id = self
+                    .handles
+                    .spawn(async move {
+                        Box::pin(run_remote_prover_test_task(
+                            prover_url_clone,
+                            &name_clone,
+                            proof_type,
+                            payload,
+                            prover_test_tx,
+                        ))
+                        .await;
+                    })
+                    .id();
+                let component_name = format!("prover-test-{}", i + 1);
+                self.names.insert(id, component_name);
+
+                prover_test_rx
+            } else {
+                debug!(
+                    "Skipping prover tests for {} (supports {:?} proofs, only testing Transaction proofs)",
+                    name, proof_type
+                );
+                // For non-transaction provers, create a dummy receiver with no test task
+                let (_tx, rx) = watch::channel(initial_prover_status.clone());
+                rx
+            };
+
+            prover_rxs.push((prover_status_rx, prover_test_rx));
+        }
 
-    // Exit with error context
-    err.context(format!("component {component_name} failed"))
+        Ok(prover_rxs)
+    }
+
+    /// Spawn the faucet testing task.
+    fn spawn_faucet(&mut self, config: &MonitorConfig) -> Receiver<ServiceStatus> {
+        let current_time = current_unix_timestamp_secs();
+
+        // Create initial faucet test status
+        let initial_faucet_status = ServiceStatus {
+            name: "Faucet".to_string(),
+            status: Status::Unknown,
+            last_checked: current_time,
+            error: None,
+            details: ServiceDetails::FaucetTest(crate::faucet::FaucetTestDetails {
+                test_duration_ms: 0,
+                success_count: 0,
+                failure_count: 0,
+                last_tx_id: None,
+                challenge_difficulty: None,
+            }),
+        };
+
+        // Spawn the faucet testing task
+        let (faucet_tx, faucet_rx) = watch::channel(initial_faucet_status);
+        // SAFETY: config.faucet_url is Some
+        let faucet_url = config.faucet_url.clone().unwrap();
+        let faucet_test_interval = config.faucet_test_interval;
+        let id = self
+            .handles
+            .spawn(async move {
+                run_faucet_test_task(faucet_url, faucet_tx, faucet_test_interval).await;
+            })
+            .id();
+        self.names.insert(id, "faucet-test".to_string());
+
+        faucet_rx
+    }
+
+    /// Spawn the HTTP frontend server.
+    fn spawn_http_server(&mut self, server_state: ServerState, config: &MonitorConfig) {
+        let config = config.clone();
+        let id = self.handles.spawn(async move { serve(server_state, config).await }).id();
+        self.names.insert(id, "frontend".to_string());
+    }
+
+    /// Wait for any task to complete or fail and return the result.
+    async fn join_next_with_id(&mut self) -> Option<Result<(Id, ()), tokio::task::JoinError>> {
+        self.handles.join_next_with_id().await
+    }
+
+    /// Get the component name for a given task ID.
+    fn get_component_name(&self, id: Id) -> Option<&String> {
+        self.names.get(&id)
+    }
+
+    /// Handles the failure of a task.
+    ///
+    /// This method waits for any task to complete or fail and returns an error.
+    /// Since we expect components to run indefinitely, any task completion is treated as fatal.
+    ///
+    /// # Returns
+    ///
+    /// An error if any task fails or completes unexpectedly.
+    async fn handle_failure(&mut self) -> anyhow::Result<()> {
+        // Wait for any task to complete or fail
+        let component_result = self.join_next_with_id().await.expect("join set is not empty");
+
+        // We expect components to run indefinitely, so we treat any return as fatal.
+        let (id, err) = match component_result {
+            Ok((id, ())) => (id, anyhow::anyhow!("component completed unexpectedly")),
+            Err(join_err) => (join_err.id(), anyhow::Error::from(join_err)),
+        };
+        let component_name = self.get_component_name(id).map_or("unknown", String::as_str);
+
+        // Exit with error context
+        Err(err.context(format!("component {component_name} failed")))
+    }
+}
+
+// HELPERS
+// ================================================================================================
+
+/// Gets the current Unix timestamp in seconds.
+///
+/// This function is infallible - if the system time is somehow before Unix epoch
+/// (extremely unlikely), it returns 0.
+pub fn current_unix_timestamp_secs() -> u64 {
+    SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .unwrap_or_else(|_| Duration::from_secs(0))  // Fallback to 0 if before Unix epoch
+        .as_secs()
 }
diff --git a/bin/network-monitor/src/remote_prover.rs b/bin/network-monitor/src/remote_prover.rs
new file mode 100644
index 000000000..33a2fcf3d
--- /dev/null
+++ b/bin/network-monitor/src/remote_prover.rs
@@ -0,0 +1,309 @@
+//! Remote transaction prover test functionality.
+//!
+//! This module contains the logic for periodically testing remote transaction prover functionality
+//! by sending mock transactions and checking for successful transaction proof generation.
+
+use std::time::Duration;
+
+use anyhow::Context;
+use miden_node_proto::clients::{Builder as ClientBuilder, RemoteProverClient};
+use miden_node_proto::generated as proto;
+use miden_objects::asset::{Asset, FungibleAsset};
+use miden_objects::note::NoteType;
+use miden_objects::testing::account_id::{ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET, ACCOUNT_ID_SENDER};
+use miden_objects::transaction::TransactionInputs;
+use miden_testing::{Auth, MockChainBuilder};
+use miden_tx::utils::Serializable;
+use serde::{Deserialize, Serialize};
+use tokio::sync::watch;
+use tokio::time::MissedTickBehavior;
+use tonic::Request;
+use tracing::{info, instrument};
+use url::Url;
+
+use crate::status::{ServiceDetails, ServiceStatus, Status};
+use crate::{COMPONENT, current_unix_timestamp_secs};
+
+// PROOF TYPE
+// ================================================================================================
+
+/// Remote prover types
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum ProofType {
+    Transaction,
+    Block,
+    Batch,
+}
+
+impl From<ProofType> for proto::remote_prover::ProofType {
+    fn from(value: ProofType) -> Self {
+        match value {
+            ProofType::Transaction => proto::remote_prover::ProofType::Transaction,
+            ProofType::Block => proto::remote_prover::ProofType::Block,
+            ProofType::Batch => proto::remote_prover::ProofType::Batch,
+        }
+    }
+}
+
+impl From<proto::remote_prover::ProofType> for ProofType {
+    fn from(value: proto::remote_prover::ProofType) -> Self {
+        match value {
+            proto::remote_prover::ProofType::Transaction => ProofType::Transaction,
+            proto::remote_prover::ProofType::Batch => ProofType::Batch,
+            proto::remote_prover::ProofType::Block => ProofType::Block,
+        }
+    }
+}
+
+// REMOTE PROVER TEST TYPES
+// ================================================================================================
+
+/// Details of a remote transaction prover test.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ProverTestDetails {
+    pub test_duration_ms: u64,
+    pub proof_size_bytes: usize,
+    pub success_count: u64,
+    pub failure_count: u64,
+    pub proof_type: ProofType,
+}
+
+// REMOTE TRANSACTION PROVER TEST TASK
+// ================================================================================================
+
+/// Runs a task that continuously tests remote prover functionality and updates a watch channel.
+///
+/// This function spawns a task that periodically sends mock request payloads to a remote prover
+/// and measures the success/failure rate and performance metrics for proof generation.
+///
+/// # Arguments
+///
+/// * `prover_url` - The URL of the remote prover service to test.
+/// * `name` - The name of the remote prover.
+/// * `proof_type` - The type of proof to test.
+/// * `serialized_request_payload` - The serialized request payload to send to the remote prover.
+/// * `status_sender` - The sender for the watch channel.
+///
+/// # Returns
+///
+/// `Ok(())` if the task completes successfully, or an error if the task fails.
+#[instrument(target = COMPONENT, name = "remote-prover-test-task", skip_all)]
+pub async fn run_remote_prover_test_task(
+    prover_url: Url,
+    name: &str,
+    proof_type: ProofType,
+    serialized_request_payload: proto::remote_prover::ProofRequest,
+    status_sender: watch::Sender<ServiceStatus>,
+) {
+    let mut client = ClientBuilder::new(prover_url)
+        .with_tls()
+        .expect("TLS is enabled")
+        .with_timeout(Duration::from_secs(10))
+        .without_metadata_version()
+        .without_metadata_genesis()
+        .connect_lazy::<RemoteProverClient>();
+
+    let mut interval = tokio::time::interval(Duration::from_secs(2 * 60)); // Test every 2 minutes
+    interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
+
+    let mut success_count = 0u64;
+    let mut failure_count = 0u64;
+
+    loop {
+        interval.tick().await;
+
+        let current_time = current_unix_timestamp_secs();
+
+        let status = test_remote_prover(
+            &mut client,
+            name,
+            &proof_type,
+            &serialized_request_payload,
+            current_time,
+            &mut success_count,
+            &mut failure_count,
+        )
+        .await;
+
+        // Send the status update; exit if no receivers (shutdown signal)
+        if status_sender.send(status).is_err() {
+            info!("No receivers for remote prover status updates, shutting down");
+            return;
+        }
+    }
+}
+
+/// Tests the remote prover by sending a mock request payload.
+///
+/// This function sends a mock request payload to the remote prover and measures the response time
+/// and success/failure rate for proof generation.
+///
+/// # Arguments
+///
+/// * `client` - The remote prover gRPC client.
+/// * `name` - The name of the remote prover.
+/// * `proof_type` - The type of proof to test.
+/// * `serialized_request_payload` - The serialized request payload to send to the remote prover.
+/// * `current_time` - The current time in seconds since UNIX epoch.
+/// * `success_count` - Mutable reference to the success counter.
+/// * `failure_count` - Mutable reference to the failure counter.
+///
+/// # Returns
+///
+/// A `ServiceStatus` containing the results of the proof test.
+#[instrument(target = COMPONENT, name = "test-remote-prover", skip_all, ret(level = "info"))]
+async fn test_remote_prover(
+    client: &mut miden_node_proto::clients::RemoteProverClient,
+    name: &str,
+    proof_type: &ProofType,
+    serialized_request_payload: &proto::remote_prover::ProofRequest,
+    current_time: u64,
+    success_count: &mut u64,
+    failure_count: &mut u64,
+) -> ServiceStatus {
+    let start_time = std::time::Instant::now();
+
+    // Create the proof request
+    let request = Request::new(serialized_request_payload.clone());
+
+    // Send the request and measure the time
+    match client.prove(request).await {
+        Ok(response) => {
+            let duration = start_time.elapsed();
+            let response_inner = response.into_inner();
+
+            *success_count += 1;
+
+            ServiceStatus {
+                name: name.to_string(),
+                status: Status::Healthy,
+                last_checked: current_time,
+                error: None,
+                details: ServiceDetails::RemoteProverTest(ProverTestDetails {
+                    test_duration_ms: duration.as_millis() as u64,
+                    proof_size_bytes: response_inner.payload.len(),
+                    success_count: *success_count,
+                    failure_count: *failure_count,
+                    proof_type: proof_type.clone(),
+                }),
+            }
+        },
+        Err(e) => {
+            *failure_count += 1;
+
+            ServiceStatus {
+                name: name.to_string(),
+                status: Status::Unhealthy,
+                last_checked: current_time,
+                error: Some(tonic_status_to_json(&e)),
+                details: ServiceDetails::RemoteProverTest(ProverTestDetails {
+                    test_duration_ms: 0,
+                    proof_size_bytes: 0,
+                    success_count: *success_count,
+                    failure_count: *failure_count,
+                    proof_type: proof_type.clone(),
+                }),
+            }
+        },
+    }
+}
+
+/// Converts a `tonic::Status` error to a JSON string with structured error information.
+///
+/// This function extracts the code, message, details, and metadata from a `tonic::Status`
+/// error and serializes them into a JSON string for structured error reporting.
+///
+/// # Arguments
+///
+/// * `status` - The `tonic::Status` error to convert.
+///
+/// # Returns
+///
+/// A JSON string containing the structured error information.
+fn tonic_status_to_json(status: &tonic::Status) -> String {
+    let error_json = serde_json::json!({
+        "code": format!("{:?}", status.code()),
+        "message": status.message(),
+        "details": if status.details().is_empty() {
+            serde_json::Value::Null
+        } else {
+            serde_json::Value::String(format!("details present ({} bytes)", status.details().len()))
+        },
+        "metadata": {
+            "headers": status.metadata().iter().map(|kv| {
+                match kv {
+                    tonic::metadata::KeyAndValueRef::Ascii(key, value) => {
+                        (key.as_str(), value.to_str().unwrap_or("<invalid ascii>"))
+                    },
+                    tonic::metadata::KeyAndValueRef::Binary(key, _value) => {
+                        (key.as_str(), "<binary data>")
+                    }
+                }
+            }).collect::<std::collections::HashMap<_, _>>()
+        }
+    });
+
+    error_json.to_string()
+}
+
+// TRANSACTION WITNESS GENERATOR
+// ================================================================================================
+
+/// Generates a mock transaction for testing remote prover functionality.
+///
+/// This function creates a mock transaction using `MockChainBuilder` similar to what's done
+/// in the remote prover tests. The transaction is generated once and can be reused for
+/// multiple proof test calls.
+pub async fn generate_mock_transaction() -> anyhow::Result<TransactionInputs> {
+    let mut mock_chain_builder = MockChainBuilder::new();
+
+    // Create an account with basic authentication
+    let account = mock_chain_builder
+        .add_existing_wallet(Auth::BasicAuth)
+        .context("Failed to add wallet to mock chain")?;
+
+    // Create a fungible asset
+    let fungible_asset: Asset = FungibleAsset::new(
+        ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET
+            .try_into()
+            .context("Failed to convert account ID")?,
+        100,
+    )
+    .context("Failed to create fungible asset")?
+    .into();
+
+    // Create a P2ID note
+    let note = mock_chain_builder
+        .add_p2id_note(
+            ACCOUNT_ID_SENDER.try_into().context("Failed to convert sender account ID")?,
+            account.id(),
+            &[fungible_asset],
+            NoteType::Private,
+        )
+        .context("Failed to add P2ID note")?;
+
+    // Build the mock chain
+    let mock_chain = mock_chain_builder.build().context("Failed to build mock chain")?;
+
+    // Build transaction context
+    let tx_context = mock_chain
+        .build_tx_context(account.id(), &[note.id()], &[])
+        .context("Failed to build transaction context")?
+        .build()
+        .context("Failed to build transaction")?;
+
+    // Execute the transaction
+    let executed_transaction =
+        Box::pin(tx_context.execute()).await.context("Failed to execute transaction")?;
+    Ok(executed_transaction.into())
+}
+
+// GENERATE TEST REQUEST PAYLOAD
+// ================================================================================================
+
+pub(crate) async fn generate_prover_test_payload() -> proto::remote_prover::ProofRequest {
+    proto::remote_prover::ProofRequest {
+        proof_type: proto::remote_prover::ProofType::Transaction.into(),
+        payload: generate_mock_transaction().await.unwrap().to_bytes(),
+    }
+}
diff --git a/bin/network-monitor/src/status.rs b/bin/network-monitor/src/status.rs
index a77746f5a..ccd350991 100644
--- a/bin/network-monitor/src/status.rs
+++ b/bin/network-monitor/src/status.rs
@@ -3,88 +3,54 @@
 //! This module contains the logic for checking the status of network services.
 //! Individual status checker tasks send updates via watch channels to the web server.
 
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
+use std::time::Duration;
 
-use anyhow::Context;
 use miden_node_proto::clients::{Builder as ClientBuilder, RemoteProverProxy, Rpc};
+use miden_node_proto::generated as proto;
 use miden_node_proto::generated::block_producer::BlockProducerStatus;
-use miden_node_proto::generated::remote_prover::{
-    ProofType,
-    ProxyStatus,
-    ProxyWorkerStatus,
-    WorkerHealthStatus,
-};
 use miden_node_proto::generated::rpc::RpcStatus;
 use miden_node_proto::generated::rpc_store::StoreStatus;
 use serde::{Deserialize, Serialize};
 use tokio::sync::watch;
 use tokio::time::MissedTickBehavior;
-use tracing::instrument;
+use tracing::{info, instrument};
 use url::Url;
 
-use crate::COMPONENT;
+use crate::faucet::FaucetTestDetails;
+use crate::remote_prover::{ProofType, ProverTestDetails};
+use crate::{COMPONENT, current_unix_timestamp_secs};
 
-// MONITOR CONFIGURATION
+// STATUS
 // ================================================================================================
 
-const DEFAULT_RPC_URL: &str = "http://localhost:50051";
-const DEFAULT_REMOTE_PROVER_URLS: &str = "http://localhost:50052";
-const DEFAULT_PORT: u16 = 3000;
-
-const RPC_URL_ENV_VAR: &str = "MIDEN_MONITOR_RPC_URL";
-const REMOTE_PROVER_URLS_ENV_VAR: &str = "MIDEN_MONITOR_REMOTE_PROVER_URLS";
-const PORT_ENV_VAR: &str = "MIDEN_MONITOR_PORT";
-pub(crate) const ENABLE_OTEL_ENV_VAR: &str = "MIDEN_MONITOR_ENABLE_OTEL";
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub(crate) enum Status {
+    Healthy,
+    Unhealthy,
+    Unknown,
+}
 
-/// Configuration for the monitor.
-///
-/// This struct contains the configuration for the monitor.
-#[derive(Debug, Clone)]
-pub struct MonitorConfig {
-    /// The URL of the RPC service.
-    pub rpc_url: Url,
-    /// The URLs of the remote provers.
-    pub remote_prover_urls: Vec<Url>,
-    /// The port of the monitor.
-    pub port: u16,
+impl From<String> for Status {
+    fn from(value: String) -> Self {
+        match value.as_str() {
+            "HEALTHY" | "connected" => Status::Healthy,
+            "UNHEALTHY" | "disconnected" => Status::Unhealthy,
+            _ => Status::Unknown,
+        }
+    }
 }
 
-impl MonitorConfig {
-    /// Loads the configuration from the environment variables.
-    ///
-    /// This function loads the configuration from the environment variables.
-    /// The environment variables are:
-    /// - `MIDEN_MONITOR_RPC_URL`: The URL of the RPC service.
-    /// - `MIDEN_MONITOR_REMOTE_PROVER_URLS`: The URLs of the remote provers, comma separated.
-    /// - `MIDEN_MONITOR_PORT`: The port of the monitor.
-    pub fn from_env() -> Result<Self, Box<dyn std::error::Error>> {
-        let rpc_url =
-            std::env::var(RPC_URL_ENV_VAR).unwrap_or_else(|_| DEFAULT_RPC_URL.to_string());
-
-        // Parse multiple remote prover URLs from environment variable
-        let remote_prover_urls = std::env::var(REMOTE_PROVER_URLS_ENV_VAR)
-            .unwrap_or_else(|_| DEFAULT_REMOTE_PROVER_URLS.to_string());
-
-        let remote_prover_urls = remote_prover_urls
-            .split(',')
-            .map(str::trim)
-            .filter(|url| !url.is_empty())
-            .map(Url::parse)
-            .collect::<Result<Vec<_>, _>>()?;
-
-        let port = std::env::var(PORT_ENV_VAR)
-            .unwrap_or_else(|_| DEFAULT_PORT.to_string())
-            .parse::<u16>()?;
-
-        Ok(MonitorConfig {
-            rpc_url: Url::parse(&rpc_url)?,
-            remote_prover_urls,
-            port,
-        })
+impl From<proto::remote_prover::WorkerHealthStatus> for Status {
+    fn from(value: proto::remote_prover::WorkerHealthStatus) -> Self {
+        match value {
+            proto::remote_prover::WorkerHealthStatus::Unknown => Status::Unknown,
+            proto::remote_prover::WorkerHealthStatus::Healthy => Status::Healthy,
+            proto::remote_prover::WorkerHealthStatus::Unhealthy => Status::Unhealthy,
+        }
     }
 }
 
-// SERVICE STATUS CHECKER
+// SERVICE STATUS
 // ================================================================================================
 
 /// Status of a service.
@@ -95,35 +61,20 @@ impl MonitorConfig {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ServiceStatus {
     pub name: String,
-    pub status: String,
+    pub status: Status,
     pub last_checked: u64,
     pub error: Option<String>,
-    pub details: Option<ServiceDetails>,
-}
-
-impl ServiceStatus {
-    /// Creates a new `ServiceStatus` with the given name and default values.
-    ///
-    /// The `status` is initialized as "unknown", `last_checked` as 0, and both `error` and
-    /// `details` as None.
-    pub fn new(name: String) -> Self {
-        Self {
-            name,
-            status: "unknown".to_string(),
-            last_checked: 0,
-            error: None,
-            details: None,
-        }
-    }
+    pub details: ServiceDetails,
 }
 
 /// Details of a service.
-///
-/// This struct contains the details of a service, which is a union of the details of the service.
 #[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ServiceDetails {
-    pub rpc_status: Option<RpcStatusDetails>,
-    pub remote_prover_statuses: Vec<RemoteProverStatusDetails>,
+pub enum ServiceDetails {
+    RpcStatus(RpcStatusDetails),
+    RemoteProverStatus(RemoteProverStatusDetails),
+    RemoteProverTest(ProverTestDetails),
+    FaucetTest(FaucetTestDetails),
+    Error,
 }
 
 /// Details of an RPC service.
@@ -145,7 +96,7 @@ pub struct RpcStatusDetails {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct StoreStatusDetails {
     pub version: String,
-    pub status: String,
+    pub status: Status,
     pub chain_tip: u32,
 }
 
@@ -156,7 +107,7 @@ pub struct StoreStatusDetails {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct BlockProducerStatusDetails {
     pub version: String,
-    pub status: String,
+    pub status: Status,
 }
 
 /// Details of a remote prover service.
@@ -165,10 +116,9 @@ pub struct BlockProducerStatusDetails {
 /// of the remote prover service.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct RemoteProverStatusDetails {
-    pub name: String,
     pub url: String,
     pub version: String,
-    pub supported_proof_type: String,
+    pub supported_proof_type: ProofType,
     pub workers: Vec<WorkerStatusDetails>,
 }
 
@@ -180,7 +130,7 @@ pub struct RemoteProverStatusDetails {
 pub struct WorkerStatusDetails {
     pub address: String,
     pub version: String,
-    pub status: String,
+    pub status: Status,
 }
 
 /// Status of a network.
@@ -199,57 +149,50 @@ pub struct NetworkStatus {
 ///
 /// This implementation converts a `StoreStatus` to a `StoreStatusDetails`.
 impl From<StoreStatus> for StoreStatusDetails {
-    fn from(status: StoreStatus) -> Self {
+    fn from(value: StoreStatus) -> Self {
         Self {
-            version: status.version,
-            status: status.status,
-            chain_tip: status.chain_tip,
+            version: value.version,
+            status: value.status.into(),
+            chain_tip: value.chain_tip,
         }
     }
 }
 
 impl From<BlockProducerStatus> for BlockProducerStatusDetails {
-    fn from(status: BlockProducerStatus) -> Self {
+    fn from(value: BlockProducerStatus) -> Self {
         Self {
-            version: status.version,
-            status: status.status,
+            version: value.version,
+            status: value.status.into(),
         }
     }
 }
 
-impl From<ProxyWorkerStatus> for WorkerStatusDetails {
-    fn from(worker: ProxyWorkerStatus) -> Self {
-        let status_str = match WorkerHealthStatus::try_from(worker.status) {
-            Ok(WorkerHealthStatus::Healthy) => "HEALTHY",
-            Ok(WorkerHealthStatus::Unhealthy) => "UNHEALTHY",
-            Ok(WorkerHealthStatus::Unknown) | Err(_) => "UNKNOWN",
-        };
+impl From<proto::remote_prover::ProxyWorkerStatus> for WorkerStatusDetails {
+    fn from(value: proto::remote_prover::ProxyWorkerStatus) -> Self {
+        let status =
+            proto::remote_prover::WorkerHealthStatus::try_from(value.status).unwrap().into();
 
         Self {
-            address: worker.address,
-            version: worker.version,
-            status: status_str.to_string(),
+            address: value.address,
+            version: value.version,
+            status,
         }
     }
 }
 
 impl RemoteProverStatusDetails {
-    pub fn from_proxy_status(status: ProxyStatus, name: String, url: String) -> Self {
-        let proof_type_str = match ProofType::try_from(status.supported_proof_type) {
-            Ok(ProofType::Transaction) => "TRANSACTION",
-            Ok(ProofType::Batch) => "BATCH",
-            Ok(ProofType::Block) => "BLOCK",
-            Err(_) => "UNKNOWN",
-        };
+    pub fn from_proxy_status(status: proto::remote_prover::ProxyStatus, url: String) -> Self {
+        let proof_type = proto::remote_prover::ProofType::try_from(status.supported_proof_type)
+            .unwrap()
+            .into();
 
         let workers: Vec<WorkerStatusDetails> =
             status.workers.into_iter().map(WorkerStatusDetails::from).collect();
 
         Self {
-            name,
             url,
             version: status.version,
-            supported_proof_type: proof_type_str.to_string(),
+            supported_proof_type: proof_type,
             workers,
         }
     }
@@ -278,6 +221,7 @@ impl From<RpcStatus> for RpcStatusDetails {
 ///
 /// * `rpc_url` - The URL of the RPC service.
 /// * `status_sender` - The sender for the watch channel.
+/// * `status_check_interval` - The interval at which to check the status of the services.
 ///
 /// # Returns
 ///
@@ -286,29 +230,31 @@ impl From<RpcStatus> for RpcStatusDetails {
 pub async fn run_rpc_status_task(
     rpc_url: Url,
     status_sender: watch::Sender<ServiceStatus>,
-) -> anyhow::Result<()> {
+    status_check_interval: Duration,
+) {
     let mut rpc = ClientBuilder::new(rpc_url)
-        .without_tls()
-        .without_timeout()
+        .with_tls()
+        .expect("TLS is enabled")
+        .with_timeout(Duration::from_secs(10))
         .without_metadata_version()
         .without_metadata_genesis()
         .connect_lazy::<Rpc>();
 
-    let mut interval = tokio::time::interval(Duration::from_secs(3));
+    let mut interval = tokio::time::interval(status_check_interval);
     interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
 
     loop {
         interval.tick().await;
 
-        let current_time = SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .context("failed to get current time")?
-            .as_secs();
+        let current_time = current_unix_timestamp_secs();
 
         let status = check_rpc_status(&mut rpc, current_time).await;
 
-        // Send the status update (ignore if no receivers)
-        let _ = status_sender.send(status);
+        // Send the status update; exit if no receivers (shutdown signal)
+        if status_sender.send(status).is_err() {
+            info!("No receivers for RPC status updates, shutting down");
+            return;
+        }
     }
 }
 
@@ -325,7 +271,7 @@ pub async fn run_rpc_status_task(
 ///
 /// A `ServiceStatus` containing the status of the RPC service.
 #[instrument(target = COMPONENT, name = "check-status.rpc", skip_all, ret(level = "info"))]
-async fn check_rpc_status(
+pub(crate) async fn check_rpc_status(
     rpc: &mut miden_node_proto::clients::RpcClient,
     current_time: u64,
 ) -> ServiceStatus {
@@ -335,21 +281,18 @@ async fn check_rpc_status(
 
             ServiceStatus {
                 name: "RPC".to_string(),
-                status: "healthy".to_string(),
+                status: Status::Healthy,
                 last_checked: current_time,
                 error: None,
-                details: Some(ServiceDetails {
-                    rpc_status: Some(status.into()),
-                    remote_prover_statuses: Vec::new(),
-                }),
+                details: ServiceDetails::RpcStatus(status.into()),
             }
         },
         Err(e) => ServiceStatus {
             name: "RPC".to_string(),
-            status: "unhealthy".to_string(),
+            status: Status::Unhealthy,
             last_checked: current_time,
             error: Some(e.to_string()),
-            details: None,
+            details: ServiceDetails::Error,
         },
     }
 }
@@ -367,6 +310,7 @@ async fn check_rpc_status(
 /// * `prover_url` - The URL of the remote prover service.
 /// * `name` - The name of the remote prover.
 /// * `status_sender` - The sender for the watch channel.
+/// * `status_check_interval` - The interval at which to check the status of the services.
 ///
 /// # Returns
 ///
@@ -377,25 +321,24 @@ pub async fn run_remote_prover_status_task(
     prover_url: Url,
     name: String,
     status_sender: watch::Sender<ServiceStatus>,
-) -> anyhow::Result<()> {
+    status_check_interval: Duration,
+) {
     let url_str = prover_url.to_string();
     let mut remote_prover = ClientBuilder::new(prover_url)
-        .without_tls()
-        .without_timeout()
+        .with_tls()
+        .expect("TLS is enabled")
+        .with_timeout(Duration::from_secs(10))
         .without_metadata_version()
         .without_metadata_genesis()
         .connect_lazy::<RemoteProverProxy>();
 
-    let mut interval = tokio::time::interval(Duration::from_secs(3));
+    let mut interval = tokio::time::interval(status_check_interval);
     interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
 
     loop {
         interval.tick().await;
 
-        let current_time = SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .context("failed to get current time")?
-            .as_secs();
+        let current_time = current_unix_timestamp_secs();
 
         let status = check_remote_prover_status(
             &mut remote_prover,
@@ -405,8 +348,11 @@ pub async fn run_remote_prover_status_task(
         )
         .await;
 
-        // Send the status update (ignore if no receivers)
-        let _ = status_sender.send(status);
+        // Send the status update; exit if no receivers (shutdown signal)
+        if status_sender.send(status).is_err() {
+            info!("No receivers for remote prover status updates, shutting down");
+            return;
+        }
     }
 }
 
@@ -425,8 +371,8 @@ pub async fn run_remote_prover_status_task(
 ///
 /// A `ServiceStatus` containing the status of the remote prover service.
 #[instrument(target = COMPONENT, name = "check-status.remote-prover", skip_all, ret(level = "info"))]
-async fn check_remote_prover_status(
-    remote_prover: &mut miden_node_proto::clients::RemoteProverProxyClient,
+pub(crate) async fn check_remote_prover_status(
+    remote_prover: &mut miden_node_proto::clients::RemoteProverProxyStatusClient,
     name: String,
     url: String,
     current_time: u64,
@@ -436,35 +382,31 @@ async fn check_remote_prover_status(
             let status = response.into_inner();
 
             // Use the new method to convert gRPC status to domain type
-            let remote_prover_details =
-                RemoteProverStatusDetails::from_proxy_status(status, name.clone(), url);
+            let remote_prover_details = RemoteProverStatusDetails::from_proxy_status(status, url);
 
             // Determine overall health based on worker statuses
             let overall_health = if remote_prover_details.workers.is_empty() {
-                "unknown"
-            } else if remote_prover_details.workers.iter().any(|w| w.status == "HEALTHY") {
-                "healthy"
+                Status::Unknown
+            } else if remote_prover_details.workers.iter().any(|w| w.status == Status::Healthy) {
+                Status::Healthy
             } else {
-                "unhealthy"
+                Status::Unhealthy
             };
 
             ServiceStatus {
                 name: format!("Remote Prover ({name})"),
-                status: overall_health.to_string(),
+                status: overall_health,
                 last_checked: current_time,
                 error: None,
-                details: Some(ServiceDetails {
-                    rpc_status: None,
-                    remote_prover_statuses: vec![remote_prover_details],
-                }),
+                details: ServiceDetails::RemoteProverStatus(remote_prover_details),
             }
         },
         Err(e) => ServiceStatus {
             name: format!("Remote Prover ({name})"),
-            status: "unhealthy".to_string(),
+            status: Status::Unhealthy,
             last_checked: current_time,
             error: Some(e.to_string()),
-            details: None,
+            details: ServiceDetails::Error,
         },
     }
 }
diff --git a/bin/node/Cargo.toml b/bin/node/Cargo.toml
index 1b7b0bf72..0ddaaba58 100644
--- a/bin/node/Cargo.toml
+++ b/bin/node/Cargo.toml
@@ -19,7 +19,7 @@ tracing-forest = ["miden-node-block-producer/tracing-forest"]
 
 [dependencies]
 anyhow                    = { workspace = true }
-clap                      = { features = ["derive", "env", "string"], version = "4.5" }
+clap                      = { features = ["env", "string"], workspace = true }
 fs-err                    = { workspace = true }
 humantime                 = { workspace = true }
 miden-node-block-producer = { workspace = true }
diff --git a/bin/node/src/main.rs b/bin/node/src/main.rs
index d2b264097..d20b66e57 100644
--- a/bin/node/src/main.rs
+++ b/bin/node/src/main.rs
@@ -74,7 +74,7 @@ async fn main() -> anyhow::Result<()> {
     let cli = Cli::parse();
 
     // Configure tracing with optional OpenTelemetry exporting support.
-    miden_node_utils::logging::setup_tracing(cli.command.open_telemetry())?;
+    let _otel_guard = miden_node_utils::logging::setup_tracing(cli.command.open_telemetry())?;
 
     cli.command.execute().await
 }
diff --git a/bin/remote-prover/Cargo.toml b/bin/remote-prover/Cargo.toml
index 6823b13b0..a05fcdb42 100644
--- a/bin/remote-prover/Cargo.toml
+++ b/bin/remote-prover/Cargo.toml
@@ -27,7 +27,7 @@ anyhow                = { workspace = true }
 async-trait           = { version = "0.1" }
 axum                  = { version = "0.8" }
 bytes                 = { version = "1.0" }
-clap                  = { features = ["derive", "env"], version = "4.5" }
+clap                  = { features = ["env"], workspace = true }
 http                  = { workspace = true }
 humantime             = { workspace = true }
 miden-block-prover    = { workspace = true }
diff --git a/bin/remote-prover/src/api/prover.rs b/bin/remote-prover/src/api/prover.rs
index 56eb52354..a40b83341 100644
--- a/bin/remote-prover/src/api/prover.rs
+++ b/bin/remote-prover/src/api/prover.rs
@@ -3,7 +3,7 @@ use miden_node_utils::ErrorReport;
 use miden_objects::MIN_PROOF_SECURITY_LEVEL;
 use miden_objects::batch::ProposedBatch;
 use miden_objects::block::ProposedBlock;
-use miden_objects::transaction::TransactionWitness;
+use miden_objects::transaction::TransactionInputs;
 use miden_objects::utils::Serializable;
 use miden_tx::LocalTransactionProver;
 use miden_tx_batch_prover::LocalBatchProver;
@@ -99,7 +99,7 @@ impl ProverRpcApi {
     )]
     pub async fn prove_tx(
         &self,
-        transaction_witness: TransactionWitness,
+        tx_inputs: TransactionInputs,
         request_id: &str,
     ) -> Result<Response<proto::remote_prover::Proof>, tonic::Status> {
         let Prover::Transaction(prover) = &self.prover else {
@@ -114,7 +114,7 @@ impl ProverRpcApi {
         #[cfg(test)]
         tokio::time::sleep(std::time::Duration::from_millis(100)).await;
 
-        let proof = locked_prover.prove(transaction_witness).map_err(internal_error)?;
+        let proof = locked_prover.prove(tx_inputs).map_err(internal_error)?;
 
         // Record the transaction_id in the current tracing span
         let transaction_id = proof.id();
@@ -217,8 +217,8 @@ impl ProverApi for ProverRpcApi {
 
         match proof_type {
             proto::remote_prover::ProofType::Transaction => {
-                let tx_witness = proof_request.try_into().map_err(invalid_argument)?;
-                self.prove_tx(tx_witness, &request_id).await
+                let tx_inputs = proof_request.try_into().map_err(invalid_argument)?;
+                self.prove_tx(tx_inputs, &request_id).await
             },
             proto::remote_prover::ProofType::Batch => {
                 let proposed_batch = proof_request.try_into().map_err(invalid_argument)?;
@@ -257,7 +257,7 @@ mod test {
         ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET,
         ACCOUNT_ID_SENDER,
     };
-    use miden_objects::transaction::{ProvenTransaction, TransactionWitness};
+    use miden_objects::transaction::{ProvenTransaction, TransactionInputs};
     use miden_testing::{Auth, MockChainBuilder};
     use miden_tx::utils::Serializable;
     use tokio::net::TcpListener;
@@ -323,17 +323,16 @@ mod test {
             .unwrap();
 
         let executed_transaction = Box::pin(tx_context.execute()).await.unwrap();
-
-        let transaction_witness = TransactionWitness::from(executed_transaction);
+        let tx_inputs = TransactionInputs::from(executed_transaction);
 
         let request_1 = Request::new(proto::remote_prover::ProofRequest {
             proof_type: proto::remote_prover::ProofType::Transaction.into(),
-            payload: transaction_witness.to_bytes(),
+            payload: tx_inputs.to_bytes(),
         });
 
         let request_2 = Request::new(proto::remote_prover::ProofRequest {
             proof_type: proto::remote_prover::ProofType::Transaction.into(),
-            payload: transaction_witness.to_bytes(),
+            payload: tx_inputs.to_bytes(),
         });
 
         // Send both requests concurrently
diff --git a/bin/remote-prover/src/generated/conversions.rs b/bin/remote-prover/src/generated/conversions.rs
index 31e696e08..885d1e06b 100644
--- a/bin/remote-prover/src/generated/conversions.rs
+++ b/bin/remote-prover/src/generated/conversions.rs
@@ -3,7 +3,7 @@
 
 use miden_objects::batch::ProposedBatch;
 use miden_objects::block::ProposedBlock;
-use miden_objects::transaction::{ProvenTransaction, TransactionWitness};
+use miden_objects::transaction::{ProvenTransaction, TransactionInputs};
 use miden_tx::utils::{Deserializable, DeserializationError, Serializable};
 
 use crate::api::ProofType;
@@ -23,11 +23,11 @@ impl TryFrom<proto::Proof> for ProvenTransaction {
     }
 }
 
-impl TryFrom<proto::ProofRequest> for TransactionWitness {
+impl TryFrom<proto::ProofRequest> for TransactionInputs {
     type Error = DeserializationError;
 
     fn try_from(request: proto::ProofRequest) -> Result<Self, Self::Error> {
-        TransactionWitness::read_from_bytes(&request.payload)
+        TransactionInputs::read_from_bytes(&request.payload)
     }
 }
 
diff --git a/bin/remote-prover/src/generated/remote_prover.rs b/bin/remote-prover/src/generated/remote_prover.rs
index 7404cb38e..373859bef 100644
--- a/bin/remote-prover/src/generated/remote_prover.rs
+++ b/bin/remote-prover/src/generated/remote_prover.rs
@@ -7,7 +7,7 @@ pub struct ProofRequest {
     pub proof_type: i32,
     /// Serialized payload requiring proof generation. The encoding format is
     /// type-specific:
-    /// - TRANSACTION: TransactionWitness encoded.
+    /// - TRANSACTION: TransactionInputs encoded.
     /// - BATCH: ProposedBatch encoded.
     /// - BLOCK: ProposedBlock encoded.
     #[prost(bytes = "vec", tag = "2")]
diff --git a/bin/remote-prover/src/main.rs b/bin/remote-prover/src/main.rs
index 1ec1ee558..d4fc42f6d 100644
--- a/bin/remote-prover/src/main.rs
+++ b/bin/remote-prover/src/main.rs
@@ -11,7 +11,7 @@ pub(crate) mod utils;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    setup_tracing(OpenTelemetry::Enabled)?;
+    let _otel_guard = setup_tracing(OpenTelemetry::Enabled)?;
     info!(target: COMPONENT, "Tracing initialized");
 
     // read command-line args
diff --git a/bin/remote-prover/src/proxy/worker.rs b/bin/remote-prover/src/proxy/worker.rs
index ac91efe11..bf181c613 100644
--- a/bin/remote-prover/src/proxy/worker.rs
+++ b/bin/remote-prover/src/proxy/worker.rs
@@ -196,18 +196,10 @@ impl Worker {
 
         self.version = worker_status.version;
 
-        let worker_supported_proof_type =
-            match ProofType::try_from(worker_status.supported_proof_type) {
-                Ok(proof_type) => proof_type,
-                Err(e) => {
-                    error!(
-                        "Failed to convert worker supported proof type ({}): {}",
-                        self.address(),
-                        e
-                    );
-                    return Err(e.to_string());
-                },
-            };
+        let worker_supported_proof_type = ProofType::try_from(worker_status.supported_proof_type)
+            .inspect_err(|err| {
+            error!(%err, address=%self.address(), "Failed to convert worker supported proof type");
+        })?;
 
         if supported_proof_type != worker_supported_proof_type {
             return Err(format!("Unsupported proof type: {supported_proof_type}"));
diff --git a/bin/stress-test/Cargo.toml b/bin/stress-test/Cargo.toml
index 65e7bad01..7add1676a 100644
--- a/bin/stress-test/Cargo.toml
+++ b/bin/stress-test/Cargo.toml
@@ -19,17 +19,16 @@ workspace = true
 clap                      = { features = ["derive"], version = "4.5" }
 fs-err                    = { workspace = true }
 futures                   = { workspace = true }
-miden-air                 = { workspace = true }
+miden-air                 = { features = ["testing"], workspace = true }
 miden-block-prover        = { features = ["testing"], workspace = true }
 miden-lib                 = { workspace = true }
 miden-node-block-producer = { workspace = true }
 miden-node-proto          = { workspace = true }
 miden-node-store          = { workspace = true }
 miden-node-utils          = { workspace = true }
-miden-objects             = { features = ["testing"], workspace = true }
+miden-objects             = { workspace = true }
 rand                      = { workspace = true }
 rayon                     = { version = "1.10" }
 tokio                     = { workspace = true }
 tonic                     = { workspace = true }
 url                       = { workspace = true }
-winterfell                = { version = "0.13" }
diff --git a/bin/stress-test/src/seeding/mod.rs b/bin/stress-test/src/seeding/mod.rs
index 72604446c..34671e1f4 100644
--- a/bin/stress-test/src/seeding/mod.rs
+++ b/bin/stress-test/src/seeding/mod.rs
@@ -4,7 +4,7 @@ use std::sync::{Arc, Mutex};
 use std::time::{Duration, Instant};
 
 use metrics::SeedingMetrics;
-use miden_air::HashFunction;
+use miden_air::ExecutionProof;
 use miden_block_prover::LocalBlockProver;
 use miden_lib::account::auth::AuthRpoFalcon512;
 use miden_lib::account::faucets::BasicFungibleFaucet;
@@ -40,7 +40,6 @@ use miden_objects::transaction::{
     ProvenTransactionBuilder,
     TransactionHeader,
 };
-use miden_objects::vm::ExecutionProof;
 use miden_objects::{AssetError, Felt, ONE, Word};
 use rand::Rng;
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
@@ -51,7 +50,6 @@ use tokio::{fs, task};
 use tonic::service::interceptor::InterceptedService;
 use tonic::transport::Channel;
 use url::Url;
-use winterfell::Proof;
 
 mod metrics;
 
@@ -311,14 +309,13 @@ fn create_note(faucet_id: AccountId, target_id: AccountId, rng: &mut RpoRandomCo
 /// the given index.
 fn create_account(public_key: PublicKey, index: u64, storage_mode: AccountStorageMode) -> Account {
     let init_seed: Vec<_> = index.to_be_bytes().into_iter().chain([0u8; 24]).collect();
-    let (new_account, _) = AccountBuilder::new(init_seed.try_into().unwrap())
+    AccountBuilder::new(init_seed.try_into().unwrap())
         .account_type(AccountType::RegularAccountImmutableCode)
         .storage_mode(storage_mode)
-        .with_auth_component(AuthRpoFalcon512::new(public_key))
+        .with_auth_component(AuthRpoFalcon512::new(public_key.into()))
         .with_component(BasicWallet)
         .build()
-        .unwrap();
-    new_account
+        .unwrap()
 }
 
 /// Creates a new faucet account.
@@ -329,14 +326,13 @@ fn create_faucet() -> Account {
     let init_seed = [0_u8; 32];
 
     let token_symbol = TokenSymbol::new("TEST").unwrap();
-    let (new_faucet, _seed) = AccountBuilder::new(init_seed)
+    AccountBuilder::new(init_seed)
         .account_type(AccountType::FungibleFaucet)
         .storage_mode(AccountStorageMode::Private)
         .with_component(BasicFungibleFaucet::new(token_symbol, 2, Felt::new(u64::MAX)).unwrap())
-        .with_auth_component(AuthRpoFalcon512::new(key_pair.public_key()))
+        .with_auth_component(AuthRpoFalcon512::new(key_pair.public_key().into()))
         .build()
-        .unwrap();
-    new_faucet
+        .unwrap()
 }
 
 /// Creates a proven batch from a list of transactions and a reference block.
@@ -412,7 +408,7 @@ fn create_consume_note_tx(
         block_ref.commitment(),
         fee_from_block(block_ref).unwrap(),
         u32::MAX.into(),
-        ExecutionProof::new(Proof::new_dummy(), HashFunction::default()),
+        ExecutionProof::new_dummy(),
     )
     .add_input_notes(vec![input_note])
     .account_update_details(details)
@@ -450,7 +446,7 @@ fn create_emit_note_tx(
         )
         .unwrap(),
         u32::MAX.into(),
-        ExecutionProof::new(Proof::new_dummy(), HashFunction::default()),
+        ExecutionProof::new_dummy(),
     )
     .add_output_notes(output_notes.into_iter().map(OutputNote::Full).collect::<Vec<OutputNote>>())
     .build()
diff --git a/bin/stress-test/src/store/mod.rs b/bin/stress-test/src/store/mod.rs
index 2a571d6a3..d21826521 100644
--- a/bin/stress-test/src/store/mod.rs
+++ b/bin/stress-test/src/store/mod.rs
@@ -158,7 +158,10 @@ pub async fn sync_notes(
         .iter()
         .map(|id| u32::from(NoteTag::from_account_id(*id)))
         .collect::<Vec<_>>();
-    let sync_request = proto::rpc_store::SyncNotesRequest { block_num: 0, note_tags };
+    let sync_request = proto::rpc_store::SyncNotesRequest {
+        block_range: Some(proto::rpc_store::BlockRange { block_from: 0, block_to: None }),
+        note_tags,
+    };
 
     let start = Instant::now();
     api_client.sync_notes(sync_request).await.unwrap();
diff --git a/crates/block-producer/src/batch_builder/mod.rs b/crates/block-producer/src/batch_builder/mod.rs
index 90b586f6a..001938e9d 100644
--- a/crates/block-producer/src/batch_builder/mod.rs
+++ b/crates/block-producer/src/batch_builder/mod.rs
@@ -1,4 +1,6 @@
 use std::num::NonZeroUsize;
+use std::ops::Deref;
+use std::sync::Arc;
 use std::time::Duration;
 
 use futures::never::Never;
@@ -172,6 +174,7 @@ impl BatchJob {
             .and_then(|(txs, inputs)| Self::propose_batch(txs, inputs) )
             .inspect_ok(TelemetryInjectorExt::inject_telemetry)
             .and_then(|proposed| self.prove_batch(proposed))
+
             // Failure must be injected before the final pipeline stage i.e. before commit is called. The system cannot
             // handle errors after it considers the process complete (which makes sense).
             .and_then(|x| self.inject_failure(x))
@@ -198,12 +201,16 @@ impl BatchJob {
     async fn get_batch_inputs(
         &self,
         batch: SelectedBatch,
-    ) -> Result<(Vec<AuthenticatedTransaction>, BatchInputs), BuildBatchError> {
-        let block_references =
-            batch.transactions.iter().map(AuthenticatedTransaction::reference_block);
+    ) -> Result<(Vec<Arc<AuthenticatedTransaction>>, BatchInputs), BuildBatchError> {
+        let block_references = batch
+            .transactions
+            .iter()
+            .map(Deref::deref)
+            .map(AuthenticatedTransaction::reference_block);
         let unauthenticated_notes = batch
             .transactions
             .iter()
+            .map(Deref::deref)
             .flat_map(AuthenticatedTransaction::unauthenticated_notes);
 
         self.store
@@ -215,11 +222,14 @@ impl BatchJob {
 
     #[instrument(target = COMPONENT, name = "batch_builder.propose_batch", skip_all, err)]
     async fn propose_batch(
-        transactions: Vec<AuthenticatedTransaction>,
+        transactions: Vec<Arc<AuthenticatedTransaction>>,
         inputs: BatchInputs,
     ) -> Result<ProposedBatch, BuildBatchError> {
-        let transactions =
-            transactions.iter().map(AuthenticatedTransaction::proven_transaction).collect();
+        let transactions = transactions
+            .iter()
+            .map(Deref::deref)
+            .map(AuthenticatedTransaction::proven_transaction)
+            .collect();
 
         ProposedBatch::new(
             transactions,
@@ -234,7 +244,7 @@ impl BatchJob {
     async fn prove_batch(
         &self,
         proposed_batch: ProposedBatch,
-    ) -> Result<ProvenBatch, BuildBatchError> {
+    ) -> Result<Arc<ProvenBatch>, BuildBatchError> {
         Span::current().set_attribute("prover.kind", self.batch_prover.kind());
 
         let proven_batch = match &self.batch_prover {
@@ -256,7 +266,7 @@ impl BatchJob {
                 MIN_PROOF_SECURITY_LEVEL,
             ))
         } else {
-            Ok(proven_batch)
+            Ok(Arc::new(proven_batch))
         }
     }
 
@@ -275,7 +285,7 @@ impl BatchJob {
     }
 
     #[instrument(target = COMPONENT, name = "batch_builder.commit_batch", skip_all)]
-    async fn commit_batch(&self, batch: ProvenBatch) {
+    async fn commit_batch(&self, batch: Arc<ProvenBatch>) {
         self.mempool.lock().await.commit_batch(batch);
     }
 
@@ -287,7 +297,7 @@ impl BatchJob {
 
 struct SelectedBatch {
     id: BatchId,
-    transactions: Vec<AuthenticatedTransaction>,
+    transactions: Vec<Arc<AuthenticatedTransaction>>,
 }
 
 // BATCH PROVER
@@ -324,27 +334,29 @@ impl TelemetryInjectorExt for SelectedBatch {
     fn inject_telemetry(&self) {
         Span::current().set_attribute("batch.id", self.id);
         Span::current().set_attribute("transactions.count", self.transactions.len());
-        Span::current().set_attribute(
-            "transactions.input_notes.count",
-            self.transactions
-                .iter()
-                .map(AuthenticatedTransaction::input_note_count)
-                .sum::<usize>(),
-        );
-        Span::current().set_attribute(
-            "transactions.output_notes.count",
-            self.transactions
-                .iter()
-                .map(AuthenticatedTransaction::output_note_count)
-                .sum::<usize>(),
-        );
-        Span::current().set_attribute(
-            "transactions.unauthenticated_notes.count",
-            self.transactions
-                .iter()
-                .map(|tx| tx.unauthenticated_notes().count())
-                .sum::<usize>(),
-        );
+        // Accumulate all telemetry based on transactions.
+        let (tx_ids, input_notes_count, output_notes_count, unauth_notes_count) =
+            self.transactions.iter().fold(
+                (vec![], 0, 0, 0),
+                |(
+                    mut tx_ids,
+                    mut input_notes_count,
+                    mut output_notes_count,
+                    mut unauth_notes_count,
+                ),
+                 tx| {
+                    tx_ids.push(tx.id());
+                    input_notes_count += tx.input_note_count();
+                    output_notes_count += tx.output_note_count();
+                    unauth_notes_count += tx.unauthenticated_notes().count();
+                    (tx_ids, input_notes_count, output_notes_count, unauth_notes_count)
+                },
+            );
+        Span::current().set_attribute("transactions.ids", tx_ids);
+        Span::current().set_attribute("transactions.input_notes.count", input_notes_count);
+        Span::current().set_attribute("transactions.output_notes.count", output_notes_count);
+        Span::current()
+            .set_attribute("transactions.unauthenticated_notes.count", unauth_notes_count);
     }
 }
 
diff --git a/crates/block-producer/src/block_builder/mod.rs b/crates/block-producer/src/block_builder/mod.rs
index 177d59dbf..15fd141ff 100644
--- a/crates/block-producer/src/block_builder/mod.rs
+++ b/crates/block-producer/src/block_builder/mod.rs
@@ -1,4 +1,5 @@
-use std::ops::Range;
+use std::ops::{Deref, Range};
+use std::sync::Arc;
 
 use futures::FutureExt;
 use futures::never::Never;
@@ -8,6 +9,7 @@ use miden_objects::MIN_PROOF_SECURITY_LEVEL;
 use miden_objects::batch::ProvenBatch;
 use miden_objects::block::{BlockInputs, BlockNumber, ProposedBlock, ProvenBlock};
 use miden_objects::note::NoteHeader;
+use miden_objects::transaction::TransactionHeader;
 use miden_remote_prover_client::remote_prover::block_prover::RemoteBlockProver;
 use rand::Rng;
 use tokio::time::Duration;
@@ -104,9 +106,10 @@ impl BlockBuilder {
     async fn build_block(&self, mempool: &SharedMempool) {
         use futures::TryFutureExt;
 
-        Self::select_block(mempool)
-            .inspect(SelectedBlock::inject_telemetry)
-            .then(|selected| self.get_block_inputs(selected))
+        let selected = Self::select_block(mempool).inspect(SelectedBlock::inject_telemetry).await;
+        let block_num = selected.block_number;
+
+        self.get_block_inputs(selected)
             .inspect_ok(BlockBatchesAndInputs::inject_telemetry)
             .and_then(|inputs| self.propose_block(inputs))
             .inspect_ok(ProposedBlock::inject_telemetry)
@@ -118,7 +121,7 @@ impl BlockBuilder {
             .and_then(|proven_block| self.commit_block(mempool, proven_block))
             // Handle errors by propagating the error to the root span and rolling back the block.
             .inspect_err(|err| Span::current().set_error(err))
-            .or_else(|_err| self.rollback_block(mempool).never_error())
+            .or_else(|_err| self.rollback_block(mempool, block_num).never_error())
             // All errors were handled and discarded above, so this is just type juggling
             // to drop the result.
             .unwrap_or_else(|_: Never| ())
@@ -169,9 +172,12 @@ impl BlockBuilder {
                 .cloned()
                 .filter_map(|note| note.header().map(NoteHeader::id))
         });
-        let block_references_iter = batch_iter.clone().map(ProvenBatch::reference_block_num);
-        let account_ids_iter = batch_iter.clone().flat_map(ProvenBatch::updated_accounts);
-        let created_nullifiers_iter = batch_iter.flat_map(ProvenBatch::created_nullifiers);
+        let block_references_iter =
+            batch_iter.clone().map(Deref::deref).map(ProvenBatch::reference_block_num);
+        let account_ids_iter =
+            batch_iter.clone().map(Deref::deref).flat_map(ProvenBatch::updated_accounts);
+        let created_nullifiers_iter =
+            batch_iter.map(Deref::deref).flat_map(ProvenBatch::created_nullifiers);
 
         let inputs = self
             .store
@@ -193,6 +199,7 @@ impl BlockBuilder {
         batches_inputs: BlockBatchesAndInputs,
     ) -> Result<ProposedBlock, BuildBlockError> {
         let BlockBatchesAndInputs { batches, inputs } = batches_inputs;
+        let batches = batches.into_iter().map(Arc::unwrap_or_clone).collect();
 
         let proposed_block =
             ProposedBlock::new(inputs, batches).map_err(BuildBlockError::ProposeBlockFailed)?;
@@ -236,8 +243,8 @@ impl BlockBuilder {
     }
 
     #[instrument(target = COMPONENT, name = "block_builder.rollback_block", skip_all)]
-    async fn rollback_block(&self, mempool: &SharedMempool) {
-        mempool.lock().await.rollback_block();
+    async fn rollback_block(&self, mempool: &SharedMempool, block: BlockNumber) {
+        mempool.lock().await.rollback_block(block);
     }
 
     #[instrument(target = COMPONENT, name = "block_builder.simulate_proving", skip_all)]
@@ -270,7 +277,7 @@ impl BlockBuilder {
 /// telemetry in-between the selection and fetching the required [`BlockInputs`].
 struct SelectedBlock {
     block_number: BlockNumber,
-    batches: Vec<ProvenBatch>,
+    batches: Vec<Arc<ProvenBatch>>,
 }
 
 impl TelemetryInjectorExt for SelectedBlock {
@@ -278,10 +285,18 @@ impl TelemetryInjectorExt for SelectedBlock {
         let span = Span::current();
         span.set_attribute("block.number", self.block_number);
         span.set_attribute("block.batches.count", self.batches.len() as u32);
-        let tx_count = self
-            .batches
-            .iter()
-            .fold(0, |acc, batch| acc + batch.transactions().as_slice().len());
+        // Accumulate all telemetry based on batches.
+        let (batch_ids, tx_ids, tx_count) = self.batches.iter().fold(
+            (Vec::new(), Vec::new(), 0),
+            |(mut batch_ids, mut tx_ids, tx_count), batch| {
+                let tx_count = tx_count + batch.transactions().as_slice().len();
+                tx_ids.extend(batch.transactions().as_slice().iter().map(TransactionHeader::id));
+                batch_ids.push(batch.id());
+                (batch_ids, tx_ids, tx_count)
+            },
+        );
+        span.set_attribute("block.batch.ids", batch_ids);
+        span.set_attribute("block.transactions.ids", tx_ids);
         span.set_attribute("block.transactions.count", tx_count);
     }
 }
@@ -289,7 +304,7 @@ impl TelemetryInjectorExt for SelectedBlock {
 /// A wrapper around the inputs needed to build a [`ProposedBlock`], primarily used to be able to
 /// inject telemetry in-between fetching block inputs and proposing the block.
 struct BlockBatchesAndInputs {
-    batches: Vec<ProvenBatch>,
+    batches: Vec<Arc<ProvenBatch>>,
     inputs: BlockInputs,
 }
 
diff --git a/crates/block-producer/src/domain/transaction.rs b/crates/block-producer/src/domain/transaction.rs
index 43c7daed9..26d62def3 100644
--- a/crates/block-producer/src/domain/transaction.rs
+++ b/crates/block-producer/src/domain/transaction.rs
@@ -1,3 +1,5 @@
+#![allow(dead_code, reason = "WIP: mempoool refactor")]
+
 use std::collections::HashSet;
 use std::sync::Arc;
 
@@ -45,7 +47,7 @@ impl AuthenticatedTransaction {
     /// # Errors
     ///
     /// Returns an error if any of the transaction's nullifiers are marked as spent by the inputs.
-    pub fn new(
+    pub fn new_unchecked(
         tx: ProvenTransaction,
         inputs: TransactionInputs,
     ) -> Result<AuthenticatedTransaction, VerifyTxError> {
@@ -123,7 +125,6 @@ impl AuthenticatedTransaction {
         Arc::clone(&self.inner)
     }
 
-    #[cfg(test)]
     pub fn raw_proven_transaction(&self) -> &ProvenTransaction {
         &self.inner
     }
@@ -154,7 +155,7 @@ impl AuthenticatedTransaction {
             current_block_height: 0.into(),
         };
         // SAFETY: nullifiers were set to None aka are definitely unspent.
-        Self::new(inner, inputs).unwrap()
+        Self::new_unchecked(inner, inputs).unwrap()
     }
 
     /// Overrides the authentication height with the given value.
diff --git a/crates/block-producer/src/errors.rs b/crates/block-producer/src/errors.rs
index af0654caf..8819b72a5 100644
--- a/crates/block-producer/src/errors.rs
+++ b/crates/block-producer/src/errors.rs
@@ -1,8 +1,5 @@
 use miden_block_prover::ProvenBlockError;
-use miden_node_proto::errors::ConversionError;
-use miden_node_proto::generated::errors::SubmitProvenTransactionError;
-use miden_node_utils::ErrorReport;
-use miden_node_utils::formatting::format_opt;
+use miden_node_proto::errors::{ConversionError, GrpcError};
 use miden_objects::account::AccountId;
 use miden_objects::block::BlockNumber;
 use miden_objects::note::{NoteId, Nullifier};
@@ -55,10 +52,12 @@ pub enum VerifyTxError {
     OutputNotesAlreadyExist(Vec<NoteId>),
 
     /// The account's initial commitment did not match the current account's commitment
-    #[error("transaction's initial state commitment {tx_initial_account_commitment} does not match the account's current value of {}", format_opt(.current_account_commitment.as_ref()))]
+    #[error(
+        "transaction's initial state commitment {tx_initial_account_commitment} does not match the account's current value of {current_account_commitment}"
+    )]
     IncorrectAccountInitialCommitment {
         tx_initial_account_commitment: Word,
-        current_account_commitment: Option<Word>,
+        current_account_commitment: Word,
     },
 
     /// Failed to retrieve transaction inputs from the store
@@ -76,14 +75,40 @@ pub enum VerifyTxError {
 // Transaction adding errors
 // =================================================================================================
 
-#[derive(Debug, Error)]
+#[derive(Debug, Error, GrpcError)]
 pub enum AddTransactionError {
-    #[error("transaction verification failed")]
-    VerificationFailed(#[from] VerifyTxError),
+    #[error(
+        "input notes with given nullifiers were already consumed by another transaction: {0:?}"
+    )]
+    InputNotesAlreadyConsumed(Vec<Nullifier>),
+
+    #[error(
+        "unauthenticated transaction notes were not found in the store or in outputs of in-flight transactions: {0:?}"
+    )]
+    UnauthenticatedNotesNotFound(Vec<NoteId>),
+
+    #[error("output note IDs already used: {0:?}")]
+    OutputNotesAlreadyExist(Vec<NoteId>),
+
+    #[error(
+        "transaction's initial state commitment {tx_initial_account_commitment} does not match the account's current value of {current_account_commitment}"
+    )]
+    IncorrectAccountInitialCommitment {
+        tx_initial_account_commitment: Word,
+        current_account_commitment: Word,
+    },
+
+    #[error("failed to retrieve transaction inputs from the store")]
+    #[grpc(internal)]
+    StoreConnectionFailed(#[from] StoreError),
+
+    #[error("invalid transaction proof error for transaction: {0}")]
+    InvalidTransactionProof(TransactionId),
 
     #[error(
         "transaction input data from block {input_block} is rejected as stale because it is older than the limit of {stale_limit}"
     )]
+    #[grpc(internal)]
     StaleInputs {
         input_block: BlockNumber,
         stale_limit: BlockNumber,
@@ -101,79 +126,43 @@ pub enum AddTransactionError {
     },
 }
 
-// Error codes for gRPC Status::details
-// =================================================================================================
-
-impl AddTransactionError {
-    fn api_error(&self) -> SubmitProvenTransactionError {
-        match self {
-            AddTransactionError::VerificationFailed(tx_verify_error) => match tx_verify_error {
-                VerifyTxError::InputNotesAlreadyConsumed(_) => {
-                    SubmitProvenTransactionError::InputNotesAlreadyConsumed
-                },
-                VerifyTxError::StoreConnectionFailed(_) => {
-                    SubmitProvenTransactionError::InternalError
-                },
-                VerifyTxError::UnauthenticatedNotesNotFound(_) => {
-                    SubmitProvenTransactionError::UnauthenticatedNotesNotFound
-                },
-                VerifyTxError::OutputNotesAlreadyExist(_) => {
-                    SubmitProvenTransactionError::OutputNotesAlreadyExist
-                },
-                VerifyTxError::IncorrectAccountInitialCommitment { .. } => {
-                    SubmitProvenTransactionError::IncorrectAccountInitialCommitment
-                },
-                VerifyTxError::InvalidTransactionProof(_) => {
-                    SubmitProvenTransactionError::InvalidTransactionProof
-                },
+impl From<VerifyTxError> for AddTransactionError {
+    fn from(err: VerifyTxError) -> Self {
+        match err {
+            VerifyTxError::InputNotesAlreadyConsumed(nullifiers) => {
+                Self::InputNotesAlreadyConsumed(nullifiers)
+            },
+            VerifyTxError::UnauthenticatedNotesNotFound(note_ids) => {
+                Self::UnauthenticatedNotesNotFound(note_ids)
             },
-            AddTransactionError::StaleInputs { .. } => SubmitProvenTransactionError::InternalError,
-            AddTransactionError::Expired { .. } => SubmitProvenTransactionError::TransactionExpired,
-            AddTransactionError::TransactionDeserializationFailed(_) => {
-                SubmitProvenTransactionError::DeserializationFailed
+            VerifyTxError::OutputNotesAlreadyExist(note_ids) => {
+                Self::OutputNotesAlreadyExist(note_ids)
             },
+            VerifyTxError::IncorrectAccountInitialCommitment {
+                tx_initial_account_commitment,
+                current_account_commitment,
+            } => Self::IncorrectAccountInitialCommitment {
+                tx_initial_account_commitment,
+                current_account_commitment,
+            },
+            VerifyTxError::StoreConnectionFailed(store_err) => {
+                Self::StoreConnectionFailed(store_err)
+            },
+            VerifyTxError::InvalidTransactionProof(tx_id) => Self::InvalidTransactionProof(tx_id),
         }
     }
 }
 
-impl From<AddTransactionError> for tonic::Status {
-    fn from(value: AddTransactionError) -> Self {
-        let api_error = value.api_error();
-
-        let message = if api_error.is_internal() {
-            "Internal error".to_owned()
-        } else {
-            value.as_report()
-        };
-
-        tonic::Status::with_details(
-            api_error.tonic_code(),
-            message,
-            // Details are serialized as a single byte containing the error code value.
-            // Clients can decode this by reading the first byte of the details field.
-            // Example: details[0] will contain the SubmitProvenTransactionError enum value (0-8)
-            vec![api_error.api_code()].into(),
-        )
-    }
-}
-
 // Submit proven batch by user errors
 // =================================================================================================
 
-#[derive(Debug, Error)]
+#[derive(Debug, Error, GrpcError)]
+#[grpc(internal)]
 pub enum SubmitProvenBatchError {
     #[error("batch deserialization failed")]
     Deserialization(#[source] miden_objects::utils::DeserializationError),
 }
 
-impl From<SubmitProvenBatchError> for tonic::Status {
-    fn from(value: SubmitProvenBatchError) -> Self {
-        match value {
-            SubmitProvenBatchError::Deserialization(_) => Self::invalid_argument(value.as_report()),
-        }
-    }
-}
-
 // Batch building errors
 // =================================================================================================
 
@@ -236,7 +225,7 @@ pub enum StoreError {
     #[error("account Id prefix already exists: {0}")]
     DuplicateAccountIdPrefix(AccountId),
     #[error("gRPC client error")]
-    GrpcClientError(Box<tonic::Status>),
+    GrpcClientError(#[from] Box<tonic::Status>),
     #[error("malformed response from store: {0}")]
     MalformedResponse(String),
     #[error("failed to parse response")]
diff --git a/crates/block-producer/src/errors_test.rs b/crates/block-producer/src/errors_test.rs
deleted file mode 100644
index 7f442bdf9..000000000
--- a/crates/block-producer/src/errors_test.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-#[cfg(test)]
-mod tests {
-    use miden_node_proto::generated::errors::SubmitProvenTransactionError;
-    use miden_objects::Word;
-    use miden_objects::block::BlockNumber;
-    use miden_objects::note::{NoteId, Nullifier};
-    use miden_tx::utils::DeserializationError;
-
-    use crate::errors::{AddTransactionError, VerifyTxError};
-
-    #[rstest::rstest]
-    #[test]
-    #[case::inputs_already_consumed_error(
-        AddTransactionError::VerificationFailed(
-            VerifyTxError::InputNotesAlreadyConsumed(vec![Nullifier::dummy(1)])
-        ),
-        SubmitProvenTransactionError::InputNotesAlreadyConsumed,
-        "verification failed",
-    )]
-    #[case::unauthenticated_notes_not_found_error(
-        AddTransactionError::VerificationFailed(
-            VerifyTxError::UnauthenticatedNotesNotFound(vec![NoteId::new(Word::default(), Word::default())])
-        ),
-        SubmitProvenTransactionError::UnauthenticatedNotesNotFound,
-        "verification failed",
-    )]
-    #[case::stale_inputs_error(
-        AddTransactionError::StaleInputs { input_block: BlockNumber::from(100), stale_limit: BlockNumber::from(150) },
-        SubmitProvenTransactionError::InternalError,
-        "Internal error",
-    )]
-    #[case::expired_error(
-        AddTransactionError::Expired { expired_at: BlockNumber::from(200), limit: BlockNumber::from(250) },
-        SubmitProvenTransactionError::TransactionExpired,
-        "expired",
-    )]
-    #[case::transaction_deserialization_failed_error(
-        AddTransactionError::TransactionDeserializationFailed(DeserializationError::InvalidValue("test error".to_string())),
-        SubmitProvenTransactionError::DeserializationFailed,
-        "deserialization",
-    )]
-    fn submit_transaction_error_mapping(
-        #[case] uut: AddTransactionError,
-        #[case] expected: SubmitProvenTransactionError,
-        #[case] message: &str,
-    ) {
-        let status = tonic::Status::from(uut);
-        assert_eq!(status.code(), expected.tonic_code());
-        assert!(status.message().contains(message));
-
-        let api_code = match status.details() {
-            &[single] => single,
-            other => panic!(
-                "Details should contain exactly one byte for the api error code, but got {other:?}"
-            ),
-        };
-        assert_eq!(api_code, expected.api_code());
-    }
-}
diff --git a/crates/block-producer/src/lib.rs b/crates/block-producer/src/lib.rs
index 81482ea08..503e29cc1 100644
--- a/crates/block-producer/src/lib.rs
+++ b/crates/block-producer/src/lib.rs
@@ -15,9 +15,6 @@ pub mod errors;
 #[cfg(not(feature = "testing"))]
 mod errors;
 
-#[cfg(test)]
-mod errors_test;
-
 pub mod server;
 pub use server::BlockProducer;
 
@@ -40,7 +37,7 @@ const SERVER_NUM_BATCH_BUILDERS: NonZeroUsize = NonZeroUsize::new(2).unwrap();
 ///
 /// This determines the grace period incoming transactions have between fetching their input from
 /// the store and verification in the mempool.
-const SERVER_MEMPOOL_STATE_RETENTION: usize = 5;
+const SERVER_MEMPOOL_STATE_RETENTION: NonZeroUsize = NonZeroUsize::new(5).unwrap();
 
 /// Transactions are rejected by the mempool if there is less than this amount of blocks between the
 /// chain tip and the transaction's expiration block.
diff --git a/crates/block-producer/src/mempool/batch_graph.rs b/crates/block-producer/src/mempool/batch_graph.rs
deleted file mode 100644
index 1c4730e5d..000000000
--- a/crates/block-producer/src/mempool/batch_graph.rs
+++ /dev/null
@@ -1,379 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet};
-
-use miden_objects::account::AccountId;
-use miden_objects::batch::{BatchId, ProvenBatch};
-use miden_objects::transaction::TransactionId;
-
-use super::graph::{DependencyGraph, GraphError};
-use super::{BlockBudget, BudgetStatus};
-
-// BATCH GRAPH
-// ================================================================================================
-
-/// Tracks the dependencies between batches, transactions and their parents.
-///
-/// Batches are inserted with their transaction and parent transaction sets which defines the edges
-/// of the dependency graph. Batches are initially inserted in a pending state while we wait on
-/// their proofs to be generated. The dependencies are still tracked in this state.
-///
-/// Batches can then be promoted to ready by [submitting their proofs](Self::submit_proof) once
-/// available. Proven batches are considered for inclusion in blocks once _all_ parent batches have
-/// been selected.
-///
-/// Committed batches (i.e. included in blocks) may be [pruned](Self::prune_committed) from the
-/// graph to bound the graph's size.
-///
-/// Batches may also be outright [purged](Self::remove_batches) from the graph. This is useful for
-/// batches which may have become invalid due to external considerations e.g. expired transactions.
-///
-/// # Batch lifecycle
-/// ```text
-///                           │                           
-///                     insert│                           
-///                     ┌─────▼─────┐                     
-///                     │  pending  ┼────┐                
-///                     └─────┬─────┘    │                
-///                           │          │                
-///               submit_proof│          │                
-///                     ┌─────▼─────┐    │                
-///                     │   proved  ┼────┤                
-///                     └─────┬─────┘    │                
-///                           │          │                
-///               select_block│          │                
-///                     ┌─────▼─────┐    │                
-///                     │ committed ┼────┤                
-///                     └─────┬─────┘    │                
-///                           │          │                
-///            prune_committed│          │remove_batches
-///                     ┌─────▼─────┐    │                
-///                     │  <null>   ◄────┘                
-///                     └───────────┘                     
-/// ```
-#[derive(Default, Debug, Clone, PartialEq)]
-pub struct BatchGraph {
-    /// Tracks the interdependencies between batches.
-    inner: DependencyGraph<BatchId, ProvenBatch>,
-
-    /// Maps each transaction to its batch, allowing for reverse lookups.
-    ///
-    /// Incoming batches are defined entirely in terms of transactions, including parent edges.
-    /// This let's us transform these parent transactions into the relevant parent batches.
-    transactions: BTreeMap<TransactionId, BatchId>,
-
-    /// Maps each batch to its transaction set.
-    ///
-    /// Required because the dependency graph is defined in terms of batches. This let's us
-    /// translate between batches and their transactions when required.
-    batches: BTreeMap<BatchId, Vec<TransactionId>>,
-}
-
-#[derive(thiserror::Error, Debug, Clone, PartialEq, Eq)]
-pub enum BatchInsertError {
-    #[error("Transactions are already in the graph: {0:?}")]
-    DuplicateTransactions(BTreeSet<TransactionId>),
-    #[error("Unknown parent transaction {0}")]
-    UnknownParentTransaction(TransactionId),
-    #[error(transparent)]
-    GraphError(#[from] GraphError<BatchId>),
-}
-
-impl BatchGraph {
-    /// Inserts a new batch into the graph.
-    ///
-    /// Parents are the transactions on which the given transactions have a direct dependency. This
-    /// includes transactions within the same batch i.e. a transaction and parent transaction may
-    /// both be in this batch.
-    ///
-    /// # Returns
-    ///
-    /// The new batch's ID.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if:
-    ///   - the batch ID is already in use
-    ///   - any transactions are already in the graph
-    ///   - any parent transactions are _not_ in the graph
-    pub fn insert(
-        &mut self,
-        transactions: Vec<(TransactionId, AccountId)>,
-        mut parents: BTreeSet<TransactionId>,
-    ) -> Result<BatchId, BatchInsertError> {
-        let duplicates = transactions
-            .iter()
-            .filter_map(|(tx, _)| self.transactions.contains_key(tx).then_some(tx))
-            .copied()
-            .collect::<BTreeSet<_>>();
-        if !duplicates.is_empty() {
-            return Err(BatchInsertError::DuplicateTransactions(duplicates));
-        }
-
-        // Reverse lookup parent batch IDs. Take care to allow for parent transactions within this
-        // batch i.e. internal dependencies.
-        for (tx, _) in &transactions {
-            parents.remove(tx);
-        }
-        let parent_batches = parents
-            .into_iter()
-            .map(|tx| {
-                self.transactions
-                    .get(&tx)
-                    .copied()
-                    .ok_or(BatchInsertError::UnknownParentTransaction(tx))
-            })
-            .collect::<Result<_, _>>()?;
-
-        let id = BatchId::from_ids(transactions.iter().copied());
-        self.inner.insert_pending(id, parent_batches)?;
-
-        for (tx, _) in transactions.iter().copied() {
-            self.transactions.insert(tx, id);
-        }
-
-        self.batches.insert(id, transactions.into_iter().map(|(tx, _)| tx).collect());
-
-        Ok(id)
-    }
-
-    /// Removes the batches and their descendants from the graph.
-    ///
-    /// # Returns
-    ///
-    /// Returns all removed batches and their transactions.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if any of the batches are not currently in the graph.
-    pub fn remove_batches(
-        &mut self,
-        batch_ids: BTreeSet<BatchId>,
-    ) -> Result<BTreeMap<BatchId, Vec<TransactionId>>, GraphError<BatchId>> {
-        // This returns all descendent batches as well.
-        let batch_ids = self.inner.purge_subgraphs(batch_ids)?;
-
-        // SAFETY: These batches must all have been inserted since they are emitted from the inner
-        // dependency graph, and therefore must all be in the batches mapping.
-        let batches = batch_ids
-            .into_iter()
-            .map(|batch_id| {
-                (batch_id, self.batches.remove(&batch_id).expect("batch should be removed"))
-            })
-            .collect::<BTreeMap<_, _>>();
-
-        for tx in batches.values().flatten() {
-            self.transactions.remove(tx);
-        }
-
-        Ok(batches)
-    }
-
-    /// Remove all batches associated with the given transactions (and their descendents).
-    ///
-    /// Transactions not currently associated with a batch are allowed, but have no impact.
-    ///
-    /// # Returns
-    ///
-    /// Returns all removed batches and their transactions.
-    ///
-    /// Unlike [`remove_batches`](Self::remove_batches), this has no error condition as batches are
-    /// derived internally.
-    pub fn remove_batches_with_transactions<'a>(
-        &mut self,
-        txs: impl Iterator<Item = &'a TransactionId>,
-    ) -> BTreeMap<BatchId, Vec<TransactionId>> {
-        let batches = txs.filter_map(|tx| self.transactions.get(tx)).copied().collect();
-
-        self.remove_batches(batches)
-            .expect("batches must exist as they have been taken from internal map")
-    }
-
-    /// Removes the set of committed batches from the graph.
-    ///
-    /// The batches _must_ have been previously selected for inclusion in a block using
-    /// [`select_block`](Self::select_block). This is intended for limiting the size of the graph by
-    /// culling committed data.
-    ///
-    /// # Returns
-    ///
-    /// Returns the transactions of the pruned batches.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if
-    ///   - any batch was not previously selected for inclusion in a block
-    ///   - any batch is unknown
-    ///   - any parent batch would be left dangling in the graph
-    ///
-    /// The last point implies that batches should be removed in block order.
-    pub fn prune_committed(
-        &mut self,
-        batch_ids: &BTreeSet<BatchId>,
-    ) -> Result<Vec<TransactionId>, GraphError<BatchId>> {
-        // This clone could be elided by moving this call to the end. This would lose the atomic
-        // property of this method though its unclear what value (if any) that has.
-        self.inner.prune_processed(batch_ids.clone())?;
-        let mut transactions = Vec::new();
-
-        for batch_id in batch_ids {
-            transactions.extend(self.batches.remove(batch_id).into_iter().flatten());
-        }
-
-        for tx in &transactions {
-            self.transactions.remove(tx);
-        }
-
-        Ok(transactions)
-    }
-
-    /// Submits a proof for the given batch, promoting it from pending to ready for inclusion in a
-    /// block once all its parents have themselves been included.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if the batch is not in the graph or if it was already previously proven.
-    pub fn submit_proof(&mut self, batch: ProvenBatch) -> Result<(), GraphError<BatchId>> {
-        self.inner.promote_pending(batch.id(), batch)
-    }
-
-    /// Selects the next set of batches ready for inclusion in a block while adhering to the given
-    /// budget.
-    ///
-    /// Note that batch order should be maintained to allow for inter-batch dependencies to be
-    /// correctly resolved.
-    pub fn select_block(&mut self, mut budget: BlockBudget) -> Vec<ProvenBatch> {
-        let mut batches = Vec::with_capacity(budget.batches);
-
-        while let Some(batch_id) = self.inner.roots().first().copied() {
-            // SAFETY: Since it was a root batch, it must definitely have a processed batch
-            // associated with it.
-            let batch = self.inner.get(&batch_id).expect("root should be in graph");
-
-            // Adhere to block's budget.
-            if budget.check_then_subtract(batch) == BudgetStatus::Exceeded {
-                break;
-            }
-
-            // Clone is required to avoid multiple borrows of self. We delay this clone until after
-            // the budget check, which is why this looks so out of place.
-            let batch = batch.clone();
-
-            // SAFETY: This is definitely a root since we just selected it from the set of roots.
-            self.inner.process_root(batch_id).expect("root should be processed");
-
-            batches.push(batch);
-        }
-
-        batches
-    }
-
-    /// Returns `true` if the graph contains the given batch.
-    pub fn contains(&self, id: &BatchId) -> bool {
-        self.batches.contains_key(id)
-    }
-
-    /// Returns the transactions associated with the given batch, otherwise returns `None` if the
-    /// batch does not exist.
-    pub fn get_transactions(&self, id: &BatchId) -> Option<&[TransactionId]> {
-        self.batches.get(id).map(Vec::as_slice)
-    }
-
-    // Amount of inflight batches without a submitted proof.
-    pub fn num_pending(&self) -> usize {
-        self.inner.num_pending()
-    }
-
-    // Amount of inflight batches with a submitted proof.
-    pub fn num_proven(&self) -> usize {
-        self.inner.num_processed()
-    }
-
-    // The total number of batches in the graph.
-    pub fn len(&self) -> usize {
-        self.inner.len()
-    }
-
-    /// The amount of batches which are root nodes.
-    pub fn num_roots(&self) -> usize {
-        self.inner.num_roots()
-    }
-}
-
-#[cfg(any(test, doctest))]
-mod tests {
-    use super::*;
-    use crate::test_utils::Random;
-
-    // INSERT TESTS
-    // ================================================================================================
-
-    #[test]
-    fn insert_rejects_duplicate_transactions() {
-        let mut rng = Random::with_random_seed();
-        let tx_dup = (rng.draw_tx_id(), rng.draw_account_id());
-        let tx_non_dup = (rng.draw_tx_id(), rng.draw_account_id());
-
-        let mut uut = BatchGraph::default();
-
-        uut.insert(vec![tx_dup], BTreeSet::default()).unwrap();
-        let err = uut.insert(vec![tx_dup, tx_non_dup], BTreeSet::default()).unwrap_err();
-        let expected = BatchInsertError::DuplicateTransactions([tx_dup.0].into());
-
-        assert_eq!(err, expected);
-    }
-
-    #[test]
-    fn insert_rejects_missing_parents() {
-        let mut rng = Random::with_random_seed();
-        let tx = (rng.draw_tx_id(), rng.draw_account_id());
-        let missing = (rng.draw_tx_id(), rng.draw_account_id());
-
-        let mut uut = BatchGraph::default();
-
-        let err = uut.insert(vec![tx], [missing.0].into()).unwrap_err();
-        let expected = BatchInsertError::UnknownParentTransaction(missing.0);
-
-        assert_eq!(err, expected);
-    }
-
-    #[test]
-    fn insert_with_internal_parent_succeeds() {
-        // Ensure that a batch with internal dependencies can be inserted.
-        let mut rng = Random::with_random_seed();
-        let parent = (rng.draw_tx_id(), rng.draw_account_id());
-        let child = (rng.draw_tx_id(), rng.draw_account_id());
-
-        let mut uut = BatchGraph::default();
-        uut.insert(vec![parent, child], [parent.0].into()).unwrap();
-    }
-
-    // PURGE_SUBGRAPHS TESTS
-    // ================================================================================================
-
-    #[test]
-    fn purge_subgraphs_returns_all_purged_transaction_sets() {
-        // Ensure that purge_subgraphs returns both parent and child batches when the parent is
-        // pruned. Further ensure that a disjoint batch is not pruned.
-        let mut rng = Random::with_random_seed();
-        let parent_batch_txs =
-            (0..5).map(|_| (rng.draw_tx_id(), rng.draw_account_id())).collect::<Vec<_>>();
-        let child_batch_txs =
-            (0..5).map(|_| (rng.draw_tx_id(), rng.draw_account_id())).collect::<Vec<_>>();
-        let disjoint_batch_txs =
-            (0..5).map(|_| (rng.draw_tx_id(), rng.draw_account_id())).collect();
-
-        let mut uut = BatchGraph::default();
-        let parent_batch_id = uut.insert(parent_batch_txs.clone(), BTreeSet::default()).unwrap();
-        let child_batch_id =
-            uut.insert(child_batch_txs.clone(), [parent_batch_txs[0].0].into()).unwrap();
-        uut.insert(disjoint_batch_txs, BTreeSet::default()).unwrap();
-
-        let result = uut.remove_batches([parent_batch_id].into()).unwrap();
-        let expected = [
-            (parent_batch_id, parent_batch_txs.into_iter().map(|(tx, _)| tx).collect()),
-            (child_batch_id, child_batch_txs.into_iter().map(|(tx, _)| tx).collect()),
-        ]
-        .into();
-
-        assert_eq!(result, expected);
-    }
-}
diff --git a/crates/block-producer/src/mempool/budget.rs b/crates/block-producer/src/mempool/budget.rs
new file mode 100644
index 000000000..05a743284
--- /dev/null
+++ b/crates/block-producer/src/mempool/budget.rs
@@ -0,0 +1,102 @@
+use miden_objects::batch::ProvenBatch;
+use miden_objects::{
+    MAX_ACCOUNTS_PER_BATCH,
+    MAX_INPUT_NOTES_PER_BATCH,
+    MAX_OUTPUT_NOTES_PER_BATCH,
+};
+
+use crate::domain::transaction::AuthenticatedTransaction;
+use crate::{DEFAULT_MAX_BATCHES_PER_BLOCK, DEFAULT_MAX_TXS_PER_BATCH};
+
+/// Constraints placed on the batches proposed by the [`Mempool`](super::Mempool).
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct BatchBudget {
+    /// Maximum number of transactions allowed in a batch.
+    pub transactions: usize,
+    /// Maximum number of input notes allowed.
+    pub input_notes: usize,
+    /// Maximum number of output notes allowed.
+    pub output_notes: usize,
+    /// Maximum number of updated accounts.
+    pub accounts: usize,
+}
+
+/// Constraints placed on the blocks proposed by the [`Mempool`](super::Mempool).
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct BlockBudget {
+    /// Maximum number of batches allowed in a block.
+    pub batches: usize,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub(crate) enum BudgetStatus {
+    /// The operation remained within the budget.
+    WithinScope,
+    /// The operation exceeded the budget.
+    Exceeded,
+}
+
+impl Default for BatchBudget {
+    fn default() -> Self {
+        Self {
+            transactions: DEFAULT_MAX_TXS_PER_BATCH,
+            input_notes: MAX_INPUT_NOTES_PER_BATCH,
+            output_notes: MAX_OUTPUT_NOTES_PER_BATCH,
+            accounts: MAX_ACCOUNTS_PER_BATCH,
+        }
+    }
+}
+
+impl Default for BlockBudget {
+    fn default() -> Self {
+        Self { batches: DEFAULT_MAX_BATCHES_PER_BLOCK }
+    }
+}
+
+impl BatchBudget {
+    /// Attempts to consume the transaction's resources from the budget.
+    ///
+    /// Returns [`BudgetStatus::Exceeded`] if the transaction would exceed the remaining budget,
+    /// otherwise returns [`BudgetStatus::Ok`] and subtracts the resources from the budget.
+    #[must_use]
+    pub(crate) fn check_then_subtract(&mut self, tx: &AuthenticatedTransaction) -> BudgetStatus {
+        // This type assertion reminds us to update the account check if we ever support
+        // multiple account updates per tx.
+        pub(crate) const ACCOUNT_UPDATES_PER_TX: usize = 1;
+        let _: miden_objects::account::AccountId = tx.account_update().account_id();
+
+        let output_notes = tx.output_note_count();
+        let input_notes = tx.input_note_count();
+
+        if self.transactions == 0
+            || self.accounts < ACCOUNT_UPDATES_PER_TX
+            || self.input_notes < input_notes
+            || self.output_notes < output_notes
+        {
+            return BudgetStatus::Exceeded;
+        }
+
+        self.transactions -= 1;
+        self.accounts -= ACCOUNT_UPDATES_PER_TX;
+        self.input_notes -= input_notes;
+        self.output_notes -= output_notes;
+
+        BudgetStatus::WithinScope
+    }
+}
+
+impl BlockBudget {
+    /// Attempts to consume the batch's resources from the budget.
+    ///
+    /// Returns [`BudgetStatus::Exceeded`] if the batch would exceed the remaining budget,
+    /// otherwise returns [`BudgetStatus::Ok`].
+    #[must_use]
+    pub(crate) fn check_then_subtract(&mut self, _batch: &ProvenBatch) -> BudgetStatus {
+        if self.batches == 0 {
+            BudgetStatus::Exceeded
+        } else {
+            self.batches -= 1;
+            BudgetStatus::WithinScope
+        }
+    }
+}
diff --git a/crates/block-producer/src/mempool/graph/mod.rs b/crates/block-producer/src/mempool/graph/mod.rs
deleted file mode 100644
index 956a8d5f8..000000000
--- a/crates/block-producer/src/mempool/graph/mod.rs
+++ /dev/null
@@ -1,437 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet};
-use std::fmt::{Debug, Display};
-
-#[cfg(test)]
-mod tests;
-
-// DEPENDENCY GRAPH
-// ================================================================================================
-
-/// A dependency graph structure where nodes are inserted, and then made available for processing
-/// once all parent nodes have been processed.
-///
-/// Forms the basis of our transaction and batch dependency graphs.
-///
-/// # Node lifecycle
-/// ```text
-///                                    │
-///                                    │
-///                      insert_pending│
-///                              ┌─────▼─────┐
-///                              │  pending  │────┐
-///                              └─────┬─────┘    │
-///                                    │          │
-///                     promote_pending│          │
-///                              ┌─────▼─────┐    │
-///                   ┌──────────► in queue  │────│
-///                   │          └─────┬─────┘    │
-///   revert_processed│                │          │
-///                   │    process_root│          │
-///                   │          ┌─────▼─────┐    │
-///                   └──────────┼ processed │────│
-///                              └─────┬─────┘    │
-///                                    │          │
-///                     prune_processed│          │purge_subgraphs
-///                              ┌─────▼─────┐    │
-///                              │  <null>   ◄────┘
-///                              └───────────┘
-/// ```
-#[derive(Clone, PartialEq, Eq)]
-pub struct DependencyGraph<K, V> {
-    /// Node's who's data is still pending.
-    pending: BTreeSet<K>,
-
-    /// Each node's data.
-    vertices: BTreeMap<K, V>,
-
-    /// Each node's parents. This is redundant with `children`,
-    /// but we require both for efficient lookups.
-    parents: BTreeMap<K, BTreeSet<K>>,
-
-    /// Each node's children. This is redundant with `parents`,
-    /// but we require both for efficient lookups.
-    children: BTreeMap<K, BTreeSet<K>>,
-
-    /// Nodes that are available to process next.
-    ///
-    /// Effectively this is the set of nodes which are
-    /// unprocessed and whose parent's _are_ all processed.
-    roots: BTreeSet<K>,
-
-    /// Set of nodes that are already processed.
-    processed: BTreeSet<K>,
-}
-
-impl<K, V> Debug for DependencyGraph<K, V>
-where
-    K: Debug,
-{
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("DependencyGraph")
-            .field("pending", &self.pending)
-            .field("vertices", &self.vertices.keys())
-            .field("processed", &self.processed)
-            .field("roots", &self.roots)
-            .field("parents", &self.parents)
-            .field("children", &self.children)
-            .finish()
-    }
-}
-
-#[derive(thiserror::Error, Debug, Clone, PartialEq, Eq)]
-pub enum GraphError<K> {
-    #[error("node {0} already exists")]
-    DuplicateKey(K),
-
-    #[error("parents not found: {0:?}")]
-    MissingParents(BTreeSet<K>),
-
-    #[error("nodes not found: {0:?}")]
-    UnknownNodes(BTreeSet<K>),
-
-    #[error("nodes were not yet processed: {0:?}")]
-    UnprocessedNodes(BTreeSet<K>),
-
-    #[error("nodes would be left dangling: {0:?}")]
-    DanglingNodes(BTreeSet<K>),
-
-    #[error("node {0} is not a root node")]
-    InvalidRootNode(K),
-
-    #[error("node {0} is not a pending node")]
-    InvalidPendingNode(K),
-}
-
-/// This cannot be derived without enforcing `Default` bounds on K and V.
-impl<K, V> Default for DependencyGraph<K, V> {
-    fn default() -> Self {
-        Self {
-            vertices: BTreeMap::default(),
-            pending: BTreeSet::default(),
-            parents: BTreeMap::default(),
-            children: BTreeMap::default(),
-            roots: BTreeSet::default(),
-            processed: BTreeSet::default(),
-        }
-    }
-}
-
-impl<K: Ord + Copy + Display + Debug, V: Clone> DependencyGraph<K, V> {
-    /// Inserts a new pending node into the graph.
-    ///
-    /// # Errors
-    ///
-    /// Errors if the node already exists, or if any of the parents are not part of the graph.
-    ///
-    /// This method is atomic.
-    pub fn insert_pending(&mut self, key: K, parents: BTreeSet<K>) -> Result<(), GraphError<K>> {
-        if self.contains(&key) {
-            return Err(GraphError::DuplicateKey(key));
-        }
-
-        let missing_parents = parents
-            .iter()
-            .filter(|parent| !self.contains(parent))
-            .copied()
-            .collect::<BTreeSet<_>>();
-        if !missing_parents.is_empty() {
-            return Err(GraphError::MissingParents(missing_parents));
-        }
-
-        // Inform parents of their new child.
-        for parent in &parents {
-            self.children.entry(*parent).or_default().insert(key);
-        }
-        self.pending.insert(key);
-        self.parents.insert(key, parents);
-        self.children.insert(key, BTreeSet::default());
-
-        Ok(())
-    }
-
-    /// Promotes a pending node, associating it with the provided value and allowing it to be
-    /// considered for processing.
-    ///
-    /// # Errors
-    ///
-    /// Errors if the given node is not pending.
-    ///
-    /// This method is atomic.
-    pub fn promote_pending(&mut self, key: K, value: V) -> Result<(), GraphError<K>> {
-        if !self.pending.remove(&key) {
-            return Err(GraphError::InvalidPendingNode(key));
-        }
-
-        self.vertices.insert(key, value);
-        self.try_make_root(key);
-
-        Ok(())
-    }
-
-    /// Reverts the nodes __and their descendents__, requeuing them for processing.
-    ///
-    /// Descendents which are pending remain unchanged.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if any of the given nodes:
-    ///
-    ///   - are not part of the graph, or
-    ///   - were not previously processed
-    ///
-    /// This method is atomic.
-    pub fn revert_subgraphs(&mut self, keys: BTreeSet<K>) -> Result<(), GraphError<K>> {
-        let missing_nodes = keys
-            .iter()
-            .filter(|key| !self.vertices.contains_key(key))
-            .copied()
-            .collect::<BTreeSet<_>>();
-        if !missing_nodes.is_empty() {
-            return Err(GraphError::UnknownNodes(missing_nodes));
-        }
-        let unprocessed = keys.difference(&self.processed).copied().collect::<BTreeSet<_>>();
-        if !unprocessed.is_empty() {
-            return Err(GraphError::UnprocessedNodes(unprocessed));
-        }
-
-        let mut reverted = BTreeSet::new();
-        let mut to_revert = keys.clone();
-
-        while let Some(key) = to_revert.pop_first() {
-            self.processed.remove(&key);
-
-            let unprocessed_children = self
-                .children
-                .get(&key)
-                .map(|children| children.difference(&reverted))
-                .into_iter()
-                .flatten()
-                // We should not revert children which are pending.
-                .filter(|child| self.vertices.contains_key(child))
-                .copied();
-
-            to_revert.extend(unprocessed_children);
-
-            reverted.insert(key);
-        }
-
-        // Only the original keys and the current roots need to be considered as roots.
-        //
-        // The children of the input keys are disqualified by definition (they're descendents),
-        // and current roots must be re-evaluated since their parents may have been requeued.
-        std::mem::take(&mut self.roots)
-            .into_iter()
-            .chain(keys)
-            .for_each(|key| self.try_make_root(key));
-
-        Ok(())
-    }
-
-    /// Removes a set of previously processed nodes from the graph.
-    ///
-    /// This is used to bound the size of the graph by removing nodes once they are no longer
-    /// required.
-    ///
-    /// # Errors
-    ///
-    /// Errors if
-    ///   - any node is unknown
-    ///   - any node is __not__ processed
-    ///   - any parent node would be left unpruned
-    ///
-    /// The last point implies that all parents of the given nodes must either be part of the set,
-    /// or already been pruned.
-    ///
-    /// This method is atomic.
-    pub fn prune_processed(&mut self, keys: BTreeSet<K>) -> Result<Vec<V>, GraphError<K>> {
-        let missing_nodes =
-            keys.iter().filter(|key| !self.contains(key)).copied().collect::<BTreeSet<_>>();
-        if !missing_nodes.is_empty() {
-            return Err(GraphError::UnknownNodes(missing_nodes));
-        }
-
-        let unprocessed = keys.difference(&self.processed).copied().collect::<BTreeSet<_>>();
-        if !unprocessed.is_empty() {
-            return Err(GraphError::UnprocessedNodes(unprocessed));
-        }
-
-        // No parent may be left dangling i.e. all parents must be part of this prune set.
-        let dangling = keys
-            .iter()
-            .filter_map(|key| self.parents.get(key))
-            .flatten()
-            .filter(|parent| !keys.contains(parent))
-            .copied()
-            .collect::<BTreeSet<_>>();
-        if !dangling.is_empty() {
-            return Err(GraphError::DanglingNodes(dangling));
-        }
-
-        let mut pruned = Vec::with_capacity(keys.len());
-
-        for key in keys {
-            let value = self.vertices.remove(&key).expect("Checked in precondition");
-            pruned.push(value);
-            self.processed.remove(&key);
-            self.parents.remove(&key);
-
-            let children = self.children.remove(&key).unwrap_or_default();
-
-            // Remove edges from children to this node.
-            for child in children {
-                if let Some(child) = self.parents.get_mut(&child) {
-                    child.remove(&key);
-                }
-            }
-        }
-
-        Ok(pruned)
-    }
-
-    /// Removes the set of nodes __and all descendents__ from the graph, returning all removed
-    /// nodes. This __includes__ pending nodes.
-    ///
-    /// # Returns
-    ///
-    /// All nodes removed.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if any of the given nodes does not exist.
-    ///
-    /// This method is atomic.
-    pub fn purge_subgraphs(&mut self, keys: BTreeSet<K>) -> Result<BTreeSet<K>, GraphError<K>> {
-        let missing_nodes =
-            keys.iter().filter(|key| !self.contains(key)).copied().collect::<BTreeSet<_>>();
-        if !missing_nodes.is_empty() {
-            return Err(GraphError::UnknownNodes(missing_nodes));
-        }
-
-        let visited = keys.clone();
-        let mut to_remove = keys;
-        let mut removed = BTreeSet::new();
-
-        while let Some(key) = to_remove.pop_first() {
-            self.vertices.remove(&key);
-            self.pending.remove(&key);
-            removed.insert(key);
-
-            self.processed.remove(&key);
-            self.roots.remove(&key);
-
-            // Children must also be purged. Take care not to visit them twice which is
-            // possible since children can have multiple purged parents.
-            let unvisited_children = self.children.remove(&key).unwrap_or_default();
-            let unvisited_children = unvisited_children.difference(&visited);
-            to_remove.extend(unvisited_children);
-
-            // Inform parents that this child no longer exists.
-            let parents = self.parents.remove(&key).unwrap_or_default();
-            for parent in parents {
-                if let Some(parent) = self.children.get_mut(&parent) {
-                    parent.remove(&key);
-                }
-            }
-        }
-
-        Ok(removed)
-    }
-
-    /// Adds the node to the `roots` list _IFF_ all of its parents are processed.
-    ///
-    /// # SAFETY
-    ///
-    /// This method assumes the node exists. Caller is responsible for ensuring this is true.
-    fn try_make_root(&mut self, key: K) {
-        if self.pending.contains(&key) {
-            return;
-        }
-        debug_assert!(
-            self.vertices.contains_key(&key),
-            "Potential root {key} must exist in the graph"
-        );
-        debug_assert!(
-            !self.processed.contains(&key),
-            "Potential root {key} cannot already be processed"
-        );
-
-        let all_parents_processed = self
-            .parents
-            .get(&key)
-            .into_iter()
-            .flatten()
-            .all(|parent| self.processed.contains(parent));
-
-        if all_parents_processed {
-            self.roots.insert(key);
-        }
-    }
-
-    /// Returns the set of nodes that are ready for processing.
-    ///
-    /// Nodes can be selected from here and marked as processed using [`Self::process_root`].
-    pub fn roots(&self) -> &BTreeSet<K> {
-        &self.roots
-    }
-
-    /// Marks a root node as processed, removing it from the roots list.
-    ///
-    /// The node's children are [evaluated](Self::try_make_root) as possible roots.
-    ///
-    /// # Error
-    ///
-    /// Errors if the node is not in the roots list.
-    ///
-    /// This method is atomic.
-    pub fn process_root(&mut self, key: K) -> Result<(), GraphError<K>> {
-        if !self.roots.remove(&key) {
-            return Err(GraphError::InvalidRootNode(key));
-        }
-
-        self.processed.insert(key);
-
-        self.children
-            .get(&key)
-            .cloned()
-            .unwrap_or_default()
-            .into_iter()
-            .for_each(|child| self.try_make_root(child));
-
-        Ok(())
-    }
-
-    /// Returns the value of a node.
-    pub fn get(&self, key: &K) -> Option<&V> {
-        self.vertices.get(key)
-    }
-
-    /// Returns the parents of the node, or `None` if the node does not exist.
-    pub fn parents(&self, key: &K) -> Option<&BTreeSet<K>> {
-        self.parents.get(key)
-    }
-
-    /// Returns true if the node exists, in either the pending or non-pending sets.
-    fn contains(&self, key: &K) -> bool {
-        self.pending.contains(key) || self.vertices.contains_key(key)
-    }
-
-    /// The amount of nodes which are in the pending state.
-    pub fn num_pending(&self) -> usize {
-        self.pending.len()
-    }
-
-    /// The amount of nodes which are in the processed state.
-    pub fn num_processed(&self) -> usize {
-        self.processed.len()
-    }
-
-    /// The total amount of nodes in the graph.
-    pub fn len(&self) -> usize {
-        self.vertices.len()
-    }
-
-    /// The amount of root nodes.
-    pub fn num_roots(&self) -> usize {
-        self.roots.len()
-    }
-}
diff --git a/crates/block-producer/src/mempool/graph/tests.rs b/crates/block-producer/src/mempool/graph/tests.rs
deleted file mode 100644
index af8acdc18..000000000
--- a/crates/block-producer/src/mempool/graph/tests.rs
+++ /dev/null
@@ -1,577 +0,0 @@
-use super::*;
-
-// TEST UTILITIES
-// ================================================================================================
-
-/// Simplified graph variant where a node's key always equals its value. This is done to make
-/// generating test values simpler.
-type TestGraph = DependencyGraph<u32, u32>;
-
-impl TestGraph {
-    /// Alias for inserting a node with no parents.
-    fn insert_with_no_parents(&mut self, node: u32) -> Result<(), GraphError<u32>> {
-        self.insert_with_parents(node, BTreeSet::default())
-    }
-
-    /// Alias for inserting a node with a single parent.
-    fn insert_with_parent(&mut self, node: u32, parent: u32) -> Result<(), GraphError<u32>> {
-        self.insert_with_parents(node, [parent].into())
-    }
-
-    /// Alias for inserting a node with multiple parents.
-    fn insert_with_parents(
-        &mut self,
-        node: u32,
-        parents: BTreeSet<u32>,
-    ) -> Result<(), GraphError<u32>> {
-        self.insert_pending(node, parents)
-    }
-
-    /// Alias for promoting nodes with the same value as the key.
-    fn promote(&mut self, nodes: impl IntoIterator<Item = u32>) -> Result<(), GraphError<u32>> {
-        for node in nodes {
-            self.promote_pending(node, node)?;
-        }
-        Ok(())
-    }
-
-    /// Promotes all nodes in the pending list with value=key.
-    fn promote_all(&mut self) {
-        // SAFETY: these are definitely pending nodes.
-        self.promote(self.pending.clone()).unwrap();
-    }
-
-    /// Calls `process_root` until all nodes have been processed.
-    fn process_all(&mut self) {
-        while let Some(root) = self.roots().first().copied() {
-            // SAFETY: this is definitely a root since we just took it from there :)
-            self.process_root(root).unwrap();
-        }
-    }
-}
-
-// PROMOTE TESTS
-// ================================================================================================
-
-#[test]
-fn promoted_nodes_are_considered_for_root() {
-    //! Ensure that a promoted node is added to the root list if all parents are already
-    //! processed.
-    let parent_a = 1;
-    let parent_b = 2;
-    let child_a = 3;
-    let child_b = 4;
-    let child_c = 5;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(parent_a).unwrap();
-    uut.insert_with_no_parents(parent_b).unwrap();
-    uut.promote_all();
-
-    // Only process one parent so that some children remain unrootable.
-    uut.process_root(parent_a).unwrap();
-
-    uut.insert_with_parent(child_a, parent_a).unwrap();
-    uut.insert_with_parent(child_b, parent_b).unwrap();
-    uut.insert_with_parents(child_c, [parent_a, parent_b].into()).unwrap();
-
-    uut.promote_all();
-
-    // Only child_a should be added (in addition to the parents), since the other children
-    // are dependent on parent_b which is incomplete.
-    let expected_roots = [parent_b, child_a].into();
-
-    assert_eq!(uut.roots, expected_roots);
-}
-
-#[test]
-fn pending_nodes_are_not_considered_for_root() {
-    //! Ensure that an unpromoted node is _not_ added to the root list even if all parents are
-    //! already processed.
-    let parent_a = 1;
-    let parent_b = 2;
-    let child_a = 3;
-    let child_b = 4;
-    let child_c = 5;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(parent_a).unwrap();
-    uut.insert_with_no_parents(parent_b).unwrap();
-    uut.promote_all();
-    uut.process_all();
-
-    uut.insert_with_parent(child_a, parent_a).unwrap();
-    uut.insert_with_parent(child_b, parent_b).unwrap();
-    uut.insert_with_parents(child_c, [parent_a, parent_b].into()).unwrap();
-
-    uut.promote([child_b]).unwrap();
-
-    // Only child b is valid as it was promoted.
-    let expected = [child_b].into();
-
-    assert_eq!(uut.roots, expected);
-}
-
-#[test]
-fn promoted_nodes_are_moved() {
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(123).unwrap();
-
-    assert!(uut.pending.contains(&123));
-    assert!(!uut.vertices.contains_key(&123));
-
-    uut.promote_pending(123, 123).unwrap();
-
-    assert!(!uut.pending.contains(&123));
-    assert!(uut.vertices.contains_key(&123));
-}
-
-#[test]
-fn promote_rejects_already_promoted_nodes() {
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(123).unwrap();
-    uut.promote_all();
-
-    let err = uut.promote_pending(123, 123).unwrap_err();
-    let expected = GraphError::InvalidPendingNode(123);
-    assert_eq!(err, expected);
-}
-
-#[test]
-fn promote_rejects_unknown_nodes() {
-    let err = TestGraph::default().promote_pending(123, 123).unwrap_err();
-    let expected = GraphError::InvalidPendingNode(123);
-    assert_eq!(err, expected);
-}
-
-// INSERT TESTS
-// ================================================================================================
-
-#[test]
-fn insert_with_known_parents_succeeds() {
-    let parent_a = 10;
-    let parent_b = 20;
-    let grandfather = 123;
-    let uncle = 222;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(grandfather).unwrap();
-    uut.insert_with_no_parents(parent_a).unwrap();
-    uut.insert_with_parent(parent_b, grandfather).unwrap();
-    uut.insert_with_parent(uncle, grandfather).unwrap();
-    uut.insert_with_parents(1, [parent_a, parent_b].into()).unwrap();
-}
-
-#[test]
-fn insert_duplicate_is_rejected() {
-    //! Ensure that inserting a duplicate node
-    //!   - results in an error, and
-    //!   - does not mutate the state (atomicity)
-    const KEY: u32 = 123;
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(KEY).unwrap();
-
-    let err = uut.insert_with_no_parents(KEY).unwrap_err();
-    let expected = GraphError::DuplicateKey(KEY);
-    assert_eq!(err, expected);
-
-    let mut atomic_reference = TestGraph::default();
-    atomic_reference.insert_with_no_parents(KEY).unwrap();
-    assert_eq!(uut, atomic_reference);
-}
-
-#[test]
-fn insert_with_all_parents_missing_is_rejected() {
-    //! Ensure that inserting a node with unknown parents
-    //!   - results in an error, and
-    //!   - does not mutate the state (atomicity)
-    const MISSING: [u32; 4] = [1, 2, 3, 4];
-    let mut uut = TestGraph::default();
-
-    let err = uut.insert_with_parents(0xABC, MISSING.into()).unwrap_err();
-    let expected = GraphError::MissingParents(MISSING.into());
-    assert_eq!(err, expected);
-
-    let atomic_reference = TestGraph::default();
-    assert_eq!(uut, atomic_reference);
-}
-
-#[test]
-fn insert_with_some_parents_missing_is_rejected() {
-    //! Ensure that inserting a node with unknown parents
-    //!   - results in an error, and
-    //!   - does not mutate the state (atomicity)
-    const MISSING: u32 = 123;
-    let mut uut = TestGraph::default();
-
-    uut.insert_with_no_parents(1).unwrap();
-    uut.insert_with_no_parents(2).unwrap();
-    uut.insert_with_no_parents(3).unwrap();
-
-    let atomic_reference = uut.clone();
-
-    let err = uut.insert_with_parents(0xABC, [1, 2, 3, MISSING].into()).unwrap_err();
-    let expected = GraphError::MissingParents([MISSING].into());
-    assert_eq!(err, expected);
-    assert_eq!(uut, atomic_reference);
-}
-
-// REVERT TESTS
-// ================================================================================================
-
-#[test]
-fn reverting_unprocessed_nodes_is_rejected() {
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(1).unwrap();
-    uut.insert_with_no_parents(2).unwrap();
-    uut.insert_with_no_parents(3).unwrap();
-    uut.promote_all();
-    uut.process_root(1).unwrap();
-
-    let err = uut.revert_subgraphs([1, 2, 3].into()).unwrap_err();
-    let expected = GraphError::UnprocessedNodes([2, 3].into());
-
-    assert_eq!(err, expected);
-}
-
-#[test]
-fn reverting_unknown_nodes_is_rejected() {
-    let err = TestGraph::default().revert_subgraphs([1].into()).unwrap_err();
-    let expected = GraphError::UnknownNodes([1].into());
-    assert_eq!(err, expected);
-}
-
-#[test]
-fn reverting_resets_the_entire_subgraph() {
-    //! Reverting should reset the state to before any of the nodes where processed.
-    let grandparent = 1;
-    let parent_a = 2;
-    let parent_b = 3;
-    let child_a = 4;
-    let child_b = 5;
-    let child_c = 6;
-
-    let disjoint = 7;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(grandparent).unwrap();
-    uut.insert_with_no_parents(disjoint).unwrap();
-    uut.insert_with_parent(parent_a, grandparent).unwrap();
-    uut.insert_with_parent(parent_b, grandparent).unwrap();
-    uut.insert_with_parent(child_a, parent_a).unwrap();
-    uut.insert_with_parent(child_b, parent_b).unwrap();
-    uut.insert_with_parents(child_c, [parent_a, parent_b].into()).unwrap();
-
-    uut.promote([disjoint, grandparent, parent_a, parent_b, child_a, child_c])
-        .unwrap();
-    uut.process_root(disjoint).unwrap();
-
-    let reference = uut.clone();
-
-    uut.process_all();
-    uut.revert_subgraphs([grandparent].into()).unwrap();
-
-    assert_eq!(uut, reference);
-}
-
-#[test]
-fn reverting_reevaluates_roots() {
-    //! Node reverting from processed to unprocessed should cause the root nodes to be
-    //! re-evaluated. Only nodes with all parents processed should remain in the set.
-    let disjoint_parent = 1;
-    let disjoint_child = 2;
-
-    let parent_a = 3;
-    let parent_b = 4;
-    let child_a = 5;
-    let child_b = 6;
-
-    let partially_disjoin_child = 7;
-
-    let mut uut = TestGraph::default();
-    // This pair of nodes should not be impacted by the reverted subgraph.
-    uut.insert_with_no_parents(disjoint_parent).unwrap();
-    uut.insert_with_parent(disjoint_child, disjoint_parent).unwrap();
-
-    uut.insert_with_no_parents(parent_a).unwrap();
-    uut.insert_with_no_parents(parent_b).unwrap();
-    uut.insert_with_parent(child_a, parent_a).unwrap();
-    uut.insert_with_parent(child_b, parent_b).unwrap();
-    uut.insert_with_parents(partially_disjoin_child, [disjoint_parent, parent_a].into())
-        .unwrap();
-
-    // Since we are reverting the other parents, we expect the roots to match the current state.
-    uut.promote_all();
-    uut.process_root(disjoint_parent).unwrap();
-    let reference = uut.roots().clone();
-
-    uut.process_root(parent_a).unwrap();
-    uut.process_root(parent_b).unwrap();
-    uut.revert_subgraphs([parent_a, parent_b].into()).unwrap();
-
-    assert_eq!(uut.roots(), &reference);
-}
-
-// PRUNING TESTS
-// ================================================================================================
-
-#[test]
-fn pruned_nodes_are_nonextant() {
-    //! Checks that processed and then pruned nodes behave as if they never existed in the
-    //! graph. We test this by comparing it to a reference graph created without these ancestor
-    //! nodes.
-    let ancestor_a = 1;
-    let ancestor_b = 2;
-
-    let child_a = 3;
-    let child_b = 4;
-    let child_both = 5;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(ancestor_a).unwrap();
-    uut.insert_with_no_parents(ancestor_b).unwrap();
-    uut.insert_with_parent(child_a, ancestor_a).unwrap();
-    uut.insert_with_parent(child_b, ancestor_b).unwrap();
-    uut.insert_with_parents(child_both, [ancestor_a, ancestor_b].into()).unwrap();
-    uut.promote_all();
-
-    uut.process_root(ancestor_a).unwrap();
-    uut.process_root(ancestor_b).unwrap();
-    uut.prune_processed([ancestor_a, ancestor_b].into()).unwrap();
-
-    let mut reference = TestGraph::default();
-    reference.insert_with_no_parents(child_a).unwrap();
-    reference.insert_with_no_parents(child_b).unwrap();
-    reference.insert_with_no_parents(child_both).unwrap();
-    reference.promote_all();
-
-    assert_eq!(uut, reference);
-}
-
-#[test]
-fn pruning_unknown_nodes_is_rejected() {
-    let err = TestGraph::default().prune_processed([1].into()).unwrap_err();
-    let expected = GraphError::UnknownNodes([1].into());
-    assert_eq!(err, expected);
-}
-
-#[test]
-fn pruning_unprocessed_nodes_is_rejected() {
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(1).unwrap();
-    uut.promote_all();
-
-    let err = uut.prune_processed([1].into()).unwrap_err();
-    let expected = GraphError::UnprocessedNodes([1].into());
-    assert_eq!(err, expected);
-}
-
-#[test]
-fn pruning_cannot_leave_parents_dangling() {
-    //! Pruning processed nodes must always prune all parent nodes as well. No parent node may
-    //! be left behind.
-    let dangling = 1;
-    let pruned = 2;
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(dangling).unwrap();
-    uut.insert_with_parent(pruned, dangling).unwrap();
-    uut.promote_all();
-    uut.process_all();
-
-    let err = uut.prune_processed([pruned].into()).unwrap_err();
-    let expected = GraphError::DanglingNodes([dangling].into());
-    assert_eq!(err, expected);
-}
-
-// PURGING TESTS
-// ================================================================================================
-
-#[test]
-fn purging_subgraph_handles_internal_nodes() {
-    //! Purging a subgraph should correctly handle nodes already deleted within that subgraph.
-    //!
-    //! This is a concern for errors as we are deleting parts of the subgraph while we are
-    //! iterating through the nodes to purge. This means its likely a node will already have
-    //! been deleted before processing it as an input.
-    //!
-    //! We can force this to occur by re-ordering the inputs relative to the actual dependency
-    //! order. This means this test is a bit weaker because it relies on implementation details.
-
-    let ancestor_a = 1;
-    let ancestor_b = 2;
-    let parent_a = 3;
-    let parent_b = 4;
-    let child_a = 5;
-    // This should be purged prior to parent_a. Relies on the fact that we are iterating over a
-    // btree which is ordered by value.
-    let child_b = 0;
-    let child_c = 6;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(ancestor_a).unwrap();
-    uut.insert_with_no_parents(ancestor_b).unwrap();
-    uut.insert_with_parent(parent_a, ancestor_a).unwrap();
-    uut.insert_with_parent(parent_b, ancestor_b).unwrap();
-    uut.insert_with_parents(child_a, [ancestor_a, parent_a].into()).unwrap();
-    uut.insert_with_parents(child_b, [parent_a, parent_b].into()).unwrap();
-    uut.insert_with_parent(child_c, parent_b).unwrap();
-
-    uut.purge_subgraphs([child_b, parent_a].into()).unwrap();
-
-    let mut reference = TestGraph::default();
-    reference.insert_with_no_parents(ancestor_a).unwrap();
-    reference.insert_with_no_parents(ancestor_b).unwrap();
-    reference.insert_with_parent(parent_b, ancestor_b).unwrap();
-    reference.insert_with_parent(child_c, parent_b).unwrap();
-
-    assert_eq!(uut, reference);
-}
-
-#[test]
-fn purging_removes_all_descendents() {
-    let ancestor_a = 1;
-    let ancestor_b = 2;
-    let parent_a = 3;
-    let parent_b = 4;
-    let child_a = 5;
-    let child_b = 6;
-    let child_c = 7;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(ancestor_a).unwrap();
-    uut.insert_with_no_parents(ancestor_b).unwrap();
-    uut.insert_with_parent(parent_a, ancestor_a).unwrap();
-    uut.insert_with_parent(parent_b, ancestor_b).unwrap();
-    uut.insert_with_parents(child_a, [ancestor_a, parent_a].into()).unwrap();
-    uut.insert_with_parents(child_b, [parent_a, parent_b].into()).unwrap();
-    uut.insert_with_parent(child_c, parent_b).unwrap();
-
-    uut.purge_subgraphs([parent_a].into()).unwrap();
-
-    let mut reference = TestGraph::default();
-    reference.insert_with_no_parents(ancestor_a).unwrap();
-    reference.insert_with_no_parents(ancestor_b).unwrap();
-    reference.insert_with_parent(parent_b, ancestor_b).unwrap();
-    reference.insert_with_parent(child_c, parent_b).unwrap();
-
-    assert_eq!(uut, reference);
-}
-
-// PROCESSING TESTS
-// ================================================================================================
-
-#[test]
-fn process_root_evaluates_children_as_roots() {
-    let parent_a = 1;
-    let parent_b = 2;
-    let child_a = 3;
-    let child_b = 4;
-    let child_c = 5;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(parent_a).unwrap();
-    uut.insert_with_no_parents(parent_b).unwrap();
-    uut.insert_with_parent(child_a, parent_a).unwrap();
-    uut.insert_with_parent(child_b, parent_b).unwrap();
-    uut.insert_with_parents(child_c, [parent_a, parent_b].into()).unwrap();
-    uut.promote_all();
-
-    uut.process_root(parent_a).unwrap();
-    assert_eq!(uut.roots(), &[parent_b, child_a].into());
-}
-
-#[test]
-fn process_root_rejects_non_root_node() {
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(1).unwrap();
-    uut.insert_with_parent(2, 1).unwrap();
-    uut.promote_all();
-
-    let err = uut.process_root(2).unwrap_err();
-    let expected = GraphError::InvalidRootNode(2);
-    assert_eq!(err, expected);
-}
-
-#[test]
-fn process_root_cannot_reprocess_same_node() {
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(1).unwrap();
-    uut.promote_all();
-    uut.process_root(1).unwrap();
-
-    let err = uut.process_root(1).unwrap_err();
-    let expected = GraphError::InvalidRootNode(1);
-    assert_eq!(err, expected);
-}
-
-#[test]
-fn processing_a_queue_graph() {
-    //! Creates a queue graph and ensures that nodes processed in FIFO order.
-    let nodes = (0..10).collect::<Vec<_>>();
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(nodes[0]).unwrap();
-    for pairs in nodes.windows(2) {
-        let (parent, id) = (pairs[0], pairs[1]);
-        uut.insert_with_parent(id, parent).unwrap();
-    }
-    uut.promote_all();
-
-    let mut ordered_roots = Vec::<u32>::new();
-    for _ in &nodes {
-        let current_roots = uut.roots().clone();
-        ordered_roots.extend(&current_roots);
-
-        for root in current_roots {
-            uut.process_root(root).unwrap();
-        }
-    }
-
-    assert_eq!(ordered_roots, nodes);
-}
-
-#[test]
-fn processing_and_root_tracking() {
-    //! Creates a somewhat arbitrarily connected graph and ensures that roots are tracked as
-    //! expected as the they are processed.
-    let ancestor_a = 1;
-    let ancestor_b = 2;
-    let parent_a = 3;
-    let parent_b = 4;
-    let child_a = 5;
-    let child_b = 6;
-    let child_c = 7;
-
-    let mut uut = TestGraph::default();
-    uut.insert_with_no_parents(ancestor_a).unwrap();
-    uut.insert_with_no_parents(ancestor_b).unwrap();
-    uut.insert_with_parent(parent_a, ancestor_a).unwrap();
-    uut.insert_with_parent(parent_b, ancestor_b).unwrap();
-    uut.insert_with_parents(child_a, [ancestor_a, parent_a].into()).unwrap();
-    uut.insert_with_parents(child_b, [parent_a, parent_b].into()).unwrap();
-    uut.insert_with_parent(child_c, parent_b).unwrap();
-    uut.promote_all();
-
-    assert_eq!(uut.roots(), &[ancestor_a, ancestor_b].into());
-
-    uut.process_root(ancestor_a).unwrap();
-    assert_eq!(uut.roots(), &[ancestor_b, parent_a].into());
-
-    uut.process_root(ancestor_b).unwrap();
-    assert_eq!(uut.roots(), &[parent_a, parent_b].into());
-
-    uut.process_root(parent_a).unwrap();
-    assert_eq!(uut.roots(), &[parent_b, child_a].into());
-
-    uut.process_root(parent_b).unwrap();
-    assert_eq!(uut.roots(), &[child_a, child_b, child_c].into());
-
-    uut.process_root(child_a).unwrap();
-    assert_eq!(uut.roots(), &[child_b, child_c].into());
-
-    uut.process_root(child_b).unwrap();
-    assert_eq!(uut.roots(), &[child_c].into());
-
-    uut.process_root(child_c).unwrap();
-    assert!(uut.roots().is_empty());
-}
diff --git a/crates/block-producer/src/mempool/inflight_state/account_state.rs b/crates/block-producer/src/mempool/inflight_state/account_state.rs
deleted file mode 100644
index e33a796e9..000000000
--- a/crates/block-producer/src/mempool/inflight_state/account_state.rs
+++ /dev/null
@@ -1,325 +0,0 @@
-use std::collections::VecDeque;
-
-use miden_objects::Word;
-use miden_objects::transaction::TransactionId;
-
-// IN-FLIGHT ACCOUNT STATE
-// ================================================================================================
-
-/// Tracks the inflight state of an account.
-#[derive(Clone, Default, Debug, PartialEq)]
-pub struct InflightAccountState {
-    /// This account's state transitions due to inflight transactions.
-    ///
-    /// Ordering is chronological from front (oldest) to back (newest).
-    states: VecDeque<(Word, TransactionId)>,
-
-    /// The number of inflight states that have been committed.
-    ///
-    /// This acts as a pivot index for `self.states`, splitting it into two segments. The first
-    /// contains committed states and the second those that are uncommitted.
-    committed: usize,
-}
-
-impl InflightAccountState {
-    /// Appends the new state, returning the previous state's transaction ID __IFF__ it is
-    /// uncommitted.
-    pub fn insert(&mut self, state: Word, tx: TransactionId) -> Option<TransactionId> {
-        let mut parent = self.states.back().map(|(_, tx)| tx).copied();
-
-        // Only return uncommitted parent ID.
-        //
-        // Since this is the latest state's ID, we need at least one uncommitted state.
-        if self.uncommitted_count() == 0 {
-            parent.take();
-        }
-
-        self.states.push_back((state, tx));
-
-        parent
-    }
-
-    /// The latest state of this account.
-    pub fn current_state(&self) -> Option<&Word> {
-        self.states.back().map(|(state, _)| state)
-    }
-
-    /// Reverts the most recent `n` uncommitted inflight transactions.
-    ///
-    /// # Returns
-    ///
-    /// Returns the emptiness state of the account.
-    ///
-    /// # Panics
-    ///
-    /// Panics if there are less than `n` uncommitted inflight transactions.
-    pub fn revert(&mut self, n: usize) -> AccountStatus {
-        let uncommitted = self.uncommitted_count();
-        assert!(
-            uncommitted >= n,
-            "Attempted to revert {n} transactions which is more than the {uncommitted} which are uncommitted.",
-        );
-
-        self.states.drain(self.states.len() - n..);
-
-        self.emptiness()
-    }
-
-    /// Commits the next `n` uncommitted inflight transactions.
-    ///
-    /// # Panics
-    ///
-    /// Panics if there are less than `n` uncommitted inflight transactions.
-    pub fn commit(&mut self, n: usize) {
-        let uncommitted = self.uncommitted_count();
-        assert!(
-            uncommitted >= n,
-            "Attempted to revert {n} transactions which is more than the {uncommitted} which are uncommitted."
-        );
-
-        self.committed += n;
-    }
-
-    /// Removes `n` committed transactions.
-    ///
-    /// # Returns
-    ///
-    /// Returns the emptiness state of the account.
-    ///
-    /// # Panics
-    ///
-    /// Panics if there are less than `n` committed transactions.
-    pub fn prune_committed(&mut self, n: usize) -> AccountStatus {
-        assert!(
-            self.committed >= n,
-            "Attempted to prune {n} transactions, which is more than the {} which are committed",
-            self.committed
-        );
-
-        self.committed -= n;
-        self.states.drain(..n);
-
-        self.emptiness()
-    }
-
-    /// This is essentially `is_empty` with the additional benefit that [`AccountStatus`] is marked
-    /// as `#[must_use]`, forcing callers to handle empty accounts (which should be pruned).
-    fn emptiness(&self) -> AccountStatus {
-        if self.states.is_empty() {
-            AccountStatus::Empty
-        } else {
-            AccountStatus::NonEmpty
-        }
-    }
-
-    /// The number of uncommitted inflight transactions.
-    fn uncommitted_count(&self) -> usize {
-        self.states.len() - self.committed
-    }
-}
-
-/// Describes the emptiness of an [`InflightAccountState`].
-///
-/// Is marked as `#[must_use]` so that callers handle prune empty accounts.
-#[must_use]
-#[derive(Clone, Copy, PartialEq, Eq)]
-pub enum AccountStatus {
-    /// [`InflightAccountState`] contains no state and should be pruned.
-    Empty,
-    /// [`InflightAccountState`] contains state and should be kept.
-    NonEmpty,
-}
-
-impl AccountStatus {
-    pub fn is_empty(self) -> bool {
-        self == Self::Empty
-    }
-}
-
-// TESTS
-// ================================================================================================
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::test_utils::Random;
-
-    #[test]
-    fn current_state_is_the_most_recently_inserted() {
-        let mut rng = Random::with_random_seed();
-        let mut uut = InflightAccountState::default();
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-
-        let expected = rng.draw_digest();
-        uut.insert(expected, rng.draw_tx_id());
-
-        assert_eq!(uut.current_state(), Some(&expected));
-    }
-
-    #[test]
-    fn parent_is_the_most_recently_inserted() {
-        let mut rng = Random::with_random_seed();
-        let mut uut = InflightAccountState::default();
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-
-        let expected = rng.draw_tx_id();
-        uut.insert(rng.draw_digest(), expected);
-
-        let parent = uut.insert(rng.draw_digest(), rng.draw_tx_id());
-
-        assert_eq!(parent, Some(expected));
-    }
-
-    #[test]
-    fn empty_account_has_no_parent() {
-        let mut rng = Random::with_random_seed();
-        let mut uut = InflightAccountState::default();
-        let parent = uut.insert(rng.draw_digest(), rng.draw_tx_id());
-
-        assert!(parent.is_none());
-    }
-
-    #[test]
-    fn fully_committed_account_has_no_parent() {
-        let mut rng = Random::with_random_seed();
-        let mut uut = InflightAccountState::default();
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        uut.commit(1);
-        let parent = uut.insert(rng.draw_digest(), rng.draw_tx_id());
-
-        assert!(parent.is_none());
-    }
-
-    #[test]
-    fn uncommitted_account_has_a_parent() {
-        let mut rng = Random::with_random_seed();
-        let expected_parent = rng.draw_tx_id();
-
-        let mut uut = InflightAccountState::default();
-        uut.insert(rng.draw_digest(), expected_parent);
-
-        let parent = uut.insert(rng.draw_digest(), rng.draw_tx_id());
-
-        assert_eq!(parent, Some(expected_parent));
-    }
-
-    #[test]
-    fn partially_committed_account_has_a_parent() {
-        let mut rng = Random::with_random_seed();
-        let expected_parent = rng.draw_tx_id();
-
-        let mut uut = InflightAccountState::default();
-        uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        uut.insert(rng.draw_digest(), expected_parent);
-        uut.commit(1);
-
-        let parent = uut.insert(rng.draw_digest(), rng.draw_tx_id());
-
-        assert_eq!(parent, Some(expected_parent));
-    }
-
-    #[test]
-    fn reverted_txs_are_nonextant() {
-        const N: usize = 5;
-        const REVERT: usize = 2;
-        let mut rng = Random::with_random_seed();
-
-        let states = (0..N).map(|_| (rng.draw_digest(), rng.draw_tx_id())).collect::<Vec<_>>();
-
-        let mut uut = InflightAccountState::default();
-        for (state, tx) in &states {
-            uut.insert(*state, *tx);
-        }
-        let _ = uut.revert(REVERT);
-
-        let mut expected = InflightAccountState::default();
-        for (state, tx) in states.iter().rev().skip(REVERT).rev() {
-            expected.insert(*state, *tx);
-        }
-
-        assert_eq!(uut, expected);
-    }
-
-    #[test]
-    fn pruned_txs_are_nonextant() {
-        const N: usize = 5;
-        const PRUNE: usize = 2;
-        let mut rng = Random::with_random_seed();
-
-        let states = (0..N).map(|_| (rng.draw_digest(), rng.draw_tx_id())).collect::<Vec<_>>();
-
-        let mut uut = InflightAccountState::default();
-        for (state, tx) in &states {
-            uut.insert(*state, *tx);
-        }
-        uut.commit(PRUNE);
-        let _ = uut.prune_committed(PRUNE);
-
-        let mut expected = InflightAccountState::default();
-        for (state, tx) in states.iter().skip(PRUNE) {
-            expected.insert(*state, *tx);
-        }
-
-        assert_eq!(uut, expected);
-    }
-
-    #[test]
-    fn is_empty_after_full_commit_and_prune() {
-        const N: usize = 5;
-        let mut rng = Random::with_random_seed();
-        let mut uut = InflightAccountState::default();
-        for _ in 0..N {
-            uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        }
-
-        uut.commit(N);
-        let _ = uut.prune_committed(N);
-
-        assert_eq!(uut, InflightAccountState::default());
-    }
-
-    #[test]
-    fn is_empty_after_full_revert() {
-        const N: usize = 5;
-        let mut uut = InflightAccountState::default();
-        let mut rng = Random::with_random_seed();
-        for _ in 0..N {
-            uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        }
-
-        let _ = uut.revert(N);
-
-        assert_eq!(uut, InflightAccountState::default());
-    }
-
-    #[test]
-    #[should_panic]
-    fn revert_panics_on_out_of_bounds() {
-        const N: usize = 5;
-        let mut rng = Random::with_random_seed();
-        let mut uut = InflightAccountState::default();
-        for _ in 0..N {
-            uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        }
-
-        uut.commit(1);
-        let _ = uut.revert(N);
-    }
-
-    #[test]
-    #[should_panic]
-    fn commit_panics_on_out_of_bounds() {
-        const N: usize = 5;
-        let mut rng = Random::with_random_seed();
-        let mut uut = InflightAccountState::default();
-        for _ in 0..N {
-            uut.insert(rng.draw_digest(), rng.draw_tx_id());
-        }
-
-        uut.commit(N + 1);
-    }
-}
diff --git a/crates/block-producer/src/mempool/inflight_state/mod.rs b/crates/block-producer/src/mempool/inflight_state/mod.rs
deleted file mode 100644
index b836dd1e2..000000000
--- a/crates/block-producer/src/mempool/inflight_state/mod.rs
+++ /dev/null
@@ -1,729 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet, VecDeque};
-
-use miden_objects::account::AccountId;
-use miden_objects::block::BlockNumber;
-use miden_objects::note::{NoteId, Nullifier};
-use miden_objects::transaction::TransactionId;
-
-use crate::domain::transaction::AuthenticatedTransaction;
-use crate::errors::{AddTransactionError, VerifyTxError};
-
-mod account_state;
-
-use account_state::InflightAccountState;
-
-// IN-FLIGHT STATE
-// ================================================================================================
-
-/// Tracks the inflight state of the mempool. This includes recently committed blocks.
-///
-/// Allows appending and reverting transactions as well as marking them as part of a committed
-/// block. Committed state can also be pruned once the state is considered past the stale
-/// threshold.
-#[derive(Clone, Debug, PartialEq)]
-pub struct InflightState {
-    /// Account states from inflight transactions.
-    ///
-    /// Accounts which are empty are immediately pruned.
-    accounts: BTreeMap<AccountId, InflightAccountState>,
-
-    /// Nullifiers produced by the input notes of inflight transactions.
-    nullifiers: BTreeSet<Nullifier>,
-
-    /// Notes created by inflight transactions.
-    ///
-    /// Some of these may already be consumed - check the nullifiers.
-    output_notes: BTreeMap<NoteId, OutputNoteState>,
-
-    /// Inflight transaction deltas.
-    ///
-    /// This _excludes_ deltas in committed blocks.
-    transaction_deltas: BTreeMap<TransactionId, Delta>,
-
-    /// Committed block deltas.
-    committed_blocks: VecDeque<BTreeMap<TransactionId, Delta>>,
-
-    /// Amount of recently committed blocks we retain in addition to the inflight state.
-    ///
-    /// This provides an overlap between committed and inflight state, giving a grace
-    /// period for incoming transactions to be verified against both without requiring it
-    /// to be an atomic action.
-    num_retained_blocks: usize,
-
-    /// The latest committed block height.
-    chain_tip: BlockNumber,
-
-    /// Number of blocks to allow between chain tip and a transaction's expiration block height
-    /// before rejecting it.
-    ///
-    /// A new transaction is rejected if its expiration block is this close to the chain tip.
-    expiration_slack: u32,
-}
-
-/// A summary of a transaction's impact on the state.
-#[derive(Clone, Debug, PartialEq)]
-struct Delta {
-    /// The account this transaction updated.
-    account: AccountId,
-    /// The nullifiers produced by this transaction.
-    nullifiers: BTreeSet<Nullifier>,
-    /// The output notes created by this transaction.
-    output_notes: BTreeSet<NoteId>,
-}
-
-impl Delta {
-    fn new(tx: &AuthenticatedTransaction) -> Self {
-        Self {
-            account: tx.account_id(),
-            nullifiers: tx.nullifiers().collect(),
-            output_notes: tx.output_note_ids().collect(),
-        }
-    }
-}
-
-impl InflightState {
-    /// Creates an [`InflightState`] which will retain committed state for the given
-    /// amount of blocks before pruning them.
-    pub fn new(chain_tip: BlockNumber, num_retained_blocks: usize, expiration_slack: u32) -> Self {
-        Self {
-            num_retained_blocks,
-            chain_tip,
-            expiration_slack,
-            accounts: BTreeMap::default(),
-            nullifiers: BTreeSet::default(),
-            output_notes: BTreeMap::default(),
-            transaction_deltas: BTreeMap::default(),
-            committed_blocks: VecDeque::default(),
-        }
-    }
-
-    /// Appends the transaction to the inflight state.
-    ///
-    /// This operation is atomic i.e. a rejected transaction has no impact of the state.
-    pub fn add_transaction(
-        &mut self,
-        tx: &AuthenticatedTransaction,
-    ) -> Result<BTreeSet<TransactionId>, AddTransactionError> {
-        // Separate verification and state mutation so that a rejected transaction
-        // does not impact the state (atomicity).
-        self.verify_transaction(tx)?;
-
-        let parents = self.insert_transaction(tx);
-
-        Ok(parents)
-    }
-
-    fn oldest_committed_state(&self) -> BlockNumber {
-        let committed_len: u32 = self
-            .committed_blocks
-            .len()
-            .try_into()
-            .expect("We should not be storing many blocks");
-        self.chain_tip
-            .checked_sub(committed_len)
-            .expect("Chain height cannot be less than number of committed blocks")
-    }
-
-    fn verify_transaction(&self, tx: &AuthenticatedTransaction) -> Result<(), AddTransactionError> {
-        // Check that the transaction hasn't already expired.
-        if tx.expires_at() <= self.chain_tip + self.expiration_slack {
-            return Err(AddTransactionError::Expired {
-                expired_at: tx.expires_at(),
-                limit: self.chain_tip + self.expiration_slack,
-            });
-        }
-
-        // The mempool retains recently committed blocks, in addition to the state that is currently
-        // inflight. This overlap with the committed state allows us to verify incoming
-        // transactions against the current state (committed + inflight). Transactions are
-        // first authenticated against the committed state prior to being submitted to the
-        // mempool. The overlap provides a grace period between transaction authentication
-        // against committed state and verification against inflight state.
-        //
-        // Here we just ensure that this authentication point is still within this overlap zone.
-        // This should only fail if the grace period is too restrictive for the current
-        // combination of block rate, transaction throughput and database IO.
-        let stale_limit = self.oldest_committed_state();
-        if tx.authentication_height() < stale_limit {
-            return Err(AddTransactionError::StaleInputs {
-                input_block: tx.authentication_height(),
-                stale_limit,
-            });
-        }
-
-        // Ensure current account state is correct.
-        let current = self
-            .accounts
-            .get(&tx.account_id())
-            .and_then(|account_state| account_state.current_state())
-            .copied()
-            .or(tx.store_account_state());
-        let expected = tx.account_update().initial_state_commitment();
-
-        // SAFETY: a new accounts state is set to zero ie default.
-        if expected != current.unwrap_or_default() {
-            return Err(VerifyTxError::IncorrectAccountInitialCommitment {
-                tx_initial_account_commitment: expected,
-                current_account_commitment: current,
-            }
-            .into());
-        }
-
-        // Ensure nullifiers aren't already present.
-        //
-        // We don't need to check the store state here because that was
-        // already performed as part of authenticated the transaction.
-        let double_spend = tx
-            .nullifiers()
-            .filter(|nullifier| self.nullifiers.contains(nullifier))
-            .collect::<Vec<_>>();
-        if !double_spend.is_empty() {
-            return Err(VerifyTxError::InputNotesAlreadyConsumed(double_spend).into());
-        }
-
-        // Ensure output notes aren't already present.
-        let duplicates = tx
-            .output_note_ids()
-            .filter(|note| self.output_notes.contains_key(note))
-            .collect::<Vec<_>>();
-        if !duplicates.is_empty() {
-            return Err(VerifyTxError::OutputNotesAlreadyExist(duplicates).into());
-        }
-
-        // Ensure that all unauthenticated notes have an inflight output note to consume.
-        //
-        // We don't need to worry about double spending them since we already checked for
-        // that using the nullifiers.
-        //
-        // Note that the authenticated transaction already filters out notes that were
-        // previously unauthenticated, but were authenticated by the store.
-        let missing = tx
-            .unauthenticated_notes()
-            .filter(|note_id| !self.output_notes.contains_key(note_id))
-            .collect::<Vec<_>>();
-        if !missing.is_empty() {
-            return Err(VerifyTxError::UnauthenticatedNotesNotFound(missing).into());
-        }
-
-        Ok(())
-    }
-
-    /// Aggregate the transaction into the state, returning its parent transactions.
-    fn insert_transaction(&mut self, tx: &AuthenticatedTransaction) -> BTreeSet<TransactionId> {
-        self.transaction_deltas.insert(tx.id(), Delta::new(tx));
-        let account_parent = self
-            .accounts
-            .entry(tx.account_id())
-            .or_default()
-            .insert(tx.account_update().final_state_commitment(), tx.id());
-
-        self.nullifiers.extend(tx.nullifiers());
-        self.output_notes
-            .extend(tx.output_note_ids().map(|note_id| (note_id, OutputNoteState::new(tx.id()))));
-
-        // Authenticated input notes (provably) consume notes that are already committed
-        // on chain. They therefore cannot form part of the inflight dependency chain.
-        //
-        // Additionally, we only care about parents which have not been committed yet.
-        let note_parents = tx
-            .unauthenticated_notes()
-            .filter_map(|note_id| self.output_notes.get(&note_id))
-            .filter_map(|note| note.transaction())
-            .copied();
-
-        account_parent.into_iter().chain(note_parents).collect()
-    }
-
-    /// Reverts the given set of _uncommitted_ transactions.
-    ///
-    /// # Panics
-    ///
-    /// Panics if any transactions is not part of the uncommitted state. Callers should take care to
-    /// only revert transaction sets who's ancestors are all either committed or reverted.
-    pub fn revert_transactions(&mut self, txs: BTreeSet<TransactionId>) {
-        for tx in txs {
-            let delta = self.transaction_deltas.remove(&tx).expect("Transaction delta must exist");
-
-            // SAFETY: Since the delta exists, so must the account.
-            let account_status = self.accounts.get_mut(&delta.account).unwrap().revert(1);
-            // Prune empty accounts.
-            if account_status.is_empty() {
-                self.accounts.remove(&delta.account);
-            }
-
-            for nullifier in delta.nullifiers {
-                assert!(self.nullifiers.remove(&nullifier), "Nullifier must exist");
-            }
-
-            for note in delta.output_notes {
-                assert!(self.output_notes.remove(&note).is_some(), "Output note must exist");
-            }
-        }
-    }
-
-    /// Marks the given state diff as committed.
-    ///
-    /// These transactions are no longer considered inflight. Callers should take care to only
-    /// commit transactions who's ancestors are all committed.
-    ///
-    /// Note that this state is still retained for the configured number of blocks. The oldest
-    /// retained block is also pruned from the state.
-    ///
-    /// # Panics
-    ///
-    /// Panics if any transactions is not part of the uncommitted state.
-    pub fn commit_block(&mut self, txs: impl IntoIterator<Item = TransactionId>) {
-        let mut block_deltas = BTreeMap::new();
-        for tx in txs {
-            let delta = self.transaction_deltas.remove(&tx).expect("Transaction delta must exist");
-
-            // SAFETY: Since the delta exists, so must the account.
-            self.accounts.get_mut(&delta.account).unwrap().commit(1);
-
-            for note in &delta.output_notes {
-                self.output_notes.get_mut(note).expect("Output note must exist").commit();
-            }
-
-            block_deltas.insert(tx, delta);
-        }
-
-        self.committed_blocks.push_back(block_deltas);
-        self.prune_block();
-        self.chain_tip = self.chain_tip.child();
-    }
-
-    /// Prunes the state from the oldest committed block _IFF_ there are more than the number we
-    /// wish to retain.
-    ///
-    /// This is used to bound the size of the inflight state.
-    fn prune_block(&mut self) {
-        // Keep the required number of committed blocks.
-        //
-        // This would occur on startup until we have accumulated enough blocks.
-        if self.committed_blocks.len() <= self.num_retained_blocks {
-            return;
-        }
-        // SAFETY: The length check above guarantees that we have at least one committed block.
-        let block = self.committed_blocks.pop_front().unwrap();
-
-        for (_, delta) in block {
-            // SAFETY: Since the delta exists, so must the account.
-            let status = self.accounts.get_mut(&delta.account).unwrap().prune_committed(1);
-
-            // Prune empty accounts.
-            if status.is_empty() {
-                self.accounts.remove(&delta.account);
-            }
-
-            for nullifier in delta.nullifiers {
-                self.nullifiers.remove(&nullifier);
-            }
-
-            for output_note in delta.output_notes {
-                self.output_notes.remove(&output_note);
-            }
-        }
-    }
-
-    /// The number of accounts affected by inflight transactions _and_ transactions in recently
-    /// committed blocks.
-    pub fn num_accounts(&self) -> usize {
-        self.accounts.len()
-    }
-
-    /// The number of nullifiers produced by inflight transactions _and_ transactions in recently
-    /// committed blocks.
-    pub fn num_nullifiers(&self) -> usize {
-        self.nullifiers.len()
-    }
-
-    /// The number of notes produced by inflight transactions _and_ transactions in recently
-    /// committed blocks.
-    pub fn num_notes_created(&self) -> usize {
-        self.output_notes.len()
-    }
-}
-
-/// Describes the state of an inflight output note.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum OutputNoteState {
-    /// Output note is part of a committed block, and its source transaction should no longer be
-    /// considered for dependency tracking.
-    Committed,
-    /// Output note is still inflight and should be considered for dependency tracking.
-    Inflight(TransactionId),
-}
-
-impl OutputNoteState {
-    /// Creates a new inflight output note state.
-    fn new(tx: TransactionId) -> Self {
-        Self::Inflight(tx)
-    }
-
-    /// Commits the output note, removing the source transaction.
-    fn commit(&mut self) {
-        *self = Self::Committed;
-    }
-
-    /// Returns the source transaction ID if the output note is not yet committed.
-    fn transaction(&self) -> Option<&TransactionId> {
-        if let Self::Inflight(tx) = self { Some(tx) } else { None }
-    }
-}
-
-// TESTS
-// ================================================================================================
-
-#[cfg(test)]
-mod tests {
-    use assert_matches::assert_matches;
-    use miden_node_utils::ErrorReport;
-    use miden_objects::Word;
-
-    use super::*;
-    use crate::test_utils::note::{mock_note, mock_output_note};
-    use crate::test_utils::{MockProvenTxBuilder, mock_account_id};
-
-    #[test]
-    fn rejects_expired_transaction() {
-        let chain_tip = BlockNumber::from(123);
-        let mut uut = InflightState::new(chain_tip, 5, 0u32);
-
-        let expired = MockProvenTxBuilder::with_account_index(0)
-            .expiration_block_num(chain_tip)
-            .build();
-        let expired =
-            AuthenticatedTransaction::from_inner(expired).with_authentication_height(chain_tip);
-
-        let err = uut.add_transaction(&expired).unwrap_err();
-        assert_matches!(err, AddTransactionError::Expired { .. });
-    }
-
-    /// Ensures that the specified expiration slack is adhered to.
-    #[test]
-    fn expiration_slack_is_respected() {
-        let slack = 3;
-        let chain_tip = BlockNumber::from(123);
-        let expiration_limit = chain_tip + slack;
-        let mut uut = InflightState::new(chain_tip, 5, slack);
-
-        let unexpired = MockProvenTxBuilder::with_account_index(0)
-            .expiration_block_num(expiration_limit + 1)
-            .build();
-        let unexpired =
-            AuthenticatedTransaction::from_inner(unexpired).with_authentication_height(chain_tip);
-
-        uut.add_transaction(&unexpired).unwrap();
-
-        let expired = MockProvenTxBuilder::with_account_index(1)
-            .expiration_block_num(expiration_limit)
-            .build();
-        let expired =
-            AuthenticatedTransaction::from_inner(expired).with_authentication_height(chain_tip);
-
-        let err = uut.add_transaction(&expired).unwrap_err();
-        assert_matches!(err, AddTransactionError::Expired { .. });
-    }
-
-    #[test]
-    fn rejects_duplicate_nullifiers() {
-        let account = mock_account_id(1);
-        let states = (1u8..=4).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-
-        let note_seed = 123;
-        // We need to make the note available first, in order for it to be consumed at all.
-        let tx0 = MockProvenTxBuilder::with_account(account, states[0], states[1])
-            .output_notes(vec![mock_output_note(note_seed)])
-            .build();
-        let tx1 = MockProvenTxBuilder::with_account(account, states[1], states[2])
-            .unauthenticated_notes(vec![mock_note(note_seed)])
-            .build();
-        let tx2 = MockProvenTxBuilder::with_account(account, states[2], states[3])
-            .unauthenticated_notes(vec![mock_note(note_seed)])
-            .build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx0)).unwrap();
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx1)).unwrap();
-
-        let err = uut.add_transaction(&AuthenticatedTransaction::from_inner(tx2)).unwrap_err();
-
-        assert_matches!(
-            err,
-            AddTransactionError::VerificationFailed(VerifyTxError::InputNotesAlreadyConsumed(
-                notes
-            )) if notes == vec![mock_note(note_seed).nullifier()]
-        );
-    }
-
-    #[test]
-    fn rejects_duplicate_output_notes() {
-        let account = mock_account_id(1);
-        let states = (1u8..=3).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-
-        let note = mock_output_note(123);
-        let tx0 = MockProvenTxBuilder::with_account(account, states[0], states[1])
-            .output_notes(vec![note.clone()])
-            .build();
-        let tx1 = MockProvenTxBuilder::with_account(account, states[1], states[2])
-            .output_notes(vec![note.clone()])
-            .build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx0)).unwrap();
-
-        let err = uut.add_transaction(&AuthenticatedTransaction::from_inner(tx1)).unwrap_err();
-
-        assert_matches!(
-            err,
-            AddTransactionError::VerificationFailed(VerifyTxError::OutputNotesAlreadyExist(
-                notes
-            )) if notes == vec![note.id()]
-        );
-    }
-
-    #[test]
-    fn rejects_account_state_mismatch() {
-        let account = mock_account_id(1);
-        let states = (1u8..=3).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-
-        let tx = MockProvenTxBuilder::with_account(account, states[0], states[1]).build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        let err = uut
-            .add_transaction(&AuthenticatedTransaction::from_inner(tx).with_store_state(states[2]))
-            .unwrap_err();
-
-        assert_matches!(
-            err,
-            AddTransactionError::VerificationFailed(VerifyTxError::IncorrectAccountInitialCommitment {
-                tx_initial_account_commitment: init_state,
-                current_account_commitment: current_state,
-            }) if init_state == states[0] && current_state == states[2].into()
-        );
-    }
-
-    #[test]
-    fn account_state_transitions() {
-        let account = mock_account_id(1);
-        let states = (1u8..=3).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-
-        let tx0 = MockProvenTxBuilder::with_account(account, states[0], states[1]).build();
-        let tx1 = MockProvenTxBuilder::with_account(account, states[1], states[2]).build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx0)).unwrap();
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx1).with_empty_store_state())
-            .unwrap();
-    }
-
-    #[test]
-    fn new_account_state_defaults_to_zero() {
-        let account = mock_account_id(1);
-
-        let tx = MockProvenTxBuilder::with_account(
-            account,
-            [0u8, 0, 0, 0].into(),
-            [1u8, 0, 0, 0].into(),
-        )
-        .build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx).with_empty_store_state())
-            .unwrap();
-    }
-
-    #[test]
-    fn inflight_account_state_overrides_input_state() {
-        let account = mock_account_id(1);
-        let states = (1u8..=3).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-
-        let tx0 = MockProvenTxBuilder::with_account(account, states[0], states[1]).build();
-        let tx1 = MockProvenTxBuilder::with_account(account, states[1], states[2]).build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx0)).unwrap();
-
-        // Feed in an old state via input. This should be ignored, and the previous tx's final
-        // state should be used.
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx1).with_store_state(states[0]))
-            .unwrap();
-    }
-
-    #[test]
-    fn dependency_tracking() {
-        let account = mock_account_id(1);
-        let states = (1u8..=3).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-        let note_seed = 123;
-
-        // Parent via account state.
-        let tx0 = MockProvenTxBuilder::with_account(account, states[0], states[1]).build();
-        // Parent via output note.
-        let tx1 = MockProvenTxBuilder::with_account(mock_account_id(2), states[0], states[1])
-            .output_notes(vec![mock_output_note(note_seed)])
-            .build();
-
-        let tx = MockProvenTxBuilder::with_account(account, states[1], states[2])
-            .unauthenticated_notes(vec![mock_note(note_seed)])
-            .build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx0.clone())).unwrap();
-        uut.add_transaction(&AuthenticatedTransaction::from_inner(tx1.clone())).unwrap();
-
-        let parents = uut
-            .add_transaction(&AuthenticatedTransaction::from_inner(tx).with_empty_store_state())
-            .unwrap();
-        let expected = BTreeSet::from([tx0.id(), tx1.id()]);
-
-        assert_eq!(parents, expected);
-    }
-
-    #[test]
-    fn committed_parents_are_not_tracked() {
-        let account = mock_account_id(1);
-        let states = (1u8..=3).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-        let note_seed = 123;
-
-        // Parent via account state.
-        let tx0 = MockProvenTxBuilder::with_account(account, states[0], states[1]).build();
-        let tx0 = AuthenticatedTransaction::from_inner(tx0);
-        // Parent via output note.
-        let tx1 = MockProvenTxBuilder::with_account(mock_account_id(2), states[0], states[1])
-            .output_notes(vec![mock_output_note(note_seed)])
-            .build();
-        let tx1 = AuthenticatedTransaction::from_inner(tx1);
-
-        let tx = MockProvenTxBuilder::with_account(account, states[1], states[2])
-            .unauthenticated_notes(vec![mock_note(note_seed)])
-            .build();
-
-        let mut uut = InflightState::new(BlockNumber::default(), 1, 0u32);
-        uut.add_transaction(&tx0.clone()).unwrap();
-        uut.add_transaction(&tx1.clone()).unwrap();
-
-        // Commit the parents, which should remove them from dependency tracking.
-        uut.commit_block([tx0.id(), tx1.id()]);
-
-        let parents = uut
-            .add_transaction(&AuthenticatedTransaction::from_inner(tx).with_empty_store_state())
-            .unwrap();
-
-        assert!(parents.is_empty());
-    }
-
-    #[test]
-    fn tx_insertions_and_reversions_cancel_out() {
-        // Reverting txs should be equivalent to them never being inserted.
-        //
-        // We test this by reverting some txs and equating it to the remaining set.
-        // This is a form of property test.
-        let states = (1u8..=5).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-        let txs = vec![
-            MockProvenTxBuilder::with_account(mock_account_id(1), states[0], states[1]),
-            MockProvenTxBuilder::with_account(mock_account_id(1), states[1], states[2])
-                .output_notes(vec![mock_output_note(111), mock_output_note(222)]),
-            MockProvenTxBuilder::with_account(mock_account_id(2), states[0], states[1])
-                .unauthenticated_notes(vec![mock_note(222)]),
-            MockProvenTxBuilder::with_account(mock_account_id(1), states[2], states[3]),
-            MockProvenTxBuilder::with_account(mock_account_id(2), states[1], states[2])
-                .unauthenticated_notes(vec![mock_note(111)])
-                .output_notes(vec![mock_output_note(45)]),
-        ];
-
-        let txs = txs
-            .into_iter()
-            .map(MockProvenTxBuilder::build)
-            .map(AuthenticatedTransaction::from_inner)
-            .collect::<Vec<_>>();
-
-        for i in 0..states.len() {
-            // Insert all txs and then revert the last `i` of them.
-            // This should match only inserting the first `N-i` of them.
-            let mut reverted = InflightState::new(BlockNumber::default(), 1, 0u32);
-            for (idx, tx) in txs.iter().enumerate() {
-                reverted.add_transaction(tx).unwrap_or_else(|err| {
-                    panic!(
-                        "Inserting tx #{idx} in iteration {i} should succeed: {}",
-                        err.as_report()
-                    )
-                });
-            }
-            reverted.revert_transactions(
-                txs.iter().rev().take(i).rev().map(AuthenticatedTransaction::id).collect(),
-            );
-
-            let mut inserted = InflightState::new(BlockNumber::default(), 1, 0u32);
-            for (idx, tx) in txs.iter().rev().skip(i).rev().enumerate() {
-                inserted.add_transaction(tx).unwrap_or_else(|err| {
-                    panic!(
-                        "Inserting tx #{idx} in iteration {i} should succeed: {}",
-                        err.as_report()
-                    )
-                });
-            }
-
-            assert_eq!(reverted, inserted, "Iteration {i}");
-        }
-    }
-
-    #[test]
-    fn pruning_committed_state() {
-        //! This is a form of property test, where we assert that pruning the first `i` of `N`
-        //! transactions is equivalent to only inserting the last `N-i` transactions.
-        let states = (1u8..=5).map(|x| Word::from([x, 0, 0, 0])).collect::<Vec<_>>();
-
-        // Skipping initial txs means that output notes required for subsequent unauthenticated
-        // input notes wont' always be present. To work around this, we instead only use
-        // authenticated input notes.
-        let txs = vec![
-            MockProvenTxBuilder::with_account(mock_account_id(1), states[0], states[1]),
-            MockProvenTxBuilder::with_account(mock_account_id(1), states[1], states[2])
-                .output_notes(vec![mock_output_note(111), mock_output_note(222)]),
-            MockProvenTxBuilder::with_account(mock_account_id(2), states[0], states[1])
-                .nullifiers(vec![mock_note(222).nullifier()]),
-            MockProvenTxBuilder::with_account(mock_account_id(1), states[2], states[3]),
-            MockProvenTxBuilder::with_account(mock_account_id(2), states[1], states[2])
-                .nullifiers(vec![mock_note(111).nullifier()])
-                .output_notes(vec![mock_output_note(45)]),
-        ];
-
-        let txs = txs
-            .into_iter()
-            .map(MockProvenTxBuilder::build)
-            .map(AuthenticatedTransaction::from_inner)
-            .collect::<Vec<_>>();
-
-        for i in 0..states.len() {
-            // Insert all txs and then commit and prune the first `i` of them.
-            //
-            // This should match only inserting the final `N-i` transactions.
-            // Note: we force all committed state to immediately be pruned by setting
-            // it to zero.
-            let mut committed = InflightState::new(BlockNumber::default(), 0, 0u32);
-            for (idx, tx) in txs.iter().enumerate() {
-                committed.add_transaction(tx).unwrap_or_else(|err| {
-                    panic!(
-                        "Inserting tx #{idx} in iteration {i} should succeed: {}",
-                        err.as_report()
-                    )
-                });
-            }
-            committed.commit_block(txs.iter().take(i).map(AuthenticatedTransaction::id));
-
-            let mut inserted = InflightState::new(BlockNumber::from(1), 0, 0u32);
-            for (idx, tx) in txs.iter().skip(i).enumerate() {
-                // We need to adjust the height since we are effectively at block "1" now.
-                let tx = tx.clone().with_authentication_height(1.into());
-                inserted.add_transaction(&tx).unwrap_or_else(|err| {
-                    panic!(
-                        "Inserting tx #{idx} in iteration {i} should succeed: {}",
-                        err.as_report()
-                    )
-                });
-            }
-
-            assert_eq!(committed, inserted, "Iteration {i}");
-        }
-    }
-}
diff --git a/crates/block-producer/src/mempool/mod.rs b/crates/block-producer/src/mempool/mod.rs
index 0a88d8956..af8ce1c3e 100644
--- a/crates/block-producer/src/mempool/mod.rs
+++ b/crates/block-producer/src/mempool/mod.rs
@@ -1,141 +1,117 @@
-use std::collections::BTreeSet;
+//! The [`Mempool`] is responsible for receiving transactions, and proposing transactions for
+//! inclusion in batches, and proposing batches for inclusion in the next block.
+//!
+//! It performs these tasks by maintaining a dependency graph between all inflight transactions,
+//! batches and blocks. A parent-child dependency edge between two nodes exists whenever the child
+//! consumes a piece of state that the parent node created. To be more specific, node `A` is a
+//! child of node `B`:
+//!
+//! - if `B` created an output note which is the input note of `A`, or
+//! - if `B` updated an account to state `x'`, and `A` is updating this account from `x' -> x''`.
+//!
+//! Note that note dependency can only be tracked for unauthenticated input notes, because
+//! authenticated notes have their IDs erased. This isn't a problem because authenticated notes are
+//! guaranteed to be part of the committed state already by definition, and therefore we don't need
+//! to concern ourselves with them. Double spending is also not possible because of nullifiers.
+//!
+//! Maintaining this dependency graph simplifies selecting transactions for new batches, and
+//! selecting batches for new blocks. This follows from the blockchain requirement that each block
+//! must build on the state of the previous block. This in turn implies that a child node can never
+//! be committed in a block before all of its parents.
+//!
+//! The mempool also enforces that the graph contains no cycles i.e. that the dependency graph
+//! is always a directed acyclic graph (DAG). While technically not illegal from a protocol
+//! perspective, allowing cycles between nodes would require that all nodes within the cycle be
+//! committed within the same block.
+//!
+//! While this is technically possible, the bookkeeping and implementation to allow this are
+//! infeasible, and both blocks and batches have constraints. This is also undersireable since if
+//! one component of such a cycle fails or expires, then all others would likewise need to be
+//! reverted.
+//!
+//! The DAG nature of the graph is maintained by:
+//!
+//! - Ensuring incoming transactions are only ever appended to the current graph. This in turn
+//!   implies that the transaction's state transition must build on top of the current mempool
+//!   state.
+//! - Parent/child edges between nodes in the graph are formed via state dependency.
+//! - Transactions are proposed for batch inclusion only once _all_ its ancestors have already been
+//!   included in a batch (or are part of the currently proposed batch).
+//! - Similarly, batches are proposed for block inclusion once _all_ ancestors have been included in
+//!   a block (or are part of the currently proposed block).
+//! - Reverting a node reverts all descendents as well.
+
+use std::collections::{HashMap, HashSet};
+use std::num::NonZeroUsize;
 use std::sync::Arc;
 
-use batch_graph::BatchGraph;
-use graph::GraphError;
-use inflight_state::InflightState;
 use miden_node_proto::domain::mempool::MempoolEvent;
-use miden_node_utils::tracing::OpenTelemetrySpanExt;
 use miden_objects::batch::{BatchId, ProvenBatch};
 use miden_objects::block::{BlockHeader, BlockNumber};
 use miden_objects::transaction::TransactionId;
-use miden_objects::{
-    MAX_ACCOUNTS_PER_BATCH,
-    MAX_INPUT_NOTES_PER_BATCH,
-    MAX_OUTPUT_NOTES_PER_BATCH,
-};
 use subscription::SubscriptionProvider;
 use tokio::sync::{Mutex, MutexGuard, mpsc};
 use tracing::{instrument, warn};
-use transaction_expiration::TransactionExpirations;
-use transaction_graph::TransactionGraph;
 
 use crate::domain::transaction::AuthenticatedTransaction;
-use crate::errors::AddTransactionError;
-use crate::{COMPONENT, DEFAULT_MAX_BATCHES_PER_BLOCK, DEFAULT_MAX_TXS_PER_BATCH};
+use crate::errors::{AddTransactionError, VerifyTxError};
+use crate::mempool::budget::BudgetStatus;
+use crate::mempool::nodes::{BlockNode, Node, NodeId, ProposedBatchNode, TransactionNode};
+use crate::{COMPONENT, SERVER_MEMPOOL_EXPIRATION_SLACK, SERVER_MEMPOOL_STATE_RETENTION};
 
-mod batch_graph;
-mod graph;
-mod inflight_state;
+mod budget;
+pub use budget::{BatchBudget, BlockBudget};
+
+mod nodes;
+mod state;
 mod subscription;
-mod transaction_expiration;
-mod transaction_graph;
 
 #[cfg(test)]
 mod tests;
 
-// MEMPOOL BUDGET
-// ================================================================================================
-
-/// Limits placed on a batch's contents.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct BatchBudget {
-    /// Maximum number of transactions allowed in a batch.
-    pub transactions: usize,
-    /// Maximum number of input notes allowed.
-    pub input_notes: usize,
-    /// Maximum number of output notes allowed.
-    pub output_notes: usize,
-    /// Maximum number of updated accounts.
-    pub accounts: usize,
-}
-
-/// Limits placed on a blocks's contents.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct BlockBudget {
-    /// Maximum number of batches allowed in a block.
-    pub batches: usize,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum BudgetStatus {
-    /// The operation remained within the budget.
-    WithinScope,
-    /// The operation exceeded the budget.
-    Exceeded,
-}
-
-impl Default for BatchBudget {
-    fn default() -> Self {
-        Self {
-            transactions: DEFAULT_MAX_TXS_PER_BATCH,
-            input_notes: MAX_INPUT_NOTES_PER_BATCH,
-            output_notes: MAX_OUTPUT_NOTES_PER_BATCH,
-            accounts: MAX_ACCOUNTS_PER_BATCH,
-        }
-    }
-}
+#[derive(Clone)]
+pub struct SharedMempool(Arc<Mutex<Mempool>>);
 
-impl Default for BlockBudget {
-    fn default() -> Self {
-        Self { batches: DEFAULT_MAX_BATCHES_PER_BLOCK }
-    }
-}
+#[derive(Debug, Clone)]
+pub struct MempoolConfig {
+    /// The constraints each proposed block must adhere to.
+    pub block_budget: BlockBudget,
 
-impl BatchBudget {
-    /// Attempts to consume the transaction's resources from the budget.
-    ///
-    /// Returns [`BudgetStatus::Exceeded`] if the transaction would exceed the remaining budget,
-    /// otherwise returns [`BudgetStatus::Ok`] and subtracts the resources from the budger.
-    #[must_use]
-    fn check_then_subtract(&mut self, tx: &AuthenticatedTransaction) -> BudgetStatus {
-        // This type assertion reminds us to update the account check if we ever support multiple
-        // account updates per tx.
-        const ACCOUNT_UPDATES_PER_TX: usize = 1;
-        let _: miden_objects::account::AccountId = tx.account_update().account_id();
-
-        let output_notes = tx.output_note_count();
-        let input_notes = tx.input_note_count();
-
-        if self.transactions == 0
-            || self.accounts < ACCOUNT_UPDATES_PER_TX
-            || self.input_notes < input_notes
-            || self.output_notes < output_notes
-        {
-            return BudgetStatus::Exceeded;
-        }
+    /// The constraints each proposed batch must adhere to.
+    pub batch_budget: BatchBudget,
 
-        self.transactions -= 1;
-        self.accounts -= ACCOUNT_UPDATES_PER_TX;
-        self.input_notes -= input_notes;
-        self.output_notes -= output_notes;
+    /// How close to the chain tip the mempool will allow submitted transactions and batches to
+    /// expire.
+    ///
+    /// Submitted data which expires within this number of blocks to the chain tip will be
+    /// rejected. This prevents accepting data which will likely expire before it can be
+    /// included in a block.
+    pub expiration_slack: u32,
 
-        BudgetStatus::WithinScope
-    }
+    /// The number of recently committed blocks retained by the mempool.
+    ///
+    /// This retained state provides an overlap with the committed chain state in the store which
+    /// mitigates race conditions for transaction and batch authentication.
+    ///
+    /// Authentication is done against the store state _before_ arriving at the mempool, and there
+    /// is therefore opportunity for the chain state to have changed between authentication and the
+    /// mempool handling the authenticated data. Retaining the recent blocks locally therefore
+    /// guarantees that the mempool can verify the data against the additional changes so long as
+    /// the data was authenticated against one of the retained blocks.
+    pub state_retention: NonZeroUsize,
 }
 
-impl BlockBudget {
-    /// Attempts to consume the batch's resources from the budget.
-    ///
-    /// Returns [`BudgetStatus::Exceeded`] if the batch would exceed the remaining budget,
-    /// otherwise returns [`BudgetStatus::Ok`].
-    #[must_use]
-    fn check_then_subtract(&mut self, _batch: &ProvenBatch) -> BudgetStatus {
-        if self.batches == 0 {
-            BudgetStatus::Exceeded
-        } else {
-            self.batches -= 1;
-            BudgetStatus::WithinScope
+impl Default for MempoolConfig {
+    fn default() -> Self {
+        Self {
+            block_budget: BlockBudget::default(),
+            batch_budget: BatchBudget::default(),
+            expiration_slack: SERVER_MEMPOOL_EXPIRATION_SLACK,
+            state_retention: SERVER_MEMPOOL_STATE_RETENTION,
         }
     }
 }
 
-// MEMPOOL
-// ================================================================================================
-
-#[derive(Clone)]
-pub struct SharedMempool(Arc<Mutex<Mempool>>);
-
 impl SharedMempool {
     #[instrument(target = COMPONENT, name = "mempool.lock", skip_all)]
     pub async fn lock(&self) -> MutexGuard<'_, Mempool> {
@@ -145,98 +121,39 @@ impl SharedMempool {
 
 #[derive(Clone, Debug)]
 pub struct Mempool {
-    /// The latest inflight state of each account.
-    ///
-    /// Accounts without inflight transactions are not stored.
-    state: InflightState,
+    /// Contains the aggregated state of all transactions, batches and blocks currently inflight in
+    /// the mempool. Combines with `nodes` to describe the mempool's state graph.
+    state: state::InflightState,
 
-    /// Inflight transactions.
-    transactions: TransactionGraph,
+    /// Contains all the transactions, batches and blocks currently in the mempool.
+    nodes: nodes::Nodes,
 
-    /// Tracks inflight transaction expirations.
-    ///
-    /// This is used to identify inflight transactions that have become invalid once their
-    /// expiration block constraint has been violated. This occurs naturally as blocks get
-    /// committed and the chain grows.
-    expirations: TransactionExpirations,
-
-    /// Inflight batches.
-    batches: BatchGraph,
-
-    /// The current block height of the chain.
     chain_tip: BlockNumber,
 
-    /// The current inflight block, if any.
-    block_in_progress: Option<BTreeSet<BatchId>>,
-
-    block_budget: BlockBudget,
-    batch_budget: BatchBudget,
-
+    config: MempoolConfig,
     subscription: subscription::SubscriptionProvider,
 }
 
-// We have to implement this manually since the event's channel does not implement PartialEq.
+// We have to implement this manually since the subscription channel does not implement PartialEq.
 impl PartialEq for Mempool {
     fn eq(&self, other: &Self) -> bool {
-        // We use this deconstructive pattern to ensure we adapt this whenever fields are changed.
-        let Self {
-            state,
-            transactions,
-            expirations,
-            batches,
-            chain_tip,
-            block_in_progress,
-            block_budget,
-            batch_budget,
-            subscription: _,
-        } = self;
-
-        state == &other.state
-            && transactions == &other.transactions
-            && expirations == &other.expirations
-            && batches == &other.batches
-            && chain_tip == &other.chain_tip
-            && block_in_progress == &other.block_in_progress
-            && block_budget == &other.block_budget
-            && batch_budget == &other.batch_budget
+        self.state == other.state && self.nodes == other.nodes
     }
 }
 
 impl Mempool {
     /// Creates a new [`SharedMempool`] with the provided configuration.
-    pub fn shared(
-        chain_tip: BlockNumber,
-        batch_budget: BatchBudget,
-        block_budget: BlockBudget,
-        state_retention: usize,
-        expiration_slack: u32,
-    ) -> SharedMempool {
-        SharedMempool(Arc::new(Mutex::new(Self::new(
-            chain_tip,
-            batch_budget,
-            block_budget,
-            state_retention,
-            expiration_slack,
-        ))))
+    pub fn shared(chain_tip: BlockNumber, config: MempoolConfig) -> SharedMempool {
+        SharedMempool(Arc::new(Mutex::new(Self::new(chain_tip, config))))
     }
 
-    fn new(
-        chain_tip: BlockNumber,
-        batch_budget: BatchBudget,
-        block_budget: BlockBudget,
-        state_retention: usize,
-        expiration_slack: u32,
-    ) -> Mempool {
+    fn new(chain_tip: BlockNumber, config: MempoolConfig) -> Mempool {
         Self {
+            config,
             chain_tip,
-            batch_budget,
-            block_budget,
-            state: InflightState::new(chain_tip, state_retention, expiration_slack),
-            block_in_progress: None,
-            transactions: TransactionGraph::default(),
-            batches: BatchGraph::default(),
-            expirations: TransactionExpirations::default(),
             subscription: SubscriptionProvider::new(chain_tip),
+            state: state::InflightState::default(),
+            nodes: nodes::Nodes::default(),
         }
     }
 
@@ -251,18 +168,51 @@ impl Mempool {
     /// # Errors
     ///
     /// Returns an error if the transaction's initial conditions don't match the current state.
-    #[instrument(target = COMPONENT, name = "mempool.add_transaction", skip_all, fields(tx=%transaction.id()))]
+    #[instrument(target = COMPONENT, name = "mempool.add_transaction", skip_all, fields(tx=%tx.id()))]
     pub fn add_transaction(
         &mut self,
-        transaction: AuthenticatedTransaction,
+        tx: Arc<AuthenticatedTransaction>,
     ) -> Result<BlockNumber, AddTransactionError> {
-        // Add transaction to inflight state.
-        let parents = self.state.add_transaction(&transaction)?;
-        self.subscription.transaction_added(&transaction);
-        self.expirations.insert(transaction.id(), transaction.expires_at());
-        self.transactions
-            .insert(transaction, parents)
-            .expect("Transaction should insert after passing inflight state");
+        self.authentication_staleness_check(tx.authentication_height())?;
+        self.expiration_check(tx.expires_at())?;
+
+        // The transaction should append to the existing mempool state. This means:
+        //
+        // - The current account commitment should match the tx's initial state.
+        // - No duplicate nullifiers are created.
+        // - No duplicate notes are created.
+        // - All unauthenticated notes exist as output notes.
+        let account_commitment = self
+            .state
+            .account_commitment(&tx.account_id())
+            .or(tx.store_account_state())
+            .unwrap_or_default();
+        if tx.account_update().initial_state_commitment() != account_commitment {
+            return Err(VerifyTxError::IncorrectAccountInitialCommitment {
+                tx_initial_account_commitment: tx.account_update().initial_state_commitment(),
+                current_account_commitment: account_commitment,
+            }
+            .into());
+        }
+        let double_spend = self.state.nullifiers_exist(tx.nullifiers());
+        if !double_spend.is_empty() {
+            return Err(VerifyTxError::InputNotesAlreadyConsumed(double_spend).into());
+        }
+        let duplicates = self.state.output_notes_exist(tx.output_note_ids());
+        if !duplicates.is_empty() {
+            return Err(VerifyTxError::OutputNotesAlreadyExist(duplicates).into());
+        }
+        let missing = self.state.output_notes_missing(tx.unauthenticated_notes());
+        if !missing.is_empty() {
+            return Err(VerifyTxError::UnauthenticatedNotesNotFound(missing).into());
+        }
+
+        // Insert the transaction node.
+        self.subscription.transaction_added(&tx);
+        let tx = TransactionNode::new(tx);
+        self.state.insert(NodeId::Transaction(tx.id()), &tx);
+        self.nodes.txs.insert(tx.id(), tx);
+
         self.inject_telemetry();
 
         Ok(self.chain_tip)
@@ -274,55 +224,130 @@ impl Mempool {
     ///
     /// Returns `None` if no transactions are available.
     #[instrument(target = COMPONENT, name = "mempool.select_batch", skip_all)]
-    pub fn select_batch(&mut self) -> Option<(BatchId, Vec<AuthenticatedTransaction>)> {
-        let (batch, parents) = self.transactions.select_batch(self.batch_budget);
-        if batch.is_empty() {
+    pub fn select_batch(&mut self) -> Option<(BatchId, Vec<Arc<AuthenticatedTransaction>>)> {
+        // The selection algorithm is fairly neanderthal in nature.
+        //
+        // We iterate over all transaction nodes, each time selecting the first transaction which
+        // has no parent nodes that are unselected transactions. This is fairly primitive, but
+        // avoids the manual bookkeeping of which transactions are selectable.
+        //
+        // Note that selecting a transaction can unblock other transactions. This implementation
+        // handles this by resetting the iteration whenever a transaction is selected.
+        //
+        // This is still reasonably performant given that we only retain unselected transactions as
+        // transaction nodes i.e. selected transactions become batch nodes.
+        //
+        // The additional bookkeeping can be implemented once we have fee related strategies. KISS.
+
+        let mut selected = ProposedBatchNode::default();
+        let mut budget = self.config.batch_budget;
+
+        let mut candidates = self.nodes.txs.values();
+
+        'next: while let Some(candidate) = candidates.next() {
+            if selected.contains(candidate.id()) {
+                continue 'next;
+            }
+
+            // A transaction may be placed in a batch IFF all parents were already in a batch (or
+            // are part of this one).
+            for parent in self.state.parents(NodeId::Transaction(candidate.id()), candidate) {
+                match parent {
+                    // TODO(mirko): Once user batches are supported, they will also need to be
+                    // checked here.
+                    NodeId::Transaction(parent) if !selected.contains(parent) => continue 'next,
+                    NodeId::Transaction(_)
+                    | NodeId::ProposedBatch(_)
+                    | NodeId::ProvenBatch(_)
+                    | NodeId::Block(_) => {},
+                }
+            }
+
+            if budget.check_then_subtract(candidate.inner()) == BudgetStatus::Exceeded {
+                break;
+            }
+
+            candidates = self.nodes.txs.values();
+            selected.push(candidate.inner().clone());
+        }
+
+        if selected.is_empty() {
             return None;
         }
-        let tx_ids = batch.iter().map(|tx| (tx.id(), tx.account_id())).collect::<Vec<_>>();
 
-        let batch_id = self.batches.insert(tx_ids, parents).expect("Selected batch should insert");
-        self.inject_telemetry();
+        let batch_id = selected.calculate_id();
+        let batch_txs = selected.transactions().cloned().collect::<Vec<_>>();
+
+        for tx in &batch_txs {
+            let node =
+                self.nodes.txs.remove(&tx.id()).expect("selected transaction node must exist");
+            self.state.remove(&node);
+            tracing::info!(
+                batch.id = %batch_id,
+                transaction.id = %tx.id(),
+                "Transaction selected for inclusion in batch"
+            );
+        }
+        self.state.insert(NodeId::ProposedBatch(batch_id), &selected);
+        self.nodes.proposed_batches.insert(batch_id, selected);
 
-        Some((batch_id, batch))
+        // TODO(mirko): Selecting a batch can unblock user batches, which should be checked here.
+
+        self.inject_telemetry();
+        Some((batch_id, batch_txs))
     }
 
-    /// Drops the failed batch and all of its descendants.
+    /// Drops the proposed batch and all of its descendants.
     ///
-    /// Transactions are placed back in the queue.
+    /// Transactions are re-queued.
     #[instrument(target = COMPONENT, name = "mempool.rollback_batch", skip_all)]
     pub fn rollback_batch(&mut self, batch: BatchId) {
-        // Batch may already have been removed as part of a parent batches failure.
-        if !self.batches.contains(&batch) {
+        // Due to the distributed nature of the system, its possible that a proposed batch was
+        // already proven, or already reverted. This guards against this eventuality.
+        if !self.nodes.proposed_batches.contains_key(&batch) {
             return;
         }
 
-        let removed_batches =
-            self.batches.remove_batches([batch].into()).expect("Batch was not present");
-
-        let transactions = removed_batches.values().flatten().copied().collect();
-
-        self.transactions
-            .requeue_transactions(transactions)
-            .expect("Transaction should requeue");
+        // TODO(mirko): This will be somewhat complicated by the introduction of user batches
+        // since these don't have all inner txs present and therefore must at least partially
+        // revert their own tx descendents.
+
+        // Remove all descendents and reinsert their transactions. This is safe to do since
+        // a batch's state impact is the aggregation of its transactions.
+        let reverted = self.revert_subtree(NodeId::ProposedBatch(batch));
+
+        for (_, node) in reverted {
+            for tx in node.transactions() {
+                let tx = TransactionNode::new(Arc::clone(tx));
+                let tx_id = tx.id();
+                self.state.insert(NodeId::Transaction(tx_id), &tx);
+                self.nodes.txs.insert(tx_id, tx);
+                tracing::info!(
+                    batch.id = %batch,
+                    transaction.id = %tx_id,
+                    "Transaction requeued as part of batch rollback"
+                );
+            }
+        }
 
-        tracing::warn!(
-            %batch,
-            descendents=?removed_batches.keys(),
-            "Batch failed, dropping all inflight descendent batches, impacted transactions are back in queue."
-        );
         self.inject_telemetry();
     }
 
     /// Marks a batch as proven if it exists.
     #[instrument(target = COMPONENT, name = "mempool.commit_batch", skip_all)]
-    pub fn commit_batch(&mut self, batch: ProvenBatch) {
-        // Batch may have been removed as part of a parent batches failure.
-        if !self.batches.contains(&batch.id()) {
+    pub fn commit_batch(&mut self, proof: Arc<ProvenBatch>) {
+        // Due to the distributed nature of the system, its possible that a proposed batch was
+        // already proven, or already reverted. This guards against this eventuality.
+        let Some(proposed) = self.nodes.proposed_batches.remove(&proof.id()) else {
             return;
-        }
+        };
+
+        self.state.remove(&proposed);
+
+        let proven = proposed.into_proven_batch_node(proof);
+        self.state.insert(NodeId::ProvenBatch(proven.id()), &proven);
+        self.nodes.proven_batches.insert(proven.id(), proven);
 
-        self.batches.submit_proof(batch).expect("Batch proof should submit");
         self.inject_telemetry();
     }
 
@@ -336,14 +361,70 @@ impl Mempool {
     ///
     /// Panics if there is already a block in flight.
     #[instrument(target = COMPONENT, name = "mempool.select_block", skip_all)]
-    pub fn select_block(&mut self) -> (BlockNumber, Vec<ProvenBatch>) {
-        assert!(self.block_in_progress.is_none(), "Cannot have two blocks inflight.");
+    pub fn select_block(&mut self) -> (BlockNumber, Vec<Arc<ProvenBatch>>) {
+        // The selection algorithm is fairly neanderthal in nature.
+        //
+        // We iterate over all proven batch nodes, each time selecting the first which has no
+        // parent nodes that are unselected batches.
+        //
+        // Note that selecting a batch can unblock other batches. This implementation handles this
+        // by resetting the iteration whenever a batch is selected.
 
-        let batches = self.batches.select_block(self.block_budget);
-        self.block_in_progress = Some(batches.iter().map(ProvenBatch::id).collect());
-        self.inject_telemetry();
+        assert!(
+            self.nodes.proposed_block.is_none(),
+            "block {} is already in progress",
+            self.nodes.proposed_block.as_ref().unwrap().0
+        );
 
-        (self.chain_tip.child(), batches)
+        let mut selected = BlockNode::default();
+        let mut budget = self.config.block_budget;
+        let mut candidates = self.nodes.proven_batches.values();
+
+        'next: while let Some(candidate) = candidates.next() {
+            if selected.contains(candidate.id()) {
+                continue 'next;
+            }
+
+            // A batch is selectable if all parents are already blocks, or if the batch is part of
+            // the current block selection.
+            for parent in self.state.parents(NodeId::ProvenBatch(candidate.id()), candidate) {
+                match parent {
+                    NodeId::Block(_) => {},
+                    NodeId::ProvenBatch(parent) if selected.contains(parent) => {},
+                    _ => continue 'next,
+                }
+            }
+
+            if budget.check_then_subtract(candidate.inner()) == BudgetStatus::Exceeded {
+                break;
+            }
+
+            // Reset iteration as this batch could have unblocked previous batches.
+            candidates = self.nodes.proven_batches.values();
+            selected.push(candidate.clone());
+        }
+
+        let block_number = self.chain_tip.child();
+        // Replace the batches with the block in state and nodes.
+        for batch in selected.batches() {
+            // SAFETY: Selected batches came from nodes, and are unique.
+            let batch = self.nodes.proven_batches.remove(&batch.id()).unwrap();
+            self.state.remove(&batch);
+            tracing::info!(
+                block.number = %block_number,
+                batch.id = %batch.id(),
+                "Batch selected for inclusion in block",
+            );
+        }
+
+        let block_number = self.chain_tip.child();
+        let batches = selected.batches().to_vec();
+
+        self.state.insert(NodeId::Block(block_number), &selected);
+        self.nodes.proposed_block = Some((block_number, selected));
+
+        self.inject_telemetry();
+        (block_number, batches)
     }
 
     /// Notify the pool that the in flight block was successfully committed to the chain.
@@ -357,32 +438,30 @@ impl Mempool {
     /// # Returns
     ///
     /// Returns a set of transactions that were purged from the mempool because they can no longer
-    /// be included in in the chain (e.g., expired transactions and their descendants).
+    /// be included in the chain (e.g., expired transactions and their descendants).
     ///
     /// # Panics
     ///
     /// Panics if there is no block in flight.
     #[instrument(target = COMPONENT, name = "mempool.commit_block", skip_all)]
-    pub fn commit_block(&mut self, header: BlockHeader) {
-        // Remove committed batches and transactions from graphs.
-        let batches = self.block_in_progress.take().expect("No block in progress to commit");
-        let transactions =
-            self.batches.prune_committed(&batches).expect("Batches failed to commit");
-        self.transactions
-            .commit_transactions(&transactions)
-            .expect("Transaction graph malformed");
-
-        // Remove the committed transactions from expiration tracking.
-        self.expirations.remove(transactions.iter());
-
-        // Inform inflight state about committed data.
-        self.state.commit_block(transactions.clone());
+    pub fn commit_block(&mut self, to_commit: BlockHeader) {
+        let block = self
+            .nodes
+            .proposed_block
+            .take_if(|(proposed, _)| proposed == &to_commit.block_num())
+            .expect("block must be in progress to commit");
+        let tx_ids = block.1.transactions().map(|tx| tx.id()).collect();
+
+        self.nodes.committed_blocks.push_back(block);
         self.chain_tip = self.chain_tip.child();
+        self.subscription.block_committed(to_commit, tx_ids);
 
-        self.subscription.block_committed(header, transactions);
-
-        // Revert expired transactions and their descendents.
-        self.revert_expired_transactions();
+        if self.nodes.committed_blocks.len() > self.config.state_retention.get() {
+            let (_number, node) = self.nodes.committed_blocks.pop_front().unwrap();
+            self.state.remove(&node);
+        }
+        let reverted_tx_ids = self.revert_expired_nodes();
+        self.subscription.txs_reverted(reverted_tx_ids);
         self.inject_telemetry();
     }
 
@@ -401,83 +480,61 @@ impl Mempool {
     ///
     /// Panics if there is no block in flight.
     #[instrument(target = COMPONENT, name = "mempool.rollback_block", skip_all)]
-    pub fn rollback_block(&mut self) {
-        let batches = self.block_in_progress.take().expect("No block in progress to be failed");
-
-        // Revert all transactions. This is the nuclear (but simplest) solution.
+    pub fn rollback_block(&mut self, block: BlockNumber) {
+        // Only revert if the given block is actually inflight.
         //
-        // We currently don't have a way of determining why this block failed so take the safe route
-        // and just nuke all associated transactions.
+        // This guards against extreme circumstances where multiple block proofs may be inflight at
+        // once. Due to the distributed nature of the node, one can imagine a scenario where
+        // multiple provers get the same job for example.
         //
-        // TODO: improve this strategy, e.g. count txn failures (as well as in e.g. batch failures),
-        // and only revert upon exceeding some threshold.
-        let txs = batches
-            .into_iter()
-            .flat_map(|batch_id| {
-                self.batches
-                    .get_transactions(&batch_id)
-                    .expect("batch from a block must be in the mempool")
-            })
-            .copied()
-            .collect();
-        self.revert_transactions(txs)
-            .expect("transactions from a block must be part of the mempool");
-        self.inject_telemetry();
-    }
-
-    /// Gets all transactions that expire at the new chain tip and reverts them (and their
-    /// descendants) from the mempool. Returns the set of transactions that were purged.
-    #[instrument(target = COMPONENT, name = "mempool.revert_expired_transactions", skip_all)]
-    fn revert_expired_transactions(&mut self) -> BTreeSet<TransactionId> {
-        let expired = self.expirations.get(self.chain_tip);
-
-        self.revert_transactions(expired.iter().copied().collect())
-            .expect("expired transactions must be part of the mempool");
+        // FIXME: We should consider a more robust check here to identify the block by a hash.
+        //        If multiple jobs are possible, then so are multiple variants with the same block
+        //        number.
+        if self
+            .nodes
+            .proposed_block
+            .as_ref()
+            .is_none_or(|(proposed, _)| proposed != &block)
+        {
+            return;
+        }
 
-        expired
-    }
+        // Remove all descendents _without_ reinserting the transactions.
+        //
+        // This is done to prevent a system bug from causing repeated failures if we keep retrying
+        // the same transactions. Since we can't trivially identify the cause of the block
+        // failure, we take the safe route and nuke all associated state.
+        //
+        // A more refined approach could be to tag the offending transactions and then evict them
+        // once a certain failure threshold has been met.
+        let reverted = self.revert_subtree(NodeId::Block(block));
+        let mut reverted_txs = HashSet::default();
+
+        // Log reverted batches and transactions.
+        for (id, node) in reverted {
+            match id {
+                NodeId::ProposedBatch(batch_id) | NodeId::ProvenBatch(batch_id) => {
+                    tracing::info!(
+                        block.number=%block,
+                        batch.id=%batch_id,
+                        "Reverted batch as part of block rollback"
+                    );
+                },
+                NodeId::Transaction(_) | NodeId::Block(_) => {},
+            }
+
+            for tx in node.transactions() {
+                reverted_txs.insert(tx.id());
+                tracing::info!(
+                    block.number=%block,
+                    transaction.id=%tx.id(),
+                    "Reverted transaction as part of block rollback"
+                );
+            }
+        }
+        self.subscription.txs_reverted(reverted_txs);
 
-    /// Reverts the given transactions and their descendents from the mempool.
-    ///
-    /// This includes removing them from the transaction and batch graphs, as well as cleaning up
-    /// their inflight state and expiration mappings.
-    ///
-    /// Transactions that were in reverted batches but that are disjoint from the reverted
-    /// transactions (i.e. not descendents) are requeued and _not_ reverted.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if any transaction was not in the transaction graph i.e. if the transaction
-    /// is unknown.
-    #[instrument(target = COMPONENT, name = "mempool.revert_transactions", skip_all, fields(transactions.expired.ids))]
-    fn revert_transactions(
-        &mut self,
-        txs: Vec<TransactionId>,
-    ) -> Result<BTreeSet<TransactionId>, GraphError<TransactionId>> {
-        tracing::Span::current().record("transactions.expired.ids", tracing::field::debug(&txs));
-
-        // Revert all transactions and their descendents, and their associated batches.
-        let reverted = self.transactions.remove_transactions(txs)?;
-        let batches_reverted = self.batches.remove_batches_with_transactions(reverted.iter());
-
-        // Requeue transactions that are disjoint from the reverted set, but were part of the
-        // reverted batches.
-        let to_requeue = batches_reverted
-            .into_values()
-            .flatten()
-            .filter(|tx| !reverted.contains(tx))
-            .collect();
-        self.transactions
-            .requeue_transactions(to_requeue)
-            .expect("transactions from batches must be requeueable");
-
-        // Cleanup state.
-        self.expirations.remove(reverted.iter());
-        self.state.revert_transactions(reverted.clone());
-
-        self.subscription.txs_reverted(reverted.clone());
-
-        Ok(reverted)
+        self.inject_telemetry();
     }
 
     /// Creates a subscription to [`MempoolEvent`] which will be emitted in the order they occur.
@@ -503,14 +560,155 @@ impl Mempool {
     fn inject_telemetry(&self) {
         let span = tracing::Span::current();
 
-        span.set_attribute("mempool.transactions.total", self.transactions.len());
-        span.set_attribute("mempool.transactions.roots", self.transactions.num_roots());
-        span.set_attribute("mempool.accounts", self.state.num_accounts());
-        span.set_attribute("mempool.nullifiers", self.state.num_nullifiers());
-        span.set_attribute("mempool.output_notes", self.state.num_notes_created());
-        span.set_attribute("mempool.batches.pending", self.batches.num_pending());
-        span.set_attribute("mempool.batches.proven", self.batches.num_proven());
-        span.set_attribute("mempool.batches.total", self.batches.len());
-        span.set_attribute("mempool.batches.roots", self.batches.num_roots());
+        self.nodes.inject_telemetry(&span);
+        self.state.inject_telemetry(&span);
+    }
+
+    /// Reverts expired transactions and batches as per the current `chain_tip`.
+    ///
+    /// Returns the list of all transactions that were reverted.
+    fn revert_expired_nodes(&mut self) -> HashSet<TransactionId> {
+        let expired_txs = self.nodes.txs.iter().filter_map(|(id, node)| {
+            (node.expires_at() <= self.chain_tip).then_some(NodeId::Transaction(*id))
+        });
+        let expired_proposed_batches =
+            self.nodes.proposed_batches.iter().filter_map(|(id, node)| {
+                (node.expires_at() <= self.chain_tip).then_some(NodeId::ProposedBatch(*id))
+            });
+        let expired_proven_batches = self.nodes.proven_batches.iter().filter_map(|(id, node)| {
+            (node.expires_at() <= self.chain_tip).then_some(NodeId::ProvenBatch(*id))
+        });
+
+        let expired = expired_proven_batches
+            .chain(expired_proposed_batches)
+            .chain(expired_txs)
+            .collect::<Vec<_>>();
+        let mut reverted_txs = HashSet::default();
+        for expired_id in expired {
+            let reverted = self.revert_subtree(expired_id);
+            for (id, node) in reverted {
+                match id {
+                    NodeId::ProposedBatch(batch_id) | NodeId::ProvenBatch(batch_id) => {
+                        tracing::info!(
+                            ancestor=?expired_id,
+                            batch.id=%batch_id,
+                            "Reverted batch due to expiration of ancestor"
+                        );
+                    },
+                    NodeId::Transaction(_) => {},
+                    NodeId::Block(block_number) => panic!(
+                        "Found block {block_number} descendent while reverting expired nodes which shouldn't be possible since only one block is in progress"
+                    ),
+                }
+
+                for tx in node.transactions() {
+                    reverted_txs.insert(tx.id());
+                    tracing::info!(
+                        ancestor=?expired_id,
+                        transaction.id=%tx.id(),
+                        "Reverted transaction due to expiration of ancestor"
+                    );
+                }
+            }
+        }
+
+        reverted_txs
+    }
+
+    /// Reverts the subtree with the given root and returns the reverted nodes. Does nothing if the
+    /// root node does not exist to allow using this in cases where multiple overlapping calls to
+    /// this are made.
+    fn revert_subtree(&mut self, root: NodeId) -> HashMap<NodeId, Box<dyn Node>> {
+        let root_exists = match root {
+            NodeId::Transaction(id) => self.nodes.txs.contains_key(&id),
+            NodeId::ProposedBatch(id) => self.nodes.proposed_batches.contains_key(&id),
+            NodeId::ProvenBatch(id) => self.nodes.proven_batches.contains_key(&id),
+            NodeId::Block(id) => {
+                self.nodes.proposed_block.as_ref().is_some_and(|(number, _)| *number == id)
+            },
+        };
+        if !root_exists {
+            return HashMap::default();
+        }
+
+        let mut to_process = vec![root];
+        let mut reverted = HashMap::default();
+
+        while let Some(id) = to_process.pop() {
+            if reverted.contains_key(&id) {
+                continue;
+            }
+
+            // SAFETY: all IDs come from the state DAG and must therefore exist. The processed check
+            // above also prevents removing a node twice.
+            let node: Box<dyn Node> = match id {
+                NodeId::Transaction(id) => {
+                    self.nodes.txs.remove(&id).map(|x| Box::new(x) as Box<dyn Node>)
+                },
+                NodeId::ProposedBatch(id) => {
+                    self.nodes.proposed_batches.remove(&id).map(|x| Box::new(x) as Box<dyn Node>)
+                },
+                NodeId::ProvenBatch(id) => {
+                    self.nodes.proven_batches.remove(&id).map(|x| Box::new(x) as Box<dyn Node>)
+                },
+                NodeId::Block(id) => self
+                    .nodes
+                    .proposed_block
+                    .take_if(|(number, _)| number == &id)
+                    .map(|(_, x)| Box::new(x) as Box<dyn Node>),
+            }
+            .unwrap();
+
+            to_process.extend(self.state.children(id, node.as_ref()));
+            self.state.remove(node.as_ref());
+            reverted.insert(id, node);
+        }
+
+        reverted
+    }
+
+    /// Rejects authentication height's which we cannot guarantee are correct from the locally
+    /// retained state.
+    ///
+    /// In other words, this returns an error if the authentication height is more than one block
+    /// older than the locally retained state. One block is allowed because this means block `N-1`
+    /// was authenticated by the store, and we can check blocks `N..chain_tip`.
+    ///
+    /// # Panics
+    ///
+    /// This panics if the authentication height exceeds the latest locally known block. This
+    /// includes any proposed block since the block is committed to the mempool and store
+    /// concurrently (or at least can be).
+    fn authentication_staleness_check(
+        &self,
+        authentication_height: BlockNumber,
+    ) -> Result<(), AddTransactionError> {
+        let oldest = self.nodes.oldest_committed_block().unwrap_or_default();
+        let limit = oldest.parent().unwrap_or_default();
+
+        if authentication_height < limit {
+            return Err(AddTransactionError::StaleInputs {
+                input_block: authentication_height,
+                stale_limit: limit,
+            });
+        }
+
+        let latest_block =
+            self.nodes.proposed_block.as_ref().map_or(self.chain_tip, |(number, _)| *number);
+        assert!(
+            authentication_height <= latest_block,
+            "Authentication height {authentication_height} exceeded the latest known block {latest_block}"
+        );
+
+        Ok(())
+    }
+
+    fn expiration_check(&self, expired_at: BlockNumber) -> Result<(), AddTransactionError> {
+        let limit = self.chain_tip + self.config.expiration_slack;
+        if expired_at <= limit {
+            return Err(AddTransactionError::Expired { expired_at, limit });
+        }
+
+        Ok(())
     }
 }
diff --git a/crates/block-producer/src/mempool/nodes.rs b/crates/block-producer/src/mempool/nodes.rs
new file mode 100644
index 000000000..cdacd3c09
--- /dev/null
+++ b/crates/block-producer/src/mempool/nodes.rs
@@ -0,0 +1,316 @@
+use std::collections::{HashMap, VecDeque};
+use std::sync::Arc;
+
+use miden_objects::Word;
+use miden_objects::account::AccountId;
+use miden_objects::batch::{BatchId, ProvenBatch};
+use miden_objects::block::BlockNumber;
+use miden_objects::note::{NoteHeader, NoteId, Nullifier};
+use miden_objects::transaction::{InputNoteCommitment, TransactionHeader, TransactionId};
+
+use crate::domain::transaction::AuthenticatedTransaction;
+
+/// Uniquely identifies a node in the mempool.
+///
+/// This effectively describes the lifecycle of a transaction in the mempool.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+pub(super) enum NodeId {
+    Transaction(TransactionId),
+    // UserBatch(BatchId),
+    ProposedBatch(BatchId),
+    ProvenBatch(BatchId),
+    Block(BlockNumber),
+}
+
+/// A node representing a [`AuthenticatedTransaction`] which is waiting for inclusion in a batch.
+///
+/// Once this is selected for inclusion in a batch it will be moved inside a [`ProposedBatchNode`].
+#[derive(Clone, Debug, PartialEq)]
+pub(super) struct TransactionNode(Arc<AuthenticatedTransaction>);
+
+impl TransactionNode {
+    pub(super) fn new(inner: Arc<AuthenticatedTransaction>) -> Self {
+        Self(inner)
+    }
+
+    pub(super) fn id(&self) -> TransactionId {
+        self.0.id()
+    }
+
+    pub(super) fn inner(&self) -> &Arc<AuthenticatedTransaction> {
+        &self.0
+    }
+
+    pub(super) fn expires_at(&self) -> BlockNumber {
+        self.0.expires_at()
+    }
+}
+
+/// Represents a batch which has been proposed by the mempool and which is undergoing proving.
+///
+/// Once proven it transitions to a [`ProvenBatchNode`].
+#[derive(Clone, Debug, PartialEq, Default)]
+pub(super) struct ProposedBatchNode(Vec<Arc<AuthenticatedTransaction>>);
+
+impl ProposedBatchNode {
+    pub(super) fn push(&mut self, tx: Arc<AuthenticatedTransaction>) {
+        self.0.push(tx);
+    }
+
+    pub(super) fn contains(&mut self, id: TransactionId) -> bool {
+        self.0.iter().any(|tx| tx.id() == id)
+    }
+
+    pub(super) fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    pub(super) fn calculate_id(&self) -> BatchId {
+        BatchId::from_transactions(
+            self.0
+                .iter()
+                .map(AsRef::as_ref)
+                .map(AuthenticatedTransaction::raw_proven_transaction),
+        )
+    }
+
+    pub(super) fn into_proven_batch_node(self, proof: Arc<ProvenBatch>) -> ProvenBatchNode {
+        let Self(txs) = self;
+        ProvenBatchNode { txs, inner: proof }
+    }
+
+    pub(super) fn expires_at(&self) -> BlockNumber {
+        self.0.iter().map(|tx| tx.expires_at()).min().unwrap_or_default()
+    }
+}
+
+/// Represents a [`ProvenBatch`] which is waiting for inclusion in a block.
+#[derive(Clone, Debug, PartialEq)]
+pub(super) struct ProvenBatchNode {
+    /// We need to store this in addition to the proven batch because [`ProvenBatch`] erases the
+    /// transaction information. We need the original information if we want to rollback the batch
+    /// but retain the transactions.
+    txs: Vec<Arc<AuthenticatedTransaction>>,
+    inner: Arc<ProvenBatch>,
+}
+
+impl ProvenBatchNode {
+    pub(super) fn tx_headers(&self) -> impl Iterator<Item = &TransactionHeader> {
+        self.inner.transactions().as_slice().iter()
+    }
+
+    pub(super) fn id(&self) -> BatchId {
+        self.inner.id()
+    }
+
+    pub(super) fn inner(&self) -> &Arc<ProvenBatch> {
+        &self.inner
+    }
+
+    pub(super) fn expires_at(&self) -> BlockNumber {
+        self.inner.batch_expiration_block_num()
+    }
+}
+
+/// Represents a block - both committed and in-progress.
+#[derive(Clone, Debug, PartialEq, Default)]
+pub(super) struct BlockNode {
+    txs: Vec<Arc<AuthenticatedTransaction>>,
+    batches: Vec<Arc<ProvenBatch>>,
+}
+
+impl BlockNode {
+    pub(super) fn push(&mut self, batch: ProvenBatchNode) {
+        let ProvenBatchNode { txs, inner } = batch;
+        self.txs.extend(txs);
+        self.batches.push(inner);
+    }
+
+    pub(super) fn contains(&self, id: BatchId) -> bool {
+        self.batches.iter().any(|batch| batch.id() == id)
+    }
+
+    pub(super) fn batches(&self) -> &[Arc<ProvenBatch>] {
+        &self.batches
+    }
+}
+
+/// Describes a node's impact on the state.
+///
+/// This is used to determine what state data is created or consumed by this node.
+pub(super) trait Node {
+    /// All [`Nullifier`]s created by this node, **including** nullifiers for erased notes. This
+    /// may not be strictly necessary but it removes having to worry about reverting batches and
+    /// blocks with erased notes -- since these would otherwise have different state impact than
+    /// the transactions within them.
+    fn nullifiers(&self) -> Box<dyn Iterator<Item = Nullifier> + '_>;
+
+    /// All output notes created by this node, **including** erased notes. This may not be strictly
+    /// necessary but it removes having to worry about reverting batches and blocks with erased
+    /// notes -- since these would otherwise have different state impact than the transactions
+    /// within them.
+    fn output_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_>;
+    fn unauthenticated_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_>;
+    /// The account state commitment updates caused by this node.
+    ///
+    /// Output tuple represents each updates `(account ID, initial commitment, final commitment)`.
+    fn account_updates(&self) -> Box<dyn Iterator<Item = (AccountId, Word, Word)> + '_>;
+    fn transactions(&self) -> Box<dyn Iterator<Item = &Arc<AuthenticatedTransaction>> + '_>;
+}
+
+impl Node for TransactionNode {
+    fn nullifiers(&self) -> Box<dyn Iterator<Item = Nullifier> + '_> {
+        Box::new(self.0.nullifiers())
+    }
+
+    fn output_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(self.0.output_note_ids())
+    }
+
+    fn unauthenticated_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(self.0.unauthenticated_notes())
+    }
+
+    fn account_updates(&self) -> Box<dyn Iterator<Item = (AccountId, Word, Word)> + '_> {
+        let update = self.0.account_update();
+        Box::new(std::iter::once((
+            update.account_id(),
+            update.initial_state_commitment(),
+            update.final_state_commitment(),
+        )))
+    }
+
+    fn transactions(&self) -> Box<dyn Iterator<Item = &Arc<AuthenticatedTransaction>> + '_> {
+        Box::new(std::iter::once(&self.0))
+    }
+}
+
+impl Node for ProposedBatchNode {
+    fn nullifiers(&self) -> Box<dyn Iterator<Item = Nullifier> + '_> {
+        Box::new(self.0.iter().flat_map(|tx| tx.nullifiers()))
+    }
+
+    fn output_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(self.0.iter().flat_map(|tx| tx.output_note_ids()))
+    }
+
+    fn unauthenticated_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(self.0.iter().flat_map(|tx| tx.unauthenticated_notes()))
+    }
+
+    fn account_updates(&self) -> Box<dyn Iterator<Item = (AccountId, Word, Word)> + '_> {
+        Box::new(self.0.iter().flat_map(|tx| {
+            let update = tx.account_update();
+            std::iter::once((
+                update.account_id(),
+                update.initial_state_commitment(),
+                update.final_state_commitment(),
+            ))
+        }))
+    }
+
+    fn transactions(&self) -> Box<dyn Iterator<Item = &Arc<AuthenticatedTransaction>> + '_> {
+        Box::new(self.0.iter())
+    }
+}
+
+impl Node for ProvenBatchNode {
+    fn nullifiers(&self) -> Box<dyn Iterator<Item = Nullifier> + '_> {
+        Box::new(
+            self.tx_headers()
+                .flat_map(|tx| tx.input_notes().iter().map(InputNoteCommitment::nullifier)),
+        )
+    }
+
+    fn output_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(self.tx_headers().flat_map(|tx| tx.output_notes().iter().map(NoteHeader::id)))
+    }
+
+    fn unauthenticated_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(
+            self.inner
+                .input_notes()
+                .iter()
+                .filter_map(|note| note.header())
+                .map(NoteHeader::id),
+        )
+    }
+
+    fn account_updates(&self) -> Box<dyn Iterator<Item = (AccountId, Word, Word)> + '_> {
+        Box::new(self.inner.account_updates().values().map(|update| {
+            (
+                update.account_id(),
+                update.initial_state_commitment(),
+                update.final_state_commitment(),
+            )
+        }))
+    }
+
+    fn transactions(&self) -> Box<dyn Iterator<Item = &Arc<AuthenticatedTransaction>> + '_> {
+        Box::new(self.txs.iter())
+    }
+}
+
+impl Node for BlockNode {
+    fn nullifiers(&self) -> Box<dyn Iterator<Item = Nullifier> + '_> {
+        Box::new(self.txs.iter().flat_map(|tx| tx.nullifiers()))
+    }
+
+    fn output_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(self.txs.iter().flat_map(|tx| tx.output_note_ids()))
+    }
+
+    fn unauthenticated_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+        Box::new(self.batches.iter().flat_map(|batch| {
+            batch.input_notes().iter().filter_map(|note| note.header().map(NoteHeader::id))
+        }))
+    }
+
+    fn account_updates(&self) -> Box<dyn Iterator<Item = (AccountId, Word, Word)> + '_> {
+        Box::new(self.batches.iter().flat_map(|batch| batch.account_updates()).map(
+            |(_, update)| {
+                (
+                    update.account_id(),
+                    update.initial_state_commitment(),
+                    update.final_state_commitment(),
+                )
+            },
+        ))
+    }
+
+    fn transactions(&self) -> Box<dyn Iterator<Item = &Arc<AuthenticatedTransaction>> + '_> {
+        Box::new(self.txs.iter())
+    }
+}
+
+/// Contains the current nodes of the state DAG.
+///
+/// Nodes are purposefully not stored as a single collection since we often want to iterate
+/// through specific node types e.g. all available transactions.
+///
+/// This data _must_ be kept in sync with the [`InflightState's`] [`NodeIds`] since these are
+/// used as the edges of the graph.
+#[derive(Clone, Debug, PartialEq, Default)]
+pub(super) struct Nodes {
+    // Nodes in the DAG
+    pub(super) txs: HashMap<TransactionId, TransactionNode>,
+    // user_batches: HashMap<BatchId, ProvenBatchNode>,
+    pub(super) proposed_batches: HashMap<BatchId, ProposedBatchNode>,
+    pub(super) proven_batches: HashMap<BatchId, ProvenBatchNode>,
+    pub(super) proposed_block: Option<(BlockNumber, BlockNode)>,
+    pub(super) committed_blocks: VecDeque<(BlockNumber, BlockNode)>,
+}
+
+impl Nodes {
+    pub(super) fn oldest_committed_block(&self) -> Option<BlockNumber> {
+        self.committed_blocks.front().map(|(number, _)| *number)
+    }
+
+    pub(super) fn inject_telemetry(&self, span: &tracing::Span) {
+        use miden_node_utils::tracing::OpenTelemetrySpanExt;
+
+        span.set_attribute("mempool.transactions.unbatched", self.txs.len());
+        span.set_attribute("mempool.batches.proposed", self.proposed_batches.len());
+        span.set_attribute("mempool.batches.proven", self.proven_batches.len());
+    }
+}
diff --git a/crates/block-producer/src/mempool/state.rs b/crates/block-producer/src/mempool/state.rs
new file mode 100644
index 000000000..c5dc52b81
--- /dev/null
+++ b/crates/block-producer/src/mempool/state.rs
@@ -0,0 +1,248 @@
+use std::collections::hash_map::Entry;
+use std::collections::{HashMap, HashSet};
+
+use miden_objects::Word;
+use miden_objects::account::AccountId;
+use miden_objects::note::{NoteId, Nullifier};
+
+use crate::mempool::nodes::{Node, NodeId};
+
+/// Tracks the inflight state of the mempool and the [`NodeId`]s associated with each piece of it.
+///
+/// This allows it to track the dependency relationships between nodes in the mempool's state DAG by
+/// checking which [`NodeId`]s created or consumed the data the node relies on.
+///
+/// Note that the user is responsible for ensuring that the inserted nodes adhere to a DAG
+/// structure. No attempt is made to verify this internally here as it requires more information
+/// than is available at this level.
+#[derive(Clone, Debug, PartialEq, Default)]
+pub(super) struct InflightState {
+    /// All nullifiers created by inflight state.
+    ///
+    /// This _includes_ nullifiers from erased notes to simplify reverting nodes and requeuing
+    /// their transactions. If this weren't the case, then its possible that a batch contains an
+    /// erased note which can clash with another inflight transaction. If we were to revert this
+    /// batch and requeue its transactions, then this would be illegal. This is possible to handle
+    /// but would be painful ito bookkeeping.
+    ///
+    /// Instead we opt to include erased notes in the tracking here, which allows us to revert the
+    /// batch and requeue its transactions without having to worry about note clashes.
+    nullifiers: HashSet<Nullifier>,
+
+    /// All created notes and the ID of the node that created it.
+    ///
+    /// This _includes_ erased notes, see `nullifiers` for more information.
+    output_notes: HashMap<NoteId, NodeId>,
+
+    /// Maps all unauthenticated notes to the node ID that consumed them.
+    ///
+    /// This can be combined with `output_notes` to infer a parent<->child relationship between
+    /// nodes i.e. the parent node that created a note and the child node that consumed the note.
+    ///
+    /// It is the callers responsibility to ensure that all unauthenticated notes exist as output
+    /// notes at the time when a new transaction or batch node is inserted.
+    unauthenticated_notes: HashMap<NoteId, NodeId>,
+
+    /// All inflight account commitment transitions.
+    accounts: HashMap<AccountId, AccountUpdates>,
+}
+
+impl InflightState {
+    /// Returns all nullifiers which already exist.
+    pub(super) fn nullifiers_exist(
+        &self,
+        nullifiers: impl Iterator<Item = Nullifier>,
+    ) -> Vec<Nullifier> {
+        nullifiers.filter(|nullifier| self.nullifiers.contains(nullifier)).collect()
+    }
+
+    /// Returns all output notes which already exist.
+    pub(super) fn output_notes_exist(&self, notes: impl Iterator<Item = NoteId>) -> Vec<NoteId> {
+        notes.filter(|note| self.output_notes.contains_key(note)).collect()
+    }
+
+    /// Returns all output notes which don't exist.
+    pub(super) fn output_notes_missing(&self, notes: impl Iterator<Item = NoteId>) -> Vec<NoteId> {
+        notes.filter(|note| !self.output_notes.contains_key(note)).collect()
+    }
+
+    /// The latest account commitment tracked by the inflight state.
+    ///
+    /// A [`None`] value _does not_ mean this account doesn't exist at all, but rather that it
+    /// has no inflight nodes.
+    pub(super) fn account_commitment(&self, account: &AccountId) -> Option<Word> {
+        self.accounts.get(account).map(AccountUpdates::latest_commitment)
+    }
+
+    /// Removes all the state of the node from tracking.
+    ///
+    /// Note that this simply removes the data and does not check that the data was associated with
+    /// the [`Node`] at the time of removal. The caller is responsible for ensuring that the given
+    /// node was still active in the state.
+    pub(super) fn remove(&mut self, node: &dyn Node) {
+        for nullifier in node.nullifiers() {
+            assert!(
+                self.nullifiers.remove(&nullifier),
+                "Nullifier {nullifier} was not present for removal"
+            );
+        }
+
+        for note in node.output_notes() {
+            assert!(
+                self.output_notes.remove(&note).is_some(),
+                "Output note {note} was not present for removal"
+            );
+        }
+
+        for note in node.unauthenticated_notes() {
+            assert!(
+                self.unauthenticated_notes.remove(&note).is_some(),
+                "Unauthenticated note {note} was not present for removal"
+            );
+        }
+
+        for (account, from, to) in node.account_updates() {
+            let Entry::Occupied(entry) =
+                self.accounts.entry(account).and_modify(|entry| entry.remove(from, to))
+            else {
+                panic!("Account {account} update ({from} -> {to}) was not present for removal");
+            };
+
+            if entry.get().is_empty() {
+                entry.remove_entry();
+            }
+        }
+    }
+
+    /// Inserts the node into the state, associating the data with the node's ID. This powers the
+    /// parent and child relationship lookups.
+    pub(super) fn insert(&mut self, id: NodeId, node: &dyn Node) {
+        self.nullifiers.extend(node.nullifiers());
+        self.output_notes.extend(node.output_notes().map(|note| (note, id)));
+        self.unauthenticated_notes
+            .extend(node.unauthenticated_notes().map(|note| (note, id)));
+
+        for (account, from, to) in node.account_updates() {
+            self.accounts.entry(account).or_default().insert(id, from, to);
+        }
+    }
+
+    /// The [`NodeId`]s which the given node directly depends on.
+    ///
+    /// Note that the result is invalidated by mutating the state.
+    pub(super) fn parents(&self, id: NodeId, node: &dyn Node) -> HashSet<NodeId> {
+        let note_parents =
+            node.unauthenticated_notes().filter_map(|note| self.output_notes.get(&note));
+
+        let account_parents = node
+            .account_updates()
+            .filter_map(|(account, from, _to)| {
+                self.accounts.get(&account).map(|account| account.parent(&from))
+            })
+            .flatten();
+
+        account_parents
+            .chain(note_parents)
+            .copied()
+            // Its possible for a node to have internal state connecting to itself. For example,
+            // a proposed batch has not erased the internally produced and consumed notes.
+            .filter(|parent| parent != &id)
+            .collect()
+    }
+
+    /// The [`NodeId`]s which depend directly on the given node.
+    ///
+    /// Note that the result is invalidated by mutating the state.
+    pub(super) fn children(&self, id: NodeId, node: &dyn Node) -> HashSet<NodeId> {
+        let note_children =
+            node.output_notes().filter_map(|note| self.unauthenticated_notes.get(&note));
+
+        let account_children = node
+            .account_updates()
+            .filter_map(|(account, _from, to)| {
+                self.accounts.get(&account).map(|account| account.child(&to))
+            })
+            .flatten();
+
+        account_children
+            .chain(note_children)
+            .copied()
+            // Its possible for a node to have internal state connecting to itself. For example,
+            // a proposed batch has not erased the internally produced and consumed notes.
+            .filter(|child| child != &id)
+            .collect()
+    }
+
+    pub(super) fn inject_telemetry(&self, span: &tracing::Span) {
+        use miden_node_utils::tracing::OpenTelemetrySpanExt;
+
+        span.set_attribute("mempool.accounts", self.accounts.len());
+        span.set_attribute("mempool.nullifiers", self.nullifiers.len());
+        span.set_attribute("mempool.output_notes", self.output_notes.len());
+    }
+}
+
+/// The commitment updates made to a account.
+#[derive(Clone, Debug, PartialEq, Default)]
+struct AccountUpdates {
+    from: HashMap<Word, NodeId>,
+    to: HashMap<Word, NodeId>,
+}
+
+impl AccountUpdates {
+    fn latest_commitment(&self) -> Word {
+        // The latest commitment will be whichever commitment isn't consumed aka a `to` which has
+        // no `from`. This breaks if this isn't in a valid state.
+        self.to
+            .keys()
+            .find(|commitment| !self.from.contains_key(commitment))
+            .copied()
+            .unwrap_or_default()
+    }
+
+    fn is_empty(&self) -> bool {
+        self.from.is_empty() && self.to.is_empty()
+    }
+
+    fn remove(&mut self, from: Word, to: Word) {
+        let from_removed = self
+            .from
+            .remove(&from)
+            .expect("should only be removing account updates from nodes that are present");
+        let to_removed = self
+            .to
+            .remove(&to)
+            .expect("should only be removing account updates from nodes that are present");
+        assert_eq!(
+            from_removed, to_removed,
+            "Account updates should be removed as a pair with the same node ID"
+        );
+    }
+
+    fn insert(&mut self, id: NodeId, from: Word, to: Word) {
+        assert!(
+            self.from.insert(from, id).is_none(),
+            "Account already contained the commitment {from} when inserting {id:?}"
+        );
+        assert!(
+            self.to.insert(to, id).is_none(),
+            "Account already contained the commitment {to} when inserting {id:?}"
+        );
+    }
+
+    /// Returns the node ID that updated this account's commitment to the given value.
+    ///
+    /// In other words, this returns the ID of `node` where `node.to == from`. This infers the
+    /// parent-child relationship where `parent.to == child.from`.
+    fn parent(&self, from: &Word) -> Option<&NodeId> {
+        self.to.get(from)
+    }
+
+    /// Returns the node ID that consumed the given commitment.
+    ///
+    /// In other words, this returns the ID of `node` where `node.from == to`. This infers the
+    /// parent-child relationship where `parent.to == child.from`.
+    fn child(&self, to: &Word) -> Option<&NodeId> {
+        self.from.get(to)
+    }
+}
diff --git a/crates/block-producer/src/mempool/subscription.rs b/crates/block-producer/src/mempool/subscription.rs
index 5b4752cb2..70789bdd8 100644
--- a/crates/block-producer/src/mempool/subscription.rs
+++ b/crates/block-producer/src/mempool/subscription.rs
@@ -1,4 +1,4 @@
-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::{BTreeMap, HashSet};
 use std::ops::Mul;
 
 use miden_node_proto::domain::mempool::MempoolEvent;
@@ -109,7 +109,7 @@ impl SubscriptionProvider {
         Self::send_event(&mut self.subscription, MempoolEvent::BlockCommitted { header, txs });
     }
 
-    pub(super) fn txs_reverted(&mut self, txs: BTreeSet<TransactionId>) {
+    pub(super) fn txs_reverted(&mut self, txs: HashSet<TransactionId>) {
         for tx in &txs {
             self.inflight_txs.remove(tx);
         }
diff --git a/crates/block-producer/src/mempool/tests.rs b/crates/block-producer/src/mempool/tests.rs
index fa672b20d..a2666b53a 100644
--- a/crates/block-producer/src/mempool/tests.rs
+++ b/crates/block-producer/src/mempool/tests.rs
@@ -1,5 +1,7 @@
+use std::sync::Arc;
+
 use miden_objects::Word;
-use miden_objects::block::BlockNumber;
+use miden_objects::block::{BlockHeader, BlockNumber};
 use pretty_assertions::assert_eq;
 use serial_test::serial;
 
@@ -7,15 +9,26 @@ use super::*;
 use crate::test_utils::MockProvenTxBuilder;
 use crate::test_utils::batch::TransactionBatchConstructor;
 
+mod add_transaction;
+
 impl Mempool {
-    fn for_tests() -> Self {
-        Self::new(
+    /// Returns an empty [`Mempool`] and a perfect clone intended for use as the Unit Under Test and
+    /// the reference instance.
+    ///
+    /// The clone is important as this guarantees that the internal _hash_ state is the same. This
+    /// is relevant for internal `HashMap`s which would otherwise give different iteration order
+    /// which in turn doesn't let different mempool instances give the same results.
+    fn for_tests() -> (Self, Self) {
+        let uut = Self::new(
             BlockNumber::GENESIS,
-            BatchBudget::default(),
-            BlockBudget::default(),
-            5,
-            u32::default(),
-        )
+            MempoolConfig {
+                expiration_slack: 3,
+                state_retention: NonZeroUsize::new(5).unwrap(),
+                ..Default::default()
+            },
+        );
+
+        (uut.clone(), uut)
     }
 }
 
@@ -27,7 +40,7 @@ impl Mempool {
 async fn add_transaction_traces_are_correct() {
     let (mut rx_export, _rx_shutdown) = miden_node_utils::logging::setup_test_tracing().unwrap();
 
-    let mut uut = Mempool::for_tests();
+    let (mut uut, _) = Mempool::for_tests();
     let txs = MockProvenTxBuilder::sequential();
     uut.add_transaction(txs[0].clone()).unwrap();
 
@@ -43,31 +56,6 @@ async fn add_transaction_traces_are_correct() {
     );
 }
 
-#[tokio::test]
-#[serial(open_telemetry_tracing)]
-async fn revert_transactions_traces_are_correct() {
-    let (mut rx_export, _rx_shutdown) = miden_node_utils::logging::setup_test_tracing().unwrap();
-
-    let mut uut = Mempool::for_tests();
-    let txs = MockProvenTxBuilder::sequential();
-    uut.add_transaction(txs[0].clone()).unwrap();
-    let span_data = rx_export.recv().await.unwrap();
-    assert_eq!(span_data.name, "mempool.add_transaction");
-
-    uut.revert_transactions(vec![txs[0].id()]).unwrap();
-    let span_data = rx_export.recv().await.unwrap();
-    assert_eq!(span_data.name, "mempool.revert_transactions");
-    assert!(span_data.attributes.iter().any(|kv| kv.key == "code.namespace".into()
-        && kv.value == "miden_node_block_producer::mempool".into()));
-
-    assert!(
-        span_data
-            .attributes
-            .iter()
-            .any(|kv| kv.key == "transactions.expired.ids".into())
-    );
-}
-
 // BATCH FAILED TESTS
 // ================================================================================================
 
@@ -78,7 +66,7 @@ fn children_of_failed_batches_are_ignored() {
     // should be ignored.
     let txs = MockProvenTxBuilder::sequential();
 
-    let mut uut = Mempool::for_tests();
+    let (mut uut, _) = Mempool::for_tests();
     uut.add_transaction(txs[0].clone()).unwrap();
     let (parent_batch, batch_txs) = uut.select_batch().unwrap();
     assert_eq!(batch_txs, vec![txs[0].clone()]);
@@ -99,7 +87,8 @@ fn children_of_failed_batches_are_ignored() {
     uut.rollback_batch(child_batch_a);
     assert_eq!(uut, reference);
 
-    let proven_batch = ProvenBatch::mocked_from_transactions([txs[2].raw_proven_transaction()]);
+    let proven_batch =
+        Arc::new(ProvenBatch::mocked_from_transactions([txs[2].raw_proven_transaction()]));
     uut.commit_batch(proven_batch);
     assert_eq!(uut, reference);
 }
@@ -108,7 +97,7 @@ fn children_of_failed_batches_are_ignored() {
 fn failed_batch_transactions_are_requeued() {
     let txs = MockProvenTxBuilder::sequential();
 
-    let mut uut = Mempool::for_tests();
+    let (mut uut, mut reference) = Mempool::for_tests();
     uut.add_transaction(txs[0].clone()).unwrap();
     uut.select_batch().unwrap();
 
@@ -121,7 +110,6 @@ fn failed_batch_transactions_are_requeued() {
     // Middle batch failed, so it and its child transaction should be re-entered into the queue.
     uut.rollback_batch(failed_batch);
 
-    let mut reference = Mempool::for_tests();
     reference.add_transaction(txs[0].clone()).unwrap();
     reference.select_batch().unwrap();
     reference.add_transaction(txs[1].clone()).unwrap();
@@ -136,17 +124,18 @@ fn failed_batch_transactions_are_requeued() {
 /// Expired transactions should be reverted once their expiration block is committed.
 #[test]
 fn block_commit_reverts_expired_txns() {
-    let mut uut = Mempool::for_tests();
+    let (mut uut, _) = Mempool::for_tests();
+    uut.config.expiration_slack = 0;
 
     let tx_to_commit = MockProvenTxBuilder::with_account_index(0).build();
-    let tx_to_commit = AuthenticatedTransaction::from_inner(tx_to_commit);
+    let tx_to_commit = Arc::new(AuthenticatedTransaction::from_inner(tx_to_commit));
 
     // Force the tx into a pending block.
     uut.add_transaction(tx_to_commit.clone()).unwrap();
     uut.select_batch().unwrap();
-    uut.commit_batch(ProvenBatch::mocked_from_transactions(
-        [tx_to_commit.raw_proven_transaction()],
-    ));
+    uut.commit_batch(Arc::new(ProvenBatch::mocked_from_transactions([
+        tx_to_commit.raw_proven_transaction()
+    ])));
     let (block, _) = uut.select_block();
     // A reverted transaction behaves as if it never existed, the current state is the expected
     // outcome, plus an extra committed block at the end.
@@ -155,11 +144,11 @@ fn block_commit_reverts_expired_txns() {
     // Add a new transaction which will expire when the pending block is committed.
     let tx_to_revert =
         MockProvenTxBuilder::with_account_index(1).expiration_block_num(block).build();
-    let tx_to_revert = AuthenticatedTransaction::from_inner(tx_to_revert);
+    let tx_to_revert = Arc::new(AuthenticatedTransaction::from_inner(tx_to_revert));
     uut.add_transaction(tx_to_revert).unwrap();
 
     // Commit the pending block which should revert the above tx.
-    let arb_header = BlockHeader::mock(0, None, None, &[], Word::empty());
+    let arb_header = BlockHeader::mock(block, None, None, &[], Word::empty());
     uut.commit_block(arb_header.clone());
     reference.commit_block(arb_header);
 
@@ -168,12 +157,12 @@ fn block_commit_reverts_expired_txns() {
 
 #[test]
 fn empty_block_commitment() {
-    let mut uut = Mempool::for_tests();
+    let (mut uut, _) = Mempool::for_tests();
 
-    let arb_header = BlockHeader::mock(0, None, None, &[], Word::empty());
     for _ in 0..3 {
-        let (_block, _) = uut.select_block();
-        uut.commit_block(arb_header.clone());
+        let (number, _) = uut.select_block();
+        let arb_header = BlockHeader::mock(number, None, None, &[], Word::empty());
+        uut.commit_block(arb_header);
     }
 }
 
@@ -181,13 +170,13 @@ fn empty_block_commitment() {
 #[should_panic]
 fn block_commitment_is_rejected_if_no_block_is_in_flight() {
     let arb_header = BlockHeader::mock(0, None, None, &[], Word::empty());
-    Mempool::for_tests().commit_block(arb_header);
+    Mempool::for_tests().0.commit_block(arb_header);
 }
 
 #[test]
 #[should_panic]
 fn cannot_have_multiple_inflight_blocks() {
-    let mut uut = Mempool::for_tests();
+    let (mut uut, _) = Mempool::for_tests();
 
     uut.select_block();
     uut.select_block();
@@ -199,20 +188,19 @@ fn cannot_have_multiple_inflight_blocks() {
 /// A failed block should have all of its transactions reverted.
 #[test]
 fn block_failure_reverts_its_transactions() {
-    let mut uut = Mempool::for_tests();
     // We will revert everything so the reference should be the empty mempool.
-    let reference = uut.clone();
+    let (mut uut, reference) = Mempool::for_tests();
 
     let reverted_txs = MockProvenTxBuilder::sequential();
 
     uut.add_transaction(reverted_txs[0].clone()).unwrap();
     uut.select_batch().unwrap();
-    uut.commit_batch(ProvenBatch::mocked_from_transactions([
+    uut.commit_batch(Arc::new(ProvenBatch::mocked_from_transactions([
         reverted_txs[0].raw_proven_transaction()
-    ]));
+    ])));
 
     // Block 1 will contain just the first batch.
-    let (_number, _batches) = uut.select_block();
+    let (number, _batches) = uut.select_block();
 
     // Create another dependent batch.
     uut.add_transaction(reverted_txs[1].clone()).unwrap();
@@ -221,21 +209,16 @@ fn block_failure_reverts_its_transactions() {
     uut.add_transaction(reverted_txs[2].clone()).unwrap();
 
     // Fail the block which should result in everything reverting.
-    uut.rollback_block();
+    uut.rollback_block(number);
 
     assert_eq!(uut, reference);
 }
 
-// TRANSACTION REVERSION TESTS
-// ================================================================================================
-
-/// Ensures that reverting transactions is equivalent to them never being inserted at all.
-///
-/// This checks that there are no forgotten links to them exist anywhere in the mempool by
-/// comparing to a reference mempool that never had them inserted.
+/// Ensures that reverting a subtree removes the node and all its descendents. We test this by
+/// comparing against a reference mempool that never had the subtree inserted at all.
 #[test]
-fn reverted_transactions_and_descendents_are_non_existent() {
-    let mut uut = Mempool::for_tests();
+fn subtree_reversion_removes_all_descendents() {
+    let (mut uut, mut reference) = Mempool::for_tests();
 
     let reverted_txs = MockProvenTxBuilder::sequential();
 
@@ -243,47 +226,48 @@ fn reverted_transactions_and_descendents_are_non_existent() {
     uut.select_batch().unwrap();
 
     uut.add_transaction(reverted_txs[1].clone()).unwrap();
-    uut.select_batch().unwrap();
+    let (to_revert, _) = uut.select_batch().unwrap();
 
     uut.add_transaction(reverted_txs[2].clone()).unwrap();
-    uut.revert_transactions(vec![reverted_txs[1].id()]).unwrap();
+    uut.revert_subtree(NodeId::ProposedBatch(to_revert));
 
     // We expect the second batch and the latter reverted txns to be non-existent.
-    let mut reference = Mempool::for_tests();
     reference.add_transaction(reverted_txs[0].clone()).unwrap();
     reference.select_batch().unwrap();
 
     assert_eq!(uut, reference);
 }
 
-/// Reverting transactions causes their batches to also revert. These batches in turn contain
-/// non-reverted transactions which should be requeued (and not reverted).
+/// We've decided that transactions from a rolled back batch should be requeued.
+///
+/// This test checks this at a basic level by ensuring that rolling back a batch is the same as
+/// never selecting that batch i.e. that the set of unbatched transactions remains the same.
 #[test]
-fn reverted_transaction_batches_are_requeued() {
-    let mut uut = Mempool::for_tests();
+fn transactions_from_reverted_batches_are_requeued() {
+    let (mut uut, mut reference) = Mempool::for_tests();
 
-    let unrelated_txs = MockProvenTxBuilder::sequential();
-    let reverted_txs = MockProvenTxBuilder::sequential();
+    let tx_set_a = MockProvenTxBuilder::sequential();
+    let tx_set_b = MockProvenTxBuilder::sequential();
 
-    uut.add_transaction(reverted_txs[0].clone()).unwrap();
-    uut.add_transaction(unrelated_txs[0].clone()).unwrap();
+    uut.add_transaction(tx_set_b[0].clone()).unwrap();
+    uut.add_transaction(tx_set_a[0].clone()).unwrap();
     uut.select_batch().unwrap();
 
-    uut.add_transaction(reverted_txs[1].clone()).unwrap();
-    uut.add_transaction(unrelated_txs[1].clone()).unwrap();
-    uut.select_batch().unwrap();
+    uut.add_transaction(tx_set_b[1].clone()).unwrap();
+    uut.add_transaction(tx_set_a[1].clone()).unwrap();
+    let (batch_id, _) = uut.select_batch().unwrap();
 
-    uut.add_transaction(reverted_txs[2].clone()).unwrap();
-    uut.add_transaction(unrelated_txs[2].clone()).unwrap();
-    uut.revert_transactions(vec![reverted_txs[1].id()]).unwrap();
+    uut.add_transaction(tx_set_b[2].clone()).unwrap();
+    uut.add_transaction(tx_set_a[2].clone()).unwrap();
+    uut.rollback_batch(batch_id);
 
-    // We expect the second batch and the latter reverted txns to be non-existent.
-    let mut reference = Mempool::for_tests();
-    reference.add_transaction(reverted_txs[0].clone()).unwrap();
-    reference.add_transaction(unrelated_txs[0].clone()).unwrap();
+    reference.add_transaction(tx_set_b[0].clone()).unwrap();
+    reference.add_transaction(tx_set_a[0].clone()).unwrap();
     reference.select_batch().unwrap();
-    reference.add_transaction(unrelated_txs[1].clone()).unwrap();
-    reference.add_transaction(unrelated_txs[2].clone()).unwrap();
+    reference.add_transaction(tx_set_b[1].clone()).unwrap();
+    reference.add_transaction(tx_set_a[1].clone()).unwrap();
+    reference.add_transaction(tx_set_b[2].clone()).unwrap();
+    reference.add_transaction(tx_set_a[2].clone()).unwrap();
 
     assert_eq!(uut, reference);
 }
diff --git a/crates/block-producer/src/mempool/tests/add_transaction.rs b/crates/block-producer/src/mempool/tests/add_transaction.rs
new file mode 100644
index 000000000..d4ea2d458
--- /dev/null
+++ b/crates/block-producer/src/mempool/tests/add_transaction.rs
@@ -0,0 +1,485 @@
+use std::sync::Arc;
+
+use assert_matches::assert_matches;
+use miden_objects::Word;
+use miden_objects::block::BlockHeader;
+
+use crate::domain::transaction::AuthenticatedTransaction;
+use crate::errors::AddTransactionError;
+use crate::mempool::Mempool;
+use crate::test_utils::{MockProvenTxBuilder, mock_account_id};
+
+#[test]
+fn valid_with_state_from_multiple_parents() {
+    let (mut uut, _) = Mempool::for_tests();
+
+    let parent_a = MockProvenTxBuilder::with_account(
+        mock_account_id(1),
+        Word::empty(),
+        Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .private_notes_created_range(0..1)
+    .build();
+
+    let parent_b = MockProvenTxBuilder::with_account(
+        mock_account_id(2),
+        Word::empty(),
+        Word::new([300u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .private_notes_created_range(1..2)
+    .build();
+
+    let parent_c = MockProvenTxBuilder::with_account(
+        mock_account_id(3),
+        Word::empty(),
+        Word::new([4500u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .private_notes_created_range(2..3)
+    .build();
+
+    let child = MockProvenTxBuilder::with_account(
+        parent_a.account_id(),
+        parent_a.account_update().final_state_commitment(),
+        Word::new([4u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .unauthenticated_notes_range(0..3)
+    .build();
+
+    for tx in [parent_a, parent_b, parent_c, child] {
+        let tx = AuthenticatedTransaction::from_inner(tx);
+        let tx = Arc::new(tx);
+
+        uut.add_transaction(tx).unwrap();
+    }
+}
+
+/// Ensures that transactions that expire before or within the expiration slack of the chain tip
+/// are rejected.
+mod tx_expiration {
+    use super::*;
+
+    fn setup() -> Mempool {
+        let (mut uut, _) = Mempool::for_tests();
+        assert!(
+            uut.config.expiration_slack > 0,
+            "Test is only useful if there is some expiration slack"
+        );
+
+        // Create at least some locally retained state.
+        let slack = uut.config.expiration_slack;
+        for _ in 0..slack + 10 {
+            let (number, _) = uut.select_block();
+            let header = BlockHeader::mock(number, None, None, &[], Word::default());
+            uut.commit_block(header);
+        }
+
+        uut
+    }
+
+    #[test]
+    fn expiration_after_slack_limit_is_accepted() {
+        let mut uut = setup();
+        let limit = uut.chain_tip + uut.config.expiration_slack;
+
+        let tx = MockProvenTxBuilder::with_account_index(0)
+            .expiration_block_num(limit.child())
+            .build();
+        let tx = AuthenticatedTransaction::from_inner(tx).with_authentication_height(uut.chain_tip);
+        let tx = Arc::new(tx);
+        uut.add_transaction(tx).unwrap();
+    }
+
+    #[test]
+    fn expiration_within_slack_limit_is_rejected() {
+        let mut uut = setup();
+        let limit = uut.chain_tip + uut.config.expiration_slack;
+
+        for i in uut.chain_tip.child().as_u32()..=limit.as_u32() {
+            let tx = MockProvenTxBuilder::with_account_index(0)
+                .expiration_block_num(i.into())
+                .build();
+            let tx =
+                AuthenticatedTransaction::from_inner(tx).with_authentication_height(uut.chain_tip);
+            let tx = Arc::new(tx);
+            let result = uut.add_transaction(tx);
+
+            assert_matches!(
+                result,
+                Err(AddTransactionError::Expired { .. }),
+                "Failed run with expiration {i} and limit {limit}"
+            );
+        }
+    }
+
+    #[test]
+    fn already_expired_is_rejected() {
+        let mut uut = setup();
+        let tx = MockProvenTxBuilder::with_account_index(0)
+            .expiration_block_num(uut.chain_tip)
+            .build();
+        let tx = AuthenticatedTransaction::from_inner(tx).with_authentication_height(uut.chain_tip);
+        let tx = Arc::new(tx);
+        let result = uut.add_transaction(tx);
+
+        assert_matches!(result, Err(AddTransactionError::Expired { .. }));
+    }
+}
+
+/// Ensures that a transaction's authentication height is always within the overlap between the
+/// store chain tip and the locally retained state.
+mod authentication_height {
+    use super::*;
+
+    fn setup() -> Mempool {
+        let (mut uut, _) = Mempool::for_tests();
+        assert!(
+            uut.config.state_retention.get() > 0,
+            "Test is only useful if there is some retained state"
+        );
+
+        // Create at least some locally retained state.
+        let retention = uut.config.state_retention.get();
+        for _ in 0..retention + 10 {
+            let (number, _) = uut.select_block();
+            let header = BlockHeader::mock(number, None, None, &[], Word::default());
+            uut.commit_block(header);
+        }
+
+        uut
+    }
+
+    /// We expect a rejection if the tx was authenticated in some gap between the store and local
+    /// state i.e. `oldest_local - 2`.
+    #[test]
+    fn stale_inputs_are_rejected() {
+        let mut uut = setup();
+
+        let oldest_local = uut.chain_tip.as_u32() - uut.config.state_retention.get() as u32 + 1;
+
+        let tx = MockProvenTxBuilder::with_account_index(0).build();
+        let tx = AuthenticatedTransaction::from_inner(tx)
+            .with_authentication_height((oldest_local - 2).into());
+        let tx = Arc::new(tx);
+        uut.add_transaction(tx).unwrap_err();
+    }
+
+    /// Ensures that we guard against authentication height from lying about imaginary blocks beyond
+    /// the chain tip. Since the authentication height is determined by the store, and this is
+    /// considered internal, we panic as this is completely abnormal.
+    #[test]
+    #[should_panic]
+    fn inputs_from_beyond_the_chain_tip_are_rejected() {
+        let mut uut = setup();
+
+        let tx = MockProvenTxBuilder::with_account_index(0).build();
+        let tx = AuthenticatedTransaction::from_inner(tx)
+            .with_authentication_height(uut.chain_tip.child());
+        let tx = Arc::new(tx);
+        let _ = uut.add_transaction(tx);
+    }
+
+    /// We expect transactions to be accepted in the `oldest-1..` range. We already test `>
+    /// chain_tip` above. The `-1` is because we only require that there is _no gap_ between the
+    /// authentication height and the local state, which would mean we are unable to authenticate
+    /// against those blocks.
+    #[test]
+    fn inputs_from_within_overlap_are_accepted() {
+        let mut uut = setup();
+
+        let oldest_local = uut.chain_tip.as_u32() - uut.config.state_retention.get() as u32 + 1;
+
+        for i in oldest_local - 1..=uut.chain_tip.as_u32() {
+            let tx = MockProvenTxBuilder::with_account_index(i).build();
+            let tx = AuthenticatedTransaction::from_inner(tx).with_authentication_height(i.into());
+            let tx = Arc::new(tx);
+
+            let result = uut.add_transaction(tx);
+
+            assert_matches!(
+                result,
+                Ok(..),
+                "Failed run with authentication height {i}, chain tip {} and oldest local {oldest_local}",
+                uut.chain_tip
+            );
+        }
+    }
+}
+
+#[test]
+fn duplicate_nullifiers_are_rejected() {
+    let (mut uut, _) = Mempool::for_tests();
+
+    let tx_a = MockProvenTxBuilder::with_account(
+        mock_account_id(111),
+        Word::empty(),
+        Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .nullifiers_range(1..11)
+    .build();
+    let tx_a = AuthenticatedTransaction::from_inner(tx_a);
+    let tx_a = Arc::new(tx_a);
+
+    let tx_b = MockProvenTxBuilder::with_account(
+        mock_account_id(222),
+        Word::empty(),
+        Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .nullifiers_range(10..20)
+    .build();
+    let tx_b = AuthenticatedTransaction::from_inner(tx_b);
+    let tx_b = Arc::new(tx_b);
+
+    uut.add_transaction(tx_a).unwrap();
+    let result = uut.add_transaction(tx_b);
+
+    // We overlap with one nullifier.
+    assert_matches!(result, Err(AddTransactionError::InputNotesAlreadyConsumed(..)));
+}
+
+#[test]
+fn duplicate_output_notes_are_rejected() {
+    let (mut uut, _) = Mempool::for_tests();
+
+    let tx_a = MockProvenTxBuilder::with_account(
+        mock_account_id(111),
+        Word::empty(),
+        Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .private_notes_created_range(0..11)
+    .build();
+    let tx_a = AuthenticatedTransaction::from_inner(tx_a);
+    let tx_a = Arc::new(tx_a);
+
+    let tx_b = MockProvenTxBuilder::with_account(
+        mock_account_id(222),
+        Word::empty(),
+        Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .private_notes_created_range(10..20)
+    .build();
+    let tx_b = AuthenticatedTransaction::from_inner(tx_b);
+    let tx_b = Arc::new(tx_b);
+
+    uut.add_transaction(tx_a).unwrap();
+    let result = uut.add_transaction(tx_b);
+
+    assert_matches!(result, Err(AddTransactionError::OutputNotesAlreadyExist(..)));
+}
+
+#[test]
+fn unknown_unauthenticated_notes_are_rejected() {
+    let (mut uut, _) = Mempool::for_tests();
+
+    let tx_a = MockProvenTxBuilder::with_account(
+        mock_account_id(111),
+        Word::empty(),
+        Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .private_notes_created_range(0..11)
+    .build();
+    let tx_a = AuthenticatedTransaction::from_inner(tx_a);
+    let tx_a = Arc::new(tx_a);
+
+    let tx_b = MockProvenTxBuilder::with_account(
+        mock_account_id(222),
+        Word::empty(),
+        Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+    )
+    .unauthenticated_notes_range(0..12)
+    .build();
+    let tx_b = AuthenticatedTransaction::from_inner(tx_b);
+    let tx_b = Arc::new(tx_b);
+
+    uut.add_transaction(tx_a).unwrap();
+    let result = uut.add_transaction(tx_b);
+
+    assert_matches!(result, Err(AddTransactionError::UnauthenticatedNotesNotFound(..)));
+}
+
+mod account_state {
+    use super::*;
+
+    #[test]
+    fn matches_mempool_state() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let txs = MockProvenTxBuilder::sequential();
+        for tx in txs {
+            uut.add_transaction(tx).unwrap();
+        }
+    }
+
+    #[test]
+    fn matches_store_state() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let account_id = mock_account_id(123);
+
+        let tx = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::new([0u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+            Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+        )
+        .build();
+        let tx = AuthenticatedTransaction::from_inner(tx);
+        let tx = Arc::new(tx);
+
+        uut.add_transaction(tx).unwrap();
+    }
+
+    /// An inflight account state takes preference over the store's account state as the mempool's
+    /// will also consider inflight transaction effects. This test ensures that this is the case.
+    #[test]
+    fn mempool_commitment_overrides_store() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let account_id = mock_account_id(123);
+
+        let tx_a = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::empty(),
+            Word::new([0u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+        )
+        .build();
+        let tx_b = MockProvenTxBuilder::with_account(
+            account_id,
+            tx_a.account_update().final_state_commitment(),
+            Word::new([10u32.into(), 11u32.into(), 12u32.into(), 13u32.into()]),
+        )
+        .build();
+        let tx_a = AuthenticatedTransaction::from_inner(tx_a);
+        let tx_b = AuthenticatedTransaction::from_inner(tx_b).with_store_state(Word::new([
+            30u32.into(),
+            31u32.into(),
+            32u32.into(),
+            33u32.into(),
+        ]));
+
+        let tx_a = Arc::new(tx_a);
+        let tx_b = Arc::new(tx_b);
+
+        uut.add_transaction(tx_a).unwrap();
+        // We expect this to succeed because the local mempool account state will be correct, even
+        // though the store's account state is a mismatch.
+        uut.add_transaction(tx_b).unwrap();
+    }
+
+    #[test]
+    fn mismatch_with_mempool_is_rejected() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let account_id = mock_account_id(123);
+
+        let tx_a = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::empty(),
+            Word::new([0u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+        )
+        .build();
+        let tx_b = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::new([10u32.into(), 11u32.into(), 12u32.into(), 13u32.into()]),
+            Word::new([20u32.into(), 11u32.into(), 12u32.into(), 13u32.into()]),
+        )
+        .build();
+        let tx_a = AuthenticatedTransaction::from_inner(tx_a);
+        let tx_b = AuthenticatedTransaction::from_inner(tx_b);
+        let tx_a = Arc::new(tx_a);
+        let tx_b = Arc::new(tx_b);
+
+        uut.add_transaction(tx_a).unwrap();
+        let result = uut.add_transaction(tx_b);
+
+        assert_matches!(result, Err(AddTransactionError::IncorrectAccountInitialCommitment { .. }));
+    }
+
+    /// Ensures that store state is checked if there is no local mempool state.
+    #[test]
+    fn mismatch_with_store_is_rejected() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let account_id = mock_account_id(123);
+
+        let tx = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::new([0u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+            Word::new([3u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+        )
+        .build();
+        let tx = AuthenticatedTransaction::from_inner(tx).with_store_state(Word::new([
+            6u32.into(),
+            1u32.into(),
+            2u32.into(),
+            3u32.into(),
+        ]));
+        let tx = Arc::new(tx);
+
+        let result = uut.add_transaction(tx);
+        assert_matches!(result, Err(AddTransactionError::IncorrectAccountInitialCommitment { .. }));
+    }
+}
+
+mod new_account {
+    use super::*;
+
+    #[test]
+    fn is_valid() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let account_id = mock_account_id(123);
+
+        let tx = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::empty(),
+            Word::new([0u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+        )
+        .build();
+        let tx = AuthenticatedTransaction::from_inner(tx);
+        let tx = Arc::new(tx);
+        uut.add_transaction(tx).unwrap();
+    }
+
+    #[test]
+    fn already_exists_in_store() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let account_id = mock_account_id(123);
+
+        let tx = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::empty(),
+            Word::new([0u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+        )
+        .build();
+        let tx = AuthenticatedTransaction::from_inner(tx).with_store_state(Word::new([
+            5u32.into(),
+            1u32.into(),
+            2u32.into(),
+            3u32.into(),
+        ]));
+        let tx = Arc::new(tx);
+        let result = uut.add_transaction(tx);
+        assert_matches!(result, Err(AddTransactionError::IncorrectAccountInitialCommitment { .. }));
+    }
+
+    #[test]
+    fn already_exists_in_mempool() {
+        let (mut uut, _) = Mempool::for_tests();
+
+        let account_id = mock_account_id(123);
+
+        let tx = MockProvenTxBuilder::with_account(
+            account_id,
+            Word::empty(),
+            Word::new([0u32.into(), 1u32.into(), 2u32.into(), 3u32.into()]),
+        )
+        .build();
+        let tx = AuthenticatedTransaction::from_inner(tx);
+        let tx = Arc::new(tx);
+
+        uut.add_transaction(tx.clone()).unwrap();
+
+        let result = uut.add_transaction(tx);
+        assert_matches!(result, Err(AddTransactionError::IncorrectAccountInitialCommitment { .. }));
+    }
+}
diff --git a/crates/block-producer/src/mempool/transaction_expiration.rs b/crates/block-producer/src/mempool/transaction_expiration.rs
deleted file mode 100644
index cd5bd96e6..000000000
--- a/crates/block-producer/src/mempool/transaction_expiration.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use std::collections::hash_map::Entry;
-use std::collections::{BTreeSet, HashMap};
-
-use miden_objects::block::BlockNumber;
-use miden_objects::transaction::TransactionId;
-
-/// Tracks transactions and their expiration block heights.
-///
-/// Implemented as a bi-directional map internally to allow for efficient lookups via both
-/// transaction ID and block number.
-#[derive(Debug, Clone, Default, PartialEq, Eq)]
-pub struct TransactionExpirations {
-    /// Transaction lookup index.
-    by_tx: HashMap<TransactionId, BlockNumber>,
-    /// Block number lookup index.
-    by_block: HashMap<BlockNumber, BTreeSet<TransactionId>>,
-}
-
-impl TransactionExpirations {
-    /// Add the transaction to the tracker.
-    pub fn insert(&mut self, tx: TransactionId, block: BlockNumber) {
-        self.by_tx.insert(tx, block);
-        self.by_block.entry(block).or_default().insert(tx);
-    }
-
-    /// Returns all transactions that are expiring at the given block number.
-    pub fn get(&mut self, block: BlockNumber) -> BTreeSet<TransactionId> {
-        self.by_block.get(&block).cloned().unwrap_or_default()
-    }
-
-    /// Removes the transactions from the tracker.
-    ///
-    /// Unknown transactions are ignored.
-    pub fn remove<'a>(&mut self, txs: impl Iterator<Item = &'a TransactionId>) {
-        for tx in txs {
-            if let Some(block) = self.by_tx.remove(tx) {
-                let Entry::Occupied(entry) = self.by_block.entry(block).and_modify(|x| {
-                    x.remove(tx);
-                }) else {
-                    panic!("block entry must exist as this is a bidirectional mapping");
-                };
-
-                // Prune the entire block's entry if no transactions are tracked.
-                if entry.get().is_empty() {
-                    entry.remove();
-                }
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::test_utils::Random;
-
-    /// Removing a transaction may result in a block's mapping being empty. This test ensures that
-    /// such maps are pruned to prevent endless growth.
-    #[test]
-    fn remove_prunes_empty_block_maps() {
-        let tx = Random::with_random_seed().draw_tx_id();
-        let block = BlockNumber::from(123);
-
-        let mut uut = TransactionExpirations::default();
-        uut.insert(tx, block);
-        uut.remove(std::iter::once(&tx));
-
-        assert_eq!(uut, TransactionExpirations::default());
-    }
-
-    #[test]
-    fn get_empty() {
-        assert!(TransactionExpirations::default().get(BlockNumber::from(123)).is_empty());
-    }
-}
diff --git a/crates/block-producer/src/mempool/transaction_graph.rs b/crates/block-producer/src/mempool/transaction_graph.rs
deleted file mode 100644
index 89eb59db0..000000000
--- a/crates/block-producer/src/mempool/transaction_graph.rs
+++ /dev/null
@@ -1,208 +0,0 @@
-use std::collections::BTreeSet;
-
-use miden_objects::transaction::TransactionId;
-
-use super::graph::{DependencyGraph, GraphError};
-use super::{BatchBudget, BudgetStatus};
-use crate::domain::transaction::AuthenticatedTransaction;
-
-// TRANSACTION GRAPH
-// ================================================================================================
-
-/// Tracks the dependency graph and status of transactions.
-///
-/// It handles insertion of transactions, locking them inqueue until they are ready to be processed.
-/// A transaction is considered eligible for batch selection once all of its parents have also been
-/// selected. Essentially this graph ensures that transaction dependency ordering is adhered to.
-///
-/// Transactions from failed batches may be [re-queued](Self::requeue_transactions) for batch
-/// selection. Successful batches will eventually form part of a committed block at which point the
-/// transaction data may be safely [pruned](Self::commit_transactions).
-///
-/// Transactions may also be outright [purged](Self::remove_transactions) from the graph. This is
-/// useful for transactions which may have become invalid due to external considerations e.g.
-/// expired transactions.
-///
-/// # Transaction lifecycle:
-/// ```text
-///                                        │                                   
-///                                  insert│                                   
-///                                  ┌─────▼─────┐                             
-///                        ┌─────────►           ┼────┐                        
-///                        │         └─────┬─────┘    │                        
-///                        │               │          │                        
-///    requeue_transactions│   select_batch│          │                        
-///                        │         ┌─────▼─────┐    │                        
-///                        └─────────┼ in batch  ┼────┤                        
-///                                  └─────┬─────┘    │                        
-///                                        │          │                        
-///                     commit_transactions│          │remove_transactions     
-///                                  ┌─────▼─────┐    │                        
-///                                  │  <null>   ◄────┘                        
-///                                  └───────────┘                             
-/// ```
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct TransactionGraph {
-    inner: DependencyGraph<TransactionId, AuthenticatedTransaction>,
-}
-
-impl TransactionGraph {
-    /// Inserts a new transaction node, with edges to the given parent nodes.
-    ///
-    /// # Errors
-    ///
-    /// Follows the error conditions of [`DependencyGraph::insert_pending`].
-    pub fn insert(
-        &mut self,
-        transaction: AuthenticatedTransaction,
-        parents: BTreeSet<TransactionId>,
-    ) -> Result<(), GraphError<TransactionId>> {
-        self.inner.insert_pending(transaction.id(), parents)?;
-        self.inner.promote_pending(transaction.id(), transaction)
-    }
-
-    /// Selects a set transactions for the next batch such that they adhere to the given budget.
-    ///
-    /// Also returns the transactions' parents.
-    ///
-    /// Internally these transactions are considered processed and cannot be emitted in future
-    /// batches.
-    ///
-    /// Note: this may emit empty batches.
-    ///
-    /// See also:
-    ///   - [`Self::requeue_transactions`]
-    ///   - [`Self::commit_transactions`]
-    pub fn select_batch(
-        &mut self,
-        mut budget: BatchBudget,
-    ) -> (Vec<AuthenticatedTransaction>, BTreeSet<TransactionId>) {
-        // This strategy just selects arbitrary roots for now. This is valid but not very
-        // interesting or efficient.
-        let mut batch = Vec::with_capacity(budget.transactions);
-        let mut parents = BTreeSet::new();
-
-        while let Some(root) = self.inner.roots().first().copied() {
-            // SAFETY: Since it was a root batch, it must definitely have a processed batch
-            // associated with it.
-            let tx = self.inner.get(&root).unwrap().clone();
-
-            // Adhere to batch budget.
-            if budget.check_then_subtract(&tx) == BudgetStatus::Exceeded {
-                break;
-            }
-
-            // SAFETY: This is definitely a root since we just selected it from the set of roots.
-            self.inner.process_root(root).unwrap();
-            let tx_parents = self.inner.parents(&root).unwrap();
-
-            batch.push(tx);
-            parents.extend(tx_parents);
-        }
-
-        (batch, parents)
-    }
-
-    /// Marks the given transactions as being back in queue.
-    ///
-    /// # Errors
-    ///
-    /// Follows the error conditions of [`DependencyGraph::revert_subgraphs`].
-    pub fn requeue_transactions(
-        &mut self,
-        transactions: BTreeSet<TransactionId>,
-    ) -> Result<(), GraphError<TransactionId>> {
-        self.inner.revert_subgraphs(transactions)
-    }
-
-    /// Removes the provided transactions from the graph.
-    ///
-    /// # Errors
-    ///
-    /// Follows the error conditions of [`DependencyGraph::prune_processed`].
-    pub fn commit_transactions(
-        &mut self,
-        tx_ids: &[TransactionId],
-    ) -> Result<(), GraphError<TransactionId>> {
-        // TODO: revisit this api.
-        let tx_ids = tx_ids.iter().copied().collect();
-        self.inner.prune_processed(tx_ids)?;
-        Ok(())
-    }
-
-    /// Removes the transactions and all their descendants from the graph.
-    ///
-    /// Returns the removed transactions.
-    ///
-    /// # Errors
-    ///
-    /// Follows the error conditions of [`DependencyGraph::purge_subgraphs`].
-    pub fn remove_transactions(
-        &mut self,
-        transactions: Vec<TransactionId>,
-    ) -> Result<BTreeSet<TransactionId>, GraphError<TransactionId>> {
-        // TODO: revisit this api.
-        let transactions = transactions.into_iter().collect();
-        self.inner.purge_subgraphs(transactions)
-    }
-
-    /// The total number of transactions in the graph.
-    pub fn len(&self) -> usize {
-        self.inner.len()
-    }
-
-    /// The amount of transactions which are root nodes.
-    pub fn num_roots(&self) -> usize {
-        self.inner.num_roots()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::test_utils::mock_proven_tx;
-
-    // BATCH SELECTION TESTS
-    // ================================================================================================
-
-    #[test]
-    fn select_batch_respects_transaction_limit() {
-        // These transactions are independent and just used to ensure we have more available
-        // transactions than we want in the batch.
-        let txs = (0..10)
-            .map(|i| mock_proven_tx(i, vec![], vec![]))
-            .map(AuthenticatedTransaction::from_inner);
-
-        let mut uut = TransactionGraph::default();
-        for tx in txs {
-            uut.insert(tx, [].into()).unwrap();
-        }
-
-        let (batch, parents) =
-            uut.select_batch(BatchBudget { transactions: 0, ..Default::default() });
-        assert!(batch.is_empty());
-        assert!(parents.is_empty());
-
-        let (batch, parents) =
-            uut.select_batch(BatchBudget { transactions: 3, ..Default::default() });
-        assert_eq!(batch.len(), 3);
-        assert!(parents.is_empty());
-
-        let (batch, parents) =
-            uut.select_batch(BatchBudget { transactions: 4, ..Default::default() });
-        assert_eq!(batch.len(), 4);
-        assert!(parents.is_empty());
-
-        // We expect this to be partially filled.
-        let (batch, parents) =
-            uut.select_batch(BatchBudget { transactions: 4, ..Default::default() });
-        assert_eq!(batch.len(), 3);
-        assert!(parents.is_empty());
-
-        // And thereafter empty.
-        let (batch, parents) =
-            uut.select_batch(BatchBudget { transactions: 100, ..Default::default() });
-        assert!(batch.is_empty());
-        assert!(parents.is_empty());
-    }
-}
diff --git a/crates/block-producer/src/server/mod.rs b/crates/block-producer/src/server/mod.rs
index b7ac224ec..af88910e8 100644
--- a/crates/block-producer/src/server/mod.rs
+++ b/crates/block-producer/src/server/mod.rs
@@ -34,14 +34,9 @@ use crate::errors::{
     SubmitProvenBatchError,
     VerifyTxError,
 };
-use crate::mempool::{BatchBudget, BlockBudget, Mempool, SharedMempool};
+use crate::mempool::{BatchBudget, BlockBudget, Mempool, MempoolConfig, SharedMempool};
 use crate::store::StoreClient;
-use crate::{
-    COMPONENT,
-    SERVER_MEMPOOL_EXPIRATION_SLACK,
-    SERVER_MEMPOOL_STATE_RETENTION,
-    SERVER_NUM_BATCH_BUILDERS,
-};
+use crate::{COMPONENT, SERVER_NUM_BATCH_BUILDERS};
 
 /// The block producer server.
 ///
@@ -130,16 +125,15 @@ impl BlockProducer {
             self.batch_prover_url,
             self.batch_interval,
         );
-        let mempool = Mempool::shared(
-            chain_tip,
-            BatchBudget {
+        let mempool = MempoolConfig {
+            batch_budget: BatchBudget {
                 transactions: self.max_txs_per_batch,
                 ..BatchBudget::default()
             },
-            BlockBudget { batches: self.max_batches_per_block },
-            SERVER_MEMPOOL_STATE_RETENTION,
-            SERVER_MEMPOOL_EXPIRATION_SLACK,
-        );
+            block_budget: BlockBudget { batches: self.max_batches_per_block },
+            ..Default::default()
+        };
+        let mempool = Mempool::shared(chain_tip, mempool);
 
         // Spawn rpc server and batch and block provers.
         //
@@ -378,7 +372,7 @@ impl BlockProducerRpcServer {
         let inputs = self.store.get_tx_inputs(&tx).await.map_err(VerifyTxError::from)?;
 
         // SAFETY: we assume that the rpc component has verified the transaction proof already.
-        let tx = AuthenticatedTransaction::new(tx, inputs)?;
+        let tx = AuthenticatedTransaction::new_unchecked(tx, inputs).map(Arc::new)?;
 
         self.mempool.lock().await.lock().await.add_transaction(tx).map(|block_height| {
             proto::block_producer::SubmitProvenTransactionResponse {
diff --git a/crates/block-producer/src/test_utils/batch.rs b/crates/block-producer/src/test_utils/batch.rs
index 770611793..878b155db 100644
--- a/crates/block-producer/src/test_utils/batch.rs
+++ b/crates/block-producer/src/test_utils/batch.rs
@@ -26,7 +26,7 @@ pub trait TransactionBatchConstructor {
 
     /// Returns a `TransactionBatch` with `notes_per_tx.len()` transactions, where the i'th
     /// transaction has `notes_per_tx[i]` notes created
-    fn from_notes_created(starting_account_index: u32, notes_per_tx: &[u64]) -> Self;
+    fn from_notes_created(starting_account_index: u32, notes_per_tx: &[u32]) -> Self;
 
     /// Returns a `TransactionBatch` which contains `num_txs_in_batch` transactions
     fn from_txs(starting_account_index: u32, num_txs_in_batch: u64) -> Self;
@@ -74,12 +74,12 @@ impl TransactionBatchConstructor for ProvenBatch {
         .unwrap()
     }
 
-    fn from_notes_created(starting_account_index: u32, notes_per_tx: &[u64]) -> Self {
+    fn from_notes_created(starting_account_index: u32, notes_per_tx: &[u32]) -> Self {
         let txs: Vec<_> = notes_per_tx
             .iter()
             .enumerate()
             .map(|(index, &num_notes)| {
-                let starting_note_index = u64::from(starting_account_index) + index as u64;
+                let starting_note_index = starting_account_index + index as u32;
                 MockProvenTxBuilder::with_account_index(starting_account_index + index as u32)
                     .private_notes_created_range(
                         starting_note_index..(starting_note_index + num_notes),
diff --git a/crates/block-producer/src/test_utils/mod.rs b/crates/block-producer/src/test_utils/mod.rs
index a3ef2ff3a..0695ceadf 100644
--- a/crates/block-producer/src/test_utils/mod.rs
+++ b/crates/block-producer/src/test_utils/mod.rs
@@ -6,7 +6,7 @@ use miden_objects::transaction::TransactionId;
 
 mod proven_tx;
 
-pub use proven_tx::{MockProvenTxBuilder, mock_proven_tx};
+pub use proven_tx::MockProvenTxBuilder;
 
 mod account;
 
diff --git a/crates/block-producer/src/test_utils/proven_tx.rs b/crates/block-producer/src/test_utils/proven_tx.rs
index 69b3295a4..22bf1d4ca 100644
--- a/crates/block-producer/src/test_utils/proven_tx.rs
+++ b/crates/block-producer/src/test_utils/proven_tx.rs
@@ -1,11 +1,12 @@
 use std::ops::Range;
+use std::sync::Arc;
 
 use itertools::Itertools;
 use miden_node_utils::fee::test_fee;
 use miden_objects::account::AccountId;
 use miden_objects::asset::FungibleAsset;
 use miden_objects::block::BlockNumber;
-use miden_objects::note::{Note, NoteExecutionHint, NoteHeader, NoteMetadata, NoteType, Nullifier};
+use miden_objects::note::{Note, Nullifier};
 use miden_objects::transaction::{
     InputNote,
     OutputNote,
@@ -13,7 +14,7 @@ use miden_objects::transaction::{
     ProvenTransactionBuilder,
 };
 use miden_objects::vm::ExecutionProof;
-use miden_objects::{Felt, Hasher, ONE, Word};
+use miden_objects::{Felt, ONE, Word};
 use rand::Rng;
 
 use super::MockPrivateAccount;
@@ -38,7 +39,7 @@ impl MockProvenTxBuilder {
     }
 
     /// Generates 3 random, sequential transactions acting on the same account.
-    pub fn sequential() -> [AuthenticatedTransaction; 3] {
+    pub fn sequential() -> [Arc<AuthenticatedTransaction>; 3] {
         let mut rng = rand::rng();
         let mock_account: MockPrivateAccount<4> = rng.random::<u32>().into();
 
@@ -50,7 +51,7 @@ impl MockProvenTxBuilder {
                     mock_account.states[i + 1],
                 )
             })
-            .map(|tx| AuthenticatedTransaction::from_inner(tx.build()))
+            .map(|tx| Arc::new(AuthenticatedTransaction::from_inner(tx.build())))
             .collect_vec()
             .try_into()
             .expect("Sizes should match")
@@ -115,20 +116,21 @@ impl MockProvenTxBuilder {
     }
 
     #[must_use]
-    pub fn private_notes_created_range(self, range: Range<u64>) -> Self {
+    pub fn unauthenticated_notes_range(self, range: Range<u32>) -> Self {
+        let notes = range
+            .map(|note_index| Note::mock_noop(Word::from([0, 0, 0, note_index])))
+            .collect();
+
+        self.unauthenticated_notes(notes)
+    }
+
+    #[must_use]
+    pub fn private_notes_created_range(self, range: Range<u32>) -> Self {
         let notes = range
             .map(|note_index| {
-                let note_id = Hasher::hash(&note_index.to_be_bytes());
-                let note_metadata = NoteMetadata::new(
-                    self.account_id,
-                    NoteType::Private,
-                    0.into(),
-                    NoteExecutionHint::none(),
-                    ONE,
-                )
-                .unwrap();
+                let note = Note::mock_noop(Word::from([0, 0, 0, note_index]));
 
-                OutputNote::Header(NoteHeader::new(note_id.into(), note_metadata))
+                OutputNote::Header(*note.header())
             })
             .collect();
 
@@ -154,14 +156,3 @@ impl MockProvenTxBuilder {
         .unwrap()
     }
 }
-
-pub fn mock_proven_tx(
-    account_index: u8,
-    unauthenticated_notes: Vec<Note>,
-    output_notes: Vec<OutputNote>,
-) -> ProvenTransaction {
-    MockProvenTxBuilder::with_account_index(account_index.into())
-        .unauthenticated_notes(unauthenticated_notes)
-        .output_notes(output_notes)
-        .build()
-}
diff --git a/crates/grpc-error-macro/Cargo.toml b/crates/grpc-error-macro/Cargo.toml
new file mode 100644
index 000000000..2524e1b35
--- /dev/null
+++ b/crates/grpc-error-macro/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+categories  = ["no-std"]
+description = "Procedural macro for deriving GrpcError trait (internal implementation detail - use miden-node-proto)"
+keywords    = ["grpc", "miden", "node"]
+name        = "miden-node-grpc-error-macro"
+publish     = false                                                                                                   # Internal implementation detail
+
+edition.workspace      = true
+license.workspace      = true
+readme.workspace       = true
+repository.workspace   = true
+rust-version.workspace = true
+version.workspace      = true
+
+[lints]
+workspace = true
+
+[lib]
+proc-macro = true
+
+[dependencies]
+quote = "1.0"
+syn   = { features = ["full"], version = "2.0" }
diff --git a/crates/grpc-error-macro/README.md b/crates/grpc-error-macro/README.md
new file mode 100644
index 000000000..ea835ef2c
--- /dev/null
+++ b/crates/grpc-error-macro/README.md
@@ -0,0 +1,111 @@
+# miden-node-grpc-error-macro
+
+Procedural macro for deriving the `GrpcError` trait on error enums, reducing boilerplate in gRPC error handling.
+
+## Overview
+
+This macro automatically generates:
+1. A companion `*GrpcError` enum with `#[repr(u8)]` for wire serialization
+2. An `api_error()` method that maps error variants to their gRPC representations
+3. Implementation of the `GrpcError` trait for the companion enum
+
+## Usage
+
+### Basic Example
+
+```rust
+use miden_node_grpc_error_macro::GrpcError;
+use thiserror::Error;
+
+#[derive(Debug, Error, GrpcError)]
+pub enum GetNoteScriptByRootError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    
+    #[error("malformed script root")]
+    DeserializationFailed(#[from] ConversionError),
+    
+    #[error("script with given root doesn't exist")]
+    ScriptNotFound,
+}
+```
+
+### Generated Code
+
+The above example generates:
+
+```rust
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[repr(u8)]
+pub enum GetNoteScriptByRootGrpcError {
+    /// Internal server error
+    Internal = 0,
+    /// Malformed script root
+    DeserializationFailed = 1,
+    /// Script with given root doesn't exist
+    ScriptNotFound = 2,
+}
+
+impl GrpcError for GetNoteScriptByRootGrpcError {
+    fn api_code(self) -> u8 {
+        self as u8
+    }
+    
+    fn is_internal(&self) -> bool {
+        matches!(self, Self::Internal)
+    }
+}
+
+impl GetNoteScriptByRootError {
+    pub fn api_error(&self) -> GetNoteScriptByRootGrpcError {
+        match self {
+            GetNoteScriptByRootError::DatabaseError(_) => 
+                GetNoteScriptByRootGrpcError::Internal,
+            GetNoteScriptByRootError::DeserializationFailed(_) => 
+                GetNoteScriptByRootGrpcError::DeserializationFailed,
+            GetNoteScriptByRootError::ScriptNotFound => 
+                GetNoteScriptByRootGrpcError::ScriptNotFound,
+        }
+    }
+}
+
+impl From<GetNoteScriptByRootError> for tonic::Status {
+    fn from(value: GetNoteScriptByRootError) -> Self {
+        let api_error = value.api_error();
+        let message = if api_error.is_internal() {
+            "Internal error".to_owned()
+        } else {
+            value.as_report()
+        };
+        tonic::Status::with_details(
+            api_error.tonic_code(),
+            message,
+            vec![api_error.api_code()].into(),
+        )
+    }
+}
+```
+
+## Attributes
+
+### `#[grpc(internal)]`
+
+Mark a variant as an internal error. This will:
+- Map the variant to `*GrpcError::Internal` instead of creating a separate variant
+- Result in the error being serialized with `tonic::Code::Internal` instead of `tonic::Code::InvalidArgument`
+
+```rust
+#[derive(Debug, Error, GrpcError)]
+pub enum MyError {
+    #[error("database connection failed")]
+    #[grpc(internal)]  // Maps to MyGrpcError::Internal
+    DatabaseError(#[from] DatabaseError),
+    
+    #[error("invalid input")]
+    InvalidInput,  // Creates MyGrpcError::InvalidInput variant
+}
+```
+
+## License
+This project is [MIT licensed](../../LICENSE).
diff --git a/crates/grpc-error-macro/src/lib.rs b/crates/grpc-error-macro/src/lib.rs
new file mode 100644
index 000000000..a898d49dc
--- /dev/null
+++ b/crates/grpc-error-macro/src/lib.rs
@@ -0,0 +1,180 @@
+//! Procedural macro for deriving the `GrpcError` trait on error enums.
+//!
+//! This macro simplifies the creation of gRPC-compatible error enums by automatically:
+//! - Generating a companion error enum for gRPC serialization
+//! - Implementing the `GrpcError` trait
+//! - Providing proper error code mappings
+//! - Generating `From<Error> for tonic::Status` conversion
+//!
+//! # Example
+//!
+//! ```rust,ignore
+//! use miden_node_grpc_error_macro::GrpcError;
+//! use thiserror::Error;
+//!
+//! #[derive(Debug, Error, GrpcError)]
+//! pub enum GetNoteScriptByRootError {
+//!     #[error("database error")]
+//!     #[grpc(internal)]
+//!     DatabaseError(#[from] DatabaseError),
+//!     
+//!     #[error("malformed script root")]
+//!     DeserializationFailed,
+//!     
+//!     #[error("script with given root doesn't exist")]
+//!     ScriptNotFound,
+//! }
+//! ```
+
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::{Data, DeriveInput, Fields, Ident, parse_macro_input};
+
+/// Derives the `GrpcError` trait for an error enum.
+///
+/// # Attributes
+///
+/// - `#[grpc(internal)]` - Marks a variant as an internal error (will map to
+///   `tonic::Code::Internal`)
+///
+/// # Generated Code
+///
+/// This macro generates:
+/// 1. A companion `*GrpcError` enum with `#[repr(u8)]` for wire serialization
+/// 2. An implementation of the `GrpcError` trait for the companion enum
+/// 3. A method `api_error()` on the original enum that maps to the companion enum
+/// 4. An implementation of `From<Error> for tonic::Status` for automatic error conversion
+#[proc_macro_derive(GrpcError, attributes(grpc))]
+pub fn derive_grpc_error(input: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(input as DeriveInput);
+
+    let name = &input.ident;
+    let vis = &input.vis;
+    let grpc_name = Ident::new(&format!("{name}GrpcError"), name.span());
+
+    let variants = match &input.data {
+        Data::Enum(data) => &data.variants,
+        _ => {
+            return syn::Error::new_spanned(name, "GrpcError can only be derived for enums")
+                .to_compile_error()
+                .into();
+        },
+    };
+
+    // Build the GrpcError enum variants
+    let mut grpc_variants = Vec::new();
+    let mut api_error_arms = Vec::new();
+
+    // Always add Internal variant (standard practice for gRPC errors)
+    grpc_variants.push(quote! {
+        /// Internal server error
+        Internal = 0
+    });
+    let mut discriminant = 1u8;
+
+    for variant in variants {
+        let variant_name = &variant.ident;
+
+        // Check if this variant is marked as internal
+        let is_internal = variant.attrs.iter().any(|attr| {
+            attr.path().is_ident("grpc")
+                && attr.parse_args::<Ident>().map(|i| i == "internal").unwrap_or(false)
+        });
+
+        // Extract doc comments
+        let docs: Vec<_> =
+            variant.attrs.iter().filter(|attr| attr.path().is_ident("doc")).collect();
+
+        if is_internal {
+            // Map to Internal variant
+            let pattern = match &variant.fields {
+                Fields::Unit => quote! { #name::#variant_name },
+                Fields::Unnamed(_) => quote! { #name::#variant_name(..) },
+                Fields::Named(_) => quote! { #name::#variant_name { .. } },
+            };
+
+            api_error_arms.push(quote! {
+                #pattern => #grpc_name::Internal
+            });
+        } else {
+            // Create a corresponding variant in GrpcError enum
+            grpc_variants.push(quote! {
+                #(#docs)*
+                #variant_name = #discriminant
+            });
+
+            let pattern = match &variant.fields {
+                Fields::Unit => quote! { #name::#variant_name },
+                Fields::Unnamed(_) => quote! { #name::#variant_name(..) },
+                Fields::Named(_) => quote! { #name::#variant_name { .. } },
+            };
+
+            api_error_arms.push(quote! {
+                #pattern => #grpc_name::#variant_name
+            });
+
+            discriminant += 1;
+        }
+    }
+
+    let expanded = quote! {
+        #[derive(Debug, Copy, Clone, PartialEq, Eq)]
+        #[repr(u8)]
+        #vis enum #grpc_name {
+            #(#grpc_variants,)*
+        }
+
+        impl #grpc_name {
+            /// Returns the error code for this gRPC error.
+            pub fn api_code(self) -> u8 {
+                self as u8
+            }
+
+            /// Returns true if this is an internal server error.
+            pub fn is_internal(&self) -> bool {
+                matches!(self, Self::Internal)
+            }
+
+            /// Returns the appropriate tonic code for this error.
+            pub fn tonic_code(&self) -> tonic::Code {
+                if self.is_internal() {
+                    tonic::Code::Internal
+                } else {
+                    tonic::Code::InvalidArgument
+                }
+            }
+        }
+
+        impl #name {
+            /// Maps this error to its gRPC error code representation.
+            pub fn api_error(&self) -> #grpc_name {
+                match self {
+                    #(#api_error_arms,)*
+                }
+            }
+        }
+
+        // Automatically implement From<Error> for tonic::Status
+        impl From<#name> for tonic::Status {
+            fn from(value: #name) -> Self {
+                let api_error = value.api_error();
+
+                let message = if api_error.is_internal() {
+                    "Internal error".to_owned()
+                } else {
+                    // Use ErrorReport trait to get detailed error message
+                    use miden_node_utils::ErrorReport as _;
+                    value.as_report()
+                };
+
+                tonic::Status::with_details(
+                    api_error.tonic_code(),
+                    message,
+                    vec![api_error.api_code()].into(),
+                )
+            }
+        }
+    };
+
+    TokenStream::from(expanded)
+}
diff --git a/crates/ntx-builder/src/transaction.rs b/crates/ntx-builder/src/transaction.rs
index 3aa70408c..db7ef2b3c 100644
--- a/crates/ntx-builder/src/transaction.rs
+++ b/crates/ntx-builder/src/transaction.rs
@@ -6,12 +6,14 @@ use miden_objects::asset::AssetWitness;
 use miden_objects::block::{BlockHeader, BlockNumber};
 use miden_objects::note::Note;
 use miden_objects::transaction::{
+    AccountInputs,
     ExecutedTransaction,
     InputNote,
     InputNotes,
     PartialBlockchain,
     ProvenTransaction,
     TransactionArgs,
+    TransactionInputs,
 };
 use miden_objects::vm::FutureMaybeSend;
 use miden_objects::{TransactionInputError, Word};
@@ -121,7 +123,7 @@ impl NtxContext {
                 let notes = notes.into_iter().map(Note::from).collect::<Vec<_>>();
                 let (successful, failed) = self.filter_notes(&data_store, notes).await?;
                 let executed = Box::pin(self.execute(&data_store, successful)).await?;
-                let proven = Box::pin(self.prove(executed)).await?;
+                let proven = Box::pin(self.prove(executed.into())).await?;
                 self.submit(proven).await?;
                 Ok(failed)
             }
@@ -206,11 +208,11 @@ impl NtxContext {
     /// Delegates the transaction proof to the remote prover if configured, otherwise performs the
     /// proof locally.
     #[instrument(target = COMPONENT, name = "ntx.execute_transaction.prove", skip_all, err)]
-    async fn prove(&self, tx: ExecutedTransaction) -> NtxResult<ProvenTransaction> {
+    async fn prove(&self, tx_inputs: TransactionInputs) -> NtxResult<ProvenTransaction> {
         if let Some(remote) = &self.prover {
-            remote.prove(tx.into()).await
+            remote.prove(tx_inputs).await
         } else {
-            tokio::task::spawn_blocking(move || LocalTransactionProver::default().prove(tx.into()))
+            tokio::task::spawn_blocking(move || LocalTransactionProver::default().prove(tx_inputs))
                 .await
                 .map_err(NtxError::Panic)?
         }
@@ -260,9 +262,8 @@ impl DataStore for NtxDataStore {
         &self,
         account_id: AccountId,
         ref_blocks: BTreeSet<BlockNumber>,
-    ) -> impl FutureMaybeSend<
-        Result<(PartialAccount, Option<Word>, BlockHeader, PartialBlockchain), DataStoreError>,
-    > {
+    ) -> impl FutureMaybeSend<Result<(PartialAccount, BlockHeader, PartialBlockchain), DataStoreError>>
+    {
         let account = self.account.clone();
         async move {
             if account.id() != account_id {
@@ -276,10 +277,20 @@ impl DataStore for NtxDataStore {
                 None => return Err(DataStoreError::other("no reference block requested")),
             }
 
-            Ok((account.into(), None, self.reference_header.clone(), self.chain_mmr.clone()))
+            let partial_account = PartialAccount::from(&account);
+
+            Ok((partial_account, self.reference_header.clone(), self.chain_mmr.clone()))
         }
     }
 
+    fn get_foreign_account_inputs(
+        &self,
+        foreign_account_id: AccountId,
+        _ref_block: BlockNumber,
+    ) -> impl FutureMaybeSend<Result<AccountInputs, DataStoreError>> {
+        async move { Err(DataStoreError::AccountNotFound(foreign_account_id)) }
+    }
+
     fn get_vault_asset_witness(
         &self,
         account_id: AccountId,
@@ -299,7 +310,7 @@ impl DataStore for NtxDataStore {
                 });
             }
 
-            AssetWitness::new(account.vault().asset_tree().open(&vault_key)).map_err(|err| {
+            AssetWitness::new(account.vault().open(vault_key).into()).map_err(|err| {
                 DataStoreError::Other {
                     error_msg: "failed to open vault asset tree".into(),
                     source: Some(Box::new(err)),
@@ -339,6 +350,14 @@ impl DataStore for NtxDataStore {
             }
         }
     }
+
+    fn get_note_script(
+        &self,
+        script_root: Word,
+    ) -> impl FutureMaybeSend<Result<miden_objects::note::NoteScript, DataStoreError>> {
+        // TODO: Add implementation for getting note script from NtxDataStore.
+        async move { Err(DataStoreError::NoteScriptNotFound(script_root)) }
+    }
 }
 
 impl MastForestStore for NtxDataStore {
diff --git a/crates/proto/Cargo.toml b/crates/proto/Cargo.toml
index bf23a9547..1b806581b 100644
--- a/crates/proto/Cargo.toml
+++ b/crates/proto/Cargo.toml
@@ -15,15 +15,16 @@ version.workspace      = true
 workspace = true
 
 [dependencies]
-anyhow           = { workspace = true }
-hex              = { version = "0.4" }
-http             = { workspace = true }
-miden-node-utils = { workspace = true }
-miden-objects    = { workspace = true }
-prost            = { workspace = true }
-thiserror        = { workspace = true }
-tonic            = { workspace = true }
-url              = { workspace = true }
+anyhow                      = { workspace = true }
+hex                         = { version = "0.4" }
+http                        = { workspace = true }
+miden-node-grpc-error-macro = { workspace = true }
+miden-node-utils            = { workspace = true }
+miden-objects               = { workspace = true }
+prost                       = { workspace = true }
+thiserror                   = { workspace = true }
+tonic                       = { workspace = true }
+url                         = { workspace = true }
 
 [dev-dependencies]
 proptest = { version = "1.7" }
diff --git a/crates/proto/README.md b/crates/proto/README.md
index 7a1a1d646..41edaae06 100644
--- a/crates/proto/README.md
+++ b/crates/proto/README.md
@@ -6,5 +6,14 @@ This crate contains protobuf bindings for the APIs exposed by the components of
 > This crate is intended for internal use only. For gRPC bindings please see the [miden-node-proto-build](../../proto/README.md) crate.\
 > This crate does not support TLS and cannot be used as a client for the official RPC endpoints.
 
+## Error handling
+
+The node's gRPC endpoints return rich error information using gRPC status details. Each component exposes its own set of error codes which are included in the response details.
+
+- Error types are defined in this crate's `src/errors/` directory:
+  - `src/errors/mod.rs` - Common error traits and conversion utilities
+  - `src/errors/store.rs` - Store component gRPC error enums
+  - `src/errors/block_producer.rs` - Block producer component gRPC error enums
+
 ## License
 This project is [MIT licensed](../../LICENSE).
diff --git a/crates/proto/build.rs b/crates/proto/build.rs
index 015fb0f7d..39e7c908c 100644
--- a/crates/proto/build.rs
+++ b/crates/proto/build.rs
@@ -4,7 +4,6 @@ use std::path::{Path, PathBuf};
 use fs_err as fs;
 use miden_node_proto_build::{
     block_producer_api_descriptor,
-    errors_api_descriptor,
     remote_prover_api_descriptor,
     rpc_api_descriptor,
     store_block_producer_api_descriptor,
@@ -47,7 +46,6 @@ fn main() -> miette::Result<()> {
     generate_bindings(store_shared_api_descriptor(), &dst_dir)?;
     generate_bindings(block_producer_api_descriptor(), &dst_dir)?;
     generate_bindings(remote_prover_api_descriptor(), &dst_dir)?;
-    generate_bindings(errors_api_descriptor(), &dst_dir)?;
 
     generate_mod_rs(&dst_dir).into_diagnostic().wrap_err("generating mod.rs")?;
 
diff --git a/crates/proto/src/clients/mod.rs b/crates/proto/src/clients/mod.rs
index 1468f8cd3..4fb6b622c 100644
--- a/crates/proto/src/clients/mod.rs
+++ b/crates/proto/src/clients/mod.rs
@@ -113,11 +113,14 @@ pub type StoreBlockProducerClient =
 pub type StoreRpcClient =
     generated::rpc_store::rpc_client::RpcClient<InterceptedService<Channel, OtelInterceptor>>;
 
-pub type RemoteProverProxyClient =
+pub type RemoteProverProxyStatusClient =
     generated::remote_prover::proxy_status_api_client::ProxyStatusApiClient<
         InterceptedService<Channel, OtelInterceptor>,
     >;
 
+pub type RemoteProverClient =
+    generated::remote_prover::api_client::ApiClient<InterceptedService<Channel, OtelInterceptor>>;
+
 // GRPC CLIENT BUILDER TRAIT
 // ================================================================================================
 
@@ -219,7 +222,7 @@ impl GrpcClientBuilder for StoreRpc {
 }
 
 impl GrpcClientBuilder for RemoteProverProxy {
-    type Service = RemoteProverProxyClient;
+    type Service = RemoteProverProxyStatusClient;
 
     fn with_interceptor(channel: Channel, _config: &ClientConfig) -> Self::Service {
         generated::remote_prover::proxy_status_api_client::ProxyStatusApiClient::with_interceptor(
@@ -229,6 +232,14 @@ impl GrpcClientBuilder for RemoteProverProxy {
     }
 }
 
+impl GrpcClientBuilder for RemoteProverClient {
+    type Service = RemoteProverClient;
+
+    fn with_interceptor(channel: Channel, _config: &ClientConfig) -> Self::Service {
+        generated::remote_prover::api_client::ApiClient::with_interceptor(channel, OtelInterceptor)
+    }
+}
+
 // STRICT TYPE-SAFE BUILDER (NO DEFAULTS)
 // ================================================================================================
 
diff --git a/crates/proto/src/domain/account.rs b/crates/proto/src/domain/account.rs
index d00c88ddd..494f16671 100644
--- a/crates/proto/src/domain/account.rs
+++ b/crates/proto/src/domain/account.rs
@@ -7,10 +7,12 @@ use miden_objects::account::{
     AccountHeader,
     AccountId,
     AccountStorageHeader,
+    StorageMap,
     StorageSlotType,
 };
-use miden_objects::asset::Asset;
+use miden_objects::asset::{Asset, AssetVault};
 use miden_objects::block::{AccountWitness, BlockNumber};
+use miden_objects::crypto::merkle::SparseMerklePath;
 use miden_objects::note::{NoteExecutionMode, NoteTag};
 use miden_objects::utils::{Deserializable, DeserializationError, Serializable};
 use thiserror::Error;
@@ -105,75 +107,181 @@ impl From<&AccountInfo> for proto::account::AccountDetails {
 /// Represents a request for an account proof.
 pub struct AccountProofRequest {
     pub account_id: AccountId,
-    pub account_details: Option<AccountDetailRequest>,
+    pub block_num: BlockNumber,
+    pub details: Option<AccountDetailRequest>,
 }
 
 impl TryFrom<proto::rpc_store::AccountProofRequest> for AccountProofRequest {
     type Error = ConversionError;
 
-    fn try_from(request: proto::rpc_store::AccountProofRequest) -> Result<Self, Self::Error> {
-        let proto::rpc_store::AccountProofRequest { account_id, account_details } = request;
+    fn try_from(value: proto::rpc_store::AccountProofRequest) -> Result<Self, Self::Error> {
+        let proto::rpc_store::AccountProofRequest { account_id, block_num, details } = value;
 
         let account_id = account_id
             .ok_or(proto::rpc_store::AccountProofRequest::missing_field(stringify!(account_id)))?
             .try_into()?;
 
-        let account_details = account_details.map(TryFrom::try_from).transpose()?;
+        let details = details.map(TryFrom::try_from).transpose()?;
 
-        Ok(AccountProofRequest { account_id, account_details })
+        Ok(AccountProofRequest {
+            account_id,
+            block_num: block_num.into(),
+            details,
+        })
     }
 }
 
 /// Represents a request for account details alongside specific storage data.
 pub struct AccountDetailRequest {
     pub code_commitment: Option<Word>,
-    pub storage_requests: Vec<StorageMapKeysProof>,
+    pub asset_vault_commitment: Option<Word>,
+    pub storage_requests: Vec<StorageMapRequest>,
 }
 
-impl TryFrom<proto::rpc_store::account_proof_request::AccountDetailsRequest>
+impl TryFrom<proto::rpc_store::account_proof_request::AccountDetailRequest>
     for AccountDetailRequest
 {
     type Error = ConversionError;
 
     fn try_from(
-        request: proto::rpc_store::account_proof_request::AccountDetailsRequest,
+        value: proto::rpc_store::account_proof_request::AccountDetailRequest,
     ) -> Result<Self, Self::Error> {
-        let proto::rpc_store::account_proof_request::AccountDetailsRequest {
+        let proto::rpc_store::account_proof_request::AccountDetailRequest {
+            code_commitment,
+            asset_vault_commitment,
+            storage_maps,
+        } = value;
+
+        let code_commitment = code_commitment.map(TryFrom::try_from).transpose()?;
+        let asset_vault_commitment = asset_vault_commitment.map(TryFrom::try_from).transpose()?;
+        let storage_requests = try_convert(storage_maps).collect::<Result<_, _>>()?;
+
+        Ok(AccountDetailRequest {
             code_commitment,
+            asset_vault_commitment,
             storage_requests,
-        } = request;
+        })
+    }
+}
 
-        let storage_requests = try_convert(storage_requests).collect::<Result<_, _>>()?;
-        let code_commitment = code_commitment.map(Word::try_from).transpose()?;
+impl TryFrom<proto::account::AccountStorageHeader> for AccountStorageHeader {
+    type Error = ConversionError;
+
+    fn try_from(value: proto::account::AccountStorageHeader) -> Result<Self, Self::Error> {
+        let proto::account::AccountStorageHeader { slots } = value;
+
+        let items = slots
+            .into_iter()
+            .map(|slot| {
+                let slot_type = storage_slot_type_from_raw(slot.slot_type)?;
+                let commitment =
+                    slot.commitment.ok_or(ConversionError::NotAValidFelt)?.try_into()?;
+                Ok((slot_type, commitment))
+            })
+            .collect::<Result<Vec<_>, ConversionError>>()?;
 
-        Ok(AccountDetailRequest { code_commitment, storage_requests })
+        Ok(AccountStorageHeader::new(items))
     }
 }
 
-/// Represents a request for an account's storage map values and its proof of existence.
-pub struct StorageMapKeysProof {
-    /// Index of the storage map
-    pub storage_index: u8,
-    /// List of requested keys in the map
-    pub storage_keys: Vec<Word>,
+impl TryFrom<proto::rpc_store::account_storage_details::AccountStorageMapDetails>
+    for AccountStorageMapDetails
+{
+    type Error = ConversionError;
+
+    fn try_from(
+        value: proto::rpc_store::account_storage_details::AccountStorageMapDetails,
+    ) -> Result<Self, Self::Error> {
+        let proto::rpc_store::account_storage_details::AccountStorageMapDetails {
+            slot_index,
+            too_many_entries,
+            entries,
+        } = value;
+
+        let slot_index = slot_index.try_into().map_err(ConversionError::TryFromIntError)?;
+
+        // Extract map_entries from the MapEntries message
+        let map_entries = if let Some(entries) = entries {
+            entries
+                .entries
+                .into_iter()
+                .map(|entry| {
+                    let key = entry
+                        .key
+                        .ok_or(proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry::missing_field(
+                            stringify!(key),
+                        ))?
+                        .try_into()?;
+                    let value = entry
+                        .value
+                        .ok_or(proto::rpc_store::account_storage_details::account_storage_map_details::map_entries::StorageMapEntry::missing_field(
+                            stringify!(value),
+                        ))?
+                        .try_into()?;
+                    Ok((key, value))
+                })
+                .collect::<Result<Vec<_>, ConversionError>>()?
+        } else {
+            Vec::new()
+        };
+
+        Ok(Self {
+            slot_index,
+            too_many_entries,
+            map_entries,
+        })
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct StorageMapRequest {
+    pub slot_index: u8,
+    pub slot_data: SlotData,
 }
 
-impl TryFrom<proto::rpc_store::account_proof_request::account_details_request::StorageRequest>
-    for StorageMapKeysProof
+impl
+    TryFrom<
+        proto::rpc_store::account_proof_request::account_detail_request::StorageMapDetailRequest,
+    > for StorageMapRequest
 {
     type Error = ConversionError;
 
     fn try_from(
-        request: proto::rpc_store::account_proof_request::account_details_request::StorageRequest,
+        value: proto::rpc_store::account_proof_request::account_detail_request::StorageMapDetailRequest,
     ) -> Result<Self, Self::Error> {
-        let proto::rpc_store::account_proof_request::account_details_request::StorageRequest {
-            storage_slot_index,
-            map_keys,
-        } = request;
-
-        Ok(StorageMapKeysProof {
-            storage_index: storage_slot_index.try_into()?,
-            storage_keys: try_convert(map_keys).collect::<Result<_, _>>()?,
+        let proto::rpc_store::account_proof_request::account_detail_request::StorageMapDetailRequest {
+            slot_index,
+            slot_data,
+        } = value;
+
+        let slot_index = slot_index.try_into()?;
+        let slot_data = slot_data.ok_or(proto::rpc_store::account_proof_request::account_detail_request::StorageMapDetailRequest::missing_field(stringify!(slot_data)))?.try_into()?;
+
+        Ok(StorageMapRequest { slot_index, slot_data })
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum SlotData {
+    All,
+    MapKeys(Vec<Word>),
+}
+
+impl TryFrom<proto::rpc_store::account_proof_request::account_detail_request::storage_map_detail_request::SlotData>
+    for SlotData
+{
+    type Error = ConversionError;
+
+    fn try_from(value: proto::rpc_store::account_proof_request::account_detail_request::storage_map_detail_request::SlotData) -> Result<Self, Self::Error> {
+        use proto::rpc_store::account_proof_request::account_detail_request::storage_map_detail_request::SlotData as ProtoSlotData;
+
+        Ok(match value {
+            ProtoSlotData::AllEntries(true) => SlotData::All,
+            ProtoSlotData::AllEntries(false) => return Err(ConversionError::EnumDiscriminantOutOfRange),
+            ProtoSlotData::MapKeys(keys) => {
+                let keys = try_convert(keys.map_keys).collect::<Result<Vec<_>, _>>()?;
+                SlotData::MapKeys(keys)
+            },
         })
     }
 }
@@ -243,6 +351,152 @@ impl From<AccountStorageHeader> for proto::account::AccountStorageHeader {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct AccountVaultDetails {
+    pub too_many_assets: bool,
+    pub assets: Vec<Asset>,
+}
+impl AccountVaultDetails {
+    const MAX_RETURN_ENTRIES: usize = 1000;
+
+    pub fn new(vault: &AssetVault) -> Self {
+        if vault.assets().nth(Self::MAX_RETURN_ENTRIES).is_some() {
+            Self::too_many()
+        } else {
+            Self {
+                too_many_assets: false,
+                assets: Vec::from_iter(vault.assets()),
+            }
+        }
+    }
+
+    pub fn empty() -> Self {
+        Self {
+            too_many_assets: false,
+            assets: Vec::new(),
+        }
+    }
+
+    fn too_many() -> Self {
+        Self {
+            too_many_assets: true,
+            assets: Vec::new(),
+        }
+    }
+}
+
+impl TryFrom<proto::rpc_store::AccountVaultDetails> for AccountVaultDetails {
+    type Error = ConversionError;
+
+    fn try_from(value: proto::rpc_store::AccountVaultDetails) -> Result<Self, Self::Error> {
+        let proto::rpc_store::AccountVaultDetails { too_many_assets, assets } = value;
+
+        let assets =
+            Result::<Vec<_>, ConversionError>::from_iter(assets.into_iter().map(|asset| {
+                let asset = asset
+                    .asset
+                    .ok_or(proto::primitives::Asset::missing_field(stringify!(asset)))?;
+                let asset = Word::try_from(asset)?;
+                Asset::try_from(asset).map_err(ConversionError::AssetError)
+            }))?;
+        Ok(Self { too_many_assets, assets })
+    }
+}
+
+impl From<AccountVaultDetails> for proto::rpc_store::AccountVaultDetails {
+    fn from(value: AccountVaultDetails) -> Self {
+        let AccountVaultDetails { too_many_assets, assets } = value;
+
+        Self {
+            too_many_assets,
+            assets: Vec::from_iter(assets.into_iter().map(|asset| proto::primitives::Asset {
+                asset: Some(proto::primitives::Digest::from(Word::from(asset))),
+            })),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct AccountStorageMapDetails {
+    pub slot_index: u8,
+    pub too_many_entries: bool,
+    pub map_entries: Vec<(Word, Word)>,
+}
+
+impl AccountStorageMapDetails {
+    const MAX_RETURN_ENTRIES: usize = 1000;
+
+    pub fn new(slot_index: u8, slot_data: SlotData, storage_map: &StorageMap) -> Self {
+        match slot_data {
+            SlotData::All => Self::from_all_entries(slot_index, storage_map),
+            SlotData::MapKeys(keys) => Self::from_specific_keys(slot_index, &keys[..], storage_map),
+        }
+    }
+
+    fn from_all_entries(slot_index: u8, storage_map: &StorageMap) -> Self {
+        if storage_map.num_entries() > Self::MAX_RETURN_ENTRIES {
+            Self::too_many_entries(slot_index)
+        } else {
+            let map_entries = Vec::from_iter(storage_map.entries().map(|(k, v)| (*k, *v)));
+            Self {
+                slot_index,
+                too_many_entries: false,
+                map_entries,
+            }
+        }
+    }
+
+    fn from_specific_keys(slot_index: u8, keys: &[Word], storage_map: &StorageMap) -> Self {
+        if keys.len() > Self::MAX_RETURN_ENTRIES {
+            Self::too_many_entries(slot_index)
+        } else {
+            // TODO For now, we return all entries instead of specific keys with proofs
+            Self::from_all_entries(slot_index, storage_map)
+        }
+    }
+
+    pub fn too_many_entries(slot_index: u8) -> Self {
+        Self {
+            slot_index,
+            too_many_entries: true,
+            map_entries: Vec::new(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct AccountStorageDetails {
+    pub header: AccountStorageHeader,
+    pub map_details: Vec<AccountStorageMapDetails>,
+}
+
+impl TryFrom<proto::rpc_store::AccountStorageDetails> for AccountStorageDetails {
+    type Error = ConversionError;
+
+    fn try_from(value: proto::rpc_store::AccountStorageDetails) -> Result<Self, Self::Error> {
+        let proto::rpc_store::AccountStorageDetails { header, map_details } = value;
+
+        let header = header
+            .ok_or(proto::rpc_store::AccountStorageDetails::missing_field(stringify!(header)))?
+            .try_into()?;
+
+        let map_details = try_convert(map_details).collect::<Result<Vec<_>, _>>()?;
+
+        Ok(Self { header, map_details })
+    }
+}
+
+impl From<AccountStorageDetails> for proto::rpc_store::AccountStorageDetails {
+    fn from(value: AccountStorageDetails) -> Self {
+        let AccountStorageDetails { header, map_details } = value;
+
+        Self {
+            header: Some(header.into()),
+            map_details: map_details.into_iter().map(Into::into).collect(),
+        }
+    }
+}
+
 const fn storage_slot_type_from_raw(slot_type: u32) -> Result<StorageSlotType, ConversionError> {
     Ok(match slot_type {
         0 => StorageSlotType::Map,
@@ -259,166 +513,175 @@ const fn storage_slot_type_to_raw(slot_type: StorageSlotType) -> u32 {
 }
 
 /// Represents account details returned in response to an account proof request.
-pub struct AccountDetailsResponse {
+pub struct AccountDetails {
     pub account_header: AccountHeader,
-    pub storage_header: AccountStorageHeader,
     pub account_code: Option<Vec<u8>>,
-    pub storage_proofs: Vec<StorageSlotMapProof>,
+    pub vault_details: AccountVaultDetails,
+    pub storage_details: AccountStorageDetails,
 }
 
-impl TryFrom<proto::rpc_store::account_proof::AccountDetailsResponse> for AccountDetailsResponse {
+/// Represents the response to an account proof request.
+pub struct AccountProofResponse {
+    pub witness: AccountWitness,
+    pub details: Option<AccountDetails>,
+}
+
+impl TryFrom<proto::rpc_store::AccountProofResponse> for AccountProofResponse {
+    type Error = ConversionError;
+
+    fn try_from(value: proto::rpc_store::AccountProofResponse) -> Result<Self, Self::Error> {
+        let proto::rpc_store::AccountProofResponse { witness, details } = value;
+
+        let witness = witness
+            .ok_or(proto::rpc_store::AccountProofResponse::missing_field(stringify!(witness)))?
+            .try_into()?;
+
+        let details = details.map(TryFrom::try_from).transpose()?;
+
+        Ok(AccountProofResponse { witness, details })
+    }
+}
+
+impl From<AccountProofResponse> for proto::rpc_store::AccountProofResponse {
+    fn from(value: AccountProofResponse) -> Self {
+        let AccountProofResponse { witness, details } = value;
+
+        Self {
+            witness: Some(witness.into()),
+            details: details.map(Into::into),
+        }
+    }
+}
+
+impl TryFrom<proto::rpc_store::account_proof_response::AccountDetails> for AccountDetails {
     type Error = ConversionError;
 
     fn try_from(
-        value: proto::rpc_store::account_proof::AccountDetailsResponse,
+        value: proto::rpc_store::account_proof_response::AccountDetails,
     ) -> Result<Self, Self::Error> {
-        let proto::rpc_store::account_proof::AccountDetailsResponse {
+        let proto::rpc_store::account_proof_response::AccountDetails {
             header,
-            storage_header,
-            account_code,
-            storage_maps,
+            code,
+            vault_details,
+            storage_details,
         } = value;
 
         let account_header = header
-            .ok_or(proto::rpc_store::account_proof::AccountDetailsResponse::missing_field(
+            .ok_or(proto::rpc_store::account_proof_response::AccountDetails::missing_field(
                 stringify!(header),
             ))?
             .try_into()?;
 
-        let storage_header = storage_header.ok_or(
-            proto::rpc_store::account_proof::AccountDetailsResponse::missing_field(stringify!(
-                storage_header
-            )),
-        )?;
-
-        let storage_header_entries = storage_header
-            .slots
-            .into_iter()
-            .map(|slot| {
-                let slot_type = storage_slot_type_from_raw(slot.slot_type)?;
-                let commitment = slot
-                    .commitment
-                    .ok_or(proto::account::account_storage_header::StorageSlot::missing_field(
-                        stringify!(commitment),
-                    ))?
-                    .try_into()?;
-                Ok((slot_type, commitment))
-            })
-            .collect::<Result<Vec<_>, ConversionError>>()?;
-
-        let storage_header = AccountStorageHeader::new(storage_header_entries);
+        let storage_details = storage_details
+            .ok_or(proto::rpc_store::account_proof_response::AccountDetails::missing_field(
+                stringify!(storage_details),
+            ))?
+            .try_into()?;
 
-        let storage_proofs = try_convert(storage_maps).collect::<Result<_, _>>()?;
+        let vault_details = vault_details
+            .ok_or(proto::rpc_store::account_proof_response::AccountDetails::missing_field(
+                stringify!(vault_details),
+            ))?
+            .try_into()?;
+        let account_code = code;
 
-        Ok(AccountDetailsResponse {
+        Ok(AccountDetails {
             account_header,
-            storage_header,
             account_code,
-            storage_proofs,
+            vault_details,
+            storage_details,
         })
     }
 }
 
-impl From<AccountDetailsResponse> for proto::rpc_store::account_proof::AccountDetailsResponse {
-    fn from(value: AccountDetailsResponse) -> Self {
-        let AccountDetailsResponse {
+impl From<AccountDetails> for proto::rpc_store::account_proof_response::AccountDetails {
+    fn from(value: AccountDetails) -> Self {
+        let AccountDetails {
             account_header,
-            storage_header,
+            storage_details,
             account_code,
-            storage_proofs,
+            vault_details,
         } = value;
 
         let header = Some(proto::account::AccountHeader::from(account_header));
-        let storage_header = Some(proto::account::AccountStorageHeader::from(storage_header));
-
-        let storage_maps = storage_proofs
-            .into_iter()
-            .map(|proof| {
-                let storage_slot = u32::from(proof.storage_slot);
-                let smt_proof = Some(proto::primitives::SmtOpening::from(proof.proof));
-                proto::rpc_store::account_proof::account_details_response::StorageSlotMapProof {
-                    storage_slot,
-                    smt_proof,
-                }
-            })
-            .collect();
+        let storage_details = Some(storage_details.into());
+        let code = account_code;
+        let vault_details = Some(vault_details.into());
 
         Self {
             header,
-            storage_header,
-            account_code,
-            storage_maps,
+            storage_details,
+            code,
+            vault_details,
         }
     }
 }
 
-/// Represents a storage slot map proof.
-pub struct StorageSlotMapProof {
-    pub storage_slot: u8,
-    pub proof: miden_objects::crypto::merkle::SmtProof,
-}
-
-impl TryFrom<proto::rpc_store::account_proof::account_details_response::StorageSlotMapProof>
-    for StorageSlotMapProof
+impl From<AccountStorageMapDetails>
+    for proto::rpc_store::account_storage_details::AccountStorageMapDetails
 {
-    type Error = ConversionError;
+    fn from(value: AccountStorageMapDetails) -> Self {
+        use proto::rpc_store::account_storage_details::account_storage_map_details;
 
-    fn try_from(
-        proof: proto::rpc_store::account_proof::account_details_response::StorageSlotMapProof,
-    ) -> Result<Self, Self::Error> {
-        let proto::rpc_store::account_proof::account_details_response::StorageSlotMapProof {
-            storage_slot,
-            smt_proof,
-        } = proof;
+        let AccountStorageMapDetails {
+            slot_index,
+            too_many_entries,
+            map_entries,
+        } = value;
 
-        let storage_slot = storage_slot.try_into().map_err(ConversionError::TryFromIntError)?;
-        let proof =
-        smt_proof.ok_or(proto::rpc_store::account_proof::account_details_response::StorageSlotMapProof::missing_field(stringify!(proof)))?.try_into()?;
+        let entries = Some(account_storage_map_details::MapEntries {
+            entries: Vec::from_iter(map_entries.into_iter().map(|(key, value)| {
+                account_storage_map_details::map_entries::StorageMapEntry {
+                    key: Some(key.into()),
+                    value: Some(value.into()),
+                }
+            })),
+        });
 
-        Ok(StorageSlotMapProof { storage_slot, proof })
+        Self {
+            slot_index: u32::from(slot_index),
+            too_many_entries,
+            entries,
+        }
     }
 }
 
-// ACCOUNT PROOF
+// ACCOUNT WITNESS
 // ================================================================================================
 
-/// Represents an account proof.
-pub struct AccountProofResponse {
-    pub block_num: BlockNumber,
-    pub witness: AccountWitnessRecord,
-    pub account_details: Option<AccountDetailsResponse>,
-}
-
-impl TryFrom<proto::rpc_store::AccountProof> for AccountProofResponse {
+impl TryFrom<proto::account::AccountWitness> for AccountWitness {
     type Error = ConversionError;
 
-    fn try_from(proof: proto::rpc_store::AccountProof) -> Result<Self, Self::Error> {
-        let proto::rpc_store::AccountProof { block_num, witness, details } = proof;
-
-        let witness =
-            witness.ok_or(proto::rpc_store::AccountProof::missing_field(stringify!(witness)))?;
-
-        let witness = AccountWitnessRecord::try_from(witness)?;
-
-        let account_details = details.map(AccountDetailsResponse::try_from).transpose()?;
+    fn try_from(account_witness: proto::account::AccountWitness) -> Result<Self, Self::Error> {
+        let witness_id = account_witness
+            .witness_id
+            .ok_or(proto::account::AccountWitness::missing_field(stringify!(witness_id)))?
+            .try_into()?;
+        let commitment = account_witness
+            .commitment
+            .ok_or(proto::account::AccountWitness::missing_field(stringify!(commitment)))?
+            .try_into()?;
+        let path = account_witness
+            .path
+            .ok_or(proto::account::AccountWitness::missing_field(stringify!(path)))?
+            .try_into()?;
 
-        Ok(AccountProofResponse {
-            block_num: block_num.into(),
-            witness,
-            account_details,
+        AccountWitness::new(witness_id, commitment, path).map_err(|err| {
+            ConversionError::deserialization_error(
+                "AccountWitness",
+                DeserializationError::InvalidValue(err.to_string()),
+            )
         })
     }
 }
 
-impl From<AccountProofResponse> for proto::rpc_store::AccountProof {
-    fn from(value: AccountProofResponse) -> Self {
-        let AccountProofResponse { block_num, witness, account_details } = value;
-
-        proto::rpc_store::AccountProof {
-            block_num: block_num.as_u32(),
-            witness: Some(proto::account::AccountWitness::from(witness)),
-            details: account_details
-                .map(proto::rpc_store::account_proof::AccountDetailsResponse::from),
+impl From<AccountWitness> for proto::account::AccountWitness {
+    fn from(witness: AccountWitness) -> Self {
+        Self {
+            account_id: Some(witness.id().into()),
+            witness_id: Some(witness.id().into()),
+            commitment: Some(witness.state_commitment().into()),
+            path: Some(witness.into_proof().into_parts().0.into()),
         }
     }
 }
@@ -426,7 +689,7 @@ impl From<AccountProofResponse> for proto::rpc_store::AccountProof {
 // ACCOUNT WITNESS RECORD
 // ================================================================================================
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct AccountWitnessRecord {
     pub account_id: AccountId,
     pub witness: AccountWitness,
@@ -446,10 +709,11 @@ impl TryFrom<proto::account::AccountWitness> for AccountWitnessRecord {
             .commitment
             .ok_or(proto::account::AccountWitness::missing_field(stringify!(commitment)))?
             .try_into()?;
-        let path = account_witness_record
+        let path: SparseMerklePath = account_witness_record
             .path
             .as_ref()
             .ok_or(proto::account::AccountWitness::missing_field(stringify!(path)))?
+            .clone()
             .try_into()?;
 
         let witness = AccountWitness::new(witness_id, commitment, path).map_err(|err| {
@@ -475,7 +739,7 @@ impl From<AccountWitnessRecord> for proto::account::AccountWitness {
             account_id: Some(from.account_id.into()),
             witness_id: Some(from.witness.id().into()),
             commitment: Some(from.witness.state_commitment().into()),
-            path: Some(from.witness.into_proof().into_parts().0.into()),
+            path: Some(from.witness.path().clone().into()),
         }
     }
 }
diff --git a/crates/proto/src/domain/block.rs b/crates/proto/src/domain/block.rs
index 4967fbeb7..dd449e2b9 100644
--- a/crates/proto/src/domain/block.rs
+++ b/crates/proto/src/domain/block.rs
@@ -12,6 +12,7 @@ use miden_objects::block::{
 use miden_objects::note::{NoteId, NoteInclusionProof};
 use miden_objects::transaction::PartialBlockchain;
 use miden_objects::utils::{Deserializable, Serializable};
+use thiserror::Error;
 
 use crate::errors::{ConversionError, MissingFieldHelper};
 use crate::{AccountWitnessRecord, NullifierWitnessRecord, generated as proto};
@@ -218,18 +219,48 @@ impl From<&FeeParameters> for proto::blockchain::FeeParameters {
 // BLOCK RANGE
 // ================================================================================================
 
+#[derive(Debug, Clone, Error, PartialEq, Eq)]
+pub enum InvalidBlockRange {
+    #[error("start ({start}) greater than end ({end})")]
+    StartGreaterThanEnd { start: BlockNumber, end: BlockNumber },
+    #[error("empty range: start ({start})..end ({end})")]
+    EmptyRange { start: BlockNumber, end: BlockNumber },
+}
+
 impl proto::rpc_store::BlockRange {
     /// Converts the block range into an inclusive range, using the fallback block number if the
     /// block to is not specified.
-    pub fn into_inclusive_range(self, fallback: BlockNumber) -> RangeInclusive<BlockNumber> {
-        RangeInclusive::new(
+    pub fn into_inclusive_range<T: From<InvalidBlockRange>>(
+        self,
+        fallback: &BlockNumber,
+    ) -> Result<RangeInclusive<BlockNumber>, T> {
+        let block_range = RangeInclusive::new(
             self.block_from.into(),
-            self.block_to.map_or(fallback, BlockNumber::from),
-        )
+            self.block_to.map_or(*fallback, BlockNumber::from),
+        );
+
+        if block_range.start() > block_range.end() {
+            return Err(InvalidBlockRange::StartGreaterThanEnd {
+                start: *block_range.start(),
+                end: *block_range.end(),
+            }
+            .into());
+        }
+
+        if block_range.is_empty() {
+            return Err(InvalidBlockRange::EmptyRange {
+                start: *block_range.start(),
+                end: *block_range.end(),
+            }
+            .into());
+        }
+
+        Ok(block_range)
     }
+}
 
-    /// Converts an inclusive range into a [`proto::rpc_store::BlockRange`].
-    pub fn from_range(range: RangeInclusive<BlockNumber>) -> Self {
+impl From<RangeInclusive<BlockNumber>> for proto::rpc_store::BlockRange {
+    fn from(range: RangeInclusive<BlockNumber>) -> Self {
         Self {
             block_from: range.start().as_u32(),
             block_to: Some(range.end().as_u32()),
diff --git a/crates/proto/src/domain/errors.rs b/crates/proto/src/domain/errors.rs
deleted file mode 100644
index 3e03d3dd1..000000000
--- a/crates/proto/src/domain/errors.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use crate::generated::errors::SubmitProvenTransactionError;
-
-impl SubmitProvenTransactionError {
-    pub fn api_code(&self) -> u8 {
-        *self as u8
-    }
-
-    pub fn tonic_code(&self) -> tonic::Code {
-        match self {
-            SubmitProvenTransactionError::InternalError
-            | SubmitProvenTransactionError::Unspecified => tonic::Code::Internal,
-            _ => tonic::Code::InvalidArgument,
-        }
-    }
-
-    pub fn is_internal(&self) -> bool {
-        matches!(
-            self,
-            SubmitProvenTransactionError::InternalError | SubmitProvenTransactionError::Unspecified
-        )
-    }
-}
diff --git a/crates/proto/src/domain/mempool.rs b/crates/proto/src/domain/mempool.rs
index 16a291e54..6e9e56322 100644
--- a/crates/proto/src/domain/mempool.rs
+++ b/crates/proto/src/domain/mempool.rs
@@ -1,4 +1,4 @@
-use std::collections::BTreeSet;
+use std::collections::HashSet;
 
 use miden_objects::account::delta::AccountUpdateDetails;
 use miden_objects::block::BlockHeader;
@@ -22,7 +22,7 @@ pub enum MempoolEvent {
         header: BlockHeader,
         txs: Vec<TransactionId>,
     },
-    TransactionsReverted(BTreeSet<TransactionId>),
+    TransactionsReverted(HashSet<TransactionId>),
 }
 
 impl MempoolEvent {
diff --git a/crates/proto/src/domain/merkle.rs b/crates/proto/src/domain/merkle.rs
index ca1ca551a..61b49c9e8 100644
--- a/crates/proto/src/domain/merkle.rs
+++ b/crates/proto/src/domain/merkle.rs
@@ -183,10 +183,11 @@ impl TryFrom<proto::primitives::SmtOpening> for SmtProof {
     type Error = ConversionError;
 
     fn try_from(opening: proto::primitives::SmtOpening) -> Result<Self, Self::Error> {
-        let path: MerklePath = opening
+        let path = opening
             .path
             .as_ref()
             .ok_or(proto::primitives::SmtOpening::missing_field(stringify!(path)))?
+            .clone()
             .try_into()?;
         let leaf: SmtLeaf = opening
             .leaf
@@ -199,7 +200,8 @@ impl TryFrom<proto::primitives::SmtOpening> for SmtProof {
 
 impl From<SmtProof> for proto::primitives::SmtOpening {
     fn from(proof: SmtProof) -> Self {
-        let (ref path, leaf) = proof.into_parts();
+        let (path, leaf) = proof.into_parts();
+
         Self {
             path: Some(path.into()),
             leaf: Some(leaf.into()),
diff --git a/crates/proto/src/domain/mod.rs b/crates/proto/src/domain/mod.rs
index 6d023a1a4..f70c8f738 100644
--- a/crates/proto/src/domain/mod.rs
+++ b/crates/proto/src/domain/mod.rs
@@ -2,7 +2,6 @@ pub mod account;
 pub mod batch;
 pub mod block;
 pub mod digest;
-pub mod errors;
 pub mod mempool;
 pub mod merkle;
 pub mod note;
diff --git a/crates/proto/src/errors.rs b/crates/proto/src/errors/mod.rs
similarity index 94%
rename from crates/proto/src/errors.rs
rename to crates/proto/src/errors/mod.rs
index bef5a1468..5e461315c 100644
--- a/crates/proto/src/errors.rs
+++ b/crates/proto/src/errors/mod.rs
@@ -1,6 +1,8 @@
 use std::any::type_name;
 use std::num::TryFromIntError;
 
+// Re-export the GrpcError derive macro for convenience
+pub use miden_node_grpc_error_macro::GrpcError;
 use miden_objects::crypto::merkle::{SmtLeafError, SmtProofError};
 use miden_objects::utils::DeserializationError;
 use miden_objects::{AssetError, FeeError};
@@ -8,6 +10,9 @@ use thiserror::Error;
 
 use crate::domain::note::NetworkNoteError;
 
+#[cfg(test)]
+mod test_macro;
+
 #[derive(Debug, Error)]
 pub enum ConversionError {
     #[error("asset error")]
diff --git a/crates/proto/src/errors/test_macro.rs b/crates/proto/src/errors/test_macro.rs
new file mode 100644
index 000000000..abfc9ddcc
--- /dev/null
+++ b/crates/proto/src/errors/test_macro.rs
@@ -0,0 +1,69 @@
+//! Test to verify the `GrpcError` macro generates correct code
+
+use thiserror::Error;
+
+use crate::errors::GrpcError;
+
+#[derive(Debug, Error, GrpcError)]
+pub enum TestError {
+    #[error("internal error 1")]
+    #[grpc(internal)]
+    InternalError1,
+
+    #[error("client error 1")]
+    ClientError1,
+
+    #[error("internal error 2")]
+    #[grpc(internal)]
+    InternalError2,
+
+    #[error("client error 2")]
+    ClientError2,
+
+    #[error("client error 3")]
+    ClientError3,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_all_variants_mapped() {
+        // Test that all variants map correctly
+        assert_eq!(TestError::InternalError1.api_error(), TestErrorGrpcError::Internal);
+        assert_eq!(TestError::ClientError1.api_error(), TestErrorGrpcError::ClientError1);
+        assert_eq!(TestError::InternalError2.api_error(), TestErrorGrpcError::Internal);
+        assert_eq!(TestError::ClientError2.api_error(), TestErrorGrpcError::ClientError2);
+        assert_eq!(TestError::ClientError3.api_error(), TestErrorGrpcError::ClientError3);
+    }
+
+    #[test]
+    fn test_grpc_error_codes() {
+        // Verify the discriminant values
+        assert_eq!(TestErrorGrpcError::Internal.api_code(), 0);
+        assert_eq!(TestErrorGrpcError::ClientError1.api_code(), 1);
+        assert_eq!(TestErrorGrpcError::ClientError2.api_code(), 2);
+        assert_eq!(TestErrorGrpcError::ClientError3.api_code(), 3);
+    }
+
+    #[test]
+    fn test_is_internal() {
+        assert!(TestErrorGrpcError::Internal.is_internal());
+        assert!(!TestErrorGrpcError::ClientError1.is_internal());
+        assert!(!TestErrorGrpcError::ClientError2.is_internal());
+        assert!(!TestErrorGrpcError::ClientError3.is_internal());
+    }
+
+    #[test]
+    fn test_tonic_status_conversion() {
+        // Test that the automatic From<Error> for tonic::Status implementation works
+        let internal_status: tonic::Status = TestError::InternalError1.into();
+        assert_eq!(internal_status.code(), tonic::Code::Internal);
+        assert_eq!(internal_status.message(), "Internal error");
+
+        let client_status: tonic::Status = TestError::ClientError1.into();
+        assert_eq!(client_status.code(), tonic::Code::InvalidArgument);
+        assert_eq!(client_status.message(), "client error 1");
+    }
+}
diff --git a/crates/proto/src/generated/account.rs b/crates/proto/src/generated/account.rs
index 463f5abf3..2048e5128 100644
--- a/crates/proto/src/generated/account.rs
+++ b/crates/proto/src/generated/account.rs
@@ -90,5 +90,5 @@ pub struct AccountWitness {
     pub commitment: ::core::option::Option<super::primitives::Digest>,
     /// The merkle path of the state commitment in the account tree.
     #[prost(message, optional, tag = "4")]
-    pub path: ::core::option::Option<super::primitives::MerklePath>,
+    pub path: ::core::option::Option<super::primitives::SparseMerklePath>,
 }
diff --git a/crates/proto/src/generated/errors.rs b/crates/proto/src/generated/errors.rs
deleted file mode 100644
index 60d9318e2..000000000
--- a/crates/proto/src/generated/errors.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-// This file is @generated by prost-build.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum SubmitProvenTransactionError {
-    Unspecified = 0,
-    InternalError = 1,
-    DeserializationFailed = 2,
-    InvalidTransactionProof = 3,
-    IncorrectAccountInitialCommitment = 4,
-    InputNotesAlreadyConsumed = 5,
-    UnauthenticatedNotesNotFound = 6,
-    OutputNotesAlreadyExist = 7,
-    TransactionExpired = 8,
-}
-impl SubmitProvenTransactionError {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            Self::Unspecified => "SUBMIT_PROVEN_TRANSACTION_ERROR_UNSPECIFIED",
-            Self::InternalError => "INTERNAL_ERROR",
-            Self::DeserializationFailed => "DESERIALIZATION_FAILED",
-            Self::InvalidTransactionProof => "INVALID_TRANSACTION_PROOF",
-            Self::IncorrectAccountInitialCommitment => {
-                "INCORRECT_ACCOUNT_INITIAL_COMMITMENT"
-            }
-            Self::InputNotesAlreadyConsumed => "INPUT_NOTES_ALREADY_CONSUMED",
-            Self::UnauthenticatedNotesNotFound => "UNAUTHENTICATED_NOTES_NOT_FOUND",
-            Self::OutputNotesAlreadyExist => "OUTPUT_NOTES_ALREADY_EXIST",
-            Self::TransactionExpired => "TRANSACTION_EXPIRED",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "SUBMIT_PROVEN_TRANSACTION_ERROR_UNSPECIFIED" => Some(Self::Unspecified),
-            "INTERNAL_ERROR" => Some(Self::InternalError),
-            "DESERIALIZATION_FAILED" => Some(Self::DeserializationFailed),
-            "INVALID_TRANSACTION_PROOF" => Some(Self::InvalidTransactionProof),
-            "INCORRECT_ACCOUNT_INITIAL_COMMITMENT" => {
-                Some(Self::IncorrectAccountInitialCommitment)
-            }
-            "INPUT_NOTES_ALREADY_CONSUMED" => Some(Self::InputNotesAlreadyConsumed),
-            "UNAUTHENTICATED_NOTES_NOT_FOUND" => Some(Self::UnauthenticatedNotesNotFound),
-            "OUTPUT_NOTES_ALREADY_EXIST" => Some(Self::OutputNotesAlreadyExist),
-            "TRANSACTION_EXPIRED" => Some(Self::TransactionExpired),
-            _ => None,
-        }
-    }
-}
diff --git a/crates/proto/src/generated/mod.rs b/crates/proto/src/generated/mod.rs
index 36812988b..799aa1b71 100644
--- a/crates/proto/src/generated/mod.rs
+++ b/crates/proto/src/generated/mod.rs
@@ -5,7 +5,6 @@ pub mod account;
 pub mod block_producer;
 pub mod block_producer_store;
 pub mod blockchain;
-pub mod errors;
 pub mod note;
 pub mod ntx_builder_store;
 pub mod primitives;
diff --git a/crates/proto/src/generated/primitives.rs b/crates/proto/src/generated/primitives.rs
index 6a0e2b5c7..bc55a90b7 100644
--- a/crates/proto/src/generated/primitives.rs
+++ b/crates/proto/src/generated/primitives.rs
@@ -48,7 +48,7 @@ pub mod smt_leaf {
 pub struct SmtOpening {
     /// The Merkle path to the leaf.
     #[prost(message, optional, tag = "1")]
-    pub path: ::core::option::Option<MerklePath>,
+    pub path: ::core::option::Option<SparseMerklePath>,
     /// The leaf itself.
     #[prost(message, optional, tag = "2")]
     pub leaf: ::core::option::Option<SmtLeaf>,
diff --git a/crates/proto/src/generated/remote_prover.rs b/crates/proto/src/generated/remote_prover.rs
index 7404cb38e..373859bef 100644
--- a/crates/proto/src/generated/remote_prover.rs
+++ b/crates/proto/src/generated/remote_prover.rs
@@ -7,7 +7,7 @@ pub struct ProofRequest {
     pub proof_type: i32,
     /// Serialized payload requiring proof generation. The encoding format is
     /// type-specific:
-    /// - TRANSACTION: TransactionWitness encoded.
+    /// - TRANSACTION: TransactionInputs encoded.
     /// - BATCH: ProposedBatch encoded.
     /// - BLOCK: ProposedBlock encoded.
     #[prost(bytes = "vec", tag = "2")]
diff --git a/crates/proto/src/generated/rpc.rs b/crates/proto/src/generated/rpc.rs
index c0fe9a4a4..9d4968b6f 100644
--- a/crates/proto/src/generated/rpc.rs
+++ b/crates/proto/src/generated/rpc.rs
@@ -181,7 +181,7 @@ pub mod api_client {
                 super::super::rpc_store::AccountProofRequest,
             >,
         ) -> std::result::Result<
-            tonic::Response<super::super::rpc_store::AccountProof>,
+            tonic::Response<super::super::rpc_store::AccountProofResponse>,
             tonic::Status,
         > {
             self.inner
@@ -499,6 +499,30 @@ pub mod api_client {
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "SyncStorageMaps"));
             self.inner.unary(req, path, codec).await
         }
+        /// Returns transactions records for specific accounts within a block range.
+        pub async fn sync_transactions(
+            &mut self,
+            request: impl tonic::IntoRequest<
+                super::super::rpc_store::SyncTransactionsRequest,
+            >,
+        ) -> std::result::Result<
+            tonic::Response<super::super::rpc_store::SyncTransactionsResponse>,
+            tonic::Status,
+        > {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static("/rpc.Api/SyncTransactions");
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "SyncTransactions"));
+            self.inner.unary(req, path, codec).await
+        }
     }
 }
 /// Generated server implementations.
@@ -540,7 +564,7 @@ pub mod api_server {
             &self,
             request: tonic::Request<super::super::rpc_store::AccountProofRequest>,
         ) -> std::result::Result<
-            tonic::Response<super::super::rpc_store::AccountProof>,
+            tonic::Response<super::super::rpc_store::AccountProofResponse>,
             tonic::Status,
         >;
         /// Returns raw block data for the specified block number.
@@ -667,6 +691,14 @@ pub mod api_server {
             tonic::Response<super::super::rpc_store::SyncStorageMapsResponse>,
             tonic::Status,
         >;
+        /// Returns transactions records for specific accounts within a block range.
+        async fn sync_transactions(
+            &self,
+            request: tonic::Request<super::super::rpc_store::SyncTransactionsRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::super::rpc_store::SyncTransactionsResponse>,
+            tonic::Status,
+        >;
     }
     /// RPC API for the RPC component
     #[derive(Debug)]
@@ -884,7 +916,7 @@ pub mod api_server {
                     > tonic::server::UnaryService<
                         super::super::rpc_store::AccountProofRequest,
                     > for GetAccountProofSvc<T> {
-                        type Response = super::super::rpc_store::AccountProof;
+                        type Response = super::super::rpc_store::AccountProofResponse;
                         type Future = BoxFuture<
                             tonic::Response<Self::Response>,
                             tonic::Status,
@@ -1446,6 +1478,54 @@ pub mod api_server {
                     };
                     Box::pin(fut)
                 }
+                "/rpc.Api/SyncTransactions" => {
+                    #[allow(non_camel_case_types)]
+                    struct SyncTransactionsSvc<T: Api>(pub Arc<T>);
+                    impl<
+                        T: Api,
+                    > tonic::server::UnaryService<
+                        super::super::rpc_store::SyncTransactionsRequest,
+                    > for SyncTransactionsSvc<T> {
+                        type Response = super::super::rpc_store::SyncTransactionsResponse;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<
+                                super::super::rpc_store::SyncTransactionsRequest,
+                            >,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as Api>::sync_transactions(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = SyncTransactionsSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
                 _ => {
                     Box::pin(async move {
                         let mut response = http::Response::new(
diff --git a/crates/proto/src/generated/rpc_store.rs b/crates/proto/src/generated/rpc_store.rs
index 77a2abf74..5f6f05816 100644
--- a/crates/proto/src/generated/rpc_store.rs
+++ b/crates/proto/src/generated/rpc_store.rs
@@ -12,98 +12,172 @@ pub struct StoreStatus {
     #[prost(fixed32, tag = "3")]
     pub chain_tip: u32,
 }
-/// Returns the latest state proof of the specified accounts.
+/// Returns the latest state proof of the specified account.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AccountProofRequest {
-    /// The account ID for this request.
+    /// ID of the account for which we want to get data
     #[prost(message, optional, tag = "1")]
     pub account_id: ::core::option::Option<super::account::AccountId>,
-    /// A account detail requests, including map keys + values.
-    #[prost(message, optional, tag = "2")]
-    pub account_details: ::core::option::Option<
-        account_proof_request::AccountDetailsRequest,
-    >,
+    /// Block at which we'd like to get this data. Must be close to the chain tip.
+    #[prost(fixed32, tag = "2")]
+    pub block_num: u32,
+    /// Request for additional account details; valid only for public accounts.
+    #[prost(message, optional, tag = "3")]
+    pub details: ::core::option::Option<account_proof_request::AccountDetailRequest>,
 }
 /// Nested message and enum types in `AccountProofRequest`.
 pub mod account_proof_request {
     /// Request the details for a public account.
     #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct AccountDetailsRequest {
-        /// Account code commitment corresponding to the last-known `AccountCode` for the requested
-        /// account. The response will include only code that is known.
+    pub struct AccountDetailRequest {
+        /// Last known code commitment to the requester. The response will include account code
+        /// only if its commitment is different from this value.
+        ///
+        /// If the field is ommiteed, the response will not include the account code.
         #[prost(message, optional, tag = "1")]
         pub code_commitment: ::core::option::Option<super::super::primitives::Digest>,
-        /// List of storage requests for this account.
-        #[prost(message, repeated, tag = "2")]
-        pub storage_requests: ::prost::alloc::vec::Vec<
-            account_details_request::StorageRequest,
+        /// Last known asset vault commitment to the requester. The response will include asset vault data
+        /// only if its commitment is different from this value. If the value is not present in the
+        /// request, the response will not contain one either.
+        /// If the number of to-be-returned asset entries exceed a threshold, they have to be requested
+        /// separately, which is signaled in the response message with dedicated flag.
+        #[prost(message, optional, tag = "2")]
+        pub asset_vault_commitment: ::core::option::Option<
+            super::super::primitives::Digest,
+        >,
+        /// Additional request per storage map.
+        #[prost(message, repeated, tag = "3")]
+        pub storage_maps: ::prost::alloc::vec::Vec<
+            account_detail_request::StorageMapDetailRequest,
         >,
     }
-    /// Nested message and enum types in `AccountDetailsRequest`.
-    pub mod account_details_request {
+    /// Nested message and enum types in `AccountDetailRequest`.
+    pub mod account_detail_request {
         /// Represents a storage slot index and the associated map keys.
         #[derive(Clone, PartialEq, ::prost::Message)]
-        pub struct StorageRequest {
-            /// Storage slot index (\[0..255\])
+        pub struct StorageMapDetailRequest {
+            /// Storage slot index (`\[0..255\]`).
             #[prost(uint32, tag = "1")]
-            pub storage_slot_index: u32,
-            /// A list of map keys (Digests) associated with this storage slot.
-            #[prost(message, repeated, tag = "2")]
-            pub map_keys: ::prost::alloc::vec::Vec<
-                super::super::super::primitives::Digest,
-            >,
+            pub slot_index: u32,
+            #[prost(oneof = "storage_map_detail_request::SlotData", tags = "2, 3")]
+            pub slot_data: ::core::option::Option<storage_map_detail_request::SlotData>,
+        }
+        /// Nested message and enum types in `StorageMapDetailRequest`.
+        pub mod storage_map_detail_request {
+            /// Indirection required for use in `oneof {..}` block.
+            #[derive(Clone, PartialEq, ::prost::Message)]
+            pub struct MapKeys {
+                /// A list of map keys associated with this storage slot.
+                #[prost(message, repeated, tag = "1")]
+                pub map_keys: ::prost::alloc::vec::Vec<
+                    super::super::super::super::primitives::Digest,
+                >,
+            }
+            #[derive(Clone, PartialEq, ::prost::Oneof)]
+            pub enum SlotData {
+                /// Request to return all storage map data. If the number exceeds a threshold of 1000 entries,
+                /// the response will not contain them but must be requested separately.
+                #[prost(bool, tag = "2")]
+                AllEntries(bool),
+                /// A list of map keys associated with the given storage slot identified by `slot_index`.
+                #[prost(message, tag = "3")]
+                MapKeys(MapKeys),
+            }
         }
     }
 }
-/// Represents the result of getting account proofs.
+/// Represents the result of getting account proof.
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AccountProof {
-    /// Block number at which the state of the accounts is returned.
-    #[prost(fixed32, tag = "1")]
-    pub block_num: u32,
-    /// The account witness for the current state commitment of one account ID.
-    #[prost(message, optional, tag = "2")]
+pub struct AccountProofResponse {
+    /// Account ID, current state commitment, and SMT path
+    #[prost(message, optional, tag = "1")]
     pub witness: ::core::option::Option<super::account::AccountWitness>,
-    /// State header for public accounts. Filled only if the flag `AccountDetailsRequest` was
-    /// present and the account was a public account/the information was available.
-    #[prost(message, optional, tag = "3")]
-    pub details: ::core::option::Option<account_proof::AccountDetailsResponse>,
+    /// Additional details for public accounts
+    #[prost(message, optional, tag = "2")]
+    pub details: ::core::option::Option<account_proof_response::AccountDetails>,
 }
-/// Nested message and enum types in `AccountProof`.
-pub mod account_proof {
-    /// State header, available for public accounts only.
+/// Nested message and enum types in `AccountProofResponse`.
+pub mod account_proof_response {
     #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct AccountDetailsResponse {
-        /// Account header, always included.
+    pub struct AccountDetails {
+        /// Account header.
         #[prost(message, optional, tag = "1")]
         pub header: ::core::option::Option<super::super::account::AccountHeader>,
-        /// Account storage header containing slot types and commitments.
+        /// Account storage data
         #[prost(message, optional, tag = "2")]
-        pub storage_header: ::core::option::Option<
-            super::super::account::AccountStorageHeader,
-        >,
-        /// Account code, if the current account code does not match the request provided commitment digest.
+        pub storage_details: ::core::option::Option<super::AccountStorageDetails>,
+        /// Account code; empty if code commitments matched or none was requested
         #[prost(bytes = "vec", optional, tag = "3")]
-        pub account_code: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
-        /// Storage slots information for this account
-        #[prost(message, repeated, tag = "4")]
-        pub storage_maps: ::prost::alloc::vec::Vec<
-            account_details_response::StorageSlotMapProof,
-        >,
+        pub code: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
+        /// Account asset vault data; empty if vault commitments matched or the requester
+        /// omitted it in the request.
+        #[prost(message, optional, tag = "4")]
+        pub vault_details: ::core::option::Option<super::AccountVaultDetails>,
     }
-    /// Nested message and enum types in `AccountDetailsResponse`.
-    pub mod account_details_response {
-        /// Represents a single storage slot with the requested keys and their respective values.
+}
+/// Account vault details for AccountProofResponse
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct AccountVaultDetails {
+    /// A flag that is set to true if the account contains too many assets. This indicates
+    /// to the user that `SyncAccountVault` endpoint should be used to retrieve the
+    /// account's assets
+    #[prost(bool, tag = "1")]
+    pub too_many_assets: bool,
+    /// When too_many_assets == false, this will contain the list of assets in the
+    /// account's vault
+    #[prost(message, repeated, tag = "2")]
+    pub assets: ::prost::alloc::vec::Vec<super::primitives::Asset>,
+}
+/// Account storage details for AccountProofResponse
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct AccountStorageDetails {
+    /// Account storage header (storage slot info for up to 256 slots)
+    #[prost(message, optional, tag = "1")]
+    pub header: ::core::option::Option<super::account::AccountStorageHeader>,
+    /// Additional data for the requested storage maps
+    #[prost(message, repeated, tag = "2")]
+    pub map_details: ::prost::alloc::vec::Vec<
+        account_storage_details::AccountStorageMapDetails,
+    >,
+}
+/// Nested message and enum types in `AccountStorageDetails`.
+pub mod account_storage_details {
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct AccountStorageMapDetails {
+        /// slot index of the storage map
+        #[prost(uint32, tag = "1")]
+        pub slot_index: u32,
+        /// A flag that is set to `true` if the number of to-be-returned entries in the
+        /// storage map would exceed a threshold. This indicates to the user that `SyncStorageMaps`
+        /// endpoint should be used to get all storage map data.
+        #[prost(bool, tag = "2")]
+        pub too_many_entries: bool,
+        /// By default we provide all storage entries.
+        #[prost(message, optional, tag = "3")]
+        pub entries: ::core::option::Option<account_storage_map_details::MapEntries>,
+    }
+    /// Nested message and enum types in `AccountStorageMapDetails`.
+    pub mod account_storage_map_details {
+        /// Wrapper for repeated storage map entries
         #[derive(Clone, PartialEq, ::prost::Message)]
-        pub struct StorageSlotMapProof {
-            /// The storage slot index (\[0..255\]).
-            #[prost(uint32, tag = "1")]
-            pub storage_slot: u32,
-            /// Merkle proof of the map value
-            #[prost(message, optional, tag = "2")]
-            pub smt_proof: ::core::option::Option<
-                super::super::super::primitives::SmtOpening,
-            >,
+        pub struct MapEntries {
+            #[prost(message, repeated, tag = "1")]
+            pub entries: ::prost::alloc::vec::Vec<map_entries::StorageMapEntry>,
+        }
+        /// Nested message and enum types in `MapEntries`.
+        pub mod map_entries {
+            /// Definition of individual storage entries.
+            #[derive(Clone, Copy, PartialEq, ::prost::Message)]
+            pub struct StorageMapEntry {
+                #[prost(message, optional, tag = "1")]
+                pub key: ::core::option::Option<
+                    super::super::super::super::primitives::Digest,
+                >,
+                #[prost(message, optional, tag = "2")]
+                pub value: ::core::option::Option<
+                    super::super::super::super::primitives::Digest,
+                >,
+            }
         }
     }
 }
@@ -160,12 +234,12 @@ pub mod sync_nullifiers_response {
 }
 /// State synchronization request.
 ///
-/// Specifies state updates the client is interested in. The server will return the first block which
+/// Specifies state updates the requester is interested in. The server will return the first block which
 /// contains a note matching `note_tags` or the chain tip. And the corresponding updates to
 /// `account_ids` for that block range.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncStateRequest {
-    /// Last block known by the client. The response will contain data starting from the next block,
+    /// Last block known by the requester. The response will contain data starting from the next block,
     /// until the first block which contains a note of matching the requested tag, or the chain tip
     /// if there are no notes.
     #[prost(fixed32, tag = "1")]
@@ -177,7 +251,7 @@ pub struct SyncStateRequest {
     /// it won't be included in the response.
     #[prost(message, repeated, tag = "2")]
     pub account_ids: ::prost::alloc::vec::Vec<super::account::AccountId>,
-    /// Specifies the tags which the client is interested in.
+    /// Specifies the tags which the requester is interested in.
     #[prost(fixed32, repeated, tag = "3")]
     pub note_tags: ::prost::alloc::vec::Vec<u32>,
 }
@@ -206,7 +280,7 @@ pub struct SyncStateResponse {
 }
 /// Account vault synchronization request.
 ///
-/// Allows clients to sync asset values for specific public accounts within a block range.
+/// Allows requesters to sync asset values for specific public accounts within a block range.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncAccountVaultRequest {
     /// Block range from which to start synchronizing.
@@ -246,24 +320,23 @@ pub struct AccountVaultUpdate {
 }
 /// Note synchronization request.
 ///
-/// Specifies note tags that client is interested in. The server will return the first block which
+/// Specifies note tags that requester is interested in. The server will return the first block which
 /// contains a note matching `note_tags` or the chain tip.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncNotesRequest {
-    /// Last block known by the client. The response will contain data starting from the next block,
-    /// until the first block which contains a note of matching the requested tag.
-    #[prost(fixed32, tag = "1")]
-    pub block_num: u32,
-    /// Specifies the tags which the client is interested in.
+    /// Block range from which to start synchronizing.
+    #[prost(message, optional, tag = "1")]
+    pub block_range: ::core::option::Option<BlockRange>,
+    /// Specifies the tags which the requester is interested in.
     #[prost(fixed32, repeated, tag = "2")]
     pub note_tags: ::prost::alloc::vec::Vec<u32>,
 }
 /// Represents the result of syncing notes request.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncNotesResponse {
-    /// Number of the latest block in the chain.
-    #[prost(fixed32, tag = "1")]
-    pub chain_tip: u32,
+    /// Pagination information.
+    #[prost(message, optional, tag = "1")]
+    pub pagination_info: ::core::option::Option<PaginationInfo>,
     /// Block header of the block with the first note matching the specified criteria.
     #[prost(message, optional, tag = "2")]
     pub block_header: ::core::option::Option<super::blockchain::BlockHeader>,
@@ -279,7 +352,7 @@ pub struct SyncNotesResponse {
 }
 /// Storage map synchronization request.
 ///
-/// Allows clients to sync storage map values for specific public accounts within a block range,
+/// Allows requesters to sync storage map values for specific public accounts within a block range,
 /// with support for cursor-based pagination to handle large storage maps.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SyncStorageMapsRequest {
@@ -340,11 +413,11 @@ pub struct BlockRange {
 }
 /// Represents pagination information for chunked responses.
 ///
-/// Pagination is done using block numbers as the axis, allowing clients to request
+/// Pagination is done using block numbers as the axis, allowing requesters to request
 /// data in chunks by specifying block ranges and continuing from where the previous
 /// response left off.
 ///
-/// To request the next chunk, the client should use `block_num + 1` from the previous response
+/// To request the next chunk, the requester should use `block_num + 1` from the previous response
 /// as the `block_from` for the next request.
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct PaginationInfo {
@@ -359,6 +432,40 @@ pub struct PaginationInfo {
     #[prost(fixed32, tag = "2")]
     pub block_num: u32,
 }
+/// Transactions synchronization request.
+///
+/// Allows requesters to sync transactions for specific accounts within a block range.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SyncTransactionsRequest {
+    /// Block range from which to start synchronizing.
+    #[prost(message, optional, tag = "1")]
+    pub block_range: ::core::option::Option<BlockRange>,
+    /// Accounts to sync transactions for.
+    #[prost(message, repeated, tag = "2")]
+    pub account_ids: ::prost::alloc::vec::Vec<super::account::AccountId>,
+}
+/// Represents the result of syncing transactions request.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SyncTransactionsResponse {
+    /// Pagination information.
+    #[prost(message, optional, tag = "1")]
+    pub pagination_info: ::core::option::Option<PaginationInfo>,
+    /// List of transaction records.
+    #[prost(message, repeated, tag = "2")]
+    pub transaction_records: ::prost::alloc::vec::Vec<TransactionRecord>,
+}
+/// Represents a transaction record.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TransactionRecord {
+    /// Block number in which the transaction was executed.
+    #[prost(fixed32, tag = "1")]
+    pub block_num: u32,
+    /// A transaction header.
+    #[prost(message, optional, tag = "2")]
+    pub transaction_header: ::core::option::Option<
+        super::transaction::TransactionHeader,
+    >,
+}
 /// Generated client implementations.
 pub mod rpc_client {
     #![allow(
@@ -524,7 +631,10 @@ pub mod rpc_client {
         pub async fn get_account_proof(
             &mut self,
             request: impl tonic::IntoRequest<super::AccountProofRequest>,
-        ) -> std::result::Result<tonic::Response<super::AccountProof>, tonic::Status> {
+        ) -> std::result::Result<
+            tonic::Response<super::AccountProofResponse>,
+            tonic::Status,
+        > {
             self.inner
                 .ready()
                 .await
@@ -672,9 +782,9 @@ pub mod rpc_client {
                 .insert(GrpcMethod::new("rpc_store.Rpc", "SyncNullifiers"));
             self.inner.unary(req, path, codec).await
         }
-        /// Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
+        /// Returns info which can be used by the requester to sync up to the tip of chain for the notes they are interested in.
         ///
-        /// Client specifies the `note_tags` they are interested in, and the block height from which to search for new for
+        /// requester specifies the `note_tags` they are interested in, and the block height from which to search for new for
         /// matching notes for. The request will then return the next block containing any note matching the provided tags.
         ///
         /// The response includes each note's metadata and inclusion proof.
@@ -702,20 +812,20 @@ pub mod rpc_client {
             req.extensions_mut().insert(GrpcMethod::new("rpc_store.Rpc", "SyncNotes"));
             self.inner.unary(req, path, codec).await
         }
-        /// Returns info which can be used by the client to sync up to the latest state of the chain
-        /// for the objects (accounts, notes, nullifiers) the client is interested in.
+        /// Returns info which can be used by the requester to sync up to the latest state of the chain
+        /// for the objects (accounts, notes, nullifiers) the requester is interested in.
         ///
         /// This request returns the next block containing requested data. It also returns `chain_tip`
-        /// which is the latest block number in the chain. Client is expected to repeat these requests
+        /// which is the latest block number in the chain. requester is expected to repeat these requests
         /// in a loop until `response.block_header.block_num == response.chain_tip`, at which point
-        /// the client is fully synchronized with the chain.
+        /// the requester is fully synchronized with the chain.
         ///
         /// Each request also returns info about new notes, nullifiers etc. created. It also returns
         /// Chain MMR delta that can be used to update the state of Chain MMR. This includes both chain
         /// MMR peaks and chain MMR nodes.
         ///
         /// For preserving some degree of privacy, note tags and nullifiers filters contain only high
-        /// part of hashes. Thus, returned data contains excessive notes and nullifiers, client can make
+        /// part of hashes. Thus, returned data contains excessive notes and nullifiers, requester can make
         /// additional filtering of that data on its side.
         pub async fn sync_state(
             &mut self,
@@ -788,6 +898,31 @@ pub mod rpc_client {
                 .insert(GrpcMethod::new("rpc_store.Rpc", "SyncStorageMaps"));
             self.inner.unary(req, path, codec).await
         }
+        /// Returns transactions records for specific accounts within a block range.
+        pub async fn sync_transactions(
+            &mut self,
+            request: impl tonic::IntoRequest<super::SyncTransactionsRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::SyncTransactionsResponse>,
+            tonic::Status,
+        > {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/rpc_store.Rpc/SyncTransactions",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("rpc_store.Rpc", "SyncTransactions"));
+            self.inner.unary(req, path, codec).await
+        }
     }
 }
 /// Generated server implementations.
@@ -828,7 +963,10 @@ pub mod rpc_server {
         async fn get_account_proof(
             &self,
             request: tonic::Request<super::AccountProofRequest>,
-        ) -> std::result::Result<tonic::Response<super::AccountProof>, tonic::Status>;
+        ) -> std::result::Result<
+            tonic::Response<super::AccountProofResponse>,
+            tonic::Status,
+        >;
         /// Returns raw block data for the specified block number.
         async fn get_block_by_number(
             &self,
@@ -869,9 +1007,9 @@ pub mod rpc_server {
             tonic::Response<super::SyncNullifiersResponse>,
             tonic::Status,
         >;
-        /// Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
+        /// Returns info which can be used by the requester to sync up to the tip of chain for the notes they are interested in.
         ///
-        /// Client specifies the `note_tags` they are interested in, and the block height from which to search for new for
+        /// requester specifies the `note_tags` they are interested in, and the block height from which to search for new for
         /// matching notes for. The request will then return the next block containing any note matching the provided tags.
         ///
         /// The response includes each note's metadata and inclusion proof.
@@ -885,20 +1023,20 @@ pub mod rpc_server {
             tonic::Response<super::SyncNotesResponse>,
             tonic::Status,
         >;
-        /// Returns info which can be used by the client to sync up to the latest state of the chain
-        /// for the objects (accounts, notes, nullifiers) the client is interested in.
+        /// Returns info which can be used by the requester to sync up to the latest state of the chain
+        /// for the objects (accounts, notes, nullifiers) the requester is interested in.
         ///
         /// This request returns the next block containing requested data. It also returns `chain_tip`
-        /// which is the latest block number in the chain. Client is expected to repeat these requests
+        /// which is the latest block number in the chain. requester is expected to repeat these requests
         /// in a loop until `response.block_header.block_num == response.chain_tip`, at which point
-        /// the client is fully synchronized with the chain.
+        /// the requester is fully synchronized with the chain.
         ///
         /// Each request also returns info about new notes, nullifiers etc. created. It also returns
         /// Chain MMR delta that can be used to update the state of Chain MMR. This includes both chain
         /// MMR peaks and chain MMR nodes.
         ///
         /// For preserving some degree of privacy, note tags and nullifiers filters contain only high
-        /// part of hashes. Thus, returned data contains excessive notes and nullifiers, client can make
+        /// part of hashes. Thus, returned data contains excessive notes and nullifiers, requester can make
         /// additional filtering of that data on its side.
         async fn sync_state(
             &self,
@@ -923,6 +1061,14 @@ pub mod rpc_server {
             tonic::Response<super::SyncStorageMapsResponse>,
             tonic::Status,
         >;
+        /// Returns transactions records for specific accounts within a block range.
+        async fn sync_transactions(
+            &self,
+            request: tonic::Request<super::SyncTransactionsRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::SyncTransactionsResponse>,
+            tonic::Status,
+        >;
     }
     /// Store API for the RPC component
     #[derive(Debug)]
@@ -1133,7 +1279,7 @@ pub mod rpc_server {
                     struct GetAccountProofSvc<T: Rpc>(pub Arc<T>);
                     impl<T: Rpc> tonic::server::UnaryService<super::AccountProofRequest>
                     for GetAccountProofSvc<T> {
-                        type Response = super::AccountProof;
+                        type Response = super::AccountProofResponse;
                         type Future = BoxFuture<
                             tonic::Response<Self::Response>,
                             tonic::Status,
@@ -1578,6 +1724,51 @@ pub mod rpc_server {
                     };
                     Box::pin(fut)
                 }
+                "/rpc_store.Rpc/SyncTransactions" => {
+                    #[allow(non_camel_case_types)]
+                    struct SyncTransactionsSvc<T: Rpc>(pub Arc<T>);
+                    impl<
+                        T: Rpc,
+                    > tonic::server::UnaryService<super::SyncTransactionsRequest>
+                    for SyncTransactionsSvc<T> {
+                        type Response = super::SyncTransactionsResponse;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<super::SyncTransactionsRequest>,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as Rpc>::sync_transactions(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = SyncTransactionsSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
                 _ => {
                     Box::pin(async move {
                         let mut response = http::Response::new(
diff --git a/crates/proto/src/generated/transaction.rs b/crates/proto/src/generated/transaction.rs
index e550340af..78ba28f31 100644
--- a/crates/proto/src/generated/transaction.rs
+++ b/crates/proto/src/generated/transaction.rs
@@ -34,3 +34,22 @@ pub struct TransactionSummary {
     #[prost(message, optional, tag = "3")]
     pub account_id: ::core::option::Option<super::account::AccountId>,
 }
+/// Represents a transaction header.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TransactionHeader {
+    /// ID of the account against which the transaction was executed.
+    #[prost(message, optional, tag = "1")]
+    pub account_id: ::core::option::Option<super::account::AccountId>,
+    /// State commitment of the account before the transaction was executed.
+    #[prost(message, optional, tag = "2")]
+    pub initial_state_commitment: ::core::option::Option<super::primitives::Digest>,
+    /// State commitment of the account after the transaction was executed.
+    #[prost(message, optional, tag = "3")]
+    pub final_state_commitment: ::core::option::Option<super::primitives::Digest>,
+    /// Nullifiers of the input notes of the transaction.
+    #[prost(message, repeated, tag = "4")]
+    pub input_notes: ::prost::alloc::vec::Vec<super::primitives::Digest>,
+    /// Output notes of the transaction.
+    #[prost(message, repeated, tag = "5")]
+    pub output_notes: ::prost::alloc::vec::Vec<super::note::NoteSyncRecord>,
+}
diff --git a/crates/remote-prover-client/src/remote_prover/batch_prover.rs b/crates/remote-prover-client/src/remote_prover/batch_prover.rs
index e72fdfc44..a8109ad9c 100644
--- a/crates/remote-prover-client/src/remote_prover/batch_prover.rs
+++ b/crates/remote-prover-client/src/remote_prover/batch_prover.rs
@@ -170,8 +170,8 @@ impl RemoteBatchProver {
             }
 
             // Check input notes
-            let num_notes = proposed_header.input_notes().num_notes() as usize;
-            if num_notes != proven_header.input_notes().len() {
+            let num_notes = proposed_header.input_notes().num_notes();
+            if num_notes != proven_header.input_notes().num_notes() {
                 return Err(RemoteProverClientError::other(format!(
                     "transaction header of {} has a different number of input notes than the proposed transaction",
                     proposed_header.id()
@@ -180,10 +180,10 @@ impl RemoteBatchProver {
 
             // Because we checked the length matches we can zip the iterators up.
             // We expect the nullifiers to be in the same order.
-            for (proposed_nullifier, header_nullifier) in
+            for (proposed_nullifier, input_note_commitment) in
                 proposed_header.nullifiers().zip(proven_header.input_notes().iter())
             {
-                if proposed_nullifier != *header_nullifier {
+                if proposed_nullifier != input_note_commitment.nullifier() {
                     return Err(RemoteProverClientError::other(format!(
                         "transaction header of {} has a different set of input notes than the proposed transaction",
                         proposed_header.id()
@@ -201,13 +201,13 @@ impl RemoteBatchProver {
 
             // Because we checked the length matches we can zip the iterators up.
             // We expect the note IDs to be in the same order.
-            for (proposed_note_id, header_note_id) in proposed_header
+            for (proposed_note_id, header_note) in proposed_header
                 .output_notes()
                 .iter()
                 .map(OutputNote::id)
                 .zip(proven_header.output_notes().iter())
             {
-                if proposed_note_id != *header_note_id {
+                if proposed_note_id != header_note.id() {
                     return Err(RemoteProverClientError::other(format!(
                         "transaction header of {} has a different set of input notes than the proposed transaction",
                         proposed_header.id()
diff --git a/crates/remote-prover-client/src/remote_prover/generated/nostd/remote_prover.rs b/crates/remote-prover-client/src/remote_prover/generated/nostd/remote_prover.rs
index 0549a5df8..e10a0603c 100644
--- a/crates/remote-prover-client/src/remote_prover/generated/nostd/remote_prover.rs
+++ b/crates/remote-prover-client/src/remote_prover/generated/nostd/remote_prover.rs
@@ -7,7 +7,7 @@ pub struct ProofRequest {
     pub proof_type: i32,
     /// Serialized payload requiring proof generation. The encoding format is
     /// type-specific:
-    /// - TRANSACTION: TransactionWitness encoded.
+    /// - TRANSACTION: TransactionInputs encoded.
     /// - BATCH: ProposedBatch encoded.
     /// - BLOCK: ProposedBlock encoded.
     #[prost(bytes = "vec", tag = "2")]
diff --git a/crates/remote-prover-client/src/remote_prover/generated/std/remote_prover.rs b/crates/remote-prover-client/src/remote_prover/generated/std/remote_prover.rs
index 4568d463a..87deb784a 100644
--- a/crates/remote-prover-client/src/remote_prover/generated/std/remote_prover.rs
+++ b/crates/remote-prover-client/src/remote_prover/generated/std/remote_prover.rs
@@ -7,7 +7,7 @@ pub struct ProofRequest {
     pub proof_type: i32,
     /// Serialized payload requiring proof generation. The encoding format is
     /// type-specific:
-    /// - TRANSACTION: TransactionWitness encoded.
+    /// - TRANSACTION: TransactionInputs encoded.
     /// - BATCH: ProposedBatch encoded.
     /// - BLOCK: ProposedBlock encoded.
     #[prost(bytes = "vec", tag = "2")]
diff --git a/crates/remote-prover-client/src/remote_prover/tx_prover.rs b/crates/remote-prover-client/src/remote_prover/tx_prover.rs
index 705e8e814..6bdc63a04 100644
--- a/crates/remote-prover-client/src/remote_prover/tx_prover.rs
+++ b/crates/remote-prover-client/src/remote_prover/tx_prover.rs
@@ -3,7 +3,7 @@ use alloc::string::{String, ToString};
 use alloc::sync::Arc;
 use core::time::Duration;
 
-use miden_objects::transaction::{ProvenTransaction, TransactionWitness};
+use miden_objects::transaction::{ExecutedTransaction, ProvenTransaction, TransactionInputs};
 use miden_objects::utils::{Deserializable, DeserializationError, Serializable};
 use miden_objects::vm::FutureMaybeSend;
 use miden_tx::TransactionProverError;
@@ -82,7 +82,7 @@ impl RemoteTransactionProver {
 impl RemoteTransactionProver {
     pub fn prove(
         &self,
-        tx_witness: TransactionWitness,
+        tx_inputs: TransactionInputs,
     ) -> impl FutureMaybeSend<Result<ProvenTransaction, TransactionProverError>> {
         async move {
             use miden_objects::utils::Serializable;
@@ -101,7 +101,7 @@ impl RemoteTransactionProver {
                 .ok_or_else(|| TransactionProverError::other("client should be connected"))?
                 .clone();
 
-            let request = tonic::Request::new(tx_witness.into());
+            let request = tonic::Request::new(tx_inputs.into());
 
             let response = client.prove(request).await.map_err(|err| {
                 TransactionProverError::other_with_source("failed to prove transaction", err)
@@ -131,11 +131,11 @@ impl TryFrom<proto::Proof> for ProvenTransaction {
     }
 }
 
-impl From<TransactionWitness> for proto::ProofRequest {
-    fn from(witness: TransactionWitness) -> Self {
+impl From<TransactionInputs> for proto::ProofRequest {
+    fn from(tx_inputs: TransactionInputs) -> Self {
         proto::ProofRequest {
             proof_type: proto::ProofType::Transaction.into(),
-            payload: witness.to_bytes(),
+            payload: tx_inputs.to_bytes(),
         }
     }
 }
diff --git a/crates/rpc/README.md b/crates/rpc/README.md
index a14ac8063..408f0affb 100644
--- a/crates/rpc/README.md
+++ b/crates/rpc/README.md
@@ -26,6 +26,7 @@ The full gRPC method definitions can be found in the [proto](../proto/README.md)
 - [SyncNotes](#syncnotes)
 - [SyncState](#syncstate)
 - [SyncStorageMaps](#syncstoragemaps)
+- [SyncTransactions](#synctransactions)
 
 <!--toc:end-->
 
@@ -35,6 +36,16 @@ The full gRPC method definitions can be found in the [proto](../proto/README.md)
 
 Returns a nullifier proof for each of the requested nullifiers.
 
+#### Error Handling
+
+When nullifier checking fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed nullifier format            |
+| `TOO_MANY_NULLIFIERS`     | 2     | `INVALID_ARGUMENT` | Too many nullifiers in request        |
+
 ---
 
 ### GetAccountDetails
@@ -66,12 +77,34 @@ authenticate the block's inclusion.
 
 Returns a list of notes matching the provided note IDs.
 
+#### Error Handling
+
+When note retrieval fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed note ID format              |
+| `NOTE_NOT_FOUND`          | 2     | `NOT_FOUND`        | One or more note IDs don't exist     |
+| `TOO_MANY_NOTE_IDS`       | 3     | `INVALID_ARGUMENT` | Too many note IDs in request          |
+| `NOTE_NOT_PUBLIC`         | 4     | `PERMISSION_DENIED`| Note details not publicly accessible  |
+
 ---
 
 ### GetNoteScriptByRoot
 
 Returns the script for a note by its root.
 
+#### Error Handling
+
+When script retrieval fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed script root format          |
+| `SCRIPT_NOT_FOUND`        | 2     | `NOT_FOUND`        | Script with given root doesn't exist  |
+
 ---
 
 ### SubmitProvenTransaction
@@ -82,17 +115,16 @@ Submits a proven transaction to the Miden network for inclusion in future blocks
 
 When transaction submission fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
 
-| Error Code                             | Value | gRPC Status        | Description                                                   |
-|----------------------------------------|-------|--------------------|---------------------------------------------------------------|
-| `UNSPECIFIED_ERROR`                    | 0     | `INTERNAL`         | Default/unspecified error                                     |
-| `INTERNAL_ERROR`                       | 1     | `INTERNAL`         | Internal server error occurred                                |
-| `DESERIALIZATION_FAILED`               | 2     | `INVALID_ARGUMENT` | Transaction could not be deserialized                         |
-| `INVALID_TRANSACTION_PROOF`            | 3     | `INVALID_ARGUMENT` | Transaction execution proof is invalid                        |
-| `INCORRECT_ACCOUNT_INITIAL_COMMITMENT` | 4     | `INVALID_ARGUMENT` | Account's initial state doesn't match current state           |
-| `INPUT_NOTES_ALREADY_CONSUMED`         | 5     | `INVALID_ARGUMENT` | Input notes have already been consumed by another transaction |
-| `UNAUTHENTICATED_NOTES_NOT_FOUND`      | 6     | `INVALID_ARGUMENT` | Required unauthenticated notes were not found                 |
-| `OUTPUT_NOTES_ALREADY_EXIST`           | 7     | `INVALID_ARGUMENT` | Output note IDs are already in use                            |
-| `TRANSACTION_EXPIRED`                  | 8     | `INVALID_ARGUMENT` | Transaction has exceeded its expiration block height          |
+| Error Code                                    | Value | gRPC Status        | Description                                                   |
+|-----------------------------------------------|-------|--------------------|---------------------------------------------------------------|
+| `INTERNAL_ERROR`                              | 0     | `INTERNAL`         | Internal server error occurred                                |
+| `DESERIALIZATION_FAILED`                      | 1     | `INVALID_ARGUMENT` | Transaction could not be deserialized                         |
+| `INVALID_TRANSACTION_PROOF`                   | 2     | `INVALID_ARGUMENT` | Transaction execution proof is invalid                        |
+| `INCORRECT_ACCOUNT_INITIAL_COMMITMENT`        | 3     | `INVALID_ARGUMENT` | Account's initial state doesn't match current state           |
+| `INPUT_NOTES_ALREADY_CONSUMED`                | 4     | `INVALID_ARGUMENT` | Input notes have already been consumed by another transaction |
+| `UNAUTHENTICATED_NOTES_NOT_FOUND`             | 5     | `INVALID_ARGUMENT` | Required unauthenticated notes were not found                 |
+| `OUTPUT_NOTES_ALREADY_EXIST`                  | 6     | `INVALID_ARGUMENT` | Output note IDs are already in use                            |
+| `TRANSACTION_EXPIRED`                         | 7     | `INVALID_ARGUMENT` | Transaction has exceeded its expiration block height          |
 
 **Error Details Serialization**: The `Status.details` field contains a single byte with the numeric error code value. Clients can decode this by reading `details[0]` to get the error code (0-8) and mapping it to the corresponding enum value.
 
@@ -112,6 +144,16 @@ range, the last block included in the response (`block_num`), and the current ch
 If the response is chunked due to exceeding the maximum returned entries, continue by issuing another request with
 consecutive block number to retrieve subsequent updates.
 
+#### Error Handling
+
+When nullifier synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed nullifier prefix format     |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `INVALID_PREFIX_LENGTH`   | 3     | `INVALID_ARGUMENT` | Unsupported prefix length (only 16)   |
 ---
 
 ### SyncAccountVault
@@ -122,19 +164,39 @@ For any `block_range`, the latest known set of assets is returned for the reques
 The data can be split and a cutoff block may be selected if there are too many assets to sync. The response contains
 the chain tip so that the caller knows when it has been reached.
 
+#### Error Handling
+
+When account vault synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed account ID format           |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `ACCOUNT_NOT_PUBLIC`      | 3     | `INVALID_ARGUMENT` | Account is not public (no vault sync) |
+
 ---
 
 ### SyncNotes
 
 Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
 
-Client specifies the `note_tags` they are interested in, and the block height from which to search for new for matching
-notes for. The request will then return the next block containing any note matching the provided tags.
+Client specifies the `note_tags` they are interested in, and the block range from which to search for matching notes. The request will then return the next block containing any note matching the provided tags within the specified range.
 
 The response includes each note's metadata and inclusion proof.
 
-A basic note sync can be implemented by repeatedly requesting the previous response's block until reaching the tip of
-the chain.
+A basic note sync can be implemented by repeatedly requesting the previous response's block until reaching the tip of the chain.
+
+#### Error Handling
+
+When note synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed note tags format            |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `TOO_MANY_TAGS`           | 3     | `INVALID_ARGUMENT` | Too many note tags in request         |
 
 ---
 
@@ -163,6 +225,36 @@ Caller specifies the `account_id` of the public account and the block range `blo
 
 This endpoint enables clients to maintain an updated view of account storage.
 
+#### Error Handling
+
+When storage map synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed account ID format           |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `ACCOUNT_NOT_FOUND`       | 3     | `NOT_FOUND`        | Account ID does not exist             |
+| `ACCOUNT_NOT_PUBLIC`      | 4     | `INVALID_ARGUMENT` | Account storage not publicly accessible |
+
+---
+
+### SyncTransactions
+
+Returns transaction records for specific accounts within a block range.
+
+#### Error Handling
+
+When transaction synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed account ID format           |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `ACCOUNT_NOT_FOUND`       | 3     | `NOT_FOUND`        | Account ID does not exist             |
+| `TOO_MANY_ACCOUNT_IDS`    | 4     | `INVALID_ARGUMENT` | Too many account IDs in request       |
+
 ---
 
 ## License
diff --git a/crates/rpc/src/server/api.rs b/crates/rpc/src/server/api.rs
index cc3b17719..ddc1c9313 100644
--- a/crates/rpc/src/server/api.rs
+++ b/crates/rpc/src/server/api.rs
@@ -508,7 +508,7 @@ impl api_server::Api for RpcService {
     async fn get_account_proof(
         &self,
         request: Request<proto::rpc_store::AccountProofRequest>,
-    ) -> Result<Response<proto::rpc_store::AccountProof>, Status> {
+    ) -> Result<Response<proto::rpc_store::AccountProofResponse>, Status> {
         let request = request.into_inner();
 
         debug!(target: COMPONENT, ?request);
@@ -576,6 +576,23 @@ impl api_server::Api for RpcService {
 
         self.store.clone().get_note_script_by_root(request).await
     }
+
+    #[instrument(
+        parent = None,
+        target = COMPONENT,
+        name = "rpc.server.sync_transactions",
+        skip_all,
+        ret(level = "debug"),
+        err
+    )]
+    async fn sync_transactions(
+        &self,
+        request: Request<proto::rpc_store::SyncTransactionsRequest>,
+    ) -> Result<Response<proto::rpc_store::SyncTransactionsResponse>, Status> {
+        debug!(target: COMPONENT, request = ?request);
+
+        self.store.clone().sync_transactions(request).await
+    }
 }
 
 // LIMIT HELPERS
diff --git a/crates/rpc/src/server/health.rs b/crates/rpc/src/server/health.rs
new file mode 100644
index 000000000..c240edcb1
--- /dev/null
+++ b/crates/rpc/src/server/health.rs
@@ -0,0 +1,54 @@
+use std::pin::Pin;
+use std::task::{Context as StdContext, Poll};
+
+use tonic::body::Body;
+use tower::{Layer, Service};
+
+/// Simple health check layer that intercepts requests to root path.
+///
+/// The root path is used by load-balancers and options requests to check the health
+/// of the server. Since our gRPC server doesn't serve anything on the root
+/// these get logged as errors. This layer instead intercepts these requests
+/// and returns `Ok(200)`, preventing the errors.
+#[derive(Clone)]
+pub struct HealthCheckLayer;
+
+impl<S> Layer<S> for HealthCheckLayer {
+    type Service = HealthCheckService<S>;
+
+    fn layer(&self, service: S) -> Self::Service {
+        HealthCheckService { inner: service }
+    }
+}
+
+#[derive(Clone)]
+pub struct HealthCheckService<S> {
+    inner: S,
+}
+
+impl<S> Service<http::Request<Body>> for HealthCheckService<S>
+where
+    S: Service<http::Request<Body>, Response = http::Response<Body>> + Clone + Send + 'static,
+    S::Future: Send + 'static,
+    S::Error: Send + 'static,
+{
+    type Response = http::Response<Body>;
+    type Error = S::Error;
+    type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
+
+    fn poll_ready(&mut self, cx: &mut StdContext<'_>) -> Poll<Result<(), Self::Error>> {
+        self.inner.poll_ready(cx)
+    }
+
+    fn call(&mut self, req: http::Request<Body>) -> Self::Future {
+        if req.uri().path() == "/" {
+            let response = http::Response::builder()
+                .status(http::StatusCode::OK)
+                .body(Body::empty())
+                .expect("valid empty 200 response");
+            Box::pin(async move { Ok(response) })
+        } else {
+            Box::pin(self.inner.call(req))
+        }
+    }
+}
diff --git a/crates/rpc/src/server/mod.rs b/crates/rpc/src/server/mod.rs
index 35d8cf210..600f994fe 100644
--- a/crates/rpc/src/server/mod.rs
+++ b/crates/rpc/src/server/mod.rs
@@ -16,9 +16,11 @@ use tracing::info;
 use url::Url;
 
 use crate::COMPONENT;
+use crate::server::health::HealthCheckLayer;
 
 mod accept;
 mod api;
+mod health;
 
 /// The RPC server component.
 ///
@@ -76,6 +78,7 @@ impl Rpc {
             .timeout(self.grpc_timeout)
             .layer(CatchPanicLayer::custom(catch_panic_layer_fn))
             .layer(TraceLayer::new_for_grpc().make_span_with(grpc_trace_fn))
+            .layer(HealthCheckLayer)
             .layer(AcceptHeaderLayer::new(&rpc_version, genesis.commitment()))
             .layer(cors_for_grpc_web_layer())
             // Enables gRPC-web support.
diff --git a/crates/store/README.md b/crates/store/README.md
index c77c17843..0b12487c1 100644
--- a/crates/store/README.md
+++ b/crates/store/README.md
@@ -28,6 +28,7 @@ The full gRPC API can be found [here](../../proto/proto/store.proto).
 - [SyncNotes](#syncnotes)
 - [SyncState](#syncstate)
 - [SyncStorageMaps](#syncstoragemaps)
+- [SyncTransactions](#synctransactions)
 <!--toc:end-->
 
 ---
@@ -42,6 +43,16 @@ Applies changes of a new block to the DB and in-memory data structures. Raw bloc
 
 Returns a nullifier proof for each of the requested nullifiers.
 
+#### Error Handling
+
+When nullifier checking fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed nullifier format            |
+| `TOO_MANY_NULLIFIERS`     | 2     | `INVALID_ARGUMENT` | Too many nullifiers in request        |
+
 ---
 
 ### GetAccountDetails
@@ -87,6 +98,18 @@ This is used by the `block-producer` as part of the batch proving process.
 
 Returns a list of notes matching the provided note IDs.
 
+#### Error Handling
+
+When note retrieval fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed note ID format              |
+| `NOTE_NOT_FOUND`          | 2     | `NOT_FOUND`        | One or more note IDs don't exist     |
+| `TOO_MANY_NOTE_IDS`       | 3     | `INVALID_ARGUMENT` | Too many note IDs in request          |
+| `NOTE_NOT_PUBLIC`         | 4     | `PERMISSION_DENIED`| Note details not publicly accessible  |
+
 ---
 
 ### GetTransactionInputs
@@ -99,6 +122,16 @@ Used by the `block-producer` to query state required to verify a submitted trans
 
 Returns the script for a note by its root.
 
+#### Error Handling
+
+When script retrieval fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed script root format          |
+| `SCRIPT_NOT_FOUND`        | 2     | `NOT_FOUND`        | Script with given root doesn't exist  |
+
 ---
 
 ### SyncNullifiers
@@ -112,6 +145,17 @@ range, the last block included in the response (`resp.block_num`), and the curre
 If the response is chunked (i.e., `resp.block_num < block_to`), continue by issuing another request with
 `block_from = block_num + 1` to retrieve subsequent updates.
 
+#### Error Handling
+
+When nullifier synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed nullifier prefix format     |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `INVALID_PREFIX_LENGTH`   | 3     | `INVALID_ARGUMENT` | Unsupported prefix length (only 16)   |
+
 ---
 
 ### SyncAccountVault
@@ -122,19 +166,39 @@ For any `block_range`, the latest known set of assets is returned for the reques
 The data can be split and a cutoff block may be selected if there are too many assets to sync. The response contains
 the chain tip so that the caller knows when it has been reached.
 
+#### Error Handling
+
+When account vault synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed account ID format           |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `ACCOUNT_NOT_PUBLIC`      | 3     | `INVALID_ARGUMENT` | Account is not public (no vault sync) |
+
 ---
 
 ### SyncNotes
 
 Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
 
-Client specifies the `note_tags` they are interested in, and the block height from which to search for new for matching
-notes for. The request will then return the next block containing any note matching the provided tags.
+Client specifies the `note_tags` they are interested in, and the block range from which to search for matching notes. The request will then return the next block containing any note matching the provided tags within the specified range.
 
 The response includes each note's metadata and inclusion proof.
 
-A basic note sync can be implemented by repeatedly requesting the previous response's block until reaching the tip of
-the chain.
+A basic note sync can be implemented by repeatedly requesting the previous response's block until reaching the tip of the chain.
+
+#### Error Handling
+
+When note synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed note tags format            |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `TOO_MANY_TAGS`           | 3     | `INVALID_ARGUMENT` | Too many note tags in request         |
 
 ---
 
@@ -163,6 +227,36 @@ Caller specifies the `account_id` of the public account and the block range `blo
 
 This endpoint enables clients to maintain an updated view of account storage.
 
+#### Error Handling
+
+When storage map synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed account ID format           |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `ACCOUNT_NOT_FOUND`       | 3     | `NOT_FOUND`        | Account ID does not exist             |
+| `ACCOUNT_NOT_PUBLIC`      | 4     | `INVALID_ARGUMENT` | Account storage not publicly accessible |
+
+---
+
+### SyncTransactions
+
+Returns transaction records for specific accounts within a block range.
+
+#### Error Handling
+
+When transaction synchronization fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
+
+| Error Code                | Value | gRPC Status        | Description                           |
+|---------------------------|-------|--------------------|---------------------------------------|
+| `INTERNAL_ERROR`          | 0     | `INTERNAL`         | Internal server error occurred        |
+| `DESERIALIZATION_FAILED`  | 1     | `INVALID_ARGUMENT` | Malformed account ID format           |
+| `INVALID_BLOCK_RANGE`     | 2     | `INVALID_ARGUMENT` | Invalid block range parameters        |
+| `ACCOUNT_NOT_FOUND`       | 3     | `NOT_FOUND`        | Account ID does not exist             |
+| `TOO_MANY_ACCOUNT_IDS`    | 4     | `INVALID_ARGUMENT` | Too many account IDs in request       |
+
 ---
 
 ## License
diff --git a/crates/store/src/blocks.rs b/crates/store/src/blocks.rs
index 43c2fa8d2..5c9570252 100644
--- a/crates/store/src/blocks.rs
+++ b/crates/store/src/blocks.rs
@@ -74,6 +74,13 @@ impl BlockStore {
         }
     }
 
+    #[instrument(
+        target = COMPONENT,
+        name = "store.block_store.save_block",
+        skip(self, data),
+        err,
+        fields(block_size = data.len())
+    )]
     pub async fn save_block(
         &self,
         block_num: BlockNumber,
diff --git a/crates/store/src/db/migrations/2025062000000_setup/up.sql b/crates/store/src/db/migrations/2025062000000_setup/up.sql
index 071906857..1eb7a9728 100644
--- a/crates/store/src/db/migrations/2025062000000_setup/up.sql
+++ b/crates/store/src/db/migrations/2025062000000_setup/up.sql
@@ -119,9 +119,14 @@ CREATE INDEX idx_nullifiers_prefix ON nullifiers(nullifier_prefix);
 CREATE INDEX idx_nullifiers_block_num ON nullifiers(block_num);
 
 CREATE TABLE transactions (
-    transaction_id BLOB    NOT NULL,
-    account_id     BLOB    NOT NULL,
-    block_num      INTEGER NOT NULL,
+    transaction_id               BLOB    NOT NULL,
+    account_id                   BLOB    NOT NULL,
+    block_num                    INTEGER NOT NULL, -- Block number in which the transaction was included.
+    initial_state_commitment     BLOB    NOT NULL, -- State of the account before applying the transaction.
+    final_state_commitment       BLOB    NOT NULL, -- State of the account after applying the transaction.
+    input_notes                  BLOB    NOT NULL, -- Serialized vector with the Nullifier of the input notes.
+    output_notes                 BLOB    NOT NULL, -- Serialized vector with the NoteId of the output notes.
+    size_in_bytes                INTEGER NOT NULL, -- Estimated size of the row in bytes, considering the size of the input and output notes.
 
     PRIMARY KEY (transaction_id),
     FOREIGN KEY (account_id) REFERENCES accounts(account_id),
diff --git a/crates/store/src/db/mod.rs b/crates/store/src/db/mod.rs
index f129da300..74277ee83 100644
--- a/crates/store/src/db/mod.rs
+++ b/crates/store/src/db/mod.rs
@@ -92,6 +92,41 @@ pub struct TransactionSummary {
     pub transaction_id: TransactionId,
 }
 
+#[derive(Debug, PartialEq)]
+pub struct TransactionRecord {
+    pub block_num: BlockNumber,
+    pub transaction_id: TransactionId,
+    pub account_id: AccountId,
+    pub initial_state_commitment: Word,
+    pub final_state_commitment: Word,
+    pub input_notes: Vec<Nullifier>, // Store nullifiers for input notes
+    pub output_notes: Vec<NoteId>,   // Store note IDs for output notes
+}
+
+impl TransactionRecord {
+    /// Convert to proto `TransactionRecord`, but requires note sync records for output notes.
+    /// For `sync_transactions` RPC, we need to fetch note sync records separately since we only
+    /// store note IDs in the database.
+    pub fn into_proto_with_note_records(
+        self,
+        note_records: Vec<NoteRecord>,
+    ) -> proto::rpc_store::TransactionRecord {
+        let output_notes: Vec<proto::note::NoteSyncRecord> =
+            note_records.into_iter().map(Into::into).collect();
+
+        proto::rpc_store::TransactionRecord {
+            transaction_header: Some(proto::transaction::TransactionHeader {
+                account_id: Some(self.account_id.into()),
+                initial_state_commitment: Some(self.initial_state_commitment.into()),
+                final_state_commitment: Some(self.final_state_commitment.into()),
+                input_notes: self.input_notes.into_iter().map(From::from).collect(),
+                output_notes,
+            }),
+            block_num: self.block_num.as_u32(),
+        }
+    }
+}
+
 #[derive(Debug, Clone, PartialEq)]
 pub struct NoteRecord {
     pub block_num: BlockNumber,
@@ -118,6 +153,22 @@ impl From<NoteRecord> for proto::note::CommittedNote {
     }
 }
 
+impl From<NoteRecord> for proto::note::NoteSyncRecord {
+    fn from(value: NoteRecord) -> Self {
+        let note_id = value.note_id.into();
+        let note_index_in_block = value.note_index.leaf_index_value().into();
+        let metadata = value.metadata.into();
+        let inclusion_path = value.inclusion_path.into();
+
+        proto::note::NoteSyncRecord {
+            note_id: Some(note_id),
+            note_index_in_block,
+            metadata: Some(metadata),
+            inclusion_path: Some(inclusion_path),
+        }
+    }
+}
+
 #[derive(Debug, PartialEq)]
 pub struct StateSyncUpdate {
     pub notes: Vec<NoteSyncRecord>,
@@ -383,11 +434,11 @@ impl Db {
     #[instrument(level = "debug", target = COMPONENT, skip_all, ret(level = "debug"), err)]
     pub async fn get_note_sync(
         &self,
-        block_num: BlockNumber,
+        block_range: RangeInclusive<BlockNumber>,
         note_tags: Vec<u32>,
-    ) -> Result<NoteSyncUpdate, NoteSyncError> {
+    ) -> Result<(NoteSyncUpdate, BlockNumber), NoteSyncError> {
         self.transact("notes sync task", move |conn| {
-            queries::get_note_sync(conn, block_num, note_tags.as_slice())
+            queries::get_note_sync(conn, note_tags.as_slice(), block_range)
         })
         .await
     }
@@ -538,4 +589,21 @@ impl Db {
         })
         .await
     }
+
+    /// Returns the complete transaction records for the specified accounts within the specified
+    /// block range, including state commitments and note IDs.
+    ///
+    /// Note: This method is size-limited (~5MB) and may not return all matching transactions
+    /// if the limit is exceeded. Transactions from partial blocks are excluded to maintain
+    /// consistency.
+    pub async fn select_transactions_records(
+        &self,
+        account_ids: Vec<AccountId>,
+        block_range: RangeInclusive<BlockNumber>,
+    ) -> Result<(BlockNumber, Vec<TransactionRecord>)> {
+        self.transact("full transactions records", move |conn| {
+            queries::select_transactions_records(conn, &account_ids, block_range)
+        })
+        .await
+    }
 }
diff --git a/crates/store/src/db/models/queries/accounts.rs b/crates/store/src/db/models/queries/accounts.rs
index 867fe1df8..4f3946062 100644
--- a/crates/store/src/db/models/queries/accounts.rs
+++ b/crates/store/src/db/models/queries/accounts.rs
@@ -531,7 +531,8 @@ impl TryInto<Option<Account>> for AccountWithCodeRawJoined {
             let code = AccountCode::read_from_bytes(&code)?;
             let nonce = raw_sql_to_nonce(nonce);
             let nonce = Felt::new(nonce);
-            Some(Account::from_parts(account_id, vault, storage, code, nonce))
+            let account = Account::new_unchecked(account_id, vault, storage, code, nonce, None);
+            Some(account)
         } else {
             // a private account
             None
diff --git a/crates/store/src/db/models/queries/mod.rs b/crates/store/src/db/models/queries/mod.rs
index 81ef9b31e..0d40dd8c4 100644
--- a/crates/store/src/db/models/queries/mod.rs
+++ b/crates/store/src/db/models/queries/mod.rs
@@ -85,12 +85,19 @@ pub(crate) fn get_state_sync(
     account_ids: Vec<AccountId>,
     note_tags: Vec<u32>,
 ) -> Result<StateSyncUpdate, StateSyncError> {
+    let chain_tip = select_block_header_by_block_num(conn, None)?
+        .expect("Chain tip is not found")
+        .block_num();
+
+    // Sync notes from the starting block to the latest in the chain.
+    let block_range = from_start_block..=chain_tip;
+
     // select notes since block by tag and sender
-    let notes = select_notes_since_block_by_tag_and_sender(
+    let (notes, _) = select_notes_since_block_by_tag_and_sender(
         conn,
-        from_start_block,
         &account_ids[..],
         &note_tags[..],
+        block_range,
     )?;
 
     // select block header by block num
diff --git a/crates/store/src/db/models/queries/notes.rs b/crates/store/src/db/models/queries/notes.rs
index f572eb116..17c585c35 100644
--- a/crates/store/src/db/models/queries/notes.rs
+++ b/crates/store/src/db/models/queries/notes.rs
@@ -4,6 +4,7 @@
 )]
 
 use std::collections::{BTreeMap, BTreeSet};
+use std::ops::RangeInclusive;
 
 use diesel::prelude::{
     BoolExpressionMethods,
@@ -64,17 +65,18 @@ use crate::db::models::{serialize_vec, vec_raw_try_into};
 use crate::db::{DatabaseError, NoteRecord, NoteSyncRecord, NoteSyncUpdate, Page, schema};
 use crate::errors::NoteSyncError;
 
-/// Select notes matching the tags and account IDs search criteria.
+/// Select notes matching the tags and account IDs search criteria within a block range.
 ///
 /// # Parameters
 /// * `account_ids`: List of account IDs to filter by
 ///     - Limit: 0 <= size <= 1000
 /// * `note_tags`: List of note tags to filter by
 ///     - Limit: 0 <= count <= 1000
+/// * `block_range`: Range of blocks to search (inclusive)
 ///
 /// # Returns
 ///
-/// All matching notes from the first block greater than `block_num` containing a matching note.
+/// All matching notes from the first block within the range containing a matching note.
 /// A note is considered a match if it has any of the given tags, or if its sender is one of the
 /// given account IDs. If no matching notes are found at all, then an empty vector is returned.
 ///
@@ -108,7 +110,8 @@ use crate::errors::NoteSyncError;
 ///             notes
 ///         WHERE
 ///             (tag IN (?1) OR sender IN (?2)) AND
-///             block_num > ?3
+///             block_num > ?3 AND
+///             block_num <= ?4
 ///         ORDER BY
 ///             block_num ASC
 ///     LIMIT 1) AND
@@ -117,16 +120,17 @@ use crate::errors::NoteSyncError;
 /// ```
 pub(crate) fn select_notes_since_block_by_tag_and_sender(
     conn: &mut SqliteConnection,
-    from_start_block: BlockNumber,
     account_ids: &[AccountId],
     note_tags: &[u32],
-) -> Result<Vec<NoteSyncRecord>, DatabaseError> {
+    block_range: RangeInclusive<BlockNumber>,
+) -> Result<(Vec<NoteSyncRecord>, BlockNumber), DatabaseError> {
     QueryParamAccountIdLimit::check(account_ids.len())?;
     QueryParamNoteTagLimit::check(note_tags.len())?;
     let desired_note_tags = Vec::from_iter(note_tags.iter().map(|tag| *tag as i32));
     let desired_senders = serialize_vec(account_ids.iter());
 
-    let start_block_num = from_start_block.to_raw_sql();
+    let start_block_num = block_range.start().to_raw_sql();
+    let end_block_num = block_range.end().to_raw_sql();
 
     // find block_num: select notes since block by tag and sender
     let Some(desired_block_num): Option<i64> =
@@ -137,12 +141,13 @@ pub(crate) fn select_notes_since_block_by_tag_and_sender(
                     .or(schema::notes::sender.eq_any(&desired_senders[..])),
             )
             .filter(schema::notes::committed_at.gt(start_block_num))
+            .filter(schema::notes::committed_at.le(end_block_num))
             .order_by(schema::notes::committed_at.asc())
             .limit(1)
             .get_result(conn)
             .optional()?
     else {
-        return Ok(Vec::new());
+        return Ok((Vec::new(), *block_range.end()));
     };
 
     let notes = SelectDsl::select(schema::notes::table, NoteSyncRecordRawRow::as_select())
@@ -162,7 +167,7 @@ pub(crate) fn select_notes_since_block_by_tag_and_sender(
             .get_results::<NoteSyncRecordRawRow>(conn)
             .map_err(DatabaseError::from)?;
 
-    vec_raw_try_into(notes)
+    Ok((vec_raw_try_into(notes)?, BlockNumber::from_raw_sql(desired_block_num)?))
 }
 
 /// Select all notes matching the given set of identifiers
@@ -530,17 +535,18 @@ pub(crate) fn select_unconsumed_network_notes_by_tag(
 /// Loads the data necessary for a note sync.
 pub(crate) fn get_note_sync(
     conn: &mut SqliteConnection,
-    block_num: BlockNumber,
     note_tags: &[u32],
-) -> Result<NoteSyncUpdate, NoteSyncError> {
+    block_range: RangeInclusive<BlockNumber>,
+) -> Result<(NoteSyncUpdate, BlockNumber), NoteSyncError> {
     QueryParamNoteTagLimit::check(note_tags.len()).map_err(DatabaseError::from)?;
 
-    let notes = select_notes_since_block_by_tag_and_sender(conn, block_num, &[], note_tags)?;
+    let (notes, last_included_block) =
+        select_notes_since_block_by_tag_and_sender(conn, &[], note_tags, block_range)?;
 
     let block_header =
         select_block_header_by_block_num(conn, notes.first().map(|note| note.block_num))?
             .ok_or(NoteSyncError::EmptyBlockHeadersTable)?;
-    Ok(NoteSyncUpdate { notes, block_header })
+    Ok((NoteSyncUpdate { notes, block_header }, last_included_block))
 }
 
 #[derive(Debug, Clone, PartialEq, Selectable, Queryable, QueryableByName)]
diff --git a/crates/store/src/db/models/queries/transactions.rs b/crates/store/src/db/models/queries/transactions.rs
index d8d490a24..73672efb9 100644
--- a/crates/store/src/db/models/queries/transactions.rs
+++ b/crates/store/src/db/models/queries/transactions.rs
@@ -3,17 +3,20 @@ use std::ops::RangeInclusive;
 use diesel::prelude::{Insertable, Queryable};
 use diesel::query_dsl::methods::SelectDsl;
 use diesel::{
+    BoolExpressionMethods,
     ExpressionMethods,
     QueryDsl,
     QueryableByName,
     RunQueryDsl,
     Selectable,
+    SelectableHelper,
     SqliteConnection,
 };
-use miden_lib::utils::{Deserializable, Serializable};
+use miden_lib::utils::Deserializable;
 use miden_node_utils::limiter::{QueryParamAccountIdLimit, QueryParamLimiter};
 use miden_objects::account::AccountId;
 use miden_objects::block::BlockNumber;
+use miden_objects::note::{NoteId, Nullifier};
 use miden_objects::transaction::{OrderedTransactionHeaders, TransactionId};
 
 use super::DatabaseError;
@@ -69,7 +72,7 @@ pub fn select_transactions_by_accounts_and_block_range(
     .order(schema::transactions::transaction_id.asc())
     .load::<TransactionSummaryRaw>(conn)
     .map_err(DatabaseError::from)?;
-    Ok(vec_raw_try_into(raw).unwrap())
+    vec_raw_try_into(raw)
 }
 
 #[derive(Debug, Clone, PartialEq, Queryable, Selectable, QueryableByName)]
@@ -81,6 +84,20 @@ pub struct TransactionSummaryRaw {
     transaction_id: Vec<u8>,
 }
 
+#[derive(Debug, Clone, PartialEq, Queryable, Selectable, QueryableByName)]
+#[diesel(table_name = schema::transactions)]
+#[diesel(check_for_backend(diesel::sqlite::Sqlite))]
+pub struct TransactionRecordRaw {
+    account_id: Vec<u8>,
+    block_num: i64,
+    transaction_id: Vec<u8>,
+    initial_state_commitment: Vec<u8>,
+    final_state_commitment: Vec<u8>,
+    input_notes: Vec<u8>,
+    output_notes: Vec<u8>,
+    size_in_bytes: i64,
+}
+
 impl TryInto<crate::db::TransactionSummary> for TransactionSummaryRaw {
     type Error = DatabaseError;
     fn try_into(self) -> Result<crate::db::TransactionSummary, Self::Error> {
@@ -92,6 +109,33 @@ impl TryInto<crate::db::TransactionSummary> for TransactionSummaryRaw {
     }
 }
 
+impl TryInto<crate::db::TransactionRecord> for TransactionRecordRaw {
+    type Error = DatabaseError;
+    fn try_into(self) -> Result<crate::db::TransactionRecord, Self::Error> {
+        use miden_lib::utils::Deserializable;
+        use miden_objects::Word;
+
+        let initial_state_commitment = self.initial_state_commitment;
+        let final_state_commitment = self.final_state_commitment;
+        let input_notes_binary = self.input_notes;
+        let output_notes_binary = self.output_notes;
+
+        // Deserialize input notes as nullifiers and output notes as note IDs
+        let input_notes: Vec<Nullifier> = Deserializable::read_from_bytes(&input_notes_binary)?;
+        let output_notes: Vec<NoteId> = Deserializable::read_from_bytes(&output_notes_binary)?;
+
+        Ok(crate::db::TransactionRecord {
+            account_id: AccountId::read_from_bytes(&self.account_id[..])?,
+            block_num: BlockNumber::from_raw_sql(self.block_num)?,
+            transaction_id: TransactionId::read_from_bytes(&self.transaction_id[..])?,
+            initial_state_commitment: Word::read_from_bytes(&initial_state_commitment)?,
+            final_state_commitment: Word::read_from_bytes(&final_state_commitment)?,
+            input_notes,
+            output_notes,
+        })
+    }
+}
+
 /// Insert transactions to the DB using the given [`SqliteConnection`].
 ///
 /// # Returns
@@ -108,14 +152,13 @@ pub(crate) fn insert_transactions(
     transactions: &OrderedTransactionHeaders,
 ) -> Result<usize, DatabaseError> {
     #[allow(clippy::into_iter_on_ref)] // false positive
-    let count = diesel::insert_into(schema::transactions::table)
-        .values(Vec::from_iter(
-            transactions
-                .as_slice()
-                .into_iter()
-                .map(|tx| TransactionSummaryRowInsert::new(tx.id(), tx.account_id(), block_num)),
-        ))
-        .execute(conn)?;
+    let rows: Vec<_> = transactions
+        .as_slice()
+        .into_iter()
+        .map(|tx| TransactionSummaryRowInsert::new(tx, block_num))
+        .collect();
+
+    let count = diesel::insert_into(schema::transactions::table).values(rows).execute(conn)?;
     Ok(count)
 }
 
@@ -126,14 +169,209 @@ pub struct TransactionSummaryRowInsert {
     transaction_id: Vec<u8>,
     account_id: Vec<u8>,
     block_num: i64,
+    initial_state_commitment: Vec<u8>,
+    final_state_commitment: Vec<u8>,
+    input_notes: Vec<u8>,
+    output_notes: Vec<u8>,
+    size_in_bytes: i64,
 }
 
 impl TransactionSummaryRowInsert {
-    fn new(transaction_id: TransactionId, account_id: AccountId, block_num: BlockNumber) -> Self {
+    #[allow(
+        clippy::cast_possible_wrap,
+        reason = "We will not approach the item count where i64 and usize cause issues"
+    )]
+    fn new(
+        transaction_header: &miden_objects::transaction::TransactionHeader,
+        block_num: BlockNumber,
+    ) -> Self {
+        use miden_lib::utils::Serializable;
+
+        const HEADER_BASE_SIZE: usize = 4 + 32 + 16 + 64; // block_num + tx_id + account_id + commitments
+
+        // Serialize input notes using binary format (store nullifiers)
+        let input_notes_binary = transaction_header.input_notes().to_bytes();
+
+        // Serialize output notes using binary format (store note IDs)
+        let output_notes_binary = transaction_header.output_notes().to_bytes();
+
+        // Manually calculate the estimated size of the transaction header to avoid
+        // the cost of serialization. The size estimation includes:
+        // - 4 bytes for block number
+        // - 32 bytes for transaction ID
+        // - 16 bytes for account ID
+        // - 64 bytes for initial + final state commitments (32 bytes each)
+        // - 32 bytes per input note (nullifier size)
+        // - 500 bytes per output note (estimated size when converted to NoteSyncRecord)
+        //
+        // Note: 500 bytes per output note is an over-estimate but ensures we don't
+        // exceed memory limits when these transactions are later converted to proto records.
+        let input_notes_size = (transaction_header.input_notes().num_notes() * 32) as usize;
+        let output_notes_size = transaction_header.output_notes().len() * 500;
+        let size_in_bytes = (HEADER_BASE_SIZE + input_notes_size + output_notes_size) as i64;
+
         Self {
-            transaction_id: transaction_id.to_bytes(),
-            account_id: account_id.to_bytes(),
+            transaction_id: transaction_header.id().to_bytes(),
+            account_id: transaction_header.account_id().to_bytes(),
             block_num: block_num.to_raw_sql(),
+            initial_state_commitment: transaction_header.initial_state_commitment().to_bytes(),
+            final_state_commitment: transaction_header.final_state_commitment().to_bytes(),
+            input_notes: input_notes_binary,
+            output_notes: output_notes_binary,
+            size_in_bytes,
         }
     }
 }
+
+/// Select complete transaction records for the given accounts and block range.
+///
+/// # Parameters
+/// * `account_ids`: List of account IDs to filter by
+///     - Limit: 0 <= size <= 1000
+/// * `block_range`: Range of blocks to include inclusive
+///
+/// # Returns
+/// A tuple of (`last_block_included`, `transaction_records`) where:
+/// - `last_block_included`: The highest block number included in the response
+/// - `transaction_records`: Vector of transaction records, limited by payload size
+///
+/// # Note
+/// This function returns complete transaction record information including state commitments
+/// and note IDs, allowing for direct conversion to proto `TransactionRecord` without loading
+/// full block data. We use a chunked loading strategy to prevent memory exhaustion attacks and
+/// ensure predictable resource usage.
+///
+/// # Raw SQL
+/// ```sql
+/// SELECT
+///     account_id,
+///     block_num,
+///     transaction_id,
+///     initial_state_commitment,
+///     final_state_commitment,
+///     input_notes,
+///     output_notes,
+///     size_in_bytes
+/// FROM
+///     transactions
+/// WHERE
+///     block_num >= ?1
+///     AND block_num <= ?2
+///     AND account_id IN rarray(?3)
+///     AND (
+///         block_num > ?4 OR (block_num = ?4 AND transaction_id > ?5)
+///     )  -- cursor-based pagination
+/// ORDER BY
+///     block_num ASC,
+///     transaction_id ASC
+/// LIMIT
+///     ?6
+/// ```
+/// Notes:
+/// - Uses stable ordering (`block_num`, `transaction_id`) to ensure consistent results across
+///   paginated queries.
+/// - Uses cursor-based pagination.
+/// - The query is executed in chunks of 1000 transactions to prevent loading excessive data and to
+///   stop as soon as the accumulated size approaches the 4MB limit.
+/// - Given the size of note records, 1000 records are guaranteed never to return more than about
+///   60MB of data.
+pub fn select_transactions_records(
+    conn: &mut SqliteConnection,
+    account_ids: &[AccountId],
+    block_range: RangeInclusive<BlockNumber>,
+) -> Result<(BlockNumber, Vec<crate::db::TransactionRecord>), DatabaseError> {
+    const MAX_PAYLOAD_BYTES: i64 = 4 * 1024 * 1024; // 4 MB
+    const NUM_TXS_PER_CHUNK: i64 = 1000; // Read 1000 transactions at a time
+
+    QueryParamAccountIdLimit::check(account_ids.len())?;
+
+    if block_range.is_empty() {
+        return Err(DatabaseError::InvalidBlockRange {
+            from: *block_range.start(),
+            to: *block_range.end(),
+        });
+    }
+
+    let desired_account_ids = serialize_vec(account_ids);
+
+    // Read transactions in chunks to prevent loading excessive data and to stop
+    // as soon as we approach the size limit
+    let mut all_transactions = Vec::new();
+    let mut total_size = 0i64;
+    let mut last_block_num: Option<i64> = None;
+    let mut last_transaction_id: Option<Vec<u8>> = None;
+
+    loop {
+        let mut query =
+            SelectDsl::select(schema::transactions::table, TransactionRecordRaw::as_select())
+                .filter(schema::transactions::block_num.ge(block_range.start().to_raw_sql()))
+                .filter(schema::transactions::block_num.le(block_range.end().to_raw_sql()))
+                .filter(schema::transactions::account_id.eq_any(&desired_account_ids))
+                .into_boxed();
+
+        // Apply cursor-based pagination using the last seen (block_num, transaction_id)
+        if let (Some(last_block), Some(last_tx_id)) = (last_block_num, &last_transaction_id) {
+            query = query.filter(
+                schema::transactions::block_num
+                    .gt(last_block)
+                    .or(schema::transactions::block_num
+                        .eq(last_block)
+                        .and(schema::transactions::transaction_id.gt(last_tx_id))),
+            );
+        }
+
+        let chunk = query
+            .order((
+                schema::transactions::block_num.asc(),
+                schema::transactions::transaction_id.asc(),
+            ))
+            .limit(NUM_TXS_PER_CHUNK)
+            .load::<TransactionRecordRaw>(conn)
+            .map_err(DatabaseError::from)?;
+
+        // Add transactions from this chunk one by one until we hit the limit
+        let mut added_from_chunk = 0;
+        let mut last_added_tx: Option<TransactionRecordRaw> = None;
+
+        for tx in chunk {
+            if total_size + tx.size_in_bytes <= MAX_PAYLOAD_BYTES {
+                total_size += tx.size_in_bytes;
+                last_added_tx = Some(tx);
+                added_from_chunk += 1;
+            } else {
+                // Can't fit this transaction, stop here
+                break;
+            }
+        }
+
+        // Update cursor position only for the last transaction that was actually added
+        if let Some(tx) = last_added_tx {
+            last_block_num = Some(tx.block_num);
+            last_transaction_id = Some(tx.transaction_id.clone());
+            all_transactions.push(tx);
+        }
+
+        // Break if chunk incomplete (size limit hit or data exhausted)
+        if added_from_chunk < NUM_TXS_PER_CHUNK {
+            break;
+        }
+    }
+
+    // Ensure block consistency: remove the last block if it's incomplete
+    // (we may have stopped loading mid-block due to size constraints)
+    if total_size >= MAX_PAYLOAD_BYTES {
+        // SAFETY: We're guaranteed to have at least one transaction since total_size > 0
+        let last_block_num = last_block_num.expect(
+            "guaranteed to have processed at least one transaction when size limit is reached",
+        );
+        let filtered_transactions = vec_raw_try_into(
+            all_transactions.into_iter().take_while(|row| row.block_num != last_block_num),
+        )?;
+
+        // SAFETY: block_num came from the database and was previously validated
+        let last_included_block = BlockNumber::from_raw_sql(last_block_num.saturating_sub(1))?;
+        Ok((last_included_block, filtered_transactions))
+    } else {
+        Ok((*block_range.end(), vec_raw_try_into(all_transactions)?))
+    }
+}
diff --git a/crates/store/src/db/schema.rs b/crates/store/src/db/schema.rs
index bc907e826..2b81eb52d 100644
--- a/crates/store/src/db/schema.rs
+++ b/crates/store/src/db/schema.rs
@@ -1,7 +1,7 @@
 // @generated automatically by Diesel CLI.
 
 diesel::table! {
-    account_storage_map_values (account_id, block_num, slot, key, is_latest_update) {
+    account_storage_map_values (account_id, block_num, slot, key) {
         account_id -> Binary,
         block_num -> BigInt,
         slot -> Integer,
@@ -90,6 +90,11 @@ diesel::table! {
         transaction_id -> Binary,
         account_id -> Binary,
         block_num -> BigInt,
+        initial_state_commitment -> Binary,
+        final_state_commitment -> Binary,
+        input_notes -> Binary,
+        output_notes -> Binary,
+        size_in_bytes -> BigInt,
     }
 }
 
diff --git a/crates/store/src/db/tests.rs b/crates/store/src/db/tests.rs
index 174067367..30c3e0a8f 100644
--- a/crates/store/src/db/tests.rs
+++ b/crates/store/src/db/tests.rs
@@ -22,6 +22,7 @@ use miden_objects::account::{
     AccountStorageMode,
     AccountType,
     AccountVaultDelta,
+    PublicKeyCommitment,
     StorageSlot,
 };
 use miden_objects::asset::{Asset, FungibleAsset};
@@ -32,13 +33,13 @@ use miden_objects::block::{
     BlockNoteTree,
     BlockNumber,
 };
-use miden_objects::crypto::dsa::rpo_falcon512::PublicKey;
 use miden_objects::crypto::merkle::SparseMerklePath;
 use miden_objects::crypto::rand::RpoRandomCoin;
 use miden_objects::note::{
     Note,
     NoteDetails,
     NoteExecutionHint,
+    NoteHeader,
     NoteId,
     NoteMetadata,
     NoteTag,
@@ -52,7 +53,13 @@ use miden_objects::testing::account_id::{
     ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE,
     ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE_2,
 };
-use miden_objects::transaction::{OrderedTransactionHeaders, TransactionHeader, TransactionId};
+use miden_objects::transaction::{
+    InputNoteCommitment,
+    InputNotes,
+    OrderedTransactionHeaders,
+    TransactionHeader,
+    TransactionId,
+};
 use miden_objects::{EMPTY_WORD, Felt, FieldElement, Word, ZERO};
 use pretty_assertions::assert_eq;
 use rand::Rng;
@@ -444,7 +451,7 @@ fn sql_unconsumed_network_notes() {
     // An arbitrary public account (network note tag requires public account).
     create_block(conn, block_num);
 
-    let account_notes = vec![
+    let account_notes = [
         make_account_and_note(conn, block_num, [0u8; 32], AccountStorageMode::Public),
         make_account_and_note(conn, block_num, [1u8; 32], AccountStorageMode::Network),
     ];
@@ -1098,21 +1105,25 @@ fn notes() {
     let block_num_1 = 1.into();
     create_block(conn, block_num_1);
 
+    let block_range = BlockNumber::from(0)..=BlockNumber::from(1);
+
     // test empty table
-    let res =
-        queries::select_notes_since_block_by_tag_and_sender(conn, BlockNumber::from(0), &[], &[])
+    let (res, last_included_block) =
+        queries::select_notes_since_block_by_tag_and_sender(conn, &[], &[], block_range.clone())
             .unwrap();
 
     assert!(res.is_empty());
+    assert_eq!(last_included_block, 1.into());
 
-    let res = queries::select_notes_since_block_by_tag_and_sender(
+    let (res, last_included_block) = queries::select_notes_since_block_by_tag_and_sender(
         conn,
-        BlockNumber::from(0),
         &[],
         &[1, 2, 3],
+        block_range.clone(),
     )
     .unwrap();
     assert!(res.is_empty());
+    assert_eq!(last_included_block, 1.into());
 
     let sender = AccountId::try_from(ACCOUNT_ID_PRIVATE_SENDER).unwrap();
 
@@ -1151,25 +1162,27 @@ fn notes() {
     queries::insert_notes(conn, &[(note.clone(), None)]).unwrap();
 
     // test empty tags
-    let res =
-        queries::select_notes_since_block_by_tag_and_sender(conn, BlockNumber::from(0), &[], &[])
+    let (res, last_included_block) =
+        queries::select_notes_since_block_by_tag_and_sender(conn, &[], &[], block_range.clone())
             .unwrap();
     assert!(res.is_empty());
+    assert_eq!(last_included_block, 1.into());
+
+    let block_range_1 = 1.into()..=1.into();
 
     // test no updates
-    let res = queries::select_notes_since_block_by_tag_and_sender(conn, block_num_1, &[], &[tag])
-        .unwrap();
+    let (res, last_included_block) =
+        queries::select_notes_since_block_by_tag_and_sender(conn, &[], &[tag], block_range_1)
+            .unwrap();
     assert!(res.is_empty());
+    assert_eq!(last_included_block, 1.into());
 
     // test match
-    let res = queries::select_notes_since_block_by_tag_and_sender(
-        conn,
-        block_num_1.parent().unwrap(),
-        &[],
-        &[tag],
-    )
-    .unwrap();
+    let (res, last_included_block) =
+        queries::select_notes_since_block_by_tag_and_sender(conn, &[], &[tag], block_range.clone())
+            .unwrap();
     assert_eq!(res, vec![note.clone().into()]);
+    assert_eq!(last_included_block, 1.into());
 
     let block_num_2 = note.block_num + 1;
     create_block(conn, block_num_2);
@@ -1186,20 +1199,24 @@ fn notes() {
 
     queries::insert_notes(conn, &[(note2.clone(), None)]).unwrap();
 
+    let block_range = 0.into()..=2.into();
+
     // only first note is returned
-    let res = queries::select_notes_since_block_by_tag_and_sender(
-        conn,
-        block_num_1.parent().unwrap(),
-        &[],
-        &[tag],
-    )
-    .unwrap();
+    let (res, last_included_block) =
+        queries::select_notes_since_block_by_tag_and_sender(conn, &[], &[tag], block_range)
+            .unwrap();
     assert_eq!(res, vec![note.clone().into()]);
+    assert_eq!(last_included_block, 1.into());
+
+    let block_range = 1.into()..=2.into();
 
     // only the second note is returned
-    let res = queries::select_notes_since_block_by_tag_and_sender(conn, block_num_1, &[], &[tag])
-        .unwrap();
+    let (res, last_included_block) =
+        queries::select_notes_since_block_by_tag_and_sender(conn, &[], &[tag], block_range)
+            .unwrap();
     assert_eq!(res, vec![note2.clone().into()]);
+    assert_eq!(last_included_block, 2.into());
+
     // test query notes by id
     let notes = vec![note.clone(), note2];
 
@@ -1389,6 +1406,24 @@ fn mock_block_transaction(account_id: AccountId, num: u64) -> TransactionHeader
     let input_notes_commitment = Word::try_from([0, 0, num, 0]).unwrap();
     let output_notes_commitment = Word::try_from([0, 0, 0, num]).unwrap();
 
+    let notes = vec![InputNoteCommitment::from(num_to_nullifier(num))];
+    let input_notes = InputNotes::new_unchecked(notes);
+
+    let output_notes = vec![NoteHeader::new(
+        NoteId::new(
+            Word::try_from([num, num, 0, 0]).unwrap(),
+            Word::try_from([0, 0, num, num]).unwrap(),
+        ),
+        NoteMetadata::new(
+            account_id,
+            NoteType::Public,
+            NoteTag::LocalAny(num as u32),
+            NoteExecutionHint::None,
+            Felt::default(),
+        )
+        .unwrap(),
+    )];
+
     TransactionHeader::new_unchecked(
         TransactionId::new(
             initial_state_commitment,
@@ -1399,11 +1434,8 @@ fn mock_block_transaction(account_id: AccountId, num: u64) -> TransactionHeader
         account_id,
         initial_state_commitment,
         final_account_commitment,
-        vec![num_to_nullifier(num)],
-        vec![NoteId::new(
-            Word::try_from([num, num, 0, 0]).unwrap(),
-            Word::try_from([0, 0, num, num]).unwrap(),
-        )],
+        input_notes,
+        output_notes,
     )
 }
 
@@ -1465,7 +1497,7 @@ fn mock_account_code_and_storage(
         .storage_mode(storage_mode)
         .with_assets(assets)
         .with_component(component)
-        .with_auth_component(AuthRpoFalcon512::new(PublicKey::new(EMPTY_WORD)))
+        .with_auth_component(AuthRpoFalcon512::new(PublicKeyCommitment::from(EMPTY_WORD)))
         .build_existing()
         .unwrap()
 }
diff --git a/crates/store/src/errors.rs b/crates/store/src/errors.rs
index 353cb215a..f24b3ae20 100644
--- a/crates/store/src/errors.rs
+++ b/crates/store/src/errors.rs
@@ -3,6 +3,8 @@ use std::io;
 
 use deadpool_sync::InteractError;
 use miden_node_proto::domain::account::NetworkAccountError;
+use miden_node_proto::domain::block::InvalidBlockRange;
+use miden_node_proto::errors::{ConversionError, GrpcError};
 use miden_node_utils::limiter::QueryLimitError;
 use miden_objects::account::AccountId;
 use miden_objects::block::BlockNumber;
@@ -271,11 +273,13 @@ impl From<ApplyBlockError> for Status {
     }
 }
 
-#[derive(Error, Debug)]
+#[derive(Error, Debug, GrpcError)]
 pub enum GetBlockHeaderError {
     #[error("database error")]
+    #[grpc(internal)]
     DatabaseError(#[from] DatabaseError),
     #[error("error retrieving the merkle proof for the block")]
+    #[grpc(internal)]
     MmrError(#[from] MmrError),
 }
 
@@ -310,14 +314,23 @@ impl From<diesel::result::Error> for StateSyncError {
     }
 }
 
-#[derive(Error, Debug)]
+#[derive(Error, Debug, GrpcError)]
 pub enum NoteSyncError {
     #[error("database error")]
+    #[grpc(internal)]
     DatabaseError(#[from] DatabaseError),
     #[error("block headers table is empty")]
+    #[grpc(internal)]
     EmptyBlockHeadersTable,
     #[error("error retrieving the merkle proof for the block")]
+    #[grpc(internal)]
     MmrError(#[from] MmrError),
+    #[error("invalid block range")]
+    InvalidBlockRange(#[from] InvalidBlockRange),
+    #[error("too many note tags: received {0}, max {1}")]
+    TooManyNoteTags(usize, usize),
+    #[error("malformed note tags")]
+    DeserializationFailed(#[from] ConversionError),
 }
 
 impl From<diesel::result::Error> for NoteSyncError {
@@ -351,6 +364,132 @@ pub enum GetBatchInputsError {
     },
 }
 
+// SYNC NULLIFIERS ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum SyncNullifiersError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("invalid block range")]
+    InvalidBlockRange(#[from] InvalidBlockRange),
+    #[error("unsupported prefix length: {0} (only 16-bit prefixes are supported)")]
+    InvalidPrefixLength(u32),
+    #[error("malformed nullifier prefix")]
+    DeserializationFailed(#[from] ConversionError),
+}
+
+// SYNC ACCOUNT VAULT ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum SyncAccountVaultError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("invalid block range")]
+    InvalidBlockRange(#[from] InvalidBlockRange),
+    #[error("malformed account ID")]
+    DeserializationFailed(#[from] ConversionError),
+    #[error("account {0} is not public")]
+    AccountNotPublic(AccountId),
+}
+
+// SYNC STORAGE MAPS ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum SyncStorageMapsError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("invalid block range")]
+    InvalidBlockRange(#[from] InvalidBlockRange),
+    #[error("malformed account ID")]
+    DeserializationFailed(#[from] ConversionError),
+    #[error("account {0} not found")]
+    AccountNotFound(AccountId),
+    #[error("account {0} is not public")]
+    AccountNotPublic(AccountId),
+}
+
+// GET BLOCK BY NUMBER ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum GetBlockByNumberError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("malformed block number")]
+    DeserializationFailed(#[from] DeserializationError),
+}
+
+// GET NOTES BY ID ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum GetNotesByIdError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("malformed note ID")]
+    DeserializationFailed(#[from] ConversionError),
+    #[error("note {0} not found")]
+    NoteNotFound(miden_objects::note::NoteId),
+    #[error("too many note IDs: received {0}, max {1}")]
+    TooManyNoteIds(usize, usize),
+    #[error("note {0} is not public")]
+    NoteNotPublic(miden_objects::note::NoteId),
+}
+
+// GET NOTE SCRIPT BY ROOT ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum GetNoteScriptByRootError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("malformed script root")]
+    DeserializationFailed(#[from] ConversionError),
+    #[error("script with given root not found")]
+    ScriptNotFound,
+}
+
+// CHECK NULLIFIERS ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum CheckNullifiersError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("malformed nullifier")]
+    DeserializationFailed(#[from] ConversionError),
+    #[error("too many nullifiers: received {0}, maximum {1}")]
+    TooManyNullifiers(usize, usize),
+}
+
+// SYNC TRANSACTIONS ERRORS
+// ================================================================================================
+
+#[derive(Debug, Error, GrpcError)]
+pub enum SyncTransactionsError {
+    #[error("database error")]
+    #[grpc(internal)]
+    DatabaseError(#[from] DatabaseError),
+    #[error("invalid block range")]
+    InvalidBlockRange(#[from] InvalidBlockRange),
+    #[error("malformed account ID")]
+    DeserializationFailed(#[from] ConversionError),
+    #[error("account {0} not found")]
+    AccountNotFound(AccountId),
+    #[error("too many account IDs: received {0}, max {1}")]
+    TooManyAccountIds(usize, usize),
+}
+
 // Do not scope for `cfg(test)` - if it the traitbounds don't suffice the issue will already appear
 // in the compilation of the library or binary, which would prevent getting to compiling the
 // following code.
diff --git a/crates/store/src/genesis/config/mod.rs b/crates/store/src/genesis/config/mod.rs
index 531ed696a..af52090fa 100644
--- a/crates/store/src/genesis/config/mod.rs
+++ b/crates/store/src/genesis/config/mod.rs
@@ -27,7 +27,7 @@ use miden_objects::account::{
 use miden_objects::asset::{FungibleAsset, TokenSymbol};
 use miden_objects::block::FeeParameters;
 use miden_objects::crypto::dsa::rpo_falcon512::SecretKey;
-use miden_objects::{Felt, FieldElement, ONE, TokenSymbolError, Word, ZERO};
+use miden_objects::{Felt, FieldElement, ONE, TokenSymbolError, ZERO};
 use rand::distr::weighted::Weight;
 use rand::{Rng, SeedableRng};
 use rand_chacha::ChaCha20Rng;
@@ -119,8 +119,7 @@ impl GenesisConfig {
             .chain(fungible_faucet_configs.into_iter())
         {
             let symbol = fungible_faucet_config.symbol.clone();
-            let (faucet_account, faucet_account_seed, secret_key) =
-                fungible_faucet_config.build_account()?;
+            let (faucet_account, secret_key) = fungible_faucet_config.build_account()?;
 
             if faucet_accounts.insert(symbol.clone(), faucet_account.clone()).is_some() {
                 return Err(GenesisConfigError::DuplicateFaucetDefinition { symbol });
@@ -130,7 +129,6 @@ impl GenesisConfig {
                 format!("faucet_{symbol}.mac", symbol = symbol.to_string().to_lowercase()),
                 faucet_account.id(),
                 secret_key,
-                faucet_account_seed,
             ));
             // Do _not_ collect the account, only after we know all wallet assets
             // we know the remaining supply in the faucets.
@@ -157,7 +155,7 @@ impl GenesisConfig {
 
             let mut rng = ChaCha20Rng::from_seed(rand::random());
             let secret_key = SecretKey::with_rng(&mut get_rpo_random_coin(&mut rng));
-            let auth = AuthScheme::RpoFalcon512 { pub_key: secret_key.public_key() };
+            let auth = AuthScheme::RpoFalcon512 { pub_key: secret_key.public_key().into() };
             let init_seed: [u8; 32] = rng.random();
 
             let account_type = if has_updatable_code {
@@ -166,7 +164,7 @@ impl GenesisConfig {
                 AccountType::RegularAccountImmutableCode
             };
             let account_storage_mode = storage_mode.into();
-            let (mut wallet_account, wallet_account_seed) =
+            let mut wallet_account =
                 create_basic_wallet(init_seed, auth, account_type, account_storage_mode)?;
 
             // Add fungible assets and track the faucet adjustments per faucet/asset.
@@ -199,7 +197,6 @@ impl GenesisConfig {
                 format!("wallet_{index:0zero_padding_width$}.mac"),
                 wallet_account.id(),
                 secret_key,
-                wallet_account_seed,
             ));
 
             wallet_accounts.push(wallet_account);
@@ -335,7 +332,7 @@ pub struct FungibleFaucetConfig {
 
 impl FungibleFaucetConfig {
     /// Create a fungible faucet from a config entry
-    fn build_account(self) -> Result<(Account, Word, SecretKey), GenesisConfigError> {
+    fn build_account(self) -> Result<(Account, SecretKey), GenesisConfigError> {
         let FungibleFaucetConfig {
             symbol,
             decimals,
@@ -344,7 +341,7 @@ impl FungibleFaucetConfig {
         } = self;
         let mut rng = ChaCha20Rng::from_seed(rand::random());
         let secret_key = SecretKey::with_rng(&mut get_rpo_random_coin(&mut rng));
-        let auth = AuthRpoFalcon512::new(secret_key.public_key());
+        let auth = AuthRpoFalcon512::new(secret_key.public_key().into());
         let init_seed: [u8; 32] = rng.random();
 
         let max_supply = Felt::try_from(max_supply)
@@ -353,7 +350,7 @@ impl FungibleFaucetConfig {
         let component = BasicFungibleFaucet::new(*symbol.as_ref(), decimals, max_supply)?;
 
         // It's similar to `fn create_basic_fungible_faucet`, but we need to cover more cases.
-        let (faucet_account, faucet_account_seed) = AccountBuilder::new(init_seed)
+        let faucet_account = AccountBuilder::new(init_seed)
             .account_type(AccountType::FungibleFaucet)
             .storage_mode(storage_mode.into())
             .with_auth_component(auth)
@@ -362,7 +359,7 @@ impl FungibleFaucetConfig {
 
         debug_assert_eq!(faucet_account.nonce(), Felt::ZERO);
 
-        Ok((faucet_account, faucet_account_seed, secret_key))
+        Ok((faucet_account, secret_key))
     }
 }
 
@@ -429,7 +426,7 @@ pub struct AccountFileWithName {
 #[derive(Debug, Clone)]
 pub struct AccountSecrets {
     // name, account, private key, account seed
-    pub secrets: Vec<(String, AccountId, SecretKey, Word)>,
+    pub secrets: Vec<(String, AccountId, SecretKey)>,
 }
 
 impl AccountSecrets {
@@ -444,16 +441,12 @@ impl AccountSecrets {
         let account_lut = IndexMap::<AccountId, Account>::from_iter(
             genesis_state.accounts.iter().map(|account| (account.id(), account.clone())),
         );
-        self.secrets.iter().map(move |(name, account_id, secret_key, account_seed)| {
+        self.secrets.iter().cloned().map(move |(name, account_id, secret_key)| {
             let account = account_lut
-                .get(account_id)
-                .ok_or(GenesisConfigError::MissingGenesisAccount { account_id: *account_id })?;
-            let account_file = AccountFile::new(
-                account.clone(),
-                Some(*account_seed),
-                vec![AuthSecretKey::RpoFalcon512(secret_key.clone())],
-            );
-            let name = name.to_string();
+                .get(&account_id)
+                .ok_or(GenesisConfigError::MissingGenesisAccount { account_id })?;
+            let account_file =
+                AccountFile::new(account.clone(), vec![AuthSecretKey::RpoFalcon512(secret_key)]);
             Ok(AccountFileWithName { name, account_file })
         })
     }
diff --git a/crates/store/src/server/api.rs b/crates/store/src/server/api.rs
index f59aac355..87d529bc5 100644
--- a/crates/store/src/server/api.rs
+++ b/crates/store/src/server/api.rs
@@ -34,8 +34,7 @@ impl StoreApi {
         let (block_header, mmr_proof) = self
             .state
             .get_block_header(block_num, request.include_mmr_proof.unwrap_or(false))
-            .await
-            .map_err(internal_error)?;
+            .await?;
 
         Ok(Response::new(proto::shared::BlockHeaderByNumberResponse {
             block_header: block_header.map(Into::into),
@@ -58,38 +57,98 @@ pub fn invalid_argument<E: core::fmt::Display>(err: E) -> Status {
     Status::invalid_argument(err.to_string())
 }
 
-pub fn read_account_id(id: Option<proto::account::AccountId>) -> Result<AccountId, Box<Status>> {
-    id.ok_or(invalid_argument("missing account ID"))?
-        .try_into()
-        .map_err(|err: ConversionError| {
-            invalid_argument(err.as_report_context("invalid account ID")).into()
-        })
+/// Converts `ConversionError` to Status for nullifier validation
+pub fn conversion_error_to_status(value: &ConversionError) -> Status {
+    invalid_argument(value.as_report_context("Invalid nullifier format"))
 }
 
-#[allow(clippy::result_large_err)]
-#[instrument(level = "debug", target = COMPONENT, skip_all, err)]
-pub fn read_account_ids(
-    account_ids: &[proto::account::AccountId],
-) -> Result<Vec<AccountId>, Status> {
+/// Reads a block range from a request, returning a specific error type if the field is missing
+pub fn read_block_range<E>(
+    block_range: Option<proto::rpc_store::BlockRange>,
+    entity: &'static str,
+) -> Result<proto::rpc_store::BlockRange, E>
+where
+    E: From<ConversionError>,
+{
+    block_range.ok_or_else(|| {
+        ConversionError::MissingFieldInProtobufRepresentation { entity, field_name: "block_range" }
+            .into()
+    })
+}
+
+/// Reads and converts a root field from a request to Word, returning a specific error type if
+/// conversion fails
+pub fn read_root<E>(
+    root: Option<proto::primitives::Digest>,
+    entity: &'static str,
+) -> Result<Word, E>
+where
+    E: From<ConversionError>,
+{
+    root.ok_or_else(|| ConversionError::MissingFieldInProtobufRepresentation {
+        entity,
+        field_name: "root",
+    })?
+    .try_into()
+    .map_err(Into::into)
+}
+
+/// Converts a collection of proto primitives to Words, returning a specific error type if
+/// conversion fails
+pub fn convert_digests_to_words<E, I>(digests: I) -> Result<Vec<Word>, E>
+where
+    E: From<ConversionError>,
+    I: IntoIterator,
+    I::Item: TryInto<Word, Error = ConversionError>,
+{
+    digests
+        .into_iter()
+        .map(TryInto::try_into)
+        .collect::<Result<Vec<_>, ConversionError>>()
+        .map_err(Into::into)
+}
+
+/// Reads account IDs from a request, returning a specific error type if conversion fails
+pub fn read_account_ids<E>(account_ids: &[proto::account::AccountId]) -> Result<Vec<AccountId>, E>
+where
+    E: From<ConversionError>,
+{
     account_ids
         .iter()
         .cloned()
         .map(AccountId::try_from)
         .collect::<Result<_, ConversionError>>()
-        .map_err(|_| invalid_argument("Byte array is not a valid AccountId"))
+        .map_err(Into::into)
+}
+
+pub fn read_account_id<E>(id: Option<proto::account::AccountId>) -> Result<AccountId, E>
+where
+    E: From<ConversionError>,
+{
+    id.ok_or_else(|| {
+        ConversionError::deserialization_error(
+            "AccountId",
+            miden_objects::crypto::utils::DeserializationError::InvalidValue(
+                "Missing account ID".to_string(),
+            ),
+        )
+    })?
+    .try_into()
+    .map_err(Into::into)
 }
 
 #[allow(clippy::result_large_err)]
 #[instrument(level = "debug", target = COMPONENT, skip_all, err)]
-pub fn validate_nullifiers(
-    nullifiers: &[proto::primitives::Digest],
-) -> Result<Vec<Nullifier>, Status> {
+pub fn validate_nullifiers<E>(nullifiers: &[proto::primitives::Digest]) -> Result<Vec<Nullifier>, E>
+where
+    E: From<ConversionError> + std::fmt::Display,
+{
     nullifiers
         .iter()
         .copied()
         .map(TryInto::try_into)
         .collect::<Result<_, ConversionError>>()
-        .map_err(|_| invalid_argument("Digest field is not in the modulus range"))
+        .map_err(Into::into)
 }
 
 #[allow(clippy::result_large_err)]
diff --git a/crates/store/src/server/block_producer.rs b/crates/store/src/server/block_producer.rs
index 8e2b7d221..9e4255ab0 100644
--- a/crates/store/src/server/block_producer.rs
+++ b/crates/store/src/server/block_producer.rs
@@ -14,6 +14,7 @@ use tracing::{debug, info, instrument};
 use crate::COMPONENT;
 use crate::server::api::{
     StoreApi,
+    conversion_error_to_status,
     internal_error,
     read_account_id,
     read_account_ids,
@@ -97,8 +98,9 @@ impl block_producer_server::BlockProducer for StoreApi {
     ) -> Result<Response<proto::block_producer_store::BlockInputs>, Status> {
         let request = request.into_inner();
 
-        let account_ids = read_account_ids(&request.account_ids)?;
-        let nullifiers = validate_nullifiers(&request.nullifiers)?;
+        let account_ids = read_account_ids::<Status>(&request.account_ids)?;
+        let nullifiers = validate_nullifiers(&request.nullifiers)
+            .map_err(|err| conversion_error_to_status(&err))?;
         let unauthenticated_notes = validate_notes(&request.unauthenticated_notes)?;
         let reference_blocks = read_block_numbers(&request.reference_blocks);
         let unauthenticated_notes = unauthenticated_notes.into_iter().collect();
@@ -163,8 +165,9 @@ impl block_producer_server::BlockProducer for StoreApi {
 
         debug!(target: COMPONENT, ?request);
 
-        let account_id = read_account_id(request.account_id).map_err(|err| *err)?;
-        let nullifiers = validate_nullifiers(&request.nullifiers)?;
+        let account_id = read_account_id::<Status>(request.account_id)?;
+        let nullifiers = validate_nullifiers(&request.nullifiers)
+            .map_err(|err| conversion_error_to_status(&err))?;
         let unauthenticated_notes = validate_notes(&request.unauthenticated_notes)?;
 
         let tx_inputs = self
diff --git a/crates/store/src/server/rpc_api.rs b/crates/store/src/server/rpc_api.rs
index f8886969d..66125365a 100644
--- a/crates/store/src/server/rpc_api.rs
+++ b/crates/store/src/server/rpc_api.rs
@@ -1,9 +1,7 @@
+use miden_node_proto::convert;
 use miden_node_proto::domain::account::AccountInfo;
-use miden_node_proto::errors::ConversionError;
 use miden_node_proto::generated::rpc_store::rpc_server;
 use miden_node_proto::generated::{self as proto};
-use miden_node_proto::{convert, try_convert};
-use miden_node_utils::ErrorReport as _;
 use miden_objects::Word;
 use miden_objects::account::AccountId;
 use miden_objects::note::NoteId;
@@ -11,15 +9,36 @@ use tonic::{Request, Response, Status};
 use tracing::{debug, info, instrument};
 
 use crate::COMPONENT;
+use crate::errors::{
+    CheckNullifiersError,
+    GetBlockByNumberError,
+    GetNoteScriptByRootError,
+    GetNotesByIdError,
+    NoteSyncError,
+    SyncAccountVaultError,
+    SyncNullifiersError,
+    SyncStorageMapsError,
+    SyncTransactionsError,
+};
 use crate::server::api::{
     StoreApi,
+    convert_digests_to_words,
     internal_error,
-    invalid_argument,
     read_account_id,
     read_account_ids,
+    read_block_range,
+    read_root,
     validate_nullifiers,
 };
 
+// CONSTANTS
+// ================================================================================================
+
+const MAX_ACCOUNT_IDS: usize = 100;
+const MAX_NULLIFIERS: usize = 100;
+const MAX_NOTE_TAGS: usize = 100;
+const MAX_NOTE_IDS: usize = 100;
+
 // CLIENT ENDPOINTS
 // ================================================================================================
 
@@ -64,7 +83,16 @@ impl rpc_server::Rpc for StoreApi {
         // Validate the nullifiers and convert them to Word values. Stop on first error.
         let request = request.into_inner();
 
-        let nullifiers = validate_nullifiers(&request.nullifiers)?;
+        // Validate nullifiers count
+        if request.nullifiers.len() > MAX_NULLIFIERS {
+            return Err(CheckNullifiersError::TooManyNullifiers(
+                request.nullifiers.len(),
+                MAX_NULLIFIERS,
+            )
+            .into());
+        }
+
+        let nullifiers = validate_nullifiers::<CheckNullifiersError>(&request.nullifiers)?;
 
         // Query the state for the request's nullifiers
         let proofs = self.state.check_nullifiers(&nullifiers).await;
@@ -93,19 +121,20 @@ impl rpc_server::Rpc for StoreApi {
         let request = request.into_inner();
 
         if request.prefix_len != 16 {
-            return Err(Status::invalid_argument("Only 16-bit prefixes are supported"));
+            return Err(SyncNullifiersError::InvalidPrefixLength(request.prefix_len).into());
         }
 
         let chain_tip = self.state.latest_block_num().await;
-        let block_range = request
-            .block_range
-            .ok_or(invalid_argument("block_range is required"))?
-            .into_inclusive_range(chain_tip);
+        let block_range =
+            read_block_range::<SyncNullifiersError>(request.block_range, "SyncNullifiersRequest")?
+                .into_inclusive_range::<SyncNullifiersError>(&chain_tip)?;
 
         let (nullifiers, block_num) = self
             .state
             .sync_nullifiers(request.prefix_len, request.nullifiers, block_range)
-            .await?;
+            .await
+            .map_err(SyncNullifiersError::from)?;
+
         let nullifiers = nullifiers
             .into_iter()
             .map(|nullifier_info| proto::rpc_store::sync_nullifiers_response::NullifierUpdate {
@@ -140,7 +169,7 @@ impl rpc_server::Rpc for StoreApi {
     ) -> Result<Response<proto::rpc_store::SyncStateResponse>, Status> {
         let request = request.into_inner();
 
-        let account_ids: Vec<AccountId> = read_account_ids(&request.account_ids)?;
+        let account_ids: Vec<AccountId> = read_account_ids::<Status>(&request.account_ids)?;
 
         let (state, delta) = self
             .state
@@ -196,16 +225,28 @@ impl rpc_server::Rpc for StoreApi {
     ) -> Result<Response<proto::rpc_store::SyncNotesResponse>, Status> {
         let request = request.into_inner();
 
-        let (state, mmr_proof) = self
-            .state
-            .sync_notes(request.block_num.into(), request.note_tags)
-            .await
-            .map_err(internal_error)?;
+        let chain_tip = self.state.latest_block_num().await;
+        let block_range =
+            read_block_range::<NoteSyncError>(request.block_range, "SyncNotesRequest")?
+                .into_inclusive_range::<NoteSyncError>(&chain_tip)?;
+
+        // Validate note tags count
+        if request.note_tags.len() > MAX_NOTE_TAGS {
+            return Err(
+                NoteSyncError::TooManyNoteTags(request.note_tags.len(), MAX_NOTE_TAGS).into()
+            );
+        }
+
+        let (state, mmr_proof, last_block_included) =
+            self.state.sync_notes(request.note_tags, block_range).await?;
 
         let notes = state.notes.into_iter().map(Into::into).collect();
 
         Ok(Response::new(proto::rpc_store::SyncNotesResponse {
-            chain_tip: self.state.latest_block_num().await.as_u32(),
+            pagination_info: Some(proto::rpc_store::PaginationInfo {
+                chain_tip: chain_tip.as_u32(),
+                block_num: last_block_included.as_u32(),
+            }),
             block_header: Some(state.block_header.into()),
             mmr_path: Some(mmr_proof.merkle_path.into()),
             notes,
@@ -233,16 +274,20 @@ impl rpc_server::Rpc for StoreApi {
 
         let note_ids = request.into_inner().ids;
 
-        let note_ids: Vec<Word> = try_convert(note_ids)
-            .collect::<Result<_, _>>()
-            .map_err(|err| Status::invalid_argument(format!("Invalid NoteId: {err}")))?;
+        // Validate note IDs count
+        if note_ids.len() > MAX_NOTE_IDS {
+            return Err(GetNotesByIdError::TooManyNoteIds(note_ids.len(), MAX_NOTE_IDS).into());
+        }
+
+        let note_ids: Vec<Word> = convert_digests_to_words::<GetNotesByIdError, _>(note_ids)?;
 
         let note_ids: Vec<NoteId> = note_ids.into_iter().map(From::from).collect();
 
         let notes = self
             .state
             .get_notes_by_id(note_ids)
-            .await?
+            .await
+            .map_err(GetNotesByIdError::from)?
             .into_iter()
             .map(Into::into)
             .collect();
@@ -265,7 +310,7 @@ impl rpc_server::Rpc for StoreApi {
         request: Request<proto::account::AccountId>,
     ) -> Result<Response<proto::account::AccountDetails>, Status> {
         let request = request.into_inner();
-        let account_id = read_account_id(Some(request)).map_err(|err| *err)?;
+        let account_id = read_account_id::<Status>(Some(request))?;
         let account_info: AccountInfo = self.state.get_account_details(account_id).await?;
 
         // TODO: revisit this, previous implementation was just returning only the summary, but it
@@ -290,7 +335,11 @@ impl rpc_server::Rpc for StoreApi {
 
         debug!(target: COMPONENT, ?request);
 
-        let block = self.state.load_block(request.block_num.into()).await?;
+        let block = self
+            .state
+            .load_block(request.block_num.into())
+            .await
+            .map_err(GetBlockByNumberError::from)?;
 
         Ok(Response::new(proto::blockchain::MaybeBlock { block }))
     }
@@ -307,14 +356,14 @@ impl rpc_server::Rpc for StoreApi {
     async fn get_account_proof(
         &self,
         request: Request<proto::rpc_store::AccountProofRequest>,
-    ) -> Result<Response<proto::rpc_store::AccountProof>, Status> {
+    ) -> Result<Response<proto::rpc_store::AccountProofResponse>, Status> {
         debug!(target: COMPONENT, ?request);
         let request = request.into_inner();
-        let account_request = request.try_into()?;
+        let account_proof_request = request.try_into()?;
 
-        let proof = self.state.get_account_proof(account_request).await?;
+        let proof = self.state.get_account_proof(account_proof_request).await?;
 
-        Ok(Response::new(proto::rpc_store::AccountProof::from(proof)))
+        Ok(Response::new(proof.into()))
     }
 
     #[instrument(
@@ -333,26 +382,23 @@ impl rpc_server::Rpc for StoreApi {
         let request = request.into_inner();
         let chain_tip = self.state.latest_block_num().await;
 
-        let account_id: AccountId = read_account_id(request.account_id).map_err(|e| *e)?;
+        let account_id: AccountId = read_account_id::<SyncAccountVaultError>(request.account_id)?;
+
         if !account_id.is_public() {
-            return Err(Status::invalid_argument(format!(
-                "account with ID {account_id} is not public",
-            )));
+            return Err(SyncAccountVaultError::AccountNotPublic(account_id).into());
         }
 
-        let block_range = request.block_range.ok_or(invalid_argument("block_range is required"))?;
-
-        let block_range = block_range.into_inclusive_range(chain_tip);
-
-        if block_range.end() > &chain_tip {
-            return Err(Status::invalid_argument("block_to cannot be higher than the chain tip"));
-        }
+        let block_range = read_block_range::<SyncAccountVaultError>(
+            request.block_range,
+            "SyncAccountVaultRequest",
+        )?
+        .into_inclusive_range::<SyncAccountVaultError>(&chain_tip)?;
 
         let (last_included_block, updates) = self
             .state
             .sync_account_vault(account_id, block_range)
             .await
-            .map_err(internal_error)?;
+            .map_err(SyncAccountVaultError::from)?;
 
         let updates = updates
             .into_iter()
@@ -390,29 +436,24 @@ impl rpc_server::Rpc for StoreApi {
     ) -> Result<Response<proto::rpc_store::SyncStorageMapsResponse>, Status> {
         let request = request.into_inner();
 
-        let account_id = read_account_id(request.account_id).map_err(|e| *e)?;
+        let account_id = read_account_id::<SyncStorageMapsError>(request.account_id)?;
 
         if !account_id.is_public() {
-            return Err(Status::invalid_argument(format!(
-                "account with ID {account_id} is not public"
-            )));
+            Err(SyncStorageMapsError::AccountNotPublic(account_id))?;
         }
 
         let chain_tip = self.state.latest_block_num().await;
-        let block_range = request
-            .block_range
-            .ok_or(invalid_argument("block_range is required"))?
-            .into_inclusive_range(chain_tip);
-
-        if block_range.start() > block_range.end() {
-            return Err(Status::invalid_argument("block_from cannot be greater than block_to"));
-        }
+        let block_range = read_block_range::<SyncStorageMapsError>(
+            request.block_range,
+            "SyncStorageMapsRequest",
+        )?
+        .into_inclusive_range::<SyncStorageMapsError>(&chain_tip)?;
 
         let storage_maps_page = self
             .state
             .get_storage_map_sync_values(account_id, block_range)
             .await
-            .map_err(internal_error)?;
+            .map_err(SyncStorageMapsError::from)?;
 
         let updates = storage_maps_page
             .values
@@ -468,19 +509,82 @@ impl rpc_server::Rpc for StoreApi {
     ) -> Result<Response<proto::rpc_store::MaybeNoteScript>, Status> {
         debug!(target: COMPONENT, request = ?request);
 
-        let root = request
-            .into_inner()
-            .root
-            .ok_or(invalid_argument("missing root"))?
-            .try_into()
-            .map_err(|err: ConversionError| {
-                invalid_argument(err.as_report_context("invalid root"))
-            })?;
+        let root = read_root::<GetNoteScriptByRootError>(request.into_inner().root, "NoteRoot")?;
 
-        let note_script = self.state.get_note_script_by_root(root).await.map_err(internal_error)?;
+        let note_script = self
+            .state
+            .get_note_script_by_root(root)
+            .await
+            .map_err(GetNoteScriptByRootError::from)?;
 
         Ok(Response::new(proto::rpc_store::MaybeNoteScript {
             script: note_script.map(Into::into),
         }))
     }
+
+    #[instrument(
+        parent = None,
+        target = COMPONENT,
+        name = "store.rpc_server.sync_transactions",
+        skip_all,
+        ret(level = "debug"),
+        err
+    )]
+    async fn sync_transactions(
+        &self,
+        request: Request<proto::rpc_store::SyncTransactionsRequest>,
+    ) -> Result<Response<proto::rpc_store::SyncTransactionsResponse>, Status> {
+        debug!(target: COMPONENT, request = ?request);
+
+        let request = request.into_inner();
+
+        let chain_tip = self.state.latest_block_num().await;
+        let block_range = read_block_range::<SyncTransactionsError>(
+            request.block_range,
+            "SyncTransactionsRequest",
+        )?
+        .into_inclusive_range::<SyncTransactionsError>(&chain_tip)?;
+
+        let account_ids: Vec<AccountId> =
+            read_account_ids::<SyncTransactionsError>(&request.account_ids)?;
+
+        // Validate account IDs count
+        if account_ids.len() > MAX_ACCOUNT_IDS {
+            return Err(SyncTransactionsError::TooManyAccountIds(
+                account_ids.len(),
+                MAX_ACCOUNT_IDS,
+            )
+            .into());
+        }
+
+        let (last_block_included, transaction_records_db) = self
+            .state
+            .sync_transactions(account_ids, block_range.clone())
+            .await
+            .map_err(SyncTransactionsError::from)?;
+
+        // Convert database TransactionRecord to proto TransactionRecord
+        let mut transaction_records = Vec::with_capacity(transaction_records_db.len());
+
+        for tx_header in transaction_records_db {
+            // Retrieve full note data for output notes from the database
+            let note_records = self
+                .state
+                .get_notes_by_id(tx_header.output_notes.clone())
+                .await
+                .map_err(SyncTransactionsError::from)?;
+
+            // Convert to proto using the helper method
+            let proto_record = tx_header.into_proto_with_note_records(note_records);
+            transaction_records.push(proto_record);
+        }
+
+        Ok(Response::new(proto::rpc_store::SyncTransactionsResponse {
+            pagination_info: Some(proto::rpc_store::PaginationInfo {
+                chain_tip: chain_tip.as_u32(),
+                block_num: last_block_included.as_u32(),
+            }),
+            transaction_records,
+        }))
+    }
 }
diff --git a/crates/store/src/state.rs b/crates/store/src/state.rs
index 52831df61..69546170f 100644
--- a/crates/store/src/state.rs
+++ b/crates/store/src/state.rs
@@ -8,15 +8,17 @@ use std::ops::RangeInclusive;
 use std::path::Path;
 use std::sync::Arc;
 
-use miden_node_proto::AccountWitnessRecord;
 use miden_node_proto::domain::account::{
-    AccountDetailsResponse,
+    AccountDetailRequest,
+    AccountDetails,
     AccountInfo,
     AccountProofRequest,
     AccountProofResponse,
+    AccountStorageDetails,
+    AccountStorageMapDetails,
+    AccountVaultDetails,
     NetworkAccountPrefix,
-    StorageMapKeysProof,
-    StorageSlotMapProof,
+    StorageMapRequest,
 };
 use miden_node_proto::domain::batch::BatchInputs;
 use miden_node_utils::ErrorReport;
@@ -668,22 +670,23 @@ impl State {
     ///
     /// # Arguments
     ///
-    /// - `block_num`: The last block *known* by the client, updates start from the next block.
     /// - `note_tags`: The tags the client is interested in, resulting notes are restricted to the
     ///   first block containing a matching note.
+    /// - `block_range`: The range of blocks from which to synchronize notes.
     #[instrument(level = "debug", target = COMPONENT, skip_all, ret(level = "debug"), err)]
     pub async fn sync_notes(
         &self,
-        block_num: BlockNumber,
         note_tags: Vec<u32>,
-    ) -> Result<(NoteSyncUpdate, MmrProof), NoteSyncError> {
+        block_range: RangeInclusive<BlockNumber>,
+    ) -> Result<(NoteSyncUpdate, MmrProof, BlockNumber), NoteSyncError> {
         let inner = self.inner.read().await;
 
-        let note_sync = self.db.get_note_sync(block_num, note_tags).await?;
+        let (note_sync, last_included_block) =
+            self.db.get_note_sync(block_range, note_tags).await?;
 
         let mmr_proof = inner.blockchain.open(note_sync.block_header.block_num())?;
 
-        Ok((note_sync, mmr_proof))
+        Ok((note_sync, mmr_proof, last_included_block))
     }
 
     /// Returns data needed by the block producer to construct and prove the next block.
@@ -887,6 +890,10 @@ impl State {
 
     /// Returns the respective account proof with optional details, such as asset and storage
     /// entries.
+    ///
+    /// Note: The `block_num` parameter in the request is currently ignored and will always
+    /// return the current state. Historical block support will be implemented in a future update.
+    #[allow(clippy::too_many_lines)]
     pub async fn get_account_proof(
         &self,
         account_request: AccountProofRequest,
@@ -897,70 +904,82 @@ impl State {
         let inner_state = self.inner.read().await;
 
         let account_id = account_request.account_id;
-
-        let account_details = if let Some(account_detail_request) = account_request.account_details
+        // TODO: Implement historical block support using account_request.block_num
+        // For now, we always return the current state
+        let account_details = if let Some(AccountDetailRequest {
+            code_commitment,
+            asset_vault_commitment,
+            storage_requests,
+        }) = account_request.details
         {
-            let info = self.db.select_account(account_id).await?;
-
-            if let Some(details) = &info.details {
-                let mut storage_proofs = Vec::new();
-
-                for StorageMapKeysProof { storage_index, storage_keys } in
-                    &account_detail_request.storage_requests
-                {
-                    if let Some(StorageSlot::Map(storage_map)) =
-                        details.storage().slots().get(*storage_index as usize)
-                    {
-                        for map_key in storage_keys {
-                            let proof = storage_map.open(map_key);
-
-                            let slot_map_key = StorageSlotMapProof {
-                                storage_slot: *storage_index,
-                                proof: proof.into(),
-                            };
-                            storage_proofs.push(slot_map_key);
-                        }
-                    } else {
-                        return Err(AccountError::StorageSlotNotMap(*storage_index).into());
-                    }
-                }
-
-                // Only include unknown account code blobs
-                let account_code = match account_detail_request.code_commitment {
-                    Some(known_code_commitment)
-                        if known_code_commitment == details.code().commitment() =>
-                    {
-                        // the known code matches the expected commitment, which implies
-                        // the user already has that code
-                        None
-                    },
-                    _ => Some(details.code().to_bytes()),
-                };
+            let account_info = self.db.select_account(account_id).await?;
 
-                let account_details_response = AccountDetailsResponse {
-                    account_header: AccountHeader::from(details),
-                    storage_header: details.storage().to_header(),
-                    account_code,
-                    storage_proofs,
-                };
+            // if we get a query for a _private_ account _with_ details requested, we'll error out
+            let Some(account) = account_info.details else {
+                return Err(DatabaseError::AccountNotPublic(account_id));
+            };
 
-                Some(account_details_response)
-            } else {
-                None
+            let storage_header = account.storage().to_header();
+
+            let mut storage_map_details =
+                Vec::<AccountStorageMapDetails>::with_capacity(storage_requests.len());
+
+            for StorageMapRequest { slot_index, slot_data } in storage_requests {
+                let Some(StorageSlot::Map(storage_map)) =
+                    account.storage().slots().get(slot_index as usize)
+                else {
+                    return Err(AccountError::StorageSlotNotMap(slot_index).into());
+                };
+                let details = AccountStorageMapDetails::new(slot_index, slot_data, storage_map);
+                storage_map_details.push(details);
             }
+
+            // Only include unknown account code blobs, which is equal to a account code digest
+            // mismatch. If `None` was requested, don't return any.
+            let account_code = code_commitment
+                .is_some_and(|code_commitment| code_commitment != account.code().commitment())
+                .then(|| account.code().to_bytes());
+
+            // storage details
+            let storage_details = AccountStorageDetails {
+                header: storage_header,
+                map_details: storage_map_details,
+            };
+
+            // Handle vault details based on the `asset_vault_commitment`.
+            // Similar to `code_commitment`, if the provided commitment matches, we don't return
+            // vault data. If no commitment is provided or it doesn't match, we return
+            // the vault data. If the number of vault contained assets are exceeding a
+            // limit, we signal this back in the response and the user must handle that
+            // in follow-up request.
+            let vault_details = match asset_vault_commitment {
+                Some(commitment) if commitment == account.vault().root() => {
+                    // The client already has the correct vault data
+                    AccountVaultDetails::empty()
+                },
+                Some(_) => {
+                    // The commitment doesn't match, so return vault data
+                    AccountVaultDetails::new(account.vault())
+                },
+                None => {
+                    // No commitment provided, so don't return vault data
+                    AccountVaultDetails::empty()
+                },
+            };
+
+            Some(AccountDetails {
+                account_header: AccountHeader::from(account),
+                account_code,
+                vault_details,
+                storage_details,
+            })
         } else {
             None
         };
 
-        let witness = AccountWitnessRecord {
-            account_id, // FIXME TODO see account.proto we need to triple check this is correct
-            witness: inner_state.account_tree.open(account_id),
-        };
-
         let response = AccountProofResponse {
-            block_num: inner_state.latest_block_num(),
-            witness,
-            account_details,
+            witness: inner_state.account_tree.open(account_id),
+            details: account_details,
         };
 
         Ok(response)
@@ -1033,6 +1052,16 @@ impl State {
     ) -> Result<Option<NoteScript>, DatabaseError> {
         self.db.select_note_script_by_root(root).await
     }
+
+    /// Returns the complete transaction records for the specified accounts within the specified
+    /// block range, including state commitments and note IDs.
+    pub async fn sync_transactions(
+        &self,
+        account_ids: Vec<AccountId>,
+        block_range: RangeInclusive<BlockNumber>,
+    ) -> Result<(BlockNumber, Vec<crate::db::TransactionRecord>), DatabaseError> {
+        self.db.select_transactions_records(account_ids, block_range).await
+    }
 }
 
 // UTILITIES
diff --git a/crates/utils/src/logging.rs b/crates/utils/src/logging.rs
index 1452d48c3..b1425d0f2 100644
--- a/crates/utils/src/logging.rs
+++ b/crates/utils/src/logging.rs
@@ -3,7 +3,7 @@ use std::str::FromStr;
 use opentelemetry::trace::TracerProvider as _;
 use opentelemetry_otlp::WithTonicConfig;
 use opentelemetry_sdk::propagation::TraceContextPropagator;
-use opentelemetry_sdk::trace::SpanExporter;
+use opentelemetry_sdk::trace::SdkTracerProvider;
 use tracing::subscriber::Subscriber;
 use tracing_opentelemetry::OpenTelemetryLayer;
 use tracing_subscriber::layer::{Filter, SubscriberExt};
@@ -22,6 +22,20 @@ impl OpenTelemetry {
     }
 }
 
+/// A guard that shuts down the tracer provider when dropped. This ensures that the logs are flushed
+/// to the exporter before the program exits.
+pub struct OtelGuard {
+    tracer_provider: SdkTracerProvider,
+}
+
+impl Drop for OtelGuard {
+    fn drop(&mut self) {
+        if let Err(err) = self.tracer_provider.shutdown() {
+            eprintln!("{err:?}");
+        }
+    }
+}
+
 /// Initializes tracing to stdout and optionally an open-telemetry exporter.
 ///
 /// Trace filtering defaults to `INFO` and can be configured using the conventional `RUST_LOG`
@@ -31,7 +45,10 @@ impl OpenTelemetry {
 /// [specification](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#opentelemetry-protocol-exporter)
 ///
 /// Registers a panic hook so that panic errors are reported to the open-telemetry exporter.
-pub fn setup_tracing(otel: OpenTelemetry) -> anyhow::Result<()> {
+///
+/// Returns an [`OtelGuard`] if open-telemetry is enabled, otherwise `None`. When this guard is
+/// dropped, the tracer provider is shutdown.
+pub fn setup_tracing(otel: OpenTelemetry) -> anyhow::Result<Option<OtelGuard>> {
     if otel.is_enabled() {
         opentelemetry::global::set_text_map_propagator(TraceContextPropagator::new());
     }
@@ -39,17 +56,14 @@ pub fn setup_tracing(otel: OpenTelemetry) -> anyhow::Result<()> {
     // Note: open-telemetry requires a tokio-runtime, so this _must_ be lazily evaluated (aka not
     // `then_some`) to avoid crashing sync callers (with OpenTelemetry::Disabled set). Examples of
     // such callers are tests with logging enabled.
-    let otel_layer = {
-        if otel.is_enabled() {
-            let exporter = opentelemetry_otlp::SpanExporter::builder()
-                .with_tonic()
-                .with_tls_config(tonic::transport::ClientTlsConfig::new().with_native_roots())
-                .build()?;
-            Some(open_telemetry_layer(exporter))
-        } else {
-            None
-        }
+    let tracer_provider = if otel.is_enabled() {
+        Some(init_tracer_provider()?)
+    } else {
+        None
     };
+    let otel_layer = tracer_provider.as_ref().map(|provider| {
+        OpenTelemetryLayer::new(provider.tracer("tracing-otel-subscriber")).boxed()
+    });
 
     let subscriber = Registry::default()
         .with(stdout_layer().with_filter(env_or_default_filter()))
@@ -60,7 +74,19 @@ pub fn setup_tracing(otel: OpenTelemetry) -> anyhow::Result<()> {
     std::panic::set_hook(Box::new(|info| {
         tracing::error!(panic = true, "{info}");
     }));
-    Ok(())
+
+    Ok(tracer_provider.map(|tracer_provider| OtelGuard { tracer_provider }))
+}
+
+fn init_tracer_provider() -> anyhow::Result<SdkTracerProvider> {
+    let exporter = opentelemetry_otlp::SpanExporter::builder()
+        .with_tonic()
+        .with_tls_config(tonic::transport::ClientTlsConfig::new().with_native_roots())
+        .build()?;
+
+    Ok(opentelemetry_sdk::trace::SdkTracerProvider::builder()
+        .with_batch_exporter(exporter)
+        .build())
 }
 
 /// Initializes tracing to a test exporter.
@@ -79,7 +105,11 @@ pub fn setup_test_tracing() -> anyhow::Result<(
     let (exporter, rx_export, rx_shutdown) =
         opentelemetry_sdk::testing::trace::new_tokio_test_exporter();
 
-    let otel_layer = open_telemetry_layer(exporter);
+    let tracer_provider = opentelemetry_sdk::trace::SdkTracerProvider::builder()
+        .with_batch_exporter(exporter)
+        .build();
+    let otel_layer =
+        OpenTelemetryLayer::new(tracer_provider.tracer("tracing-otel-subscriber")).boxed();
     let subscriber = Registry::default()
         .with(stdout_layer().with_filter(env_or_default_filter()))
         .with(otel_layer.with_filter(env_or_default_filter()));
@@ -87,21 +117,6 @@ pub fn setup_test_tracing() -> anyhow::Result<(
     Ok((rx_export, rx_shutdown))
 }
 
-fn open_telemetry_layer<S>(
-    exporter: impl SpanExporter + 'static,
-) -> Box<dyn tracing_subscriber::Layer<S> + Send + Sync + 'static>
-where
-    S: Subscriber + Sync + Send,
-    for<'a> S: tracing_subscriber::registry::LookupSpan<'a>,
-{
-    let tracer = opentelemetry_sdk::trace::SdkTracerProvider::builder()
-        .with_batch_exporter(exporter)
-        .build();
-
-    let tracer = tracer.tracer("tracing-otel-subscriber");
-    OpenTelemetryLayer::new(tracer).boxed()
-}
-
 #[cfg(not(feature = "tracing-forest"))]
 fn stdout_layer<S>() -> Box<dyn tracing_subscriber::Layer<S> + Send + Sync + 'static>
 where
diff --git a/crates/utils/src/tracing/grpc.rs b/crates/utils/src/tracing/grpc.rs
index d05aea97c..a4721cd73 100644
--- a/crates/utils/src/tracing/grpc.rs
+++ b/crates/utils/src/tracing/grpc.rs
@@ -1,3 +1,5 @@
+use tracing::field;
+
 use crate::tracing::OpenTelemetrySpanExt;
 
 /// Returns a [`trace_fn`](tonic::transport::server::Server) implementation for gRPC requests
@@ -10,15 +12,22 @@ use crate::tracing::OpenTelemetrySpanExt;
 pub fn grpc_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
     // A gRPC request's path ends with `../<service>/<method>`.
     let mut path_segments = request.uri().path().rsplit('/');
+
     let method = path_segments.next().unwrap_or_default();
     let service = path_segments.next().unwrap_or_default();
 
-    // Create a span with a generic name - the actual span name will be set via otel.name
-    let span = tracing::info_span!("grpc_request", rpc.service = service, rpc.method = method);
+    // Create a span with a generic, static name. Fields to be recorded after needs to be
+    // initialized as empty since otherwise the assignment will have no effect.
+    let span = tracing::info_span!(
+        "rpc",
+        otel.name = field::Empty,
+        rpc.service = service,
+        rpc.method = method
+    );
 
-    // Set the dynamic span name that OpenTelemetry will use
-    // This allows us to have the proper <service>/<method> format without hardcoding
-    span.record("otel.name", format!("{service}/{method}"));
+    // Set the span name via otel.name
+    let otel_name = format!("{service}/{method}");
+    span.record("otel.name", otel_name);
 
     // Pull the open-telemetry parent context using the HTTP extractor
     let otel_ctx = opentelemetry::global::get_text_map_propagator(|propagator| {
diff --git a/crates/utils/src/tracing/span_ext.rs b/crates/utils/src/tracing/span_ext.rs
index ca73d3f8a..c887346b2 100644
--- a/crates/utils/src/tracing/span_ext.rs
+++ b/crates/utils/src/tracing/span_ext.rs
@@ -5,8 +5,9 @@ use miden_objects::Word;
 use miden_objects::account::AccountId;
 use miden_objects::batch::BatchId;
 use miden_objects::block::BlockNumber;
+use miden_objects::transaction::TransactionId;
 use opentelemetry::trace::Status;
-use opentelemetry::{Key, Value};
+use opentelemetry::{Key, StringValue, Value};
 
 use crate::ErrorReport;
 
@@ -15,6 +16,13 @@ pub trait ToValue {
     fn to_value(&self) -> Value;
 }
 
+impl<T: ToValue> ToValue for Vec<T> {
+    fn to_value(&self) -> Value {
+        let string_values = self.iter().map(|v| v.to_value().into()).collect::<Vec<StringValue>>();
+        Value::Array(string_values.into())
+    }
+}
+
 impl ToValue for Duration {
     fn to_value(&self) -> Value {
         self.as_secs_f64().into()
@@ -45,6 +53,12 @@ impl ToValue for BatchId {
     }
 }
 
+impl ToValue for TransactionId {
+    fn to_value(&self) -> Value {
+        self.to_hex().into()
+    }
+}
+
 impl ToValue for usize {
     fn to_value(&self) -> Value {
         i64::try_from(*self).unwrap_or(i64::MAX).into()
diff --git a/docs/external/src/rpc.md b/docs/external/src/rpc.md
index 258d77b36..606f5cf44 100644
--- a/docs/external/src/rpc.md
+++ b/docs/external/src/rpc.md
@@ -24,6 +24,7 @@ The gRPC service definition can be found in the Miden node's `proto` [directory]
 - [SyncNotes](#syncnotes)
 - [SyncState](#syncstate)
 - [SyncStorageMaps](#syncstoragemaps)
+- [SyncTransactions](#synctransactions)
 - [Status](#status)
 
 <!--toc:end-->
@@ -68,17 +69,16 @@ This endpoint accepts a proven transaction and attempts to add it to the mempool
 
 When transaction submission fails, detailed error information is provided through gRPC status details. The following error codes may be returned:
 
-| Error Code                             | Value | gRPC Status        | Description                                                   |
-| -------------------------------------- | ----- | ------------------ | ------------------------------------------------------------- |
-| `UNSPECIFIED_ERROR`                    | 0     | `INTERNAL`         | Default/unspecified error                                     |
-| `INTERNAL_ERROR`                       | 1     | `INTERNAL`         | Internal server error occurred                                |
-| `DESERIALIZATION_FAILED`               | 2     | `INVALID_ARGUMENT` | Transaction could not be deserialized                         |
-| `INVALID_TRANSACTION_PROOF`            | 3     | `INVALID_ARGUMENT` | Transaction execution proof is invalid                        |
-| `INCORRECT_ACCOUNT_INITIAL_COMMITMENT` | 4     | `INVALID_ARGUMENT` | Account's initial state doesn't match current state           |
-| `INPUT_NOTES_ALREADY_CONSUMED`         | 5     | `INVALID_ARGUMENT` | Input notes have already been consumed by another transaction |
-| `UNAUTHENTICATED_NOTES_NOT_FOUND`      | 6     | `INVALID_ARGUMENT` | Required unauthenticated notes were not found                 |
-| `OUTPUT_NOTES_ALREADY_EXIST`           | 7     | `INVALID_ARGUMENT` | Output note IDs are already in use                            |
-| `TRANSACTION_EXPIRED`                  | 8     | `INVALID_ARGUMENT` | Transaction has exceeded its expiration block height          |
+| Error Code                                    | Value | gRPC Status        | Description                                                   |
+|-----------------------------------------------|-------|--------------------|---------------------------------------------------------------|
+| `INTERNAL_ERROR`                              | 0     | `INTERNAL`         | Internal server error occurred                                |
+| `DESERIALIZATION_FAILED`                      | 1     | `INVALID_ARGUMENT` | Transaction could not be deserialized                         |
+| `INVALID_TRANSACTION_PROOF`                   | 2     | `INVALID_ARGUMENT` | Transaction execution proof is invalid                        |
+| `INCORRECT_ACCOUNT_INITIAL_COMMITMENT`        | 3     | `INVALID_ARGUMENT` | Account's initial state doesn't match current state           |
+| `INPUT_NOTES_ALREADY_CONSUMED`                | 4     | `INVALID_ARGUMENT` | Input notes have already been consumed by another transaction |
+| `UNAUTHENTICATED_NOTES_NOT_FOUND`             | 5     | `INVALID_ARGUMENT` | Required unauthenticated notes were not found                 |
+| `OUTPUT_NOTES_ALREADY_EXIST`                  | 6     | `INVALID_ARGUMENT` | Output note IDs are already in use                            |
+| `TRANSACTION_EXPIRED`                         | 7     | `INVALID_ARGUMENT` | Transaction has exceeded its expiration block height          |
 
 ### SyncNullifiers
 
@@ -98,7 +98,7 @@ For any `[block_from..block_to]` range, the latest known set of assets is return
 
 Iteratively sync data for a given set of note tags.
 
-Client specify the note tags of interest and the block height from which to search. The response returns the next block containing note matching the provided tags.
+Client specifies the `note_tags` they are interested in, and the block range from which to search for matching notes. The request will then return the next block containing any note matching the provided tags within the specified range.
 
 The response includes each note's metadata and inclusion proof.
 
@@ -122,6 +122,10 @@ Caller specifies the `account_id` of the public account and the block range (`bl
 
 This endpoint enables clients to maintain an updated view of account storage.
 
+### SyncTransactions
+
+Returns transaction records for specific accounts within a block range.
+
 ### Status
 
 Request the status of the node components. The response contains the current version of the RPC component and the connection status of the other components, including their versions and the number of the most recent block in the chain (chain tip).
diff --git a/docs/internal/src/rpc.md b/docs/internal/src/rpc.md
index e37d04e55..dcc9c379a 100644
--- a/docs/internal/src/rpc.md
+++ b/docs/internal/src/rpc.md
@@ -18,3 +18,35 @@ If there is a mismatch in version, clients will encounter an error while executi
 - gRPC message: Missing required ACCEPT header
 
 The server will reject any version that does not have the same major and minor version to it. This behaviour will change after v1.0.0., at which point only the major version will be taken into account.
+
+## Error Handling
+
+The RPC component uses domain-specific error enums for structured error reporting instead of proto-generated error types. This provides better control over error codes and makes error handling more maintainable.
+
+### Error Architecture
+
+Error handling follows this pattern:
+
+1. **Domain Errors**: Business logic errors are defined in domain-specific enums
+2. **gRPC Conversion**: Domain errors are converted to gRPC `Status` objects with structured details
+3. **Error Details**: Specific error codes are embedded in `Status.details` as single bytes
+
+### SubmitProvenTransaction Errors
+
+Transaction submission errors are:
+
+```rust
+enum SubmitProvenTransactionGrpcError {
+    Internal = 0,
+    DeserializationFailed = 1,
+    InvalidTransactionProof = 2,
+    IncorrectAccountInitialCommitment = 3,
+    InputNotesAlreadyConsumed = 4,
+    UnauthenticatedNotesNotFound = 5,
+    OutputNotesAlreadyExist = 6,
+    TransactionExpired = 7,
+}
+```
+
+Error codes are embedded as single bytes in `Status.details`
+
diff --git a/proto/build.rs b/proto/build.rs
index 80a9e0ace..0b172c706 100644
--- a/proto/build.rs
+++ b/proto/build.rs
@@ -12,7 +12,6 @@ const STORE_BLOCK_PRODUCER_PROTO: &str = "store/block_producer.proto";
 const STORE_SHARED_PROTO: &str = "store/shared.proto";
 const BLOCK_PRODUCER_PROTO: &str = "block_producer.proto";
 const REMOTE_PROVER_PROTO: &str = "remote_prover.proto";
-const ERRORS_PROTO: &str = "types/errors.proto";
 
 const RPC_DESCRIPTOR: &str = "rpc_file_descriptor.bin";
 const STORE_RPC_DESCRIPTOR: &str = "store_rpc_file_descriptor.bin";
@@ -21,7 +20,6 @@ const STORE_BLOCK_PRODUCER_DESCRIPTOR: &str = "store_block_producer_file_descrip
 const STORE_SHARED_DESCRIPTOR: &str = "store_shared_file_descriptor.bin";
 const BLOCK_PRODUCER_DESCRIPTOR: &str = "block_producer_file_descriptor.bin";
 const REMOTE_PROVER_DESCRIPTOR: &str = "remote_prover_file_descriptor.bin";
-const ERRORS_DESCRIPTOR: &str = "errors_file_descriptor.bin";
 
 /// Generates Rust protobuf bindings from .proto files.
 ///
@@ -81,11 +79,5 @@ fn main() -> miette::Result<()> {
         .into_diagnostic()
         .wrap_err("writing block producer file descriptor")?;
 
-    let errors_file_descriptor = protox::compile([ERRORS_PROTO], includes)?;
-    let errors_path = PathBuf::from(&out).join(ERRORS_DESCRIPTOR);
-    fs::write(&errors_path, errors_file_descriptor.encode_to_vec())
-        .into_diagnostic()
-        .wrap_err("writing errors file descriptor")?;
-
     Ok(())
 }
diff --git a/proto/proto/remote_prover.proto b/proto/proto/remote_prover.proto
index 7f8544fc7..49132fd6f 100644
--- a/proto/proto/remote_prover.proto
+++ b/proto/proto/remote_prover.proto
@@ -31,7 +31,7 @@ message ProofRequest {
 
     // Serialized payload requiring proof generation. The encoding format is
     // type-specific:
-    // - TRANSACTION: TransactionWitness encoded.
+    // - TRANSACTION: TransactionInputs encoded.
     // - BATCH: ProposedBatch encoded.
     // - BLOCK: ProposedBlock encoded.
     bytes payload = 2;
diff --git a/proto/proto/rpc.proto b/proto/proto/rpc.proto
index 05fdb7ddf..6669d407a 100644
--- a/proto/proto/rpc.proto
+++ b/proto/proto/rpc.proto
@@ -27,7 +27,7 @@ service Api {
     rpc GetAccountDetails(account.AccountId) returns (account.AccountDetails) {}
 
     // Returns the latest state proof of the specified account.
-    rpc GetAccountProof(rpc_store.AccountProofRequest) returns (rpc_store.AccountProof) {}
+    rpc GetAccountProof(rpc_store.AccountProofRequest) returns (rpc_store.AccountProofResponse) {}
 
     // Returns raw block data for the specified block number.
     rpc GetBlockByNumber(blockchain.BlockNumber) returns (blockchain.MaybeBlock) {}
@@ -95,6 +95,9 @@ service Api {
 
     // Returns storage map updates for specified account and storage slots within a block range.
     rpc SyncStorageMaps(rpc_store.SyncStorageMapsRequest) returns (rpc_store.SyncStorageMapsResponse) {}
+
+    // Returns transactions records for specific accounts within a block range.
+    rpc SyncTransactions(rpc_store.SyncTransactionsRequest) returns (rpc_store.SyncTransactionsResponse) {}
 }
 
 // RPC STATUS
diff --git a/proto/proto/store/rpc.proto b/proto/proto/store/rpc.proto
index f32598829..1bbc37f67 100644
--- a/proto/proto/store/rpc.proto
+++ b/proto/proto/store/rpc.proto
@@ -27,7 +27,7 @@ service Rpc {
     rpc GetAccountDetails(account.AccountId) returns (account.AccountDetails) {}
 
     // Returns the latest state proof of the specified account.
-    rpc GetAccountProof(AccountProofRequest) returns (AccountProof) {}
+    rpc GetAccountProof(AccountProofRequest) returns (AccountProofResponse) {}
 
     // Returns raw block data for the specified block number.
     rpc GetBlockByNumber(blockchain.BlockNumber) returns (blockchain.MaybeBlock) {}
@@ -47,9 +47,9 @@ service Rpc {
     // Note that only 16-bit prefixes are supported at this time.
     rpc SyncNullifiers(SyncNullifiersRequest) returns (SyncNullifiersResponse) {}
 
-    // Returns info which can be used by the client to sync up to the tip of chain for the notes they are interested in.
+    // Returns info which can be used by the requester to sync up to the tip of chain for the notes they are interested in.
     //
-    // Client specifies the `note_tags` they are interested in, and the block height from which to search for new for
+    // requester specifies the `note_tags` they are interested in, and the block height from which to search for new for
     // matching notes for. The request will then return the next block containing any note matching the provided tags.
     //
     // The response includes each note's metadata and inclusion proof.
@@ -58,20 +58,20 @@ service Rpc {
     // tip of the chain.
     rpc SyncNotes(SyncNotesRequest) returns (SyncNotesResponse) {}
 
-    // Returns info which can be used by the client to sync up to the latest state of the chain
-    // for the objects (accounts, notes, nullifiers) the client is interested in.
+    // Returns info which can be used by the requester to sync up to the latest state of the chain
+    // for the objects (accounts, notes, nullifiers) the requester is interested in.
     //
     // This request returns the next block containing requested data. It also returns `chain_tip`
-    // which is the latest block number in the chain. Client is expected to repeat these requests
+    // which is the latest block number in the chain. requester is expected to repeat these requests
     // in a loop until `response.block_header.block_num == response.chain_tip`, at which point
-    // the client is fully synchronized with the chain.
+    // the requester is fully synchronized with the chain.
     //
     // Each request also returns info about new notes, nullifiers etc. created. It also returns
     // Chain MMR delta that can be used to update the state of Chain MMR. This includes both chain
     // MMR peaks and chain MMR nodes.
     //
     // For preserving some degree of privacy, note tags and nullifiers filters contain only high
-    // part of hashes. Thus, returned data contains excessive notes and nullifiers, client can make
+    // part of hashes. Thus, returned data contains excessive notes and nullifiers, requester can make
     // additional filtering of that data on its side.
     rpc SyncState(SyncStateRequest) returns (SyncStateResponse) {}
 
@@ -80,6 +80,9 @@ service Rpc {
 
     // Returns storage map updates for specified account and storage slots within a block range.
     rpc SyncStorageMaps(SyncStorageMapsRequest) returns (SyncStorageMapsResponse) {}
+
+    // Returns transactions records for specific accounts within a block range.
+    rpc SyncTransactions(SyncTransactionsRequest) returns (SyncTransactionsResponse) {}
 }
 
 // STORE STATUS
@@ -100,71 +103,127 @@ message StoreStatus {
 // GET ACCOUNT PROOF
 // ================================================================================================
 
-// Returns the latest state proof of the specified accounts.
+// Returns the latest state proof of the specified account.
 message AccountProofRequest {
     // Request the details for a public account.
-    message AccountDetailsRequest {
+    message AccountDetailRequest {
         // Represents a storage slot index and the associated map keys.
-        message StorageRequest {
-            // Storage slot index ([0..255])
-            uint32 storage_slot_index = 1;
-
-            // A list of map keys (Digests) associated with this storage slot.
-            repeated primitives.Digest map_keys = 2;
+        message StorageMapDetailRequest {
+            // Indirection required for use in `oneof {..}` block.
+            message MapKeys {
+                // A list of map keys associated with this storage slot.
+                repeated primitives.Digest map_keys = 1;
+            }
+            // Storage slot index (`[0..255]`).
+            uint32 slot_index = 1;
+
+            oneof slot_data {
+                // Request to return all storage map data. If the number exceeds a threshold of 1000 entries,
+                // the response will not contain them but must be requested separately.
+                bool all_entries = 2;
+
+                // A list of map keys associated with the given storage slot identified by `slot_index`.
+                MapKeys map_keys = 3;
+            }
         }
 
-        // Account code commitment corresponding to the last-known `AccountCode` for the requested
-        // account. The response will include only code that is known.
+        // Last known code commitment to the requester. The response will include account code
+        // only if its commitment is different from this value.
+        //
+        // If the field is ommiteed, the response will not include the account code.
         optional primitives.Digest code_commitment = 1;
 
-        // List of storage requests for this account.
-        repeated StorageRequest storage_requests = 2;
+        // Last known asset vault commitment to the requester. The response will include asset vault data
+        // only if its commitment is different from this value. If the value is not present in the
+        // request, the response will not contain one either.
+        // If the number of to-be-returned asset entries exceed a threshold, they have to be requested
+        // separately, which is signaled in the response message with dedicated flag.
+        optional primitives.Digest asset_vault_commitment = 2;
+
+        // Additional request per storage map.
+        repeated StorageMapDetailRequest storage_maps = 3;
     }
 
-    // The account ID for this request.
+    // ID of the account for which we want to get data
     account.AccountId account_id = 1;
 
-    // A account detail requests, including map keys + values.
-    optional AccountDetailsRequest account_details = 2;
+    // Block at which we'd like to get this data. Must be close to the chain tip.
+    fixed32 block_num = 2;
+
+    // Request for additional account details; valid only for public accounts.
+    optional AccountDetailRequest details = 3;
 }
 
-// Represents the result of getting account proofs.
-message AccountProof {
-    // State header, available for public accounts only.
-    message AccountDetailsResponse {
-        // Represents a single storage slot with the requested keys and their respective values.
-        message StorageSlotMapProof {
-            // The storage slot index ([0..255]).
-            uint32 storage_slot = 1;
-
-            // Merkle proof of the map value
-            primitives.SmtOpening smt_proof = 2;
-        }
+// Represents the result of getting account proof.
+message AccountProofResponse {
 
-        // Account header, always included.
+    message AccountDetails {
+        // Account header.
         account.AccountHeader header = 1;
 
-        // Account storage header containing slot types and commitments.
-        account.AccountStorageHeader storage_header = 2;
+        // Account storage data
+        AccountStorageDetails storage_details = 2;
 
-        // Account code, if the current account code does not match the request provided commitment digest.
-        optional bytes account_code = 3;
+        // Account code; empty if code commitments matched or none was requested
+        optional bytes code = 3;
 
-        // Storage slots information for this account
-        repeated StorageSlotMapProof storage_maps = 4;
+        // Account asset vault data; empty if vault commitments matched or the requester
+        // omitted it in the request.
+        optional AccountVaultDetails vault_details = 4;
     }
 
-    // Block number at which the state of the accounts is returned.
-    fixed32 block_num = 1;
+    // Account ID, current state commitment, and SMT path
+    account.AccountWitness witness = 1;
+
+    // Additional details for public accounts
+    optional AccountDetails details = 2;
+}
+
+// Account vault details for AccountProofResponse
+message AccountVaultDetails {
+    // A flag that is set to true if the account contains too many assets. This indicates
+    // to the user that `SyncAccountVault` endpoint should be used to retrieve the
+    // account's assets
+    bool too_many_assets = 1;
+
+    // When too_many_assets == false, this will contain the list of assets in the
+    // account's vault
+    repeated primitives.Asset assets = 2;
+}
+
+// Account storage details for AccountProofResponse
+message AccountStorageDetails {
+    message AccountStorageMapDetails {
+        // Wrapper for repeated storage map entries
+        message MapEntries {
+            // Definition of individual storage entries.
+            message StorageMapEntry {
+                primitives.Digest key = 1;
+                primitives.Digest value = 2;
+            }
+
+            repeated StorageMapEntry entries = 1;
+        }
+        // slot index of the storage map
+        uint32 slot_index = 1;
+
+        // A flag that is set to `true` if the number of to-be-returned entries in the
+        // storage map would exceed a threshold. This indicates to the user that `SyncStorageMaps`
+        // endpoint should be used to get all storage map data.
+        bool too_many_entries = 2;
+
+        // By default we provide all storage entries.
+        MapEntries entries = 3;
+    }
 
-    // The account witness for the current state commitment of one account ID.
-    account.AccountWitness witness = 2;
+    // Account storage header (storage slot info for up to 256 slots)
+    account.AccountStorageHeader header = 1;
 
-    // State header for public accounts. Filled only if the flag `AccountDetailsRequest` was
-    // present and the account was a public account/the information was available.
-    optional AccountDetailsResponse details = 3;
+    // Additional data for the requested storage maps
+    repeated AccountStorageMapDetails map_details = 2;
 }
 
+
 // CHECK NULLIFIERS
 // ================================================================================================
 
@@ -219,11 +278,11 @@ message SyncNullifiersResponse {
 
 // State synchronization request.
 //
-// Specifies state updates the client is interested in. The server will return the first block which
+// Specifies state updates the requester is interested in. The server will return the first block which
 // contains a note matching `note_tags` or the chain tip. And the corresponding updates to
 // `account_ids` for that block range.
 message SyncStateRequest {
-    // Last block known by the client. The response will contain data starting from the next block,
+    // Last block known by the requester. The response will contain data starting from the next block,
     // until the first block which contains a note of matching the requested tag, or the chain tip
     // if there are no notes.
     fixed32 block_num = 1;
@@ -235,7 +294,7 @@ message SyncStateRequest {
     // it won't be included in the response.
     repeated account.AccountId account_ids = 2;
 
-    // Specifies the tags which the client is interested in.
+    // Specifies the tags which the requester is interested in.
     repeated fixed32 note_tags = 3;
 }
 
@@ -266,7 +325,7 @@ message SyncStateResponse {
 
 // Account vault synchronization request.
 //
-// Allows clients to sync asset values for specific public accounts within a block range.
+// Allows requesters to sync asset values for specific public accounts within a block range.
 message SyncAccountVaultRequest {
     // Block range from which to start synchronizing.
     //
@@ -306,21 +365,20 @@ message AccountVaultUpdate {
 
 // Note synchronization request.
 //
-// Specifies note tags that client is interested in. The server will return the first block which
+// Specifies note tags that requester is interested in. The server will return the first block which
 // contains a note matching `note_tags` or the chain tip.
 message SyncNotesRequest {
-    // Last block known by the client. The response will contain data starting from the next block,
-    // until the first block which contains a note of matching the requested tag.
-    fixed32 block_num = 1;
+    // Block range from which to start synchronizing.
+    BlockRange block_range = 1;
 
-    // Specifies the tags which the client is interested in.
+    // Specifies the tags which the requester is interested in.
     repeated fixed32 note_tags = 2;
 }
 
 // Represents the result of syncing notes request.
 message SyncNotesResponse {
-    // Number of the latest block in the chain.
-    fixed32 chain_tip = 1;
+    // Pagination information.
+    PaginationInfo pagination_info = 1;
 
     // Block header of the block with the first note matching the specified criteria.
     blockchain.BlockHeader block_header = 2;
@@ -340,7 +398,7 @@ message SyncNotesResponse {
 
 // Storage map synchronization request.
 //
-// Allows clients to sync storage map values for specific public accounts within a block range,
+// Allows requesters to sync storage map values for specific public accounts within a block range,
 // with support for cursor-based pagination to handle large storage maps.
 message SyncStorageMapsRequest {
     // Block range from which to start synchronizing.
@@ -405,11 +463,11 @@ message BlockRange {
 
 // Represents pagination information for chunked responses.
 //
-// Pagination is done using block numbers as the axis, allowing clients to request
+// Pagination is done using block numbers as the axis, allowing requesters to request
 // data in chunks by specifying block ranges and continuing from where the previous
 // response left off.
 //
-// To request the next chunk, the client should use `block_num + 1` from the previous response
+// To request the next chunk, the requester should use `block_num + 1` from the previous response
 // as the `block_from` for the next request.
 message PaginationInfo {
     // Current chain tip
@@ -422,3 +480,35 @@ message PaginationInfo {
     // starting from the next block to this one (ie, request.block_range.block_from = block_num + 1).
     fixed32 block_num = 2;
 }
+
+// SYNC TRANSACTIONS
+// ================================================================================================
+
+// Transactions synchronization request.
+//
+// Allows requesters to sync transactions for specific accounts within a block range.
+message SyncTransactionsRequest {
+    // Block range from which to start synchronizing.
+    BlockRange block_range = 1;
+
+    // Accounts to sync transactions for.
+    repeated account.AccountId account_ids = 2;
+}
+
+// Represents the result of syncing transactions request.
+message SyncTransactionsResponse {
+    // Pagination information.
+    PaginationInfo pagination_info = 1;
+
+    // List of transaction records.
+    repeated TransactionRecord transaction_records = 2;
+}
+
+// Represents a transaction record.
+message TransactionRecord {
+    // Block number in which the transaction was executed.
+    fixed32 block_num = 1;
+
+    // A transaction header.
+    transaction.TransactionHeader transaction_header = 2;
+}
diff --git a/proto/proto/types/account.proto b/proto/proto/types/account.proto
index d02424607..6953c228b 100644
--- a/proto/proto/types/account.proto
+++ b/proto/proto/types/account.proto
@@ -85,5 +85,5 @@ message AccountWitness {
     primitives.Digest commitment = 3;
 
     // The merkle path of the state commitment in the account tree.
-    primitives.MerklePath path = 4;
+    primitives.SparseMerklePath path = 4;
 }
diff --git a/proto/proto/types/errors.proto b/proto/proto/types/errors.proto
deleted file mode 100644
index 2fc105f6c..000000000
--- a/proto/proto/types/errors.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-syntax = "proto3";
-package errors;
-
-enum SubmitProvenTransactionError {
-    SUBMIT_PROVEN_TRANSACTION_ERROR_UNSPECIFIED = 0;
-    INTERNAL_ERROR = 1;
-    DESERIALIZATION_FAILED = 2;
-    INVALID_TRANSACTION_PROOF = 3;
-    INCORRECT_ACCOUNT_INITIAL_COMMITMENT = 4;
-    INPUT_NOTES_ALREADY_CONSUMED = 5;
-    UNAUTHENTICATED_NOTES_NOT_FOUND = 6;
-    OUTPUT_NOTES_ALREADY_EXIST = 7;
-    TRANSACTION_EXPIRED = 8;
-}
diff --git a/proto/proto/types/primitives.proto b/proto/proto/types/primitives.proto
index cace5112b..aed31cec0 100644
--- a/proto/proto/types/primitives.proto
+++ b/proto/proto/types/primitives.proto
@@ -44,7 +44,7 @@ message SmtLeaf {
 // The opening of a leaf in an SMT.
 message SmtOpening {
     // The Merkle path to the leaf.
-    MerklePath path = 1;
+    SparseMerklePath path = 1;
 
     // The leaf itself.
     SmtLeaf leaf = 2;
diff --git a/proto/proto/types/transaction.proto b/proto/proto/types/transaction.proto
index 841815349..1c57ae10b 100644
--- a/proto/proto/types/transaction.proto
+++ b/proto/proto/types/transaction.proto
@@ -1,8 +1,9 @@
 syntax = "proto3";
 package transaction;
 
-import "types/primitives.proto";
 import "types/account.proto";
+import "types/note.proto";
+import "types/primitives.proto";
 
 // TRANSACTION
 // ================================================================================================
@@ -37,3 +38,21 @@ message TransactionSummary {
     // The ID of the account affected by the transaction.
     account.AccountId account_id = 3;
 }
+
+// Represents a transaction header.
+message TransactionHeader {
+    // ID of the account against which the transaction was executed.
+    account.AccountId account_id = 1;
+
+    // State commitment of the account before the transaction was executed.
+    primitives.Digest initial_state_commitment = 2;
+
+    // State commitment of the account after the transaction was executed.
+    primitives.Digest final_state_commitment = 3;
+
+    // Nullifiers of the input notes of the transaction.
+    repeated primitives.Digest input_notes = 4;
+
+    // Output notes of the transaction.
+    repeated note.NoteSyncRecord output_notes = 5;
+}
diff --git a/proto/src/lib.rs b/proto/src/lib.rs
index 575b74688..f7a96cf2f 100644
--- a/proto/src/lib.rs
+++ b/proto/src/lib.rs
@@ -56,10 +56,3 @@ pub fn block_producer_api_descriptor() -> FileDescriptorSet {
     FileDescriptorSet::decode(&bytes[..])
         .expect("bytes should be a valid file descriptor created by build.rs")
 }
-
-/// Returns the Protobuf file descriptor for the errors API.
-pub fn errors_api_descriptor() -> FileDescriptorSet {
-    let bytes = include_bytes!(concat!(env!("OUT_DIR"), "/", "errors_file_descriptor.bin"));
-    FileDescriptorSet::decode(&bytes[..])
-        .expect("bytes should be a valid file descriptor created by build.rs")
-}
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 000000000..6744e56e1
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,5 @@
+[toolchain]
+channel    = "1.90"
+components = ["clippy", "rust-src", "rustfmt"]
+profile    = "minimal"
+targets    = ["wasm32-unknown-unknown"]
diff --git a/scripts/check-msrv.sh b/scripts/check-msrv.sh
new file mode 100755
index 000000000..0bde2955f
--- /dev/null
+++ b/scripts/check-msrv.sh
@@ -0,0 +1,153 @@
+#!/bin/bash
+set -e
+set -o pipefail
+
+# Enhanced MSRV checking script for workspace repository
+# Checks MSRV for each workspace member and provides helpful error messages
+
+# ---- utilities --------------------------------------------------------------
+
+check_command() {
+  if ! command -v "$1" >/dev/null 2>&1; then
+    echo "ERROR: Required command '$1' is not installed or not in PATH"
+    exit 1
+  fi
+}
+
+# Check required commands
+check_command "cargo"
+check_command "jq"
+check_command "rustup"
+check_command "sed"
+check_command "grep"
+check_command "awk"
+
+# Portable in-place sed (GNU/macOS); usage: sed_i 's/foo/bar/' file
+# shellcheck disable=SC2329  # used quoted
+sed_i() {
+  if sed --version >/dev/null 2>&1; then
+    sed -i "$@"
+  else
+    sed -i '' "$@"
+  fi
+}
+
+# ---- repo root --------------------------------------------------------------
+
+# Get the directory where this script is located and change to the parent directory
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd "$DIR/.."
+
+echo "Checking MSRV for workspace members..."
+
+# ---- metadata --------------------------------------------------------------
+
+metadata_json="$(cargo metadata --no-deps --format-version 1)"
+workspace_root="$(printf '%s' "$metadata_json" | jq -r '.workspace_root')"
+
+failed_packages=""
+
+# Iterate actual workspace packages with manifest paths and (maybe) rust_version
+# Fields per line (TSV): id  name  manifest_path  rust_version_or_empty
+while IFS=$'\t' read -r pkg_id package_name manifest_path rust_version; do
+  # Derive package directory (avoid external dirname for portability)
+  package_dir="${manifest_path%/*}"
+  if [[ -z "$package_dir" || "$package_dir" == "$manifest_path" ]]; then
+    package_dir="."
+  fi
+
+  echo "Checking $package_name ($pkg_id) in $package_dir"
+
+  if [[ ! -f "$package_dir/Cargo.toml" ]]; then
+    echo "WARNING: No Cargo.toml found in $package_dir, skipping..."
+    continue
+  fi
+
+  # Prefer cargo metadata's effective rust_version if present
+  current_msrv="$rust_version"
+  if [[ -z "$current_msrv" ]]; then
+    # If the crate inherits: rust-version.workspace = true
+    if grep -Eq '^\s*rust-version\.workspace\s*=\s*true\b' "$package_dir/Cargo.toml"; then
+      # Read from workspace root [workspace.package]
+      current_msrv="$(grep -Eo '^\s*rust-version\s*=\s*"[^"]+"' "$workspace_root/Cargo.toml" | head -n1 | sed -E 's/.*"([^"]+)".*/\1/')"
+      if [[ -n "$current_msrv" ]]; then
+        echo "   Using workspace MSRV: $current_msrv"
+      fi
+    fi
+  fi
+
+  if [[ -z "$current_msrv" ]]; then
+    echo "WARNING: No rust-version found (package or workspace) for $package_name"
+    continue
+  fi
+
+  echo "   Current MSRV: $current_msrv"
+
+  # Try to verify the MSRV
+  if ! cargo msrv verify --manifest-path "$package_dir/Cargo.toml" >/dev/null 2>&1; then
+    echo "ERROR: MSRV check failed for $package_name"
+    failed_packages="$failed_packages $package_name"
+
+    echo "Searching for correct MSRV for $package_name..."
+
+    # Determine the currently-installed stable toolchain version (e.g., "1.81.0")
+    latest_stable="$(rustup run stable rustc --version 2>/dev/null | awk '{print $2}')"
+    if [[ -z "$latest_stable" ]]; then latest_stable="1.81.0"; fi
+
+    # Search for the actual MSRV starting from the current one
+    if actual_msrv=$(cargo msrv find \
+          --manifest-path "$package_dir/Cargo.toml" \
+          --min "$current_msrv" \
+          --max "$latest_stable" \
+          --output-format minimal 2>/dev/null); then
+      echo "   Found actual MSRV: $actual_msrv"
+      echo ""
+      echo "ERROR SUMMARY for $package_name:"
+      echo "   Package:   $package_name"
+      echo "   Directory: $package_dir"
+      echo "   Current (incorrect) MSRV: $current_msrv"
+      echo "   Correct MSRV:             $actual_msrv"
+      echo ""
+      echo "TO FIX:"
+      echo "   Update rust-version in $package_dir/Cargo.toml from \"$current_msrv\" to \"$actual_msrv\""
+      echo ""
+      echo "   Or run this command (portable in-place edit):"
+      echo "     sed_i 's/^\\s*rust-version\\s*=\\s*\"$current_msrv\"/rust-version = \"$actual_msrv\"/' \"$package_dir/Cargo.toml\""
+    else
+      echo "   Could not determine correct MSRV automatically"
+      echo ""
+      echo "ERROR SUMMARY for $package_name:"
+      echo "   Package:   $package_name"
+      echo "   Directory: $package_dir"
+      echo "   Current (incorrect) MSRV: $current_msrv"
+      echo "   Could not automatically determine correct MSRV"
+      echo ""
+      echo "TO FIX:"
+      echo "   Run manually: cargo msrv find --manifest-path \"$package_dir/Cargo.toml\""
+    fi
+    echo "-------------------------------------------------------------------------------"
+  else
+    echo "OK: MSRV check passed for $package_name"
+  fi
+  echo ""
+
+done < <(
+  printf '%s' "$metadata_json" \
+  | jq -r '. as $m
+           | $m.workspace_members[]
+           | . as $id
+           | ($m.packages[] | select(.id == $id)
+              | [ .id, .name, .manifest_path, (.rust_version // "") ] | @tsv)'
+)
+
+if [[ -n "$failed_packages" ]]; then
+  echo "MSRV CHECK FAILED"
+  echo ""
+  echo "The following packages have incorrect MSRV settings:$failed_packages"
+  echo ""
+  echo "Please fix the rust-version fields in the affected Cargo.toml files as shown above."
+  exit 1
+else
+  echo "ALL WORKSPACE MEMBERS PASSED MSRV CHECKS!"
+  exit 0
+fi
\ No newline at end of file

From 5c41a2916ae501d274d55180181696ee37eb1e94 Mon Sep 17 00:00:00 2001
From: juan518munoz <62400508+juan518munoz@users.noreply.github.com>
Date: Tue, 21 Oct 2025 11:00:42 -0300
Subject: [PATCH 54/78] feat: update miden-base version (#1300)

---
 Cargo.lock | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9d7f2215e..305182d24 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2320,7 +2320,7 @@ dependencies = [
 [[package]]
 name = "miden-block-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#f23bf31ffff5973969375cd5c379cb9815aa27ab"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2401,7 +2401,7 @@ dependencies = [
 [[package]]
 name = "miden-lib"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#f23bf31ffff5973969375cd5c379cb9815aa27ab"
 dependencies = [
  "Inflector",
  "fs-err",
@@ -2738,11 +2738,12 @@ dependencies = [
 [[package]]
 name = "miden-objects"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#f23bf31ffff5973969375cd5c379cb9815aa27ab"
 dependencies = [
  "bech32",
  "getrandom 0.3.3",
  "miden-assembly",
+ "miden-assembly-syntax",
  "miden-core",
  "miden-crypto",
  "miden-mast-package",
@@ -2874,7 +2875,7 @@ dependencies = [
 [[package]]
 name = "miden-testing"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#f23bf31ffff5973969375cd5c379cb9815aa27ab"
 dependencies = [
  "anyhow",
  "itertools",
@@ -2893,7 +2894,7 @@ dependencies = [
 [[package]]
 name = "miden-tx"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#f23bf31ffff5973969375cd5c379cb9815aa27ab"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2908,7 +2909,7 @@ dependencies = [
 [[package]]
 name = "miden-tx-batch-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#0e4abf7a3629b9d0494685e58ea287128881d614"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#f23bf31ffff5973969375cd5c379cb9815aa27ab"
 dependencies = [
  "miden-objects",
  "miden-tx",

From 3c4676d9703b21e1f477012fadd5c3cb249b776b Mon Sep 17 00:00:00 2001
From: keinberger <philipp.keinberger@gmail.com>
Date: Wed, 22 Oct 2025 13:13:46 +0300
Subject: [PATCH 55/78] fix(docs): broken links in internal user docs

---
 docs/internal/src/assets/node_architecture.svg     | 4 ++++
 docs/internal/src/assets/operator_architecture.svg | 4 ++++
 docs/internal/src/assets/workspace_tree.svg        | 4 ++++
 docs/internal/src/codebase.md                      | 2 +-
 docs/internal/src/components.md                    | 4 ++--
 docs/internal/src/index.md                         | 2 +-
 docs/internal/src/monitoring.md                    | 2 +-
 7 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 docs/internal/src/assets/node_architecture.svg
 create mode 100644 docs/internal/src/assets/operator_architecture.svg
 create mode 100644 docs/internal/src/assets/workspace_tree.svg

diff --git a/docs/internal/src/assets/node_architecture.svg b/docs/internal/src/assets/node_architecture.svg
new file mode 100644
index 000000000..ba697edf6
--- /dev/null
+++ b/docs/internal/src/assets/node_architecture.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2034.27880859375 1106.9869079589844" width="2034.27880859375" height="1106.9869079589844"><!-- svg-source:excalidraw --><metadata><!-- payload-type:application/vnd.excalidraw+json --><!-- payload-version:2 --><!-- payload-start -->eyJ2ZXJzaW9uIjoiMSIsImVuY29kaW5nIjoiYnN0cmluZyIsImNvbXByZXNzZWQiOnRydWUsImVuY29kZWQiOiJ4nO19WXfiyJb1+/1cdTAwMTVe1Y9foY556Dc8z/P8VS8vwFx1MDAxOGMzmcHG7nX/e58jXHUwMDBmXGIpJCRQkmQvXFy36mZcdTAwMWFcdTAwMTBcdTAwMTFS7HP2mf/nXysrf/XfO9W//mvlr+qwUmrU77ult7/+xt+/Vru9ertcdTAwMDUvMf/vvfagW/Hf+djvd3r/9Z//Wep0vNGnvEq7+fnJaqParLb6PXjv/4e/r6z8j/9feKV+j5/fIOv7tWHlcv9071rrouaN0+O6/1H/Td9cdTAwMGLqViv9UqvWqI5eXHUwMDFhwu8ptcojllx1MDAxM6aY1YLzn1ff4VUpqPC0ZZpcdTAwMTmrLGH259W3+n3/XHUwMDExP6+ZJy3X8ueVx2q99tiHl6z1tIBcdTAwMGZxXHUwMDAxL1x1MDAxM0JGl/5cXMd/rZCf3/T63fZzda3daHdxsf9Bq/jPaKnlUuW51m1cdTAwMGZa9z/v6XdLrV6n1IV7M3rfQ73ROOu/+1eHe1xm9/Kv0HdcXH0vPPT7uE/Bl9ZcdTAwMWVb1V5v7DPtTqlS7+MtomS0XHUwMDBiXFxhZ+fef1T/PVpTt9Ss7uCzalxyXHUwMDFhjZ9f11v3VXxcdTAwMDJ/lcXB2Ne17r++buztvWpcdTAwMTUvQVxyXHUwMDEzVnK4rz+vjI5cdTAwMTY8TFx1MDAxM/71YbvlnzNcdTAwMDNPiWrJ2GhcdTAwMDG9dThbff+yXHUwMDBmpUavOrrbuIiNwLlcdTAwMWJtZtC5L31+XHUwMDA0L8ZcdTAwMTWnTFx1MDAxODl6+o166zm89Ea78jz6XHUwMDE2/7f//tt1lE376GC3d7Y7eLo1xb3zi/c9ubqX/ihr7jFtpbBcdTAwMWHuXHUwMDBmh+M8fpa1klx1MDAxZTH4XHUwMDAyp8QwXHUwMDE1OctGWVx1MDAwZs669lx1MDAwZmz0PHNDPFx1MDAxYvjR8z7PlW671ys8lvqVxz/gVJtt96n+fuajXHUwMDA3yr9+8+/IYVdGwYGnMnKq4UVBZNxZZ9pwIanI+ahzq6Tg+Vx1MDAxY/X1gjxcdTAwMTPi7uqj3W1cdTAwMWPQ2+5up2BthqNOPUlcdTAwMDSVllx1MDAxMus46iCuPa6kskpYw11H3dDoXHUwMDAxXHUwMDE3jHtcdTAwMWGkvVVcdTAwMDZcdTAwMDQ3/IjlXHRPPOG7s59wRqRcdTAwMTJcdTAwMDLOueOEc6ZjTzilijEltcn5jEuhVFx1MDAwMDgznfGBum2R182zrdftTqV0/PJsb2t3qc94XHUwMDAxZLlcdTAwMDesQUlcdTAwMDBcdTAwMWUhSpNcdTAwMTA3oUJ4Qlx1MDAxM2qMMtIlz5nRcIHRj+PIXHUwMDAzRDyqlYZcdTAwMWJJmVxccpT4s34481mHO8xcZlx1MDAwN+7iOOpSxlxuc9DVVILO1lMxl5/ljVx1MDAxNlx1MDAxYTh6/epw9GBcdTAwMDInl9dcdTAwMGXLjV6ldNlsXHUwMDE3Lq/ahf7HqX7+6+d9//7bfdnPXHUwMDBmV9hdbevoqdFcdTAwMTfnW6u73cfuXHUwMDAzK6yOf8v395e63fZb4Lpff4rFp1x1MDAwMUmvXGbNSVx1MDAwN7l3XHUwMDE5wefYTfqEJlXC41x1MDAwNiRcdTAwMTe1VFxuYFZhZNpkZErtacWt1kRcdTAwMTJcdTAwMWZ5XHUwMDBltiWXUIyB4lFcdTAwMTZzwVrJZJBcdTAwMDJcdTAwMDRAR2ks6JRCaahcdTAwMDJPNlx1MDAwZv0yxflcdTAwMWRcdTAwMWRHPIaw/9PjtcBcdTAwMDNst/pn9Vx1MDAwZl8lmrHfbpaa9YZ/XHUwMDFhx65QbNRrLVx1MDAxZqWw2Gr3r+BccujXwfr+eUO/3Vx1MDAxOb1agSuW6q1qdyeNZmt367V6q9Q4dy25NOi3T6u9z0X3u4Nq8GZUt7/PP/WYTMBuspBcdFx0mHHwXG6tXHUwMDEy9aqiXGbVplCMMu5cIo9wnjyGMlnB85Q6wM5/0Es8XHUwMDAzp4sqMLU4MfDoRydtieZxNFx1MDAxZqdVrCyWRFx1MDAwMmlcdTAwMTNoiDtBLmJBLlxymMOKk1xc7SSpLaWaaFx1MDAxYTzWaTHeadfDenv0p5XRkfH/8vPn//7b+e7YY4o/hehcdFx1MDAxZF0vooZcdTAwMWKlXn+t3WzW+7DRY1xcZETe9kvd/io81nqrXHUwMDE2fq3aulx1MDAxZr1cdTAwMTJ4rl+evU+RcvXQ2nqrV2/uqjeMdl/3zyv7RydcdTAwMDHWXHUwMDAwQq0ywFtcdTAwMDMrJ1x1MDAwMF240WBcdTAwMDRcdTAwMTB47pRpXHUwMDExeF+t1IF3Wdg6XHUwMDExRlxiRlx1MDAwNFx1MDAwMzUtoodcdTAwMDdXXFxE+fBYLUVcdTAwMGUorDn4XHUwMDFhXHUwMDAwrlx1MDAxZeLo1Ua5/ZaKZ9TPzl5qW1fdXHUwMDE3XbiSz2+Vl6tXvZ2KZ1xiIcHOjVx1MDAxN1XSXHUwMDE4eD1BVFHuIP1sXHUwMDA02qUwXHUwMDFhXHUwMDE3RidcdTAwMTmoXHUwMDA1UVZKbqMuR19FRFj+t9RcdTAwMTEodpRcIvkyXHUwMDBisIZcdTAwMDHNbCZm0Vx1MDAxYpRcdTAwMDHhK51u+7XaWulcdTAwMGadNIOqsd/+SpoxtvYwp4hfbD5cdTAwMDSjt/5eulx1MDAxMN33gXku1fZ443BrvZrFeGfUU9pcblx1MDAwZarJhVxcZpinwHCINVx1MDAxMahcdTAwMWE5P36QS+koXHUwMDAysYTuOHRP00PXXHUwMDAw+lxic2BcdTAwMTTtLsvCv/1xOoHeIUDg2VROp1x1MDAxZlxylc1cdTAwMTLnj6u2VnzrvOyWrpvDQ3N4/vKQ1lx1MDAxMj842NrfPTvrbeuLer32PJD86kDkZIlzn1fk5Clz7zKNhlx1MDAwNFx1MDAwM8+zQnNt4MGAJpQhnHHGPJqIM8I9yUGRXHUwMDFhpalxxT3EUl3GYe4sPeZcdTAwMThRXHUwMDAyfbZO0Fx0XHUwMDEyb4ljuEpcdTAwMWJcdTAwMWF4XG65WOLZz29EX5ZLvXplpVt9XHUwMDE5VHv9f1qw8PpcdTAwMDPotj7uaVx1MDAxZaqzWb+/XHUwMDBmKp6QkT5Bg4VcdTAwMTXq2G5W3JvJR7UmU/3JqpVcdTAwMDJitTbA/52qVVxu41FhjVZ0qVpzgfl5XHUwMDE2h1x1MDAxYkVggUXi0q0qPmRJMVx1MDAwM4OxqWzx6VTrdUOdic29w4+W7OqD5tXjaaN8O1x1MDAwNyd34nVf+Eapd25qW++6M3xb2zh7fumc5KKyv1x1MDAxY1x1MDAxM8pcdTAwMDYxO73Kdt+9dCrbYJqBgbVQXHUwMDAxf6EshF+rPZWIX1xub8D4rLJcdTAwMDJEOFx1MDAwYiB3aeNORvNFXHUwMDA2NHNhXGI8XHUwMDA36sq24SY22Vx1MDAwNlx1MDAxZVx1MDAxYyOcSp6rkfvtWiNcdTAwMTlOcERp+4rtXHUwMDFkXGZGNFx1MDAxZNtcdTAwMGaLoKgn6MOwoo7dQT7auf5Rurvr7WxVTlx1MDAwN7W702L/YLXddXBxt2fdeFx1MDAxY4lcdTAwMWXjnCpcdTAwMWHIn/jk4pp4VjOGOXHMXHUwMDEwM7qdP8i2wjOGK1xuXHUwMDA0XHLlgFx1MDAxOF1hpKg9XHUwMDA1XFzfgCFmkLBrtlxmlMUh/XJ21zrwdcpcdTAwMDHOzqA1jzWVlVx1MDAwNKhcbv0rnFxcnLDguf4trvX4c4o/hehcdTAwMTFcdTAwMWRdMKKlM/vW4zzoonV43uze7N/r3tCuX7/0d9bNR4xcdTAwMDddoXyWVEhcclx1MDAxYqCCXHUwMDA13vXpP8ctcFx1MDAwMoJfXHUwMDFhIVBcdTAwMTObyFx1MDAxMVx1MDAxOXPrR1x1MDAxNzxcdTAwMTfXunq+XFynR7esUlx1MDAxYlxcXHUwMDEy9fq0unN9V0znWvdcdTAwMWRcdTAwMDNcdTAwMWNzfi3nJpRAxoX2RKKosnCH8EfAXHUwMDE5kHArRyd9yUEmS6ar9Fx1MDAxY8RcdTAwMWFcdTAwMGJcdTAwMDREOyP4YMbHUlx1MDAxMK2U5EBgck74zcHPXHUwMDBlXHUwMDE2dvd9XHUwMDA1QNKvzoV+TOtid64zXHUwMDFmktF6a2xcdTAwMWW/1596u6/2tLt2fX/aOjqM4lx1MDAxNi9cdTAwMTnJijOJ0XskXHUwMDE5idF7qTwmXHUwMDE0cefsj1x1MDAwZctCI/a+jcpivpC9nplMSCWkYNqZXHUwMDAwx3S8212j61ZO51x1MDAxYUhwXHUwMDAwckKkncqWyJVLOM4j/rDR52anXGbx4fjp9fbYa512473mP8hJXHUwMDFhe1dcdTAwMWTcq4ve5VGRyf3nl4Pi4ep5K4r8uMRvZTysb2BcdTAwMWM0gogmflNhQPCAaKAmpsbBSE9IRaT4SvKOyoBAQHehhcBvUNs3MyfBgvkuiKFOc0LFxsxcdTAwMTlcdTAwMTVKwdOmOebAzlx1MDAxY1wi+zvpuvL65fytf77fOdxcdTAwMWFcdTAwMGVcbsMtfVYukVx1MDAxY67Lnnduj99cdTAwMWUvmlx1MDAxZNXZ5Y3VrUvNXHUwMDFm0l03XCJGot5cdTAwMTVGXHLLYl0l4Hxt7eisNdx+6eyc6sfO5eZd4eRcIn38nDGEKVx1MDAwMJlY46pl4tp6XHUwMDE2Y35aXHUwMDBiZ4FcdTAwMDfGXHUwMDA1YzJr0X1cdTAwMThMi59/0vtcdTAwMWZW5lHK4DCkzEpBpXG5/42JredQhFqpxTzd/82WXHUwMDFlKFNsXZ2b7YP76+vtfbW+k92dbvKBi3s1XHUwMDExuERcclmmMJecKcYtKEUlQz43oelcdTAwMDSgXHUwMDEw6dGlITstNspZsIHpQNKdMObwsP2kqTLGjJKL50qvt1x1MDAxZVx1MDAxYXhC5mjKlsHw+SpcZvffXHUwMDEw8qRPUDphXHUwMDAzN25cdTAwMDP52LjJ1Fwi2ZFux5PHQvUlXFxcdTAwMTJPcUPQxKVERJ1TXHUwMDE4XCJcdTAwMGaWdVx1MDAwNVTcSFxySu5cdFxm1FrB4Ep/XG7r/Vx1MDAxZKZvJVx1MDAwM8ilJlxmZKlwKkBcdTAwMTVxYv0wXFyrXHUwMDE0k4xMleUynVx1MDAwMmRbr6dk/fH1eGv3vXk5rNrti+bg1/LFgL2YpzeegVxu5GD0mXCnhVx1MDAxYz5eiOBk0vXiwTfpepE7nltsIDlcdTAwMTdoZVx1MDAxNFx1MDAxYiCeYCBUODVEYXxgVFwitfJcdTAwMWRcdTAwMWHgwY/Vh6OFjd1UjzBrXHUwMDA1XHUwMDAxpadcdTAwMTVcdTAwMTHajj1cdTAwMTJPasrQoDNcbsu3mY3cg5gwQ9z+kr1cbmP7I4RcdTAwMTE0QeHrleSEXHUwMDA3XHUwMDFmz9dcdTAwMGVlmlx1MDAxZGJcdTAwMWRcdTAwMDJcdTAwMTYvK4yQ+50ghFx1MDAxY9+ksMC7rLTUcKXBklFcdLvML2Qypq/81Z9Va5Ns4S9Zx8bEhL+m0K4nwSWItzGEfO5cIvPVXHUwMDEy4DK6jS5h5S9+p3fWqVbqpUZEXHUwMDAwwVpcIi8m6HK3rExBz1x1MDAwYkLBaZdcdTAwMTTsWFx0XHUwMDFh28ApXHUwMDE41+WUKo9cdTAwMWFBgZ+rMZY3lqBq4Fx1MDAxNkmj4bTBvVhcdTAwMDSC/oeZsPfpNbjCRjFRRY2Cz4Z/+Vx1MDAxM2zCXHUwMDEwqcBypJxJOrGa6ZmCTZ1ue1iv3q/4wZxFyHaZQIvDXHUwMDFjPWb9+VD0pjk+vtg5Llx1MDAxZD1V7jf1y0dnIMub6Z1UIJo0XHUwMDA1ocQ1hpEjTipBmKcl6Fx1MDAxOVx1MDAxYdOFhHLlMVRcdTAwMWTM7amSy1x1MDAwNiTJsK66YZ2lXHUwMDAxXHRBmiac+S1KxkeXjYGHLuV0gJ+Or7+V1MFT326/7D/3P7b3RXmjrlx1MDAwYnPIK0287l3fljW/+nj62Hx87N2+2KLV5Vx1MDAxY677x/i53U8lXHUwMDA1M2BaeNxqgsRcdTAwMTBsP1x1MDAxNnbcUZssPDBcdTAwMDVcdFx1MDAwM1hGaFx1MDAwMVx1MDAxYlrWeWZcdTAwMTFcdTAwMWNcdTAwMGbp+Vx1MDAwMHZcdTAwMWFcdTAwMTLAv9xcdTAwMTJcItZrRy1cdTAwMDPLhoJ1kDMlyOx1jlCCr1x1MDAwNNL5ee0mMIJcdFo4Jv/1l/jsksVkss+OjlelhHg+QNlDOCumseekI6OMWeIxg8lm9tNcdTAwMTRyeOLh2p6likgmli0lk1x1MDAwMF7LXHUwMDAwcLib8HhcdTAwMTRzueyA18dcIlx1MDAxYzszXHUwMDExrqcrXHUwMDA3naSeplwi/fm61YT0qFx1MDAxMET4XHLxZGa3WuLHXHUwMDBi4ZM86XLx6JhwuVxiXHUwMDFkyM2plqllhYDTXCI1oVx1MDAxYZtvSlx1MDAxNmjG8Z1xXHUwMDFi/OCUbjWMvjLBpMKYXHUwMDExMTO71ZIl80rQraZcdTAwMDFcZtYwoTnaM46OXHUwMDFjwlx1MDAwM3PHKKGsIdhMUqTZL945XHUwMDBl2+WYsSNcdTAwMTjVmLUzvme4KFx1MDAxN1x1MDAxNlBcdTAwMDP/4M5cdTAwMTP2PCcnW/QsXHUwMDA1XU3h71xmv5agnbrPrfvas3yUR1x1MDAxN53D62OlOut7XHUwMDBlL1RsToVAlyScXHUwMDFmd39YuIlcdTAwMWXTmGlcdTAwMTdcdTAwMTcqXHUwMDA2XGLC4Vx1MDAxZPnqXHUwMDFjXG7KXHUwMDFhz1x1MDAxMKVcdTAwMDRRvut7mVsxQU89ZdBT2mpquCQuPUVJNKdq5J2iWCvH+Fx1MDAxYztcYlx1MDAwZfY/9tlcdTAwMDHdqDZ69avNYnW/vX5K0lx1MDAxYX9qfWetsS8363q7evSmjlYrhYPi+LcsRlx1MDAxMaR7l2mMP1BXoFx1MDAxY6lSlFx1MDAxOatlXHUwMDE4i5IrjFx1MDAwMIO2IMqZx0glXHUwMDAwXHLzNqRcdTAwMTJWgPZbpm1kgd1zXHUwMDE22GklLXNXNCN3jIVcdTAwMWRBfYRcXP9cdTAwMTdYgDllbviPtFTBKv/eXCKYglx1MDAxMzRcXGxcdTAwMDKHe1x1MDAxZvnYhLXbx5vtrep+dWPI1i7oS/O2XFxbz6R1XHUwMDE1XGJtaoQzk1FaQLo0XHUwMDAwZFx1MDAxNq91gS9yLKhlYqzv+lx1MDAwZtKN8L5f/fxZat1E+DczwF+BeCaGOJtcdTAwMGJSXHUwMDFhkLGRXHUwMDE2osKgbJ5nTqOs3fItWl1cdTAwMTdXu4+XXHUwMDFiV5dXldfzrbRa97DxsVs/erzevGj3d043mD5ZPXtKp3WTtXnR2lVxev642322XHUwMDA3O6JHO7t5pEJfPVx1MDAxZu2X1m9cdTAwMWaGXHUwMDFkUahcdTAwMTT35MExpyldz/NlXHTup5KGJYCS15xJXG7iXHUwMDFlLDtcdTAwMTJoXHUwMDEy/dmplFx1MDAxOWBcdFx1MDAwMqtcdTAwMTRjZFx1MDAwN2NcdTAwMWXni1x1MDAxNjv+Y1hCK4OYkFozIOjOUVxylIpYco5WK1CM6SpcdTAwMWLmQ1x1MDAxMsoo1qtcdTAwMGLBXHUwMDBmJujiWH5cdTAwMTDZQj7UYOPu7GHjo655QVx1MDAxZL5LVryi+qCcmlx1MDAxYWDzfY1TheBcYrDo6CHBPWxRxaWMMVx1MDAwMZajh2aHeDs9xFx1MDAxOVx1MDAwMzHrMLP9lcR3XHUwMDE5plx1MDAwNFx1MDAwYshcdTAwMTmnc+xcdTAwMWFYXHUwMDE2J6+NPblz0bw11ePBUat5uMbmYH3/XHUwMDE2frG5vbX3tLM/OD9fXHUwMDFkXlx1MDAxY91cdTAwMWM/XHUwMDE1XG67ezlcXPfooPZ8ctjudDbX7rffTyq11+t+PVx1MDAxN37BXHUwMDE1s1xcWZZcdTAwMTO/cD/tXHUwMDE0/EJcdTAwMTHpXHUwMDE5XHUwMDBl+lx1MDAwN+SPRVM1JIFcZveMYFqgZlx1MDAwYlx1MDAwZTlcdTAwMTilpmGSozRWcoPVO8tGTJlkTydcdTAwMDO9MCDMQZDEOCFsbKKKP9Mu6G3PqVx1MDAwYoKkUsyWmOar5JXyoN64XHUwMDBmMoLfxy0mKPNov0Tn+vMhXHUwMDE2yTI4KVx1MDAwZS2o9Fx1MDAxNFHKXHUwMDFhd4W05Fg7XCK4wVxu+GBcdTAwMTbMyLPIsPdLXGaz4Mqzflo7U1SZQMrz0tPgxPhL2lxmtfhcdTAwMTZMVGmmlHampJr4IXCKYT3flN7H6WhH7UVV2PXg/aW/9rRZWj9cdTAwMWVcdTAwMGXfVzNWlCzG6Fx1MDAwNFx1MDAxN1x1MDAwNvCnXHUwMDEwOf6jK0U2l1ucOdkpujJW3GAt2JqSXHUwMDEyqlx1MDAxNbGUXHUwMDA1guTfYebIOUtcdTAwMTVcdE5cdTAwMTaOY2vgXHUwMDA0TVx1MDAxNlxuVJlgYMJEQ8HUk5FVzK9nlPuUpqBLQlx1MDAxOTCrXGb69IxcdTAwMTCWh7wxwjKct6GJUERcdTAwMDBcdTAwMWaKSFahPOHPYYOjbrSxrpjN/JtN/2FcdTAwMDK1m540aVx1MDAwMmY1iEBX80pcdTAwMTYrN6mxyp9cdTAwMWTyK1x1MDAxMvdm88j0YFx1MDAxNZX+P63y+MP6fZRpXHUwMDAyTYnMbHCvP1x1MDAxZsqUbF4mUSaplMdGflx1MDAxOFx1MDAxNjKDpMBcYlxyt/BcbsGkzihjgjfo7zR+d09cdTAwMTlFPWpcdNFcdTAwMWH+XHUwMDAzxEzQZWZ/Msx7s/MmkMVcbrOtXFy0ScdcdTAwMTbiXHUwMDAyWFxy09O2rp2ON1x1MDAxZDSKx7Xb3fPC7eb1+8nTQVx1MDAwMbRt/0/kTYVYKOBPXHUwMDE0XHUwMDA082BPqZlLgXhUXHUwMDFiI5VcdTAwMDFcdTAwMWJcdOs6XHUwMDAzLcd+qFx1MDAwYndQl1RcdTAwMDQq2XM9RqAox+JYXHUwMDA1VrvEXHUwMDAxV9yVSydcYv+MXGL/TiblPrepmJT2XGYjmJjE4G6rXHUwMDEwk5JSg6xXaKZcbqNcdTAwMWNMSlx1MDAxMmBaXG6MXCI8/pa5QuJLXCI1QcL201x1MDAxMykwg5RkTt9TPI+SnCGMXHUwMDE2kEZ9zoxaIFx1MDAxYTWBujhKXCJd68+HRq1cdTAwMWW9r1Xl6fXZ+lx1MDAxZaB0+L5uXHUwMDBmSjx9SEsrXHUwMDBme1x1MDAwZTFtpLXhkJbUXHUwMDFhzGpcdTAwMDXS38ZcdTAwMTREYpFcdTAwMDSjwk8wjWJcdTAwMWH9zVxm/c2RYvGlb3llXHUwMDFj3YP06MboM87Xsc7IXHUwMDE2tVx0VEn7M1x1MDAxONhcdTAwMWOp0snFdvFjtzhcdTAwMTSvT1x1MDAxZi12frv9RIZHvztcdTAwMTPlVzX72+ypXHUwMDEz8np8IXeKO7un1cstcqZzmqStOPIwldMkbfdTSUFcdTAwMDRcdTAwMTQl/iRsqimRkptQXHUwMDExpKLAXHUwMDEzOFx1MDAwN8gzlPqOXCJI6Vx1MDAxMVx1MDAwM3xSYj2u26OyXGZAxVxuiddcZsFvwlxmXHUwMDA2v51FUuhcdTAwMTCNXHUwMDEzXHUwMDEy2LLDWJ17XHUwMDFibsXggc9cdTAwMTaAwtdcdTAwMTcpXHUwMDAwNUH1Rlx1MDAwMlDu9edcdTAwMTSASlx1MDAxNJXJXHUwMDAxKONcdIaDlf2uXGLh4dpcdTAwMWNcdTAwMTBNXHUwMDAw78AptbSuxHbuXHUwMDAxcfiu8lxutt5cdTAwMWZxe89QTiynmFx1MDAxOcODV1lSfVx1MDAxN87f3DjPNGJbg6gmVLuzX0j8JCBswm9cdTAwMTmdI0Xo3Z+0brc3NrXobl9stY9fXHUwMDFl3+GWpVaNi+NNiYdcdTAwMDL+XHUwMDE0XCIoXHUwMDE4XS+yxdy8KVx1MDAxOdxcdTAwMThEWCZcdTAwMThY8JJwZlx1MDAwNdGBd307U5iSX4Vi8CN15Pilcq0ky82VlfE6TGUlcFZcdTAwMWPaYpjmNFx1MDAxYSFcdTAwMTPYj0nqr4R6XHUwMDAy5Fwiioq5uVjchzlcdTAwMDWzXHUwMDEy2ENSXHUwMDAyq5doisnArK6v1GHpXHTCXHUwMDE0XHUwMDBlWmMqmFlcdTAwMWNcdTAwMThwgm1cdTAwMGaY1Vx1MDAxYZ6eXHIo/mXbqa+VTVx1MDAxNLzDTFx1MDAwNFx1MDAwYngwc5ZcdTAwMTmw+OxhwpDFL+Cctc9Yz4pPUlx1MDAxNoFcXE0gNO5QVXj5+XCrZHMxiVtpXHUwMDAx9o4yijKGJbxhbqW0xzF2KaWWNJCROlx1MDAxYZxoPb+lXHUwMDE4yDauXHUwMDE5NY5IlcB+dGBTwVx1MDAxYpTgwcT1JcRdXHUwMDEwf09cdTAwMGZxUNF4Z6O2XHUwMDEyLkUkRKR9N4s0cywk0ofXj297pXelzsRdYa9/yZh4zN5jaVx1MDAwMZpYxFx1MDAxZflcdTAwMWM+XoiAZVx1MDAxZVx1MDAxNCw13SGeNvBcZog0XHUwMDEyo5rGkVxylKrTKfVcYlxcRGvCkFx1MDAxOFx1MDAxOWHM2D30jFx1MDAxNZRiXHUwMDFjRlx1MDAxYTDrVLSh7a9q5lrARrJcdTAwMWNLb4BcdTAwMDZcdTAwMWJgmERGdzg261x1MDAwMZ5lqi3jrVNcdTAwMTKjgcBcdTAwMTdxVN5Y01x0uCGSjtrIarFcdTAwMDCdXX9Z01x0tyhIwUCNwlxcMIpcdTAwMDRcdTAwMDXUXHUwMDExIaFEVEWFXHUwMDA3v5aCXHUwMDEzt7bCwtiFm/L7h2mnj/TaiVxuPMmYM+VioLHlLZoojvXxOVx1MDAxM9DZXHUwMDFin1Z8Wbs4XHUwMDA0dFx1MDAwMutcdTAwMGJcdTAwMTNQ9/LzIaDJlbNJXHUwMDA0lDNcdTAwMTC5ilx1MDAxOa2pXHUwMDA1uUjDOZDKSJx9amlcXDW7JFx1MDAxZahcdTAwMTDKXHUwMDE5ldjMh4/M0lx1MDAxMahcdTAwMDV+XHUwMDA39f1cdTAwMWGMXHUwMDFiZuY+lO/PXHUwMDAyuV3LkFx1MDAxMqko5Sqml4WJn6bJXHUwMDE4zoqdazL5Pjk9lefv21x1MDAxZqWnzcOL5tvwovdQyO7G+/3jXHTG3i2Fp7myRP+EsSd9vFx1MDAxMFx1MDAwYplfcb0o+CZej1x1MDAxOc9cdTAwMWEmceKmYHg9lvaCv44jp3ZT+l38hZLUUKqwY4NcZpjVKyOXoMLeZnC7hCVUqGD3tlx1MDAwNFx1MDAwZSlcdFx1MDAwNymIQ1xcgMPwMe8tUkgrXHRVXHUwMDFh3lwipNKRu5KRNL9sssPK7i19eSrbfdtrKn17vurcMShcdTAwMDeGjYUs/Fx1MDAwZj2A2jH9Oc3+/N5swO+IMNQy0FxiXHUwMDA0zt+4ZYCjpTG9XHUwMDBiwKixU9Hvp8k5XGZAXHUwMDE4w3NcIlx1MDAwMtNcZkBIhuOky4/E4d/JXHUwMDFi4yk2NttSZt5pgqSY56hcdTAwMDe33klh7zCKjXpwXHUwMDE4/Fd5yEj1+NxcYiDnoYBkQKLAao1QI/Q1UFx1MDAxOahcdTAwMGZZ2juZqdB6eirEuDWaWWd+OI81d3BkPDZcdTAwMDPKe9DD7Fx1MDAwZfdmtdlpt1x1MDAxYivVV//rXHUwMDE2wOKZYGaELZ64XHLkY/M8KLZXb2zfXHUwMDE0xH67VHrvPlx1MDAxNldbNpXNU1x1MDAxMNpi4jpgWlxuiikwoSwlo5RcdTAwMDfmKsNcXG2weUa4/enszC2wXGYrqGLaXHUwMDFheNYuq8dcdTAwMDOSYKxcdTAwMTDcwonQNJD1vIS6XHUwMDBi6lx1MDAxYrMnNVhO0aPpLFx1MDAxMFx1MDAwM1JcdTAwMTMrXHUwMDAzXGJRVFk1XeNnt56eZFxyPTytkYuPzunu02nr7eVW3eyy4nGGfD9cdTAwMDNbXHUwMDE1PJBcdTAwMWb3u6yheCz4r0ZQXHUwMDEwoYy/wFpcdTAwMTCtw/Nm92b/XveGdv36pb+zXHUwMDFl8JytXHUwMDA0PeqYq0gwvEY4pjZETVx1MDAwNe5cdTAwMDHV/8zZSCby009enymhwH2QUtCbXHUwMDAyXHUwMDE4XHUwMDBiXHUwMDFlZ9pcYssk+lxuwrmaXG7oIahHXHUwMDAy3IW7p91cYlx1MDAwZjuRWfpVIbTkN5mF3mZ6fmONXHUwMDAxmFx07WpIXHUwMDE2n1BArSVA0YPjQPPJ12RYsDRVTtU3wVx1MDAxOfSq3ZXqsFpcdTAwMTnAhVf6w0WgOFx1MDAxM1hFmOLEbyFcdTAwMWaSY9vPp2+n7HA4uDvaur3cOKm/bFbTkVx1MDAxY1BcdTAwMTHYZlx1MDAxNHVcdTAwMWLhQHNCRbCWKo9p4idcdTAwMDRcdTAwMDFfXHUwMDFknZ8gx7HCWm2MXHUwMDAxI8ZKh/lcdTAwMDLiXHUwMDEzpCeYR9QwkO6SL/uUJsN9a2aOg0FKJaXgLjHAZXxtXHUwMDA3qDfLcVbm/DjOXHUwMDBiOd5cdTAwMTNFQldPau3u7qGp1Ml750/kOIV4MPifj8AgT5JcdTAwMTNmXHUwMDBludJcdTAwMWatmcRG8oJcbi1cdTAwMDNJ/SuB1lx1MDAxZUxKzS2hSuC5U9GTOTeu4z5QabiOsdL7KWIjXFyGsic1IVx1MDAxM7hcdTAwMGXF1F2QmvxrYMmS62RcdTAwMTZ+21x1MDAxOWLXUihOjXW3+ohv0Yx9alxmyTV5Mj+q81nmuSBEZ1x1MDAwMrNwXHUwMDEyXHUwMDFkx1x1MDAwNvKhOclcdTAwMDJrUo1qQXFMXG7iSnJcdTAwMTBTRIXyUj5cclSC4SzmxrZ0oFmrZSe0ZDjvpOUysbM6XHUwMDE5kZgq5M6f1LFzXHUwMDE4ONUgr9VcdTAwMWOHn5jahpLF8vr1zvmA2+7Nx/BtmHpSZ/2jdHfX29mqnFx1MDAwZWp3p8X+wWq7m3LyZeJ1k02V6a+bLFx1MDAxOVx1MDAxMq87idCBKGWcZspcIk2QXHUwMDFh7qeShlxySGM8RanCyUdcdTAwMDQrXHUwMDBmxyWGXCJcIlliKL8xmNVcZsRccohcdTAwMWPlmvXLl/IjWX7spqdcdTAwMDNcXIBcdTAwMGXGyLpLUND4VDacXHUwMDAxyPIuVGXwjdMlQn+zgYteTH1qwIU2XHUwMDBmXHUwMDBlMEHthjnA+LJzmsWyWlx1MDAxNne3zZ1er0yvLt4uaFE/rKbW/IZgw3XK1Ocsllx1MDAxMIyNVVx1MDAxZWb70ljFr1x1MDAxY+Xlcknjk3G7l1x1MDAxZbdovoM0dfdY5/GTljSO8J7nKO6z5/JcdTAwMDPhO4X+xmrj/WntomaGXHUwMDFivbRcbrPcXHUwMDFm3Dduerec765cdTAwMWWsXXZON+/aV/koTMO0XHUwMDE1wZD2TFxu073LXHUwMDE0XG7TMMBcdTAwMTlFy9nCmqxcdTAwMGVZz5bQXHRAY8qDo2CA7IEgx0rMKO6W/Z0m4G4/g77Ep6CCXHUwMDEzXG6CsIuNXHUwMDE1KIFFJXK6sYJcdGdYXHUwMDFhxVx1MDAwM32Np9CY8NxA0620XHUwMDA3/ZV667VcdTAwMDT3/p9Wq91fkFx1MDAxOSbJOiysRqN7WVx0bSVcdTAwMWbVWjpcdTAwMWbcmqP7J73KhX69Kcjn26u79KqVXHUwMDEyzy+RssIxy1x1MDAwNISSX1BjMS3KOctkqVqngPhBlupcdTAwMGUlUFx1MDAxY7vKi4WMzftcdTAwMTZYMGW4nqPxvHU8OCtcbvWx+sL22D15XudXO/VMOjCz/EhAhXs1aXQgx9HEoPtgOYLIQH3TJ1wiMJkyXHUwMDExXHUwMDExTHpcdTAwMDazXHUwMDAwudJKS22WOjA7QFx1MDAwZdNcdTAwMDNEUCz0I85weWBcXHd0XGK8YYIwm2+bw1xclOBXnHmlP/ynXHUwMDA1Kqg3aNZbtbDu+H1qcIK+XHSrwdFuVmI3k49cInzcXb99eC2dlfUr2yfnsvl42krvXTaU4aBzq6lcIpFcdTAwMGWIYNtcdTAwMTCgvpRbq+JsTIGDgeXPNE9Ha9OlXpxcdTAwMDD7o/SwZ1JcdTAwMTIzltBcdTAwMTCAvbbh346qXHUwMDFlmWLETpdcdTAwMDY8nV48aF1ebFfPXHUwMDA2V1x1MDAwN+U1tcPq5nG3maGtXHUwMDExiFx1MDAxNCVh2SaIien1ons1afSi5lx1MDAxZVx1MDAwN8NPgrCVQlx1MDAxMFx1MDAxM1x1MDAwMlxilclcdTAwMDBcdTAwMTHUw8ZhmojvXCKEKECWodVcdFx1MDAwMDnOQFx1MDAxYzFJXHUwMDFlQOIsXHUwMDBiVibeJ0ONXHUwMDExU1x1MDAwMiTPM1x1MDAxY1GLflRyXHUwMDExXHUwMDE04Fx1MDAwND3j7PqbeyS1s/PRIZfH/cvd7YvHzqmtdlonmYw+zGQh8Fx1MDAxZoeuk8RTiihcbvbD0p+aXHUwMDFidk8yYFcyIZVcZiZzXHUwMDA2rL6ozvtx7FhJuFx1MDAwMVx1MDAwMjM/7dbcYaXLgVwi3UtSPy2Wr4q28faS1qN617dlza8+nj42XHUwMDFmXHUwMDFme7cvtmj1Qk6Cdu8yjdZUXHUwMDE2XHUwMDFiP2lBLVx1MDAwZlx1MDAxNlx1MDAxZn1cdTAwMDJNyWSgYSs4wzlcdTAwMTdcXGIzXHUwMDE4u1x1MDAxMFOg/zDYnWaAnWWUoP5zOVuCbZzCRfZEalxuZy33Zlx1MDAxYTl0c1x1MDAxYpSb9f5cImjNXHRcdTAwMWEr0scttPB81GZysfUktcms8qQhXHUwMDE4XHUwMDFlwTBkZESjXHUwMDA1I1x1MDAxMSeqXG5DYiY/L1x1MDAxNedcdTAwMTRcYr7I4i1lQnClnFxittFcdTAwMWWNPzMvsLDX8HkmTW/SfpuUdu8qb+/tq4PiycFDU+7MIVx1MDAxNJl43eTKz8Trzlchu+9eXG6FXGbY9dBcbiWUUeBXQTP0q15CTsAwpogrpdBcdTAwMTPsW7JLpZxcdTAwMWTSl+khja1+XHUwMDE15c5cdTAwMDCIVbG9XHUwMDE3rSVKUEZyde/mopJLlVxufF9/ha78v8Vx6k5QjGHtnLCHfFx1MDAxNPXZ9muhODh4eVZnXHUwMDFiXHUwMDA3Q1HunFx1MDAxNJo0k6KGf6mk2NbBoajBwoV/lYRcdTAwMTeXYc3cUH2VXHUwMDFl1UxJXHUwMDEwnjGotrHOKVx1MDAxMNmg3eU83bdb189cdTAwMDel9WGp/L6nL2yz09zv8bNFSFx1MDAxOeIgjqTNK1xc6txlKn2qMWzCiFGaXGJtTVifgo2bXGY1ITwsWzUgXuNybJf6dFx1MDAwMvKus/iWJOGWulx1MDAwYlx1MDAwYikxsVx1MDAxMVOhtVx1MDAwNtKUt2c4+zGO1ahskTTqXHUwMDA0XHJcdTAwMTanUVx1MDAxZHvIR6Ou9Xb6rXq7rkivsflinkmr1nUgPFajXCLMOeCYY2ldWKMqQpjfQ0nGT4hbatTsuL5Jj2tlLHyjcFx1MDAwZoMjNDZcIkqJVJzMNVNo93qobzd7pz1e/7hUw429yvYh/22qz72aNKpPc09KTVxm9jjWNqi5vkKielx1MDAwMia4XHUwMDA3XHUwMDE0XHUwMDE1PshcZmGaXHUwMDBiZ1PVJUSSIXKbwZTUfmayc1RcdTAwMDelTMdBXHUwMDA0aFx0k2pcdTAwMTE1n+d5i6DrJuiWsK5cdTAwMWJbdT7arVFcdTAwMWXI1uC4Vlh7oCcv18dmq3Kosmk3opVcdTAwMTaaO1x1MDAxY7uKSO7B81eaxzt2PY5eXG5DXfx1qecmgLiUXHUwMDAxxIQzXHUwMDEyk++H0ex4+ipwXmpgXHUwMDE25S/Xc1x1MDAxZmc3/dezvVe7dta7uTgpq+7N5f1v03Pu1aQy8YynNONWXHUwMDE4g5HMQPORrzCmmYBcdTAwMGXBPcYpZsVSjVxyQpdqLjNCyulcdTAwMTFCgdJcdTAwMTmKSstcdTAwMDVcdTAwMTFcdTAwMTbfI5NcdTAwMGIpKDDIfFtI5WnhXHUwMDFkLpKFN0HnxFl4jj3ko1x1MDAwMzfs0cv63klzs7Tf6Xb37vpcdTAwMDfre6lcdTAwMDZ+SEk8XCJcdTAwMTkgXFxKbHRcdTAwMWJqIcVcdTAwMTn1/J5CXHUwMDE2XHUwMDEwXHUwMDBlUjQ6clx1MDAwZVx1MDAwNLJcdTAwMDdcdTAwMTT3p0FcdTAwMWN1zJybf5104jhfXHUwMDE2+v3vxHYlXHUwMDBitlx1MDAwNSgxRrizYUpS+1slpZ+7mSe2/XiIXHUwMDEygVx1MDAxMNhcdTAwMTTYXvXH4Xa67ftBZU710v12J1x1MDAwZdVjK1x1MDAwZkM4bqn54Ld3X9l4e1x1MDAxZr5+sIvtI37XfHt/rT+nwS/D+XFcdTAwMDJcdTAwMDde+qI2XFzExbnyXGbjWklcdTAwMTDwNpD5+aOfifaAOVkhQZVjXHUwMDBiTIeCXsI3XHUwMDE2vvdcdTAwMTngK1x1MDAxOZb5ups7XHUwMDA2Z/ZFOlx1MDAxY/iet+nyXHUwMDEz8lxmyUfQ+9X8eaFhXHUwMDFiWWNO9Sbn99X+2c3Ny8bOVks/vfWbj1x1MDAwNzpccl6FtZ7ERFx1MDAxNUNcdTAwMDTBZIRcdTAwMTBgteFcdTAwMWVcdTAwMTFcdTAwMTI9ekC3XHUwMDAz87d+9K1iaK9cdTAwMWFcdTAwMWMhapR2Tdha4jVcdTAwMTav1VxmeMXOXCKU8Gi6PO7JxqpbpUBRg0DOu7hMKNDgU03G+cbrYbX/1u4+r5xfRyfQLyB0k5abXHUwMDBmioetnfvto423XHUwMDEzXnm7erXbd+9n8jy154hSQz2plWCfrqNcdTAwMTCSXHUwMDA1155cdTAwMDWyZkA146TFqOrVzIvpM1xiQkJcdTAwMGIw4rj4XHUwMDFjIz66dC6A/o9cdTAwMDf/Z1x1MDAxYTAvkl38mFx1MDAxZcxcdTAwMDBkwi3c7Jj2Qlx0WVx1MDAwN0IpXHUwMDFjZThccpq/XsjqOtI35WG1UD06kf3revG19rCvu2mzXHUwMDBlNre39p529lx1MDAwN+fnq8OLo5vjp0Jhd2/8W6bKXHUwMDBlPDqoPZ9cdTAwMWO2O53Ntfvt95NK7fW6X0933a8/xbdbwrpJI/NydTnvXlxuzUxcdTAwMTlcdTAwMTVcdTAwMWUx1irs9MqYXG7BWWtPY1x1MDAxNVx1MDAxYmNcdTAwMTJcdTAwMDd4O5m0VMpPUbFcdTAwMDJUgCPoOX9X11x1MDAxZlx1MDAwM+Z6XHUwMDA2zYzRTtDAMb3CopUzP2BcdTAwMTbWXHUwMDAwlrXMOVnfwOlVs1x1MDAxNX6X0Vx1MDAxOfnZfbO7XHUwMDEwXHUwMDFlrlx0ujGsrGPWn4+eTlx1MDAxNmrJw9e1h2PXQZVSy4hcZoNaXHUwMDE59H5RTZGPO3S0YMZcdTAwMDOR4MNcdTAwMTmLu12ZXGbYXHUwMDFhmvtcdTAwMWTKMMmJXHUwMDA0e14t/dkuqD+5oZ6lQzrcb2Rezlx1MDAxNEJcdTAwMWXbXHUwMDE5xVx1MDAwMlx1MDAxYuNApOdcdTAwMThcdTAwMDfaPWxcdTAwMGXPqttXRTE8Lt9sV47qp7dP2ZQj/D+Zyk7PtT96PFx1MDAxMvyPRzAwul5ki7nNgNm4O3vY+KhrXlCH75JcdTAwMTWvqD5cYpYsjFxyXHUwMDFkp0ZRgLi1XHUwMDEyXGZnXHUwMDFkmFxy/jMv0khiYO1WYcd0XHUwMDFlPXypXHUwMDFhsyfLzcCaiMeBTkhQSZpcIjtVVEXWJD0hgLpcdTAwMWFcdTAwMGXLwZHlJrKm+TVmd5/kXHUwMDE0xMpcdTAwMTLh4aBOhekuWpHQiD0hjSfAXHUwMDE2XHUwMDEyWCupXcSKSo/iXGZcdTAwMWGgYJ9pootArP4wmfucnl5JrjRYrM5cdTAwMDLkeNlcblx1MDAxZlCCS0Hz9XsoTjC8PFx1MDAxM7fqwSoqOLylPP60flx1MDAxZrmaQGhcIlx1MDAwNZExXHUwMDFiyIddJZt2SexcblST8pjRjFq/bsqGxkuB3vJAgXGOXHUwMDAzarSJOjNBXHUwMDFl/4ze8lvnRJFNPSGlhmvj/CpBXHUwMDAyKn9cdHRcdTAwMTfQXHUwMDFiM5Mrylxmtlx1MDAwMHU0kfSXXHUwMDE431uSXHUwMDFhbiiYx3SOJVx1MDAxYXf7XHUwMDFksdqR7faT2a7cX5dcdTAwMGaOb2+LmflVpu6rv4ZfXHUwMDE1YrGAP1x1MDAxMVx1MDAxNMyDXqWmMlx1MDAwNVx1MDAxY5JrXHUwMDA19lx1MDAxNFx1MDAxMUJYJKxRfiU9PFdcdTAwMDSTXuFw8Z/B0lx1MDAxOflVas5cdTAwMDf8SmDuraCYNMapiNIr7llQc9hcco5cIkGBw/BcdTAwMWL5lfskp+FX2NFFW6mtUMyokIkrXHTcXGKwl7Sxylx1MDAwNtvwjPxWQN41Wsdawy1wRpSW9GqC1G1mcEVjoo00zlx1MDAxOcbxUWAlXGbT0tKcR/xxwpRgM7Grr4kxXHUwMDBiw60m0Fx1MDAxOWeLpsjy82FWu7RQPL9vbFx1MDAxZeyU7sXJeW/4SEw7S3yJYO4kI58zV0PxJVBcdTAwMDcodS3HXHUwMDA2hU6H9DK+9PnbaUHdTlx1MDAwZmpq0XlcdTAwMDBmrDO5g0XB/o1rIzEzh003unM6ynR02/l42i3IQuNwWGW95+bH3odKXHUwMDFiXHUwMDA3MqdcdTAwMTXePn4rs93+XHUwMDAzU7W3u4vt/Z3xb5kqvrTZUyfk9fhC7lx1MDAxNHd2T6uXW+RMr6a7blxuipdjfMl991KoaThcdTAwMDV+Q22BKexcdTAwMDJLh8bxrKj0OFx1MDAwMf6kQVx1MDAwNVx1MDAxM4cv2nJP+LM8NXbstmwh3CB/XGaYO+nBbLRcdTAwMDJcdTAwMDOIOFx1MDAwN9NRZmM7yVhBgNra6UaMJ0aXXHUwMDA0XHUwMDFjjll0dPk7efE1Judjzjp6gmKMXHUwMDA0l5zLz0dHJ1x1MDAwYrTk2Fx1MDAxMpg9nGmmOVx1MDAxOJDChom3VVx1MDAxZXZvN5ZcdTAwMGLCRbQ0QnD53TbYoaKJR6wwXHUwMDA056pcdTAwMWKFXHItlsPqJiD8xY3wLJ5cdTAwMGaD9ivRzr6p8IhjnZ9cdTAwMTJccidGpmPn02nxRvtU3DQvjs+23ktv6mnz8XTQXHUwMDFi/omOXHUwMDBmXHUwMDE3XGb8XHUwMDBmRlx1MDAwMTC6VGR3c1x1MDAxOLmbLLRWgp5cdTAwMDdcdTAwMTTaQuK0XYrFozzwpu9gk5LcYo9cdTAwMWFCudNcdTAwMTkyP8eD+ySlYDSWcHhy2EuWc39wUEhcdTAwMDBcdTAwMWFcdTAwMTCAUimLXkGtXZ5cdTAwMDcgRGC5XHUwMDEw6VdAL7tCTyH0ulx1MDAxOWxcdTAwMTRcdTAwMDI2n5FUOz1cdTAwMGbxgVx1MDAxZMaYwqFQuVx1MDAwN3bUtPInXHUwMDFh2ME3Llx1MDAwMrGZwCbiXHUwMDAzO+NcdTAwMWLIKW0m0aZKXHUwMDBl7CjrXHRCtFx1MDAwNuZieDhkqzj3cNRcdTAwMDX6XHUwMDFktFx1MDAxMa64jvFwnrI0XHUwMDE0xJuydHS6XHUwMDAyXHUwMDA0R2BcdTAwMDFcdTAwMTEzXHUwMDAwfVx1MDAwNWaRXU7TnID13uxcdTAwMDSHgCFcZprJ3Skk2OUgLFx1MDAwNLCXmiHBNpq/PnXm9npDrO6VnteKa5tcdTAwMDdd+UhcdTAwMWVPXHUwMDBm/kSGU4iHg/+yXHUwMDAzXHR5Mp2Z+VxmLJBij1TJXHSIXHUwMDAyyShcdMSmvlxiXHIlXHUwMDFlyFx0XHUwMDAxnFx1MDAwNvZcdTAwMDGszZGqkopkrVx1MDAxZb2vVeXp9dn6nlB6+L5uXHUwMDBmStxNsiiFxehPiiVcdTAwMDOFiKM1/UZS5T68qUiV8KglOGdcbvQuXHL3VFOMe36GsZExXt9lOGd2SdvPwKo48HxcdTAwMTZjM1x1MDAwNpyOkVi5JiBcdTAwMDfIdIVcdTAwMDVJrFxuLixmYlWLXHUwMDE20JlAY+ZcdTAwMTnQab9cdTAwMWWUr3dVcevuuFk7a1fW75ut3Siq41x1MDAwMjqMKE/h2Fs4MCDpw1x1MDAwM1x1MDAxNznFXHUwMDEwOdiLXHUwMDE0az6jyP5t8Zz/Q27gQVx1MDAwNmRjS8vxjLZcdTAwMDBZUjK+4Fx1MDAxZdVcdTAwMWZcdTAwMDd1mHMzXHKmXHUwMDE5KLssJYBcdEe5efI8eN46v14/ON3ePn6929pcdTAwMWM8pu9cdEhBwXjAWVxmnGNcdTAwMTGNTeKkRG4tZtJyI1x1MDAxN+ko/1x1MDAxZlx0Tb5mMftcdTAwMTWRUlpnX3zgTrGtzyizklx1MDAxOPjgXHUwMDFjvZpX6mP1st6o1Nmbbm731OF6/z71kG72UWhU1NUjf9XsoXp3SU+u1m/Hv2Wq2OR24/TkpHN8crz6cjpcdTAwMTT9ZrlweHuf7rpcdTAwMTH2/ksx7b57KUgnaCbpSVxycDOCYsJUyOC3VnhMXHUwMDBiXHUwMDEwiELqQKeRUZcn6WnDuSDYRohcdTAwMDTbRC1jk5PR/JZcdTAwMWXNflx1MDAxN0N4XHUwMDEyzlxihZKxpW8gqjHxjuTax9B3c2NcdTAwMWLLWehmXHUwMDFk2SHwN5xcdTAwMTK6QPVvXHUwMDEz9GOYdSbuXCJcdTAwMWbymdxQPMmdJ/RnXHUwMDA1hmCWcNDW4/NcdTAwMWKlZdTTliuwp0HzXHUwMDA2Tc5vfHOgpqCNucbotjHUXHUwMDAxb4Nmqd9kk1x1MDAxMMqXWdrJiH+f3ZWnsFx1MDAxYr5cci4m6MrT8f58eEhcdTAwMDbs1TnOu3nev3lcdTAwMWWer69f1zpPdVBLW1x1MDAxN7dbtczzY/RUzS9y9eTF4lx1MDAwMH9cbiFcYowuXHUwMDE22V9uPrzk2Vx1MDAxZCvjPjzfMVx1MDAwN1Ymx1xuuEAvkZVcdTAwMWaHXHUwMDE59aTvNrXUgFx1MDAxOFx1MDAwMFx1MDAxNlx1MDAxZTl9qZx4tdWyuLtt7vR6ZXp18XZBi/rBuSriYatCarTvu6CBovuVQI42XHUwMDEzWLMpXHUwMDE5zoyQXHUwMDBlQMzNqec+xyn4lVA4zVx1MDAwZr3v1lx1MDAwMLtcbjSPQYFcIqRUXHUwMDFlXHUwMDE38Fwi+vS4y6nHjCd48jTA5WD5XHQy9yM9y6JcdTAwMDa4rsGqJYdwVbF9Zlxyt0Jxa3ImWTNIv/FI6UqlXHUwMDA00MWL/9P6akm5XGJUa1x1MDAwMrFxXHUwMDA3TVx1MDAxM/eSXHUwMDBm4Uq2J5NcYpfVylx1MDAwM7BcdTAwMGKce2yjdXFcdTAwMTbEXHUwMDAxXHUwMDE2tFJiXHUwMDE54N1BuNBTmJBcdTAwMTZBPcNB18A/wlx1MDAwMumXbPRcdTAwMDVL7DuwXyQz8y1cdTAwMGVcdTAwMTjEXHUwMDA28i62peNnkVGjQIyAVTxHJ8rBzdt1o7axcXve2ehdrN/sbdTeWDanhNbB+Wq/i25RMEwsgEBcdTAwMTlJwNTkcoxvXHUwMDAxeim8aoVmglNMXHUwMDE1m3Q9J6o+L1x1MDAxNcZTnuQte6pZsvE5RqCUIFx1MDAxNmd4oNPFKlx1MDAxYU01o8QjiktrQCgpzqXUv5FBuY9mXG5cdTAwMDZFXHRnSL0plVx1MDAxODqjJFwiUuGocOzDXHUwMDA2P0ZFXHUwMDFinVrpMSsxXHUwMDFkV+JhcrUpXoZFJ0hRmp5BaVwipFHKTaDiXHUwMDFiNMFcdTAwMDNcdTAwMDKSr/KdpoxcdTAwMDJNjLWLmoJBVYfVylx1MDAwMFO1+sNF4ExcdTAwMTO4SZgzOVefXHUwMDBmS0r2jidnmVx1MDAxOeExTKBX1Fx1MDAxMlx1MDAxM8Tk53BcdTAwMDGm4KtcdTAwMTXwaVx0XHUwMDE2XCKlLppkPMqxr1xikHVcdTAwMTOXZ2YtxbRcdTAwMTRmQY8oXHUwMDEzaHG+RLlcdTAwMGLlbGauRDFrXHUwMDEw77TbS01ifVNY58jh9TlmmdHd58KLeC5cdTAwMTbKhWr7qNKs18v1LFlmIFtAzFx1MDAwNYo/fluWmbZcdTAwMDAmXHUwMDAy2pFbdCYwOvZxXHUwMDBm+Fx1MDAxMzBYQzSxQHBcdTAwMTibeL14cPkvXHUwMDEzj1x1MDAxMsPAyGFcZuCJTVro6JKzk6aZqVx1MDAxMabVXHRcdTAwMTD6XHUwMDE05FxuXHUwMDBlKNDEXHUwMDA0ON9cdTAwMTc50khcdTAwMWGAXHUwMDExXG5JOKHafDvtYlx1MDAxY17RXHUwMDA1z4U1uc9oKtYkgDVRjk9cdTAwMTFcZlx1MDAxOCnDXHUwMDEyloKEXHUwMDA1XHUwMDFiXHUwMDE1IKeVoNFEXi08IExcdTAwMTbuzuf0lpHMWbKmr5VNlKc8PWui2MJcdTAwMDH9XHUwMDA2rli9im9Si9mZIFdzXHUwMDFlUsa0XHUwMDE0era2ll/JWIvBmSYwlZhEsvxcdTAwMTnTXd+WNb/6ePrYfHzs3b7YotXlVIzJWO6hXHUwMDFimaDrKNxxWlFcIj1g3IqCpOeuoYPaMLB/SdyoXW1cYvr/rdYoXHUwMDEwzDKIN1x1MDAwMdhcIktcdTAwMTJcdTAwMGVcYlgrtHD2XHUwMDA3MPE1xThVx1xiMV03+elcdTAwMTjR2/mFvji1+9fH18PT5vVqsUjPK9midYxcdTAwMWHGg9j4LYxo7N3YRVBbJVx1MDAwMFx1MDAwM5qCiOVcdTAwMTO9RVx1MDAwNSdcXPK+VkEp4WlBhLXSXHUwMDAwZbaTiZlcdTAwMTLSw1x1MDAxMKON1EwmXezXUTLR2fnokMvj/uXu9sVj59RWO61cdTAwMTO3t1xuVs1cYqaiMDDosL5z5Fx1MDAwYvjhZEGW9lBcdTAwMWaO1jb2bD3YI5A6abFzplx1MDAxMFKFXHUwMDFjelEymjGI2TTHx1x1MDAxNzvHpaOnyv2mfvnoXGZkeTOOaFx1MDAwMs9cdTAwMDTarbmUsDNqXHUwMDFknTzTbFxurlx1MDAwNJZcdTAwMTPGjonExp9ajTUqxV1rojSIaKPQQ1x1MDAwYiw/YZf58dMxTeev/qxamyBlvuUkXHUwMDFikzD+mkK7XHUwMDBlXHUwMDAxNVx1MDAxMV5joPjcReRq8VibdOmRjPs7eVM8xaamX8ZMO0xcdTAwMTBcdTAwMDFjO4yIXHUwMDAzf1x1MDAxNzu9s061Ui81XCKSXHUwMDE51lx1MDAxMXkxgeO4lUhcbpNcdTAwMDUsXHUwMDBliZOoXHUwMDE4/CtBM46Hylx1MDAxNaPYXG5cdTAwMGZsWIWnP5qJXGJcdTAwMWbH7nJcdTAwMWNtPuOeRrc0WCbwXHUwMDFhmcHNq+FcdTAwMDBcblx1MDAxZS1cdTAwMWPE+1x1MDAxY2+vWIYjXHUwMDEyzHSDxydcdTAwMDXKZyspXHUwMDFllEEhLojBMsFQiFx1MDAwNMaja8/HYPk4q2y3X3dZca9zLtbt25VYf0g1U0NcdTAwMTHrgUaUfuU52KehxEOqNYDZXHUwMDEwzVx1MDAxOXGlXHUwMDE1a5CSlFrsf66VdNosy1lXsTBW6WFcZs9GS2x77oAxj5+rXGZoXHUwMDAz5mNFvrPpsHJcdTAwMDauamdcbtec9dvdqlx1MDAxM8OLMt4qtMKc5sCuXW/fko1cdTAwMTfKhsPbu/tr0tpsfKRBKtiYnlx1MDAwNIBir1x1MDAwZVx1MDAwMKpcblx1MDAxNfRcdTAwMThhPU5cco66XHUwMDAy8lx1MDAxOUWq0Z5k2nJcdTAwMDNv0ZpcdTAwMGJHftpcdTAwMTKpsUjV6ZFKKTZbXHUwMDAx3udyJIBWjYMqqFuGg2BzXHUwMDBlrH6O/abBs5q5N9lcdTAwMWYwiu5cdTAwMTfNn7t837s7rnWvblx1MDAwN1x1MDAxZGWqQ3vFyEk/XHJauaBY5O3HyoxcdTAwMTI81HnHSO2BXGLVXFwzJ1pB7WKfaWVcYjxFdy7EXHUwMDEyrbFoNenRKsDIo4Q53fk6mks20qtcdTAwMWEnXFyR3PXq7NPYwUrsL7ZeXHKtMFx1MDAxZqTuPJVKZ63y+/rNxs7rzunRll5vpi/8LjCmPSzq9qOkmElcdTAwMThWr/C60cZq6rZql6XfOeDWZtKyTCrscORcdTAwMDAuXHL21FxiIVx1MDAxNz6F2YjTlcwmXHUwMDAwl1I4XCJZXGbbhLPcfNpYt3eX4vistHdkuH69Jzp95XeBoe6x2JqEcWCL0bMsiWeN5SzGqFvWfs94jovpz7G06Ei27qxlxWOzljU8PMmlmGPUqa4/upXV6nWxe18u1T+OzjdvOvUseTi5YsS9mlx1MDAxNMxcZkS99ODYK/RqOOFhXHT2TjNcdTAwMWNcdTAwMWWLs8uH8Pv3mMXohvjHgGI1g3C3QIsxiOLMTtMsvnJSgIqmiuSdZ4HOas5mclt2q812v7poJdTJiiZM3Fx1MDAxMvaQUz3P887t8dvjRbOjOru8sbp1qflDXHUwMDE01K5cdTAwMDJqwzxuKZXuMaJM4jeDXU5ccubERUFt0M+pOcHAXHUwMDA1g9PnKunBYVx1MDAwZlxue8ZqgdMtzTL7XCJcdTAwMTnxa1x1MDAxOaJcdTAwMTQ4XHUwMDFjRzHpXHUwMDA0vDGxw1x1MDAxOSg8bspMcDz4r9eDb5dPr1ulV1O/I8WSoFvPN0+N7NlcdTAwMTe/v3hnPPtcInK6J328XHUwMDEwi5lJ14vcofw6JqqDe3XRuzwqMrn//HJQPFxcPW+5XHUwMDEzXHUwMDFkXHUwMDE4VuZcdTAwMTOt/YaJctRcInUlY5ZcdTAwMDNH/oZ1PcKgO0eP3Vx1MDAwNI9IMFSIIFx1MDAwNshcdTAwMWPcXHUwMDBlXHUwMDFluVx0vyrnXHUwMDAxOIwm1HBOXHUwMDA1lVpoSyNcdTAwMWJknvCxg0Fuf3Zpmlxy01BcdTAwMDLE2H4xO42BgWzVZ2vapFx1MDAxNI85JT9ET1EwSFx1MDAxZf7O8GtJXHUwMDA01ClcdTAwMDZSXHUwMDEwUCG4R6iKU1VcdTAwMDJr/Kmlwko4lcJRU6GN5+Key/LyXHT6aD1cdTAwMGJcdTAwMDM1XHUwMDAwmpj6iID7J+LDXHUwMDA3i1tJlatX8FthzFReXvmWrv+04lx1MDAxZITzrpBKZnth9lx1MDAxOb+FzOTzX1/K569Sp3PmX+tb4v71Wq++rcZ7Jv71JVx1MDAwZVx1MDAxMFxiVb/o5t//+vf/XHUwMDAyk+RsRyJ9<!-- payload-end --></metadata><defs><style class="style-fonts">
+      @font-face { font-family: Excalifont; src: url(data:font/woff2;base64,d09GMgABAAAAABpEAA4AAAAAMHQAABnuAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGiIbjC4cgg4GYACBBBEICsgAtR4LWAABNgIkA4EsBCAFgxgHIBvFJaOiktab7K8OeCJiD31GhKqqtV5HgDN0840OGwin4ZyIeCX/Dt/c64gjljjy2jSRGqLTmmXoKnGbMmxTJ66uTaW7poDOKk5CD3qf8fARPP/8fb919rsfh8n/py88VSD5OGuBZInElmVR2rvSWUmpJu2ZESwc2JK9B2TvgQ8pMx1EGF4QPa1TX6oR2OtFke2l+uUDQEnz0P8A/v3v1dlnv+uS9jP3B1gSB6696ppWbkftjMYU2I0MgU0+JFkg+LJ9tbajvjRXmohWZlaQRCiFlF78/19LbX6AFKAENDrCR6gYM3mLd2Z/gP9OSO5MgEEYFjInNmp3wlBQiDauwlfZ+p6o2rgoWb2y3lUo0XWpyfQEd9t0+RYZQpSSsZwOQvtqDwABgAqgCkO0MQqnAlELBFl3J9MwQw+OUrKA12VPa/0u7ra1oi7uydPeKKDQGkNaPF63NgJiKICcgAepABgAbZxwK3L886M/rQ+fCDb69sQ/3gqLYaXZ33LHLUUbSU63rPQe/hNSe1zL7LJBExUGDByB3CPWsrP5icFq/v+pAf/onFvjNu+hteY7BInvuwZpjCQuZx0X/Baz0wNGmJ8fdwrXQuGIyDYc5vrRL87SPfGDFF8UOOK4xzFB2LioBDqMQZSdd+9DjEVOhScQjEQgMDU2wiqJgQiKE6ID0yIEMKEh+NA/hRMKJCEwuOpKxsVCwYMkKhrA+SE5z/QDOcidVgtEJIyYyimRl7w4vf46Bi4mgKWT2DhAKVUMDRVjBxL2P5nC89hPd2s7SAHaQA4cGjkrhiIoMHANMk3FfDm+ySXmFFKYXChRZFIn1ZoaDJ/uqzyA/9pa3gjobeBQKdXZcxHIYaBCNc29Bnmj+gtwqWLwKVUhvQxZDc4lDaWGuEQiIAWvQZUh56BRnF2XjFotTtMLy8AADvNnDc+IjG6uqQoF/mTAdbpkVR+sV2YkDwDJtG7ohM5HRgbjrvZjVyoYItHTdf4DbGdYnSsAVgIAAPQRJleSXokrhdteIhXVfOqCmQPR4apBQunYpHLLlqdGT/+N0kgtK8sI86j7cfbfbrruqrOOOOyQA3bYHgQ5xKMKQJBgOT7RNZQe2gk59DRxQNrCRBUMAgZbdsOV+8PDCYa8QxS0mYXlWfmcpOJIaVN6WlaxnqsSGGPo6kVmjs3LJ0WZYhP5BTLCpkZzYbIrrTBRJybzl7xi9Q5cZUID9DeK2M7skJKgaZkmlHpDjh2u00l4UHLxIS3LrlARLo7ePPAZJnSBK8Fb9W4KYVVsVLUeD7dov7Rvk8uwdyi9BQQs0RedYef/YVvH7zP9VBtR5ga3KeOzRDJLrmBVKrcqXk5X9VqP9vgF+QjX+Vl/ebjz8gh4K14ku4D499M0LdMC/VAdnlj/dGVflnliXXe+Mz3gLn2PcoMYMn2SZKMPMuVgRYJgjeQtPFu5BTVISRz0yKyRIHnup3Kz5qRpFzJ9UYJm07IsEou2Y9NsGSVvmqafwUxcQRNnz2zwNq4YTsJ34aNFLaf4bVpAARMsIPtwUfo+3e/Wy7VhOrpHGf4H6fGldCjngpeLn5alT8vcpolCCuFNMeBIU3JDkRvNbT5RvQBgxYvMOTCYIWHJW9bkDaYxSLO7gdrcww3Kk+KIazyrbwdpHWTWRcRc3EgGaRqTyxjDN+vBMp/k1JnVOkbyQhYxCBMeGS+M4W1O66rXWiB+quKcMwWu05GNhNUlseAW1zq1mPQ0/xmSmLKEIpS14nm5zIHBoYU4Mx7dyRDQceX2LjJNB1ZuJtzg0A5Dyo3Wf8sBmaY6BCbgOGCslOV9IEune+nIGfma36ZcXC3Kd+vrRv9v/YimElSow1zBICW4MeA+JmN1tlaQX+d+SG++14JP2S7ezSX+lD7iKJkXHtOJzA3QKzFYXRwl2evXr0vhdVcRHQfwjgFvtST6fTqfp/ziOZnwcl31U5LTtDfibw9Kch1xP3wUfqL86ZP5w5fkOsJAh0BSngc6BpNZ3maCM3w3EMaFg5/erThxUurMNlRF8kkFYaFw5CqtuBfM6yGVvm9IXif+pk+uidGEuJmBFakE8AwlF2MisGTQwtx8fYJbMJrv1mpNrjmccrtNOcQ0L+PS+Fi5nGll7smnjiTl9eG093U+DVykl86B6kyIfmk+ryTRcnpMFvFOHAM3G4D3x0QFPUvrpFfTlVFvvFPriqgWPANbHJ0o1kxUr0fU06dEEbVIGcl898kLHNGk3///5M/sRyHd1y2MwYAlXNxNdtGTLibAqKrTERUkvkFb/Jlnuo5klXwG1yNMjBXM4e4KPaocnhu54ddMTdI43m+HziTRcUZ/ntuZ7ure2qGc8rAe8O1s27U/n8Ewlg32D+7L8tIkGfCWopyhIg1e6rEEV9HEyMYYenu8q8JKc43kp2G99erEOi8mm92858ougGeRJlFrMP6+U4y72LsUJUaduoI4NK7CiCJ+qtlFh5NEufmw/pBn25M04GJg0Cb2tlZExY1l6/Y+bz7BHqAE+lptIzOPHQqfIEkLxkDKL4Zn+ZmCbyZ4t4ln4rNagssvXGEmuTC58jK5kCjWSuGZmRnKOULE/AcPUPJMCy6/gI0od6s6Jtnquec9RfLQ72d5ldaa9Va5X+J1Wp1gYi4WrgOurnokLoBHpnHFxFetxzjsU5RBCVIylSBj3RLCRBGmd++IXuLUptF/qZhedLOSJsucBlzbkeD8UjrU4aVlJE8JEBIQdT7emMshoDmS9qj0ffNvbjEvR7uu32jEsoFwaecgg7dAH6ZqXujPUQyDQyjBbiU6rYZNW3wmVTvp9qfKtm3GUIAzZCCSLQUnSOZXk62ZJ0w85CYGH0k8oQWPsmQzfEpMx2gc/tUjPaLS1PC1oEiK6LjTWIw7gkfTZW7wIzuM+zSzz2iaHpxoZH6+mCEZCe5W0tGcnryUI5UwlsPMWB0Oc7st8oT4STPlDmeTfSJJbE+oUhWIWphozYgdPjzLtwVI5gXDVRLacSzcpNNRCLA6VlVLtAMku/i2u3U77KvL2WiX1efayJjk31XdTgd7MnokVlVrwpoRfQmjKIJr31zDyAQdECXaJQUG8FZlLpInaoKcPQmytyiWXf07O+DUUZXo9LFUPEGMC7y4SLnfp/2D7M8zJRNV0RE8QK+693+4MFRXDbpcX0YyOZUNDOCK97YuOQ9Vq2X1SC4BaMAIFmR0OgLN4+g6mimqWU5O2uDX7YJfV4bvk2Z4CWF8fpweL4lYiNGT05tyT0G9t2cXKt7hxWJ0T+/2G5wH9gXsSDByRM3lR6VClv6H5G0fF3mNilcBjXHzHoIb83wP2/SmakkGDtDbvPmhtH5hf9kVBKQSBKQ0zr0aAM5BWyHXdMyzqPqpWmvqJ9UCg31MTBDVOrfp7pZWV/13SBrcJnFKGN2iRZqlPwqW/oO58vwaOXhtrngeoIMXk3wmxio77Wp6azqi/p7Q8jQY8okGWCHXmgurSfr1/IWbdr/YVSjBz5N3YfHTyUCaGJxQuBYPOohd5BuMoO7nCLLMlNttGESfL+LKLQiCOEmTnGfg71w96ynxZ1pcZNFW27lPeRV19IVfGwjtXeQzJHcU/LBFGUnEzMfdAQHhWDLYyGEVLNJ7uTsP/NNNrSZ7/9XDEyXD257bxRRlPS/a/TYNhj/s4CyhKCUPnC5ypAsBUW82q+AdpfN+f2ZGveO0xA/VatizZrcutixvkBD3F+nNYBmqL0jm4gfHcwopL/uvuMsH+ATbPu0OGDCAG9IZGUR9qNlc4ivMNdXqkS3H5h2MJGP4NSV5QndfZX07xAiD2fkF4ZqQZgwgrlKWfIY9EBnlBZw1Uk1JR4/Fc/0O+t8mGYr2qB7w4Y1agpGlmt+Y5VoLSdyVMdeuek+yHPbbi5FJ57Zt02ihd09W0Ek01WG8F/FJHNnN/B+3VNyAAwl+is6Ofmgk62geOWmgaQFXvMCihznXQ2N2/xypiA64UWWs92hwhZE8V6Z1TKs+7sruIQzWSAlXVm4K1kXS+OWp+e60o5ydb0jOo8MtdfBc5dogPlSvS646F5x+AtZ1hg/XR3T79Xv81kRHfYnIhaQjqdVNIykmnPZRfiaj9VKi+c9GaA9el0n4bt0o+t2lwvfQhDijpTtGL4ZQKdMH0GXZyBQamWte3bIm44kv9R4SvmfPuBk4XiRX5kTCVASuRGaxHj1nrbn2RvmTa4Tym69ejtNd1exO4iEwUzluRYOMnwz1lP2mGkyjjBhxBghZnL8hOzTkB+f4U/Cgqtn20KCJbcSOVQc/jI8LztyTWfaxfBAjGzUDhPuEdDSNgpxL7EHBbOKC/3J528OdB+B5fWungXkzP1tm//bce/WG5ZcGiuQQH1JCekmGxWw4qgzztEZfyZFEPtr/57m3FfmjPTFHAv+/89xi6mrE+hcU+nF+Y+ga+9BBjHl+zoCTW0ZLgVvTgdWcYscJDsws7WhO+e5kDJ80qwc5TR+iILOBE20sF/OukRE28VH/WVsIpocfWJIht66V1lPAcYnf1Gfh9omJRRY/poplZR8xZS091Gy3Ym4ac/j4gYD/FDoe01bJ7elyITLSUhFzicmHW46MTHo3Hh7M0JzNEMVP5Tk7CqM+xreTKAnwbTAfipkccPmQNXsFr6ZwwFpg8alqk+BwJxOFn0od7xvH+o++mAaf9Kq2sZgAurrPUZ01s/gyi1z0z/9vHQWLUt0GS6PPIEAy8HkIh+7M7hF1p49LFoKUEO8x/86IFxbA3TAxbHBq0FmxLaku0f1uIuRKMvDaqXM9vCcpvE7V6EXtJSrrxQJO4kl2XhxvDnHm349j58A8F4INI3bKR886HLt0xMATlePykd/nKH6StaVPgWdc5R8tIKmwJPleUMkpDoGs5IIk7zkpv8GZAYd7TCajF21/9rJsfBnewClVzA1yDuftTQa5zvdPLwnLm6yK2XphSrQASGh4fHI/DHZPY7exnprfnOkUTAYU4EyP2clSDIStRS2PjfJHgOpVCpO9wSiIeN1477fqbHdbivMjR3ru60LpFRNP8stX2mrllrDRgfeCDRY250VUHpXUiK6HsWSjRMLhvUK2esgdxJ2w6yhkl3EZbdmW/1G1R7+/Mhlzy93YeHlBSLbLeNuHsW3vh7+m6Sh3rNh4PG9KnNsVa1/MhiBJ5TiMqXZUABHcBqfKNm4plDNDH6sWaqEtr1VmKIn0V9/CTIc2u8F/ZAzj5vJdLW4NNBI59GjmOBdoHfhoPTW/dIqZgvVNgYsgN6das2OUYf8wHzJ+ammyuK3PGJ86efgbS0xDBdgtsukroFSMg14KpRdp3HZmGjSmxe/bhJTHiPH9WKpemCkoIpixisnIqmYm1kxOgB4noUG4UyomQouZzaubqeupHMz81Iz9RcgFvxDJpCVrEOFY2VHmORCK+5xOFfqc5BSU4DMaEGWzClGH62f8P/S2U8uzvr9PIpDd4qQpysY/v1fL/hikhjd2V1Y+UM9dKx+dJIDTAjkseAhZpEZbpqtF9OzQkuCAuR2z31RNp9v2dAr2g5AaaONkP9nRvOrZbLRn6TttNrTPP/TRiicsKeuxfLWRTO2wZdB8vQNIKQpZF5Q1Rj08/NUkujBd07jkZ9lF0UdkX46+7httdEb6k2llYsh2s6KslQP/Z+A3Td2vVwQUi8VyNjiNP7UIVbNrb6Vl8wKhQMfh4HJZfwIjjcCqWWL6oahwjiBVICsUzqanoZ8EFlS6yXlGYdjMt/jbWrKsxayb0KiKBKSbYEhC9YN5e5vRGi9AppS71EmhpCIoczSe5c37j8arvcdaSPZ5jjGm+jBmIe5xij/8EpaIQ90yU/P0hSkGbX4O80LvxQtZLNfrv1YEK9JIJ50Psr9nFYAi2pBX+ssy5t2PuLNx7gT+CP8/zBeklZfjlReGkCtvIq/M/7P/RYDhKGyNXvdK92kYtKcOazUQhN3FYANbe+nOjg94eiyBlDaxN5X6OCkgDiEgPQRcwy9PZTOHwzGHnmd4LzQAt5JapxAPU5g9Ybk+3uYkv7+NBG7Df6LGRoYr8cwFw7rm/VLBu9zg2Pm81bCLlFWhB/45ZxWVtXHpKcKXZUMt6fEqND0f4fP09Q8u0TeWpkzkjL9w19aqlHGfTHHz09NQq9ouL/irC2t7YyH7wpnP9HNaeNzvdVWrwW5y//upE9S9PLZtXO/GfN5YuZjZF7UXquOL0mcIDXvbBlvd8MgNE7e8Y2P12t2P/vecVazKhDo1UcZWWiox4cr5xFGcd1cXxgWBV9jbxlulEog6iRjR5DOWQrg3DHA7Oc6IgoalZlGqR8A+ah94J0PAnQmkYcPZaDo8J1wbPTUqgWzMq36XGuECGEVDwboOONxfXtY5Zfbo6MQtlUdYdxUSK3eEmNi5HNk4RQG8TcvSxDX0Lkn50nvBf4AXmKi6FtQqYNj+OKquMyRW06g3KIJpMoCgtDC9Bk5mI4Uwn/65z8FM1v6SXRD4doZ5jUVf7QkeZ0Fzhp7PlyZwxXkrffICoQi2owXMPfXkg6+EvGGCh8NyZ8w3T9P1ynugSFYua6rwh3WA5utNcBPyCF6+f6rO/cxraLoaQpSFQXCYuhZs9L5d5phl0fy2gcrCqxDc+f50u/vMRPDPhdiSgkTf09svj3HQrXfgTn9PuSzwEAQTcbhYeyPYcWHqV6QugE3sIfgakXrISZ6jOaDA4DS8Rlkoh9YkgPEcwYUH0GghjUCmXPSCKT8F9/B9xPBYDHGRaSG0w4T5iRDikOxcS+u9AHrBuhLFCvjVik/tLxxhXPbpaZ760BtuRBsnNvPxrZ3zkoaI+VDuSd+lKmrX6axvjYMZIaPgMpI2097NWp62XJ/y7yB8Lz6X0gZrQXiKfsRMsBcmi9iVVWxLkWpHgkCGE6WWCGMGJzS1ZbX9mDiRMt8XG4aQmLbnkjO1QfQIyLbnujynSX7HLF1b21e3x8+VzU5HTkFef0mqwT00sOZE4ie0pjawZoclYFF80rT4C3rn9viG0T5vKpo1kuSAHH6iyUmxrKqCZFmhweJzR1hZ/XaifxAFIjc831MHlrU2N9/JOc7yd5E3EkGlF5RRRLKPfX6J46ARBjv8NAlfqGP+a4yT3ckwLEdJ8BQpoTaqfGBx+IITMd68xARn1g7lW0oyY+Voei9YUvpH8v5CagGtDUk7lyrYDwe0HoU8md1iLN3Uy/odnqB/kJtC4HBwCkxoIk2B90WK4oimZ+D7249zrF8gbxSN+QQ70aYgmJoYPgjmygfpdi62W0YV6GU0aO0qwfpZhRNGcDGS1+wELnWTa/R0Mkc5A7TyabMio9c/vhxLRxIRPmwHFgfnutKk+9t33W4zxee7QWNnyIph1mwvi9FZesUbb/i9SJGJwVLkxXCvvTOBlzEZS3++r+PTzWuT3/2/N/tFXoR1+BMCq0U6Zgzgmi4XKq8cUFJGqrgJObbTt0i+u0vvPrJFcvKoQ6aqQ9X8daH+SHOlUntnt+Xy+q1gvOedk7lbUOxkmMhpO72+Vhg0r9x7LZMcXTWjXGgHd8fQ5fvp5pKREcPcLZIx4A4VJ0RZpv8xtkKYAceN7BFL1u2ZYtRv6hdCDko2DQ99y5Fpx7sQSSisUEaFZfxcGnCG5HssqdInKcD043YCgpaspUvDglQmNJbmevmZnQ8eEFhnDl8yFYvcO7sEvuOBDJIChfsN0CE2Ud3UqYdWvHr6WSbMXbXc60bhtd8y8UW7JehQCoPwyGTptmc5imdF3LdsYJVLbRoLTgDn6YiEctX6uHrh5CZ9NLQMxlU0VpCMlTuO0MnKKvYd7cTmB9pyky2tlU9USKJNmowHsX3PhVYs02buiXwGrcx+4TH37XC1GJJk1jjnT495Xd4ZUdUgIXZ12pI6tCZ5Qlql1TQv/0VFzqPBEH5XDhFtGWRO2xqT6TEjq9ozrJG2+QtG864zWRkSBzscQuBA+/rKwlizg8dPMLF6JKXX9B+DvT4MpU+YNzff+heTDPPPzbBlC++GgQdtkvlKKXV45JxtsQNXbjkjpaKy696F9RYPOUEwLoD1bpwLD3qOlNCDXb/0Ln50M/dzZFoVao+ZnTlK6CMb1hvXYvgPjlI2C3fFbddFRJHi5F5kYNuf8V7ZZmi5ylNOUcu6bEsnSO97T4C1M08yOUZzXinrIYmwldbYvibyTC4FKaN1kv8n82fdWctassVXkPBKwH2H9f1+pWTVmtIz+Y8rxw3wS/z7LtohLh5s5Xjn4aWzWODhvn1lkQglN3ky4WcGexJrigI0s/73yeepXZa5q4/y7yPnuSQseap/cFIw0ckjuxk8XuLYbXfDKQM3vQ9O43na9OLj95fBHOki+z2OvgpyFL9tXz9Uv8Cuda7M2+M2gmK4sN78c+cE3KGv9Xy5G8/8NX1/x0nve7T3tRd0QC/nOsIWTBjBiPkjIuQPAIDH74F2Mnzy9ffIb5M+sv3VIh9UcVg6wKO3vAHbErzPwz8C835BXSlH9QHwml+xWWsrfo7h50OUdBCkm3eOsOSRpDQidfmg3BGadoqYqRLEWO+TpJg6It71wofsEJQIRq8xwxPiMUMWigkdRCaPJiIR8eZfy2gjFhA1KAra0AAt+4UkDSNsutrAZ9Oj+fGuBf3XlicFuQkHDAqULzHDowgKIKBGAgDUu/KXAuE6kQKj25WCCDQlBaVQmoKJowAuHxcAh25lPOrVqNSkUbsQGSpU6SjRPFrlGKJVm5VkSwmtUBotornsWo9m1UIqZXroCAGK6RaOoA6egWRosI3bZXJJFe01VI5shY1Esx4LapyU6poQ4AA1CR3NBoYPlFqnSnxR7qx5dAmVsORQD4P8lTYDFcQq0ClR7lSIwKy+fYUBAA==); }</style></defs><rect x="0" y="0" width="2034.27880859375" height="1106.9869079589844" fill="#ffffff"></rect><g stroke-linecap="round" transform="translate(1841.0966796875 280.3225402832031) rotate(0 86.296875 49.87451171875)"><path d="M0 0 C39.76 0.86, 83.31 -0.08, 172.59 0 M0 0 C60.14 0.52, 122 -0.46, 172.59 0 M172.59 0 C170.87 25.94, 171.49 50.31, 172.59 99.75 M172.59 0 C173.38 33.79, 172.68 69, 172.59 99.75 M172.59 99.75 C126 98.6, 79.2 98.28, 0 99.75 M172.59 99.75 C137.04 100.35, 102.28 100.24, 0 99.75 M0 99.75 C0.91 75.99, 0.54 49.72, 0 0 M0 99.75 C0.86 75.96, 0.79 50.33, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-linecap="round" transform="translate(818.283203125 630.619140625) rotate(0 434.9638671875 190.5)"><path d="M32 0 C337.49 -3.17, 643.32 -3.5, 837.93 0 M32 0 C202.56 0.7, 373.83 1.11, 837.93 0 M837.93 0 C858.9 0.88, 870.26 10.66, 869.93 32 M837.93 0 C858.65 -0.46, 870.21 12.79, 869.93 32 M869.93 32 C871.83 103.51, 871.7 171.8, 869.93 349 M869.93 32 C869.97 123.96, 869.06 217.42, 869.93 349 M869.93 349 C869.86 370.44, 860.31 381.22, 837.93 381 M869.93 349 C869.62 371.4, 858.33 378.71, 837.93 381 M837.93 381 C643.67 381.84, 450.82 382.28, 32 381 M837.93 381 C531.65 382.39, 226.11 382.38, 32 381 M32 381 C9.19 380.1, 1.13 371.5, 0 349 M32 381 C10.56 382.08, 2.27 368.08, 0 349 M0 349 C-1.39 282.85, -2 213.97, 0 32 M0 349 C-0.16 282.47, -0.05 215.65, 0 32 M0 32 C-0.89 11.6, 10.58 -1.62, 32 0 M0 32 C1.9 9.64, 9.72 0.77, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-linecap="round" transform="translate(816.5078125 154.8955078125) rotate(0 440.5 211.8896484375)"><path d="M32 0 C260.73 1.89, 490.66 1.25, 849 0 M32 0 C257.13 -2.34, 482.48 -2.51, 849 0 M849 0 C869.8 -0.4, 881.25 12.51, 881 32 M849 0 C868.53 1.58, 882.33 11.25, 881 32 M881 32 C881.28 173.47, 880.78 315.94, 881 391.78 M881 32 C879.19 106.36, 879.54 180.72, 881 391.78 M881 391.78 C880.73 414.04, 869.52 421.79, 849 423.78 M881 391.78 C879.62 411.04, 871.48 421.73, 849 423.78 M849 423.78 C682.54 422.91, 515.09 422.11, 32 423.78 M849 423.78 C548.56 425.74, 248.93 426.15, 32 423.78 M32 423.78 C10.58 424.72, 1.97 411.15, 0 391.78 M32 423.78 C8.62 425.34, -2.08 413.31, 0 391.78 M0 391.78 C-0.34 266.23, -0.37 140.65, 0 32 M0 391.78 C-1.3 260.75, -1.05 128.62, 0 32 M0 32 C1.65 9.78, 9.84 0.67, 32 0 M0 32 C-1.4 10.94, 11.85 2.05, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-linecap="round" transform="translate(366 10) rotate(0 143.50000000000006 284.58837890625)"><path d="M32 0 C97.75 0.64, 161.98 -0.11, 255 0 M32 0 C93.8 -1.18, 157.44 -1.55, 255 0 M255 0 C278.21 0.34, 286.18 10.51, 287 32 M255 0 C276.01 -1.09, 288.18 8.52, 287 32 M287 32 C287.58 144.32, 287.63 255.68, 287 537.18 M287 32 C285.94 206.55, 286.38 381.47, 287 537.18 M287 537.18 C285.09 558.47, 275.53 570.77, 255 569.18 M287 537.18 C288.27 559.31, 275.29 570.73, 255 569.18 M255 569.18 C166.11 568.73, 79.77 567.68, 32 569.18 M255 569.18 C176.87 567.88, 99.51 567.37, 32 569.18 M32 569.18 C11.66 568.48, -1.89 556.74, 0 537.18 M32 569.18 C11.04 567.08, 0.69 560.01, 0 537.18 M0 537.18 C-1.42 362.98, -2.45 189.5, 0 32 M0 537.18 C0.59 408.14, 1.04 279.37, 0 32 M0 32 C-0.35 9.84, 11.06 -0.7, 32 0 M0 32 C-0.08 12.05, 11.51 -0.9, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(480.61801147460943 15) rotate(0 28.881988525390625 17.5)"><text x="28.881988525390625" y="24.668" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">RPC</text></g><g stroke-linecap="round"><g transform="translate(169 477.5302734375) rotate(0 126.52209050920334 -0.6171660234481351)"><path d="M-0.32 -0.24 C41.87 -0.19, 211.27 0.22, 253.37 0.26 M1.71 -1.41 C43.74 -1.67, 210.34 -1.2, 252.5 -1.29" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(169 477.5302734375) rotate(0 126.52209050920334 -0.6171660234481351)"><path d="M250.6 -3.06 L239.23 3.22 L239.5 -6.33 L253.39 0.49" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M252.5 -1.29 C247.89 0.87, 245.27 1.51, 238.9 5.05 M252.5 -1.29 C248.22 1.21, 242.19 3.36, 238.9 5.05 M238.9 5.05 C237.78 0.43, 239.3 -2.24, 238.9 -7.63 M238.9 5.05 C238.75 1.47, 238.58 -3.32, 238.9 -7.63 M238.9 -7.63 C240.77 -7.61, 245.35 -5.25, 252.5 -1.29 M238.9 -7.63 C243.76 -4.76, 249.98 -2.37, 252.5 -1.29 M252.5 -1.29 C252.5 -1.29, 252.5 -1.29, 252.5 -1.29 M252.5 -1.29 C252.5 -1.29, 252.5 -1.29, 252.5 -1.29" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g transform="translate(199.5 454.0302734375) rotate(0 65.5 10)"><text x="65.5" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">submit proven tx</text></g><g stroke-linecap="round" transform="translate(423.32421875 148.1875) rotate(0 83.5 59.5)"><path d="M0 0 C53.56 2.47, 104.88 3.19, 167 0 M0 0 C52.76 -0.34, 106.32 -0.8, 167 0 M167 0 C167.42 27.41, 167.54 52.45, 167 119 M167 0 C165.92 40.3, 167.01 81.51, 167 119 M167 119 C134.44 119.43, 99.38 117.43, 0 119 M167 119 C104.91 119.65, 44.86 120.67, 0 119 M0 119 C-2.52 82.06, 0.8 46.88, 0 0 M0 119 C-1.54 81.38, -0.43 44.61, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(455.0562744140625 187.6875) rotate(0 51.7679443359375 20)"><text x="51.7679443359375" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">basic request</text><text x="51.7679443359375" y="34.096000000000004" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">verification</text></g><g stroke-linecap="round" transform="translate(431.42578125 413.6796875) rotate(0 83.5 59.5)"><path d="M0 0 C60.09 -2.38, 119.35 -1.85, 167 0 M0 0 C41.4 1.83, 84.33 1.61, 167 0 M167 0 C168.06 41.16, 165.15 82.74, 167 119 M167 0 C166.64 24.95, 167.19 50.74, 167 119 M167 119 C109.06 120.15, 49.73 116.77, 0 119 M167 119 C124.33 120.44, 82.74 118.99, 0 119 M0 119 C-0.63 94.9, -1.5 66.92, 0 0 M0 119 C0.1 94.5, 0.25 69.59, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(456.0757827758789 463.1796875) rotate(0 58.849998474121094 10)"><text x="58.849998474121094" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">verify tx proof</text></g><g stroke-linecap="round"><g transform="translate(166.68301105844762 236.50210154698289) rotate(0 96.88891548840814 -0.5320821276677634)"><path d="M-0.17 -0.57 C32.49 -1.02, 163.14 -2.68, 195.5 -2.81 M-1.72 1.75 C30.88 1.41, 161.86 -1.59, 194.87 -1.86" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(166.68301105844762 236.50210154698289) rotate(0 96.88891548840814 -0.5320821276677634)"><path d="M196.52 -2.75 L180.56 5.37 L179.96 -7.74 L195.9 -0.08" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M194.87 -1.86 C190.66 0.59, 186.47 0.34, 181.38 4.7 M194.87 -1.86 C190.86 0.37, 185.96 2.78, 181.38 4.7 M181.38 4.7 C180.31 2.04, 180.27 -3.09, 181.17 -7.98 M181.38 4.7 C181.72 1.14, 181.02 -2.43, 181.17 -7.98 M181.17 -7.98 C185.95 -4.61, 192.91 -3.11, 194.87 -1.86 M181.17 -7.98 C185.32 -5.21, 190.06 -3.53, 194.87 -1.86 M194.87 -1.86 C194.87 -1.86, 194.87 -1.86, 194.87 -1.86 M194.87 -1.86 C194.87 -1.86, 194.87 -1.86, 194.87 -1.86" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g transform="translate(222.84967899668004 213.00210154698289) rotate(0 45.83333206176758 10)"><text x="45.83333206176758" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">query state</text></g><g stroke-linecap="round"><g transform="translate(367 235.5302734375) rotate(0 27.631575616449112 1.1908784903585001)"><path d="M-0.94 0.32 C8.32 0.85, 46.57 1.76, 56.21 2.06" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 7"></path></g></g><mask></mask><g stroke-linecap="round" transform="translate(813.5009765625 13.783203125) rotate(0 442.72802734375 49)"><path d="M24.5 0 C209.81 0.54, 395.14 0.01, 860.96 0 M24.5 0 C313.88 2.96, 603.93 2.97, 860.96 0 M860.96 0 C875.38 -0.04, 884.66 9.76, 885.46 24.5 M860.96 0 C878.56 0.8, 884.42 9.72, 885.46 24.5 M885.46 24.5 C884.88 44.99, 886.94 63.13, 885.46 73.5 M885.46 24.5 C885.05 42.18, 885.04 58.58, 885.46 73.5 M885.46 73.5 C886.45 89.14, 875.4 96.23, 860.96 98 M885.46 73.5 C885.83 87.73, 877.98 99.5, 860.96 98 M860.96 98 C572.95 96.48, 283.55 97.17, 24.5 98 M860.96 98 C646.98 99.17, 433.7 99.48, 24.5 98 M24.5 98 C7.81 97.17, 0.39 89.13, 0 73.5 M24.5 98 C8.09 99.39, 0.84 88.94, 0 73.5 M0 73.5 C0.47 52.51, 0.38 35.86, 0 24.5 M0 73.5 C-0.76 57.61, -0.73 41.36, 0 24.5 M0 24.5 C1.11 6.61, 9.56 1.6, 24.5 0 M0 24.5 C-2.1 7.98, 7.36 2.07, 24.5 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-linecap="round" transform="translate(870.458984375 245.5087890625) rotate(0 94.890625 58.5)"><path d="M0 0 C67.86 -0.56, 131.88 -0.94, 189.78 0 M0 0 C38.87 1.67, 79.25 2.49, 189.78 0 M189.78 0 C191.53 43.44, 191.5 81.6, 189.78 117 M189.78 0 C190.4 30.33, 191.43 58.74, 189.78 117 M189.78 117 C149.94 116.28, 109.05 113.39, 0 117 M189.78 117 C149.98 115.92, 110.02 116.16, 0 117 M0 117 C-2.17 88.76, -1.44 56.4, 0 0 M0 117 C1.23 78.88, 0.54 38.56, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(912.7662773132324 337.5087890625) rotate(0 52.58333206176758 10)"><text x="52.58333206176758" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">inflight state</text></g><g mask="url(#mask-MMGLJSSsH7Uiigku53WM4)" stroke-linecap="round"><g transform="translate(595.32421875 216.16783254521943) rotate(0 106.58837890625001 -76.62928797049562)"><path d="M0 0 C27.18 1.66, 56.18 -1.24, 111.73 0 M111.73 0 C122.36 -0.8, 129.33 -4.23, 127.73 -16 M127.73 -16 C130.19 -55.35, 126.81 -98.2, 127.73 -137.48 M127.73 -137.48 C128.86 -146.99, 132.98 -152.55, 143.73 -153.48 M143.73 -153.48 C172.78 -154.67, 199.28 -151.88, 213.18 -153.48" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 7"></path></g><g transform="translate(595.32421875 216.16783254521943) rotate(0 106.58837890625001 -76.62928797049562)"><path d="M214.17 -154.18 L197.89 -148.5 L199.72 -161.22 L213.77 -152.18" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M213.18 -153.48 C208.28 -151.07, 204.83 -151.49, 199.79 -146.73 M199.79 -146.73 C200.42 -150.06, 199.03 -153.42, 199.39 -159.4 M199.39 -159.4 C204.21 -156.11, 211.2 -154.69, 213.18 -153.48 M213.18 -153.48 C213.18 -153.48, 213.18 -153.48, 213.18 -153.48" stroke="#1e1e1e" stroke-width="1.5" fill="none"></path></g></g><mask id="mask-MMGLJSSsH7Uiigku53WM4"><rect x="0" y="0" fill="#fff" width="908.5009765625" height="469.6524619654392"></rect><rect x="671.2659492492676" y="129.42551783510953" fill="#000" width="103.58333587646484" height="20" opacity="1"></rect></mask><g transform="translate(671.2659492492676 129.42551783510953) rotate(0 30.646648406982408 10.11302673961427)"><text x="51.79166793823242" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">proxied query</text></g><g stroke-linecap="round" transform="translate(898.7138671875 268.2861328125) rotate(0 68.11181640625 27)"><path d="M13.5 0 C51.66 0.24, 91.5 2.14, 122.72 0 M13.5 0 C51 -0.08, 85.87 -1.18, 122.72 0 M122.72 0 C132.85 1.16, 136.13 5.44, 136.22 13.5 M122.72 0 C133.99 -2.25, 134.17 6.06, 136.22 13.5 M136.22 13.5 C135.56 17.27, 134.47 25.15, 136.22 40.5 M136.22 13.5 C136.75 20.02, 135.86 25.24, 136.22 40.5 M136.22 40.5 C136.14 47.88, 133.37 53.11, 122.72 54 M136.22 40.5 C135.28 50.27, 130.32 54.28, 122.72 54 M122.72 54 C83.5 54.2, 45.22 53.74, 13.5 54 M122.72 54 C84.32 52.61, 43.05 53.57, 13.5 54 M13.5 54 C2.87 53.91, 1.07 50, 0 40.5 M13.5 54 C5.32 53.25, -1.34 49.58, 0 40.5 M0 40.5 C-1.47 35.29, 1.68 25.48, 0 13.5 M0 40.5 C0.54 33.06, -0.79 23.92, 0 13.5 M0 13.5 C0.66 3.14, 2.9 0.13, 13.5 0 M0 13.5 C1.7 2.91, 2.84 -1.99, 13.5 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(919.4006843566895 285.2861328125) rotate(0 47.42499923706055 10)"><text x="47.42499923706055" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">verify state</text></g><g stroke-linecap="round"><g transform="translate(603.42578125 429.09307402614286) rotate(0 145.14404296875003 -70.0810257109697)"><path d="M0 0 C34.28 -1.62, 68.52 1.19, 129.14 0 M0 0 C47.76 1.16, 94.35 1.05, 129.14 0 M129.14 0 C141.78 -1.96, 143.36 -3.98, 145.14 -16 M129.14 0 C137.73 0.2, 146.28 -6.13, 145.14 -16 M145.14 -16 C144.28 -37.77, 147.41 -59.84, 145.14 -124.92 M145.14 -16 C145.59 -59.17, 146.45 -101.16, 145.14 -124.92 M145.14 -124.92 C144.32 -134.91, 149.26 -140.68, 161.14 -140.92 M145.14 -124.92 C146.33 -133.53, 150.07 -141.87, 161.14 -140.92 M161.14 -140.92 C203.62 -140.14, 242.91 -138.97, 290.29 -140.92 M161.14 -140.92 C186.57 -140.96, 214.16 -140.66, 290.29 -140.92" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(603.42578125 429.09307402614286) rotate(0 145.14404296875003 -70.0810257109697)"><path d="M291.36 -140.42 L277.42 -135.2 L275.52 -147.16 L289.18 -141.5" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M290.29 -140.92 C287.33 -139.86, 284.28 -136.1, 276.71 -134.55 M290.29 -140.92 C285.7 -138.22, 280.28 -135.97, 276.71 -134.55 M276.71 -134.55 C277.68 -140.75, 276.92 -144.03, 276.68 -147.23 M276.71 -134.55 C276.92 -138.5, 277 -140.87, 276.68 -147.23 M276.68 -147.23 C282.13 -145.06, 284.9 -141.58, 290.29 -140.92 M276.68 -147.23 C279.68 -145.57, 284 -143.38, 290.29 -140.92 M290.29 -140.92 C290.29 -140.92, 290.29 -140.92, 290.29 -140.92 M290.29 -140.92 C290.29 -140.92, 290.29 -140.92, 290.29 -140.92" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round" transform="translate(869.501953125 362.8056640625) rotate(0 95.05419921875003 49.4033203125)"><path d="M0 0 C74.23 2.53, 151.4 1.31, 190.11 0 M0 0 C65.06 2.54, 130.99 1.95, 190.11 0 M190.11 0 C187.99 34.86, 187.94 69.67, 190.11 98.81 M190.11 0 C190.11 36.53, 190.51 71.32, 190.11 98.81 M190.11 98.81 C118.08 96.81, 44.95 99.06, 0 98.81 M190.11 98.81 C116.3 97.67, 42.06 98.63, 0 98.81 M0 98.81 C-1.55 63.64, 0.38 30.65, 0 0 M0 98.81 C-0.17 69.28, -1.11 40.45, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(885.147819519043 402.208984375) rotate(0 79.40833282470702 10)"><text x="79.40833282470703" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">inflight transactions</text></g><g stroke-linecap="round" transform="translate(869.638671875 462.1884765625) rotate(0 95.26416015625 42.015625)"><path d="M0 0 C54.33 -3.66, 113.94 -3.69, 190.53 0 M0 0 C57.87 -0.23, 117.8 -0.25, 190.53 0 M190.53 0 C192.85 26.83, 192.01 55.36, 190.53 84.03 M190.53 0 C190.81 18.73, 190.61 36.9, 190.53 84.03 M190.53 84.03 C122.72 84.09, 55.85 83.63, 0 84.03 M190.53 84.03 C122.82 82.32, 52.26 83.28, 0 84.03 M0 84.03 C0.54 66.4, -0.61 46.16, 0 0 M0 84.03 C1.02 57.77, 1.16 33.86, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(903.7361640930176 494.2041015625) rotate(0 61.16666793823242 10)"><text x="61.16666793823242" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">inflight batches</text></g><g stroke-linecap="round" transform="translate(1214.7939453125 309.498046875) rotate(0 86.296875 49.87451171875)"><path d="M0 0 C36.57 2.55, 72.1 -0.33, 172.59 0 M0 0 C36.77 2.23, 73.39 2.46, 172.59 0 M172.59 0 C171.44 27.13, 172.17 50.14, 172.59 99.75 M172.59 0 C172.5 34.15, 171.81 66.11, 172.59 99.75 M172.59 99.75 C118.64 100.43, 61.5 101.59, 0 99.75 M172.59 99.75 C136.71 99.7, 102.99 99.99, 0 99.75 M0 99.75 C0.39 65.15, -0.26 33.88, 0 0 M0 99.75 C-1.61 77.49, -1.05 56.29, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1250.842872619629 349.37255859375) rotate(0 50.247947692871094 10)"><text x="50.247947692871094" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">batch builder</text></g><g mask="url(#mask-6DIClL5Fi7HeOw6OBc-MA)" stroke-linecap="round"><g transform="translate(1060.6103515625 396.164195147996) rotate(0 75.87277241572738 -18.54243686255495)"><path d="M-1.14 -1.06 C24.25 -7.34, 127.18 -32.22, 152.88 -38.08 M0.47 0.99 C25.66 -5.14, 126.7 -30.59, 152.04 -37.11" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1060.6103515625 396.164195147996) rotate(0 75.87277241572738 -18.54243686255495)"><path d="M152.7 -38.48 L138.83 -27.49 L138.77 -41.29 L150.59 -38.84" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M152.04 -37.11 C146.61 -33.66, 142.52 -30.14, 140.42 -27.62 M152.04 -37.11 C147.51 -33.2, 143.57 -30.69, 140.42 -27.62 M140.42 -27.62 C139.71 -33.11, 138.24 -36.38, 137.3 -39.91 M140.42 -27.62 C139.35 -32.64, 137.99 -36.82, 137.3 -39.91 M137.3 -39.91 C140.8 -40.54, 147.2 -39.39, 152.04 -37.11 M137.3 -39.91 C141.94 -39.37, 145.59 -38.27, 152.04 -37.11 M152.04 -37.11 C152.04 -37.11, 152.04 -37.11, 152.04 -37.11 M152.04 -37.11 C152.04 -37.11, 152.04 -37.11, 152.04 -37.11" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-6DIClL5Fi7HeOw6OBc-MA"><rect x="0" y="0" fill="#fff" width="1313.2939453125" height="533.1454454096774"></rect><rect x="1113.7521476745605" y="357.6735700171557" fill="#000" width="46.400001525878906" height="40" opacity="1"></rect></mask><g transform="translate(1113.7521476745605 357.6735700171557) rotate(0 22.730976303666836 19.94818826828532)"><text x="23.200000762939453" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">select</text><text x="23.200000762939453" y="34.096000000000004" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">batch</text></g><g mask="url(#mask-NlzJiOhXFUotIRE27QBSj)" stroke-linecap="round"><g transform="translate(1211.2939453125 412.18375452346754) rotate(0 -73.24680030312848 31.200563972897726)"><path d="M0.36 0.78 C-24.04 11.34, -121.58 52.1, -146.19 62.26 M-0.91 0.14 C-25.44 10.49, -122.29 50.77, -146.85 60.69" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1211.2939453125 412.18375452346754) rotate(0 -73.24680030312848 31.200563972897726)"><path d="M-145.38 59.32 L-138.13 47.94 L-132.01 60.17 L-146.84 59.17" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-146.85 60.69 C-142.56 57.84, -138.99 53.01, -136.69 49.66 M-146.85 60.69 C-142.7 56.62, -140.11 53.38, -136.69 49.66 M-136.69 49.66 C-134.39 52.22, -134.89 55.5, -131.87 61.39 M-136.69 49.66 C-135.18 52.49, -133.53 55.24, -131.87 61.39 M-131.87 61.39 C-135 61.93, -137.63 61.52, -146.85 60.69 M-131.87 61.39 C-136.29 60.99, -139.46 60.44, -146.85 60.69 M-146.85 60.69 C-146.85 60.69, -146.85 60.69, -146.85 60.69 M-146.85 60.69 C-146.85 60.69, -146.85 60.69, -146.85 60.69" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-NlzJiOhXFUotIRE27QBSj"><rect x="0" y="0" fill="#fff" width="1458.017578125" height="573.373832424285"></rect><rect x="1112.8237953186035" y="422.77879347387625" fill="#000" width="50.21666717529297" height="40" opacity="1"></rect></mask><g transform="translate(1112.8237953186035 422.77879347387625) rotate(0 25.223349690767947 20.60552502248902)"><text x="25.108333587646484" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">proven</text><text x="25.108333587646484" y="34.096000000000004" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">batch</text></g><g stroke-linecap="round" transform="translate(1221.55078125 443.2158203125) rotate(0 81.7607421875 50.14794921875)"><path d="M0 0 C57.31 0.64, 111.13 2.38, 163.52 0 M0 0 C41.17 -0.43, 84.08 0.35, 163.52 0 M163.52 0 C162.41 28.26, 164.31 57.38, 163.52 100.3 M163.52 0 C163.52 26.17, 163.66 52.31, 163.52 100.3 M163.52 100.3 C105.04 99.72, 47.93 99.77, 0 100.3 M163.52 100.3 C119.92 99.82, 74.02 98.95, 0 100.3 M0 100.3 C-0.02 71.97, -2.52 47.83, 0 0 M0 100.3 C1.54 76.35, 0.08 52.92, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1255.7675704956055 483.36376953125) rotate(0 47.54395294189453 10)"><text x="47.54395294189453" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">block builder</text></g><g mask="url(#mask-6A99B4RThJrk9MI4s1pJ0)" stroke-linecap="round"><g transform="translate(1063.4326171875 503.33899069177005) rotate(0 76.74438985604371 -2.261725874392141)"><path d="M0.99 -0.53 C26.57 -1.11, 128.07 -3.72, 153.44 -4.41 M0.05 1.8 C25.43 0.94, 126.29 -5.48, 152.23 -6.32" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1063.4326171875 503.33899069177005) rotate(0 76.74438985604371 -2.261725874392141)"><path d="M153.15 -4.84 L137.62 1.52 L136.66 -10.4 L153.16 -6.42" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M152.23 -6.32 C147.59 -4.76, 144.83 -2.98, 138.97 0.68 M152.23 -6.32 C148 -4.33, 144.14 -2.1, 138.97 0.68 M138.97 0.68 C138.21 -1.87, 137.29 -8.04, 138.34 -11.98 M138.97 0.68 C139.22 -2.95, 138.92 -7.11, 138.34 -11.98 M138.34 -11.98 C141.26 -9.7, 143.89 -8.12, 152.23 -6.32 M138.34 -11.98 C143.3 -9.14, 149.18 -7.34, 152.23 -6.32 M152.23 -6.32 C152.23 -6.32, 152.23 -6.32, 152.23 -6.32 M152.23 -6.32 C152.23 -6.32, 152.23 -6.32, 152.23 -6.32" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-6A99B4RThJrk9MI4s1pJ0"><rect x="0" y="0" fill="#fff" width="1317.366210937501" height="608.1520838478536"></rect><rect x="1094.6577491760258" y="490.9324441137287" fill="#000" width="91.48332977294922" height="20" opacity="1"></rect></mask><g transform="translate(1094.6577491760258 490.9324441137287) rotate(0 45.51925786751792 10.144820703649202)"><text x="45.74166488647461" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">select block</text></g><g mask="url(#mask-5XqTwtTLpNGxu-xG7Sba0)" stroke-linecap="round"><g transform="translate(1390.072265625 532.8919168893153) rotate(0 60.18219720817507 -207.65155732707717)"><path d="M0 0 C27.14 1.66, 55.58 0.28, 103.91 0 M0 0 C26.85 0.97, 54.14 -0.03, 103.91 0 M103.91 0 C116.48 -1.94, 118 -5.34, 119.91 -16 M103.91 0 C112.7 -0.1, 121.14 -4.76, 119.91 -16 M119.91 -16 C120.69 -150.96, 120.32 -284.03, 119.91 -416.11 M119.91 -16 C117.82 -105.01, 118.13 -193.41, 119.91 -416.11" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1390.072265625 532.8919168893153) rotate(0 60.18219720817507 -207.65155732707717)"><path d="M118.23 -414.53 L127.08 -402.56 L111.75 -404.25 L119.74 -415.46" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M119.91 -416.11 C121.75 -411.77, 124.53 -409.27, 126.15 -402.47 M119.91 -416.11 C121.53 -412.11, 123.44 -409.32, 126.15 -402.47 M126.15 -402.47 C121.14 -403.66, 116.08 -401.98, 113.48 -402.56 M126.15 -402.47 C121.66 -402.52, 117.56 -402.75, 113.48 -402.56 M113.48 -402.56 C117.06 -408.79, 118.03 -412.76, 119.91 -416.11 M113.48 -402.56 C115.26 -408.48, 118.68 -413.67, 119.91 -416.11 M119.91 -416.11 C119.91 -416.11, 119.91 -416.11, 119.91 -416.11 M119.91 -416.11 C119.91 -416.11, 119.91 -416.11, 119.91 -416.11" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-5XqTwtTLpNGxu-xG7Sba0"><rect x="0" y="0" fill="#fff" width="1609.981985938722" height="1049.0006306536297"></rect><rect x="1461.631987464601" y="522.8919168893153" fill="#000" width="96.69999694824219" height="20" opacity="1"></rect></mask><g transform="translate(1461.6319874646008 522.8919168893153) rotate(0 -11.377524631425729 -197.65155732707717)"><text x="48.349998474121094" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">commit block</text></g><g mask="url(#mask-WkOLaDZfxp4-cAK5MP31b)" stroke-linecap="round"><g transform="translate(965.5665305892684 551.2197265625) rotate(0 -25.283709869468453 120.38733761404774)"><path d="M0 0 C1.3 11.94, -0.46 26.83, 0 38.74 M0 0 C-0.71 14.3, 0.5 29.54, 0 38.74 M0 38.74 C-1.6 49.53, -3.86 53.36, -16 54.74 M0 38.74 C-1.66 47.42, -5.49 53.33, -16 54.74 M-16 54.74 C-20.17 53.58, -26.32 53.27, -34.46 54.74 M-16 54.74 C-23.79 53.95, -30.07 55.03, -34.46 54.74 M-34.46 54.74 C-45.54 54.1, -51.51 58.56, -50.46 70.74 M-34.46 54.74 C-43.29 55.76, -50 59.25, -50.46 70.74 M-50.46 70.74 C-51.59 120.22, -50.84 169.46, -50.46 229.82 M-50.46 70.74 C-49.76 128.02, -49.35 187.71, -50.46 229.82 M-50.46 229.82 C-48.55 235.26, -48.04 239.38, -39.72 240.56 M-50.46 229.82 C-49.63 235.72, -48.12 238.78, -39.72 240.56 M-39.72 240.56 C-36.39 241.28, -33.41 239.9, -28.98 240.56 M-39.72 240.56 C-37.79 240.18, -35.4 240.45, -28.98 240.56" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(965.5665305892684 551.2197265625) rotate(0 -25.283709869468453 120.38733761404774)"><path d="M-29.61 242.2 L-36.92 243.12 L-39.76 234.59 L-28.26 239.46" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-28.98 240.56 C-31.66 241.17, -36.1 243.3, -38.83 244.85 M-28.98 240.56 C-33.28 241.84, -36.47 243.58, -38.83 244.85 M-38.83 244.85 C-39.41 242.19, -39.51 240.78, -38.59 235.77 M-38.83 244.85 C-38.56 243.02, -39.02 240.7, -38.59 235.77 M-38.59 235.77 C-36.53 235.84, -35.32 237.7, -28.98 240.56 M-38.59 235.77 C-35.69 236.99, -31.78 239.23, -28.98 240.56 M-28.98 240.56 C-28.98 240.56, -28.98 240.56, -28.98 240.56 M-28.98 240.56 C-28.98 240.56, -28.98 240.56, -28.98 240.56" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-WkOLaDZfxp4-cAK5MP31b"><rect x="0" y="0" fill="#fff" width="1116.0246627410368" height="891.7810421648828"></rect><rect x="855.5333976745607" y="595.9566345214844" fill="#000" width="119.1500015258789" height="20" opacity="1"></rect></mask><g transform="translate(855.5333976745605 595.9566345214844) rotate(0 84.74942304523938 75.65042965506336)"><text x="59.57500076293945" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">mempool events</text></g><g mask="url(#mask-f62KilHY-4LoaayrhABn9)" stroke-linecap="round"><g transform="translate(165.8132038489248 732.5020156474429) rotate(0 119.56083302607091 1.6001835728984588)"><path d="M-0.42 1.08 C39.69 1.53, 199.81 2.59, 239.54 2.6 M1.56 0.6 C41.65 0.7, 199.09 0.54, 238.88 0.75" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(165.8132038489248 732.5020156474429) rotate(0 119.56083302607091 1.6001835728984588)"><path d="M237.71 -0.43 L225.99 5.97 L224.21 -7.16 L239.34 1.53" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M238.88 0.75 C237.38 2.69, 233.85 2.02, 225.27 7.07 M238.88 0.75 C235.32 2.09, 233.49 2.91, 225.27 7.07 M225.27 7.07 C224.61 4.19, 224.42 1.87, 225.29 -5.61 M225.27 7.07 C224.83 2.82, 225.66 -2.46, 225.29 -5.61 M225.29 -5.61 C228.63 -4.55, 230.57 -3.67, 238.88 0.75 M225.29 -5.61 C228.54 -4.51, 231.53 -3.02, 238.88 0.75 M238.88 0.75 C238.88 0.75, 238.88 0.75, 238.88 0.75 M238.88 0.75 C238.88 0.75, 238.88 0.75, 238.88 0.75" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-f62KilHY-4LoaayrhABn9"><rect x="0" y="0" fill="#fff" width="504.82262012881597" height="834.5719100871956"></rect><rect x="218.14996612705397" y="723.5369628673197" fill="#000" width="134.3358917236328" height="20" opacity="1"></rect></mask><g transform="translate(218.14996612705397 723.5369628673197) rotate(0 67.22407074794172 10.565236353021646)"><text x="67.1679458618164" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">user executed tx</text></g><g mask="url(#mask-9okRwR2Nxu_OGZVEQiqFe)" stroke-linecap="round"><g transform="translate(406.47555278665516 781.8006446067484) rotate(0 -119.85111957690289 0.07555124326972873)"><path d="M-1.06 -0.97 C-41.07 -1.08, -199.58 -0.42, -239.55 -0.13 M0.59 1.13 C-39.6 1.11, -200.44 0.82, -240.29 0.98" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(406.47555278665516 781.8006446067484) rotate(0 -119.85111957690289 0.07555124326972873)"><path d="M-241.37 -0.57 L-226.23 -4.59 L-227.78 7.05 L-239.06 -0.2" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-240.29 0.98 C-236.85 -0.59, -231.98 -4.47, -226.7 -5.37 M-240.29 0.98 C-236.71 -1.52, -232.06 -3.28, -226.7 -5.37 M-226.7 -5.37 C-225.85 -2.41, -226.26 1.19, -226.69 7.31 M-226.7 -5.37 C-227.18 -1.1, -226.69 4.45, -226.69 7.31 M-226.69 7.31 C-231.6 6.67, -233.6 4, -240.29 0.98 M-226.69 7.31 C-229.96 5.34, -233.9 3.95, -240.29 0.98 M-240.29 0.98 C-240.29 0.98, -240.29 0.98, -240.29 0.98 M-240.29 0.98 C-240.29 0.98, -240.29 0.98, -240.29 0.98" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-9okRwR2Nxu_OGZVEQiqFe"><rect x="0" y="0" fill="#fff" width="746.4255316716648" height="882.4916874250011"></rect><rect x="229.53260680118163" y="772.1461660158748" fill="#000" width="113.9359130859375" height="20" opacity="1"></rect></mask><g transform="translate(229.5326068011816 772.1461660158748) rotate(0 57.09182640857064 9.730029834143352)"><text x="56.96795654296875" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">user proven tx</text></g><g stroke-linecap="round" transform="translate(10 104.5302734375) rotate(0 77.5 382.5)"><path d="M32 0 C62.45 2.2, 91.27 -0.72, 123 0 M32 0 C51.45 -0.21, 71.34 1.3, 123 0 M123 0 C142.99 0.84, 153.32 12.24, 155 32 M123 0 C145.4 -0.11, 153.02 8.72, 155 32 M155 32 C155.66 235.98, 155.31 441.44, 155 733 M155 32 C155.6 273.31, 155.73 514.7, 155 733 M155 733 C154.95 754.39, 143.99 766.3, 123 765 M155 733 C157.06 754.52, 142.65 763.19, 123 765 M123 765 C96.85 764.71, 72.97 766.59, 32 765 M123 765 C100.93 764.68, 77.85 764.16, 32 765 M32 765 C11.89 763.82, -1.34 752.64, 0 733 M32 765 C12.54 763.14, -1.63 752.31, 0 733 M0 733 C1.07 562.59, 0.92 391.38, 0 32 M0 733 C-2.05 500.3, -1.63 267.04, 0 32 M0 32 C-0.1 10.95, 12.44 0.9, 32 0 M0 32 C-1.67 9.96, 9.29 -1.76, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(56.39201354980469 469.5302734375) rotate(0 31.107986450195312 17.5)"><text x="31.107986450195312" y="24.668" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">User</text></g><g stroke-linecap="round" transform="translate(1454.794921875 761.9990234375) rotate(0 83 25)"><path d="M0 0 C60.32 1.06, 122.87 1.21, 166 0 M0 0 C36.47 -0.82, 73.45 -0.45, 166 0 M166 0 C164.28 17.14, 166.63 34.2, 166 50 M166 0 C166.54 13.85, 165.94 26.46, 166 50 M166 50 C113.62 50.68, 62.69 50.39, 0 50 M166 50 C104.67 49.35, 44.49 50.95, 0 50 M0 50 C-0.75 30.94, -0.67 9.36, 0 0 M0 50 C-0.66 38.74, 0.5 27.16, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1474.7229843139648 766.9990234375) rotate(0 63.071937561035156 20)"><text x="63.071937561035156" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">filter out invalid</text><text x="63.071937561035156" y="34.096000000000004" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">notes</text></g><g stroke-linecap="round" transform="translate(1455.3173828125 815.31640625) rotate(0 83 25)"><path d="M0 0 C47.11 0.91, 98.76 -1.36, 166 0 M0 0 C57.23 -1.36, 112.68 -2.16, 166 0 M166 0 C165.53 13.52, 164.66 30.76, 166 50 M166 0 C166.21 16.94, 166.54 34.09, 166 50 M166 50 C117.95 51.51, 67.47 48.25, 0 50 M166 50 C130.25 50.5, 92.01 50.77, 0 50 M0 50 C-1.28 33.67, 1.05 15.32, 0 0 M0 50 C-0.98 34.81, 0.51 20.51, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1475.373435974121 820.31640625) rotate(0 62.943946838378906 20)"><text x="62.943946838378906" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">execute tx</text><text x="62.943946838378906" y="34.096000000000004" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">consuming notes</text></g><g stroke-linecap="round" transform="translate(1457.140625 865.9912109375) rotate(0 82.072265625 25)"><path d="M0 0 C57.63 -0.58, 115.15 2.03, 164.14 0 M0 0 C48.39 1.72, 96.75 1.07, 164.14 0 M164.14 0 C164.66 12.76, 163.05 24.96, 164.14 50 M164.14 0 C164.34 13.66, 164.19 27.9, 164.14 50 M164.14 50 C98.61 48.17, 37.88 50.71, 0 50 M164.14 50 C129.41 48.48, 93.42 48.25, 0 50 M0 50 C-0.46 35.06, -1.37 16.32, 0 0 M0 50 C-1.12 38.35, -0.97 28.08, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1518.3249053955078 880.9912109375) rotate(0 20.887985229492188 10)"><text x="20.887985229492188" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">prove</text></g><g stroke-linecap="round" transform="translate(1455.9140625 916.1904296875) rotate(0 83 25)"><path d="M0 0 C35.73 -2.49, 69.95 -0.93, 166 0 M0 0 C54.69 -0.22, 111.24 0.97, 166 0 M166 0 C165.27 16.88, 165.13 31.94, 166 50 M166 0 C166.81 15.23, 165.18 29.51, 166 50 M166 50 C119.72 50.42, 75.71 52.31, 0 50 M166 50 C125.55 49.1, 84.08 48.58, 0 50 M0 50 C-1.4 33.56, -1.33 12.44, 0 0 M0 50 C0.1 39.42, 0.63 28.63, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1514.072395324707 931.1904296875) rotate(0 24.84166717529297 10)"><text x="24.84166717529297" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">submit</text></g><g stroke-linecap="round" transform="translate(941.583984375 766.068359375) rotate(0 83 25)"><path d="M0 0 C44.86 2.47, 93.63 1.27, 166 0 M0 0 C44.29 0.11, 87.68 0.49, 166 0 M166 0 C166.49 12.68, 164.75 27.65, 166 50 M166 0 C165.9 18.51, 166.84 37.65, 166 50 M166 50 C125.93 49.3, 84.03 51.62, 0 50 M166 50 C126.81 47.79, 85.27 47.72, 0 50 M0 50 C0.23 38.53, -0.16 25.04, 0 0 M0 50 C-0.4 34.11, 0.63 16.84, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(954.6006546020508 781.068359375) rotate(0 69.98332977294922 10)"><text x="69.98332977294922" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">account 1 + notes</text></g><g stroke-linecap="round" transform="translate(941.2998046875 816.48046875) rotate(0 83 25)"><path d="M0 0 C62.36 -0.1, 125.6 0.55, 166 0 M0 0 C43.9 0.6, 89.04 0.03, 166 0 M166 0 C167.25 13.26, 163.88 21.53, 166 50 M166 0 C165.64 11.27, 166.41 24.47, 166 50 M166 50 C124.04 49.68, 82.74 52.65, 0 50 M166 50 C129.09 48.16, 93.12 48.56, 0 50 M0 50 C0.74 34.69, 0.34 16.4, 0 0 M0 50 C-0.55 31.5, 0.39 13.18, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(952.1398620605469 831.48046875) rotate(0 72.15994262695312 10)"><text x="72.15994262695312" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">account 2 + notes</text></g><g stroke-linecap="round" transform="translate(942.13671875 868.0595703125) rotate(0 83 25)"><path d="M0 0 C51 -0.79, 103.43 -1.08, 166 0 M0 0 C59.87 -0.92, 120.88 0.69, 166 0 M166 0 C164.39 20.5, 164.47 38.48, 166 50 M166 0 C165.57 10.99, 166.73 21.66, 166 50 M166 50 C125.68 49.93, 86.85 50.22, 0 50 M166 50 C122.81 49.85, 78.6 50.35, 0 50 M0 50 C1.39 33.37, 0.09 12.65, 0 0 M0 50 C-1.17 33.99, -1.04 17.83, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1018.5607376098633 883.0595703125) rotate(0 6.575981140136719 10)"><text x="6.575981140136719" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">...</text></g><g stroke-linecap="round" transform="translate(942.111328125 919.146484375) rotate(0 83.1806640625 25)"><path d="M0 0 C50.76 2.08, 99.07 -1.18, 166.36 0 M0 0 C37.74 -2.23, 72.99 -1.96, 166.36 0 M166.36 0 C164.54 17.27, 166.87 32.51, 166.36 50 M166.36 0 C166 13.49, 167.48 27.87, 166.36 50 M166.36 50 C127.51 48.7, 90.2 49.76, 0 50 M166.36 50 C120.1 50.66, 72.35 51.27, 0 50 M0 50 C0.24 31.79, 0.87 8.59, 0 0 M0 50 C0.13 37.27, 1.12 22.72, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(953.6760482788086 934.146484375) rotate(0 71.6159439086914 10)"><text x="71.6159439086914" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">account N + notes</text></g><g transform="translate(1195.055892944336 186.92282104492188) rotate(0 100.49195861816406 17.5)"><text x="100.49195861816406" y="24.668" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Block producer</text></g><g transform="translate(912.3445587158203 202.35357666015625) rotate(0 53.54997253417969 17.5)"><text x="53.54997253417969" y="24.668" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">mempool</text></g><g transform="translate(1144.528091430664 648.5755004882812) rotate(0 131.05393981933594 17.5)"><text x="131.05393981933594" y="24.668" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Network TX builder</text></g><g stroke-linecap="round" transform="translate(1826.580078125 303.4328918457031) rotate(0 86.296875 49.87451171875)"><path d="M1.07 0.1 L172.39 0.72 L171.69 99.09 L1.99 101.37" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C55.64 0.79, 112.06 -0.34, 172.59 0 M0 0 C42.54 1.25, 84.34 1.49, 172.59 0 M172.59 0 C174.01 33.03, 172.93 63.95, 172.59 99.75 M172.59 0 C172.35 30.55, 172.22 62.06, 172.59 99.75 M172.59 99.75 C129.05 98.37, 89.28 98.06, 0 99.75 M172.59 99.75 C122.15 98.74, 72.56 99.87, 0 99.75 M0 99.75 C-0.89 69.15, -0.58 38.73, 0 0 M0 99.75 C-1.46 74.25, -0.79 48.86, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1859.093620300293 343.3074035644531) rotate(0 53.78333282470703 10)"><text x="53.78333282470703" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">batch provers</text></g><g mask="url(#mask-FHGKjILuTTBxUOYPj--JK)" stroke-linecap="round"><g transform="translate(1392.2385557092725 333.58198269460354) rotate(0 213.7101036338833 -0.05567869495371269)"><path d="M0.28 -1.11 C71.58 -1.07, 357.17 -0.8, 428.45 -0.39 M-1.03 0.93 C70.02 1.13, 355.37 0.83, 427.26 0.58" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1392.2385557092725 333.58198269460354) rotate(0 213.7101036338833 -0.05567869495371269)"><path d="M428.73 1.87 L414.63 6.43 L411.71 -6.97 L428.24 0.29" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M427.26 0.58 C421.04 2.3, 416.26 3.9, 413.68 6.95 M427.26 0.58 C422.8 3.57, 417.16 4.66, 413.68 6.95 M413.68 6.95 C412.74 4.09, 413.45 0.76, 413.65 -5.73 M413.68 6.95 C413.15 4.11, 413.91 1.06, 413.65 -5.73 M413.65 -5.73 C419.91 -4.8, 424.07 -2.27, 427.26 0.58 M413.65 -5.73 C418.43 -3.65, 423.52 -1.09, 427.26 0.58 M427.26 0.58 C427.26 0.58, 427.26 0.58, 427.26 0.58 M427.26 0.58 C427.26 0.58, 427.26 0.58, 427.26 0.58" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-FHGKjILuTTBxUOYPj--JK"><rect x="0" y="0" fill="#fff" width="1921.137969771772" height="434.2758953804296"></rect><rect x="1549.1203153528272" y="323.9289390375161" fill="#000" width="115.13589477539062" height="20" opacity="1"></rect></mask><g transform="translate(1549.1203153528272 323.9289390375161) rotate(0 56.82834399032873 9.597364962133724)"><text x="57.56794738769531" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">selected batch</text></g><g mask="url(#mask-OMgkQNoppFCdHyQcgvXti)" stroke-linecap="round"><g transform="translate(1821.2908729286164 375.1611413749615) rotate(0 -215.22864248836868 0.3664609535285308)"><path d="M-0.13 -1.03 C-71.69 -0.59, -357.76 1.5, -429.57 1.77 M-1.66 1.04 C-73.33 1.19, -359.16 -0.26, -430.33 -0.19" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1821.2908729286164 375.1611413749615) rotate(0 -215.22864248836868 0.3664609535285308)"><path d="M-431.24 1.68 L-414.97 -5.48 L-415.96 5.83 L-429.55 0.65" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-430.33 -0.19 C-427.71 -1.5, -422.17 -5.06, -416.72 -6.5 M-430.33 -0.19 C-427.44 -1.7, -424.29 -3.38, -416.72 -6.5 M-416.72 -6.5 C-417.96 -1.77, -417.5 0.03, -416.75 6.18 M-416.72 -6.5 C-416.21 -2.07, -417.15 2.31, -416.75 6.18 M-416.75 6.18 C-420.38 4.52, -423.38 3.92, -430.33 -0.19 M-416.75 6.18 C-421 4.36, -423.56 2.93, -430.33 -0.19 M-430.33 -0.19 C-430.33 -0.19, -430.33 -0.19, -430.33 -0.19 M-430.33 -0.19 C-430.33 -0.19, -430.33 -0.19, -430.33 -0.19" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-OMgkQNoppFCdHyQcgvXti"><rect x="0" y="0" fill="#fff" width="2351.2342323036164" height="476.61689632684556"></rect><rect x="1555.9832328529328" y="365.8890188509031" fill="#000" width="100.67192077636719" height="20" opacity="1"></rect></mask><g transform="translate(1555.983232852933 365.8890188509031) rotate(0 50.078997587314916 9.638583477586963)"><text x="50.335960388183594" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">proven batch</text></g><g stroke-linecap="round" transform="translate(1825.23486328125 440.9597473144531) rotate(0 86.296875 49.87451171875)"><path d="M-0.16 -1.49 L170.96 -1.38 L172.99 100.39 L0.89 98.49" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C55.5 -0.52, 111.64 2.18, 172.59 0 M0 0 C41.53 -1.59, 82.27 -0.61, 172.59 0 M172.59 0 C173.28 38.32, 170.56 72.31, 172.59 99.75 M172.59 0 C173.21 31.11, 172.82 63.08, 172.59 99.75 M172.59 99.75 C112.81 97.93, 53.08 100.96, 0 99.75 M172.59 99.75 C132.65 99.81, 92.94 99.96, 0 99.75 M0 99.75 C1.82 62, -0.8 25.1, 0 0 M0 99.75 C0.19 70.72, 0.14 42.6, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1864.7900733947754 480.8342590332031) rotate(0 46.74166488647461 10)"><text x="46.74166488647461" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">block prover</text></g><g mask="url(#mask-8Rc3oPwb2Jtf26gw_UHLI)" stroke-linecap="round"><g transform="translate(1385.4363807411166 461.83910065452073) rotate(0 216.78576694538356 0.5567261642377161)"><path d="M-0.13 -0.59 C72.26 -0.66, 362.85 -0.51, 435.22 -0.46 M-1.65 1.72 C70.5 1.8, 361.3 0.94, 434.31 0.79" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1385.4363807411166 461.83910065452073) rotate(0 216.78576694538356 0.5567261642377161)"><path d="M435.01 0.92 L422.26 7.76 L421.41 -6.76 L436.27 0.82" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M434.31 0.79 C428.47 3.27, 423.4 4.25, 420.74 7.16 M434.31 0.79 C430.05 2.25, 427.33 4.16, 420.74 7.16 M420.74 7.16 C420.24 2.59, 420.66 -1.43, 420.7 -5.52 M420.74 7.16 C420.88 3.67, 420.2 -0.22, 420.7 -5.52 M420.7 -5.52 C426.28 -2.31, 430.11 -1.91, 434.31 0.79 M420.7 -5.52 C424.89 -3.76, 428.41 -1.59, 434.31 0.79 M434.31 0.79 C434.31 0.79, 434.31 0.79, 434.31 0.79 M434.31 0.79 C434.31 0.79, 434.31 0.79, 434.31 0.79" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-8Rc3oPwb2Jtf26gw_UHLI"><rect x="0" y="0" fill="#fff" width="1920.5809119911166" height="561.9339095993837"></rect><rect x="1548.1446937293979" y="451.8865051269522" fill="#000" width="109.7279052734375" height="20" opacity="1"></rect></mask><g transform="translate(1548.1446937293979 451.8865051269522) rotate(0 54.07745395710231 10.509321691806235)"><text x="54.86395263671875" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">selected block</text></g><g mask="url(#mask-Fs6Q0vPU5IAIJReVG0S7B)" stroke-linecap="round"><g transform="translate(1814.4044237383691 499.39281159202164) rotate(0 -213.0922577059481 -0.5254379269335914)"><path d="M-0.57 -1.03 C-71.57 -1.11, -355.99 -0.25, -427.18 -0.12 M1.34 1.04 C-69.62 0.56, -355.95 -2.1, -427.52 -2.09" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1814.4044237383691 499.39281159202164) rotate(0 -213.0922577059481 -0.5254379269335914)"><path d="M-427.08 -3.31 L-415.71 -9.87 L-412.03 5.29 L-428.4 -1.55" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-427.52 -2.09 C-426.06 -1.86, -421.63 -3.76, -413.89 -8.36 M-427.52 -2.09 C-422.63 -4.4, -418.75 -6.41, -413.89 -8.36 M-413.89 -8.36 C-414.36 -3.13, -413.14 0.45, -413.96 4.32 M-413.89 -8.36 C-413.86 -4.05, -414.13 -0.64, -413.96 4.32 M-413.96 4.32 C-420.11 0.71, -422.7 -1.27, -427.52 -2.09 M-413.96 4.32 C-416.61 2.15, -420 1.72, -427.52 -2.09 M-427.52 -2.09 C-427.52 -2.09, -427.52 -2.09, -427.52 -2.09 M-427.52 -2.09 C-427.52 -2.09, -427.52 -2.09, -427.52 -2.09" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-Fs6Q0vPU5IAIJReVG0S7B"><rect x="0" y="0" fill="#fff" width="2342.7365818517383" height="599.8044544263903"></rect><rect x="1549.9023842935012" y="489.1869901748378" fill="#000" width="100.67192077636719" height="20" opacity="1"></rect></mask><g transform="translate(1549.9023842935012 489.1869901748378) rotate(0 51.40978173892006 9.680383490250279)"><text x="50.335960388183594" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">proven batch</text></g><g stroke-linecap="round" transform="translate(1851.68505859375 796.8194274902344) rotate(0 86.296875 49.87451171875)"><path d="M0 0 C56.44 -0.42, 112.67 1.33, 172.59 0 M0 0 C35.11 -0.8, 70.93 0.04, 172.59 0 M172.59 0 C171.77 23.1, 174.16 47.9, 172.59 99.75 M172.59 0 C172.16 26.6, 172.41 51.49, 172.59 99.75 M172.59 99.75 C105.32 100.14, 36.58 100.69, 0 99.75 M172.59 99.75 C110.84 100.51, 48.85 101.01, 0 99.75 M0 99.75 C-1.7 75.69, 1.14 48.39, 0 0 M0 99.75 C0.3 68.12, 0.5 35.19, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-linecap="round" transform="translate(1837.16845703125 819.9297790527344) rotate(0 86.296875 49.87451171875)"><path d="M1.97 0.96 L172.3 -1.99 L173.04 100.58 L0.23 99.19" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C37.36 1.5, 74.72 1.73, 172.59 0 M0 0 C52.51 1.36, 104.72 1.19, 172.59 0 M172.59 0 C173.81 21.81, 171.42 39.19, 172.59 99.75 M172.59 0 C173.33 27.82, 173.74 56.98, 172.59 99.75 M172.59 99.75 C123.44 101.77, 78.26 101.66, 0 99.75 M172.59 99.75 C115.05 100.86, 57.76 100.52, 0 99.75 M0 99.75 C2.18 70.95, 1.17 42.76, 0 0 M0 99.75 C0.21 76.79, -0.33 52.83, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1850.5736618041992 859.8042907714844) rotate(0 72.89167022705078 10)"><text x="72.89167022705078" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">internal tx provers</text></g><g mask="url(#mask-btudlYsZ33JBMCVpRF_oW)" stroke-linecap="round"><g transform="translate(1119.120296293186 787.3234215631928) rotate(0 165.7140989357226 -4.913192348253233)"><path d="M0.84 0.48 C56.02 -1.05, 276.36 -6.8, 331.61 -8.35 M-0.19 -0.31 C54.78 -2.3, 275.24 -9.1, 330.59 -10.31" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1119.120296293186 787.3234215631928) rotate(0 165.7140989357226 -4.913192348253233)"><path d="M328.86 -9.08 L316.72 -3.12 L315.47 -15.77 L330.63 -9.79" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M330.59 -10.31 C326.63 -8.08, 321.8 -4.84, 317.18 -3.6 M330.59 -10.31 C326.86 -8.29, 323.54 -6.14, 317.18 -3.6 M317.18 -3.6 C317.92 -8.2, 317.47 -12.06, 316.83 -16.28 M317.18 -3.6 C316.94 -8.66, 316.64 -12.63, 316.83 -16.28 M316.83 -16.28 C321.23 -14.98, 322.28 -13.52, 330.59 -10.31 M316.83 -16.28 C320 -15.17, 322.41 -13.1, 330.59 -10.31 M330.59 -10.31 C330.59 -10.31, 330.59 -10.31, 330.59 -10.31 M330.59 -10.31 C330.59 -10.31, 330.59 -10.31, 330.59 -10.31" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-btudlYsZ33JBMCVpRF_oW"><rect x="0" y="0" fill="#fff" width="1550.8706752220676" height="895.9802090732064"></rect><rect x="1220.7788185823335" y="762.995027808186" fill="#000" width="128.43333435058594" height="40" opacity="1"></rect></mask><g transform="translate(1220.7788185823338 762.995027808186) rotate(0 64.05557664657479 19.415201406753567)"><text x="64.21666717529297" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">select candidate</text><text x="64.21666717529297" y="34.096000000000004" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">account</text></g><g mask="url(#mask-2z-lc6Wh3v72fe_V1QWDZ)" stroke-linecap="round"><g transform="translate(1621.0521236796164 834.8887222365529) rotate(0 102.28482031314167 1.659837350975522)"><path d="M0.37 1.15 C20.54 1.35, 87.25 0.8, 121.43 0.84 C155.62 0.88, 191.48 1.13, 205.47 1.4 M-0.9 0.7 C19.04 1.12, 86.01 1.88, 120.23 2.18 C154.44 2.47, 190.22 2.81, 204.39 2.48" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1621.0521236796164 834.8887222365529) rotate(0 102.28482031314167 1.659837350975522)"><path d="M203.65 2.18 L192.37 8.5 L191.6 -4.02 L204.31 2.71" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M204.39 2.48 C201.29 4.05, 194.87 6.08, 190.85 8.92 M204.39 2.48 C200.7 4.84, 196.94 6.41, 190.85 8.92 M190.85 8.92 C189.6 4.57, 190.99 -0.57, 190.75 -3.75 M190.85 8.92 C190.98 5.8, 190.1 2.53, 190.75 -3.75 M190.75 -3.75 C194.57 -1.7, 199.72 0.22, 204.39 2.48 M190.75 -3.75 C193.98 -2.87, 197.09 -0.49, 204.39 2.48 M204.39 2.48 C204.39 2.48, 204.39 2.48, 204.39 2.48 M204.39 2.48 C204.39 2.48, 204.39 2.48, 204.39 2.48" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-2z-lc6Wh3v72fe_V1QWDZ"><rect x="0" y="0" fill="#fff" width="1927.1048580546164" height="936.7252878915187"></rect><rect x="1695.3315277099607" y="826.1080017089844" fill="#000" width="95.29592895507812" height="20" opacity="1"></rect></mask><g transform="translate(1695.3315277099607 826.1080017089844) rotate(0 28.00541628279717 10.440557878544041)"><text x="47.64796447753906" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">executed tx</text></g><g mask="url(#mask-HlRQQpPQPBqRx4tmb-NZd)" stroke-linecap="round"><g transform="translate(1829.2309295809482 891.7867959018859) rotate(0 -104.27220446658572 0.19447815733110474)"><path d="M0.36 0.17 C-13.13 0.22, -45.5 1.15, -80.37 1.27 C-115.25 1.4, -187.76 1.25, -208.9 0.93 M-0.91 -0.78 C-14.09 -1.19, -44.02 -0.63, -78.27 -0.64 C-112.52 -0.66, -185.04 -1.01, -206.41 -0.87" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1829.2309295809482 891.7867959018859) rotate(0 -104.27220446658572 0.19447815733110474)"><path d="M-208.15 -0.68 L-191.38 -5.88 L-192.55 7.13 L-204.81 -2.62" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-206.41 -0.87 C-201.58 -4.53, -196.64 -6.23, -192.82 -7.21 M-206.41 -0.87 C-200.95 -3.56, -196.07 -5.18, -192.82 -7.21 M-192.82 -7.21 C-192.25 -1.8, -193.77 1.45, -192.81 5.46 M-192.82 -7.21 C-192.27 -3.6, -193.16 -0.53, -192.81 5.46 M-192.81 5.46 C-196.53 3.2, -198.7 2.05, -206.41 -0.87 M-192.81 5.46 C-197.31 2.82, -201 2.05, -206.41 -0.87 M-206.41 -0.87 C-206.41 -0.87, -206.41 -0.87, -206.41 -0.87 M-206.41 -0.87 C-206.41 -0.87, -206.41 -0.87, -206.41 -0.87" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-HlRQQpPQPBqRx4tmb-NZd"><rect x="0" y="0" fill="#fff" width="2137.3628923818173" height="992.7787501315715"></rect><rect x="1712.5627670288086" y="882.6705017089844" fill="#000" width="74.89595031738281" height="20" opacity="1"></rect></mask><g transform="translate(1712.5627670288088 882.6705017089844) rotate(0 12.3959580855539 9.310772350232583)"><text x="37.447975158691406" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">proven tx</text></g><g mask="url(#mask-_t9b73WzjzFhhsZq9A97b)" stroke-linecap="round"><g transform="translate(1538.8140625 971.1904296875) rotate(0 -391.0141609415505 -274.47740345137845)"><path d="M0 0 C-0.93 26.22, -1.89 50.55, 0 99.8 M0 0 C0.37 33.59, 0.16 67.82, 0 99.8 M0 99.8 C1.71 110.13, -3.76 115.61, -16 115.8 M0 99.8 C-1.81 110.3, -5.3 118.09, -16 115.8 M-16 115.8 C-266.23 114.28, -516.85 114.16, -766.05 115.8 M-16 115.8 C-198.62 115.04, -381.11 115.06, -766.05 115.8 M-766.05 115.8 C-774.77 117.1, -781.58 112.12, -782.05 99.8 M-766.05 115.8 C-777.48 116.63, -783.43 109.93, -782.05 99.8 M-782.05 99.8 C-781.08 -160.61, -781.65 -421.86, -782.05 -648.74 M-782.05 99.8 C-782.04 -83.82, -782.7 -267.4, -782.05 -648.74 M-782.05 -648.74 C-783.85 -658, -775.52 -663.36, -766.05 -664.74 M-782.05 -648.74 C-781.61 -660, -776.37 -664.91, -766.05 -664.74 M-766.05 -664.74 C-738.97 -664.06, -709.56 -664.11, -645.1 -664.74 M-766.05 -664.74 C-735.66 -664.06, -706.45 -665.95, -645.1 -664.74" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1538.8140625 971.1904296875) rotate(0 -391.0141609415505 -274.47740345137845)"><path d="M-646.94 -666.52 L-660.55 -657.11 L-657.44 -669.81 L-644.72 -665.25" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-645.1 -664.74 C-648.98 -662.01, -653.07 -660.74, -658.75 -658.52 M-645.1 -664.74 C-649.65 -663.19, -654.49 -661.08, -658.75 -658.52 M-658.75 -658.52 C-658.81 -664.4, -658.73 -668.28, -658.64 -671.2 M-658.75 -658.52 C-659.05 -663.17, -658.77 -668.13, -658.64 -671.2 M-658.64 -671.2 C-655.39 -669.87, -650.79 -667.99, -645.1 -664.74 M-658.64 -671.2 C-653.89 -668.51, -649.8 -666.71, -645.1 -664.74 M-645.1 -664.74 C-645.1 -664.74, -645.1 -664.74, -645.1 -664.74 M-645.1 -664.74 C-645.1 -664.74, -645.1 -664.74, -645.1 -664.74" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-_t9b73WzjzFhhsZq9A97b"><rect x="0" y="0" fill="#fff" width="2420.864453125" height="1851.7274075478836"></rect><rect x="719.572006225586" y="1076.9869079589844" fill="#000" width="74.38333129882812" height="20" opacity="1"></rect></mask><g transform="translate(719.5720062255859 1076.9869079589844) rotate(0 428.22789533286357 -380.2738817228628)"><text x="37.19166564941406" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">submit tx</text></g><g transform="translate(1254.5961608886719 42.987884521484375) rotate(0 37.855987548828125 17.5)"><text x="37.855987548828125" y="24.668" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Store</text></g><g transform="translate(1489.5084915161133 714.8482360839844) rotate(0 43.76396942138672 17.5)"><text x="43.76396942138672" y="24.668" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">builder</text></g><g transform="translate(986.6747894287109 722.5435485839844) rotate(0 38.66798400878906 17.5)"><text x="38.66798400878906" y="24.668" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">state</text></g><g stroke-linecap="round" transform="translate(417.82763671875 693.4087829589844) rotate(0 86.296875 49.87451171875)"><path d="M0 0 C50.51 1.46, 97.25 -1.01, 172.59 0 M0 0 C56.08 -0.67, 111.61 -1.12, 172.59 0 M172.59 0 C173.67 19.49, 172.47 39.34, 172.59 99.75 M172.59 0 C173.16 19.99, 171.72 41.9, 172.59 99.75 M172.59 99.75 C135.67 98.34, 101.86 100.57, 0 99.75 M172.59 99.75 C135.25 100.22, 98.65 99.61, 0 99.75 M0 99.75 C-2.15 69.77, -1.95 41.58, 0 0 M0 99.75 C0.92 62.93, -0.25 27.22, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-linecap="round" transform="translate(403.31103515625 716.5191345214844) rotate(0 86.296875 49.87451171875)"><path d="M-0.78 0.23 L172.02 -0.3 L171.32 98.57 L-0.77 98.05" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C42.07 -2.4, 85.41 0.69, 172.59 0 M0 0 C68.65 -1.13, 134.87 -1.37, 172.59 0 M172.59 0 C172.63 21.32, 171.15 45.58, 172.59 99.75 M172.59 0 C172.12 27.66, 172.13 54.63, 172.59 99.75 M172.59 99.75 C130.09 101.11, 86.15 99.34, 0 99.75 M172.59 99.75 C117.9 99.72, 63.78 100.84, 0 99.75 M0 99.75 C-0.52 77.01, 2.01 55.06, 0 0 M0 99.75 C-1.16 76.46, -0.25 53.04, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(419.27197265625 756.3936462402344) rotate(0 70.3359375 10)"><text x="70.3359375" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">remote tx provers</text></g><g mask="url(#mask-2kIZPwhUmp6pJ3lBGV73f)" stroke-linecap="round"><g transform="translate(1127.3948057092725 116.783203125) rotate(0 -43.15996586130774 90.27956580719729)"><path d="M0 0 C2.06 61.84, 0.85 120.92, 0 164.27 M0 0 C-1.36 54.87, -1.92 110.43, 0 164.27 M0 164.27 C-2 175.5, -6.15 179.35, -16 180.27 M0 164.27 C-1.85 175.37, -7.55 179.04, -16 180.27 M-16 180.27 C-41.97 180.05, -67.66 179.62, -87.46 180.27 M-16 180.27 C-43.42 180.77, -70.45 180.52, -87.46 180.27" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1127.3948057092725 116.783203125) rotate(0 -43.15996586130774 90.27956580719729)"><path d="M-86.4 180.59 L-73.14 173.77 L-73.26 188.02 L-88.4 180.97" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-87.46 180.27 C-81.93 178.58, -77.76 174.83, -73.79 174.09 M-87.46 180.27 C-82.7 178.2, -78.56 176.7, -73.79 174.09 M-73.79 174.09 C-74.36 175.6, -73.57 177.94, -73.94 186.76 M-73.79 174.09 C-73.37 177.18, -73.99 180.35, -73.94 186.76 M-73.94 186.76 C-76.53 184.16, -80.45 182.24, -87.46 180.27 M-73.94 186.76 C-78.44 184.59, -81.56 182.89, -87.46 180.27 M-87.46 180.27 C-87.46 180.27, -87.46 180.27, -87.46 180.27 M-87.46 180.27 C-87.46 180.27, -87.46 180.27, -87.46 180.27" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-2kIZPwhUmp6pJ3lBGV73f"><rect x="0" y="0" fill="#fff" width="1314.852111418545" height="397.04896086891586"></rect><rect x="1088.0198057092725" y="277.04896086891586" fill="#000" width="78.75" height="40" opacity="1"></rect></mask><g transform="translate(1088.0198057092725 277.04896086891586) rotate(0 -3.7849658613077395 -69.98619193671857)"><text x="39.375" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">committed</text><text x="39.375" y="34.096000000000004" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">state</text></g></svg>
\ No newline at end of file
diff --git a/docs/internal/src/assets/operator_architecture.svg b/docs/internal/src/assets/operator_architecture.svg
new file mode 100644
index 000000000..961c58faa
--- /dev/null
+++ b/docs/internal/src/assets/operator_architecture.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1272.2340820360434 841.25" width="1272.2340820360434" height="841.25"><!-- svg-source:excalidraw --><metadata><!-- payload-type:application/vnd.excalidraw+json --><!-- payload-version:2 --><!-- payload-start -->eyJ2ZXJzaW9uIjoiMSIsImVuY29kaW5nIjoiYnN0cmluZyIsImNvbXByZXNzZWQiOnRydWUsImVuY29kZWQiOiJ4nO1dWXPiSNZ971/hqHlcdTAwMWRycl/mzftWhfFu19dcdTAwMTNcdTAwMGVcZlx1MDAxOFPGgFmMYaL/+3cv2CBQSlxiUNluXHUwMDBmVHRHXHUwMDE1XHUwMDAykZLynHtu5l3++8fa2rd2r1H69u+1b6WXQr5aKTbz3W//xPefS81WpV6DQ3zw71a90yxcZj553243Wv/+17/yjVx1MDAwNlx1MDAxOX+LXHUwMDE06o/Db5aqpcdSrd2Cz/5cdTAwMWb8e23tv4P/w5FKXHUwMDExv9882eLHpYuGeTgo9be3M/eb2YfTwVdcdTAwMDdcdTAwMWZ6XHUwMDFiULNUaOdr5WppfOhcdTAwMDXezzDtJIH/qFx1MDAxNdRcdTAwMTiljVx1MDAxYVx1MDAxZO/Bcam0IEI4J5zWXFxYOzrarVx1MDAxNNv3eD1MXHUwMDEzpfn4a/elSvm+XHJHmLGEwlx1MDAxMfr2cqPPXGZH8u81Onqn1W7WXHUwMDFmSpv1ar2Jw/1cdTAwMDcr4Z/xYG/zhYdys96pXHUwMDE1R59pN/O1ViPfhLsz/txdpVo9bfdcdTAwMDZnh7tcZnfz29RvXFy+XHUwMDBlnE29XHUwMDFm9S340fJ9rdRqTXyn3shcdTAwMTcqbbxFjI6vXHUwMDAyR9jYL1x1MDAwZVx1MDAxZdZ/xmNq5lx1MDAxZkv7+LRqnWp19HalVizhM/h2q+tcdTAwMTM/Vyu+/tzbo1x1MDAxZT9H8frOX+PBl0p4ZiaUMfCA5Pgmj+ecXHUwMDEwYvrdbL02mH+cXHUwMDFhTqk0xozH1dqCSddcdTAwMWWc9i5fbZXGXHUwMDBmXHUwMDAxx7Y9PSGDk3JizrVLL+MnXHUwMDEzmLInt1vC3j5eZJ9cdTAwMGV2X07V9/Wd68fut9Hn/nr92/hcdTAwMDZ2XHUwMDFhxfxwPMxI5oQ0XHUwMDFh5ipcdTAwMWZcdTAwMWSvVmpcdTAwMGbTd7daLzyML+GPwE2bXHUwMDAykH80IVx1MDAwME1cXMxcdTAwMWJ2XHUwMDE0gMNauHlcbuDB6Fx1MDAxNHZcZkBDUi4jscOEIE4xa1x1MDAxZFx1MDAxNZZa5WRcdTAwMThFnK5QXHUwMDEzgZqGXHUwMDFmNVx1MDAxM1x1MDAxZn+FXHUwMDA3Z4YzYcM4wKFYXHUwMDE2hVx1MDAwZabhXHUwMDE5Sk2tW1x1MDAwNFx1MDAxZGlO4PF8xHlcYpe//dIuNWv56lqr1HyuXHUwMDE0Sq3A06zX2qeV/vBcdTAwMDIm3t3JP1aqePvVxPnWq5Uy3olvXHUwMDA1XHUwMDE4eqn5LXg72lx1MDAxNbBJo1x1MDAwZtzW2+1XyzT4QFx1MDAwMU6ar9RKzf0kxqjerJQrMOaz2deQ77TrJ6XW8CrazU4peK9KeyNcdTAwMWJDuIrB9vHlRrnzcNzd46Xb2l3m9rZePXxcbmNcdTAwMWJPOY1tITWxVnEntaHM6fHMXHUwMDE5YJsqTpy2kjLO4WHaMXLfwG1cdDdCXG7jsYzaOVwiXHUwMDFjXHJazVSw/Y+7wesjce2Wh/VTclhcdTAwMGJONXNKy+CMfYO1iTR6TDFBXHUwMDA1oDB9WFx1MDAwM4/L4FRNXG7rRr0ybVPHf1tcdTAwMWJPi8E/Rn//zz+9n86E5lx1MDAxZb7Gs278/ZCpreZb7c3642OlXHJcdTAwMTeWw0GFbn0732xvwPOq1MrTx0q1YsSRwbfWm816976UXHUwMDBmPX34XuSxRr3aK1x1MDAwZp7oLEtOj1x1MDAwZa73W81f27ubL3m6TW/PnvaP5pDCXHUwMDAwZsJB6irDfJBcdTAwMDdcdTAwMWJCmFx1MDAwNDttzVx1MDAwMPIhxDtBrFDOXHUwMDBieW5cdTAwMTlx0nFmjXT4XHUwMDFhz5KvXHUwMDAy/TRMejM59lx1MDAwMcKaWSetXHUwMDBm/IJF23SUXHUwMDAxzoo0XHUwMDE173D+5XPPlVx1MDAxYvuw3ji5/9H5dXNeOm5vNCdcdTAwMDXw21x1MDAxY8zjbFx1MDAwZkjef/rPO0tJ7/063toq0/Of33uV5+7Zy0OeuufZp1x1MDAxZH75PPOYr5+fZLv9851dtpHJ5V86dqnhXHUwMDBlz3uXzb6U+4W9evbC6MPczcND76iXwnl/Xl6f7Gycnfeu1Pn9WVlU2J14SuG8p9ubXHUwMDE3/Kad/fm0337eqj0/PuV6xVx1MDAxNM57eLBrMzcv5e7R5Vx1MDAwZlHKnJ/x+4ZK4byslz/IXHUwMDE1lap2vre2u7aYK7bLuymct7qXPT2612ePnZPDrWJnc6/Lm1x070PIjExZRnCBJNdiXHUwMDFly1x1MDAxOMPz/lmfyGNcdTAwMTPA0dKBs1xmLFx1MDAwZTyvpime83iKN2BZmXNcdTAwMWOYXFxcdTAwMWJlXHUwMDAynsOI6VXKXHUwMDBl21x1MDAxN2H2VnJml4pR7uCPh9i5iiZ2qlx1MDAxNXPglC9E7DGqXHUwMDBlXFxAI9VcdTAwMWNzN+Ssfa/ni3/WbvPVPFxmNWDjXHUwMDAynlrAz0/FU2vXXHUwMDAz7vGUmzZDKE27aTj6tfDg03HR4o3mXHUwMDE040yh2UhBlGRK+n00blxyUdRILVwi0CxcdTAwMDR8XHUwMDAw/Fx1MDAwN8GGq5TjXHQ3QrMgwlxiXHUwMDAzQlx1MDAwM1jB4Fx1MDAwZo1/46ugO1x1MDAwNZet7Vx1MDAwN3d4/ZK/vlx1MDAxM1q/5Fx1MDAxY1SZVkpcdTAwMDdn9CvmlYvEvIOnXHUwMDBm1oWNn0pcdTAwMWGQfzVXXHUwMDBiQT5VRy5yguIrXHUwMDEznpvj84UscoqOXeCxvu5OJKGVXHUwMDAxsVx1MDAxNTp4ayhRYD6lXHUwMDE11mmp4Ops4EPlfFx1MDAwM8FLXGbnWo2d1b8mx5nUlfzWblamnL1S9bbeTSQ0XFy++Ou+dcrV5pbKdFx1MDAxZjNCybN6mJtcIlx1MDAxZEqmXHUwMDE4kdRcdTAwMWHBvVx1MDAwZSVz4FByq5SRxu9QSkKn1olGxGRcdTAwMWPhUtNcdG9zxUgjRurM4UhS6lx1MDAxY9xjOf7VgCPp1PS7I+7RWlvu2EKLSH4hPsvfu/l+eLXJvqv129rDXcm52nnN8Ll0uJYgcsfzcClcdTAwMWTuXHUwMDFmTVwiXHUwMDFkXHUwMDBlfEZcdTAwMDBcdTAwMTFcZu+ftDyswyWoXHUwMDA2pqlcdTAwMTTIXHUwMDE0YWRIVFx1MDAxNfDUwJF33K/DV4urPlxcPM+BXHUwMDBiMC5gdaz0LbDA3Y/U4WCTwbuyMl1cdTAwMWS+wNxccunwk9zmu4jvx0qxXHUwMDE4NFx1MDAwN1P6e4ZdmdbfXHUwMDEzo05HdW9lq4V18ySK6q6S3c11nsBmy+SWXHI8aLA+1IBLzz2GTShHmJDgOFk/fFx1MDAxOYdcdTAwMGaoQGzA+Fx1MDAwNCP82lx1MDAxNX49+O0mx69yIFx1MDAxZoFCffCVzky/O3ajXHUwMDE1XHUwMDEzXHUwMDAymHd8XHUwMDA1v92u5Z5y1bx8PKg/XHUwMDFk3+V0+fqht3+ReFx1MDAxZDP7Yvt78uKqdl1cdTAwMTPlp++n99+Pa9lcdTAwMTTWw84vj8p5/tg+uDrf29+93C00Ly76KZw3W9y9VqJ7dFTey3V6h3Inw053UjhvvZwtXHUwMDE2XHUwMDFm9jKX94rnmmXZ67DL41x1MDAxNM7b7WbM9Xd6dbi/n1x1MDAxNUeZy7ueeDpIYV1QcaZcdTAwMTmGR8iUXCI5/LMoiVx1MDAxZVx1MDAwMVx1MDAxMVx1MDAwMb5cdTAwMTRcdTAwMDc5zVx1MDAxNafgmkzxmdFEx/GZNVx1MDAwNCxcdTAwMTQ4o1pcdTAwMGJcdTAwMDOUOFx1MDAwNtdXXlx1MDAxNkyBzl7mXHThYFJYwY1viUDwyM1eeGaOmlRDOHDmgluH3usyamRcdTAwMDOP/1nLNevFznstXHUwMDBizlAmM3TBtDJcdTAwMTlcXMFa+Fx1MDAwMtJcdTAwMTEp/f3ds/Vcct5061l1cFY6XHUwMDEzj7XaQXKRMnC/mUL3wvlUXG5u98JRaVxchJOxcr9cdTAwMTfFddBccpzpZnDUKHCTfcv9gkW634xcdTAwMTnqrLaLXHUwMDAxezGdsrVO2/3dbuGJ9ot7N+vHt7nb0+pcXP63dFpcdTAwMDVcdTAwMThsKXvnXHUwMDFmTVx1MDAxMntcdTAwMDf+tySOKW7B01x1MDAxNpZPXHUwMDAxg1uiXHJcdTAwMWPV3L9uXHUwMDBl3rdcdTAwMDLv2ygmXHKXRjBf3OJcblx1MDAxN1x1MDAxZVxciDlim1x1MDAxY9hcdTAwMTgupPXAgoWN4Fx1MDAxYiwsRlx1MDAxNmpcdTAwMTAj6Zm7YWiTcmq5iMVP4nzPsCrv4Hzv5GVh29W2Xurm8Ojmtnd/dVm6SVx1MDAxOHHsXGbhjGpHgTGDS4/DZTMtXHSLXHUwMDAzLnOUSOGsklx1MDAxNP6TaoXb4ZBm4lbNYc+M4NRK5l1O5jJk5d6AqyjnXFwzm/ZWloWpwE1wos5cdTAwMGLcZqNA2qVWu1ZqXHUwMDEzXHUwMDAwV6lGKvV3QXLMXHUwMDFl9sT4pzFcdTAwMWI/4HRA3MrXr/ZcdTAwMWF721x1MDAwZv1fxf7d1U++U6mo5OLUMfA4XHUwMDAxpVx1MDAxMeHFmFVcdTAwMDPqkkYjebWCtiCU9Vx1MDAxY1BcdTAwMDYpJJAvfVBWMibEkEsnXHJdLFx1MDAxMmUxadr4sStcdTAwMWXqz7/uMs3W6Wlm09Q2srmPXkJTL9tcdTAwMDUmLlxmP7t92t/pt8/7XHUwMDE3ZzzZeWOl9GDpiHFl05LS/ruXxCRbI4mxUisluFx1MDAwNp2kp4AsZ1x1MDAwMFmBk2lASzPBMH48XHUwMDEwXHUwMDAwsTLJsTg2yXFcZlrHgHHl3lxyXlx1MDAxM71cdTAwMTJcdTAwMGXe/SD2XCJdLVxyJtnCqZdcbig7bdebpXexwTPU9FxmMzhtmafGnY4pvixdXlxu2fm1l+uXbp9OSoe10+plMj1cco+DXGJcZsCQ4OBINVx1MDAwNV5M8oEnZsVrOGg4yUdpXCJcckZcdTAwMGYw3DZxcrVcdTAwMGY9XHUwMDFj0kz02uToVVZcbuGMNzSMRW9DS0ZccrOKpq2njaQs8JxcdTAwMTdcdTAwMDBvrnNbrVx1MDAxND61gp5cdTAwMWViSlx1MDAwYrrXXHUwMDFifVa6zD5v25dcdTAwMWWzN1uFi41MMqBcbsFcYnPGaInuLZteskKkgmhcdTAwMWV5vmGkXHUwMDFhQzDtZlx1MDAxMHJm/Wl5K6T6kOqSI1x1MDAxNWhQaHg4viUrYULW91xyqcZyaUE8pVx1MDAxZC9ihJWByPVcdTAwMDWQul9cdTAwMWImqH5qrIZcdTAwMDeZXHUwMDBlWnefLCvou9t24+nutP24ccp4dX2e7Vx1MDAxN62JdVx1MDAwMmnY5+IqxVxieFaMOeePflxcubiLQnY9OWRcdTAwMTmlnFHwX3za2PHI1SqBUfdUL1x1MDAxNuP1emBOXHUwMDBm90dJXbv6xf2jfX7sn1x1MDAxZVxc986vjlx1MDAxM3u4SySlvf4tTs/jPmBKnqj/Klx1MDAxM9lIJlx1MDAxNPia0imutGUhNavsXGbAXHUwMDAxXlx1MDAxNYhZXHT+qLIuXHUwMDE497cykbF425hjV0eAelHWu9lpdMyKXHUwMDEyzDP4o1x1MDAxNlxuykpz6oZs5E6+Uyi138VCzvBFZ1x1MDAxOKxpuzk98HSsZnyW6qx8JoX1ZDh3mnIqxFx1MDAxOKLDfVmMulx1MDAxNJZppVx1MDAxNVx1MDAxN2GJK6Qg1GLuolx1MDAxNGxcIsF5jF9iuYBcdTAwMTNcdTAwMDPEuaOW6lx1MDAxNZ49eN7043mOdCajpFx1MDAxMcoxb6ySilTCXHUwMDFjyFx1MDAxOWwqtWnDfJDPtFx1MDAxMMzTzWeKmqH4yoQn5/h8ISP8mfKZMpRcYm2wpojkXHUwMDE0Y1xigVNcdTAwMDNcdTAwMWZcdTAwMWJmNLHwXFx5t0Sm7P7L0XFr52kj89J6eX6q9i6LP34kXHUwMDEzXHUwMDE1hjFcdTAwMTRcdTAwMTVWWVxy16emIyM5JVx1MDAxMmYst8xLSZwr0PDOcqqU1iBcdTAwMTg9KZYrTeHjoK05XCIjXHLHwFRvXHUwMDFkXGZcdTAwMWHyxcfxU+CcKblgXHUwMDFkjNhccmelzFJcdTAwMWLOd1x1MDAwM8v899pznjnmdORFfLGKWfKCXHUwMDExyozBfFmAspmOh9ScUKqdZkxyzsZIXHUwMDFkp0uDQ1x1MDAxZlHfRlx1MDAxMMVcdTAwMTmmoVqnwNJcdTAwMDSXXVegXHUwMDFlgXp7eWFhtbMuWJAhkNTBXCKFXHUwMDA1Y1x1MDAwNlxmrmGBMlx1MDAwNl9LWISmJr4y4Vn591FcdTAwMTRcdTAwMTg+XHUwMDAwXHUwMDBmjCthuFx1MDAxYS9oj/RcdTAwMDTHXHUwMDBipoyCr8A0XHUwMDA1j91TXHUwMDFi9P1cdTAwMDTGdnvjeqPPb3LPNb6VLz02mvvbXHRcdTAwMDVcdTAwMDbWXFzR2lx1MDAxOO1A/LrAitKQlYRcdTAwMDFZaOBwxFx1MDAwNjqHR1x1MDAwZlLbwlRcdTAwMDRkOG08y4QrieFjo53kXHUwMDEyQ4IyZ456d9C5idRcdTAwMTjWYnRTMGkzJYlcdTAwMDFkxpbagyu9NOBZlpp/L5GRYNTpyFxm2egpd9b63jtSe8d71eNm/1b1w3iOriotwNHTXHUwMDAwSH/lXHUwMDAz8IyJ4ehORKVexJTSg+8qsGdgzlao9qB6f46ddUOlXHUwMDEz/lxuejq6Kq7EMtPGLrZfNzJjc639l+3zuaCbzcLPzMGR2OKKO73/XHUwMDBlhdhCXCLht5ai9l9lXCIrqrkkUoE2tNRRXHUwMDFkXFzXXHUwMDFiXHUwMDAwXHUwMDBlXHUwMDBmO4P7s1GFzTTBpFx1MDAwMZxcdTAwMGVcdTAwMTS8dbFcbmRcdTAwMTlcdTAwMGVpJtxcdTAwMGWSw41ZyzU8JG9cdTAwMDajltHlalFka1xyTzdVM5pGXHUwMDE16jeD9Fx1MDAxOZb/Z9isKFuatuksV/mP9cNSp3O1e7N72MlcdTAwMTaz3aeLebbNrSVCOoXBS9IwN1x1MDAxNenCOCOOSVxmKGU0qKxG2+bGXHUwMDEwv4vuNFx1MDAwMb6nuHWL32RcdTAwMWU8XHUwMDEzdChcZmapScbgt1x1MDAwM2Vq/6drzZsjP8zn6NAgKFx1MDAwNpJcdTAwMDdWhic897hcdTAwMTL0lCpOaerlan9X/df061x1MDAxYsxSXHUwMDA3zVx1MDAxZvZmm9Wvv7+Yo6fde7F3Vrc3nyMyQINcdTAwMTROSVx1MDAxZPivMpE6XHUwMDAwJ5tQQWFcdTAwMTKB5p5og/DKKXpcdTAwMDanSEmMUFx1MDAxNr6umeCWeZbxXHUwMDAz+U5/Mzop1nHF55355FwiuW5cdTAwMTDcXHUwMDE5ZbVcdTAwMGWlQk8qmGnfm1x1MDAxYYtcdTAwMDVRU49/pZJcdTAwMDW6zCwgXHUwMDFh9sBcdTAwMTT30XZXq721XHUwMDE2WPhS8c/aSW5zrdGsP4ND23yfXlx1MDAxNnFcdTAwMTVSZ1x1MDAxOPFpLeG5orWIXHUwMDBiSkdk6PXWy0a/dlcsZ1x1MDAwZmljU9ZcdTAwMWIv9/N0fWKKY1xyRiypwT1dn1x1MDAwNOWgQZh13FgjXHUwMDAyXHUwMDE59qvSXGJLI/80OfC1VYIqqn1da0R0JilcdTAwMDc3Qzn+ju75nr10ZbvRO3xcdTAwMTAnldr3w/7Oz9zVfG70vOnlMeDwjyaZoWSCXHUwMDE4jiVcdTAwMWG0tsHsstfdboe73W/N0MKwwIZPwjlcdTAwMGLaXHUwMDFkwGWCkdArNzpcdTAwMTZcdTAwMTVnc7jRXHUwMDFja/NqXHUwMDEzdpi/XHJcImhcImGBXHUwMDE1Q2C2pVx1MDAxY0OXRmlcdTAwMDRCyGfwoGdYlWmrNzHqdOxavE9cdTAwMTK/vY31fISw8EiGKdXjx/xaXHJcXKNcdTAwMDbmRjBcdTAwMGXzIFxmXs44MfBdXHUwMDA3/IlBsNIjcuFcdTAwMTeMXHUwMDAzw2hcdTAwMDVcdTAwMDVcdTAwMTHkWCCe5VN3ZyvmW/fzSFxcvTyir5IjmlOnMWg5nFGNclwipuK/tlx1MDAwMlx1MDAwM+1SLnZcdTAwMDJcdTAwMTRusL/DXCKITnVXO3pG4is8XHUwMDE3x+dcdTAwMGJcdTAwMTncuTe3ly/yXHUwMDFkeC8qXHUwMDAyLtGmebxcdTAwMTZcdTAwMGb+XCLBgoKCYVx1MDAxMy5upWJWJ1x1MDAxOMP7bZLHrzTMXCI3Q4DWXHUwMDAwJOCkY77UlDKRjGhF2aAwXGajY8SMyE1cblx1MDAwMlLfXG4nXHUwMDA05zRYRW+sTDglXG6DTy1cdTAwMTVcXJpgKZJcdTAwMTW5TZLbz6VcdTAwMDN5UIywiWYlgaxWXHUwMDFkk1x0YFx1MDAwNGhTo1PfU3dcdTAwMDYwM55WXHUwMDFmxXmg7ohQ3FxmdLR2kk9wnuRcdTAwMDSLLFx1MDAxOGNcdTAwMWR10s0k0MhZPzhcdTAwMWGa75+cQDUwPrVcdTAwMGUuXHUwMDFkSUBSvVx1MDAxOKHG50msTUQhgWyyIJkwhEo5oWk4rplcdTAwMTOlsCBcdTAwMTVcdTAwMTdOwVNTXHUwMDFmybDxO72z5SNcdTAwMTbhsNZb01pqmCxcdTAwMWFcdTAwMGVYRv01rY0gblAxffjinjgkpjThXHUwMDEyq+Y5LrkwX5RgzfJcdTAwMDSbX5pgse4rcGW4XHUwMDBi6MBcdTAwMDJEV69XXHUwMDE458SZSp1flWNzdUD7PfwqsOeItFRcdIkkYidcdTAwMTnRYMFU9JHh3oEon0mwXHUwMDE5hoGXjFx1MDAwM1GDKVx1MDAxM4aJiZSO0Hz/5Fx1MDAwNLugQo3feZ5UqLiealxyc8xcdTAwMTmmg+Gqb0MgwOzgvKpcdTAwMDHHayE+MqxzvVI9zOzwl+1GvXCzeXj+424z61x0XHUwMDAz81x1MDAxNmzA5ltOSVx1MDAwNWxcdPZhaoVcdTAwMTmMu1x1MDAwNsFcdTAwMWHTXHUwMDFiXHUwMDFkd6uNUlHx5jLlVbTPQp1p7C1cdTAwMTWTe96MO9RHOtxcdTAwMGVgQIXRvW+ExoJccilHpGBxXHUwMDE1R5cr2bD9kn9sVEtrlVx1MDAxYdwoeFx1MDAxOJ1Cu1x1MDAxM1EqSbzfhlJsVOesIafUaG89c0jN7f7l5nrzR7t+eSy08mSORG9cdTAwMTlcdTAwMTlJNFx1MDAwNo9p69syMiifxoD2rI2vyjksiOfSXHUwMDFjeFx1MDAwNvVcbrdfeveKrYhJXHUwMDA2c9ZcdTAwMTlcdE9vXHUwMDExQI9s2Fxcm0ZX51fdnev8Ra6g9lvH992d5+puYb7oXG6FXHUwMDAxXHUwMDE2c7BFXGY8/KNJZOqYttjMSoJNkzC9p4rygl9cdTAwMTm0dFx1MDAxZWAwXHUwMDA1joPDXHUwMDE0XHUwMDE17sDb+lx1MDAxZmkqm1x1MDAwMjDuklx1MDAwM4NcdTAwMGbLzEtcdTAwMWJcdTAwMTL+6Fx1MDAwZURnZFs4JrVx6e5cdTAwMTktMHVDhu5cZlx1MDAxNUu+0IbB/lnDQIPPXHUwMDExhTnDzEzbvtirSKnq2IbLle9cdTAwMWKFg1x1MDAwMq90tuV67eCEeXKTXCJcclx1MDAxZqVcdTAwMTZ+gEdcdTAwMTk+7Vx1MDAxYzGYVDnE91hIrVxm37L4Ls9h+FxmV0xST9ZcdTAwMDJcdTAwMGXFRMZKMINcdTAwMWRcZrBcdTAwMGLp+1x1MDAxOb7+82G2eXL6/JC9KZxtPVx1MDAxNzi/3/75YYbPP5okhs/hilx1MDAxN5VKYMFcdTAwMTLBQoqQXHUwMDE5wuOAoSmR2MSR+l28lc3zYeI+OSaMXHUwMDEyXHUwMDEyXHUwMDFkcJ9cdTAwMTY04e7qozhcdKAqxcUnNHlcdTAwMWL5duH+M1x1MDAxObtcdTAwMTmmJdQuXHTHv/Z7rNyx/dXrdfP32Xz1VjaOrnqVXHUwMDA3ypJbOSspwaWaSO9OXHUwMDEwzuJcIp9WRm5BQFfmMHJMYq1Mp31cIpZRXHUwMDE27d4pimuOPM0kgllWrlTJP12c1C7sfpHy7nWt8Vwic/bDrJx/NEmsnKVcdTAwMWFcdTAwMTfFI61cdTAwMWOnxMQhY2XlXHUwMDE2XHUwMDAwxa85QKFgciuqqU/52eglTEa5hS+yxeJkf6+dXHUwMDFiNlx1MDAwNvw8dm6GcfG3XHUwMDA1/D12bqvb3Wjv72RPzMX1IbN0/9fm2VlyO4dVj1xiY5wq5vfmjFx1MDAwNE1cdTAwMWKzL6FwndP6kMzk32Q791x1MDAwM9LnXHUwMDFlkm7nRqbPMVxmf1x1MDAwM/PndfBUeJc3sJ9rwINcdTAwMTc0RVx1MDAwN2/pxLF/xp33d/VcdTAwMWSu7mVPj+712WPn5HCr2Nnc6/JmMYXztphq7Vx1MDAxNHdfNjZcdTAwMWVcdTAwMWaL21x1MDAxN1V6/7hXTXbeWFxyMGzyYmVgj3o5XHLAevmDXFxRqWrne2u7a4u5Yru8mzA6xFxiSpxcdTAwMTC4PcWpZtNl8DAuSTDJmFx1MDAwMFx1MDAwMlx09IBcdTAwMTntZnJJhOZmkNArYDZ6ausyrGCPXUmVlcroQFDrSlx1MDAxOIyIpJqUSKJcdTAwMDPvpGNcbuid+9xixaNcdTAwMDNDwFx0cpTxxZo6/VxySmhFTlF8ZUKzc3y+XHUwMDEwij9TJS1KXHUwMDE4jFx1MDAxYjtDOFx1MDAwMcN3elx1MDAxY9W69lx1MDAxNnOhXGI3XGZ0m1aWXG6pw2F171x1MDAxN3Gxa+0+z262XHUwMDBlOrdN11CFcr32azORn8JcZmdEUCxcIqxcdTAwMDU8pOlcdTAwMTZcdTAwMTngm1x1MDAxMCqBpFx1MDAxY8VCpYFcdTAwMDCKUYywXHUwMDAy7YVcdTAwMDFullxyqnmKVfbScEgzWelxXHUwMDFlXHUwMDFm3qH65N7AX1x1MDAxMd63XHUwMDFkXHUwMDE13KcgfThLvZ1cclx1MDAwMJ0u5620XzJDqf/3qqWVZNjpuCzxwmtWVConhjvskO1LapLUYlx1MDAxZmdQuFx1MDAxYYuuepKapMbNZW2A4Fx1MDAxY1x1MDAxM8x6XHUwMDFjXHUwMDE37jThWLrYUudcdTAwMDR87ovGVqVcdTAwMTD3X1tefmCkgKLOpz5cdTAwMDDdoVJcXONSekpwoI3UXHUwMDBieFx1MDAxYaXkx6tcdTAwMGaGXHJPjZOOWzlcZnxcZn5dXHUwMDBiXHUwMDAyw+VcdTAwMDLUt9bUcTnrdNHTfnA0NOHTXHUwMDE0M78jLlx1MDAxNcRcdTAwMTcoXHUwMDE3I7GFlTOGL1x1MDAxOPlcdTAwMWa/eFx1MDAxMlx1MDAxOEKGXHUwMDEyreFJgCDkXGZ72/FwXHUwMDAxUvCIwCGXXHUwMDFh01x1MDAxMVxmxXanXHUwMDFmqJviO5jGcqxVnMBcdTAwMTTAXHUwMDFjOqXgLk/XQlAqPlKVXHUwMDEx9FXBOktuqaaBXHUwMDEwqnG0qiNcdTAwMGWblmnMaGEuIKw+NcHOKaRSXGL7by7Nr5piVTPqXVxy5uGe3G/0qo1cdTAwMDXN7NKsj4zrXHUwMDE31Fx1MDAxYWw49/H0XHUwMDFhNUfxlVx0Tc/3oMOtbLWwbp5EUd1Vsru5zlx1MDAxM/CijOBcImqEsIZyXHUwMDFj5SCQK0xGRFrsXHUwMDBmiMlcdTAwMWLo4NgwXHUwMDE5JWLI+H6mXHUwMDEzfiVcdTAwMTVcdTAwMWHzKFx1MDAxODdgSpzR4dQoSahcdTAwMDV/edCvJWJQ78eQ8cuKM1x1MDAxOFJcdTAwMTGjcL1cdTAwMWPbQEg2VVx1MDAxNlx1MDAwM3xJwsCjZNiFwJdcdTAwMWFFiXRot1x1MDAxZNpcbkYtXHUwMDE3Plx1MDAxNcotUSBGXHUwMDE0uulKikD7qVx1MDAxNUlOkGR7eVx1MDAxMao0aFBhmbdcdTAwMTidil5Mp0I5zlx1MDAxNUvRXHUwMDBiXHUwMDFk0+RCXHUwMDFkkVOlyZiJiq/wXHUwMDE0/VRESVx0SDUgSCGAlFx1MDAxNFx1MDAwNVx1MDAxMZ0k/z1d4UhcdHY401i2XGJ8XHUwMDE1LYVHOMrBXHUwMDA22keKxdhcboXxXHUwMDBlOWUge7EnODhPRunpQrsgXHUwMDEwXHSIXHUwMDBm50BcdTAwMTebYDGaUeUsRsDQ4nqjRi3PPGtsmIfqrEGZL1x1MDAxNKeB3JxcdTAwMTVcdTAwMTFOXHUwMDEw4fPyRFxik1VgN2CvXFyMXHRcdTAwMWK11kkrxFclwshZiq9MaIK+XHUwMDA3XHLOUVx1MDAwNlx1MDAwNJ4o+K1aweBpMFx1MDAxNiOgXHUwMDE2lVx1MDAwNlx1MDAxZIxcdTAwMTeHYLXh+ZGMXHUwMDE1kzPzoG4m1Vj8mdLAdFtcdTAwMWLvQTDMXHUwMDFlMWyQRlx1MDAwYvf3XHUwMDAz+VGVy13a0Y1cIn88t9dcdTAwMTeX1/Sg6MmFieRHKkDrSoF7ZW46jZ5zglkujltkT0+pUSpcYvOVXHUwMDE1pESnXvH/61Bhb2kqdEZyQ1x1MDAxZPcxYTByLVxcj1x1MDAwNFtKXHUwMDA1XHUwMDFmZUpcdTAwMWJcdTAwMTPgz4mPZ8Kp+YivzHAqpkl60Vx1MDAxYqDhb71cdTAwMGJcdTAwMDXk9N3uyU3ntnR1UN7e7fZE5XDnLjFcdTAwMDUwXCKpjaRcdTAwMDAqicRQyS9NXHUwMDAx81x1MDAxNlx1MDAxNU6BXHUwMDAz+inIIWe0kqBtfSRcdTAwMTCdJceU1Fx1MDAxOE3H096dWJHAR5LASbVcXOQ/mtnur9rhXHUwMDEx7Z10Ls7yx0lJgDqCScWUamq4tVNZsVxcgrfqNFx1MDAxN05orJ/5NUng3XWApcvrXHUwMDAwXHUwMDA2ytlcbn911fCy+tgjwrZcdTAwMTJ2sVx1MDAwNPJcdTAwMTVcdTAwMDN8Ulx1MDAwNmjcXFzWj93V7e3J0e5Gj/aeLzZ+eKKtI2WAZlxcYOt6KUMrJVxcaeKUdlxcaPB8lWdf7SswwPvLXHUwMDAwy5aXXHUwMDAxUlHJqPZcdTAwMDYpXGJcdTAwMWItXHUwMDAzgNZcdTAwMTW8+IpcdTAwMDS+XHUwMDEyXHRk3fFJQ1x1MDAxNZ9+tjbyRXq5aU4v+zyxXGbA2lx1MDAxOFx1MDAwMH+MkcZQsylcdTAwMTIwnDClmOPKYora1ySB95dcdTAwMDF8eVx1MDAwZXCOKuy56nNcdTAwMDVkTL6F1FRcdTAwMWGTcpH1XHUwMDE1XHUwMDA1fCxcdTAwMDX0e+r5olf9SVx1MDAxZlx1MDAxZlx1MDAwZU8vzEm2ITY9YclRWVdcdTAwMWF7/CqsZlx1MDAwN/9pRqd6/FxuLYKVXHUwMDAyVtnFqUUmWzFHZLJcdTAwMDEthkWJvVx1MDAxOVbR9Vx1MDAwMpiQWihcdTAwMTmstPnbk4srd3u75afT40r+7vy03OxsXHUwMDE1XHUwMDBl69dJXHUwMDEzlurlbLH4sJe5vFc81yzLXoddXHUwMDFlT/7KQolQ3W7GXFx/p1eH+/tZcZS5vOuJp4NcdTAwMTTOq162XHUwMDBiTFxcXHUwMDE4fnb7tL/Tb5/3L854XG7n/f2JW/PwdVxm+/ifdoh9PElcdTAwMTGaKYKKXHUwMDE0XHUwMDAziIxcdTAwMTFsumy6pcHaPVx1MDAxMbW5MOpSO2m55MxcdTAwMTPct8rg9lx1MDAxMY9MTjxW4611Xt6RMlx1MDAxNKIy4lx1MDAxZMyGsFLJlPdgwfHBUKdFpMZbSkS21O7Wm1x1MDAwZmtnL3/WNjqVavFzpHHPsOLTXHUwMDE5XHUwMDEysVeRTmpEPFx1MDAxNce6XHUwMDE2xlx1MDAwMrQtVdRcdTAwMGU1xXSvJsuJXHUwMDEy2ljMyFxmXHUwMDA2nI2grVx1MDAxY7GDiqOvL5+PwSUmVjhcdTAwMTCfXG7DaeTXXGbcTSHD26o5hFx1MDAwNipccmqd8tbii6nMbSXlTqVZmXuId2OCjXw+zLWImpCDb4en4vh8IWv8IUG6WGlKU8rBUaNWXHUwMDE5T+xcdTAwMTmR8MydktiuRHIpXHUwMDE3zGKIp7G1YNiFkjDZNOYmWLAxKjwmQZSxjH9kNNpBu3K5v311scvbx/r7zuWPVqvrSV3wqFx1MDAxYmP0XHUwMDA0XHUwMDA1htwqXHUwMDFlVDeeXHUwMDE1VjHG/ThcdTAwMGU3ZTnzhTjOzMFxyiqmWHBJK5hlXHUwMDFlxXFCUFxmXHUwMDAyc4vso05cZiOsxynMh4Xau7yJmsfSY6Ner65cck+dSo/WaumuXHUwMDFkI2dcdTAwMTZN7YxcdTAwMWNpOqIl3s+LXHUwMDE1LUBDXHUwMDAxxNLpXHUwMDFjbak40do4inwlXHUwMDAzNmnco1x1MDAwZXNcbjRcdTAwMWNcdTAwMDSW1TbQMG2ca2SIwO8jrU2Emq3gvDZcdGfrh/NcdTAwMWOLpMCuXHUwMDAwqkBXnGAyp4hcXCNVXHUwMDFhbDk3iyyRxoN84Ll8fDJnhnFDsHUt11x1MDAxYYthOT6hZXDrnzolXHUwMDFjeOWOazXzdJGzfnDUXHUwMDEw5oDdsLFcdTAwMDa1uOHwXHUwMDFlwiixXHUwMDA2XHUwMDAxYYSNX1x1MDAxOHiqg/VcdTAwMDPjfHlCXHUwMDAy+7ZhWydquHK/P1x1MDAxY1x1MDAxNcSkhLtcdEPCsu9GhoP0XHUwMDE5XHUwMDExcFRITDelXHUwMDFjV3M+UFwircvj5lnt0pby9rmw3n583tXZm2RcdTAwMTJJxUokqVm8RHKKUFxyL4Csk1hgeCWY5mBYl1xcMGmhnPR3a1x1MDAxMtFBJ1RTJfhiva5nUCny11KLQLXX5ZP2y2fWSt5RpqOT4tetZyzuyDjYcjXLs3G+5r30a2bSpIHUjaW1kMb0T8a9zeqjM1xuXHUwMDFkXHUwMDE1WGRgob2jXHUwMDE5XHUwMDBlj1x1MDAwMDXw8VqI0YncmVHlhugvuMkuv/RdsmtcdTAwMTLnPWdcdTAwMDZ1ooXBmrdMO4zf9GhcdTAwMDfJXHUwMDAwmoPm6ExcbmXDVVx1MDAxZNNe6GEwXHUwMDE2jtnWmPzorPNliI92j+HlqPvINZ+NRv/5+qbSyOmfrX7/6fKgdiN+JFx1MDAxMzTaxjKjXHUwMDE28cxoLPH2U1uJmChq3EwuYlxm+iCce1x1MDAxN31YuFx1MDAwZf+4+5K2VDK1UFx1MDAxZvNcdTAwMTksqLilS8mYwlx1MDAxYr38WVx1MDAwM3y0/a3UPoeWiVx1MDAxZWo6giZ+wzx+4Vx1MDAwN1x1MDAxY404P0TReNhK51uqVauKw1Go3Vo+XHUwMDAyjlPKXHUwMDA0N85fbT+62D6XXHUwMDA2i1x1MDAxNS9UKHRcdTAwMDaa562G+3s0TSYwXHUwMDFi8Vx1MDAwNfPwPTTKXFxrLljGQWtcdHpgkKdcdTAwMWSSXHUwMDAznIz22Vx1MDAxY3bU9lSvSr2kXHUwMDE2XGInM+g3hKGVNqybuCXvVlx1MDAxOOGP10f0Ld9onFx1MDAwZcjy7Vx1MDAxYb89V0rdjei4lD9ex4bEUFx1MDAxYWDqrz/++n9cdTAwMWFBYUUifQ==<!-- payload-end --></metadata><defs><style class="style-fonts">
+      @font-face { font-family: Excalifont; src: url(data:font/woff2;base64,d09GMgABAAAAABmEAA4AAAAALhgAABktAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGhwbi2QcgSwGYACBFBEICsRYsmYLVAABNgIkA4EkBCAFgxgHIBvjI6OitDLeJfurg3iM16gD+qgpSYk6q0+bUW/bqhG0T5AISpZ/Jznc6yuueyMkmR2eTv13d7mLeHHbuE2FNXXi1mkqpuQq7q+DikHqun1w4PfoL3Qyz9Pfp+fd/wKSCWdCmB0kvm9YkIrUKlzmfkumK3bPdgNujGlJ7v4THMIYlOrofwD//vfq/LLfdkmbLGN7wB1WnM21V17Tya3UzmgMCctW6LOTDwQry1Vx/6fOklpN+2dGAcwGQMCG6LA5dKQLFe/qK6pMi1uNAslJQhjsjBdvCPFGmnd/7ddmSLeItRNCYn4nZDwUQqIUbpHl/cVs7zC1bBoSQzW1ZAkaoRG9hWvETLxKLpRUUadzis1hj4UdVQaihKiZtIXKFrVymsk/OQ+iOQAEABoAgIkQRBB6gC4KAAp/eoTpPDEdiHddLXVAfGoprwXiu3NmAxAjAACoR7LboaUBkALBW0nAHVdYIFI0CVz9Hf5cCH+1Cp8Qgj5c8+OAB6jDtaGqaxC1+TzouAf+8Xzt9A9dWdjQB4b0iEfFAWESvdZB26e6AfwvpWljiTqZa7uSFjgZIMwVG0R6hQeRBQtbOvEd/5GZpKfCqU+Nh+fEQnq1cU2t39k1VszENR2AiMGPJieGgoqGjoGJhY2LBycgIuXClYKSilqzpD+E7ljAQJGgMJgAXVG+vjEEfjE2PhEJ00SRcTABXGIyLKMjHpw/DtwrqRBeUSRklM0R8AMAAMCgLKY2AA4duTHjTaeJuoL7HbSLBCOnUUdIp7FTQKiGCiFMCtNRhIYR8CgkkQoJ3IQYFSOCpDOk7xYMlGin6PPcL5VOwHu1lDUABuAdj+UInYg223jO6+jJliNvzgjcPUcpeQAVZsVjxJBDcCfOYM2DdDBn0ssoFCnzkw2AhHlPoKVAr8E8ZErzwpYMjpLpbtr/OTRTlPYBABvOot/BOMtuWYAk5fHCcyHBIJWKCTRj9b5MrOIkSmaXrkK1Jt3tB+9pfRhZxFoMOjhVqdXyNXy477Ljjjnqa1/50hcO2G+fvUHgCIkuB0BbQQ5BcBrqB6BP7M4kh45QrBYxzvDcGW6QI6RZrHmUBFC/a+Rz41uTCksjCsLkjakpQTyNICSSoe2lmcTSRHWiSeTqyQwZ5iXYUvLiEgpAx+0n5Z+raXZAozuExDV8i3EnwH3Vn4HePVKA0aisskmqSYdnDlvoMRzM9Gq8wmOS9AakY+oPU/xabFS8OE5Moq8LvAtsJUES2a07NNvE0esoGmVo8xJYOPtk41leMqrDt+HDdcNK8iYO+EmIMIPsS5MiCOhhslutTMdTB5LxXx6fX4knrOa6Ovl5UQS0SC2qNdQQbxsJV5mQ25LcbuwLiRz0gI/8vrUChhkRC8EsyWuM/0Lvfv0JAVAFqVerJAxXduVGisKQjqkYhx8pvR0jmvy8jIxhB3win4AF8F0omZZGxVCIgTPdDl5WgzTcUw5CKA7nzYG0KGbDWaoFyokeAKQ8Da9eVWFEKgMiZSnfOty4syimTxXDMRJYPFbRBeDsYmEMqwCUHJYU+EdEy53OMyITdwA4KJ7mu1B4XTI9p52G2o6EsW5RAsuDbK+yA6OTcqepbDlDeoeWqLcku/Wu7K2bOh/8C8DbGmNIvM0cLjQlmov3/EsdH2Iq8ASzJH++zQEXvDaAZUElPfyiqmkkjNyRCh8poHCSTMinps4UNaUh1bhIoeMwXIxXVfB9y2o0FJ7m8BIUbkk1noB5V2MM5wsRsIBhdEGVOHwGSporvFavajwG87TL5EWqcyTXpjC8uk2adBEJzXRbHMDtAE7GSJj5C52ABRgDxiTHT1e43jhCdUpz8owwaMlZIs1pYssImYfrURIXMHqMMXynGm2LOUG9JaNr6ucq48AseGq6NQ6zOZWVg+YaCWMdVtx58N2OatJQXpGZZOpWEjIwwqd7NowZRDHKUtDOPebCaGaJp9OpPQ8AXE9tHULLcmHtVy1MChtuVE95yrNHJnGW9yyANgDXiuJ3TlYuD+LChYRG2KI0uT4p3o7H5nAreyIThZewwzzJECNcT/iPSKp3KrmEVRqG9M68EX3M9PG+L/DniDJitCqh6/atXVAjDk4fx1GmXC4L6d2yxjouwG9GErIih0O6mMf88jURicGmHsbEymRQCPdHZ8QY0TB8mNTtP44H/fPX6LnSKMt7ivR9UByM5wT3I5xxLlHjJ49+6rAUxIupt1TXJbHzvwGWTp50pJG/cqVxSEUQmEJUUbweoWdhsCBppPlIKSSJYX0MkcSipAM56InLKi5Iu8kV1WlTPD1DdBOJMgYMyjHGC+A2hT0zNSWN+0duhxUTijBPT7umN0cUT6tPKwd7h/q1PbFizWok9pPjUEIiWeOq4XD6MCNujaNEsNHPGcnd6EU2UfhdsDCwfxmUPd7P8VHjHrHX6Wrz5YVNManvL+cDT/WB+zZpEHkP0m8HWdvDwa04Mqu4LLGZtMwLkoSx4eYJx5F250n1CS215mgk5MjE+zjY+zcr+Vx17h0LViMcACg8u1HZ8sx7T2qPkaC5Qk+xd6MdcSXXOxrvR3abX1UKv/3al9rRjfGdN/qG1py1ky/N0ojVGCELZmeRfmpEt1/z3X7ubkUSKVZuU5JYMxxmaId+bFSbxeEZGtPKGOeEnTDPBT8rByQ5yX0y4SVjl8dR5niE/Ux6czGZKDzt3JVqkcYsv8az07FuA/Wpz2E0Awo/LGWvWXdoUyzGejfe/0I6jsMYEm7mDCzak6tGIr8e7c26LEbn+BV6H0jSNaKHGXQYdonxHLbhH1UYEBnH9dCIJlFjHW8Bs7YreTC4Kkx66IRI8Kvqo1x9OKui9elmRjQ17pd6U1bkgHhKweJqLZ3q0ylqtWTqyre6sWhTRh9jUdQKpAqWOZFr3eai3BWpjtgXIZFnDFdQanFueFGnoyFAOdVlU3ZbSCzje/7eXXOor2biQ85QGDPmOD9X9jsdHKjgk0SXza69KIcK9Pt9KH1Xgr4Fqkek7Co2GEAttEhiHdkt2UDhu0+Iq372BzcS1NOl7A2x0AKJtSVaX6c0HNLhNAWrTMuMMutIAYBfPvg/WJuoyjpdra4iEV3KxgYw8t9UhRCmbDbtAbFpDgqgD0squB0JV3H8M1hX1mRWvLgu9MrtvzuX7/ozXqPGr6fx+QLjEmeg9n4VR3IZvLm6VApOLU/Gvy6c2bxxuOlLDHoK75FCmns7AliBloae5bZECn+if2xwp0ZkUoCRSaxcpRbdP+DOTvAWCZNaJIlJjIzTJI0zv+UqgtmoPrl6jr+yRr4P4OLlKJ8Z/5b24u2kNinIra5h3WgiJAr4iGTqVcs5+u3ijTvucLKvYYRf6bfh5OfjRK9Ik/GTpZyXgR3CwCQA9VcYZYhp91ow6n+6CaMa7/WIbNqR5GIwVzSwn5BwsSlkkl17Pw0p7aA/OlNpJLUOYcCQOJDrk6ZS7A4RC3A/waD2b5Ss56DMbTJ4cdj2w8sNg2iHQ5MeaxnvBd4yRkpPnXVn2KJRauEAZRDpAZ+Ib75vRABWdKNR5r4vmY+Hi4v6fa8pH3K77kT6rVzGjhMkEdFwnd6Jtml0QzDP8/CUhtqb4UvRoRN0gZyA9hMGBrCrXIghZKcNl87QHRKGbA7ITtulA4QEY/gdRi0zukPCpKEThsgkNoPEPAt6aQPAFcxcf5MHwNLS78XZjciGovqPAL6B+r9BpmV3vRqJ1FaY5oWVSlhfEkYTCdxXIdcqB48zFA5b6/cC0dRyHJrb71H/4t/gSsChxo+CZbmqn64ksnRadFUc+DCUZQlejchKKqLkMPT5ohCDOFn2D6pvvAq7uwAWQ2L80cwfd5d/XswBhwIoLzkU/uajxs39pf7Yi6dWva9IrKLjA3bwVKk04qUH3qaLOK5HV4XQvewXfQYHM4QGCKtFpjOosBU7Nkw9qcDp43w7rbIF5f0noNFKlkUUvh2b+ai/cfIn3oAkrZT/TCkcJO/88j8FWPfiIPFB8cbNJSdy7lcMjvOL3UfPmsEC9eD6egU/Aeoq/U0zkUItKjoBjPpEM0a0oHp5W1Pit99E8skLu5DjjKNUZBGwEhrK3PBLFIRDujd20uSDBsF3DAmQPbCF3pXLtbk9q0vHzLPi8g2uLA3byPlcl77m0yazEbXTWYVD4x7/qQJxlqmC19VhQxTkNSLWap2UV4b0xL8Ygicc/icdopg5uLUtL/x1zEwyNRa+DpZBkbM9zn9qzFiPV+eNG3MN0spWGQa3swjwQ7nlZcOAe9/ZFPgbcZWJzQLQxcOWqvQFBefZlPx//n9uyV2ZbA82NEgnAOLAliJchjWjS9SZOpggBBtpvA8Zdiu2KIqYQzKRiDkZRUEPUL1ZQ/6YZTuP/7nz8MTx/SPijeoZy1es/BGNCT2zOUA92UiwCraa+IfflRMrmyq03kih1Mw8SDl41HTih8oZNxz9hKttghSJ2qH8dCiWcMnZrIfd7BirrA1Dk5F05qU/ort3jC5mni8+l7NlsD4VtLE2J/KwAtqxN/HYN9vk8e0OouzCFFO4TdCTFXHl5KFPd6TbR+g/WksXw8Orvo9JKiMXc4vJcL2L0kykimaIAv75vZjRfGNErkaK2cRfM7DC74iSfTvBwcxhsl2NFMcZ0W7V91YKj4Tpf26NqVLhw2iVl9DeyVLkR2f7UXMgB3wU4W5lPRfVtZAYZJvcFTJD9E85JCMOXvlK+5BYgV9etV0VWibi7zkDIXBWowRKYZAtEm0Kd+YhGcgRhfaOVYrSfXayP7Mwm2N/ZZDMlJkM9uGkYFKwl3MgEQeszKbJ9d6b0gN+Hr0njLvjuFypPjSNcRFxIMIysRDIDA3L/m4i6TECfNZeR2dD48dDdhM95jtvtPBQf8QfxUvclgNP8JJFHmFMlpPGYgm+/8b5q3JDOvH4AK9CbxJWBP25wofK3UKP3/5P9lNtgZRLzmn4SyWHcrGsjY4Fjj7AllT0k5FaX5DoI+n/d36MMBfuhEl+E3O8TrqZ4mvj7C9mQbb4YHwmbYkTf5CIt2v6Vs4s1hjP5nLjvuFkR+OLSQv+vh+1GMZtCJpEalf2Lfwsak3R+AON5fznvy9W/ahoTR2B51/kf5FL1qDxyilQwS3wgYyU3HjJ4sTf4DSPz7p0uhAx/UjG2gxsLVbPLVEt8bIW4lMJIMv68uE5YVmjUbUoSJgYIQAyOhaTMAaDybmcVvZD/bMT7YLZgAqsqZEH2Kpxvy0Ew/0Q5T1AE5fAFAnohUiXQ279VpVhb020vubKT71fIb+gw2U/v6dvUu/26/O85R1s4HAfhWfTyA2EbTCaECKTcfEnyB4npY10ALZ9AZkVPGZrhuF/gtYZdKQiAbUr7eiQMtcnwxZyXcrcO/Xqr7mB1BtGdAjLHom226LMqzgQJKsYRFlaSzkQwa1wsmLH7jwly/e+ZkUAtPupRg/Fk/8aXZFmCciod++JZF5dd7DZ7g/1IJ/eWzBoAy3jr43HlpWM6Kno6AicD9m5Vf77e4OPJEkp2LE1CW6toyExybMLnxki68vBpMgUVA4lo1zCOV9Gvr/dzEqB+ptdPwy7ODPS5XWJdkWaIJ+oR8tnIxubWGgTJRa6H0/wwqxyNxK0itW0qYm2jcZF9Q/16F/ELPAziUJevRkRDii+YJ0Cx7GHBqFmUc21lAzcE/K0fOZdphiLZaYQ2dWrdd/n5y0WJAsUecJFjBTCG4B6ley0nlAF7+Ib3E3N6cYC9lWotzwW6SQGxxOCJrKnmgjVYkChltm08b7kfCitD0uX4P/R8Zpb7BUU6TTKnCNlLkTsg6o/XGNXu/naFbqmeSsSgwNyMllnus+eSWfbnv613luVQv7GeifjO3YuyKcfFac+LmXdfI1ZG5YM84vc/9CfkVecj1GfOYpceBZ2YdmfY488gr+AjRFbnwS+SYIO1aItwURhZwHYzgk4d2P/Kyw1ikhOmdWdTLsf7xGNEJEuIubPL0vmsArhyE+nHZIVwcCuptWq3JJUeqdfllSij3f9O4TIq/9P1NDAtMWdOBO8temIXPAiyztqGb4JtpHTy4OAe+ZJVUVNdGqi8HHp0ebUGA0hNQfh40F1d84xdpQkzuIOnblpalEreA9G7PzUFIJRa1bm/tWBtj4zUFzgtF+CFjfjvO8CKzeBScrYyznD2m6cYxrs3pGDDyjdWKPhU1AtX5Q6Xxg81TrRYod7ts/a/YKD1gVM3vvfeVK1MQ1q9w8PaaEnk2IvnI7r5b64uCLaCzzBJSZ8o0YgaiehJJ10gEq8lQQe4STNJa8WAdP0xxfa2uC4KjrtClUwVwEQAt0vyB9O4CB5MJ/xVstFdcax4oMQ+PAjKh4gPIkhOq25TY4gPl8ey3PL3iDN9oRCOZZmsOTYg1cuMsr2YSeXbXcs088N7FZ2QWHsLPYc4fdbAd1FQrQTs4lilz81p37C6xsv+pAUfhDsp60BOyTXSy0LDf6/baexsUoEs748PtN+Yhb450xUcW6cy/F95/stDOMNuN3dWabw/BSCSRhcEHDF23Jmznuk1oND6iK6hCB1kJWy2P9jFQqnYNXqPCW0ORYMcQVn7kB9QjqRQj0rhqk/enfxpW7wAIrYKHQf+mfEZXEQYpEd2ELvPgO6wdZi1Xr4STifNpZXFLL2zcNs7afPeKGt3Ki0+9cOLI0/SsqBsr5xWaOhdRxP/9Awmu/TC5eSA9LMnex1KeuCEv+dgG/FZFFb4QAwIzGoaAGYgikiTkUlx5Cv2R8rUGAkuSE0xMH1TW7eZP7SLY66zAVNQsgs07TsRI0XIxQyHbqszGxU3tDLt9SM1h5ytWVwUpFjkPgvWRW4RfCs/jruDaG6xrN6v8FjZUz83JgzQdZ9MfV90mflTf6yBI9MfpzOSjVsrIQU6b7ebqc+Z6ePmUnuXlSIUj99qBasbWlqupH5FdvdRtlBAhViyJFPNg9Mn+Na6MSJNlf/2He0/v8aohU3HMHrCGR4RE6sCS8bXzVj+deREjwu1pq+X/2cmsDc0MfoBkuUEwwzD51U0ARBCjq0ZaNg28K84SIeShYviuXRdtr65lG46vmghU9fGBax7f75KAYSh/BhMzBYuJfVusC/XbZO6qnSbydC2n3WJxkzxIYQa8kFCVb/e74qDYXlyKOAKXN7LO6YjaZOH257c/XS7Bf/T2U8yg41Fj4gspvl/f2Apzufp77wsZrao+HFZpqOXyO7TJbcvGcK42bTjuoqP63ib/V1R5oq1AE3Jg3nt+0BQ84XVtakoMDK1FFSDojflwf7P7FPGT6ydFT32ghtvP1Hz99O1Rf3hCbZm2X94AYNI4Yb5v0xUC50wNE9XW6yrYdGQoJ2jgkhCzWDjvk+5yoChmyIzBdWqcP9HD+VeJwgu3wZXyGN99D9sI+IEIq3MOR+XhodIYpue/yWkwPuENknPjunKxDZD3QIXIaAApIDlf0ZCERMoto5cz5d/+ThW4Uwa+M68ZW8S7+lYSsnZYSjiUziPZ2h05xuKVgYetuwnV0mN/kbMCI4zUBk1IvG+1UrZjcGRUBrYUxDZ3sp2FmDxHZ2eoFLnxVd5mnKSjC0VDzQIHEmeQLmxXE55Vu+NiDtUNgv0IaMR0796H5bc3C8whht/fE+3iFxhFeB2KhNKatrCdUJwykVRt3SnEflmfcmfPgdmSRC8wRr7p7INKce2TjTYQwzLVveh19msR0yC2cGhMCe5m0VeVF6C86P1bG7ZCWXgl57i18dTR1euiTH+BeLAvNPzTdlCG/6gTutsmVqOa0wbPHeqPEL16xhclHpZUlencFJiRUMerBfDNowr2mkmOFt+7l71b2rWW/DUioJ5shFab1CqSKpO7o5+D84XN0kPBi9LzA0nBytFFOAQfA0iBw+Gdo4MvdN1XbKqgrp0I8Z0+lO2/fG0WPI6O4iejv16W8TUORzn2GL4Z+VBZL3ljgEErzZym1xnWZpcoThhZet5JOIDL6IyJBfoklPOPdGr+XvfHi4NAyhZiXMJv7E5HzEHlGBJvb/0hxcazMs2fTC0iU6+vuF+r4yp2V+CXPcveO9SVacYmfieNzA3pszqOPgq9uK7yS/nTzHMlpOCee3Hh6D6m4l3Z3qvN9KVNFvIZtfdGAYs4DRltNldiztf93Pk9zU0XtTT8UADtB4Re8726KLmJHPSFTkj5kAAPe/PM3zUR/8/t3z4aP3EP6qmx8ujnDDAfxSculwhPbeFv8753FqmxKWMgpAP7iFw5hXUdNGkBMCs4w2Ubwi5xo39HSS5HOG3BOfBuQmBxQ9TbyElJfJUkAbEUl55FVChXiKFZyP+4KzQmQYICzZ/PV0oWWtgLjxiBYU1dwNHdBzhE9SMMMRmEjy6kpSlrfvGetrXYU5w7/1vPQgI8r9seRayVOvzgUOwvM1B2M4yCE8jXAEKiUcKpoKsDhtACw6lXKqU61CowYz+XAoV6lNHacWmcq1aFVtSykTwJe/YRFsOqpLk6rV6hUFQWCBB1Bg86G0gRsiKxpY783S2CSL8FS0UbIVTMWadAmotmgVEXgYoC0WyH9A8AUlsqrMK5TZUU4dfIMZ1LGyzDtt3YLyQuXQHlBmyRAAln14DwUAAA==); }</style></defs><rect x="0" y="0" width="1272.2340820360434" height="841.25" fill="#ffffff"></rect><g stroke-linecap="round" transform="translate(60.542382822086665 576.6875) rotate(0 108.28125 89.03125)"><path d="M32 0 C87.67 -3.35, 143.28 -1.71, 184.56 0 M32 0 C86.07 0.53, 140.5 -0.25, 184.56 0 M184.56 0 C207.52 -0.44, 216.62 10.61, 216.56 32 M184.56 0 C203.66 -1.46, 216.24 8.76, 216.56 32 M216.56 32 C217.38 66.79, 217.04 96.11, 216.56 146.06 M216.56 32 C215.59 60.85, 215.58 91.74, 216.56 146.06 M216.56 146.06 C216.17 167.37, 206.28 178.77, 184.56 178.06 M216.56 146.06 C218.32 168.75, 205.24 179.41, 184.56 178.06 M184.56 178.06 C136.31 177.1, 89.26 178.69, 32 178.06 M184.56 178.06 C125.89 178.72, 66.89 179.36, 32 178.06 M32 178.06 C11.78 177.33, -1.8 167.37, 0 146.06 M32 178.06 C11.6 178.77, -1.54 165.45, 0 146.06 M0 146.06 C1.86 109.98, 0.75 71.86, 0 32 M0 146.06 C0.22 108.2, 1.14 69.64, 0 32 M0 32 C1.92 11.83, 12.16 -0.34, 32 0 M0 32 C2.02 8.94, 11.64 -2.26, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(101.8476883030437 729.75) rotate(0 66.97594451904297 10)"><text x="66.97594451904297" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">External services</text></g><g stroke-linecap="round"><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(408.3511712294578 66.31596156529031) rotate(0 -4.13671875 349.6953125)"><path d="M0 0 C-2.95 260.55, -6.2 522.09, -8.27 699.39 M0 0 C-0.4 205.5, -2.48 411.73, -8.27 699.39" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round" transform="translate(353.9371087294578 230.4956490652903) rotate(0 46.91796875 140.974609375)"><path d="M1.96 0.99 L94.88 1.04 L92.26 282.18 L0.5 283.47" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C25.52 0.69, 54.07 2.04, 93.84 0 M0 0 C34.69 1.39, 68.85 0.06, 93.84 0 M93.84 0 C93.13 76.89, 92.87 151.6, 93.84 281.95 M93.84 0 C92.08 90.12, 93.01 179.44, 93.84 281.95 M93.84 281.95 C61.97 282.29, 30 283.74, 0 281.95 M93.84 281.95 C69.3 281.2, 45.48 281.59, 0 281.95 M0 281.95 C1.69 175.68, 1.26 67.14, 0 0 M0 281.95 C-1.21 208.54, -1.49 136.43, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(361.7451150160789 235.4956490652903) rotate(0 39.109962463378906 25)"><text x="39.109962463378906" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Load</text><text x="39.109962463378906" y="42.62" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">balancer</text></g><g stroke-linecap="round"><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(11.694921229457805 300.8550240652903) rotate(0 168.63272629293158 -1.5844019653713985)"><path d="M0.9 0.74 C57.11 0.1, 281.11 -3.42, 337.36 -3.91 M-0.09 0.09 C55.94 -0.39, 279.96 -1.98, 336.33 -2.66" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(11.694921229457805 300.8550240652903) rotate(0 168.63272629293158 -1.5844019653713985)"><path d="M334.75 -2.42 L323.29 5.33 L324.35 -7.45 L335.52 -3.37" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M336.33 -2.66 C333.09 -0.77, 327.34 2.52, 322.79 3.81 M336.33 -2.66 C330.8 -0.52, 325.1 2.62, 322.79 3.81 M322.79 3.81 C322.96 -1.06, 321.9 -5.55, 322.67 -8.87 M322.79 3.81 C322.91 -0.82, 323.17 -6.02, 322.67 -8.87 M322.67 -8.87 C325.81 -8.62, 330.14 -5.99, 336.33 -2.66 M322.67 -8.87 C326.44 -8.12, 329.64 -6.16, 336.33 -2.66 M336.33 -2.66 C336.33 -2.66, 336.33 -2.66, 336.33 -2.66 M336.33 -2.66 C336.33 -2.66, 336.33 -2.66, 336.33 -2.66" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(603.8277337294578 210.4761178152903) rotate(0 47.01953125 39.623046875)"><path d="M0.5 1.52 L95.72 1.42 L93.23 78.53 L-0.21 77.81" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C34.34 1.6, 72.41 2.01, 94.04 0 M0 0 C24.07 0.74, 49.88 0.57, 94.04 0 M94.04 0 C92.91 15.7, 95.83 35.39, 94.04 79.25 M94.04 0 C95.15 28.43, 94.1 56.81, 94.04 79.25 M94.04 79.25 C60.96 77.68, 26.77 78.43, 0 79.25 M94.04 79.25 C69.5 78.06, 43.98 77.78, 0 79.25 M0 79.25 C0.31 55.71, -0.61 30.62, 0 0 M0 79.25 C-0.25 50.02, -1.56 19.88, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(630.2172829848289 237.5991646902903) rotate(0 20.629981994628906 12.5)"><text x="20.629981994628906" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">RPC</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(841.9957024794578 372.4819771902903) rotate(0 64.578125 42.5)"><path d="M-0.81 -0.71 L128.95 -1.44 L127.69 85.02 L1.48 84.04" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C47.54 -1.8, 95.52 -2.65, 129.16 0 M0 0 C41.26 0.06, 83.62 -0.75, 129.16 0 M129.16 0 C131.08 19.64, 130.54 39.53, 129.16 85 M129.16 0 C129.47 23.34, 128.03 47.47, 129.16 85 M129.16 85 C94.21 86.67, 58.5 86.81, 0 85 M129.16 85 C93.93 83.88, 59.27 84.28, 0 85 M0 85 C1.91 58.03, 1.39 28.19, 0 0 M0 85 C0.92 55.85, 1.51 25.9, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(862.8638566475868 389.9819771902903) rotate(0 43.70997083187103 25)"><text x="43.70997083187103" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Block</text><text x="43.70997083187103" y="42.62" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Producer</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(604.0816399794578 414.8960396902903) rotate(0 47.01953125 39.623046875)"><path d="M-0.16 0.09 L95.58 -1.57 L93.77 80.93 L0.46 78.23" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C24.79 1.62, 47.5 1.43, 94.04 0 M0 0 C31.22 -0.26, 63.38 -0.23, 94.04 0 M94.04 0 C92.61 16.39, 93.39 34.25, 94.04 79.25 M94.04 0 C95.52 15.5, 94.81 31.69, 94.04 79.25 M94.04 79.25 C58.26 79.69, 25.85 81.58, 0 79.25 M94.04 79.25 C60.37 79.85, 28.52 80.49, 0 79.25 M0 79.25 C-1.28 48.62, -2 16.93, 0 0 M0 79.25 C-0.32 54.78, -0.55 31.32, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(630.3211836558341 442.0190865652903) rotate(0 20.779987573623657 12.5)"><text x="20.779987573623657" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">RPC</text></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(58.0257754367351 277.5190865652903) rotate(0 95.2199270427227 12.5)"><text x="95.2199270427227" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">rpc.testnet.miden.io</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(842.9136712294578 229.9565865652903) rotate(0 64.578125 42.5)"><path d="M0.09 -1.2 L129.19 -1.83 L130.61 84.99 L0.1 83.24" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C48.57 1.29, 98.13 -1.6, 129.16 0 M0 0 C37.92 0.59, 76.58 -0.08, 129.16 0 M129.16 0 C127.83 33.13, 128.11 67.38, 129.16 85 M129.16 0 C129.53 26.19, 130.48 51.37, 129.16 85 M129.16 85 C83.9 84.48, 39.71 85.66, 0 85 M129.16 85 C81.13 83.82, 32.58 84.55, 0 85 M0 85 C-0.78 53.27, 0.03 21.23, 0 0 M0 85 C-0.79 59.96, -0.43 32.73, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(880.4518105727195 259.9565865652903) rotate(0 27.03998565673828 12.5)"><text x="27.03998565673828" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Store</text></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(335.8807214241981 66.08939906529031) rotate(0 28.239981055259705 12.5)"><text x="28.239981055259705" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Public</text></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(424.03870174703593 65.76908656529031) rotate(0 38.999969482421875 12.5)"><text x="38.999969482421875" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Internal</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(588.3433587294578 565.3276803152903) rotate(0 64.578125 42.5)"><path d="M0.96 -0.78 L130.27 -1.16 L129.54 84.81 L0.17 85.96" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C33.76 1.58, 66.75 1.71, 129.16 0 M0 0 C35.37 0.3, 71.3 0.7, 129.16 0 M129.16 0 C130.26 30.88, 129.75 58.9, 129.16 85 M129.16 0 C128.74 30.67, 129.33 60.52, 129.16 85 M129.16 85 C94.18 83.4, 62.11 86.35, 0 85 M129.16 85 C96.65 84.04, 63.98 84.28, 0 85 M0 85 C2.35 53.4, -0.35 20.97, 0 0 M0 85 C0.72 64.61, 0.04 43.35, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(619.6315133315086 595.3276803152903) rotate(0 33.28997039794922 12.5)"><text x="33.28997039794922" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Faucet</text></g><g stroke-linecap="round"><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(9.84823629762036 426.58572598995215) rotate(0 172.08906471658258 -1.9023878558659817)"><path d="M1.06 -0.32 C58.23 -0.71, 287.01 -2.99, 344.03 -3.48 M0.15 -1.53 C57.17 -1.67, 286.52 -2.17, 343.57 -2.29" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(9.84823629762036 426.58572598995215) rotate(0 172.08906471658258 -1.9023878558659817)"><path d="M343.96 -2.48 L330.16 5.04 L328.09 -10.15 L342.54 -3.29" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M343.57 -2.29 C337.93 1.42, 332.33 2.79, 329.99 4.07 M343.57 -2.29 C340.4 -1, 336.6 1.57, 329.99 4.07 M329.99 4.07 C330.57 -1.97, 330.05 -5.7, 329.96 -8.6 M329.99 4.07 C329.62 -0.92, 329.8 -5.92, 329.96 -8.6 M329.96 -8.6 C332.33 -6.88, 335.23 -5.79, 343.57 -2.29 M329.96 -8.6 C334.36 -7.43, 337.5 -4.43, 343.57 -2.29 M343.57 -2.29 C343.57 -2.29, 343.57 -2.29, 343.57 -2.29 M343.57 -2.29 C343.57 -2.29, 343.57 -2.29, 343.57 -2.29" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(43.63160726930005 333.81228848995215) rotate(0 112.57991027832031 12.5)"><text x="112.57991027832031" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">faucet.testnet.miden.io</text></g><g stroke-linecap="round"><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(14.218722769296846 475.35452147982414) rotate(0 168.18937360855284 -2.011052638010824)"><path d="M0.09 -0.49 C56.21 -0.97, 281.5 -2.93, 337.71 -3.53 M-1.33 -1.79 C54.63 -2.01, 280.84 -1.79, 337.2 -2" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(14.218722769296846 475.35452147982414) rotate(0 168.18937360855284 -2.011052638010824)"><path d="M335.33 -3.55 L322.58 3.36 L324.8 -7.11 L337.05 -1.27" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M337.2 -2 C331.42 1.47, 326.88 3.42, 323.61 4.36 M337.2 -2 C334.5 0.09, 330.72 1.71, 323.61 4.36 M323.61 4.36 C324.56 2.61, 324.49 -1.77, 323.6 -8.32 M323.61 4.36 C323.16 1.01, 324.09 -2.65, 323.6 -8.32 M323.6 -8.32 C327.72 -6.38, 332.51 -3.04, 337.2 -2 M323.6 -8.32 C326.78 -7.42, 329.65 -6.09, 337.2 -2 M337.2 -2 C337.2 -2, 337.2 -2, 337.2 -2 M337.2 -2 C337.2 -2, 337.2 -2, 337.2 -2" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(33.06968897995944 451.1753365652903) rotate(0 118.17991974949837 12.5)"><text x="118.17991974949837" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">explorer.testnet.miden.io</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(122.1714837294578 605.0679146902903) rotate(0 46.91796875 45.755859375)"><path d="M1.25 -0.45 L95.6 -0.74 L92.39 89.8 L0.3 92.63" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C29.45 0.13, 57.94 -2.49, 93.84 0 M0 0 C30.09 0, 58.1 -1.07, 93.84 0 M93.84 0 C93.2 28, 92.22 53.56, 93.84 91.51 M93.84 0 C93.79 22.05, 94.64 43.23, 93.84 91.51 M93.84 91.51 C65.95 91.82, 38.89 91.76, 0 91.51 M93.84 91.51 C74.32 90.63, 55.18 91.12, 0 91.51 M0 91.51 C0.34 59.13, 1.5 24.53, 0 0 M0 91.51 C1.07 71.76, 0.4 51.15, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(130.77947780904765 638.3237740652903) rotate(0 38.309974670410156 12.5)"><text x="38.309974670410156" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">explorer</text></g><g stroke-linecap="round" transform="translate(566.8868940449349 135.26158654783467) rotate(0.6287350308633108 88.6875 198.02451577011152)"><path d="M32 0 C72.36 -1.94, 117.57 1.29, 145.38 0 M32 0 C60.43 -0.5, 87.85 0.1, 145.38 0 M145.38 0 C167.3 -1.85, 176.9 12.2, 177.38 32 M145.38 0 C168.03 -0.74, 178.7 11.98, 177.38 32 M177.38 32 C176.48 121.26, 177.64 212.66, 177.38 364.05 M177.38 32 C177.08 157.19, 177.7 283.53, 177.38 364.05 M177.38 364.05 C175.63 384.32, 165.38 396.22, 145.38 396.05 M177.38 364.05 C176.54 385.43, 168.91 397.87, 145.38 396.05 M145.38 396.05 C112.59 395.34, 79.4 397.74, 32 396.05 M145.38 396.05 C113.19 395.98, 82.29 395.99, 32 396.05 M32 396.05 C12.07 397.66, 0.01 384.15, 0 364.05 M32 396.05 C12.12 394.91, -2.03 384.03, 0 364.05 M0 364.05 C1.36 256.8, 1.68 146.39, 0 32 M0 364.05 C0.07 278.57, 0.67 191.18, 0 32 M0 32 C-1.77 11.19, 9.46 1.01, 32 0 M0 32 C-0.99 9.06, 9.03 1.33, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(583.2064588642709 140.26158654783467) rotate(0.6287350308633108 72.36793518066406 20)"><text x="72.36793518066406" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Horizontally scaled</text><text x="72.36793518066406" y="34.096000000000004" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">RPC providers</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(602.7103515720867 315.6894531250009) rotate(0 47.01953125 39.623046875)"><path d="M-0.73 0.01 L94.55 -0.87 L94.36 79 L-1.16 78.16" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C24.43 -0.96, 48.4 0.52, 94.04 0 M0 0 C18.29 0.93, 38.84 0.49, 94.04 0 M94.04 0 C94.88 17.05, 93.17 35.17, 94.04 79.25 M94.04 0 C94.85 19.39, 94.81 39.84, 94.04 79.25 M94.04 79.25 C62.4 80.33, 28.99 80.03, 0 79.25 M94.04 79.25 C68.55 79.41, 42.8 79.97, 0 79.25 M0 79.25 C0.03 48.31, -2.02 19.4, 0 0 M0 79.25 C1.45 61.67, -0.25 43.55, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(641.5098892307781 342.8125000000009) rotate(0 8.219993591308594 12.5)"><text x="8.219993591308594" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">...</text></g><g stroke-linecap="round"><g stroke-opacity="0.6" fill-opacity="0.6" transform="translate(353.89804622945803 299.3778334646913) rotate(0 106.39839641470371 0.4668846691251929)"><path d="M0 0 C66.12 -0.92, 134.97 -0.4, 212.8 1.38" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="8 9"></path></g><g stroke-opacity="0.6" fill-opacity="0.6" transform="translate(353.89804622945803 299.3778334646913) rotate(0 106.39839641470371 0.4668846691251929)"><path d="M214.14 -0.31 L200.72 9.27 L198.2 -6.24 L212.59 -0.09" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M212.8 1.38 C207.96 2.34, 205.43 4.32, 199.09 7.47 M199.09 7.47 C199.66 5.25, 200.47 1.12, 199.32 -5.21 M199.32 -5.21 C203.01 -4.28, 209.08 0.55, 212.8 1.38 M212.8 1.38 C212.8 1.38, 212.8 1.38, 212.8 1.38" stroke="#1e1e1e" stroke-width="1.5" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g stroke-opacity="0.6" fill-opacity="0.6" transform="translate(347.5662096368294 354.9977293837128) rotate(0 122.35499647713198 110.45415426984346)"><path d="M1.1 0.3 C21.47 7.26, 81.03 5.52, 121.45 42.24 C161.87 78.96, 223.18 191.06, 243.61 220.61" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="8 9"></path></g><g stroke-opacity="0.6" fill-opacity="0.6" transform="translate(347.5662096368294 354.9977293837128) rotate(0 122.35499647713198 110.45415426984346)"><path d="M242.54 220.41 L232.64 213.27 L240.3 207.71 L244.14 222.21" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M243.61 220.61 C240.99 217.66, 237.08 217.21, 231.05 212.41 M231.05 212.41 C233.79 209.78, 237.54 208.64, 241.81 205.71 M241.81 205.71 C241.53 208.64, 244.17 212.07, 243.61 220.61 M243.61 220.61 C243.61 220.61, 243.61 220.61, 243.61 220.61" stroke="#1e1e1e" stroke-width="1.5" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(354.1050774794578 473.9077584402903) rotate(0 -47.04735893348493 78.64444765286407)"><path d="M-1.14 -0.02 C5.03 4.56, 58.94 0.35, 36.47 26.57 C13.99 52.8, -107.13 135.84, -136.01 157.31" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="8 9"></path></g><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(354.1050774794578 473.9077584402903) rotate(0 -47.04735893348493 78.64444765286407)"><path d="M-136.32 158.29 L-130.1 142.7 L-119.42 155.15 L-134.56 155.35" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-136.01 157.31 C-134.07 153.23, -132.89 151.73, -128.65 144.24 M-128.65 144.24 C-124.73 148.02, -122.26 152.23, -121.27 154.55 M-121.27 154.55 C-124.52 155.29, -127.05 157.29, -136.01 157.31 M-136.01 157.31 C-136.01 157.31, -136.01 157.31, -136.01 157.31" stroke="#1e1e1e" stroke-width="1.5" fill="none"></path></g></g><mask></mask><g transform="translate(367.64101563458667 10) rotate(0 198.3779296875 22.5)"><text x="198.3779296875" y="31.716" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="36px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Example infrastructure</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(580.6087890720867 714.5000000000009) rotate(0 64.578125 42.5)"><path d="M-0.02 1.27 L128.34 1.11 L129.43 83.85 L-1.04 83.82" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C38.6 2.12, 75.32 2.87, 129.16 0 M0 0 C44.67 -1.4, 91.7 0.54, 129.16 0 M129.16 0 C129.21 29.14, 128.51 60.36, 129.16 85 M129.16 0 C129.39 24.07, 129.44 47.65, 129.16 85 M129.16 85 C79.81 86.55, 34.36 83.84, 0 85 M129.16 85 C85.73 85.46, 41.4 86.88, 0 85 M0 85 C1.09 61.36, -0.67 39.72, 0 0 M0 85 C-1.14 63.5, -1.1 43.11, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(587.2169662571453 732.0000000000009) rotate(0 57.969947814941406 25)"><text x="57.969947814941406" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Transaction</text><text x="57.969947814941406" y="42.62" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">prover</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(746.9837890720867 713.1249999999991) rotate(0 64.578125 42.5)"><path d="M-1.46 0.46 L130.6 -0.56 L129.68 83.52 L-0.03 84.9" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C41.37 0.43, 81.41 0.08, 129.16 0 M0 0 C44.9 -1.73, 89.85 -1.14, 129.16 0 M129.16 0 C129.38 30.61, 129.7 60.69, 129.16 85 M129.16 0 C128.87 28.31, 129.19 58.25, 129.16 85 M129.16 85 C83.44 82.63, 40.14 83.36, 0 85 M129.16 85 C81.06 85.06, 35.06 85.76, 0 85 M0 85 C-0.27 61.61, 0.7 40.41, 0 0 M0 85 C-0.47 56.59, -0.78 29.62, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(781.3319336033367 730.6249999999991) rotate(0 30.22998046875 25)"><text x="30.22998046875" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Batch</text><text x="30.22998046875" y="42.62" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">prover</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(914.7337890720867 716.5625000000009) rotate(0 64.578125 42.5)"><path d="M1.5 -1.63 L129.09 -0.73 L129.67 83.62 L-0.77 85.91" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C43.15 -2.19, 90.8 -2, 129.16 0 M0 0 C27.98 -0.29, 54.92 -1.22, 129.16 0 M129.16 0 C128.68 26.32, 130.89 52.58, 129.16 85 M129.16 0 C129.55 30.46, 129.75 59.83, 129.16 85 M129.16 85 C79.62 83.42, 28.65 85.17, 0 85 M129.16 85 C99.91 83.51, 71.69 84.83, 0 85 M0 85 C1.42 66.52, 0.6 44.56, 0 0 M0 85 C-0.92 62.99, 0.81 42.4, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(949.0819336033367 734.0625000000009) rotate(0 30.22998046875 25)"><text x="30.22998046875" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Block</text><text x="30.22998046875" y="42.62" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">prover</text></g><g stroke-linecap="round" transform="translate(566.1244140720867 688.25) rotate(0 250.59375 71.5)"><path d="M32 0 C195.03 -2.25, 360.08 -1.07, 469.19 0 M32 0 C151.55 -1.69, 271.82 -2.17, 469.19 0 M469.19 0 C489.02 1.96, 499.26 9.28, 501.19 32 M469.19 0 C491.54 1.13, 502.41 12.37, 501.19 32 M501.19 32 C502.7 53.87, 499.19 72.55, 501.19 111 M501.19 32 C500.76 51.29, 501.91 71.63, 501.19 111 M501.19 111 C502.96 133.87, 488.77 143.98, 469.19 143 M501.19 111 C502.08 134.03, 490.24 143.92, 469.19 143 M469.19 143 C352.51 144.66, 236.97 143.35, 32 143 M469.19 143 C342.88 144.86, 216.08 144.81, 32 143 M32 143 C9.43 143.82, 0.12 133.01, 0 111 M32 143 C9.14 142.74, -2.12 133.76, 0 111 M0 111 C-0.84 81.51, 1.76 51.84, 0 32 M0 111 C0.87 88.76, 0.51 65.73, 0 32 M0 32 C-0.76 12.18, 12.31 1.6, 32 0 M0 32 C-1.82 9.89, 12.62 1.23, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-linecap="round"><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(24.302975879040105 355.97897170505803) rotate(0 162.71606434578075 -0.6608136030981768)"><path d="M0.81 0.8 C54.62 0.7, 269.46 -0.13, 323.44 -0.49 M-0.23 0.17 C53.9 -0.26, 271.62 -2.1, 325.66 -2.12" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(24.302975879040105 355.97897170505803) rotate(0 162.71606434578075 -0.6608136030981768)"><path d="M326.78 -4.06 L313.35 2.54 L311.76 -9.14 L324.65 -2.92" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M325.66 -2.12 C321.97 -0.97, 317.44 2.77, 312.1 4.29 M325.66 -2.12 C321.54 0.28, 317.69 1.17, 312.1 4.29 M312.1 4.29 C312.06 0.76, 312.6 -0.63, 312.04 -8.39 M312.1 4.29 C311.87 1.17, 312.59 -2.55, 312.04 -8.39 M312.04 -8.39 C317.1 -4.61, 321.51 -4.45, 325.66 -2.12 M312.04 -8.39 C316.08 -6.41, 319.67 -4.85, 325.66 -2.12 M325.66 -2.12 C325.66 -2.12, 325.66 -2.12, 325.66 -2.12 M325.66 -2.12 C325.66 -2.12, 325.66 -2.12, 325.66 -2.12" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(33.93472026380596 402.39070936795633) rotate(0 125.60990905761719 12.5)"><text x="125.60990905761719" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">tx-prover.testnet.miden.io</text></g><g stroke-linecap="round"><g stroke-opacity="0.6" fill-opacity="0.6" transform="translate(352.50742122945803 422.26326099339076) rotate(0 123.17175793263243 147.46667863528864)"><path d="M-0.94 -0.23 C18.63 10.28, 76.09 12.78, 117.46 62.01 C158.83 111.24, 225.79 255.99, 247.28 295.16" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="8 9"></path></g><g stroke-opacity="0.6" fill-opacity="0.6" transform="translate(352.50742122945803 422.26326099339076) rotate(0 123.17175793263243 147.46667863528864)"><path d="M245.74 294.35 L236.36 284.83 L247.29 280.56 L248.72 293.73" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M247.28 295.16 C243.5 293.25, 238.74 289.9, 235.46 285.92 M235.46 285.92 C237.91 283.91, 239.38 283.32, 246.76 280.17 M246.76 280.17 C247.31 283.98, 246.26 288.12, 247.28 295.16 M247.28 295.16 C247.28 295.16, 247.28 295.16, 247.28 295.16" stroke="#1e1e1e" stroke-width="1.5" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(902.8413159436857 369) rotate(0 0.5647120954222942 -24.943887575363078)"><path d="M0.48 0.27 C0.69 -8.07, 1.01 -41.87, 1.07 -50.16 M0.06 -0.07 C0.2 -8.32, 0.27 -41.19, 0.59 -49.56" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(902.8413159436857 369) rotate(0 0.5647120954222942 -24.943887575363078)"><path d="M0.48 -49.84 L6.84 -34.87 L-5.23 -36.16 L0.92 -50.52" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M0.59 -49.56 C2.55 -46.09, 3.54 -42.79, 6.69 -35.85 M0.59 -49.56 C3.25 -44.52, 5.24 -38.46, 6.69 -35.85 M6.69 -35.85 C3.35 -35.76, -0.22 -35.95, -5.99 -36.08 M6.69 -35.85 C2.34 -36.21, -1.52 -36.18, -5.99 -36.08 M-5.99 -36.08 C-4.24 -38.76, -2.94 -41.67, 0.59 -49.56 M-5.99 -36.08 C-3.87 -40.1, -1.79 -44.65, 0.59 -49.56 M0.59 -49.56 C0.59 -49.56, 0.59 -49.56, 0.59 -49.56 M0.59 -49.56 C0.59 -49.56, 0.59 -49.56, 0.59 -49.56" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(899.4781900410126 458.4819771902903) rotate(0 0.4324297541884903 113.75098941127726)"><path d="M-0.61 0.08 C-0.49 38, 1.33 189.35, 1.48 227.47 M1.27 -0.93 C1.25 37.11, 1.36 189.9, 1.04 228.43" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(899.4781900410126 458.4819771902903) rotate(0 0.4324297541884903 113.75098941127726)"><path d="M3 230.1 L-6.09 213.07 L6.03 213.12 L0.72 228.69" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M1.04 228.43 C-1.14 224.68, -4.9 218.21, -5.25 214.82 M1.04 228.43 C-1.43 224.02, -3.79 220.13, -5.25 214.82 M-5.25 214.82 C-1.89 214.33, 2.98 214.07, 7.43 214.86 M-5.25 214.82 C-2.44 214.72, 1.18 215.46, 7.43 214.86 M7.43 214.86 C6.44 220.1, 2.49 224.89, 1.04 228.43 M7.43 214.86 C5.61 218.56, 4.29 222.6, 1.04 228.43 M1.04 228.43 C1.04 228.43, 1.04 228.43, 1.04 228.43 M1.04 228.43 C1.04 228.43, 1.04 228.43, 1.04 228.43" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(745.0051739520876 401.3495550348225) rotate(0 45.57656702217736 -0.4907678162630873)"><path d="M0.31 0.5 C15.68 0.35, 76.93 0.2, 92.14 0.03 M-0.99 -0.28 C14.25 -0.81, 76.08 -1.11, 91.36 -1.49" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(745.0051739520876 401.3495550348225) rotate(0 45.57656702217736 -0.4907678162630873)"><path d="M89.71 -2.83 L79.12 5.45 L78.77 -9.48 L89.5 -1.13" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M91.36 -1.49 C88.07 0.86, 84.93 2.11, 77.86 5.04 M91.36 -1.49 C87.3 0.9, 81.43 2.46, 77.86 5.04 M77.86 5.04 C77.02 0.7, 76.8 -2.14, 77.68 -7.64 M77.86 5.04 C78.27 1.91, 77.41 -1.21, 77.68 -7.64 M77.68 -7.64 C83.17 -6.81, 89.04 -1.84, 91.36 -1.49 M77.68 -7.64 C82.11 -5.97, 87.37 -3.29, 91.36 -1.49 M91.36 -1.49 C91.36 -1.49, 91.36 -1.49, 91.36 -1.49 M91.36 -1.49 C91.36 -1.49, 91.36 -1.49, 91.36 -1.49" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(745.2033815870749 435.646453213275) rotate(0 51.658765795240186 -0.22308406928186741)"><path d="M0.85 0.45 C18.05 0.47, 86.59 -0.57, 103.49 -0.93 M-0.17 -0.36 C16.89 -0.06, 85.27 0.58, 102.73 0.48" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(745.2033815870749 435.646453213275) rotate(0 51.658765795240186 -0.22308406928186741)"><path d="M102.89 0.81 L87.84 6.5 L89.12 -6.78 L101.61 1.15" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M102.73 0.48 C98.88 3.04, 93.66 3.44, 89.12 6.77 M102.73 0.48 C99.52 2.03, 96.58 3.66, 89.12 6.77 M89.12 6.77 C88.36 2.82, 90.1 -2.45, 89.15 -5.9 M89.12 6.77 C89.29 2.36, 89.48 -1.51, 89.15 -5.9 M89.15 -5.9 C93.06 -5.79, 93.76 -2.55, 102.73 0.48 M89.15 -5.9 C94.45 -2.8, 100.15 -1.51, 102.73 0.48 M102.73 0.48 C102.73 0.48, 102.73 0.48, 102.73 0.48 M102.73 0.48 C102.73 0.48, 102.73 0.48, 102.73 0.48" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(743.8283815870749 417.771453213275) rotate(0 50.769414345547546 -0.9813760738820747)"><path d="M-1.05 -0.85 C16.09 -0.88, 85.15 -1.06, 102.58 -1.11" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 7"></path></g><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(743.8283815870749 417.771453213275) rotate(0 50.769414345547546 -0.9813760738820747)"><path d="M100.78 -0.2 L90.57 6.09 L87.21 -7.05 L104.1 0.77" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M102.58 -1.11 C97.67 -0.12, 94.41 2.89, 89.01 5.27 M89.01 5.27 C89.45 1.64, 88.18 -1.04, 88.97 -7.41 M88.97 -7.41 C93.91 -6.42, 99.62 -3.26, 102.58 -1.11 M102.58 -1.11 C102.58 -1.11, 102.58 -1.11, 102.58 -1.11" stroke="#1e1e1e" stroke-width="1.5" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(746.0375652923652 253.54379970520677) rotate(0 51.52684324197469 -0.4347360081969782)"><path d="M-0.63 1.02 C16.58 0.94, 86.54 0.38, 103.68 -0.09 M1.24 0.52 C18.31 0.04, 85.79 -1.64, 103.02 -1.89" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(746.0375652923652 253.54379970520677) rotate(0 51.52684324197469 -0.4347360081969782)"><path d="M104.6 -1.47 L89.97 3.85 L88.88 -6.11 L103.37 -2.22" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M103.02 -1.89 C99.82 0.95, 94.78 1.34, 89.56 4.72 M103.02 -1.89 C100.76 -1.01, 97.64 0.84, 89.56 4.72 M89.56 4.72 C89.87 1.27, 89.47 -3.51, 89.3 -7.95 M89.56 4.72 C89.26 1.82, 89.67 -2.2, 89.3 -7.95 M89.3 -7.95 C93.66 -5.56, 95.2 -4.94, 103.02 -1.89 M89.3 -7.95 C92.4 -6.08, 95.97 -5.78, 103.02 -1.89 M103.02 -1.89 C103.02 -1.89, 103.02 -1.89, 103.02 -1.89 M103.02 -1.89 C103.02 -1.89, 103.02 -1.89, 103.02 -1.89" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(743.6241339551876 270.30448398977023) rotate(0 51.38748306445774 -0.5862455587835029)"><path d="M0.56 0.6 C17.7 0.13, 85.21 -1.54, 102.22 -1.77" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="1.5 7"></path></g><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(743.6241339551876 270.30448398977023) rotate(0 51.38748306445774 -0.5862455587835029)"><path d="M103.02 -0.52 L89.97 3.5 L88.5 -9.09 L100.82 -1.28" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M102.22 -1.77 C99.69 -1.2, 94.25 0.94, 88.76 4.84 M88.76 4.84 C89.06 1.13, 88.42 -2.48, 88.5 -7.84 M88.5 -7.84 C92.23 -7.23, 95.14 -5.03, 102.22 -1.77 M102.22 -1.77 C102.22 -1.77, 102.22 -1.77, 102.22 -1.77" stroke="#1e1e1e" stroke-width="1.5" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(747.2220015573536 285.50275291848266) rotate(0 50.859381965920306 -0.09274263172164865)"><path d="M-0.91 -1.09 C16.11 -1.32, 85.13 -0.76, 102.62 -0.82 M0.82 0.96 C17.58 0.86, 84.25 0.9, 101.41 0.64" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(747.2220015573536 285.50275291848266) rotate(0 50.859381965920306 -0.09274263172164865)"><path d="M100.99 2.49 L88.2 6.74 L87.62 -7.22 L99.93 2.58" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M101.41 0.64 C95.39 2.14, 91.89 6.15, 87.86 7.07 M101.41 0.64 C98.2 2.15, 94.81 3.88, 87.86 7.07 M87.86 7.07 C87.28 2.68, 87.92 -1.59, 87.78 -5.61 M87.86 7.07 C87.49 2.02, 88.01 -1.53, 87.78 -5.61 M87.78 -5.61 C91.71 -4.4, 97.94 -1.34, 101.41 0.64 M87.78 -5.61 C92.94 -3.2, 97.16 -0.78, 101.41 0.64 M101.41 0.64 C101.41 0.64, 101.41 0.64, 101.41 0.64 M101.41 0.64 C101.41 0.64, 101.41 0.64, 101.41 0.64" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(1133.0778320360434 376.6250000000009) rotate(0 64.578125 42.5)"><path d="M1.85 0.34 L130.14 1.18 L130.47 86.8 L0.32 85.42" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C46.94 1.49, 91.33 0.33, 129.16 0 M0 0 C46.64 -0.28, 92.6 -0.57, 129.16 0 M129.16 0 C130.19 27.8, 128.21 58.48, 129.16 85 M129.16 0 C129.95 30.03, 129.69 58.63, 129.16 85 M129.16 85 C102.57 83.34, 72.77 85.57, 0 85 M129.16 85 C97.74 84.63, 67.72 83.23, 0 85 M0 85 C2 57.68, 0.32 32.99, 0 0 M0 85 C0.32 63.08, 0.04 39.08, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(1139.6809585619224 394.1250000000009) rotate(0 57.974998474121094 25)"><text x="57.974998474121094" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Network Tx</text><text x="57.974998474121094" y="42.62" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Builder</text></g><g stroke-linecap="round"><g transform="translate(969.6559570360436 395.88434401184713) rotate(0 79.92187499999994 -0.220810252508727)"><path d="M0 0 C39.61 -0.47, 73.97 -2.06, 159.84 0.24 M0 0 C33.33 1.27, 66.99 -0.19, 159.84 0.24" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(969.6559570360436 395.88434401184713) rotate(0 79.92187499999994 -0.220810252508727)"><path d="M160.79 -1.12 L146.41 5.89 L147.87 -4.1 L161.2 1.91" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M159.84 0.24 C157.92 1.71, 152.1 1.98, 146.25 6.58 M159.84 0.24 C156.72 1.97, 153.88 2.17, 146.25 6.58 M146.25 6.58 C145.3 2.47, 147.17 -2.52, 146.25 -6.1 M146.25 6.58 C145.95 2.33, 145.83 -2.04, 146.25 -6.1 M146.25 -6.1 C150.84 -4.84, 151.38 -3.22, 159.84 0.24 M146.25 -6.1 C149.9 -3.62, 154.97 -2.77, 159.84 0.24 M159.84 0.24 C159.84 0.24, 159.84 0.24, 159.84 0.24 M159.84 0.24 C159.84 0.24, 159.84 0.24, 159.84 0.24" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g transform="translate(978.6559570360434 376.125) rotate(0 65 10)"><text x="0" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">mempool updates</text></g><g stroke-linecap="round"><g transform="translate(1166.655957036046 466.0154609260735) rotate(0 -106.41060738632711 16.669147859513032)"><path d="M0.34 0.11 C-20.87 6.88, -91.36 41.07, -126.92 39.75 C-162.47 38.44, -198.26 0.1, -212.98 -7.79 M-0.94 -0.88 C-22.28 6.14, -92.17 42.09, -127.54 41.11 C-162.91 40.12, -198.49 1.18, -213.16 -6.78" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1166.655957036046 466.0154609260735) rotate(0 -106.41060738632711 16.669147859513032)"><path d="M-213.05 -4.81 L-200.18 -5.11 L-204.3 8.36 L-211.91 -7.05" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-213.16 -6.78 C-208.23 -5.05, -203.99 -3.43, -198.48 -3.72 M-213.16 -6.78 C-209.89 -6.54, -205.57 -5.88, -198.48 -3.72 M-198.48 -3.72 C-201.49 -1.19, -205.15 2.96, -206.07 6.44 M-198.48 -3.72 C-201.86 0.61, -204.43 3.89, -206.07 6.44 M-206.07 6.44 C-209.41 2.72, -211.95 -1.37, -213.16 -6.78 M-206.07 6.44 C-209.38 0.78, -211.8 -4.26, -213.16 -6.78 M-213.16 -6.78 C-213.16 -6.78, -213.16 -6.78, -213.16 -6.78 M-213.16 -6.78 C-213.16 -6.78, -213.16 -6.78, -213.16 -6.78" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g transform="translate(998.6559570360434 475.125) rotate(0 47.53333282470703 10)"><text x="0" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">network txs</text></g><g stroke-linecap="round"><g transform="translate(970.6559570360434 266.125) rotate(0 95.51964635755866 54.050115219950385)"><path d="M0.08 0.27 C17.94 4.86, 75.21 9.33, 107.26 27.16 C139.31 45, 178.16 93.79, 192.37 107.27 M-1.33 -0.64 C16.9 3.69, 77.39 7.42, 109.58 25.65 C141.77 43.88, 177.89 95.33, 191.8 108.74" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(970.6559570360434 266.125) rotate(0 95.51964635755866 54.050115219950385)"><path d="M192.74 108.22 L177.42 102.38 L186.25 95.23 L190.16 109.22" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M191.8 108.74 C187.93 105.94, 184.81 105.46, 178.09 102.66 M191.8 108.74 C186.67 106.56, 183.58 105.18, 178.09 102.66 M178.09 102.66 C181.68 100.28, 185.06 97.97, 187.64 94.32 M178.09 102.66 C180.86 100.43, 184.09 96.82, 187.64 94.32 M187.64 94.32 C187.72 97.57, 190.59 103.78, 191.8 108.74 M187.64 94.32 C188.83 100.04, 190.32 105.14, 191.8 108.74 M191.8 108.74 C191.8 108.74, 191.8 108.74, 191.8 108.74 M191.8 108.74 C191.8 108.74, 191.8 108.74, 191.8 108.74" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g transform="translate(986.6559570360434 277.125) rotate(0 39.375 20)"><text x="0" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">committed</text><text x="0" y="34.096000000000004" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">state</text></g><g stroke-linecap="round"><g transform="translate(1193.6559570360434 464.125) rotate(0 -244.35041486561295 126.56448117945365)"><path d="M-1.16 0.59 C-82.63 42.77, -407.3 211.21, -488.81 253.27 M0.44 -0.14 C-81.09 41.63, -407.21 208.89, -489.14 251.29" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1193.6559570360434 464.125) rotate(0 -244.35041486561295 126.56448117945365)"><path d="M-488.06 250.89 L-480.81 239.57 L-473.84 252.23 L-490.65 250.08" stroke="none" stroke-width="0" fill="#1e1e1e" fill-rule="evenodd"></path><path d="M-489.14 251.29 C-485.65 249.28, -483.28 243.93, -479.96 239.43 M-489.14 251.29 C-486.14 248, -482.97 244.65, -479.96 239.43 M-479.96 239.43 C-477.7 242.14, -477.41 245.02, -474.15 250.7 M-479.96 239.43 C-478.92 242.51, -477.07 243.97, -474.15 250.7 M-474.15 250.7 C-477.71 251.04, -482.94 251.05, -489.14 251.29 M-474.15 250.7 C-477.42 251.37, -480.71 250.99, -489.14 251.29 M-489.14 251.29 C-489.14 251.29, -489.14 251.29, -489.14 251.29 M-489.14 251.29 C-489.14 251.29, -489.14 251.29, -489.14 251.29" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask></svg>
\ No newline at end of file
diff --git a/docs/internal/src/assets/workspace_tree.svg b/docs/internal/src/assets/workspace_tree.svg
new file mode 100644
index 000000000..016e69a63
--- /dev/null
+++ b/docs/internal/src/assets/workspace_tree.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 827.1364674277316 627.7500000000009" width="827.1364674277316" height="627.7500000000009"><!-- svg-source:excalidraw --><metadata><!-- payload-type:application/vnd.excalidraw+json --><!-- payload-version:2 --><!-- payload-start -->eyJ2ZXJzaW9uIjoiMSIsImVuY29kaW5nIjoiYnN0cmluZyIsImNvbXByZXNzZWQiOnRydWUsImVuY29kZWQiOiJ4nO1cXFlT20hcdTAwMTd9z6+g+F5cdTAwMDdN78u8sS9J2MP2zVRKWMJcdTAwMTbYkpFlXGaZyn+f2zJYsjYvXGJCpaypmlwiUku+3brnnHu7b+vfT0tLy9FT113+a2nZfWzYbc9cdO3B8lx1MDAxZub8g1x1MDAxYva8wIdLJP53L+iHjbhlK4q6vb/+/NPudq3kLqtcdTAwMTF0hne6bbfj+lFcdTAwMGba/lx1MDAxZv69tPRv/H+44jnmfrt72nWf9qLPXHUwMDA3XHUwMDE33e1cdTAwMWLXsa/Do5X41rjRi0Gh24hsv9l2k0uPcH5FIGJJglx1MDAxOVx1MDAxMYpILiRcdTAwMWZdfoLLnFwibWlEXHUwMDE41UJcdTAwMTCq9OjqwHOiXHUwMDE2tMBEW5hcdTAwMGLC0fNBR01artdsRdBGJVx1MDAwZlx1MDAxZJrw11x1MDAxMlx1MDAxYZ3pRWFw565cdTAwMDftIDR2/lx1MDAwZrvmv8TKa7tx11xmg77vJG1u4iNpc+O12yfRU/xkXHUwMDE4Wlx1MDAxOMLlzPPPX8zNnC+7XHUwMDBifrDZ8t1eb+yeoGs3vMhcZoxOOmCM6+468Vx1MDAwYvonMSm0O+6ueUN+v91cdTAwMWWd9nzHNeO+fC22x37Nd55/bax5z3WdeJBcdTAwMTlnhFx1MDAxMiZGV1x1MDAxMoeCkc+e3Vx1MDAwZvzYubBcdTAwMTJaXHUwMDEzTVx1MDAwNUlcZuhtgEdF8WNv7HbPTVx1MDAwNtpcdTAwMTixmfW2tMeNOVTkPkajXHUwMDFlpPyxtXaI2ofR3e6mdKR/7j8+9Fx1MDAwNuvLo3Y//yh+7PDm3ire3rn8et/yzvd31lvisDPY/D7+Ky+/b4dhMEg99/mv5Fxy9LuOPewnllxmK6koZUgkY9X2/LvseLeDxl0yNJ9SXHUwMDA2Z1BX3MtcdTAwMWPqxlx1MDAwNmlcYjguscUoJZJcdTAwMTDCOVx1MDAxNjJcdTAwMDM4Olx1MDAwMXBCWFxcas2Q1FxcacVYXHUwMDFlb2SBt1x1MDAwMrztTI83RrhcdTAwMTZIcFZcdTAwMDA3cKIyuIGHUc2FXHUwMDEw86CtwnFcdKaCq1x1MDAxOVx1MDAxYzfxQ+N/0Pstu99wU554XHUwMDEz+NGJ98NcdTAwMThN0NjZLbvjtWNPXHUwMDFje8hq22ua3i83wF43XFxOXHUwMDBmQeSBao1cdTAwMWF0PMdJq0xcdTAwMDNcdTAwMWVqe75cdTAwMWLuTiNXQeg1Pd9un5ZcdTAwMThu96Pg2O1cck2Pwr6bXHUwMDFlXHUwMDE1d+dcdTAwMDVcdTAwMDHYXCK8XHUwMDAyvWxD76w621x1MDAxYmtXXHUwMDE3q963jZuHXtd1ptdMxaTFZIVmUlx1MDAwYlx1MDAxMflcdTAwMDLhXHUwMDA04Fx1MDAwYs18LYZ3Z9FMzSCwUWlPfYYwkzJ7dqSYWCosQG5cdTAwMTNb31xcMTtP97x/1du9WD9k+P76fHBPXHUwMDBlrqdVzKfdjfD7gX7avXSO+fnKw8n64PPOdIpZ+dzPbO389sfBXHUwMDBmPOh1dptHzYPv3/drU2JcIjRLXHTXq5S4ePSmUWKFhCVAiTVBXHUwMDAya0ayMKZcdTAwMTNgXHUwMDFjs4DWXG4xoVJcdTAwMWOwkOFKXGLvzVx1MDAwMGGqmYZgSOdcdTAwMTTX6DAhZSAmXGJhjbhIgb8mIUacMjyD3+aEeD9w3I8gw1x1MDAxM1x1MDAxNDArw+Nm1yPCZM+/v7tEO0H40FljX44j3e99nl6EIfq1XHUwMDE0XHUwMDEzZVwizDTktVIuXHUwMDEy1+H7rFx1MDAxM8Ffp0ewwlxmXHUwMDEzqlVR3kpUTptHKiwpRlx1MDAwMt7wXFyR9HwqfNE/vrv88rjd31xiwvVz/8z+7GytzaZqSEHsUI+qXHUwMDE1WzONqmlcbrJEQGIlZURcIkbGccExskhcdTAwMTUulLAo1lx1MDAxYV5cdTAwMDBcdTAwMDX1o0X5ZSo4WsBiXHUwMDA0i/3pYWFSXHUwMDA0znCRrOFU1JBFXHUwMDA1eJlmb1wiazM6bk7W1sz1v/3DMHAgX1x1MDAwYj+Cwk2Ql6zCxT1YynegXHUwMDFlrfNuKHnyVVdcdTAwMDTbh0fbrTZpfuHR9FqnkKzWOmaxxSTty5utXHUwMDEz1Fx1MDAwN9ODXHUwMDFhXHUwMDEyXHUwMDAxLDWnhVx1MDAxOSfT2bPJXHUwMDFjLcNSIPWeXHUwMDE5py02Ns5WNzna37389rDPXHUwMDFmoofByrRax4dcdTAwMTOXmqFZXCLhXG5wXHUwMDE0WzON1kmJLIpcdTAwMTRRkilGUWqObKh1ZFx1MDAwMi44s1x1MDAxMGRwXHUwMDEyU0yZXHUwMDE0XFzkYbFI4opgcTjDXFyq5EhcdCVcbkPAfGaXwEJTJECXalx1MDAxNLv5PDcndidRXHUwMDEwfogkboKqZCUuY3c9ynbUvjl19OGpaovrtvTPTu4vXHUwMDFjb4blR4EnZXGYk8VU6vCF1lx04ZNcdTAwMTnmYVx1MDAxMCZMYo5yMy5cdTAwMDbfvDyN44aVJUPvmMa198VX3DknXHUwMDBmq9tX67p73fLo9sWvXn5cdTAwMWNcdTAwMTJcdTAwMGZcdTAwMTFcdTAwMTjPsopTgbriXk4jmVx1MDAwMkMoqUEyqVwiXHUwMDA0a8HGXHUwMDAxXHUwMDA3llZcdTAwMDOOXHUwMDE5PtBaQFKvXHSXXG7n8baQzFwivJ1OjzeCzZw0YYXL/USX4o1IZlx1MDAxMEfZPHCr03Nzknl8uP5cdTAwMTFcdTAwMDRzglhlXHUwMDA1c8zqeuTye6SO7txcdTAwMGIsv+701vvnZ61cdTAwMWS3WVA3UL7yWDnpKbFKT+4s5LI++H6bQS6lVlx1MDAwMutCtaSkNFx1MDAxMdRcdTAwMDRIXHUwMDE1XHT8jnmg39JcdTAwMWR8dSld4ZydXHUwMDFkba1+OZBcdTAwMDK/w1xuYeVz9fWj5+3rrb67s9J4jC5a+LB/UoNcYtdeXHUwMDAzVDx604iwmc8h2Igwx1x1MDAxMpFUfDSEMZtcdTAwMDBjxkHDjVxiU6nAZchi8XFo0kRcdTAwMTSfzSDCiFxiKSFcdTAwMTIqnKVcdTAwMTWlXCKsiFx1MDAxNlxcgGTWJ8LDSVqIylJ8P4dcYn+LvHbvI8jwXHUwMDA0XHUwMDExzMpwxu56hPjpXCJyLlr8cnswOOvpq69cdTAwMDdcdTAwMWTpXHUwMDBlZshbKa8qm5VcdTAwMTBGL2Zk31x1MDAwNMLnM1xisSBEXGKBRKFcdTAwMTKr8rknjjRWXHUwMDE0v+fyo33q2WdcdTAwMGZcdTAwMTf3W61cdTAwMWbN1sr+/q1e5edTS+be3sn2/tFaXHUwMDBmXHUwMDFkiOPOce/cd1x1MDAwNqguyWSIXHRRU95a3MtpJJNrZWFcdTAwMDHhXHUwMDEzUvGSciZvhURl8lQv1VqqeFGTLup1nk2aiLeLXHUwMDE58EYoMaVQhZEvqVjYRFjDe8F6rtD3TTWzXHUwMDFiXHUwMDA2UfBcdTAwMTE0c4JeZTUzY3c9mon2NndcdTAwMGb3XHUwMDAy7Fx1MDAxZWxdXHUwMDEye3s7XFxVx1x1MDAwNUVcdGWaiVx1MDAxMYS9glGKcPFkL2BUJHNPXHTljErfTcmPZHp05DGMOejySFTHdLVcdTAwMTZMR6Ht97p2XGJv81fiXHUwMDFho9dcdTAwMDP7slx1MDAxONiJvLy8UPp85mdi/HNcdTAwMTmDkIAwwlxu4Y4q4E45RUrMXHUwMDA39ypcdTAwMWR8q2LYV6Skb6XbJc+dXHUwMDE0Zkgq2bq/vv/5dmflylx1MDAxYlxc0yC825xtXHUwMDFhXHUwMDFi1JPWXHUwMDE0XHUwMDBlXHUwMDE0WzNNOCBcdLU0uFx1MDAxZThcdTAwMTFcIkqgXGaVcMXT4UCeSnS8XHSHQl84gsa6aFx1MDAxN03NVU6/XHUwMDExdVxcTVx1MDAxZlx1MDAxM0gkgO5xcVx1MDAxNk1zXHUwMDFibJJcdTAwMTBcdTAwMWNkgs5cdTAwMTWAj1nxevfNhVx1MDAwNOtBp1x1MDAxYvjxj1x1MDAxNcVcdTAwMDWpQqpa4oLrIIqe94LGXHIyccFcdTAwMDRNzsZcdTAwMDVFxteUUFdyb4bHMmCWwlx1MDAxMoBjJmhcXIufaPawXHUwMDEwX2mLJ4X4eTBcdTAwMTNcdTAwMGJpXHLhI1x1MDAwNJ5cdTAwMTJcdTAwMWNcdTAwMDel4s9cdTAwMTGaXHUwMDA1s5hcdTAwMTSQ9LF4Y4iuOdb/jcBtT1x1MDAxYlx1MDAxN5CyuFx1MDAwMCOuQeJcdTAwMGJWqmJaLVx1MDAwNT3QNqTrhNde8jE35ruBl1xyO5K/llx1MDAxMpeJ/zH6+58/XG5br5T7qTlyXHUwMDFlmjwvp8ptu1x1MDAxN1x1MDAwMZQ7Xlx1MDAwNFx1MDAxZD00RuboN7LDaFxyXqvnN8ff3vOG8mn2XHUwMDAxxFx1MDAxY9bom1x1MDAwMVhBYLykRCqwXHUwMDBlIGqWKlLNmnY3poh06K3RqFx1MDAwZomLuL4z2apqUlx1MDAxYreKYlx1MDAxOFRcdTAwMGVcdTAwMTZx+G3Jkz2bI6tcYmRcdTAwMDR5VzXjs2rIqOXaOTiAlelrWdZy29fBYKpcYqd6kaSSXHUwMDE1zS5DjlVZtkQlT29wyLNcIjXbm4qWXHUwMDA2qFwiVt1zXHUwMDFkv1x1MDAxMf9dv5r/XHUwMDA0IIVQgou2XHUwMDBmY5lb1Fx1MDAxZsU8lEA8rJSaa7d+1TSIQlxcJKL6y/gv45HmwIK8hFx1MDAxNVV3XG4rtcPOXHUwMDFjQ1x1MDAxZv5QXGZcdFx1MDAwNMkxXHUwMDEzSnHGXHUwMDE1pLgqqTJMXGJyPj6sXjBcdTAwMTnnQ86wpphcbiW1RCxZPFx1MDAxY9nAoYmZpftVlFhdZFVJiZxcdTAwMTHge1x1MDAwMXQoITmQODNcdMzAv1BloKgspokgjGmMXHUwMDExXHUwMDA0m1x1MDAwNeyokJWaYkrXny6IcpwoXHUwMDFirydKriDiXHUwMDExxfPF5XFcItBcdTAwMWFEXHUwMDFmtE6efKlzYnSu6eKa48RSNzVHzkHfg1x1MDAwNas/2zDOQFgxIc1SjYnMmCR5XG7C2MIk6Vx1MDAwM9Lz0WJ1OddcdTAwMTg1Y4K4woxQKlx1MDAwNUNcYlx1MDAxN9FcIk1NXHUwMDFjXHUwMDE3xq7vRJDVs43VmbSCoFx1MDAxMFJcYlx1MDAwNNFcdTAwMDdcdTAwMDGmTKBcdTAwMWZcdTAwMTOkwMRikF4oXCJMNW+Cn2RZ2sLArVx1MDAxOJtpMaHSXHUwMDEwXHUwMDFiXHUwMDExpKZcdTAwMTalwjRjklx1MDAwMtEmv7EgyHGCdF6fSWNiUkVV/CWaiukz8F/JIdasnVwiP0YqXe6n5sh56Hsw5NQ5K6SskOczgrSKXHUwMDBifbnOk5FKgtu3XG5cdTAwMTWRZUrLTJlcdTAwMDPDWFxiSFhUzlxmQ1x1MDAxN8lqW1x1MDAxMU+/XHUwMDEzJZ45p97Z5lO4s3J8uXrFelxy70fE8pRo5iuzhTqIWbh8zZEyXj23yGnBKiNcdTAwMTHaWiTQZbTnvZr2pNlKqXjhXHUwMDA26XTpRob1XHUwMDA03CRY3dkzXHUwMDE1TPBcdTAwMGZcdTAwMTBcdTAwMTVigbJZ8FxuRtxKUrnye1NebFx1MDAwZSyoScTrpMUs7kuuzMRcdTAwMTdj17pB+6lcdTAwMTl7wMT4qXJVtTrBVNhcdTAwMTKQXFwwU4cgXHUwMDE5z3ycT0DgakhTUqmVLijMXHUwMDA13kZcZljGRO1cdTAwMWH4JuGTpEJcdTAwMDFeXHUwMDE51YhA7iMoQ5gv4qcyXCK5rWElwrA64YU7abAq/1xmmCn+o0ih3zR+Wil1VHPkXfRDXHUwMDA1UGbSXHUwMDFmca5cdTAwMThcdTAwMDJao9zsYkux4nPoXHUwMDAyqj9vXGJVXWqVMYRcdTAwMTPFhVx1MDAwNlx1MDAxZlx1MDAwM+lcdTAwMDHVyq8+cCtV5ftL88q9x6fDe9c5woNvT7eis7Fy2mdcdTAwMDV5ZdF+XHUwMDA1rKqWXCKw1tWFW+BJXHUwMDE2vCZcdFKlzTb799iw8Fx1MDAxYvFge5ZdXHUwMDBiXG6iXHUwMDE2iFiKXGKv/INLVCGlmZA17lx1MDAxY1x1MDAxY9ZcdTAwMGVTrlJlenNUW5xcdTAwMDfhXHUwMDFkvMaGu+S4XYCC6zeelqLQrWVcdTAwMDN+271JOUeu9FwiXG66ZXVcdTAwMTdjXchcdTAwMTZZTGFzPTVcdTAwMTfrnq+um3fdxplq3eCVPtm4dGb4rFxmx9LSXHUwMDE4fFx1MDAwNXFmcqTc5nuUzo1cdTAwMTa7XHTrK6pcdTAwMGVmQLSE6IVcdTAwMTZ+QS39XHUwMDFki1xmoM1GYKzQu374+1x1MDAxYu3cSXHTdE/Xd24vb69cdTAwMGY8XHUwMDFl/bJcdTAwMWTyxdZMI3bcXHUwMDA0+YhcdTAwMTJTpCEkXHUwMDExLFx1MDAwN1x1MDAwYj5cdTAwMDFcdTAwMTaYW3pCcaFcXMCiXHUwMDAwXHUwMDE23elhgcH5hSZUXHUwMDE2zVx1MDAxMVx1MDAxMFG6y5YgJDhGsv5N8kCE8lWFhftuNFx1MDAwMOX42z81oYvdiMDsv/21vtd2PsYn1SbITe6jocP+LKW6s5TrzcxC+OmZQpbtbvckgncwiuSXXHUwMDFmPHewVo6NT89cXGGw4caJ5M9PP/9cdTAwMDPDXHUwMDE1Zk4ifQ==<!-- payload-end --></metadata><defs><style class="style-fonts">
+      @font-face { font-family: Excalifont; src: url(data:font/woff2;base64,d09GMgABAAAAABMYAA4AAAAAIKgAABLFAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGhYbh0QcNAZgAIEcEQgKr0SjHws8AAE2AiQDdAQgBYMYByAbVhmjoozVksj+IoHDK+PPmdAuy2Lrgciy+LUojZ+ShVG885tL3oaj3Gt42ua/uyMihRabMhpasbBmVE0n62639i++Lqr4h7rY2797RAdygE0TWJ4EQQkH5I0HUT7+2n6+fE2cLqKV7clGI5RCSj5fTvOl9ia1HwckO7BgXkCnQGQonPL+GQ836SpdZzQC2yGBMUl3HV4AGGn6H8C/v//f2q/ufMSaWBYrEa+ETCkz6Nx5mM1+PO02xKwRKY0QReOS/kZU4id1UueQ42ZS5CVbx/YVYM1oRP2ImAYgAJAA1DAIIOrfHQQAAq0YqIsjMQMI7p7WeiB4tFbUAcGrpG8jEEABADw2ZjwrWhsBDkikQIEBKQ3XC4MBckJQgEk/B/v+3XFZy97+TkPBxb72lZvVLEj10iK9CvH6bri10KbYbQ4Ecp9iAsorWsOVt/27vOEiUK/tVelFi/6Vcdd/Ww/p8rtTwgtLHKQKdysvQQWsGiuUhqFtkGAwBQ0Rgw6nYOOiEhJh3FAQssAAQfIuBmIzoAjIBHRgWBsFDQeDyfBoCH0TIWjcBnlNC87GIwBTk4S8SgVBpTgaQPQVAgigp4rbNy+vHgDALVwe9ZcBTV35jMaXDQBIMPuBbkDvJywOOdN2dSaDo0DKMzv+WtDuMKhDCsCSSvReDEkfDQwGYoPVJ8j4UcYeRqIdAjdSVg7J3DJlKVGhRrN2/Xg2T3BhlpA0VhZfp/W7+tfjqMN2bNsyNTKUiEVCa0EwB/QHQmJgEYYyEvtpxR98Gwr6ERAp2F0YEUxh0CIQ8AHOHKYrqSBcpiz/+9MPjf+fA/V3/1IFuZlvi99+os/V/lr/8I9vfvhq0WpZGYrjIVotJ6r92Vdqr2VmmZhnuKRYaDic8QRZNhlOZ1F6O02rKVZ4gxCY3tLuJm9wJ8nd5GAjnym+k5Ws8ySFBkjvrG5HEb77feegtZ4t3FHKRSt7fz+byyx8UK+rdoRVFuBEpzqF18OMq2wj5CDUO+IjZxgDaxr2yRhwpqTQFhs26DakBuin5ZCVMjl89WTvmx3xxkPTZEe1oX1Zoy4gLZybgUwVAoBkzNrwM6oKpNDeUoy6gHAQ8oK1C5QS4Jm0UiBNK9c7xUzMluQNkWdrbA0tvcHoQKXUg910lq5A6lFKIW4HF8WSwOZafq2cXNcMDgwCDvG0w8FmJSw5Q38d+VmOjN1l4LpdjUekuS8LL4n8WitGw7x/VbUhLVI1UtNtuiqPumD85i4vTBdutQQQ19OWT1BCXHDpj0SUWcKSBDNzXwyO0XZWsuIKVgcQrs8+1b8ttP/xMKs9kZ/3A8zql+v23Z2d8uhC6YG2FatBu9STOGkKuzPuJTTNrbaE/DYbJRhfyAcPiwN4u2PDOlVT+GATibpun+yCcMqBNIBRWoQQ2lJ1oBtdF5B/ccVoX/ZHeKdKq3uf2akoX835Gcq0Paz5R4N37B2VjZKD5CFmD+3g+uIt6rnSuGTFihOGIOSAt5K3l8KUf850+Pl7j/CkI5CZYXPNzDkoGzYI2D3/IHHy4iLMdhJsR1HZFm0qblepRyAhILYK1lRRLFAgigtJKtF0ViIVgi4WrYVsfaXVE3lTYBYEmCWQTjSy2TlUB7or+uRyMVJtzHb2pxxRIw4kfDgxyJk92X9np9rnaviKoRn8ODkE3nMNpBnWkCPjfK9lzvVkZ04OrhbZiVfo4a7uQUgxZqdEEuQDHKg2hFSSOpLkqSy/ceri/Fr73Dlk502G80y1i1Q3YOf4pjZu8Jjw8TXNrZCSg+IaGh7JmQ5o9CuEhM0wqzmO7/gmXhJX32H4qmo3aUQBjCA9iU0TONLhgiP4EyHkt/irZZcfbm4W5hIKeSF8ND7ePzF43Zpa2yjbr7eXbn5wVdSTvUHV8zQXWKGDesjZBtNnx42OB72vorTcpgPJeHPatGoO8rO8LL7NrVTH8+15thYs4UDIQZnuQe9ww2i4XJP0M94khR4gilW60rrW8ustdS6rNhYmsZIduVfFJ8I4gbffh1f4p6FifV1ypZX0i61vyskXiS5dOl/gY67MkUppZNtqcjUffF2ydvsV7Q8SP0BxLx8cFCmjGCik79EO+DWsDZGTZcjPB3WqG11vBRodVyI45Y8DUWYHLDnIjROQCpYQPIopefRlSlpO4KDRX8jkDJGpKIRrncI0tz7PgkBmPfnVXiZyrJicMdJU96QmbVrIWe/5q/KamF8VRwLVrhoUNqm0zLnkpd2uTgFpTnOOL8slgQ+g7h6+WYxyB8XohDQS+Y3yVvXPptvtQk8jIYorTeg5q7KvkD72AvAuMBcREMbIkWXFARxkcWkWymqnB+ZQsdJfiGtu6X05ENjMObI5grbuSUZHYhsbmI1GePQGiyZUT0PT6EoeIGHzznN/fa7tmPigfaDa6Udpl4NMwzttW4h5x/edIcoiC4SA9MGuRtyuRCcw+o2QR/uQTGZmigdU08tv9t/jp3yODv98mr2vGFzi9LT+H/YpoeGdT3cb3lt79eiPi+9c/eLubCAZoK9YMVKmlcoYkDFY1qlHXBigWFdyrR65zQdlFkFKJaPZZgG+vaJbW9Fd1S6zAMUZOiHH+Kj3zg/CdmQf66vrVqxbZBqGgLhwL62mwWjc+ry9vbhdcy708lkTzPkoBNYU3QCXdpbwOztfYHlUH+g0hcXkblKvb83072KmdR5c4uOMEzQqMwSWOwyKjOr6Mhj3H31JpotWHCPHd45SA0fkaOhcQf6qL2Qmy85RNsJsS93SZwNjafkEjahqHxOeX8JMtVVGIziYMUDHSGe7FdK0QstBw7P+6mouZ/qy6TsmO1n/qjGAkuTNUpWNNjAOLuLgC5t6ngcnOtXLo5siz86xDxiL8GCGg4PsKk/E/xZal+WNdiDmr70Uq7bf8s01kV9SbTjQSGW56V0usmQUbOBA5FnAGE5Uuzr4sEFciXDQ4acJIa7mmgZKiynRhsHa0SZZe3Pi+SNRHPxED3KccpSITAIOVGO5hH2DgDBw/087aQ1AG+AH5gTIrW8le3KZTsmX+gyMbUR8vtmLpqZbGPvDMhbsbbZZ0G4yrXDYdM1bpZ5Ns1ayPP2ciBy/gE+bHyZilSMDXN+GwTPStCfT+LFj2I72vIifsX3xxDj4LpgFRY3SdO21ZC5m1+RNt+SaRVVtUgzcQUPBj2T2741DvAedTYGPCKqtdBqAru+0V2dMKOiiE/Jfv/tqz52b7DaaG0UzAJKGmYkwKY5MD78zdWgCD7TTlieyMAWkY79cmCOrZK6ONKz02g4qbxV3QFbkrZPb967JcI8mX3aUTYaHz7sYm1SOL2YW4+EGscKGJfJD+LrXz4opLd2jZSqkmI59kokpvIAVbloLEgOEg9+Mj+Xlwp0wLmjGGL+TEqurLt79bQTkdBnZfUlTSti9iewO9aC5fYvVlrO5zPgjjOwY9mTchFc90ZNhthNBJ+E6FIMm7oteUDS9V23v2v9ssvKyvC11NDz+OudALl6Ndil2gEpmQQBkIeS6hJMTn8Lpmn2esLBgAXlX5sJMzEJMA7NUOcXPUcjekQCyHN8fneOVN1mUkwy8xEgukJIxsQnTYLBtLKON/sj05UQHdxQgAkdq1Ba6cnrQCpS5J1jxPyAJSmGCEAyEcDeD7z2tznS3JTp+MmWn/s6RXQtjS6/+JS9TrQ8a5HvP32hmMD9EZJPwjahVMDohWCplsj8hG0oI7bgtsPMAZJOzqG2Z5nconxLDrsoEtFvhRg9T5AZkOoPviqgbd/x4OVZP7Lagh2GyR8e4ndG2eQwIklYORdN87BWAD7fByfI16/MUtMAe9RwdtP6z2gS58C+nzkm36zIbvAdEUW8v2tri1kIDkL3/TxjqBK3Tf1qOzSodbSKip46G8yE3s1q7eaBxV5KIgDm2IEHSNjU4NnlU4RdzVEMF2Ma3GiqgZDQTdS6Qkq9122gp0OAWr3/DGzY1Svyz1GdOOjcfa0JXjEKWNtPQzYQ4qMeF8sM4ZBIcNI/WvKyZtIrERJsemdAvsVngKo6An78c4Q2RH6CdAoEY0fFknugIM7cYM74BUTWrEZ8Qw/h3R7926NiW7/fxWIJb4hqtanxxwUf+fAYppLGzsvKBz5QVikEuLpziy6TDR5G5PqiWcT58SmZgsb9mSvukL1XjKNbtHdxdYDZRFTMhnikOrUFVcApqvPy+ltpsxh9fKfXBfLfRIS1eH68aqXWk78matGQajzHhwmEFvSpR20F4/zzW+f3ZSWXKXDIMGSAM6P3DZZP7BuM00yqPTvbmxwkdYXGKhFD8o6tfrVmlqbYBY9Ulyagx2jBX4qS3Fy6A45hHZp56Uu2dlEy2L+Rr3+dfLp8WR03B0mvmh13Mz5vMTebK83iTKCmoXwDtV7rWcUJpXMcxe1tbMiwF9NvQwIo4pBNrdKEMM7J3NKNqBCCffFSQ+rGM9t9PjKNxynBOkfdz0xlZZVes6sxR5NqX8GuzXkz7oDEegC2RKz/pfyVB2+vQrUYsr7MArGboznVv/oFJjcbiU0b0Tyb1uDQxCBbxYDFaTnkyg1YIR+19nyacYwRuFalOKUlSmkqCskRCk8vrVTCW1fCW39hIdcafOGNc2bxLxv2W5R89i70MduIzKgzAu89JZWVtTGoi72PZ0ZbUWDUqNQfhsA31D85R1pQmjmAOO/OftVUlZ/WOdnNSU1AWH5si92U/dNsXM0EMpz82TG5hsy7oq5aBKcd6f4ilhNXDS5h0d9os01h9f4UHCqdn0cfwLq4EZLEQ68ZmYwXiF+pTV9gNTdcDcPIgCA7yqQVrhHfL7BPN2qerSXRMFYJxfD/e131iBHh9Jro4N158fFPXYDvF0g13eJeUy333QjAOAxfobvnbz4z5i9RpGDgPVhyM1EMOwmTtbiUaTsHUqPIU0PI4MIzJPfMAGsQjYwnEswKYeNnfwxFJ4CFoxEkgB5D3YWfFQ4hdumUFuf8Z0B+sLFYuhj9FcEjT8oqCF/56lO2z9wsrtI0Znd5zZ8tM11FcDpR1RLxATep3PONf43h8wEC4DK9Lt3XSF6UsMiS+mQHfi80itsE6EJJoKJoAdsAEPqOyimHOV2+O48oxOJk5NDiNGZjcssx2UBJPnCVGJyF4mvW99EStHyUUsm6/qejTpOg2yVbUTq3b7uXMZKQixyDBS2k1uIfyrTkc/wtVU+tbs9msmRvrGht7xuDYFNswSPSlolkrTdD04cSHOYjmpVWQPCPQX3JqPz1jmg3n7UeECA3vt9eBha3Nzd19DtG9nYQ1OFApgNLy8bYh788x7WTsjHYvbdwf0uC3jTHy7jTjIhQeHi3D1kaUT58XMvtwlJAdH+fI2Kz6SkygLhlE6Q+mKGZQbCz0NjmJa5CToRVLuasm5g0vYqHxgklxLNJa56BxBKZqPGjlkCeGR67q6YqmIPEIB7YBs515UxWmfyVeuc1EFJ2fEdwRsDjJkikwBztKrwkxDc/yleloWIZ80O2wdcSx00ahU9/vbP91+8aob+92ZH7IDrUU9mLpLbLBgwErrCtPdW23ijhAzYrrYz1+By/eVvrf/9ZwZjbpaFjV3mrOykBvpLlSpeveZu5atQEMK/nmoG3jFjioYYSULYK/FUbtJ/cO80h7v5qBTlQ7a/PRrvuppuIBoUnuFulg0E3CYCPM454PqeClwTEDPBLpyu2jgw1rp/EgOzGTjAn8ypTrhjkRaSCsVEUEpV0p1ZzAiw+6KkUuTdilTVgEVbyCIgvyU4ehosnOj78ZOeA0BZESr1t6queMajJEQgthjJpM95PTs4ZiO+gZBeJBDvQsX2tWgrm1sleNxFtlCRg/hvhUYMVCXfr28MfQkswPJaapm50tRpfcEuO43MPuJ0yLqAYP2qSzVDJSYfjkjdHTr91xhMv4ZTeFefXmEkIcd6iG/m2oE+P3Himm+Duv9p/3/+2s3+EpVShb1KT0gTyRPKl/TIvxLRyhauZ1bl1P+m9E4GN2AQEAAACAAAABGzeWkoqoUV+cijwHAOjx+NoAAKB3+asB/0Z+wHq5ZgDAgQEAAAT8lWrYGEzkfi/9L+gxxbMU2MdUAP4h1g64zeJTJxC2n7n/uWoE+JkDoLoFToaoTEA9vpNWIDH45/iMFluAHmBsDjeYAsLLBtri80LHQrokNPmAUkbDdwmIQb8BqWK3AQZwHxClA2ACJmPlQkALrxPqXUuHsBxOh1FsTUf4Gp2OolSajhZDCUxw3QDYdSpTol6NSk0a9RUgTYUq7eqVaNVHhVZtarjhUjqBtKQjOXnLo1m1EoXMAL2Bps/0e4fyWXgu0sULG2yTzilZLdtocW95Flajm3kY1IioekXQCOBjtJ7WhjHQpTzuoqYoF9sl+gnsabN64rCgObUlUGFYBTp6KBc1I7C0f3+hAQ==); }</style></defs><rect x="0" y="0" width="827.1364674277316" height="627.7500000000009" fill="#ffffff"></rect><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(563.1833424277318 120.25000000000091) rotate(0 64.578125 42.5)"><path d="M1.92 -0.25 L128.6 0.14 L129.67 84.71 L0.67 83.96" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C39.62 -1.89, 80.61 -0.67, 129.16 0 M0 0 C26.92 -1.02, 53.48 -1.41, 129.16 0 M129.16 0 C127.71 22.18, 126.71 44.42, 129.16 85 M129.16 0 C128.87 23.37, 129.99 44.34, 129.16 85 M129.16 85 C102.71 86.65, 77.47 87.35, 0 85 M129.16 85 C99.03 83.59, 67.65 83.6, 0 85 M0 85 C-0.55 64.2, 2.36 41.08, 0 0 M0 85 C0.75 56.63, 0.14 27.86, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(594.4714970297825 150.2500000000009) rotate(0 33.28997039794922 12.5)"><text x="33.28997039794922" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Faucet</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(318.43334242773176 113.37499999999909) rotate(0 64.578125 42.5)"><path d="M-1.92 0.57 L128.34 -1.34 L127.4 85.3 L-0.45 84.34" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C25.26 -0.16, 52.58 1.86, 129.16 0 M0 0 C29.38 1.64, 58.65 -0.31, 129.16 0 M129.16 0 C128.36 28.71, 129.31 61.43, 129.16 85 M129.16 0 C130.33 26.85, 128.8 55.4, 129.16 85 M129.16 85 C100.48 82.29, 74.93 84.76, 0 85 M129.16 85 C102.09 83.95, 76.43 83.71, 0 85 M0 85 C-0.4 58.23, 2.59 31.96, 0 0 M0 85 C-0.38 66.82, 0.37 47.32, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(359.27147719335676 143.3749999999991) rotate(0 23.739990234375 12.5)"><text x="23.739990234375" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Node</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(207.05834242773176 303.1250000000009) rotate(0 64.578125 42.5)"><path d="M0.96 1.24 L127.53 -0.42 L129.77 86.8 L-0.03 84.43" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C48.3 0.89, 94.81 1.3, 129.16 0 M0 0 C31.9 -0.62, 62.83 -0.24, 129.16 0 M129.16 0 C129.9 19.46, 126.91 34.76, 129.16 85 M129.16 0 C130.71 29.39, 130.2 61.09, 129.16 85 M129.16 85 C96.72 84.87, 67.73 82.66, 0 85 M129.16 85 C91.12 85.3, 52.19 85.46, 0 85 M0 85 C-1.81 50.58, 1.65 18.27, 0 0 M0 85 C-0.51 63.53, 0.3 41.13, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(228.47650191259504 320.6250000000009) rotate(0 43.15996551513672 25)"><text x="43.15996551513672" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Block</text><text x="43.15996551513672" y="42.62" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Producer</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(358.05834242773176 304.7500000000009) rotate(0 64.578125 42.5)"><path d="M-1.95 0.64 L129.4 -1.07 L130.77 86.28 L-0.44 85.76" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C36.62 -0.86, 71.71 0.71, 129.16 0 M0 0 C39.24 1.03, 76.09 1.97, 129.16 0 M129.16 0 C130.29 34.26, 130.42 68.99, 129.16 85 M129.16 0 C128.77 24.09, 128.71 50.82, 129.16 85 M129.16 85 C88.45 83.96, 45.69 83.18, 0 85 M129.16 85 C77.98 85.35, 27.79 84.8, 0 85 M0 85 C-1.78 59.07, -1.51 32.03, 0 0 M0 85 C-0.02 59.41, -1.02 35.35, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(395.5964817709935 334.7500000000009) rotate(0 27.03998565673828 12.5)"><text x="27.03998565673828" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Store</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(504.05834242773176 302.4999999999991) rotate(0 64.578125 42.5)"><path d="M0.19 0.73 L128.03 1.12 L130.38 86.83 L0.21 86.49" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C33.32 0.75, 65.34 -0.53, 129.16 0 M0 0 C28.12 -0.98, 55.52 0.43, 129.16 0 M129.16 0 C129.94 25.47, 130.97 48.6, 129.16 85 M129.16 0 C128.67 17.35, 130.42 35.2, 129.16 85 M129.16 85 C90.28 86.16, 54.34 84.52, 0 85 M129.16 85 C79.34 85.5, 28.33 85.76, 0 85 M0 85 C0.97 54.07, -1.45 22.33, 0 0 M0 85 C0.2 63.82, 0.45 41.75, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(548.0064854331029 332.4999999999991) rotate(0 20.629981994628906 12.5)"><text x="20.629981994628906" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">RPC</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(317.05834242773176 528.6249999999991) rotate(0 64.578125 42.5)"><path d="M0.38 -1.03 L130.3 0.47 L130.73 83.08 L0.74 84.5" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C49.93 0.09, 98.49 0.7, 129.16 0 M0 0 C35.56 -1.28, 72.26 -0.79, 129.16 0 M129.16 0 C130.48 15.92, 130.62 34.6, 129.16 85 M129.16 0 C129.05 23.21, 130.11 48.75, 129.16 85 M129.16 85 C104.36 86.85, 76.65 84.16, 0 85 M129.16 85 C86.17 83.59, 43.46 84.28, 0 85 M0 85 C-0.28 55.22, -2.58 24.83, 0 0 M0 85 C0.31 53.64, 1.53 24.08, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(358.68648573827863 558.6249999999991) rotate(0 22.949981689453125 12.5)"><text x="22.949981689453125" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Utils</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(530.1833424277318 532.7500000000009) rotate(0 64.578125 42.5)"><path d="M-0.61 -0.63 L128.26 -0.56 L131.04 85.32 L-1.61 84.04" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C31.38 0.58, 61.08 1.98, 129.16 0 M0 0 C36.05 -1.59, 73.61 -1.96, 129.16 0 M129.16 0 C127.57 26.28, 128.11 49.07, 129.16 85 M129.16 0 C128.19 21.55, 128.54 45.85, 129.16 85 M129.16 85 C79.98 86.46, 33.6 84.28, 0 85 M129.16 85 C87.6 83.89, 47.08 84.92, 0 85 M0 85 C-2.22 53.01, -2.75 20.19, 0 0 M0 85 C-0.22 51.2, 0.2 17.92, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(567.7414784140599 562.7500000000009) rotate(0 27.019989013671875 12.5)"><text x="27.019989013671875" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">proto</text></g><g stroke-linecap="round" transform="translate(158.26146742773176 265) rotate(0 329.43749999999994 77.875)"><path d="M32 0 C228.93 -0.51, 427.12 -1.49, 626.87 0 M32 0 C229.14 -2.12, 426.57 -2.05, 626.87 0 M626.87 0 C648.14 -1.69, 657.33 8.99, 658.87 32 M626.87 0 C648.9 -1.21, 658.36 12.92, 658.87 32 M658.87 32 C660.47 57.6, 656.98 85.29, 658.87 123.75 M658.87 32 C659.92 51.41, 658.3 71.61, 658.87 123.75 M658.87 123.75 C657.34 146.36, 649.96 156.27, 626.87 155.75 M658.87 123.75 C659.18 147.02, 648.75 156.37, 626.87 155.75 M626.87 155.75 C489.91 156.07, 352.32 155.3, 32 155.75 M626.87 155.75 C430.28 156.82, 233.49 156.9, 32 155.75 M32 155.75 C12.05 155.47, 0.37 146.4, 0 123.75 M32 155.75 C9.63 155.33, -0.6 145.49, 0 123.75 M0 123.75 C-0.06 96.74, 2.08 71.1, 0 32 M0 123.75 C-1.28 98.8, -1.56 74.27, 0 32 M0 32 C-1.11 8.7, 10.32 -1.24, 32 0 M0 32 C1.15 9.69, 8.79 -1.57, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(441.9823002524388 395.75) rotate(0 45.71666717529297 10)"><text x="45.71666717529297" y="14.096" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="16px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Components</text></g><g stroke-linecap="round"><g transform="translate(389.30452286323793 199.875) rotate(0 -1.4173552571758137 31.76487885779079)"><path d="M0.79 -0.84 C0.55 9.56, -2.01 52.7, -2.48 63.4 M-0.25 1.33 C-0.6 11.76, -3.2 53.91, -3.62 64.37" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(389.30452286323793 199.875) rotate(0 -1.4173552571758137 31.76487885779079)"><path d="M-10.94 40.47 C-10.58 44.93, -9.39 50.79, -3.62 64.37 M-10.94 40.47 C-10.24 44.85, -8.42 50.9, -3.62 64.37" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(389.30452286323793 199.875) rotate(0 -1.4173552571758137 31.76487885779079)"><path d="M6.14 41.36 C2.82 45.74, 0.33 51.41, -3.62 64.37 M6.14 41.36 C3.3 45.67, 1.6 51.54, -3.62 64.37" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(318.38646742773176 186.125) rotate(0 -154.13904846830724 191.12900188629055)"><path d="M0.11 -0.85 C-51.01 26.13, -306.08 98.97, -307.16 162.77 C-308.23 226.57, -56.35 345.23, -6.34 381.95 M-1.29 1.32 C-52.58 27.86, -307.46 97.29, -308.38 160.92 C-309.31 224.55, -57.06 346.43, -6.83 383.11" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(318.38646742773176 186.125) rotate(0 -154.13904846830724 191.12900188629055)"><path d="M-31.38 378.42 C-26.28 378.75, -17.53 381.76, -6.83 383.11 M-31.38 378.42 C-23.89 379.77, -17.95 381.07, -6.83 383.11" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(318.38646742773176 186.125) rotate(0 -154.13904846830724 191.12900188629055)"><path d="M-22.63 363.73 C-19.73 367.94, -13.28 374.83, -6.83 383.11 M-22.63 363.73 C-17.57 369.18, -14.03 374.52, -6.83 383.11" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(623.5884935514279 216.375) rotate(0 -14.305356431079588 40.362964733689296)"><path d="M0.18 -0.79 C-4.56 12.93, -23.16 67.84, -28.07 81.52 M-1.19 1.41 C-6.07 14.87, -24.53 66.83, -28.79 79.8" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(623.5884935514279 216.375) rotate(0 -14.305356431079588 40.362964733689296)"><path d="M-29.24 54.8 C-30.58 63.74, -27.84 70.03, -28.79 79.8 M-29.24 54.8 C-29.47 64.26, -29.14 72.54, -28.79 79.8" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(623.5884935514279 216.375) rotate(0 -14.305356431079588 40.362964733689296)"><path d="M-13.06 60.36 C-19.7 67.5, -22.27 71.96, -28.79 79.8 M-13.06 60.36 C-18.92 67.87, -24.16 74.23, -28.79 79.8" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(380.1667660429831 422.7888429526338) rotate(0 5.556833776504732 47.118445846032955)"><path d="M0.22 1.08 C2.33 16.63, 10.23 77.34, 12.24 92.52 M-1.12 0.61 C0.87 16.35, 9.22 78.25, 11.33 93.63" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(380.1667660429831 422.7888429526338) rotate(0 5.556833776504732 47.118445846032955)"><path d="M-0.3 71.5 C4.47 77.52, 4.41 83.46, 11.33 93.63 M-0.3 71.5 C1.46 75.97, 4.68 81.03, 11.33 93.63" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(380.1667660429831 422.7888429526338) rotate(0 5.556833776504732 47.118445846032955)"><path d="M16.64 69.2 C16.88 75.87, 12.3 82.42, 11.33 93.63 M16.64 69.2 C14.96 74.1, 14.71 79.63, 11.33 93.63" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(561.7614674277318 155.875) rotate(0 -269.90140178576115 27.453679341111638)"><path d="M0.24 0.79 C-26.53 -16.67, -69.84 -132.89, -159.89 -105.77 C-249.94 -78.65, -476.9 118.47, -540.05 163.5 M-1.09 0.16 C-27.99 -17, -70.88 -131.61, -160.32 -104.17 C-249.75 -76.74, -474.68 120.35, -537.7 164.76" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(584.2557227305535 421.7347341365985) rotate(0 -3.5733186249954656 52.32141529806631)"><path d="M-0.9 -1.09 C-2.01 16.62, -6.04 87.93, -7.43 105.74 M0.83 0.95 C-0.3 18.33, -6.69 86.69, -7.97 103.79" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(584.2557227305535 421.7347341365985) rotate(0 -3.5733186249954656 52.32141529806631)"><path d="M-14.5 79.66 C-14.91 86.63, -10.99 89.27, -7.97 103.79 M-14.5 79.66 C-12.25 86.92, -9.88 96.33, -7.97 103.79" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(584.2557227305535 421.7347341365985) rotate(0 -3.5733186249954656 52.32141529806631)"><path d="M2.54 81.11 C-1.84 87.61, -1.89 89.92, -7.97 103.79 M2.54 81.11 C-0.84 87.75, -4.09 96.68, -7.97 103.79" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g transform="translate(347.38646742773176 10) rotate(0 132.60989379882812 12.5)"><text x="0" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Workspace dependency tree</text></g><g stroke-opacity="0.9" fill-opacity="0.9" stroke-linecap="round" transform="translate(647.9901087138658 300.8749999999991) rotate(0 64.578125 42.5)"><path d="M-0.54 0.65 L130.5 -0.88 L130.78 86.43 L-1.37 85.37" stroke="none" stroke-width="0" fill="#ffffff"></path><path d="M0 0 C30.47 -0.01, 61.01 -0.6, 129.16 0 M0 0 C31.23 -1.27, 62.39 -0.92, 129.16 0 M129.16 0 C130.06 15.88, 130.61 35.95, 129.16 85 M129.16 0 C128.13 21.53, 129.76 44.73, 129.16 85 M129.16 85 C93.02 83.82, 57.75 82.72, 0 85 M129.16 85 C99.29 84.99, 70.86 84.76, 0 85 M0 85 C-2.28 62.87, 1.09 40.96, 0 0 M0 85 C-0.23 63.39, -0.43 41.56, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(654.6015665385728 305.8749999999991) rotate(0 57.96666717529297 37.5)"><text x="57.96666717529297" y="17.619999999999997" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Network</text><text x="57.96666717529297" y="42.62" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Transaction</text><text x="57.96666717529297" y="67.62" font-family="Excalifont, Xiaolai, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Builder</text></g></svg>
\ No newline at end of file
diff --git a/docs/internal/src/codebase.md b/docs/internal/src/codebase.md
index 459ab03ed..0680d0209 100644
--- a/docs/internal/src/codebase.md
+++ b/docs/internal/src/codebase.md
@@ -25,4 +25,4 @@ instead simply serve to enforce code organisation and decoupling.
 > [!NOTE] > [`miden-base`](https://github.com/0xMiden/miden-base) is an important dependency which
 > contains the core Miden protocol definitions e.g. accounts, notes, transactions etc.
 
-[![workspace dependency tree](../../external/src/img/workspace_tree.svg)](../../external/src/img/workspace_tree.svg)
+[![workspace dependency tree](assets/workspace_tree.svg)](assets/workspace_tree.svg)
diff --git a/docs/internal/src/components.md b/docs/internal/src/components.md
index 3137df423..9253fed98 100644
--- a/docs/internal/src/components.md
+++ b/docs/internal/src/components.md
@@ -1,8 +1,8 @@
 # Node components
 
 The node is split into three distinct components that communicate via gRPC. See the
-[Operator guide#architecture](../../external/src/operator/architecture.md) chapter for an overview of each component.
+[Operator guide#architecture](https://0xmiden.github.io/miden-docs/miden-node/operator/architecture) chapter for an overview of each component.
 
 The following sections will describe the inner architecture of each component.
 
-[![node internal architecture](../../external/src/img/node_architecture.svg)](../../external/src/img/node_architecture.svg)
+[![node internal architecture](assets/node_architecture.svg)](assets/node_architecture.svg)
diff --git a/docs/internal/src/index.md b/docs/internal/src/index.md
index dd6802b19..478f22e8b 100644
--- a/docs/internal/src/index.md
+++ b/docs/internal/src/index.md
@@ -7,7 +7,7 @@ architectural decisions.
 
 This is _not_ intended for dApp developers or users of the node, but for development of the node itself.
 
-It is also a good idea to familiarise yourself with the [operator manual](../../external/src/operator/index.md).
+It is also a good idea to familiarise yourself with the [operator manual](https://0xmiden.github.io/miden-docs/miden-node/operator/).
 
 <div class="warning">
 
diff --git a/docs/internal/src/monitoring.md b/docs/internal/src/monitoring.md
index e6bbad83c..4e1bf8920 100644
--- a/docs/internal/src/monitoring.md
+++ b/docs/internal/src/monitoring.md
@@ -3,7 +3,7 @@
 Developer level overview of how we aim to use `tracing` and `open-telemetry` to provide monitoring and telemetry for the
 node.
 
-Please begin by reading through the [monitoring operator guide](../../external/src/operator/monitoring.md) as this will
+Please begin by reading through the [monitoring operator guide](https://0xmiden.github.io/miden-docs/miden-node/operator/monitoring) as this will
 provide some much needed context.
 
 ## Approach and philosophy

From cf8dc6ff675a425a44dea6442284bd79daf892d3 Mon Sep 17 00:00:00 2001
From: keinberger <philipp.keinberger@gmail.com>
Date: Wed, 22 Oct 2025 13:23:36 +0300
Subject: [PATCH 56/78] fix(internal-docs): format book.toml file correctly

---
 docs/internal/book.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/internal/book.toml b/docs/internal/book.toml
index 09a76af96..6a0ac5db7 100644
--- a/docs/internal/book.toml
+++ b/docs/internal/book.toml
@@ -13,4 +13,4 @@ after = ["links"]
 
 [preprocessor.alerts]
 
-[output.linkcheck]
\ No newline at end of file
+[output.linkcheck]

From 1c02b4445283b90ab49e0305588b30ef28100683 Mon Sep 17 00:00:00 2001
From: keinberger <philipp.keinberger@gmail.com>
Date: Wed, 22 Oct 2025 19:57:40 +0300
Subject: [PATCH 57/78] docs(external): implement custom styling

---
 docs/external/docusaurus.config.ts            |   98 ++
 docs/external/package-lock.json               |  502 ++++++++
 docs/external/package.json                    |    5 +-
 .../src/theme/Admonition/Icon/Danger.tsx      |   19 +
 .../src/theme/Admonition/Icon/Info.tsx        |   20 +
 .../src/theme/Admonition/Icon/Note.tsx        |   20 +
 .../src/theme/Admonition/Icon/Tip.tsx         |   20 +
 .../src/theme/Admonition/Icon/Warning.tsx     |   20 +
 .../src/theme/Admonition/Layout/index.tsx     |   51 +
 .../theme/Admonition/Layout/styles.module.css |   35 +
 .../src/theme/Admonition/Type/Caution.tsx     |   32 +
 .../src/theme/Admonition/Type/Danger.tsx      |   30 +
 .../src/theme/Admonition/Type/Info.tsx        |   30 +
 .../src/theme/Admonition/Type/Note.tsx        |   30 +
 .../src/theme/Admonition/Type/Tip.tsx         |   30 +
 .../src/theme/Admonition/Type/Warning.tsx     |   30 +
 docs/external/src/theme/Admonition/Types.tsx  |   31 +
 docs/external/src/theme/Admonition/index.tsx  |   21 +
 docs/external/static/img/custom_caret.svg     |    3 +
 docs/external/static/img/favicon.ico          |  Bin 0 -> 15406 bytes
 docs/external/static/img/logo.png             |  Bin 0 -> 4335 bytes
 docs/external/styles.css                      | 1046 +++++++++++++++++
 22 files changed, 2071 insertions(+), 2 deletions(-)
 create mode 100644 docs/external/src/theme/Admonition/Icon/Danger.tsx
 create mode 100644 docs/external/src/theme/Admonition/Icon/Info.tsx
 create mode 100644 docs/external/src/theme/Admonition/Icon/Note.tsx
 create mode 100644 docs/external/src/theme/Admonition/Icon/Tip.tsx
 create mode 100644 docs/external/src/theme/Admonition/Icon/Warning.tsx
 create mode 100644 docs/external/src/theme/Admonition/Layout/index.tsx
 create mode 100644 docs/external/src/theme/Admonition/Layout/styles.module.css
 create mode 100644 docs/external/src/theme/Admonition/Type/Caution.tsx
 create mode 100644 docs/external/src/theme/Admonition/Type/Danger.tsx
 create mode 100644 docs/external/src/theme/Admonition/Type/Info.tsx
 create mode 100644 docs/external/src/theme/Admonition/Type/Note.tsx
 create mode 100644 docs/external/src/theme/Admonition/Type/Tip.tsx
 create mode 100644 docs/external/src/theme/Admonition/Type/Warning.tsx
 create mode 100644 docs/external/src/theme/Admonition/Types.tsx
 create mode 100644 docs/external/src/theme/Admonition/index.tsx
 create mode 100644 docs/external/static/img/custom_caret.svg
 create mode 100644 docs/external/static/img/favicon.ico
 create mode 100644 docs/external/static/img/logo.png
 create mode 100644 docs/external/styles.css

diff --git a/docs/external/docusaurus.config.ts b/docs/external/docusaurus.config.ts
index ba607d361..ef8eee764 100644
--- a/docs/external/docusaurus.config.ts
+++ b/docs/external/docusaurus.config.ts
@@ -1,4 +1,5 @@
 import type { Config } from "@docusaurus/types";
+import { themes as prismThemes } from "prism-react-renderer";
 
 // If your content lives in docs/src, set DOCS_PATH='src'; else '.'
 const DOCS_PATH =
@@ -21,11 +22,108 @@ const config: Config = {
           sidebarPath: "./sidebars.ts",
           remarkPlugins: [require("remark-math")],
           rehypePlugins: [require("rehype-katex")],
+          versions: {
+            current: {
+              label: `unstable`,
+            },
+          },
         },
         blog: false,
         pages: false,
+        theme: {
+          customCss: "./styles.css",
+        },
+      },
+    ],
+  ],
+
+  plugins: [
+    [
+      "@cmfcmf/docusaurus-search-local",
+      {
+        // whether to index docs pages
+        indexDocs: true,
+
+        // whether to index blog pages
+        indexBlog: false,
+
+        // whether to index static pages
+        indexPages: false,
+
+        // language of your documentation, see next section
+        language: "en",
+
+        // setting this to "none" will prevent the default CSS to be included. The default CSS
+        // comes from autocomplete-theme-classic, which you can read more about here:
+        // https://www.algolia.com/doc/ui-libraries/autocomplete/api-reference/autocomplete-theme-classic/
+        style: undefined,
+
+        // lunr.js-specific settings
+        lunr: {
+          // When indexing your documents, their content is split into "tokens".
+          // Text entered into the search box is also tokenized.
+          // This setting configures the separator used to determine where to split the text into tokens.
+          // By default, it splits the text at whitespace and dashes.
+          //
+          // Note: Does not work for "ja" and "th" languages, since these use a different tokenizer.
+          tokenizerSeparator: /[\s\-]+/,
+          // https://lunrjs.com/guides/customising.html#similarity-tuning
+          //
+          // This parameter controls the importance given to the length of a document and its fields. This
+          // value must be between 0 and 1, and by default it has a value of 0.75. Reducing this value
+          // reduces the effect of different length documents on a term's importance to that document.
+          b: 0.75,
+          // This controls how quickly the boost given by a common word reaches saturation. Increasing it
+          // will slow down the rate of saturation and lower values result in quicker saturation. The
+          // default value is 1.2. If the collection of documents being indexed have high occurrences
+          // of words that are not covered by a stop word filter, these words can quickly dominate any
+          // similarity calculation. In these cases, this value can be reduced to get more balanced results.
+          k1: 1.2,
+          // By default, we rank pages where the search term appears in the title higher than pages where
+          // the search term appears in just the text. This is done by "boosting" title matches with a
+          // higher value than content matches. The concrete boosting behavior can be controlled by changing
+          // the following settings.
+          titleBoost: 5,
+          contentBoost: 1,
+          tagsBoost: 3,
+          parentCategoriesBoost: 2, // Only used when indexing is enabled for categories
+        },
       },
     ],
   ],
+
+  themeConfig:
+    /** @type {import('@docusaurus/preset-classic').ThemeConfig} */
+    {
+      colorMode: {
+        defaultMode: "light",
+        disableSwitch: true,
+      },
+      prism: {
+        theme: prismThemes.oneLight,
+        darkTheme: prismThemes.oneDark,
+        additionalLanguages: ["rust", "solidity", "toml", "yaml"],
+      },
+      navbar: {
+        logo: {
+          src: "img/logo.png",
+          alt: "Miden Logo",
+          height: 240,
+        },
+        title: "MIDEN",
+        items: [
+          {
+            type: "docsVersionDropdown",
+            position: "left",
+            dropdownActiveClassDisabled: true,
+          },
+          {
+            href: "https://github.com/0xMiden/",
+            label: "GitHub",
+            position: "right",
+          },
+        ],
+      },
+    },
 };
 export default config;
diff --git a/docs/external/package-lock.json b/docs/external/package-lock.json
index 2bedc86c6..cd68240f3 100644
--- a/docs/external/package-lock.json
+++ b/docs/external/package-lock.json
@@ -6,6 +6,7 @@
     "": {
       "name": "@miden/docs-dev",
       "devDependencies": {
+        "@cmfcmf/docusaurus-search-local": "^2.0.0",
         "@docusaurus/core": "^3",
         "@docusaurus/preset-classic": "^3",
         "rehype-katex": "^7",
@@ -112,6 +113,59 @@
         "@algolia/autocomplete-shared": "1.19.2"
       }
     },
+    "node_modules/@algolia/autocomplete-js": {
+      "version": "1.19.4",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-js/-/autocomplete-js-1.19.4.tgz",
+      "integrity": "sha512-ZkwsuTTIEuw+hbsIooMrNLvTVulUSSKqJT3ZeYYd//kA5fHaFf2/T0BDmd9qSGxZRhT5WS8AJYjFARLmj5x08g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/autocomplete-core": "1.19.4",
+        "@algolia/autocomplete-preset-algolia": "1.19.4",
+        "@algolia/autocomplete-shared": "1.19.4",
+        "htm": "^3.1.1",
+        "preact": "^10.13.2"
+      },
+      "peerDependencies": {
+        "@algolia/client-search": ">= 4.5.1 < 6",
+        "algoliasearch": ">= 4.9.1 < 6"
+      }
+    },
+    "node_modules/@algolia/autocomplete-js/node_modules/@algolia/autocomplete-core": {
+      "version": "1.19.4",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.19.4.tgz",
+      "integrity": "sha512-yVwXLrfwQ3dAndY12j1pfa0oyC5hTDv+/dgwvVHj57dY3zN6PbAmcHdV5DOOdGJrCMXff+fsPr8G2Ik8zWOPTw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/autocomplete-plugin-algolia-insights": "1.19.4",
+        "@algolia/autocomplete-shared": "1.19.4"
+      }
+    },
+    "node_modules/@algolia/autocomplete-js/node_modules/@algolia/autocomplete-plugin-algolia-insights": {
+      "version": "1.19.4",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.19.4.tgz",
+      "integrity": "sha512-K6TQhTKxx0Es1ZbjlAQjgm/QLDOtKvw23MX0xmpvO7AwkmlmaEXo2PwHdVSs3Bquv28CkO2BYKks7jVSIdcXUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/autocomplete-shared": "1.19.4"
+      },
+      "peerDependencies": {
+        "search-insights": ">= 1 < 3"
+      }
+    },
+    "node_modules/@algolia/autocomplete-js/node_modules/@algolia/autocomplete-shared": {
+      "version": "1.19.4",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.19.4.tgz",
+      "integrity": "sha512-V7tYDgRXP0AqL4alwZBWNm1HPWjJvEU94Nr7Qa2cuPcIAbsTAj7M/F/+Pv/iwOWXl3N7tzVzNkOWm7sX6JT1SQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@algolia/client-search": ">= 4.9.1 < 6",
+        "algoliasearch": ">= 4.9.1 < 6"
+      }
+    },
     "node_modules/@algolia/autocomplete-plugin-algolia-insights": {
       "version": "1.19.2",
       "resolved": "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.19.2.tgz",
@@ -125,6 +179,31 @@
         "search-insights": ">= 1 < 3"
       }
     },
+    "node_modules/@algolia/autocomplete-preset-algolia": {
+      "version": "1.19.4",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.19.4.tgz",
+      "integrity": "sha512-WhX4mYosy7yBDjkB6c/ag+WKICjvV2fqQv/+NWJlpvnk2JtMaZByi73F6svpQX945J+/PxpQe8YIRBZHuYsLAQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/autocomplete-shared": "1.19.4"
+      },
+      "peerDependencies": {
+        "@algolia/client-search": ">= 4.9.1 < 6",
+        "algoliasearch": ">= 4.9.1 < 6"
+      }
+    },
+    "node_modules/@algolia/autocomplete-preset-algolia/node_modules/@algolia/autocomplete-shared": {
+      "version": "1.19.4",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.19.4.tgz",
+      "integrity": "sha512-V7tYDgRXP0AqL4alwZBWNm1HPWjJvEU94Nr7Qa2cuPcIAbsTAj7M/F/+Pv/iwOWXl3N7tzVzNkOWm7sX6JT1SQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@algolia/client-search": ">= 4.9.1 < 6",
+        "algoliasearch": ">= 4.9.1 < 6"
+      }
+    },
     "node_modules/@algolia/autocomplete-shared": {
       "version": "1.19.2",
       "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.19.2.tgz",
@@ -136,6 +215,40 @@
         "algoliasearch": ">= 4.9.1 < 6"
       }
     },
+    "node_modules/@algolia/autocomplete-theme-classic": {
+      "version": "1.19.4",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-theme-classic/-/autocomplete-theme-classic-1.19.4.tgz",
+      "integrity": "sha512-/qE8BETNFbul4WrrUyBYgaaKcgFPk0Px9FDKADnr3HlIkXquRpcFHTxXK16jdwXb33yrcXaAVSQZRfUUSSnxVA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@algolia/cache-browser-local-storage": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.25.2.tgz",
+      "integrity": "sha512-tA1rqAafI+gUdewjZwyTsZVxesl22MTgLWRKt1+TBiL26NiKx7SjRqTI3pzm8ngx1ftM5LSgXkVIgk2+SRgPTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/cache-common": "4.25.2"
+      }
+    },
+    "node_modules/@algolia/cache-common": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.25.2.tgz",
+      "integrity": "sha512-E+aZwwwmhvZXsRA1+8DhH2JJIwugBzHivASTnoq7bmv0nmForLyH7rMG5cOTiDK36DDLnKq1rMGzxWZZ70KZag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@algolia/cache-in-memory": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.25.2.tgz",
+      "integrity": "sha512-KYcenhfPKgR+WJ6IEwKVEFMKKCWLZdnYuw08+3Pn1cxAXbJcTIKjoYgEXzEW6gJmDaau2l55qNrZo6MBbX7+sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/cache-common": "4.25.2"
+      }
+    },
     "node_modules/@algolia/client-abtesting": {
       "version": "5.38.0",
       "resolved": "https://registry.npmjs.org/@algolia/client-abtesting/-/client-abtesting-5.38.0.tgz",
@@ -152,6 +265,41 @@
         "node": ">= 14.0.0"
       }
     },
+    "node_modules/@algolia/client-account": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.25.2.tgz",
+      "integrity": "sha512-IfRGhBxvjli9mdexrCxX2N4XT9NBN3tvZK5zCaL8zkDcgsthiM9WPvGIZS/pl/FuXB7hA0lE5kqOzsQDP6OmGQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "4.25.2",
+        "@algolia/client-search": "4.25.2",
+        "@algolia/transporter": "4.25.2"
+      }
+    },
+    "node_modules/@algolia/client-account/node_modules/@algolia/client-common": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.25.2.tgz",
+      "integrity": "sha512-HXX8vbJPYW29P18GxciiwaDpQid6UhpPP9nW9WE181uGUgFhyP5zaEkYWf9oYBrjMubrGwXi5YEzJOz6Oa4faA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/requester-common": "4.25.2",
+        "@algolia/transporter": "4.25.2"
+      }
+    },
+    "node_modules/@algolia/client-account/node_modules/@algolia/client-search": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.25.2.tgz",
+      "integrity": "sha512-pO/LpVnQlbJpcHRk+AroWyyFnh01eOlO6/uLZRUmYvr/hpKZKxI6n7ufgTawbo0KrAu2CePfiOkStYOmDuRjzQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "4.25.2",
+        "@algolia/requester-common": "4.25.2",
+        "@algolia/transporter": "4.25.2"
+      }
+    },
     "node_modules/@algolia/client-analytics": {
       "version": "5.38.0",
       "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-5.38.0.tgz",
@@ -265,6 +413,23 @@
         "node": ">= 14.0.0"
       }
     },
+    "node_modules/@algolia/logger-common": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.25.2.tgz",
+      "integrity": "sha512-aUXpcodoIpLPsnVc2OHgC9E156R7yXWLW2l+Zn24Cyepfq3IvmuVckBvJDpp7nPnXkEzeMuvnVxQfQsk+zP/BA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@algolia/logger-console": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.25.2.tgz",
+      "integrity": "sha512-H3Y+UB0Ty0htvMJ6zDSufhFTSDlg3Pyj3AXilfDdDRcvfhH4C/cJNVm+CTaGORxL5uKABGsBp+SZjsEMTyAunQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/logger-common": "4.25.2"
+      }
+    },
     "node_modules/@algolia/monitoring": {
       "version": "1.38.0",
       "resolved": "https://registry.npmjs.org/@algolia/monitoring/-/monitoring-1.38.0.tgz",
@@ -310,6 +475,13 @@
         "node": ">= 14.0.0"
       }
     },
+    "node_modules/@algolia/requester-common": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.25.2.tgz",
+      "integrity": "sha512-Q4wC3sgY0UFjV3Rb3icRLTpPB5/M44A8IxzJHM9PNeK1T3iX7X/fmz7ATUYQYZTpwHCYATlsQKWiTpql1hHjVg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@algolia/requester-fetch": {
       "version": "5.38.0",
       "resolved": "https://registry.npmjs.org/@algolia/requester-fetch/-/requester-fetch-5.38.0.tgz",
@@ -336,6 +508,18 @@
         "node": ">= 14.0.0"
       }
     },
+    "node_modules/@algolia/transporter": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.25.2.tgz",
+      "integrity": "sha512-yw3RLHWc6V+pbdsFtq8b6T5bJqLDqnfKWS7nac1Vzcmgvs/V/Lfy7/6iOF9XRilu5aBDOBHoP1SOeIDghguzWw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/cache-common": "4.25.2",
+        "@algolia/logger-common": "4.25.2",
+        "@algolia/requester-common": "4.25.2"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
@@ -2145,6 +2329,206 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@cmfcmf/docusaurus-search-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@cmfcmf/docusaurus-search-local/-/docusaurus-search-local-2.0.0.tgz",
+      "integrity": "sha512-WfgqJN5VXeyhcAVTF4isXFNCvZXdOlQZIsXbgKPEmXcXykV+YfPX4UgKJ4J/MuKtaKQ8SGjfeXhg2clhdmwHVw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/autocomplete-js": "^1.8.2",
+        "@algolia/autocomplete-theme-classic": "^1.8.2",
+        "@algolia/client-search": "^4.12.0",
+        "algoliasearch": "^4.12.0",
+        "cheerio": "^1.0.0",
+        "clsx": "^2.0.0",
+        "lunr-languages": "^1.4.0",
+        "mark.js": "^8.11.1",
+        "tslib": "^2.6.3"
+      },
+      "peerDependencies": {
+        "@docusaurus/core": "^3.0.0",
+        "nodejieba": "^2.5.0 || ^3.0.0",
+        "react": "^18 || ^19",
+        "react-dom": "^18 || ^19"
+      },
+      "peerDependenciesMeta": {
+        "nodejieba": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@cmfcmf/docusaurus-search-local/node_modules/@algolia/client-analytics": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.25.2.tgz",
+      "integrity": "sha512-4Yxxhxh+XjXY8zPyo+h6tQuyoJWDBn8E3YLr8j+YAEy5p+r3/5Tp+ANvQ+hNaQXbwZpyf5d4ViYOBjJ8+bWNEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "4.25.2",
+        "@algolia/client-search": "4.25.2",
+        "@algolia/requester-common": "4.25.2",
+        "@algolia/transporter": "4.25.2"
+      }
+    },
+    "node_modules/@cmfcmf/docusaurus-search-local/node_modules/@algolia/client-common": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.25.2.tgz",
+      "integrity": "sha512-HXX8vbJPYW29P18GxciiwaDpQid6UhpPP9nW9WE181uGUgFhyP5zaEkYWf9oYBrjMubrGwXi5YEzJOz6Oa4faA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/requester-common": "4.25.2",
+        "@algolia/transporter": "4.25.2"
+      }
+    },
+    "node_modules/@cmfcmf/docusaurus-search-local/node_modules/@algolia/client-personalization": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.25.2.tgz",
+      "integrity": "sha512-K81PRaHF77mHv2u8foWTHnIf5c+QNf/SnKNM7rB8JPi7TMYi4E5o2mFbgdU1ovd8eg9YMOEAuLkl1Nz1vbM3zQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "4.25.2",
+        "@algolia/requester-common": "4.25.2",
+        "@algolia/transporter": "4.25.2"
+      }
+    },
+    "node_modules/@cmfcmf/docusaurus-search-local/node_modules/@algolia/client-search": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.25.2.tgz",
+      "integrity": "sha512-pO/LpVnQlbJpcHRk+AroWyyFnh01eOlO6/uLZRUmYvr/hpKZKxI6n7ufgTawbo0KrAu2CePfiOkStYOmDuRjzQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "4.25.2",
+        "@algolia/requester-common": "4.25.2",
+        "@algolia/transporter": "4.25.2"
+      }
+    },
+    "node_modules/@cmfcmf/docusaurus-search-local/node_modules/@algolia/recommend": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-4.25.2.tgz",
+      "integrity": "sha512-puRrGeXwAuVa4mLdvXvmxHRFz9MkcCOLPcjz7MjU4NihlpIa+lZYgikJ7z0SUAaYgd6l5Bh00hXiU/OlX5ffXQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/cache-browser-local-storage": "4.25.2",
+        "@algolia/cache-common": "4.25.2",
+        "@algolia/cache-in-memory": "4.25.2",
+        "@algolia/client-common": "4.25.2",
+        "@algolia/client-search": "4.25.2",
+        "@algolia/logger-common": "4.25.2",
+        "@algolia/logger-console": "4.25.2",
+        "@algolia/requester-browser-xhr": "4.25.2",
+        "@algolia/requester-common": "4.25.2",
+        "@algolia/requester-node-http": "4.25.2",
+        "@algolia/transporter": "4.25.2"
+      }
+    },
+    "node_modules/@cmfcmf/docusaurus-search-local/node_modules/@algolia/requester-browser-xhr": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.25.2.tgz",
+      "integrity": "sha512-aAjfsI0AjWgXLh/xr9eoR8/9HekBkIER3bxGoBf9d1XWMMoTo/q92Da2fewkxwLE6mla95QJ9suJGOtMOewXXQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/requester-common": "4.25.2"
+      }
+    },
+    "node_modules/@cmfcmf/docusaurus-search-local/node_modules/@algolia/requester-node-http": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.25.2.tgz",
+      "integrity": "sha512-Ja/FYB7W9ZM+m8UrMIlawNUAKpncvb9Mo+D8Jq5WepGTUyQ9CBYLsjwxv9O8wbj3TSWqTInf4uUBJ2FKR8G7xw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/requester-common": "4.25.2"
+      }
+    },
+    "node_modules/@cmfcmf/docusaurus-search-local/node_modules/algoliasearch": {
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.25.2.tgz",
+      "integrity": "sha512-lYx98L6kb1VvXypbPI7Z54C4BJB2VT5QvOYthvPq6/POufZj+YdyeZSKjoLBKHJgGmYWQTHOKtcCTdKf98WOCA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/cache-browser-local-storage": "4.25.2",
+        "@algolia/cache-common": "4.25.2",
+        "@algolia/cache-in-memory": "4.25.2",
+        "@algolia/client-account": "4.25.2",
+        "@algolia/client-analytics": "4.25.2",
+        "@algolia/client-common": "4.25.2",
+        "@algolia/client-personalization": "4.25.2",
+        "@algolia/client-search": "4.25.2",
+        "@algolia/logger-common": "4.25.2",
+        "@algolia/logger-console": "4.25.2",
+        "@algolia/recommend": "4.25.2",
+        "@algolia/requester-browser-xhr": "4.25.2",
+        "@algolia/requester-common": "4.25.2",
+        "@algolia/requester-node-http": "4.25.2",
+        "@algolia/transporter": "4.25.2"
+      }
+    },
+    "node_modules/@cmfcmf/docusaurus-search-local/node_modules/cheerio": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.1.2.tgz",
+      "integrity": "sha512-IkxPpb5rS/d1IiLbHMgfPuS0FgiWTtFIm/Nj+2woXDLTZ7fOT2eqzgYbdMlLweqlHbsZjxEChoVK+7iph7jyQg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cheerio-select": "^2.1.0",
+        "dom-serializer": "^2.0.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.2.2",
+        "encoding-sniffer": "^0.2.1",
+        "htmlparser2": "^10.0.0",
+        "parse5": "^7.3.0",
+        "parse5-htmlparser2-tree-adapter": "^7.1.0",
+        "parse5-parser-stream": "^7.1.2",
+        "undici": "^7.12.0",
+        "whatwg-mimetype": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=20.18.1"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/cheerio?sponsor=1"
+      }
+    },
+    "node_modules/@cmfcmf/docusaurus-search-local/node_modules/entities": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
+      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/@cmfcmf/docusaurus-search-local/node_modules/htmlparser2": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-10.0.0.tgz",
+      "integrity": "sha512-TwAZM+zE5Tq3lrEHvOlvwgj1XLWQCtaaibSN11Q+gGBAS7Y1uZSWwXXRe4iF6OXnaq1riyQAPFOBtYc77Mxq0g==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.2.1",
+        "entities": "^6.0.0"
+      }
+    },
     "node_modules/@colors/colors": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
@@ -8068,6 +8452,33 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/encoding-sniffer": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.1.tgz",
+      "integrity": "sha512-5gvq20T6vfpekVtqrYQsSCFZ1wEg5+wW0/QaZMWkFr6BqD3NfKs0rLCx4rrVlSWJeZb5NBJgVLswK/w2MWU+Gw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "iconv-lite": "^0.6.3",
+        "whatwg-encoding": "^3.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/encoding-sniffer?sponsor=1"
+      }
+    },
+    "node_modules/encoding-sniffer/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/enhanced-resolve": {
       "version": "5.18.3",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz",
@@ -9696,6 +10107,13 @@
         "safe-buffer": "~5.1.0"
       }
     },
+    "node_modules/htm": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/htm/-/htm-3.1.1.tgz",
+      "integrity": "sha512-983Vyg8NwUE7JkZ6NmOqpCZ+sh1bKv2iYTlUkzlWmA5JD2acKoxd4KVxbMmxX/85mtfdnDmTFoNKcg5DGAvxNQ==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
     "node_modules/html-escaper": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
@@ -10887,6 +11305,20 @@
         "yallist": "^3.0.2"
       }
     },
+    "node_modules/lunr-languages": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/lunr-languages/-/lunr-languages-1.14.0.tgz",
+      "integrity": "sha512-hWUAb2KqM3L7J5bcrngszzISY4BxrXn/Xhbb9TTCJYEGqlR1nG67/M14sp09+PTIRklobrn57IAxcdcO/ZFyNA==",
+      "dev": true,
+      "license": "MPL-1.1"
+    },
+    "node_modules/mark.js": {
+      "version": "8.11.1",
+      "resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz",
+      "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/markdown-extensions": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-2.0.0.tgz",
@@ -14151,6 +14583,19 @@
         "url": "https://github.com/inikulin/parse5?sponsor=1"
       }
     },
+    "node_modules/parse5-parser-stream": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz",
+      "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parse5": "^7.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
     "node_modules/parse5/node_modules/entities": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
@@ -15812,6 +16257,17 @@
         "postcss": "^8.4.31"
       }
     },
+    "node_modules/preact": {
+      "version": "10.27.2",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.27.2.tgz",
+      "integrity": "sha512-5SYSgFKSyhCbk6SrXyMpqjb5+MQBgfvEKE/OC+PujcY34sOpqtr+0AZQtPYx5IA6VxynQ7rUPCtKzyovpj9Bpg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/preact"
+      }
+    },
     "node_modules/pretty-error": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
@@ -18213,6 +18669,16 @@
         "is-typedarray": "^1.0.0"
       }
     },
+    "node_modules/undici": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.16.0.tgz",
+      "integrity": "sha512-QEg3HPMll0o3t2ourKwOeUAZ159Kn9mx5pnzHRQO8+Wixmh88YdZRiIwat0iNzNNXn0yoEtXJqFpyW7eM8BV7g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.18.1"
+      }
+    },
     "node_modules/undici-types": {
       "version": "7.12.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.12.0.tgz",
@@ -19232,6 +19698,42 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/whatwg-encoding": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
+      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
+      "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
diff --git a/docs/external/package.json b/docs/external/package.json
index 14b45b175..a59fc51af 100644
--- a/docs/external/package.json
+++ b/docs/external/package.json
@@ -7,9 +7,10 @@
     "serve:dev": "docusaurus serve build"
   },
   "devDependencies": {
+    "@cmfcmf/docusaurus-search-local": "^2.0.0",
     "@docusaurus/core": "^3",
     "@docusaurus/preset-classic": "^3",
-    "remark-math": "^6",
-    "rehype-katex": "^7"
+    "rehype-katex": "^7",
+    "remark-math": "^6"
   }
 }
diff --git a/docs/external/src/theme/Admonition/Icon/Danger.tsx b/docs/external/src/theme/Admonition/Icon/Danger.tsx
new file mode 100644
index 000000000..ab14d7dec
--- /dev/null
+++ b/docs/external/src/theme/Admonition/Icon/Danger.tsx
@@ -0,0 +1,19 @@
+import React, { type ReactNode } from "react";
+import type { Props } from "@theme/Admonition/Icon/Danger";
+
+export default function AdmonitionIconDanger(props: Props): ReactNode {
+  return (
+    <svg
+      width="15"
+      height="19"
+      viewBox="0 0 15 19"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M13.3333 10V7.5H12.5V6.66667H11.6667V4.16667H10.8333V2.5H10V1.66667H9.16667V0.833333H8.33333V0H6.66667V0.833333H7.5V2.5H6.66667V4.16667H5.83333V5H5V5.83333H4.16667V6.66667H3.33333V7.5H2.5V10H3.33333V11.6667H2.5V10.8333H1.66667V9.16667H0.833333V10.8333H0V13.3333H0.833333V15H1.66667V15.8333H2.5V16.6667H3.33333V17.5H4.16667V18.3333H10.8333V17.5H11.6667V16.6667H12.5V15.8333H13.3333V14.1667H14.1667V10H13.3333ZM10.8333 15.8333V16.6667H9.16667V17.5H5.83333V16.6667H5V14.1667H5.83333V13.3333H6.66667V12.5H7.5V11.6667H8.33333V8.33333H9.16667V10H10V13.3333H9.16667V15H10V14.1667H10.8333V13.3333H11.6667V15.8333H10.8333ZM13.3333 13.3333H12.5V12.5H10.8333V9.16667H10V7.5H9.16667V6.66667H6.66667V7.5H7.5V10.8333H6.66667V11.6667H5.83333V12.5H5V13.3333H4.16667V15.8333H3.33333V15H2.5V14.1667H1.66667V12.5H4.16667V9.16667H3.33333V8.33333H4.16667V7.5H5V6.66667H5.83333V5.83333H6.66667V5H7.5V3.33333H8.33333V2.5H9.16667V3.33333H10V5H10.8333V7.5H11.6667V8.33333H12.5V10.8333H13.3333V13.3333Z"
+        fill="#FF0000"
+      />
+    </svg>
+  );
+}
diff --git a/docs/external/src/theme/Admonition/Icon/Info.tsx b/docs/external/src/theme/Admonition/Icon/Info.tsx
new file mode 100644
index 000000000..59e48a521
--- /dev/null
+++ b/docs/external/src/theme/Admonition/Icon/Info.tsx
@@ -0,0 +1,20 @@
+import React, { type ReactNode } from "react";
+import type { Props } from "@theme/Admonition/Icon/Info";
+
+export default function AdmonitionIconInfo(props: Props): ReactNode {
+  return (
+    <svg
+      width="13"
+      height="17"
+      viewBox="0 0 13 17"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M3.33332 0.583313H9.66666V2.16665H3.33332V0.583313ZM1.74999 3.74998V2.16665H3.33332V3.74998H1.74999ZM1.74999 8.49998H0.166656V3.74998H1.74999V8.49998ZM3.33332 10.0833H1.74999V8.49998H3.33332V10.0833ZM9.66666 10.0833V13.25H3.33332V10.0833H4.91666V11.6666H8.08332V10.0833H9.66666ZM11.25 8.49998V10.0833H9.66666V8.49998H11.25ZM11.25 3.74998H12.8333V8.49998H11.25V3.74998ZM11.25 3.74998V2.16665H9.66666V3.74998H11.25ZM9.66666 14.8333H3.33332V16.4166H9.66666V14.8333Z"
+        fill="#102445"
+      />
+    </svg>
+  );
+}
diff --git a/docs/external/src/theme/Admonition/Icon/Note.tsx b/docs/external/src/theme/Admonition/Icon/Note.tsx
new file mode 100644
index 000000000..d7c524b3a
--- /dev/null
+++ b/docs/external/src/theme/Admonition/Icon/Note.tsx
@@ -0,0 +1,20 @@
+import React, { type ReactNode } from "react";
+import type { Props } from "@theme/Admonition/Icon/Note";
+
+export default function AdmonitionIconNote(props: Props): ReactNode {
+  return (
+    <svg
+      width="15"
+      height="17"
+      viewBox="0 0 15 17"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M0.375 0.583313H14.625V11.6666H13.0417V13.25H11.4583V11.6666H9.875V13.25H11.4583V14.8333H9.875V16.4166H0.375V0.583313ZM1.95833 2.16665V14.8333H8.29167V10.0833H13.0417V2.16665H1.95833Z"
+        fill="#df9f26"
+      />
+    </svg>
+  );
+}
diff --git a/docs/external/src/theme/Admonition/Icon/Tip.tsx b/docs/external/src/theme/Admonition/Icon/Tip.tsx
new file mode 100644
index 000000000..219bb8d0a
--- /dev/null
+++ b/docs/external/src/theme/Admonition/Icon/Tip.tsx
@@ -0,0 +1,20 @@
+import React, { type ReactNode } from "react";
+import type { Props } from "@theme/Admonition/Icon/Tip";
+
+export default function AdmonitionIconTip(props: Props): ReactNode {
+  return (
+    <svg
+      width="19"
+      height="19"
+      viewBox="0 0 19 19"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M10.2917 1.58337H8.70834V6.33337H10.2917V1.58337ZM10.2917 12.6667H8.70834V17.4167H10.2917V12.6667ZM17.4167 8.70837V10.2917H12.6667V8.70837H17.4167ZM6.33334 10.2917V8.70837H1.58334V10.2917H6.33334ZM11.875 5.54171H13.4583V7.12504H11.875V5.54171ZM15.0417 3.95837H13.4583V5.54171H15.0417V3.95837ZM7.12501 5.54171H5.54168V7.12504H7.12501V5.54171ZM3.95834 3.95837H5.54168V5.54171H3.95834V3.95837ZM11.875 13.4584H13.4583V15.0417H15.0417V13.4584H13.4583V11.875H11.875V13.4584ZM5.54168 13.4584V11.875H7.12501V13.4584H5.54168ZM5.54168 13.4584V15.0417H3.95834V13.4584H5.54168Z"
+        fill="#00871D"
+      />
+    </svg>
+  );
+}
diff --git a/docs/external/src/theme/Admonition/Icon/Warning.tsx b/docs/external/src/theme/Admonition/Icon/Warning.tsx
new file mode 100644
index 000000000..f96398d11
--- /dev/null
+++ b/docs/external/src/theme/Admonition/Icon/Warning.tsx
@@ -0,0 +1,20 @@
+import React, { type ReactNode } from "react";
+import type { Props } from "@theme/Admonition/Icon/Warning";
+
+export default function AdmonitionIconCaution(props: Props): ReactNode {
+  return (
+    <svg
+      width="19"
+      height="19"
+      viewBox="0 0 19 19"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M10.2916 0.791626H8.70829V2.37496H7.12496V3.95829H5.54163V5.54163H3.95829V7.12496H2.37496V8.70829H0.791626V10.2916H2.37496V11.875H3.95829V13.4583H5.54163V15.0416H7.12496V16.625H8.70829V18.2083H10.2916V16.625H11.875V15.0416H13.4583V13.4583H15.0416V11.875H16.625V10.2916H18.2083V8.70829H16.625V7.12496H15.0416V5.54163H13.4583V3.95829H11.875V2.37496H10.2916V0.791626ZM10.2916 2.37496V3.95829H11.875V5.54163H13.4583V7.12496H15.0416V8.70829H16.625V10.2916H15.0416V11.875H13.4583V13.4583H11.875V15.0416H10.2916V16.625H8.70829V15.0416H7.12496V13.4583H5.54163V11.875H3.95829V10.2916H2.37496V8.70829H3.95829V7.12496H5.54163V5.54163H7.12496V3.95829H8.70829V2.37496H10.2916ZM10.2916 5.54163H8.70829V10.2916H10.2916V5.54163ZM10.2916 11.875H8.70829V13.4583H10.2916V11.875Z"
+        fill="#FF5500"
+      />
+    </svg>
+  );
+}
diff --git a/docs/external/src/theme/Admonition/Layout/index.tsx b/docs/external/src/theme/Admonition/Layout/index.tsx
new file mode 100644
index 000000000..7b2c170d8
--- /dev/null
+++ b/docs/external/src/theme/Admonition/Layout/index.tsx
@@ -0,0 +1,51 @@
+import React, { type ReactNode } from "react";
+import clsx from "clsx";
+import { ThemeClassNames } from "@docusaurus/theme-common";
+
+import type { Props } from "@theme/Admonition/Layout";
+
+import styles from "./styles.module.css";
+
+function AdmonitionContainer({
+  type,
+  className,
+  children,
+}: Pick<Props, "type" | "className"> & { children: ReactNode }) {
+  return (
+    <div
+      className={clsx(
+        ThemeClassNames.common.admonition,
+        ThemeClassNames.common.admonitionType(type),
+        styles.admonition,
+        className
+      )}
+    >
+      {children}
+    </div>
+  );
+}
+
+function AdmonitionHeading({ icon, title }: Pick<Props, "icon" | "title">) {
+  return (
+    <div className={styles.admonitionHeading}>
+      <span className={styles.admonitionIcon}>{icon}</span>
+      {/* {title} */}
+    </div>
+  );
+}
+
+function AdmonitionContent({ children }: Pick<Props, "children">) {
+  return children ? (
+    <div className={styles.admonitionContent}>{children}</div>
+  ) : null;
+}
+
+export default function AdmonitionLayout(props: Props): ReactNode {
+  const { type, icon, title, children, className } = props;
+  return (
+    <AdmonitionContainer type={type} className={className}>
+      {title || icon ? <AdmonitionHeading title={title} icon={icon} /> : null}
+      <AdmonitionContent>{children}</AdmonitionContent>
+    </AdmonitionContainer>
+  );
+}
diff --git a/docs/external/src/theme/Admonition/Layout/styles.module.css b/docs/external/src/theme/Admonition/Layout/styles.module.css
new file mode 100644
index 000000000..88df7e639
--- /dev/null
+++ b/docs/external/src/theme/Admonition/Layout/styles.module.css
@@ -0,0 +1,35 @@
+.admonition {
+  margin-bottom: 1em;
+}
+
+.admonitionHeading {
+  font: var(--ifm-heading-font-weight) var(--ifm-h5-font-size) /
+    var(--ifm-heading-line-height) var(--ifm-heading-font-family);
+  text-transform: uppercase;
+}
+
+/* Heading alone without content (does not handle fragment content) */
+.admonitionHeading:not(:last-child) {
+  margin-bottom: 0.3rem;
+}
+
+.admonitionHeading code {
+  text-transform: none;
+}
+
+.admonitionIcon {
+  display: inline-block;
+  vertical-align: middle;
+  margin-right: 0.4em;
+}
+
+.admonitionIcon svg {
+  display: inline-block;
+  height: 1.6em;
+  width: 1.6em;
+  fill: var(--ifm-alert-foreground-color);
+}
+
+.admonitionContent > :last-child {
+  margin-bottom: 0;
+}
diff --git a/docs/external/src/theme/Admonition/Type/Caution.tsx b/docs/external/src/theme/Admonition/Type/Caution.tsx
new file mode 100644
index 000000000..b570a37a9
--- /dev/null
+++ b/docs/external/src/theme/Admonition/Type/Caution.tsx
@@ -0,0 +1,32 @@
+import React, {type ReactNode} from 'react';
+import clsx from 'clsx';
+import Translate from '@docusaurus/Translate';
+import type {Props} from '@theme/Admonition/Type/Caution';
+import AdmonitionLayout from '@theme/Admonition/Layout';
+import IconWarning from '@theme/Admonition/Icon/Warning';
+
+const infimaClassName = 'alert alert--warning';
+
+const defaultProps = {
+  icon: <IconWarning />,
+  title: (
+    <Translate
+      id="theme.admonition.caution"
+      description="The default label used for the Caution admonition (:::caution)">
+      caution
+    </Translate>
+  ),
+};
+
+// TODO remove before v4: Caution replaced by Warning
+// see https://github.com/facebook/docusaurus/issues/7558
+export default function AdmonitionTypeCaution(props: Props): ReactNode {
+  return (
+    <AdmonitionLayout
+      {...defaultProps}
+      {...props}
+      className={clsx(infimaClassName, props.className)}>
+      {props.children}
+    </AdmonitionLayout>
+  );
+}
diff --git a/docs/external/src/theme/Admonition/Type/Danger.tsx b/docs/external/src/theme/Admonition/Type/Danger.tsx
new file mode 100644
index 000000000..49901fa91
--- /dev/null
+++ b/docs/external/src/theme/Admonition/Type/Danger.tsx
@@ -0,0 +1,30 @@
+import React, {type ReactNode} from 'react';
+import clsx from 'clsx';
+import Translate from '@docusaurus/Translate';
+import type {Props} from '@theme/Admonition/Type/Danger';
+import AdmonitionLayout from '@theme/Admonition/Layout';
+import IconDanger from '@theme/Admonition/Icon/Danger';
+
+const infimaClassName = 'alert alert--danger';
+
+const defaultProps = {
+  icon: <IconDanger />,
+  title: (
+    <Translate
+      id="theme.admonition.danger"
+      description="The default label used for the Danger admonition (:::danger)">
+      danger
+    </Translate>
+  ),
+};
+
+export default function AdmonitionTypeDanger(props: Props): ReactNode {
+  return (
+    <AdmonitionLayout
+      {...defaultProps}
+      {...props}
+      className={clsx(infimaClassName, props.className)}>
+      {props.children}
+    </AdmonitionLayout>
+  );
+}
diff --git a/docs/external/src/theme/Admonition/Type/Info.tsx b/docs/external/src/theme/Admonition/Type/Info.tsx
new file mode 100644
index 000000000..018e0a16d
--- /dev/null
+++ b/docs/external/src/theme/Admonition/Type/Info.tsx
@@ -0,0 +1,30 @@
+import React, {type ReactNode} from 'react';
+import clsx from 'clsx';
+import Translate from '@docusaurus/Translate';
+import type {Props} from '@theme/Admonition/Type/Info';
+import AdmonitionLayout from '@theme/Admonition/Layout';
+import IconInfo from '@theme/Admonition/Icon/Info';
+
+const infimaClassName = 'alert alert--info';
+
+const defaultProps = {
+  icon: <IconInfo />,
+  title: (
+    <Translate
+      id="theme.admonition.info"
+      description="The default label used for the Info admonition (:::info)">
+      info
+    </Translate>
+  ),
+};
+
+export default function AdmonitionTypeInfo(props: Props): ReactNode {
+  return (
+    <AdmonitionLayout
+      {...defaultProps}
+      {...props}
+      className={clsx(infimaClassName, props.className)}>
+      {props.children}
+    </AdmonitionLayout>
+  );
+}
diff --git a/docs/external/src/theme/Admonition/Type/Note.tsx b/docs/external/src/theme/Admonition/Type/Note.tsx
new file mode 100644
index 000000000..c99e03857
--- /dev/null
+++ b/docs/external/src/theme/Admonition/Type/Note.tsx
@@ -0,0 +1,30 @@
+import React, {type ReactNode} from 'react';
+import clsx from 'clsx';
+import Translate from '@docusaurus/Translate';
+import type {Props} from '@theme/Admonition/Type/Note';
+import AdmonitionLayout from '@theme/Admonition/Layout';
+import IconNote from '@theme/Admonition/Icon/Note';
+
+const infimaClassName = 'alert alert--secondary';
+
+const defaultProps = {
+  icon: <IconNote />,
+  title: (
+    <Translate
+      id="theme.admonition.note"
+      description="The default label used for the Note admonition (:::note)">
+      note
+    </Translate>
+  ),
+};
+
+export default function AdmonitionTypeNote(props: Props): ReactNode {
+  return (
+    <AdmonitionLayout
+      {...defaultProps}
+      {...props}
+      className={clsx(infimaClassName, props.className)}>
+      {props.children}
+    </AdmonitionLayout>
+  );
+}
diff --git a/docs/external/src/theme/Admonition/Type/Tip.tsx b/docs/external/src/theme/Admonition/Type/Tip.tsx
new file mode 100644
index 000000000..18604a5e9
--- /dev/null
+++ b/docs/external/src/theme/Admonition/Type/Tip.tsx
@@ -0,0 +1,30 @@
+import React, {type ReactNode} from 'react';
+import clsx from 'clsx';
+import Translate from '@docusaurus/Translate';
+import type {Props} from '@theme/Admonition/Type/Tip';
+import AdmonitionLayout from '@theme/Admonition/Layout';
+import IconTip from '@theme/Admonition/Icon/Tip';
+
+const infimaClassName = 'alert alert--success';
+
+const defaultProps = {
+  icon: <IconTip />,
+  title: (
+    <Translate
+      id="theme.admonition.tip"
+      description="The default label used for the Tip admonition (:::tip)">
+      tip
+    </Translate>
+  ),
+};
+
+export default function AdmonitionTypeTip(props: Props): ReactNode {
+  return (
+    <AdmonitionLayout
+      {...defaultProps}
+      {...props}
+      className={clsx(infimaClassName, props.className)}>
+      {props.children}
+    </AdmonitionLayout>
+  );
+}
diff --git a/docs/external/src/theme/Admonition/Type/Warning.tsx b/docs/external/src/theme/Admonition/Type/Warning.tsx
new file mode 100644
index 000000000..61d9597b6
--- /dev/null
+++ b/docs/external/src/theme/Admonition/Type/Warning.tsx
@@ -0,0 +1,30 @@
+import React, {type ReactNode} from 'react';
+import clsx from 'clsx';
+import Translate from '@docusaurus/Translate';
+import type {Props} from '@theme/Admonition/Type/Warning';
+import AdmonitionLayout from '@theme/Admonition/Layout';
+import IconWarning from '@theme/Admonition/Icon/Warning';
+
+const infimaClassName = 'alert alert--warning';
+
+const defaultProps = {
+  icon: <IconWarning />,
+  title: (
+    <Translate
+      id="theme.admonition.warning"
+      description="The default label used for the Warning admonition (:::warning)">
+      warning
+    </Translate>
+  ),
+};
+
+export default function AdmonitionTypeWarning(props: Props): ReactNode {
+  return (
+    <AdmonitionLayout
+      {...defaultProps}
+      {...props}
+      className={clsx(infimaClassName, props.className)}>
+      {props.children}
+    </AdmonitionLayout>
+  );
+}
diff --git a/docs/external/src/theme/Admonition/Types.tsx b/docs/external/src/theme/Admonition/Types.tsx
new file mode 100644
index 000000000..2a1001900
--- /dev/null
+++ b/docs/external/src/theme/Admonition/Types.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import AdmonitionTypeNote from '@theme/Admonition/Type/Note';
+import AdmonitionTypeTip from '@theme/Admonition/Type/Tip';
+import AdmonitionTypeInfo from '@theme/Admonition/Type/Info';
+import AdmonitionTypeWarning from '@theme/Admonition/Type/Warning';
+import AdmonitionTypeDanger from '@theme/Admonition/Type/Danger';
+import AdmonitionTypeCaution from '@theme/Admonition/Type/Caution';
+import type AdmonitionTypes from '@theme/Admonition/Types';
+
+const admonitionTypes: typeof AdmonitionTypes = {
+  note: AdmonitionTypeNote,
+  tip: AdmonitionTypeTip,
+  info: AdmonitionTypeInfo,
+  warning: AdmonitionTypeWarning,
+  danger: AdmonitionTypeDanger,
+};
+
+// Undocumented legacy admonition type aliases
+// Provide hardcoded/untranslated retrocompatible label
+// See also https://github.com/facebook/docusaurus/issues/7767
+const admonitionAliases: typeof AdmonitionTypes = {
+  secondary: (props) => <AdmonitionTypeNote title="secondary" {...props} />,
+  important: (props) => <AdmonitionTypeInfo title="important" {...props} />,
+  success: (props) => <AdmonitionTypeTip title="success" {...props} />,
+  caution: AdmonitionTypeCaution,
+};
+
+export default {
+  ...admonitionTypes,
+  ...admonitionAliases,
+};
diff --git a/docs/external/src/theme/Admonition/index.tsx b/docs/external/src/theme/Admonition/index.tsx
new file mode 100644
index 000000000..8f4225da2
--- /dev/null
+++ b/docs/external/src/theme/Admonition/index.tsx
@@ -0,0 +1,21 @@
+import React, {type ComponentType, type ReactNode} from 'react';
+import {processAdmonitionProps} from '@docusaurus/theme-common';
+import type {Props} from '@theme/Admonition';
+import AdmonitionTypes from '@theme/Admonition/Types';
+
+function getAdmonitionTypeComponent(type: string): ComponentType<Props> {
+  const component = AdmonitionTypes[type];
+  if (component) {
+    return component;
+  }
+  console.warn(
+    `No admonition component found for admonition type "${type}". Using Info as fallback.`,
+  );
+  return AdmonitionTypes.info!;
+}
+
+export default function Admonition(unprocessedProps: Props): ReactNode {
+  const props = processAdmonitionProps(unprocessedProps);
+  const AdmonitionTypeComponent = getAdmonitionTypeComponent(props.type);
+  return <AdmonitionTypeComponent {...props} />;
+}
diff --git a/docs/external/static/img/custom_caret.svg b/docs/external/static/img/custom_caret.svg
new file mode 100644
index 000000000..0480cf1c4
--- /dev/null
+++ b/docs/external/static/img/custom_caret.svg
@@ -0,0 +1,3 @@
+<svg width="8" height="13" viewBox="0 0 8 13" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M-5.22335e-06 1.83333L-5.24521e-06 8.74491e-08L1.83333 6.55868e-08L1.83333 1.83333L3.66666 1.83333L3.66666 3.66667L5.49999 3.66667L5.49999 5.5L7.33333 5.5L7.33333 7.33333L5.49999 7.33333L5.49999 9.16667L3.66666 9.16667L3.66666 11L1.83333 11L1.83333 12.8333L-5.09217e-06 12.8333L-5.11404e-06 11L1.83333 11L1.83333 9.16667L3.66666 9.16667L3.66666 7.33333L5.49999 7.33333L5.49999 5.5L3.66666 5.5L3.66666 3.66667L1.83333 3.66667L1.83333 1.83333L-5.22335e-06 1.83333Z" fill="black"/>
+</svg>
diff --git a/docs/external/static/img/favicon.ico b/docs/external/static/img/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..732d3522265c295e355937128b79431dbf96cedc
GIT binary patch
literal 15406
zcmeHNYe-Z<6du!pioza352^iA_@h7yq@+OTPtlKlgr#QEgG?<7j0&})h=L$23nD2K
zk)j_#L|U1cy)>diP0BUsosv{O(tPXJIbFro_HlRjx_75$VA#F$JoDW%XU_f32oWFx
zMR2g7UyDcz5+XtfVX<h>VN-;-L}lUO1NHNTC=U@LjM`8a>Y<g>kKKfSI90p{N~+yk
z;MFo<;~6b4KLjk^Kk$4O_}T7ythz>k``vg3WEBEwmx1a}K<sJYYm@8#+@j?d5J&Cr
zk?eP?v_2hOKyRPE{@kjo2S~mEl-KI-W82c3{@%#%Eq>m<KU)ku(I4CXGW@q|6x=9e
zJ7b|7MValBqa*_sN=Ai%KO*q?J7BFdPqMfyz_Md>=jXGnn9jPQ%D?lngTS;cz?~6w
zd^UD;8zWakGa#bf&o4h1Ge3`#T?_=R2O`pd>raO=uRmn#&~x5>U}=UXtC91w4D7c|
zhzC+G0)72lqWLZ(-+w3h7mM}*M$galvClG{-gi9tVLiRT?FwMtF0L7#-ZcPiox{tF
zda`~YolgPQoX~XavDK)N^^a3ezGV1bV8s!jwL^bDBU`dB7j+m|k`6Sr89B1PvCN#`
zO#Ew1)IT%#pI-aJ-zP@fA2aQ*+2@a|^Ox=MXr8~$tbs554`=h6?SDCwP1Pv`WI(_X
zFYv#VGfzSkt=L3a@gy>6tddb7pb$_9C<Ocg0p_AwDE`(=d_*^KLb4@}{Ux3UVkoY6
z|CMag1GV+QoMd1kaf7*~{v|(iV~nq}{HO+)y&V|80XS9Yye)H%zDlginFT=P0q1!^
zDlj$%2v`TqC0;U;_+LkTUcB{{^Z@g~J9FIU&7E=W1<!paKhMOv%^dp}!j>^!dlE>$
z0%X`^-n)|%wEES@hw3=KADsz=CINxO-SfJ9EkCb;If?|jqcAQOShz>KH_$)8-*Y|3
zkDTq_N{VBwJVqGM8qAQNW&F_!?9SEJz&d`D^k8rewJzl6c2C{_GZW2|pVz?gsMI{o
zPKJ`b;TTn4AC-5}oeqklO(Gr2E#;Q>Q~m?s<2U<tzA9z=mvsx6MOe<*rpe2EYa{Xh
ziP=E@Ltjba`8;e_`7X%R&00QJq{Wi>4iEbfvLud&vL3PC<dl%TH7MTc%k`I8wRk1_
z4o9!ag+JrOzUOO-$FN;x|AEhjcG}OfB-!PcS%3cQU-AuP+rKi~&%yJHeF53dFNgjE
z*?ryq1NnkxB$@p;Z~f;g@}F0k<Uh;&{UZDKqbJ|*e6Pq~zTeqS$jqPUwR8T=U+Gzc
j?EInZ{H>mMq}nJ16aoqXg@8i9Qv~RGkV*;xj}iC{Uw-;d

literal 0
HcmV?d00001

diff --git a/docs/external/static/img/logo.png b/docs/external/static/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..35e9497563533cdab4b533f7777d001430839297
GIT binary patch
literal 4335
zcmeI0*H;rtw1+2=A|0joAWb-Q1*C`Giy(&*ARr(hp(xT7BB82uFaifbK>=x@NG}Np
z2uP782}n_?0@8~VZ_ZiwkGK!_VP?O~>{+wdp8fmwBwCsqFwk<-0st6{40Wx@7XR<K
zNJXBlW>C~*0|~S;&<2%5ysH2(mm2A6-3oQy$cq@yvgYsAeDm}tYZI&W;ENZ}OnW3N
zB!5H-#N3T}F=Oqgb1nUTqAT;L*%i|g$NS<&ckKT*>%P_5SX7il!}fY0*XsJu<yF1?
z_Tj~Ume*^C!`e@(YA1;ie<Dv#rt<?|dLn(wksXoh##XRG+Hq#UmDHMZ)&_;b`2@#k
zFQQH3kx3k2?Lzk7aNw?Tdbbr=3Vf`CLSbVIw%;kyzu|A$m_asU2e%9ur<SikgO3l6
zCPE<v8mZot6!5oQRXucI|FP*`Fd)wtso)GsnA{y8kkr+!vTZ2*5$ylQ5kEC>ca<eW
zS=vwh0tXa)I?X%KR7tP&8NR&q7<~x>xDJBm;2qaoCv{8K!tejwZ8_(b7J#U(FOAlI
zB3%a3IvpsvJr!p5L52p>A)i-kgUPVGj|pg`Zvz3P!IB6l?76A9$7LW+lkKbkg{eyw
z`dkK|xs`_mfg`OnaD2x%@EjzFSQ}?kz>T%v+9m-*i-DCK3V5A<a^OXPjiv+GyS+6c
z;C5f8)!R1$UHiT++Xgw*hDM_g%fyjjvMN5vXJ<mJZD+0$!{xT{*redwz*hKhGhcEe
zSVLvMJiDPVQBH{%f09v)+Q}3HWzPu%I`g&1F0iB2$?}*(F@h)E>$cK1k@X14@j1$X
zM$wW@#gUz>USXznDIV#CY7ov48Tt<Hb|-|W>;0)`qEhoY)i^inc>SlI@6;eGb2Osr
z4r(?g#GQkrf|I}z)E_H9J=7c}991fxeiLMB73?#mMle&tH%VdER^SIeEhM!ics7$a
znCscEUrDMWiwWRrX@JefdTVyTcUPCLSH^v;%%E>?NAZx_+GVS0Yn9gy*?o@i=aZ>%
zgBE;*7!I@sg=6N^G`nWJw|&0)Rxz+xZa@9d@4b6(0E-tBz=zDmaa5n-lMWJWHkh)@
zBXf_Pk3D1|jln@RJ6TPXaKGj-`~EwRvC=UR&#soLp1{v{v|2Qv!P+_`@6Yi8wh=f5
zE!S1jHtr;{uY$*}e!KlP*Qb~CECR7iqGDwRKzOW7_<q$9Z(Q(W@8Rf*zC_~+^Vp}G
z@f+N_i>3!>9CQo6bzBm=x&x^2)=Jdyhiz9#NC<PqO`|0o@~fwRESAckg9UYy$DsjZ
z9#RycW+Vr2E)~v@v0nTORRYz;&UA3KZ<B9$Re^156vjD0H>qFF`ramOkSV%MzpH+_
zw@g#Qwi=Y|4a{otw?k)nk!{6Ln8Xv2^EP#%6aio{$J-`J%psMtIjZn-Z>Ih6_U)#^
zlXj1zULkv3&;{>=fpIIQ_uibop=e4>+84c!RMJ4eF6LFBrWZ-xd}CsH8v=Iy`W`lx
z@jblm7Ko&TN6JZOk1Cp~_{h_*(LWV3zgruq!lOvXACGDZsO;kapZ*Z77n197sJ@<x
zOQ1==L3e;Cn)QmKtMl+R56&%Per8A=p_9ZLXY>e)pM9)<5W}%a40YB9x`&vW0l6qq
zwaE*!Iq-?%$@8Lavnaad83rjv3u#P}?!MpmV9x8GOfcv5EJ_FD;HUW5XX22axeAeI
zt1GUf;S39%1YFd#yBTtuau3CzD9HZYkuTYYCANwlBe?u$h5Vw}$7=f9POpU)(3wW@
zPwJtHXYNGY@Q3k^FrsE*<~58V!>h9UG@3wG=2NkTL8odJg$D5}g?i88VI_+JoyAV(
zax(7Whxcqn!!xupa~y3sb&)zZ-iz^0OSN}fcy>AQxeyQ&*n9g-maC7C<zI_UG2tV7
zb*A|(%gj#|vjWT^mNr}M$K0Y*G4}p;wGwKr!Rehwwq4$B1xxJP&7G}E(NR!Dse{dZ
z26R$_%|kX*Mp99Jo^e{5FnC8-7xZNN!a^U9%i`$PrlqHk*B74T4*E3|Th-52Ircb5
z3S?wWSmYP*VYg8-kOp0XYd?5^d+_c1VOOBv{<Wj7tdWD9(2fGCsZ22!J0%?Ud%h@y
znJsI)odevoB3=H@^oLKaW=cL9cdJF3ck0s61{1=M$0jh~=Ir=Q*&k3lr){@La`rkI
zD^tK71vRrNA59Z_Yde+drV>ULmI<p$y$Ew(pNyWp*y0m(TZG+ZaIY{uL<5qltIb2;
zn&rEbOgCri!aSu(uy4>h)Bntl$~#{{%r{MA5^s?G+W+hKvY_v$nK;^C9apCuS)QXx
zKlqdI9w`_zX+04h-<pu5s3f#Th6@&{mo;)Ieia7pU-~>t7w32}!{GF2%F0H)K4CMY
zmzw2{YPXut7;H?0*rY2`EDwc=5mDHQ{(0ipV0+^7T6)mZqh#7(EK%i(NENxp9LIDy
zI}~fsTo_KQ>{f}wy5dfL74AyJUn8p*x0OW%Rh%;vDaD91Be@H#{FXhHk7p4W-Leis
zy+s4VLhC6b7Df3zuaG16;LxO`Lq`7ibtpX+i!Ay)Bwwxrir8*N$kjJRt6I=8cF>yC
zS1+Av;pS+(?QPYSCCFD`tt8!^^H<Tlu+++~;aY!IIkF*uJAAdx@%hb0*_sYuea%9S
zS;EigK?T>+*`bkb|B<)Wcb*GyXm37TV+F@09Dh&#ovIPU^6V#vAK|$`LklFi-Hw@6
zf?aT*7OnlnueQa)kx7PuK3}$0WW0X(Xe97kg|Jl7FjpA@u&T@>WtfuP9xgrKs#W%-
zo)lM~kNL~>XL#&^@xH$$95k-b)^~*dt|f>N2Q;f@UvGR+spP5axU}ZC(OLUxni*6!
zqkYlU*xRaMo#q84(!|k3>+sILuLMQnRkm9Yh^1wiQt1qPbK9A`+5`JNM}q6Jc0A83
z!mv~L3uOeffKxF4KyBvU{YDSfJkl)nd1!|7GdfNoh$Z}9Sw(n{-O))Rc@fF~wl!Hx
zqt&5j%lWeFqbmlm>A#8RRO(Q+8ye68JoJy{*`W-fP^p#TkIbpa6yvmtkqkjvTL?Io
zpt=g`V|TO|FwLo|i45d)tZ>}9dqt9C;-9QbAU0E_&nltzq|-G|;hXix&|5bfz}3w8
zdd{I_n}^j=jg+b$&0P!uw>V1Jb~9JCkN+WrQ^EzK{o*}|XKoIRP8Wl$E3840gy*8v
zGdaZ%>$txjOvJsYTeNV<2ZrzLf{x#d$V-XjO$ve0)Rz0!t$ev&y<%~1dZY@*Hb|`b
zahu}fg20OT65rGGxF>q0I^c&;3u8~efx1jTE!wdwb;aw0(5taL6>d4(3OYM;@Z(Bl
z+tzG|ps6^1p|R<xP+pl#RhNw#7D6AiO#d~sy%Is(UP*b(5T^g8|NH0SXE8h*p?hBo
zjaN=s$%$^HdwL%ItONgvqf_Q1j?1Y9_TAJeHBEQ+_7662&nD%Oo|V*%(}zxJthQgS
zEVF={5Zv;aGLLlM$(0_FFzP%=-U;FPwBAJPLVBy1%g5tpVHt;t=pW4BW(_I)Wg1PT
zk@|7f_9pG5Lg~$Z)njLHORUxx$*Tz?=n>oIj|RR6Mb;ko&=C|&ny*e98B`4=fD&V_
z-1!{Yi~9RiJb5%GK@E>HD&xk&yEPZXW_bcEde^XKjqM_%=SdRn(3YB@+~3)x3>Z+{
zm?87awT8}t!^e*pP4;=BH|Esq5vRy%i)FmihU<T2m;ryP<mx^=-}C!X3SF{ST_N|i
zR0_NW24!2IF+%xPlc_#MNs_4le3uFj*&u9ECTFZyuWd4Jk*pV*oS-fm`^uMR!$h`9
zwcJ+Z7<1|p#$Kln3jqlouU<A%b?m{YPYQ)=sk2UFfb9C5qCGVZIrXx_^>chAaLM~K
z5%01Uruo|~ggYdPF=r#c+*c$A0qo|N24i|7@CcSpnWoy-;ORm>kJ)cqKLnA#<@Wq8
zm}u-=K*#<f_=@?hrvO9#FX__T=fa%fa(12x#=#9=7KL1fCtZ{XVrB<2foFn|02geA
z^WBYYQEKlu0>Vjm6PFr#|6zKI$7>S4H7z9JSaNw3F=YlAU#~ueV+!>9vx5xRZqeTN
zbZEyyg!bZOWn7;S1__Ulq%l$O(cZ;ih+p4I?fMkS0Lg5QXS$EByX_uaM4#SXf8@>c
zv%b(+e-6rq)Nh&oU!Z^-SfpC)KtN0P&dV{^gYkEWD_|!Px9nkSi;p45uBqTW=W*`6
z8A_TLE4dkh)10_Vr@++R$@ogN60*FVjKN8U5q9zFYf}_h2(!W`@9)1WrYV)0f8h|}
zN#g7PS%u~r?t0NqNU$ZV$!hm>ZqB-%zZcep<!RnLbCyFMEyq`;X@!LT?Ddn|Kz4b5
zzIoC<qf=(J43$V0d+VyeY2D$`SlM}0=;1_YWxX0zvj+5FCpXx^eE_DS+YyRX<qw{d
zX$nF#`~JGYHsEsL{^Euj=c;i!S&81O4Iz|2dDpfC7I%j{XlN@qm)_p(9c<#aYZq?h
z>{7XFSJPXmAMv3=`J?APV!7d(k!CKF;%Ju1WzbZz<jTdf$T`l1+O{9R))BwSF(?AD
zyuLbiO)Z3KPx(r?f@e7UK(Q#qlB&AS$FMM2L<Vz*y@&={0IO-PsEZPNu~&k~UA%2Z
z#%5tMF>A4cCZA<9BS>n*Rf_)rdbH=vm)=pliQI%W-I>k$56vZJ%d0|$IEb%APw)zE
zgaZwCSQZ&rYz8pae5l33L8_DgKwp$fL+=eK2s604AKVv3c{j5nKN9KbGj-^NBW^t_
z+M&Qld-6p&eRyJl)v8x8B*Q4isSxWL(#n?He&fbV;bFF^#2mZ8r$;=eEH>-@OFNW!
zgTW2v@>%Mx+ZG2DCnafa`4ngq0#+){nY#0Jg47G?6uo=ING4wzfYrJLq$iR+Ou&b9
z@i(SWn26w5nLa2g_IO|hg*gcID*wBa5^eI{jd&SUyBmvV07IjXd+#oRRc|h*43IGS
z@g5^&-YS4RHtgyt;F8%^{q7OLztmY~^EuZSzFsGm`xmM&JV{&S?@doXS+q+60ellS
zNJ4Z2hHgjkLV@V|3@i8bdo5HS-&64uSpYw!PGzGlS?Invva4IcK`1MI(>G@bWZpT@
ze$S9>$?)?ef|3FqG3fDGh-?iAsef&f8{SO?tX>MasQ$l$Bh66goP>^&&ja!g1~Aey
K*R9lciT)qw4D3Gu

literal 0
HcmV?d00001

diff --git a/docs/external/styles.css b/docs/external/styles.css
new file mode 100644
index 000000000..297366633
--- /dev/null
+++ b/docs/external/styles.css
@@ -0,0 +1,1046 @@
+/* Import Google Fonts */
+@import url("https://fonts.googleapis.com/css2?family=DM+Mono:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap");
+@import url("https://fonts.googleapis.com/css2?family=Geist:wght@100..900&display=swap");
+
+/* ============================
+   0) SEMANTIC TOKENS (your brand)
+   ============================ */
+
+:root {
+  /* ---- Brand palette (LIGHT) ---- */
+  --color-brand: #ff5500; /* TODO: replace with your primary */
+  --color-brand-600: #ff6a26; /* TODO */
+  --color-brand-700: #e24c00; /* TODO */
+  --color-brand-800: #b63c00; /* TODO */
+  --color-secondary: #102445;
+
+  --color-accent: #1764a8; /* TODO secondary/accent */
+  --color-success: #00871d;
+  --color-warning: #ff5500;
+  --color-danger: #ff0000;
+
+  /* ---- Neutral & Surfaces ---- */
+  --color-bg: #ffffff;
+  --color-surface: #f9f9f9;
+  --color-elevated: color-mix(in oklab, #000 5%, transparent);
+  --color-border: color-mix(in oklab, #000 20%, transparent);
+  --color-text: #363636;
+  --color-muted: color-mix(in oklab, var(--color-text) 70%, transparent);
+  --color-link: var(--color-brand);
+
+  /* ---- Typography ---- */
+  --font-sans: "Geist", ui-sans-serif, system-ui, sans-serif,
+    "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  --font-mono: "DM Mono", ui-monospace, SFMono-Regular, Menlo, Consolas,
+    "Liberation Mono", monospace;
+  --font-size-base: 14px;
+  --line-height-base: 150%;
+  --letter-spacing-base: 0;
+
+  /* ---- Radii & Spacing ---- */
+  --radius-xs: 5px;
+  --radius-md: 5px;
+  --radius-lg: 5px;
+  --radius-xl: 5px;
+
+  /* Design system spacing - exact pixel values */
+  --space-4px: 4px; /* Inline code padding */
+  --space-16px: 16px; /* Standard paragraph, list, heading spacing */
+  --space-24px: 24px; /* H1 to first content, H2 to large components, list indent */
+  --space-32px: 32px; /* Section breaks, major structural spacing */
+  --space-40px: 40px; /* Major structural reset (lower bound) */
+  --space-48px: 48px; /* Major structural reset (upper bound) */
+
+  /* Legacy spacing variables for compatibility */
+  --space-1: 0.25rem; /* 4px  */
+  --space-2: 0.5rem; /* 8px  */
+  --space-3: 0.75rem; /* 12px */
+  --space-4: 1rem; /* 16px */
+  --space-5: 1.25rem; /* 20px */
+  --space-6: 1.5rem; /* 24px */
+  --space-8: 2rem; /* 32px */
+  --space-10: 2.5rem; /* 40px */
+
+  /* ---- Shadows ---- */
+  --shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.06);
+  --shadow-md: 0 6px 16px rgba(0, 0, 0, 0.08);
+  --shadow-lg: 0 12px 28px rgba(0, 0, 0, 0.12);
+
+  /* ---- Container widths ---- */
+
+  /* Common layout sizes */
+  --navbar-height: 64px;
+
+  /* Docs sidebar width */
+  --doc-sidebar-width: 250px !important;
+}
+
+/* ==========================================
+   1) MAP SEMANTIC → INFIMA (core variables)
+   ========================================== */
+
+:root {
+  /* Brand */
+  --ifm-color-primary: var(--color-brand);
+  --ifm-color-secondary: var(--color-secondary);
+  --ifm-color-primary-dark: var(--color-brand-700);
+  --ifm-color-primary-darker: var(--color-brand-800);
+  --ifm-color-primary-darkest: var(--color-brand-800);
+  --ifm-color-primary-light: var(--color-brand-600);
+  --ifm-color-primary-lighter: var(--color-brand-600);
+  --ifm-color-primary-lightest: var(--color-brand-600);
+
+  /* Text & surfaces */
+  --ifm-color-content: var(--color-text);
+  --ifm-color-content-secondary: var(--color-muted);
+  --ifm-link-color: var(--color-link);
+  --ifm-background-color: var(--color-bg);
+  --ifm-background-surface-color: var(--color-surface);
+
+  /* Typography */
+  --ifm-font-family-base: var(--font-sans);
+  --ifm-font-family-monospace: var(--font-mono);
+  --ifm-font-size-base: var(--font-size-base);
+  --ifm-line-height-base: var(--line-height-base);
+  --ifm-font-weight-base: 400;
+  --ifm-heading-font-weight: 700;
+
+  /* Heading typography specifications */
+  --ifm-h1-font-size: 28px;
+  --ifm-h1-line-height: 32px;
+  --ifm-h2-font-size: 24px;
+  --ifm-h2-line-height: 28px;
+  --ifm-h3-font-size: 20px;
+  --ifm-h3-line-height: 24px;
+  --ifm-h4-font-size: 16px;
+  --ifm-h4-line-height: 16px;
+
+  /* Code typography specifications */
+  --ifm-code-font-size: 14px;
+  --ifm-code-line-height: 150%;
+  --ifm-code-letter-spacing: -2%;
+  --ifm-code-padding-horizontal: 4px;
+  --ifm-code-padding-vertical: 4px;
+
+  /* Layout & spacing */
+  --ifm-spacing-horizontal: var(--space-4);
+  --ifm-global-radius: var(--radius-md);
+
+  /* Component radii (Infima) */
+  --ifm-breadcrumb-border-radius: var(--radius-md);
+  --ifm-button-border-radius: var(--radius-md);
+  --ifm-card-border-radius: var(--radius-md);
+  --ifm-alert-border-radius: var(--radius-md);
+  --ifm-badge-border-radius: var(--radius-md);
+  --ifm-tabs-border-radius: var(--radius-md);
+  --ifm-table-border-radius: var(--radius-md);
+  --ifm-code-border-radius: var(--radius-md);
+
+  /* Sizes */
+  --ifm-container-width: var(--container-width);
+  --ifm-navbar-height: var(--navbar-height);
+  --ifm-menu-link-padding-horizontal: 6px;
+  --ifm-menu-link-padding-vertical: 12px;
+
+  /* Borders & shadows */
+  --ifm-border-color: var(--color-border);
+  --ifm-card-box-shadow: var(--shadow-md);
+  --ifm-global-shadow-lw: var(--shadow-sm);
+  --ifm-global-shadow-md: var(--shadow-md);
+  --ifm-global-shadow-tl: var(--shadow-lg);
+
+  /* Tables */
+  --ifm-table-cell-padding: 0.75rem;
+
+  /* Alerts */
+  --ifm-alert-background-color: var(--color-elevated);
+  --ifm-alert-border-color: var(--color-border);
+
+  /* Breadcrumbs */
+  --ifm-breadcrumb-color-active: var(--color-text);
+  --ifm-breadcrumb-item-background-active: var(--color-elevated);
+}
+
+/* ==========================================
+   2) BASE ELEMENTS
+   ========================================== */
+
+html,
+body {
+  font-family: var(--ifm-font-family-base);
+  font-size: var(--ifm-font-size-base);
+  font-weight: var(--ifm-font-weight-base);
+  line-height: var(--ifm-line-height-base);
+  color: var(--ifm-color-content);
+  background: var(--ifm-background-color);
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+}
+
+/* Remove underlines from all links by default */
+a {
+  color: var(--ifm-link-color);
+  text-decoration: none;
+}
+
+/* Add underlines only to links within text content */
+p a,
+li a,
+blockquote a,
+.theme-doc-markdown a,
+.markdown a,
+article a,
+main a {
+  text-decoration: underline;
+  text-decoration-color: var(--ifm-link-color);
+  text-underline-offset: 0.2em;
+}
+
+/* Hover effects for text links */
+p a:hover,
+li a:hover,
+blockquote a:hover,
+.theme-doc-markdown a:hover,
+.markdown a:hover,
+article a:hover,
+main a:hover {
+  text-decoration-color: currentColor;
+}
+
+/* Ensure navigation links have no underlines */
+.navbar a,
+.theme-doc-sidebar-container a,
+.menu__link,
+.breadcrumbs__link,
+.pagination-nav__link,
+.table-of-contents a {
+  text-decoration: none !important;
+}
+
+/* Hover effects for navigation links */
+.navbar a:hover,
+.theme-doc-sidebar-container a:hover,
+.menu__link:hover,
+.breadcrumbs__link:hover,
+.pagination-nav__link:hover,
+.table-of-contents a:hover {
+  text-decoration: none !important;
+}
+
+/* Headings - exact design specifications */
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-family: var(--font-sans);
+  letter-spacing: 0em;
+  font-weight: bold;
+}
+
+/* H1: 28px font, 32px line height */
+h1 {
+  font-size: var(--ifm-h1-font-size);
+  line-height: var(--ifm-h1-line-height);
+}
+
+/* H2: 24px font, 28px line height */
+h2 {
+  font-size: var(--ifm-h2-font-size);
+  line-height: var(--ifm-h2-line-height);
+}
+
+/* H3: 20px font, 24px line height */
+h3 {
+  font-size: var(--ifm-h3-font-size);
+  line-height: var(--ifm-h3-line-height);
+}
+
+/* H4: 16px line height */
+h4 {
+  font-size: var(--ifm-h4-font-size);
+  line-height: var(--ifm-h4-line-height);
+}
+
+h5 {
+  font-size: 1.125rem;
+  line-height: 20px;
+}
+
+h6 {
+  font-size: 1rem;
+  text-transform: none;
+  line-height: 16px;
+}
+
+/* Bold text styling */
+strong,
+b {
+  font-weight: 600;
+  color: var(--ifm-color-content);
+}
+
+/* Body/Paragraph: 14px, 130% line height, Regular */
+p {
+  font-size: var(--ifm-font-size-base);
+  line-height: var(--line-height-base);
+  font-weight: 400;
+  letter-spacing: 0em;
+}
+
+/* Links (text): 14px, 130% line height, Semibold */
+a {
+  line-height: 130%;
+}
+
+/* List/Bulletpoints: 14-16px, 150% line height, Regular */
+ul {
+  list-style-type: disc;
+  line-height: 150%;
+}
+
+ul li::marker {
+  color: var(--color-border);
+}
+
+/* Nested unordered lists */
+ul ul {
+  list-style-type: circle;
+}
+
+ul ul ul {
+  list-style-type: square;
+}
+
+/* Ordered lists: 14-16px, 150% line height, Regular */
+ol {
+  list-style-type: decimal;
+  line-height: 150%;
+  font-size: var(--font-size-base);
+  font-weight: 400;
+}
+
+/* Nested ordered lists keep default styling */
+ol ol {
+  list-style-type: lower-alpha;
+}
+
+ol ol ol {
+  list-style-type: lower-roman;
+}
+
+/* Blockquote */
+blockquote {
+  border-left: 3px solid var(--ifm-color-primary);
+  background: var(--ifm-background-surface-color);
+  padding: var(--space-4);
+  border-radius: var(--radius-md);
+  color: var(--ifm-color-content);
+}
+
+/* Images */
+img {
+  border-radius: var(--radius-md);
+}
+
+/* ==========================================
+   3) NAVBAR & FOOTER (scoped to stable classes)
+   ========================================== */
+
+/* ThemeClassNames.layout.navbar.container */
+.theme-layout-navbar {
+  height: var(--ifm-navbar-height);
+  backdrop-filter: saturate(1.1) blur(8px);
+  border-bottom: 1px solid var(--ifm-border-color) !important;
+  background: color-mix(in oklab, var(--ifm-background-color) 75%, transparent);
+  backdrop-filter: saturate(1.1) blur(8px);
+  box-shadow: none;
+}
+
+/* ThemeClassNames.layout.footer.container */
+.theme-layout-footer {
+  --ifm-footer-background-color: var(--color-elevated);
+  background: var(--ifm-footer-background-color);
+  color: var(--ifm-color-content);
+}
+
+/* ==========================================
+   4) SIDEBAR (Docs)
+   ========================================== */
+
+/* ThemeClassNames.docs.docSidebarContainer */
+.theme-doc-sidebar-container {
+  border-right: 1px solid var(--ifm-border-color) !important;
+  padding: 5px;
+  font-size: 0.875rem; /* Sidebar-specific font size */
+}
+
+/* Main docs content area - wider to fill space */
+.theme-doc-markdown {
+  max-width: 100%; /* Use full available width */
+}
+
+/* ThemeClassNames.docs.docSidebarMenu */
+.theme-doc-sidebar-menu .menu__link {
+  font-family: var(--font-sans);
+  letter-spacing: -2%;
+  border-radius: var(--radius-md);
+  padding: var(--ifm-menu-link-padding-vertical)
+    var(--ifm-menu-link-padding-horizontal);
+}
+
+.theme-doc-sidebar-menu .menu__link--active {
+  color: var(--ifm-color-primary);
+  background: color-mix(
+    in oklab,
+    var(--ifm-background-surface-color) 70%,
+    transparent
+  );
+}
+.theme-doc-sidebar-menu .menu__link--active:hover {
+  background: var(--ifm-background-surface-color);
+}
+
+/* Category collapsible */
+.menu__list-item-collapsible {
+  border-radius: var(--radius-md);
+}
+
+/* ==========================================
+   5) BREADCRUMBS
+   ========================================== */
+
+/* ThemeClassNames.docs.docBreadcrumbs */
+.theme-doc-breadcrumbs .breadcrumbs__link {
+  line-height: 150%;
+  border-radius: var(--radius-md);
+  padding: var(--ifm-menu-link-padding-horizontal)
+    var(--ifm-menu-link-padding-vertical);
+}
+
+.theme-doc-breadcrumbs .breadcrumbs__item--active .breadcrumbs__link {
+  color: var(--ifm-color-primary);
+}
+
+/* ==========================================
+   6) BUTTONS
+   ========================================== */
+
+.button {
+  border-radius: var(--ifm-button-border-radius);
+  font-weight: 600;
+  letter-spacing: 0.01em;
+  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.05);
+  line-height: 150%;
+}
+.button--outline:not(.button--link) {
+  border-color: color-mix(in oklab, var(--ifm-color-primary) 70%, transparent);
+}
+.button--link {
+  color: var(--ifm-link-color);
+}
+
+/* ==========================================
+   7) BADGES
+   ========================================== */
+
+.badge {
+  border-radius: var(--ifm-badge-border-radius);
+  border: 1px solid var(--ifm-border-color);
+  background: var(--ifm-background-surface-color);
+}
+
+/* ==========================================
+   8) ALERTS (Admonitions)
+   ========================================== */
+
+.theme-admonition {
+  display: flex;
+  align-items: flex-start; /* icon aligns with text top */
+  gap: 0.75rem; /* spacing between icon and text */
+  padding: 1rem 1.25rem;
+}
+
+/* ThemeClassNames.common.admonition */
+.theme-admonition.alert {
+  --ifm-alert-background-color: var(--color-elevated);
+  --ifm-alert-border-color: var(--ifm-color-primary);
+  --ifm-alert-background-color-highlight: #fff;
+
+  font-family: var(--font-mono);
+  border: 1px solid var(--color-elevated);
+  border-top: 5px solid var(--ifm-alert-border-color); /* top border accent */
+  border-left: none; /* disable default */
+  border-radius: var(--ifm-alert-border-radius);
+  box-shadow: none;
+  background: var(--ifm-alert-background-color);
+  color: var(--ifm-color-content);
+  /* padding: 1rem 1.25rem; */
+}
+
+/* NOTE */
+.theme-admonition.alert--secondary {
+  --ifm-alert-border-color: #df9f26;
+  border-top-color: #df9f26;
+}
+/* TIP */
+.theme-admonition.alert--success {
+  --ifm-alert-background-color: var(--color-elevated);
+  border-top-color: var(--ifm-color-success) !important;
+}
+/* INFO / IMPORTANT */
+.theme-admonition.alert--info {
+  --ifm-alert-border-color: #1764a8;
+  border-top-color: #1764a8;
+}
+/* WARNING */
+.theme-admonition.alert--warning {
+  --ifm-alert-border-color: var(--color-warning);
+  border-top-color: var(--color-warning);
+}
+
+/* DANGER */
+.theme-admonition.alert--danger {
+  --ifm-alert-border-color: var(--color-danger);
+  border-top-color: var(--color-danger);
+}
+
+.theme-admonition ul li::marker {
+  color: var(--ifm-color-primary);
+}
+
+/* Exclude list margins from alert blocks */
+.theme-admonition ul,
+.theme-admonition ol {
+  margin-top: 0 !important; /* Smaller margins for lists in alert blocks */
+  margin-bottom: 0 !important;
+  padding-left: 1.5rem !important; /* Standard padding for lists in alerts */
+}
+
+/* Nested lists in alert blocks should have no extra margin */
+.theme-admonition ul ul,
+.theme-admonition ol ol,
+.theme-admonition ul ol,
+.theme-admonition ol ul {
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+}
+
+/* VERSION BANNER */
+.theme-doc-version-banner {
+  --ifm-alert-background-color: var(--color-elevated);
+  --ifm-alert-border-color: var(--color-warning);
+
+  font-family: var(--font-mono);
+  border: 1px solid var(--color-elevated);
+  border-top: 6px solid var(--ifm-alert-border-color);
+  border-left: none; /* disable default */
+  color: var(--ifm-color-content);
+}
+
+/* ==========================================
+   9) TABS
+   ========================================== */
+
+/* ThemeClassNames.tabs.container */
+.theme-tabs-container .tabs {
+  --ifm-tabs-padding-vertical: 0.375rem;
+  --ifm-tabs-padding-horizontal: 0.75rem;
+}
+.theme-tabs-container .tabs__item {
+  border-radius: var(--ifm-tabs-border-radius);
+}
+.theme-tabs-container .tabs__item--active {
+  background: var(--ifm-background-surface-color);
+  box-shadow: inset 0 0 0 2px
+    color-mix(in oklab, var(--ifm-color-primary) 24%, transparent);
+}
+
+/* ==========================================
+   10) CARDS
+   ========================================== */
+
+.card {
+  border-radius: var(--ifm-card-border-radius);
+  box-shadow: var(--ifm-card-box-shadow);
+  border: 1px solid var(--ifm-border-color);
+  background: var(--ifm-background-surface-color);
+}
+
+/* ==========================================
+   11) TABLES
+   ========================================== */
+
+/* Apply border radius to the entire table */
+table {
+  border-radius: 5px; /* Adjust this value to change corner rounding */
+}
+
+tbody tr {
+  border-top: none;
+  background: var(--ifm-background-surface-color);
+}
+
+/* =========================
+   12. Code block card + header
+   ========================= */
+
+.theme-code-block {
+  border: 1px solid var(--ifm-border-color);
+  border-radius: 5px;
+  position: relative;
+}
+
+/* Target CSS module class using attribute selector to handle hashed names */
+.theme-code-block [class*="codeBlockTitle"] {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 10px 12px;
+  font-family: var(--font-sans) !important;
+  font-size: 0.875rem !important;
+  font-weight: 500 !important;
+  letter-spacing: 0.02rem !important;
+  color: var(--color-base) !important;
+  border-bottom: 1px solid var(--ifm-border-color) !important;
+}
+
+/* Body */
+.theme-code-block pre {
+  margin: 0;
+  background: color-mix(
+    in oklab,
+    var(--color-surface) 96%,
+    var(--color-bg, #fff)
+  );
+  padding: 16px 18px;
+}
+
+/* Code text - design specifications */
+.theme-code-block code {
+  background: transparent;
+  border: 0;
+  border-radius: 0;
+  padding: 0;
+  font-family: var(--font-mono);
+  font-size: var(--ifm-code-font-size); /* 14px */
+  line-height: var(--ifm-code-line-height); /* 24px */
+  letter-spacing: var(--ifm-code-letter-spacing); /* -2% */
+  color: var(--color-text);
+}
+
+/* Inline code - design specifications */
+code {
+  font-family: var(--font-mono);
+  font-size: 12px; /* 14px */
+  line-height: 24px; /* 24px */
+  letter-spacing: var(--ifm-code-letter-spacing); /* -2% */
+  font-weight: 400;
+}
+
+/* Highlighted lines / magic comments */
+.token-line.highlighted,
+.code-block-highlighted-line {
+  background: color-mix(in oklab, var(--ifm-color-primary) 12%, transparent);
+}
+
+/* Optional: softer $ prompt tint in bash */
+.theme-code-block[data-language="bash"] pre code .token.operator {
+  opacity: 0.9;
+}
+
+/* Dark tweaks */
+[data-theme="dark"] .theme-code-block .codeBlockTitle {
+  background: color-mix(in oklab, var(--color-surface) 85%, transparent);
+}
+
+/* ==========================================
+   12.1) DETAILS/SUMMARY (Expandable Sections) - styled like code blocks
+   ========================================== */
+
+/* Scope to docs content only */
+.theme-doc-markdown details {
+  border: 1px solid var(--ifm-border-color);
+  border-radius: 5px;
+  background: var(--ifm-background-surface-color);
+  margin: 0.75rem 0 1rem;
+  overflow: hidden; /* crisp rounded corners */
+  padding: 0;
+}
+
+/* The clickable header row */
+.theme-doc-markdown details > summary {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 10px 12px;
+  font-weight: 500;
+  text-transform: uppercase;
+  font-family: var(--font-sans);
+  line-height: 1.5;
+  cursor: pointer;
+  list-style: none;
+  user-select: none;
+  color: var(--color-text);
+  border-bottom: 1px solid transparent;
+}
+
+/* Hide native disclosure marker */
+.theme-doc-markdown details > summary::marker,
+.theme-doc-markdown details > summary::-webkit-details-marker {
+  display: none;
+  content: "";
+}
+
+/* Custom caret icon */
+.theme-doc-markdown details > summary::before {
+  content: "";
+  width: 3px;
+  height: 3px;
+  flex-shrink: 0;
+  -webkit-mask: url("/img/custom_caret.svg") no-repeat center / contain;
+  mask: url("/img/custom_caret.svg") no-repeat center / contain;
+  background: currentColor;
+  transition: transform 0.15s ease;
+  transform: rotate(0deg);
+  transform-origin: center center; /* Rotate around its own center */
+  opacity: 0.8;
+  position: relative;
+  top: 0;
+}
+
+.theme-doc-markdown details[open] > summary {
+  border-bottom-color: var(--ifm-border-color);
+}
+
+/* Rotate caret when details is open */
+.theme-doc-markdown details[open] > summary::before {
+  transform: rotate(90deg);
+  transform-origin: center center; /* Keep center rotation when open */
+}
+
+/* Body content area */
+.theme-doc-markdown details > :not(summary) {
+  padding: 1rem;
+}
+
+/* Code block inside details (optional polish) */
+.theme-doc-markdown details pre {
+  margin: 0;
+  background: color-mix(in oklab, var(--color-surface) 96%, var(--color-bg));
+  border-radius: 6px;
+}
+
+.theme-doc-markdown details > summary {
+  border-top: none !important;
+  box-shadow: none !important;
+}
+
+[class^="collapsibleContent_"],
+[class*=" collapsibleContent_"] {
+  padding-top: 0 !important;
+  border-top: none !important;
+  box-shadow: none !important;
+}
+
+[class^="collapsibleContent_"]::before,
+[class*=" collapsibleContent_"]::before {
+  display: none !important;
+  content: none !important;
+}
+
+/* ==========================================
+   13) PAGINATION
+   ========================================== */
+
+.pagination-nav__link {
+  border: 1px solid var(--ifm-border-color);
+  border-radius: var(--radius-md);
+  box-shadow: var(--ifm-global-shadow-lw);
+  background: var(--ifm-background-surface-color);
+  transition: all 0.2s ease;
+}
+
+/* Hide "Previous" and "Next" labels */
+.pagination-nav__sublabel {
+  display: none;
+}
+
+/* Main pagination link text - uppercase */
+.pagination-nav__label {
+  text-transform: uppercase;
+  font-weight: 500;
+  letter-spacing: 0.02em;
+  font-size: 1.2rem;
+  font-family: var(--font-mono);
+  color: color-mix(in oklab, #292929bf 75%, #000);
+}
+
+/* Arrow text characters (>> and <<) */
+.pagination-nav__link--prev::before,
+.pagination-nav__link--next::after {
+  color: var(--ifm-color-primary) !important;
+  font-weight: 700 !important;
+  font-size: 1.25rem !important;
+}
+
+/* If arrows are in a separate element */
+.pagination-nav__link .pagination-nav__icon,
+.pagination-nav__link--prev .pagination-nav__icon,
+.pagination-nav__link--next .pagination-nav__icon {
+  color: var(--ifm-color-primary) !important;
+}
+
+/* ==========================================
+   14) TOC (right sidebar)
+   ========================================== */
+
+/* TOC links styling */
+.table-of-contents {
+  font-family: var(--font-sans);
+  letter-spacing: 0.01rem;
+  border-left: 1px solid var(--ifm-border-color);
+  padding-left: var(--space-4);
+  font-size: 0.875rem;
+}
+
+.table-of-contents__link {
+  color: var(--color-text);
+  display: block;
+  padding: 4px 0;
+}
+
+.table-of-contents__link--active {
+  color: var(--ifm-color-primary);
+  font-weight: 500;
+}
+
+/* ==========================================
+   15) VERSION INDICATOR STYLING
+   ========================================== */
+
+/* Style the version indicator that appears above page content */
+.theme-doc-version-badge {
+  font-size: 0.75rem !important;
+  font-weight: 600 !important;
+  color: var(--ifm-color-primary) !important;
+  background: color-mix(
+    in oklab,
+    var(--ifm-color-primary) 12%,
+    transparent
+  ) !important;
+  border: 1px solid
+    color-mix(in oklab, var(--ifm-color-primary) 30%, transparent) !important;
+  border-radius: var(--radius-md) !important;
+  /* line-height: 0 !important; */
+  padding-top: 0.37rem !important;
+  display: inline-block !important;
+  text-transform: uppercase !important;
+  letter-spacing: 0.05em !important;
+  margin-top: 8px !important;
+  margin-bottom: 8px !important;
+}
+
+/* ==========================================
+   16) LOCAL SEARCH STYLING
+   ========================================== */
+
+/* Local search modal styling - integrate with design system */
+.aa-Panel {
+  border-radius: var(--radius-md);
+  box-shadow: var(--shadow-lg);
+  border: 1px solid var(--color-border);
+  background: var(--color-bg);
+}
+
+.aa-Form {
+  border-radius: var(--radius-md);
+  background: var(--color-surface);
+  border: 1px solid var(--color-border);
+}
+
+.aa-Input {
+  font-family: var(--font-sans);
+  font-size: var(--font-size-base);
+  color: var(--color-text);
+  background: transparent;
+}
+
+.aa-Item {
+  border-radius: var(--radius-md);
+  color: var(--color-text);
+}
+
+.aa-Item[aria-selected="true"] {
+  background: var(--color-surface);
+}
+
+.aa-ItemContentTitle {
+  font-family: var(--font-sans);
+  font-weight: 600;
+  color: var(--color-text);
+}
+
+.aa-ItemContentDescription {
+  font-family: var(--font-sans);
+  color: var(--color-muted);
+}
+
+/* ==========================================
+   17) NUMERED LISTS
+   ========================================== */
+
+/* === DOCUSAURUS "VitePress-style" numbered steps === */
+.steps {
+  counter-reset: step-counter;
+  list-style: none;
+  padding-left: 1.5rem;
+  margin-left: 2.5rem; /* Space for number badges and line */
+  margin-top: 1.5rem;
+  margin-bottom: 1.5rem;
+}
+.steps > ol,
+.steps > ul {
+  list-style: none;
+  margin-left: 0;
+  padding-left: 0;
+}
+.steps li {
+  counter-increment: step-counter;
+  position: relative;
+  margin-bottom: 2rem;
+  min-height: 2rem;
+}
+
+/* Number badge - dynamically aligns with first element */
+.steps li::before {
+  content: counter(step-counter);
+  position: absolute;
+  left: -4rem; /* Align with .steps margin-left */
+  top: 0.15rem; /* Slight offset for visual centering with text baseline */
+  width: 2rem;
+  min-height: 2rem;
+  border-radius: 0px;
+  background: var(--ifm-background-surface-color);
+  color: var(--color-text);
+  font-size: 1rem;
+  font-family: var(--font-mono);
+  padding: 0.3rem 0.4rem;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid var(--ifm-border-color);
+  z-index: 2;
+  flex-shrink: 0;
+  line-height: 1;
+}
+
+/* All headings inside steps get proper spacing */
+.steps li > h1,
+.steps li > h2,
+.steps li > h3,
+.steps li > h4,
+.steps li > h5,
+.steps li > h6 {
+  margin-top: 0rem !important;
+  margin-bottom: 1.5rem !important;
+  line-height: 1.3 !important;
+  padding-top: 0.7rem !important;
+} /* Specific h5 styling (most common) */
+.steps li > h5 {
+  font-size: 1.15rem !important;
+  font-weight: 600 !important;
+} /* Style for all content inside step items */
+.steps li > * {
+  margin-bottom: 1rem;
+}
+.steps li > *:last-child {
+  margin-bottom: 0;
+}
+
+/* Paragraphs right after headings - reduce space */
+.steps li > h1 + p,
+.steps li > h2 + p,
+.steps li > h3 + p,
+.steps li > h4 + p,
+.steps li > h5 + p,
+.steps li > h6 + p {
+  margin-top: -0.75rem;
+}
+
+/* First paragraph without heading */
+.steps li > p:first-child {
+  margin-top: 0;
+} /* Code blocks within steps */
+.steps li pre,
+.steps li .theme-code-block {
+  margin-top: 0.75rem;
+  margin-bottom: 0.75rem;
+}
+
+/* Lists within steps */
+.steps li ul,
+.steps li ol {
+  margin-top: 0.5rem;
+  margin-bottom: 0.5rem;
+  padding-left: 1.5rem;
+} /* Admonitions within steps */
+.steps li .theme-admonition {
+  margin-top: 0.75rem;
+  margin-bottom: 0.75rem;
+}
+
+/* ==========================================
+   18) DESIGN SYSTEM SPACING SPECIFICATIONS
+   ========================================== */
+
+/* Apply design system spacing to documentation content */
+.theme-doc-markdown h1 {
+  margin-bottom: var(--space-24px); /* H1 → First content block: 24px */
+}
+
+.theme-doc-markdown h2 {
+  margin-top: var(
+    --space-32px
+  ); /* H2 → previous section (major section break): 32px */
+  margin-bottom: var(--space-16px); /* H2 → Paragraph below: 16px */
+}
+
+.theme-doc-markdown h3 {
+  margin-bottom: var(--space-16px); /* H3 → Paragraph below: 16px */
+}
+
+.theme-doc-markdown h4 {
+  margin-bottom: var(--space-16px); /* H4 → Paragraph below: 16px */
+}
+
+/* Paragraph spacing */
+.theme-doc-markdown p {
+  margin-bottom: var(--space-16px); /* Paragraph → Paragraph: 16px */
+}
+
+/* List spacing */
+.theme-doc-markdown ul,
+.theme-doc-markdown ol {
+  margin-top: var(--space-16px); /* Paragraph → List: 16px */
+  margin-bottom: var(--space-16px); /* List → Next Paragraph: 16px */
+  padding-left: var(--space-24px); /* List indent: 24px */
+}
+
+/* H2 to large components (images, tables, diagrams) */
+.theme-doc-markdown h2 + img,
+.theme-doc-markdown h2 + table,
+.theme-doc-markdown h2 + .theme-admonition {
+  margin-top: var(--space-24px); /* H2 → large component: 24px */
+}
+
+/* Major structural reset for dramatic transitions */
+.theme-doc-markdown > *:first-child {
+  margin-top: 0;
+}
+
+/* Section breaks - ensure consistent spacing between major sections */
+.theme-doc-markdown h1 + h2 {
+  margin-top: var(--space-32px); /* Major section break */
+}

From e2069690c8113d355976218d7d17a0ca07b292da Mon Sep 17 00:00:00 2001
From: Tomas Fabrizio Orsi <torsi@fi.uba.ar>
Date: Thu, 23 Oct 2025 03:57:54 -0300
Subject: [PATCH 58/78] feat: create data and accounts dir if not already
 existing (#1301)

---
 bin/node/src/commands/store.rs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/bin/node/src/commands/store.rs b/bin/node/src/commands/store.rs
index e28a9b16f..7cc0fb040 100644
--- a/bin/node/src/commands/store.rs
+++ b/bin/node/src/commands/store.rs
@@ -177,6 +177,29 @@ impl StoreCommand {
             .unwrap_or_default();
 
         let (genesis_state, secrets) = config.into_state()?;
+
+        // Create directories if they do not already exist.
+        for directory in &[accounts_directory, data_directory] {
+            if directory.exists() {
+                let is_empty = directory.read_dir()?.next().is_none();
+                // If the directory exists and is empty, we store the files there
+                if !is_empty {
+                    anyhow::bail!(format!("{} exists but it is not empty.", directory.display()));
+                }
+            } else {
+                fs_err::create_dir(directory).with_context(|| {
+                    format!(
+                        "failed to create {} at {}",
+                        directory
+                            .file_name()
+                            .unwrap_or(std::ffi::OsStr::new("directory"))
+                            .display(),
+                        directory.display()
+                    )
+                })?;
+            }
+        }
+
         // Write the accounts to disk
         for item in secrets.as_account_files(&genesis_state) {
             let AccountFileWithName { account_file, name } = item?;

From bd74768659d181ff967658301b156ccf8274605c Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Thu, 23 Oct 2025 18:24:42 +0200
Subject: [PATCH 59/78] fix: trim MAX_NOTE_ATTEMPTS to 1 (#1307)

Reduces noise significantly on testnet, and we don't have many practical
error cases _yet_. In the future we should increment it again.
---
 crates/ntx-builder/src/state/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/ntx-builder/src/state/mod.rs b/crates/ntx-builder/src/state/mod.rs
index e99c39e5d..856448935 100644
--- a/crates/ntx-builder/src/state/mod.rs
+++ b/crates/ntx-builder/src/state/mod.rs
@@ -90,7 +90,7 @@ pub struct State {
 
 impl State {
     /// Maximum number of attempts to execute a network note.
-    const MAX_NOTE_ATTEMPTS: usize = 30;
+    const MAX_NOTE_ATTEMPTS: usize = 1;
 
     /// Load's all available network notes from the store, along with the required account states.
     #[instrument(target = COMPONENT, name = "ntx.state.load", skip_all)]

From 00782364796e826614a88059c4039722f3938218 Mon Sep 17 00:00:00 2001
From: Serge Radinovich <47865535+sergerad@users.noreply.github.com>
Date: Fri, 24 Oct 2025 11:18:06 +1300
Subject: [PATCH 60/78] feat: Update SubmitProvenTransaction RPC with tx replay
 data (#1278)

---
 CHANGELOG.md                              |   1 +
 crates/block-producer/src/server/tests.rs |  11 +-
 crates/ntx-builder/src/block_producer.rs  |   5 +-
 crates/ntx-builder/src/transaction.rs     |  17 +--
 crates/proto/src/generated/transaction.rs |   4 +
 crates/rpc/src/server/api.rs              |  36 +++++-
 crates/rpc/src/server/mod.rs              |   1 +
 crates/rpc/src/server/validator.rs        | 148 ++++++++++++++++++++++
 crates/rpc/src/tests.rs                   |   5 +-
 proto/proto/types/transaction.proto       |   3 +
 10 files changed, 213 insertions(+), 18 deletions(-)
 create mode 100644 crates/rpc/src/server/validator.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76f51789a..884246805 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - Added pagination to `SyncNotes` endpoint ([#1257](https://github.com/0xMiden/miden-node/pull/1257)).
 - Added application level error in gRPC endpoints ([#1266](https://github.com/0xMiden/miden-node/pull/1266)).
 - [BREAKING] Response type nuances of `GetAccountProof` in the public store API (#[1277](https://github.com/0xMiden/miden-node/pull/1277)).
+- Add optional `TransactionInputs` field to `SubmitProvenTransaction` endpoint for transaction re-execution (#[1278](https://github.com/0xMiden/miden-node/pull/1278)).
 
 ## v0.11.2 (2025-09-10)
 
diff --git a/crates/block-producer/src/server/tests.rs b/crates/block-producer/src/server/tests.rs
index 3619aaa5e..ad2376613 100644
--- a/crates/block-producer/src/server/tests.rs
+++ b/crates/block-producer/src/server/tests.rs
@@ -2,8 +2,7 @@ use std::time::Duration;
 
 use miden_air::{ExecutionProof, HashFunction};
 use miden_node_proto::generated::{
-    self as proto,
-    block_producer::api_client as block_producer_client,
+    self as proto, block_producer::api_client as block_producer_client,
 };
 use miden_node_store::{GenesisState, Store};
 use miden_objects::{
@@ -149,7 +148,8 @@ async fn block_producer_startup_is_robust_to_network_failures() {
 async fn send_request(
     mut client: block_producer_client::ApiClient<Channel>,
     i: u8,
-) -> Result<tonic::Response<proto::block_producer::SubmitProvenTransactionResponse>, tonic::Status> {
+) -> Result<tonic::Response<proto::block_producer::SubmitProvenTransactionResponse>, tonic::Status>
+{
     let tx = ProvenTransactionBuilder::new(
         AccountId::dummy(
             [0; 15],
@@ -167,6 +167,9 @@ async fn send_request(
     )
     .build()
     .unwrap();
-    let request = proto::transaction::ProvenTransaction { transaction: tx.to_bytes() };
+    let request = proto::transaction::ProvenTransaction {
+        transaction: tx.to_bytes(),
+        transaction_replay: None,
+    };
     client.submit_proven_transaction(request).await
 }
diff --git a/crates/ntx-builder/src/block_producer.rs b/crates/ntx-builder/src/block_producer.rs
index 92b44cf49..a29b61295 100644
--- a/crates/ntx-builder/src/block_producer.rs
+++ b/crates/ntx-builder/src/block_producer.rs
@@ -49,7 +49,10 @@ impl BlockProducerClient {
         &self,
         proven_tx: ProvenTransaction,
     ) -> Result<(), Status> {
-        let request = proto::transaction::ProvenTransaction { transaction: proven_tx.to_bytes() };
+        let request = proto::transaction::ProvenTransaction {
+            transaction: proven_tx.to_bytes(),
+            transaction_inputs: None,
+        };
 
         self.client.clone().submit_proven_transaction(request).await?;
 
diff --git a/crates/ntx-builder/src/transaction.rs b/crates/ntx-builder/src/transaction.rs
index db7ef2b3c..e0a7b7350 100644
--- a/crates/ntx-builder/src/transaction.rs
+++ b/crates/ntx-builder/src/transaction.rs
@@ -264,9 +264,8 @@ impl DataStore for NtxDataStore {
         ref_blocks: BTreeSet<BlockNumber>,
     ) -> impl FutureMaybeSend<Result<(PartialAccount, BlockHeader, PartialBlockchain), DataStoreError>>
     {
-        let account = self.account.clone();
         async move {
-            if account.id() != account_id {
+            if self.account.id() != account_id {
                 return Err(DataStoreError::AccountNotFound(account_id));
             }
 
@@ -277,7 +276,7 @@ impl DataStore for NtxDataStore {
                 None => return Err(DataStoreError::other("no reference block requested")),
             }
 
-            let partial_account = PartialAccount::from(&account);
+            let partial_account = PartialAccount::from(&self.account);
 
             Ok((partial_account, self.reference_header.clone(), self.chain_mmr.clone()))
         }
@@ -297,20 +296,19 @@ impl DataStore for NtxDataStore {
         vault_root: Word,
         vault_key: Word,
     ) -> impl FutureMaybeSend<Result<AssetWitness, DataStoreError>> {
-        let account = self.account.clone();
         async move {
-            if account.id() != account_id {
+            if self.account.id() != account_id {
                 return Err(DataStoreError::AccountNotFound(account_id));
             }
 
-            if account.vault().root() != vault_root {
+            if self.account.vault().root() != vault_root {
                 return Err(DataStoreError::Other {
                     error_msg: "vault root mismatch".into(),
                     source: None,
                 });
             }
 
-            AssetWitness::new(account.vault().open(vault_key).into()).map_err(|err| {
+            AssetWitness::new(self.account.vault().open(vault_key).into()).map_err(|err| {
                 DataStoreError::Other {
                     error_msg: "failed to open vault asset tree".into(),
                     source: Some(Box::new(err)),
@@ -325,14 +323,13 @@ impl DataStore for NtxDataStore {
         map_root: Word,
         map_key: Word,
     ) -> impl FutureMaybeSend<Result<StorageMapWitness, DataStoreError>> {
-        let account = self.account.clone();
         async move {
-            if account.id() != account_id {
+            if self.account.id() != account_id {
                 return Err(DataStoreError::AccountNotFound(account_id));
             }
 
             let mut map_witness = None;
-            for slot in account.storage().slots() {
+            for slot in self.account.storage().slots() {
                 if let StorageSlot::Map(map) = slot {
                     if map.root() == map_root {
                         map_witness = Some(map.open(&map_key));
diff --git a/crates/proto/src/generated/transaction.rs b/crates/proto/src/generated/transaction.rs
index 78ba28f31..f2ce1944c 100644
--- a/crates/proto/src/generated/transaction.rs
+++ b/crates/proto/src/generated/transaction.rs
@@ -6,6 +6,10 @@ pub struct ProvenTransaction {
     /// \[miden_objects::transaction::proven_tx::ProvenTransaction\].
     #[prost(bytes = "vec", tag = "1")]
     pub transaction: ::prost::alloc::vec::Vec<u8>,
+    /// Transaction inputs encoded using \[winter_utils::Serializable\] implementation for
+    /// \[miden_objects::transaction::TransactionInputs\].
+    #[prost(bytes = "vec", optional, tag = "2")]
+    pub transaction_inputs: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProvenTransactionBatch {
diff --git a/crates/rpc/src/server/api.rs b/crates/rpc/src/server/api.rs
index ddc1c9313..bd3527f75 100644
--- a/crates/rpc/src/server/api.rs
+++ b/crates/rpc/src/server/api.rs
@@ -26,15 +26,21 @@ use miden_objects::account::delta::AccountUpdateDetails;
 use miden_objects::batch::ProvenBatch;
 use miden_objects::block::{BlockHeader, BlockNumber};
 use miden_objects::note::{Note, NoteRecipient, NoteScript};
-use miden_objects::transaction::{OutputNote, ProvenTransaction, ProvenTransactionBuilder};
+use miden_objects::transaction::{
+    OutputNote,
+    ProvenTransaction,
+    ProvenTransactionBuilder,
+    TransactionInputs,
+};
 use miden_objects::utils::serde::{Deserializable, Serializable};
 use miden_objects::{MIN_PROOF_SECURITY_LEVEL, Word};
 use miden_tx::TransactionVerifier;
 use tonic::{IntoRequest, Request, Response, Status};
-use tracing::{debug, info, instrument};
+use tracing::{debug, info, instrument, warn};
 use url::Url;
 
 use crate::COMPONENT;
+use crate::server::validator;
 
 // RPC SERVICE
 // ================================================================================================
@@ -392,6 +398,32 @@ impl api_server::Api for RpcService {
             ))
         })?;
 
+        // If transaction inputs are provided, re-execute the transaction to validate it.
+        if let Some(tx_inputs_bytes) = &request.transaction_inputs {
+            // Deserialize the transaction inputs.
+            let tx_inputs = TransactionInputs::read_from_bytes(tx_inputs_bytes).map_err(|err| {
+                Status::invalid_argument(err.as_report_context("Invalid transaction inputs"))
+            })?;
+            // Re-execute the transaction.
+            match validator::re_execute_transaction(tx_inputs).await {
+                Ok(_executed_tx) => {
+                    debug!(
+                        target = COMPONENT,
+                        tx_id = %tx.id().to_hex(),
+                        "Transaction re-execution successful"
+                    );
+                },
+                Err(e) => {
+                    warn!(
+                        target = COMPONENT,
+                        tx_id = %tx.id().to_hex(),
+                        error = %e,
+                        "Transaction re-execution failed, but continuing with submission"
+                    );
+                },
+            }
+        }
+
         block_producer.clone().submit_proven_transaction(request).await
     }
 
diff --git a/crates/rpc/src/server/mod.rs b/crates/rpc/src/server/mod.rs
index 600f994fe..c6b6349be 100644
--- a/crates/rpc/src/server/mod.rs
+++ b/crates/rpc/src/server/mod.rs
@@ -21,6 +21,7 @@ use crate::server::health::HealthCheckLayer;
 mod accept;
 mod api;
 mod health;
+mod validator;
 
 /// The RPC server component.
 ///
diff --git a/crates/rpc/src/server/validator.rs b/crates/rpc/src/server/validator.rs
new file mode 100644
index 000000000..fc113b1ee
--- /dev/null
+++ b/crates/rpc/src/server/validator.rs
@@ -0,0 +1,148 @@
+/// NOTE: This module contains logic that will eventually be moved to the Validator component
+/// when it is added to this repository.
+use std::collections::BTreeSet;
+
+use miden_objects::Word;
+use miden_objects::account::{AccountId, PartialAccount, StorageMapWitness};
+use miden_objects::asset::AssetWitness;
+use miden_objects::block::{BlockHeader, BlockNumber};
+use miden_objects::transaction::{
+    AccountInputs,
+    ExecutedTransaction,
+    PartialBlockchain,
+    TransactionInputs,
+};
+use miden_objects::vm::FutureMaybeSend;
+use miden_tx::auth::UnreachableAuth;
+use miden_tx::{
+    DataStore,
+    DataStoreError,
+    MastForestStore,
+    TransactionExecutor,
+    TransactionExecutorError,
+    TransactionMastStore,
+};
+
+/// Executes a transaction using the provided transaction inputs.
+pub async fn re_execute_transaction(
+    tx_inputs: TransactionInputs,
+) -> Result<ExecutedTransaction, TransactionExecutorError> {
+    // Create a DataStore from the transaction inputs.
+    let data_store = TransactionInputsDataStore::new(tx_inputs.clone());
+
+    // Execute the transaction.
+    let (account, block_header, _, input_notes, tx_args) = tx_inputs.into_parts();
+    let executor: TransactionExecutor<'_, '_, _, UnreachableAuth> =
+        TransactionExecutor::new(&data_store);
+    executor
+        .execute_transaction(account.id(), block_header.block_num(), input_notes, tx_args)
+        .await
+}
+
+/// A [`DataStore`] implementation that wraps [`TransactionInputs`]
+struct TransactionInputsDataStore {
+    tx_inputs: TransactionInputs,
+    mast_store: TransactionMastStore,
+}
+
+impl TransactionInputsDataStore {
+    fn new(tx_inputs: TransactionInputs) -> Self {
+        let mast_store = TransactionMastStore::new();
+        mast_store.load_account_code(tx_inputs.account().code());
+        Self { tx_inputs, mast_store }
+    }
+}
+
+impl DataStore for TransactionInputsDataStore {
+    fn get_transaction_inputs(
+        &self,
+        account_id: AccountId,
+        _ref_blocks: BTreeSet<BlockNumber>,
+    ) -> impl FutureMaybeSend<Result<(PartialAccount, BlockHeader, PartialBlockchain), DataStoreError>>
+    {
+        async move {
+            if self.tx_inputs.account().id() != account_id {
+                return Err(DataStoreError::AccountNotFound(account_id));
+            }
+
+            Ok((
+                self.tx_inputs.account().clone(),
+                self.tx_inputs.block_header().clone(),
+                self.tx_inputs.blockchain().clone(),
+            ))
+        }
+    }
+
+    fn get_foreign_account_inputs(
+        &self,
+        foreign_account_id: AccountId,
+        _ref_block: BlockNumber,
+    ) -> impl FutureMaybeSend<Result<AccountInputs, DataStoreError>> {
+        async move { Err(DataStoreError::AccountNotFound(foreign_account_id)) }
+    }
+
+    fn get_vault_asset_witness(
+        &self,
+        account_id: AccountId,
+        vault_root: Word,
+        vault_key: Word,
+    ) -> impl FutureMaybeSend<Result<AssetWitness, DataStoreError>> {
+        async move {
+            if self.tx_inputs.account().id() != account_id {
+                return Err(DataStoreError::AccountNotFound(account_id));
+            }
+
+            if self.tx_inputs.account().vault().root() != vault_root {
+                return Err(DataStoreError::Other {
+                    error_msg: "vault root mismatch".into(),
+                    source: None,
+                });
+            }
+
+            match self.tx_inputs.account().vault().open(vault_key) {
+                Ok(vault_proof) => {
+                    AssetWitness::new(vault_proof.into()).map_err(|err| DataStoreError::Other {
+                        error_msg: "failed to open vault asset tree".into(),
+                        source: Some(err.into()),
+                    })
+                },
+                Err(err) => Err(DataStoreError::Other {
+                    error_msg: "failed to open vault".into(),
+                    source: Some(err.into()),
+                }),
+            }
+        }
+    }
+
+    fn get_storage_map_witness(
+        &self,
+        account_id: AccountId,
+        _map_root: Word,
+        _map_key: Word,
+    ) -> impl FutureMaybeSend<Result<StorageMapWitness, DataStoreError>> {
+        async move {
+            if self.tx_inputs.account().id() != account_id {
+                return Err(DataStoreError::AccountNotFound(account_id));
+            }
+
+            // For partial accounts, storage map witness is not available.
+            Err(DataStoreError::Other {
+                error_msg: "storage map witness not available with partial account state".into(),
+                source: None,
+            })
+        }
+    }
+
+    fn get_note_script(
+        &self,
+        script_root: Word,
+    ) -> impl FutureMaybeSend<Result<miden_objects::note::NoteScript, DataStoreError>> {
+        async move { Err(DataStoreError::NoteScriptNotFound(script_root)) }
+    }
+}
+
+impl MastForestStore for TransactionInputsDataStore {
+    fn get(&self, procedure_hash: &Word) -> Option<std::sync::Arc<miden_objects::MastForest>> {
+        self.mast_store.get(procedure_hash)
+    }
+}
diff --git a/crates/rpc/src/tests.rs b/crates/rpc/src/tests.rs
index 425f434ec..2fb0dfa86 100644
--- a/crates/rpc/src/tests.rs
+++ b/crates/rpc/src/tests.rs
@@ -239,7 +239,10 @@ async fn rpc_server_rejects_proven_transactions_with_invalid_commitment() {
     ))
     .build()
     .unwrap();
-    let request = proto::transaction::ProvenTransaction { transaction: tx.to_bytes() };
+    let request = proto::transaction::ProvenTransaction {
+        transaction: tx.to_bytes(),
+        transaction_inputs: None,
+    };
 
     let response = rpc_client.submit_proven_transaction(request).await;
 
diff --git a/proto/proto/types/transaction.proto b/proto/proto/types/transaction.proto
index 1c57ae10b..a600e6327 100644
--- a/proto/proto/types/transaction.proto
+++ b/proto/proto/types/transaction.proto
@@ -13,6 +13,9 @@ message ProvenTransaction {
     // Transaction encoded using [winter_utils::Serializable] implementation for
     // [miden_objects::transaction::proven_tx::ProvenTransaction].
     bytes transaction = 1;
+    // Transaction inputs encoded using [winter_utils::Serializable] implementation for
+    // [miden_objects::transaction::TransactionInputs].
+    optional bytes transaction_inputs = 2;
 }
 
 message ProvenTransactionBatch {

From 80cb4a078997001ec0e6c1076992fc90967819dc Mon Sep 17 00:00:00 2001
From: juan518munoz <62400508+juan518munoz@users.noreply.github.com>
Date: Fri, 24 Oct 2025 16:26:03 -0300
Subject: [PATCH 61/78] docs: reword proto comment (#1311)

---
 crates/proto/src/generated/rpc_store.rs | 2 +-
 proto/proto/store/rpc.proto             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/proto/src/generated/rpc_store.rs b/crates/proto/src/generated/rpc_store.rs
index 5f6f05816..0da5fdcb8 100644
--- a/crates/proto/src/generated/rpc_store.rs
+++ b/crates/proto/src/generated/rpc_store.rs
@@ -457,7 +457,7 @@ pub struct SyncTransactionsResponse {
 /// Represents a transaction record.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionRecord {
-    /// Block number in which the transaction was executed.
+    /// Block number in which the transaction was included.
     #[prost(fixed32, tag = "1")]
     pub block_num: u32,
     /// A transaction header.
diff --git a/proto/proto/store/rpc.proto b/proto/proto/store/rpc.proto
index 1bbc37f67..09214fa6f 100644
--- a/proto/proto/store/rpc.proto
+++ b/proto/proto/store/rpc.proto
@@ -506,7 +506,7 @@ message SyncTransactionsResponse {
 
 // Represents a transaction record.
 message TransactionRecord {
-    // Block number in which the transaction was executed.
+    // Block number in which the transaction was included.
     fixed32 block_num = 1;
 
     // A transaction header.

From 4dfad9b0d48c29972eee253349cfe306209447dc Mon Sep 17 00:00:00 2001
From: Serge Radinovich <47865535+sergerad@users.noreply.github.com>
Date: Thu, 30 Oct 2025 14:52:01 +1300
Subject: [PATCH 62/78] feat: Validator component (#1293)

---
 CHANGELOG.md                            |   1 +
 Cargo.lock                              |  17 ++
 Cargo.toml                              |   2 +
 bin/node/.env                           |   1 +
 bin/node/Cargo.toml                     |   1 +
 bin/node/src/commands/bundled.rs        |  19 ++
 bin/node/src/commands/mod.rs            |   2 +
 bin/node/src/commands/validator.rs      |  58 ++++
 bin/node/src/main.rs                    |   6 +
 crates/block-producer/src/server/mod.rs |   4 +-
 crates/proto/build.rs                   |   2 +
 crates/proto/src/generated/mod.rs       |   1 +
 crates/proto/src/generated/validator.rs | 379 ++++++++++++++++++++++++
 crates/validator/Cargo.toml             |  31 ++
 crates/validator/README.md              |  94 ++++++
 crates/validator/src/lib.rs             |   9 +
 crates/validator/src/server/mod.rs      | 100 +++++++
 proto/build.rs                          |   8 +
 proto/proto/validator.proto             |  31 ++
 proto/src/lib.rs                        |   7 +
 20 files changed, 771 insertions(+), 2 deletions(-)
 create mode 100644 bin/node/src/commands/validator.rs
 create mode 100644 crates/proto/src/generated/validator.rs
 create mode 100644 crates/validator/Cargo.toml
 create mode 100644 crates/validator/README.md
 create mode 100644 crates/validator/src/lib.rs
 create mode 100644 crates/validator/src/server/mod.rs
 create mode 100644 proto/proto/validator.proto

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 884246805..ed77b284c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - Added pagination to `SyncNotes` endpoint ([#1257](https://github.com/0xMiden/miden-node/pull/1257)).
 - Added application level error in gRPC endpoints ([#1266](https://github.com/0xMiden/miden-node/pull/1266)).
 - [BREAKING] Response type nuances of `GetAccountProof` in the public store API (#[1277](https://github.com/0xMiden/miden-node/pull/1277)).
+- Add `validator` crate with initial protobuf, gRPC server, and sub-command (#[1293](https://github.com/0xMiden/miden-node/pull/1293)).
 - Add optional `TransactionInputs` field to `SubmitProvenTransaction` endpoint for transaction re-execution (#[1278](https://github.com/0xMiden/miden-node/pull/1278)).
 
 ## v0.11.2 (2025-09-10)
diff --git a/Cargo.lock b/Cargo.lock
index 305182d24..64e7c0c64 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2507,6 +2507,7 @@ dependencies = [
  "miden-node-rpc",
  "miden-node-store",
  "miden-node-utils",
+ "miden-node-validator",
  "miden-objects",
  "tokio",
  "url",
@@ -2735,6 +2736,22 @@ dependencies = [
  "vergen-gitcl",
 ]
 
+[[package]]
+name = "miden-node-validator"
+version = "0.12.0"
+dependencies = [
+ "anyhow",
+ "miden-node-proto",
+ "miden-node-proto-build",
+ "miden-node-utils",
+ "tokio",
+ "tokio-stream",
+ "tonic",
+ "tonic-reflection",
+ "tower-http",
+ "tracing",
+]
+
 [[package]]
 name = "miden-objects"
 version = "0.12.0"
diff --git a/Cargo.toml b/Cargo.toml
index 5a59a71a8..e16ccf198 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,6 +13,7 @@ members = [
   "crates/store",
   "crates/test-macro",
   "crates/utils",
+  "crates/validator",
   "proto",
 ]
 
@@ -44,6 +45,7 @@ miden-node-rpc              = { path = "crates/rpc", version = "0.12" }
 miden-node-store            = { path = "crates/store", version = "0.12" }
 miden-node-test-macro       = { path = "crates/test-macro" }
 miden-node-utils            = { path = "crates/utils", version = "0.12" }
+miden-node-validator        = { path = "crates/validator", version = "0.12" }
 miden-remote-prover-client  = { path = "crates/remote-prover-client", version = "0.12" }
 
 # miden-base aka protocol dependencies. These should be updated in sync.
diff --git a/bin/node/.env b/bin/node/.env
index fcaab1c5a..75d0bbbbd 100644
--- a/bin/node/.env
+++ b/bin/node/.env
@@ -1,6 +1,7 @@
 # For more info use -h on the relevant commands:
 # miden-node bundled start -h
 MIDEN_NODE_BLOCK_PRODUCER_URL=
+MIDEN_NODE_VALIDATOR_URL=
 MIDEN_NODE_NTX_BUILDER_URL=
 MIDEN_NODE_BATCH_PROVER_URL=
 MIDEN_NODE_BLOCK_PROVER_URL=
diff --git a/bin/node/Cargo.toml b/bin/node/Cargo.toml
index 0ddaaba58..38db5e109 100644
--- a/bin/node/Cargo.toml
+++ b/bin/node/Cargo.toml
@@ -27,6 +27,7 @@ miden-node-ntx-builder    = { workspace = true }
 miden-node-rpc            = { workspace = true }
 miden-node-store          = { workspace = true }
 miden-node-utils          = { workspace = true }
+miden-node-validator      = { workspace = true }
 miden-objects             = { workspace = true }
 tokio                     = { features = ["macros", "net", "rt-multi-thread"], workspace = true }
 url                       = { workspace = true }
diff --git a/bin/node/src/commands/bundled.rs b/bin/node/src/commands/bundled.rs
index 0b03e8c89..2acc4b9ea 100644
--- a/bin/node/src/commands/bundled.rs
+++ b/bin/node/src/commands/bundled.rs
@@ -9,6 +9,7 @@ use miden_node_ntx_builder::NetworkTransactionBuilder;
 use miden_node_rpc::Rpc;
 use miden_node_store::Store;
 use miden_node_utils::grpc::UrlExt;
+use miden_node_validator::Validator;
 use tokio::net::TcpListener;
 use tokio::sync::Barrier;
 use tokio::task::JoinSet;
@@ -141,6 +142,12 @@ impl BundledCommand {
             .local_addr()
             .context("Failed to retrieve the block-producer's gRPC address")?;
 
+        let validator_address = TcpListener::bind("127.0.0.1:0")
+            .await
+            .context("Failed to bind to validator gRPC endpoint")?
+            .local_addr()
+            .context("Failed to retrieve the validator's gRPC address")?;
+
         // Store addresses for each exposed API
         let store_rpc_listener = TcpListener::bind("127.0.0.1:0")
             .await
@@ -213,6 +220,17 @@ impl BundledCommand {
             })
             .id();
 
+        let validator_id = join_set
+            .spawn({
+                async move {
+                    Validator { address: validator_address, grpc_timeout }
+                        .serve()
+                        .await
+                        .context("failed while serving validator component")
+                }
+            })
+            .id();
+
         // Start RPC component.
         let rpc_id = join_set
             .spawn(async move {
@@ -236,6 +254,7 @@ impl BundledCommand {
         let mut component_ids = HashMap::from([
             (store_id, "store"),
             (block_producer_id, "block-producer"),
+            (validator_id, "validator"),
             (rpc_id, "rpc"),
         ]);
 
diff --git a/bin/node/src/commands/mod.rs b/bin/node/src/commands/mod.rs
index 3b8d94fb9..90c91ccfc 100644
--- a/bin/node/src/commands/mod.rs
+++ b/bin/node/src/commands/mod.rs
@@ -7,8 +7,10 @@ pub mod block_producer;
 pub mod bundled;
 pub mod rpc;
 pub mod store;
+pub mod validator;
 
 const ENV_BLOCK_PRODUCER_URL: &str = "MIDEN_NODE_BLOCK_PRODUCER_URL";
+const ENV_VALIDATOR_URL: &str = "MIDEN_NODE_VALIDATOR_URL";
 const ENV_BATCH_PROVER_URL: &str = "MIDEN_NODE_BATCH_PROVER_URL";
 const ENV_BLOCK_PROVER_URL: &str = "MIDEN_NODE_BLOCK_PROVER_URL";
 const ENV_NTX_PROVER_URL: &str = "MIDEN_NODE_NTX_PROVER_URL";
diff --git a/bin/node/src/commands/validator.rs b/bin/node/src/commands/validator.rs
new file mode 100644
index 000000000..248331781
--- /dev/null
+++ b/bin/node/src/commands/validator.rs
@@ -0,0 +1,58 @@
+use std::time::Duration;
+
+use anyhow::Context;
+use miden_node_utils::grpc::UrlExt;
+use miden_node_validator::Validator;
+use url::Url;
+
+use crate::commands::{
+    DEFAULT_TIMEOUT,
+    ENV_ENABLE_OTEL,
+    ENV_VALIDATOR_URL,
+    duration_to_human_readable_string,
+};
+
+#[derive(clap::Subcommand)]
+pub enum ValidatorCommand {
+    /// Starts the validator component.
+    Start {
+        /// Url at which to serve the gRPC API.
+        #[arg(env = ENV_VALIDATOR_URL)]
+        url: Url,
+
+        /// Enables the exporting of traces for OpenTelemetry.
+        ///
+        /// This can be further configured using environment variables as defined in the official
+        /// OpenTelemetry documentation. See our operator manual for further details.
+        #[arg(long = "enable-otel", default_value_t = true, env = ENV_ENABLE_OTEL, value_name = "BOOL")]
+        enable_otel: bool,
+
+        /// Maximum duration a gRPC request is allocated before being dropped by the server.
+        #[arg(
+            long = "grpc.timeout",
+            default_value = &duration_to_human_readable_string(DEFAULT_TIMEOUT),
+            value_parser = humantime::parse_duration,
+            value_name = "DURATION"
+        )]
+        grpc_timeout: Duration,
+    },
+}
+
+impl ValidatorCommand {
+    pub async fn handle(self) -> anyhow::Result<()> {
+        let Self::Start { url, grpc_timeout, .. } = self;
+
+        let address =
+            url.to_socket().context("Failed to extract socket address from validator URL")?;
+
+        Validator { address, grpc_timeout }
+            .serve()
+            .await
+            .context("failed while serving validator component")
+    }
+
+    pub fn is_open_telemetry_enabled(&self) -> bool {
+        let Self::Start { enable_otel, .. } = self;
+        *enable_otel
+    }
+}
diff --git a/bin/node/src/main.rs b/bin/node/src/main.rs
index d20b66e57..d7a288bee 100644
--- a/bin/node/src/main.rs
+++ b/bin/node/src/main.rs
@@ -32,6 +32,10 @@ pub enum Command {
     #[command(subcommand)]
     BlockProducer(commands::block_producer::BlockProducerCommand),
 
+    // Commands related to the node's validator component.
+    #[command(subcommand)]
+    Validator(commands::validator::ValidatorCommand),
+
     /// Commands relevant to running all components in the same process.
     ///
     /// This is the recommended way to run the node at the moment.
@@ -48,6 +52,7 @@ impl Command {
             Command::Store(subcommand) => subcommand.is_open_telemetry_enabled(),
             Command::Rpc(subcommand) => subcommand.is_open_telemetry_enabled(),
             Command::BlockProducer(subcommand) => subcommand.is_open_telemetry_enabled(),
+            Command::Validator(subcommand) => subcommand.is_open_telemetry_enabled(),
             Command::Bundled(subcommand) => subcommand.is_open_telemetry_enabled(),
         } {
             OpenTelemetry::Enabled
@@ -61,6 +66,7 @@ impl Command {
             Command::Rpc(rpc_command) => rpc_command.handle().await,
             Command::Store(store_command) => store_command.handle().await,
             Command::BlockProducer(block_producer_command) => block_producer_command.handle().await,
+            Command::Validator(validator) => validator.handle().await,
             Command::Bundled(node) => node.handle().await,
         }
     }
diff --git a/crates/block-producer/src/server/mod.rs b/crates/block-producer/src/server/mod.rs
index af88910e8..39753fe83 100644
--- a/crates/block-producer/src/server/mod.rs
+++ b/crates/block-producer/src/server/mod.rs
@@ -75,8 +75,8 @@ pub struct BlockProducer {
 impl BlockProducer {
     /// Serves the block-producer RPC API, the batch-builder and the block-builder.
     ///
-    /// Note: Executes in place (i.e. not spawned) and will run indefinitely until
-    ///       a fatal error is encountered.
+    /// Executes in place (i.e. not spawned) and will run indefinitely until a fatal error is
+    /// encountered.
     #[allow(clippy::too_many_lines)]
     pub async fn serve(self) -> anyhow::Result<()> {
         info!(target: COMPONENT, endpoint=?self.block_producer_address, store=%self.store_url, "Initializing server");
diff --git a/crates/proto/build.rs b/crates/proto/build.rs
index 39e7c908c..9952f7032 100644
--- a/crates/proto/build.rs
+++ b/crates/proto/build.rs
@@ -10,6 +10,7 @@ use miden_node_proto_build::{
     store_ntx_builder_api_descriptor,
     store_rpc_api_descriptor,
     store_shared_api_descriptor,
+    validator_api_descriptor,
 };
 use miette::{Context, IntoDiagnostic};
 use tonic_build::FileDescriptorSet;
@@ -46,6 +47,7 @@ fn main() -> miette::Result<()> {
     generate_bindings(store_shared_api_descriptor(), &dst_dir)?;
     generate_bindings(block_producer_api_descriptor(), &dst_dir)?;
     generate_bindings(remote_prover_api_descriptor(), &dst_dir)?;
+    generate_bindings(validator_api_descriptor(), &dst_dir)?;
 
     generate_mod_rs(&dst_dir).into_diagnostic().wrap_err("generating mod.rs")?;
 
diff --git a/crates/proto/src/generated/mod.rs b/crates/proto/src/generated/mod.rs
index 799aa1b71..ab0567476 100644
--- a/crates/proto/src/generated/mod.rs
+++ b/crates/proto/src/generated/mod.rs
@@ -13,3 +13,4 @@ pub mod rpc;
 pub mod rpc_store;
 pub mod shared;
 pub mod transaction;
+pub mod validator;
diff --git a/crates/proto/src/generated/validator.rs b/crates/proto/src/generated/validator.rs
new file mode 100644
index 000000000..e532c2396
--- /dev/null
+++ b/crates/proto/src/generated/validator.rs
@@ -0,0 +1,379 @@
+// This file is @generated by prost-build.
+/// Represents the status of the validator.
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct ValidatorStatus {
+    /// The validator's running version.
+    #[prost(string, tag = "1")]
+    pub version: ::prost::alloc::string::String,
+    /// The validator's status.
+    #[prost(string, tag = "2")]
+    pub status: ::prost::alloc::string::String,
+}
+/// Generated client implementations.
+pub mod api_client {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
+    use tonic::codegen::*;
+    use tonic::codegen::http::Uri;
+    /// Validator API for the Validator component.
+    #[derive(Debug, Clone)]
+    pub struct ApiClient<T> {
+        inner: tonic::client::Grpc<T>,
+    }
+    impl ApiClient<tonic::transport::Channel> {
+        /// Attempt to create a new client by connecting to a given endpoint.
+        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
+        where
+            D: TryInto<tonic::transport::Endpoint>,
+            D::Error: Into<StdError>,
+        {
+            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
+            Ok(Self::new(conn))
+        }
+    }
+    impl<T> ApiClient<T>
+    where
+        T: tonic::client::GrpcService<tonic::body::Body>,
+        T::Error: Into<StdError>,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
+    {
+        pub fn new(inner: T) -> Self {
+            let inner = tonic::client::Grpc::new(inner);
+            Self { inner }
+        }
+        pub fn with_origin(inner: T, origin: Uri) -> Self {
+            let inner = tonic::client::Grpc::with_origin(inner, origin);
+            Self { inner }
+        }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> ApiClient<InterceptedService<T, F>>
+        where
+            F: tonic::service::Interceptor,
+            T::ResponseBody: Default,
+            T: tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+                Response = http::Response<
+                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
+                >,
+            >,
+            <T as tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
+        {
+            ApiClient::new(InterceptedService::new(inner, interceptor))
+        }
+        /// Compress requests with the given encoding.
+        ///
+        /// This requires the server to support it otherwise it might respond with an
+        /// error.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.send_compressed(encoding);
+            self
+        }
+        /// Enable decompressing responses.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.accept_compressed(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_decoding_message_size(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_encoding_message_size(limit);
+            self
+        }
+        /// Returns the status info of the validator.
+        pub async fn status(
+            &mut self,
+            request: impl tonic::IntoRequest<()>,
+        ) -> std::result::Result<
+            tonic::Response<super::ValidatorStatus>,
+            tonic::Status,
+        > {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static("/validator.Api/Status");
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new("validator.Api", "Status"));
+            self.inner.unary(req, path, codec).await
+        }
+        /// Submits a transaction to the validator.
+        pub async fn submit_proven_transaction(
+            &mut self,
+            request: impl tonic::IntoRequest<
+                super::super::transaction::ProvenTransaction,
+            >,
+        ) -> std::result::Result<tonic::Response<()>, tonic::Status> {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic::codec::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/validator.Api/SubmitProvenTransaction",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("validator.Api", "SubmitProvenTransaction"));
+            self.inner.unary(req, path, codec).await
+        }
+    }
+}
+/// Generated server implementations.
+pub mod api_server {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
+    use tonic::codegen::*;
+    /// Generated trait containing gRPC methods that should be implemented for use with ApiServer.
+    #[async_trait]
+    pub trait Api: std::marker::Send + std::marker::Sync + 'static {
+        /// Returns the status info of the validator.
+        async fn status(
+            &self,
+            request: tonic::Request<()>,
+        ) -> std::result::Result<tonic::Response<super::ValidatorStatus>, tonic::Status>;
+        /// Submits a transaction to the validator.
+        async fn submit_proven_transaction(
+            &self,
+            request: tonic::Request<super::super::transaction::ProvenTransaction>,
+        ) -> std::result::Result<tonic::Response<()>, tonic::Status>;
+    }
+    /// Validator API for the Validator component.
+    #[derive(Debug)]
+    pub struct ApiServer<T> {
+        inner: Arc<T>,
+        accept_compression_encodings: EnabledCompressionEncodings,
+        send_compression_encodings: EnabledCompressionEncodings,
+        max_decoding_message_size: Option<usize>,
+        max_encoding_message_size: Option<usize>,
+    }
+    impl<T> ApiServer<T> {
+        pub fn new(inner: T) -> Self {
+            Self::from_arc(Arc::new(inner))
+        }
+        pub fn from_arc(inner: Arc<T>) -> Self {
+            Self {
+                inner,
+                accept_compression_encodings: Default::default(),
+                send_compression_encodings: Default::default(),
+                max_decoding_message_size: None,
+                max_encoding_message_size: None,
+            }
+        }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> InterceptedService<Self, F>
+        where
+            F: tonic::service::Interceptor,
+        {
+            InterceptedService::new(Self::new(inner), interceptor)
+        }
+        /// Enable decompressing requests with the given encoding.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.accept_compression_encodings.enable(encoding);
+            self
+        }
+        /// Compress responses with the given encoding, if the client supports it.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.send_compression_encodings.enable(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.max_decoding_message_size = Some(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.max_encoding_message_size = Some(limit);
+            self
+        }
+    }
+    impl<T, B> tonic::codegen::Service<http::Request<B>> for ApiServer<T>
+    where
+        T: Api,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
+    {
+        type Response = http::Response<tonic::body::Body>;
+        type Error = std::convert::Infallible;
+        type Future = BoxFuture<Self::Response, Self::Error>;
+        fn poll_ready(
+            &mut self,
+            _cx: &mut Context<'_>,
+        ) -> Poll<std::result::Result<(), Self::Error>> {
+            Poll::Ready(Ok(()))
+        }
+        fn call(&mut self, req: http::Request<B>) -> Self::Future {
+            match req.uri().path() {
+                "/validator.Api/Status" => {
+                    #[allow(non_camel_case_types)]
+                    struct StatusSvc<T: Api>(pub Arc<T>);
+                    impl<T: Api> tonic::server::UnaryService<()> for StatusSvc<T> {
+                        type Response = super::ValidatorStatus;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(&mut self, request: tonic::Request<()>) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as Api>::status(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = StatusSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
+                "/validator.Api/SubmitProvenTransaction" => {
+                    #[allow(non_camel_case_types)]
+                    struct SubmitProvenTransactionSvc<T: Api>(pub Arc<T>);
+                    impl<
+                        T: Api,
+                    > tonic::server::UnaryService<
+                        super::super::transaction::ProvenTransaction,
+                    > for SubmitProvenTransactionSvc<T> {
+                        type Response = ();
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<
+                                super::super::transaction::ProvenTransaction,
+                            >,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as Api>::submit_proven_transaction(&inner, request).await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = SubmitProvenTransactionSvc(inner);
+                        let codec = tonic::codec::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
+                _ => {
+                    Box::pin(async move {
+                        let mut response = http::Response::new(
+                            tonic::body::Body::default(),
+                        );
+                        let headers = response.headers_mut();
+                        headers
+                            .insert(
+                                tonic::Status::GRPC_STATUS,
+                                (tonic::Code::Unimplemented as i32).into(),
+                            );
+                        headers
+                            .insert(
+                                http::header::CONTENT_TYPE,
+                                tonic::metadata::GRPC_CONTENT_TYPE,
+                            );
+                        Ok(response)
+                    })
+                }
+            }
+        }
+    }
+    impl<T> Clone for ApiServer<T> {
+        fn clone(&self) -> Self {
+            let inner = self.inner.clone();
+            Self {
+                inner,
+                accept_compression_encodings: self.accept_compression_encodings,
+                send_compression_encodings: self.send_compression_encodings,
+                max_decoding_message_size: self.max_decoding_message_size,
+                max_encoding_message_size: self.max_encoding_message_size,
+            }
+        }
+    }
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "validator.Api";
+    impl<T> tonic::server::NamedService for ApiServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
+    }
+}
diff --git a/crates/validator/Cargo.toml b/crates/validator/Cargo.toml
new file mode 100644
index 000000000..ebb6145b7
--- /dev/null
+++ b/crates/validator/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+authors.workspace      = true
+description            = "Miden node's validator component"
+edition.workspace      = true
+homepage.workspace     = true
+keywords               = ["miden", "node", "validator"]
+license.workspace      = true
+name                   = "miden-node-validator"
+readme                 = "README.md"
+repository.workspace   = true
+rust-version.workspace = true
+version.workspace      = true
+
+[lints]
+workspace = true
+
+[features]
+
+[dependencies]
+anyhow                 = { workspace = true }
+miden-node-proto       = { workspace = true }
+miden-node-proto-build = { features = ["internal"], workspace = true }
+miden-node-utils       = { features = ["testing"], workspace = true }
+tokio                  = { features = ["macros", "net", "rt-multi-thread"], workspace = true }
+tokio-stream           = { features = ["net"], workspace = true }
+tonic                  = { features = ["transport"], workspace = true }
+tonic-reflection       = { workspace = true }
+tower-http             = { features = ["util"], workspace = true }
+tracing                = { workspace = true }
+
+[dev-dependencies]
diff --git a/crates/validator/README.md b/crates/validator/README.md
new file mode 100644
index 000000000..5f34fa968
--- /dev/null
+++ b/crates/validator/README.md
@@ -0,0 +1,94 @@
+# Miden Validator
+
+The Miden Validator is a temporary component of the Miden node that provides transaction validation and block signing services for the Miden network. It is a core component of the network's "guardrails" that provide additional validation and assurances while the protocol is in active development.
+
+## Overview
+
+The validator component is responsible for:
+
+- **Transaction Validation**: Receiving and re-executing proven transactions from the RPC layer.
+- **Transaction Storage**: Persisting re-executed transaction data for block verification and signing.
+- **Block Validation**: Verifying blocks produced by the block producer using stored transaction information.
+- **Block Signing**: Cryptographically signing valid blocks as part of the consensus process.
+
+## Architecture
+
+The validator operates as a gRPC server and integrates with other Miden node components according to the following flow:
+
+```mermaid
+sequenceDiagram
+    participant Client
+    participant RPC
+    participant Validator
+    participant BlockProducer as Block Producer
+    participant Store
+    participant RemoteProver as Remote Prover
+
+    Note over Client, Validator: Transaction Submission
+    Client->>RPC: SubmitProvenTransaction()
+
+    Note over RPC, Validator: Transaction Validation
+
+    RPC->>RPC: Validate transaction
+    RPC->>Validator: Submit transaction
+    Validator->>Validator: Validate transaction
+    Validator->>Validator: Store transaction
+    Validator->>RPC: Accepted
+    RPC->>Client: OK
+
+
+    Note over BlockProducer, RPC: Block Building
+    RPC->>BlockProducer: Forward valid transaction
+    BlockProducer->>BlockProducer: Build proposed block
+
+    Note over BlockProducer, Validator: Block Validation
+    BlockProducer->>Validator: Proposed block
+    Validator->>Validator: Check block validity using stored tx info
+    Validator->>BlockProducer: Signed block header
+    BlockProducer->>BlockProducer: Signed Block
+    BlockProducer->>Store: Signed block
+
+    Note over Store, RemoteProver: Block Proving
+    Store->>RemoteProver: Signed block
+    RemoteProver->>Store: Block proof
+    Store->>Store: Proven block
+```
+
+## Current Status
+
+> [!WARNING]
+> The validator is currently a **work in progress** and under active development. Many features described above are not yet fully implemented.
+
+### Implemented Features
+
+- ✅ Protobuf schema and gRPC server scaffolding.
+- ✅ Transaction submission handler.
+
+### In Development
+
+- 🚧 Transaction re-execution logic.
+- 🚧 Database schema and impl.
+- 🚧 Block validation logic.
+- 🚧 Block signing logic.
+- 🚧 Integration with RPC.
+- 🚧 Integration with block producer consensus.
+
+## API
+
+The validator exposes a gRPC API with the following endpoints:
+
+- `Status()` - Returns validator health and version information.
+- `SubmitProvenTransaction()` - Validates and stores a proven transaction.
+- `ValidateBlock()` - Validates a block and returns a signature (TODO).
+
+## Configuration
+
+The validator requires:
+
+- **Address**: Network address for the gRPC server.
+- **gRPC Timeout**: Request timeout duration.
+- **Data Directory**: Path for SQLite database files.
+
+## License
+
+This project is [MIT licensed](../../LICENSE).
diff --git a/crates/validator/src/lib.rs b/crates/validator/src/lib.rs
new file mode 100644
index 000000000..d467b33fb
--- /dev/null
+++ b/crates/validator/src/lib.rs
@@ -0,0 +1,9 @@
+mod server;
+
+pub use server::Validator;
+
+// CONSTANTS
+// =================================================================================================
+
+/// The name of the validator component.
+pub const COMPONENT: &str = "miden-validator";
diff --git a/crates/validator/src/server/mod.rs b/crates/validator/src/server/mod.rs
new file mode 100644
index 000000000..2ce321290
--- /dev/null
+++ b/crates/validator/src/server/mod.rs
@@ -0,0 +1,100 @@
+use std::net::SocketAddr;
+use std::time::Duration;
+
+use anyhow::Context;
+use miden_node_proto::generated::validator::api_server;
+use miden_node_proto::generated::{self as proto};
+use miden_node_proto_build::validator_api_descriptor;
+use miden_node_utils::panic::catch_panic_layer_fn;
+use miden_node_utils::tracing::grpc::grpc_trace_fn;
+use tokio::net::TcpListener;
+use tokio_stream::wrappers::TcpListenerStream;
+use tower_http::catch_panic::CatchPanicLayer;
+use tower_http::trace::TraceLayer;
+
+use crate::COMPONENT;
+
+// VALIDATOR
+// ================================================================================
+
+/// The handle into running the gRPC validator server.
+///
+/// Facilitates the running of the gRPC server which implements the validator API.
+pub struct Validator {
+    /// The address of the validator component.
+    pub address: SocketAddr,
+    /// Server-side timeout for an individual gRPC request.
+    ///
+    /// If the handler takes longer than this duration, the server cancels the call.
+    pub grpc_timeout: Duration,
+}
+
+impl Validator {
+    /// Serves the validator RPC API.
+    ///
+    /// Executes in place (i.e. not spawned) and will run indefinitely until a fatal error is
+    /// encountered.
+    pub async fn serve(self) -> anyhow::Result<()> {
+        tracing::info!(target: COMPONENT, endpoint=?self.address, "Initializing server");
+
+        let listener = TcpListener::bind(self.address)
+            .await
+            .context("failed to bind to block producer address")?;
+
+        let reflection_service = tonic_reflection::server::Builder::configure()
+            .register_file_descriptor_set(validator_api_descriptor())
+            .build_v1()
+            .context("failed to build reflection service")?;
+
+        // This is currently required for postman to work properly because
+        // it doesn't support the new version yet.
+        //
+        // See: <https://github.com/postmanlabs/postman-app-support/issues/13120>.
+        let reflection_service_alpha = tonic_reflection::server::Builder::configure()
+            .register_file_descriptor_set(validator_api_descriptor())
+            .build_v1alpha()
+            .context("failed to build reflection service")?;
+
+        // Build the gRPC server with the API service and trace layer.
+        tonic::transport::Server::builder()
+            .layer(CatchPanicLayer::custom(catch_panic_layer_fn))
+            .layer(TraceLayer::new_for_grpc().make_span_with(grpc_trace_fn))
+            .timeout(self.grpc_timeout)
+            .add_service(api_server::ApiServer::new(ValidatorServer {}))
+            .add_service(reflection_service)
+            .add_service(reflection_service_alpha)
+            .serve_with_incoming(TcpListenerStream::new(listener))
+            .await
+            .context("failed to serve validator API")
+    }
+}
+
+// VALIDATOR SERVER
+// ================================================================================
+
+/// The underlying implementation of the gRPC validator server.
+///
+/// Implements the gRPC API for the validator.
+struct ValidatorServer {}
+
+#[tonic::async_trait]
+impl api_server::Api for ValidatorServer {
+    /// Returns the status of the validator.
+    async fn status(
+        &self,
+        _request: tonic::Request<()>,
+    ) -> Result<tonic::Response<proto::validator::ValidatorStatus>, tonic::Status> {
+        Ok(tonic::Response::new(proto::validator::ValidatorStatus {
+            version: env!("CARGO_PKG_VERSION").to_string(),
+            status: "OK".to_string(),
+        }))
+    }
+
+    /// Receives a proven transaction, then validates and stores it.
+    async fn submit_proven_transaction(
+        &self,
+        _request: tonic::Request<proto::transaction::ProvenTransaction>,
+    ) -> Result<tonic::Response<()>, tonic::Status> {
+        todo!()
+    }
+}
diff --git a/proto/build.rs b/proto/build.rs
index 0b172c706..2e90174db 100644
--- a/proto/build.rs
+++ b/proto/build.rs
@@ -12,6 +12,7 @@ const STORE_BLOCK_PRODUCER_PROTO: &str = "store/block_producer.proto";
 const STORE_SHARED_PROTO: &str = "store/shared.proto";
 const BLOCK_PRODUCER_PROTO: &str = "block_producer.proto";
 const REMOTE_PROVER_PROTO: &str = "remote_prover.proto";
+const VALIDATOR_PROTO: &str = "validator.proto";
 
 const RPC_DESCRIPTOR: &str = "rpc_file_descriptor.bin";
 const STORE_RPC_DESCRIPTOR: &str = "store_rpc_file_descriptor.bin";
@@ -20,6 +21,7 @@ const STORE_BLOCK_PRODUCER_DESCRIPTOR: &str = "store_block_producer_file_descrip
 const STORE_SHARED_DESCRIPTOR: &str = "store_shared_file_descriptor.bin";
 const BLOCK_PRODUCER_DESCRIPTOR: &str = "block_producer_file_descriptor.bin";
 const REMOTE_PROVER_DESCRIPTOR: &str = "remote_prover_file_descriptor.bin";
+const VALIDATOR_DESCRIPTOR: &str = "validator_file_descriptor.bin";
 
 /// Generates Rust protobuf bindings from .proto files.
 ///
@@ -79,5 +81,11 @@ fn main() -> miette::Result<()> {
         .into_diagnostic()
         .wrap_err("writing block producer file descriptor")?;
 
+    let validator_file_descriptor = protox::compile([VALIDATOR_PROTO], includes)?;
+    let validator_path = PathBuf::from(&out).join(VALIDATOR_DESCRIPTOR);
+    fs::write(&validator_path, validator_file_descriptor.encode_to_vec())
+        .into_diagnostic()
+        .wrap_err("writing validator file descriptor")?;
+
     Ok(())
 }
diff --git a/proto/proto/validator.proto b/proto/proto/validator.proto
new file mode 100644
index 000000000..6d4e801b4
--- /dev/null
+++ b/proto/proto/validator.proto
@@ -0,0 +1,31 @@
+// Specification of the user facing gRPC API.
+syntax = "proto3";
+package validator;
+
+import "types/transaction.proto";
+import "types/blockchain.proto";
+import "google/protobuf/empty.proto";
+
+// VALIDATOR API
+// ================================================================================================
+
+// Validator API for the Validator component.
+service Api {
+   // Returns the status info of the validator.
+   rpc Status(google.protobuf.Empty) returns (ValidatorStatus) {}
+
+   // Submits a transaction to the validator.
+   rpc SubmitProvenTransaction(transaction.ProvenTransaction) returns (google.protobuf.Empty) {}
+}
+
+// STATUS
+// ================================================================================================
+
+// Represents the status of the validator.
+message ValidatorStatus {
+    // The validator's running version.
+    string version = 1;
+
+    // The validator's status.
+    string status = 2;
+}
diff --git a/proto/src/lib.rs b/proto/src/lib.rs
index f7a96cf2f..24632115f 100644
--- a/proto/src/lib.rs
+++ b/proto/src/lib.rs
@@ -56,3 +56,10 @@ pub fn block_producer_api_descriptor() -> FileDescriptorSet {
     FileDescriptorSet::decode(&bytes[..])
         .expect("bytes should be a valid file descriptor created by build.rs")
 }
+
+/// Returns the Protobuf file descriptor for the validator API.
+pub fn validator_api_descriptor() -> FileDescriptorSet {
+    let bytes = include_bytes!(concat!(env!("OUT_DIR"), "/", "validator_file_descriptor.bin"));
+    FileDescriptorSet::decode(&bytes[..])
+        .expect("bytes should be a valid file descriptor created by build.rs")
+}

From 7f3e1686d67d56bb364916c0fcf00063c6a930b5 Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Fri, 31 Oct 2025 18:29:15 +0100
Subject: [PATCH 63/78] chore: bump miden-base (#1320)

---
 Cargo.lock                                    | 486 ++++++++----------
 bin/remote-prover/src/api/prover.rs           |   4 +-
 crates/ntx-builder/src/transaction.rs         |   4 +-
 .../src/remote_prover/tx_prover.rs            |   2 +-
 crates/rpc/src/server/validator.rs            |   4 +-
 .../store/src/db/models/queries/accounts.rs   |   9 +-
 crates/store/src/db/tests.rs                  |  12 +-
 crates/store/src/genesis/mod.rs               |   2 +-
 crates/store/src/state.rs                     |   2 +-
 9 files changed, 244 insertions(+), 281 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 64e7c0c64..ba1f2cbd1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -44,7 +44,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -200,7 +200,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -211,7 +211,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -354,9 +354,9 @@ checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
 
 [[package]]
 name = "bigdecimal"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a22f228ab7a1b23027ccc6c350b72868017af7ea8356fbdf19f8d991c690013"
+checksum = "560f42649de9fa436b73517378a147ec21f6c997a546581df4b4b31677828934"
 dependencies = [
  "autocfg",
  "libm",
@@ -388,9 +388,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.4"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 
 [[package]]
 name = "blake2"
@@ -502,9 +502,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.41"
+version = "1.2.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
+checksum = "739eb0f94557554b3ca9a86d2d37bebd49c5e6d0c1d2bda35ba5bdac830befc2"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -514,9 +514,9 @@ dependencies = [
 
 [[package]]
 name = "cf-rustracing"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb9972cb0c088499d4f4df938512cf5e1ec07b52528dec5f8148d188dd61ba9"
+checksum = "93f85c3824e4191621dec0551e3cef3d511f329da9a8990bf3e450a85651d97e"
 dependencies = [
  "backtrace",
  "rand 0.8.5",
@@ -542,9 +542,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "chacha20"
@@ -613,9 +613,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.49"
+version = "4.5.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4512b90fa68d3a9932cea5184017c5d200f5921df706d45e853537dea51508f"
+checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623"
 dependencies = [
  "clap_builder",
  "clap_derive 4.5.49",
@@ -623,9 +623,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.49"
+version = "4.5.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0025e98baa12e766c67ba13ff4695a887a1eba19569aad00a472546795bd6730"
+checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -655,7 +655,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -841,7 +841,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -855,7 +855,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -866,7 +866,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core 0.20.11",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -877,7 +877,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core 0.21.3",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -933,9 +933,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071"
+checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
 dependencies = [
  "powerfmt",
 ]
@@ -969,7 +969,7 @@ dependencies = [
  "darling 0.20.11",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -979,7 +979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -999,14 +999,14 @@ checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
 name = "diesel"
-version = "2.3.2"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8496eeb328dce26ee9d9b73275d396d9bddb433fa30106cf6056dd8c3c2764c"
+checksum = "5e7624a3bb9fffd82fff016be9a7f163d20e5a89eb8d28f9daaa6b30fff37500"
 dependencies = [
  "bigdecimal",
  "diesel_derives",
@@ -1021,15 +1021,15 @@ dependencies = [
 
 [[package]]
 name = "diesel_derives"
-version = "2.3.3"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09af0e983035368439f1383011cd87c46f41da81d0f21dc3727e2857d5a43c8e"
+checksum = "9daac6489a36e42570da165a10c424f3edcefdff70c5fd55e1847c23f3dd7562"
 dependencies = [
  "diesel_table_macro_syntax",
  "dsl_auto_type",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -1049,7 +1049,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe2444076b48641147115697648dc743c2c00b61adade0f01ce67133c7babe8c"
 dependencies = [
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -1078,7 +1078,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -1104,7 +1104,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -1174,7 +1174,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -1262,9 +1262,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "flate2"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
  "libz-ng-sys",
@@ -1390,7 +1390,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -1463,21 +1463,21 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
  "r-efi",
- "wasi 0.14.7+wasi-0.2.4",
+ "wasip2",
  "wasm-bindgen",
 ]
 
@@ -1516,7 +1516,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http",
- "indexmap 2.11.4",
+ "indexmap 2.12.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -1538,6 +1538,8 @@ dependencies = [
  "allocator-api2",
  "equivalent",
  "foldhash 0.1.5",
+ "rayon",
+ "serde",
 ]
 
 [[package]]
@@ -1785,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+checksum = "f578a71f2bfaf7ceb30b519a645ae48024b45f9eecbe060a31a004d7b4ba9462"
 dependencies = [
  "displaydoc",
  "potential_utf",
@@ -1798,9 +1800,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+checksum = "4c219b62bf5a06801012446193fdfcbd7970e876823aba4c62def2ce957dcb44"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -1811,11 +1813,10 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+checksum = "33747cecc725eebb47ac503fab725e395d50cb7889ae490a1359f130611d4cc5"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_normalizer_data",
  "icu_properties",
@@ -1826,42 +1827,38 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+checksum = "d6ce2d23e1b3c45624ba6a23e2c767e01c9680e0c0800b39c7abfff9565175d8"
 
 [[package]]
 name = "icu_properties"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+checksum = "6d70f9b6574c79f7a83ea5ce72cc88d271a3e77355c5f7748a107e751d8617fb"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "potential_utf",
  "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+checksum = "17fa55bf868e28e638ed132bcee1e5c21ba2c1e52c15e7c78b781858e7b54342"
 
 [[package]]
 name = "icu_provider"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+checksum = "f64958e359123591ae1f17a27b5fc9ebdb50c98b04e0401146154de1d8fe3e44"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
- "stable_deref_trait",
- "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
@@ -1914,9 +1911,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.11.4"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
 dependencies = [
  "equivalent",
  "hashbrown 0.16.0",
@@ -1937,17 +1934,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "io-uring"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
-dependencies = [
- "bitflags 2.9.4",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "ipnet"
 version = "2.11.0"
@@ -1972,9 +1958,9 @@ checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.1"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 
 [[package]]
 name = "itertools"
@@ -2012,7 +1998,7 @@ checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2021,15 +2007,15 @@ version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.81"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -2146,9 +2132,9 @@ checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 
 [[package]]
 name = "litemap"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 
 [[package]]
 name = "local-ip-address"
@@ -2199,7 +2185,7 @@ dependencies = [
  "quote",
  "regex-syntax",
  "rustc_version 0.4.1",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2271,9 +2257,9 @@ dependencies = [
 
 [[package]]
 name = "miden-air"
-version = "0.18.2"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b72121bacf147becf7eadcfc7bcd62d41c1e97c0d2cfdc1fd5dba2531721a8"
+checksum = "22dd34d9e3ab8a4ae367f0e5003ce64068400d0e10ce1849b1c131f5d5d5fa55"
 dependencies = [
  "miden-core",
  "thiserror 2.0.17",
@@ -2283,9 +2269,9 @@ dependencies = [
 
 [[package]]
 name = "miden-assembly"
-version = "0.18.2"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc57c069054e1f34052e60b55e7c7e066c09fe6f23fc6ca747b25b9afa9b6abd"
+checksum = "2c7be9c1d460df398afe31c58a276ff86e9b207efab7de3f1a3b8476c08187be"
 dependencies = [
  "log",
  "miden-assembly-syntax",
@@ -2297,9 +2283,9 @@ dependencies = [
 
 [[package]]
 name = "miden-assembly-syntax"
-version = "0.18.2"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b73b2c264d5f65a3f62f49a6c4dfedf37152454d6d963330bd0c5b183b2e2e6c"
+checksum = "fc560c3464478364314c3c2a1533dfe3908303ddfd155a2cebc1fc0523c08703"
 dependencies = [
  "aho-corasick",
  "lalrpop",
@@ -2320,7 +2306,7 @@ dependencies = [
 [[package]]
 name = "miden-block-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#f23bf31ffff5973969375cd5c379cb9815aa27ab"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#f14d0eb719c6e124e4101eb8a75c279edc00c29c"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2329,9 +2315,9 @@ dependencies = [
 
 [[package]]
 name = "miden-core"
-version = "0.18.2"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "996f8d8e2a4dd4eef54225f6f116c73b14f03256bc23ea5d4260fe803dd103e2"
+checksum = "da3298dd3c75b119f9031631d0087d8d7de66ae5ac4da80ba7f243d2035b2a1f"
 dependencies = [
  "enum_dispatch",
  "miden-crypto",
@@ -2356,6 +2342,7 @@ dependencies = [
  "flume",
  "getrandom 0.2.16",
  "glob",
+ "hashbrown 0.15.5",
  "hkdf",
  "k256",
  "num",
@@ -2364,6 +2351,7 @@ dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
  "rand_hc",
+ "rayon",
  "sha3",
  "thiserror 2.0.17",
  "winter-crypto",
@@ -2374,9 +2362,9 @@ dependencies = [
 
 [[package]]
 name = "miden-debug-types"
-version = "0.18.2"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c24f4040fd3a5b714f2492c723b91dffe29b1af591d15f393dd102063725cd0"
+checksum = "e230c51cae3ed84f295927ac736bca1a7668f12f187f7feeec16fbf6f50dca3e"
 dependencies = [
  "memchr",
  "miden-crypto",
@@ -2401,7 +2389,7 @@ dependencies = [
 [[package]]
 name = "miden-lib"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#f23bf31ffff5973969375cd5c379cb9815aa27ab"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#f14d0eb719c6e124e4101eb8a75c279edc00c29c"
 dependencies = [
  "Inflector",
  "fs-err",
@@ -2418,9 +2406,9 @@ dependencies = [
 
 [[package]]
 name = "miden-mast-package"
-version = "0.18.2"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c25726075ff6b7262fbb12d4914672ae6999fbeaa6e3883c9cff69348ad1c09c"
+checksum = "34898290e9ca8bff61cf2bd3c8c9b8803c244682b823b4468d5788d11b304e47"
 dependencies = [
  "derive_more",
  "miden-assembly-syntax",
@@ -2451,7 +2439,7 @@ dependencies = [
  "supports-color",
  "supports-hyperlinks",
  "supports-unicode",
- "syn 2.0.106",
+ "syn 2.0.108",
  "terminal_size 0.3.0",
  "textwrap",
  "thiserror 2.0.17",
@@ -2467,7 +2455,7 @@ checksum = "86a905f3ea65634dd4d1041a4f0fd0a3e77aa4118341d265af1a94339182222f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2476,7 +2464,7 @@ version = "0.12.0"
 dependencies = [
  "anyhow",
  "axum",
- "clap 4.5.49",
+ "clap 4.5.50",
  "humantime",
  "miden-node-proto",
  "miden-node-utils",
@@ -2498,7 +2486,7 @@ name = "miden-node"
 version = "0.12.0"
 dependencies = [
  "anyhow",
- "clap 4.5.49",
+ "clap 4.5.50",
  "figment",
  "fs-err",
  "humantime",
@@ -2554,7 +2542,7 @@ name = "miden-node-grpc-error-macro"
 version = "0.12.0"
 dependencies = [
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2654,7 +2642,7 @@ dependencies = [
  "diesel",
  "diesel_migrations",
  "hex",
- "indexmap 2.11.4",
+ "indexmap 2.12.0",
  "miden-lib",
  "miden-node-proto",
  "miden-node-proto-build",
@@ -2681,7 +2669,7 @@ dependencies = [
 name = "miden-node-stress-test"
 version = "0.12.0"
 dependencies = [
- "clap 4.5.49",
+ "clap 4.5.50",
  "fs-err",
  "futures",
  "miden-air",
@@ -2704,7 +2692,7 @@ name = "miden-node-test-macro"
 version = "0.1.0"
 dependencies = [
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2755,10 +2743,10 @@ dependencies = [
 [[package]]
 name = "miden-objects"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#f23bf31ffff5973969375cd5c379cb9815aa27ab"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#f14d0eb719c6e124e4101eb8a75c279edc00c29c"
 dependencies = [
  "bech32",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "miden-assembly",
  "miden-assembly-syntax",
  "miden-core",
@@ -2778,9 +2766,9 @@ dependencies = [
 
 [[package]]
 name = "miden-processor"
-version = "0.18.2"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943b22d826ce116cbaf8633c699e45eece83dc4c2facb1677e067b42f433aba8"
+checksum = "a66dd65cfc087c88a3a31312959fe1535ae058e0867900bdabd38c85877b58dd"
 dependencies = [
  "miden-air",
  "miden-core",
@@ -2795,9 +2783,9 @@ dependencies = [
 
 [[package]]
 name = "miden-prover"
-version = "0.18.2"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "743e27899f2a56e92da93efc287fe76a635446251dbecc2138e8b85ecdcfd0bd"
+checksum = "64af2c9163b79102a7b349d62dd02dab772e90f2e6cfd79394ee98d8b166ba86"
 dependencies = [
  "miden-air",
  "miden-debug-types",
@@ -2815,7 +2803,7 @@ dependencies = [
  "async-trait",
  "axum",
  "bytes",
- "clap 4.5.49",
+ "clap 4.5.50",
  "http",
  "humantime",
  "miden-block-prover",
@@ -2857,7 +2845,7 @@ dependencies = [
 name = "miden-remote-prover-client"
 version = "0.12.0"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "miden-node-proto-build",
  "miden-objects",
  "miden-tx",
@@ -2875,9 +2863,9 @@ dependencies = [
 
 [[package]]
 name = "miden-stdlib"
-version = "0.18.2"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cebf10ea08fc7e015e4391953e8953ed689104973084e1c4f057473017e6518"
+checksum = "5420098c2e7264d2ec248aec80e98a763f5e0941fd37203b4b08da2ec5d950ac"
 dependencies = [
  "env_logger",
  "fs-err",
@@ -2892,7 +2880,7 @@ dependencies = [
 [[package]]
 name = "miden-testing"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#f23bf31ffff5973969375cd5c379cb9815aa27ab"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#f14d0eb719c6e124e4101eb8a75c279edc00c29c"
 dependencies = [
  "anyhow",
  "itertools",
@@ -2911,7 +2899,7 @@ dependencies = [
 [[package]]
 name = "miden-tx"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#f23bf31ffff5973969375cd5c379cb9815aa27ab"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#f14d0eb719c6e124e4101eb8a75c279edc00c29c"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2926,7 +2914,7 @@ dependencies = [
 [[package]]
 name = "miden-tx-batch-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#f23bf31ffff5973969375cd5c379cb9815aa27ab"
+source = "git+https://github.com/0xMiden/miden-base?branch=next#f14d0eb719c6e124e4101eb8a75c279edc00c29c"
 dependencies = [
  "miden-objects",
  "miden-tx",
@@ -2934,9 +2922,9 @@ dependencies = [
 
 [[package]]
 name = "miden-utils-diagnostics"
-version = "0.18.2"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9da59c10824c85d585145aff6ef760f0baaaf6c4576c8ad241c281ce2e345b79"
+checksum = "c2c9186ccc6e826d35bcbf84f5a580c6401ba09b7735fc650b5ad75c61131c41"
 dependencies = [
  "miden-crypto",
  "miden-debug-types",
@@ -2947,9 +2935,9 @@ dependencies = [
 
 [[package]]
 name = "miden-utils-sync"
-version = "0.18.2"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "498138c030b4bf3808e2ef87ba1170b22d5572a8ef6a0acd5a5f10d2bfc91e72"
+checksum = "562a065032f319f4e25319e509cbedd93f1e5b2b1dbd25236ca4ec5871ebc03b"
 dependencies = [
  "lock_api",
  "loom",
@@ -2958,9 +2946,9 @@ dependencies = [
 
 [[package]]
 name = "miden-verifier"
-version = "0.18.2"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edf15bf92a77f8f7d0291b155af55bb5576fe4277d897dc035e73dc39275bace"
+checksum = "e625e7403820e6637d9d59ad16ec6258f912d1ceae4cca03958780b76629f740"
 dependencies = [
  "miden-air",
  "miden-core",
@@ -3007,7 +2995,7 @@ checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -3049,13 +3037,13 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.4"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
 dependencies = [
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "windows-sys 0.59.0",
+ "wasi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3189,7 +3177,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -3269,9 +3257,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "once_cell_polyfill"
-version = "1.70.1"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
 [[package]]
 name = "opaque-debug"
@@ -3281,11 +3269,11 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl"
-version = "0.10.73"
+version = "0.10.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
+checksum = "24ad14dd45412269e1a30f52ad8f0664f0f4f4a89ee8fe28c3b3527021ebb654"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -3302,7 +3290,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -3313,9 +3301,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.109"
+version = "0.9.110"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
+checksum = "0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2"
 dependencies = [
  "cc",
  "libc",
@@ -3444,7 +3432,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -3460,7 +3448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
 dependencies = [
  "fixedbitset",
- "indexmap 2.11.4",
+ "indexmap 2.12.0",
 ]
 
 [[package]]
@@ -3489,7 +3477,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -3791,9 +3779,9 @@ dependencies = [
 
 [[package]]
 name = "potential_utf"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
+checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
 dependencies = [
  "zerovec",
 ]
@@ -3836,7 +3824,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 dependencies = [
  "proc-macro2",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -3874,9 +3862,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
@@ -3889,7 +3877,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
  "version_check",
  "yansi",
 ]
@@ -3926,14 +3914,13 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bb0be07becd10686a0bb407298fb425360a5c44a663774406340c59a22de4ce"
+checksum = "bee689443a2bd0a16ab0348b52ee43e3b2d1b1f931c8aa5c9f8de4c86fbe8c40"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.9.4",
- "lazy_static",
+ "bitflags 2.10.0",
  "num-traits",
  "rand 0.9.2",
  "rand_chacha 0.9.0",
@@ -3970,7 +3957,7 @@ dependencies = [
  "prost",
  "prost-types",
  "regex",
- "syn 2.0.106",
+ "syn 2.0.108",
  "tempfile",
 ]
 
@@ -3984,7 +3971,7 @@ dependencies = [
  "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -4138,7 +4125,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
 ]
 
 [[package]]
@@ -4194,7 +4181,7 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
@@ -4344,7 +4331,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version 0.4.1",
- "syn 2.0.106",
+ "syn 2.0.108",
  "unicode-ident",
 ]
 
@@ -4388,7 +4375,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -4401,7 +4388,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "errno",
  "libc",
  "linux-raw-sys 0.11.0",
@@ -4410,9 +4397,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.32"
+version = "0.23.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3c25631629d034ce7cd9940adc9d45762d46de2b0f57193c4443b92c6d4d40"
+checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7"
 dependencies = [
  "log",
  "once_cell",
@@ -4425,9 +4412,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
+checksum = "9980d917ebb0c0536119ba501e90834767bffc3d60641457fd84a1f3fd337923"
 dependencies = [
  "openssl-probe",
  "rustls-pki-types",
@@ -4437,9 +4424,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a"
 dependencies = [
  "zeroize",
 ]
@@ -4544,7 +4531,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
@@ -4557,7 +4544,7 @@ version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
@@ -4626,7 +4613,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -4728,7 +4715,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -4738,7 +4725,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fa1f336066b758b7c9df34ed049c0e693a426afe2b27ff7d5b14f410ab1a132"
 dependencies = [
  "base64",
- "indexmap 2.11.4",
+ "indexmap 2.12.0",
  "rust_decimal",
 ]
 
@@ -4868,9 +4855,9 @@ dependencies = [
 
 [[package]]
 name = "sqlite-wasm-rs"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aead1c279716985b981b7940ef9b652d3f93d70a7296853c633b7ce8fa8088a"
+checksum = "54e4348c16a3d2e2a45437eff67efc5462b60443de76f61b5d0ed9111c626d9d"
 dependencies = [
  "js-sys",
  "once_cell",
@@ -4939,7 +4926,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -4982,9 +4969,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.106"
+version = "2.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5008,7 +4995,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -5017,7 +5004,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
@@ -5034,9 +5021,9 @@ dependencies = [
 
 [[package]]
 name = "target-triple"
-version = "0.1.4"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ac9aa371f599d22256307c24a9d748c041e548cbf599f35d890f9d365361790"
+checksum = "591ef38edfb78ca4771ee32cf494cb8771944bee237a9b91fc9c1424ac4b777b"
 
 [[package]]
 name = "tempfile"
@@ -5045,7 +5032,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
 dependencies = [
  "fastrand",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "once_cell",
  "rustix 1.1.2",
  "windows-sys 0.61.2",
@@ -5132,7 +5119,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -5143,7 +5130,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -5200,9 +5187,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -5210,33 +5197,30 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.47.1"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
 dependencies = [
- "backtrace",
  "bytes",
- "io-uring",
  "libc",
  "mio",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "slab",
  "socket2 0.6.1",
  "tokio-macros",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -5315,7 +5299,7 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.12.0",
  "serde_core",
  "serde_spanned 1.0.3",
  "toml_datetime 0.7.3",
@@ -5348,7 +5332,7 @@ version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.12.0",
  "serde",
  "serde_spanned 0.6.9",
  "toml_datetime 0.6.11",
@@ -5362,7 +5346,7 @@ version = "0.23.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.12.0",
  "toml_datetime 0.7.3",
  "toml_parser",
  "winnow",
@@ -5431,7 +5415,7 @@ dependencies = [
  "prost-build",
  "prost-types",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -5510,7 +5494,7 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "indexmap 2.11.4",
+ "indexmap 2.12.0",
  "pin-project-lite",
  "slab",
  "sync_wrapper",
@@ -5527,7 +5511,7 @@ version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
 dependencies = [
- "bitflags 2.9.4",
+ "bitflags 2.10.0",
  "bytes",
  "futures-util",
  "http",
@@ -5573,7 +5557,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -5686,9 +5670,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "trybuild"
-version = "1.0.111"
+version = "1.0.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ded9fdb81f30a5708920310bfcd9ea7482ff9cba5f54601f7a19a877d5c2392"
+checksum = "559b6a626c0815c942ac98d434746138b4f89ddd6a1b8cbb168c6845fb3376c5"
 dependencies = [
  "dissimilar",
  "glob",
@@ -5729,9 +5713,9 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"
 
 [[package]]
 name = "unicode-linebreak"
@@ -5803,7 +5787,7 @@ version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "js-sys",
  "wasm-bindgen",
 ]
@@ -5909,15 +5893,6 @@ version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
-[[package]]
-name = "wasi"
-version = "0.14.7+wasi-0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c"
-dependencies = [
- "wasip2",
-]
-
 [[package]]
 name = "wasip2"
 version = "1.0.1+wasi-0.2.4"
@@ -5929,9 +5904,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -5940,25 +5915,11 @@ dependencies = [
  "wasm-bindgen-shared",
 ]
 
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
- "wasm-bindgen-shared",
-]
-
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.54"
+version = "0.4.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c"
+checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5969,9 +5930,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5979,22 +5940,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
- "wasm-bindgen-backend",
+ "syn 2.0.108",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
 dependencies = [
  "unicode-ident",
 ]
@@ -6014,9 +5975,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.81"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120"
+checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6130,7 +6091,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -6141,7 +6102,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -6514,7 +6475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d31a19dae58475d019850e25b0170e94b16d382fbf6afee9c0e80fdc935e73e"
 dependencies = [
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -6583,9 +6544,9 @@ checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "writeable"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
 [[package]]
 name = "yaml-rust"
@@ -6604,11 +6565,10 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
 [[package]]
 name = "yoke"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
 dependencies = [
- "serde",
  "stable_deref_trait",
  "yoke-derive",
  "zerofrom",
@@ -6616,13 +6576,13 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
  "synstructure",
 ]
 
@@ -6643,7 +6603,7 @@ checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -6663,7 +6623,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
  "synstructure",
 ]
 
@@ -6675,9 +6635,9 @@ checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 
 [[package]]
 name = "zerotrie"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
 dependencies = [
  "displaydoc",
  "yoke",
@@ -6686,9 +6646,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.4"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -6697,13 +6657,13 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.108",
 ]
 
 [[package]]
diff --git a/bin/remote-prover/src/api/prover.rs b/bin/remote-prover/src/api/prover.rs
index a40b83341..2f4cbf6a7 100644
--- a/bin/remote-prover/src/api/prover.rs
+++ b/bin/remote-prover/src/api/prover.rs
@@ -257,7 +257,7 @@ mod test {
         ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET,
         ACCOUNT_ID_SENDER,
     };
-    use miden_objects::transaction::{ProvenTransaction, TransactionInputs};
+    use miden_objects::transaction::ProvenTransaction;
     use miden_testing::{Auth, MockChainBuilder};
     use miden_tx::utils::Serializable;
     use tokio::net::TcpListener;
@@ -323,7 +323,7 @@ mod test {
             .unwrap();
 
         let executed_transaction = Box::pin(tx_context.execute()).await.unwrap();
-        let tx_inputs = TransactionInputs::from(executed_transaction);
+        let tx_inputs = executed_transaction.tx_inputs();
 
         let request_1 = Request::new(proto::remote_prover::ProofRequest {
             proof_type: proto::remote_prover::ProofType::Transaction.into(),
diff --git a/crates/ntx-builder/src/transaction.rs b/crates/ntx-builder/src/transaction.rs
index e0a7b7350..325eaf490 100644
--- a/crates/ntx-builder/src/transaction.rs
+++ b/crates/ntx-builder/src/transaction.rs
@@ -2,7 +2,7 @@ use std::collections::BTreeSet;
 
 use miden_node_utils::tracing::OpenTelemetrySpanExt;
 use miden_objects::account::{Account, AccountId, PartialAccount, StorageMapWitness, StorageSlot};
-use miden_objects::asset::AssetWitness;
+use miden_objects::asset::{AssetWitness, VaultKey};
 use miden_objects::block::{BlockHeader, BlockNumber};
 use miden_objects::note::Note;
 use miden_objects::transaction::{
@@ -294,7 +294,7 @@ impl DataStore for NtxDataStore {
         &self,
         account_id: AccountId,
         vault_root: Word,
-        vault_key: Word,
+        vault_key: VaultKey,
     ) -> impl FutureMaybeSend<Result<AssetWitness, DataStoreError>> {
         async move {
             if self.account.id() != account_id {
diff --git a/crates/remote-prover-client/src/remote_prover/tx_prover.rs b/crates/remote-prover-client/src/remote_prover/tx_prover.rs
index 6bdc63a04..0d4995141 100644
--- a/crates/remote-prover-client/src/remote_prover/tx_prover.rs
+++ b/crates/remote-prover-client/src/remote_prover/tx_prover.rs
@@ -3,7 +3,7 @@ use alloc::string::{String, ToString};
 use alloc::sync::Arc;
 use core::time::Duration;
 
-use miden_objects::transaction::{ExecutedTransaction, ProvenTransaction, TransactionInputs};
+use miden_objects::transaction::{ProvenTransaction, TransactionInputs};
 use miden_objects::utils::{Deserializable, DeserializationError, Serializable};
 use miden_objects::vm::FutureMaybeSend;
 use miden_tx::TransactionProverError;
diff --git a/crates/rpc/src/server/validator.rs b/crates/rpc/src/server/validator.rs
index fc113b1ee..615ec5cf4 100644
--- a/crates/rpc/src/server/validator.rs
+++ b/crates/rpc/src/server/validator.rs
@@ -4,7 +4,7 @@ use std::collections::BTreeSet;
 
 use miden_objects::Word;
 use miden_objects::account::{AccountId, PartialAccount, StorageMapWitness};
-use miden_objects::asset::AssetWitness;
+use miden_objects::asset::{AssetWitness, VaultKey};
 use miden_objects::block::{BlockHeader, BlockNumber};
 use miden_objects::transaction::{
     AccountInputs,
@@ -85,7 +85,7 @@ impl DataStore for TransactionInputsDataStore {
         &self,
         account_id: AccountId,
         vault_root: Word,
-        vault_key: Word,
+        vault_key: VaultKey,
     ) -> impl FutureMaybeSend<Result<AssetWitness, DataStoreError>> {
         async move {
             if self.tx_inputs.account().id() != account_id {
diff --git a/crates/store/src/db/models/queries/accounts.rs b/crates/store/src/db/models/queries/accounts.rs
index 4f3946062..9506a8c7b 100644
--- a/crates/store/src/db/models/queries/accounts.rs
+++ b/crates/store/src/db/models/queries/accounts.rs
@@ -32,7 +32,7 @@ use miden_objects::account::{
     NonFungibleDeltaAction,
     StorageSlot,
 };
-use miden_objects::asset::{Asset, AssetVault, FungibleAsset};
+use miden_objects::asset::{Asset, AssetVault, FungibleAsset, VaultKey};
 use miden_objects::block::{BlockAccountUpdate, BlockNumber};
 use miden_objects::{Felt, Word};
 
@@ -577,10 +577,11 @@ pub(crate) fn insert_account_vault_asset(
     conn: &mut SqliteConnection,
     account_id: AccountId,
     block_num: BlockNumber,
-    vault_key: Word,
+    vault_key: VaultKey,
     asset: Option<Asset>,
 ) -> Result<usize, DatabaseError> {
-    let record = AccountAssetRowInsert::new(&account_id, &vault_key, block_num, asset, true);
+    let vault_key_word: Word = vault_key.into();
+    let record = AccountAssetRowInsert::new(&account_id, &vault_key_word, block_num, asset, true);
 
     diesel::Connection::transaction(conn, |conn| {
         // First, update any existing rows with the same (account_id, vault_key) to set
@@ -589,7 +590,7 @@ pub(crate) fn insert_account_vault_asset(
             .filter(
                 schema::account_vault_assets::account_id
                     .eq(&account_id.to_bytes())
-                    .and(schema::account_vault_assets::vault_key.eq(&vault_key.to_bytes()))
+                    .and(schema::account_vault_assets::vault_key.eq(&vault_key_word.to_bytes()))
                     .and(schema::account_vault_assets::is_latest_update.eq(true)),
             )
             .set(schema::account_vault_assets::is_latest_update.eq(false))
diff --git a/crates/store/src/db/tests.rs b/crates/store/src/db/tests.rs
index 30c3e0a8f..ab190a465 100644
--- a/crates/store/src/db/tests.rs
+++ b/crates/store/src/db/tests.rs
@@ -25,7 +25,7 @@ use miden_objects::account::{
     PublicKeyCommitment,
     StorageSlot,
 };
-use miden_objects::asset::{Asset, FungibleAsset};
+use miden_objects::asset::{Asset, FungibleAsset, VaultKey};
 use miden_objects::block::{
     BlockAccountUpdate,
     BlockHeader,
@@ -722,8 +722,8 @@ fn sync_account_vault_basic_validation() {
         .unwrap();
 
     // Create some test vault assets
-    let vault_key_1 = num_to_word(100);
-    let vault_key_2 = num_to_word(200);
+    let vault_key_1 = VaultKey::new_unchecked(num_to_word(100));
+    let vault_key_2 = VaultKey::new_unchecked(num_to_word(200));
     let fungible_asset_1 = Asset::Fungible(FungibleAsset::new(public_account_id, 1000).unwrap());
     let fungible_asset_2 = Asset::Fungible(FungibleAsset::new(public_account_id, 2000).unwrap());
 
@@ -779,8 +779,10 @@ fn sync_account_vault_basic_validation() {
     assert!(last_block >= block_from, "response block num should be higher than request");
 
     // Verify that we get the updated asset for vault_key_1
-    let vault_key_1_asset =
-        values.iter().find(|v| v.vault_key == vault_key_1 && v.block_num == block_to);
+    let vault_key_1_word: Word = vault_key_1.into();
+    let vault_key_1_asset = values
+        .iter()
+        .find(|v| v.vault_key == vault_key_1_word && v.block_num == block_to);
     assert!(vault_key_1_asset.is_some(), "should find updated vault asset");
     assert_eq!(vault_key_1_asset.unwrap().asset, Some(updated_fungible_asset_1));
 }
diff --git a/crates/store/src/genesis/mod.rs b/crates/store/src/genesis/mod.rs
index df4cbd009..760a51b4b 100644
--- a/crates/store/src/genesis/mod.rs
+++ b/crates/store/src/genesis/mod.rs
@@ -2,8 +2,8 @@ use miden_lib::transaction::TransactionKernel;
 use miden_objects::Word;
 use miden_objects::account::Account;
 use miden_objects::account::delta::AccountUpdateDetails;
+use miden_objects::block::account_tree::AccountTree;
 use miden_objects::block::{
-    AccountTree,
     BlockAccountUpdate,
     BlockHeader,
     BlockNoteTree,
diff --git a/crates/store/src/state.rs b/crates/store/src/state.rs
index 69546170f..c1e5eedbb 100644
--- a/crates/store/src/state.rs
+++ b/crates/store/src/state.rs
@@ -24,8 +24,8 @@ use miden_node_proto::domain::batch::BatchInputs;
 use miden_node_utils::ErrorReport;
 use miden_node_utils::formatting::format_array;
 use miden_objects::account::{AccountHeader, AccountId, StorageSlot};
+use miden_objects::block::account_tree::AccountTree;
 use miden_objects::block::{
-    AccountTree,
     AccountWitness,
     BlockHeader,
     BlockInputs,

From 32b0faad635b8304f9e3fd7cc1a3c575e80e23af Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Fri, 31 Oct 2025 21:06:35 +0100
Subject: [PATCH 64/78] doc: update SQL query doc parameters (#1321)

---
 .../store/src/db/models/queries/accounts.rs   |  75 +++++++++----
 .../src/db/models/queries/block_headers.rs    |  22 +++-
 crates/store/src/db/models/queries/notes.rs   | 105 ++++++++++++++----
 .../store/src/db/models/queries/nullifiers.rs |  30 ++++-
 .../src/db/models/queries/transactions.rs     |   6 +-
 5 files changed, 179 insertions(+), 59 deletions(-)

diff --git a/crates/store/src/db/models/queries/accounts.rs b/crates/store/src/db/models/queries/accounts.rs
index 9506a8c7b..c0c40e4e9 100644
--- a/crates/store/src/db/models/queries/accounts.rs
+++ b/crates/store/src/db/models/queries/accounts.rs
@@ -58,19 +58,25 @@ use crate::errors::DatabaseError;
 ///
 /// ```sql
 /// SELECT
-///     account_id,
-///     account_commitment,
-///     block_num,
-///     details
+///     accounts.account_id,
+///     accounts.account_commitment,
+///     accounts.block_num,
+///     accounts.storage,
+///     accounts.vault,
+///     accounts.nonce,
+///     accounts.code_commitment,
+///     account_codes.code
 /// FROM
 ///     accounts
+/// LEFT JOIN
+///     account_codes ON accounts.code_commitment = account_codes.code_commitment
 /// WHERE
-///     account_id = ?1;
+///     account_id = ?1
 /// ```
 pub(crate) fn select_account(
     conn: &mut SqliteConnection,
     account_id: AccountId,
-) -> Result<proto::domain::account::AccountInfo, DatabaseError> {
+) -> Result<AccountInfo, DatabaseError> {
     let raw = SelectDsl::select(
         schema::accounts::table.left_join(schema::account_codes::table.on(
             schema::accounts::code_commitment.eq(schema::account_codes::code_commitment.nullable()),
@@ -100,14 +106,20 @@ pub(crate) fn select_account(
 ///
 /// ```sql
 /// SELECT
-///     account_id,
-///     account_commitment,
-///     block_num,
-///     details
+///     accounts.account_id,
+///     accounts.account_commitment,
+///     accounts.block_num,
+///     accounts.storage,
+///     accounts.vault,
+///     accounts.nonce,
+///     accounts.code_commitment,
+///     account_codes.code
 /// FROM
 ///     accounts
+/// LEFT JOIN
+///     account_codes ON accounts.code_commitment = account_codes.code_commitment
 /// WHERE
-///     network_account_id_prefix = ?1;
+///     network_account_id_prefix = ?1
 /// ```
 pub(crate) fn select_account_by_id_prefix(
     conn: &mut SqliteConnection,
@@ -137,10 +149,21 @@ pub(crate) fn select_account_by_id_prefix(
 /// # Returns
 ///
 /// The vector with the account id and corresponding commitment, or an error.
+///
+/// # Raw SQL
+///
+/// ```sql
+/// SELECT
+///     account_id,
+///     account_commitment
+/// FROM
+///     accounts
+/// ORDER BY
+///     block_num ASC
+/// ```
 pub(crate) fn select_all_account_commitments(
     conn: &mut SqliteConnection,
 ) -> Result<Vec<(AccountId, Word)>, DatabaseError> {
-    // SELECT account_id, account_commitment FROM accounts ORDER BY block_num ASC
     let raw = SelectDsl::select(
         schema::accounts::table,
         (schema::accounts::account_id, schema::accounts::account_commitment),
@@ -174,13 +197,13 @@ pub(crate) fn select_all_account_commitments(
 /// FROM
 ///     account_vault_assets
 /// WHERE
-///     account_id = ?
-///     AND block_num >= ?
-///     AND block_num <= ?
+///     account_id = ?1
+///     AND block_num >= ?2
+///     AND block_num <= ?3
 /// ORDER BY
 ///     block_num ASC
 /// LIMIT
-///     ROW_LIMIT;
+///     ?4
 /// ```
 pub(crate) fn select_account_vault_assets(
     conn: &mut SqliteConnection,
@@ -261,7 +284,7 @@ pub(crate) fn select_account_vault_assets(
 /// WHERE
 ///     block_num > ?1 AND
 ///     block_num <= ?2 AND
-///     account_id IN rarray(?3)
+///     account_id IN (?3)
 /// ORDER BY
 ///     block_num ASC
 /// ```
@@ -295,14 +318,20 @@ pub fn select_accounts_by_block_range(
 ///
 /// ```sql
 /// SELECT
-///     account_id,
-///     account_commitment,
-///     block_num,
-///     details
+///     accounts.account_id,
+///     accounts.account_commitment,
+///     accounts.block_num,
+///     accounts.storage,
+///     accounts.vault,
+///     accounts.nonce,
+///     accounts.code_commitment,
+///     account_codes.code
 /// FROM
 ///     accounts
+/// LEFT JOIN
+///     account_codes ON accounts.code_commitment = account_codes.code_commitment
 /// ORDER BY
-///     block_num ASC;
+///     block_num ASC
 /// ```
 #[cfg(test)]
 pub(crate) fn select_all_accounts(
@@ -377,7 +406,7 @@ impl StorageMapValue {
 /// ORDER BY
 ///     block_num ASC
 /// LIMIT
-///     :row_limit;
+///     ?4
 /// ```
 /// Select account storage map values within a block range (inclusive).
 ///
diff --git a/crates/store/src/db/models/queries/block_headers.rs b/crates/store/src/db/models/queries/block_headers.rs
index c071ab34d..42ec3b0e5 100644
--- a/crates/store/src/db/models/queries/block_headers.rs
+++ b/crates/store/src/db/models/queries/block_headers.rs
@@ -28,10 +28,16 @@ use crate::db::schema;
 /// the given block height is returned.
 ///
 /// ```sql
-/// # with argument
-/// SELECT block_header FROM block_headers WHERE block_num = ?1
-/// # without
-/// SELECT block_header FROM block_headers ORDER BY block_num DESC LIMIT 1
+/// -- with argument
+/// SELECT block_num, block_header
+/// FROM block_headers
+/// WHERE block_num = ?1
+///
+/// -- without argument
+/// SELECT block_num, block_header
+/// FROM block_headers
+/// ORDER BY block_num DESC
+/// LIMIT 1
 /// ```
 pub(crate) fn select_block_header_by_block_num(
     conn: &mut SqliteConnection,
@@ -70,7 +76,9 @@ pub(crate) fn select_block_header_by_block_num(
 /// # Raw SQL
 ///
 /// ```sql
-/// SELECT block_header FROM block_headers WHERE block_num IN (?1)
+/// SELECT block_num, block_header
+/// FROM block_headers
+/// WHERE block_num IN (?1)
 /// ```
 pub fn select_block_headers(
     conn: &mut SqliteConnection,
@@ -101,7 +109,9 @@ pub fn select_block_headers(
 /// # Raw SQL
 ///
 /// ```sql
-/// SELECT block_header FROM block_headers ORDER BY block_num ASC
+/// SELECT block_num, block_header
+/// FROM block_headers
+/// ORDER BY block_num ASC
 /// ```
 pub fn select_all_block_headers(
     conn: &mut SqliteConnection,
diff --git a/crates/store/src/db/models/queries/notes.rs b/crates/store/src/db/models/queries/notes.rs
index 17c585c35..a9416281f 100644
--- a/crates/store/src/db/models/queries/notes.rs
+++ b/crates/store/src/db/models/queries/notes.rs
@@ -114,9 +114,10 @@ use crate::errors::NoteSyncError;
 ///             block_num <= ?4
 ///         ORDER BY
 ///             block_num ASC
-///     LIMIT 1) AND
-///     -- filter the block's notes and return only the ones matching the requested tags or
-/// senders     (tag IN (?1) OR sender IN (?2))
+///         LIMIT 1
+///     ) AND
+///     -- filter the block's notes and return only the ones matching the requested tags or senders
+///     (tag IN (?1) OR sender IN (?2))
 /// ```
 pub(crate) fn select_notes_since_block_by_tag_and_sender(
     conn: &mut SqliteConnection,
@@ -175,10 +176,24 @@ pub(crate) fn select_notes_since_block_by_tag_and_sender(
 /// # Raw SQL
 ///
 /// ```sql
-/// SELECT {}
+/// SELECT
+///     notes.committed_at,
+///     notes.batch_index,
+///     notes.note_index,
+///     notes.note_id,
+///     notes.note_type,
+///     notes.sender,
+///     notes.tag,
+///     notes.aux,
+///     notes.execution_hint,
+///     notes.assets,
+///     notes.inputs,
+///     notes.serial_num,
+///     notes.inclusion_path,
+///     note_scripts.script
 /// FROM notes
 /// LEFT JOIN note_scripts ON notes.script_root = note_scripts.script_root
-/// WHERE note_id IN rarray(?1),
+/// WHERE note_id IN (?1)
 /// ```
 pub(crate) fn select_notes_by_id(
     conn: &mut SqliteConnection,
@@ -211,11 +226,25 @@ pub(crate) fn select_notes_by_id(
 ///
 /// # Raw SQL
 ///
-/// ```
-/// SELECT {cols}
+/// ```sql
+/// SELECT
+///     notes.committed_at,
+///     notes.batch_index,
+///     notes.note_index,
+///     notes.note_id,
+///     notes.note_type,
+///     notes.sender,
+///     notes.tag,
+///     notes.aux,
+///     notes.execution_hint,
+///     notes.assets,
+///     notes.inputs,
+///     notes.serial_num,
+///     notes.inclusion_path,
+///     note_scripts.script
 /// FROM notes
 /// LEFT JOIN note_scripts ON notes.script_root = note_scripts.script_root
-/// ORDER BY block_num ASC
+/// ORDER BY committed_at ASC
 /// ```
 #[cfg(test)]
 pub(crate) fn select_all_notes(
@@ -252,7 +281,7 @@ pub(crate) fn select_all_notes(
 ///
 /// ```sql
 /// SELECT
-///     block_num,
+///     committed_at,
 ///     note_id,
 ///     batch_index,
 ///     note_index,
@@ -262,7 +291,7 @@ pub(crate) fn select_all_notes(
 /// WHERE
 ///     note_id IN (?1)
 /// ORDER BY
-///     block_num ASC
+///     committed_at ASC
 /// ```
 pub(crate) fn select_note_inclusion_proofs(
     conn: &mut SqliteConnection,
@@ -305,12 +334,12 @@ pub(crate) fn select_note_inclusion_proofs(
 ///
 /// ```sql
 /// SELECT
-///     root,
+///     script_root,
 ///     script
 /// FROM
 ///     note_scripts
 /// WHERE
-///     root = ?1;
+///     script_root = ?1
 /// ```
 pub(crate) fn select_note_script_by_root(
     conn: &mut SqliteConnection,
@@ -339,14 +368,29 @@ pub(crate) fn select_note_script_by_root(
 ///
 /// # Raw SQL
 ///
-/// ```
-/// SELECT *, rowid
+/// ```sql
+/// SELECT
+///     notes.committed_at,
+///     notes.batch_index,
+///     notes.note_index,
+///     notes.note_id,
+///     notes.note_type,
+///     notes.sender,
+///     notes.tag,
+///     notes.aux,
+///     notes.execution_hint,
+///     notes.assets,
+///     notes.inputs,
+///     notes.serial_num,
+///     notes.inclusion_path,
+///     note_scripts.script,
+///     notes.rowid
 /// FROM notes
 /// LEFT JOIN note_scripts ON notes.script_root = note_scripts.script_root
 /// WHERE
-///     execution_mode = 0 AND consumed_block_num = NULL AND rowid >= ?
-/// ORDER BY rowid
-/// LIMIT ?
+///     execution_mode = 0 AND consumed_at IS NULL AND notes.rowid >= ?1
+/// ORDER BY notes.rowid ASC
+/// LIMIT ?2
 /// ```
 #[allow(
     clippy::cast_sign_loss,
@@ -437,15 +481,30 @@ pub(crate) fn unconsumed_network_notes(
 /// statements.
 ///
 /// ```sql
-/// SELECT *, rowid
+/// SELECT
+///     notes.committed_at,
+///     notes.batch_index,
+///     notes.note_index,
+///     notes.note_id,
+///     notes.note_type,
+///     notes.sender,
+///     notes.tag,
+///     notes.aux,
+///     notes.execution_hint,
+///     notes.assets,
+///     notes.inputs,
+///     notes.serial_num,
+///     notes.inclusion_path,
+///     note_scripts.script,
+///     notes.rowid
 /// FROM notes
 /// LEFT JOIN note_scripts ON notes.script_root = note_scripts.script_root
 /// WHERE
-///  execution_mode = 0 AND tag = ?1 AND
-///  block_num <= ?2 AND
-///  (consumed_block_num IS NULL OR consumed_block_num > ?2) AND rowid >= ?3
-/// ORDER BY rowid
-/// LIMIT ?
+///     execution_mode = 0 AND tag = ?1 AND
+///     committed_at <= ?2 AND
+///     (consumed_at IS NULL OR consumed_at > ?2) AND notes.rowid >= ?3
+/// ORDER BY notes.rowid ASC
+/// LIMIT ?4
 /// ```
 #[allow(
     clippy::cast_sign_loss,
diff --git a/crates/store/src/db/models/queries/nullifiers.rs b/crates/store/src/db/models/queries/nullifiers.rs
index 9670ae578..a81ca050e 100644
--- a/crates/store/src/db/models/queries/nullifiers.rs
+++ b/crates/store/src/db/models/queries/nullifiers.rs
@@ -51,10 +51,12 @@ use crate::db::{NullifierInfo, schema};
 ///     nullifiers
 /// WHERE
 ///     nullifier_prefix IN (?1) AND
-///     block_num >= ?2
+///     block_num >= ?2 AND
 ///     block_num <= ?3
 /// ORDER BY
 ///     block_num ASC
+/// LIMIT
+///     ?4
 /// ```
 pub(crate) fn select_nullifiers_by_prefix(
     conn: &mut SqliteConnection,
@@ -114,10 +116,21 @@ pub(crate) fn select_nullifiers_by_prefix(
 /// # Returns
 ///
 /// A vector with nullifiers and the block height at which they were created, or an error.
+///
+/// # Raw SQL
+///
+/// ```sql
+/// SELECT
+///     nullifier,
+///     block_num
+/// FROM
+///     nullifiers
+/// ORDER BY
+///     block_num ASC
+/// ```
 pub(crate) fn select_all_nullifiers(
     conn: &mut SqliteConnection,
 ) -> Result<Vec<NullifierInfo>, DatabaseError> {
-    // SELECT nullifier, block_num FROM nullifiers ORDER BY block_num ASC
     let nullifiers_raw =
         SelectDsl::select(schema::nullifiers::table, NullifierWithoutPrefixRawRow::as_select())
             .load::<NullifierWithoutPrefixRawRow>(conn)?;
@@ -139,14 +152,23 @@ pub(crate) fn select_all_nullifiers(
 ///
 /// The [`SqliteConnection`] object is not consumed. It's up to the caller to commit or rollback the
 /// transaction.
+///
+/// # Raw SQL
+///
+/// ```sql
+/// UPDATE notes
+/// SET consumed_at = ?1
+/// WHERE nullifier IN (?2);
+///
+/// INSERT INTO nullifiers (nullifier, nullifier_prefix, block_num)
+/// VALUES (?1, ?2, ?3)
+/// ```
 pub(crate) fn insert_nullifiers_for_block(
     conn: &mut SqliteConnection,
     nullifiers: &[Nullifier],
     block_num: BlockNumber,
 ) -> Result<usize, DatabaseError> {
     QueryParamNullifierLimit::check(nullifiers.len())?;
-
-    // UPDATE notes SET consumed = TRUE WHERE nullifier IN rarray(?1)
     let serialized_nullifiers =
         Vec::<Vec<u8>>::from_iter(nullifiers.iter().map(Nullifier::to_bytes));
 
diff --git a/crates/store/src/db/models/queries/transactions.rs b/crates/store/src/db/models/queries/transactions.rs
index 73672efb9..b011c2d72 100644
--- a/crates/store/src/db/models/queries/transactions.rs
+++ b/crates/store/src/db/models/queries/transactions.rs
@@ -46,7 +46,7 @@ use crate::db::{TransactionSummary, schema};
 /// WHERE
 ///     block_num > ?1 AND
 ///     block_num <= ?2 AND
-///     account_id IN rarray(?3)
+///     account_id IN (?3)
 /// ORDER BY
 ///     transaction_id ASC
 /// ```
@@ -257,10 +257,10 @@ impl TransactionSummaryRowInsert {
 /// WHERE
 ///     block_num >= ?1
 ///     AND block_num <= ?2
-///     AND account_id IN rarray(?3)
+///     AND account_id IN (?3)
 ///     AND (
 ///         block_num > ?4 OR (block_num = ?4 AND transaction_id > ?5)
-///     )  -- cursor-based pagination
+///     )
 /// ORDER BY
 ///     block_num ASC,
 ///     transaction_id ASC

From a17b216d98ea6a930551d2073e783b2e3241f012 Mon Sep 17 00:00:00 2001
From: Tomas <tomas.arrachea@lambdaclass.com>
Date: Mon, 3 Nov 2025 20:49:32 -0300
Subject: [PATCH 65/78] chore: update dependencies (#1319)

---
 Cargo.lock                                    | 303 ++++++-----
 Cargo.toml                                    |  15 +-
 bin/network-monitor/Cargo.toml                |   2 +-
 bin/remote-prover/Cargo.toml                  |  26 +-
 bin/remote-prover/build.rs                    |   6 +-
 .../src/generated/remote_prover.rs            | 490 +++++++++---------
 bin/remote-prover/src/proxy/update_workers.rs |   5 +-
 crates/block-producer/src/mempool/tests.rs    |   2 +-
 crates/proto/Cargo.toml                       |   6 +-
 crates/proto/build.rs                         |   8 +-
 crates/proto/src/generated/account.rs         |  10 +-
 crates/proto/src/generated/block_producer.rs  |  36 +-
 .../src/generated/block_producer_store.rs     |  26 +-
 crates/proto/src/generated/blockchain.rs      |  12 +-
 crates/proto/src/generated/note.rs            |  12 +-
 .../proto/src/generated/ntx_builder_store.rs  |  28 +-
 crates/proto/src/generated/primitives.rs      |   6 +-
 crates/proto/src/generated/remote_prover.rs   | 490 +++++++++---------
 crates/proto/src/generated/rpc.rs             |  78 +--
 crates/proto/src/generated/rpc_store.rs       |  80 +--
 crates/proto/src/generated/shared.rs          |   2 +-
 crates/proto/src/generated/transaction.rs     |   8 +-
 crates/proto/src/generated/validator.rs       |  10 +-
 crates/remote-prover-client/Cargo.toml        |  17 +-
 crates/remote-prover-client/build.rs          |   6 +-
 .../generated/nostd/remote_prover.rs          |  28 +-
 .../generated/std/remote_prover.rs            |  28 +-
 crates/rpc/Cargo.toml                         |   4 +-
 crates/store/Cargo.toml                       |   2 +-
 crates/utils/Cargo.toml                       |  10 +-
 crates/utils/src/tracing/grpc.rs              |   2 +-
 proto/Cargo.toml                              |   7 +-
 proto/build.rs                                |   2 +-
 proto/src/lib.rs                              |   2 +-
 34 files changed, 904 insertions(+), 865 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ba1f2cbd1..f9db50bdc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -52,9 +52,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
@@ -613,9 +613,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.50"
+version = "4.5.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623"
+checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5"
 dependencies = [
  "clap_builder",
  "clap_derive 4.5.49",
@@ -623,9 +623,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.50"
+version = "4.5.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0"
+checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1753,7 +1753,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.6.1",
+ "socket2",
  "system-configuration",
  "tokio",
  "tower-service",
@@ -1787,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f578a71f2bfaf7ceb30b519a645ae48024b45f9eecbe060a31a004d7b4ba9462"
+checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
 dependencies = [
  "displaydoc",
  "potential_utf",
@@ -1800,9 +1800,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c219b62bf5a06801012446193fdfcbd7970e876823aba4c62def2ce957dcb44"
+checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -1813,9 +1813,9 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33747cecc725eebb47ac503fab725e395d50cb7889ae490a1359f130611d4cc5"
+checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
 dependencies = [
  "icu_collections",
  "icu_normalizer_data",
@@ -1827,15 +1827,15 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6ce2d23e1b3c45624ba6a23e2c767e01c9680e0c0800b39c7abfff9565175d8"
+checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
 
 [[package]]
 name = "icu_properties"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d70f9b6574c79f7a83ea5ce72cc88d271a3e77355c5f7748a107e751d8617fb"
+checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
 dependencies = [
  "icu_collections",
  "icu_locale_core",
@@ -1847,15 +1847,15 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17fa55bf868e28e638ed132bcee1e5c21ba2c1e52c15e7c78b781858e7b54342"
+checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
 
 [[package]]
 name = "icu_provider"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64958e359123591ae1f17a27b5fc9ebdb50c98b04e0401146154de1d8fe3e44"
+checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
@@ -2236,9 +2236,9 @@ checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
 
 [[package]]
 name = "mediatype"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f490ea2ae935dd8ac89c472d4df28c7f6b87cc20767e1b21fd5ed6a16e7f61e4"
+checksum = "120fa187be19d9962f0926633453784691731018a2bf936ddb4e29101b79c4a7"
 
 [[package]]
 name = "memchr"
@@ -2464,7 +2464,7 @@ version = "0.12.0"
 dependencies = [
  "anyhow",
  "axum",
- "clap 4.5.50",
+ "clap 4.5.51",
  "humantime",
  "miden-node-proto",
  "miden-node-utils",
@@ -2486,7 +2486,7 @@ name = "miden-node"
 version = "0.12.0"
 dependencies = [
  "anyhow",
- "clap 4.5.50",
+ "clap 4.5.51",
  "figment",
  "fs-err",
  "humantime",
@@ -2581,11 +2581,10 @@ dependencies = [
  "miette",
  "proptest",
  "prost",
- "prost-build",
- "protox",
  "thiserror 2.0.17",
  "tonic",
- "tonic-build",
+ "tonic-prost",
+ "tonic-prost-build",
  "url",
 ]
 
@@ -2595,9 +2594,8 @@ version = "0.12.0"
 dependencies = [
  "fs-err",
  "miette",
- "prost",
  "protox",
- "tonic-build",
+ "tonic-prost-build",
 ]
 
 [[package]]
@@ -2658,7 +2656,7 @@ dependencies = [
  "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
- "toml 0.8.23",
+ "toml 0.9.8",
  "tonic",
  "tonic-reflection",
  "tower-http",
@@ -2669,7 +2667,7 @@ dependencies = [
 name = "miden-node-stress-test"
 version = "0.12.0"
 dependencies = [
- "clap 4.5.50",
+ "clap 4.5.51",
  "fs-err",
  "futures",
  "miden-air",
@@ -2803,7 +2801,7 @@ dependencies = [
  "async-trait",
  "axum",
  "bytes",
- "clap 4.5.50",
+ "clap 4.5.51",
  "http",
  "humantime",
  "miden-block-prover",
@@ -2822,8 +2820,6 @@ dependencies = [
  "pingora-proxy",
  "prometheus 0.14.0",
  "prost",
- "prost-build",
- "protox",
  "reqwest",
  "semver 1.0.27",
  "serde",
@@ -2832,8 +2828,9 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tonic",
- "tonic-build",
  "tonic-health",
+ "tonic-prost",
+ "tonic-prost-build",
  "tonic-web",
  "tower-http",
  "tracing",
@@ -2851,12 +2848,11 @@ dependencies = [
  "miden-tx",
  "miette",
  "prost",
- "prost-build",
- "protox",
  "thiserror 2.0.17",
  "tokio",
  "tonic",
- "tonic-build",
+ "tonic-prost",
+ "tonic-prost-build",
  "tonic-web",
  "tonic-web-wasm-client",
 ]
@@ -3313,9 +3309,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf416e4cb72756655126f7dd7bb0af49c674f4c1b9903e80c009e0c37e552e6"
+checksum = "b84bcd6ae87133e903af7ef497404dda70c60d0ea14895fc8a5e6722754fc2a0"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -3327,9 +3323,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-otlp"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbee664a43e07615731afc539ca60c6d9f1a9425e25ca09c57bc36c87c55852b"
+checksum = "7a2366db2dca4d2ad033cad11e6ee42844fd727007af5ad04a1730f4cb8163bf"
 dependencies = [
  "http",
  "opentelemetry",
@@ -3343,21 +3339,22 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-proto"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e046fd7660710fe5a05e8748e70d9058dc15c94ba914e7c4faa7c728f0e8ddc"
+checksum = "a7175df06de5eaee9909d4805a3d07e28bb752c34cab57fa9cff549da596b30f"
 dependencies = [
  "opentelemetry",
  "opentelemetry_sdk",
  "prost",
  "tonic",
+ "tonic-prost",
 ]
 
 [[package]]
 name = "opentelemetry_sdk"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11f644aa9e5e31d11896e024305d7e3c98a88884d9f8919dbf37a9991bc47a4b"
+checksum = "e14ae4f5991976fd48df6d843de219ca6d31b01daaab2dad5af2badeded372bd"
 dependencies = [
  "futures-channel",
  "futures-executor",
@@ -3365,7 +3362,6 @@ dependencies = [
  "opentelemetry",
  "percent-encoding",
  "rand 0.9.2",
- "serde_json",
  "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
@@ -3494,9 +3490,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pingora"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d793bb3f61d3aacb02b10d0e32724f5b4f1d3fcf2f51efc4188a1a6a5810606"
+checksum = "1a1f02a6347e81953ab831fdcf090a028db12d67ec3badf47831d1299dac6e20"
 dependencies = [
  "pingora-core",
  "pingora-http",
@@ -3507,9 +3503,9 @@ dependencies = [
 
 [[package]]
 name = "pingora-cache"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb4b85ca73955092e7e2a6654304f6ee7868d38792f442733a197cbb3ac5f75"
+checksum = "7ef622051fbb2cb98a524df3a8112f02d0919ccda600a44d705ec550f1a28fe2"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3532,6 +3528,7 @@ dependencies = [
  "pingora-http",
  "pingora-lru",
  "pingora-timeout",
+ "rand 0.8.5",
  "regex",
  "rmp",
  "rmp-serde",
@@ -3542,9 +3539,9 @@ dependencies = [
 
 [[package]]
 name = "pingora-core"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2298292e2dbd156294bcc8dd2ec34507277c78bab31bfe3aecc1cab9b1f91dff"
+checksum = "76f63d3f67d99c95a1f85623fc43242fd644dd12ccbaa18c38a54e1580c6846a"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3578,7 +3575,7 @@ dependencies = [
  "serde",
  "serde_yaml",
  "sfv",
- "socket2 0.6.1",
+ "socket2",
  "strum",
  "strum_macros",
  "tokio",
@@ -3590,15 +3587,15 @@ dependencies = [
 
 [[package]]
 name = "pingora-error"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca838db1ee9beef844d6db7e2e85e0006b50bb6bf8f19c96fb64bf2567e59039"
+checksum = "52119570d3f4644e09654ad24df2b7d851bf12eaa8c4148b4674c7f90916598e"
 
 [[package]]
 name = "pingora-header-serde"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "659b46bad022e1b4a3ee6b12739e4e597ccca5e3652c9cbfb06155686c94adbe"
+checksum = "252a16def05c7adbbdda776e87b2be36e9481c8a77249207a2f3b563e8933b35"
 dependencies = [
  "bytes",
  "http",
@@ -3612,9 +3609,9 @@ dependencies = [
 
 [[package]]
 name = "pingora-http"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f15f9fa5ae034435adfe2b94620e25dee7b0859c2460acec499163de3d299f1"
+checksum = "5a3542fd0fd0a83212882c5066ae739ba51804f20d624ff7e12ec85113c5c89a"
 dependencies = [
  "bytes",
  "http",
@@ -3623,27 +3620,27 @@ dependencies = [
 
 [[package]]
 name = "pingora-ketama"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672fab42518ae10cbcbed2e4532c46744b222425c12886d2e6ae2ffd64b1e74"
+checksum = "3f5dd8546b1874d5cfca594375c1cfb852c3dffd4f060428fa031a6e790dea18"
 dependencies = [
  "crc32fast",
 ]
 
 [[package]]
 name = "pingora-limits"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a719a8cb5558ca06bd6076c97b8905d500ea556da89e132ba53d4272844f95b9"
+checksum = "b93c897e8cc04ff0d077ee2a655142910618222aeefc83f7f99f5b9fc59ccb13"
 dependencies = [
  "ahash",
 ]
 
 [[package]]
 name = "pingora-load-balancing"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c6fe587777e321fbead02352aa089e9965f6e3b87a944d12d7dfd3717fac4b1"
+checksum = "4b5bb0314830a64b73b50b3782f3089f87947b61b4324c804d6f8d4ff9ce1c70"
 dependencies = [
  "arc-swap",
  "async-trait",
@@ -3663,9 +3660,9 @@ dependencies = [
 
 [[package]]
 name = "pingora-lru"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f1c33f6ce9ca9b8e81190796f7d4d543d1ab2a310097d884ebe48ce5d33c4d"
+checksum = "ba89e4400cb978f0d7be1c14bd7ab4168c8e2c00d97ff19f964fc0048780237c"
 dependencies = [
  "arrayvec",
  "hashbrown 0.16.0",
@@ -3675,9 +3672,9 @@ dependencies = [
 
 [[package]]
 name = "pingora-pool"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a74589c2e4f089d00fde78030e2d51b44406341e1e43b0bdb5456b93b4459937"
+checksum = "996c574f30a6e1ad10b47ac1626a86e0e47d5075953dd049d60df16ba5f7076e"
 dependencies = [
  "crossbeam-queue",
  "log",
@@ -3690,9 +3687,9 @@ dependencies = [
 
 [[package]]
 name = "pingora-proxy"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d12839bb50f9716db46b6bafc2ea9cf0de504dee857ff79d7a96dc64f46063a"
+checksum = "6c4097fd2639905bf5b81f3618551cd826d5e03aac063e17fd7a4137f19c1a5b"
 dependencies = [
  "async-trait",
  "bytes",
@@ -3706,15 +3703,16 @@ dependencies = [
  "pingora-core",
  "pingora-error",
  "pingora-http",
+ "rand 0.8.5",
  "regex",
  "tokio",
 ]
 
 [[package]]
 name = "pingora-runtime"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e720a120466e8f61a64384deff6d7a52de6df6a4c54b0046c70c9cf0eaad1092"
+checksum = "8ccc165021cf55a39b9e760121b22c4260b17a0b2c530d5b93092fc5bc765b94"
 dependencies = [
  "once_cell",
  "rand 0.8.5",
@@ -3724,9 +3722,9 @@ dependencies = [
 
 [[package]]
 name = "pingora-timeout"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fd4538cb5a3ae793c63126fc21e77e20778742931e31a5ac64e75b3ca10d176"
+checksum = "548cd21d41611c725827677937e68f2cd008bbfa09f3416d3fbad07e1e42f6d7"
 dependencies = [
  "once_cell",
  "parking_lot",
@@ -3933,9 +3931,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.13.5"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
+checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -3943,9 +3941,9 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.13.5"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
+checksum = "ac6c3320f9abac597dcbc668774ef006702672474aad53c6d596b62e487b40b1"
 dependencies = [
  "heck 0.5.0",
  "itertools",
@@ -3956,6 +3954,8 @@ dependencies = [
  "prettyplease",
  "prost",
  "prost-types",
+ "pulldown-cmark",
+ "pulldown-cmark-to-cmark",
  "regex",
  "syn 2.0.108",
  "tempfile",
@@ -3963,9 +3963,9 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.13.5"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
+checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425"
 dependencies = [
  "anyhow",
  "itertools",
@@ -3976,9 +3976,9 @@ dependencies = [
 
 [[package]]
 name = "prost-reflect"
-version = "0.15.3"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37587d5a8a1b3dc9863403d084fc2254b91ab75a702207098837950767e2260b"
+checksum = "89a3ac73ec9a9118131a4594c9d336631a07852220a1d0ae03ee36b04503a063"
 dependencies = [
  "logos",
  "miette",
@@ -3988,9 +3988,9 @@ dependencies = [
 
 [[package]]
 name = "prost-types"
-version = "0.13.5"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
+checksum = "b9b4db3d6da204ed77bb26ba83b6122a73aeb2e87e25fbf7ad2e84c4ccbf8f72"
 dependencies = [
  "prost",
 ]
@@ -4023,9 +4023,9 @@ dependencies = [
 
 [[package]]
 name = "protox"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "424c2bd294b69c49b949f3619362bc3c5d28298cd1163b6d1a62df37c16461aa"
+checksum = "8555716f64c546306ddf3383065dc40d4232609e79e0a4c50e94e87d54f30fb4"
 dependencies = [
  "bytes",
  "miette",
@@ -4038,9 +4038,9 @@ dependencies = [
 
 [[package]]
 name = "protox-parse"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57927f9dbeeffcce7192404deee6157a640cbb3fe8ac11eabbe571565949ab75"
+checksum = "072eee358134396a4643dff81cfff1c255c9fbd3fb296be14bdb6a26f9156366"
 dependencies = [
  "logos",
  "miette",
@@ -4048,6 +4048,26 @@ dependencies = [
  "thiserror 2.0.17",
 ]
 
+[[package]]
+name = "pulldown-cmark"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0"
+dependencies = [
+ "bitflags 2.10.0",
+ "memchr",
+ "unicase",
+]
+
+[[package]]
+name = "pulldown-cmark-to-cmark"
+version = "21.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5b6a0769a491a08b31ea5c62494a8f144ee0987d86d670a8af4df1e1b7cde75"
+dependencies = [
+ "pulldown-cmark",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -4307,21 +4327,20 @@ dependencies = [
 
 [[package]]
 name = "rstest"
-version = "0.25.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fc39292f8613e913f7df8fa892b8944ceb47c247b78e1b1ae2f09e019be789d"
+checksum = "f5a3193c063baaa2a95a33f03035c8a72b83d97a54916055ba22d35ed3839d49"
 dependencies = [
  "futures-timer",
  "futures-util",
  "rstest_macros",
- "rustc_version 0.4.1",
 ]
 
 [[package]]
 name = "rstest_macros"
-version = "0.25.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f168d99749d307be9de54d23fd226628d99768225ef08f6ffb52e0182a27746"
+checksum = "9c845311f0ff7951c5506121a9ad75aec44d083c31583b2ea5a30bcb0b0abba0"
 dependencies = [
  "cfg-if",
  "glob",
@@ -4433,9 +4452,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.7"
+version = "0.103.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf"
+checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -4814,16 +4833,6 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
 
-[[package]]
-name = "socket2"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "socket2"
 version = "0.6.1"
@@ -5207,7 +5216,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.6.1",
+ "socket2",
  "tokio-macros",
  "windows-sys 0.61.2",
 ]
@@ -5375,9 +5384,9 @@ checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
 
 [[package]]
 name = "tonic"
-version = "0.13.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e581ba15a835f4d9ea06c55ab1bd4dce26fc53752c69a04aac00703bfb49ba9"
+checksum = "eb7613188ce9f7df5bfe185db26c5814347d110db17920415cf2fbcad85e7203"
 dependencies = [
  "async-trait",
  "axum",
@@ -5392,9 +5401,9 @@ dependencies = [
  "hyper-util",
  "percent-encoding",
  "pin-project",
- "prost",
  "rustls-native-certs",
- "socket2 0.5.10",
+ "socket2",
+ "sync_wrapper",
  "tokio",
  "tokio-rustls",
  "tokio-stream",
@@ -5406,48 +5415,75 @@ dependencies = [
 
 [[package]]
 name = "tonic-build"
-version = "0.13.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac6f67be712d12f0b41328db3137e0d0757645d8904b4cb7d51cd9c2279e847"
+checksum = "4c40aaccc9f9eccf2cd82ebc111adc13030d23e887244bc9cfa5d1d636049de3"
 dependencies = [
  "prettyplease",
  "proc-macro2",
- "prost-build",
- "prost-types",
  "quote",
  "syn 2.0.108",
 ]
 
 [[package]]
 name = "tonic-health"
-version = "0.13.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb87334d340313fefa513b6e60794d44a86d5f039b523229c99c323e4e19ca4b"
+checksum = "2a82868bf299e0a1d2e8dce0dc33a46c02d6f045b2c1f1d6cc8dc3d0bf1812ef"
 dependencies = [
  "prost",
  "tokio",
  "tokio-stream",
  "tonic",
+ "tonic-prost",
+]
+
+[[package]]
+name = "tonic-prost"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66bd50ad6ce1252d87ef024b3d64fe4c3cf54a86fb9ef4c631fdd0ded7aeaa67"
+dependencies = [
+ "bytes",
+ "prost",
+ "tonic",
+]
+
+[[package]]
+name = "tonic-prost-build"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4a16cba4043dc3ff43fcb3f96b4c5c154c64cbd18ca8dce2ab2c6a451d058a2"
+dependencies = [
+ "prettyplease",
+ "proc-macro2",
+ "prost-build",
+ "prost-types",
+ "quote",
+ "syn 2.0.108",
+ "tempfile",
+ "tonic-build",
 ]
 
 [[package]]
 name = "tonic-reflection"
-version = "0.13.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9687bd5bfeafebdded2356950f278bba8226f0b32109537c4253406e09aafe1"
+checksum = "34da53e8387581d66db16ff01f98a70b426b091fdf76856e289d5c1bd386ed7b"
 dependencies = [
  "prost",
  "prost-types",
  "tokio",
  "tokio-stream",
  "tonic",
+ "tonic-prost",
 ]
 
 [[package]]
 name = "tonic-web"
-version = "0.13.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "774cad0f35370f81b6c59e3a1f5d0c3188bdb4a2a1b8b7f0921c860bfbd3aec6"
+checksum = "75214f6b6bd28c19aa752ac09fdf0eea546095670906c21fe3940e180a4c43f2"
 dependencies = [
  "base64",
  "bytes",
@@ -5463,9 +5499,9 @@ dependencies = [
 
 [[package]]
 name = "tonic-web-wasm-client"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66e3bb7acca55e6790354be650f4042d418fcf8e2bc42ac382348f2b6bf057e5"
+checksum = "898cd44be5e23e59d2956056538f1d6b3c5336629d384ffd2d92e76f87fb98ff"
 dependencies = [
  "base64",
  "byteorder",
@@ -5572,13 +5608,13 @@ dependencies = [
 
 [[package]]
 name = "tracing-forest"
-version = "0.1.6"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee40835db14ddd1e3ba414292272eddde9dad04d3d4b65509656414d1c42592f"
+checksum = "3298fe855716711a00474eceb89cc7dc254bbe67f6bc4afafdeec5f0c538771c"
 dependencies = [
  "chrono",
  "smallvec",
- "thiserror 1.0.69",
+ "thiserror 2.0.17",
  "tracing",
  "tracing-subscriber",
 ]
@@ -5596,15 +5632,16 @@ dependencies = [
 
 [[package]]
 name = "tracing-opentelemetry"
-version = "0.31.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddcf5959f39507d0d04d6413119c04f33b623f4f951ebcbdddddfad2d0623a9c"
+checksum = "1e6e5658463dd88089aba75c7791e1d3120633b1bfde22478b28f625a9bb1b8e"
 dependencies = [
  "js-sys",
- "once_cell",
  "opentelemetry",
  "opentelemetry_sdk",
+ "rustversion",
  "smallvec",
+ "thiserror 2.0.17",
  "tracing",
  "tracing-core",
  "tracing-log",
@@ -5713,9 +5750,9 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unicode-linebreak"
diff --git a/Cargo.toml b/Cargo.toml
index e16ccf198..33ea70d30 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -69,20 +69,23 @@ futures            = { version = "0.3" }
 hex                = { version = "0.4" }
 http               = { version = "1.3" }
 humantime          = { version = "2.2" }
-indexmap           = { version = "2.7" }
+indexmap           = { version = "2.12" }
 itertools          = { version = "0.14" }
 pretty_assertions  = { version = "1.4" }
-prost              = { version = "0.13" }
+prost              = { version = "0.14" }
+protox             = { version = "0.9" }
 rand               = { version = "0.9" }
 rand_chacha        = { version = "0.9" }
-rstest             = { version = "0.25" }
+rstest             = { version = "0.26" }
 serde              = { features = ["derive"], version = "1" }
 thiserror          = { default-features = false, version = "2.0" }
 tokio              = { features = ["rt-multi-thread"], version = "1.46" }
 tokio-stream       = { version = "0.1" }
-toml               = { version = "0.8" }
-tonic              = { version = "0.13" }
-tonic-reflection   = { version = "0.13" }
+toml               = { version = "0.9" }
+tonic              = { version = "0.14" }
+tonic-prost        = { version = "0.14" }
+tonic-prost-build  = { version = "0.14" }
+tonic-reflection   = { version = "0.14" }
 tower              = { version = "0.5" }
 tower-http         = { features = ["cors", "trace"], version = "0.6" }
 tracing            = { version = "0.1" }
diff --git a/bin/network-monitor/Cargo.toml b/bin/network-monitor/Cargo.toml
index 8ed1053c9..68e3e086f 100644
--- a/bin/network-monitor/Cargo.toml
+++ b/bin/network-monitor/Cargo.toml
@@ -29,6 +29,6 @@ serde            = { features = ["derive"], version = "1.0" }
 serde_json       = { version = "1.0" }
 sha2             = { version = "0.10" }
 tokio            = { features = ["full"], workspace = true }
-tonic            = { features = ["codegen", "prost", "tls-native-roots", "transport"], workspace = true }
+tonic            = { features = ["codegen", "tls-native-roots", "transport"], workspace = true }
 tracing          = { workspace = true }
 url              = { features = ["serde"], workspace = true }
diff --git a/bin/remote-prover/Cargo.toml b/bin/remote-prover/Cargo.toml
index a05fcdb42..0bcc98a2e 100644
--- a/bin/remote-prover/Cargo.toml
+++ b/bin/remote-prover/Cargo.toml
@@ -35,13 +35,13 @@ miden-node-utils      = { workspace = true }
 miden-objects         = { features = ["std"], workspace = true }
 miden-tx              = { features = ["std"], workspace = true }
 miden-tx-batch-prover = { features = ["std"], workspace = true }
-opentelemetry         = { version = "0.30" }
-pingora               = { features = ["lb"], version = "0.5" }
-pingora-core          = { version = "0.5" }
-pingora-limits        = { version = "0.5" }
-pingora-proxy         = { version = "0.5" }
+opentelemetry         = { version = "0.31" }
+pingora               = { features = ["lb"], version = "0.6" }
+pingora-core          = { version = "0.6" }
+pingora-limits        = { version = "0.6" }
+pingora-proxy         = { version = "0.6" }
 prometheus            = { version = "0.14" }
-prost                 = { default-features = false, features = ["derive"], version = "0.13" }
+prost                 = { default-features = false, features = ["derive"], version = "0.14" }
 reqwest               = { version = "0.12" }
 semver                = { version = "1.0" }
 serde                 = { features = ["derive"], version = "1.0" }
@@ -49,12 +49,13 @@ serde_qs              = { version = "0.15" }
 thiserror             = { workspace = true }
 tokio                 = { features = ["full"], workspace = true }
 tokio-stream          = { features = ["net"], version = "0.1" }
-tonic                 = { default-features = false, features = ["codegen", "prost", "router", "transport"], version = "0.13" }
-tonic-health          = { version = "0.13" }
-tonic-web             = { version = "0.13" }
+tonic                 = { default-features = false, features = ["codegen", "router", "transport"], version = "0.14" }
+tonic-health          = { version = "0.14" }
+tonic-prost           = { workspace = true }
+tonic-web             = { version = "0.14" }
 tower-http            = { features = ["trace"], workspace = true }
 tracing               = { workspace = true }
-tracing-opentelemetry = { version = "0.31" }
+tracing-opentelemetry = { version = "0.32" }
 uuid                  = { features = ["v4"], version = "1.16" }
 
 [dev-dependencies]
@@ -66,7 +67,4 @@ miden-tx      = { features = ["testing"], workspace = true }
 [build-dependencies]
 miden-node-proto-build = { features = ["internal"], workspace = true }
 miette                 = { features = ["fancy"], version = "7.5" }
-prost                  = { default-features = false, features = ["derive"], version = "0.13" }
-prost-build            = { version = "0.13" }
-protox                 = { version = "0.8" }
-tonic-build            = { version = "0.13" }
+tonic-prost-build      = { workspace = true }
diff --git a/bin/remote-prover/build.rs b/bin/remote-prover/build.rs
index 31584911e..f9b2eaafb 100644
--- a/bin/remote-prover/build.rs
+++ b/bin/remote-prover/build.rs
@@ -1,6 +1,6 @@
 use miden_node_proto_build::remote_prover_api_descriptor;
 use miette::IntoDiagnostic;
-use tonic_build::FileDescriptorSet;
+use tonic_prost_build::FileDescriptorSet;
 
 /// Defines whether the build script should generate files in `/src`.
 ///
@@ -31,10 +31,10 @@ fn main() -> miette::Result<()> {
 
 /// Builds tonic code from a `FileDescriptorSet`
 fn build_tonic_from_descriptor(descriptor: FileDescriptorSet) -> miette::Result<()> {
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .out_dir(GENERATED_OUT_DIR)
         .build_server(true)
         .build_transport(true)
-        .compile_fds_with_config(prost_build::Config::new(), descriptor)
+        .compile_fds_with_config(descriptor, tonic_prost_build::Config::new())
         .into_diagnostic()
 }
diff --git a/bin/remote-prover/src/generated/remote_prover.rs b/bin/remote-prover/src/generated/remote_prover.rs
index 373859bef..210b69153 100644
--- a/bin/remote-prover/src/generated/remote_prover.rs
+++ b/bin/remote-prover/src/generated/remote_prover.rs
@@ -1,30 +1,32 @@
 // This file is @generated by prost-build.
 /// Request message for proof generation containing payload and proof type metadata.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProofRequest {
     /// Type of proof being requested, determines payload interpretation
     #[prost(enumeration = "ProofType", tag = "1")]
     pub proof_type: i32,
     /// Serialized payload requiring proof generation. The encoding format is
     /// type-specific:
-    /// - TRANSACTION: TransactionInputs encoded.
-    /// - BATCH: ProposedBatch encoded.
-    /// - BLOCK: ProposedBlock encoded.
+    ///
+    /// * TRANSACTION: TransactionInputs encoded.
+    /// * BATCH: ProposedBatch encoded.
+    /// * BLOCK: ProposedBlock encoded.
     #[prost(bytes = "vec", tag = "2")]
     pub payload: ::prost::alloc::vec::Vec<u8>,
 }
 /// Response message containing the generated proof.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Proof {
     /// Serialized proof bytes.
-    /// - TRANSACTION: Returns an encoded ProvenTransaction.
-    /// - BATCH: Returns an encoded ProvenBatch.
-    /// - BLOCK: Returns an encoded ProvenBlock.
+    ///
+    /// * TRANSACTION: Returns an encoded ProvenTransaction.
+    /// * BATCH: Returns an encoded ProvenBatch.
+    /// * BLOCK: Returns an encoded ProvenBlock.
     #[prost(bytes = "vec", tag = "1")]
     pub payload: ::prost::alloc::vec::Vec<u8>,
 }
 /// Status of an individual worker in the proxy.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProxyWorkerStatus {
     /// The address of the worker.
     #[prost(string, tag = "1")]
@@ -50,7 +52,7 @@ pub struct ProxyStatus {
     pub workers: ::prost::alloc::vec::Vec<ProxyWorkerStatus>,
 }
 /// Response message containing the status of the worker.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct WorkerStatus {
     /// The version of the worker.
     #[prost(string, tag = "1")]
@@ -233,7 +235,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/remote_prover.Api/Prove");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("remote_prover.Api", "Prove"));
@@ -241,236 +243,6 @@ pub mod api_client {
         }
     }
 }
-/// Generated client implementations.
-pub mod proxy_status_api_client {
-    #![allow(
-        unused_variables,
-        dead_code,
-        missing_docs,
-        clippy::wildcard_imports,
-        clippy::let_unit_value,
-    )]
-    use tonic::codegen::*;
-    use tonic::codegen::http::Uri;
-    #[derive(Debug, Clone)]
-    pub struct ProxyStatusApiClient<T> {
-        inner: tonic::client::Grpc<T>,
-    }
-    impl ProxyStatusApiClient<tonic::transport::Channel> {
-        /// Attempt to create a new client by connecting to a given endpoint.
-        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
-        where
-            D: TryInto<tonic::transport::Endpoint>,
-            D::Error: Into<StdError>,
-        {
-            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
-            Ok(Self::new(conn))
-        }
-    }
-    impl<T> ProxyStatusApiClient<T>
-    where
-        T: tonic::client::GrpcService<tonic::body::Body>,
-        T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
-    {
-        pub fn new(inner: T) -> Self {
-            let inner = tonic::client::Grpc::new(inner);
-            Self { inner }
-        }
-        pub fn with_origin(inner: T, origin: Uri) -> Self {
-            let inner = tonic::client::Grpc::with_origin(inner, origin);
-            Self { inner }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> ProxyStatusApiClient<InterceptedService<T, F>>
-        where
-            F: tonic::service::Interceptor,
-            T::ResponseBody: Default,
-            T: tonic::codegen::Service<
-                http::Request<tonic::body::Body>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
-                >,
-            >,
-            <T as tonic::codegen::Service<
-                http::Request<tonic::body::Body>,
-            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
-        {
-            ProxyStatusApiClient::new(InterceptedService::new(inner, interceptor))
-        }
-        /// Compress requests with the given encoding.
-        ///
-        /// This requires the server to support it otherwise it might respond with an
-        /// error.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.send_compressed(encoding);
-            self
-        }
-        /// Enable decompressing responses.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.accept_compressed(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_decoding_message_size(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_encoding_message_size(limit);
-            self
-        }
-        /// Returns the status of the proxy.
-        pub async fn status(
-            &mut self,
-            request: impl tonic::IntoRequest<()>,
-        ) -> std::result::Result<tonic::Response<super::ProxyStatus>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::unknown(
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/remote_prover.ProxyStatusApi/Status",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("remote_prover.ProxyStatusApi", "Status"));
-            self.inner.unary(req, path, codec).await
-        }
-    }
-}
-/// Generated client implementations.
-pub mod worker_status_api_client {
-    #![allow(
-        unused_variables,
-        dead_code,
-        missing_docs,
-        clippy::wildcard_imports,
-        clippy::let_unit_value,
-    )]
-    use tonic::codegen::*;
-    use tonic::codegen::http::Uri;
-    #[derive(Debug, Clone)]
-    pub struct WorkerStatusApiClient<T> {
-        inner: tonic::client::Grpc<T>,
-    }
-    impl WorkerStatusApiClient<tonic::transport::Channel> {
-        /// Attempt to create a new client by connecting to a given endpoint.
-        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
-        where
-            D: TryInto<tonic::transport::Endpoint>,
-            D::Error: Into<StdError>,
-        {
-            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
-            Ok(Self::new(conn))
-        }
-    }
-    impl<T> WorkerStatusApiClient<T>
-    where
-        T: tonic::client::GrpcService<tonic::body::Body>,
-        T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
-    {
-        pub fn new(inner: T) -> Self {
-            let inner = tonic::client::Grpc::new(inner);
-            Self { inner }
-        }
-        pub fn with_origin(inner: T, origin: Uri) -> Self {
-            let inner = tonic::client::Grpc::with_origin(inner, origin);
-            Self { inner }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> WorkerStatusApiClient<InterceptedService<T, F>>
-        where
-            F: tonic::service::Interceptor,
-            T::ResponseBody: Default,
-            T: tonic::codegen::Service<
-                http::Request<tonic::body::Body>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
-                >,
-            >,
-            <T as tonic::codegen::Service<
-                http::Request<tonic::body::Body>,
-            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
-        {
-            WorkerStatusApiClient::new(InterceptedService::new(inner, interceptor))
-        }
-        /// Compress requests with the given encoding.
-        ///
-        /// This requires the server to support it otherwise it might respond with an
-        /// error.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.send_compressed(encoding);
-            self
-        }
-        /// Enable decompressing responses.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.accept_compressed(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_decoding_message_size(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_encoding_message_size(limit);
-            self
-        }
-        /// Returns the status of the worker.
-        pub async fn status(
-            &mut self,
-            request: impl tonic::IntoRequest<()>,
-        ) -> std::result::Result<tonic::Response<super::WorkerStatus>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::unknown(
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/remote_prover.WorkerStatusApi/Status",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("remote_prover.WorkerStatusApi", "Status"));
-            self.inner.unary(req, path, codec).await
-        }
-    }
-}
 /// Generated server implementations.
 pub mod api_server {
     #![allow(
@@ -594,7 +366,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = ProveSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -649,6 +421,121 @@ pub mod api_server {
         const NAME: &'static str = SERVICE_NAME;
     }
 }
+/// Generated client implementations.
+pub mod proxy_status_api_client {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
+    use tonic::codegen::*;
+    use tonic::codegen::http::Uri;
+    #[derive(Debug, Clone)]
+    pub struct ProxyStatusApiClient<T> {
+        inner: tonic::client::Grpc<T>,
+    }
+    impl ProxyStatusApiClient<tonic::transport::Channel> {
+        /// Attempt to create a new client by connecting to a given endpoint.
+        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
+        where
+            D: TryInto<tonic::transport::Endpoint>,
+            D::Error: Into<StdError>,
+        {
+            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
+            Ok(Self::new(conn))
+        }
+    }
+    impl<T> ProxyStatusApiClient<T>
+    where
+        T: tonic::client::GrpcService<tonic::body::Body>,
+        T::Error: Into<StdError>,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
+    {
+        pub fn new(inner: T) -> Self {
+            let inner = tonic::client::Grpc::new(inner);
+            Self { inner }
+        }
+        pub fn with_origin(inner: T, origin: Uri) -> Self {
+            let inner = tonic::client::Grpc::with_origin(inner, origin);
+            Self { inner }
+        }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> ProxyStatusApiClient<InterceptedService<T, F>>
+        where
+            F: tonic::service::Interceptor,
+            T::ResponseBody: Default,
+            T: tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+                Response = http::Response<
+                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
+                >,
+            >,
+            <T as tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
+        {
+            ProxyStatusApiClient::new(InterceptedService::new(inner, interceptor))
+        }
+        /// Compress requests with the given encoding.
+        ///
+        /// This requires the server to support it otherwise it might respond with an
+        /// error.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.send_compressed(encoding);
+            self
+        }
+        /// Enable decompressing responses.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.accept_compressed(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_decoding_message_size(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_encoding_message_size(limit);
+            self
+        }
+        /// Returns the status of the proxy.
+        pub async fn status(
+            &mut self,
+            request: impl tonic::IntoRequest<()>,
+        ) -> std::result::Result<tonic::Response<super::ProxyStatus>, tonic::Status> {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic_prost::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/remote_prover.ProxyStatusApi/Status",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("remote_prover.ProxyStatusApi", "Status"));
+            self.inner.unary(req, path, codec).await
+        }
+    }
+}
 /// Generated server implementations.
 pub mod proxy_status_api_server {
     #![allow(
@@ -769,7 +656,7 @@ pub mod proxy_status_api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = StatusSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -824,6 +711,121 @@ pub mod proxy_status_api_server {
         const NAME: &'static str = SERVICE_NAME;
     }
 }
+/// Generated client implementations.
+pub mod worker_status_api_client {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
+    use tonic::codegen::*;
+    use tonic::codegen::http::Uri;
+    #[derive(Debug, Clone)]
+    pub struct WorkerStatusApiClient<T> {
+        inner: tonic::client::Grpc<T>,
+    }
+    impl WorkerStatusApiClient<tonic::transport::Channel> {
+        /// Attempt to create a new client by connecting to a given endpoint.
+        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
+        where
+            D: TryInto<tonic::transport::Endpoint>,
+            D::Error: Into<StdError>,
+        {
+            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
+            Ok(Self::new(conn))
+        }
+    }
+    impl<T> WorkerStatusApiClient<T>
+    where
+        T: tonic::client::GrpcService<tonic::body::Body>,
+        T::Error: Into<StdError>,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
+    {
+        pub fn new(inner: T) -> Self {
+            let inner = tonic::client::Grpc::new(inner);
+            Self { inner }
+        }
+        pub fn with_origin(inner: T, origin: Uri) -> Self {
+            let inner = tonic::client::Grpc::with_origin(inner, origin);
+            Self { inner }
+        }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> WorkerStatusApiClient<InterceptedService<T, F>>
+        where
+            F: tonic::service::Interceptor,
+            T::ResponseBody: Default,
+            T: tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+                Response = http::Response<
+                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
+                >,
+            >,
+            <T as tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
+        {
+            WorkerStatusApiClient::new(InterceptedService::new(inner, interceptor))
+        }
+        /// Compress requests with the given encoding.
+        ///
+        /// This requires the server to support it otherwise it might respond with an
+        /// error.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.send_compressed(encoding);
+            self
+        }
+        /// Enable decompressing responses.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.accept_compressed(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_decoding_message_size(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_encoding_message_size(limit);
+            self
+        }
+        /// Returns the status of the worker.
+        pub async fn status(
+            &mut self,
+            request: impl tonic::IntoRequest<()>,
+        ) -> std::result::Result<tonic::Response<super::WorkerStatus>, tonic::Status> {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic_prost::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/remote_prover.WorkerStatusApi/Status",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("remote_prover.WorkerStatusApi", "Status"));
+            self.inner.unary(req, path, codec).await
+        }
+    }
+}
 /// Generated server implementations.
 pub mod worker_status_api_server {
     #![allow(
@@ -944,7 +946,7 @@ pub mod worker_status_api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = StatusSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
diff --git a/bin/remote-prover/src/proxy/update_workers.rs b/bin/remote-prover/src/proxy/update_workers.rs
index a1dcf2fc8..320ac5a67 100644
--- a/bin/remote-prover/src/proxy/update_workers.rs
+++ b/bin/remote-prover/src/proxy/update_workers.rs
@@ -3,9 +3,8 @@ use std::sync::Arc;
 
 use miden_node_utils::ErrorReport;
 use miden_remote_prover::COMPONENT;
-use pingora::apps::{HttpServerApp, HttpServerOptions};
+use pingora::apps::{HttpServerApp, HttpServerOptions, ReusedHttpStream};
 use pingora::http::ResponseHeader;
-use pingora::protocols::Stream;
 use pingora::protocols::http::ServerSession;
 use pingora::server::ShutdownWatch;
 use tonic::async_trait;
@@ -64,7 +63,7 @@ impl HttpServerApp for LoadBalancerUpdateService {
         self: &Arc<Self>,
         mut http: ServerSession,
         _shutdown: &ShutdownWatch,
-    ) -> Option<Stream> {
+    ) -> Option<ReusedHttpStream> {
         match http.read_request().await {
             Ok(res) => {
                 if !res {
diff --git a/crates/block-producer/src/mempool/tests.rs b/crates/block-producer/src/mempool/tests.rs
index a2666b53a..e2b556cd7 100644
--- a/crates/block-producer/src/mempool/tests.rs
+++ b/crates/block-producer/src/mempool/tests.rs
@@ -46,7 +46,7 @@ async fn add_transaction_traces_are_correct() {
 
     let span_data = rx_export.recv().await.unwrap();
     assert_eq!(span_data.name, "mempool.add_transaction");
-    assert!(span_data.attributes.iter().any(|kv| kv.key == "code.namespace".into()
+    assert!(span_data.attributes.iter().any(|kv| kv.key == "code.module.name".into()
         && kv.value == "miden_node_block_producer::mempool".into()));
     assert!(
         span_data
diff --git a/crates/proto/Cargo.toml b/crates/proto/Cargo.toml
index 1b806581b..0b0943030 100644
--- a/crates/proto/Cargo.toml
+++ b/crates/proto/Cargo.toml
@@ -24,6 +24,7 @@ miden-objects               = { workspace = true }
 prost                       = { workspace = true }
 thiserror                   = { workspace = true }
 tonic                       = { workspace = true }
+tonic-prost                 = { workspace = true }
 url                         = { workspace = true }
 
 [dev-dependencies]
@@ -33,7 +34,4 @@ proptest = { version = "1.7" }
 fs-err                 = { workspace = true }
 miden-node-proto-build = { features = ["internal"], workspace = true }
 miette                 = { version = "7.6" }
-prost                  = { workspace = true }
-prost-build            = { version = "0.13" }
-protox                 = { version = "0.8" }
-tonic-build            = { version = "0.13" }
+tonic-prost-build      = { workspace = true }
diff --git a/crates/proto/build.rs b/crates/proto/build.rs
index 9952f7032..6d71e8400 100644
--- a/crates/proto/build.rs
+++ b/crates/proto/build.rs
@@ -13,7 +13,7 @@ use miden_node_proto_build::{
     validator_api_descriptor,
 };
 use miette::{Context, IntoDiagnostic};
-use tonic_build::FileDescriptorSet;
+use tonic_prost_build::FileDescriptorSet;
 
 /// Generates Rust protobuf bindings using miden-node-proto-build.
 ///
@@ -57,13 +57,13 @@ fn main() -> miette::Result<()> {
 /// Generates protobuf bindings from the given file descriptor set and stores them in the
 /// given destination directory.
 fn generate_bindings(file_descriptors: FileDescriptorSet, dst_dir: &Path) -> miette::Result<()> {
-    let mut prost_config = prost_build::Config::new();
+    let mut prost_config = tonic_prost_build::Config::new();
     prost_config.skip_debug(["AccountId", "Digest"]);
 
     // Generate the stub of the user facing server from its proto file
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .out_dir(dst_dir)
-        .compile_fds_with_config(prost_config, file_descriptors)
+        .compile_fds_with_config(file_descriptors, prost_config)
         .into_diagnostic()
         .wrap_err("compiling protobufs")?;
 
diff --git a/crates/proto/src/generated/account.rs b/crates/proto/src/generated/account.rs
index 2048e5128..d30e8c888 100644
--- a/crates/proto/src/generated/account.rs
+++ b/crates/proto/src/generated/account.rs
@@ -3,7 +3,7 @@
 ///
 /// A Miden account ID is a 120-bit value derived from the commitments to account code and storage,
 /// and a random user-provided seed.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 #[prost(skip_debug)]
 pub struct AccountId {
     /// 15 bytes (120 bits) encoded using \[winter_utils::Serializable\] implementation for
@@ -12,7 +12,7 @@ pub struct AccountId {
     pub id: ::prost::alloc::vec::Vec<u8>,
 }
 /// The state of an account at a specific block height.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct AccountSummary {
     /// The account ID.
     #[prost(message, optional, tag = "1")]
@@ -34,7 +34,7 @@ pub struct AccountStorageHeader {
 /// Nested message and enum types in `AccountStorageHeader`.
 pub mod account_storage_header {
     /// A single storage slot in the account storage header.
-    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct StorageSlot {
         /// The type of the storage slot.
         #[prost(uint32, tag = "1")]
@@ -45,7 +45,7 @@ pub mod account_storage_header {
     }
 }
 /// An account details.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct AccountDetails {
     /// Account summary.
     #[prost(message, optional, tag = "1")]
@@ -56,7 +56,7 @@ pub struct AccountDetails {
     pub details: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
 }
 /// An account header.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct AccountHeader {
     /// The account ID.
     #[prost(message, optional, tag = "1")]
diff --git a/crates/proto/src/generated/block_producer.rs b/crates/proto/src/generated/block_producer.rs
index 1ebbb078a..5771d5510 100644
--- a/crates/proto/src/generated/block_producer.rs
+++ b/crates/proto/src/generated/block_producer.rs
@@ -1,6 +1,6 @@
 // This file is @generated by prost-build.
 /// Represents the status of the block producer.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct BlockProducerStatus {
     /// The block producer's running version.
     #[prost(string, tag = "1")]
@@ -10,20 +10,20 @@ pub struct BlockProducerStatus {
     pub status: ::prost::alloc::string::String,
 }
 /// Represents the result of submitting proven transaction.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct SubmitProvenTransactionResponse {
     /// The node's current block height.
     #[prost(fixed32, tag = "1")]
     pub block_height: u32,
 }
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct SubmitProvenBatchResponse {
     /// The node's current block height.
     #[prost(fixed32, tag = "1")]
     pub block_height: u32,
 }
 /// Request to subscribe to mempool events.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct MempoolSubscriptionRequest {
     /// The caller's current chain height.
     ///
@@ -197,7 +197,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/block_producer.Api/Status",
             );
@@ -223,7 +223,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/block_producer.Api/SubmitProvenTransaction",
             );
@@ -238,9 +238,9 @@ pub mod api_client {
         ///
         /// The batch may include transactions which were are:
         ///
-        ///   - already in the mempool i.e. previously successfully submitted
-        ///   - will be submitted to the mempool in the future
-        ///   - won't be submitted to the mempool at all
+        /// * already in the mempool i.e. previously successfully submitted
+        /// * will be submitted to the mempool in the future
+        /// * won't be submitted to the mempool at all
         ///
         /// All transactions in the batch but not in the mempool must build on the current mempool
         /// state following normal transaction submission rules.
@@ -261,7 +261,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/block_producer.Api/SubmitProvenBatch",
             );
@@ -295,7 +295,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/block_producer.Api/MempoolSubscription",
             );
@@ -339,9 +339,9 @@ pub mod api_server {
         ///
         /// The batch may include transactions which were are:
         ///
-        ///   - already in the mempool i.e. previously successfully submitted
-        ///   - will be submitted to the mempool in the future
-        ///   - won't be submitted to the mempool at all
+        /// * already in the mempool i.e. previously successfully submitted
+        /// * will be submitted to the mempool in the future
+        /// * won't be submitted to the mempool at all
         ///
         /// All transactions in the batch but not in the mempool must build on the current mempool
         /// state following normal transaction submission rules.
@@ -476,7 +476,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = StatusSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -524,7 +524,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SubmitProvenTransactionSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -572,7 +572,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SubmitProvenBatchSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -619,7 +619,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = MempoolSubscriptionSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
diff --git a/crates/proto/src/generated/block_producer_store.rs b/crates/proto/src/generated/block_producer_store.rs
index 1c95d8eae..42697787d 100644
--- a/crates/proto/src/generated/block_producer_store.rs
+++ b/crates/proto/src/generated/block_producer_store.rs
@@ -78,7 +78,7 @@ pub struct BatchInputs {
     pub batch_reference_block_header: ::core::option::Option<
         super::blockchain::BlockHeader,
     >,
-    /// Proof of each _found_ unauthenticated note's inclusion in a block.
+    /// Proof of each *found* unauthenticated note's inclusion in a block.
     #[prost(message, repeated, tag = "2")]
     pub note_proofs: ::prost::alloc::vec::Vec<super::note::NoteInclusionInBlockProof>,
     /// The serialized chain MMR which includes proofs for all blocks referenced by the
@@ -131,7 +131,7 @@ pub struct TransactionInputs {
 /// Nested message and enum types in `TransactionInputs`.
 pub mod transaction_inputs {
     /// An account returned as a response to the `GetTransactionInputs`.
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct AccountTransactionInputRecord {
         /// The account ID.
         #[prost(message, optional, tag = "1")]
@@ -141,7 +141,7 @@ pub mod transaction_inputs {
         pub account_commitment: ::core::option::Option<super::super::primitives::Digest>,
     }
     /// A nullifier returned as a response to the `GetTransactionInputs`.
-    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct NullifierTransactionInputRecord {
         /// The nullifier ID.
         #[prost(message, optional, tag = "1")]
@@ -256,7 +256,7 @@ pub mod block_producer_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/block_producer_store.BlockProducer/ApplyBlock",
             );
@@ -286,7 +286,7 @@ pub mod block_producer_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/block_producer_store.BlockProducer/GetBlockHeaderByNumber",
             );
@@ -313,7 +313,7 @@ pub mod block_producer_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/block_producer_store.BlockProducer/GetBlockInputs",
             );
@@ -340,7 +340,7 @@ pub mod block_producer_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/block_producer_store.BlockProducer/GetBatchInputs",
             );
@@ -370,7 +370,7 @@ pub mod block_producer_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/block_producer_store.BlockProducer/GetTransactionInputs",
             );
@@ -539,7 +539,7 @@ pub mod block_producer_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = ApplyBlockSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -591,7 +591,7 @@ pub mod block_producer_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetBlockHeaderByNumberSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -637,7 +637,7 @@ pub mod block_producer_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetBlockInputsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -683,7 +683,7 @@ pub mod block_producer_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetBatchInputsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -732,7 +732,7 @@ pub mod block_producer_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetTransactionInputsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
diff --git a/crates/proto/src/generated/blockchain.rs b/crates/proto/src/generated/blockchain.rs
index ba2811b0b..1f1152896 100644
--- a/crates/proto/src/generated/blockchain.rs
+++ b/crates/proto/src/generated/blockchain.rs
@@ -1,6 +1,6 @@
 // This file is @generated by prost-build.
 /// Represents a block.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Block {
     /// Block data encoded using \[winter_utils::Serializable\] implementation for
     /// \[miden_objects::block::Block\].
@@ -8,7 +8,7 @@ pub struct Block {
     pub block: ::prost::alloc::vec::Vec<u8>,
 }
 /// Represents a block or nothing.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct MaybeBlock {
     /// The requested block data encoded using \[winter_utils::Serializable\] implementation for
     /// \[miden_objects::block::Block\].
@@ -16,21 +16,21 @@ pub struct MaybeBlock {
     pub block: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
 }
 /// Represents a block number.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct BlockNumber {
     /// The block number of the target block.
     #[prost(fixed32, tag = "1")]
     pub block_num: u32,
 }
 /// Represents a block number or nothing.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct MaybeBlockNumber {
     /// The block number of the target block.
     #[prost(fixed32, optional, tag = "1")]
     pub block_num: ::core::option::Option<u32>,
 }
 /// Represents a block header.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct BlockHeader {
     /// Specifies the version of the protocol.
     #[prost(uint32, tag = "1")]
@@ -70,7 +70,7 @@ pub struct BlockHeader {
     pub timestamp: u32,
 }
 /// Definition of the fee parameters.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct FeeParameters {
     /// The faucet account ID which is used for native fee assets.
     #[prost(message, optional, tag = "1")]
diff --git a/crates/proto/src/generated/note.rs b/crates/proto/src/generated/note.rs
index 79f404bd5..097c5f94d 100644
--- a/crates/proto/src/generated/note.rs
+++ b/crates/proto/src/generated/note.rs
@@ -1,6 +1,6 @@
 // This file is @generated by prost-build.
 /// Represents a note's ID.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct NoteId {
     /// A unique identifier of the note which is a 32-byte commitment to the underlying note data.
     #[prost(message, optional, tag = "1")]
@@ -14,7 +14,7 @@ pub struct NoteIdList {
     pub ids: ::prost::alloc::vec::Vec<NoteId>,
 }
 /// Represents a note's metadata.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct NoteMetadata {
     /// The account which sent the note.
     #[prost(message, optional, tag = "1")]
@@ -39,7 +39,7 @@ pub struct NoteMetadata {
 /// Represents a note.
 ///
 /// The note is composed of the note metadata and its serialized details.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Note {
     /// The note's metadata.
     #[prost(message, optional, tag = "1")]
@@ -52,7 +52,7 @@ pub struct Note {
 ///
 /// Network notes are a subtype of public notes, and as such, their details are always publicly
 /// known.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct NetworkNote {
     /// The note's metadata.
     #[prost(message, optional, tag = "1")]
@@ -115,14 +115,14 @@ pub struct NoteSyncRecord {
     pub inclusion_path: ::core::option::Option<super::primitives::SparseMerklePath>,
 }
 /// Represents a note root.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct NoteRoot {
     /// The root of the note.
     #[prost(message, optional, tag = "1")]
     pub root: ::core::option::Option<super::primitives::Digest>,
 }
 /// Represents a note script.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct NoteScript {
     /// Entrypoint of the script.
     #[prost(uint32, tag = "1")]
diff --git a/crates/proto/src/generated/ntx_builder_store.rs b/crates/proto/src/generated/ntx_builder_store.rs
index ff48a45df..3b74e3f6e 100644
--- a/crates/proto/src/generated/ntx_builder_store.rs
+++ b/crates/proto/src/generated/ntx_builder_store.rs
@@ -1,20 +1,20 @@
 // This file is @generated by prost-build.
 /// Account ID prefix.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct AccountIdPrefix {
     /// Account ID prefix.
     #[prost(fixed32, tag = "1")]
     pub account_id_prefix: u32,
 }
 /// Represents the result of getting network account details by prefix.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct MaybeAccountDetails {
     /// Account details.
     #[prost(message, optional, tag = "1")]
     pub details: ::core::option::Option<super::account::AccountDetails>,
 }
 /// Returns a list of unconsumed network notes using pagination.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct UnconsumedNetworkNotesRequest {
     /// An opaque token used to paginate through the notes.
     ///
@@ -29,7 +29,7 @@ pub struct UnconsumedNetworkNotesRequest {
 /// Returns a paginated list of unconsumed network notes for an account.
 ///
 /// Notes created or consumed after the specified block are excluded from the result.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct UnconsumedNetworkNotesForAccountRequest {
     /// This should be null on the first call, and set to the response token until the response token
     /// is null, at which point all data has been fetched.
@@ -185,7 +185,7 @@ pub mod ntx_builder_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/ntx_builder_store.NtxBuilder/GetBlockHeaderByNumber",
             );
@@ -215,7 +215,7 @@ pub mod ntx_builder_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/ntx_builder_store.NtxBuilder/GetUnconsumedNetworkNotes",
             );
@@ -247,7 +247,7 @@ pub mod ntx_builder_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/ntx_builder_store.NtxBuilder/GetUnconsumedNetworkNotesForAccount",
             );
@@ -279,7 +279,7 @@ pub mod ntx_builder_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/ntx_builder_store.NtxBuilder/GetCurrentBlockchainData",
             );
@@ -309,7 +309,7 @@ pub mod ntx_builder_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/ntx_builder_store.NtxBuilder/GetNetworkAccountDetailsByPrefix",
             );
@@ -496,7 +496,7 @@ pub mod ntx_builder_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetBlockHeaderByNumberSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -545,7 +545,7 @@ pub mod ntx_builder_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetUnconsumedNetworkNotesSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -599,7 +599,7 @@ pub mod ntx_builder_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetUnconsumedNetworkNotesForAccountSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -651,7 +651,7 @@ pub mod ntx_builder_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetCurrentBlockchainDataSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -702,7 +702,7 @@ pub mod ntx_builder_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetNetworkAccountDetailsByPrefixSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
diff --git a/crates/proto/src/generated/primitives.rs b/crates/proto/src/generated/primitives.rs
index bc55a90b7..907ef856a 100644
--- a/crates/proto/src/generated/primitives.rs
+++ b/crates/proto/src/generated/primitives.rs
@@ -1,12 +1,12 @@
 // This file is @generated by prost-build.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Asset {
     /// Asset represented as a word.
     #[prost(message, optional, tag = "1")]
     pub asset: ::core::option::Option<Digest>,
 }
 /// Represents a single SMT leaf entry.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct SmtLeafEntry {
     /// The key of the entry.
     #[prost(message, optional, tag = "1")]
@@ -84,7 +84,7 @@ pub struct MerklePath {
     pub siblings: ::prost::alloc::vec::Vec<Digest>,
 }
 /// A hash digest, the result of a hash function.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 #[prost(skip_debug)]
 pub struct Digest {
     #[prost(fixed64, tag = "1")]
diff --git a/crates/proto/src/generated/remote_prover.rs b/crates/proto/src/generated/remote_prover.rs
index 373859bef..210b69153 100644
--- a/crates/proto/src/generated/remote_prover.rs
+++ b/crates/proto/src/generated/remote_prover.rs
@@ -1,30 +1,32 @@
 // This file is @generated by prost-build.
 /// Request message for proof generation containing payload and proof type metadata.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProofRequest {
     /// Type of proof being requested, determines payload interpretation
     #[prost(enumeration = "ProofType", tag = "1")]
     pub proof_type: i32,
     /// Serialized payload requiring proof generation. The encoding format is
     /// type-specific:
-    /// - TRANSACTION: TransactionInputs encoded.
-    /// - BATCH: ProposedBatch encoded.
-    /// - BLOCK: ProposedBlock encoded.
+    ///
+    /// * TRANSACTION: TransactionInputs encoded.
+    /// * BATCH: ProposedBatch encoded.
+    /// * BLOCK: ProposedBlock encoded.
     #[prost(bytes = "vec", tag = "2")]
     pub payload: ::prost::alloc::vec::Vec<u8>,
 }
 /// Response message containing the generated proof.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Proof {
     /// Serialized proof bytes.
-    /// - TRANSACTION: Returns an encoded ProvenTransaction.
-    /// - BATCH: Returns an encoded ProvenBatch.
-    /// - BLOCK: Returns an encoded ProvenBlock.
+    ///
+    /// * TRANSACTION: Returns an encoded ProvenTransaction.
+    /// * BATCH: Returns an encoded ProvenBatch.
+    /// * BLOCK: Returns an encoded ProvenBlock.
     #[prost(bytes = "vec", tag = "1")]
     pub payload: ::prost::alloc::vec::Vec<u8>,
 }
 /// Status of an individual worker in the proxy.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProxyWorkerStatus {
     /// The address of the worker.
     #[prost(string, tag = "1")]
@@ -50,7 +52,7 @@ pub struct ProxyStatus {
     pub workers: ::prost::alloc::vec::Vec<ProxyWorkerStatus>,
 }
 /// Response message containing the status of the worker.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct WorkerStatus {
     /// The version of the worker.
     #[prost(string, tag = "1")]
@@ -233,7 +235,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/remote_prover.Api/Prove");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("remote_prover.Api", "Prove"));
@@ -241,236 +243,6 @@ pub mod api_client {
         }
     }
 }
-/// Generated client implementations.
-pub mod proxy_status_api_client {
-    #![allow(
-        unused_variables,
-        dead_code,
-        missing_docs,
-        clippy::wildcard_imports,
-        clippy::let_unit_value,
-    )]
-    use tonic::codegen::*;
-    use tonic::codegen::http::Uri;
-    #[derive(Debug, Clone)]
-    pub struct ProxyStatusApiClient<T> {
-        inner: tonic::client::Grpc<T>,
-    }
-    impl ProxyStatusApiClient<tonic::transport::Channel> {
-        /// Attempt to create a new client by connecting to a given endpoint.
-        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
-        where
-            D: TryInto<tonic::transport::Endpoint>,
-            D::Error: Into<StdError>,
-        {
-            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
-            Ok(Self::new(conn))
-        }
-    }
-    impl<T> ProxyStatusApiClient<T>
-    where
-        T: tonic::client::GrpcService<tonic::body::Body>,
-        T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
-    {
-        pub fn new(inner: T) -> Self {
-            let inner = tonic::client::Grpc::new(inner);
-            Self { inner }
-        }
-        pub fn with_origin(inner: T, origin: Uri) -> Self {
-            let inner = tonic::client::Grpc::with_origin(inner, origin);
-            Self { inner }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> ProxyStatusApiClient<InterceptedService<T, F>>
-        where
-            F: tonic::service::Interceptor,
-            T::ResponseBody: Default,
-            T: tonic::codegen::Service<
-                http::Request<tonic::body::Body>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
-                >,
-            >,
-            <T as tonic::codegen::Service<
-                http::Request<tonic::body::Body>,
-            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
-        {
-            ProxyStatusApiClient::new(InterceptedService::new(inner, interceptor))
-        }
-        /// Compress requests with the given encoding.
-        ///
-        /// This requires the server to support it otherwise it might respond with an
-        /// error.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.send_compressed(encoding);
-            self
-        }
-        /// Enable decompressing responses.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.accept_compressed(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_decoding_message_size(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_encoding_message_size(limit);
-            self
-        }
-        /// Returns the status of the proxy.
-        pub async fn status(
-            &mut self,
-            request: impl tonic::IntoRequest<()>,
-        ) -> std::result::Result<tonic::Response<super::ProxyStatus>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::unknown(
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/remote_prover.ProxyStatusApi/Status",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("remote_prover.ProxyStatusApi", "Status"));
-            self.inner.unary(req, path, codec).await
-        }
-    }
-}
-/// Generated client implementations.
-pub mod worker_status_api_client {
-    #![allow(
-        unused_variables,
-        dead_code,
-        missing_docs,
-        clippy::wildcard_imports,
-        clippy::let_unit_value,
-    )]
-    use tonic::codegen::*;
-    use tonic::codegen::http::Uri;
-    #[derive(Debug, Clone)]
-    pub struct WorkerStatusApiClient<T> {
-        inner: tonic::client::Grpc<T>,
-    }
-    impl WorkerStatusApiClient<tonic::transport::Channel> {
-        /// Attempt to create a new client by connecting to a given endpoint.
-        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
-        where
-            D: TryInto<tonic::transport::Endpoint>,
-            D::Error: Into<StdError>,
-        {
-            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
-            Ok(Self::new(conn))
-        }
-    }
-    impl<T> WorkerStatusApiClient<T>
-    where
-        T: tonic::client::GrpcService<tonic::body::Body>,
-        T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
-    {
-        pub fn new(inner: T) -> Self {
-            let inner = tonic::client::Grpc::new(inner);
-            Self { inner }
-        }
-        pub fn with_origin(inner: T, origin: Uri) -> Self {
-            let inner = tonic::client::Grpc::with_origin(inner, origin);
-            Self { inner }
-        }
-        pub fn with_interceptor<F>(
-            inner: T,
-            interceptor: F,
-        ) -> WorkerStatusApiClient<InterceptedService<T, F>>
-        where
-            F: tonic::service::Interceptor,
-            T::ResponseBody: Default,
-            T: tonic::codegen::Service<
-                http::Request<tonic::body::Body>,
-                Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
-                >,
-            >,
-            <T as tonic::codegen::Service<
-                http::Request<tonic::body::Body>,
-            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
-        {
-            WorkerStatusApiClient::new(InterceptedService::new(inner, interceptor))
-        }
-        /// Compress requests with the given encoding.
-        ///
-        /// This requires the server to support it otherwise it might respond with an
-        /// error.
-        #[must_use]
-        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.send_compressed(encoding);
-            self
-        }
-        /// Enable decompressing responses.
-        #[must_use]
-        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
-            self.inner = self.inner.accept_compressed(encoding);
-            self
-        }
-        /// Limits the maximum size of a decoded message.
-        ///
-        /// Default: `4MB`
-        #[must_use]
-        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_decoding_message_size(limit);
-            self
-        }
-        /// Limits the maximum size of an encoded message.
-        ///
-        /// Default: `usize::MAX`
-        #[must_use]
-        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
-            self.inner = self.inner.max_encoding_message_size(limit);
-            self
-        }
-        /// Returns the status of the worker.
-        pub async fn status(
-            &mut self,
-            request: impl tonic::IntoRequest<()>,
-        ) -> std::result::Result<tonic::Response<super::WorkerStatus>, tonic::Status> {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::unknown(
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic::codec::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/remote_prover.WorkerStatusApi/Status",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("remote_prover.WorkerStatusApi", "Status"));
-            self.inner.unary(req, path, codec).await
-        }
-    }
-}
 /// Generated server implementations.
 pub mod api_server {
     #![allow(
@@ -594,7 +366,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = ProveSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -649,6 +421,121 @@ pub mod api_server {
         const NAME: &'static str = SERVICE_NAME;
     }
 }
+/// Generated client implementations.
+pub mod proxy_status_api_client {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
+    use tonic::codegen::*;
+    use tonic::codegen::http::Uri;
+    #[derive(Debug, Clone)]
+    pub struct ProxyStatusApiClient<T> {
+        inner: tonic::client::Grpc<T>,
+    }
+    impl ProxyStatusApiClient<tonic::transport::Channel> {
+        /// Attempt to create a new client by connecting to a given endpoint.
+        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
+        where
+            D: TryInto<tonic::transport::Endpoint>,
+            D::Error: Into<StdError>,
+        {
+            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
+            Ok(Self::new(conn))
+        }
+    }
+    impl<T> ProxyStatusApiClient<T>
+    where
+        T: tonic::client::GrpcService<tonic::body::Body>,
+        T::Error: Into<StdError>,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
+    {
+        pub fn new(inner: T) -> Self {
+            let inner = tonic::client::Grpc::new(inner);
+            Self { inner }
+        }
+        pub fn with_origin(inner: T, origin: Uri) -> Self {
+            let inner = tonic::client::Grpc::with_origin(inner, origin);
+            Self { inner }
+        }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> ProxyStatusApiClient<InterceptedService<T, F>>
+        where
+            F: tonic::service::Interceptor,
+            T::ResponseBody: Default,
+            T: tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+                Response = http::Response<
+                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
+                >,
+            >,
+            <T as tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
+        {
+            ProxyStatusApiClient::new(InterceptedService::new(inner, interceptor))
+        }
+        /// Compress requests with the given encoding.
+        ///
+        /// This requires the server to support it otherwise it might respond with an
+        /// error.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.send_compressed(encoding);
+            self
+        }
+        /// Enable decompressing responses.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.accept_compressed(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_decoding_message_size(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_encoding_message_size(limit);
+            self
+        }
+        /// Returns the status of the proxy.
+        pub async fn status(
+            &mut self,
+            request: impl tonic::IntoRequest<()>,
+        ) -> std::result::Result<tonic::Response<super::ProxyStatus>, tonic::Status> {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic_prost::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/remote_prover.ProxyStatusApi/Status",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("remote_prover.ProxyStatusApi", "Status"));
+            self.inner.unary(req, path, codec).await
+        }
+    }
+}
 /// Generated server implementations.
 pub mod proxy_status_api_server {
     #![allow(
@@ -769,7 +656,7 @@ pub mod proxy_status_api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = StatusSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -824,6 +711,121 @@ pub mod proxy_status_api_server {
         const NAME: &'static str = SERVICE_NAME;
     }
 }
+/// Generated client implementations.
+pub mod worker_status_api_client {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value,
+    )]
+    use tonic::codegen::*;
+    use tonic::codegen::http::Uri;
+    #[derive(Debug, Clone)]
+    pub struct WorkerStatusApiClient<T> {
+        inner: tonic::client::Grpc<T>,
+    }
+    impl WorkerStatusApiClient<tonic::transport::Channel> {
+        /// Attempt to create a new client by connecting to a given endpoint.
+        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
+        where
+            D: TryInto<tonic::transport::Endpoint>,
+            D::Error: Into<StdError>,
+        {
+            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
+            Ok(Self::new(conn))
+        }
+    }
+    impl<T> WorkerStatusApiClient<T>
+    where
+        T: tonic::client::GrpcService<tonic::body::Body>,
+        T::Error: Into<StdError>,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
+    {
+        pub fn new(inner: T) -> Self {
+            let inner = tonic::client::Grpc::new(inner);
+            Self { inner }
+        }
+        pub fn with_origin(inner: T, origin: Uri) -> Self {
+            let inner = tonic::client::Grpc::with_origin(inner, origin);
+            Self { inner }
+        }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> WorkerStatusApiClient<InterceptedService<T, F>>
+        where
+            F: tonic::service::Interceptor,
+            T::ResponseBody: Default,
+            T: tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+                Response = http::Response<
+                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
+                >,
+            >,
+            <T as tonic::codegen::Service<
+                http::Request<tonic::body::Body>,
+            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
+        {
+            WorkerStatusApiClient::new(InterceptedService::new(inner, interceptor))
+        }
+        /// Compress requests with the given encoding.
+        ///
+        /// This requires the server to support it otherwise it might respond with an
+        /// error.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.send_compressed(encoding);
+            self
+        }
+        /// Enable decompressing responses.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.accept_compressed(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_decoding_message_size(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_encoding_message_size(limit);
+            self
+        }
+        /// Returns the status of the worker.
+        pub async fn status(
+            &mut self,
+            request: impl tonic::IntoRequest<()>,
+        ) -> std::result::Result<tonic::Response<super::WorkerStatus>, tonic::Status> {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic_prost::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/remote_prover.WorkerStatusApi/Status",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(GrpcMethod::new("remote_prover.WorkerStatusApi", "Status"));
+            self.inner.unary(req, path, codec).await
+        }
+    }
+}
 /// Generated server implementations.
 pub mod worker_status_api_server {
     #![allow(
@@ -944,7 +946,7 @@ pub mod worker_status_api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = StatusSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
diff --git a/crates/proto/src/generated/rpc.rs b/crates/proto/src/generated/rpc.rs
index 9d4968b6f..a1a28e4e6 100644
--- a/crates/proto/src/generated/rpc.rs
+++ b/crates/proto/src/generated/rpc.rs
@@ -1,6 +1,6 @@
 // This file is @generated by prost-build.
 /// Represents the status of the node.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct RpcStatus {
     /// The rpc component's running version.
     #[prost(string, tag = "1")]
@@ -122,7 +122,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/rpc.Api/Status");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "Status"));
@@ -144,7 +144,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/rpc.Api/CheckNullifiers");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "CheckNullifiers"));
@@ -166,7 +166,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc.Api/GetAccountDetails",
             );
@@ -192,7 +192,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/rpc.Api/GetAccountProof");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "GetAccountProof"));
@@ -214,7 +214,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/rpc.Api/GetBlockByNumber");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "GetBlockByNumber"));
@@ -239,7 +239,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc.Api/GetBlockHeaderByNumber",
             );
@@ -264,7 +264,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/rpc.Api/GetNotesById");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "GetNotesById"));
@@ -286,7 +286,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc.Api/GetNoteScriptByRoot",
             );
@@ -315,7 +315,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc.Api/SubmitProvenTransaction",
             );
@@ -328,9 +328,9 @@ pub mod api_client {
         ///
         /// The batch may include transactions which were are:
         ///
-        ///   - already in the mempool i.e. previously successfully submitted
-        ///   - will be submitted to the mempool in the future
-        ///   - won't be submitted to the mempool at all
+        /// * already in the mempool i.e. previously successfully submitted
+        /// * will be submitted to the mempool in the future
+        /// * won't be submitted to the mempool at all
         ///
         /// All transactions in the batch but not in the mempool must build on the current mempool
         /// state following normal transaction submission rules.
@@ -351,7 +351,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc.Api/SubmitProvenBatch",
             );
@@ -379,7 +379,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/rpc.Api/SyncNullifiers");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "SyncNullifiers"));
@@ -403,7 +403,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/rpc.Api/SyncAccountVault");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "SyncAccountVault"));
@@ -433,7 +433,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/rpc.Api/SyncNotes");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "SyncNotes"));
@@ -469,7 +469,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/rpc.Api/SyncState");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "SyncState"));
@@ -493,7 +493,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/rpc.Api/SyncStorageMaps");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "SyncStorageMaps"));
@@ -517,7 +517,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/rpc.Api/SyncTransactions");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("rpc.Api", "SyncTransactions"));
@@ -614,9 +614,9 @@ pub mod api_server {
         ///
         /// The batch may include transactions which were are:
         ///
-        ///   - already in the mempool i.e. previously successfully submitted
-        ///   - will be submitted to the mempool in the future
-        ///   - won't be submitted to the mempool at all
+        /// * already in the mempool i.e. previously successfully submitted
+        /// * will be submitted to the mempool in the future
+        /// * won't be submitted to the mempool at all
         ///
         /// All transactions in the batch but not in the mempool must build on the current mempool
         /// state following normal transaction submission rules.
@@ -801,7 +801,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = StatusSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -848,7 +848,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = CheckNullifiersSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -893,7 +893,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetAccountDetailsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -941,7 +941,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetAccountProofSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -988,7 +988,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetBlockByNumberSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1037,7 +1037,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetBlockHeaderByNumberSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1082,7 +1082,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetNotesByIdSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1127,7 +1127,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetNoteScriptByRootSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1175,7 +1175,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SubmitProvenTransactionSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1223,7 +1223,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SubmitProvenBatchSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1271,7 +1271,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SyncNullifiersSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1319,7 +1319,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SyncAccountVaultSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1367,7 +1367,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SyncNotesSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1415,7 +1415,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SyncStateSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1463,7 +1463,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SyncStorageMapsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1511,7 +1511,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SyncTransactionsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
diff --git a/crates/proto/src/generated/rpc_store.rs b/crates/proto/src/generated/rpc_store.rs
index 0da5fdcb8..440d9dd12 100644
--- a/crates/proto/src/generated/rpc_store.rs
+++ b/crates/proto/src/generated/rpc_store.rs
@@ -1,6 +1,6 @@
 // This file is @generated by prost-build.
 /// Represents the status of the store.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct StoreStatus {
     /// The store's running version.
     #[prost(string, tag = "1")]
@@ -167,7 +167,7 @@ pub mod account_storage_details {
         /// Nested message and enum types in `MapEntries`.
         pub mod map_entries {
             /// Definition of individual storage entries.
-            #[derive(Clone, Copy, PartialEq, ::prost::Message)]
+            #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
             pub struct StorageMapEntry {
                 #[prost(message, optional, tag = "1")]
                 pub key: ::core::option::Option<
@@ -196,7 +196,7 @@ pub struct CheckNullifiersResponse {
     pub proofs: ::prost::alloc::vec::Vec<super::primitives::SmtOpening>,
 }
 /// Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct SyncNullifiersRequest {
     /// Block number from which the nullifiers are requested (inclusive).
     #[prost(message, optional, tag = "1")]
@@ -222,7 +222,7 @@ pub struct SyncNullifiersResponse {
 /// Nested message and enum types in `SyncNullifiersResponse`.
 pub mod sync_nullifiers_response {
     /// Represents a single nullifier update.
-    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
+    #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
     pub struct NullifierUpdate {
         /// Nullifier ID.
         #[prost(message, optional, tag = "1")]
@@ -281,7 +281,7 @@ pub struct SyncStateResponse {
 /// Account vault synchronization request.
 ///
 /// Allows requesters to sync asset values for specific public accounts within a block range.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct SyncAccountVaultRequest {
     /// Block range from which to start synchronizing.
     ///
@@ -305,7 +305,7 @@ pub struct SyncAccountVaultResponse {
     #[prost(message, repeated, tag = "2")]
     pub updates: ::prost::alloc::vec::Vec<AccountVaultUpdate>,
 }
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct AccountVaultUpdate {
     /// Vault key associated with the asset.
     #[prost(message, optional, tag = "1")]
@@ -322,7 +322,7 @@ pub struct AccountVaultUpdate {
 ///
 /// Specifies note tags that requester is interested in. The server will return the first block which
 /// contains a note matching `note_tags` or the chain tip.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct SyncNotesRequest {
     /// Block range from which to start synchronizing.
     #[prost(message, optional, tag = "1")]
@@ -354,7 +354,7 @@ pub struct SyncNotesResponse {
 ///
 /// Allows requesters to sync storage map values for specific public accounts within a block range,
 /// with support for cursor-based pagination to handle large storage maps.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct SyncStorageMapsRequest {
     /// Block range from which to start synchronizing.
     ///
@@ -379,7 +379,7 @@ pub struct SyncStorageMapsResponse {
     pub updates: ::prost::alloc::vec::Vec<StorageMapUpdate>,
 }
 /// Represents a single storage map update.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct StorageMapUpdate {
     /// Block number in which the slot was updated.
     #[prost(fixed32, tag = "1")]
@@ -395,14 +395,14 @@ pub struct StorageMapUpdate {
     pub value: ::core::option::Option<super::primitives::Digest>,
 }
 /// Represents a note script or nothing.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct MaybeNoteScript {
     /// The script for a note by its root.
     #[prost(message, optional, tag = "1")]
     pub script: ::core::option::Option<super::note::NoteScript>,
 }
 /// Represents a block range.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct BlockRange {
     /// Block number from which to start (inclusive).
     #[prost(fixed32, tag = "1")]
@@ -419,7 +419,7 @@ pub struct BlockRange {
 ///
 /// To request the next chunk, the requester should use `block_num + 1` from the previous response
 /// as the `block_from` for the next request.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct PaginationInfo {
     /// Current chain tip
     #[prost(fixed32, tag = "1")]
@@ -571,7 +571,7 @@ pub mod rpc_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/rpc_store.Rpc/Status");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("rpc_store.Rpc", "Status"));
@@ -593,7 +593,7 @@ pub mod rpc_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc_store.Rpc/CheckNullifiers",
             );
@@ -618,7 +618,7 @@ pub mod rpc_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc_store.Rpc/GetAccountDetails",
             );
@@ -643,7 +643,7 @@ pub mod rpc_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc_store.Rpc/GetAccountProof",
             );
@@ -668,7 +668,7 @@ pub mod rpc_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc_store.Rpc/GetBlockByNumber",
             );
@@ -696,7 +696,7 @@ pub mod rpc_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc_store.Rpc/GetBlockHeaderByNumber",
             );
@@ -721,7 +721,7 @@ pub mod rpc_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc_store.Rpc/GetNotesById",
             );
@@ -746,7 +746,7 @@ pub mod rpc_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc_store.Rpc/GetNoteScriptByRoot",
             );
@@ -773,7 +773,7 @@ pub mod rpc_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc_store.Rpc/SyncNullifiers",
             );
@@ -806,7 +806,7 @@ pub mod rpc_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/rpc_store.Rpc/SyncNotes");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("rpc_store.Rpc", "SyncNotes"));
@@ -842,7 +842,7 @@ pub mod rpc_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/rpc_store.Rpc/SyncState");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("rpc_store.Rpc", "SyncState"));
@@ -864,7 +864,7 @@ pub mod rpc_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc_store.Rpc/SyncAccountVault",
             );
@@ -889,7 +889,7 @@ pub mod rpc_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc_store.Rpc/SyncStorageMaps",
             );
@@ -914,7 +914,7 @@ pub mod rpc_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/rpc_store.Rpc/SyncTransactions",
             );
@@ -1171,7 +1171,7 @@ pub mod rpc_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = StatusSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1214,7 +1214,7 @@ pub mod rpc_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = CheckNullifiersSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1259,7 +1259,7 @@ pub mod rpc_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetAccountDetailsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1302,7 +1302,7 @@ pub mod rpc_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetAccountProofSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1349,7 +1349,7 @@ pub mod rpc_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetBlockByNumberSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1398,7 +1398,7 @@ pub mod rpc_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetBlockHeaderByNumberSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1443,7 +1443,7 @@ pub mod rpc_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetNotesByIdSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1488,7 +1488,7 @@ pub mod rpc_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = GetNoteScriptByRootSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1533,7 +1533,7 @@ pub mod rpc_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SyncNullifiersSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1576,7 +1576,7 @@ pub mod rpc_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SyncNotesSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1619,7 +1619,7 @@ pub mod rpc_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SyncStateSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1664,7 +1664,7 @@ pub mod rpc_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SyncAccountVaultSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1709,7 +1709,7 @@ pub mod rpc_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SyncStorageMapsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -1754,7 +1754,7 @@ pub mod rpc_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SyncTransactionsSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
diff --git a/crates/proto/src/generated/shared.rs b/crates/proto/src/generated/shared.rs
index 9661eda28..c68ba0f66 100644
--- a/crates/proto/src/generated/shared.rs
+++ b/crates/proto/src/generated/shared.rs
@@ -3,7 +3,7 @@
 /// path and current forest which validate the block's inclusion in the chain.
 ///
 /// The Merkle path is an MMR proof for the block's leaf, based on the current chain length.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct BlockHeaderByNumberRequest {
     /// The target block height, defaults to latest if not provided.
     #[prost(uint32, optional, tag = "1")]
diff --git a/crates/proto/src/generated/transaction.rs b/crates/proto/src/generated/transaction.rs
index f2ce1944c..e02a63636 100644
--- a/crates/proto/src/generated/transaction.rs
+++ b/crates/proto/src/generated/transaction.rs
@@ -1,6 +1,6 @@
 // This file is @generated by prost-build.
 /// Submits proven transaction to the Miden network.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProvenTransaction {
     /// Transaction encoded using \[winter_utils::Serializable\] implementation for
     /// \[miden_objects::transaction::proven_tx::ProvenTransaction\].
@@ -11,7 +11,7 @@ pub struct ProvenTransaction {
     #[prost(bytes = "vec", optional, tag = "2")]
     pub transaction_inputs: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
 }
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProvenTransactionBatch {
     /// Encoded using \[winter_utils::Serializable\] implementation for
     /// \[miden_objects::transaction::proven_tx::ProvenTransaction\].
@@ -19,14 +19,14 @@ pub struct ProvenTransactionBatch {
     pub encoded: ::prost::alloc::vec::Vec<u8>,
 }
 /// Represents a transaction ID.
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct TransactionId {
     /// The transaction ID.
     #[prost(message, optional, tag = "1")]
     pub id: ::core::option::Option<super::primitives::Digest>,
 }
 /// Represents a transaction summary.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct TransactionSummary {
     /// A unique 32-byte identifier of a transaction.
     #[prost(message, optional, tag = "1")]
diff --git a/crates/proto/src/generated/validator.rs b/crates/proto/src/generated/validator.rs
index e532c2396..a5a31a35f 100644
--- a/crates/proto/src/generated/validator.rs
+++ b/crates/proto/src/generated/validator.rs
@@ -1,6 +1,6 @@
 // This file is @generated by prost-build.
 /// Represents the status of the validator.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ValidatorStatus {
     /// The validator's running version.
     #[prost(string, tag = "1")]
@@ -117,7 +117,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/validator.Api/Status");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("validator.Api", "Status"));
@@ -138,7 +138,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/validator.Api/SubmitProvenTransaction",
             );
@@ -274,7 +274,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = StatusSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -322,7 +322,7 @@ pub mod api_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SubmitProvenTransactionSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
diff --git a/crates/remote-prover-client/Cargo.toml b/crates/remote-prover-client/Cargo.toml
index a3b9ecfd4..049fb1621 100644
--- a/crates/remote-prover-client/Cargo.toml
+++ b/crates/remote-prover-client/Cargo.toml
@@ -22,18 +22,17 @@ tx-prover    = ["dep:miden-objects", "dep:miden-tx", "dep:tokio"]
 
 [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
 getrandom             = { features = ["wasm_js"], version = "0.3" }
-tonic                 = { default-features = false, features = ["codegen", "prost"], version = "0.13" }
-tonic-web-wasm-client = { default-features = false, version = "0.7" }
+tonic                 = { default-features = false, features = ["codegen"], version = "0.14" }
+tonic-web-wasm-client = { default-features = false, version = "0.8" }
 
 [target.'cfg(not(all(target_arch = "wasm32", target_os = "unknown")))'.dependencies]
 tonic = { default-features = false, features = [
   "codegen",
-  "prost",
   "tls-native-roots",
   "tls-ring",
   "transport",
-], version = "0.13" }
-tonic-web = { optional = true, version = "0.13" }
+], version = "0.14" }
+tonic-web = { optional = true, version = "0.14" }
 
 [lints]
 workspace = true
@@ -41,14 +40,12 @@ workspace = true
 [dependencies]
 miden-objects = { optional = true, workspace = true }
 miden-tx      = { optional = true, workspace = true }
-prost         = { default-features = false, features = ["derive"], version = "0.13" }
+prost         = { default-features = false, features = ["derive"], version = "0.14" }
 thiserror     = { workspace = true }
 tokio         = { default-features = false, features = ["sync"], optional = true, version = "1.44" }
+tonic-prost   = { workspace = true }
 
 [build-dependencies]
 miden-node-proto-build = { workspace = true }
 miette                 = { features = ["fancy"], version = "7.5" }
-prost                  = { default-features = false, features = ["derive"], version = "0.13" }
-prost-build            = { version = "0.13" }
-protox                 = { version = "0.8" }
-tonic-build            = { version = "0.13" }
+tonic-prost-build      = { workspace = true }
diff --git a/crates/remote-prover-client/build.rs b/crates/remote-prover-client/build.rs
index 6da93f606..4a6c5e254 100644
--- a/crates/remote-prover-client/build.rs
+++ b/crates/remote-prover-client/build.rs
@@ -3,7 +3,7 @@ use std::io::Write;
 
 use miden_node_proto_build::remote_prover_api_descriptor;
 use miette::IntoDiagnostic;
-use tonic_build::FileDescriptorSet;
+use tonic_prost_build::FileDescriptorSet;
 
 /// Defines whether the build script should generate files in `/src`.
 ///
@@ -46,11 +46,11 @@ fn build_tonic_from_descriptor(
     out_dir: String,
     build_transport: bool,
 ) -> miette::Result<()> {
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .out_dir(out_dir)
         .build_server(false)
         .build_transport(build_transport)
-        .compile_fds_with_config(prost_build::Config::new(), descriptor)
+        .compile_fds_with_config(descriptor, tonic_prost_build::Config::new())
         .into_diagnostic()
 }
 
diff --git a/crates/remote-prover-client/src/remote_prover/generated/nostd/remote_prover.rs b/crates/remote-prover-client/src/remote_prover/generated/nostd/remote_prover.rs
index e10a0603c..53326a3fb 100644
--- a/crates/remote-prover-client/src/remote_prover/generated/nostd/remote_prover.rs
+++ b/crates/remote-prover-client/src/remote_prover/generated/nostd/remote_prover.rs
@@ -1,30 +1,32 @@
 // This file is @generated by prost-build.
 /// Request message for proof generation containing payload and proof type metadata.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProofRequest {
     /// Type of proof being requested, determines payload interpretation
     #[prost(enumeration = "ProofType", tag = "1")]
     pub proof_type: i32,
     /// Serialized payload requiring proof generation. The encoding format is
     /// type-specific:
-    /// - TRANSACTION: TransactionInputs encoded.
-    /// - BATCH: ProposedBatch encoded.
-    /// - BLOCK: ProposedBlock encoded.
+    ///
+    /// * TRANSACTION: TransactionInputs encoded.
+    /// * BATCH: ProposedBatch encoded.
+    /// * BLOCK: ProposedBlock encoded.
     #[prost(bytes = "vec", tag = "2")]
     pub payload: ::prost::alloc::vec::Vec<u8>,
 }
 /// Response message containing the generated proof.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Proof {
     /// Serialized proof bytes.
-    /// - TRANSACTION: Returns an encoded ProvenTransaction.
-    /// - BATCH: Returns an encoded ProvenBatch.
-    /// - BLOCK: Returns an encoded ProvenBlock.
+    ///
+    /// * TRANSACTION: Returns an encoded ProvenTransaction.
+    /// * BATCH: Returns an encoded ProvenBatch.
+    /// * BLOCK: Returns an encoded ProvenBlock.
     #[prost(bytes = "vec", tag = "1")]
     pub payload: ::prost::alloc::vec::Vec<u8>,
 }
 /// Status of an individual worker in the proxy.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProxyWorkerStatus {
     /// The address of the worker.
     #[prost(string, tag = "1")]
@@ -50,7 +52,7 @@ pub struct ProxyStatus {
     pub workers: ::prost::alloc::vec::Vec<ProxyWorkerStatus>,
 }
 /// Response message containing the status of the worker.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct WorkerStatus {
     /// The version of the worker.
     #[prost(string, tag = "1")]
@@ -222,7 +224,7 @@ pub mod api_client {
                         alloc::format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/remote_prover.Api/Prove");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("remote_prover.Api", "Prove"));
@@ -323,7 +325,7 @@ pub mod proxy_status_api_client {
                         alloc::format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/remote_prover.ProxyStatusApi/Status",
             );
@@ -427,7 +429,7 @@ pub mod worker_status_api_client {
                         alloc::format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/remote_prover.WorkerStatusApi/Status",
             );
diff --git a/crates/remote-prover-client/src/remote_prover/generated/std/remote_prover.rs b/crates/remote-prover-client/src/remote_prover/generated/std/remote_prover.rs
index 87deb784a..7f33a307f 100644
--- a/crates/remote-prover-client/src/remote_prover/generated/std/remote_prover.rs
+++ b/crates/remote-prover-client/src/remote_prover/generated/std/remote_prover.rs
@@ -1,30 +1,32 @@
 // This file is @generated by prost-build.
 /// Request message for proof generation containing payload and proof type metadata.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProofRequest {
     /// Type of proof being requested, determines payload interpretation
     #[prost(enumeration = "ProofType", tag = "1")]
     pub proof_type: i32,
     /// Serialized payload requiring proof generation. The encoding format is
     /// type-specific:
-    /// - TRANSACTION: TransactionInputs encoded.
-    /// - BATCH: ProposedBatch encoded.
-    /// - BLOCK: ProposedBlock encoded.
+    ///
+    /// * TRANSACTION: TransactionInputs encoded.
+    /// * BATCH: ProposedBatch encoded.
+    /// * BLOCK: ProposedBlock encoded.
     #[prost(bytes = "vec", tag = "2")]
     pub payload: ::prost::alloc::vec::Vec<u8>,
 }
 /// Response message containing the generated proof.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct Proof {
     /// Serialized proof bytes.
-    /// - TRANSACTION: Returns an encoded ProvenTransaction.
-    /// - BATCH: Returns an encoded ProvenBatch.
-    /// - BLOCK: Returns an encoded ProvenBlock.
+    ///
+    /// * TRANSACTION: Returns an encoded ProvenTransaction.
+    /// * BATCH: Returns an encoded ProvenBatch.
+    /// * BLOCK: Returns an encoded ProvenBlock.
     #[prost(bytes = "vec", tag = "1")]
     pub payload: ::prost::alloc::vec::Vec<u8>,
 }
 /// Status of an individual worker in the proxy.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ProxyWorkerStatus {
     /// The address of the worker.
     #[prost(string, tag = "1")]
@@ -50,7 +52,7 @@ pub struct ProxyStatus {
     pub workers: ::prost::alloc::vec::Vec<ProxyWorkerStatus>,
 }
 /// Response message containing the status of the worker.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct WorkerStatus {
     /// The version of the worker.
     #[prost(string, tag = "1")]
@@ -233,7 +235,7 @@ pub mod api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static("/remote_prover.Api/Prove");
             let mut req = request.into_request();
             req.extensions_mut().insert(GrpcMethod::new("remote_prover.Api", "Prove"));
@@ -345,7 +347,7 @@ pub mod proxy_status_api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/remote_prover.ProxyStatusApi/Status",
             );
@@ -460,7 +462,7 @@ pub mod worker_status_api_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/remote_prover.WorkerStatusApi/Status",
             );
diff --git a/crates/rpc/Cargo.toml b/crates/rpc/Cargo.toml
index dff596a7c..84e305e30 100644
--- a/crates/rpc/Cargo.toml
+++ b/crates/rpc/Cargo.toml
@@ -18,7 +18,7 @@ workspace = true
 anyhow                 = { workspace = true }
 futures                = { version = "0.3" }
 http                   = { workspace = true }
-mediatype              = { version = "0.20" }
+mediatype              = { version = "0.21" }
 miden-node-proto       = { workspace = true }
 miden-node-proto-build = { workspace = true }
 miden-node-utils       = { workspace = true }
@@ -30,7 +30,7 @@ tokio                  = { features = ["macros", "net", "rt-multi-thread"], work
 tokio-stream           = { features = ["net"], workspace = true }
 tonic                  = { features = ["tls-native-roots", "tls-ring"], workspace = true }
 tonic-reflection       = { workspace = true }
-tonic-web              = { version = "0.13" }
+tonic-web              = { version = "0.14" }
 tower                  = { workspace = true }
 tower-http             = { features = ["trace"], workspace = true }
 tracing                = { workspace = true }
diff --git a/crates/store/Cargo.toml b/crates/store/Cargo.toml
index e74692597..830bd7ffc 100644
--- a/crates/store/Cargo.toml
+++ b/crates/store/Cargo.toml
@@ -34,7 +34,7 @@ serde                  = { features = ["derive"], version = "1" }
 thiserror              = { workspace = true }
 tokio                  = { features = ["fs", "rt-multi-thread"], workspace = true }
 tokio-stream           = { features = ["net"], workspace = true }
-toml                   = { version = "0.8" }
+toml                   = { version = "0.9" }
 tonic                  = { workspace = true }
 tonic-reflection       = { workspace = true }
 tower-http             = { features = ["util"], workspace = true }
diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml
index 436e5d834..1c28ce8fb 100644
--- a/crates/utils/Cargo.toml
+++ b/crates/utils/Cargo.toml
@@ -28,17 +28,17 @@ http                  = { workspace = true }
 http-body-util        = { version = "0.1" }
 itertools             = { workspace = true }
 miden-objects         = { workspace = true }
-opentelemetry         = { version = "0.30" }
-opentelemetry-otlp    = { default-features = false, features = ["grpc-tonic", "tls-roots", "trace"], version = "0.30" }
-opentelemetry_sdk     = { features = ["rt-tokio", "testing"], version = "0.30" }
+opentelemetry         = { version = "0.31" }
+opentelemetry-otlp    = { default-features = false, features = ["grpc-tonic", "tls-roots", "trace"], version = "0.31" }
+opentelemetry_sdk     = { features = ["rt-tokio", "testing"], version = "0.31" }
 rand                  = { workspace = true }
 serde                 = { features = ["derive"], version = "1.0" }
 thiserror             = { workspace = true }
 tonic                 = { workspace = true }
 tower-http            = { features = ["catch-panic"], workspace = true }
 tracing               = { workspace = true }
-tracing-forest        = { features = ["chrono"], optional = true, version = "0.1" }
-tracing-opentelemetry = { version = "0.31" }
+tracing-forest        = { features = ["chrono"], optional = true, version = "0.2" }
+tracing-opentelemetry = { version = "0.32" }
 tracing-subscriber    = { workspace = true }
 url                   = { workspace = true }
 
diff --git a/crates/utils/src/tracing/grpc.rs b/crates/utils/src/tracing/grpc.rs
index a4721cd73..f5d0951bf 100644
--- a/crates/utils/src/tracing/grpc.rs
+++ b/crates/utils/src/tracing/grpc.rs
@@ -35,7 +35,7 @@ pub fn grpc_trace_fn<T>(request: &http::Request<T>) -> tracing::Span {
             request.headers().clone(),
         )))
     });
-    tracing_opentelemetry::OpenTelemetrySpanExt::set_parent(&span, otel_ctx);
+    let _ = tracing_opentelemetry::OpenTelemetrySpanExt::set_parent(&span, otel_ctx);
 
     // Adds various network attributes to the span, including remote address and port.
     //
diff --git a/proto/Cargo.toml b/proto/Cargo.toml
index f82ddd25c..ba7d15f26 100644
--- a/proto/Cargo.toml
+++ b/proto/Cargo.toml
@@ -20,11 +20,10 @@ internal = []
 workspace = true
 
 [dependencies]
-protox      = { version = "0.8" }
-tonic-build = { version = "0.13" }
+protox            = { workspace = true }
+tonic-prost-build = { workspace = true }
 
 [build-dependencies]
 fs-err = { workspace = true }
 miette = { version = "7.6" }
-prost  = { workspace = true }
-protox = { version = "0.8" }
+protox = { workspace = true }
diff --git a/proto/build.rs b/proto/build.rs
index 2e90174db..87eb57e55 100644
--- a/proto/build.rs
+++ b/proto/build.rs
@@ -3,7 +3,7 @@ use std::path::PathBuf;
 
 use fs_err as fs;
 use miette::{Context, IntoDiagnostic};
-use prost::Message;
+use protox::prost::Message;
 
 const RPC_PROTO: &str = "rpc.proto";
 const STORE_RPC_PROTO: &str = "store/rpc.proto";
diff --git a/proto/src/lib.rs b/proto/src/lib.rs
index 24632115f..14ded322f 100644
--- a/proto/src/lib.rs
+++ b/proto/src/lib.rs
@@ -1,5 +1,5 @@
 use protox::prost::Message;
-use tonic_build::FileDescriptorSet;
+use tonic_prost_build::FileDescriptorSet;
 
 /// Returns the Protobuf file descriptor for the RPC API.
 pub fn rpc_api_descriptor() -> FileDescriptorSet {

From 782db94b03e729e1c83f4840604cdeebecbd24ac Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Tue, 4 Nov 2025 10:44:18 +0100
Subject: [PATCH 66/78] feat: add account tree with history (#1292)

Its features are not yet exposed through the RPC.
---
 CHANGELOG.md                                  |   1 +
 Cargo.lock                                    | 174 +++++-
 Cargo.toml                                    |   2 +-
 .../src/test_utils/proven_tx.rs               |   2 +-
 crates/proto/src/domain/account.rs            |  22 +-
 crates/proto/src/domain/block.rs              |  15 +
 crates/proto/src/domain/merkle.rs             |   5 +-
 crates/proto/src/generated/rpc_store.rs       |  18 +-
 crates/store/Cargo.toml                       |  10 +-
 .../store/benches/account_tree_historical.rs  | 238 ++++++++
 crates/store/src/accounts/mod.rs              | 460 +++++++++++++++
 crates/store/src/accounts/tests.rs            | 523 ++++++++++++++++++
 .../store/src/db/models/queries/accounts.rs   |   1 -
 crates/store/src/errors.rs                    |   4 +
 crates/store/src/genesis/mod.rs               |  20 +-
 crates/store/src/lib.rs                       |   7 +
 crates/store/src/state.rs                     |  84 ++-
 proto/proto/store/rpc.proto                   |  18 +-
 18 files changed, 1536 insertions(+), 68 deletions(-)
 create mode 100644 crates/store/benches/account_tree_historical.rs
 create mode 100644 crates/store/src/accounts/mod.rs
 create mode 100644 crates/store/src/accounts/tests.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed77b284c..83f1243f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - [BREAKING] Response type nuances of `GetAccountProof` in the public store API (#[1277](https://github.com/0xMiden/miden-node/pull/1277)).
 - Add `validator` crate with initial protobuf, gRPC server, and sub-command (#[1293](https://github.com/0xMiden/miden-node/pull/1293)).
 - Add optional `TransactionInputs` field to `SubmitProvenTransaction` endpoint for transaction re-execution (#[1278](https://github.com/0xMiden/miden-node/pull/1278)).
+- [BREAKING] Added `AccountTreeWithHistory` and integrate historical queries into `GetAccountProof` ([#1292](https://github.com/0xMiden/miden-node/pull/1292)).
 
 ## v0.11.2 (2025-09-10)
 
diff --git a/Cargo.lock b/Cargo.lock
index f9db50bdc..3d92ccc3b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -89,6 +89,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
 [[package]]
 name = "anstream"
 version = "0.6.21"
@@ -500,11 +506,17 @@ dependencies = [
  "thiserror 2.0.17",
 ]
 
+[[package]]
+name = "cast"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+
 [[package]]
 name = "cc"
-version = "1.2.43"
+version = "1.2.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "739eb0f94557554b3ca9a86d2d37bebd49c5e6d0c1d2bda35ba5bdac830befc2"
+checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -583,6 +595,33 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
+[[package]]
+name = "ciborium"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -744,6 +783,42 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "criterion"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
+dependencies = [
+ "anes",
+ "cast",
+ "ciborium",
+ "clap 4.5.51",
+ "criterion-plot",
+ "is-terminal",
+ "itertools 0.10.5",
+ "num-traits",
+ "once_cell",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
+dependencies = [
+ "cast",
+ "itertools 0.10.5",
+]
+
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.6"
@@ -778,6 +853,12 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
 [[package]]
 name = "crypto-bigint"
 version = "0.5.5"
@@ -1523,6 +1604,17 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "half"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+ "zerocopy",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -1950,6 +2042,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "is-terminal"
+version = "0.4.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
+dependencies = [
+ "hermit-abi 0.5.2",
+ "libc",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "is_ci"
 version = "1.2.0"
@@ -1962,6 +2065,15 @@ version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.14.0"
@@ -2053,7 +2165,7 @@ dependencies = [
  "ascii-canvas",
  "bit-set",
  "ena",
- "itertools",
+ "itertools 0.14.0",
  "lalrpop-util",
  "petgraph",
  "regex",
@@ -2508,7 +2620,7 @@ dependencies = [
  "anyhow",
  "assert_matches",
  "futures",
- "itertools",
+ "itertools 0.14.0",
  "miden-block-prover",
  "miden-lib",
  "miden-node-proto",
@@ -2634,11 +2746,13 @@ version = "0.12.0"
 dependencies = [
  "anyhow",
  "assert_matches",
+ "criterion",
  "deadpool",
  "deadpool-diesel",
  "deadpool-sync",
  "diesel",
  "diesel_migrations",
+ "fs-err",
  "hex",
  "indexmap 2.12.0",
  "miden-lib",
@@ -2702,7 +2816,7 @@ dependencies = [
  "figment",
  "http",
  "http-body-util",
- "itertools",
+ "itertools 0.14.0",
  "miden-objects",
  "opentelemetry",
  "opentelemetry-otlp",
@@ -2879,7 +2993,7 @@ version = "0.12.0"
 source = "git+https://github.com/0xMiden/miden-base?branch=next#f14d0eb719c6e124e4101eb8a75c279edc00c29c"
 dependencies = [
  "anyhow",
- "itertools",
+ "itertools 0.14.0",
  "miden-block-prover",
  "miden-lib",
  "miden-objects",
@@ -3257,6 +3371,12 @@ version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
+[[package]]
+name = "oorandom"
+version = "11.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
+
 [[package]]
 name = "opaque-debug"
 version = "0.3.1"
@@ -3749,6 +3869,34 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
+[[package]]
+name = "plotters"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
+dependencies = [
+ "plotters-backend",
+]
+
 [[package]]
 name = "poly1305"
 version = "0.8.0"
@@ -3946,7 +4094,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac6c3320f9abac597dcbc668774ef006702672474aad53c6d596b62e487b40b1"
 dependencies = [
  "heck 0.5.0",
- "itertools",
+ "itertools 0.14.0",
  "log",
  "multimap",
  "once_cell",
@@ -3968,7 +4116,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425"
 dependencies = [
  "anyhow",
- "itertools",
+ "itertools 0.14.0",
  "proc-macro2",
  "quote",
  "syn 2.0.108",
@@ -5204,6 +5352,16 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "tokio"
 version = "1.48.0"
diff --git a/Cargo.toml b/Cargo.toml
index 33ea70d30..95b57a64f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -57,7 +57,7 @@ miden-tx              = { branch = "next", default-features = false, git = "http
 miden-tx-batch-prover = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
 
 # Other miden dependencies. These should align with those expected by miden-base.
-miden-air = { features = ["std", "testing"], version = "0.18" }
+miden-air = { features = ["std", "testing"], version = "0.18.1" }
 
 # External dependencies
 anyhow             = { version = "1.0" }
diff --git a/crates/block-producer/src/test_utils/proven_tx.rs b/crates/block-producer/src/test_utils/proven_tx.rs
index 22bf1d4ca..b6a946894 100644
--- a/crates/block-producer/src/test_utils/proven_tx.rs
+++ b/crates/block-producer/src/test_utils/proven_tx.rs
@@ -143,7 +143,7 @@ impl MockProvenTxBuilder {
             self.initial_account_commitment,
             self.final_account_commitment,
             Word::empty(),
-            BlockNumber::from(0),
+            BlockNumber::GENESIS,
             Word::empty(),
             self.fee,
             self.expiration_block_num,
diff --git a/crates/proto/src/domain/account.rs b/crates/proto/src/domain/account.rs
index 494f16671..8d690803c 100644
--- a/crates/proto/src/domain/account.rs
+++ b/crates/proto/src/domain/account.rs
@@ -107,7 +107,8 @@ impl From<&AccountInfo> for proto::account::AccountDetails {
 /// Represents a request for an account proof.
 pub struct AccountProofRequest {
     pub account_id: AccountId,
-    pub block_num: BlockNumber,
+    // If not present, the latest account proof references the latest available
+    pub block_num: Option<BlockNumber>,
     pub details: Option<AccountDetailRequest>,
 }
 
@@ -120,14 +121,11 @@ impl TryFrom<proto::rpc_store::AccountProofRequest> for AccountProofRequest {
         let account_id = account_id
             .ok_or(proto::rpc_store::AccountProofRequest::missing_field(stringify!(account_id)))?
             .try_into()?;
+        let block_num = block_num.map(Into::into);
 
         let details = details.map(TryFrom::try_from).transpose()?;
 
-        Ok(AccountProofRequest {
-            account_id,
-            block_num: block_num.into(),
-            details,
-        })
+        Ok(AccountProofRequest { account_id, block_num, details })
     }
 }
 
@@ -522,6 +520,7 @@ pub struct AccountDetails {
 
 /// Represents the response to an account proof request.
 pub struct AccountProofResponse {
+    pub block_num: BlockNumber,
     pub witness: AccountWitness,
     pub details: Option<AccountDetails>,
 }
@@ -530,7 +529,11 @@ impl TryFrom<proto::rpc_store::AccountProofResponse> for AccountProofResponse {
     type Error = ConversionError;
 
     fn try_from(value: proto::rpc_store::AccountProofResponse) -> Result<Self, Self::Error> {
-        let proto::rpc_store::AccountProofResponse { witness, details } = value;
+        let proto::rpc_store::AccountProofResponse { block_num, witness, details } = value;
+
+        let block_num = block_num
+            .ok_or(proto::rpc_store::AccountProofResponse::missing_field(stringify!(block_num)))?
+            .into();
 
         let witness = witness
             .ok_or(proto::rpc_store::AccountProofResponse::missing_field(stringify!(witness)))?
@@ -538,17 +541,18 @@ impl TryFrom<proto::rpc_store::AccountProofResponse> for AccountProofResponse {
 
         let details = details.map(TryFrom::try_from).transpose()?;
 
-        Ok(AccountProofResponse { witness, details })
+        Ok(AccountProofResponse { block_num, witness, details })
     }
 }
 
 impl From<AccountProofResponse> for proto::rpc_store::AccountProofResponse {
     fn from(value: AccountProofResponse) -> Self {
-        let AccountProofResponse { witness, details } = value;
+        let AccountProofResponse { block_num, witness, details } = value;
 
         Self {
             witness: Some(witness.into()),
             details: details.map(Into::into),
+            block_num: Some(block_num.into()),
         }
     }
 }
diff --git a/crates/proto/src/domain/block.rs b/crates/proto/src/domain/block.rs
index dd449e2b9..a64427d1a 100644
--- a/crates/proto/src/domain/block.rs
+++ b/crates/proto/src/domain/block.rs
@@ -17,6 +17,21 @@ use thiserror::Error;
 use crate::errors::{ConversionError, MissingFieldHelper};
 use crate::{AccountWitnessRecord, NullifierWitnessRecord, generated as proto};
 
+// BLOCK NUMBER
+// ================================================================================================
+
+impl From<BlockNumber> for proto::blockchain::BlockNumber {
+    fn from(value: BlockNumber) -> Self {
+        proto::blockchain::BlockNumber { block_num: value.as_u32() }
+    }
+}
+
+impl From<proto::blockchain::BlockNumber> for BlockNumber {
+    fn from(value: proto::blockchain::BlockNumber) -> Self {
+        BlockNumber::from(value.block_num)
+    }
+}
+
 // BLOCK HEADER
 // ================================================================================================
 
diff --git a/crates/proto/src/domain/merkle.rs b/crates/proto/src/domain/merkle.rs
index 61b49c9e8..6d3845625 100644
--- a/crates/proto/src/domain/merkle.rs
+++ b/crates/proto/src/domain/merkle.rs
@@ -183,11 +183,9 @@ impl TryFrom<proto::primitives::SmtOpening> for SmtProof {
     type Error = ConversionError;
 
     fn try_from(opening: proto::primitives::SmtOpening) -> Result<Self, Self::Error> {
-        let path = opening
+        let path: SparseMerklePath = opening
             .path
-            .as_ref()
             .ok_or(proto::primitives::SmtOpening::missing_field(stringify!(path)))?
-            .clone()
             .try_into()?;
         let leaf: SmtLeaf = opening
             .leaf
@@ -201,7 +199,6 @@ impl TryFrom<proto::primitives::SmtOpening> for SmtProof {
 impl From<SmtProof> for proto::primitives::SmtOpening {
     fn from(proof: SmtProof) -> Self {
         let (path, leaf) = proof.into_parts();
-
         Self {
             path: Some(path.into()),
             leaf: Some(leaf.into()),
diff --git a/crates/proto/src/generated/rpc_store.rs b/crates/proto/src/generated/rpc_store.rs
index 440d9dd12..8c5f5d21f 100644
--- a/crates/proto/src/generated/rpc_store.rs
+++ b/crates/proto/src/generated/rpc_store.rs
@@ -18,9 +18,10 @@ pub struct AccountProofRequest {
     /// ID of the account for which we want to get data
     #[prost(message, optional, tag = "1")]
     pub account_id: ::core::option::Option<super::account::AccountId>,
-    /// Block at which we'd like to get this data. Must be close to the chain tip.
-    #[prost(fixed32, tag = "2")]
-    pub block_num: u32,
+    /// Block at which we'd like to get this data. If present, must be close to the chain tip.
+    /// If not present, data from the latest block will be returned.
+    #[prost(message, optional, tag = "2")]
+    pub block_num: ::core::option::Option<super::blockchain::BlockNumber>,
     /// Request for additional account details; valid only for public accounts.
     #[prost(message, optional, tag = "3")]
     pub details: ::core::option::Option<account_proof_request::AccountDetailRequest>,
@@ -89,11 +90,14 @@ pub mod account_proof_request {
 /// Represents the result of getting account proof.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AccountProofResponse {
-    /// Account ID, current state commitment, and SMT path
+    /// The block number at which the account witness was created and the account details were observed.
     #[prost(message, optional, tag = "1")]
-    pub witness: ::core::option::Option<super::account::AccountWitness>,
-    /// Additional details for public accounts
+    pub block_num: ::core::option::Option<super::blockchain::BlockNumber>,
+    /// Account ID, current state commitment, and SMT path.
     #[prost(message, optional, tag = "2")]
+    pub witness: ::core::option::Option<super::account::AccountWitness>,
+    /// Additional details for public accounts.
+    #[prost(message, optional, tag = "3")]
     pub details: ::core::option::Option<account_proof_response::AccountDetails>,
 }
 /// Nested message and enum types in `AccountProofResponse`.
@@ -106,7 +110,7 @@ pub mod account_proof_response {
         /// Account storage data
         #[prost(message, optional, tag = "2")]
         pub storage_details: ::core::option::Option<super::AccountStorageDetails>,
-        /// Account code; empty if code commitments matched or none was requested
+        /// Account code; empty if code commitments matched or none was requested.
         #[prost(bytes = "vec", optional, tag = "3")]
         pub code: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
         /// Account asset vault data; empty if vault commitments matched or the requester
diff --git a/crates/store/Cargo.toml b/crates/store/Cargo.toml
index 830bd7ffc..f490cf4b7 100644
--- a/crates/store/Cargo.toml
+++ b/crates/store/Cargo.toml
@@ -27,7 +27,8 @@ miden-lib              = { workspace = true }
 miden-node-proto       = { workspace = true }
 miden-node-proto-build = { features = ["internal"], workspace = true }
 miden-node-utils       = { workspace = true }
-miden-objects          = { workspace = true }
+miden-objects          = { features = ["std"], workspace = true }
+pretty_assertions      = { workspace = true }
 rand                   = { workspace = true }
 rand_chacha            = { workspace = true }
 serde                  = { features = ["derive"], version = "1" }
@@ -42,11 +43,16 @@ tracing                = { workspace = true }
 
 [dev-dependencies]
 assert_matches        = { workspace = true }
+criterion             = { version = "0.5" }
+fs-err                = { workspace = true }
 miden-lib             = { features = ["testing"], workspace = true }
 miden-node-test-macro = { workspace = true }
 miden-node-utils      = { features = ["testing", "tracing-forest"], workspace = true }
 miden-objects         = { default-features = true, features = ["testing"], workspace = true }
-pretty_assertions     = { workspace = true }
 rand                  = { workspace = true }
 regex                 = { version = "1.11" }
 termtree              = { version = "0.5" }
+
+[[bench]]
+harness = false
+name    = "account_tree_historical"
diff --git a/crates/store/benches/account_tree_historical.rs b/crates/store/benches/account_tree_historical.rs
new file mode 100644
index 000000000..dbb538d5a
--- /dev/null
+++ b/crates/store/benches/account_tree_historical.rs
@@ -0,0 +1,238 @@
+use std::hint::black_box;
+
+use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
+use miden_node_store::{AccountTreeWithHistory, InMemoryAccountTree};
+use miden_objects::Word;
+use miden_objects::account::AccountId;
+use miden_objects::block::BlockNumber;
+use miden_objects::block::account_tree::{AccountTree, account_id_to_smt_key};
+use miden_objects::crypto::hash::rpo::Rpo256;
+use miden_objects::crypto::merkle::{LargeSmt, MemoryStorage};
+use miden_objects::testing::account_id::AccountIdBuilder;
+
+// HELPER FUNCTIONS
+// ================================================================================================
+
+/// Creates a storage backend for a `LargeSmt`.
+fn setup_storage() -> MemoryStorage {
+    // TODO migrate to RocksDB for persistence to gain meaningful numbers
+    MemoryStorage::default()
+}
+
+/// Generates a deterministic word from a seed.
+fn generate_word(seed: &mut [u8; 32]) -> Word {
+    for byte in seed.iter_mut() {
+        *byte = byte.wrapping_add(1);
+        if *byte != 0 {
+            break;
+        }
+    }
+    Rpo256::hash(seed)
+}
+
+/// Generates a deterministic `AccountId` from a seed.
+fn generate_account_id(seed: &mut [u8; 32]) -> AccountId {
+    for byte in seed.iter_mut() {
+        *byte = byte.wrapping_add(1);
+        if *byte != 0 {
+            break;
+        }
+    }
+    AccountIdBuilder::new().build_with_seed(*seed)
+}
+
+// SETUP FUNCTIONS
+// ================================================================================================
+
+/// Sets up a vanilla `AccountTree` with specified number of accounts.
+fn setup_vanilla_account_tree(
+    num_accounts: usize,
+) -> (AccountTree<LargeSmt<MemoryStorage>>, Vec<AccountId>) {
+    let mut seed = [0u8; 32];
+    let mut account_ids = Vec::new();
+    let mut entries = Vec::new();
+
+    for _ in 0..num_accounts {
+        let account_id = generate_account_id(&mut seed);
+        let commitment = generate_word(&mut seed);
+        account_ids.push(account_id);
+        entries.push((account_id_to_smt_key(account_id), commitment));
+    }
+
+    let storage = setup_storage();
+    let smt =
+        LargeSmt::with_entries(storage, entries).expect("Failed to create LargeSmt from entries");
+    let tree = AccountTree::new(smt).expect("Failed to create AccountTree");
+    (tree, account_ids)
+}
+
+/// Sets up `AccountTreeWithHistory` with specified number of accounts and blocks.
+fn setup_account_tree_with_history(
+    num_accounts: usize,
+    num_blocks: usize,
+) -> (AccountTreeWithHistory<InMemoryAccountTree>, Vec<AccountId>) {
+    let mut seed = [0u8; 32];
+    let storage = setup_storage();
+    let smt = LargeSmt::with_entries(storage, std::iter::empty())
+        .expect("Failed to create empty LargeSmt");
+    let account_tree = AccountTree::new(smt).expect("Failed to create AccountTree");
+    let mut account_tree_hist = AccountTreeWithHistory::new(account_tree, BlockNumber::GENESIS);
+    let mut account_ids = Vec::new();
+
+    for _block in 0..num_blocks {
+        let mutations: Vec<_> = (0..num_accounts)
+            .map(|_| {
+                let account_id = generate_account_id(&mut seed);
+                let commitment = generate_word(&mut seed);
+                if account_ids.len() < num_accounts {
+                    account_ids.push(account_id);
+                }
+                (account_id, commitment)
+            })
+            .collect();
+
+        account_tree_hist.compute_and_apply_mutations(mutations).unwrap();
+    }
+
+    (account_tree_hist, account_ids)
+}
+
+// VANILLA ACCOUNTTREE BENCHMARKS
+// ================================================================================================
+
+/// Benchmarks vanilla `AccountTree` open (query) operations.
+/// This provides a baseline for comparison with historical access operations.
+fn bench_vanilla_access(c: &mut Criterion) {
+    let mut group = c.benchmark_group("account_tree_vanilla_access");
+
+    let account_counts = [1, 10, 50, 100, 500, 1000];
+
+    for &num_accounts in &account_counts {
+        let (tree, account_ids) = setup_vanilla_account_tree(num_accounts);
+
+        group.bench_function(BenchmarkId::new("vanilla", num_accounts), |b| {
+            let test_account = *account_ids.first().unwrap();
+            b.iter(|| {
+                tree.open(black_box(test_account));
+            });
+        });
+    }
+
+    group.finish();
+}
+
+/// Benchmarks vanilla `AccountTree` insertion (mutation) performance.
+/// This provides a baseline for comparison with history-tracking insertion.
+fn bench_vanilla_insertion(c: &mut Criterion) {
+    let mut group = c.benchmark_group("account_tree_insertion");
+
+    let account_counts = [1, 10, 50, 100, 500];
+
+    for &num_accounts in &account_counts {
+        group.bench_function(BenchmarkId::new("vanilla", num_accounts), |b| {
+            b.iter(|| {
+                let mut seed = [0u8; 32];
+                let storage = setup_storage();
+                let smt = LargeSmt::with_entries(storage, std::iter::empty())
+                    .expect("Failed to create empty LargeSmt");
+                let mut tree = AccountTree::new(smt).expect("Failed to create AccountTree");
+                let entries: Vec<_> = (0..num_accounts)
+                    .map(|_| {
+                        let account_id = generate_account_id(&mut seed);
+                        let commitment = generate_word(&mut seed);
+                        (account_id, commitment)
+                    })
+                    .collect();
+                let mutations = tree.compute_mutations(black_box(entries)).unwrap();
+                tree.apply_mutations(black_box(mutations)).unwrap();
+            });
+        });
+    }
+
+    group.finish();
+}
+
+// HISTORICAL ACCOUNTTREE BENCHMARKS
+// ================================================================================================
+
+/// Benchmarks historical access at different depths and account counts.
+fn bench_historical_access(c: &mut Criterion) {
+    let mut group = c.benchmark_group("account_tree_historical_access");
+
+    let account_counts = [10, 100, 500, 2500];
+    let block_depths = [0, 5, 10, 20, 32];
+
+    for &num_accounts in &account_counts {
+        for &block_depth in &block_depths {
+            if block_depth > AccountTreeWithHistory::<InMemoryAccountTree>::MAX_HISTORY {
+                continue;
+            }
+
+            let (tree_hist, account_ids) =
+                setup_account_tree_with_history(num_accounts, block_depth + 1);
+            let current_block = tree_hist.block_number_latest();
+            let target_block = current_block
+                .checked_sub(u32::try_from(block_depth).unwrap())
+                .unwrap_or(BlockNumber::GENESIS);
+
+            if block_depth >= tree_hist.history_len() && block_depth > 0 {
+                continue;
+            }
+
+            group.bench_function(
+                BenchmarkId::new(format!("depth_{block_depth}"), num_accounts),
+                |b| {
+                    let test_account = *account_ids.first().unwrap();
+                    b.iter(|| {
+                        tree_hist.open_at(black_box(test_account), black_box(target_block));
+                    });
+                },
+            );
+        }
+    }
+
+    group.finish();
+}
+
+/// Benchmarks insertion performance with history tracking at different account counts.
+fn bench_insertion_with_history(c: &mut Criterion) {
+    let mut group = c.benchmark_group("account_tree_insertion");
+
+    let account_counts = [1, 10, 50, 100, 500, 2500];
+
+    for &num_accounts in &account_counts {
+        group.bench_function(BenchmarkId::new("with_history", num_accounts), |b| {
+            b.iter(|| {
+                let mut seed = [0u8; 32];
+                let storage = setup_storage();
+                let smt = LargeSmt::with_entries(storage, std::iter::empty())
+                    .expect("Failed to create empty LargeSmt");
+                let account_tree = AccountTree::new(smt).expect("Failed to create AccountTree");
+                let mut tree = AccountTreeWithHistory::new(account_tree, BlockNumber::GENESIS);
+                let mutations: Vec<_> = (0..num_accounts)
+                    .map(|_| {
+                        let account_id = generate_account_id(&mut seed);
+                        let commitment = generate_word(&mut seed);
+                        (account_id, commitment)
+                    })
+                    .collect();
+                tree.compute_and_apply_mutations(black_box(mutations)).unwrap();
+            });
+        });
+    }
+
+    group.finish();
+}
+
+criterion_group!(
+    name = historical_account_tree;
+    config = Criterion::default()
+        .measurement_time(std::time::Duration::from_millis(1500))
+        .warm_up_time(std::time::Duration::from_millis(100))
+        .sample_size(10);
+    targets = bench_vanilla_access,
+        bench_vanilla_insertion,
+        bench_historical_access,
+        bench_insertion_with_history
+);
+criterion_main!(historical_account_tree);
diff --git a/crates/store/src/accounts/mod.rs b/crates/store/src/accounts/mod.rs
new file mode 100644
index 000000000..bf18b815a
--- /dev/null
+++ b/crates/store/src/accounts/mod.rs
@@ -0,0 +1,460 @@
+//! Historical tracking for `AccountTree` via mutation overlays
+
+use std::collections::{BTreeMap, HashMap};
+
+use miden_objects::account::{AccountId, AccountIdPrefix};
+use miden_objects::block::account_tree::{AccountMutationSet, AccountTree};
+use miden_objects::block::{AccountWitness, BlockNumber};
+use miden_objects::crypto::merkle::{
+    EmptySubtreeRoots,
+    LargeSmt,
+    LeafIndex,
+    MemoryStorage,
+    MerkleError,
+    MerklePath,
+    NodeIndex,
+    NodeMutation,
+    SMT_DEPTH,
+    SmtLeaf,
+    SmtStorage,
+    SparseMerklePath,
+};
+use miden_objects::{AccountTreeError, EMPTY_WORD, Word};
+
+#[cfg(test)]
+mod tests;
+
+/// Convenience for an in-memory-only account tree.
+pub type InMemoryAccountTree = AccountTree<LargeSmt<MemoryStorage>>;
+
+// ACCOUNT TREE STORAGE TRAIT
+// ================================================================================================
+
+/// Trait abstracting operations over different account tree backends.
+pub trait AccountTreeStorage {
+    /// Returns the root hash of the tree.
+    fn root(&self) -> Word;
+
+    /// Returns the number of accounts in the tree.
+    fn num_accounts(&self) -> usize;
+
+    /// Opens an account and returns its witness.
+    fn open(&self, account_id: AccountId) -> AccountWitness;
+
+    /// Gets the account state commitment.
+    fn get(&self, account_id: AccountId) -> Word;
+
+    /// Computes mutations for applying account updates.
+    fn compute_mutations(
+        &self,
+        accounts: impl IntoIterator<Item = (AccountId, Word)>,
+    ) -> Result<AccountMutationSet, AccountTreeError>;
+
+    /// Applies mutations with reversion data.
+    fn apply_mutations_with_reversion(
+        &mut self,
+        mutations: AccountMutationSet,
+    ) -> Result<AccountMutationSet, AccountTreeError>;
+
+    /// Checks if the tree contains an account with the given prefix.
+    fn contains_account_id_prefix(&self, prefix: AccountIdPrefix) -> bool;
+}
+
+impl<S> AccountTreeStorage for AccountTree<LargeSmt<S>>
+where
+    S: SmtStorage,
+{
+    fn root(&self) -> Word {
+        self.root()
+    }
+
+    fn num_accounts(&self) -> usize {
+        self.num_accounts()
+    }
+
+    fn open(&self, account_id: AccountId) -> AccountWitness {
+        self.open(account_id)
+    }
+
+    fn get(&self, account_id: AccountId) -> Word {
+        self.get(account_id)
+    }
+
+    fn compute_mutations(
+        &self,
+        accounts: impl IntoIterator<Item = (AccountId, Word)>,
+    ) -> Result<AccountMutationSet, AccountTreeError> {
+        self.compute_mutations(accounts)
+    }
+
+    fn apply_mutations_with_reversion(
+        &mut self,
+        mutations: AccountMutationSet,
+    ) -> Result<AccountMutationSet, AccountTreeError> {
+        self.apply_mutations_with_reversion(mutations)
+    }
+
+    fn contains_account_id_prefix(&self, prefix: AccountIdPrefix) -> bool {
+        self.contains_account_id_prefix(prefix)
+    }
+}
+
+// HISTORICAL ERROR TYPES
+// ================================================================================================
+
+#[allow(missing_docs)]
+#[derive(thiserror::Error, Debug)]
+pub enum HistoricalError {
+    #[error(transparent)]
+    MerkleError(#[from] MerkleError),
+    #[error(transparent)]
+    AccountTreeError(#[from] AccountTreeError),
+}
+
+// HISTORICAL SELECTOR ENUM
+// ================================================================================================
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum HistoricalSelector {
+    /// The requested block is in the future (later than current block).
+    Future,
+    /// The requested block is available in history.
+    At(BlockNumber),
+    /// The requested block is the current/latest block.
+    Latest,
+    /// The requested block is too old and has been pruned from history.
+    TooAncient,
+}
+
+// HISTORICAL OVERLAY
+// ================================================================================================
+
+/// Captures reversion state for historical queries at a specific block.
+#[derive(Debug, Clone)]
+struct HistoricalOverlay {
+    block_number: BlockNumber,
+    root: Word,
+    node_mutations: HashMap<NodeIndex, Word>,
+    account_updates: HashMap<LeafIndex<SMT_DEPTH>, (Word, Word)>,
+}
+
+impl HistoricalOverlay {
+    fn new(block_number: BlockNumber, rev_set: AccountMutationSet) -> Self {
+        let root = rev_set.as_mutation_set().root();
+        let mut_set = rev_set.into_mutation_set();
+
+        let node_mutations =
+            HashMap::from_iter(mut_set.node_mutations().iter().map(|(node_index, mutation)| {
+                match mutation {
+                    NodeMutation::Addition(inner_node) => (*node_index, inner_node.hash()),
+                    NodeMutation::Removal => {
+                        // Store the actual empty subtree root for this depth
+                        // depth() is 1-indexed from leaf, so we use it directly for
+                        // EmptySubtreeRoots
+                        let empty_root = *EmptySubtreeRoots::entry(SMT_DEPTH, node_index.depth());
+                        (*node_index, empty_root)
+                    },
+                }
+            }));
+
+        let account_updates = HashMap::from_iter(
+            mut_set.new_pairs().iter().map(|(&k, &v)| (LeafIndex::from(k), (k, v))),
+        );
+
+        Self {
+            block_number,
+            root,
+            node_mutations,
+            account_updates,
+        }
+    }
+}
+
+// ACCOUNT TREE WITH HISTORY
+// ================================================================================================
+
+/// Wraps `AccountTree` with historical query support via reversion overlays.
+///
+/// This structure maintains a sliding window of historical account states by storing
+/// reversion data (mutations that undo changes). Historical witnesses are reconstructed
+/// by starting from the latest state and applying reversion overlays backwards in time.
+#[derive(Debug, Clone)]
+pub struct AccountTreeWithHistory<S>
+where
+    S: AccountTreeStorage,
+{
+    /// The current block number (latest state).
+    block_number: BlockNumber,
+    /// The latest account tree state.
+    latest: S,
+    /// Historical overlays indexed by block number, storing reversion data.
+    overlays: BTreeMap<BlockNumber, HistoricalOverlay>,
+}
+
+impl<S> AccountTreeWithHistory<S>
+where
+    S: AccountTreeStorage,
+{
+    /// Maximum number of historical blocks to maintain.
+    pub const MAX_HISTORY: usize = 33;
+
+    // CONSTRUCTORS
+    // --------------------------------------------------------------------------------------------
+
+    /// Creates a new historical tree starting at the given block number.
+    pub fn new(account_tree: S, block_number: BlockNumber) -> Self {
+        Self {
+            block_number,
+            latest: account_tree,
+            overlays: BTreeMap::new(),
+        }
+    }
+
+    /// Removes oldest overlays when exceeding the maximum history depth.
+    fn drain_excess(overlays: &mut BTreeMap<BlockNumber, HistoricalOverlay>) {
+        while overlays.len() > Self::MAX_HISTORY {
+            overlays.pop_first();
+        }
+    }
+
+    // PUBLIC ACCESSORS
+    // --------------------------------------------------------------------------------------------
+
+    /// Returns the latest block number.
+    pub fn block_number_latest(&self) -> BlockNumber {
+        self.block_number
+    }
+
+    /// Returns the root hash of the latest state.
+    pub fn root_latest(&self) -> Word {
+        self.latest.root()
+    }
+
+    /// Returns the root hash at a specific historical block.
+    ///
+    /// Returns `None` if the block is in the future or too old (pruned).
+    pub fn root_at(&self, block_number: BlockNumber) -> Option<Word> {
+        match self.historical_selector(block_number) {
+            HistoricalSelector::Latest => Some(self.latest.root()),
+            HistoricalSelector::At(block_number) => {
+                let overlay = self.overlays.get(&block_number)?;
+                debug_assert_eq!(overlay.block_number, block_number);
+                Some(overlay.root)
+            },
+            HistoricalSelector::Future | HistoricalSelector::TooAncient => None,
+        }
+    }
+
+    /// Returns the number of accounts in the latest state.
+    pub fn num_accounts_latest(&self) -> usize {
+        self.latest.num_accounts()
+    }
+
+    /// Returns the number of historical blocks currently stored.
+    pub fn history_len(&self) -> usize {
+        self.overlays.len()
+    }
+
+    /// Opens an account at the latest block, returning its witness.
+    pub fn open_latest(&self, account_id: AccountId) -> AccountWitness {
+        self.latest.open(account_id)
+    }
+
+    /// Opens an account at a historical block, returning its witness.
+    ///
+    /// This method reconstructs the account witness at the given historical block by:
+    /// 1. Starting with the latest account state
+    /// 2. Applying reversion mutations from the overlays to walk back in time
+    /// 3. Reconstructing the Merkle path with the historical node values
+    ///
+    /// Returns `None` if the block is in the future or too old (pruned).
+    pub fn open_at(
+        &self,
+        account_id: AccountId,
+        block_number: BlockNumber,
+    ) -> Option<AccountWitness> {
+        match self.historical_selector(block_number) {
+            HistoricalSelector::Latest => Some(self.latest.open(account_id)),
+            HistoricalSelector::At(block_number) => {
+                // Ensure overlay exists before reconstruction
+                self.overlays.get(&block_number)?;
+                Self::reconstruct_historical_witness(self, account_id, block_number)
+            },
+            HistoricalSelector::Future | HistoricalSelector::TooAncient => None,
+        }
+    }
+
+    /// Gets the account state commitment at the latest block.
+    pub fn get_latest_commitment(&self, account_id: AccountId) -> Word {
+        self.latest.get(account_id)
+    }
+
+    /// Checks if the tree contains an account with the given prefix.
+    pub fn contains_account_id_prefix_in_latest(&self, prefix: AccountIdPrefix) -> bool {
+        self.latest.contains_account_id_prefix(prefix)
+    }
+
+    // PRIVATE HELPERS - HISTORICAL RECONSTRUCTION
+    // --------------------------------------------------------------------------------------------
+
+    /// Determines the historical state selector of a requested block number.
+    fn historical_selector(&self, desired_block_number: BlockNumber) -> HistoricalSelector {
+        if desired_block_number == self.block_number {
+            return HistoricalSelector::Latest;
+        }
+
+        // Check if block is in the future
+        if self.block_number.checked_sub(desired_block_number.as_u32()).is_none() {
+            return HistoricalSelector::Future;
+        }
+
+        // Check if block exists in overlays
+        if !self.overlays.contains_key(&desired_block_number) {
+            return HistoricalSelector::TooAncient;
+        }
+
+        HistoricalSelector::At(desired_block_number)
+    }
+
+    /// Reconstructs a historical account witness by applying reversion overlays.
+    fn reconstruct_historical_witness(
+        &self,
+        account_id: AccountId,
+        block_target: BlockNumber,
+    ) -> Option<AccountWitness> {
+        // Start with the latest witness
+        let latest_witness = self.latest.open(account_id);
+        let (latest_path, leaf) = latest_witness.into_proof().into_parts();
+        let path_nodes = Self::initialize_path_nodes(&latest_path);
+
+        let leaf_index = NodeIndex::from(leaf.index());
+
+        // Apply reversion overlays to reconstruct historical state.
+        // We reverse the overlay iteration (newest to oldest) to walk backwards in time
+        // from the latest state to the target block.
+        let (path, leaf) = Self::apply_reversion_overlays(
+            self.overlays.range(block_target..).rev().map(|(_, overlay)| overlay),
+            path_nodes,
+            leaf_index,
+            leaf,
+        )?;
+
+        // Extract commitment from leaf
+        let commitment = match leaf {
+            SmtLeaf::Empty(_) => EMPTY_WORD,
+            SmtLeaf::Single((_, value)) => value,
+            SmtLeaf::Multiple(_) => unreachable!("AccountTree uses prefix-free IDs"),
+        };
+
+        AccountWitness::new(account_id, commitment, path).ok()
+    }
+
+    /// Initializes the path nodes array from the latest state.
+    ///
+    /// Converts the sparse path to a dense path and reverses it for indexing by depth from leaf.
+    fn initialize_path_nodes(path: &SparseMerklePath) -> [Word; SMT_DEPTH as usize] {
+        let mut path_nodes: [Word; SMT_DEPTH as usize] = MerklePath::from(path.clone())
+            .to_vec()
+            .try_into()
+            .expect("MerklePath should have exactly SMT_DEPTH nodes");
+        path_nodes.reverse();
+        path_nodes
+    }
+
+    /// Applies reversion overlays to reconstruct the historical state.
+    ///
+    /// Iterates through overlays from newest to oldest (walking backwards in time),
+    /// updating both the path nodes and the leaf value based on reversion mutations.
+    fn apply_reversion_overlays<'a>(
+        overlays: impl IntoIterator<Item = &'a HistoricalOverlay>,
+        mut path_nodes: [Word; SMT_DEPTH as usize],
+        leaf_index: NodeIndex,
+        mut leaf: SmtLeaf,
+    ) -> Option<(SparseMerklePath, SmtLeaf)> {
+        // Iterate through overlays
+        for overlay in overlays {
+            // Update path sibling nodes that changed in this overlay
+            for sibling in leaf_index.proof_indices() {
+                let height = sibling
+                    .depth()
+                    .checked_sub(1) // -1: Convert from 1-indexed to 0-indexed
+                    .expect("proof_indices should not include root")
+                    as usize;
+
+                // Apply reversion mutation if this node was modified.
+                // It's sound since `proof_indices()`` returns siblings on the path from leaf to
+                // root, hence the height is always less than `SMT_DEPTH`, the leaf
+                // and root are not included.
+                if let Some(hash) = overlay.node_mutations.get(&sibling) {
+                    path_nodes[height] = *hash;
+                }
+            }
+
+            // Update leaf if it was modified in this overlay
+            if let Some(&(key, value)) = overlay.account_updates.get(&leaf.index()) {
+                leaf = if value == EMPTY_WORD {
+                    SmtLeaf::new_empty(leaf.index())
+                } else {
+                    SmtLeaf::new_single(key, value)
+                };
+            }
+        }
+
+        // Build the Merkle path directly from the reconstructed nodes
+        // No need for build_dense_path since all nodes have actual values (not sentinels)
+        let dense: Vec<Word> = path_nodes.iter().rev().copied().collect();
+        let path = MerklePath::new(dense);
+        let path = SparseMerklePath::try_from(path).ok()?;
+        Some((path, leaf))
+    }
+
+    // PUBLIC MUTATORS
+    // --------------------------------------------------------------------------------------------
+
+    /// Computes and applies mutations in one operation.
+    ///
+    /// This is a convenience method primarily for testing.
+    pub fn compute_and_apply_mutations(
+        &mut self,
+        account_commitments: impl IntoIterator<Item = (AccountId, Word)>,
+    ) -> Result<(), HistoricalError> {
+        let mutations = self.compute_mutations(account_commitments)?;
+        self.apply_mutations(mutations)
+    }
+
+    /// Computes mutations relative to the latest state.
+    pub fn compute_mutations(
+        &self,
+        account_commitments: impl IntoIterator<Item = (AccountId, Word)>,
+    ) -> Result<AccountMutationSet, HistoricalError> {
+        Ok(self.latest.compute_mutations(account_commitments)?)
+    }
+
+    /// Applies mutations and advances to the next block.
+    ///
+    /// This method:
+    /// 1. Applies the mutations to the latest tree, getting back reversion data
+    /// 2. Stores the reversion data as a historical overlay
+    /// 3. Advances the block number
+    /// 4. Prunes old overlays if exceeding `MAX_HISTORY`
+    pub fn apply_mutations(
+        &mut self,
+        mutations: AccountMutationSet,
+    ) -> Result<(), HistoricalError> {
+        // Apply mutations and get reversion data
+        let rev = self.latest.apply_mutations_with_reversion(mutations)?;
+
+        // Store reversion data for current block before advancing
+        let block_num = self.block_number;
+        let overlay = HistoricalOverlay::new(block_num, rev);
+        self.overlays.insert(block_num, overlay);
+
+        // Advance to next block
+        self.block_number = block_num.child();
+
+        // Prune old history if needed
+        Self::drain_excess(&mut self.overlays);
+
+        Ok(())
+    }
+}
diff --git a/crates/store/src/accounts/tests.rs b/crates/store/src/accounts/tests.rs
new file mode 100644
index 000000000..9d90e975e
--- /dev/null
+++ b/crates/store/src/accounts/tests.rs
@@ -0,0 +1,523 @@
+//! Tests for `AccountTreeWithHistory`
+
+#[cfg(test)]
+#[allow(clippy::similar_names)]
+#[allow(clippy::needless_range_loop)]
+#[allow(clippy::uninlined_format_args)]
+#[allow(clippy::cast_sign_loss)]
+mod account_tree_with_history_tests {
+    use miden_objects::Word;
+    use miden_objects::account::AccountId;
+    use miden_objects::block::BlockNumber;
+    use miden_objects::block::account_tree::{AccountTree, account_id_to_smt_key};
+    use miden_objects::crypto::merkle::{LargeSmt, MemoryStorage};
+    use miden_objects::testing::account_id::AccountIdBuilder;
+
+    use super::super::*;
+
+    /// Helper function to create an `AccountTree` from entries using the new API
+    fn create_account_tree(
+        entries: impl IntoIterator<Item = (AccountId, Word)>,
+    ) -> AccountTree<LargeSmt<MemoryStorage>> {
+        let smt_entries = entries
+            .into_iter()
+            .map(|(id, commitment)| (account_id_to_smt_key(id), commitment));
+        let smt = LargeSmt::with_entries(MemoryStorage::default(), smt_entries)
+            .expect("Failed to create LargeSmt from entries");
+        AccountTree::new(smt).expect("Failed to create AccountTree")
+    }
+
+    /// Helper function to verify a Merkle proof
+    fn assert_verify(root: Word, witness: AccountWitness) {
+        let proof = witness.into_proof();
+        let (path, leaf) = proof.into_parts();
+        path.verify(leaf.index().value(), leaf.hash(), &root).unwrap();
+    }
+
+    #[test]
+    fn test_historical_queries() {
+        let ids = [
+            AccountIdBuilder::new().build_with_seed([1; 32]),
+            AccountIdBuilder::new().build_with_seed([2; 32]),
+            AccountIdBuilder::new().build_with_seed([3; 32]),
+        ];
+
+        let states = [
+            vec![
+                (ids[0], Word::from([1u32, 0, 0, 0])),
+                (ids[1], Word::from([2u32, 0, 0, 0])),
+                (ids[2], Word::from([3u32, 0, 0, 0])),
+            ],
+            vec![
+                (ids[0], Word::from([10u32, 0, 0, 0])),
+                (ids[1], Word::from([2u32, 0, 0, 0])),
+                (ids[2], Word::from([30u32, 0, 0, 0])),
+            ],
+            vec![
+                (ids[0], Word::from([10u32, 0, 0, 0])),
+                (ids[1], Word::from([200u32, 0, 0, 0])),
+                (ids[2], Word::from([30u32, 0, 0, 0])),
+            ],
+        ];
+
+        let trees: Vec<_> = states.iter().map(|s| create_account_tree(s.clone())).collect();
+
+        // Create a separate tree for history tracking
+        let hist_tree = create_account_tree(states[0].clone());
+        let mut hist = AccountTreeWithHistory::new(hist_tree, BlockNumber::GENESIS);
+        hist.compute_and_apply_mutations([(ids[0], states[1][0].1), (ids[2], states[1][2].1)])
+            .unwrap();
+        hist.compute_and_apply_mutations([(ids[1], states[2][1].1)]).unwrap();
+
+        for (block, tree) in trees.iter().enumerate() {
+            let hist_root = hist.root_at(BlockNumber::from(block as u32)).unwrap();
+            assert_eq!(hist_root, tree.root());
+
+            for &id in &ids {
+                let hist_witness = hist.open_at(id, BlockNumber::from(block as u32)).unwrap();
+                let actual = tree.open(id);
+                assert_eq!(hist_witness.state_commitment(), actual.state_commitment());
+                assert_eq!(hist_witness.path(), actual.path());
+            }
+        }
+    }
+
+    #[test]
+    fn test_history_limits() {
+        const MAX_HIST: u32 =
+            AccountTreeWithHistory::<AccountTree<LargeSmt<MemoryStorage>>>::MAX_HISTORY as u32;
+        use assert_matches::assert_matches;
+
+        let id = AccountIdBuilder::new().build_with_seed([30; 32]);
+        let tree = create_account_tree([(id, Word::from([1u32, 0, 0, 0]))]);
+        let mut hist = AccountTreeWithHistory::new(tree, BlockNumber::GENESIS);
+
+        for i in 1..=(MAX_HIST + 5) {
+            hist.compute_and_apply_mutations([(id, Word::from([dbg!(i) as u32, 0, 0, 0]))])
+                .unwrap();
+            assert_eq!(hist.block_number_latest(), BlockNumber::from(i));
+        }
+
+        let current = hist.block_number_latest();
+        assert_matches!(hist.open_at(id, current), Some(_));
+        assert_matches!(hist.open_at(id, BlockNumber::GENESIS), None);
+        assert_matches!(hist.open_at(id, current.child()), None);
+    }
+
+    #[test]
+    fn test_account_lifecycle() {
+        let id0 = AccountIdBuilder::new().build_with_seed([40; 32]);
+        let id1 = AccountIdBuilder::new().build_with_seed([41; 32]);
+        let v0 = Word::from([0u32; 4]);
+        let v1 = Word::from([1u32; 4]);
+
+        // Create separate trees for expected states at each block
+        let tree0 = create_account_tree(vec![(id0, v0)]);
+        let tree1 = create_account_tree(vec![(id0, v0), (id1, v1)]);
+        let tree2 = create_account_tree(vec![(id0, Word::default()), (id1, v1)]);
+
+        // Create separate tree for history tracking
+        let hist_tree = create_account_tree(vec![(id0, v0)]);
+        let mut hist = AccountTreeWithHistory::new(hist_tree, BlockNumber::GENESIS);
+        hist.compute_and_apply_mutations([(id1, v1)]).unwrap();
+        hist.compute_and_apply_mutations([(id0, Word::default())]).unwrap();
+
+        assert_eq!(hist.block_number_latest(), BlockNumber::from(2));
+
+        assert_verify(tree2.root(), tree2.open(id0));
+        assert_verify(tree2.root(), hist.open_at(id0, BlockNumber::from(2)).unwrap());
+        assert_verify(tree1.root(), tree1.open(id0));
+        assert_verify(tree1.root(), hist.open_at(id0, BlockNumber::from(1)).unwrap());
+        assert_verify(tree0.root(), tree0.open(id0));
+        assert_verify(tree0.root(), hist.open_at(id0, BlockNumber::GENESIS).unwrap());
+
+        assert_eq!(hist.open_at(id0, BlockNumber::GENESIS).unwrap(), tree0.open(id0));
+        assert_eq!(hist.open_at(id0, BlockNumber::from(1)).unwrap(), tree1.open(id0));
+        assert_eq!(hist.open_at(id0, BlockNumber::from(2)).unwrap(), tree2.open(id0));
+
+        assert_eq!(hist.open_at(id1, BlockNumber::GENESIS).unwrap(), tree0.open(id1));
+        assert_eq!(hist.open_at(id1, BlockNumber::from(1)).unwrap(), tree1.open(id1));
+        assert_eq!(hist.open_at(id1, BlockNumber::from(2)).unwrap(), tree2.open(id1));
+
+        assert_eq!(hist.open_at(id0, BlockNumber::GENESIS).unwrap().state_commitment(), v0);
+        assert_eq!(hist.open_at(id0, BlockNumber::from(1)).unwrap().state_commitment(), v0);
+        assert_eq!(hist.open_at(id1, BlockNumber::from(1)).unwrap().state_commitment(), v1);
+        assert_eq!(
+            hist.open_at(id0, BlockNumber::from(2)).unwrap().state_commitment(),
+            Word::default()
+        );
+        assert_eq!(hist.open_at(id1, BlockNumber::from(2)).unwrap().state_commitment(), v1);
+    }
+
+    #[test]
+    fn test_many_accounts_sequential_updates() {
+        // Create 50 different account IDs
+        let account_count = 50;
+        let ids: Vec<_> = (0..account_count)
+            .map(|i| AccountIdBuilder::new().build_with_seed([i as u8; 32]))
+            .collect();
+
+        // Create initial state with all accounts having value [i, 0, 0, 0]
+        let initial_state: Vec<_> = ids
+            .iter()
+            .enumerate()
+            .map(|(i, &id)| (id, Word::from([i as u32, 0, 0, 0])))
+            .collect();
+
+        let initial_tree = create_account_tree(initial_state.clone());
+        let mut hist = AccountTreeWithHistory::new(initial_tree, BlockNumber::GENESIS);
+
+        // Apply 10 blocks of updates, each updating 5 accounts
+        let num_blocks = 5;
+        for block in 1..=num_blocks {
+            let updates: Vec<_> = (0..5)
+                .map(|i| {
+                    let idx = ((block - 1) * 5 + i) % account_count;
+                    let new_value = Word::from([idx as u32 + block as u32 * 100, 0, 0, 0]);
+                    (ids[idx], new_value)
+                })
+                .collect();
+            hist.compute_and_apply_mutations(updates).unwrap();
+        }
+
+        // Verify we can query historical states
+        assert_eq!(hist.block_number_latest(), BlockNumber::from(num_blocks as u32));
+
+        // Check genesis state for a few accounts
+        for i in 0..4 {
+            let witness = hist.open_at(ids[i], BlockNumber::GENESIS).unwrap();
+            assert_eq!(
+                witness.state_commitment(),
+                Word::from([i as u32, 0, 0, 0]),
+                "Account {} at genesis",
+                i
+            );
+        }
+
+        // Check intermediate block states
+        for block in 1..=num_blocks {
+            for i in 0..5 {
+                let idx = ((block - 1) * 5 + i) % account_count;
+                let witness = hist.open_at(ids[idx], BlockNumber::from(block as u32)).unwrap();
+                let expected = Word::from([idx as u32 + block as u32 * 100, 0, 0, 0]);
+                assert_eq!(
+                    witness.state_commitment(),
+                    expected,
+                    "Account {} at block {}",
+                    idx,
+                    block
+                );
+            }
+        }
+    }
+
+    #[test]
+    fn test_many_accounts_concurrent_updates() {
+        // Create 100 accounts
+        let account_count = 100;
+        let ids: Vec<_> = (0..account_count)
+            .map(|i| {
+                AccountIdBuilder::new().build_with_seed([
+                    i as u8,
+                    (i >> 8) as u8,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                ])
+            })
+            .collect();
+
+        // Create initial state
+        let initial_state: Vec<_> = ids
+            .iter()
+            .enumerate()
+            .map(|(i, &id)| (id, Word::from([i as u32, 0, 0, 0])))
+            .collect();
+
+        let initial_tree = create_account_tree(initial_state.clone());
+        let mut hist = AccountTreeWithHistory::new(initial_tree, BlockNumber::GENESIS);
+
+        // Apply updates to all accounts in each block
+        let num_blocks = 5;
+        for block in 1..=num_blocks {
+            let updates: Vec<_> = ids
+                .iter()
+                .enumerate()
+                .map(|(i, &id)| {
+                    let new_value = Word::from([i as u32, block as u32, 0, 0]);
+                    (id, new_value)
+                })
+                .collect();
+            hist.compute_and_apply_mutations(updates).unwrap();
+        }
+
+        // Verify all accounts at all blocks
+        for block in 0..=num_blocks {
+            for (i, &id) in ids.iter().enumerate().take(20) {
+                // Check first 20 for speed
+                let witness = hist.open_at(id, BlockNumber::from(block as u32)).unwrap();
+                let expected = if block == 0 {
+                    Word::from([i as u32, 0, 0, 0])
+                } else {
+                    Word::from([i as u32, block as u32, 0, 0])
+                };
+                assert_eq!(
+                    witness.state_commitment(),
+                    expected,
+                    "Account {} at block {}",
+                    i,
+                    block
+                );
+            }
+        }
+    }
+
+    #[test]
+    fn test_sparse_updates_many_accounts() {
+        // Create 200 accounts but only update a few at a time
+        let account_count = 200;
+        let ids: Vec<_> = (0..account_count)
+            .map(|i| {
+                let mut seed = [0u8; 32];
+                seed[0] = i as u8;
+                seed[1] = (i >> 8) as u8;
+                AccountIdBuilder::new().build_with_seed(seed)
+            })
+            .collect();
+
+        // Create initial state with first 50 accounts
+        let initial_state: Vec<_> = ids
+            .iter()
+            .take(50)
+            .enumerate()
+            .map(|(i, &id)| (id, Word::from([i as u32, 0, 0, 0])))
+            .collect();
+
+        let initial_tree = create_account_tree(initial_state.clone());
+        let mut hist = AccountTreeWithHistory::new(initial_tree, BlockNumber::GENESIS);
+
+        // Block 1: Add 50 more accounts
+        let updates1: Vec<_> = ids
+            .iter()
+            .skip(50)
+            .take(50)
+            .enumerate()
+            .map(|(i, &id)| (id, Word::from([(i + 50) as u32, 1, 0, 0])))
+            .collect();
+        hist.compute_and_apply_mutations(updates1).unwrap();
+
+        // Block 2: Update every 10th account
+        let updates2: Vec<_> = ids
+            .iter()
+            .enumerate()
+            .filter(|(i, _)| i % 10 == 0)
+            .take(10)
+            .map(|(i, &id)| (id, Word::from([i as u32, 2, 0, 0])))
+            .collect();
+        hist.compute_and_apply_mutations(updates2).unwrap();
+
+        // Block 3: Add remaining accounts
+        let updates3: Vec<_> = ids
+            .iter()
+            .skip(100)
+            .enumerate()
+            .map(|(i, &id)| (id, Word::from([(i + 100) as u32, 3, 0, 0])))
+            .collect();
+        hist.compute_and_apply_mutations(updates3).unwrap();
+
+        // Verify states at different blocks
+        // Check genesis - first 50 accounts exist, others don't
+        for i in 0..50 {
+            let witness = hist.open_at(ids[i], BlockNumber::GENESIS).unwrap();
+            assert_eq!(witness.state_commitment(), Word::from([i as u32, 0, 0, 0]));
+        }
+
+        // Check block 1 - first 100 accounts exist
+        for i in 50..100 {
+            let witness = hist.open_at(ids[i], BlockNumber::from(1)).unwrap();
+            assert_eq!(witness.state_commitment(), Word::from([i as u32, 1, 0, 0]));
+        }
+
+        // Check block 2 - every 10th account was updated
+        for i in 0..10 {
+            let idx = i * 10;
+            if idx < 100 {
+                let witness = hist.open_at(ids[idx], BlockNumber::from(2)).unwrap();
+                assert_eq!(witness.state_commitment(), Word::from([idx as u32, 2, 0, 0]));
+            }
+        }
+
+        // Check block 3 - all 200 accounts should be accessible
+        for i in [0, 50, 100, 150, 199] {
+            let witness = hist.open_at(ids[i], BlockNumber::from(3));
+            assert!(witness.is_some(), "Account {} should exist at block 3", i);
+        }
+    }
+
+    #[test]
+    fn test_account_deletion_and_recreation() {
+        // Test accounts being removed (set to empty) and then recreated
+        let ids: Vec<_> = (0..20)
+            .map(|i| AccountIdBuilder::new().build_with_seed([i as u8 + 100; 32]))
+            .collect();
+
+        // Initial state: all accounts exist
+        let initial_state: Vec<_> = ids
+            .iter()
+            .enumerate()
+            .map(|(i, &id)| (id, Word::from([i as u32 + 1, 0, 0, 0])))
+            .collect();
+
+        let initial_tree = create_account_tree(initial_state.clone());
+        let mut hist = AccountTreeWithHistory::new(initial_tree, BlockNumber::GENESIS);
+
+        // Block 1: Delete half the accounts (set to empty word)
+        let deletes: Vec<_> = ids.iter().take(10).map(|&id| (id, Word::default())).collect();
+        hist.compute_and_apply_mutations(deletes).unwrap();
+
+        // Block 2: Recreate some deleted accounts with new values
+        let recreates: Vec<_> =
+            ids.iter().take(5).map(|&id| (id, Word::from([999u32, 0, 0, 0]))).collect();
+        hist.compute_and_apply_mutations(recreates).unwrap();
+
+        // Verify genesis state
+        for (i, &id) in ids.iter().enumerate().take(20) {
+            let witness = hist.open_at(id, BlockNumber::GENESIS).unwrap();
+            assert_eq!(
+                witness.state_commitment(),
+                Word::from([i as u32 + 1, 0, 0, 0]),
+                "Genesis state for account {}",
+                i
+            );
+        }
+
+        // Verify block 1 - first 10 are deleted
+        for i in 0..10 {
+            let witness = hist.open_at(ids[i], BlockNumber::from(1)).unwrap();
+            assert_eq!(
+                witness.state_commitment(),
+                Word::default(),
+                "Account {} should be deleted at block 1",
+                i
+            );
+        }
+
+        // Verify block 2 - first 5 are recreated
+        for i in 0..5 {
+            let witness = hist.open_at(ids[i], BlockNumber::from(2)).unwrap();
+            assert_eq!(
+                witness.state_commitment(),
+                Word::from([999u32, 0, 0, 0]),
+                "Account {} should be recreated at block 2",
+                i
+            );
+        }
+
+        // Accounts 5-9 should still be empty at block 2
+        for i in 5..10 {
+            let witness = hist.open_at(ids[i], BlockNumber::from(2)).unwrap();
+            assert_eq!(
+                witness.state_commitment(),
+                Word::default(),
+                "Account {} should still be empty at block 2",
+                i
+            );
+        }
+
+        // Accounts 10-19 should never have been deleted
+        for i in 10..20 {
+            let witness_b1 = hist.open_at(ids[i], BlockNumber::from(1)).unwrap();
+            let witness_b2 = hist.open_at(ids[i], BlockNumber::from(2)).unwrap();
+            assert_eq!(witness_b1.state_commitment(), Word::from([i as u32 + 1, 0, 0, 0]));
+            assert_eq!(witness_b2.state_commitment(), Word::from([i as u32 + 1, 0, 0, 0]));
+        }
+    }
+
+    #[test]
+    fn test_account_tree_with_history_minimal_verify() {
+        // Create a single account
+        let account_id = AccountIdBuilder::new().build_with_seed([42; 32]);
+        let genesis_commitment = Word::from([100u32, 200, 300, 400]);
+        let updated_commitment = Word::from([999u32, 888, 777, 666]);
+
+        // Create initial tree with the account
+        let tree = create_account_tree(vec![(account_id, genesis_commitment)]);
+        let mut hist = AccountTreeWithHistory::new(tree, BlockNumber::GENESIS);
+
+        // Apply a mutation to update the account (moves to block 1)
+        hist.compute_and_apply_mutations(vec![(account_id, updated_commitment)])
+            .expect("Mutation should succeed");
+
+        // Verify we're now at block 1
+        assert_eq!(hist.block_number_latest(), BlockNumber::from(1));
+
+        // Get witness for the account at genesis (tests historical reconstruction)
+        let witness = hist
+            .open_at(account_id, BlockNumber::GENESIS)
+            .expect("Account should exist at genesis");
+
+        // Verify the state commitment matches the genesis value (not the updated value)
+        assert_eq!(witness.state_commitment(), genesis_commitment);
+
+        // Get the proof and verify it against the genesis root
+        let root = hist.root_at(BlockNumber::GENESIS).expect("Root should exist at genesis");
+        let proof = witness.into_proof();
+        let (path, leaf) = proof.into_parts();
+
+        // Verify the Merkle proof - this tests the historical reconstruction code path
+        path.verify(leaf.index().value(), leaf.hash(), &root)
+            .expect("Proof verification should succeed");
+    }
+
+    #[test]
+    fn test_account_tree_minimal_verify() {
+        // Create a single account
+        let account_id = AccountIdBuilder::new().build_with_seed([42; 32]);
+        let state_commitment = Word::from([100u32, 200, 300, 400]);
+
+        // Create tree with the account
+        let tree = create_account_tree(vec![(account_id, state_commitment)]);
+
+        // Get witness for the account
+        let witness = tree.open(account_id);
+
+        // Verify the state commitment matches
+        assert_eq!(witness.state_commitment(), state_commitment);
+
+        // Get the proof and verify it
+        let root = tree.root();
+        let proof = witness.into_proof();
+        let (path, leaf) = proof.into_parts();
+
+        // Verify the Merkle proof
+        path.verify(leaf.index().value(), leaf.hash(), &root)
+            .expect("Proof verification should succeed");
+    }
+}
diff --git a/crates/store/src/db/models/queries/accounts.rs b/crates/store/src/db/models/queries/accounts.rs
index c0c40e4e9..694805bf9 100644
--- a/crates/store/src/db/models/queries/accounts.rs
+++ b/crates/store/src/db/models/queries/accounts.rs
@@ -91,7 +91,6 @@ pub(crate) fn select_account(
     Ok(info)
 }
 
-// TODO: Handle account prefix collision in a more robust way
 /// Select the latest account details by account ID prefix from the DB using the given
 /// [`SqliteConnection`] This method is meant to be used by the network transaction builder. Because
 /// network notes get matched through accounts through the account's 30-bit prefix, it is possible
diff --git a/crates/store/src/errors.rs b/crates/store/src/errors.rs
index f24b3ae20..639032104 100644
--- a/crates/store/src/errors.rs
+++ b/crates/store/src/errors.rs
@@ -96,6 +96,8 @@ pub enum DatabaseError {
     AccountCommitmentsMismatch { expected: Word, calculated: Word },
     #[error("account {0} not found")]
     AccountNotFoundInDb(AccountId),
+    #[error("account {0} state at block height {1} not found")]
+    AccountAtBlockHeightNotFoundInDb(AccountId, BlockNumber),
     #[error("accounts {0:?} not found")]
     AccountsNotFoundInDb(Vec<AccountId>),
     #[error("account {0} is not on the chain")]
@@ -117,6 +119,8 @@ pub enum DatabaseError {
     ConnectionManager(#[from] ConnectionManagerError),
     #[error(transparent)]
     SqlValueConversion(#[from] DatabaseTypeConversionError),
+    #[error("Not implemented: {0}")]
+    NotImplemented(String),
 }
 
 impl DatabaseError {
diff --git a/crates/store/src/genesis/mod.rs b/crates/store/src/genesis/mod.rs
index 760a51b4b..f021980e7 100644
--- a/crates/store/src/genesis/mod.rs
+++ b/crates/store/src/genesis/mod.rs
@@ -2,7 +2,7 @@ use miden_lib::transaction::TransactionKernel;
 use miden_objects::Word;
 use miden_objects::account::Account;
 use miden_objects::account::delta::AccountUpdateDetails;
-use miden_objects::block::account_tree::AccountTree;
+use miden_objects::block::account_tree::{AccountTree, account_id_to_smt_key};
 use miden_objects::block::{
     BlockAccountUpdate,
     BlockHeader,
@@ -11,7 +11,7 @@ use miden_objects::block::{
     FeeParameters,
     ProvenBlock,
 };
-use miden_objects::crypto::merkle::{Forest, MmrPeaks, Smt};
+use miden_objects::crypto::merkle::{Forest, LargeSmt, MemoryStorage, MmrPeaks, Smt};
 use miden_objects::note::Nullifier;
 use miden_objects::transaction::OrderedTransactionHeaders;
 use miden_objects::utils::serde::{ByteReader, Deserializable, DeserializationError};
@@ -77,12 +77,16 @@ impl GenesisState {
             })
             .collect();
 
-        let account_smt = AccountTree::with_entries(
-            accounts
-                .iter()
-                .map(|update| (update.account_id(), update.final_state_commitment())),
-        )
-        .map_err(GenesisError::AccountTree)?;
+        // Convert account updates to SMT entries using account_id_to_smt_key
+        let smt_entries = accounts.iter().map(|update| {
+            (account_id_to_smt_key(update.account_id()), update.final_state_commitment())
+        });
+
+        // Create LargeSmt with MemoryStorage
+        let smt = LargeSmt::with_entries(MemoryStorage::default(), smt_entries)
+            .expect("Failed to create LargeSmt for genesis accounts");
+
+        let account_smt = AccountTree::new(smt).expect("Failed to create AccountTree for genesis");
 
         let empty_nullifiers: Vec<Nullifier> = Vec::new();
         let empty_nullifier_tree = Smt::new();
diff --git a/crates/store/src/lib.rs b/crates/store/src/lib.rs
index 146a82750..d50f124f7 100644
--- a/crates/store/src/lib.rs
+++ b/crates/store/src/lib.rs
@@ -1,5 +1,6 @@
 use std::time::Duration;
 
+mod accounts;
 mod blocks;
 mod db;
 mod errors;
@@ -7,6 +8,12 @@ pub mod genesis;
 mod server;
 pub mod state;
 
+pub use accounts::{
+    AccountTreeStorage,
+    AccountTreeWithHistory,
+    HistoricalError,
+    InMemoryAccountTree,
+};
 pub use genesis::GenesisState;
 pub use server::{DataDirectory, Store};
 
diff --git a/crates/store/src/state.rs b/crates/store/src/state.rs
index c1e5eedbb..9e398027c 100644
--- a/crates/store/src/state.rs
+++ b/crates/store/src/state.rs
@@ -24,7 +24,7 @@ use miden_node_proto::domain::batch::BatchInputs;
 use miden_node_utils::ErrorReport;
 use miden_node_utils::formatting::format_array;
 use miden_objects::account::{AccountHeader, AccountId, StorageSlot};
-use miden_objects::block::account_tree::AccountTree;
+use miden_objects::block::account_tree::{AccountTree, account_id_to_smt_key};
 use miden_objects::block::{
     AccountWitness,
     BlockHeader,
@@ -37,12 +37,15 @@ use miden_objects::block::{
 };
 use miden_objects::crypto::merkle::{
     Forest,
+    LargeSmt,
+    MemoryStorage,
     Mmr,
     MmrDelta,
     MmrPeaks,
     MmrProof,
     PartialMmr,
     SmtProof,
+    SmtStorage,
 };
 use miden_objects::note::{NoteDetails, NoteId, NoteScript, Nullifier};
 use miden_objects::transaction::{OutputNote, PartialBlockchain};
@@ -74,7 +77,7 @@ use crate::errors::{
     StateInitializationError,
     StateSyncError,
 };
-use crate::{COMPONENT, DataDirectory};
+use crate::{AccountTreeWithHistory, COMPONENT, DataDirectory, InMemoryAccountTree};
 
 // STRUCTURES
 // ================================================================================================
@@ -88,13 +91,19 @@ pub struct TransactionInputs {
 }
 
 /// Container for state that needs to be updated atomically.
-struct InnerState {
+struct InnerState<S = MemoryStorage>
+where
+    S: SmtStorage,
+{
     nullifier_tree: NullifierTree,
     blockchain: Blockchain,
-    account_tree: AccountTree,
+    account_tree: AccountTreeWithHistory<AccountTree<LargeSmt<S>>>,
 }
 
-impl InnerState {
+impl<S> InnerState<S>
+where
+    S: SmtStorage,
+{
     /// Returns the latest block number.
     fn latest_block_num(&self) -> BlockNumber {
         self.blockchain
@@ -140,7 +149,16 @@ impl State {
             .map_err(StateInitializationError::DatabaseLoadError)?;
 
         let chain_mmr = load_mmr(&mut db).await?;
-        let account_tree = load_account_tree(&mut db).await?;
+        let block_headers = db.select_all_block_headers().await?;
+        // TODO: Account tree loading synchronization
+        // Currently `load_account_tree` loads all account commitments from the DB. This could
+        // potentially lead to inconsistency if the DB contains account states from blocks beyond
+        // `latest_block_num`, though in practice the DB writes are transactional and this
+        // should not occur.
+        let latest_block_num = block_headers
+            .last()
+            .map_or(BlockNumber::GENESIS, miden_objects::block::BlockHeader::block_num);
+        let account_tree = load_account_tree(&mut db, latest_block_num).await?;
         let nullifier_tree = load_nullifier_tree(&mut db).await?;
 
         let inner = RwLock::new(InnerState {
@@ -283,7 +301,14 @@ impl State {
                         .iter()
                         .map(|update| (update.account_id(), update.final_state_commitment())),
                 )
-                .map_err(InvalidBlockError::NewBlockDuplicateAccountIdPrefix)?;
+                .map_err(|e| match e {
+                    crate::HistoricalError::AccountTreeError(err) => {
+                        InvalidBlockError::NewBlockDuplicateAccountIdPrefix(err)
+                    },
+                    crate::HistoricalError::MerkleError(_) => {
+                        panic!("Unexpected MerkleError during account tree mutation computation")
+                    },
+                })?;
 
             if account_tree_update.as_mutation_set().root() != header.account_root() {
                 return Err(InvalidBlockError::NewBlockInvalidAccountRoot.into());
@@ -292,7 +317,7 @@ impl State {
             (
                 inner.nullifier_tree.root(),
                 nullifier_tree_update,
-                inner.account_tree.root(),
+                inner.account_tree.root_latest(),
                 account_tree_update,
             )
         };
@@ -366,7 +391,7 @@ impl State {
             // did change, we do not proceed with in-memory and database updates, since it may
             // lead to an inconsistent state.
             if inner.nullifier_tree.root() != nullifier_tree_old_root
-                || inner.account_tree.root() != account_tree_old_root
+                || inner.account_tree.root_latest() != account_tree_old_root
             {
                 return Err(ApplyBlockError::ConcurrentWrite);
             }
@@ -814,7 +839,7 @@ impl State {
         let account_witnesses = account_ids
             .iter()
             .copied()
-            .map(|account_id| (account_id, inner.account_tree.open(account_id)))
+            .map(|account_id| (account_id, inner.account_tree.open_latest(account_id)))
             .collect::<BTreeMap<AccountId, AccountWitness>>();
 
         // Fetch witnesses for all nullifiers. We don't check whether the nullifiers are spent or
@@ -840,10 +865,10 @@ impl State {
 
         let inner = self.inner.read().await;
 
-        let account_commitment = inner.account_tree.get(account_id);
+        let account_commitment = inner.account_tree.get_latest_commitment(account_id);
 
         let new_account_id_prefix_is_unique = if account_commitment.is_empty() {
-            Some(!inner.account_tree.contains_account_id_prefix(account_id.prefix()))
+            Some(!inner.account_tree.contains_account_id_prefix_in_latest(account_id.prefix()))
         } else {
             None
         };
@@ -898,19 +923,26 @@ impl State {
         &self,
         account_request: AccountProofRequest,
     ) -> Result<AccountProofResponse, DatabaseError> {
+        let AccountProofRequest { block_num, account_id, details } = account_request;
+        let _ = block_num.ok_or_else(|| {
+            DatabaseError::NotImplemented(
+                "Handling of historical/past block numbers is not implemented yet".to_owned(),
+            )
+        });
+
         // Lock inner state for the whole operation. We need to hold this lock to prevent the
         // database, account tree and latest block number from changing during the operation,
         // because changing one of them would lead to inconsistent state.
         let inner_state = self.inner.read().await;
 
-        let account_id = account_request.account_id;
-        // TODO: Implement historical block support using account_request.block_num
-        // For now, we always return the current state
+        let block_num = inner_state.account_tree.block_number_latest();
+        let witness = inner_state.account_tree.open_latest(account_id);
+
         let account_details = if let Some(AccountDetailRequest {
             code_commitment,
             asset_vault_commitment,
             storage_requests,
-        }) = account_request.details
+        }) = details
         {
             let account_info = self.db.select_account(account_id).await?;
 
@@ -978,7 +1010,8 @@ impl State {
         };
 
         let response = AccountProofResponse {
-            witness: inner_state.account_tree.open(account_id),
+            block_num,
+            witness,
             details: account_details,
         };
 
@@ -1088,9 +1121,20 @@ async fn load_mmr(db: &mut Db) -> Result<Mmr, StateInitializationError> {
 }
 
 #[instrument(level = "info", target = COMPONENT, skip_all)]
-async fn load_account_tree(db: &mut Db) -> Result<AccountTree, StateInitializationError> {
+async fn load_account_tree(
+    db: &mut Db,
+    block_number: BlockNumber,
+) -> Result<AccountTreeWithHistory<InMemoryAccountTree>, StateInitializationError> {
     let account_data = db.select_all_account_commitments().await?.into_iter().collect::<Vec<_>>();
 
-    AccountTree::with_entries(account_data)
-        .map_err(StateInitializationError::FailedToCreateAccountsTree)
+    // Convert account_data to use account_id_to_smt_key
+    let smt_entries = account_data
+        .into_iter()
+        .map(|(id, commitment)| (account_id_to_smt_key(id), commitment));
+
+    let smt = LargeSmt::with_entries(MemoryStorage::default(), smt_entries)
+        .expect("Failed to create LargeSmt from database account data");
+
+    let account_tree = AccountTree::new(smt).expect("Failed to create AccountTree");
+    Ok(AccountTreeWithHistory::new(account_tree, block_number))
 }
diff --git a/proto/proto/store/rpc.proto b/proto/proto/store/rpc.proto
index 09214fa6f..d090408eb 100644
--- a/proto/proto/store/rpc.proto
+++ b/proto/proto/store/rpc.proto
@@ -147,8 +147,9 @@ message AccountProofRequest {
     // ID of the account for which we want to get data
     account.AccountId account_id = 1;
 
-    // Block at which we'd like to get this data. Must be close to the chain tip.
-    fixed32 block_num = 2;
+    // Block at which we'd like to get this data. If present, must be close to the chain tip.
+    // If not present, data from the latest block will be returned.
+    optional blockchain.BlockNumber block_num = 2;
 
     // Request for additional account details; valid only for public accounts.
     optional AccountDetailRequest details = 3;
@@ -164,7 +165,7 @@ message AccountProofResponse {
         // Account storage data
         AccountStorageDetails storage_details = 2;
 
-        // Account code; empty if code commitments matched or none was requested
+        // Account code; empty if code commitments matched or none was requested.
         optional bytes code = 3;
 
         // Account asset vault data; empty if vault commitments matched or the requester
@@ -172,11 +173,14 @@ message AccountProofResponse {
         optional AccountVaultDetails vault_details = 4;
     }
 
-    // Account ID, current state commitment, and SMT path
-    account.AccountWitness witness = 1;
+    // The block number at which the account witness was created and the account details were observed.
+    blockchain.BlockNumber block_num = 1;
+
+    // Account ID, current state commitment, and SMT path.
+    account.AccountWitness witness = 2;
 
-    // Additional details for public accounts
-    optional AccountDetails details = 2;
+    // Additional details for public accounts.
+    optional AccountDetails details = 3;
 }
 
 // Account vault details for AccountProofResponse

From de667e941ae7195d39ef86de43bf5bfd04d58ff6 Mon Sep 17 00:00:00 2001
From: Serge Radinovich <47865535+sergerad@users.noreply.github.com>
Date: Wed, 5 Nov 2025 12:48:37 +1300
Subject: [PATCH 67/78] feat: implement `DataStore:: get_note_script()` for
 `NtxDataStore` (#1332)

---
 CHANGELOG.md                                  |  1 +
 Cargo.lock                                    | 11 ++-
 Cargo.toml                                    |  1 +
 bin/node/src/commands/bundled.rs              | 12 +--
 crates/ntx-builder/Cargo.toml                 |  1 +
 crates/ntx-builder/src/builder/mod.rs         | 28 ++++--
 crates/ntx-builder/src/store.rs               | 27 ++++++
 crates/ntx-builder/src/transaction.rs         | 85 +++++++++++++++++--
 .../proto/src/generated/ntx_builder_store.rs  | 84 ++++++++++++++++++
 crates/proto/src/generated/rpc.rs             |  6 +-
 crates/proto/src/generated/rpc_store.rs       | 16 ++--
 crates/proto/src/generated/shared.rs          |  7 ++
 crates/rpc/src/server/api.rs                  |  2 +-
 crates/rpc/src/server/validator.rs            |  3 +-
 crates/store/src/server/ntx_builder.rs        | 32 ++++++-
 crates/store/src/server/rpc_api.rs            |  4 +-
 proto/proto/rpc.proto                         |  2 +-
 proto/proto/store/ntx_builder.proto           |  3 +
 proto/proto/store/rpc.proto                   | 11 +--
 proto/proto/store/shared.proto                |  9 ++
 20 files changed, 295 insertions(+), 50 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83f1243f8..a26d4bcff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - [BREAKING] Response type nuances of `GetAccountProof` in the public store API (#[1277](https://github.com/0xMiden/miden-node/pull/1277)).
 - Add `validator` crate with initial protobuf, gRPC server, and sub-command (#[1293](https://github.com/0xMiden/miden-node/pull/1293)).
 - Add optional `TransactionInputs` field to `SubmitProvenTransaction` endpoint for transaction re-execution (#[1278](https://github.com/0xMiden/miden-node/pull/1278)).
+- Implement `DataStore::get_note_script()` for `NtxDataStore` (#[1332](https://github.com/0xMiden/miden-node/pull/1332)).
 - [BREAKING] Added `AccountTreeWithHistory` and integrate historical queries into `GetAccountProof` ([#1292](https://github.com/0xMiden/miden-node/pull/1292)).
 
 ## v0.11.2 (2025-09-10)
diff --git a/Cargo.lock b/Cargo.lock
index 3d92ccc3b..d207cdcef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2331,6 +2331,12 @@ dependencies = [
  "hashbrown 0.15.5",
 ]
 
+[[package]]
+name = "lru"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96051b46fc183dc9cd4a223960ef37b9af631b55191852a8274bfef064cda20f"
+
 [[package]]
 name = "matchers"
 version = "0.2.0"
@@ -2663,6 +2669,7 @@ version = "0.12.0"
 dependencies = [
  "anyhow",
  "futures",
+ "lru 0.16.2",
  "miden-node-proto",
  "miden-node-test-macro",
  "miden-node-utils",
@@ -3639,7 +3646,7 @@ dependencies = [
  "httpdate",
  "indexmap 1.9.3",
  "log",
- "lru",
+ "lru 0.14.0",
  "once_cell",
  "parking_lot",
  "pingora-core",
@@ -3798,7 +3805,7 @@ checksum = "996c574f30a6e1ad10b47ac1626a86e0e47d5075953dd049d60df16ba5f7076e"
 dependencies = [
  "crossbeam-queue",
  "log",
- "lru",
+ "lru 0.14.0",
  "parking_lot",
  "pingora-timeout",
  "thread_local",
diff --git a/Cargo.toml b/Cargo.toml
index 95b57a64f..888cf2997 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -71,6 +71,7 @@ http               = { version = "1.3" }
 humantime          = { version = "2.2" }
 indexmap           = { version = "2.12" }
 itertools          = { version = "0.14" }
+lru                = { default-features = false, version = "0.16" }
 pretty_assertions  = { version = "1.4" }
 prost              = { version = "0.14" }
 protox             = { version = "0.9" }
diff --git a/bin/node/src/commands/bundled.rs b/bin/node/src/commands/bundled.rs
index 2acc4b9ea..71c6f5ac1 100644
--- a/bin/node/src/commands/bundled.rs
+++ b/bin/node/src/commands/bundled.rs
@@ -268,13 +268,13 @@ impl BundledCommand {
                     let block_producer_url =
                         Url::parse(&format!("http://{block_producer_address}"))
                             .context("Failed to parse URL")?;
-                    NetworkTransactionBuilder {
-                        store_url: store_ntx_builder_url,
+                    NetworkTransactionBuilder::new(
+                        store_ntx_builder_url,
                         block_producer_url,
-                        tx_prover_url: ntx_builder.tx_prover_url,
-                        ticker_interval: ntx_builder.ticker_interval,
-                        bp_checkpoint: checkpoint,
-                    }
+                        ntx_builder.tx_prover_url,
+                        ntx_builder.ticker_interval,
+                        checkpoint,
+                    )
                     .serve_new()
                     .await
                     .context("failed while serving ntx builder component")
diff --git a/crates/ntx-builder/Cargo.toml b/crates/ntx-builder/Cargo.toml
index 82ecc7f98..7eefab8e4 100644
--- a/crates/ntx-builder/Cargo.toml
+++ b/crates/ntx-builder/Cargo.toml
@@ -16,6 +16,7 @@ workspace = true
 [dependencies]
 anyhow                     = { workspace = true }
 futures                    = { workspace = true }
+lru                        = { workspace = true }
 miden-node-proto           = { workspace = true }
 miden-node-utils           = { workspace = true }
 miden-objects              = { default-features = true, workspace = true }
diff --git a/crates/ntx-builder/src/builder/mod.rs b/crates/ntx-builder/src/builder/mod.rs
index 2a6216a19..2932240b7 100644
--- a/crates/ntx-builder/src/builder/mod.rs
+++ b/crates/ntx-builder/src/builder/mod.rs
@@ -27,22 +27,39 @@ use crate::transaction::NtxError;
 /// transactions that consume them (reaching out to the store to retrieve state as necessary).
 pub struct NetworkTransactionBuilder {
     /// Address of the store gRPC server.
-    pub store_url: Url,
+    store_url: Url,
     /// Address of the block producer gRPC server.
-    pub block_producer_url: Url,
+    block_producer_url: Url,
     /// Address of the remote prover. If `None`, transactions will be proven locally, which is
     /// undesirable due to the perofmrance impact.
-    pub tx_prover_url: Option<Url>,
+    tx_prover_url: Option<Url>,
     /// Interval for checking pending notes and executing network transactions.
-    pub ticker_interval: Duration,
+    ticker_interval: Duration,
     /// A checkpoint used to sync start-up process with the block-producer.
     ///
     /// This informs the block-producer when we have subscribed to mempool events and that it is
     /// safe to begin block-production.
-    pub bp_checkpoint: Arc<Barrier>,
+    bp_checkpoint: Arc<Barrier>,
 }
 
 impl NetworkTransactionBuilder {
+    /// Creates a new instance of the network transaction builder.
+    pub fn new(
+        store_url: Url,
+        block_producer_url: Url,
+        tx_prover_url: Option<Url>,
+        ticker_interval: Duration,
+        bp_checkpoint: Arc<Barrier>,
+    ) -> Self {
+        Self {
+            store_url,
+            block_producer_url,
+            tx_prover_url,
+            ticker_interval,
+            bp_checkpoint,
+        }
+    }
+
     pub async fn serve_new(self) -> anyhow::Result<()> {
         let store = StoreClient::new(self.store_url);
         let block_producer = BlockProducerClient::new(self.block_producer_url);
@@ -77,6 +94,7 @@ impl NetworkTransactionBuilder {
         let context = crate::transaction::NtxContext {
             block_producer: block_producer.clone(),
             prover,
+            store,
         };
 
         loop {
diff --git a/crates/ntx-builder/src/store.rs b/crates/ntx-builder/src/store.rs
index 605610b58..922275276 100644
--- a/crates/ntx-builder/src/store.rs
+++ b/crates/ntx-builder/src/store.rs
@@ -6,9 +6,11 @@ use miden_node_proto::domain::note::NetworkNote;
 use miden_node_proto::errors::ConversionError;
 use miden_node_proto::generated::{self as proto};
 use miden_node_proto::try_convert;
+use miden_objects::Word;
 use miden_objects::account::Account;
 use miden_objects::block::BlockHeader;
 use miden_objects::crypto::merkle::{Forest, MmrPeaks, PartialMmr};
+use miden_objects::note::NoteScript;
 use miden_tx::utils::Deserializable;
 use thiserror::Error;
 use tracing::{info, instrument};
@@ -161,6 +163,31 @@ impl StoreClient {
 
         Ok(account)
     }
+
+    #[instrument(target = COMPONENT, name = "store.client.get_note_script_by_root", skip_all, err)]
+    pub async fn get_note_script_by_root(
+        &self,
+        root: Word,
+    ) -> Result<Option<NoteScript>, StoreError> {
+        let request = proto::note::NoteRoot { root: Some(root.into()) };
+
+        // Make the request to the store.
+        let script = self.inner.clone().get_note_script_by_root(request).await?.into_inner().script;
+
+        // Handle result.
+        if let Some(script) = script {
+            // Deserialize the script.
+            let script = NoteScript::read_from_bytes(&script.mast).map_err(|err| {
+                StoreError::DeserializationError(ConversionError::deserialization_error(
+                    "note script",
+                    err,
+                ))
+            })?;
+            Ok(Some(script))
+        } else {
+            Ok(None)
+        }
+    }
 }
 
 // Store errors
diff --git a/crates/ntx-builder/src/transaction.rs b/crates/ntx-builder/src/transaction.rs
index 325eaf490..956aff4b7 100644
--- a/crates/ntx-builder/src/transaction.rs
+++ b/crates/ntx-builder/src/transaction.rs
@@ -1,10 +1,12 @@
 use std::collections::BTreeSet;
+use std::sync::Arc;
 
+use lru::LruCache;
 use miden_node_utils::tracing::OpenTelemetrySpanExt;
 use miden_objects::account::{Account, AccountId, PartialAccount, StorageMapWitness, StorageSlot};
 use miden_objects::asset::{AssetWitness, VaultKey};
 use miden_objects::block::{BlockHeader, BlockNumber};
-use miden_objects::note::Note;
+use miden_objects::note::{Note, NoteScript};
 use miden_objects::transaction::{
     AccountInputs,
     ExecutedTransaction,
@@ -33,12 +35,14 @@ use miden_tx::{
     TransactionMastStore,
     TransactionProverError,
 };
+use tokio::sync::Mutex;
 use tokio::task::JoinError;
 use tracing::{Instrument, instrument};
 
 use crate::COMPONENT;
 use crate::block_producer::BlockProducerClient;
 use crate::state::TransactionCandidate;
+use crate::store::StoreClient;
 
 #[derive(Debug, thiserror::Error)]
 pub enum NtxError {
@@ -73,6 +77,9 @@ pub struct NtxContext {
     /// Defaults to local proving if unset. This should be avoided in production as this is
     /// computationally intensive.
     pub prover: Option<RemoteTransactionProver>,
+
+    /// The store client for retrieving note scripts.
+    pub store: StoreClient,
 }
 
 impl NtxContext {
@@ -118,7 +125,8 @@ impl NtxContext {
 
         async move {
             async move {
-                let data_store = NtxDataStore::new(account, chain_tip_header, chain_mmr);
+                let data_store =
+                    NtxDataStore::new(account, chain_tip_header, chain_mmr, self.store.clone());
 
                 let notes = notes.into_iter().map(Note::from).collect::<Vec<_>>();
                 let (successful, failed) = self.filter_notes(&data_store, notes).await?;
@@ -233,7 +241,11 @@ impl NtxContext {
 // ================================================================================================
 
 /// A [`DataStore`] implementation which provides transaction inputs for a single account and
-/// reference block.
+/// reference block with LRU caching for note scripts.
+///
+/// This implementation includes an LRU (Least Recently Used) cache for note scripts to improve
+/// performance by avoiding repeated RPC calls for the same script roots. The cache automatically
+/// manages memory usage by evicting least recently used entries when the cache reaches capacity.
 ///
 /// This is sufficient for executing a network transaction.
 struct NtxDataStore {
@@ -241,10 +253,26 @@ struct NtxDataStore {
     reference_header: BlockHeader,
     chain_mmr: PartialBlockchain,
     mast_store: TransactionMastStore,
+    /// Store client for retrieving note scripts.
+    store: StoreClient,
+    /// LRU cache for storing retrieved note scripts to avoid repeated store calls.
+    script_cache: Arc<Mutex<LruCache<Word, NoteScript>>>,
 }
 
 impl NtxDataStore {
-    fn new(account: Account, reference_header: BlockHeader, chain_mmr: PartialBlockchain) -> Self {
+    /// Default cache size for note scripts.
+    ///
+    /// Each cached script contains the deserialized `NoteScript` object, so the actual memory usage
+    /// depends on the complexity of the scripts being cached.
+    const DEFAULT_SCRIPT_CACHE_SIZE: usize = 1000;
+
+    /// Creates a new `NtxDataStore` with default cache size.
+    fn new(
+        account: Account,
+        reference_header: BlockHeader,
+        chain_mmr: PartialBlockchain,
+        store: StoreClient,
+    ) -> Self {
         let mast_store = TransactionMastStore::new();
         mast_store.load_account_code(account.code());
 
@@ -253,6 +281,11 @@ impl NtxDataStore {
             reference_header,
             chain_mmr,
             mast_store,
+            store,
+            script_cache: Arc::new(Mutex::new(LruCache::new(
+                std::num::NonZeroUsize::new(Self::DEFAULT_SCRIPT_CACHE_SIZE)
+                    .expect("default script cache size is non-zero"),
+            ))),
         }
     }
 }
@@ -348,12 +381,50 @@ impl DataStore for NtxDataStore {
         }
     }
 
+    /// Retrieves a note script by its root hash.
+    ///
+    /// This implementation uses the configured RPC client to call the `GetNoteScriptByRoot`
+    /// endpoint on the RPC server.
     fn get_note_script(
         &self,
         script_root: Word,
-    ) -> impl FutureMaybeSend<Result<miden_objects::note::NoteScript, DataStoreError>> {
-        // TODO: Add implementation for getting note script from NtxDataStore.
-        async move { Err(DataStoreError::NoteScriptNotFound(script_root)) }
+    ) -> impl FutureMaybeSend<Result<NoteScript, DataStoreError>> {
+        let store = self.store.clone();
+        let cache = self.script_cache.clone();
+
+        async move {
+            // Attempt to retrieve the script from the cache.
+            if let Some(cached_script) = {
+                let mut cache_guard = cache.lock().await;
+                cache_guard.get(&script_root).cloned()
+            } {
+                return Ok(cached_script);
+            }
+
+            // Retrieve the script from the store.
+            let maybe_script = store.get_note_script_by_root(script_root).await.map_err(|err| {
+                DataStoreError::Other {
+                    error_msg: "failed to retrieve note script from store".to_string().into(),
+                    source: Some(err.into()),
+                }
+            })?;
+            // Handle response.
+            match maybe_script {
+                Some(script) => {
+                    // Cache the retrieved script.
+                    {
+                        let mut cache_guard = cache.lock().await;
+                        cache_guard.put(script_root, script.clone());
+                    }
+                    // Return script.
+                    Ok(script)
+                },
+                None => {
+                    // Response did not contain the note script.
+                    Err(DataStoreError::NoteScriptNotFound(script_root))
+                },
+            }
+        }
     }
 }
 
diff --git a/crates/proto/src/generated/ntx_builder_store.rs b/crates/proto/src/generated/ntx_builder_store.rs
index 3b74e3f6e..3beb83076 100644
--- a/crates/proto/src/generated/ntx_builder_store.rs
+++ b/crates/proto/src/generated/ntx_builder_store.rs
@@ -323,6 +323,36 @@ pub mod ntx_builder_client {
                 );
             self.inner.unary(req, path, codec).await
         }
+        /// Returns the script for a note by its root.
+        pub async fn get_note_script_by_root(
+            &mut self,
+            request: impl tonic::IntoRequest<super::super::note::NoteRoot>,
+        ) -> std::result::Result<
+            tonic::Response<super::super::shared::MaybeNoteScript>,
+            tonic::Status,
+        > {
+            self.inner
+                .ready()
+                .await
+                .map_err(|e| {
+                    tonic::Status::unknown(
+                        format!("Service was not ready: {}", e.into()),
+                    )
+                })?;
+            let codec = tonic_prost::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/ntx_builder_store.NtxBuilder/GetNoteScriptByRoot",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut()
+                .insert(
+                    GrpcMethod::new(
+                        "ntx_builder_store.NtxBuilder",
+                        "GetNoteScriptByRoot",
+                    ),
+                );
+            self.inner.unary(req, path, codec).await
+        }
     }
 }
 /// Generated server implementations.
@@ -381,6 +411,14 @@ pub mod ntx_builder_server {
             tonic::Response<super::MaybeAccountDetails>,
             tonic::Status,
         >;
+        /// Returns the script for a note by its root.
+        async fn get_note_script_by_root(
+            &self,
+            request: tonic::Request<super::super::note::NoteRoot>,
+        ) -> std::result::Result<
+            tonic::Response<super::super::shared::MaybeNoteScript>,
+            tonic::Status,
+        >;
     }
     /// Store API for the network transaction builder component
     #[derive(Debug)]
@@ -717,6 +755,52 @@ pub mod ntx_builder_server {
                     };
                     Box::pin(fut)
                 }
+                "/ntx_builder_store.NtxBuilder/GetNoteScriptByRoot" => {
+                    #[allow(non_camel_case_types)]
+                    struct GetNoteScriptByRootSvc<T: NtxBuilder>(pub Arc<T>);
+                    impl<
+                        T: NtxBuilder,
+                    > tonic::server::UnaryService<super::super::note::NoteRoot>
+                    for GetNoteScriptByRootSvc<T> {
+                        type Response = super::super::shared::MaybeNoteScript;
+                        type Future = BoxFuture<
+                            tonic::Response<Self::Response>,
+                            tonic::Status,
+                        >;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<super::super::note::NoteRoot>,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as NtxBuilder>::get_note_script_by_root(&inner, request)
+                                    .await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = GetNoteScriptByRootSvc(inner);
+                        let codec = tonic_prost::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
                 _ => {
                     Box::pin(async move {
                         let mut response = http::Response::new(
diff --git a/crates/proto/src/generated/rpc.rs b/crates/proto/src/generated/rpc.rs
index a1a28e4e6..5c6a4ce4f 100644
--- a/crates/proto/src/generated/rpc.rs
+++ b/crates/proto/src/generated/rpc.rs
@@ -275,7 +275,7 @@ pub mod api_client {
             &mut self,
             request: impl tonic::IntoRequest<super::super::note::NoteRoot>,
         ) -> std::result::Result<
-            tonic::Response<super::super::rpc_store::MaybeNoteScript>,
+            tonic::Response<super::super::shared::MaybeNoteScript>,
             tonic::Status,
         > {
             self.inner
@@ -597,7 +597,7 @@ pub mod api_server {
             &self,
             request: tonic::Request<super::super::note::NoteRoot>,
         ) -> std::result::Result<
-            tonic::Response<super::super::rpc_store::MaybeNoteScript>,
+            tonic::Response<super::super::shared::MaybeNoteScript>,
             tonic::Status,
         >;
         /// Submits proven transaction to the Miden network.
@@ -1104,7 +1104,7 @@ pub mod api_server {
                         T: Api,
                     > tonic::server::UnaryService<super::super::note::NoteRoot>
                     for GetNoteScriptByRootSvc<T> {
-                        type Response = super::super::rpc_store::MaybeNoteScript;
+                        type Response = super::super::shared::MaybeNoteScript;
                         type Future = BoxFuture<
                             tonic::Response<Self::Response>,
                             tonic::Status,
diff --git a/crates/proto/src/generated/rpc_store.rs b/crates/proto/src/generated/rpc_store.rs
index 8c5f5d21f..187f559ef 100644
--- a/crates/proto/src/generated/rpc_store.rs
+++ b/crates/proto/src/generated/rpc_store.rs
@@ -398,13 +398,6 @@ pub struct StorageMapUpdate {
     #[prost(message, optional, tag = "4")]
     pub value: ::core::option::Option<super::primitives::Digest>,
 }
-/// Represents a note script or nothing.
-#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
-pub struct MaybeNoteScript {
-    /// The script for a note by its root.
-    #[prost(message, optional, tag = "1")]
-    pub script: ::core::option::Option<super::note::NoteScript>,
-}
 /// Represents a block range.
 #[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct BlockRange {
@@ -739,7 +732,7 @@ pub mod rpc_client {
             &mut self,
             request: impl tonic::IntoRequest<super::super::note::NoteRoot>,
         ) -> std::result::Result<
-            tonic::Response<super::MaybeNoteScript>,
+            tonic::Response<super::super::shared::MaybeNoteScript>,
             tonic::Status,
         > {
             self.inner
@@ -1000,7 +993,10 @@ pub mod rpc_server {
         async fn get_note_script_by_root(
             &self,
             request: tonic::Request<super::super::note::NoteRoot>,
-        ) -> std::result::Result<tonic::Response<super::MaybeNoteScript>, tonic::Status>;
+        ) -> std::result::Result<
+            tonic::Response<super::super::shared::MaybeNoteScript>,
+            tonic::Status,
+        >;
         /// Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
         ///
         /// Note that only 16-bit prefixes are supported at this time.
@@ -1469,7 +1465,7 @@ pub mod rpc_server {
                         T: Rpc,
                     > tonic::server::UnaryService<super::super::note::NoteRoot>
                     for GetNoteScriptByRootSvc<T> {
-                        type Response = super::MaybeNoteScript;
+                        type Response = super::super::shared::MaybeNoteScript;
                         type Future = BoxFuture<
                             tonic::Response<Self::Response>,
                             tonic::Status,
diff --git a/crates/proto/src/generated/shared.rs b/crates/proto/src/generated/shared.rs
index c68ba0f66..f79b9117e 100644
--- a/crates/proto/src/generated/shared.rs
+++ b/crates/proto/src/generated/shared.rs
@@ -25,3 +25,10 @@ pub struct BlockHeaderByNumberResponse {
     #[prost(fixed32, optional, tag = "3")]
     pub chain_length: ::core::option::Option<u32>,
 }
+/// Represents a note script or nothing.
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct MaybeNoteScript {
+    /// The script for a note by its root.
+    #[prost(message, optional, tag = "1")]
+    pub script: ::core::option::Option<super::note::NoteScript>,
+}
diff --git a/crates/rpc/src/server/api.rs b/crates/rpc/src/server/api.rs
index bd3527f75..38460683f 100644
--- a/crates/rpc/src/server/api.rs
+++ b/crates/rpc/src/server/api.rs
@@ -603,7 +603,7 @@ impl api_server::Api for RpcService {
     async fn get_note_script_by_root(
         &self,
         request: Request<proto::note::NoteRoot>,
-    ) -> Result<Response<proto::rpc_store::MaybeNoteScript>, Status> {
+    ) -> Result<Response<proto::shared::MaybeNoteScript>, Status> {
         debug!(target: COMPONENT, request = ?request);
 
         self.store.clone().get_note_script_by_root(request).await
diff --git a/crates/rpc/src/server/validator.rs b/crates/rpc/src/server/validator.rs
index 615ec5cf4..dd548b963 100644
--- a/crates/rpc/src/server/validator.rs
+++ b/crates/rpc/src/server/validator.rs
@@ -6,6 +6,7 @@ use miden_objects::Word;
 use miden_objects::account::{AccountId, PartialAccount, StorageMapWitness};
 use miden_objects::asset::{AssetWitness, VaultKey};
 use miden_objects::block::{BlockHeader, BlockNumber};
+use miden_objects::note::NoteScript;
 use miden_objects::transaction::{
     AccountInputs,
     ExecutedTransaction,
@@ -136,7 +137,7 @@ impl DataStore for TransactionInputsDataStore {
     fn get_note_script(
         &self,
         script_root: Word,
-    ) -> impl FutureMaybeSend<Result<miden_objects::note::NoteScript, DataStoreError>> {
+    ) -> impl FutureMaybeSend<Result<NoteScript, DataStoreError>> {
         async move { Err(DataStoreError::NoteScriptNotFound(script_root)) }
     }
 }
diff --git a/crates/store/src/server/ntx_builder.rs b/crates/store/src/server/ntx_builder.rs
index b58363218..1f2dd1595 100644
--- a/crates/store/src/server/ntx_builder.rs
+++ b/crates/store/src/server/ntx_builder.rs
@@ -7,11 +7,12 @@ use miden_node_utils::ErrorReport;
 use miden_objects::block::BlockNumber;
 use miden_objects::note::Note;
 use tonic::{Request, Response, Status};
-use tracing::instrument;
+use tracing::{debug, instrument};
 
 use crate::COMPONENT;
 use crate::db::models::Page;
-use crate::server::api::{StoreApi, internal_error, invalid_argument};
+use crate::errors::GetNoteScriptByRootError;
+use crate::server::api::{StoreApi, internal_error, invalid_argument, read_root};
 
 // NTX BUILDER ENDPOINTS
 // ================================================================================================
@@ -188,4 +189,31 @@ impl ntx_builder_server::NtxBuilder for StoreApi {
             next_token: next_page.token,
         }))
     }
+
+    #[instrument(
+        parent = None,
+        target = COMPONENT,
+        name = "store.ntx_builder_server.get_note_script_by_root",
+        skip_all,
+        ret(level = "debug"),
+        err
+    )]
+    async fn get_note_script_by_root(
+        &self,
+        request: Request<proto::note::NoteRoot>,
+    ) -> Result<Response<proto::shared::MaybeNoteScript>, Status> {
+        debug!(target: COMPONENT, request = ?request);
+
+        let root = read_root::<GetNoteScriptByRootError>(request.into_inner().root, "NoteRoot")?;
+
+        let note_script = self
+            .state
+            .get_note_script_by_root(root)
+            .await
+            .map_err(GetNoteScriptByRootError::from)?;
+
+        Ok(Response::new(proto::shared::MaybeNoteScript {
+            script: note_script.map(Into::into),
+        }))
+    }
 }
diff --git a/crates/store/src/server/rpc_api.rs b/crates/store/src/server/rpc_api.rs
index 66125365a..b8b0d5d7f 100644
--- a/crates/store/src/server/rpc_api.rs
+++ b/crates/store/src/server/rpc_api.rs
@@ -506,7 +506,7 @@ impl rpc_server::Rpc for StoreApi {
     async fn get_note_script_by_root(
         &self,
         request: Request<proto::note::NoteRoot>,
-    ) -> Result<Response<proto::rpc_store::MaybeNoteScript>, Status> {
+    ) -> Result<Response<proto::shared::MaybeNoteScript>, Status> {
         debug!(target: COMPONENT, request = ?request);
 
         let root = read_root::<GetNoteScriptByRootError>(request.into_inner().root, "NoteRoot")?;
@@ -517,7 +517,7 @@ impl rpc_server::Rpc for StoreApi {
             .await
             .map_err(GetNoteScriptByRootError::from)?;
 
-        Ok(Response::new(proto::rpc_store::MaybeNoteScript {
+        Ok(Response::new(proto::shared::MaybeNoteScript {
             script: note_script.map(Into::into),
         }))
     }
diff --git a/proto/proto/rpc.proto b/proto/proto/rpc.proto
index 6669d407a..dd3f1d6d6 100644
--- a/proto/proto/rpc.proto
+++ b/proto/proto/rpc.proto
@@ -40,7 +40,7 @@ service Api {
     rpc GetNotesById(note.NoteIdList) returns (note.CommittedNoteList) {}
 
     // Returns the script for a note by its root.
-    rpc GetNoteScriptByRoot(note.NoteRoot) returns (rpc_store.MaybeNoteScript) {}
+    rpc GetNoteScriptByRoot(note.NoteRoot) returns (shared.MaybeNoteScript) {}
 
     // Submits proven transaction to the Miden network.
     rpc SubmitProvenTransaction(transaction.ProvenTransaction) returns (block_producer.SubmitProvenTransactionResponse) {}
diff --git a/proto/proto/store/ntx_builder.proto b/proto/proto/store/ntx_builder.proto
index 507ad9e96..15144447b 100644
--- a/proto/proto/store/ntx_builder.proto
+++ b/proto/proto/store/ntx_builder.proto
@@ -30,6 +30,9 @@ service NtxBuilder {
 
     // Returns the latest state of a network account with the specified account prefix.
     rpc GetNetworkAccountDetailsByPrefix(AccountIdPrefix) returns (MaybeAccountDetails) {}
+
+    // Returns the script for a note by its root.
+    rpc GetNoteScriptByRoot(note.NoteRoot) returns (shared.MaybeNoteScript) {}
 }
 
 // GET NETWORK ACCOUNT DETAILS BY PREFIX
diff --git a/proto/proto/store/rpc.proto b/proto/proto/store/rpc.proto
index d090408eb..1fc3e1936 100644
--- a/proto/proto/store/rpc.proto
+++ b/proto/proto/store/rpc.proto
@@ -40,7 +40,7 @@ service Rpc {
     rpc GetNotesById(note.NoteIdList) returns (note.CommittedNoteList) {}
 
     // Returns the script for a note by its root.
-    rpc GetNoteScriptByRoot(note.NoteRoot) returns (MaybeNoteScript) {}
+    rpc GetNoteScriptByRoot(note.NoteRoot) returns (shared.MaybeNoteScript) {}
 
     // Returns a list of nullifiers that match the specified prefixes and are recorded in the node.
     //
@@ -441,15 +441,6 @@ message StorageMapUpdate {
     primitives.Digest value = 4;
 }
 
-// GET NOTE SCRIPT BY ROOT
-// ================================================================================================
-
-// Represents a note script or nothing.
-message MaybeNoteScript {
-    // The script for a note by its root.
-    optional note.NoteScript script = 1;
-}
-
 // BLOCK RANGE
 // ================================================================================================
 
diff --git a/proto/proto/store/shared.proto b/proto/proto/store/shared.proto
index 398f99001..1d162087e 100644
--- a/proto/proto/store/shared.proto
+++ b/proto/proto/store/shared.proto
@@ -34,3 +34,12 @@ message BlockHeaderByNumberResponse {
     // Current chain length.
     optional fixed32 chain_length = 3;
 }
+
+// GET NOTE SCRIPT BY ROOT
+// ================================================================================================
+
+// Represents a note script or nothing.
+message MaybeNoteScript {
+    // The script for a note by its root.
+    optional note.NoteScript script = 1;
+}

From 6f8a4106b17eed3fe340ab94fc7c1fa9bef480f0 Mon Sep 17 00:00:00 2001
From: juan518munoz <62400508+juan518munoz@users.noreply.github.com>
Date: Wed, 5 Nov 2025 17:36:15 -0300
Subject: [PATCH 68/78] chore: update `miden-base` (#1318)

---
 CHANGELOG.md                                  |   2 +-
 Cargo.lock                                    | 187 ++++++++++++++----
 Cargo.toml                                    |  16 +-
 bin/node/Dockerfile                           |   2 +-
 bin/stress-test/src/seeding/mod.rs            |  19 +-
 crates/ntx-builder/src/state/account.rs       |  21 +-
 crates/ntx-builder/src/state/mod.rs           |   9 +-
 crates/ntx-builder/src/transaction.rs         |   4 +-
 crates/rpc/Cargo.toml                         |   1 +
 crates/rpc/src/server/api.rs                  |  15 --
 crates/rpc/src/server/validator.rs            |   4 +-
 crates/rpc/src/tests.rs                       |  53 +++--
 crates/store/src/db/mod.rs                    |   7 +-
 .../store/src/db/models/queries/accounts.rs   |  27 +--
 crates/store/src/db/tests.rs                  |  16 +-
 crates/store/src/errors.rs                    |   2 +
 crates/store/src/genesis/config/mod.rs        |   2 +-
 crates/store/src/genesis/mod.rs               |  15 +-
 crates/store/src/server/rpc_api.rs            |  11 +-
 19 files changed, 274 insertions(+), 139 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a26d4bcff..9bb7aa01d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Changes
 
-- [BREAKING] Updated MSRV to 1.89.
+- [BREAKING] Updated MSRV to 1.90.
 - Added `GetNoteScriptByRoot` gRPC endpoint for retrieving a note script by its root ([#1196](https://github.com/0xMiden/miden-node/pull/1196)).
 - [BREAKING] Refactored `CheckNullifiersByPrefix` endpoint adding pagination ([#1191](https://github.com/0xMiden/miden-node/pull/1191)).
 - [BREAKING] Renamed `CheckNullifiersByPrefix` endpoint to `SyncNullifiers` ([#1191](https://github.com/0xMiden/miden-node/pull/1191)).
diff --git a/Cargo.lock b/Cargo.lock
index d207cdcef..1a92dc4cb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -882,6 +882,33 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "curve25519-dalek"
+version = "4.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "digest",
+ "fiat-crypto",
+ "rustc_version 0.4.1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
 [[package]]
 name = "daemonize"
 version = "0.5.0"
@@ -1202,6 +1229,30 @@ dependencies = [
  "spki",
 ]
 
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8",
+ "signature",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9"
+dependencies = [
+ "curve25519-dalek",
+ "ed25519",
+ "serde",
+ "sha2",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "either"
 version = "1.15.0"
@@ -1313,6 +1364,12 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "fiat-crypto"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+
 [[package]]
 name = "figment"
 version = "0.10.19"
@@ -1630,8 +1687,6 @@ dependencies = [
  "allocator-api2",
  "equivalent",
  "foldhash 0.1.5",
- "rayon",
- "serde",
 ]
 
 [[package]]
@@ -1643,6 +1698,8 @@ dependencies = [
  "allocator-api2",
  "equivalent",
  "foldhash 0.2.0",
+ "rayon",
+ "serde",
 ]
 
 [[package]]
@@ -2034,9 +2091,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "iri-string"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397"
 dependencies = [
  "memchr",
  "serde",
@@ -2375,11 +2432,12 @@ dependencies = [
 
 [[package]]
 name = "miden-air"
-version = "0.18.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22dd34d9e3ab8a4ae367f0e5003ce64068400d0e10ce1849b1c131f5d5d5fa55"
+checksum = "02cfe0ccecbd2e7a8a2cd97544d4cef438cb495e84e1a5769371dc822ff67268"
 dependencies = [
  "miden-core",
+ "miden-utils-indexing",
  "thiserror 2.0.17",
  "winter-air",
  "winter-prover",
@@ -2387,9 +2445,9 @@ dependencies = [
 
 [[package]]
 name = "miden-assembly"
-version = "0.18.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c7be9c1d460df398afe31c58a276ff86e9b207efab7de3f1a3b8476c08187be"
+checksum = "95978901bbe5cfc5632a85776d122ae3376a0728e5a4b4211c478d0a87c9e715"
 dependencies = [
  "log",
  "miden-assembly-syntax",
@@ -2401,9 +2459,9 @@ dependencies = [
 
 [[package]]
 name = "miden-assembly-syntax"
-version = "0.18.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc560c3464478364314c3c2a1533dfe3908303ddfd155a2cebc1fc0523c08703"
+checksum = "f6e4ae33c9801102e32e04d51917333b0576d245e996f5ff43b0e2820f156876"
 dependencies = [
  "aho-corasick",
  "lalrpop",
@@ -2424,7 +2482,8 @@ dependencies = [
 [[package]]
 name = "miden-block-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#f14d0eb719c6e124e4101eb8a75c279edc00c29c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "612236e5d8df5d9bd5bdc32b35e92140ad2cf2c0e99ad07b467eebfd0cb5e823"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2433,14 +2492,15 @@ dependencies = [
 
 [[package]]
 name = "miden-core"
-version = "0.18.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da3298dd3c75b119f9031631d0087d8d7de66ae5ac4da80ba7f243d2035b2a1f"
+checksum = "6806a8fd613e996b6d818a973ca40c484787848f14bea0a0c7aa1158ba9b26c2"
 dependencies = [
  "enum_dispatch",
  "miden-crypto",
  "miden-debug-types",
  "miden-formatting",
+ "miden-utils-indexing",
  "num-derive",
  "num-traits",
  "thiserror 2.0.17",
@@ -2450,19 +2510,20 @@ dependencies = [
 
 [[package]]
 name = "miden-crypto"
-version = "0.17.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87b287c7a76b95be7ef5588e98a9dbe1973395dbb19eb59dd34d82b06e47f02a"
+checksum = "ffd4233803234f287596d9a60c67c4e5762f792eb0dd20969a41c8db093d6126"
 dependencies = [
  "blake3",
  "cc",
  "chacha20poly1305",
+ "ed25519-dalek",
  "flume",
- "getrandom 0.2.16",
  "glob",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.0",
  "hkdf",
  "k256",
+ "miden-crypto-derive",
  "num",
  "num-complex",
  "rand 0.9.2",
@@ -2471,23 +2532,35 @@ dependencies = [
  "rand_hc",
  "rayon",
  "sha3",
+ "subtle",
  "thiserror 2.0.17",
  "winter-crypto",
  "winter-math",
  "winter-utils",
- "zeroize",
+ "x25519-dalek",
+]
+
+[[package]]
+name = "miden-crypto-derive"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f70dccd82a2b2787b9bfc64687cd224dfe0adc0d21ae9b241b0c6edc4a23335"
+dependencies = [
+ "quote",
+ "syn 2.0.108",
 ]
 
 [[package]]
 name = "miden-debug-types"
-version = "0.18.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e230c51cae3ed84f295927ac736bca1a7668f12f187f7feeec16fbf6f50dca3e"
+checksum = "43b37453feb8f4392af5eef29a11ac099b76cbcc47ffc034944a573d06a1cc1e"
 dependencies = [
  "memchr",
  "miden-crypto",
  "miden-formatting",
  "miden-miette",
+ "miden-utils-indexing",
  "miden-utils-sync",
  "paste",
  "serde",
@@ -2507,7 +2580,8 @@ dependencies = [
 [[package]]
 name = "miden-lib"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#f14d0eb719c6e124e4101eb8a75c279edc00c29c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42e16595f7c2c37689b9fd0fffaedb978c1b9e9aa795751ad82108365530dae8"
 dependencies = [
  "Inflector",
  "fs-err",
@@ -2524,9 +2598,9 @@ dependencies = [
 
 [[package]]
 name = "miden-mast-package"
-version = "0.18.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34898290e9ca8bff61cf2bd3c8c9b8803c244682b823b4468d5788d11b304e47"
+checksum = "bb106cd425958cb2f6fab03741d4d8905b31dca48c0942dfd61adfe6970c695f"
 dependencies = [
  "derive_more",
  "miden-assembly-syntax",
@@ -2725,6 +2799,7 @@ dependencies = [
  "futures",
  "http",
  "mediatype",
+ "miden-lib",
  "miden-node-proto",
  "miden-node-proto-build",
  "miden-node-store",
@@ -2862,7 +2937,8 @@ dependencies = [
 [[package]]
 name = "miden-objects"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#f14d0eb719c6e124e4101eb8a75c279edc00c29c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb47d96f891e22114d27748353db7dfd93247d777e1679bac44ee544ea9b204d"
 dependencies = [
  "bech32",
  "getrandom 0.3.4",
@@ -2885,15 +2961,18 @@ dependencies = [
 
 [[package]]
 name = "miden-processor"
-version = "0.18.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a66dd65cfc087c88a3a31312959fe1535ae058e0867900bdabd38c85877b58dd"
+checksum = "e97fbbc6911627d1fd25ad6f598a7ccd79721e9c89c4890a105f0a906ea3baf7"
 dependencies = [
+ "itertools 0.14.0",
  "miden-air",
  "miden-core",
  "miden-debug-types",
  "miden-utils-diagnostics",
+ "miden-utils-indexing",
  "paste",
+ "rayon",
  "thiserror 2.0.17",
  "tokio",
  "tracing",
@@ -2902,9 +2981,9 @@ dependencies = [
 
 [[package]]
 name = "miden-prover"
-version = "0.18.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64af2c9163b79102a7b349d62dd02dab772e90f2e6cfd79394ee98d8b166ba86"
+checksum = "3e07a8cb521312c8454544453b212b6dee3e7a983467f18ef8e296754ed7fe79"
 dependencies = [
  "miden-air",
  "miden-debug-types",
@@ -2980,9 +3059,9 @@ dependencies = [
 
 [[package]]
 name = "miden-stdlib"
-version = "0.18.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5420098c2e7264d2ec248aec80e98a763f5e0941fd37203b4b08da2ec5d950ac"
+checksum = "79bafb0b8715b8323eecef2b118a1dfa7112cc6cc247df742ccb8f8026c4da37"
 dependencies = [
  "env_logger",
  "fs-err",
@@ -2997,7 +3076,8 @@ dependencies = [
 [[package]]
 name = "miden-testing"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#f14d0eb719c6e124e4101eb8a75c279edc00c29c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2e5612893747091011d535b3a8a9904feab931415dd015d74d939f345d5b7dc"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -3016,7 +3096,8 @@ dependencies = [
 [[package]]
 name = "miden-tx"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#f14d0eb719c6e124e4101eb8a75c279edc00c29c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0ca3864d4a5ed445aeb1b8580e76e347d34691c642b67a79278aeb7b429f073"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -3031,7 +3112,8 @@ dependencies = [
 [[package]]
 name = "miden-tx-batch-prover"
 version = "0.12.0"
-source = "git+https://github.com/0xMiden/miden-base?branch=next#f14d0eb719c6e124e4101eb8a75c279edc00c29c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44275e75905d0f3f0c92c00f4da98acb60eaa1fbe84fdc8ad822df6db611780e"
 dependencies = [
  "miden-objects",
  "miden-tx",
@@ -3039,9 +3121,9 @@ dependencies = [
 
 [[package]]
 name = "miden-utils-diagnostics"
-version = "0.18.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2c9186ccc6e826d35bcbf84f5a580c6401ba09b7735fc650b5ad75c61131c41"
+checksum = "a7d2d3d0909fa09ba58c6965f0dfafefeb299822dc417893786c119211cac89c"
 dependencies = [
  "miden-crypto",
  "miden-debug-types",
@@ -3050,11 +3132,20 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "miden-utils-indexing"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f35669a21d99c0d5f96720ba80205438f5e63a4132dfa4d1089bc95efce7760"
+dependencies = [
+ "thiserror 2.0.17",
+]
+
 [[package]]
 name = "miden-utils-sync"
-version = "0.18.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562a065032f319f4e25319e509cbedd93f1e5b2b1dbd25236ca4ec5871ebc03b"
+checksum = "0d9f2e82680ceff6618373c61d5947eda6eaf95f3503cf8310d3fb12a1dbdf9f"
 dependencies = [
  "lock_api",
  "loom",
@@ -3063,9 +3154,9 @@ dependencies = [
 
 [[package]]
 name = "miden-verifier"
-version = "0.18.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e625e7403820e6637d9d59ad16ec6258f912d1ceae4cca03958780b76629f740"
+checksum = "a7e25b94000d5eaa24375c1c0a6fb49e1f349a35b59f51717359f06bc56fe14f"
 dependencies = [
  "miden-air",
  "miden-core",
@@ -4571,9 +4662,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.34"
+version = "0.23.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7"
+checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
 dependencies = [
  "log",
  "once_cell",
@@ -5444,9 +5535,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.16"
+version = "0.7.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
+checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
 dependencies = [
  "bytes",
  "futures-core",
@@ -6750,6 +6841,16 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
+[[package]]
+name = "x25519-dalek"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
+dependencies = [
+ "curve25519-dalek",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "yaml-rust"
 version = "0.4.5"
diff --git a/Cargo.toml b/Cargo.toml
index 888cf2997..3e32f9c8d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,7 +27,7 @@ homepage     = "https://miden.xyz"
 license      = "MIT"
 readme       = "README.md"
 repository   = "https://github.com/0xMiden/miden-node"
-rust-version = "1.89"
+rust-version = "1.90"
 version      = "0.12.0"
 
 # Optimize the cryptography for faster tests involving account creation.
@@ -49,15 +49,15 @@ miden-node-validator        = { path = "crates/validator", version = "0.12" }
 miden-remote-prover-client  = { path = "crates/remote-prover-client", version = "0.12" }
 
 # miden-base aka protocol dependencies. These should be updated in sync.
-miden-block-prover    = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
-miden-lib             = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
-miden-objects         = { branch = "next", default-features = false, git = "https://github.com/0xMiden/miden-base" }
-miden-testing         = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
-miden-tx              = { branch = "next", default-features = false, git = "https://github.com/0xMiden/miden-base" }
-miden-tx-batch-prover = { branch = "next", git = "https://github.com/0xMiden/miden-base" }
+miden-block-prover    = { version = "0.12" }
+miden-lib             = { version = "0.12" }
+miden-objects         = { default-features = false, version = "0.12" }
+miden-testing         = { version = "0.12" }
+miden-tx              = { default-features = false, version = "0.12" }
+miden-tx-batch-prover = { version = "0.12" }
 
 # Other miden dependencies. These should align with those expected by miden-base.
-miden-air = { features = ["std", "testing"], version = "0.18.1" }
+miden-air = { features = ["std", "testing"], version = "0.19" }
 
 # External dependencies
 anyhow             = { version = "1.0" }
diff --git a/bin/node/Dockerfile b/bin/node/Dockerfile
index a43695c92..a6b5cae55 100644
--- a/bin/node/Dockerfile
+++ b/bin/node/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.89-slim-bullseye AS builder
+FROM rust:1.90-slim-bullseye AS builder
 
 RUN apt-get update && \
     apt-get -y upgrade && \
diff --git a/bin/stress-test/src/seeding/mod.rs b/bin/stress-test/src/seeding/mod.rs
index 34671e1f4..5b3266287 100644
--- a/bin/stress-test/src/seeding/mod.rs
+++ b/bin/stress-test/src/seeding/mod.rs
@@ -17,7 +17,14 @@ use miden_node_proto::generated::rpc_store::rpc_client::RpcClient;
 use miden_node_store::{DataDirectory, GenesisState, Store};
 use miden_node_utils::tracing::grpc::OtelInterceptor;
 use miden_objects::account::delta::AccountUpdateDetails;
-use miden_objects::account::{Account, AccountBuilder, AccountId, AccountStorageMode, AccountType};
+use miden_objects::account::{
+    Account,
+    AccountBuilder,
+    AccountDelta,
+    AccountId,
+    AccountStorageMode,
+    AccountType,
+};
 use miden_objects::asset::{Asset, FungibleAsset, TokenSymbol};
 use miden_objects::batch::{BatchAccountUpdate, BatchId, ProvenBatch};
 use miden_objects::block::{
@@ -393,17 +400,19 @@ fn create_consume_note_tx(
 
     account.increment_nonce(ONE).unwrap();
 
-    let details = if account.is_public() {
-        AccountUpdateDetails::New(account.clone())
+    let (details, account_delta_commitment) = if account.is_public() {
+        let account_delta = AccountDelta::try_from(account.clone()).unwrap();
+        let commitment = account_delta.clone().to_commitment();
+        (AccountUpdateDetails::Delta(account_delta), commitment)
     } else {
-        AccountUpdateDetails::Private
+        (AccountUpdateDetails::Private, Word::empty())
     };
 
     ProvenTransactionBuilder::new(
         account.id(),
         init_hash,
         account.commitment(),
-        Word::empty(),
+        account_delta_commitment,
         block_ref.block_num(),
         block_ref.commitment(),
         fee_from_block(block_ref).unwrap(),
diff --git a/crates/ntx-builder/src/state/account.rs b/crates/ntx-builder/src/state/account.rs
index 52d20ed89..6487a42a6 100644
--- a/crates/ntx-builder/src/state/account.rs
+++ b/crates/ntx-builder/src/state/account.rs
@@ -250,17 +250,22 @@ impl AccountState {
 // ================================================================================================
 
 #[derive(Clone)]
-pub enum NetworkAccountUpdate {
-    New(Account),
-    Delta(AccountDelta),
+pub enum NetworkAccountEffect {
+    Created(Account),
+    Updated(AccountDelta),
 }
 
-impl NetworkAccountUpdate {
+impl NetworkAccountEffect {
     pub fn from_protocol(update: AccountUpdateDetails) -> Option<Self> {
         let update = match update {
             AccountUpdateDetails::Private => return None,
-            AccountUpdateDetails::New(update) => Self::New(update),
-            AccountUpdateDetails::Delta(update) => Self::Delta(update),
+            AccountUpdateDetails::Delta(update) if update.is_full_state() => {
+                NetworkAccountEffect::Created(
+                    Account::try_from(&update)
+                        .expect("Account should be derivable by full state AccountDelta"),
+                )
+            },
+            AccountUpdateDetails::Delta(update) => NetworkAccountEffect::Updated(update),
         };
 
         update.account_id().is_network().then_some(update)
@@ -273,8 +278,8 @@ impl NetworkAccountUpdate {
 
     fn account_id(&self) -> AccountId {
         match self {
-            NetworkAccountUpdate::New(account) => account.id(),
-            NetworkAccountUpdate::Delta(account_delta) => account_delta.id(),
+            NetworkAccountEffect::Created(acc) => acc.id(),
+            NetworkAccountEffect::Updated(delta) => delta.id(),
         }
     }
 }
diff --git a/crates/ntx-builder/src/state/mod.rs b/crates/ntx-builder/src/state/mod.rs
index 856448935..b9f4cb28b 100644
--- a/crates/ntx-builder/src/state/mod.rs
+++ b/crates/ntx-builder/src/state/mod.rs
@@ -2,7 +2,7 @@ use std::collections::hash_map::Entry;
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet, VecDeque};
 use std::num::NonZeroUsize;
 
-use account::{AccountState, InflightNetworkNote, NetworkAccountUpdate};
+use account::{AccountState, InflightNetworkNote, NetworkAccountEffect};
 use anyhow::Context;
 use miden_node_proto::domain::account::NetworkAccountPrefix;
 use miden_node_proto::domain::mempool::MempoolEvent;
@@ -320,15 +320,16 @@ impl State {
         }
 
         let mut tx_impact = TransactionImpact::default();
-        if let Some(update) = account_delta.and_then(NetworkAccountUpdate::from_protocol) {
+        if let Some(update) = account_delta.and_then(NetworkAccountEffect::from_protocol) {
             let prefix = update.prefix();
+
             match update {
-                NetworkAccountUpdate::New(account) => {
+                NetworkAccountEffect::Created(account) => {
                     let account_state = AccountState::from_uncommitted_account(account);
                     self.accounts.insert(prefix, account_state);
                     self.queue.push_back(prefix);
                 },
-                NetworkAccountUpdate::Delta(account_delta) => {
+                NetworkAccountEffect::Updated(account_delta) => {
                     self.fetch_account(prefix)
                         .await
                         .context("failed to load account")?
diff --git a/crates/ntx-builder/src/transaction.rs b/crates/ntx-builder/src/transaction.rs
index 956aff4b7..8d5b1909f 100644
--- a/crates/ntx-builder/src/transaction.rs
+++ b/crates/ntx-builder/src/transaction.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 use lru::LruCache;
 use miden_node_utils::tracing::OpenTelemetrySpanExt;
 use miden_objects::account::{Account, AccountId, PartialAccount, StorageMapWitness, StorageSlot};
-use miden_objects::asset::{AssetWitness, VaultKey};
+use miden_objects::asset::{AssetVaultKey, AssetWitness};
 use miden_objects::block::{BlockHeader, BlockNumber};
 use miden_objects::note::{Note, NoteScript};
 use miden_objects::transaction::{
@@ -327,7 +327,7 @@ impl DataStore for NtxDataStore {
         &self,
         account_id: AccountId,
         vault_root: Word,
-        vault_key: VaultKey,
+        vault_key: AssetVaultKey,
     ) -> impl FutureMaybeSend<Result<AssetWitness, DataStoreError>> {
         async move {
             if self.account.id() != account_id {
diff --git a/crates/rpc/Cargo.toml b/crates/rpc/Cargo.toml
index 84e305e30..19058084a 100644
--- a/crates/rpc/Cargo.toml
+++ b/crates/rpc/Cargo.toml
@@ -37,6 +37,7 @@ tracing                = { workspace = true }
 url                    = { workspace = true }
 
 [dev-dependencies]
+miden-lib        = { workspace = true }
 miden-node-store = { workspace = true }
 miden-node-utils = { features = ["tracing-forest"], workspace = true }
 miden-objects    = { default-features = true, features = ["testing"], workspace = true }
diff --git a/crates/rpc/src/server/api.rs b/crates/rpc/src/server/api.rs
index 38460683f..a75341f56 100644
--- a/crates/rpc/src/server/api.rs
+++ b/crates/rpc/src/server/api.rs
@@ -22,7 +22,6 @@ use miden_node_utils::limiter::{
     QueryParamNullifierLimit,
 };
 use miden_objects::account::AccountId;
-use miden_objects::account::delta::AccountUpdateDetails;
 use miden_objects::batch::ProvenBatch;
 use miden_objects::block::{BlockHeader, BlockNumber};
 use miden_objects::note::{Note, NoteRecipient, NoteScript};
@@ -374,20 +373,6 @@ impl api_server::Api for RpcService {
             ));
         }
 
-        // Compare the account delta commitment of the ProvenTransaction with the actual delta
-        let delta_commitment = tx.account_update().account_delta_commitment();
-
-        // Verify that the delta commitment matches the actual delta
-        if let AccountUpdateDetails::Delta(delta) = tx.account_update().details() {
-            let computed_commitment = delta.to_commitment();
-
-            if computed_commitment != delta_commitment {
-                return Err(Status::invalid_argument(
-                    "Account delta commitment does not match the actual account delta",
-                ));
-            }
-        }
-
         let tx_verifier = TransactionVerifier::new(MIN_PROOF_SECURITY_LEVEL);
 
         tx_verifier.verify(&tx).map_err(|err| {
diff --git a/crates/rpc/src/server/validator.rs b/crates/rpc/src/server/validator.rs
index dd548b963..2b6719c32 100644
--- a/crates/rpc/src/server/validator.rs
+++ b/crates/rpc/src/server/validator.rs
@@ -4,7 +4,7 @@ use std::collections::BTreeSet;
 
 use miden_objects::Word;
 use miden_objects::account::{AccountId, PartialAccount, StorageMapWitness};
-use miden_objects::asset::{AssetWitness, VaultKey};
+use miden_objects::asset::{AssetVaultKey, AssetWitness};
 use miden_objects::block::{BlockHeader, BlockNumber};
 use miden_objects::note::NoteScript;
 use miden_objects::transaction::{
@@ -86,7 +86,7 @@ impl DataStore for TransactionInputsDataStore {
         &self,
         account_id: AccountId,
         vault_root: Word,
-        vault_key: VaultKey,
+        vault_key: AssetVaultKey,
     ) -> impl FutureMaybeSend<Result<AssetWitness, DataStoreError>> {
         async move {
             if self.tx_inputs.account().id() != account_id {
diff --git a/crates/rpc/src/tests.rs b/crates/rpc/src/tests.rs
index 2fb0dfa86..6eaec910a 100644
--- a/crates/rpc/src/tests.rs
+++ b/crates/rpc/src/tests.rs
@@ -3,26 +3,27 @@ use std::time::Duration;
 
 use http::header::{ACCEPT, CONTENT_TYPE};
 use http::{HeaderMap, HeaderValue};
+use miden_lib::account::wallets::BasicWallet;
 use miden_node_proto::clients::{Builder, Rpc as RpcClientMarker, RpcClient};
 use miden_node_proto::generated::rpc::api_client::ApiClient as ProtoClient;
 use miden_node_proto::generated::{self as proto};
 use miden_node_store::Store;
 use miden_node_store::genesis::config::GenesisConfig;
 use miden_node_utils::fee::test_fee;
+use miden_objects::Word;
 use miden_objects::account::delta::AccountUpdateDetails;
 use miden_objects::account::{
+    AccountBuilder,
     AccountDelta,
     AccountId,
     AccountIdVersion,
-    AccountStorageDelta,
     AccountStorageMode,
     AccountType,
-    AccountVaultDelta,
 };
+use miden_objects::testing::noop_auth_component::NoopAuthComponent;
 use miden_objects::transaction::ProvenTransactionBuilder;
 use miden_objects::utils::Serializable;
 use miden_objects::vm::ExecutionProof;
-use miden_objects::{Felt, Word};
 use tempfile::TempDir;
 use tokio::net::TcpListener;
 use tokio::runtime::{self, Runtime};
@@ -216,31 +217,51 @@ async fn rpc_server_rejects_proven_transactions_with_invalid_commitment() {
         AccountType::RegularAccountImmutableCode,
         AccountStorageMode::Public,
     );
+
+    let account = AccountBuilder::new([0; 32])
+        .account_type(AccountType::RegularAccountImmutableCode)
+        .storage_mode(AccountStorageMode::Public)
+        .with_assets(vec![])
+        .with_component(BasicWallet)
+        .with_auth_component(NoopAuthComponent)
+        .build_existing()
+        .unwrap();
+
+    let other_account = AccountBuilder::new([1; 32])
+        .account_type(AccountType::RegularAccountUpdatableCode)
+        .storage_mode(AccountStorageMode::Private)
+        .with_assets(vec![])
+        .with_component(BasicWallet)
+        .with_auth_component(NoopAuthComponent)
+        .build_existing()
+        .unwrap();
+    let incorrect_commitment_delta: AccountDelta = other_account.try_into().unwrap();
+    let incorrect_commitment_delta_bytes = incorrect_commitment_delta.to_commitment().as_bytes();
+
+    let account_delta: AccountDelta = account.clone().try_into().unwrap();
+
     // Send any request to the RPC.
     let tx = ProvenTransactionBuilder::new(
         account_id,
         [8; 32].try_into().unwrap(),
-        [3; 32].try_into().unwrap(),
-        [22; 32].try_into().unwrap(), // delta commitment
+        account.commitment(),
+        account_delta.clone().to_commitment(), // delta commitment
         0.into(),
         Word::default(),
         test_fee(),
         u32::MAX.into(),
         ExecutionProof::new_dummy(),
     )
-    .account_update_details(AccountUpdateDetails::Delta(
-        AccountDelta::new(
-            account_id,
-            AccountStorageDelta::new(),
-            AccountVaultDelta::default(),
-            Felt::default(),
-        )
-        .unwrap(),
-    ))
+    .account_update_details(AccountUpdateDetails::Delta(account_delta))
     .build()
     .unwrap();
+
+    let mut tx_bytes = tx.to_bytes();
+    let offset = 15 + 32 + 32;
+    tx_bytes[offset..offset + 32].copy_from_slice(&incorrect_commitment_delta_bytes);
+
     let request = proto::transaction::ProvenTransaction {
-        transaction: tx.to_bytes(),
+        transaction: tx_bytes,
         transaction_inputs: None,
     };
 
@@ -256,7 +277,7 @@ async fn rpc_server_rejects_proven_transactions_with_invalid_commitment() {
             .err()
             .unwrap()
             .message()
-            .contains("Account delta commitment does not match the actual account delta"),
+            .contains("failed to validate account delta in transaction account update"),
     );
 
     // Shutdown to avoid runtime drop error.
diff --git a/crates/store/src/db/mod.rs b/crates/store/src/db/mod.rs
index 74277ee83..48135b115 100644
--- a/crates/store/src/db/mod.rs
+++ b/crates/store/src/db/mod.rs
@@ -9,7 +9,7 @@ use miden_node_proto::domain::account::{AccountInfo, AccountSummary, NetworkAcco
 use miden_node_proto::generated as proto;
 use miden_objects::Word;
 use miden_objects::account::AccountId;
-use miden_objects::asset::Asset;
+use miden_objects::asset::{Asset, AssetVaultKey};
 use miden_objects::block::{BlockHeader, BlockNoteIndex, BlockNumber, ProvenBlock};
 use miden_objects::crypto::merkle::SparseMerklePath;
 use miden_objects::note::{
@@ -57,7 +57,7 @@ pub struct Db {
 #[derive(Debug, Clone)]
 pub struct AccountVaultValue {
     pub block_num: BlockNumber,
-    pub vault_key: Word,
+    pub vault_key: AssetVaultKey,
     /// None if the asset was removed
     pub asset: Option<Asset>,
 }
@@ -65,9 +65,10 @@ pub struct AccountVaultValue {
 impl AccountVaultValue {
     pub fn from_raw_row(row: (i64, Vec<u8>, Option<Vec<u8>>)) -> Result<Self, DatabaseError> {
         let (block_num, vault_key, asset) = row;
+        let vault_key = Word::read_from_bytes(&vault_key)?;
         Ok(Self {
             block_num: BlockNumber::from_raw_sql(block_num)?,
-            vault_key: Word::read_from_bytes(&vault_key)?,
+            vault_key: AssetVaultKey::new_unchecked(vault_key),
             asset: asset.map(|b| Asset::read_from_bytes(&b)).transpose()?,
         })
     }
diff --git a/crates/store/src/db/models/queries/accounts.rs b/crates/store/src/db/models/queries/accounts.rs
index 694805bf9..b658d9275 100644
--- a/crates/store/src/db/models/queries/accounts.rs
+++ b/crates/store/src/db/models/queries/accounts.rs
@@ -1,4 +1,3 @@
-use std::borrow::Cow;
 use std::ops::RangeInclusive;
 
 use diesel::prelude::{Queryable, QueryableByName};
@@ -32,7 +31,7 @@ use miden_objects::account::{
     NonFungibleDeltaAction,
     StorageSlot,
 };
-use miden_objects::asset::{Asset, AssetVault, FungibleAsset, VaultKey};
+use miden_objects::asset::{Asset, AssetVault, AssetVaultKey, FungibleAsset};
 use miden_objects::block::{BlockAccountUpdate, BlockNumber};
 use miden_objects::{Felt, Word};
 
@@ -494,7 +493,7 @@ impl TryFrom<AccountVaultUpdateRaw> for AccountVaultValue {
     type Error = DatabaseError;
 
     fn try_from(raw: AccountVaultUpdateRaw) -> Result<Self, Self::Error> {
-        let vault_key = Word::read_from_bytes(&raw.vault_key)?;
+        let vault_key = AssetVaultKey::new_unchecked(Word::read_from_bytes(&raw.vault_key)?);
         let asset = raw.asset.map(|bytes| Asset::read_from_bytes(&bytes)).transpose()?;
         let block_num = BlockNumber::from_raw_sql(raw.block_num)?;
 
@@ -605,20 +604,20 @@ pub(crate) fn insert_account_vault_asset(
     conn: &mut SqliteConnection,
     account_id: AccountId,
     block_num: BlockNumber,
-    vault_key: VaultKey,
+    vault_key: AssetVaultKey,
     asset: Option<Asset>,
 ) -> Result<usize, DatabaseError> {
-    let vault_key_word: Word = vault_key.into();
-    let record = AccountAssetRowInsert::new(&account_id, &vault_key_word, block_num, asset, true);
+    let record = AccountAssetRowInsert::new(&account_id, &vault_key, block_num, asset, true);
 
     diesel::Connection::transaction(conn, |conn| {
         // First, update any existing rows with the same (account_id, vault_key) to set
         // is_latest_update=false
+        let vault_key: Word = vault_key.into();
         let update_count = diesel::update(schema::account_vault_assets::table)
             .filter(
                 schema::account_vault_assets::account_id
                     .eq(&account_id.to_bytes())
-                    .and(schema::account_vault_assets::vault_key.eq(&vault_key_word.to_bytes()))
+                    .and(schema::account_vault_assets::vault_key.eq(&vault_key.to_bytes()))
                     .and(schema::account_vault_assets::is_latest_update.eq(true)),
             )
             .set(schema::account_vault_assets::is_latest_update.eq(false))
@@ -726,9 +725,10 @@ pub(crate) fn upsert_accounts(
             None
         };
 
-        let full_account = match update.details() {
+        let full_account: Option<Account> = match update.details() {
             AccountUpdateDetails::Private => None,
-            AccountUpdateDetails::New(account) => {
+            AccountUpdateDetails::Delta(delta) if delta.is_full_state() => {
+                let account = Account::try_from(delta)?;
                 debug_assert_eq!(account_id, account.id());
 
                 if account.commitment() != update.final_state_commitment() {
@@ -758,7 +758,7 @@ pub(crate) fn upsert_accounts(
                     }
                 }
 
-                Some(Cow::Borrowed(account))
+                Some(account)
             },
             AccountUpdateDetails::Delta(delta) => {
                 let mut rows = select_details_stmt(conn, account_id)?.into_iter();
@@ -817,11 +817,11 @@ pub(crate) fn upsert_accounts(
                     )?;
                 }
 
-                Some(Cow::Owned(account))
+                Some(account)
             },
         };
 
-        if let Some(code) = full_account.as_ref().map(|account| account.code()) {
+        if let Some(code) = full_account.as_ref().map(Account::code) {
             let code_value = AccountCodeRowInsert {
                 code_commitment: code.commitment().to_bytes(),
                 code: code.to_bytes(),
@@ -915,12 +915,13 @@ pub(crate) struct AccountAssetRowInsert {
 impl AccountAssetRowInsert {
     pub(crate) fn new(
         account_id: &AccountId,
-        vault_key: &Word,
+        vault_key: &AssetVaultKey,
         block_num: BlockNumber,
         asset: Option<Asset>,
         is_latest_update: bool,
     ) -> Self {
         let account_id = account_id.to_bytes();
+        let vault_key: Word = (*vault_key).into();
         let vault_key = vault_key.to_bytes();
         let block_num = block_num.to_raw_sql();
         let asset = asset.map(|asset| asset.to_bytes());
diff --git a/crates/store/src/db/tests.rs b/crates/store/src/db/tests.rs
index ab190a465..fbe705647 100644
--- a/crates/store/src/db/tests.rs
+++ b/crates/store/src/db/tests.rs
@@ -10,6 +10,7 @@ use miden_lib::note::create_p2id_note;
 use miden_lib::transaction::TransactionKernel;
 use miden_node_proto::domain::account::AccountSummary;
 use miden_node_utils::fee::test_fee_params;
+use miden_objects::account::auth::PublicKeyCommitment;
 use miden_objects::account::delta::AccountUpdateDetails;
 use miden_objects::account::{
     Account,
@@ -22,10 +23,9 @@ use miden_objects::account::{
     AccountStorageMode,
     AccountType,
     AccountVaultDelta,
-    PublicKeyCommitment,
     StorageSlot,
 };
-use miden_objects::asset::{Asset, FungibleAsset, VaultKey};
+use miden_objects::asset::{Asset, AssetVaultKey, FungibleAsset};
 use miden_objects::block::{
     BlockAccountUpdate,
     BlockHeader,
@@ -426,7 +426,7 @@ fn make_account_and_note(
             &[BlockAccountUpdate::new(
                 account_id,
                 account.commitment(),
-                AccountUpdateDetails::New(account),
+                AccountUpdateDetails::Delta(AccountDelta::try_from(account).unwrap()),
             )],
             block_num,
         )
@@ -722,8 +722,8 @@ fn sync_account_vault_basic_validation() {
         .unwrap();
 
     // Create some test vault assets
-    let vault_key_1 = VaultKey::new_unchecked(num_to_word(100));
-    let vault_key_2 = VaultKey::new_unchecked(num_to_word(200));
+    let vault_key_1 = AssetVaultKey::new_unchecked(num_to_word(100));
+    let vault_key_2 = AssetVaultKey::new_unchecked(num_to_word(200));
     let fungible_asset_1 = Asset::Fungible(FungibleAsset::new(public_account_id, 1000).unwrap());
     let fungible_asset_2 = Asset::Fungible(FungibleAsset::new(public_account_id, 2000).unwrap());
 
@@ -779,10 +779,8 @@ fn sync_account_vault_basic_validation() {
     assert!(last_block >= block_from, "response block num should be higher than request");
 
     // Verify that we get the updated asset for vault_key_1
-    let vault_key_1_word: Word = vault_key_1.into();
-    let vault_key_1_asset = values
-        .iter()
-        .find(|v| v.vault_key == vault_key_1_word && v.block_num == block_to);
+    let vault_key_1_asset =
+        values.iter().find(|v| v.vault_key == vault_key_1 && v.block_num == block_to);
     assert!(vault_key_1_asset.is_some(), "should find updated vault asset");
     assert_eq!(vault_key_1_asset.unwrap().asset, Some(updated_fungible_asset_1));
 }
diff --git a/crates/store/src/errors.rs b/crates/store/src/errors.rs
index 639032104..6a17c60c5 100644
--- a/crates/store/src/errors.rs
+++ b/crates/store/src/errors.rs
@@ -209,6 +209,8 @@ pub enum GenesisError {
     GenesisFileDeserialization(#[from] DeserializationError),
     #[error("fee cannot be created")]
     Fee(#[from] FeeError),
+    #[error("failed to build account delta from account")]
+    AccountDelta(AccountError),
 }
 
 // ENDPOINT ERRORS
diff --git a/crates/store/src/genesis/config/mod.rs b/crates/store/src/genesis/config/mod.rs
index af52090fa..193d2f105 100644
--- a/crates/store/src/genesis/config/mod.rs
+++ b/crates/store/src/genesis/config/mod.rs
@@ -10,6 +10,7 @@ use miden_lib::account::faucets::BasicFungibleFaucet;
 use miden_lib::account::wallets::create_basic_wallet;
 use miden_lib::transaction::memory;
 use miden_node_utils::crypto::get_rpo_random_coin;
+use miden_objects::account::auth::AuthSecretKey;
 use miden_objects::account::{
     Account,
     AccountBuilder,
@@ -20,7 +21,6 @@ use miden_objects::account::{
     AccountStorageMode,
     AccountType,
     AccountVaultDelta,
-    AuthSecretKey,
     FungibleAssetDelta,
     NonFungibleAssetDelta,
 };
diff --git a/crates/store/src/genesis/mod.rs b/crates/store/src/genesis/mod.rs
index f021980e7..cad4d51c9 100644
--- a/crates/store/src/genesis/mod.rs
+++ b/crates/store/src/genesis/mod.rs
@@ -1,7 +1,7 @@
 use miden_lib::transaction::TransactionKernel;
 use miden_objects::Word;
-use miden_objects::account::Account;
 use miden_objects::account::delta::AccountUpdateDetails;
+use miden_objects::account::{Account, AccountDelta};
 use miden_objects::block::account_tree::{AccountTree, account_id_to_smt_key};
 use miden_objects::block::{
     BlockAccountUpdate,
@@ -68,14 +68,21 @@ impl GenesisState {
             .iter()
             .map(|account| {
                 let account_update_details = if account.id().is_public() {
-                    AccountUpdateDetails::New(account.clone())
+                    AccountUpdateDetails::Delta(
+                        AccountDelta::try_from(account.clone())
+                            .map_err(GenesisError::AccountDelta)?,
+                    )
                 } else {
                     AccountUpdateDetails::Private
                 };
 
-                BlockAccountUpdate::new(account.id(), account.commitment(), account_update_details)
+                Ok(BlockAccountUpdate::new(
+                    account.id(),
+                    account.commitment(),
+                    account_update_details,
+                ))
             })
-            .collect();
+            .collect::<Result<Vec<_>, GenesisError>>()?;
 
         // Convert account updates to SMT entries using account_id_to_smt_key
         let smt_entries = accounts.iter().map(|update| {
diff --git a/crates/store/src/server/rpc_api.rs b/crates/store/src/server/rpc_api.rs
index b8b0d5d7f..e1c923e27 100644
--- a/crates/store/src/server/rpc_api.rs
+++ b/crates/store/src/server/rpc_api.rs
@@ -402,10 +402,13 @@ impl rpc_server::Rpc for StoreApi {
 
         let updates = updates
             .into_iter()
-            .map(|update| proto::rpc_store::AccountVaultUpdate {
-                vault_key: Some(update.vault_key.into()),
-                asset: update.asset.map(Into::into),
-                block_num: update.block_num.as_u32(),
+            .map(|update| {
+                let vault_key: Word = update.vault_key.into();
+                proto::rpc_store::AccountVaultUpdate {
+                    vault_key: Some(vault_key.into()),
+                    asset: update.asset.map(Into::into),
+                    block_num: update.block_num.as_u32(),
+                }
             })
             .collect();
 

From c48a9f154a156c1ed50e3252c3091de23b5cf59e Mon Sep 17 00:00:00 2001
From: sergerad <sergerad@miden.team>
Date: Thu, 6 Nov 2025 10:30:53 +1300
Subject: [PATCH 69/78] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 101d0431e..b11334d42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,7 @@
 - Implement `DataStore::get_note_script()` for `NtxDataStore` (#[1332](https://github.com/0xMiden/miden-node/pull/1332)).
 - [BREAKING] Added `AccountTreeWithHistory` and integrate historical queries into `GetAccountProof` ([#1292](https://github.com/0xMiden/miden-node/pull/1292)).
 
-## v0.11.4 (TBD)
+## v0.11.4 (2025-11-06)
 
 - Reduced note retries to 1 ([#1308](https://github.com/0xMiden/miden-node/pull/1308)).
 - Address network transaction builder (NTX) invariant breaking for unavailable accounts ([#1312](https://github.com/0xMiden/miden-node/pull/1312)).

From 6986a0aab7eb644e16544e60515f6cb60fa51809 Mon Sep 17 00:00:00 2001
From: sergerad <sergerad@miden.team>
Date: Thu, 6 Nov 2025 10:39:05 +1300
Subject: [PATCH 70/78] Fix changelog

---
 CHANGELOG.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b11334d42..c75265e42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,13 +22,10 @@
 - Implement `DataStore::get_note_script()` for `NtxDataStore` (#[1332](https://github.com/0xMiden/miden-node/pull/1332)).
 - [BREAKING] Added `AccountTreeWithHistory` and integrate historical queries into `GetAccountProof` ([#1292](https://github.com/0xMiden/miden-node/pull/1292)).
 
-## v0.11.4 (2025-11-06)
+## v0.11.3 (2025-11-04)
 
 - Reduced note retries to 1 ([#1308](https://github.com/0xMiden/miden-node/pull/1308)).
 - Address network transaction builder (NTX) invariant breaking for unavailable accounts ([#1312](https://github.com/0xMiden/miden-node/pull/1312)).
-
-## v0.11.3 (2025-10-09)
-
 - Tweaked HTTP configurations on the pingora proxy server ([#1281](https://github.com/0xMiden/miden-node/pull/1281)).
 
 ## v0.11.2 (2025-09-10)

From c1abbf7ea6e29e73eb30bde83cef811bad625330 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Wed, 5 Nov 2025 19:11:46 -0300
Subject: [PATCH 71/78] fix: stress test seed (#1283)

---
 .github/workflows/stress-test-check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stress-test-check.yml b/.github/workflows/stress-test-check.yml
index 02def7747..488a2c068 100644
--- a/.github/workflows/stress-test-check.yml
+++ b/.github/workflows/stress-test-check.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Create directory for stress test store
         run: mkdir -p stress-test-store
       - name: Seed stress test store
-        run: miden-node-stress-test seed-store --data-directory stress-test-store --num-accounts 10 --public-accounts-percentage 50
+        run: miden-node-stress-test seed-store --data-directory stress-test-store --num-accounts 500 --public-accounts-percentage 50
       - name: Run sync state benchmark
         run: miden-node-stress-test benchmark-store --data-directory stress-test-store --iterations 10 --concurrency 1 sync-state
       - name: Run sync notes benchmark

From f8258dc75db2924d9fe07a95c2528daeb279ab21 Mon Sep 17 00:00:00 2001
From: Bobbin Threadbare <bobbinth@protonmail.com>
Date: Wed, 5 Nov 2025 23:41:13 -0800
Subject: [PATCH 72/78] chore: refresh Cargo.lock file

---
 Cargo.lock | 132 ++++++++++++++++++++++++++---------------------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1a92dc4cb..3865f2c70 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -206,7 +206,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -217,7 +217,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -694,7 +694,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -906,7 +906,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -949,7 +949,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -963,7 +963,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -974,7 +974,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core 0.20.11",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -985,7 +985,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core 0.21.3",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -1077,7 +1077,7 @@ dependencies = [
  "darling 0.20.11",
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -1087,7 +1087,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -1107,7 +1107,7 @@ checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -1137,7 +1137,7 @@ dependencies = [
  "dsl_auto_type",
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -1157,7 +1157,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe2444076b48641147115697648dc743c2c00b61adade0f01ce67133c7babe8c"
 dependencies = [
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -1186,7 +1186,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -1212,7 +1212,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -1306,7 +1306,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -1528,7 +1528,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -2167,7 +2167,7 @@ checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -2354,7 +2354,7 @@ dependencies = [
  "quote",
  "regex-syntax",
  "rustc_version 0.4.1",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -2481,9 +2481,9 @@ dependencies = [
 
 [[package]]
 name = "miden-block-prover"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "612236e5d8df5d9bd5bdc32b35e92140ad2cf2c0e99ad07b467eebfd0cb5e823"
+checksum = "9b2f53a1c58ced1659a622b784daa5773f70b2aa7f9c4ad1c19b6d74baf2aeb3"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -2547,7 +2547,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f70dccd82a2b2787b9bfc64687cd224dfe0adc0d21ae9b241b0c6edc4a23335"
 dependencies = [
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -2579,9 +2579,9 @@ dependencies = [
 
 [[package]]
 name = "miden-lib"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e16595f7c2c37689b9fd0fffaedb978c1b9e9aa795751ad82108365530dae8"
+checksum = "44abeb7f67252547fa54605e61e89256fa546e2f25de382ccac78a1ced07ff88"
 dependencies = [
  "Inflector",
  "fs-err",
@@ -2631,7 +2631,7 @@ dependencies = [
  "supports-color",
  "supports-hyperlinks",
  "supports-unicode",
- "syn 2.0.108",
+ "syn 2.0.109",
  "terminal_size 0.3.0",
  "textwrap",
  "thiserror 2.0.17",
@@ -2647,7 +2647,7 @@ checksum = "86a905f3ea65634dd4d1041a4f0fd0a3e77aa4118341d265af1a94339182222f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -2734,7 +2734,7 @@ name = "miden-node-grpc-error-macro"
 version = "0.12.0"
 dependencies = [
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -2886,7 +2886,7 @@ name = "miden-node-test-macro"
 version = "0.1.0"
 dependencies = [
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -2936,9 +2936,9 @@ dependencies = [
 
 [[package]]
 name = "miden-objects"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb47d96f891e22114d27748353db7dfd93247d777e1679bac44ee544ea9b204d"
+checksum = "0ef49472012d00be68f68dcbb13b4f28867fb6271c76c014bc555ef6e8e0958a"
 dependencies = [
  "bech32",
  "getrandom 0.3.4",
@@ -3075,9 +3075,9 @@ dependencies = [
 
 [[package]]
 name = "miden-testing"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2e5612893747091011d535b3a8a9904feab931415dd015d74d939f345d5b7dc"
+checksum = "7e64b086dfad33bc235d847cde20959d7b88d46d1da50d48ad2192321dbc2bcf"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -3095,9 +3095,9 @@ dependencies = [
 
 [[package]]
 name = "miden-tx"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0ca3864d4a5ed445aeb1b8580e76e347d34691c642b67a79278aeb7b429f073"
+checksum = "a8d0ddcbaaa1002b954525212ebfa7ee097e6af9d26847b3d977b3ffa9f3edeb"
 dependencies = [
  "miden-lib",
  "miden-objects",
@@ -3111,9 +3111,9 @@ dependencies = [
 
 [[package]]
 name = "miden-tx-batch-prover"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44275e75905d0f3f0c92c00f4da98acb60eaa1fbe84fdc8ad822df6db611780e"
+checksum = "3aab74fe8a2227aede2513f8a9dcde5268d3ae4debd5a904cf05992418bbd62d"
 dependencies = [
  "miden-objects",
  "miden-tx",
@@ -3203,7 +3203,7 @@ checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -3385,7 +3385,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -3504,7 +3504,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -3646,7 +3646,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -3691,7 +3691,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -4068,7 +4068,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 dependencies = [
  "proc-macro2",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -4121,7 +4121,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
  "version_check",
  "yansi",
 ]
@@ -4203,7 +4203,7 @@ dependencies = [
  "pulldown-cmark",
  "pulldown-cmark-to-cmark",
  "regex",
- "syn 2.0.108",
+ "syn 2.0.109",
  "tempfile",
 ]
 
@@ -4217,7 +4217,7 @@ dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -4596,7 +4596,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version 0.4.1",
- "syn 2.0.108",
+ "syn 2.0.109",
  "unicode-ident",
 ]
 
@@ -4878,7 +4878,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -4980,7 +4980,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -5181,7 +5181,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -5224,9 +5224,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.108"
+version = "2.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
+checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5250,7 +5250,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -5374,7 +5374,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -5385,7 +5385,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -5485,7 +5485,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -5678,7 +5678,7 @@ dependencies = [
  "prettyplease",
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -5716,7 +5716,7 @@ dependencies = [
  "prost-build",
  "prost-types",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
  "tempfile",
  "tonic-build",
 ]
@@ -5849,7 +5849,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -6240,7 +6240,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
  "wasm-bindgen-shared",
 ]
 
@@ -6384,7 +6384,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -6395,7 +6395,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -6768,7 +6768,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d31a19dae58475d019850e25b0170e94b16d382fbf6afee9c0e80fdc935e73e"
 dependencies = [
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -6885,7 +6885,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
  "synstructure",
 ]
 
@@ -6906,7 +6906,7 @@ checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]
@@ -6926,7 +6926,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
  "synstructure",
 ]
 
@@ -6966,7 +6966,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 2.0.109",
 ]
 
 [[package]]

From 257e0d18a8c673274363a3429edba71dcdbd784c Mon Sep 17 00:00:00 2001
From: Bobbin Threadbare <bobbinth@protonmail.com>
Date: Thu, 6 Nov 2025 10:26:48 -0800
Subject: [PATCH 73/78] chore: import dev dependencies with testing feature
 enabled

---
 Cargo.lock            | 1 +
 crates/rpc/Cargo.toml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3865f2c70..fa3cfec5a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2799,6 +2799,7 @@ dependencies = [
  "futures",
  "http",
  "mediatype",
+ "miden-air",
  "miden-lib",
  "miden-node-proto",
  "miden-node-proto-build",
diff --git a/crates/rpc/Cargo.toml b/crates/rpc/Cargo.toml
index 19058084a..540f85eb2 100644
--- a/crates/rpc/Cargo.toml
+++ b/crates/rpc/Cargo.toml
@@ -37,9 +37,10 @@ tracing                = { workspace = true }
 url                    = { workspace = true }
 
 [dev-dependencies]
+miden-air        = { features = ["testing"], workspace = true }
 miden-lib        = { workspace = true }
 miden-node-store = { workspace = true }
-miden-node-utils = { features = ["tracing-forest"], workspace = true }
+miden-node-utils = { features = ["testing", "tracing-forest"], workspace = true }
 miden-objects    = { default-features = true, features = ["testing"], workspace = true }
 reqwest          = { version = "0.12" }
 rstest           = { workspace = true }

From d268d989c398dd5f320a493423bf1681b9d17cd6 Mon Sep 17 00:00:00 2001
From: Marti <marti@miden.team>
Date: Thu, 6 Nov 2025 19:37:22 +0100
Subject: [PATCH 74/78] chore: automated crate publishing (#1337)

---
 .github/workflows/release-plz-dry-run.yml | 15 ++++++---------
 .github/workflows/release-plz.yml         | 13 +++++--------
 Cargo.toml                                |  2 +-
 bin/stress-test/Cargo.toml                |  1 +
 crates/grpc-error-macro/Cargo.toml        |  1 -
 crates/test-macro/Cargo.toml              |  2 +-
 6 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/release-plz-dry-run.yml b/.github/workflows/release-plz-dry-run.yml
index b41850da1..a7bbaa677 100644
--- a/.github/workflows/release-plz-dry-run.yml
+++ b/.github/workflows/release-plz-dry-run.yml
@@ -1,15 +1,15 @@
-name: Release-plz (dry-run)
+name: Publish (dry-run)
 
 permissions:
   contents: read
 
 on:
   push:
-    branches: [main, next]
+    branches: [main]
 
 jobs:
-  release-plz-dry-run-release:
-    name: Release-plz dry-run
+  publish-dry-run:
+    name: Cargo publish dry-run
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == '0xMiden' }}
     steps:
@@ -20,10 +20,7 @@ jobs:
       - name: Update Rust toolchain
         run: |
           rustup update --no-self-update
-      - name: Run release-plz
-        uses: release-plz/action@v0.5
-        with:
-          command: release --dry-run
+      - name: Run cargo publish dry-run
+        run: cargo publish --workspace --dry-run
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
diff --git a/.github/workflows/release-plz.yml b/.github/workflows/release-plz.yml
index 78218b7a6..e34fefb9f 100644
--- a/.github/workflows/release-plz.yml
+++ b/.github/workflows/release-plz.yml
@@ -1,4 +1,4 @@
-name: Release-plz (main)
+name: Publish (main)
 
 permissions:
   contents: read
@@ -8,8 +8,8 @@ on:
     types: [published]
 
 jobs:
-  release-plz-release:
-    name: Release-plz release
+  publish-release:
+    name: Cargo publish release
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == '0xMiden' }}
     steps:
@@ -37,10 +37,7 @@ jobs:
       - name: Update Rust toolchain
         run: |
           rustup update --no-self-update
-      - name: Run release-plz
-        uses: release-plz/action@v0.5
-        with:
-          command: release
+      - name: Run cargo publish
+        run: cargo publish --workspace
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
diff --git a/Cargo.toml b/Cargo.toml
index 3e32f9c8d..f9e96ed16 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ opt-level = 2
 [workspace.dependencies]
 # Workspace crates.
 miden-node-block-producer   = { path = "crates/block-producer", version = "0.12" }
-miden-node-grpc-error-macro = { path = "crates/grpc-error-macro" }
+miden-node-grpc-error-macro = { path = "crates/grpc-error-macro", version = "0.12" }
 miden-node-ntx-builder      = { path = "crates/ntx-builder", version = "0.12" }
 miden-node-proto            = { path = "crates/proto", version = "0.12" }
 miden-node-proto-build      = { path = "proto", version = "0.12" }
diff --git a/bin/stress-test/Cargo.toml b/bin/stress-test/Cargo.toml
index 7add1676a..9c3029a82 100644
--- a/bin/stress-test/Cargo.toml
+++ b/bin/stress-test/Cargo.toml
@@ -7,6 +7,7 @@ homepage.workspace     = true
 keywords               = ["miden", "stress-test"]
 license.workspace      = true
 name                   = "miden-node-stress-test"
+publish                = false
 readme.workspace       = true
 repository.workspace   = true
 rust-version.workspace = true
diff --git a/crates/grpc-error-macro/Cargo.toml b/crates/grpc-error-macro/Cargo.toml
index 2524e1b35..4fd40b0b2 100644
--- a/crates/grpc-error-macro/Cargo.toml
+++ b/crates/grpc-error-macro/Cargo.toml
@@ -3,7 +3,6 @@ categories  = ["no-std"]
 description = "Procedural macro for deriving GrpcError trait (internal implementation detail - use miden-node-proto)"
 keywords    = ["grpc", "miden", "node"]
 name        = "miden-node-grpc-error-macro"
-publish     = false                                                                                                   # Internal implementation detail
 
 edition.workspace      = true
 license.workspace      = true
diff --git a/crates/test-macro/Cargo.toml b/crates/test-macro/Cargo.toml
index 1d4b5ea15..dc1b9fec1 100644
--- a/crates/test-macro/Cargo.toml
+++ b/crates/test-macro/Cargo.toml
@@ -6,7 +6,7 @@ homepage.workspace     = true
 keywords               = ["macro", "miden", "node", "utils"]
 license.workspace      = true
 name                   = "miden-node-test-macro"
-readme                 = "README.md"
+publish                = false
 repository.workspace   = true
 rust-version.workspace = true
 version                = "0.1.0"

From 9ef1dc2540173a9f72ea0d518e31991e42eddeea Mon Sep 17 00:00:00 2001
From: Serge Radinovich <47865535+sergerad@users.noreply.github.com>
Date: Fri, 7 Nov 2025 09:08:24 +1300
Subject: [PATCH 75/78] chore: change runner for certain worfklows (#1339)

---
 .github/workflows/build-docker.yml | 2 +-
 .github/workflows/lint.yml         | 2 +-
 .github/workflows/test.yml         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 29043023a..0e7fe0c07 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         component: [node]
-    runs-on: ubuntu-latest
+    runs-on: Linux-ARM64-Runner
     name: Build ${{ matrix.component }}
     steps:
       - name: Checkout code
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 95132a697..12e76f99c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -18,7 +18,7 @@ permissions:
 
 jobs:
   typos:
-    runs-on: ubuntu-latest
+    runs-on: Linux-ARM64-Runner
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9888060bf..662fd3d44 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ concurrency:
 jobs:
   test:
     name: test
-    runs-on: ubuntu-latest
+    runs-on: Linux-ARM64-Runner
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@main
@@ -28,6 +28,6 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/next' }}
-      - uses: taiki-e/install-action@nextest 
+      - uses: taiki-e/install-action@nextest
       - name: Run tests
         run: make test

From 6a8dea27d2663c59da6fb4863ee3499cd3e55354 Mon Sep 17 00:00:00 2001
From: Santiago Pittella <87827390+SantiagoPittella@users.noreply.github.com>
Date: Thu, 6 Nov 2025 18:06:20 -0300
Subject: [PATCH 76/78] chore: add accounts creation for network monitor
 (#1276)

* chore: add accounts creation command

* review: remove increment_counter, reduce counter_program

* review: remove create accounts command

* chore: deploy accounts

* chore: add accounts creation command

* wip: deploy accounts

* chore: deploy counter account

* chore: remove deploy-account command from readme

* review: use PathBuf instead of str

* chore: remove authorized account from script

* review: remove ? and return

* chore: update with latest next

* chore: save account after deploy, add instrumentation to deployment

* fix: dont panic if remote prover is not available

* review: replace unwrap with expect

* review: add zeros to stack comment, use dropw

* review: remove Box::pin

* review: merge accounts into mod, add section separators

* Review: use filepath as suffix for config vars

* review: replace 'will be saved' with 'are located' in docs

* review: move files save into specific modules

* chore: deploy incrementing nonce and calling get_count, add account ID validation

* review: use auth component from miden testing

* review: rename to counter_account

* review: update account ID check in procedure

* review: replace .bin with .mac

* review: use proper default URL

* wip: update to latest miden-base

* chore: remove unused transaction store

* review: update filepath docs, instrument create_wallet_account

* review: remove tx script to deploy

* review: use PartialAccount::new, remove get_vault_asset_witness impl
---
 CHANGELOG.md                                  |   1 +
 Cargo.lock                                    |   3 +
 bin/network-monitor/Cargo.toml                |   5 +-
 bin/network-monitor/README.md                 |  97 ++++-
 .../src/assets/counter_program.masm           |  52 +++
 .../src/assets/increment_counter.masm         |   9 +
 bin/network-monitor/src/cli/commands.rs       |  30 ++
 bin/network-monitor/src/cli/mod.rs            |   7 +
 bin/network-monitor/src/commands/mod.rs       |   7 +
 bin/network-monitor/src/commands/start.rs     |  57 +++
 bin/network-monitor/src/config.rs             |  24 +-
 bin/network-monitor/src/deploy/counter.rs     |  60 ++++
 bin/network-monitor/src/deploy/mod.rs         | 288 +++++++++++++++
 bin/network-monitor/src/deploy/wallet.rs      |  48 +++
 bin/network-monitor/src/main.rs               | 334 ++----------------
 bin/network-monitor/src/monitor/mod.rs        |   5 +
 bin/network-monitor/src/monitor/tasks.rs      | 267 ++++++++++++++
 bin/network-monitor/src/remote_prover.rs      |   2 +-
 bin/network-monitor/src/status.rs             |   2 +-
 19 files changed, 977 insertions(+), 321 deletions(-)
 create mode 100644 bin/network-monitor/src/assets/counter_program.masm
 create mode 100644 bin/network-monitor/src/assets/increment_counter.masm
 create mode 100644 bin/network-monitor/src/cli/commands.rs
 create mode 100644 bin/network-monitor/src/cli/mod.rs
 create mode 100644 bin/network-monitor/src/commands/mod.rs
 create mode 100644 bin/network-monitor/src/commands/start.rs
 create mode 100644 bin/network-monitor/src/deploy/counter.rs
 create mode 100644 bin/network-monitor/src/deploy/mod.rs
 create mode 100644 bin/network-monitor/src/deploy/wallet.rs
 create mode 100644 bin/network-monitor/src/monitor/mod.rs
 create mode 100644 bin/network-monitor/src/monitor/tasks.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c75265e42..12c5b1c50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - Added pagination to `SyncNotes` endpoint ([#1257](https://github.com/0xMiden/miden-node/pull/1257)).
 - Added application level error in gRPC endpoints ([#1266](https://github.com/0xMiden/miden-node/pull/1266)).
 - [BREAKING] Response type nuances of `GetAccountProof` in the public store API (#[1277](https://github.com/0xMiden/miden-node/pull/1277)).
+- Added `deploy-account` command to `miden-network-monitor` binary ([#1276](https://github.com/0xMiden/miden-node/pull/1276)).
 - Add `validator` crate with initial protobuf, gRPC server, and sub-command (#[1293](https://github.com/0xMiden/miden-node/pull/1293)).
 - Add optional `TransactionInputs` field to `SubmitProvenTransaction` endpoint for transaction re-execution (#[1278](https://github.com/0xMiden/miden-node/pull/1278)).
 - Implement `DataStore::get_note_script()` for `NtxDataStore` (#[1332](https://github.com/0xMiden/miden-node/pull/1332)).
diff --git a/Cargo.lock b/Cargo.lock
index fa3cfec5a..4b3fa0ca2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2658,11 +2658,14 @@ dependencies = [
  "axum",
  "clap 4.5.51",
  "humantime",
+ "miden-lib",
  "miden-node-proto",
  "miden-node-utils",
  "miden-objects",
  "miden-testing",
  "miden-tx",
+ "rand 0.9.2",
+ "rand_chacha 0.9.0",
  "reqwest",
  "serde",
  "serde_json",
diff --git a/bin/network-monitor/Cargo.toml b/bin/network-monitor/Cargo.toml
index 68e3e086f..983868c1f 100644
--- a/bin/network-monitor/Cargo.toml
+++ b/bin/network-monitor/Cargo.toml
@@ -19,11 +19,14 @@ anyhow           = { workspace = true }
 axum             = { version = "0.8" }
 clap             = { features = ["env"], workspace = true }
 humantime        = { workspace = true }
+miden-lib        = { workspace = true }
 miden-node-proto = { workspace = true }
 miden-node-utils = { workspace = true }
 miden-objects    = { features = ["std", "testing"], workspace = true }
 miden-testing    = { workspace = true }
-miden-tx         = { workspace = true }
+miden-tx         = { features = ["std"], workspace = true }
+rand             = { version = "0.9" }
+rand_chacha      = { version = "0.9" }
 reqwest          = { features = ["json"], version = "0.12" }
 serde            = { features = ["derive"], version = "1.0" }
 serde_json       = { version = "1.0" }
diff --git a/bin/network-monitor/README.md b/bin/network-monitor/README.md
index a4df421ac..c1aa2eb08 100644
--- a/bin/network-monitor/README.md
+++ b/bin/network-monitor/README.md
@@ -21,9 +21,9 @@ The monitor application supports configuration through both command-line argumen
 miden-network-monitor --help
 
 # Common usage examples
-miden-network-monitor --port 8080 --rpc-url http://localhost:50051
-miden-network-monitor --remote-prover-urls http://prover1.com:50052,http://prover2.com:50053
-miden-network-monitor --faucet-url http://localhost:8080 --enable-otel
+miden-network-monitor start --port 8080 --rpc-url http://localhost:50051
+miden-network-monitor start --remote-prover-urls http://prover1.com:50052,http://prover2.com:50053
+miden-network-monitor start --faucet-url http://localhost:8080 --enable-otel
 ```
 
 **Available Options:**
@@ -35,6 +35,8 @@ miden-network-monitor --faucet-url http://localhost:8080 --enable-otel
 - `--status-check-interval`: Interval at which to check the status of the services (default: `3s`)
 - `--port, -p`: Web server port (default: `3000`)
 - `--enable-otel`: Enable OpenTelemetry tracing
+- `--wallet-filepath`: Path where the wallet account are located (default: `wallet_account.mac`)
+- `--counter-filepath`: Path where the counter program account are located (default: `counter_program.mac`)
 - `--help, -h`: Show help information
 - `--version, -V`: Show version information
 
@@ -50,6 +52,41 @@ If command-line arguments are not provided, the application falls back to enviro
 - `MIDEN_MONITOR_STATUS_CHECK_INTERVAL`: Interval at which to check the status of the services
 - `MIDEN_MONITOR_PORT`: Web server port
 - `MIDEN_MONITOR_ENABLE_OTEL`: Enable OpenTelemetry tracing
+- `MIDEN_MONITOR_WALLET_FILEPATH`: Path where the wallet account are located
+- `MIDEN_MONITOR_COUNTER_FILEPATH`: Path where the counter program account are located
+
+## Commands
+
+The monitor application supports one main command:
+
+### Start Monitor
+
+Starts the network monitoring service with the web dashboard. The monitor automatically creates and deploys Miden accounts if they don't already exist.
+
+```bash
+# Start with default configuration
+miden-network-monitor start
+
+# Start with custom configuration
+miden-network-monitor start --port 8080 --rpc-url http://localhost:50051
+
+# Start with custom account file paths
+miden-network-monitor start \
+  --wallet-filepath my_wallet.mac \
+  --counter-filepath my_counter.mac \
+  --rpc-url https://testnet.miden.io:443
+```
+
+**Automatic Account Management:**
+The monitor automatically handles account creation and deployment:
+1. Checks if wallet and counter account files exist
+2. If files don't exist, creates new accounts:
+   - A wallet account with RpoFalcon512 authentication
+   - A counter program account with custom MASM script
+3. Saves both accounts to the specified files using the Miden AccountFile format
+4. Deploys the accounts to the network via RPC
+5. The counter program includes authentication logic that only allows the wallet account to increment the counter
+6. Both accounts are ready for use in Miden transactions
 
 ## Usage
 
@@ -57,16 +94,18 @@ If command-line arguments are not provided, the application falls back to enviro
 
 ```bash
 # Single remote prover
-miden-network-monitor --remote-prover-urls http://localhost:50052
+miden-network-monitor start --remote-prover-urls http://localhost:50052
 
 # Multiple remote provers and custom configuration
-miden-network-monitor \
+miden-network-monitor start \
   --remote-prover-urls http://localhost:50052,http://localhost:50053,http://localhost:50054 \
   --faucet-url http://localhost:8080 \
   --remote-prover-test-interval 2m \
   --faucet-test-interval 2m \
   --status-check-interval 3s \
   --port 8080 \
+  --wallet-filepath my_wallet.mac \
+  --counter-filepath my_counter.mac \
   --enable-otel
 
 # Get help
@@ -77,12 +116,14 @@ miden-network-monitor --help
 
 ```bash
 # Single remote prover
-MIDEN_MONITOR_REMOTE_PROVER_URLS="http://localhost:50052" miden-network-monitor
+MIDEN_MONITOR_REMOTE_PROVER_URLS="http://localhost:50052" miden-network-monitor start
 
 # Multiple remote provers and faucet testing
 MIDEN_MONITOR_REMOTE_PROVER_URLS="http://localhost:50052,http://localhost:50053,http://localhost:50054" \
 MIDEN_MONITOR_FAUCET_URL="http://localhost:8080" \
-miden-network-monitor
+MIDEN_MONITOR_WALLET_FILEPATH="my_wallet.mac" \
+MIDEN_MONITOR_COUNTER_FILEPATH="my_counter.mac" \
+miden-network-monitor start
 ```
 
 Once running, the monitor will be available at `http://localhost:3000` (or the configured port).
@@ -137,6 +178,48 @@ The web dashboard provides a clean, responsive interface with the following feat
 - **Interactive Elements**: Copy-to-clipboard functionality for genesis commitments, transaction IDs, and note IDs
 - **Responsive Design**: Optimized for both desktop and mobile viewing
 
+## Account Management
+
+The monitor automatically manages Miden accounts for testing and monitoring purposes:
+
+### Created Accounts
+
+**Wallet Account:**
+- Uses RpoFalcon512 authentication scheme
+- Contains authentication keys for transaction signing
+- Automatically created if not present
+
+**Counter Program Account:**
+- Implements a simple counter with increment functionality
+- Includes authentication logic that restricts access to the wallet account
+- Uses custom MASM script with account ID-based authorization
+- Automatically created if not present
+
+### Account File Management
+
+The monitor automatically:
+1. Checks for existing account files on startup
+2. Creates new accounts if files don't exist
+3. Deploys accounts to the network via RPC
+4. Saves the wallet and counter contract account in the specified file paths (default: `wallet_account.mac` and `counter_program.mac`)
+
+### Example Usage
+
+```bash
+# Start monitor with default account files
+miden-network-monitor start --rpc-url https://testnet.miden.io:443
+
+# Start monitor with custom account file paths
+miden-network-monitor start \
+  --rpc-url https://testnet.miden.io:443 \
+  --wallet-filepath my_wallet.mac \
+  --counter-filepath my_counter.mac
+
+# The generated files can be loaded in Miden applications:
+# - wallet_account.mac: Contains the wallet account with authentication keys
+# - counter_program.mac: Contains the counter program account
+```
+
 ## Future Monitor Items
 
 Planned workflow testing features for future releases:
diff --git a/bin/network-monitor/src/assets/counter_program.masm b/bin/network-monitor/src/assets/counter_program.masm
new file mode 100644
index 000000000..b6cd43b60
--- /dev/null
+++ b/bin/network-monitor/src/assets/counter_program.masm
@@ -0,0 +1,52 @@
+# Counter program for network monitoring with note authentication
+# Storage layout:
+# - Slot 0: counter value (u64)
+# - Slot 1: authorized wallet account id as [prefix, suffix, 0, 0]
+
+use.miden::active_account
+use.miden::native_account
+use.miden::active_note
+use.miden::account_id
+use.miden::input_note
+use.miden::tx
+
+use.std::sys
+
+# Increment function with note authentication
+# => []
+export.increment
+    # Ensure the note sender matches the authorized wallet stored in slot 1.
+    push.1 exec.active_account::get_item
+    # => [owner_prefix, owner_suffix, 0, 0]
+
+    exec.active_note::get_sender
+    # => [sender_prefix, sender_suffix, owner_prefix, owner_suffix, 0, 0]
+
+    exec.account_id::is_equal
+    # => [are_equal, 0, 0]
+
+    assert drop drop
+    # => []
+
+    push.0 exec.active_account::get_item
+    # => [count, 0, 0, 0]
+    
+    push.1 add
+    # => [count+1]
+
+    push.0 exec.native_account::set_item
+    # => [count, 0, 0, 0]
+
+    dropw
+    # => []
+end
+
+# Get the counter (no auth required)
+# => [count]
+export.get_count
+    push.0 exec.active_account::get_item
+    # => [count, 0, 0, 0]
+
+    exec.sys::truncate_stack
+    # => [count]
+end
diff --git a/bin/network-monitor/src/assets/increment_counter.masm b/bin/network-monitor/src/assets/increment_counter.masm
new file mode 100644
index 000000000..76c4bdcb6
--- /dev/null
+++ b/bin/network-monitor/src/assets/increment_counter.masm
@@ -0,0 +1,9 @@
+# Note script to increment the external counter contract.
+# This script is executed as a note and calls the
+# `counter_contract::increment` entrypoint.
+
+use.external_contract::counter_contract
+
+begin
+    call.counter_contract::increment
+end
diff --git a/bin/network-monitor/src/cli/commands.rs b/bin/network-monitor/src/cli/commands.rs
new file mode 100644
index 000000000..50bfeaf40
--- /dev/null
+++ b/bin/network-monitor/src/cli/commands.rs
@@ -0,0 +1,30 @@
+//! CLI command definitions.
+
+use clap::{Parser, Subcommand};
+
+use crate::commands::start_monitor;
+use crate::config::MonitorConfig;
+
+/// Main CLI structure.
+#[derive(Parser)]
+#[command(version, about, long_about = None)]
+pub struct Cli {
+    #[command(subcommand)]
+    pub command: Command,
+}
+
+/// Available commands.
+#[derive(Subcommand)]
+pub enum Command {
+    /// Starts the network monitor
+    Start(MonitorConfig),
+}
+
+impl Cli {
+    /// Execute the parsed command.
+    pub async fn execute(self) -> anyhow::Result<()> {
+        match self.command {
+            Command::Start(config) => start_monitor(config).await,
+        }
+    }
+}
diff --git a/bin/network-monitor/src/cli/mod.rs b/bin/network-monitor/src/cli/mod.rs
new file mode 100644
index 000000000..92e7789bc
--- /dev/null
+++ b/bin/network-monitor/src/cli/mod.rs
@@ -0,0 +1,7 @@
+//! Command-line interface module.
+//!
+//! This module contains the CLI parsing and command definitions.
+
+pub mod commands;
+
+pub use commands::*;
diff --git a/bin/network-monitor/src/commands/mod.rs b/bin/network-monitor/src/commands/mod.rs
new file mode 100644
index 000000000..550a87d20
--- /dev/null
+++ b/bin/network-monitor/src/commands/mod.rs
@@ -0,0 +1,7 @@
+//! Command implementations.
+//!
+//! This module contains the implementations for all available commands.
+
+pub mod start;
+
+pub use start::*;
diff --git a/bin/network-monitor/src/commands/start.rs b/bin/network-monitor/src/commands/start.rs
new file mode 100644
index 000000000..a83ec06c7
--- /dev/null
+++ b/bin/network-monitor/src/commands/start.rs
@@ -0,0 +1,57 @@
+//! Start command implementation.
+//!
+//! This module contains the implementation for starting the network monitoring service.
+
+use anyhow::Result;
+use miden_node_utils::logging::OpenTelemetry;
+use tracing::{info, warn};
+
+use crate::config::MonitorConfig;
+use crate::deploy::ensure_accounts_exist;
+use crate::frontend::ServerState;
+use crate::monitor::tasks::Tasks;
+
+/// Start the network monitoring service.
+///
+/// This function initializes all monitoring tasks including RPC status checking,
+/// remote prover testing, faucet testing, and the web frontend.
+pub async fn start_monitor(config: MonitorConfig) -> Result<()> {
+    // Load configuration from command-line arguments and environment variables
+    info!("Loaded configuration: {:?}", config);
+
+    if config.enable_otel {
+        miden_node_utils::logging::setup_tracing(OpenTelemetry::Enabled)?;
+    } else {
+        miden_node_utils::logging::setup_tracing(OpenTelemetry::Disabled)?;
+    }
+
+    // Ensure accounts exist before starting monitoring tasks
+    ensure_accounts_exist(&config.wallet_filepath, &config.counter_filepath, &config.rpc_url)
+        .await?;
+
+    let mut tasks = Tasks::new();
+
+    // Initialize the RPC Status endpoint checker task.
+    let rpc_rx = tasks.spawn_rpc_checker(&config).await?;
+
+    // Initialize the prover checkers & tests tasks.
+    let prover_rxs = tasks.spawn_prover_tasks(&config).await?;
+
+    // Initialize the faucet testing task.
+    let faucet_rx = if config.faucet_url.is_some() {
+        Some(tasks.spawn_faucet(&config))
+    } else {
+        warn!("Faucet URL not configured, skipping faucet testing");
+        None
+    };
+
+    // Initialize HTTP server.
+    let server_state = ServerState {
+        rpc: rpc_rx,
+        provers: prover_rxs,
+        faucet: faucet_rx,
+    };
+    tasks.spawn_http_server(server_state, &config);
+
+    tasks.handle_failure().await
+}
diff --git a/bin/network-monitor/src/config.rs b/bin/network-monitor/src/config.rs
index f79dce52a..73887b2fe 100644
--- a/bin/network-monitor/src/config.rs
+++ b/bin/network-monitor/src/config.rs
@@ -3,6 +3,7 @@
 //! This module contains the configuration structures and constants for the network monitor.
 //! Configuration for the monitor.
 
+use std::path::PathBuf;
 use std::time::Duration;
 
 use clap::Parser;
@@ -11,7 +12,7 @@ use url::Url;
 // MONITOR CONFIGURATION CONSTANTS
 // ================================================================================================
 
-const DEFAULT_RPC_URL: &str = "http://localhost:50051";
+const DEFAULT_RPC_URL: &str = "http://0.0.0.0:57291";
 const DEFAULT_REMOTE_PROVER_URLS: &str = "http://localhost:50052";
 const DEFAULT_FAUCET_URL: &str = "http://localhost:8080";
 const DEFAULT_PORT: u16 = 3000;
@@ -20,9 +21,6 @@ const DEFAULT_PORT: u16 = 3000;
 ///
 /// This struct contains the configuration for the monitor.
 #[derive(Debug, Clone, Parser)]
-#[command(name = "miden-network-monitor")]
-#[command(about = "A network monitor for Miden node services")]
-#[command(version)]
 pub struct MonitorConfig {
     /// The URL of the RPC service.
     #[arg(
@@ -101,4 +99,22 @@ pub struct MonitorConfig {
         help = "Whether to enable OpenTelemetry"
     )]
     pub enable_otel: bool,
+
+    /// Path for the wallet account file.
+    #[arg(
+        long = "wallet-filepath",
+        env = "MIDEN_MONITOR_WALLET_FILEPATH",
+        default_value = "wallet_account.mac",
+        help = "Path where the wallet account is located"
+    )]
+    pub wallet_filepath: PathBuf,
+
+    /// Path for the counter program account file.
+    #[arg(
+        long = "counter-filepath",
+        env = "MIDEN_MONITOR_COUNTER_FILEPATH",
+        default_value = "counter_program.mac",
+        help = "Path where the counter account is located"
+    )]
+    pub counter_filepath: PathBuf,
 }
diff --git a/bin/network-monitor/src/deploy/counter.rs b/bin/network-monitor/src/deploy/counter.rs
new file mode 100644
index 000000000..38e8043a9
--- /dev/null
+++ b/bin/network-monitor/src/deploy/counter.rs
@@ -0,0 +1,60 @@
+//! Counter program account creation functionality.
+
+use std::path::Path;
+
+use anyhow::Result;
+use miden_lib::testing::account_component::IncrNonceAuthComponent;
+use miden_lib::transaction::TransactionKernel;
+use miden_objects::account::{
+    Account,
+    AccountBuilder,
+    AccountComponent,
+    AccountFile,
+    AccountId,
+    AccountStorageMode,
+    AccountType,
+    StorageSlot,
+};
+use miden_objects::{Felt, Word};
+use tracing::instrument;
+
+use crate::COMPONENT;
+
+/// Create a counter program account with custom MASM script.
+#[instrument(target = COMPONENT, name = "create-counter-account", skip_all, ret(level = "debug"))]
+pub fn create_counter_account(owner_account_id: AccountId) -> Result<Account> {
+    // Load and customize the MASM script
+    let script =
+        include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/assets/counter_program.masm"));
+
+    // Compile the account code
+    let owner_felts: [Felt; 2] = owner_account_id.into();
+    let owner_word = Word::from([Felt::new(0), Felt::new(0), owner_felts[0], owner_felts[1]]);
+
+    let account_code = AccountComponent::compile(
+        script,
+        TransactionKernel::assembler(),
+        vec![StorageSlot::empty_value(), StorageSlot::Value(owner_word)],
+    )?
+    .with_supports_all_types();
+
+    let incr_nonce_auth: AccountComponent = IncrNonceAuthComponent.into();
+
+    // Create the counter program account
+    let init_seed: [u8; 32] = rand::random();
+    let counter_account = AccountBuilder::new(init_seed)
+        .account_type(AccountType::RegularAccountUpdatableCode)
+        .storage_mode(AccountStorageMode::Network)
+        .with_component(account_code)
+        .with_auth_component(incr_nonce_auth)
+        .build()?;
+
+    Ok(counter_account)
+}
+
+/// Save counter program account to disk without extra auth material.
+pub fn save_counter_account(account: &Account, file_path: &Path) -> Result<()> {
+    let account_file = AccountFile::new(account.clone(), vec![]);
+    account_file.write(file_path)?;
+    Ok(())
+}
diff --git a/bin/network-monitor/src/deploy/mod.rs b/bin/network-monitor/src/deploy/mod.rs
new file mode 100644
index 000000000..87045827d
--- /dev/null
+++ b/bin/network-monitor/src/deploy/mod.rs
@@ -0,0 +1,288 @@
+//! Account deployment module.
+//!
+//! This module contains functionality for deploying Miden accounts to the network.
+
+use std::collections::BTreeSet;
+use std::path::Path;
+use std::sync::Arc;
+use std::time::Duration;
+
+use anyhow::{Context, Result};
+use miden_node_proto::clients::{Builder, Rpc, RpcClient};
+use miden_node_proto::generated::shared::BlockHeaderByNumberRequest;
+use miden_node_proto::generated::transaction::ProvenTransaction;
+use miden_objects::account::{Account, AccountId, PartialAccount, PartialStorage};
+use miden_objects::asset::{AssetVaultKey, AssetWitness, PartialVault};
+use miden_objects::block::{BlockHeader, BlockNumber};
+use miden_objects::crypto::merkle::{MmrPeaks, PartialMmr};
+use miden_objects::note::NoteScript;
+use miden_objects::transaction::{AccountInputs, InputNotes, PartialBlockchain, TransactionArgs};
+use miden_objects::{MastForest, Word};
+use miden_tx::auth::BasicAuthenticator;
+use miden_tx::utils::Serializable;
+use miden_tx::{
+    DataStore,
+    DataStoreError,
+    LocalTransactionProver,
+    MastForestStore,
+    TransactionExecutor,
+    TransactionMastStore,
+};
+use tokio::sync::Mutex;
+use tracing::instrument;
+use url::Url;
+
+use crate::COMPONENT;
+use crate::deploy::counter::{create_counter_account, save_counter_account};
+use crate::deploy::wallet::{create_wallet_account, save_wallet_account};
+
+pub mod counter;
+pub mod wallet;
+
+/// Ensure accounts exist, creating them if they don't.
+///
+/// This function checks if the wallet and counter account files exist.
+/// If they don't exist, it creates new accounts and saves them to the specified files.
+/// If they do exist, it does nothing.
+///
+/// # Arguments
+///
+/// * `wallet_file` - Path to the wallet account file.
+/// * `counter_file` - Path to the counter program account file.
+///
+/// # Returns
+///
+/// `Ok(())` if the accounts exist or were successfully created, or an error if creation fails.
+pub async fn ensure_accounts_exist(
+    wallet_filepath: &Path,
+    counter_filepath: &Path,
+    rpc_url: &Url,
+) -> Result<()> {
+    let wallet_exists = wallet_filepath.exists();
+    let counter_exists = counter_filepath.exists();
+
+    if wallet_exists && counter_exists {
+        tracing::info!("Account files already exist, skipping account creation");
+        return Ok(());
+    }
+
+    tracing::info!("Account files not found, creating new accounts");
+
+    // Create wallet account
+    let (wallet_account, secret_key) = create_wallet_account()?;
+
+    // Create counter program account
+    let counter_account = create_counter_account(wallet_account.id())?;
+
+    deploy_accounts(&wallet_account, &counter_account, rpc_url).await?;
+    tracing::info!("Successfully created and deployed accounts");
+
+    // Save accounts to files
+    save_wallet_account(&wallet_account, &secret_key, wallet_filepath)?;
+    save_counter_account(&counter_account, counter_filepath)
+}
+
+/// Deploy accounts to the network.
+///
+/// This function creates both a wallet account and a counter program account,
+/// then saves them to the specified files.
+#[instrument(target = COMPONENT, name = "deploy-accounts", skip_all, ret(level = "debug"))]
+pub async fn deploy_accounts(
+    wallet_account: &Account,
+    counter_account: &Account,
+    rpc_url: &Url,
+) -> Result<()> {
+    // Deploy accounts to the network
+    let mut rpc_client: RpcClient = Builder::new(rpc_url.clone())
+        .with_tls()
+        .context("Failed to configure TLS for RPC client")?
+        .with_timeout(Duration::from_secs(5))
+        .without_metadata_version()
+        .without_metadata_genesis()
+        .connect::<Rpc>()
+        .await
+        .context("Failed to connect to RPC server")?;
+
+    let block_header_request = BlockHeaderByNumberRequest {
+        block_num: Some(BlockNumber::GENESIS.as_u32()),
+        include_mmr_proof: None,
+    };
+
+    let response = rpc_client
+        .get_block_header_by_number(block_header_request)
+        .await
+        .context("Failed to get block header from RPC")?;
+
+    let root_block_header = response
+        .into_inner()
+        .block_header
+        .ok_or_else(|| anyhow::anyhow!("No block header in response"))?;
+
+    let genesis_header = root_block_header.try_into().context("Failed to convert block header")?;
+
+    let genesis_chain_mmr =
+        PartialBlockchain::new(PartialMmr::from_peaks(MmrPeaks::default()), Vec::new())
+            .context("Failed to create empty ChainMmr")?;
+
+    let data_store = Arc::new(MonitorDataStore::new(
+        wallet_account.clone(),
+        counter_account.clone(),
+        wallet_account.seed(),
+        genesis_header,
+        genesis_chain_mmr,
+    ));
+
+    let executor: TransactionExecutor<'_, '_, _, BasicAuthenticator> =
+        TransactionExecutor::new(data_store.as_ref());
+
+    let tx_args = TransactionArgs::default();
+
+    let executed_tx = executor
+        .execute_transaction(
+            counter_account.id(),
+            BlockNumber::GENESIS,
+            InputNotes::default(),
+            tx_args,
+        )
+        .await
+        .context("Failed to execute transaction")?;
+
+    let prover = LocalTransactionProver::default();
+
+    let proven_tx = prover.prove(executed_tx).context("Failed to prove transaction")?;
+
+    let request = ProvenTransaction {
+        transaction: proven_tx.to_bytes(),
+        transaction_inputs: None,
+    };
+
+    rpc_client
+        .submit_proven_transaction(request)
+        .await
+        .context("Failed to submit proven transaction to RPC")?;
+
+    Ok(())
+}
+
+// MONITOR DATA STORE
+// ================================================================================================
+
+/// A [`DataStore`] implementation for the network monitor.
+pub struct MonitorDataStore {
+    wallet_account: Mutex<Account>,
+    counter_account: Mutex<Account>,
+    #[allow(dead_code)]
+    wallet_init_seed: Option<Word>,
+    block_header: BlockHeader,
+    partial_block_chain: PartialBlockchain,
+    mast_store: TransactionMastStore,
+}
+
+impl MonitorDataStore {
+    pub fn new(
+        wallet_account: Account,
+        counter_account: Account,
+        wallet_init_seed: Option<Word>,
+        block_header: BlockHeader,
+        partial_block_chain: PartialBlockchain,
+    ) -> Self {
+        let mast_store = TransactionMastStore::new();
+        mast_store.insert(wallet_account.code().mast());
+        mast_store.insert(counter_account.code().mast());
+
+        Self {
+            mast_store,
+            wallet_account: Mutex::new(wallet_account),
+            counter_account: Mutex::new(counter_account),
+            wallet_init_seed,
+            block_header,
+            partial_block_chain,
+        }
+    }
+}
+
+impl DataStore for MonitorDataStore {
+    async fn get_transaction_inputs(
+        &self,
+        account_id: AccountId,
+        mut _block_refs: BTreeSet<BlockNumber>,
+    ) -> Result<(PartialAccount, BlockHeader, PartialBlockchain), DataStoreError> {
+        let account = self.wallet_account.lock().await;
+
+        let account = if account_id == account.id() {
+            account.to_owned()
+        } else {
+            self.counter_account.lock().await.to_owned()
+        };
+
+        let partial_storage = PartialStorage::new_full(account.storage().clone());
+        let assert_vault = PartialVault::new_full(account.vault().clone());
+        let partial_account = PartialAccount::new(
+            account_id,
+            account.nonce(),
+            account.code().clone(),
+            partial_storage,
+            assert_vault,
+            account.seed(),
+        )
+        .expect("Partial account be valid");
+
+        Ok((partial_account, self.block_header.clone(), self.partial_block_chain.clone()))
+    }
+
+    async fn get_storage_map_witness(
+        &self,
+        _account_id: AccountId,
+        _map_root: Word,
+        _map_key: Word,
+    ) -> Result<miden_objects::account::StorageMapWitness, DataStoreError> {
+        unimplemented!("Not needed")
+    }
+
+    async fn get_foreign_account_inputs(
+        &self,
+        _foreign_account_id: AccountId,
+        _ref_block: BlockNumber,
+    ) -> Result<AccountInputs, DataStoreError> {
+        unimplemented!("Not needed")
+    }
+
+    async fn get_vault_asset_witness(
+        &self,
+        account_id: AccountId,
+        vault_root: Word,
+        vault_key: AssetVaultKey,
+    ) -> Result<AssetWitness, DataStoreError> {
+        let account = self.wallet_account.lock().await;
+
+        let account = if account_id == account.id() {
+            account.to_owned()
+        } else {
+            self.counter_account.lock().await.to_owned()
+        };
+
+        if account.vault().root() != vault_root {
+            return Err(DataStoreError::Other {
+                error_msg: "vault root mismatch".into(),
+                source: None,
+            });
+        }
+
+        AssetWitness::new(account.vault().open(vault_key).into()).map_err(|err| {
+            DataStoreError::Other {
+                error_msg: "failed to open vault asset tree".into(),
+                source: Some(Box::new(err)),
+            }
+        })
+    }
+
+    async fn get_note_script(&self, script_root: Word) -> Result<NoteScript, DataStoreError> {
+        Err(DataStoreError::NoteScriptNotFound(script_root))
+    }
+}
+
+impl MastForestStore for MonitorDataStore {
+    fn get(&self, procedure_hash: &Word) -> Option<Arc<MastForest>> {
+        self.mast_store.get(procedure_hash)
+    }
+}
diff --git a/bin/network-monitor/src/deploy/wallet.rs b/bin/network-monitor/src/deploy/wallet.rs
new file mode 100644
index 000000000..704ced5e4
--- /dev/null
+++ b/bin/network-monitor/src/deploy/wallet.rs
@@ -0,0 +1,48 @@
+//! Wallet account creation functionality.
+
+use std::path::Path;
+
+use anyhow::Result;
+use miden_lib::AuthScheme;
+use miden_lib::account::wallets::create_basic_wallet;
+use miden_node_utils::crypto::get_rpo_random_coin;
+use miden_objects::account::auth::AuthSecretKey;
+use miden_objects::account::{Account, AccountFile, AccountStorageMode, AccountType};
+use miden_objects::crypto::dsa::rpo_falcon512::SecretKey;
+use rand::{Rng, SeedableRng};
+use rand_chacha::ChaCha20Rng;
+use tracing::instrument;
+
+use crate::COMPONENT;
+
+/// Create a wallet account with `RpoFalcon512` authentication.
+///
+/// Returns the created account and the secret key for authentication.
+#[instrument(target = COMPONENT, name = "create-wallet-account", skip_all, ret(level = "debug"))]
+pub fn create_wallet_account() -> Result<(Account, SecretKey)> {
+    let mut rng = ChaCha20Rng::from_seed(rand::random());
+    let secret_key = SecretKey::with_rng(&mut get_rpo_random_coin(&mut rng));
+    let auth = AuthScheme::RpoFalcon512 { pub_key: secret_key.public_key().into() };
+    let init_seed: [u8; 32] = rng.random();
+
+    let wallet_account = create_basic_wallet(
+        init_seed,
+        auth,
+        AccountType::RegularAccountImmutableCode,
+        AccountStorageMode::Public,
+    )?;
+
+    Ok((wallet_account, secret_key))
+}
+
+/// Save wallet account to disk together with its authentication key.
+pub fn save_wallet_account(
+    account: &Account,
+    secret_key: &SecretKey,
+    file_path: &Path,
+) -> Result<()> {
+    let auth_secret_key = AuthSecretKey::RpoFalcon512(secret_key.clone());
+    let account_file = AccountFile::new(account.clone(), vec![auth_secret_key]);
+    account_file.write(file_path)?;
+    Ok(())
+}
diff --git a/bin/network-monitor/src/main.rs b/bin/network-monitor/src/main.rs
index c3d78359b..e7a830bb1 100644
--- a/bin/network-monitor/src/main.rs
+++ b/bin/network-monitor/src/main.rs
@@ -1,318 +1,38 @@
-use std::collections::HashMap;
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
+//! Miden Network Monitor
+//!
+//! A monitor application for Miden network infrastructure that provides real-time status
+//! monitoring and account deployment capabilities.
 
+use anyhow::Result;
 use clap::Parser;
-use miden_node_proto::clients::{Builder as ClientBuilder, RemoteProverProxy, Rpc};
-use miden_node_utils::logging::OpenTelemetry;
-use tokio::sync::watch;
-use tokio::sync::watch::Receiver;
-use tokio::task::{Id, JoinSet};
 
-mod config;
-mod faucet;
-mod frontend;
-mod remote_prover;
-mod status;
-
-use config::MonitorConfig;
-use faucet::run_faucet_test_task;
-use remote_prover::run_remote_prover_test_task;
-use status::{ServiceStatus, run_remote_prover_status_task, run_rpc_status_task};
-use tracing::{debug, info, warn};
-
-use crate::frontend::{ServerState, serve};
-use crate::remote_prover::{ProofType, generate_prover_test_payload};
-use crate::status::{ServiceDetails, Status, check_remote_prover_status, check_rpc_status};
+// Module declarations
+mod cli;
+pub mod commands;
+pub mod config;
+mod deploy;
+pub mod faucet;
+pub mod frontend;
+mod monitor;
+pub mod remote_prover;
+pub mod status;
+
+// Re-exports for cleaner imports
+use cli::Cli;
+// Re-export for other modules
+pub use monitor::tasks::current_unix_timestamp_secs;
 
 /// Component identifier for structured logging and tracing
 pub const COMPONENT: &str = "miden-network-monitor";
 
-// MAIN
-// ================================================================================================
-
 /// Network Monitor main function.
 ///
-/// This implementation spawns independent status checker tasks for each service (RPC and remote
-/// provers) that communicate via watch channels. Each task continuously monitors its service and
-/// sends status updates through a `watch::Sender`. The web server holds all the `watch::Receiver`
-/// ends and aggregates status on-demand when serving HTTP requests. If any task terminates
-/// unexpectedly, the entire process exits.
+/// This function parses command-line arguments and delegates to the appropriate
+/// command handler. The monitor supports two main commands:
+/// - `start`: Runs the network monitoring service with web dashboard
+/// - `deploy-account`: Creates and deploys Miden accounts to the network
 #[tokio::main]
-async fn main() -> anyhow::Result<()> {
-    // Load configuration from command-line arguments and environment variables
-    let config = MonitorConfig::parse();
-    info!("Loaded configuration: {:?}", config);
-
-    let _otel_guard = if config.enable_otel {
-        miden_node_utils::logging::setup_tracing(OpenTelemetry::Enabled)?
-    } else {
-        miden_node_utils::logging::setup_tracing(OpenTelemetry::Disabled)?
-    };
-
-    let mut tasks = Tasks::new();
-
-    // Initialize the RPC Status endpoint checker task.
-    let rpc_rx = tasks.spawn_rpc_checker(&config).await?;
-
-    // Initialize the prover checkers & tests tasks.
-    let prover_rxs = tasks.spawn_prover_tasks(&config).await?;
-
-    // Initialize the faucet testing task.
-    let faucet_rx = if config.faucet_url.is_some() {
-        Some(tasks.spawn_faucet(&config))
-    } else {
-        warn!("Faucet URL not configured, skipping faucet testing");
-        None
-    };
-
-    // Initialize HTTP server.
-    let server_state = ServerState {
-        rpc: rpc_rx,
-        provers: prover_rxs,
-        faucet: faucet_rx,
-    };
-    tasks.spawn_http_server(server_state, &config);
-
-    tasks.handle_failure().await
-}
-
-// TASKS MANAGEMENT
-// ================================================================================================
-
-/// Task management structure that encapsulates `JoinSet` and component names.
-#[derive(Default)]
-struct Tasks {
-    handles: JoinSet<()>,
-    names: HashMap<Id, String>,
-}
-
-impl Tasks {
-    /// Create a new Tasks instance.
-    fn new() -> Self {
-        Self {
-            handles: JoinSet::new(),
-            names: HashMap::new(),
-        }
-    }
-
-    /// Spawn the RPC status checker task.
-    async fn spawn_rpc_checker(
-        &mut self,
-        config: &MonitorConfig,
-    ) -> anyhow::Result<Receiver<ServiceStatus>> {
-        // Create initial status for RPC service
-        let mut rpc = ClientBuilder::new(config.rpc_url.clone())
-            .with_tls()
-            .expect("TLS is enabled")
-            .with_timeout(Duration::from_secs(10))
-            .without_metadata_version()
-            .without_metadata_genesis()
-            .connect_lazy::<Rpc>();
-
-        let current_time = current_unix_timestamp_secs();
-        let initial_rpc_status = check_rpc_status(&mut rpc, current_time).await;
-
-        // Spawn the RPC checker
-        let (rpc_tx, rpc_rx) = watch::channel(initial_rpc_status);
-        let rpc_url = config.rpc_url.clone();
-        let status_check_interval = config.status_check_interval;
-        let id = self
-            .handles
-            .spawn(async move {
-                run_rpc_status_task(rpc_url, rpc_tx, status_check_interval).await;
-            })
-            .id();
-        self.names.insert(id, "rpc-checker".to_string());
-
-        Ok(rpc_rx)
-    }
-
-    /// Spawn prover status and test tasks for all configured provers.
-    async fn spawn_prover_tasks(
-        &mut self,
-        config: &MonitorConfig,
-    ) -> anyhow::Result<Vec<(watch::Receiver<ServiceStatus>, watch::Receiver<ServiceStatus>)>> {
-        let mut prover_rxs = Vec::new();
-
-        for (i, prover_url) in config.remote_prover_urls.iter().enumerate() {
-            let name = format!("Prover-{}", i + 1);
-
-            let mut remote_prover = ClientBuilder::new(prover_url.clone())
-                .with_tls()
-                .expect("TLS is enabled")
-                .with_timeout(Duration::from_secs(10))
-                .without_metadata_version()
-                .without_metadata_genesis()
-                .connect_lazy::<RemoteProverProxy>();
-
-            let current_time = current_unix_timestamp_secs();
-
-            let initial_prover_status = check_remote_prover_status(
-                &mut remote_prover,
-                name.clone(),
-                prover_url.to_string(),
-                current_time,
-            )
-            .await;
-
-            let (prover_status_tx, prover_status_rx) =
-                watch::channel(initial_prover_status.clone());
-
-            // Spawn the remote prover status check task
-            let component_name = format!("prover-checker-{}", i + 1);
-            let prover_url_clone = prover_url.clone();
-            let name_clone = name.clone();
-            let status_check_interval = config.status_check_interval;
-            let id = self
-                .handles
-                .spawn(async move {
-                    run_remote_prover_status_task(
-                        prover_url_clone,
-                        name_clone,
-                        prover_status_tx,
-                        status_check_interval,
-                    )
-                    .await;
-                })
-                .id();
-            self.names.insert(id, component_name);
-
-            // Extract proof_type directly from the service status
-            let proof_type = match &initial_prover_status.details {
-                crate::status::ServiceDetails::RemoteProverStatus(details) => {
-                    details.supported_proof_type.clone()
-                },
-                _ => unreachable!("This is for remote provers only"),
-            };
-
-            // Only spawn test tasks for transaction provers
-            let prover_test_rx = if matches!(proof_type, ProofType::Transaction) {
-                debug!("Starting transaction proof tests for prover: {}", name);
-                let payload = generate_prover_test_payload().await;
-                let (prover_test_tx, prover_test_rx) =
-                    watch::channel(initial_prover_status.clone());
-
-                let prover_url_clone = prover_url.clone();
-                let name_clone = name.clone();
-                let id = self
-                    .handles
-                    .spawn(async move {
-                        Box::pin(run_remote_prover_test_task(
-                            prover_url_clone,
-                            &name_clone,
-                            proof_type,
-                            payload,
-                            prover_test_tx,
-                        ))
-                        .await;
-                    })
-                    .id();
-                let component_name = format!("prover-test-{}", i + 1);
-                self.names.insert(id, component_name);
-
-                prover_test_rx
-            } else {
-                debug!(
-                    "Skipping prover tests for {} (supports {:?} proofs, only testing Transaction proofs)",
-                    name, proof_type
-                );
-                // For non-transaction provers, create a dummy receiver with no test task
-                let (_tx, rx) = watch::channel(initial_prover_status.clone());
-                rx
-            };
-
-            prover_rxs.push((prover_status_rx, prover_test_rx));
-        }
-
-        Ok(prover_rxs)
-    }
-
-    /// Spawn the faucet testing task.
-    fn spawn_faucet(&mut self, config: &MonitorConfig) -> Receiver<ServiceStatus> {
-        let current_time = current_unix_timestamp_secs();
-
-        // Create initial faucet test status
-        let initial_faucet_status = ServiceStatus {
-            name: "Faucet".to_string(),
-            status: Status::Unknown,
-            last_checked: current_time,
-            error: None,
-            details: ServiceDetails::FaucetTest(crate::faucet::FaucetTestDetails {
-                test_duration_ms: 0,
-                success_count: 0,
-                failure_count: 0,
-                last_tx_id: None,
-                challenge_difficulty: None,
-            }),
-        };
-
-        // Spawn the faucet testing task
-        let (faucet_tx, faucet_rx) = watch::channel(initial_faucet_status);
-        // SAFETY: config.faucet_url is Some
-        let faucet_url = config.faucet_url.clone().unwrap();
-        let faucet_test_interval = config.faucet_test_interval;
-        let id = self
-            .handles
-            .spawn(async move {
-                run_faucet_test_task(faucet_url, faucet_tx, faucet_test_interval).await;
-            })
-            .id();
-        self.names.insert(id, "faucet-test".to_string());
-
-        faucet_rx
-    }
-
-    /// Spawn the HTTP frontend server.
-    fn spawn_http_server(&mut self, server_state: ServerState, config: &MonitorConfig) {
-        let config = config.clone();
-        let id = self.handles.spawn(async move { serve(server_state, config).await }).id();
-        self.names.insert(id, "frontend".to_string());
-    }
-
-    /// Wait for any task to complete or fail and return the result.
-    async fn join_next_with_id(&mut self) -> Option<Result<(Id, ()), tokio::task::JoinError>> {
-        self.handles.join_next_with_id().await
-    }
-
-    /// Get the component name for a given task ID.
-    fn get_component_name(&self, id: Id) -> Option<&String> {
-        self.names.get(&id)
-    }
-
-    /// Handles the failure of a task.
-    ///
-    /// This method waits for any task to complete or fail and returns an error.
-    /// Since we expect components to run indefinitely, any task completion is treated as fatal.
-    ///
-    /// # Returns
-    ///
-    /// An error if any task fails or completes unexpectedly.
-    async fn handle_failure(&mut self) -> anyhow::Result<()> {
-        // Wait for any task to complete or fail
-        let component_result = self.join_next_with_id().await.expect("join set is not empty");
-
-        // We expect components to run indefinitely, so we treat any return as fatal.
-        let (id, err) = match component_result {
-            Ok((id, ())) => (id, anyhow::anyhow!("component completed unexpectedly")),
-            Err(join_err) => (join_err.id(), anyhow::Error::from(join_err)),
-        };
-        let component_name = self.get_component_name(id).map_or("unknown", String::as_str);
-
-        // Exit with error context
-        Err(err.context(format!("component {component_name} failed")))
-    }
-}
-
-// HELPERS
-// ================================================================================================
-
-/// Gets the current Unix timestamp in seconds.
-///
-/// This function is infallible - if the system time is somehow before Unix epoch
-/// (extremely unlikely), it returns 0.
-pub fn current_unix_timestamp_secs() -> u64 {
-    SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .unwrap_or_else(|_| Duration::from_secs(0))  // Fallback to 0 if before Unix epoch
-        .as_secs()
+async fn main() -> Result<()> {
+    let cli = Cli::parse();
+    cli.execute().await
 }
diff --git a/bin/network-monitor/src/monitor/mod.rs b/bin/network-monitor/src/monitor/mod.rs
new file mode 100644
index 000000000..fd7bb63c9
--- /dev/null
+++ b/bin/network-monitor/src/monitor/mod.rs
@@ -0,0 +1,5 @@
+//! Monitor module.
+//!
+//! This module contains the core monitoring functionality.
+
+pub mod tasks;
diff --git a/bin/network-monitor/src/monitor/tasks.rs b/bin/network-monitor/src/monitor/tasks.rs
new file mode 100644
index 000000000..852a9d96e
--- /dev/null
+++ b/bin/network-monitor/src/monitor/tasks.rs
@@ -0,0 +1,267 @@
+//! Task management for the network monitor.
+
+use std::collections::HashMap;
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
+
+use anyhow::Result;
+use miden_node_proto::clients::{Builder as ClientBuilder, RemoteProverProxy, Rpc};
+use tokio::sync::watch;
+use tokio::sync::watch::Receiver;
+use tokio::task::{Id, JoinSet};
+use tracing::debug;
+
+use crate::config::MonitorConfig;
+use crate::faucet::run_faucet_test_task;
+use crate::frontend::{ServerState, serve};
+use crate::remote_prover::{ProofType, generate_prover_test_payload, run_remote_prover_test_task};
+use crate::status::{
+    ServiceStatus,
+    check_remote_prover_status,
+    check_rpc_status,
+    run_remote_prover_status_task,
+    run_rpc_status_task,
+};
+
+/// Task management structure that encapsulates `JoinSet` and component names.
+#[derive(Default)]
+pub struct Tasks {
+    handles: JoinSet<()>,
+    names: HashMap<Id, String>,
+}
+
+impl Tasks {
+    /// Create a new Tasks instance.
+    pub fn new() -> Self {
+        Self {
+            handles: JoinSet::new(),
+            names: HashMap::new(),
+        }
+    }
+
+    /// Spawn the RPC status checker task.
+    pub async fn spawn_rpc_checker(
+        &mut self,
+        config: &MonitorConfig,
+    ) -> Result<Receiver<ServiceStatus>> {
+        // Create initial status for RPC service
+        let mut rpc = ClientBuilder::new(config.rpc_url.clone())
+            .with_tls()
+            .expect("TLS is enabled")
+            .with_timeout(Duration::from_secs(10))
+            .without_metadata_version()
+            .without_metadata_genesis()
+            .connect_lazy::<Rpc>();
+
+        let current_time = current_unix_timestamp_secs();
+        let initial_rpc_status = check_rpc_status(&mut rpc, current_time).await;
+
+        // Spawn the RPC checker
+        let (rpc_tx, rpc_rx) = watch::channel(initial_rpc_status);
+        let rpc_url = config.rpc_url.clone();
+        let status_check_interval = config.status_check_interval;
+        let id = self
+            .handles
+            .spawn(async move {
+                run_rpc_status_task(rpc_url, rpc_tx, status_check_interval).await;
+            })
+            .id();
+        self.names.insert(id, "rpc-checker".to_string());
+
+        Ok(rpc_rx)
+    }
+
+    /// Spawn prover status and test tasks for all configured provers.
+    pub async fn spawn_prover_tasks(
+        &mut self,
+        config: &MonitorConfig,
+    ) -> Result<Vec<(watch::Receiver<ServiceStatus>, watch::Receiver<ServiceStatus>)>> {
+        let mut prover_rxs = Vec::new();
+
+        for (i, prover_url) in config.remote_prover_urls.iter().enumerate() {
+            let name = format!("Prover-{}", i + 1);
+
+            let mut remote_prover = ClientBuilder::new(prover_url.clone())
+                .with_tls()
+                .expect("TLS is enabled")
+                .with_timeout(Duration::from_secs(10))
+                .without_metadata_version()
+                .without_metadata_genesis()
+                .connect_lazy::<RemoteProverProxy>();
+
+            let current_time = current_unix_timestamp_secs();
+
+            let initial_prover_status = check_remote_prover_status(
+                &mut remote_prover,
+                name.clone(),
+                prover_url.to_string(),
+                current_time,
+            )
+            .await;
+
+            let (prover_status_tx, prover_status_rx) =
+                watch::channel(initial_prover_status.clone());
+
+            // Spawn the remote prover status check task
+            let component_name = format!("prover-checker-{}", i + 1);
+            let prover_url_clone = prover_url.clone();
+            let name_clone = name.clone();
+            let status_check_interval = config.status_check_interval;
+            let id = self
+                .handles
+                .spawn(async move {
+                    run_remote_prover_status_task(
+                        prover_url_clone,
+                        name_clone,
+                        prover_status_tx,
+                        status_check_interval,
+                    )
+                    .await;
+                })
+                .id();
+            self.names.insert(id, component_name);
+
+            // Extract proof_type directly from the service status
+            // If the prover is not available during startup, skip spawning test tasks
+            let proof_type = if let crate::status::ServiceDetails::RemoteProverStatus(details) =
+                &initial_prover_status.details
+            {
+                Some(details.supported_proof_type.clone())
+            } else {
+                // Prover is not available during startup, but we'll still monitor its status
+                tracing::warn!(
+                    "Prover {} is not available during startup, skipping test task initialization",
+                    name
+                );
+                None
+            };
+
+            // Only spawn test tasks for transaction provers if proof_type is available
+            let prover_test_rx = if matches!(proof_type, Some(ProofType::Transaction)) {
+                debug!("Starting transaction proof tests for prover: {}", name);
+                let payload = generate_prover_test_payload().await;
+                let (prover_test_tx, prover_test_rx) =
+                    watch::channel(initial_prover_status.clone());
+
+                let prover_url_clone = prover_url.clone();
+                let name_clone = name.clone();
+                let proof_type = proof_type.expect("proof type is Some");
+
+                let id = self
+                    .handles
+                    .spawn(async move {
+                        run_remote_prover_test_task(
+                            prover_url_clone,
+                            &name_clone,
+                            proof_type,
+                            payload,
+                            prover_test_tx,
+                        )
+                        .await;
+                    })
+                    .id();
+                let component_name = format!("prover-test-{}", i + 1);
+                self.names.insert(id, component_name);
+
+                prover_test_rx
+            } else {
+                debug!(
+                    "Skipping prover tests for {} (supports {:?} proofs, only testing Transaction proofs)",
+                    name, proof_type
+                );
+                // For non-transaction provers, create a dummy receiver with no test task
+                let (_tx, rx) = watch::channel(initial_prover_status.clone());
+                rx
+            };
+
+            prover_rxs.push((prover_status_rx, prover_test_rx));
+        }
+
+        Ok(prover_rxs)
+    }
+
+    /// Spawn the faucet testing task.
+    pub fn spawn_faucet(&mut self, config: &MonitorConfig) -> Receiver<ServiceStatus> {
+        let current_time = current_unix_timestamp_secs();
+
+        // Create initial faucet test status
+        let initial_faucet_status = ServiceStatus {
+            name: "Faucet".to_string(),
+            status: crate::status::Status::Unknown,
+            last_checked: current_time,
+            error: None,
+            details: crate::status::ServiceDetails::FaucetTest(crate::faucet::FaucetTestDetails {
+                test_duration_ms: 0,
+                success_count: 0,
+                failure_count: 0,
+                last_tx_id: None,
+                challenge_difficulty: None,
+            }),
+        };
+
+        // Spawn the faucet testing task
+        let (faucet_tx, faucet_rx) = watch::channel(initial_faucet_status);
+        // SAFETY: config.faucet_url is Some
+        let faucet_url = config.faucet_url.clone().unwrap();
+        let faucet_test_interval = config.faucet_test_interval;
+        let id = self
+            .handles
+            .spawn(async move {
+                run_faucet_test_task(faucet_url, faucet_tx, faucet_test_interval).await;
+            })
+            .id();
+        self.names.insert(id, "faucet-test".to_string());
+
+        faucet_rx
+    }
+
+    /// Spawn the HTTP frontend server.
+    pub fn spawn_http_server(&mut self, server_state: ServerState, config: &MonitorConfig) {
+        let config = config.clone();
+        let id = self.handles.spawn(async move { serve(server_state, config).await }).id();
+        self.names.insert(id, "frontend".to_string());
+    }
+
+    /// Wait for any task to complete or fail and return the result.
+    async fn join_next_with_id(&mut self) -> Option<Result<(Id, ()), tokio::task::JoinError>> {
+        self.handles.join_next_with_id().await
+    }
+
+    /// Get the component name for a given task ID.
+    fn get_component_name(&self, id: Id) -> Option<&String> {
+        self.names.get(&id)
+    }
+
+    /// Handles the failure of a task.
+    ///
+    /// This method waits for any task to complete or fail and returns an error.
+    /// Since we expect components to run indefinitely, any task completion is treated as fatal.
+    ///
+    /// # Returns
+    ///
+    /// An error if any task fails or completes unexpectedly.
+    pub async fn handle_failure(&mut self) -> Result<()> {
+        // Wait for any task to complete or fail
+        let component_result = self.join_next_with_id().await.expect("join set is not empty");
+
+        // We expect components to run indefinitely, so we treat any return as fatal.
+        let (id, err) = match component_result {
+            Ok((id, ())) => (id, anyhow::anyhow!("component completed unexpectedly")),
+            Err(join_err) => (join_err.id(), anyhow::Error::from(join_err)),
+        };
+        let component_name = self.get_component_name(id).map_or("unknown", String::as_str);
+
+        // Exit with error context
+        Err(err.context(format!("component {component_name} failed")))
+    }
+}
+
+/// Gets the current Unix timestamp in seconds.
+///
+/// This function is infallible - if the system time is somehow before Unix epoch
+/// (extremely unlikely), it returns 0.
+pub fn current_unix_timestamp_secs() -> u64 {
+    SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .unwrap_or_else(|_| Duration::from_secs(0))  // Fallback to 0 if before Unix epoch
+        .as_secs()
+}
diff --git a/bin/network-monitor/src/remote_prover.rs b/bin/network-monitor/src/remote_prover.rs
index 33a2fcf3d..eb6f17c83 100644
--- a/bin/network-monitor/src/remote_prover.rs
+++ b/bin/network-monitor/src/remote_prover.rs
@@ -294,7 +294,7 @@ pub async fn generate_mock_transaction() -> anyhow::Result<TransactionInputs> {
 
     // Execute the transaction
     let executed_transaction =
-        Box::pin(tx_context.execute()).await.context("Failed to execute transaction")?;
+        tx_context.execute().await.context("Failed to execute transaction")?;
     Ok(executed_transaction.into())
 }
 
diff --git a/bin/network-monitor/src/status.rs b/bin/network-monitor/src/status.rs
index ccd350991..dd1015a59 100644
--- a/bin/network-monitor/src/status.rs
+++ b/bin/network-monitor/src/status.rs
@@ -24,7 +24,7 @@ use crate::{COMPONENT, current_unix_timestamp_secs};
 // ================================================================================================
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-pub(crate) enum Status {
+pub enum Status {
     Healthy,
     Unhealthy,
     Unknown,

From 3d8fd0c8a6e750684b6eeb6ddc9c91dced3eedb3 Mon Sep 17 00:00:00 2001
From: igamigo <ignacio.amigo@lambdaclass.com>
Date: Fri, 7 Nov 2025 01:29:59 -0300
Subject: [PATCH 77/78] refactor: validate note commitments before adding them 
 (#1338)

---
 CHANGELOG.md                                  |  1 +
 bin/stress-test/src/seeding/mod.rs            |  4 +-
 .../block-producer/src/batch_builder/mod.rs   |  4 +-
 .../block-producer/src/block_builder/mod.rs   |  2 +-
 .../block-producer/src/domain/transaction.rs  | 21 ++++---
 crates/block-producer/src/errors.rs           | 26 ++++-----
 crates/block-producer/src/mempool/mod.rs      |  4 +-
 crates/block-producer/src/mempool/nodes.rs    | 56 +++++++++++--------
 crates/block-producer/src/mempool/state.rs    | 44 +++++++++------
 crates/block-producer/src/store/mod.rs        | 16 +++---
 .../src/generated/block_producer_store.rs     |  6 +-
 .../db/migrations/2025062000000_setup/up.sql  |  2 +
 crates/store/src/db/mod.rs                    | 30 ++++++----
 crates/store/src/db/models/queries/notes.rs   | 43 ++++++++++++--
 crates/store/src/db/schema.rs                 |  1 +
 crates/store/src/db/tests.rs                  |  9 +++
 crates/store/src/server/api.rs                |  8 +--
 crates/store/src/server/block_producer.rs     | 28 ++++++----
 crates/store/src/state.rs                     | 30 ++++++----
 crates/utils/src/limiter.rs                   |  7 +++
 docs/external/src/operator/monitoring.md      |  2 +-
 proto/proto/store/block_producer.proto        |  6 +-
 22 files changed, 221 insertions(+), 129 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12c5b1c50..51a764191 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 - Add optional `TransactionInputs` field to `SubmitProvenTransaction` endpoint for transaction re-execution (#[1278](https://github.com/0xMiden/miden-node/pull/1278)).
 - Implement `DataStore::get_note_script()` for `NtxDataStore` (#[1332](https://github.com/0xMiden/miden-node/pull/1332)).
 - [BREAKING] Added `AccountTreeWithHistory` and integrate historical queries into `GetAccountProof` ([#1292](https://github.com/0xMiden/miden-node/pull/1292)).
+- Started validating notes by their commitment instead of ID before entering the mempool ([#1338](https://github.com/0xMiden/miden-node/pull/1338)).
 
 ## v0.11.3 (2025-11-04)
 
diff --git a/bin/stress-test/src/seeding/mod.rs b/bin/stress-test/src/seeding/mod.rs
index 5b3266287..c35a6dd91 100644
--- a/bin/stress-test/src/seeding/mod.rs
+++ b/bin/stress-test/src/seeding/mod.rs
@@ -475,7 +475,7 @@ async fn get_batch_inputs(
     let batch_inputs = store_client
         .get_batch_inputs(
             vec![(block_ref.block_num(), block_ref.commitment())].into_iter(),
-            notes.iter().map(Note::id),
+            notes.iter().map(Note::commitment),
         )
         .await
         .unwrap();
@@ -498,7 +498,7 @@ async fn get_block_inputs(
                 batch
                     .input_notes()
                     .into_iter()
-                    .filter_map(|note| note.header().map(NoteHeader::id))
+                    .filter_map(|note| note.header().map(NoteHeader::commitment))
             }),
             batches.iter().map(ProvenBatch::reference_block_num),
         )
diff --git a/crates/block-producer/src/batch_builder/mod.rs b/crates/block-producer/src/batch_builder/mod.rs
index 001938e9d..6e991dea4 100644
--- a/crates/block-producer/src/batch_builder/mod.rs
+++ b/crates/block-producer/src/batch_builder/mod.rs
@@ -211,7 +211,7 @@ impl BatchJob {
             .transactions
             .iter()
             .map(Deref::deref)
-            .flat_map(AuthenticatedTransaction::unauthenticated_notes);
+            .flat_map(AuthenticatedTransaction::unauthenticated_note_commitments);
 
         self.store
             .get_batch_inputs(block_references, unauthenticated_notes)
@@ -348,7 +348,7 @@ impl TelemetryInjectorExt for SelectedBatch {
                     tx_ids.push(tx.id());
                     input_notes_count += tx.input_note_count();
                     output_notes_count += tx.output_note_count();
-                    unauth_notes_count += tx.unauthenticated_notes().count();
+                    unauth_notes_count += tx.unauthenticated_note_commitments().count();
                     (tx_ids, input_notes_count, output_notes_count, unauth_notes_count)
                 },
             );
diff --git a/crates/block-producer/src/block_builder/mod.rs b/crates/block-producer/src/block_builder/mod.rs
index 15fd141ff..6a5cf53ef 100644
--- a/crates/block-producer/src/block_builder/mod.rs
+++ b/crates/block-producer/src/block_builder/mod.rs
@@ -170,7 +170,7 @@ impl BlockBuilder {
                 .input_notes()
                 .iter()
                 .cloned()
-                .filter_map(|note| note.header().map(NoteHeader::id))
+                .filter_map(|note| note.header().map(NoteHeader::commitment))
         });
         let block_references_iter =
             batch_iter.clone().map(Deref::deref).map(ProvenBatch::reference_block_num);
diff --git a/crates/block-producer/src/domain/transaction.rs b/crates/block-producer/src/domain/transaction.rs
index 26d62def3..2b1ef3ecd 100644
--- a/crates/block-producer/src/domain/transaction.rs
+++ b/crates/block-producer/src/domain/transaction.rs
@@ -6,7 +6,7 @@ use std::sync::Arc;
 use miden_objects::Word;
 use miden_objects::account::AccountId;
 use miden_objects::block::BlockNumber;
-use miden_objects::note::{NoteId, Nullifier};
+use miden_objects::note::Nullifier;
 use miden_objects::transaction::{OutputNote, ProvenTransaction, TransactionId, TxAccountUpdate};
 
 use crate::errors::VerifyTxError;
@@ -28,12 +28,12 @@ pub struct AuthenticatedTransaction {
     /// This does not necessarily have to match the transaction's initial state
     /// as this may still be modified by inflight transactions.
     store_account_state: Option<Word>,
-    /// Unauthenticated notes that have now been authenticated by the store
+    /// Unauthenticated note commitments that have now been authenticated by the store
     /// [inputs](TransactionInputs).
     ///
     /// In other words, notes which were unauthenticated at the time the transaction was proven,
     /// but which have since been committed to, and authenticated by the store.
-    notes_authenticated_by_store: HashSet<NoteId>,
+    notes_authenticated_by_store: HashSet<Word>,
     /// Chain height that the authentication took place at.
     authentication_height: BlockNumber,
 }
@@ -91,8 +91,11 @@ impl AuthenticatedTransaction {
         self.inner.nullifiers()
     }
 
-    pub fn output_note_ids(&self) -> impl Iterator<Item = NoteId> + '_ {
-        self.inner.output_notes().iter().map(miden_objects::transaction::OutputNote::id)
+    pub fn output_note_commitments(&self) -> impl Iterator<Item = Word> + '_ {
+        self.inner
+            .output_notes()
+            .iter()
+            .map(miden_objects::transaction::OutputNote::commitment)
     }
 
     pub fn output_notes(&self) -> impl Iterator<Item = &OutputNote> + '_ {
@@ -111,14 +114,14 @@ impl AuthenticatedTransaction {
         (self.inner.ref_block_num(), self.inner.ref_block_commitment())
     }
 
-    /// Notes which were unauthenticate in the transaction __and__ which were
+    /// Note commitments which were unauthenticated in the transaction __and__ which were
     /// not authenticated by the store inputs.
-    pub fn unauthenticated_notes(&self) -> impl Iterator<Item = NoteId> + '_ {
+    pub fn unauthenticated_note_commitments(&self) -> impl Iterator<Item = Word> + '_ {
         self.inner
             .unauthenticated_notes()
             .copied()
-            .map(|header| header.id())
-            .filter(|note_id| !self.notes_authenticated_by_store.contains(note_id))
+            .map(|header| header.commitment())
+            .filter(|commitment| !self.notes_authenticated_by_store.contains(commitment))
     }
 
     pub fn proven_transaction(&self) -> Arc<ProvenTransaction> {
diff --git a/crates/block-producer/src/errors.rs b/crates/block-producer/src/errors.rs
index 8819b72a5..9d55617a2 100644
--- a/crates/block-producer/src/errors.rs
+++ b/crates/block-producer/src/errors.rs
@@ -2,7 +2,7 @@ use miden_block_prover::ProvenBlockError;
 use miden_node_proto::errors::{ConversionError, GrpcError};
 use miden_objects::account::AccountId;
 use miden_objects::block::BlockNumber;
-use miden_objects::note::{NoteId, Nullifier};
+use miden_objects::note::Nullifier;
 use miden_objects::transaction::TransactionId;
 use miden_objects::{ProposedBatchError, ProposedBlockError, ProvenBatchError, Word};
 use miden_remote_prover_client::RemoteProverClientError;
@@ -44,12 +44,12 @@ pub enum VerifyTxError {
     /// Unauthenticated transaction notes were not found in the store or in outputs of in-flight
     /// transactions
     #[error(
-        "unauthenticated transaction notes were not found in the store or in outputs of in-flight transactions: {0:?}"
+        "unauthenticated transaction note commitments were not found in the store or in outputs of in-flight transactions: {0:?}"
     )]
-    UnauthenticatedNotesNotFound(Vec<NoteId>),
+    UnauthenticatedNotesNotFound(Vec<Word>),
 
-    #[error("output note IDs already used: {0:?}")]
-    OutputNotesAlreadyExist(Vec<NoteId>),
+    #[error("output note commitments already used: {0:?}")]
+    OutputNotesAlreadyExist(Vec<Word>),
 
     /// The account's initial commitment did not match the current account's commitment
     #[error(
@@ -83,12 +83,12 @@ pub enum AddTransactionError {
     InputNotesAlreadyConsumed(Vec<Nullifier>),
 
     #[error(
-        "unauthenticated transaction notes were not found in the store or in outputs of in-flight transactions: {0:?}"
+        "unauthenticated transaction note commitments were not found in the store or in outputs of in-flight transactions: {0:?}"
     )]
-    UnauthenticatedNotesNotFound(Vec<NoteId>),
+    UnauthenticatedNotesNotFound(Vec<Word>),
 
-    #[error("output note IDs already used: {0:?}")]
-    OutputNotesAlreadyExist(Vec<NoteId>),
+    #[error("output note commitments already used: {0:?}")]
+    OutputNotesAlreadyExist(Vec<Word>),
 
     #[error(
         "transaction's initial state commitment {tx_initial_account_commitment} does not match the account's current value of {current_account_commitment}"
@@ -132,11 +132,11 @@ impl From<VerifyTxError> for AddTransactionError {
             VerifyTxError::InputNotesAlreadyConsumed(nullifiers) => {
                 Self::InputNotesAlreadyConsumed(nullifiers)
             },
-            VerifyTxError::UnauthenticatedNotesNotFound(note_ids) => {
-                Self::UnauthenticatedNotesNotFound(note_ids)
+            VerifyTxError::UnauthenticatedNotesNotFound(note_commitments) => {
+                Self::UnauthenticatedNotesNotFound(note_commitments)
             },
-            VerifyTxError::OutputNotesAlreadyExist(note_ids) => {
-                Self::OutputNotesAlreadyExist(note_ids)
+            VerifyTxError::OutputNotesAlreadyExist(note_commitments) => {
+                Self::OutputNotesAlreadyExist(note_commitments)
             },
             VerifyTxError::IncorrectAccountInitialCommitment {
                 tx_initial_account_commitment,
diff --git a/crates/block-producer/src/mempool/mod.rs b/crates/block-producer/src/mempool/mod.rs
index af8ce1c3e..277bf56fb 100644
--- a/crates/block-producer/src/mempool/mod.rs
+++ b/crates/block-producer/src/mempool/mod.rs
@@ -198,11 +198,11 @@ impl Mempool {
         if !double_spend.is_empty() {
             return Err(VerifyTxError::InputNotesAlreadyConsumed(double_spend).into());
         }
-        let duplicates = self.state.output_notes_exist(tx.output_note_ids());
+        let duplicates = self.state.output_notes_exist(tx.output_note_commitments());
         if !duplicates.is_empty() {
             return Err(VerifyTxError::OutputNotesAlreadyExist(duplicates).into());
         }
-        let missing = self.state.output_notes_missing(tx.unauthenticated_notes());
+        let missing = self.state.output_notes_missing(tx.unauthenticated_note_commitments());
         if !missing.is_empty() {
             return Err(VerifyTxError::UnauthenticatedNotesNotFound(missing).into());
         }
diff --git a/crates/block-producer/src/mempool/nodes.rs b/crates/block-producer/src/mempool/nodes.rs
index cdacd3c09..8b9b4ca47 100644
--- a/crates/block-producer/src/mempool/nodes.rs
+++ b/crates/block-producer/src/mempool/nodes.rs
@@ -5,7 +5,7 @@ use miden_objects::Word;
 use miden_objects::account::AccountId;
 use miden_objects::batch::{BatchId, ProvenBatch};
 use miden_objects::block::BlockNumber;
-use miden_objects::note::{NoteHeader, NoteId, Nullifier};
+use miden_objects::note::{NoteHeader, Nullifier};
 use miden_objects::transaction::{InputNoteCommitment, TransactionHeader, TransactionId};
 
 use crate::domain::transaction::AuthenticatedTransaction;
@@ -145,12 +145,12 @@ pub(super) trait Node {
     /// the transactions within them.
     fn nullifiers(&self) -> Box<dyn Iterator<Item = Nullifier> + '_>;
 
-    /// All output notes created by this node, **including** erased notes. This may not be strictly
-    /// necessary but it removes having to worry about reverting batches and blocks with erased
-    /// notes -- since these would otherwise have different state impact than the transactions
-    /// within them.
-    fn output_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_>;
-    fn unauthenticated_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_>;
+    /// All output note commitments created by this node, **including** erased notes. This may not
+    /// be strictly necessary but it removes having to worry about reverting batches and blocks
+    /// with erased notes -- since these would otherwise have different state impact than the
+    /// transactions within them.
+    fn output_note_commitments(&self) -> Box<dyn Iterator<Item = Word> + '_>;
+    fn unauthenticated_note_commitments(&self) -> Box<dyn Iterator<Item = Word> + '_>;
     /// The account state commitment updates caused by this node.
     ///
     /// Output tuple represents each updates `(account ID, initial commitment, final commitment)`.
@@ -163,12 +163,12 @@ impl Node for TransactionNode {
         Box::new(self.0.nullifiers())
     }
 
-    fn output_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
-        Box::new(self.0.output_note_ids())
+    fn output_note_commitments(&self) -> Box<dyn Iterator<Item = Word> + '_> {
+        Box::new(self.0.output_note_commitments())
     }
 
-    fn unauthenticated_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
-        Box::new(self.0.unauthenticated_notes())
+    fn unauthenticated_note_commitments(&self) -> Box<dyn Iterator<Item = Word> + '_> {
+        Box::new(self.0.unauthenticated_note_commitments())
     }
 
     fn account_updates(&self) -> Box<dyn Iterator<Item = (AccountId, Word, Word)> + '_> {
@@ -190,12 +190,12 @@ impl Node for ProposedBatchNode {
         Box::new(self.0.iter().flat_map(|tx| tx.nullifiers()))
     }
 
-    fn output_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
-        Box::new(self.0.iter().flat_map(|tx| tx.output_note_ids()))
+    fn output_note_commitments(&self) -> Box<dyn Iterator<Item = Word> + '_> {
+        Box::new(self.0.iter().flat_map(|tx| tx.output_note_commitments()))
     }
 
-    fn unauthenticated_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
-        Box::new(self.0.iter().flat_map(|tx| tx.unauthenticated_notes()))
+    fn unauthenticated_note_commitments(&self) -> Box<dyn Iterator<Item = Word> + '_> {
+        Box::new(self.0.iter().flat_map(|tx| tx.unauthenticated_note_commitments()))
     }
 
     fn account_updates(&self) -> Box<dyn Iterator<Item = (AccountId, Word, Word)> + '_> {
@@ -222,17 +222,20 @@ impl Node for ProvenBatchNode {
         )
     }
 
-    fn output_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
-        Box::new(self.tx_headers().flat_map(|tx| tx.output_notes().iter().map(NoteHeader::id)))
+    fn output_note_commitments(&self) -> Box<dyn Iterator<Item = Word> + '_> {
+        Box::new(
+            self.tx_headers()
+                .flat_map(|tx| tx.output_notes().iter().map(NoteHeader::commitment)),
+        )
     }
 
-    fn unauthenticated_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+    fn unauthenticated_note_commitments(&self) -> Box<dyn Iterator<Item = Word> + '_> {
         Box::new(
             self.inner
                 .input_notes()
                 .iter()
                 .filter_map(|note| note.header())
-                .map(NoteHeader::id),
+                .map(NoteHeader::commitment),
         )
     }
 
@@ -256,13 +259,20 @@ impl Node for BlockNode {
         Box::new(self.txs.iter().flat_map(|tx| tx.nullifiers()))
     }
 
-    fn output_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
-        Box::new(self.txs.iter().flat_map(|tx| tx.output_note_ids()))
+    fn output_note_commitments(&self) -> Box<dyn Iterator<Item = Word> + '_> {
+        Box::new(
+            self.txs
+                .iter()
+                .flat_map(|tx: &Arc<AuthenticatedTransaction>| tx.output_note_commitments()),
+        )
     }
 
-    fn unauthenticated_notes(&self) -> Box<dyn Iterator<Item = NoteId> + '_> {
+    fn unauthenticated_note_commitments(&self) -> Box<dyn Iterator<Item = Word> + '_> {
         Box::new(self.batches.iter().flat_map(|batch| {
-            batch.input_notes().iter().filter_map(|note| note.header().map(NoteHeader::id))
+            batch
+                .input_notes()
+                .iter()
+                .filter_map(|note| note.header().map(NoteHeader::commitment))
         }))
     }
 
diff --git a/crates/block-producer/src/mempool/state.rs b/crates/block-producer/src/mempool/state.rs
index c5dc52b81..efa32614b 100644
--- a/crates/block-producer/src/mempool/state.rs
+++ b/crates/block-producer/src/mempool/state.rs
@@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet};
 
 use miden_objects::Word;
 use miden_objects::account::AccountId;
-use miden_objects::note::{NoteId, Nullifier};
+use miden_objects::note::Nullifier;
 
 use crate::mempool::nodes::{Node, NodeId};
 
@@ -32,7 +32,7 @@ pub(super) struct InflightState {
     /// All created notes and the ID of the node that created it.
     ///
     /// This _includes_ erased notes, see `nullifiers` for more information.
-    output_notes: HashMap<NoteId, NodeId>,
+    output_notes: HashMap<Word, NodeId>,
 
     /// Maps all unauthenticated notes to the node ID that consumed them.
     ///
@@ -41,7 +41,7 @@ pub(super) struct InflightState {
     ///
     /// It is the callers responsibility to ensure that all unauthenticated notes exist as output
     /// notes at the time when a new transaction or batch node is inserted.
-    unauthenticated_notes: HashMap<NoteId, NodeId>,
+    unauthenticated_notes: HashMap<Word, NodeId>,
 
     /// All inflight account commitment transitions.
     accounts: HashMap<AccountId, AccountUpdates>,
@@ -56,14 +56,19 @@ impl InflightState {
         nullifiers.filter(|nullifier| self.nullifiers.contains(nullifier)).collect()
     }
 
-    /// Returns all output notes which already exist.
-    pub(super) fn output_notes_exist(&self, notes: impl Iterator<Item = NoteId>) -> Vec<NoteId> {
-        notes.filter(|note| self.output_notes.contains_key(note)).collect()
+    /// Returns all output note commitments which already exist.
+    pub(super) fn output_notes_exist(&self, notes: impl Iterator<Item = Word>) -> Vec<Word> {
+        notes
+            .filter(|note_commitment| self.output_notes.contains_key(note_commitment))
+            .collect()
     }
 
     /// Returns all output notes which don't exist.
-    pub(super) fn output_notes_missing(&self, notes: impl Iterator<Item = NoteId>) -> Vec<NoteId> {
-        notes.filter(|note| !self.output_notes.contains_key(note)).collect()
+    pub(super) fn output_notes_missing(
+        &self,
+        note_commitments: impl Iterator<Item = Word>,
+    ) -> Vec<Word> {
+        note_commitments.filter(|note| !self.output_notes.contains_key(note)).collect()
     }
 
     /// The latest account commitment tracked by the inflight state.
@@ -87,14 +92,14 @@ impl InflightState {
             );
         }
 
-        for note in node.output_notes() {
+        for note in node.output_note_commitments() {
             assert!(
                 self.output_notes.remove(&note).is_some(),
                 "Output note {note} was not present for removal"
             );
         }
 
-        for note in node.unauthenticated_notes() {
+        for note in node.unauthenticated_note_commitments() {
             assert!(
                 self.unauthenticated_notes.remove(&note).is_some(),
                 "Unauthenticated note {note} was not present for removal"
@@ -118,9 +123,12 @@ impl InflightState {
     /// parent and child relationship lookups.
     pub(super) fn insert(&mut self, id: NodeId, node: &dyn Node) {
         self.nullifiers.extend(node.nullifiers());
-        self.output_notes.extend(node.output_notes().map(|note| (note, id)));
-        self.unauthenticated_notes
-            .extend(node.unauthenticated_notes().map(|note| (note, id)));
+        self.output_notes
+            .extend(node.output_note_commitments().map(|note_commitment| (note_commitment, id)));
+        self.unauthenticated_notes.extend(
+            node.unauthenticated_note_commitments()
+                .map(|note_commitment| (note_commitment, id)),
+        );
 
         for (account, from, to) in node.account_updates() {
             self.accounts.entry(account).or_default().insert(id, from, to);
@@ -131,8 +139,9 @@ impl InflightState {
     ///
     /// Note that the result is invalidated by mutating the state.
     pub(super) fn parents(&self, id: NodeId, node: &dyn Node) -> HashSet<NodeId> {
-        let note_parents =
-            node.unauthenticated_notes().filter_map(|note| self.output_notes.get(&note));
+        let note_parents = node
+            .unauthenticated_note_commitments()
+            .filter_map(|note| self.output_notes.get(&note));
 
         let account_parents = node
             .account_updates()
@@ -154,8 +163,9 @@ impl InflightState {
     ///
     /// Note that the result is invalidated by mutating the state.
     pub(super) fn children(&self, id: NodeId, node: &dyn Node) -> HashSet<NodeId> {
-        let note_children =
-            node.output_notes().filter_map(|note| self.unauthenticated_notes.get(&note));
+        let note_children = node
+            .output_note_commitments()
+            .filter_map(|note| self.unauthenticated_notes.get(&note));
 
         let account_children = node
             .account_updates()
diff --git a/crates/block-producer/src/store/mod.rs b/crates/block-producer/src/store/mod.rs
index d2a7bf535..df2972a8e 100644
--- a/crates/block-producer/src/store/mod.rs
+++ b/crates/block-producer/src/store/mod.rs
@@ -11,7 +11,7 @@ use miden_node_utils::formatting::format_opt;
 use miden_objects::Word;
 use miden_objects::account::AccountId;
 use miden_objects::block::{BlockHeader, BlockInputs, BlockNumber, ProvenBlock};
-use miden_objects::note::{NoteId, Nullifier};
+use miden_objects::note::Nullifier;
 use miden_objects::transaction::ProvenTransaction;
 use miden_objects::utils::Serializable;
 use tracing::{debug, info, instrument};
@@ -34,10 +34,10 @@ pub struct TransactionInputs {
     ///
     /// We use `NonZeroU32` as the wire format uses 0 to encode none.
     pub nullifiers: HashMap<Nullifier, Option<NonZeroU32>>,
-    /// Unauthenticated notes which are present in the store.
+    /// Unauthenticated note commitments which are present in the store.
     ///
     /// These are notes which were committed _after_ the transaction was created.
-    pub found_unauthenticated_notes: HashSet<NoteId>,
+    pub found_unauthenticated_notes: HashSet<Word>,
     /// The current block height.
     pub current_block_height: BlockNumber,
 }
@@ -97,7 +97,7 @@ impl TryFrom<proto::block_producer_store::TransactionInputs> for TransactionInpu
         let found_unauthenticated_notes = response
             .found_unauthenticated_notes
             .into_iter()
-            .map(|digest| Ok(Word::try_from(digest)?.into()))
+            .map(Word::try_from)
             .collect::<Result<_, ConversionError>>()?;
 
         let current_block_height = response.block_height.into();
@@ -167,7 +167,7 @@ impl StoreClient {
             nullifiers: proven_tx.nullifiers().map(Into::into).collect(),
             unauthenticated_notes: proven_tx
                 .unauthenticated_notes()
-                .map(|note| note.id().into())
+                .map(|note| note.commitment().into())
                 .collect(),
         };
 
@@ -207,7 +207,7 @@ impl StoreClient {
         &self,
         updated_accounts: impl Iterator<Item = AccountId> + Send,
         created_nullifiers: impl Iterator<Item = Nullifier> + Send,
-        unauthenticated_notes: impl Iterator<Item = NoteId> + Send,
+        unauthenticated_notes: impl Iterator<Item = Word> + Send,
         reference_blocks: impl Iterator<Item = BlockNumber> + Send,
     ) -> Result<BlockInputs, StoreError> {
         let request = tonic::Request::new(proto::block_producer_store::BlockInputsRequest {
@@ -228,11 +228,11 @@ impl StoreClient {
     pub async fn get_batch_inputs(
         &self,
         block_references: impl Iterator<Item = (BlockNumber, Word)> + Send,
-        notes: impl Iterator<Item = NoteId> + Send,
+        note_commitments: impl Iterator<Item = Word> + Send,
     ) -> Result<BatchInputs, StoreError> {
         let request = tonic::Request::new(proto::block_producer_store::BatchInputsRequest {
             reference_blocks: block_references.map(|(block_num, _)| block_num.as_u32()).collect(),
-            note_ids: notes.map(proto::primitives::Digest::from).collect(),
+            note_commitments: note_commitments.map(proto::primitives::Digest::from).collect(),
         });
 
         let store_response = self.client.clone().get_batch_inputs(request).await?.into_inner();
diff --git a/crates/proto/src/generated/block_producer_store.rs b/crates/proto/src/generated/block_producer_store.rs
index 42697787d..3603ca50c 100644
--- a/crates/proto/src/generated/block_producer_store.rs
+++ b/crates/proto/src/generated/block_producer_store.rs
@@ -63,9 +63,9 @@ pub mod block_inputs {
 /// Returns the inputs for a transaction batch.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BatchInputsRequest {
-    /// List of unauthenticated notes to be queried from the database.
+    /// List of unauthenticated note commitments to be queried from the database.
     #[prost(message, repeated, tag = "1")]
-    pub note_ids: ::prost::alloc::vec::Vec<super::primitives::Digest>,
+    pub note_commitments: ::prost::alloc::vec::Vec<super::primitives::Digest>,
     /// Set of block numbers referenced by transactions.
     #[prost(fixed32, repeated, tag = "2")]
     pub reference_blocks: ::prost::alloc::vec::Vec<u32>,
@@ -96,7 +96,7 @@ pub struct TransactionInputsRequest {
     /// Set of nullifiers consumed by this transaction.
     #[prost(message, repeated, tag = "2")]
     pub nullifiers: ::prost::alloc::vec::Vec<super::primitives::Digest>,
-    /// Set of unauthenticated notes to check for existence on-chain.
+    /// Set of unauthenticated note commitments to check for existence on-chain.
     ///
     /// These are notes which were not on-chain at the state the transaction was proven,
     /// but could by now be present.
diff --git a/crates/store/src/db/migrations/2025062000000_setup/up.sql b/crates/store/src/db/migrations/2025062000000_setup/up.sql
index 1eb7a9728..7235ad1be 100644
--- a/crates/store/src/db/migrations/2025062000000_setup/up.sql
+++ b/crates/store/src/db/migrations/2025062000000_setup/up.sql
@@ -40,6 +40,7 @@ CREATE TABLE notes (
     batch_index              INTEGER NOT NULL, -- Index of batch in block, starting from 0
     note_index               INTEGER NOT NULL, -- Index of note in batch, starting from 0
     note_id                  BLOB    NOT NULL,
+    note_commitment          BLOB    NOT NULL,
     note_type                INTEGER NOT NULL, -- 1-Public (0b01), 2-Private (0b10), 3-Encrypted (0b11)
     sender                   BLOB    NOT NULL,
     tag                      INTEGER NOT NULL,
@@ -66,6 +67,7 @@ CREATE TABLE notes (
 );
 
 CREATE INDEX idx_notes_note_id ON notes(note_id);
+CREATE INDEX idx_notes_note_commitment ON notes(note_commitment);
 CREATE INDEX idx_notes_sender ON notes(sender, committed_at);
 CREATE INDEX idx_notes_tag ON notes(tag, committed_at);
 CREATE INDEX idx_notes_nullifier ON notes(nullifier);
diff --git a/crates/store/src/db/mod.rs b/crates/store/src/db/mod.rs
index 2e59d9e23..a7701a060 100644
--- a/crates/store/src/db/mod.rs
+++ b/crates/store/src/db/mod.rs
@@ -1,4 +1,4 @@
-use std::collections::{BTreeMap, BTreeSet, HashSet};
+use std::collections::{BTreeMap, BTreeSet};
 use std::ops::RangeInclusive;
 use std::path::PathBuf;
 
@@ -133,6 +133,7 @@ pub struct NoteRecord {
     pub block_num: BlockNumber,
     pub note_index: BlockNoteIndex,
     pub note_id: Word,
+    pub note_commitment: Word,
     pub metadata: NoteMetadata,
     pub details: Option<NoteDetails>,
     pub inclusion_path: SparseMerklePath,
@@ -454,24 +455,29 @@ impl Db {
         .await
     }
 
-    /// Loads inclusion proofs for notes matching the given IDs.
+    /// Loads all the [`NoteRecord`]s matching a certain note commitment from the
+    /// database.
     #[instrument(level = "debug", target = COMPONENT, skip_all, ret(level = "debug"), err)]
-    pub async fn select_note_inclusion_proofs(
+    pub async fn select_notes_by_commitment(
         &self,
-        note_ids: BTreeSet<NoteId>,
-    ) -> Result<BTreeMap<NoteId, NoteInclusionProof>> {
-        self.transact("block note inclusion proofs", move |conn| {
-            models::queries::select_note_inclusion_proofs(conn, &note_ids)
+        note_commitments: Vec<Word>,
+    ) -> Result<Vec<NoteRecord>> {
+        self.transact("note by commitment", move |conn| {
+            queries::select_notes_by_commitment(conn, note_commitments.as_slice())
         })
         .await
     }
 
-    /// Loads all note IDs matching a certain [`NoteId`] from the database.
+    /// Loads inclusion proofs for notes matching the given note commitments.
     #[instrument(level = "debug", target = COMPONENT, skip_all, ret(level = "debug"), err)]
-    pub async fn select_note_ids(&self, note_ids: Vec<NoteId>) -> Result<HashSet<NoteId>> {
-        self.select_notes_by_id(note_ids)
-            .await
-            .map(|notes| notes.into_iter().map(|note| note.note_id.into()).collect())
+    pub async fn select_note_inclusion_proofs(
+        &self,
+        note_commitments: BTreeSet<Word>,
+    ) -> Result<BTreeMap<NoteId, NoteInclusionProof>> {
+        self.transact("block note inclusion proofs by commitment", move |conn| {
+            models::queries::select_note_inclusion_proofs(conn, &note_commitments)
+        })
+        .await
     }
 
     /// Inserts the data of a new block into the DB.
diff --git a/crates/store/src/db/models/queries/notes.rs b/crates/store/src/db/models/queries/notes.rs
index a9416281f..01c981dc1 100644
--- a/crates/store/src/db/models/queries/notes.rs
+++ b/crates/store/src/db/models/queries/notes.rs
@@ -29,7 +29,7 @@ use miden_lib::utils::{Deserializable, Serializable};
 use miden_node_utils::limiter::{
     QueryParamAccountIdLimit,
     QueryParamLimiter,
-    QueryParamNoteIdLimit,
+    QueryParamNoteCommitmentLimit,
     QueryParamNoteTagLimit,
 };
 use miden_objects::account::AccountId;
@@ -217,6 +217,28 @@ pub(crate) fn select_notes_by_id(
     Ok(records)
 }
 
+pub(crate) fn select_notes_by_commitment(
+    conn: &mut SqliteConnection,
+    note_commitments: &[Word],
+) -> Result<Vec<NoteRecord>, DatabaseError> {
+    let note_commitments = serialize_vec(note_commitments.iter());
+    let q = schema::notes::table
+        .left_join(
+            schema::note_scripts::table
+                .on(schema::notes::script_root.eq(schema::note_scripts::script_root.nullable())),
+        )
+        .filter(schema::notes::note_commitment.eq_any(&note_commitments));
+    let raw: Vec<_> = SelectDsl::select(
+        q,
+        (NoteRecordRawRow::as_select(), schema::note_scripts::script.nullable()),
+    )
+    .load::<(NoteRecordRawRow, Option<Vec<u8>>)>(conn)?;
+    let records = vec_raw_try_into::<NoteRecord, NoteRecordWithScriptRawJoined>(
+        raw.into_iter().map(NoteRecordWithScriptRawJoined::from),
+    )?;
+    Ok(records)
+}
+
 /// Select all notes from the DB using the given [`SqliteConnection`].
 ///
 ///
@@ -266,7 +288,7 @@ pub(crate) fn select_all_notes(
     Ok(records)
 }
 
-/// Select note inclusion proofs matching the `NoteId`s.
+/// Select note inclusion proofs matching the note commitments.
 ///
 /// # Parameters
 /// * `note_ids`: Set of note IDs to query
@@ -295,11 +317,11 @@ pub(crate) fn select_all_notes(
 /// ```
 pub(crate) fn select_note_inclusion_proofs(
     conn: &mut SqliteConnection,
-    note_ids: &BTreeSet<NoteId>,
+    note_commitments: &BTreeSet<Word>,
 ) -> Result<BTreeMap<NoteId, NoteInclusionProof>, DatabaseError> {
-    QueryParamNoteIdLimit::check(note_ids.len())?;
+    QueryParamNoteCommitmentLimit::check(note_commitments.len())?;
 
-    let noted_ids_serialized = serialize_vec(note_ids.iter());
+    let note_commitments = serialize_vec(note_commitments.iter());
 
     let raw_notes = SelectDsl::select(
         schema::notes::table,
@@ -311,7 +333,7 @@ pub(crate) fn select_note_inclusion_proofs(
             schema::notes::inclusion_path,
         ),
     )
-    .filter(schema::notes::note_id.eq_any(noted_ids_serialized))
+    .filter(schema::notes::note_commitment.eq_any(note_commitments))
     .order_by(schema::notes::committed_at.asc())
     .load::<(i64, Vec<u8>, i32, i32, Vec<u8>)>(conn)?;
 
@@ -663,6 +685,7 @@ pub struct NoteRecordWithScriptRawJoined {
     // #[diesel(embed)]
     // pub note_index: BlockNoteIndexRaw,
     pub note_id: Vec<u8>,
+    pub note_commitment: Vec<u8>,
 
     pub note_type: i32,
     pub sender: Vec<u8>, // AccountId
@@ -688,6 +711,7 @@ impl From<(NoteRecordRawRow, Option<Vec<u8>>)> for NoteRecordWithScriptRawJoined
             batch_index,
             note_index,
             note_id,
+            note_commitment,
             note_type,
             sender,
             tag,
@@ -703,6 +727,7 @@ impl From<(NoteRecordRawRow, Option<Vec<u8>>)> for NoteRecordWithScriptRawJoined
             batch_index,
             note_index,
             note_id,
+            note_commitment,
             note_type,
             sender,
             tag,
@@ -729,6 +754,7 @@ impl TryInto<NoteRecord> for NoteRecordWithScriptRawJoined {
             note_index,
             // block note index ^^^
             note_id,
+            note_commitment,
 
             note_type,
             sender,
@@ -757,6 +783,7 @@ impl TryInto<NoteRecord> for NoteRecordWithScriptRawJoined {
         let metadata = metadata.try_into()?;
         let committed_at = BlockNumber::from_raw_sql(committed_at)?;
         let note_id = Word::read_from_bytes(&note_id[..])?;
+        let note_commitment = Word::read_from_bytes(&note_commitment[..])?;
         let script = script.map(|script| NoteScript::read_from_bytes(&script[..])).transpose()?;
         let details = if let NoteDetailsRawRow {
             assets: Some(assets),
@@ -781,6 +808,7 @@ impl TryInto<NoteRecord> for NoteRecordWithScriptRawJoined {
             block_num: committed_at,
             note_index,
             note_id,
+            note_commitment,
             metadata,
             details,
             inclusion_path,
@@ -797,6 +825,7 @@ pub struct NoteRecordRawRow {
     pub batch_index: i32,
     pub note_index: i32, // index within batch
     pub note_id: Vec<u8>,
+    pub note_commitment: Vec<u8>,
 
     pub note_type: i32,
     pub sender: Vec<u8>, // AccountId
@@ -921,6 +950,7 @@ pub struct NoteInsertRowInsert {
     pub note_index: i32, // index within batch
 
     pub note_id: Vec<u8>,
+    pub note_commitment: Vec<u8>,
 
     pub note_type: i32,
     pub sender: Vec<u8>, // AccountId
@@ -945,6 +975,7 @@ impl From<(NoteRecord, Option<Nullifier>)> for NoteInsertRowInsert {
             batch_index: idx_to_raw_sql(note.note_index.batch_idx()),
             note_index: idx_to_raw_sql(note.note_index.note_idx_in_batch()),
             note_id: note.note_id.to_bytes(),
+            note_commitment: note.note_commitment.to_bytes(),
             note_type: note_type_to_raw_sql(note.metadata.note_type() as u8),
             sender: note.metadata.sender().to_bytes(),
             tag: note.metadata.tag().to_raw_sql(),
diff --git a/crates/store/src/db/schema.rs b/crates/store/src/db/schema.rs
index 2b81eb52d..9fadd0175 100644
--- a/crates/store/src/db/schema.rs
+++ b/crates/store/src/db/schema.rs
@@ -61,6 +61,7 @@ diesel::table! {
         batch_index -> Integer,
         note_index -> Integer,
         note_id -> Binary,
+        note_commitment -> Binary,
         note_type -> Integer,
         sender -> Binary,
         tag -> Integer,
diff --git a/crates/store/src/db/tests.rs b/crates/store/src/db/tests.rs
index fbe705647..aa8a5617c 100644
--- a/crates/store/src/db/tests.rs
+++ b/crates/store/src/db/tests.rs
@@ -249,6 +249,7 @@ fn sql_select_notes() {
             block_num,
             note_index: BlockNoteIndex::new(0, i.try_into().unwrap()).unwrap(),
             note_id: num_to_word(u64::try_from(i).unwrap()),
+            note_commitment: num_to_word(u64::try_from(i).unwrap()),
             metadata: *new_note.metadata(),
             details: Some(NoteDetails::from(&new_note)),
             inclusion_path: SparseMerklePath::default(),
@@ -298,6 +299,7 @@ fn sql_select_notes_different_execution_hints() {
         block_num,
         note_index: BlockNoteIndex::new(0, 0).unwrap(),
         note_id: num_to_word(0),
+        note_commitment: num_to_word(0),
         metadata: NoteMetadata::new(
             sender,
             NoteType::Public,
@@ -323,6 +325,7 @@ fn sql_select_notes_different_execution_hints() {
         block_num,
         note_index: BlockNoteIndex::new(0, 1).unwrap(),
         note_id: num_to_word(1),
+        note_commitment: num_to_word(1),
         metadata: NoteMetadata::new(
             sender,
             NoteType::Public,
@@ -346,6 +349,7 @@ fn sql_select_notes_different_execution_hints() {
         block_num,
         note_index: BlockNoteIndex::new(0, 2).unwrap(),
         note_id: num_to_word(2),
+        note_commitment: num_to_word(2),
         metadata: NoteMetadata::new(
             sender,
             NoteType::Public,
@@ -388,6 +392,7 @@ fn sql_select_note_script_by_root() {
         block_num,
         note_index: BlockNoteIndex::new(0, 0.try_into().unwrap()).unwrap(),
         note_id: num_to_word(0),
+        note_commitment: num_to_word(0),
         metadata: *new_note.metadata(),
         details: Some(NoteDetails::from(&new_note)),
         inclusion_path: SparseMerklePath::default(),
@@ -468,6 +473,7 @@ fn sql_unconsumed_network_notes() {
                 block_num,
                 note_index: BlockNoteIndex::new(0, i as usize).unwrap(),
                 note_id: num_to_word(i),
+                note_commitment: num_to_word(i),
                 metadata: NoteMetadata::new(
                     account_notes[index].0,
                     NoteType::Public,
@@ -590,6 +596,7 @@ fn sql_unconsumed_network_notes_for_account() {
                 block_num: 0.into(), // Created on same block.
                 note_index: BlockNoteIndex::new(0, i as usize).unwrap(),
                 note_id: num_to_word(i.into()),
+                note_commitment: num_to_word(i.into()),
                 metadata: NoteMetadata::new(
                     account_note.0,
                     NoteType::Public,
@@ -1146,6 +1153,7 @@ fn notes() {
         block_num: block_num_1,
         note_index,
         note_id: new_note.id().into(),
+        note_commitment: new_note.commitment(),
         metadata: NoteMetadata::new(
             sender,
             NoteType::Public,
@@ -1192,6 +1200,7 @@ fn notes() {
         block_num: block_num_2,
         note_index: note.note_index,
         note_id: new_note.id().into(),
+        note_commitment: new_note.commitment(),
         metadata: note.metadata,
         details: None,
         inclusion_path: inclusion_path.clone(),
diff --git a/crates/store/src/server/api.rs b/crates/store/src/server/api.rs
index 87d529bc5..cd7d27cef 100644
--- a/crates/store/src/server/api.rs
+++ b/crates/store/src/server/api.rs
@@ -7,7 +7,7 @@ use miden_node_utils::ErrorReport;
 use miden_objects::Word;
 use miden_objects::account::AccountId;
 use miden_objects::block::BlockNumber;
-use miden_objects::note::{NoteId, Nullifier};
+use miden_objects::note::Nullifier;
 use tonic::{Request, Response, Status};
 use tracing::{info, instrument};
 
@@ -153,11 +153,11 @@ where
 
 #[allow(clippy::result_large_err)]
 #[instrument(level = "debug", target = COMPONENT, skip_all, err)]
-pub fn validate_notes(notes: &[proto::primitives::Digest]) -> Result<Vec<NoteId>, Status> {
+pub fn validate_note_commitments(notes: &[proto::primitives::Digest]) -> Result<Vec<Word>, Status> {
     notes
         .iter()
-        .map(|digest| Ok(Word::try_from(digest)?.into()))
-        .collect::<Result<_, ConversionError>>()
+        .map(Word::try_from)
+        .collect::<Result<Vec<_>, _>>()
         .map_err(|_| invalid_argument("Digest field is not in the modulus range"))
 }
 
diff --git a/crates/store/src/server/block_producer.rs b/crates/store/src/server/block_producer.rs
index 9e4255ab0..57cad0a7a 100644
--- a/crates/store/src/server/block_producer.rs
+++ b/crates/store/src/server/block_producer.rs
@@ -6,7 +6,6 @@ use miden_node_proto::try_convert;
 use miden_node_utils::ErrorReport;
 use miden_objects::Word;
 use miden_objects::block::{BlockNumber, ProvenBlock};
-use miden_objects::note::NoteId;
 use miden_objects::utils::Deserializable;
 use tonic::{Request, Response, Status};
 use tracing::{debug, info, instrument};
@@ -19,7 +18,7 @@ use crate::server::api::{
     read_account_id,
     read_account_ids,
     read_block_numbers,
-    validate_notes,
+    validate_note_commitments,
     validate_nullifiers,
 };
 
@@ -101,12 +100,19 @@ impl block_producer_server::BlockProducer for StoreApi {
         let account_ids = read_account_ids::<Status>(&request.account_ids)?;
         let nullifiers = validate_nullifiers(&request.nullifiers)
             .map_err(|err| conversion_error_to_status(&err))?;
-        let unauthenticated_notes = validate_notes(&request.unauthenticated_notes)?;
+        let unauthenticated_note_commitments =
+            validate_note_commitments(&request.unauthenticated_notes)?;
         let reference_blocks = read_block_numbers(&request.reference_blocks);
-        let unauthenticated_notes = unauthenticated_notes.into_iter().collect();
+        let unauthenticated_note_commitments =
+            unauthenticated_note_commitments.into_iter().collect();
 
         self.state
-            .get_block_inputs(account_ids, nullifiers, unauthenticated_notes, reference_blocks)
+            .get_block_inputs(
+                account_ids,
+                nullifiers,
+                unauthenticated_note_commitments,
+                reference_blocks,
+            )
             .await
             .map(proto::block_producer_store::BlockInputs::from)
             .map(Response::new)
@@ -130,10 +136,9 @@ impl block_producer_server::BlockProducer for StoreApi {
     ) -> Result<Response<proto::block_producer_store::BatchInputs>, Status> {
         let request = request.into_inner();
 
-        let note_ids: Vec<Word> = try_convert(request.note_ids)
+        let note_commitments: Vec<Word> = try_convert(request.note_commitments)
             .collect::<Result<_, _>>()
-            .map_err(|err| Status::invalid_argument(format!("Invalid NoteId: {err}")))?;
-        let note_ids = note_ids.into_iter().map(NoteId::from).collect();
+            .map_err(|err| Status::invalid_argument(format!("Invalid note commitment: {err}")))?;
 
         let reference_blocks: Vec<u32> =
             try_convert::<_, Infallible, _, _>(request.reference_blocks)
@@ -142,7 +147,7 @@ impl block_producer_server::BlockProducer for StoreApi {
         let reference_blocks = reference_blocks.into_iter().map(BlockNumber::from).collect();
 
         self.state
-            .get_batch_inputs(reference_blocks, note_ids)
+            .get_batch_inputs(reference_blocks, note_commitments.into_iter().collect())
             .await
             .map(Into::into)
             .map(Response::new)
@@ -168,11 +173,12 @@ impl block_producer_server::BlockProducer for StoreApi {
         let account_id = read_account_id::<Status>(request.account_id)?;
         let nullifiers = validate_nullifiers(&request.nullifiers)
             .map_err(|err| conversion_error_to_status(&err))?;
-        let unauthenticated_notes = validate_notes(&request.unauthenticated_notes)?;
+        let unauthenticated_note_commitments =
+            validate_note_commitments(&request.unauthenticated_notes)?;
 
         let tx_inputs = self
             .state
-            .get_transaction_inputs(account_id, &nullifiers, unauthenticated_notes)
+            .get_transaction_inputs(account_id, &nullifiers, unauthenticated_note_commitments)
             .await?;
 
         let block_height = self.state.latest_block_num().await.as_u32();
diff --git a/crates/store/src/state.rs b/crates/store/src/state.rs
index 9e398027c..b94e57bdb 100644
--- a/crates/store/src/state.rs
+++ b/crates/store/src/state.rs
@@ -86,7 +86,7 @@ use crate::{AccountTreeWithHistory, COMPONENT, DataDirectory, InMemoryAccountTre
 pub struct TransactionInputs {
     pub account_commitment: Word,
     pub nullifiers: Vec<NullifierInfo>,
-    pub found_unauthenticated_notes: HashSet<NoteId>,
+    pub found_unauthenticated_notes: HashSet<Word>,
     pub new_account_id_prefix_is_unique: Option<bool>,
 }
 
@@ -349,6 +349,7 @@ impl State {
                     block_num,
                     note_index,
                     note_id: note.id().into(),
+                    note_commitment: note.commitment(),
                     metadata: *note.metadata(),
                     details,
                     inclusion_path,
@@ -522,10 +523,10 @@ impl State {
     ///
     /// The function takes as input:
     /// - The tx reference blocks are the set of blocks referenced by transactions in the batch.
-    /// - The unauthenticated note ids are the set of IDs of unauthenticated notes consumed by all
-    ///   transactions in the batch. For these notes, we attempt to find note inclusion proofs. Not
-    ///   all notes will exist in the DB necessarily, as some notes can be created and consumed
-    ///   within the same batch.
+    /// - The unauthenticated note commitments are the set of commitments of unauthenticated notes
+    ///   consumed by all transactions in the batch. For these notes, we attempt to find inclusion
+    ///   proofs. Not all notes will exist in the DB necessarily, as some notes can be created and
+    ///   consumed within the same batch.
     ///
     /// ## Outputs
     ///
@@ -537,7 +538,7 @@ impl State {
     pub async fn get_batch_inputs(
         &self,
         tx_reference_blocks: BTreeSet<BlockNumber>,
-        unauthenticated_note_ids: BTreeSet<NoteId>,
+        unauthenticated_note_commitments: BTreeSet<Word>,
     ) -> Result<BatchInputs, GetBatchInputsError> {
         if tx_reference_blocks.is_empty() {
             return Err(GetBatchInputsError::TransactionBlockReferencesEmpty);
@@ -548,7 +549,7 @@ impl State {
         // each of those blocks is included in the chain.
         let note_proofs = self
             .db
-            .select_note_inclusion_proofs(unauthenticated_note_ids)
+            .select_note_inclusion_proofs(unauthenticated_note_commitments)
             .await
             .map_err(GetBatchInputsError::SelectNoteInclusionProofError)?;
 
@@ -719,7 +720,7 @@ impl State {
         &self,
         account_ids: Vec<AccountId>,
         nullifiers: Vec<Nullifier>,
-        unauthenticated_notes: BTreeSet<NoteId>,
+        unauthenticated_note_commitments: BTreeSet<Word>,
         reference_blocks: BTreeSet<BlockNumber>,
     ) -> Result<BlockInputs, GetBlockInputsError> {
         // Get the note inclusion proofs from the DB.
@@ -727,7 +728,7 @@ impl State {
         // reference blocks of the note proofs to get their authentication paths in the chain MMR.
         let unauthenticated_note_proofs = self
             .db
-            .select_note_inclusion_proofs(unauthenticated_notes)
+            .select_note_inclusion_proofs(unauthenticated_note_commitments)
             .await
             .map_err(GetBlockInputsError::SelectNoteInclusionProofError)?;
 
@@ -859,7 +860,7 @@ impl State {
         &self,
         account_id: AccountId,
         nullifiers: &[Nullifier],
-        unauthenticated_notes: Vec<NoteId>,
+        unauthenticated_note_commitments: Vec<Word>,
     ) -> Result<TransactionInputs, DatabaseError> {
         info!(target: COMPONENT, account_id = %account_id.to_string(), nullifiers = %format_array(nullifiers));
 
@@ -889,8 +890,13 @@ impl State {
             })
             .collect();
 
-        let found_unauthenticated_notes =
-            self.db.select_note_ids(unauthenticated_notes.clone()).await?;
+        let found_unauthenticated_notes = self
+            .db
+            .select_notes_by_commitment(unauthenticated_note_commitments)
+            .await?
+            .into_iter()
+            .map(|note| note.note_commitment)
+            .collect();
 
         Ok(TransactionInputs {
             account_commitment,
diff --git a/crates/utils/src/limiter.rs b/crates/utils/src/limiter.rs
index c7b116fa5..d02499841 100644
--- a/crates/utils/src/limiter.rs
+++ b/crates/utils/src/limiter.rs
@@ -79,6 +79,13 @@ impl QueryParamLimiter for QueryParamNoteIdLimit {
     const LIMIT: usize = 1000;
 }
 
+/// Used for internal queries retrieving note inclusion proofs by commitment.
+pub struct QueryParamNoteCommitmentLimit;
+impl QueryParamLimiter for QueryParamNoteCommitmentLimit {
+    const PARAM_NAME: &str = "note_commitment";
+    const LIMIT: usize = 1000;
+}
+
 /// Only used internally, not exposed via public RPC.
 pub struct QueryParamBlockLimit;
 impl QueryParamLimiter for QueryParamBlockLimit {
diff --git a/docs/external/src/operator/monitoring.md b/docs/external/src/operator/monitoring.md
index 0e67b2999..9e3ba945c 100644
--- a/docs/external/src/operator/monitoring.md
+++ b/docs/external/src/operator/monitoring.md
@@ -57,7 +57,7 @@ block_builder.build_block
 │        ┕━ store.server.get_block_inputs
 │           ┝━ validate_nullifiers
 │           ┝━ read_account_ids
-│           ┝━ validate_notes
+│           ┝━ validate_note_commitments
 │           ┝━ select_block_header_by_block_num
 │           ┝━ select_note_inclusion_proofs
 │           ┕━ select_block_headers
diff --git a/proto/proto/store/block_producer.proto b/proto/proto/store/block_producer.proto
index 3a8a01098..e0218bd0f 100644
--- a/proto/proto/store/block_producer.proto
+++ b/proto/proto/store/block_producer.proto
@@ -91,8 +91,8 @@ message BlockInputs {
 
 // Returns the inputs for a transaction batch.
 message BatchInputsRequest {
-  // List of unauthenticated notes to be queried from the database.
-  repeated primitives.Digest note_ids = 1;
+  // List of unauthenticated note commitments to be queried from the database.
+  repeated primitives.Digest note_commitments = 1;
   // Set of block numbers referenced by transactions.
   repeated fixed32 reference_blocks = 2;
 }
@@ -120,7 +120,7 @@ message TransactionInputsRequest {
     account.AccountId account_id = 1;
     // Set of nullifiers consumed by this transaction.
     repeated primitives.Digest nullifiers = 2;
-    // Set of unauthenticated notes to check for existence on-chain.
+    // Set of unauthenticated note commitments to check for existence on-chain.
     //
     // These are notes which were not on-chain at the state the transaction was proven,
     // but could by now be present.

From 015b18c66d67e2373711010105a9737d0639e3ee Mon Sep 17 00:00:00 2001
From: Bobbin Threadbare <bobbinth@protonmail.com>
Date: Thu, 6 Nov 2025 20:47:15 -0800
Subject: [PATCH 78/78] chore: update changelog

---
 CHANGELOG.md | 14 ++++++------
 Cargo.lock   | 64 ++++++++++++++++++++++++++--------------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51a764191..9b69fc26f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,27 +1,27 @@
 # Changelog
 
-## v0.12.0 (TBD)
+## v0.12.0 (2025-11-06)
 
 ### Changes
 
 - [BREAKING] Updated MSRV to 1.90.
-- Added `GetNoteScriptByRoot` gRPC endpoint for retrieving a note script by its root ([#1196](https://github.com/0xMiden/miden-node/pull/1196)).
 - [BREAKING] Refactored `CheckNullifiersByPrefix` endpoint adding pagination ([#1191](https://github.com/0xMiden/miden-node/pull/1191)).
 - [BREAKING] Renamed `CheckNullifiersByPrefix` endpoint to `SyncNullifiers` ([#1191](https://github.com/0xMiden/miden-node/pull/1191)).
+- Added `GetNoteScriptByRoot` gRPC endpoint for retrieving a note script by its root ([#1196](https://github.com/0xMiden/miden-node/pull/1196)).
 - [BREAKING] Added `block_range` and `pagination_info` fields to paginated gRPC endpoints ([#1205](https://github.com/0xMiden/miden-node/pull/1205)).
-- Use `tonic` error codes for gRPC errors ([#1208](https://github.com/0xMiden/miden-node/pull/1208)).
+- Implemented usage of `tonic` error codes for gRPC errors ([#1208](https://github.com/0xMiden/miden-node/pull/1208)).
 - [BREAKING] Replaced `GetAccountProofs` with `GetAccountProof` in the public store API (#[1211](https://github.com/0xMiden/miden-node/pull/1211)).
-- [BREAKING] Refactored the mempool to use a single DAG across transactions and batches ([#1234](https://github.com/0xMiden/miden-node/pull/1234)).
 - Implemented storage map `DataStore` function ([#1226](https://github.com/0xMiden/miden-node/pull/1226)).
+- [BREAKING] Refactored the mempool to use a single DAG across transactions and batches ([#1234](https://github.com/0xMiden/miden-node/pull/1234)).
 - [BREAKING] Renamed `RemoteProverProxy` to `RemoteProverClient` ([#1236](https://github.com/0xMiden/miden-node/pull/1236)).
 - Added pagination to `SyncNotes` endpoint ([#1257](https://github.com/0xMiden/miden-node/pull/1257)).
 - Added application level error in gRPC endpoints ([#1266](https://github.com/0xMiden/miden-node/pull/1266)).
-- [BREAKING] Response type nuances of `GetAccountProof` in the public store API (#[1277](https://github.com/0xMiden/miden-node/pull/1277)).
 - Added `deploy-account` command to `miden-network-monitor` binary ([#1276](https://github.com/0xMiden/miden-node/pull/1276)).
-- Add `validator` crate with initial protobuf, gRPC server, and sub-command (#[1293](https://github.com/0xMiden/miden-node/pull/1293)).
+- [BREAKING] Response type nuances of `GetAccountProof` in the public store API (#[1277](https://github.com/0xMiden/miden-node/pull/1277)).
 - Add optional `TransactionInputs` field to `SubmitProvenTransaction` endpoint for transaction re-execution (#[1278](https://github.com/0xMiden/miden-node/pull/1278)).
-- Implement `DataStore::get_note_script()` for `NtxDataStore` (#[1332](https://github.com/0xMiden/miden-node/pull/1332)).
+- Added `validator` crate with initial protobuf, gRPC server, and sub-command (#[1293](https://github.com/0xMiden/miden-node/pull/1293)).
 - [BREAKING] Added `AccountTreeWithHistory` and integrate historical queries into `GetAccountProof` ([#1292](https://github.com/0xMiden/miden-node/pull/1292)).
+- Implement `DataStore::get_note_script()` for `NtxDataStore` (#[1332](https://github.com/0xMiden/miden-node/pull/1332)).
 - Started validating notes by their commitment instead of ID before entering the mempool ([#1338](https://github.com/0xMiden/miden-node/pull/1338)).
 
 ## v0.11.3 (2025-11-04)
diff --git a/Cargo.lock b/Cargo.lock
index 4b3fa0ca2..89a0636ca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2432,9 +2432,9 @@ dependencies = [
 
 [[package]]
 name = "miden-air"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02cfe0ccecbd2e7a8a2cd97544d4cef438cb495e84e1a5769371dc822ff67268"
+checksum = "06acfd2ddc25b68f9d23d2add3f15c0ec3f9890ce6418409d71bea9dc6590bd0"
 dependencies = [
  "miden-core",
  "miden-utils-indexing",
@@ -2445,9 +2445,9 @@ dependencies = [
 
 [[package]]
 name = "miden-assembly"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95978901bbe5cfc5632a85776d122ae3376a0728e5a4b4211c478d0a87c9e715"
+checksum = "d1219b9e48bb286b58a23bb65cf74baa1b24ddbcb462ca625b38186674571047"
 dependencies = [
  "log",
  "miden-assembly-syntax",
@@ -2459,9 +2459,9 @@ dependencies = [
 
 [[package]]
 name = "miden-assembly-syntax"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6e4ae33c9801102e32e04d51917333b0576d245e996f5ff43b0e2820f156876"
+checksum = "1eeaef2853061c54527bb2664c0c832ce3d1f80847c79512455fec3b93057f2a"
 dependencies = [
  "aho-corasick",
  "lalrpop",
@@ -2492,9 +2492,9 @@ dependencies = [
 
 [[package]]
 name = "miden-core"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a8fd613e996b6d818a973ca40c484787848f14bea0a0c7aa1158ba9b26c2"
+checksum = "452a00429d05c416001ec0578291eb88e115cf94fc22b3308267abfdcd813440"
 dependencies = [
  "enum_dispatch",
  "miden-crypto",
@@ -2552,9 +2552,9 @@ dependencies = [
 
 [[package]]
 name = "miden-debug-types"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b37453feb8f4392af5eef29a11ac099b76cbcc47ffc034944a573d06a1cc1e"
+checksum = "97eed62ac0ca7420e49148fd306c74786b23a8d31df6da6277c671ba3e5c619a"
 dependencies = [
  "memchr",
  "miden-crypto",
@@ -2598,9 +2598,9 @@ dependencies = [
 
 [[package]]
 name = "miden-mast-package"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb106cd425958cb2f6fab03741d4d8905b31dca48c0942dfd61adfe6970c695f"
+checksum = "1d13e6ba2b357551598f13396ed52f8f21aa99979aa3b338bb5521feeda19c8a"
 dependencies = [
  "derive_more",
  "miden-assembly-syntax",
@@ -2965,9 +2965,9 @@ dependencies = [
 
 [[package]]
 name = "miden-processor"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97fbbc6911627d1fd25ad6f598a7ccd79721e9c89c4890a105f0a906ea3baf7"
+checksum = "d2ef77929651b8755965cde8f589bd38e2345a619d54cab6427f91aa23c47f6a"
 dependencies = [
  "itertools 0.14.0",
  "miden-air",
@@ -2985,9 +2985,9 @@ dependencies = [
 
 [[package]]
 name = "miden-prover"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e07a8cb521312c8454544453b212b6dee3e7a983467f18ef8e296754ed7fe79"
+checksum = "84c30a5d10baeec17b9336de8544cb7f9b96b32de757c4cfb8d95ee0521bb5cd"
 dependencies = [
  "miden-air",
  "miden-debug-types",
@@ -3063,9 +3063,9 @@ dependencies = [
 
 [[package]]
 name = "miden-stdlib"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79bafb0b8715b8323eecef2b118a1dfa7112cc6cc247df742ccb8f8026c4da37"
+checksum = "5e90a5de45a1e6213ff17b66fff8accde0bbc64264e2c22bbcb9a895f8f3b767"
 dependencies = [
  "env_logger",
  "fs-err",
@@ -3125,9 +3125,9 @@ dependencies = [
 
 [[package]]
 name = "miden-utils-diagnostics"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7d2d3d0909fa09ba58c6965f0dfafefeb299822dc417893786c119211cac89c"
+checksum = "1a3ff4c019d96539a7066626efb4dce5c9fb7b0e44e961b0c2571e78f34236d5"
 dependencies = [
  "miden-crypto",
  "miden-debug-types",
@@ -3138,18 +3138,18 @@ dependencies = [
 
 [[package]]
 name = "miden-utils-indexing"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f35669a21d99c0d5f96720ba80205438f5e63a4132dfa4d1089bc95efce7760"
+checksum = "c798250bee4e856d4f18c161e91cdcbef1906f6614d00cf0063b47031c0f8cc6"
 dependencies = [
  "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "miden-utils-sync"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d9f2e82680ceff6618373c61d5947eda6eaf95f3503cf8310d3fb12a1dbdf9f"
+checksum = "feebe7d896c013ea74dbc98de978836606356a044d4ed3b61ded54d3b319d89f"
 dependencies = [
  "lock_api",
  "loom",
@@ -3158,9 +3158,9 @@ dependencies = [
 
 [[package]]
 name = "miden-verifier"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7e25b94000d5eaa24375c1c0a6fb49e1f349a35b59f51717359f06bc56fe14f"
+checksum = "b8f8e47b78bba1fe1b31faee8f12aafd95385f6d6a8b108b03e92f5d743bb29f"
 dependencies = [
  "miden-air",
  "miden-core",
@@ -3171,9 +3171,9 @@ dependencies = [
 
 [[package]]
 name = "midenc-hir-type"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7798671ffbf6596de00619a9abaec67dc26965b891328c9d65c4cb6007597d50"
+checksum = "9d4cfab04baffdda3fb9eafa5f873604059b89a1699aa95e4f1057397a69f0b5"
 dependencies = [
  "miden-formatting",
  "smallvec",
@@ -4326,9 +4326,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
 dependencies = [
  "proc-macro2",
 ]
@@ -5967,9 +5967,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "trybuild"
-version = "1.0.113"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "559b6a626c0815c942ac98d434746138b4f89ddd6a1b8cbb168c6845fb3376c5"
+checksum = "3e17e807bff86d2a06b52bca4276746584a78375055b6e45843925ce2802b335"
 dependencies = [
  "dissimilar",
  "glob",