feat: Update event types and builder APIs to prevent building events that dont align with the protocol spec

Cargo.toml

@@ -42,7 +42,7 @@ async-trait = "0.1"
 asynchronous-codec = "0.7"
 axum = "0.6"
 backoff = "0.4"
-base64 = "0.20.0"
+base64 = "0.21"
 bincode = "1.3.3"
 bs58 = "0.4"
 bytecheck = "0.6.7"

api/src/server/event.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use anyhow::{anyhow, bail, Context, Result};
 use ceramic_core::{Cid, EventId, Network};
-use ceramic_event::{unvalidated, unvalidated::CeramicExt};
+use ceramic_event::unvalidated;
 use ipld_core::ipld::Ipld;
 use iroh_car::CarReader;
 use tokio::io::AsyncRead;
@@ -31,15 +31,15 @@ where
         car_blocks.insert(cid, bytes);
     }
     let event_bytes = get_block(&event_cid, &car_blocks, store).await?;
-    let event: unvalidated::Event<Ipld> =
+    let event: unvalidated::RawEvent<Ipld> =
         serde_ipld_dagcbor::from_slice(&event_bytes).context("decoding event")?;
 
     let (init_id, init_payload) = match event {
-        unvalidated::Event::Time(event) => (
+        unvalidated::RawEvent::Time(event) => (
             event.id(),
             get_init_event_payload(&event.id(), &car_blocks, store).await?,
         ),
-        unvalidated::Event::Signed(event) => {
+        unvalidated::RawEvent::Signed(event) => {
             let link = event
                 .link()
                 .ok_or_else(|| anyhow!("event should have a link"))?;
@@ -56,7 +56,7 @@ where
                 get_init_event_payload(&init_id, &car_blocks, store).await?,
             )
         }
-        unvalidated::Event::Unsigned(event) => (event_cid, event),
+        unvalidated::RawEvent::Unsigned(event) => (event_cid, event),
     };
 
     let controller = init_payload
@@ -67,7 +67,7 @@ where
     Ok(EventId::new(
         &network,
         init_payload.header().sep(),
-        init_payload.model()?.as_slice(),
+        init_payload.header().model(),
         controller,
         &init_id,
         &event_cid,
@@ -80,10 +80,10 @@ async fn get_init_event_payload(
     store: &impl AccessModelStore,
 ) -> Result<unvalidated::init::Payload<Ipld>> {
     let init_bytes = get_block(init_id, car_blocks, store).await?;
-    let init_event: unvalidated::Event<Ipld> =
+    let init_event: unvalidated::RawEvent<Ipld> =
         serde_ipld_dagcbor::from_slice(&init_bytes).context("decoding init event")?;
     match init_event {
-        unvalidated::Event::Signed(event) => {
+        unvalidated::RawEvent::Signed(event) => {
             let link = event
                 .link()
                 .ok_or_else(|| anyhow!("init event should have a link"))?;
@@ -97,8 +97,8 @@ async fn get_init_event_payload(
                 bail!("init event payload is not well formed")
             }
         }
-        unvalidated::Event::Unsigned(event) => Ok(event),
-        unvalidated::Event::Time(_) => {
+        unvalidated::RawEvent::Unsigned(event) => Ok(event),
+        unvalidated::RawEvent::Time(_) => {
             bail!("init event payload can't be a time event")
         }
     }

api/src/tests.rs

@@ -44,10 +44,7 @@ pub const SIGNED_INIT_EVENT: &str = "
         wVnRoYml5U2NtZnU4bjVWN2JvWGd4eW81cTNTWlJSI3o2TWt0QnluQVBMckV5ZVM3cFZ0aGJpeVNjbWZ
         1OG41Vjdib1hneHlvNXEzU1pSUiJ9aXNpZ25hdHVyZVhAJAOOXHx9PyttNHjTzwe04TbsskxzfwNK5_X
         9e0rXiEOnVDq-Eeqe6KhuqnkSo06nS80UILPCAb4OyOZ6z2MnDA";
-pub const SIGNED_INIT_EVENT_PAYLOAD: &str = "
-        uomRkYXRhoWVzdGVwaBkBTWZoZWFkZXKkY3NlcGVtb2RlbGVtb2RlbFgozgECAYUBEiCg6DKjNeOL00C
-        0Og8Cmb88UVoPwz3kzXkQpD6Lkx6NWGZ1bmlxdWVMRKbxOrJBC7tqhWjea2NvbnRyb2xsZXJzgXg4ZGl
-        kOmtleTp6Nk1rdEJ5bkFQTHJFeWVTN3BWdGhiaXlTY21mdThuNVY3Ym9YZ3h5bzVxM1NaUlI";
+pub const SIGNED_INIT_EVENT_PAYLOAD: &str = "uomRkYXRhoWVzdGVwaBkBTWZoZWFkZXKkY3NlcGVtb2RlbGVtb2RlbFgozgECAYUBEiCg6DKjNeOL00C0Og8Cmb88UVoPwz3kzXkQpD6Lkx6NWGZ1bmlxdWVMRKbxOrJBC7tqhWjea2NvbnRyb2xsZXJzgXg4ZGlkOmtleTp6Nk1rdEJ5bkFQTHJFeWVTN3BWdGhiaXlTY21mdThuNVY3Ym9YZ3h5bzVxM1NaUlI";
 
 pub const UNSIGNED_INIT_EVENT_CID: &str =
     "bafyreiakimdaub7m6inx2nljypdhvhu5vozjhylqukif4hjxt65qnkv6my";

core/Cargo.toml

@@ -9,7 +9,6 @@ publish = false
 
 [dependencies]
 anyhow.workspace = true
-async-trait.workspace = true
 base64 = "0.21.2"
 cid.workspace = true
 did-method-key = "0.2.1"

core/src/lib.rs

@@ -5,20 +5,16 @@ mod bytes;
 pub mod event_id;
 pub mod interest;
 mod jwk;
-mod jws;
 mod network;
 mod range;
-mod signer;
 mod stream_id;
 
 pub use bytes::Bytes;
 pub use event_id::EventId;
 pub use interest::{Interest, PeerId};
 pub use jwk::Jwk;
-pub use jws::{Jws, JwsSignature};
 pub use network::Network;
 pub use range::RangeOpen;
-pub use signer::{JwkSigner, Signer};
 pub use stream_id::{StreamId, StreamIdType};
 
 pub use cid::Cid;
@@ -49,7 +45,7 @@ macro_rules! impl_multi_base {
             type Error = anyhow::Error;
 
             fn try_from(v: &StreamId) -> Result<Self, Self::Error> {
-                let v = v.to_vec()?;
+                let v = v.to_vec();
                 Ok(Self::from(v))
             }
         }