Put multiple blocks into one transaction.

Author: twittner

robusta/src/lib.rs

@@ -9,7 +9,7 @@ use std::time::Duration;
 
 use either::Either;
 use espresso_types::{Header, NamespaceId, Transaction};
-use multisig::{Unchecked, Validated};
+use multisig::Validated;
 use reqwest::{StatusCode, Url};
 use serde::{Serialize, de::DeserializeOwned};
 use serde_json as json;
@@ -18,7 +18,7 @@ use timeboost_types::{BlockNumber, CertifiedBlock};
 use tokio::time::sleep;
 use tracing::{debug, warn};
 
-use crate::types::{TX, TaggedBase64, TransactionsWithProof, VidCommonResponse};
+use crate::types::{RecvBody, SendBody, TaggedBase64, TransactionsWithProof, VidCommonResponse, TX};
 
 pub use crate::multiwatcher::Multiwatcher;
 pub use crate::types::Height;
@@ -58,11 +58,11 @@ impl Client {
         self.get_with_retry(u).await
     }
 
-    pub async fn submit<N>(&self, nsid: N, cb: &CertifiedBlock<Validated>) -> Result<(), Error>
+    pub async fn submit<N>(&self, nsid: N, blocks: &[CertifiedBlock<Validated>]) -> Result<(), Error>
     where
         N: Into<NamespaceId>,
     {
-        let trx = Transaction::new(nsid.into(), minicbor::to_vec(cb)?);
+        let trx = Transaction::new(nsid.into(), minicbor::to_vec(SendBody { blocks })?);
         let url = self.config.base_url.join("submit/submit")?;
         self.post_with_retry::<_, TaggedBase64<TX>>(url, &trx)
             .await?;
@@ -102,34 +102,36 @@ impl Client {
             warn!(node = %self.config.label, a = %nsid, b = %ns, height = %hdr.height(), "namespace mismatch");
             return Either::Left(empty());
         }
-        Either::Right(trxs.into_iter().filter_map(move |t| {
-            match minicbor::decode::<CertifiedBlock<Unchecked>>(t.payload()) {
-                Ok(b) => {
-                    let Some(c) = cvec.get(b.committee()) else {
-                        warn!(
-                            node      = %self.config.label,
-                            height    = %hdr.height(),
-                            committee = %b.committee(),
-                            "unknown committee"
-                        );
-                        return None;
-                    };
-                    if let Some(b) = b.validated(c) {
-                        Some(b.cert().data().num())
-                    } else {
-                        warn!(node = %self.config.label, height = %hdr.height(), "invalid block");
-                        None
-                    }
+        Either::Right(trxs.into_iter().flat_map(move |t| {
+            match minicbor::decode::<RecvBody>(t.payload()) {
+                Ok(body) => {
+                    Either::Right(body.blocks.into_iter().filter_map(|b| {
+                        let Some(c) = cvec.get(b.committee()) else {
+                            warn!(
+                                node      = %self.config.label,
+                                height    = %hdr.height(),
+                                committee = %b.committee(),
+                                "unknown committee"
+                            );
+                            return None;
+                        };
+                        if let Some(b) = b.validated(c) {
+                            Some(b.cert().data().num())
+                        } else {
+                            warn!(node = %self.config.label, height = %hdr.height(), "invalid block");
+                            None
+                        }
+                    }))
                 }
                 Err(err) => {
                     warn!(
                         node   = %self.config.label,
                         nsid   = %nsid,
                         height = %hdr.height(),
                         err    = %err,
-                        "could not deserialize block"
+                        "could not decode transaction payload"
                     );
-                    None
+                    Either::Left(empty())
                 }
             }
         }))

robusta/src/types.rs

@@ -8,7 +8,10 @@ use bon::Builder;
 use data_encoding::BASE64URL_NOPAD;
 use espresso_types::{NsProof, Transaction};
 use hotshot_query_service::VidCommon;
+use minicbor::{Decode, Encode};
+use multisig::{Unchecked, Validated};
 use serde::{Deserialize, Deserializer, Serialize, Serializer, de};
+use timeboost_types::CertifiedBlock;
 
 #[derive(Debug, Deserialize, Serialize, Builder)]
 pub(crate) struct TransactionsWithProof {
@@ -21,6 +24,20 @@ pub(crate) struct VidCommonResponse {
     pub(crate) common: VidCommon,
 }
 
+#[derive(Debug, Decode)]
+#[cbor(map)]
+pub(crate) struct RecvBody {
+    #[cbor(n(0))]
+    pub(crate) blocks: Vec<CertifiedBlock<Unchecked>>
+}
+
+#[derive(Debug, Encode)]
+#[cbor(map)]
+pub(crate) struct SendBody<'a> {
+    #[cbor(n(0))]
+    pub(crate) blocks: &'a [CertifiedBlock<Validated>]
+}
+
 macro_rules! Primitive {
     ($name:ident, $t:ty) => {
         #[derive(