Full refactor of blob to share

Author: andrussal

clients/common-http-client/src/lib.rs

@@ -1,14 +1,14 @@
 use std::{fmt::Debug, sync::Arc};
 
-use nomos_core::da::blob::Blob;
-use nomos_da_messages::http::da::{DABlobCommitmentsRequest, DaSamplingRequest};
+use nomos_core::da::blob::Share;
+use nomos_da_messages::http::da::{DASharesCommitmentsRequest, DaSamplingRequest};
 use reqwest::{Client, ClientBuilder, RequestBuilder, StatusCode, Url};
 use serde::{de::DeserializeOwned, Serialize};
 
 // These could be moved into shared location, perhaps to upcoming `nomos-lib`
-const DA_GET_SHARED_COMMITMENTS: &str = "/da/sampling/commitments";
+const DA_GET_SHARES_COMMITMENTS: &str = "/da/sampling/commitments";
 
-const DA_GET_LIGHT_BLOB: &str = "/da/sampling/blob";
+const DA_GET_LIGHT_SHARE: &str = "/da/sampling/share";
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -96,37 +96,34 @@ impl CommonHttpClient {
     }
 
     /// Get the commitments for a Blob
-    pub async fn get_commitments<B>(
+    pub async fn get_commitments<S>(
         &self,
-        blob_id: B::BlobId,
-    ) -> Result<Option<B::SharedCommitments>, Error>
+        blob_id: S::BlobId,
+    ) -> Result<Option<S::SharesCommitments>, Error>
     where
-        B: Blob,
-        B::SharedCommitments: DeserializeOwned + Send + Sync,
-        <B as Blob>::BlobId: serde::Serialize + Send + Sync,
+        S: Share,
+        S::SharesCommitments: DeserializeOwned + Send + Sync,
+        <S as Share>::BlobId: serde::Serialize + Send + Sync,
     {
-        let request: DABlobCommitmentsRequest<B> = DABlobCommitmentsRequest { blob_id };
-        let path = DA_GET_SHARED_COMMITMENTS.trim_start_matches('/');
+        let request: DASharesCommitmentsRequest<S> = DASharesCommitmentsRequest { blob_id };
+        let path = DA_GET_SHARES_COMMITMENTS.trim_start_matches('/');
         self.get(path, &request).await
     }
 
     /// Get blob by blob id and column index
-    pub async fn get_blob<B, C>(
+    pub async fn get_share<S, C>(
         &self,
-        blob_id: B::BlobId,
-        column_idx: B::ColumnIndex,
+        blob_id: S::BlobId,
+        share_idx: S::ShareIndex,
     ) -> Result<Option<C>, Error>
     where
         C: DeserializeOwned + Send + Sync,
-        B: Blob + DeserializeOwned + Send + Sync,
-        <B as Blob>::BlobId: serde::Serialize + Send + Sync,
-        <B as Blob>::ColumnIndex: serde::Serialize + Send + Sync,
+        S: Share + DeserializeOwned + Send + Sync,
+        <S as Share>::BlobId: serde::Serialize + Send + Sync,
+        <S as Share>::ShareIndex: serde::Serialize + Send + Sync,
     {
-        let request: DaSamplingRequest<B> = DaSamplingRequest {
-            blob_id,
-            share_idx: column_idx,
-        };
-        let path = DA_GET_LIGHT_BLOB.trim_start_matches('/');
+        let request: DaSamplingRequest<S> = DaSamplingRequest { blob_id, share_idx };
+        let path = DA_GET_LIGHT_SHARE.trim_start_matches('/');
         self.get(path, &request).await
     }
 }

clients/executor-http-client/src/lib.rs

@@ -1,6 +1,6 @@
 pub use common_http_client::BasicAuthCredentials;
 use common_http_client::{CommonHttpClient, Error};
-use nomos_core::da::blob::Blob;
+use nomos_core::da::blob::Share;
 use nomos_executor::api::{handlers::DispersalRequest, paths};
 use reqwest::Url;
 use serde::{de::DeserializeOwned, Serialize};
@@ -45,30 +45,30 @@ impl ExecutorHttpClient {
     }
 
     /// Get the commitments for a specific `BlobId`
-    pub async fn get_commitments<B>(
+    pub async fn get_commitments<S>(
         &self,
-        blob_id: B::BlobId,
-    ) -> Result<Option<B::SharedCommitments>, Error>
+        blob_id: S::BlobId,
+    ) -> Result<Option<S::SharesCommitments>, Error>
     where
-        B: Blob + Send,
-        <B as Blob>::BlobId: Serialize + Send + Sync,
-        <B as Blob>::SharedCommitments: DeserializeOwned + Send + Sync,
+        S: Share + Send,
+        <S as Share>::BlobId: Serialize + Send + Sync,
+        <S as Share>::SharesCommitments: DeserializeOwned + Send + Sync,
     {
-        self.client.get_commitments::<B>(blob_id).await
+        self.client.get_commitments::<S>(blob_id).await
     }
 
-    /// Get blob by blob id and column index
-    pub async fn get_blob<B, C>(
+    /// Get share by blob id and share index
+    pub async fn get_share<S, C>(
         &self,
-        blob_id: B::BlobId,
-        column_idx: B::ColumnIndex,
+        blob_id: S::BlobId,
+        share_idx: S::ShareIndex,
     ) -> Result<Option<C>, Error>
     where
         C: DeserializeOwned + Send + Sync,
-        B: Blob + DeserializeOwned + Send + Sync,
-        <B as Blob>::BlobId: serde::Serialize + Send + Sync,
-        <B as Blob>::ColumnIndex: serde::Serialize + Send + Sync,
+        S: Share + DeserializeOwned + Send + Sync,
+        <S as Share>::BlobId: serde::Serialize + Send + Sync,
+        <S as Share>::ShareIndex: serde::Serialize + Send + Sync,
     {
-        self.client.get_blob::<B, C>(blob_id, column_idx).await
+        self.client.get_share::<S, C>(blob_id, share_idx).await
     }
 }

nodes/nomos-executor/src/api/backend.rs

@@ -5,7 +5,7 @@ use hyper::header::{CONTENT_TYPE, USER_AGENT};
 use nomos_api::Backend;
 use nomos_core::{
     da::{
-        blob::{info::DispersedBlobInfo, metadata, Blob},
+        blob::{info::DispersedBlobInfo, metadata, Share},
         DaVerifier as CoreDaVerifier,
     },
     header::HeaderId,
@@ -18,8 +18,8 @@ use nomos_da_verifier::backend::VerifierBackend;
 use nomos_libp2p::PeerId;
 use nomos_mempool::{tx::service::openapi::Status, MempoolMetrics};
 use nomos_node::api::handlers::{
-    add_blob, add_blob_info, add_tx, block, cl_metrics, cl_status, cryptarchia_headers,
-    cryptarchia_info, da_get_commitments, da_get_light_blob, get_range, libp2p_info,
+    add_blob_info, add_share, add_tx, block, cl_metrics, cl_status, cryptarchia_headers,
+    cryptarchia_info, da_get_commitments, da_get_light_share, get_range, libp2p_info,
 };
 use nomos_storage::backends::StorageSerde;
 use overwatch::overwatch::handle::OverwatchHandle;
@@ -47,7 +47,7 @@ pub struct AxumBackendSettings {
 
 pub struct AxumBackend<
     DaAttestation,
-    DaBlob,
+    DaShare,
     DaBlobInfo,
     Memebership,
     DaVerifiedBlobInfo,
@@ -73,7 +73,7 @@ pub struct AxumBackend<
     #[expect(clippy::type_complexity)]
     _phantom: core::marker::PhantomData<(
         DaAttestation,
-        DaBlob,
+        DaShare,
         DaBlobInfo,
         Memebership,
         DaVerifiedBlobInfo,
@@ -111,7 +111,7 @@ struct ApiDoc;
 #[async_trait::async_trait]
 impl<
         DaAttestation,
-        DaBlob,
+        DaShare,
         DaBlobInfo,
         Membership,
         DaVerifiedBlobInfo,
@@ -134,7 +134,7 @@ impl<
     > Backend
     for AxumBackend<
         DaAttestation,
-        DaBlob,
+        DaShare,
         DaBlobInfo,
         Membership,
         DaVerifiedBlobInfo,
@@ -157,12 +157,12 @@ impl<
     >
 where
     DaAttestation: Serialize + DeserializeOwned + Clone + Send + Sync + 'static,
-    DaBlob: Blob + Serialize + DeserializeOwned + Clone + Send + Sync + 'static,
-    <DaBlob as Blob>::BlobId:
+    DaShare: Share + Serialize + DeserializeOwned + Clone + Send + Sync + 'static,
+    <DaShare as Share>::BlobId:
         AsRef<[u8]> + Clone + Serialize + DeserializeOwned + Send + Sync + 'static,
-    <DaBlob as Blob>::ColumnIndex: AsRef<[u8]> + DeserializeOwned + Send + Sync + 'static,
-    <DaBlob as Blob>::LightBlob: Serialize + DeserializeOwned + Clone + Send + Sync + 'static,
-    <DaBlob as Blob>::SharedCommitments:
+    <DaShare as Share>::ShareIndex: AsRef<[u8]> + DeserializeOwned + Send + Sync + 'static,
+    <DaShare as Share>::LightShare: Serialize + DeserializeOwned + Clone + Send + Sync + 'static,
+    <DaShare as Share>::SharesCommitments:
         Serialize + DeserializeOwned + Clone + Send + Sync + 'static,
     DaBlobInfo: DispersedBlobInfo<BlobId = [u8; 32]>
         + Clone
@@ -196,7 +196,7 @@ where
         AsRef<[u8]> + Clone + Serialize + DeserializeOwned + Send + Sync,
     <DaVerifiedBlobInfo as metadata::Metadata>::Index:
         AsRef<[u8]> + Clone + Serialize + DeserializeOwned + PartialOrd + Send + Sync,
-    DaVerifierBackend: VerifierBackend + CoreDaVerifier<DaBlob = DaBlob> + Send + Sync + 'static,
+    DaVerifierBackend: VerifierBackend + CoreDaVerifier<DaShare = DaShare> + Send + Sync + 'static,
     <DaVerifierBackend as VerifierBackend>::Settings: Clone,
     <DaVerifierBackend as CoreDaVerifier>::Error: Error,
     DaVerifierNetwork: nomos_da_verifier::network::NetworkAdapter + Send + Sync + 'static,
@@ -238,7 +238,7 @@ where
         > + Send
         + 'static,
     SamplingBackend::Settings: Clone,
-    SamplingBackend::Blob: Debug + 'static,
+    SamplingBackend::Share: Debug + 'static,
     SamplingBackend::BlobId: Debug + 'static,
     SamplingNetworkAdapter: nomos_da_sampling::network::NetworkAdapter + Send + 'static,
     SamplingStorage: nomos_da_sampling::storage::DaStorageAdapter + Send + 'static,
@@ -324,11 +324,11 @@ where
                 ),
             )
             .route(
-                paths::DA_ADD_BLOB,
+                paths::DA_ADD_SHARE,
                 routing::post(
-                    add_blob::<
+                    add_share::<
                         DaAttestation,
-                        DaBlob,
+                        DaShare,
                         Membership,
                         DaVerifierBackend,
                         DaStorageSerializer,
@@ -391,12 +391,12 @@ where
                 ),
             )
             .route(
-                paths::DA_GET_SHARED_COMMITMENTS,
-                routing::get(da_get_commitments::<DaStorageSerializer, DaBlob>),
+                paths::DA_GET_SHARES_COMMITMENTS,
+                routing::get(da_get_commitments::<DaStorageSerializer, DaShare>),
             )
             .route(
-                paths::DA_GET_LIGHT_BLOB,
-                routing::get(da_get_light_blob::<DaStorageSerializer, DaBlob>),
+                paths::DA_GET_LIGHT_SHARE,
+                routing::get(da_get_light_share::<DaStorageSerializer, DaShare>),
             )
             .with_state(handle);
 

nodes/nomos-executor/src/lib.rs

@@ -2,12 +2,13 @@ pub mod api;
 pub mod config;
 
 use api::backend::AxumBackend;
-use kzgrs_backend::common::blob::DaBlob;
+use kzgrs_backend::common::share::DaShare;
 use nomos_api::ApiService;
 use nomos_blend_service::{
     backends::libp2p::Libp2pBlendBackend as BlendBackend,
     network::libp2p::Libp2pAdapter as BlendNetworkAdapter, BlendService,
 };
+use nomos_core::da::blob::info::DispersedBlobInfo;
 use nomos_da_dispersal::{
     adapters::{
         mempool::kzgrs::KzgrsMempoolAdapter,
@@ -29,9 +30,8 @@ use nomos_da_verifier::{
 use nomos_mempool::backend::mockpool::MockPool;
 use nomos_node::{
     BlobInfo, Cryptarchia, DaIndexer, DaMempool, DaNetworkService, DaSampling, DaVerifier,
-    DispersedBlobInfo, HeaderId, MempoolNetworkAdapter, NetworkBackend, NetworkService,
-    NomosDaMembership, NomosTimeService, RocksBackend, StorageService, SystemSig, Tx, TxMempool,
-    Wire, MB16,
+    HeaderId, MempoolNetworkAdapter, NetworkBackend, NetworkService, NomosDaMembership,
+    NomosTimeService, RocksBackend, StorageService, SystemSig, Tx, TxMempool, Wire, MB16,
 };
 use overwatch::OpaqueServiceHandle;
 use overwatch_derive::Services;
@@ -40,13 +40,13 @@ use rand_chacha::ChaCha20Rng;
 pub type ExecutorApiService = ApiService<
     AxumBackend<
         (),
-        DaBlob,
+        DaShare,
         BlobInfo,
         NomosDaMembership,
         BlobInfo,
         KzgrsDaVerifier,
         VerifierNetworkAdapter<NomosDaMembership>,
-        VerifierStorageAdapter<DaBlob, Wire>,
+        VerifierStorageAdapter<DaShare, Wire>,
         Tx,
         Wire,
         DispersalKZGRSBackend<DispersalNetworkAdapter<NomosDaMembership>, DispersalMempoolAdapter>,
@@ -56,7 +56,7 @@ pub type ExecutorApiService = ApiService<
         KzgrsSamplingBackend<ChaCha20Rng>,
         nomos_da_sampling::network::adapters::executor::Libp2pAdapter<NomosDaMembership>,
         ChaCha20Rng,
-        SamplingStorageAdapter<DaBlob, Wire>,
+        SamplingStorageAdapter<DaShare, Wire>,
         nomos_time::backends::system_time::SystemTimeBackend,
         HttApiAdapter<NomosDaMembership>,
         MB16,
@@ -69,10 +69,10 @@ pub type DispersalMempoolAdapter = KzgrsMempoolAdapter<
     KzgrsSamplingBackend<ChaCha20Rng>,
     nomos_da_sampling::network::adapters::executor::Libp2pAdapter<NomosDaMembership>,
     ChaCha20Rng,
-    SamplingStorageAdapter<DaBlob, Wire>,
+    SamplingStorageAdapter<DaShare, Wire>,
     KzgrsDaVerifier,
     VerifierNetworkAdapter<NomosDaMembership>,
-    VerifierStorageAdapter<DaBlob, Wire>,
+    VerifierStorageAdapter<DaShare, Wire>,
     HttApiAdapter<NomosDaMembership>,
 >;
 

nodes/nomos-executor/src/main.rs

@@ -1,12 +1,13 @@
 use clap::Parser;
 use color_eyre::eyre::{eyre, Result};
+use nomos_core::da::blob::info::DispersedBlobInfo;
 use nomos_executor::{
     config::Config as ExecutorConfig, NomosExecutor, NomosExecutorServiceSettings,
 };
 use nomos_mempool::tx::settings::TxMempoolSettings;
 use nomos_node::{
-    config::BlendArgs, BlobInfo, CryptarchiaArgs, DaMempoolSettings, DispersedBlobInfo, HttpArgs,
-    LogArgs, MempoolAdapterSettings, NetworkArgs, Transaction, Tx, CL_TOPIC, DA_TOPIC,
+    config::BlendArgs, BlobInfo, CryptarchiaArgs, DaMempoolSettings, HttpArgs, LogArgs,
+    MempoolAdapterSettings, NetworkArgs, Transaction, Tx, CL_TOPIC, DA_TOPIC,
 };
 use overwatch::overwatch::OverwatchRunner;