Derive CborLen for CertifiedBlock.

Author: twittner

adapters/src/bytes.rs

@@ -1,6 +1,7 @@
 use std::convert::Infallible;
 
 use bytes::{Bytes, BytesMut};
+use minicbor::CborLen;
 use minicbor::decode::{Decoder, Error as DecodeError};
 use minicbor::encode::{Encoder, Error as EncodeError, Write};
 
@@ -15,6 +16,11 @@ pub fn decode<'b, C>(d: &mut Decoder<'b>, _: &mut C) -> Result<Bytes, DecodeErro
     Ok(Bytes::copy_from_slice(d.bytes()?))
 }
 
+pub fn cbor_len<C>(b: &Bytes, c: &mut C) -> usize {
+    let n = b.len();
+    n.cbor_len(c) + n
+}
+
 /// `BytesWrite` can be used to encode directly into `BytesMut`.
 #[derive(Default)]
 pub struct BytesWriter(BytesMut);

adapters/src/commitment.rs

@@ -1,4 +1,5 @@
 use committable::{Commitment, Committable};
+use minicbor::CborLen;
 use minicbor::decode::{Decoder, Error as DecodeError};
 use minicbor::encode::{Encoder, Error as EncodeError, Write};
 
@@ -13,7 +14,9 @@ where
     W: Write,
     D: Committable,
 {
-    e.bytes(d.as_ref())?.ok()
+    let b: &[u8] = d.as_ref();
+    debug_assert_eq!(b.len(), LEN);
+    e.bytes(b)?.ok()
 }
 
 pub fn decode<'b, D, C>(d: &mut Decoder<'b>, _: &mut C) -> Result<Commitment<D>, DecodeError>
@@ -26,3 +29,10 @@ where
         .map(Commitment::from_raw)
         .map_err(|e| DecodeError::custom(e).at(p))
 }
+
+pub fn cbor_len<D, C>(_: &Commitment<D>, c: &mut C) -> usize
+where
+    D: Committable,
+{
+    LEN.cbor_len(c) + LEN
+}

multisig/src/cert.rs

@@ -2,13 +2,24 @@ use std::{collections::BTreeMap, num::NonZeroUsize};
 
 use committable::{Commitment, Committable, RawCommitmentBuilder};
 use constant_time_eq::constant_time_eq;
-use minicbor::{Decode, Encode};
+use minicbor::{CborLen, Decode, Encode};
 use serde::{Deserialize, Serialize};
 
 use crate::{Committee, KeyId, PublicKey, Signature};
 
 #[derive(
-    Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize, Encode, Decode,
+    Debug,
+    Clone,
+    PartialEq,
+    Eq,
+    Hash,
+    PartialOrd,
+    Ord,
+    Serialize,
+    Deserialize,
+    Encode,
+    Decode,
+    CborLen,
 )]
 #[cbor(map)]
 pub struct Certificate<D: Committable> {

multisig/src/committee.rs

@@ -5,7 +5,7 @@ use std::sync::Arc;
 
 use bimap::BiBTreeMap;
 use committable::{Commitment, Committable, RawCommitmentBuilder};
-use minicbor::{Decode, Encode};
+use minicbor::{CborLen, Decode, Encode};
 use serde::{Deserialize, Serialize};
 
 use super::{KeyId, PublicKey};
@@ -105,7 +105,19 @@ impl Committee {
 }
 
 #[derive(
-    Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Encode, Decode,
+    Debug,
+    Copy,
+    Clone,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
+    Serialize,
+    Deserialize,
+    Encode,
+    Decode,
+    CborLen,
 )]
 #[cbor(transparent)]
 #[serde(transparent)]

multisig/src/lib.rs

@@ -10,7 +10,7 @@ pub mod x25519;
 use std::fmt;
 
 use committable::{Commitment, Committable, RawCommitmentBuilder};
-use minicbor::{Decode, Encode};
+use minicbor::{CborLen, Decode, Encode};
 use secp256k1::rand::Rng;
 use serde::{Deserialize, Serialize};
 
@@ -21,7 +21,19 @@ pub use signed::Signed;
 pub use votes::VoteAccumulator;
 
 #[derive(
-    Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Encode, Decode,
+    Debug,
+    Copy,
+    Clone,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
+    Serialize,
+    Deserialize,
+    Encode,
+    Decode,
+    CborLen,
 )]
 #[cbor(transparent)]
 #[serde(transparent)]
@@ -85,14 +97,26 @@ pub struct SecretKey {
 }
 
 #[derive(
-    Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Encode, Decode,
+    Copy,
+    Clone,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
+    Serialize,
+    Deserialize,
+    Encode,
+    Decode,
+    CborLen,
 )]
 #[cbor(transparent)]
 #[serde(transparent)]
 pub struct Signature {
     #[cbor(
         encode_with = "util::encode_secp256k1_sig",
-        decode_with = "util::decode_secp256k1_sig"
+        decode_with = "util::decode_secp256k1_sig",
+        cbor_len = "util::cbor_len_secp256k1_sig"
     )]
     sig: secp256k1::ecdsa::Signature,
 }

multisig/src/util.rs

@@ -1,6 +1,7 @@
 use std::ops::Deref;
 
 use ed25519_compact::x25519;
+use minicbor::CborLen;
 use minicbor::decode::{Decode, Decoder, Error as DecodeError};
 use minicbor::encode::{Encoder, Error as EncodeError, Write};
 use serde::{Deserialize, Deserializer, Serialize, Serializer, de};
@@ -108,6 +109,8 @@ where
     }
 }
 
+const SECP256K1_SIG_LEN: usize = 64;
+
 pub fn encode_secp256k1_sig<C, W>(
     s: &secp256k1::ecdsa::Signature,
     e: &mut Encoder<W>,
@@ -116,7 +119,7 @@ pub fn encode_secp256k1_sig<C, W>(
 where
     W: Write,
 {
-    let a: [u8; 64] = s.serialize_compact();
+    let a: [u8; SECP256K1_SIG_LEN] = s.serialize_compact();
     e.bytes(&a)?;
     Ok(())
 }
@@ -151,3 +154,7 @@ pub fn decode_secp256k1_pk<'b, C>(
     let a: [u8; 33] = minicbor::bytes::ByteArray::<33>::decode(d, c)?.into();
     secp256k1::PublicKey::from_byte_array_compressed(a).map_err(|e| DecodeError::custom(e).at(p))
 }
+
+pub fn cbor_len_secp256k1_sig<C>(_: &secp256k1::ecdsa::Signature, c: &mut C) -> usize {
+    SECP256K1_SIG_LEN.cbor_len(c) + SECP256K1_SIG_LEN
+}

sailfish-types/src/round.rs

@@ -2,7 +2,7 @@ use std::fmt;
 use std::ops::{Add, AddAssign, Deref, Sub};
 
 use committable::{Commitment, Committable, RawCommitmentBuilder};
-use minicbor::{Decode, Encode};
+use minicbor::{CborLen, Decode, Encode};
 use multisig::CommitteeId;
 use serde::{Deserialize, Serialize};
 
@@ -11,7 +11,19 @@ pub const GENESIS_ROUND: RoundNumber = RoundNumber::new(0);
 
 /// A sailfish round number.
 #[derive(
-    Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Encode, Decode,
+    Copy,
+    Clone,
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
+    Serialize,
+    Deserialize,
+    Encode,
+    Decode,
+    CborLen,
 )]
 #[cbor(transparent)]
 #[serde(transparent)]
@@ -117,7 +129,19 @@ impl fmt::Display for RoundNumber {
 }
 
 #[derive(
-    Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Encode, Decode,
+    Clone,
+    Copy,
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
+    Serialize,
+    Deserialize,
+    Encode,
+    Decode,
+    CborLen,
 )]
 #[cbor(map)]
 pub struct Round {

timeboost-types/src/block.rs

@@ -7,12 +7,14 @@ use std::{
 use alloy::primitives::B256;
 use bytes::Bytes;
 use committable::{Commitment, Committable, RawCommitmentBuilder};
-use minicbor::{Decode, Encode};
+use minicbor::{CborLen, Decode, Encode};
 use multisig::{Certificate, Committee, CommitteeId, Unchecked, Validated};
 use sailfish_types::{Round, RoundNumber};
 
 /// A timeboost block number.
-#[derive(Copy, Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Encode, Decode)]
+#[derive(
+    Copy, Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Encode, Decode, CborLen,
+)]
 #[cbor(transparent)]
 pub struct BlockNumber(u64);
 
@@ -81,7 +83,9 @@ impl fmt::Display for BlockNumber {
     }
 }
 
-#[derive(Debug, Default, Clone, Copy, Ord, PartialOrd, PartialEq, Eq, Hash, Encode, Decode)]
+#[derive(
+    Debug, Default, Clone, Copy, Ord, PartialOrd, PartialEq, Eq, Hash, Encode, Decode, CborLen,
+)]
 #[cbor(transparent)]
 pub struct BlockHash(#[cbor(with = "minicbor::bytes")] [u8; 32]);
 
@@ -113,7 +117,7 @@ impl Committable for BlockHash {
     }
 }
 
-#[derive(Debug, Clone, Encode, Decode)]
+#[derive(Debug, Clone, Encode, Decode, CborLen)]
 #[cbor(map)]
 pub struct Block {
     #[cbor(n(0))]
@@ -159,7 +163,7 @@ impl Block {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Encode, Decode)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Encode, Decode, CborLen)]
 #[cbor(map)]
 pub struct BlockInfo {
     #[cbor(n(0))]
@@ -207,7 +211,7 @@ impl Committable for BlockInfo {
     }
 }
 
-#[derive(Debug, Encode, Decode)]
+#[derive(Debug, Encode, Decode, CborLen)]
 #[cbor(map)]
 pub struct CertifiedBlock<S> {
     #[cbor(n(0))]