Merge branch 'next' into sergerad-readiness-endpoint

Author: Mirko-von-Leipzig

CHANGELOG.md

@@ -2,7 +2,12 @@
 
 ## Unreleased
 
+- Improved `GetAccount` performance if number of vault assets exceeds the limit. ([#2227](https://github.com/0xMiden/node/pull/2227)).
+
+## v0.15.0-rc.4 (2026-06-09)
+
 - Fixed missing certificates in the Docker runtime image ([#2221](https://github.com/0xMiden/node/pull/2221)).
+- Accept header is now forwarded to the upstream on full nodes ([#2225](https://github.com/0xMiden/node/pull/2225)).
 
 ## v0.15.0-rc.3 (2026-06-08)
 

Cargo.lock

@@ -33,7 +33,7 @@ license      = "MIT"
 readme       = "README.md"
 repository   = "https://github.com/0xMiden/node"
 rust-version = "1.93"
-version      = "0.15.0-rc.3"
+version      = "0.15.0-rc.4"
 
 # Optimize the cryptography for faster tests involving account creation.
 [profile.test.package.miden-crypto]
@@ -44,20 +44,20 @@ debug = true
 
 [workspace.dependencies]
 # Workspace crates.
-miden-large-smt-backend-rocksdb = { path = "crates/large-smt-backend-rocksdb", version = "0.15.0-rc.3" }
-miden-node-block-producer       = { path = "crates/block-producer", version = "0.15.0-rc.3" }
-miden-node-db                   = { path = "crates/db", version = "0.15.0-rc.3" }
-miden-node-grpc-error-macro     = { path = "crates/grpc-error-macro", version = "0.15.0-rc.3" }
-miden-node-proto                = { path = "crates/proto", version = "0.15.0-rc.3" }
-miden-node-proto-build          = { path = "proto", version = "0.15.0-rc.3" }
-miden-node-rpc                  = { path = "crates/rpc", version = "0.15.0-rc.3" }
-miden-node-store                = { path = "crates/store", version = "0.15.0-rc.3" }
+miden-large-smt-backend-rocksdb = { path = "crates/large-smt-backend-rocksdb", version = "0.15.0-rc.4" }
+miden-node-block-producer       = { path = "crates/block-producer", version = "0.15.0-rc.4" }
+miden-node-db                   = { path = "crates/db", version = "0.15.0-rc.4" }
+miden-node-grpc-error-macro     = { path = "crates/grpc-error-macro", version = "0.15.0-rc.4" }
+miden-node-proto                = { path = "crates/proto", version = "0.15.0-rc.4" }
+miden-node-proto-build          = { path = "proto", version = "0.15.0-rc.4" }
+miden-node-rpc                  = { path = "crates/rpc", version = "0.15.0-rc.4" }
+miden-node-store                = { path = "crates/store", version = "0.15.0-rc.4" }
 miden-node-test-macro           = { path = "crates/test-macro" }
-miden-node-utils                = { path = "crates/utils", version = "0.15.0-rc.3" }
-miden-remote-prover-client      = { path = "crates/remote-prover-client", version = "0.15.0-rc.3" }
+miden-node-utils                = { path = "crates/utils", version = "0.15.0-rc.4" }
+miden-remote-prover-client      = { path = "crates/remote-prover-client", version = "0.15.0-rc.4" }
 # Temporary workaround until <https://github.com/rust-rocksdb/rust-rocksdb/pull/1029>
 # is part of `rocksdb-rust` release
-miden-node-rocksdb-cxx-linkage-fix = { path = "crates/rocksdb-cxx-linkage-fix", version = "0.15.0-rc.3" }
+miden-node-rocksdb-cxx-linkage-fix = { path = "crates/rocksdb-cxx-linkage-fix", version = "0.15.0-rc.4" }
 
 # miden-protocol dependencies. These should be updated in sync.
 # Requires the v0.15.2 patch release, which carries the network-account tx-script

Cargo.toml

@@ -108,7 +108,9 @@ impl tonic::service::Interceptor for Interceptor {
             request = otel.call(request)?;
         }
 
-        request.metadata_mut().insert(ACCEPT.as_str(), self.accept.clone());
+        if request.metadata().get(ACCEPT.as_str()).is_none() {
+            request.metadata_mut().insert(ACCEPT.as_str(), self.accept.clone());
+        }
 
         if let Some(value) = &self.auth_header_value {
             request.metadata_mut().insert(Self::NETWORK_TX_AUTH_HEADER_NAME, value.clone());
@@ -118,6 +120,38 @@ impl tonic::service::Interceptor for Interceptor {
     }
 }
 
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn interceptor_preserves_existing_accept_metadata() {
+        let original_accept =
+            AsciiMetadataValue::from_static("application/vnd.miden; version=1.2; genesis=0x1234");
+        let mut request = Request::new(());
+        request.metadata_mut().insert(ACCEPT.as_str(), original_accept.clone());
+
+        let mut interceptor = Interceptor::new(false, Some("9.9"), Some("0xabcd"), None);
+        let request = tonic::service::Interceptor::call(&mut interceptor, request)
+            .expect("interceptor should succeed");
+
+        assert_eq!(request.metadata().get(ACCEPT.as_str()), Some(&original_accept));
+    }
+
+    #[test]
+    fn interceptor_inserts_accept_metadata_when_missing() {
+        let mut interceptor = Interceptor::new(false, Some("9.9"), Some("0xabcd"), None);
+
+        let request = tonic::service::Interceptor::call(&mut interceptor, Request::new(()))
+            .expect("interceptor should succeed");
+
+        assert_eq!(
+            request.metadata().get(ACCEPT.as_str()).and_then(|value| value.to_str().ok()),
+            Some("application/vnd.miden; version=9.9, genesis=0xabcd"),
+        );
+    }
+}
+
 // TYPE ALIASES TO AID LEGIBILITY
 // ================================================================================================
 

crates/proto/src/clients/mod.rs

@@ -13,7 +13,7 @@ use miden_protocol::account::{
     StorageSlotName,
     StorageSlotType,
 };
-use miden_protocol::asset::{Asset, AssetVault};
+use miden_protocol::asset::Asset;
 use miden_protocol::block::BlockNumber;
 use miden_protocol::block::account_tree::AccountWitness;
 use miden_protocol::crypto::merkle::SparseMerklePath;
@@ -367,14 +367,6 @@ impl AccountVaultDetails {
     /// more assets will have `LimitExceeded` variant.
     pub const MAX_RETURN_ENTRIES: usize = 1000;
 
-    pub fn new(vault: &AssetVault) -> Self {
-        if vault.assets().nth(Self::MAX_RETURN_ENTRIES).is_some() {
-            Self::LimitExceeded
-        } else {
-            Self::Assets(Vec::from_iter(vault.assets()))
-        }
-    }
-
     pub fn empty() -> Self {
         Self::Assets(Vec::new())
     }
@@ -706,7 +698,9 @@ fn storage_slot_type_from_raw(slot_type: u32) -> Result<StorageSlotType, Convers
     Ok(match slot_type {
         0 => StorageSlotType::Value,
         1 => StorageSlotType::Map,
-        _ => return Err(ConversionError::message("enum variant discriminant out of range")),
+        _ => {
+            return Err(ConversionError::message("enum variant discriminant out of range"));
+        },
     })
 }
 

crates/proto/src/domain/account.rs

@@ -5,6 +5,7 @@ use std::task::{Context as TaskContext, Poll};
 use std::time::Duration;
 
 use anyhow::Context as AnyhowContext;
+use http::header::ACCEPT;
 use miden_node_block_producer::{BlockProducerStatus, MempoolStats as BlockProducerMempoolStats};
 use miden_node_proto::clients::NtxBuilderClient;
 use miden_node_proto::decode::{
@@ -723,6 +724,7 @@ impl api_server::Api for RpcService {
         debug!(target: COMPONENT, request = ?request.get_ref());
 
         let is_authorized_network_tx = self.is_authorized_network_tx(request.metadata());
+        let original_accept = request.metadata().get(ACCEPT.as_str()).cloned();
 
         let request = request.into_inner();
 
@@ -799,7 +801,11 @@ impl api_server::Api for RpcService {
                 (block_producer.as_ref(), validator.as_ref())
             },
             RpcMode::FullNode { source_rpc, .. } => {
-                return source_rpc.as_ref().clone().submit_proven_tx(request).await;
+                let mut forwarded_request = Request::new(request);
+                if let Some(accept) = original_accept {
+                    forwarded_request.metadata_mut().insert(ACCEPT.as_str(), accept);
+                }
+                return source_rpc.as_ref().clone().submit_proven_tx(forwarded_request).await;
             },
         };
 
@@ -826,6 +832,7 @@ impl api_server::Api for RpcService {
         request: tonic::Request<proto::transaction::TransactionBatch>,
     ) -> Result<tonic::Response<proto::blockchain::BlockNumber>, Status> {
         let is_authorized_network_tx = self.is_authorized_network_tx(request.metadata());
+        let original_accept = request.metadata().get(ACCEPT.as_str()).cloned();
         let request = request.into_inner();
 
         let proven_batch = ProvenBatch::read_from_bytes(&request.batch_proof).map_err(|err| {
@@ -916,7 +923,11 @@ impl api_server::Api for RpcService {
                 (block_producer.as_ref(), validator.as_ref())
             },
             RpcMode::FullNode { source_rpc, .. } => {
-                return source_rpc.as_ref().clone().submit_proven_tx_batch(request).await;
+                let mut forwarded_request = Request::new(request);
+                if let Some(accept) = original_accept {
+                    forwarded_request.metadata_mut().insert(ACCEPT.as_str(), accept);
+                }
+                return source_rpc.as_ref().clone().submit_proven_tx_batch(forwarded_request).await;
             },
         };