Merge remote-tracking branch 'origin/main' into coda/stitching

.github/workflows/deploy-validation-server.yml

@@ -49,7 +49,7 @@ jobs:
     needs: push_to_registry
     strategy:
       matrix:
-        environment: [ dev, production, testnet ]
+        environment: [ dev, production, testnet-staging ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

Cargo.toml

@@ -61,6 +61,7 @@ thiserror = "2.0"
 tls_codec = "0.4.1"
 tokio = { version = "1.35.1", default-features = false }
 uuid = "1.10"
+vergen-git2 = "1.0.2"
 wasm-timer = "0.2"
 web-time = "1.1"
 # Changing this version and rustls may potentially break the android build. Use Caution.

bindings_ffi/src/mls.rs

@@ -534,24 +534,6 @@ impl FfiXmtpClient {
             scw_verifier: self.inner_client.scw_verifier().clone().clone(),
         }))
     }
-
-    pub fn get_hmac_keys(&self) -> Result<Vec<FfiHmacKey>, GenericError> {
-        let inner = self.inner_client.as_ref();
-        let conversations = inner.find_groups(GroupQueryArgs::default())?;
-
-        let mut keys = vec![];
-        for conversation in conversations {
-            let mut k = conversation
-                .hmac_keys(-1..=1)?
-                .into_iter()
-                .map(Into::into)
-                .collect::<Vec<_>>();
-
-            keys.append(&mut k);
-        }
-
-        Ok(keys)
-    }
 }
 
 impl From<HmacKey> for FfiHmacKey {
@@ -1110,6 +1092,25 @@ impl FfiConversations {
 
         FfiStreamCloser::new(handle)
     }
+
+    pub fn get_hmac_keys(&self) -> Result<HashMap<Vec<u8>, Vec<FfiHmacKey>>, GenericError> {
+        let inner = self.inner_client.as_ref();
+        let conversations = inner.find_groups(GroupQueryArgs::default())?;
+
+        let mut hmac_map = HashMap::new();
+        for conversation in conversations {
+            let id = conversation.group_id.clone();
+            let keys = conversation
+                .hmac_keys(-1..=1)?
+                .into_iter()
+                .map(Into::into)
+                .collect::<Vec<_>>();
+
+            hmac_map.insert(id, keys);
+        }
+
+        Ok(hmac_map)
+    }
 }
 
 impl From<FfiConversationType> for ConversationType {

mls_validation_service/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "mls_validation_service"
-version = "0.1.0" # Intentionally decoupled from the Workspace versioning
+version = "0.1.4"
 build = "build.rs"
 license.workspace = true
 
@@ -10,7 +10,7 @@ name = "mls-validation-service"
 path = "src/main.rs"
 
 [build-dependencies]
-vergen = { version = "8.3.2", features = ["git", "git2"] }
+vergen-git2 = { workspace = true, features = ["build"] }
 
 [dependencies]
 clap = { version = "4.4.6", features = ["derive"] }

mls_validation_service/build.rs

@@ -1,5 +1,12 @@
-use vergen::EmitBuilder;
+use std::error::Error;
+use vergen_git2::{BuildBuilder, Emitter, Git2Builder};
 
-fn main() {
-    EmitBuilder::builder().git_sha(true).emit().unwrap();
+fn main() -> Result<(), Box<dyn Error>> {
+    let build = BuildBuilder::all_build()?;
+    let git = Git2Builder::default().branch(true).sha(true).build()?;
+    Emitter::default()
+        .add_instructions(&build)?
+        .add_instructions(&git)?
+        .emit()?;
+    Ok(())
 }

xmtp_content_types/src/attachment.rs

@@ -0,0 +1,6 @@
+pub struct AttachmentCodec {}
+
+//. Legacy content type id at https://github.com/xmtp/xmtp-js/blob/main/content-types/content-type-remote-attachment/src/Attachment.ts
+impl AttachmentCodec {
+    pub const TYPE_ID: &'static str = "attachment";
+}

xmtp_content_types/src/group_updated.rs

@@ -10,7 +10,7 @@ pub struct GroupUpdatedCodec {}
 
 impl GroupUpdatedCodec {
     const AUTHORITY_ID: &'static str = "xmtp.org";
-    const TYPE_ID: &'static str = "group_updated";
+    pub const TYPE_ID: &'static str = "group_updated";
 }
 
 impl ContentCodec<GroupUpdated> for GroupUpdatedCodec {

xmtp_content_types/src/lib.rs

@@ -1,16 +1,16 @@
+pub mod attachment;
 pub mod group_updated;
 pub mod membership_change;
+pub mod reaction;
+pub mod read_receipt;
+pub mod remote_attachment;
+pub mod reply;
 pub mod text;
+pub mod transaction_reference;
 
 use thiserror::Error;
 use xmtp_proto::xmtp::mls::message_contents::{ContentTypeId, EncodedContent};
 
-pub enum ContentType {
-    GroupMembershipChange,
-    GroupUpdated,
-    Text,
-}
-
 #[derive(Debug, Error)]
 pub enum CodecError {
     #[error("encode error {0}")]

xmtp_content_types/src/membership_change.rs

@@ -12,7 +12,7 @@ pub struct GroupMembershipChangeCodec {}
 
 impl GroupMembershipChangeCodec {
     const AUTHORITY_ID: &'static str = "xmtp.org";
-    const TYPE_ID: &'static str = "group_membership_change";
+    pub const TYPE_ID: &'static str = "group_membership_change";
 }
 
 impl ContentCodec<GroupMembershipChanges> for GroupMembershipChangeCodec {

xmtp_content_types/src/reaction.rs

@@ -0,0 +1,6 @@
+pub struct ReactionCodec {}
+
+/// Legacy content type id at https://github.com/xmtp/xmtp-js/blob/main/content-types/content-type-reaction/src/Reaction.ts
+impl ReactionCodec {
+    pub const TYPE_ID: &'static str = "reaction";
+}

xmtp_content_types/src/read_receipt.rs

@@ -0,0 +1,6 @@
+pub struct ReadReceiptCodec {}
+
+/// Legacy content type id at https://github.com/xmtp/xmtp-js/blob/main/content-types/content-type-read-receipt/src/ReadReceipt.ts
+impl ReadReceiptCodec {
+    pub const TYPE_ID: &'static str = "readReceipt";
+}

xmtp_content_types/src/remote_attachment.rs

@@ -0,0 +1,6 @@
+pub struct RemoteAttachmentCodec {}
+
+//. Legacy content type id at https://github.com/xmtp/xmtp-js/blob/main/content-types/content-type-remote-attachment/src/RemoteAttachment.ts
+impl RemoteAttachmentCodec {
+    pub const TYPE_ID: &'static str = "remoteStaticAttachment";
+}

xmtp_content_types/src/reply.rs

@@ -0,0 +1,6 @@
+pub struct ReplyCodec {}
+
+/// Legacy content type id at https://github.com/xmtp/xmtp-js/blob/main/content-types/content-type-reply/src/Reply.ts
+impl ReplyCodec {
+    pub const TYPE_ID: &'static str = "reply";
+}

xmtp_content_types/src/text.rs

@@ -8,7 +8,7 @@ pub struct TextCodec {}
 
 impl TextCodec {
     const AUTHORITY_ID: &'static str = "xmtp.org";
-    const TYPE_ID: &'static str = "text";
+    pub const TYPE_ID: &'static str = "text";
     const ENCODING_KEY: &'static str = "encoding";
     const ENCODING_UTF8: &'static str = "UTF-8";
 }

xmtp_content_types/src/transaction_reference.rs

@@ -0,0 +1,6 @@
+pub struct TransactionReferenceCodec {}
+
+/// Legacy content type id at https://github.com/xmtp/xmtp-js/blob/main/content-types/content-type-transaction-reference/src/TransactionReference.ts
+impl TransactionReferenceCodec {
+    pub const TYPE_ID: &'static str = "transactionReference";
+}

xmtp_debug/Cargo.toml

@@ -5,6 +5,9 @@ edition = "2021"
 version = "0.1.0"
 license.workspace = true
 
+[build-dependencies]
+vergen-git2 = { workspace = true, features = ["build"] }
+
 [dependencies]
 clap = { version = "4.5.20", features = ["derive"] }
 clap-verbosity-flag = "3.0"

xmtp_debug/build.rs

@@ -0,0 +1,12 @@
+use std::error::Error;
+use vergen_git2::{BuildBuilder, Emitter, Git2Builder};
+
+fn main() -> Result<(), Box<dyn Error>> {
+    let build = BuildBuilder::all_build()?;
+    let git = Git2Builder::default().branch(true).sha(true).build()?;
+    Emitter::default()
+        .add_instructions(&build)?
+        .add_instructions(&git)?
+        .emit()?;
+    Ok(())
+}

xmtp_debug/src/args.rs

@@ -11,6 +11,9 @@ pub use types::*;
 /// Debug & Generate data on the XMTP Network
 #[derive(Parser, Debug)]
 pub struct AppOpts {
+    // Print Version
+    #[arg(long)]
+    pub version: bool,
     #[command(subcommand)]
     pub cmd: Option<Commands>,
     #[command(flatten)]

xmtp_debug/src/main.rs

@@ -23,8 +23,17 @@ async fn main() -> Result<()> {
     let mut logger = logger::Logger::from(&opts.log);
     logger.init()?;
 
+    if opts.version {
+        info!("Version: {0}", get_version());
+        return Ok(());
+    }
+
     let app = app::App::new(opts)?;
     app.run().await?;
 
     Ok(())
 }
+
+pub fn get_version() -> String {
+    format!("{}-{}", env!("CARGO_PKG_VERSION"), env!("VERGEN_GIT_SHA"))
+}

xmtp_mls/migrations/2024-12-18-175338_messages_content_type/down.sql

@@ -0,0 +1,11 @@
+ALTER TABLE group_messages
+    DROP COLUMN authority_id;
+
+ALTER TABLE group_messages
+    DROP COLUMN version_major;
+
+ALTER TABLE group_messages
+    DROP COLUMN version_minor;
+
+ALTER TABLE group_messages
+    DROP COLUMN content_type;

xmtp_mls/migrations/2024-12-18-175338_messages_content_type/up.sql

@@ -0,0 +1,11 @@
+ALTER TABLE group_messages
+    ADD COLUMN content_type INTEGER NOT NULL DEFAULT 0;
+
+ALTER TABLE group_messages
+    ADD COLUMN version_minor INTEGER NOT NULL DEFAULT 0;
+
+ALTER TABLE group_messages
+    ADD COLUMN version_major INTEGER NOT NULL DEFAULT 0;
+
+ALTER TABLE group_messages
+    ADD COLUMN authority_id TEXT NOT NULL DEFAULT '';