diff --git a/pkg/migrations/mls/20240829001344_serial-ids.down.sql b/pkg/migrations/mls/20240829001344_serial-ids.down.sql
new file mode 100644
index 00000000..1e46ae69
--- /dev/null
+++ b/pkg/migrations/mls/20240829001344_serial-ids.down.sql
@@ -0,0 +1,6 @@
+DROP FUNCTION insert_group_message;
+
+DROP FUNCTION insert_welcome_message;
+
+DROP FUNCTION insert_inbox_log;
+
diff --git a/pkg/migrations/mls/20240829001344_serial-ids.up.sql b/pkg/migrations/mls/20240829001344_serial-ids.up.sql
new file mode 100644
index 00000000..9204f4a7
--- /dev/null
+++ b/pkg/migrations/mls/20240829001344_serial-ids.up.sql
@@ -0,0 +1,44 @@
+CREATE FUNCTION insert_group_message(group_id BYTEA, data BYTEA, group_id_data_hash BYTEA)
+	RETURNS SETOF group_messages
+	AS $$
+BEGIN
+	-- Ensures that the generated sequence ID matches the insertion order
+	-- Only released at the end of the enclosing transaction - beware if called within a long transaction
+	PERFORM
+		pg_advisory_xact_lock(hashtext('group_messages_sequence'), hashtext(encode(group_id, 'hex')));
+	RETURN QUERY INSERT INTO group_messages(group_id, data, group_id_data_hash)
+		VALUES(group_id, data, group_id_data_hash)
+	RETURNING
+		*;
+END;
+$$
+LANGUAGE plpgsql;
+
+CREATE FUNCTION insert_welcome_message(installation_key BYTEA, data BYTEA, installation_key_data_hash BYTEA, hpke_public_key BYTEA)
+	RETURNS SETOF welcome_messages
+	AS $$
+BEGIN
+	PERFORM
+		pg_advisory_xact_lock(hashtext('welcome_messages_sequence'), hashtext(encode(installation_key, 'hex')));
+	RETURN QUERY INSERT INTO welcome_messages(installation_key, data, installation_key_data_hash, hpke_public_key)
+		VALUES(installation_key, data, installation_key_data_hash, hpke_public_key)
+	RETURNING
+		*;
+END;
+$$
+LANGUAGE plpgsql;
+
+CREATE FUNCTION insert_inbox_log(inbox_id BYTEA, server_timestamp_ns BIGINT, identity_update_proto BYTEA)
+	RETURNS SETOF inbox_log
+	AS $$
+BEGIN
+	PERFORM
+		pg_advisory_xact_lock(hashtext('inbox_log_sequence'), hashtext(encode(inbox_id, 'hex')));
+	RETURN QUERY INSERT INTO inbox_log(inbox_id, server_timestamp_ns, identity_update_proto)
+		VALUES(inbox_id, server_timestamp_ns, identity_update_proto)
+	RETURNING
+		*;
+END;
+$$
+LANGUAGE plpgsql;
+
diff --git a/pkg/mls/store/queries.sql b/pkg/mls/store/queries.sql
index d54a7e45..916cb12f 100644
--- a/pkg/mls/store/queries.sql
+++ b/pkg/mls/store/queries.sql
@@ -59,10 +59,10 @@ RETURNING
 	*;
 
 -- name: InsertInboxLog :one
-INSERT INTO inbox_log(inbox_id, server_timestamp_ns, identity_update_proto)
-	VALUES (decode(@inbox_id, 'hex'), @server_timestamp_ns, @identity_update_proto)
-RETURNING
-	sequence_id;
+SELECT
+	sequence_id
+FROM
+	insert_inbox_log(decode(@inbox_id, 'hex'), @server_timestamp_ns, @identity_update_proto);
 
 -- name: RevokeAddressFromLog :exec
 UPDATE
@@ -111,16 +111,16 @@ WHERE
 	id = ANY (@installation_ids::BYTEA[]);
 
 -- name: InsertGroupMessage :one
-INSERT INTO group_messages(group_id, data, group_id_data_hash)
-	VALUES ($1, $2, $3)
-RETURNING
-	*;
+SELECT
+	*
+FROM
+	insert_group_message(@group_id, @data, @group_id_data_hash);
 
 -- name: InsertWelcomeMessage :one
-INSERT INTO welcome_messages(installation_key, data, installation_key_data_hash, hpke_public_key)
-	VALUES ($1, $2, $3, $4)
-RETURNING
-	*;
+SELECT
+	*
+FROM
+	insert_welcome_message(@installation_key, @data, @installation_key_data_hash, @hpke_public_key);
 
 -- name: GetAllGroupMessages :many
 SELECT
diff --git a/pkg/mls/store/queries/db.go b/pkg/mls/store/queries/db.go
index ef8b0c29..1cbab906 100644
--- a/pkg/mls/store/queries/db.go
+++ b/pkg/mls/store/queries/db.go
@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.25.0
+//   sqlc v1.27.0
 
 package queries
 
diff --git a/pkg/mls/store/queries/models.go b/pkg/mls/store/queries/models.go
index 3943a55a..0c6d61fb 100644
--- a/pkg/mls/store/queries/models.go
+++ b/pkg/mls/store/queries/models.go
@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.25.0
+//   sqlc v1.27.0
 
 package queries
 
diff --git a/pkg/mls/store/queries/queries.sql.go b/pkg/mls/store/queries/queries.sql.go
index 90b51b14..3bc6c86c 100644
--- a/pkg/mls/store/queries/queries.sql.go
+++ b/pkg/mls/store/queries/queries.sql.go
@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.25.0
+//   sqlc v1.27.0
 // source: queries.sql
 
 package queries
@@ -355,10 +355,10 @@ func (q *Queries) InsertAddressLog(ctx context.Context, arg InsertAddressLogPara
 }
 
 const insertGroupMessage = `-- name: InsertGroupMessage :one
-INSERT INTO group_messages(group_id, data, group_id_data_hash)
-	VALUES ($1, $2, $3)
-RETURNING
+SELECT
 	id, created_at, group_id, data, group_id_data_hash
+FROM
+	insert_group_message($1, $2, $3)
 `
 
 type InsertGroupMessageParams struct {
@@ -381,10 +381,10 @@ func (q *Queries) InsertGroupMessage(ctx context.Context, arg InsertGroupMessage
 }
 
 const insertInboxLog = `-- name: InsertInboxLog :one
-INSERT INTO inbox_log(inbox_id, server_timestamp_ns, identity_update_proto)
-	VALUES (decode($1, 'hex'), $2, $3)
-RETURNING
+SELECT
 	sequence_id
+FROM
+	insert_inbox_log(decode($1, 'hex'), $2, $3)
 `
 
 type InsertInboxLogParams struct {
@@ -401,10 +401,10 @@ func (q *Queries) InsertInboxLog(ctx context.Context, arg InsertInboxLogParams)
 }
 
 const insertWelcomeMessage = `-- name: InsertWelcomeMessage :one
-INSERT INTO welcome_messages(installation_key, data, installation_key_data_hash, hpke_public_key)
-	VALUES ($1, $2, $3, $4)
-RETURNING
+SELECT
 	id, created_at, installation_key, data, hpke_public_key, installation_key_data_hash
+FROM
+	insert_welcome_message($1, $2, $3, $4)
 `
 
 type InsertWelcomeMessageParams struct {
diff --git a/pkg/proto/identity/api/v1/identity.pb.go b/pkg/proto/identity/api/v1/identity.pb.go
index 60d072f3..5981fb90 100644
--- a/pkg/proto/identity/api/v1/identity.pb.go
+++ b/pkg/proto/identity/api/v1/identity.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: identity/api/v1/identity.proto
 
@@ -730,7 +730,7 @@ func file_identity_api_v1_identity_proto_rawDescGZIP() []byte {
 }
 
 var file_identity_api_v1_identity_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
-var file_identity_api_v1_identity_proto_goTypes = []interface{}{
+var file_identity_api_v1_identity_proto_goTypes = []any{
 	(*PublishIdentityUpdateRequest)(nil),                 // 0: xmtp.identity.api.v1.PublishIdentityUpdateRequest
 	(*PublishIdentityUpdateResponse)(nil),                // 1: xmtp.identity.api.v1.PublishIdentityUpdateResponse
 	(*GetIdentityUpdatesRequest)(nil),                    // 2: xmtp.identity.api.v1.GetIdentityUpdatesRequest
@@ -771,7 +771,7 @@ func file_identity_api_v1_identity_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_identity_api_v1_identity_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_api_v1_identity_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*PublishIdentityUpdateRequest); i {
 			case 0:
 				return &v.state
@@ -783,7 +783,7 @@ func file_identity_api_v1_identity_proto_init() {
 				return nil
 			}
 		}
-		file_identity_api_v1_identity_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_api_v1_identity_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*PublishIdentityUpdateResponse); i {
 			case 0:
 				return &v.state
@@ -795,7 +795,7 @@ func file_identity_api_v1_identity_proto_init() {
 				return nil
 			}
 		}
-		file_identity_api_v1_identity_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_api_v1_identity_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*GetIdentityUpdatesRequest); i {
 			case 0:
 				return &v.state
@@ -807,7 +807,7 @@ func file_identity_api_v1_identity_proto_init() {
 				return nil
 			}
 		}
-		file_identity_api_v1_identity_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_api_v1_identity_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*GetIdentityUpdatesResponse); i {
 			case 0:
 				return &v.state
@@ -819,7 +819,7 @@ func file_identity_api_v1_identity_proto_init() {
 				return nil
 			}
 		}
-		file_identity_api_v1_identity_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_api_v1_identity_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*GetInboxIdsRequest); i {
 			case 0:
 				return &v.state
@@ -831,7 +831,7 @@ func file_identity_api_v1_identity_proto_init() {
 				return nil
 			}
 		}
-		file_identity_api_v1_identity_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_api_v1_identity_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*GetInboxIdsResponse); i {
 			case 0:
 				return &v.state
@@ -843,7 +843,7 @@ func file_identity_api_v1_identity_proto_init() {
 				return nil
 			}
 		}
-		file_identity_api_v1_identity_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_api_v1_identity_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*GetIdentityUpdatesRequest_Request); i {
 			case 0:
 				return &v.state
@@ -855,7 +855,7 @@ func file_identity_api_v1_identity_proto_init() {
 				return nil
 			}
 		}
-		file_identity_api_v1_identity_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_api_v1_identity_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*GetIdentityUpdatesResponse_IdentityUpdateLog); i {
 			case 0:
 				return &v.state
@@ -867,7 +867,7 @@ func file_identity_api_v1_identity_proto_init() {
 				return nil
 			}
 		}
-		file_identity_api_v1_identity_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_api_v1_identity_proto_msgTypes[8].Exporter = func(v any, i int) any {
 			switch v := v.(*GetIdentityUpdatesResponse_Response); i {
 			case 0:
 				return &v.state
@@ -879,7 +879,7 @@ func file_identity_api_v1_identity_proto_init() {
 				return nil
 			}
 		}
-		file_identity_api_v1_identity_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_api_v1_identity_proto_msgTypes[9].Exporter = func(v any, i int) any {
 			switch v := v.(*GetInboxIdsRequest_Request); i {
 			case 0:
 				return &v.state
@@ -891,7 +891,7 @@ func file_identity_api_v1_identity_proto_init() {
 				return nil
 			}
 		}
-		file_identity_api_v1_identity_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_api_v1_identity_proto_msgTypes[10].Exporter = func(v any, i int) any {
 			switch v := v.(*GetInboxIdsResponse_Response); i {
 			case 0:
 				return &v.state
@@ -904,7 +904,7 @@ func file_identity_api_v1_identity_proto_init() {
 			}
 		}
 	}
-	file_identity_api_v1_identity_proto_msgTypes[10].OneofWrappers = []interface{}{}
+	file_identity_api_v1_identity_proto_msgTypes[10].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/pkg/proto/identity/associations/association.pb.go b/pkg/proto/identity/associations/association.pb.go
index 3ce82294..6fc708a9 100644
--- a/pkg/proto/identity/associations/association.pb.go
+++ b/pkg/proto/identity/associations/association.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: identity/associations/association.proto
 
@@ -954,7 +954,7 @@ func file_identity_associations_association_proto_rawDescGZIP() []byte {
 }
 
 var file_identity_associations_association_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
-var file_identity_associations_association_proto_goTypes = []interface{}{
+var file_identity_associations_association_proto_goTypes = []any{
 	(*MemberIdentifier)(nil),      // 0: xmtp.identity.associations.MemberIdentifier
 	(*Member)(nil),                // 1: xmtp.identity.associations.Member
 	(*CreateInbox)(nil),           // 2: xmtp.identity.associations.CreateInbox
@@ -1002,7 +1002,7 @@ func file_identity_associations_association_proto_init() {
 	}
 	file_identity_associations_signature_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_identity_associations_association_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_associations_association_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*MemberIdentifier); i {
 			case 0:
 				return &v.state
@@ -1014,7 +1014,7 @@ func file_identity_associations_association_proto_init() {
 				return nil
 			}
 		}
-		file_identity_associations_association_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_associations_association_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*Member); i {
 			case 0:
 				return &v.state
@@ -1026,7 +1026,7 @@ func file_identity_associations_association_proto_init() {
 				return nil
 			}
 		}
-		file_identity_associations_association_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_associations_association_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*CreateInbox); i {
 			case 0:
 				return &v.state
@@ -1038,7 +1038,7 @@ func file_identity_associations_association_proto_init() {
 				return nil
 			}
 		}
-		file_identity_associations_association_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_associations_association_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*AddAssociation); i {
 			case 0:
 				return &v.state
@@ -1050,7 +1050,7 @@ func file_identity_associations_association_proto_init() {
 				return nil
 			}
 		}
-		file_identity_associations_association_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_associations_association_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*RevokeAssociation); i {
 			case 0:
 				return &v.state
@@ -1062,7 +1062,7 @@ func file_identity_associations_association_proto_init() {
 				return nil
 			}
 		}
-		file_identity_associations_association_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_associations_association_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*ChangeRecoveryAddress); i {
 			case 0:
 				return &v.state
@@ -1074,7 +1074,7 @@ func file_identity_associations_association_proto_init() {
 				return nil
 			}
 		}
-		file_identity_associations_association_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_associations_association_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*IdentityAction); i {
 			case 0:
 				return &v.state
@@ -1086,7 +1086,7 @@ func file_identity_associations_association_proto_init() {
 				return nil
 			}
 		}
-		file_identity_associations_association_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_associations_association_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*IdentityUpdate); i {
 			case 0:
 				return &v.state
@@ -1098,7 +1098,7 @@ func file_identity_associations_association_proto_init() {
 				return nil
 			}
 		}
-		file_identity_associations_association_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_associations_association_proto_msgTypes[8].Exporter = func(v any, i int) any {
 			switch v := v.(*MemberMap); i {
 			case 0:
 				return &v.state
@@ -1110,7 +1110,7 @@ func file_identity_associations_association_proto_init() {
 				return nil
 			}
 		}
-		file_identity_associations_association_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_associations_association_proto_msgTypes[9].Exporter = func(v any, i int) any {
 			switch v := v.(*AssociationState); i {
 			case 0:
 				return &v.state
@@ -1122,7 +1122,7 @@ func file_identity_associations_association_proto_init() {
 				return nil
 			}
 		}
-		file_identity_associations_association_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_associations_association_proto_msgTypes[10].Exporter = func(v any, i int) any {
 			switch v := v.(*AssociationStateDiff); i {
 			case 0:
 				return &v.state
@@ -1135,12 +1135,12 @@ func file_identity_associations_association_proto_init() {
 			}
 		}
 	}
-	file_identity_associations_association_proto_msgTypes[0].OneofWrappers = []interface{}{
+	file_identity_associations_association_proto_msgTypes[0].OneofWrappers = []any{
 		(*MemberIdentifier_Address)(nil),
 		(*MemberIdentifier_InstallationPublicKey)(nil),
 	}
-	file_identity_associations_association_proto_msgTypes[1].OneofWrappers = []interface{}{}
-	file_identity_associations_association_proto_msgTypes[6].OneofWrappers = []interface{}{
+	file_identity_associations_association_proto_msgTypes[1].OneofWrappers = []any{}
+	file_identity_associations_association_proto_msgTypes[6].OneofWrappers = []any{
 		(*IdentityAction_CreateInbox)(nil),
 		(*IdentityAction_Add)(nil),
 		(*IdentityAction_Revoke)(nil),
diff --git a/pkg/proto/identity/associations/signature.pb.go b/pkg/proto/identity/associations/signature.pb.go
index 2a9f267f..3dd2c082 100644
--- a/pkg/proto/identity/associations/signature.pb.go
+++ b/pkg/proto/identity/associations/signature.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: identity/associations/signature.proto
 
@@ -130,23 +130,25 @@ func (x *RecoverableEd25519Signature) GetPublicKey() []byte {
 	return nil
 }
 
-// Smart wallet signature
-type Erc1271Signature struct {
+// Smart Contract Wallet signature
+type SmartContractWalletSignature struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// CAIP-10
+	// CAIP-10 string
 	// https://github.com/ChainAgnostic/CAIPs/blob/main/CAIPs/caip-10.md
 	AccountId string `protobuf:"bytes,1,opt,name=account_id,json=accountId,proto3" json:"account_id,omitempty"`
 	// Specify the block number to verify the signature against
 	BlockNumber uint64 `protobuf:"varint,2,opt,name=block_number,json=blockNumber,proto3" json:"block_number,omitempty"`
 	// The actual signature bytes
 	Signature []byte `protobuf:"bytes,3,opt,name=signature,proto3" json:"signature,omitempty"`
+	// The RPC URL specifies a chain to verify the signature against
+	ChainRpcUrl string `protobuf:"bytes,4,opt,name=chain_rpc_url,json=chainRpcUrl,proto3" json:"chain_rpc_url,omitempty"`
 }
 
-func (x *Erc1271Signature) Reset() {
-	*x = Erc1271Signature{}
+func (x *SmartContractWalletSignature) Reset() {
+	*x = SmartContractWalletSignature{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_identity_associations_signature_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -154,13 +156,13 @@ func (x *Erc1271Signature) Reset() {
 	}
 }
 
-func (x *Erc1271Signature) String() string {
+func (x *SmartContractWalletSignature) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*Erc1271Signature) ProtoMessage() {}
+func (*SmartContractWalletSignature) ProtoMessage() {}
 
-func (x *Erc1271Signature) ProtoReflect() protoreflect.Message {
+func (x *SmartContractWalletSignature) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_signature_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -172,32 +174,39 @@ func (x *Erc1271Signature) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Erc1271Signature.ProtoReflect.Descriptor instead.
-func (*Erc1271Signature) Descriptor() ([]byte, []int) {
+// Deprecated: Use SmartContractWalletSignature.ProtoReflect.Descriptor instead.
+func (*SmartContractWalletSignature) Descriptor() ([]byte, []int) {
 	return file_identity_associations_signature_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *Erc1271Signature) GetAccountId() string {
+func (x *SmartContractWalletSignature) GetAccountId() string {
 	if x != nil {
 		return x.AccountId
 	}
 	return ""
 }
 
-func (x *Erc1271Signature) GetBlockNumber() uint64 {
+func (x *SmartContractWalletSignature) GetBlockNumber() uint64 {
 	if x != nil {
 		return x.BlockNumber
 	}
 	return 0
 }
 
-func (x *Erc1271Signature) GetSignature() []byte {
+func (x *SmartContractWalletSignature) GetSignature() []byte {
 	if x != nil {
 		return x.Signature
 	}
 	return nil
 }
 
+func (x *SmartContractWalletSignature) GetChainRpcUrl() string {
+	if x != nil {
+		return x.ChainRpcUrl
+	}
+	return ""
+}
+
 // An existing address on xmtpv2 may have already signed a legacy identity key
 // of type SignedPublicKey via the 'Create Identity' signature.
 // For migration to xmtpv3, the legacy key is permitted to sign on behalf of the
@@ -274,7 +283,7 @@ type Signature struct {
 	// Types that are assignable to Signature:
 	//
 	//	*Signature_Erc_191
-	//	*Signature_Erc_1271
+	//	*Signature_Erc_6492
 	//	*Signature_InstallationKey
 	//	*Signature_DelegatedErc_191
 	Signature isSignature_Signature `protobuf_oneof:"signature"`
@@ -326,9 +335,9 @@ func (x *Signature) GetErc_191() *RecoverableEcdsaSignature {
 	return nil
 }
 
-func (x *Signature) GetErc_1271() *Erc1271Signature {
-	if x, ok := x.GetSignature().(*Signature_Erc_1271); ok {
-		return x.Erc_1271
+func (x *Signature) GetErc_6492() *SmartContractWalletSignature {
+	if x, ok := x.GetSignature().(*Signature_Erc_6492); ok {
+		return x.Erc_6492
 	}
 	return nil
 }
@@ -355,8 +364,8 @@ type Signature_Erc_191 struct {
 	Erc_191 *RecoverableEcdsaSignature `protobuf:"bytes,1,opt,name=erc_191,json=erc191,proto3,oneof"`
 }
 
-type Signature_Erc_1271 struct {
-	Erc_1271 *Erc1271Signature `protobuf:"bytes,2,opt,name=erc_1271,json=erc1271,proto3,oneof"`
+type Signature_Erc_6492 struct {
+	Erc_6492 *SmartContractWalletSignature `protobuf:"bytes,2,opt,name=erc_6492,json=erc6492,proto3,oneof"`
 }
 
 type Signature_InstallationKey struct {
@@ -369,7 +378,7 @@ type Signature_DelegatedErc_191 struct {
 
 func (*Signature_Erc_191) isSignature_Signature() {}
 
-func (*Signature_Erc_1271) isSignature_Signature() {}
+func (*Signature_Erc_6492) isSignature_Signature() {}
 
 func (*Signature_InstallationKey) isSignature_Signature() {}
 
@@ -392,67 +401,71 @@ var file_identity_associations_signature_proto_rawDesc = []byte{
 	0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x79, 0x74, 0x65,
 	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1d,
 	0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0c, 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x22, 0x72, 0x0a,
-	0x10, 0x45, 0x72, 0x63, 0x31, 0x32, 0x37, 0x31, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72,
-	0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64,
-	0x12, 0x21, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d,
-	0x62, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72,
-	0x65, 0x22, 0xbc, 0x01, 0x0a, 0x18, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x6c, 0x65,
-	0x67, 0x61, 0x74, 0x65, 0x64, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x4b,
-	0x0a, 0x0d, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x53, 0x69,
-	0x67, 0x6e, 0x65, 0x64, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x64,
-	0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x4b, 0x65, 0x79, 0x12, 0x53, 0x0a, 0x09, 0x73,
-	0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35,
-	0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61,
-	0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x52, 0x65, 0x63, 0x6f,
-	0x76, 0x65, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x63, 0x64, 0x73, 0x61, 0x53, 0x69, 0x67, 0x6e,
-	0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
-	0x22, 0xff, 0x02, 0x0a, 0x09, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x50,
-	0x0a, 0x07, 0x65, 0x72, 0x63, 0x5f, 0x31, 0x39, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x28, 0x0c, 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x22, 0xa2, 0x01,
+	0x0a, 0x1c, 0x53, 0x6d, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x57,
+	0x61, 0x6c, 0x6c, 0x65, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x1d,
+	0x0a, 0x0a, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x21, 0x0a,
+	0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+	0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x22,
+	0x0a, 0x0d, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x72, 0x70, 0x63, 0x5f, 0x75, 0x72, 0x6c, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x52, 0x70, 0x63, 0x55,
+	0x72, 0x6c, 0x22, 0xbc, 0x01, 0x0a, 0x18, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x6c,
+	0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12,
+	0x4b, 0x0a, 0x0d, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6b, 0x65, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x53,
+	0x69, 0x67, 0x6e, 0x65, 0x64, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x52, 0x0c,
+	0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x4b, 0x65, 0x79, 0x12, 0x53, 0x0a, 0x09,
+	0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x35, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e,
 	0x61, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x52, 0x65, 0x63,
 	0x6f, 0x76, 0x65, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x63, 0x64, 0x73, 0x61, 0x53, 0x69, 0x67,
-	0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x00, 0x52, 0x06, 0x65, 0x72, 0x63, 0x31, 0x39, 0x31,
-	0x12, 0x49, 0x0a, 0x08, 0x65, 0x72, 0x63, 0x5f, 0x31, 0x32, 0x37, 0x31, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
+	0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72,
+	0x65, 0x22, 0x8b, 0x03, 0x0a, 0x09, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12,
+	0x50, 0x0a, 0x07, 0x65, 0x72, 0x63, 0x5f, 0x31, 0x39, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x35, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x2e, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x52, 0x65,
+	0x63, 0x6f, 0x76, 0x65, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x63, 0x64, 0x73, 0x61, 0x53, 0x69,
+	0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x00, 0x52, 0x06, 0x65, 0x72, 0x63, 0x31, 0x39,
+	0x31, 0x12, 0x55, 0x0a, 0x08, 0x65, 0x72, 0x63, 0x5f, 0x36, 0x34, 0x39, 0x32, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74,
+	0x69, 0x74, 0x79, 0x2e, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x2e, 0x53, 0x6d, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x57, 0x61,
+	0x6c, 0x6c, 0x65, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x00, 0x52,
+	0x07, 0x65, 0x72, 0x63, 0x36, 0x34, 0x39, 0x32, 0x12, 0x64, 0x0a, 0x10, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x37, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
 	0x74, 0x79, 0x2e, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
-	0x45, 0x72, 0x63, 0x31, 0x32, 0x37, 0x31, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
-	0x48, 0x00, 0x52, 0x07, 0x65, 0x72, 0x63, 0x31, 0x32, 0x37, 0x31, 0x12, 0x64, 0x0a, 0x10, 0x69,
-	0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6b, 0x65, 0x79, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65,
+	0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x64, 0x32, 0x35, 0x35,
+	0x31, 0x39, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x00, 0x52, 0x0f, 0x69,
+	0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x12, 0x62,
+	0x0a, 0x11, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x72, 0x63, 0x5f,
+	0x31, 0x39, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x78, 0x6d, 0x74, 0x70,
+	0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x69,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x6c,
+	0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48,
+	0x00, 0x52, 0x0f, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x45, 0x72, 0x63, 0x31,
+	0x39, 0x31, 0x42, 0x0b, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x42,
+	0xf8, 0x01, 0x0a, 0x1e, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65,
 	0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x64,
-	0x32, 0x35, 0x35, 0x31, 0x39, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x00,
-	0x52, 0x0f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65,
-	0x79, 0x12, 0x62, 0x0a, 0x11, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x65,
-	0x72, 0x63, 0x5f, 0x31, 0x39, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x78,
-	0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x73, 0x73,
-	0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79,
-	0x44, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
-	0x72, 0x65, 0x48, 0x00, 0x52, 0x0f, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x64, 0x45,
-	0x72, 0x63, 0x31, 0x39, 0x31, 0x42, 0x0b, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
-	0x72, 0x65, 0x42, 0xf8, 0x01, 0x0a, 0x1e, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e,
-	0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x0e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x6d, 0x74, 0x70, 0x2f, 0x78, 0x6d, 0x74, 0x70, 0x2d, 0x6e, 0x6f,
-	0x64, 0x65, 0x2d, 0x67, 0x6f, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
-	0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0xa2, 0x02, 0x03, 0x58, 0x49, 0x41, 0xaa, 0x02, 0x1a, 0x58, 0x6d,
-	0x74, 0x70, 0x2e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x41, 0x73, 0x73, 0x6f,
-	0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0xca, 0x02, 0x1a, 0x58, 0x6d, 0x74, 0x70, 0x5c,
-	0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5c, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0xe2, 0x02, 0x26, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x49, 0x64, 0x65,
+	0x6e, 0x73, 0x42, 0x0e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x78, 0x6d, 0x74, 0x70, 0x2f, 0x78, 0x6d, 0x74, 0x70, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2d,
+	0x67, 0x6f, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x69, 0x64, 0x65,
+	0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0xa2, 0x02, 0x03, 0x58, 0x49, 0x41, 0xaa, 0x02, 0x1a, 0x58, 0x6d, 0x74, 0x70, 0x2e,
+	0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0xca, 0x02, 0x1a, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x49, 0x64, 0x65,
 	0x6e, 0x74, 0x69, 0x74, 0x79, 0x5c, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02,
-	0x1c, 0x58, 0x6d, 0x74, 0x70, 0x3a, 0x3a, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x3a,
-	0x3a, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x73, 0xe2, 0x02, 0x26, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69,
+	0x74, 0x79, 0x5c, 0x41, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5c,
+	0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1c, 0x58, 0x6d,
+	0x74, 0x70, 0x3a, 0x3a, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x3a, 0x3a, 0x41, 0x73,
+	0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
@@ -468,10 +481,10 @@ func file_identity_associations_signature_proto_rawDescGZIP() []byte {
 }
 
 var file_identity_associations_signature_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
-var file_identity_associations_signature_proto_goTypes = []interface{}{
+var file_identity_associations_signature_proto_goTypes = []any{
 	(*RecoverableEcdsaSignature)(nil),        // 0: xmtp.identity.associations.RecoverableEcdsaSignature
 	(*RecoverableEd25519Signature)(nil),      // 1: xmtp.identity.associations.RecoverableEd25519Signature
-	(*Erc1271Signature)(nil),                 // 2: xmtp.identity.associations.Erc1271Signature
+	(*SmartContractWalletSignature)(nil),     // 2: xmtp.identity.associations.SmartContractWalletSignature
 	(*LegacyDelegatedSignature)(nil),         // 3: xmtp.identity.associations.LegacyDelegatedSignature
 	(*Signature)(nil),                        // 4: xmtp.identity.associations.Signature
 	(*message_contents.SignedPublicKey)(nil), // 5: xmtp.message_contents.SignedPublicKey
@@ -480,7 +493,7 @@ var file_identity_associations_signature_proto_depIdxs = []int32{
 	5, // 0: xmtp.identity.associations.LegacyDelegatedSignature.delegated_key:type_name -> xmtp.message_contents.SignedPublicKey
 	0, // 1: xmtp.identity.associations.LegacyDelegatedSignature.signature:type_name -> xmtp.identity.associations.RecoverableEcdsaSignature
 	0, // 2: xmtp.identity.associations.Signature.erc_191:type_name -> xmtp.identity.associations.RecoverableEcdsaSignature
-	2, // 3: xmtp.identity.associations.Signature.erc_1271:type_name -> xmtp.identity.associations.Erc1271Signature
+	2, // 3: xmtp.identity.associations.Signature.erc_6492:type_name -> xmtp.identity.associations.SmartContractWalletSignature
 	1, // 4: xmtp.identity.associations.Signature.installation_key:type_name -> xmtp.identity.associations.RecoverableEd25519Signature
 	3, // 5: xmtp.identity.associations.Signature.delegated_erc_191:type_name -> xmtp.identity.associations.LegacyDelegatedSignature
 	6, // [6:6] is the sub-list for method output_type
@@ -496,7 +509,7 @@ func file_identity_associations_signature_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_identity_associations_signature_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_associations_signature_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*RecoverableEcdsaSignature); i {
 			case 0:
 				return &v.state
@@ -508,7 +521,7 @@ func file_identity_associations_signature_proto_init() {
 				return nil
 			}
 		}
-		file_identity_associations_signature_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_associations_signature_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*RecoverableEd25519Signature); i {
 			case 0:
 				return &v.state
@@ -520,8 +533,8 @@ func file_identity_associations_signature_proto_init() {
 				return nil
 			}
 		}
-		file_identity_associations_signature_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Erc1271Signature); i {
+		file_identity_associations_signature_proto_msgTypes[2].Exporter = func(v any, i int) any {
+			switch v := v.(*SmartContractWalletSignature); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -532,7 +545,7 @@ func file_identity_associations_signature_proto_init() {
 				return nil
 			}
 		}
-		file_identity_associations_signature_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_associations_signature_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*LegacyDelegatedSignature); i {
 			case 0:
 				return &v.state
@@ -544,7 +557,7 @@ func file_identity_associations_signature_proto_init() {
 				return nil
 			}
 		}
-		file_identity_associations_signature_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_associations_signature_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*Signature); i {
 			case 0:
 				return &v.state
@@ -557,9 +570,9 @@ func file_identity_associations_signature_proto_init() {
 			}
 		}
 	}
-	file_identity_associations_signature_proto_msgTypes[4].OneofWrappers = []interface{}{
+	file_identity_associations_signature_proto_msgTypes[4].OneofWrappers = []any{
 		(*Signature_Erc_191)(nil),
-		(*Signature_Erc_1271)(nil),
+		(*Signature_Erc_6492)(nil),
 		(*Signature_InstallationKey)(nil),
 		(*Signature_DelegatedErc_191)(nil),
 	}
diff --git a/pkg/proto/identity/credential.pb.go b/pkg/proto/identity/credential.pb.go
index 10a7fb12..e08838c1 100644
--- a/pkg/proto/identity/credential.pb.go
+++ b/pkg/proto/identity/credential.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: identity/credential.proto
 
@@ -105,7 +105,7 @@ func file_identity_credential_proto_rawDescGZIP() []byte {
 }
 
 var file_identity_credential_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_identity_credential_proto_goTypes = []interface{}{
+var file_identity_credential_proto_goTypes = []any{
 	(*MlsCredential)(nil), // 0: xmtp.identity.MlsCredential
 }
 var file_identity_credential_proto_depIdxs = []int32{
@@ -122,7 +122,7 @@ func file_identity_credential_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_identity_credential_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_identity_credential_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*MlsCredential); i {
 			case 0:
 				return &v.state
diff --git a/pkg/proto/keystore_api/v1/keystore.pb.go b/pkg/proto/keystore_api/v1/keystore.pb.go
index 60254343..a3fc4407 100644
--- a/pkg/proto/keystore_api/v1/keystore.pb.go
+++ b/pkg/proto/keystore_api/v1/keystore.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: keystore_api/v1/keystore.proto
 
@@ -3288,7 +3288,7 @@ func file_keystore_api_v1_keystore_proto_rawDescGZIP() []byte {
 
 var file_keystore_api_v1_keystore_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
 var file_keystore_api_v1_keystore_proto_msgTypes = make([]protoimpl.MessageInfo, 51)
-var file_keystore_api_v1_keystore_proto_goTypes = []interface{}{
+var file_keystore_api_v1_keystore_proto_goTypes = []any{
 	(ErrorCode)(0), // 0: xmtp.keystore_api.v1.ErrorCode
 	(JobType)(0),   // 1: xmtp.keystore_api.v1.JobType
 	(GetKeystoreStatusResponse_KeystoreStatus)(0),        // 2: xmtp.keystore_api.v1.GetKeystoreStatusResponse.KeystoreStatus
@@ -3409,7 +3409,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_keystore_api_v1_keystore_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*KeystoreError); i {
 			case 0:
 				return &v.state
@@ -3421,7 +3421,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*DecryptV1Request); i {
 			case 0:
 				return &v.state
@@ -3433,7 +3433,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*DecryptResponse); i {
 			case 0:
 				return &v.state
@@ -3445,7 +3445,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*DecryptV2Request); i {
 			case 0:
 				return &v.state
@@ -3457,7 +3457,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*EncryptV1Request); i {
 			case 0:
 				return &v.state
@@ -3469,7 +3469,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*EncryptResponse); i {
 			case 0:
 				return &v.state
@@ -3481,7 +3481,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*EncryptV2Request); i {
 			case 0:
 				return &v.state
@@ -3493,7 +3493,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*SelfEncryptRequest); i {
 			case 0:
 				return &v.state
@@ -3505,7 +3505,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[8].Exporter = func(v any, i int) any {
 			switch v := v.(*SelfEncryptResponse); i {
 			case 0:
 				return &v.state
@@ -3517,7 +3517,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[9].Exporter = func(v any, i int) any {
 			switch v := v.(*SelfDecryptRequest); i {
 			case 0:
 				return &v.state
@@ -3529,7 +3529,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[10].Exporter = func(v any, i int) any {
 			switch v := v.(*GetPrivatePreferencesTopicIdentifierResponse); i {
 			case 0:
 				return &v.state
@@ -3541,7 +3541,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[11].Exporter = func(v any, i int) any {
 			switch v := v.(*CreateInviteRequest); i {
 			case 0:
 				return &v.state
@@ -3553,7 +3553,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[12].Exporter = func(v any, i int) any {
 			switch v := v.(*CreateInviteResponse); i {
 			case 0:
 				return &v.state
@@ -3565,7 +3565,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[13].Exporter = func(v any, i int) any {
 			switch v := v.(*SaveInvitesRequest); i {
 			case 0:
 				return &v.state
@@ -3577,7 +3577,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[14].Exporter = func(v any, i int) any {
 			switch v := v.(*SaveInvitesResponse); i {
 			case 0:
 				return &v.state
@@ -3589,7 +3589,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[15].Exporter = func(v any, i int) any {
 			switch v := v.(*CreateAuthTokenRequest); i {
 			case 0:
 				return &v.state
@@ -3601,7 +3601,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[16].Exporter = func(v any, i int) any {
 			switch v := v.(*SaveV1ConversationsRequest); i {
 			case 0:
 				return &v.state
@@ -3613,7 +3613,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[17].Exporter = func(v any, i int) any {
 			switch v := v.(*SaveV1ConversationsResponse); i {
 			case 0:
 				return &v.state
@@ -3625,7 +3625,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[18].Exporter = func(v any, i int) any {
 			switch v := v.(*GetConversationsResponse); i {
 			case 0:
 				return &v.state
@@ -3637,7 +3637,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[19].Exporter = func(v any, i int) any {
 			switch v := v.(*GetKeystoreStatusRequest); i {
 			case 0:
 				return &v.state
@@ -3649,7 +3649,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[20].Exporter = func(v any, i int) any {
 			switch v := v.(*GetKeystoreStatusResponse); i {
 			case 0:
 				return &v.state
@@ -3661,7 +3661,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[21].Exporter = func(v any, i int) any {
 			switch v := v.(*InitKeystoreRequest); i {
 			case 0:
 				return &v.state
@@ -3673,7 +3673,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[22].Exporter = func(v any, i int) any {
 			switch v := v.(*InitKeystoreResponse); i {
 			case 0:
 				return &v.state
@@ -3685,7 +3685,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[23].Exporter = func(v any, i int) any {
 			switch v := v.(*SignDigestRequest); i {
 			case 0:
 				return &v.state
@@ -3697,7 +3697,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[24].Exporter = func(v any, i int) any {
 			switch v := v.(*GetRefreshJobRequest); i {
 			case 0:
 				return &v.state
@@ -3709,7 +3709,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[25].Exporter = func(v any, i int) any {
 			switch v := v.(*GetRefreshJobResponse); i {
 			case 0:
 				return &v.state
@@ -3721,7 +3721,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[26].Exporter = func(v any, i int) any {
 			switch v := v.(*SetRefeshJobRequest); i {
 			case 0:
 				return &v.state
@@ -3733,7 +3733,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[27].Exporter = func(v any, i int) any {
 			switch v := v.(*SetRefreshJobResponse); i {
 			case 0:
 				return &v.state
@@ -3745,7 +3745,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[28].Exporter = func(v any, i int) any {
 			switch v := v.(*TopicMap); i {
 			case 0:
 				return &v.state
@@ -3757,7 +3757,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[29].Exporter = func(v any, i int) any {
 			switch v := v.(*GetConversationHmacKeysRequest); i {
 			case 0:
 				return &v.state
@@ -3769,7 +3769,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[30].Exporter = func(v any, i int) any {
 			switch v := v.(*GetConversationHmacKeysResponse); i {
 			case 0:
 				return &v.state
@@ -3781,7 +3781,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[31].Exporter = func(v any, i int) any {
 			switch v := v.(*DecryptV1Request_Request); i {
 			case 0:
 				return &v.state
@@ -3793,7 +3793,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[32].Exporter = func(v any, i int) any {
 			switch v := v.(*DecryptResponse_Response); i {
 			case 0:
 				return &v.state
@@ -3805,7 +3805,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[33].Exporter = func(v any, i int) any {
 			switch v := v.(*DecryptResponse_Response_Success); i {
 			case 0:
 				return &v.state
@@ -3817,7 +3817,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[34].Exporter = func(v any, i int) any {
 			switch v := v.(*DecryptV2Request_Request); i {
 			case 0:
 				return &v.state
@@ -3829,7 +3829,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[35].Exporter = func(v any, i int) any {
 			switch v := v.(*EncryptV1Request_Request); i {
 			case 0:
 				return &v.state
@@ -3841,7 +3841,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[36].Exporter = func(v any, i int) any {
 			switch v := v.(*EncryptResponse_Response); i {
 			case 0:
 				return &v.state
@@ -3853,7 +3853,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[37].Exporter = func(v any, i int) any {
 			switch v := v.(*EncryptResponse_Response_Success); i {
 			case 0:
 				return &v.state
@@ -3865,7 +3865,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[38].Exporter = func(v any, i int) any {
 			switch v := v.(*EncryptV2Request_Request); i {
 			case 0:
 				return &v.state
@@ -3877,7 +3877,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[39].Exporter = func(v any, i int) any {
 			switch v := v.(*SelfEncryptRequest_Request); i {
 			case 0:
 				return &v.state
@@ -3889,7 +3889,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[40].Exporter = func(v any, i int) any {
 			switch v := v.(*SelfEncryptResponse_Response); i {
 			case 0:
 				return &v.state
@@ -3901,7 +3901,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[41].Exporter = func(v any, i int) any {
 			switch v := v.(*SelfEncryptResponse_Response_Success); i {
 			case 0:
 				return &v.state
@@ -3913,7 +3913,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[42].Exporter = func(v any, i int) any {
 			switch v := v.(*SelfDecryptRequest_Request); i {
 			case 0:
 				return &v.state
@@ -3925,7 +3925,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[43].Exporter = func(v any, i int) any {
 			switch v := v.(*SaveInvitesRequest_Request); i {
 			case 0:
 				return &v.state
@@ -3937,7 +3937,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[44].Exporter = func(v any, i int) any {
 			switch v := v.(*SaveInvitesResponse_Response); i {
 			case 0:
 				return &v.state
@@ -3949,7 +3949,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[45].Exporter = func(v any, i int) any {
 			switch v := v.(*SaveInvitesResponse_Response_Success); i {
 			case 0:
 				return &v.state
@@ -3961,7 +3961,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[46].Exporter = func(v any, i int) any {
 			switch v := v.(*TopicMap_TopicData); i {
 			case 0:
 				return &v.state
@@ -3973,7 +3973,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[48].Exporter = func(v any, i int) any {
 			switch v := v.(*GetConversationHmacKeysResponse_HmacKeyData); i {
 			case 0:
 				return &v.state
@@ -3985,7 +3985,7 @@ func file_keystore_api_v1_keystore_proto_init() {
 				return nil
 			}
 		}
-		file_keystore_api_v1_keystore_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
+		file_keystore_api_v1_keystore_proto_msgTypes[49].Exporter = func(v any, i int) any {
 			switch v := v.(*GetConversationHmacKeysResponse_HmacKeys); i {
 			case 0:
 				return &v.state
@@ -3998,27 +3998,27 @@ func file_keystore_api_v1_keystore_proto_init() {
 			}
 		}
 	}
-	file_keystore_api_v1_keystore_proto_msgTypes[15].OneofWrappers = []interface{}{}
-	file_keystore_api_v1_keystore_proto_msgTypes[21].OneofWrappers = []interface{}{
+	file_keystore_api_v1_keystore_proto_msgTypes[15].OneofWrappers = []any{}
+	file_keystore_api_v1_keystore_proto_msgTypes[21].OneofWrappers = []any{
 		(*InitKeystoreRequest_V1)(nil),
 	}
-	file_keystore_api_v1_keystore_proto_msgTypes[23].OneofWrappers = []interface{}{
+	file_keystore_api_v1_keystore_proto_msgTypes[23].OneofWrappers = []any{
 		(*SignDigestRequest_IdentityKey)(nil),
 		(*SignDigestRequest_PrekeyIndex)(nil),
 	}
-	file_keystore_api_v1_keystore_proto_msgTypes[32].OneofWrappers = []interface{}{
+	file_keystore_api_v1_keystore_proto_msgTypes[32].OneofWrappers = []any{
 		(*DecryptResponse_Response_Result)(nil),
 		(*DecryptResponse_Response_Error)(nil),
 	}
-	file_keystore_api_v1_keystore_proto_msgTypes[36].OneofWrappers = []interface{}{
+	file_keystore_api_v1_keystore_proto_msgTypes[36].OneofWrappers = []any{
 		(*EncryptResponse_Response_Result)(nil),
 		(*EncryptResponse_Response_Error)(nil),
 	}
-	file_keystore_api_v1_keystore_proto_msgTypes[40].OneofWrappers = []interface{}{
+	file_keystore_api_v1_keystore_proto_msgTypes[40].OneofWrappers = []any{
 		(*SelfEncryptResponse_Response_Result)(nil),
 		(*SelfEncryptResponse_Response_Error)(nil),
 	}
-	file_keystore_api_v1_keystore_proto_msgTypes[44].OneofWrappers = []interface{}{
+	file_keystore_api_v1_keystore_proto_msgTypes[44].OneofWrappers = []any{
 		(*SaveInvitesResponse_Response_Result)(nil),
 		(*SaveInvitesResponse_Response_Error)(nil),
 	}
diff --git a/pkg/proto/message_api/v1/authn.pb.go b/pkg/proto/message_api/v1/authn.pb.go
index de971e80..c3584167 100644
--- a/pkg/proto/message_api/v1/authn.pb.go
+++ b/pkg/proto/message_api/v1/authn.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_api/v1/authn.proto
 
@@ -210,7 +210,7 @@ func file_message_api_v1_authn_proto_rawDescGZIP() []byte {
 }
 
 var file_message_api_v1_authn_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_message_api_v1_authn_proto_goTypes = []interface{}{
+var file_message_api_v1_authn_proto_goTypes = []any{
 	(*Token)(nil),                      // 0: xmtp.message_api.v1.Token
 	(*AuthData)(nil),                   // 1: xmtp.message_api.v1.AuthData
 	(*message_contents.PublicKey)(nil), // 2: xmtp.message_contents.PublicKey
@@ -232,7 +232,7 @@ func file_message_api_v1_authn_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_message_api_v1_authn_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_api_v1_authn_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*Token); i {
 			case 0:
 				return &v.state
@@ -244,7 +244,7 @@ func file_message_api_v1_authn_proto_init() {
 				return nil
 			}
 		}
-		file_message_api_v1_authn_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_message_api_v1_authn_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*AuthData); i {
 			case 0:
 				return &v.state
diff --git a/pkg/proto/message_api/v1/message_api.pb.go b/pkg/proto/message_api/v1/message_api.pb.go
index 8d64190e..11a0a628 100644
--- a/pkg/proto/message_api/v1/message_api.pb.go
+++ b/pkg/proto/message_api/v1/message_api.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_api/v1/message_api.proto
 
@@ -902,7 +902,7 @@ func file_message_api_v1_message_api_proto_rawDescGZIP() []byte {
 
 var file_message_api_v1_message_api_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_message_api_v1_message_api_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
-var file_message_api_v1_message_api_proto_goTypes = []interface{}{
+var file_message_api_v1_message_api_proto_goTypes = []any{
 	(SortDirection)(0),          // 0: xmtp.message_api.v1.SortDirection
 	(*IndexCursor)(nil),         // 1: xmtp.message_api.v1.IndexCursor
 	(*Cursor)(nil),              // 2: xmtp.message_api.v1.Cursor
@@ -952,7 +952,7 @@ func file_message_api_v1_message_api_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_message_api_v1_message_api_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_api_v1_message_api_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*IndexCursor); i {
 			case 0:
 				return &v.state
@@ -964,7 +964,7 @@ func file_message_api_v1_message_api_proto_init() {
 				return nil
 			}
 		}
-		file_message_api_v1_message_api_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_message_api_v1_message_api_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*Cursor); i {
 			case 0:
 				return &v.state
@@ -976,7 +976,7 @@ func file_message_api_v1_message_api_proto_init() {
 				return nil
 			}
 		}
-		file_message_api_v1_message_api_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_message_api_v1_message_api_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*PagingInfo); i {
 			case 0:
 				return &v.state
@@ -988,7 +988,7 @@ func file_message_api_v1_message_api_proto_init() {
 				return nil
 			}
 		}
-		file_message_api_v1_message_api_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_message_api_v1_message_api_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*Envelope); i {
 			case 0:
 				return &v.state
@@ -1000,7 +1000,7 @@ func file_message_api_v1_message_api_proto_init() {
 				return nil
 			}
 		}
-		file_message_api_v1_message_api_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_message_api_v1_message_api_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*PublishRequest); i {
 			case 0:
 				return &v.state
@@ -1012,7 +1012,7 @@ func file_message_api_v1_message_api_proto_init() {
 				return nil
 			}
 		}
-		file_message_api_v1_message_api_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_message_api_v1_message_api_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*PublishResponse); i {
 			case 0:
 				return &v.state
@@ -1024,7 +1024,7 @@ func file_message_api_v1_message_api_proto_init() {
 				return nil
 			}
 		}
-		file_message_api_v1_message_api_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_message_api_v1_message_api_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*SubscribeRequest); i {
 			case 0:
 				return &v.state
@@ -1036,7 +1036,7 @@ func file_message_api_v1_message_api_proto_init() {
 				return nil
 			}
 		}
-		file_message_api_v1_message_api_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_message_api_v1_message_api_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*SubscribeAllRequest); i {
 			case 0:
 				return &v.state
@@ -1048,7 +1048,7 @@ func file_message_api_v1_message_api_proto_init() {
 				return nil
 			}
 		}
-		file_message_api_v1_message_api_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_message_api_v1_message_api_proto_msgTypes[8].Exporter = func(v any, i int) any {
 			switch v := v.(*QueryRequest); i {
 			case 0:
 				return &v.state
@@ -1060,7 +1060,7 @@ func file_message_api_v1_message_api_proto_init() {
 				return nil
 			}
 		}
-		file_message_api_v1_message_api_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_message_api_v1_message_api_proto_msgTypes[9].Exporter = func(v any, i int) any {
 			switch v := v.(*QueryResponse); i {
 			case 0:
 				return &v.state
@@ -1072,7 +1072,7 @@ func file_message_api_v1_message_api_proto_init() {
 				return nil
 			}
 		}
-		file_message_api_v1_message_api_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_message_api_v1_message_api_proto_msgTypes[10].Exporter = func(v any, i int) any {
 			switch v := v.(*BatchQueryRequest); i {
 			case 0:
 				return &v.state
@@ -1084,7 +1084,7 @@ func file_message_api_v1_message_api_proto_init() {
 				return nil
 			}
 		}
-		file_message_api_v1_message_api_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_message_api_v1_message_api_proto_msgTypes[11].Exporter = func(v any, i int) any {
 			switch v := v.(*BatchQueryResponse); i {
 			case 0:
 				return &v.state
@@ -1097,7 +1097,7 @@ func file_message_api_v1_message_api_proto_init() {
 			}
 		}
 	}
-	file_message_api_v1_message_api_proto_msgTypes[1].OneofWrappers = []interface{}{
+	file_message_api_v1_message_api_proto_msgTypes[1].OneofWrappers = []any{
 		(*Cursor_Index)(nil),
 	}
 	type x struct{}
diff --git a/pkg/proto/message_contents/ciphertext.pb.go b/pkg/proto/message_contents/ciphertext.pb.go
index d3f7401f..b8fa21a6 100644
--- a/pkg/proto/message_contents/ciphertext.pb.go
+++ b/pkg/proto/message_contents/ciphertext.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_contents/ciphertext.proto
 
@@ -357,7 +357,7 @@ func file_message_contents_ciphertext_proto_rawDescGZIP() []byte {
 }
 
 var file_message_contents_ciphertext_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_message_contents_ciphertext_proto_goTypes = []interface{}{
+var file_message_contents_ciphertext_proto_goTypes = []any{
 	(*Ciphertext)(nil),                     // 0: xmtp.message_contents.Ciphertext
 	(*SignedEciesCiphertext)(nil),          // 1: xmtp.message_contents.SignedEciesCiphertext
 	(*Ciphertext_Aes256GcmHkdfsha256)(nil), // 2: xmtp.message_contents.Ciphertext.Aes256gcmHkdfsha256
@@ -381,7 +381,7 @@ func file_message_contents_ciphertext_proto_init() {
 	}
 	file_message_contents_signature_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_message_contents_ciphertext_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_ciphertext_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*Ciphertext); i {
 			case 0:
 				return &v.state
@@ -393,7 +393,7 @@ func file_message_contents_ciphertext_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_ciphertext_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_ciphertext_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*SignedEciesCiphertext); i {
 			case 0:
 				return &v.state
@@ -405,7 +405,7 @@ func file_message_contents_ciphertext_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_ciphertext_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_ciphertext_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*Ciphertext_Aes256GcmHkdfsha256); i {
 			case 0:
 				return &v.state
@@ -417,7 +417,7 @@ func file_message_contents_ciphertext_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_ciphertext_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_ciphertext_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*SignedEciesCiphertext_Ecies); i {
 			case 0:
 				return &v.state
@@ -430,7 +430,7 @@ func file_message_contents_ciphertext_proto_init() {
 			}
 		}
 	}
-	file_message_contents_ciphertext_proto_msgTypes[0].OneofWrappers = []interface{}{
+	file_message_contents_ciphertext_proto_msgTypes[0].OneofWrappers = []any{
 		(*Ciphertext_Aes256GcmHkdfSha256)(nil),
 	}
 	type x struct{}
diff --git a/pkg/proto/message_contents/composite.pb.go b/pkg/proto/message_contents/composite.pb.go
index 0cdfdd12..25c74d6a 100644
--- a/pkg/proto/message_contents/composite.pb.go
+++ b/pkg/proto/message_contents/composite.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_contents/composite.proto
 
@@ -204,7 +204,7 @@ func file_message_contents_composite_proto_rawDescGZIP() []byte {
 }
 
 var file_message_contents_composite_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_message_contents_composite_proto_goTypes = []interface{}{
+var file_message_contents_composite_proto_goTypes = []any{
 	(*Composite)(nil),      // 0: xmtp.message_contents.Composite
 	(*Composite_Part)(nil), // 1: xmtp.message_contents.Composite.Part
 	(*EncodedContent)(nil), // 2: xmtp.message_contents.EncodedContent
@@ -227,7 +227,7 @@ func file_message_contents_composite_proto_init() {
 	}
 	file_message_contents_content_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_message_contents_composite_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_composite_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*Composite); i {
 			case 0:
 				return &v.state
@@ -239,7 +239,7 @@ func file_message_contents_composite_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_composite_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_composite_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*Composite_Part); i {
 			case 0:
 				return &v.state
@@ -252,7 +252,7 @@ func file_message_contents_composite_proto_init() {
 			}
 		}
 	}
-	file_message_contents_composite_proto_msgTypes[1].OneofWrappers = []interface{}{
+	file_message_contents_composite_proto_msgTypes[1].OneofWrappers = []any{
 		(*Composite_Part_Part)(nil),
 		(*Composite_Part_Composite)(nil),
 	}
diff --git a/pkg/proto/message_contents/contact.pb.go b/pkg/proto/message_contents/contact.pb.go
index 628335da..f7097872 100644
--- a/pkg/proto/message_contents/contact.pb.go
+++ b/pkg/proto/message_contents/contact.pb.go
@@ -6,7 +6,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_contents/contact.proto
 
@@ -264,7 +264,7 @@ func file_message_contents_contact_proto_rawDescGZIP() []byte {
 }
 
 var file_message_contents_contact_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_message_contents_contact_proto_goTypes = []interface{}{
+var file_message_contents_contact_proto_goTypes = []any{
 	(*ContactBundleV1)(nil),       // 0: xmtp.message_contents.ContactBundleV1
 	(*ContactBundleV2)(nil),       // 1: xmtp.message_contents.ContactBundleV2
 	(*ContactBundle)(nil),         // 2: xmtp.message_contents.ContactBundle
@@ -290,7 +290,7 @@ func file_message_contents_contact_proto_init() {
 	}
 	file_message_contents_public_key_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_message_contents_contact_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_contact_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*ContactBundleV1); i {
 			case 0:
 				return &v.state
@@ -302,7 +302,7 @@ func file_message_contents_contact_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_contact_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_contact_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*ContactBundleV2); i {
 			case 0:
 				return &v.state
@@ -314,7 +314,7 @@ func file_message_contents_contact_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_contact_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_contact_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*ContactBundle); i {
 			case 0:
 				return &v.state
@@ -327,7 +327,7 @@ func file_message_contents_contact_proto_init() {
 			}
 		}
 	}
-	file_message_contents_contact_proto_msgTypes[2].OneofWrappers = []interface{}{
+	file_message_contents_contact_proto_msgTypes[2].OneofWrappers = []any{
 		(*ContactBundle_V1)(nil),
 		(*ContactBundle_V2)(nil),
 	}
diff --git a/pkg/proto/message_contents/content.pb.go b/pkg/proto/message_contents/content.pb.go
index ce4f94ee..2bd5effc 100644
--- a/pkg/proto/message_contents/content.pb.go
+++ b/pkg/proto/message_contents/content.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_contents/content.proto
 
@@ -389,7 +389,7 @@ func file_message_contents_content_proto_rawDescGZIP() []byte {
 
 var file_message_contents_content_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_message_contents_content_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_message_contents_content_proto_goTypes = []interface{}{
+var file_message_contents_content_proto_goTypes = []any{
 	(Compression)(0),              // 0: xmtp.message_contents.Compression
 	(*ContentTypeId)(nil),         // 1: xmtp.message_contents.ContentTypeId
 	(*EncodedContent)(nil),        // 2: xmtp.message_contents.EncodedContent
@@ -419,7 +419,7 @@ func file_message_contents_content_proto_init() {
 	file_message_contents_public_key_proto_init()
 	file_message_contents_signature_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_message_contents_content_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_content_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*ContentTypeId); i {
 			case 0:
 				return &v.state
@@ -431,7 +431,7 @@ func file_message_contents_content_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_content_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_content_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*EncodedContent); i {
 			case 0:
 				return &v.state
@@ -443,7 +443,7 @@ func file_message_contents_content_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_content_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_content_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*SignedContent); i {
 			case 0:
 				return &v.state
@@ -456,7 +456,7 @@ func file_message_contents_content_proto_init() {
 			}
 		}
 	}
-	file_message_contents_content_proto_msgTypes[1].OneofWrappers = []interface{}{}
+	file_message_contents_content_proto_msgTypes[1].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/pkg/proto/message_contents/conversation_reference.pb.go b/pkg/proto/message_contents/conversation_reference.pb.go
index a1a461de..020d4203 100644
--- a/pkg/proto/message_contents/conversation_reference.pb.go
+++ b/pkg/proto/message_contents/conversation_reference.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_contents/conversation_reference.proto
 
@@ -159,7 +159,7 @@ func file_message_contents_conversation_reference_proto_rawDescGZIP() []byte {
 }
 
 var file_message_contents_conversation_reference_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_message_contents_conversation_reference_proto_goTypes = []interface{}{
+var file_message_contents_conversation_reference_proto_goTypes = []any{
 	(*ConversationReference)(nil), // 0: xmtp.message_contents.ConversationReference
 	(*InvitationV1_Context)(nil),  // 1: xmtp.message_contents.InvitationV1.Context
 	(*ConsentProofPayload)(nil),   // 2: xmtp.message_contents.ConsentProofPayload
@@ -181,7 +181,7 @@ func file_message_contents_conversation_reference_proto_init() {
 	}
 	file_message_contents_invitation_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_message_contents_conversation_reference_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_conversation_reference_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*ConversationReference); i {
 			case 0:
 				return &v.state
diff --git a/pkg/proto/message_contents/ecies.pb.go b/pkg/proto/message_contents/ecies.pb.go
index 1e44bf0a..ce692960 100644
--- a/pkg/proto/message_contents/ecies.pb.go
+++ b/pkg/proto/message_contents/ecies.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_contents/ecies.proto
 
@@ -129,7 +129,7 @@ func file_message_contents_ecies_proto_rawDescGZIP() []byte {
 }
 
 var file_message_contents_ecies_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_message_contents_ecies_proto_goTypes = []interface{}{
+var file_message_contents_ecies_proto_goTypes = []any{
 	(*EciesMessage)(nil), // 0: xmtp.message_contents.EciesMessage
 }
 var file_message_contents_ecies_proto_depIdxs = []int32{
@@ -146,7 +146,7 @@ func file_message_contents_ecies_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_message_contents_ecies_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_ecies_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*EciesMessage); i {
 			case 0:
 				return &v.state
@@ -159,7 +159,7 @@ func file_message_contents_ecies_proto_init() {
 			}
 		}
 	}
-	file_message_contents_ecies_proto_msgTypes[0].OneofWrappers = []interface{}{
+	file_message_contents_ecies_proto_msgTypes[0].OneofWrappers = []any{
 		(*EciesMessage_V1)(nil),
 	}
 	type x struct{}
diff --git a/pkg/proto/message_contents/frames.pb.go b/pkg/proto/message_contents/frames.pb.go
index c9f1e7b0..4e2e6bed 100644
--- a/pkg/proto/message_contents/frames.pb.go
+++ b/pkg/proto/message_contents/frames.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_contents/frames.proto
 
@@ -293,7 +293,7 @@ func file_message_contents_frames_proto_rawDescGZIP() []byte {
 }
 
 var file_message_contents_frames_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_message_contents_frames_proto_goTypes = []interface{}{
+var file_message_contents_frames_proto_goTypes = []any{
 	(*FrameActionBody)(nil),       // 0: xmtp.message_contents.FrameActionBody
 	(*FrameAction)(nil),           // 1: xmtp.message_contents.FrameAction
 	(*Signature)(nil),             // 2: xmtp.message_contents.Signature
@@ -317,7 +317,7 @@ func file_message_contents_frames_proto_init() {
 	file_message_contents_public_key_proto_init()
 	file_message_contents_signature_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_message_contents_frames_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_frames_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*FrameActionBody); i {
 			case 0:
 				return &v.state
@@ -329,7 +329,7 @@ func file_message_contents_frames_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_frames_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_frames_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*FrameAction); i {
 			case 0:
 				return &v.state
diff --git a/pkg/proto/message_contents/invitation.pb.go b/pkg/proto/message_contents/invitation.pb.go
index c5fcc331..979a3371 100644
--- a/pkg/proto/message_contents/invitation.pb.go
+++ b/pkg/proto/message_contents/invitation.pb.go
@@ -4,7 +4,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_contents/invitation.proto
 
@@ -665,7 +665,7 @@ func file_message_contents_invitation_proto_rawDescGZIP() []byte {
 
 var file_message_contents_invitation_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_message_contents_invitation_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
-var file_message_contents_invitation_proto_goTypes = []interface{}{
+var file_message_contents_invitation_proto_goTypes = []any{
 	(ConsentProofPayloadVersion)(0),          // 0: xmtp.message_contents.ConsentProofPayloadVersion
 	(*InvitationV1)(nil),                     // 1: xmtp.message_contents.InvitationV1
 	(*SealedInvitationHeaderV1)(nil),         // 2: xmtp.message_contents.SealedInvitationHeaderV1
@@ -703,7 +703,7 @@ func file_message_contents_invitation_proto_init() {
 	file_message_contents_ciphertext_proto_init()
 	file_message_contents_public_key_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_message_contents_invitation_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_invitation_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*InvitationV1); i {
 			case 0:
 				return &v.state
@@ -715,7 +715,7 @@ func file_message_contents_invitation_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_invitation_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_invitation_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*SealedInvitationHeaderV1); i {
 			case 0:
 				return &v.state
@@ -727,7 +727,7 @@ func file_message_contents_invitation_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_invitation_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_invitation_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*SealedInvitationV1); i {
 			case 0:
 				return &v.state
@@ -739,7 +739,7 @@ func file_message_contents_invitation_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_invitation_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_invitation_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*SealedInvitation); i {
 			case 0:
 				return &v.state
@@ -751,7 +751,7 @@ func file_message_contents_invitation_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_invitation_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_invitation_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*ConsentProofPayload); i {
 			case 0:
 				return &v.state
@@ -763,7 +763,7 @@ func file_message_contents_invitation_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_invitation_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_invitation_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*InvitationV1_Aes256GcmHkdfsha256); i {
 			case 0:
 				return &v.state
@@ -775,7 +775,7 @@ func file_message_contents_invitation_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_invitation_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_invitation_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*InvitationV1_Context); i {
 			case 0:
 				return &v.state
@@ -788,10 +788,10 @@ func file_message_contents_invitation_proto_init() {
 			}
 		}
 	}
-	file_message_contents_invitation_proto_msgTypes[0].OneofWrappers = []interface{}{
+	file_message_contents_invitation_proto_msgTypes[0].OneofWrappers = []any{
 		(*InvitationV1_Aes256GcmHkdfSha256)(nil),
 	}
-	file_message_contents_invitation_proto_msgTypes[3].OneofWrappers = []interface{}{
+	file_message_contents_invitation_proto_msgTypes[3].OneofWrappers = []any{
 		(*SealedInvitation_V1)(nil),
 	}
 	type x struct{}
diff --git a/pkg/proto/message_contents/message.pb.go b/pkg/proto/message_contents/message.pb.go
index 0735e9fc..b0ac159a 100644
--- a/pkg/proto/message_contents/message.pb.go
+++ b/pkg/proto/message_contents/message.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_contents/message.proto
 
@@ -583,7 +583,7 @@ func file_message_contents_message_proto_rawDescGZIP() []byte {
 }
 
 var file_message_contents_message_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
-var file_message_contents_message_proto_goTypes = []interface{}{
+var file_message_contents_message_proto_goTypes = []any{
 	(*MessageHeaderV1)(nil),       // 0: xmtp.message_contents.MessageHeaderV1
 	(*MessageV1)(nil),             // 1: xmtp.message_contents.MessageV1
 	(*MessageHeaderV2)(nil),       // 2: xmtp.message_contents.MessageHeaderV2
@@ -618,7 +618,7 @@ func file_message_contents_message_proto_init() {
 	file_message_contents_conversation_reference_proto_init()
 	file_message_contents_public_key_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_message_contents_message_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_message_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*MessageHeaderV1); i {
 			case 0:
 				return &v.state
@@ -630,7 +630,7 @@ func file_message_contents_message_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_message_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_message_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*MessageV1); i {
 			case 0:
 				return &v.state
@@ -642,7 +642,7 @@ func file_message_contents_message_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_message_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_message_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*MessageHeaderV2); i {
 			case 0:
 				return &v.state
@@ -654,7 +654,7 @@ func file_message_contents_message_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_message_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_message_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*MessageV2); i {
 			case 0:
 				return &v.state
@@ -666,7 +666,7 @@ func file_message_contents_message_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_message_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_message_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*Message); i {
 			case 0:
 				return &v.state
@@ -678,7 +678,7 @@ func file_message_contents_message_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_message_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_message_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*DecodedMessage); i {
 			case 0:
 				return &v.state
@@ -691,12 +691,12 @@ func file_message_contents_message_proto_init() {
 			}
 		}
 	}
-	file_message_contents_message_proto_msgTypes[3].OneofWrappers = []interface{}{}
-	file_message_contents_message_proto_msgTypes[4].OneofWrappers = []interface{}{
+	file_message_contents_message_proto_msgTypes[3].OneofWrappers = []any{}
+	file_message_contents_message_proto_msgTypes[4].OneofWrappers = []any{
 		(*Message_V1)(nil),
 		(*Message_V2)(nil),
 	}
-	file_message_contents_message_proto_msgTypes[5].OneofWrappers = []interface{}{}
+	file_message_contents_message_proto_msgTypes[5].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/pkg/proto/message_contents/private_key.pb.go b/pkg/proto/message_contents/private_key.pb.go
index 72540fe6..0607e9ae 100644
--- a/pkg/proto/message_contents/private_key.pb.go
+++ b/pkg/proto/message_contents/private_key.pb.go
@@ -5,7 +5,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_contents/private_key.proto
 
@@ -740,7 +740,7 @@ func file_message_contents_private_key_proto_rawDescGZIP() []byte {
 }
 
 var file_message_contents_private_key_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
-var file_message_contents_private_key_proto_goTypes = []interface{}{
+var file_message_contents_private_key_proto_goTypes = []any{
 	(*SignedPrivateKey)(nil),            // 0: xmtp.message_contents.SignedPrivateKey
 	(*PrivateKeyBundleV2)(nil),          // 1: xmtp.message_contents.PrivateKeyBundleV2
 	(*PrivateKey)(nil),                  // 2: xmtp.message_contents.PrivateKey
@@ -782,7 +782,7 @@ func file_message_contents_private_key_proto_init() {
 	file_message_contents_ciphertext_proto_init()
 	file_message_contents_public_key_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_message_contents_private_key_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_key_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*SignedPrivateKey); i {
 			case 0:
 				return &v.state
@@ -794,7 +794,7 @@ func file_message_contents_private_key_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_private_key_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_key_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*PrivateKeyBundleV2); i {
 			case 0:
 				return &v.state
@@ -806,7 +806,7 @@ func file_message_contents_private_key_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_private_key_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_key_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*PrivateKey); i {
 			case 0:
 				return &v.state
@@ -818,7 +818,7 @@ func file_message_contents_private_key_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_private_key_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_key_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*PrivateKeyBundleV1); i {
 			case 0:
 				return &v.state
@@ -830,7 +830,7 @@ func file_message_contents_private_key_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_private_key_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_key_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*PrivateKeyBundle); i {
 			case 0:
 				return &v.state
@@ -842,7 +842,7 @@ func file_message_contents_private_key_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_private_key_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_key_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*EncryptedPrivateKeyBundleV1); i {
 			case 0:
 				return &v.state
@@ -854,7 +854,7 @@ func file_message_contents_private_key_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_private_key_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_key_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*EncryptedPrivateKeyBundle); i {
 			case 0:
 				return &v.state
@@ -866,7 +866,7 @@ func file_message_contents_private_key_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_private_key_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_key_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*SignedPrivateKey_Secp256K1); i {
 			case 0:
 				return &v.state
@@ -878,7 +878,7 @@ func file_message_contents_private_key_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_private_key_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_key_proto_msgTypes[8].Exporter = func(v any, i int) any {
 			switch v := v.(*PrivateKey_Secp256K1); i {
 			case 0:
 				return &v.state
@@ -891,17 +891,17 @@ func file_message_contents_private_key_proto_init() {
 			}
 		}
 	}
-	file_message_contents_private_key_proto_msgTypes[0].OneofWrappers = []interface{}{
+	file_message_contents_private_key_proto_msgTypes[0].OneofWrappers = []any{
 		(*SignedPrivateKey_Secp256K1_)(nil),
 	}
-	file_message_contents_private_key_proto_msgTypes[2].OneofWrappers = []interface{}{
+	file_message_contents_private_key_proto_msgTypes[2].OneofWrappers = []any{
 		(*PrivateKey_Secp256K1_)(nil),
 	}
-	file_message_contents_private_key_proto_msgTypes[4].OneofWrappers = []interface{}{
+	file_message_contents_private_key_proto_msgTypes[4].OneofWrappers = []any{
 		(*PrivateKeyBundle_V1)(nil),
 		(*PrivateKeyBundle_V2)(nil),
 	}
-	file_message_contents_private_key_proto_msgTypes[6].OneofWrappers = []interface{}{
+	file_message_contents_private_key_proto_msgTypes[6].OneofWrappers = []any{
 		(*EncryptedPrivateKeyBundle_V1)(nil),
 	}
 	type x struct{}
diff --git a/pkg/proto/message_contents/private_preferences.pb.go b/pkg/proto/message_contents/private_preferences.pb.go
index 34aab2b3..800e9138 100644
--- a/pkg/proto/message_contents/private_preferences.pb.go
+++ b/pkg/proto/message_contents/private_preferences.pb.go
@@ -5,7 +5,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_contents/private_preferences.proto
 
@@ -435,7 +435,7 @@ type PrivatePreferencesAction_AllowGroup struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Add the given group_ids to the allow list
-	GroupIds [][]byte `protobuf:"bytes,1,rep,name=group_ids,json=groupIds,proto3" json:"group_ids,omitempty"`
+	GroupIds []string `protobuf:"bytes,1,rep,name=group_ids,json=groupIds,proto3" json:"group_ids,omitempty"`
 }
 
 func (x *PrivatePreferencesAction_AllowGroup) Reset() {
@@ -470,7 +470,7 @@ func (*PrivatePreferencesAction_AllowGroup) Descriptor() ([]byte, []int) {
 	return file_message_contents_private_preferences_proto_rawDescGZIP(), []int{0, 4}
 }
 
-func (x *PrivatePreferencesAction_AllowGroup) GetGroupIds() [][]byte {
+func (x *PrivatePreferencesAction_AllowGroup) GetGroupIds() []string {
 	if x != nil {
 		return x.GroupIds
 	}
@@ -484,7 +484,7 @@ type PrivatePreferencesAction_DenyGroup struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Add the given group_ids to the deny list
-	GroupIds [][]byte `protobuf:"bytes,1,rep,name=group_ids,json=groupIds,proto3" json:"group_ids,omitempty"`
+	GroupIds []string `protobuf:"bytes,1,rep,name=group_ids,json=groupIds,proto3" json:"group_ids,omitempty"`
 }
 
 func (x *PrivatePreferencesAction_DenyGroup) Reset() {
@@ -519,7 +519,7 @@ func (*PrivatePreferencesAction_DenyGroup) Descriptor() ([]byte, []int) {
 	return file_message_contents_private_preferences_proto_rawDescGZIP(), []int{0, 5}
 }
 
-func (x *PrivatePreferencesAction_DenyGroup) GetGroupIds() [][]byte {
+func (x *PrivatePreferencesAction_DenyGroup) GetGroupIds() []string {
 	if x != nil {
 		return x.GroupIds
 	}
@@ -588,10 +588,10 @@ var file_message_contents_private_preferences_proto_rawDesc = []byte{
 	0x1b, 0x0a, 0x09, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03,
 	0x28, 0x09, 0x52, 0x08, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x49, 0x64, 0x73, 0x1a, 0x29, 0x0a, 0x0a,
 	0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x1b, 0x0a, 0x09, 0x67, 0x72,
-	0x6f, 0x75, 0x70, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x08, 0x67,
+	0x6f, 0x75, 0x70, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x67,
 	0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x73, 0x1a, 0x28, 0x0a, 0x09, 0x44, 0x65, 0x6e, 0x79, 0x47,
 	0x72, 0x6f, 0x75, 0x70, 0x12, 0x1b, 0x0a, 0x09, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x69, 0x64,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x08, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64,
 	0x73, 0x42, 0x0e, 0x0a, 0x0c, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x74, 0x79, 0x70,
 	0x65, 0x22, 0x5b, 0x0a, 0x19, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x50, 0x72, 0x65, 0x66,
 	0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x33,
@@ -629,7 +629,7 @@ func file_message_contents_private_preferences_proto_rawDescGZIP() []byte {
 }
 
 var file_message_contents_private_preferences_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
-var file_message_contents_private_preferences_proto_goTypes = []interface{}{
+var file_message_contents_private_preferences_proto_goTypes = []any{
 	(*PrivatePreferencesAction)(nil),              // 0: xmtp.message_contents.PrivatePreferencesAction
 	(*PrivatePreferencesPayload)(nil),             // 1: xmtp.message_contents.PrivatePreferencesPayload
 	(*PrivatePreferencesAction_AllowAddress)(nil), // 2: xmtp.message_contents.PrivatePreferencesAction.AllowAddress
@@ -662,7 +662,7 @@ func file_message_contents_private_preferences_proto_init() {
 	}
 	file_message_contents_ciphertext_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_message_contents_private_preferences_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_preferences_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*PrivatePreferencesAction); i {
 			case 0:
 				return &v.state
@@ -674,7 +674,7 @@ func file_message_contents_private_preferences_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_private_preferences_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_preferences_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*PrivatePreferencesPayload); i {
 			case 0:
 				return &v.state
@@ -686,7 +686,7 @@ func file_message_contents_private_preferences_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_private_preferences_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_preferences_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*PrivatePreferencesAction_AllowAddress); i {
 			case 0:
 				return &v.state
@@ -698,7 +698,7 @@ func file_message_contents_private_preferences_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_private_preferences_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_preferences_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*PrivatePreferencesAction_DenyAddress); i {
 			case 0:
 				return &v.state
@@ -710,7 +710,7 @@ func file_message_contents_private_preferences_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_private_preferences_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_preferences_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*PrivatePreferencesAction_AllowInboxId); i {
 			case 0:
 				return &v.state
@@ -722,7 +722,7 @@ func file_message_contents_private_preferences_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_private_preferences_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_preferences_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*PrivatePreferencesAction_DenyInboxId); i {
 			case 0:
 				return &v.state
@@ -734,7 +734,7 @@ func file_message_contents_private_preferences_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_private_preferences_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_preferences_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*PrivatePreferencesAction_AllowGroup); i {
 			case 0:
 				return &v.state
@@ -746,7 +746,7 @@ func file_message_contents_private_preferences_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_private_preferences_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_private_preferences_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*PrivatePreferencesAction_DenyGroup); i {
 			case 0:
 				return &v.state
@@ -759,7 +759,7 @@ func file_message_contents_private_preferences_proto_init() {
 			}
 		}
 	}
-	file_message_contents_private_preferences_proto_msgTypes[0].OneofWrappers = []interface{}{
+	file_message_contents_private_preferences_proto_msgTypes[0].OneofWrappers = []any{
 		(*PrivatePreferencesAction_AllowAddress_)(nil),
 		(*PrivatePreferencesAction_DenyAddress_)(nil),
 		(*PrivatePreferencesAction_AllowGroup_)(nil),
@@ -767,7 +767,7 @@ func file_message_contents_private_preferences_proto_init() {
 		(*PrivatePreferencesAction_AllowInboxId_)(nil),
 		(*PrivatePreferencesAction_DenyInboxId_)(nil),
 	}
-	file_message_contents_private_preferences_proto_msgTypes[1].OneofWrappers = []interface{}{
+	file_message_contents_private_preferences_proto_msgTypes[1].OneofWrappers = []any{
 		(*PrivatePreferencesPayload_V1)(nil),
 	}
 	type x struct{}
diff --git a/pkg/proto/message_contents/public_key.pb.go b/pkg/proto/message_contents/public_key.pb.go
index 2062f960..644eafdf 100644
--- a/pkg/proto/message_contents/public_key.pb.go
+++ b/pkg/proto/message_contents/public_key.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_contents/public_key.proto
 
@@ -554,7 +554,7 @@ func file_message_contents_public_key_proto_rawDescGZIP() []byte {
 }
 
 var file_message_contents_public_key_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
-var file_message_contents_public_key_proto_goTypes = []interface{}{
+var file_message_contents_public_key_proto_goTypes = []any{
 	(*UnsignedPublicKey)(nil),                       // 0: xmtp.message_contents.UnsignedPublicKey
 	(*SignedPublicKey)(nil),                         // 1: xmtp.message_contents.SignedPublicKey
 	(*SignedPublicKeyBundle)(nil),                   // 2: xmtp.message_contents.SignedPublicKeyBundle
@@ -587,7 +587,7 @@ func file_message_contents_public_key_proto_init() {
 	}
 	file_message_contents_signature_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_message_contents_public_key_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_public_key_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*UnsignedPublicKey); i {
 			case 0:
 				return &v.state
@@ -599,7 +599,7 @@ func file_message_contents_public_key_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_public_key_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_public_key_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*SignedPublicKey); i {
 			case 0:
 				return &v.state
@@ -611,7 +611,7 @@ func file_message_contents_public_key_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_public_key_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_public_key_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*SignedPublicKeyBundle); i {
 			case 0:
 				return &v.state
@@ -623,7 +623,7 @@ func file_message_contents_public_key_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_public_key_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_public_key_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*PublicKey); i {
 			case 0:
 				return &v.state
@@ -635,7 +635,7 @@ func file_message_contents_public_key_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_public_key_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_public_key_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*PublicKeyBundle); i {
 			case 0:
 				return &v.state
@@ -647,7 +647,7 @@ func file_message_contents_public_key_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_public_key_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_public_key_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*UnsignedPublicKey_Secp256K1Uncompressed); i {
 			case 0:
 				return &v.state
@@ -659,7 +659,7 @@ func file_message_contents_public_key_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_public_key_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_public_key_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*PublicKey_Secp256K1Uncompressed); i {
 			case 0:
 				return &v.state
@@ -672,10 +672,10 @@ func file_message_contents_public_key_proto_init() {
 			}
 		}
 	}
-	file_message_contents_public_key_proto_msgTypes[0].OneofWrappers = []interface{}{
+	file_message_contents_public_key_proto_msgTypes[0].OneofWrappers = []any{
 		(*UnsignedPublicKey_Secp256K1Uncompressed_)(nil),
 	}
-	file_message_contents_public_key_proto_msgTypes[3].OneofWrappers = []interface{}{
+	file_message_contents_public_key_proto_msgTypes[3].OneofWrappers = []any{
 		(*PublicKey_Secp256K1Uncompressed_)(nil),
 	}
 	type x struct{}
diff --git a/pkg/proto/message_contents/signature.pb.go b/pkg/proto/message_contents/signature.pb.go
index 75c472a1..331a86ed 100644
--- a/pkg/proto/message_contents/signature.pb.go
+++ b/pkg/proto/message_contents/signature.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_contents/signature.proto
 
@@ -278,7 +278,7 @@ func file_message_contents_signature_proto_rawDescGZIP() []byte {
 }
 
 var file_message_contents_signature_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_message_contents_signature_proto_goTypes = []interface{}{
+var file_message_contents_signature_proto_goTypes = []any{
 	(*Signature)(nil),                    // 0: xmtp.message_contents.Signature
 	(*Signature_ECDSACompact)(nil),       // 1: xmtp.message_contents.Signature.ECDSACompact
 	(*Signature_WalletECDSACompact)(nil), // 2: xmtp.message_contents.Signature.WalletECDSACompact
@@ -299,7 +299,7 @@ func file_message_contents_signature_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_message_contents_signature_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_signature_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*Signature); i {
 			case 0:
 				return &v.state
@@ -311,7 +311,7 @@ func file_message_contents_signature_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_signature_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_signature_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*Signature_ECDSACompact); i {
 			case 0:
 				return &v.state
@@ -323,7 +323,7 @@ func file_message_contents_signature_proto_init() {
 				return nil
 			}
 		}
-		file_message_contents_signature_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_signature_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*Signature_WalletECDSACompact); i {
 			case 0:
 				return &v.state
@@ -336,7 +336,7 @@ func file_message_contents_signature_proto_init() {
 			}
 		}
 	}
-	file_message_contents_signature_proto_msgTypes[0].OneofWrappers = []interface{}{
+	file_message_contents_signature_proto_msgTypes[0].OneofWrappers = []any{
 		(*Signature_EcdsaCompact)(nil),
 		(*Signature_WalletEcdsaCompact)(nil),
 	}
diff --git a/pkg/proto/message_contents/signed_payload.pb.go b/pkg/proto/message_contents/signed_payload.pb.go
index d0b709ba..6b6bc702 100644
--- a/pkg/proto/message_contents/signed_payload.pb.go
+++ b/pkg/proto/message_contents/signed_payload.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: message_contents/signed_payload.proto
 
@@ -123,7 +123,7 @@ func file_message_contents_signed_payload_proto_rawDescGZIP() []byte {
 }
 
 var file_message_contents_signed_payload_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_message_contents_signed_payload_proto_goTypes = []interface{}{
+var file_message_contents_signed_payload_proto_goTypes = []any{
 	(*SignedPayload)(nil), // 0: xmtp.message_contents.SignedPayload
 	(*Signature)(nil),     // 1: xmtp.message_contents.Signature
 }
@@ -143,7 +143,7 @@ func file_message_contents_signed_payload_proto_init() {
 	}
 	file_message_contents_signature_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_message_contents_signed_payload_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_message_contents_signed_payload_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*SignedPayload); i {
 			case 0:
 				return &v.state
diff --git a/pkg/proto/mls/api/v1/mls.pb.go b/pkg/proto/mls/api/v1/mls.pb.go
index 8be36b51..92cb491b 100644
--- a/pkg/proto/mls/api/v1/mls.pb.go
+++ b/pkg/proto/mls/api/v1/mls.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: mls/api/v1/mls.proto
 
@@ -1536,7 +1536,7 @@ type GroupMessageInput_V1 struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Data       []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
+	Data       []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` // Serialized MlsProtocolMessage
 	SenderHmac []byte `protobuf:"bytes,2,opt,name=sender_hmac,json=senderHmac,proto3" json:"sender_hmac,omitempty"`
 }
 
@@ -2376,7 +2376,7 @@ func file_mls_api_v1_mls_proto_rawDescGZIP() []byte {
 
 var file_mls_api_v1_mls_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_mls_api_v1_mls_proto_msgTypes = make([]protoimpl.MessageInfo, 33)
-var file_mls_api_v1_mls_proto_goTypes = []interface{}{
+var file_mls_api_v1_mls_proto_goTypes = []any{
 	(SortDirection)(0),                                           // 0: xmtp.mls.api.v1.SortDirection
 	(*WelcomeMessage)(nil),                                       // 1: xmtp.mls.api.v1.WelcomeMessage
 	(*WelcomeMessageInput)(nil),                                  // 2: xmtp.mls.api.v1.WelcomeMessageInput
@@ -2473,7 +2473,7 @@ func file_mls_api_v1_mls_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_mls_api_v1_mls_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*WelcomeMessage); i {
 			case 0:
 				return &v.state
@@ -2485,7 +2485,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*WelcomeMessageInput); i {
 			case 0:
 				return &v.state
@@ -2497,7 +2497,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*GroupMessage); i {
 			case 0:
 				return &v.state
@@ -2509,7 +2509,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*GroupMessageInput); i {
 			case 0:
 				return &v.state
@@ -2521,7 +2521,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*SendGroupMessagesRequest); i {
 			case 0:
 				return &v.state
@@ -2533,7 +2533,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*SendWelcomeMessagesRequest); i {
 			case 0:
 				return &v.state
@@ -2545,7 +2545,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*KeyPackageUpload); i {
 			case 0:
 				return &v.state
@@ -2557,7 +2557,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*RegisterInstallationRequest); i {
 			case 0:
 				return &v.state
@@ -2569,7 +2569,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[8].Exporter = func(v any, i int) any {
 			switch v := v.(*RegisterInstallationResponse); i {
 			case 0:
 				return &v.state
@@ -2581,7 +2581,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[9].Exporter = func(v any, i int) any {
 			switch v := v.(*UploadKeyPackageRequest); i {
 			case 0:
 				return &v.state
@@ -2593,7 +2593,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[10].Exporter = func(v any, i int) any {
 			switch v := v.(*FetchKeyPackagesRequest); i {
 			case 0:
 				return &v.state
@@ -2605,7 +2605,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[11].Exporter = func(v any, i int) any {
 			switch v := v.(*FetchKeyPackagesResponse); i {
 			case 0:
 				return &v.state
@@ -2617,7 +2617,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[12].Exporter = func(v any, i int) any {
 			switch v := v.(*RevokeInstallationRequest); i {
 			case 0:
 				return &v.state
@@ -2629,7 +2629,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[13].Exporter = func(v any, i int) any {
 			switch v := v.(*GetIdentityUpdatesRequest); i {
 			case 0:
 				return &v.state
@@ -2641,7 +2641,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[14].Exporter = func(v any, i int) any {
 			switch v := v.(*GetIdentityUpdatesResponse); i {
 			case 0:
 				return &v.state
@@ -2653,7 +2653,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[15].Exporter = func(v any, i int) any {
 			switch v := v.(*PagingInfo); i {
 			case 0:
 				return &v.state
@@ -2665,7 +2665,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[16].Exporter = func(v any, i int) any {
 			switch v := v.(*QueryGroupMessagesRequest); i {
 			case 0:
 				return &v.state
@@ -2677,7 +2677,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[17].Exporter = func(v any, i int) any {
 			switch v := v.(*QueryGroupMessagesResponse); i {
 			case 0:
 				return &v.state
@@ -2689,7 +2689,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[18].Exporter = func(v any, i int) any {
 			switch v := v.(*QueryWelcomeMessagesRequest); i {
 			case 0:
 				return &v.state
@@ -2701,7 +2701,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[19].Exporter = func(v any, i int) any {
 			switch v := v.(*QueryWelcomeMessagesResponse); i {
 			case 0:
 				return &v.state
@@ -2713,7 +2713,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[20].Exporter = func(v any, i int) any {
 			switch v := v.(*SubscribeGroupMessagesRequest); i {
 			case 0:
 				return &v.state
@@ -2725,7 +2725,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[21].Exporter = func(v any, i int) any {
 			switch v := v.(*SubscribeWelcomeMessagesRequest); i {
 			case 0:
 				return &v.state
@@ -2737,7 +2737,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[22].Exporter = func(v any, i int) any {
 			switch v := v.(*WelcomeMessage_V1); i {
 			case 0:
 				return &v.state
@@ -2749,7 +2749,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[23].Exporter = func(v any, i int) any {
 			switch v := v.(*WelcomeMessageInput_V1); i {
 			case 0:
 				return &v.state
@@ -2761,7 +2761,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[24].Exporter = func(v any, i int) any {
 			switch v := v.(*GroupMessage_V1); i {
 			case 0:
 				return &v.state
@@ -2773,7 +2773,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[25].Exporter = func(v any, i int) any {
 			switch v := v.(*GroupMessageInput_V1); i {
 			case 0:
 				return &v.state
@@ -2785,7 +2785,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[26].Exporter = func(v any, i int) any {
 			switch v := v.(*FetchKeyPackagesResponse_KeyPackage); i {
 			case 0:
 				return &v.state
@@ -2797,7 +2797,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[27].Exporter = func(v any, i int) any {
 			switch v := v.(*GetIdentityUpdatesResponse_NewInstallationUpdate); i {
 			case 0:
 				return &v.state
@@ -2809,7 +2809,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[28].Exporter = func(v any, i int) any {
 			switch v := v.(*GetIdentityUpdatesResponse_RevokedInstallationUpdate); i {
 			case 0:
 				return &v.state
@@ -2821,7 +2821,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[29].Exporter = func(v any, i int) any {
 			switch v := v.(*GetIdentityUpdatesResponse_Update); i {
 			case 0:
 				return &v.state
@@ -2833,7 +2833,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[30].Exporter = func(v any, i int) any {
 			switch v := v.(*GetIdentityUpdatesResponse_WalletUpdates); i {
 			case 0:
 				return &v.state
@@ -2845,7 +2845,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[31].Exporter = func(v any, i int) any {
 			switch v := v.(*SubscribeGroupMessagesRequest_Filter); i {
 			case 0:
 				return &v.state
@@ -2857,7 +2857,7 @@ func file_mls_api_v1_mls_proto_init() {
 				return nil
 			}
 		}
-		file_mls_api_v1_mls_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_api_v1_mls_proto_msgTypes[32].Exporter = func(v any, i int) any {
 			switch v := v.(*SubscribeWelcomeMessagesRequest_Filter); i {
 			case 0:
 				return &v.state
@@ -2870,19 +2870,19 @@ func file_mls_api_v1_mls_proto_init() {
 			}
 		}
 	}
-	file_mls_api_v1_mls_proto_msgTypes[0].OneofWrappers = []interface{}{
+	file_mls_api_v1_mls_proto_msgTypes[0].OneofWrappers = []any{
 		(*WelcomeMessage_V1_)(nil),
 	}
-	file_mls_api_v1_mls_proto_msgTypes[1].OneofWrappers = []interface{}{
+	file_mls_api_v1_mls_proto_msgTypes[1].OneofWrappers = []any{
 		(*WelcomeMessageInput_V1_)(nil),
 	}
-	file_mls_api_v1_mls_proto_msgTypes[2].OneofWrappers = []interface{}{
+	file_mls_api_v1_mls_proto_msgTypes[2].OneofWrappers = []any{
 		(*GroupMessage_V1_)(nil),
 	}
-	file_mls_api_v1_mls_proto_msgTypes[3].OneofWrappers = []interface{}{
+	file_mls_api_v1_mls_proto_msgTypes[3].OneofWrappers = []any{
 		(*GroupMessageInput_V1_)(nil),
 	}
-	file_mls_api_v1_mls_proto_msgTypes[29].OneofWrappers = []interface{}{
+	file_mls_api_v1_mls_proto_msgTypes[29].OneofWrappers = []any{
 		(*GetIdentityUpdatesResponse_Update_NewInstallation)(nil),
 		(*GetIdentityUpdatesResponse_Update_RevokedInstallation)(nil),
 	}
diff --git a/pkg/proto/mls/database/intents.pb.go b/pkg/proto/mls/database/intents.pb.go
index c052ff6d..518bc240 100644
--- a/pkg/proto/mls/database/intents.pb.go
+++ b/pkg/proto/mls/database/intents.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: mls/database/intents.proto
 
@@ -78,6 +78,121 @@ func (AdminListUpdateType) EnumDescriptor() ([]byte, []int) {
 	return file_mls_database_intents_proto_rawDescGZIP(), []int{0}
 }
 
+// Type of Permission to Update
+type PermissionUpdateType int32
+
+const (
+	PermissionUpdateType_PERMISSION_UPDATE_TYPE_UNSPECIFIED     PermissionUpdateType = 0
+	PermissionUpdateType_PERMISSION_UPDATE_TYPE_ADD_MEMBER      PermissionUpdateType = 1
+	PermissionUpdateType_PERMISSION_UPDATE_TYPE_REMOVE_MEMBER   PermissionUpdateType = 2
+	PermissionUpdateType_PERMISSION_UPDATE_TYPE_ADD_ADMIN       PermissionUpdateType = 3
+	PermissionUpdateType_PERMISSION_UPDATE_TYPE_REMOVE_ADMIN    PermissionUpdateType = 4
+	PermissionUpdateType_PERMISSION_UPDATE_TYPE_UPDATE_METADATA PermissionUpdateType = 5
+)
+
+// Enum value maps for PermissionUpdateType.
+var (
+	PermissionUpdateType_name = map[int32]string{
+		0: "PERMISSION_UPDATE_TYPE_UNSPECIFIED",
+		1: "PERMISSION_UPDATE_TYPE_ADD_MEMBER",
+		2: "PERMISSION_UPDATE_TYPE_REMOVE_MEMBER",
+		3: "PERMISSION_UPDATE_TYPE_ADD_ADMIN",
+		4: "PERMISSION_UPDATE_TYPE_REMOVE_ADMIN",
+		5: "PERMISSION_UPDATE_TYPE_UPDATE_METADATA",
+	}
+	PermissionUpdateType_value = map[string]int32{
+		"PERMISSION_UPDATE_TYPE_UNSPECIFIED":     0,
+		"PERMISSION_UPDATE_TYPE_ADD_MEMBER":      1,
+		"PERMISSION_UPDATE_TYPE_REMOVE_MEMBER":   2,
+		"PERMISSION_UPDATE_TYPE_ADD_ADMIN":       3,
+		"PERMISSION_UPDATE_TYPE_REMOVE_ADMIN":    4,
+		"PERMISSION_UPDATE_TYPE_UPDATE_METADATA": 5,
+	}
+)
+
+func (x PermissionUpdateType) Enum() *PermissionUpdateType {
+	p := new(PermissionUpdateType)
+	*p = x
+	return p
+}
+
+func (x PermissionUpdateType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (PermissionUpdateType) Descriptor() protoreflect.EnumDescriptor {
+	return file_mls_database_intents_proto_enumTypes[1].Descriptor()
+}
+
+func (PermissionUpdateType) Type() protoreflect.EnumType {
+	return &file_mls_database_intents_proto_enumTypes[1]
+}
+
+func (x PermissionUpdateType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use PermissionUpdateType.Descriptor instead.
+func (PermissionUpdateType) EnumDescriptor() ([]byte, []int) {
+	return file_mls_database_intents_proto_rawDescGZIP(), []int{1}
+}
+
+// Permission Policy
+type PermissionPolicyOption int32
+
+const (
+	PermissionPolicyOption_PERMISSION_POLICY_OPTION_UNSPECIFIED      PermissionPolicyOption = 0
+	PermissionPolicyOption_PERMISSION_POLICY_OPTION_ALLOW            PermissionPolicyOption = 1
+	PermissionPolicyOption_PERMISSION_POLICY_OPTION_DENY             PermissionPolicyOption = 2
+	PermissionPolicyOption_PERMISSION_POLICY_OPTION_ADMIN_ONLY       PermissionPolicyOption = 3
+	PermissionPolicyOption_PERMISSION_POLICY_OPTION_SUPER_ADMIN_ONLY PermissionPolicyOption = 4
+)
+
+// Enum value maps for PermissionPolicyOption.
+var (
+	PermissionPolicyOption_name = map[int32]string{
+		0: "PERMISSION_POLICY_OPTION_UNSPECIFIED",
+		1: "PERMISSION_POLICY_OPTION_ALLOW",
+		2: "PERMISSION_POLICY_OPTION_DENY",
+		3: "PERMISSION_POLICY_OPTION_ADMIN_ONLY",
+		4: "PERMISSION_POLICY_OPTION_SUPER_ADMIN_ONLY",
+	}
+	PermissionPolicyOption_value = map[string]int32{
+		"PERMISSION_POLICY_OPTION_UNSPECIFIED":      0,
+		"PERMISSION_POLICY_OPTION_ALLOW":            1,
+		"PERMISSION_POLICY_OPTION_DENY":             2,
+		"PERMISSION_POLICY_OPTION_ADMIN_ONLY":       3,
+		"PERMISSION_POLICY_OPTION_SUPER_ADMIN_ONLY": 4,
+	}
+)
+
+func (x PermissionPolicyOption) Enum() *PermissionPolicyOption {
+	p := new(PermissionPolicyOption)
+	*p = x
+	return p
+}
+
+func (x PermissionPolicyOption) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (PermissionPolicyOption) Descriptor() protoreflect.EnumDescriptor {
+	return file_mls_database_intents_proto_enumTypes[2].Descriptor()
+}
+
+func (PermissionPolicyOption) Type() protoreflect.EnumType {
+	return &file_mls_database_intents_proto_enumTypes[2]
+}
+
+func (x PermissionPolicyOption) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use PermissionPolicyOption.Descriptor instead.
+func (PermissionPolicyOption) EnumDescriptor() ([]byte, []int) {
+	return file_mls_database_intents_proto_rawDescGZIP(), []int{2}
+}
+
 // The data required to publish a message
 type SendMessageData struct {
 	state         protoimpl.MessageState
@@ -667,6 +782,74 @@ type UpdateAdminListsData_V1_ struct {
 
 func (*UpdateAdminListsData_V1_) isUpdateAdminListsData_Version() {}
 
+// The data required to update permissions
+type UpdatePermissionData struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Types that are assignable to Version:
+	//
+	//	*UpdatePermissionData_V1_
+	Version isUpdatePermissionData_Version `protobuf_oneof:"version"`
+}
+
+func (x *UpdatePermissionData) Reset() {
+	*x = UpdatePermissionData{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_mls_database_intents_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UpdatePermissionData) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UpdatePermissionData) ProtoMessage() {}
+
+func (x *UpdatePermissionData) ProtoReflect() protoreflect.Message {
+	mi := &file_mls_database_intents_proto_msgTypes[9]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UpdatePermissionData.ProtoReflect.Descriptor instead.
+func (*UpdatePermissionData) Descriptor() ([]byte, []int) {
+	return file_mls_database_intents_proto_rawDescGZIP(), []int{9}
+}
+
+func (m *UpdatePermissionData) GetVersion() isUpdatePermissionData_Version {
+	if m != nil {
+		return m.Version
+	}
+	return nil
+}
+
+func (x *UpdatePermissionData) GetV1() *UpdatePermissionData_V1 {
+	if x, ok := x.GetVersion().(*UpdatePermissionData_V1_); ok {
+		return x.V1
+	}
+	return nil
+}
+
+type isUpdatePermissionData_Version interface {
+	isUpdatePermissionData_Version()
+}
+
+type UpdatePermissionData_V1_ struct {
+	V1 *UpdatePermissionData_V1 `protobuf:"bytes,1,opt,name=v1,proto3,oneof"`
+}
+
+func (*UpdatePermissionData_V1_) isUpdatePermissionData_Version() {}
+
 // Generic data-type for all post-commit actions
 type PostCommitAction struct {
 	state         protoimpl.MessageState
@@ -682,7 +865,7 @@ type PostCommitAction struct {
 func (x *PostCommitAction) Reset() {
 	*x = PostCommitAction{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[9]
+		mi := &file_mls_database_intents_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -695,7 +878,7 @@ func (x *PostCommitAction) String() string {
 func (*PostCommitAction) ProtoMessage() {}
 
 func (x *PostCommitAction) ProtoReflect() protoreflect.Message {
-	mi := &file_mls_database_intents_proto_msgTypes[9]
+	mi := &file_mls_database_intents_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -708,7 +891,7 @@ func (x *PostCommitAction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PostCommitAction.ProtoReflect.Descriptor instead.
 func (*PostCommitAction) Descriptor() ([]byte, []int) {
-	return file_mls_database_intents_proto_rawDescGZIP(), []int{9}
+	return file_mls_database_intents_proto_rawDescGZIP(), []int{10}
 }
 
 func (m *PostCommitAction) GetKind() isPostCommitAction_Kind {
@@ -747,7 +930,7 @@ type SendMessageData_V1 struct {
 func (x *SendMessageData_V1) Reset() {
 	*x = SendMessageData_V1{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[10]
+		mi := &file_mls_database_intents_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -760,7 +943,7 @@ func (x *SendMessageData_V1) String() string {
 func (*SendMessageData_V1) ProtoMessage() {}
 
 func (x *SendMessageData_V1) ProtoReflect() protoreflect.Message {
-	mi := &file_mls_database_intents_proto_msgTypes[10]
+	mi := &file_mls_database_intents_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -795,7 +978,7 @@ type AddMembersData_V1 struct {
 func (x *AddMembersData_V1) Reset() {
 	*x = AddMembersData_V1{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[11]
+		mi := &file_mls_database_intents_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -808,7 +991,7 @@ func (x *AddMembersData_V1) String() string {
 func (*AddMembersData_V1) ProtoMessage() {}
 
 func (x *AddMembersData_V1) ProtoReflect() protoreflect.Message {
-	mi := &file_mls_database_intents_proto_msgTypes[11]
+	mi := &file_mls_database_intents_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -843,7 +1026,7 @@ type RemoveMembersData_V1 struct {
 func (x *RemoveMembersData_V1) Reset() {
 	*x = RemoveMembersData_V1{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[12]
+		mi := &file_mls_database_intents_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -856,7 +1039,7 @@ func (x *RemoveMembersData_V1) String() string {
 func (*RemoveMembersData_V1) ProtoMessage() {}
 
 func (x *RemoveMembersData_V1) ProtoReflect() protoreflect.Message {
-	mi := &file_mls_database_intents_proto_msgTypes[12]
+	mi := &file_mls_database_intents_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -894,7 +1077,7 @@ type UpdateGroupMembershipData_V1 struct {
 func (x *UpdateGroupMembershipData_V1) Reset() {
 	*x = UpdateGroupMembershipData_V1{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[13]
+		mi := &file_mls_database_intents_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -907,7 +1090,7 @@ func (x *UpdateGroupMembershipData_V1) String() string {
 func (*UpdateGroupMembershipData_V1) ProtoMessage() {}
 
 func (x *UpdateGroupMembershipData_V1) ProtoReflect() protoreflect.Message {
-	mi := &file_mls_database_intents_proto_msgTypes[13]
+	mi := &file_mls_database_intents_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -950,7 +1133,7 @@ type UpdateMetadataData_V1 struct {
 func (x *UpdateMetadataData_V1) Reset() {
 	*x = UpdateMetadataData_V1{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[15]
+		mi := &file_mls_database_intents_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -963,7 +1146,7 @@ func (x *UpdateMetadataData_V1) String() string {
 func (*UpdateMetadataData_V1) ProtoMessage() {}
 
 func (x *UpdateMetadataData_V1) ProtoReflect() protoreflect.Message {
-	mi := &file_mls_database_intents_proto_msgTypes[15]
+	mi := &file_mls_database_intents_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1006,7 +1189,7 @@ type UpdateAdminListsData_V1 struct {
 func (x *UpdateAdminListsData_V1) Reset() {
 	*x = UpdateAdminListsData_V1{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[16]
+		mi := &file_mls_database_intents_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1019,7 +1202,7 @@ func (x *UpdateAdminListsData_V1) String() string {
 func (*UpdateAdminListsData_V1) ProtoMessage() {}
 
 func (x *UpdateAdminListsData_V1) ProtoReflect() protoreflect.Message {
-	mi := &file_mls_database_intents_proto_msgTypes[16]
+	mi := &file_mls_database_intents_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1049,6 +1232,71 @@ func (x *UpdateAdminListsData_V1) GetInboxId() string {
 	return ""
 }
 
+// V1 of UpdatePermissionData
+type UpdatePermissionData_V1 struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	PermissionUpdateType   PermissionUpdateType   `protobuf:"varint,1,opt,name=permission_update_type,json=permissionUpdateType,proto3,enum=xmtp.mls.database.PermissionUpdateType" json:"permission_update_type,omitempty"`
+	PermissionPolicyOption PermissionPolicyOption `protobuf:"varint,2,opt,name=permission_policy_option,json=permissionPolicyOption,proto3,enum=xmtp.mls.database.PermissionPolicyOption" json:"permission_policy_option,omitempty"`
+	// Metadata permissions update specify which field permission they are updating
+	MetadataFieldName *string `protobuf:"bytes,3,opt,name=metadata_field_name,json=metadataFieldName,proto3,oneof" json:"metadata_field_name,omitempty"`
+}
+
+func (x *UpdatePermissionData_V1) Reset() {
+	*x = UpdatePermissionData_V1{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_mls_database_intents_proto_msgTypes[18]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UpdatePermissionData_V1) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UpdatePermissionData_V1) ProtoMessage() {}
+
+func (x *UpdatePermissionData_V1) ProtoReflect() protoreflect.Message {
+	mi := &file_mls_database_intents_proto_msgTypes[18]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UpdatePermissionData_V1.ProtoReflect.Descriptor instead.
+func (*UpdatePermissionData_V1) Descriptor() ([]byte, []int) {
+	return file_mls_database_intents_proto_rawDescGZIP(), []int{9, 0}
+}
+
+func (x *UpdatePermissionData_V1) GetPermissionUpdateType() PermissionUpdateType {
+	if x != nil {
+		return x.PermissionUpdateType
+	}
+	return PermissionUpdateType_PERMISSION_UPDATE_TYPE_UNSPECIFIED
+}
+
+func (x *UpdatePermissionData_V1) GetPermissionPolicyOption() PermissionPolicyOption {
+	if x != nil {
+		return x.PermissionPolicyOption
+	}
+	return PermissionPolicyOption_PERMISSION_POLICY_OPTION_UNSPECIFIED
+}
+
+func (x *UpdatePermissionData_V1) GetMetadataFieldName() string {
+	if x != nil && x.MetadataFieldName != nil {
+		return *x.MetadataFieldName
+	}
+	return ""
+}
+
 // An installation
 type PostCommitAction_Installation struct {
 	state         protoimpl.MessageState
@@ -1062,7 +1310,7 @@ type PostCommitAction_Installation struct {
 func (x *PostCommitAction_Installation) Reset() {
 	*x = PostCommitAction_Installation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[17]
+		mi := &file_mls_database_intents_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1075,7 +1323,7 @@ func (x *PostCommitAction_Installation) String() string {
 func (*PostCommitAction_Installation) ProtoMessage() {}
 
 func (x *PostCommitAction_Installation) ProtoReflect() protoreflect.Message {
-	mi := &file_mls_database_intents_proto_msgTypes[17]
+	mi := &file_mls_database_intents_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1088,7 +1336,7 @@ func (x *PostCommitAction_Installation) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PostCommitAction_Installation.ProtoReflect.Descriptor instead.
 func (*PostCommitAction_Installation) Descriptor() ([]byte, []int) {
-	return file_mls_database_intents_proto_rawDescGZIP(), []int{9, 0}
+	return file_mls_database_intents_proto_rawDescGZIP(), []int{10, 0}
 }
 
 func (x *PostCommitAction_Installation) GetInstallationKey() []byte {
@@ -1118,7 +1366,7 @@ type PostCommitAction_SendWelcomes struct {
 func (x *PostCommitAction_SendWelcomes) Reset() {
 	*x = PostCommitAction_SendWelcomes{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[18]
+		mi := &file_mls_database_intents_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1131,7 +1379,7 @@ func (x *PostCommitAction_SendWelcomes) String() string {
 func (*PostCommitAction_SendWelcomes) ProtoMessage() {}
 
 func (x *PostCommitAction_SendWelcomes) ProtoReflect() protoreflect.Message {
-	mi := &file_mls_database_intents_proto_msgTypes[18]
+	mi := &file_mls_database_intents_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1144,7 +1392,7 @@ func (x *PostCommitAction_SendWelcomes) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PostCommitAction_SendWelcomes.ProtoReflect.Descriptor instead.
 func (*PostCommitAction_SendWelcomes) Descriptor() ([]byte, []int) {
-	return file_mls_database_intents_proto_rawDescGZIP(), []int{9, 1}
+	return file_mls_database_intents_proto_rawDescGZIP(), []int{10, 1}
 }
 
 func (x *PostCommitAction_SendWelcomes) GetInstallations() []*PostCommitAction_Installation {
@@ -1269,57 +1517,111 @@ var file_mls_database_intents_proto_rawDesc = []byte{
 	0x6e, 0x4c, 0x69, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12,
 	0x19, 0x0a, 0x08, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x07, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x49, 0x64, 0x42, 0x09, 0x0a, 0x07, 0x76, 0x65,
-	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xe8, 0x02, 0x0a, 0x10, 0x50, 0x6f, 0x73, 0x74, 0x43, 0x6f,
-	0x6d, 0x6d, 0x69, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x57, 0x0a, 0x0d, 0x73, 0x65,
-	0x6e, 0x64, 0x5f, 0x77, 0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x30, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e, 0x64, 0x61, 0x74,
-	0x61, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74,
-	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x57, 0x65, 0x6c, 0x63, 0x6f,
-	0x6d, 0x65, 0x73, 0x48, 0x00, 0x52, 0x0c, 0x73, 0x65, 0x6e, 0x64, 0x57, 0x65, 0x6c, 0x63, 0x6f,
-	0x6d, 0x65, 0x73, 0x1a, 0x61, 0x0a, 0x0c, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x29, 0x0a, 0x10, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0f, 0x69,
-	0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x12, 0x26,
-	0x0a, 0x0f, 0x68, 0x70, 0x6b, 0x65, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65,
-	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x68, 0x70, 0x6b, 0x65, 0x50, 0x75, 0x62,
-	0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x1a, 0x8f, 0x01, 0x0a, 0x0c, 0x53, 0x65, 0x6e, 0x64, 0x57,
-	0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x65, 0x73, 0x12, 0x56, 0x0a, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61,
-	0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30,
-	0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61,
-	0x73, 0x65, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x41, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
-	0x27, 0x0a, 0x0f, 0x77, 0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0e, 0x77, 0x65, 0x6c, 0x63, 0x6f, 0x6d,
-	0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64,
-	0x2a, 0xe7, 0x01, 0x0a, 0x13, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x26, 0x0a, 0x22, 0x41, 0x44, 0x4d, 0x49,
-	0x4e, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x54, 0x59,
-	0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
-	0x12, 0x24, 0x0a, 0x20, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x55,
-	0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x41, 0x44, 0x44, 0x5f, 0x41,
-	0x44, 0x4d, 0x49, 0x4e, 0x10, 0x01, 0x12, 0x27, 0x0a, 0x23, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x5f,
-	0x4c, 0x49, 0x53, 0x54, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45,
-	0x5f, 0x52, 0x45, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x02, 0x12,
-	0x2a, 0x0a, 0x26, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x55, 0x50,
-	0x44, 0x41, 0x54, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x41, 0x44, 0x44, 0x5f, 0x53, 0x55,
-	0x50, 0x45, 0x52, 0x5f, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x03, 0x12, 0x2d, 0x0a, 0x29, 0x41,
-	0x44, 0x4d, 0x49, 0x4e, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45,
-	0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x53, 0x55, 0x50,
-	0x45, 0x52, 0x5f, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x04, 0x42, 0xc0, 0x01, 0x0a, 0x15, 0x63,
-	0x6f, 0x6d, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e, 0x64, 0x61, 0x74, 0x61,
-	0x62, 0x61, 0x73, 0x65, 0x42, 0x0c, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x78, 0x6d, 0x74, 0x70, 0x2f, 0x78, 0x6d, 0x74, 0x70, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2d,
-	0x67, 0x6f, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6d, 0x6c, 0x73,
-	0x2f, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0xa2, 0x02, 0x03, 0x58, 0x4d, 0x44, 0xaa,
-	0x02, 0x11, 0x58, 0x6d, 0x74, 0x70, 0x2e, 0x4d, 0x6c, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x62,
-	0x61, 0x73, 0x65, 0xca, 0x02, 0x11, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x4d, 0x6c, 0x73, 0x5c, 0x44,
-	0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0xe2, 0x02, 0x1d, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x4d,
-	0x6c, 0x73, 0x5c, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x13, 0x58, 0x6d, 0x74, 0x70, 0x3a, 0x3a,
-	0x4d, 0x6c, 0x73, 0x3a, 0x3a, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xf7, 0x02, 0x0a, 0x14, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x12, 0x3c,
+	0x0a, 0x02, 0x76, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x78, 0x6d, 0x74,
+	0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x44,
+	0x61, 0x74, 0x61, 0x2e, 0x56, 0x31, 0x48, 0x00, 0x52, 0x02, 0x76, 0x31, 0x1a, 0x95, 0x02, 0x0a,
+	0x02, 0x56, 0x31, 0x12, 0x5d, 0x0a, 0x16, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f,
+	0x6e, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0e, 0x32, 0x27, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e, 0x64,
+	0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69,
+	0x6f, 0x6e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x14, 0x70, 0x65,
+	0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x79,
+	0x70, 0x65, 0x12, 0x63, 0x0a, 0x18, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e,
+	0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x29, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e,
+	0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
+	0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x16, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x6c, 0x69, 0x63,
+	0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x33, 0x0a, 0x13, 0x6d, 0x65, 0x74, 0x61, 0x64,
+	0x61, 0x74, 0x61, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x11, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
+	0x46, 0x69, 0x65, 0x6c, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x16, 0x0a, 0x14,
+	0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f,
+	0x6e, 0x61, 0x6d, 0x65, 0x42, 0x09, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22,
+	0xe8, 0x02, 0x0a, 0x10, 0x50, 0x6f, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x41, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x57, 0x0a, 0x0d, 0x73, 0x65, 0x6e, 0x64, 0x5f, 0x77, 0x65, 0x6c,
+	0x63, 0x6f, 0x6d, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x78, 0x6d,
+	0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x2e,
+	0x50, 0x6f, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x2e, 0x53, 0x65, 0x6e, 0x64, 0x57, 0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x65, 0x73, 0x48, 0x00, 0x52,
+	0x0c, 0x73, 0x65, 0x6e, 0x64, 0x57, 0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x65, 0x73, 0x1a, 0x61, 0x0a,
+	0x0c, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x29, 0x0a,
+	0x10, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6b, 0x65,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x0f, 0x68, 0x70, 0x6b, 0x65,
+	0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0c, 0x52, 0x0d, 0x68, 0x70, 0x6b, 0x65, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79,
+	0x1a, 0x8f, 0x01, 0x0a, 0x0c, 0x53, 0x65, 0x6e, 0x64, 0x57, 0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x65,
+	0x73, 0x12, 0x56, 0x0a, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e,
+	0x6d, 0x6c, 0x73, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x50, 0x6f, 0x73,
+	0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x49, 0x6e,
+	0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x69, 0x6e, 0x73, 0x74,
+	0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x77, 0x65, 0x6c,
+	0x63, 0x6f, 0x6d, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0c, 0x52, 0x0e, 0x77, 0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x2a, 0xe7, 0x01, 0x0a, 0x13, 0x41,
+	0x64, 0x6d, 0x69, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x79,
+	0x70, 0x65, 0x12, 0x26, 0x0a, 0x22, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x5f, 0x4c, 0x49, 0x53, 0x54,
+	0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53,
+	0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x20, 0x41, 0x44,
+	0x4d, 0x49, 0x4e, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f,
+	0x54, 0x59, 0x50, 0x45, 0x5f, 0x41, 0x44, 0x44, 0x5f, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x01,
+	0x12, 0x27, 0x0a, 0x23, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x55,
+	0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x4d, 0x4f, 0x56,
+	0x45, 0x5f, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x02, 0x12, 0x2a, 0x0a, 0x26, 0x41, 0x44, 0x4d,
+	0x49, 0x4e, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x54,
+	0x59, 0x50, 0x45, 0x5f, 0x41, 0x44, 0x44, 0x5f, 0x53, 0x55, 0x50, 0x45, 0x52, 0x5f, 0x41, 0x44,
+	0x4d, 0x49, 0x4e, 0x10, 0x03, 0x12, 0x2d, 0x0a, 0x29, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x5f, 0x4c,
+	0x49, 0x53, 0x54, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
+	0x52, 0x45, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x53, 0x55, 0x50, 0x45, 0x52, 0x5f, 0x41, 0x44, 0x4d,
+	0x49, 0x4e, 0x10, 0x04, 0x2a, 0x8a, 0x02, 0x0a, 0x14, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73,
+	0x69, 0x6f, 0x6e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x26, 0x0a,
+	0x22, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x50, 0x44, 0x41,
+	0x54, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46,
+	0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x25, 0x0a, 0x21, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53,
+	0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
+	0x41, 0x44, 0x44, 0x5f, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x01, 0x12, 0x28, 0x0a, 0x24,
+	0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54,
+	0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x4d, 0x45,
+	0x4d, 0x42, 0x45, 0x52, 0x10, 0x02, 0x12, 0x24, 0x0a, 0x20, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53,
+	0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45,
+	0x5f, 0x41, 0x44, 0x44, 0x5f, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x03, 0x12, 0x27, 0x0a, 0x23,
+	0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54,
+	0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x41, 0x44,
+	0x4d, 0x49, 0x4e, 0x10, 0x04, 0x12, 0x2a, 0x0a, 0x26, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53,
+	0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
+	0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x4d, 0x45, 0x54, 0x41, 0x44, 0x41, 0x54, 0x41, 0x10,
+	0x05, 0x2a, 0xe1, 0x01, 0x0a, 0x16, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x24,
+	0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43,
+	0x59, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,
+	0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x22, 0x0a, 0x1e, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53,
+	0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x4f, 0x50, 0x54, 0x49,
+	0x4f, 0x4e, 0x5f, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x10, 0x01, 0x12, 0x21, 0x0a, 0x1d, 0x50, 0x45,
+	0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f,
+	0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x44, 0x45, 0x4e, 0x59, 0x10, 0x02, 0x12, 0x27, 0x0a,
+	0x23, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x4f, 0x4c, 0x49,
+	0x43, 0x59, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x5f,
+	0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x03, 0x12, 0x2d, 0x0a, 0x29, 0x50, 0x45, 0x52, 0x4d, 0x49, 0x53,
+	0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x4f, 0x50, 0x54, 0x49,
+	0x4f, 0x4e, 0x5f, 0x53, 0x55, 0x50, 0x45, 0x52, 0x5f, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x5f, 0x4f,
+	0x4e, 0x4c, 0x59, 0x10, 0x04, 0x42, 0xc0, 0x01, 0x0a, 0x15, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x6d,
+	0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x42,
+	0x0c, 0x49, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
+	0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x6d, 0x74, 0x70,
+	0x2f, 0x78, 0x6d, 0x74, 0x70, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2d, 0x67, 0x6f, 0x2f, 0x70, 0x6b,
+	0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6d, 0x6c, 0x73, 0x2f, 0x64, 0x61, 0x74, 0x61,
+	0x62, 0x61, 0x73, 0x65, 0xa2, 0x02, 0x03, 0x58, 0x4d, 0x44, 0xaa, 0x02, 0x11, 0x58, 0x6d, 0x74,
+	0x70, 0x2e, 0x4d, 0x6c, 0x73, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0xca, 0x02,
+	0x11, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x4d, 0x6c, 0x73, 0x5c, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61,
+	0x73, 0x65, 0xe2, 0x02, 0x1d, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x4d, 0x6c, 0x73, 0x5c, 0x44, 0x61,
+	0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
+	0x74, 0x61, 0xea, 0x02, 0x13, 0x58, 0x6d, 0x74, 0x70, 0x3a, 0x3a, 0x4d, 0x6c, 0x73, 0x3a, 0x3a,
+	0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1334,50 +1636,57 @@ func file_mls_database_intents_proto_rawDescGZIP() []byte {
 	return file_mls_database_intents_proto_rawDescData
 }
 
-var file_mls_database_intents_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_mls_database_intents_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
-var file_mls_database_intents_proto_goTypes = []interface{}{
+var file_mls_database_intents_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
+var file_mls_database_intents_proto_msgTypes = make([]protoimpl.MessageInfo, 21)
+var file_mls_database_intents_proto_goTypes = []any{
 	(AdminListUpdateType)(0),              // 0: xmtp.mls.database.AdminListUpdateType
-	(*SendMessageData)(nil),               // 1: xmtp.mls.database.SendMessageData
-	(*AccountAddresses)(nil),              // 2: xmtp.mls.database.AccountAddresses
-	(*InstallationIds)(nil),               // 3: xmtp.mls.database.InstallationIds
-	(*AddressesOrInstallationIds)(nil),    // 4: xmtp.mls.database.AddressesOrInstallationIds
-	(*AddMembersData)(nil),                // 5: xmtp.mls.database.AddMembersData
-	(*RemoveMembersData)(nil),             // 6: xmtp.mls.database.RemoveMembersData
-	(*UpdateGroupMembershipData)(nil),     // 7: xmtp.mls.database.UpdateGroupMembershipData
-	(*UpdateMetadataData)(nil),            // 8: xmtp.mls.database.UpdateMetadataData
-	(*UpdateAdminListsData)(nil),          // 9: xmtp.mls.database.UpdateAdminListsData
-	(*PostCommitAction)(nil),              // 10: xmtp.mls.database.PostCommitAction
-	(*SendMessageData_V1)(nil),            // 11: xmtp.mls.database.SendMessageData.V1
-	(*AddMembersData_V1)(nil),             // 12: xmtp.mls.database.AddMembersData.V1
-	(*RemoveMembersData_V1)(nil),          // 13: xmtp.mls.database.RemoveMembersData.V1
-	(*UpdateGroupMembershipData_V1)(nil),  // 14: xmtp.mls.database.UpdateGroupMembershipData.V1
-	nil,                                   // 15: xmtp.mls.database.UpdateGroupMembershipData.V1.MembershipUpdatesEntry
-	(*UpdateMetadataData_V1)(nil),         // 16: xmtp.mls.database.UpdateMetadataData.V1
-	(*UpdateAdminListsData_V1)(nil),       // 17: xmtp.mls.database.UpdateAdminListsData.V1
-	(*PostCommitAction_Installation)(nil), // 18: xmtp.mls.database.PostCommitAction.Installation
-	(*PostCommitAction_SendWelcomes)(nil), // 19: xmtp.mls.database.PostCommitAction.SendWelcomes
+	(PermissionUpdateType)(0),             // 1: xmtp.mls.database.PermissionUpdateType
+	(PermissionPolicyOption)(0),           // 2: xmtp.mls.database.PermissionPolicyOption
+	(*SendMessageData)(nil),               // 3: xmtp.mls.database.SendMessageData
+	(*AccountAddresses)(nil),              // 4: xmtp.mls.database.AccountAddresses
+	(*InstallationIds)(nil),               // 5: xmtp.mls.database.InstallationIds
+	(*AddressesOrInstallationIds)(nil),    // 6: xmtp.mls.database.AddressesOrInstallationIds
+	(*AddMembersData)(nil),                // 7: xmtp.mls.database.AddMembersData
+	(*RemoveMembersData)(nil),             // 8: xmtp.mls.database.RemoveMembersData
+	(*UpdateGroupMembershipData)(nil),     // 9: xmtp.mls.database.UpdateGroupMembershipData
+	(*UpdateMetadataData)(nil),            // 10: xmtp.mls.database.UpdateMetadataData
+	(*UpdateAdminListsData)(nil),          // 11: xmtp.mls.database.UpdateAdminListsData
+	(*UpdatePermissionData)(nil),          // 12: xmtp.mls.database.UpdatePermissionData
+	(*PostCommitAction)(nil),              // 13: xmtp.mls.database.PostCommitAction
+	(*SendMessageData_V1)(nil),            // 14: xmtp.mls.database.SendMessageData.V1
+	(*AddMembersData_V1)(nil),             // 15: xmtp.mls.database.AddMembersData.V1
+	(*RemoveMembersData_V1)(nil),          // 16: xmtp.mls.database.RemoveMembersData.V1
+	(*UpdateGroupMembershipData_V1)(nil),  // 17: xmtp.mls.database.UpdateGroupMembershipData.V1
+	nil,                                   // 18: xmtp.mls.database.UpdateGroupMembershipData.V1.MembershipUpdatesEntry
+	(*UpdateMetadataData_V1)(nil),         // 19: xmtp.mls.database.UpdateMetadataData.V1
+	(*UpdateAdminListsData_V1)(nil),       // 20: xmtp.mls.database.UpdateAdminListsData.V1
+	(*UpdatePermissionData_V1)(nil),       // 21: xmtp.mls.database.UpdatePermissionData.V1
+	(*PostCommitAction_Installation)(nil), // 22: xmtp.mls.database.PostCommitAction.Installation
+	(*PostCommitAction_SendWelcomes)(nil), // 23: xmtp.mls.database.PostCommitAction.SendWelcomes
 }
 var file_mls_database_intents_proto_depIdxs = []int32{
-	11, // 0: xmtp.mls.database.SendMessageData.v1:type_name -> xmtp.mls.database.SendMessageData.V1
-	2,  // 1: xmtp.mls.database.AddressesOrInstallationIds.account_addresses:type_name -> xmtp.mls.database.AccountAddresses
-	3,  // 2: xmtp.mls.database.AddressesOrInstallationIds.installation_ids:type_name -> xmtp.mls.database.InstallationIds
-	12, // 3: xmtp.mls.database.AddMembersData.v1:type_name -> xmtp.mls.database.AddMembersData.V1
-	13, // 4: xmtp.mls.database.RemoveMembersData.v1:type_name -> xmtp.mls.database.RemoveMembersData.V1
-	14, // 5: xmtp.mls.database.UpdateGroupMembershipData.v1:type_name -> xmtp.mls.database.UpdateGroupMembershipData.V1
-	16, // 6: xmtp.mls.database.UpdateMetadataData.v1:type_name -> xmtp.mls.database.UpdateMetadataData.V1
-	17, // 7: xmtp.mls.database.UpdateAdminListsData.v1:type_name -> xmtp.mls.database.UpdateAdminListsData.V1
-	19, // 8: xmtp.mls.database.PostCommitAction.send_welcomes:type_name -> xmtp.mls.database.PostCommitAction.SendWelcomes
-	4,  // 9: xmtp.mls.database.AddMembersData.V1.addresses_or_installation_ids:type_name -> xmtp.mls.database.AddressesOrInstallationIds
-	4,  // 10: xmtp.mls.database.RemoveMembersData.V1.addresses_or_installation_ids:type_name -> xmtp.mls.database.AddressesOrInstallationIds
-	15, // 11: xmtp.mls.database.UpdateGroupMembershipData.V1.membership_updates:type_name -> xmtp.mls.database.UpdateGroupMembershipData.V1.MembershipUpdatesEntry
-	0,  // 12: xmtp.mls.database.UpdateAdminListsData.V1.admin_list_update_type:type_name -> xmtp.mls.database.AdminListUpdateType
-	18, // 13: xmtp.mls.database.PostCommitAction.SendWelcomes.installations:type_name -> xmtp.mls.database.PostCommitAction.Installation
-	14, // [14:14] is the sub-list for method output_type
-	14, // [14:14] is the sub-list for method input_type
-	14, // [14:14] is the sub-list for extension type_name
-	14, // [14:14] is the sub-list for extension extendee
-	0,  // [0:14] is the sub-list for field type_name
+	14, // 0: xmtp.mls.database.SendMessageData.v1:type_name -> xmtp.mls.database.SendMessageData.V1
+	4,  // 1: xmtp.mls.database.AddressesOrInstallationIds.account_addresses:type_name -> xmtp.mls.database.AccountAddresses
+	5,  // 2: xmtp.mls.database.AddressesOrInstallationIds.installation_ids:type_name -> xmtp.mls.database.InstallationIds
+	15, // 3: xmtp.mls.database.AddMembersData.v1:type_name -> xmtp.mls.database.AddMembersData.V1
+	16, // 4: xmtp.mls.database.RemoveMembersData.v1:type_name -> xmtp.mls.database.RemoveMembersData.V1
+	17, // 5: xmtp.mls.database.UpdateGroupMembershipData.v1:type_name -> xmtp.mls.database.UpdateGroupMembershipData.V1
+	19, // 6: xmtp.mls.database.UpdateMetadataData.v1:type_name -> xmtp.mls.database.UpdateMetadataData.V1
+	20, // 7: xmtp.mls.database.UpdateAdminListsData.v1:type_name -> xmtp.mls.database.UpdateAdminListsData.V1
+	21, // 8: xmtp.mls.database.UpdatePermissionData.v1:type_name -> xmtp.mls.database.UpdatePermissionData.V1
+	23, // 9: xmtp.mls.database.PostCommitAction.send_welcomes:type_name -> xmtp.mls.database.PostCommitAction.SendWelcomes
+	6,  // 10: xmtp.mls.database.AddMembersData.V1.addresses_or_installation_ids:type_name -> xmtp.mls.database.AddressesOrInstallationIds
+	6,  // 11: xmtp.mls.database.RemoveMembersData.V1.addresses_or_installation_ids:type_name -> xmtp.mls.database.AddressesOrInstallationIds
+	18, // 12: xmtp.mls.database.UpdateGroupMembershipData.V1.membership_updates:type_name -> xmtp.mls.database.UpdateGroupMembershipData.V1.MembershipUpdatesEntry
+	0,  // 13: xmtp.mls.database.UpdateAdminListsData.V1.admin_list_update_type:type_name -> xmtp.mls.database.AdminListUpdateType
+	1,  // 14: xmtp.mls.database.UpdatePermissionData.V1.permission_update_type:type_name -> xmtp.mls.database.PermissionUpdateType
+	2,  // 15: xmtp.mls.database.UpdatePermissionData.V1.permission_policy_option:type_name -> xmtp.mls.database.PermissionPolicyOption
+	22, // 16: xmtp.mls.database.PostCommitAction.SendWelcomes.installations:type_name -> xmtp.mls.database.PostCommitAction.Installation
+	17, // [17:17] is the sub-list for method output_type
+	17, // [17:17] is the sub-list for method input_type
+	17, // [17:17] is the sub-list for extension type_name
+	17, // [17:17] is the sub-list for extension extendee
+	0,  // [0:17] is the sub-list for field type_name
 }
 
 func init() { file_mls_database_intents_proto_init() }
@@ -1386,7 +1695,7 @@ func file_mls_database_intents_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_mls_database_intents_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*SendMessageData); i {
 			case 0:
 				return &v.state
@@ -1398,7 +1707,7 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*AccountAddresses); i {
 			case 0:
 				return &v.state
@@ -1410,7 +1719,7 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*InstallationIds); i {
 			case 0:
 				return &v.state
@@ -1422,7 +1731,7 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*AddressesOrInstallationIds); i {
 			case 0:
 				return &v.state
@@ -1434,7 +1743,7 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*AddMembersData); i {
 			case 0:
 				return &v.state
@@ -1446,7 +1755,7 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*RemoveMembersData); i {
 			case 0:
 				return &v.state
@@ -1458,7 +1767,7 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*UpdateGroupMembershipData); i {
 			case 0:
 				return &v.state
@@ -1470,7 +1779,7 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*UpdateMetadataData); i {
 			case 0:
 				return &v.state
@@ -1482,7 +1791,7 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[8].Exporter = func(v any, i int) any {
 			switch v := v.(*UpdateAdminListsData); i {
 			case 0:
 				return &v.state
@@ -1494,7 +1803,19 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[9].Exporter = func(v any, i int) any {
+			switch v := v.(*UpdatePermissionData); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_mls_database_intents_proto_msgTypes[10].Exporter = func(v any, i int) any {
 			switch v := v.(*PostCommitAction); i {
 			case 0:
 				return &v.state
@@ -1506,7 +1827,7 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[11].Exporter = func(v any, i int) any {
 			switch v := v.(*SendMessageData_V1); i {
 			case 0:
 				return &v.state
@@ -1518,7 +1839,7 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[12].Exporter = func(v any, i int) any {
 			switch v := v.(*AddMembersData_V1); i {
 			case 0:
 				return &v.state
@@ -1530,7 +1851,7 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[13].Exporter = func(v any, i int) any {
 			switch v := v.(*RemoveMembersData_V1); i {
 			case 0:
 				return &v.state
@@ -1542,7 +1863,7 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[14].Exporter = func(v any, i int) any {
 			switch v := v.(*UpdateGroupMembershipData_V1); i {
 			case 0:
 				return &v.state
@@ -1554,7 +1875,7 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[16].Exporter = func(v any, i int) any {
 			switch v := v.(*UpdateMetadataData_V1); i {
 			case 0:
 				return &v.state
@@ -1566,7 +1887,7 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[17].Exporter = func(v any, i int) any {
 			switch v := v.(*UpdateAdminListsData_V1); i {
 			case 0:
 				return &v.state
@@ -1578,7 +1899,19 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[18].Exporter = func(v any, i int) any {
+			switch v := v.(*UpdatePermissionData_V1); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_mls_database_intents_proto_msgTypes[19].Exporter = func(v any, i int) any {
 			switch v := v.(*PostCommitAction_Installation); i {
 			case 0:
 				return &v.state
@@ -1590,7 +1923,7 @@ func file_mls_database_intents_proto_init() {
 				return nil
 			}
 		}
-		file_mls_database_intents_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_database_intents_proto_msgTypes[20].Exporter = func(v any, i int) any {
 			switch v := v.(*PostCommitAction_SendWelcomes); i {
 			case 0:
 				return &v.state
@@ -1603,38 +1936,42 @@ func file_mls_database_intents_proto_init() {
 			}
 		}
 	}
-	file_mls_database_intents_proto_msgTypes[0].OneofWrappers = []interface{}{
+	file_mls_database_intents_proto_msgTypes[0].OneofWrappers = []any{
 		(*SendMessageData_V1_)(nil),
 	}
-	file_mls_database_intents_proto_msgTypes[3].OneofWrappers = []interface{}{
+	file_mls_database_intents_proto_msgTypes[3].OneofWrappers = []any{
 		(*AddressesOrInstallationIds_AccountAddresses)(nil),
 		(*AddressesOrInstallationIds_InstallationIds)(nil),
 	}
-	file_mls_database_intents_proto_msgTypes[4].OneofWrappers = []interface{}{
+	file_mls_database_intents_proto_msgTypes[4].OneofWrappers = []any{
 		(*AddMembersData_V1_)(nil),
 	}
-	file_mls_database_intents_proto_msgTypes[5].OneofWrappers = []interface{}{
+	file_mls_database_intents_proto_msgTypes[5].OneofWrappers = []any{
 		(*RemoveMembersData_V1_)(nil),
 	}
-	file_mls_database_intents_proto_msgTypes[6].OneofWrappers = []interface{}{
+	file_mls_database_intents_proto_msgTypes[6].OneofWrappers = []any{
 		(*UpdateGroupMembershipData_V1_)(nil),
 	}
-	file_mls_database_intents_proto_msgTypes[7].OneofWrappers = []interface{}{
+	file_mls_database_intents_proto_msgTypes[7].OneofWrappers = []any{
 		(*UpdateMetadataData_V1_)(nil),
 	}
-	file_mls_database_intents_proto_msgTypes[8].OneofWrappers = []interface{}{
+	file_mls_database_intents_proto_msgTypes[8].OneofWrappers = []any{
 		(*UpdateAdminListsData_V1_)(nil),
 	}
-	file_mls_database_intents_proto_msgTypes[9].OneofWrappers = []interface{}{
+	file_mls_database_intents_proto_msgTypes[9].OneofWrappers = []any{
+		(*UpdatePermissionData_V1_)(nil),
+	}
+	file_mls_database_intents_proto_msgTypes[10].OneofWrappers = []any{
 		(*PostCommitAction_SendWelcomes_)(nil),
 	}
+	file_mls_database_intents_proto_msgTypes[18].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_mls_database_intents_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   19,
+			NumEnums:      3,
+			NumMessages:   21,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pkg/proto/mls/message_contents/association.pb.go b/pkg/proto/mls/message_contents/association.pb.go
index 9d88b786..4a01c2f3 100644
--- a/pkg/proto/mls/message_contents/association.pb.go
+++ b/pkg/proto/mls/message_contents/association.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: mls/message_contents/association.proto
 
@@ -479,7 +479,7 @@ func file_mls_message_contents_association_proto_rawDescGZIP() []byte {
 
 var file_mls_message_contents_association_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_mls_message_contents_association_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
-var file_mls_message_contents_association_proto_goTypes = []interface{}{
+var file_mls_message_contents_association_proto_goTypes = []any{
 	(AssociationTextVersion)(0),              // 0: xmtp.mls.message_contents.AssociationTextVersion
 	(*GrantMessagingAccessAssociation)(nil),  // 1: xmtp.mls.message_contents.GrantMessagingAccessAssociation
 	(*RevokeMessagingAccessAssociation)(nil), // 2: xmtp.mls.message_contents.RevokeMessagingAccessAssociation
@@ -508,7 +508,7 @@ func file_mls_message_contents_association_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_mls_message_contents_association_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_association_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*GrantMessagingAccessAssociation); i {
 			case 0:
 				return &v.state
@@ -520,7 +520,7 @@ func file_mls_message_contents_association_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_association_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_association_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*RevokeMessagingAccessAssociation); i {
 			case 0:
 				return &v.state
@@ -532,7 +532,7 @@ func file_mls_message_contents_association_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_association_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_association_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*LegacyCreateIdentityAssociation); i {
 			case 0:
 				return &v.state
@@ -544,7 +544,7 @@ func file_mls_message_contents_association_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_association_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_association_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*RecoverableEcdsaSignature); i {
 			case 0:
 				return &v.state
@@ -556,7 +556,7 @@ func file_mls_message_contents_association_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_association_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_association_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*EdDsaSignature); i {
 			case 0:
 				return &v.state
diff --git a/pkg/proto/mls/message_contents/content.pb.go b/pkg/proto/mls/message_contents/content.pb.go
index 71ea4e7c..e2bd5ea3 100644
--- a/pkg/proto/mls/message_contents/content.pb.go
+++ b/pkg/proto/mls/message_contents/content.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: mls/message_contents/content.proto
 
@@ -387,10 +387,6 @@ type MessageHistoryReply struct {
 	Url string `protobuf:"bytes,2,opt,name=url,proto3" json:"url,omitempty"`
 	// Generated input 'secret' for the AES Key used to encrypt the message-bundle
 	EncryptionKey *MessageHistoryKeyType `protobuf:"bytes,3,opt,name=encryption_key,json=encryptionKey,proto3" json:"encryption_key,omitempty"`
-	// Generated input 'secret' for the HMAC Key used to sign the bundle_hash
-	SigningKey *MessageHistoryKeyType `protobuf:"bytes,4,opt,name=signing_key,json=signingKey,proto3" json:"signing_key,omitempty"`
-	// HMAC Signature of the message-bundle
-	BundleHash []byte `protobuf:"bytes,5,opt,name=bundle_hash,json=bundleHash,proto3" json:"bundle_hash,omitempty"`
 }
 
 func (x *MessageHistoryReply) Reset() {
@@ -446,21 +442,7 @@ func (x *MessageHistoryReply) GetEncryptionKey() *MessageHistoryKeyType {
 	return nil
 }
 
-func (x *MessageHistoryReply) GetSigningKey() *MessageHistoryKeyType {
-	if x != nil {
-		return x.SigningKey
-	}
-	return nil
-}
-
-func (x *MessageHistoryReply) GetBundleHash() []byte {
-	if x != nil {
-		return x.BundleHash
-	}
-	return nil
-}
-
-// Key used to encrypt or sign the message-bundle
+// Key used to encrypt the message-bundle
 type MessageHistoryKeyType struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -772,8 +754,8 @@ var file_mls_message_contents_content_proto_rawDesc = []byte{
 	0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f,
 	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
 	0x74, 0x49, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x70, 0x69, 0x6e, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x69, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x22, 0x93,
-	0x02, 0x0a, 0x13, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x69, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x22, 0x9f,
+	0x01, 0x0a, 0x13, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72,
 	0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
 	0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75,
 	0x65, 0x73, 0x74, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01,
@@ -783,38 +765,31 @@ var file_mls_message_contents_content_proto_rawDesc = []byte{
 	0x67, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73,
 	0x61, 0x67, 0x65, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4b, 0x65, 0x79, 0x54, 0x79, 0x70,
 	0x65, 0x52, 0x0d, 0x65, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79,
-	0x12, 0x51, 0x0a, 0x0b, 0x73, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x6b, 0x65, 0x79, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73,
-	0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74,
-	0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79,
-	0x4b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67,
-	0x4b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x68, 0x61,
-	0x73, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65,
-	0x48, 0x61, 0x73, 0x68, 0x22, 0x4d, 0x0a, 0x15, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x48,
-	0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2d, 0x0a,
-	0x11, 0x63, 0x68, 0x61, 0x63, 0x68, 0x61, 0x32, 0x30, 0x5f, 0x70, 0x6f, 0x6c, 0x79, 0x31, 0x33,
-	0x30, 0x35, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x10, 0x63, 0x68, 0x61, 0x63,
-	0x68, 0x61, 0x32, 0x30, 0x50, 0x6f, 0x6c, 0x79, 0x31, 0x33, 0x30, 0x35, 0x42, 0x05, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x2a, 0x3c, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69,
-	0x6f, 0x6e, 0x12, 0x17, 0x0a, 0x13, 0x43, 0x4f, 0x4d, 0x50, 0x52, 0x45, 0x53, 0x53, 0x49, 0x4f,
-	0x4e, 0x5f, 0x44, 0x45, 0x46, 0x4c, 0x41, 0x54, 0x45, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x43,
-	0x4f, 0x4d, 0x50, 0x52, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x47, 0x5a, 0x49, 0x50, 0x10,
-	0x01, 0x42, 0xec, 0x01, 0x0a, 0x1d, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d,
-	0x6c, 0x73, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65,
-	0x6e, 0x74, 0x73, 0x42, 0x0c, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x78, 0x6d, 0x74, 0x70, 0x2f, 0x78, 0x6d, 0x74, 0x70, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2d, 0x67,
-	0x6f, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6d, 0x6c, 0x73, 0x2f,
-	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73,
-	0xa2, 0x02, 0x03, 0x58, 0x4d, 0x4d, 0xaa, 0x02, 0x18, 0x58, 0x6d, 0x74, 0x70, 0x2e, 0x4d, 0x6c,
-	0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74,
-	0x73, 0xca, 0x02, 0x18, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x4d, 0x6c, 0x73, 0x5c, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0xe2, 0x02, 0x24, 0x58,
-	0x6d, 0x74, 0x70, 0x5c, 0x4d, 0x6c, 0x73, 0x5c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x43,
-	0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64,
-	0x61, 0x74, 0x61, 0xea, 0x02, 0x1a, 0x58, 0x6d, 0x74, 0x70, 0x3a, 0x3a, 0x4d, 0x6c, 0x73, 0x3a,
-	0x3a, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x22, 0x4d, 0x0a, 0x15, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x48, 0x69, 0x73, 0x74, 0x6f,
+	0x72, 0x79, 0x4b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2d, 0x0a, 0x11, 0x63, 0x68, 0x61,
+	0x63, 0x68, 0x61, 0x32, 0x30, 0x5f, 0x70, 0x6f, 0x6c, 0x79, 0x31, 0x33, 0x30, 0x35, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x10, 0x63, 0x68, 0x61, 0x63, 0x68, 0x61, 0x32, 0x30,
+	0x50, 0x6f, 0x6c, 0x79, 0x31, 0x33, 0x30, 0x35, 0x42, 0x05, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x2a,
+	0x3c, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x17,
+	0x0a, 0x13, 0x43, 0x4f, 0x4d, 0x50, 0x52, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x44, 0x45,
+	0x46, 0x4c, 0x41, 0x54, 0x45, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x43, 0x4f, 0x4d, 0x50, 0x52,
+	0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x5f, 0x47, 0x5a, 0x49, 0x50, 0x10, 0x01, 0x42, 0xec, 0x01,
+	0x0a, 0x1d, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e, 0x6d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x42,
+	0x0c, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
+	0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x6d, 0x74, 0x70,
+	0x2f, 0x78, 0x6d, 0x74, 0x70, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2d, 0x67, 0x6f, 0x2f, 0x70, 0x6b,
+	0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6d, 0x6c, 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0xa2, 0x02, 0x03, 0x58,
+	0x4d, 0x4d, 0xaa, 0x02, 0x18, 0x58, 0x6d, 0x74, 0x70, 0x2e, 0x4d, 0x6c, 0x73, 0x2e, 0x4d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0xca, 0x02, 0x18,
+	0x58, 0x6d, 0x74, 0x70, 0x5c, 0x4d, 0x6c, 0x73, 0x5c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0xe2, 0x02, 0x24, 0x58, 0x6d, 0x74, 0x70, 0x5c,
+	0x4d, 0x6c, 0x73, 0x5c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65,
+	0x6e, 0x74, 0x73, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,
+	0x02, 0x1a, 0x58, 0x6d, 0x74, 0x70, 0x3a, 0x3a, 0x4d, 0x6c, 0x73, 0x3a, 0x3a, 0x4d, 0x65, 0x73,
+	0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -831,7 +806,7 @@ func file_mls_message_contents_content_proto_rawDescGZIP() []byte {
 
 var file_mls_message_contents_content_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_mls_message_contents_content_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
-var file_mls_message_contents_content_proto_goTypes = []interface{}{
+var file_mls_message_contents_content_proto_goTypes = []any{
 	(Compression)(0),              // 0: xmtp.mls.message_contents.Compression
 	(*ContentTypeId)(nil),         // 1: xmtp.mls.message_contents.ContentTypeId
 	(*EncodedContent)(nil),        // 2: xmtp.mls.message_contents.EncodedContent
@@ -850,14 +825,13 @@ var file_mls_message_contents_content_proto_depIdxs = []int32{
 	8, // 3: xmtp.mls.message_contents.PlaintextEnvelope.v1:type_name -> xmtp.mls.message_contents.PlaintextEnvelope.V1
 	9, // 4: xmtp.mls.message_contents.PlaintextEnvelope.v2:type_name -> xmtp.mls.message_contents.PlaintextEnvelope.V2
 	6, // 5: xmtp.mls.message_contents.MessageHistoryReply.encryption_key:type_name -> xmtp.mls.message_contents.MessageHistoryKeyType
-	6, // 6: xmtp.mls.message_contents.MessageHistoryReply.signing_key:type_name -> xmtp.mls.message_contents.MessageHistoryKeyType
-	4, // 7: xmtp.mls.message_contents.PlaintextEnvelope.V2.request:type_name -> xmtp.mls.message_contents.MessageHistoryRequest
-	5, // 8: xmtp.mls.message_contents.PlaintextEnvelope.V2.reply:type_name -> xmtp.mls.message_contents.MessageHistoryReply
-	9, // [9:9] is the sub-list for method output_type
-	9, // [9:9] is the sub-list for method input_type
-	9, // [9:9] is the sub-list for extension type_name
-	9, // [9:9] is the sub-list for extension extendee
-	0, // [0:9] is the sub-list for field type_name
+	4, // 6: xmtp.mls.message_contents.PlaintextEnvelope.V2.request:type_name -> xmtp.mls.message_contents.MessageHistoryRequest
+	5, // 7: xmtp.mls.message_contents.PlaintextEnvelope.V2.reply:type_name -> xmtp.mls.message_contents.MessageHistoryReply
+	8, // [8:8] is the sub-list for method output_type
+	8, // [8:8] is the sub-list for method input_type
+	8, // [8:8] is the sub-list for extension type_name
+	8, // [8:8] is the sub-list for extension extendee
+	0, // [0:8] is the sub-list for field type_name
 }
 
 func init() { file_mls_message_contents_content_proto_init() }
@@ -866,7 +840,7 @@ func file_mls_message_contents_content_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_mls_message_contents_content_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_content_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*ContentTypeId); i {
 			case 0:
 				return &v.state
@@ -878,7 +852,7 @@ func file_mls_message_contents_content_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_content_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_content_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*EncodedContent); i {
 			case 0:
 				return &v.state
@@ -890,7 +864,7 @@ func file_mls_message_contents_content_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_content_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_content_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*PlaintextEnvelope); i {
 			case 0:
 				return &v.state
@@ -902,7 +876,7 @@ func file_mls_message_contents_content_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_content_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_content_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*MessageHistoryRequest); i {
 			case 0:
 				return &v.state
@@ -914,7 +888,7 @@ func file_mls_message_contents_content_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_content_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_content_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*MessageHistoryReply); i {
 			case 0:
 				return &v.state
@@ -926,7 +900,7 @@ func file_mls_message_contents_content_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_content_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_content_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*MessageHistoryKeyType); i {
 			case 0:
 				return &v.state
@@ -938,7 +912,7 @@ func file_mls_message_contents_content_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_content_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_content_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*PlaintextEnvelope_V1); i {
 			case 0:
 				return &v.state
@@ -950,7 +924,7 @@ func file_mls_message_contents_content_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_content_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_content_proto_msgTypes[8].Exporter = func(v any, i int) any {
 			switch v := v.(*PlaintextEnvelope_V2); i {
 			case 0:
 				return &v.state
@@ -963,15 +937,15 @@ func file_mls_message_contents_content_proto_init() {
 			}
 		}
 	}
-	file_mls_message_contents_content_proto_msgTypes[1].OneofWrappers = []interface{}{}
-	file_mls_message_contents_content_proto_msgTypes[2].OneofWrappers = []interface{}{
+	file_mls_message_contents_content_proto_msgTypes[1].OneofWrappers = []any{}
+	file_mls_message_contents_content_proto_msgTypes[2].OneofWrappers = []any{
 		(*PlaintextEnvelope_V1_)(nil),
 		(*PlaintextEnvelope_V2_)(nil),
 	}
-	file_mls_message_contents_content_proto_msgTypes[5].OneofWrappers = []interface{}{
+	file_mls_message_contents_content_proto_msgTypes[5].OneofWrappers = []any{
 		(*MessageHistoryKeyType_Chacha20Poly1305)(nil),
 	}
-	file_mls_message_contents_content_proto_msgTypes[8].OneofWrappers = []interface{}{
+	file_mls_message_contents_content_proto_msgTypes[8].OneofWrappers = []any{
 		(*PlaintextEnvelope_V2_Content)(nil),
 		(*PlaintextEnvelope_V2_Request)(nil),
 		(*PlaintextEnvelope_V2_Reply)(nil),
diff --git a/pkg/proto/mls/message_contents/credential.pb.go b/pkg/proto/mls/message_contents/credential.pb.go
index a31114f6..e1a5ba41 100644
--- a/pkg/proto/mls/message_contents/credential.pb.go
+++ b/pkg/proto/mls/message_contents/credential.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: mls/message_contents/credential.proto
 
@@ -302,7 +302,7 @@ func file_mls_message_contents_credential_proto_rawDescGZIP() []byte {
 }
 
 var file_mls_message_contents_credential_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_mls_message_contents_credential_proto_goTypes = []interface{}{
+var file_mls_message_contents_credential_proto_goTypes = []any{
 	(*MlsCredential)(nil),                    // 0: xmtp.mls.message_contents.MlsCredential
 	(*CredentialRevocation)(nil),             // 1: xmtp.mls.message_contents.CredentialRevocation
 	(*GrantMessagingAccessAssociation)(nil),  // 2: xmtp.mls.message_contents.GrantMessagingAccessAssociation
@@ -327,7 +327,7 @@ func file_mls_message_contents_credential_proto_init() {
 	}
 	file_mls_message_contents_association_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_mls_message_contents_credential_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_credential_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*MlsCredential); i {
 			case 0:
 				return &v.state
@@ -339,7 +339,7 @@ func file_mls_message_contents_credential_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_credential_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_credential_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*CredentialRevocation); i {
 			case 0:
 				return &v.state
@@ -352,11 +352,11 @@ func file_mls_message_contents_credential_proto_init() {
 			}
 		}
 	}
-	file_mls_message_contents_credential_proto_msgTypes[0].OneofWrappers = []interface{}{
+	file_mls_message_contents_credential_proto_msgTypes[0].OneofWrappers = []any{
 		(*MlsCredential_MessagingAccess)(nil),
 		(*MlsCredential_LegacyCreateIdentity)(nil),
 	}
-	file_mls_message_contents_credential_proto_msgTypes[1].OneofWrappers = []interface{}{
+	file_mls_message_contents_credential_proto_msgTypes[1].OneofWrappers = []any{
 		(*CredentialRevocation_InstallationKey)(nil),
 		(*CredentialRevocation_UnsignedLegacyCreateIdentityKey)(nil),
 		(*CredentialRevocation_MessagingAccess)(nil),
diff --git a/pkg/proto/mls/message_contents/group_membership.pb.go b/pkg/proto/mls/message_contents/group_membership.pb.go
index 457f1b9a..7bf9362c 100644
--- a/pkg/proto/mls/message_contents/group_membership.pb.go
+++ b/pkg/proto/mls/message_contents/group_membership.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: mls/message_contents/group_membership.proto
 
@@ -120,7 +120,7 @@ func file_mls_message_contents_group_membership_proto_rawDescGZIP() []byte {
 }
 
 var file_mls_message_contents_group_membership_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_mls_message_contents_group_membership_proto_goTypes = []interface{}{
+var file_mls_message_contents_group_membership_proto_goTypes = []any{
 	(*GroupMembership)(nil), // 0: xmtp.mls.message_contents.GroupMembership
 	nil,                     // 1: xmtp.mls.message_contents.GroupMembership.MembersEntry
 }
@@ -139,7 +139,7 @@ func file_mls_message_contents_group_membership_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_mls_message_contents_group_membership_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_group_membership_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*GroupMembership); i {
 			case 0:
 				return &v.state
diff --git a/pkg/proto/mls/message_contents/group_metadata.pb.go b/pkg/proto/mls/message_contents/group_metadata.pb.go
index 862b39ce..92e8029c 100644
--- a/pkg/proto/mls/message_contents/group_metadata.pb.go
+++ b/pkg/proto/mls/message_contents/group_metadata.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: mls/message_contents/group_metadata.proto
 
@@ -85,6 +85,8 @@ type GroupMetadataV1 struct {
 	// This will be removed soon
 	CreatorAccountAddress string `protobuf:"bytes,2,opt,name=creator_account_address,json=creatorAccountAddress,proto3" json:"creator_account_address,omitempty"`
 	CreatorInboxId        string `protobuf:"bytes,3,opt,name=creator_inbox_id,json=creatorInboxId,proto3" json:"creator_inbox_id,omitempty"`
+	// Should only be present for CONVERSATION_TYPE_DM
+	DmMembers *DmMembers `protobuf:"bytes,4,opt,name=dm_members,json=dmMembers,proto3,oneof" json:"dm_members,omitempty"`
 }
 
 func (x *GroupMetadataV1) Reset() {
@@ -140,6 +142,117 @@ func (x *GroupMetadataV1) GetCreatorInboxId() string {
 	return ""
 }
 
+func (x *GroupMetadataV1) GetDmMembers() *DmMembers {
+	if x != nil {
+		return x.DmMembers
+	}
+	return nil
+}
+
+// Wrapper around an Inbox Id
+type Inbox struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	InboxId string `protobuf:"bytes,1,opt,name=inbox_id,json=inboxId,proto3" json:"inbox_id,omitempty"`
+}
+
+func (x *Inbox) Reset() {
+	*x = Inbox{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_mls_message_contents_group_metadata_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Inbox) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Inbox) ProtoMessage() {}
+
+func (x *Inbox) ProtoReflect() protoreflect.Message {
+	mi := &file_mls_message_contents_group_metadata_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Inbox.ProtoReflect.Descriptor instead.
+func (*Inbox) Descriptor() ([]byte, []int) {
+	return file_mls_message_contents_group_metadata_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *Inbox) GetInboxId() string {
+	if x != nil {
+		return x.InboxId
+	}
+	return ""
+}
+
+// Ordering does not matter here
+type DmMembers struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	DmMemberOne *Inbox `protobuf:"bytes,1,opt,name=dm_member_one,json=dmMemberOne,proto3" json:"dm_member_one,omitempty"`
+	DmMemberTwo *Inbox `protobuf:"bytes,2,opt,name=dm_member_two,json=dmMemberTwo,proto3" json:"dm_member_two,omitempty"`
+}
+
+func (x *DmMembers) Reset() {
+	*x = DmMembers{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_mls_message_contents_group_metadata_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DmMembers) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DmMembers) ProtoMessage() {}
+
+func (x *DmMembers) ProtoReflect() protoreflect.Message {
+	mi := &file_mls_message_contents_group_metadata_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use DmMembers.ProtoReflect.Descriptor instead.
+func (*DmMembers) Descriptor() ([]byte, []int) {
+	return file_mls_message_contents_group_metadata_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *DmMembers) GetDmMemberOne() *Inbox {
+	if x != nil {
+		return x.DmMemberOne
+	}
+	return nil
+}
+
+func (x *DmMembers) GetDmMemberTwo() *Inbox {
+	if x != nil {
+		return x.DmMemberTwo
+	}
+	return nil
+}
+
 var File_mls_message_contents_group_metadata_proto protoreflect.FileDescriptor
 
 var file_mls_message_contents_group_metadata_proto_rawDesc = []byte{
@@ -147,7 +260,7 @@ var file_mls_message_contents_group_metadata_proto_rawDesc = []byte{
 	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x6d, 0x65, 0x74,
 	0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x19, 0x78, 0x6d, 0x74,
 	0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f,
-	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xcd, 0x01, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x75, 0x70,
+	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xa6, 0x02, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x75, 0x70,
 	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x56, 0x31, 0x12, 0x58, 0x0a, 0x11, 0x63, 0x6f,
 	0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73,
@@ -160,31 +273,49 @@ var file_mls_message_contents_group_metadata_proto_rawDesc = []byte{
 	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x28, 0x0a, 0x10,
 	0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x5f, 0x69, 0x64,
 	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x49,
-	0x6e, 0x62, 0x6f, 0x78, 0x49, 0x64, 0x2a, 0x88, 0x01, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x76, 0x65,
-	0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x1d, 0x43,
-	0x4f, 0x4e, 0x56, 0x45, 0x52, 0x53, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45,
-	0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1b,
-	0x0a, 0x17, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x53, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54,
-	0x59, 0x50, 0x45, 0x5f, 0x47, 0x52, 0x4f, 0x55, 0x50, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x43,
-	0x4f, 0x4e, 0x56, 0x45, 0x52, 0x53, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45,
-	0x5f, 0x44, 0x4d, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x53,
-	0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x59, 0x4e, 0x43, 0x10,
-	0x03, 0x42, 0xf2, 0x01, 0x0a, 0x1d, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d,
-	0x6c, 0x73, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65,
-	0x6e, 0x74, 0x73, 0x42, 0x12, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x6d, 0x74, 0x70, 0x2f, 0x78, 0x6d, 0x74, 0x70, 0x2d,
-	0x6e, 0x6f, 0x64, 0x65, 0x2d, 0x67, 0x6f, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x6d, 0x6c, 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f,
-	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0xa2, 0x02, 0x03, 0x58, 0x4d, 0x4d, 0xaa, 0x02, 0x18, 0x58,
-	0x6d, 0x74, 0x70, 0x2e, 0x4d, 0x6c, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x43,
-	0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0xca, 0x02, 0x18, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x4d,
-	0x6c, 0x73, 0x5c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e,
-	0x74, 0x73, 0xe2, 0x02, 0x24, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x4d, 0x6c, 0x73, 0x5c, 0x4d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x5c, 0x47, 0x50,
-	0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1a, 0x58, 0x6d, 0x74, 0x70,
-	0x3a, 0x3a, 0x4d, 0x6c, 0x73, 0x3a, 0x3a, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f,
-	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x62, 0x6f, 0x78, 0x49, 0x64, 0x12, 0x48, 0x0a, 0x0a, 0x64, 0x6d, 0x5f, 0x6d, 0x65, 0x6d,
+	0x62, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x78, 0x6d, 0x74,
+	0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f,
+	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x44, 0x6d, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73,
+	0x48, 0x00, 0x52, 0x09, 0x64, 0x6d, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x88, 0x01, 0x01,
+	0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x64, 0x6d, 0x5f, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x22,
+	0x22, 0x0a, 0x05, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x12, 0x19, 0x0a, 0x08, 0x69, 0x6e, 0x62, 0x6f,
+	0x78, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x69, 0x6e, 0x62, 0x6f,
+	0x78, 0x49, 0x64, 0x22, 0x97, 0x01, 0x0a, 0x09, 0x44, 0x6d, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72,
+	0x73, 0x12, 0x44, 0x0a, 0x0d, 0x64, 0x6d, 0x5f, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x6f,
+	0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e,
+	0x6d, 0x6c, 0x73, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74,
+	0x65, 0x6e, 0x74, 0x73, 0x2e, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x52, 0x0b, 0x64, 0x6d, 0x4d, 0x65,
+	0x6d, 0x62, 0x65, 0x72, 0x4f, 0x6e, 0x65, 0x12, 0x44, 0x0a, 0x0d, 0x64, 0x6d, 0x5f, 0x6d, 0x65,
+	0x6d, 0x62, 0x65, 0x72, 0x5f, 0x74, 0x77, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20,
+	0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x49, 0x6e, 0x62, 0x6f, 0x78,
+	0x52, 0x0b, 0x64, 0x6d, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x54, 0x77, 0x6f, 0x2a, 0x88, 0x01,
+	0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79,
+	0x70, 0x65, 0x12, 0x21, 0x0a, 0x1d, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x53, 0x41, 0x54, 0x49,
+	0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46,
+	0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x53,
+	0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x47, 0x52, 0x4f, 0x55, 0x50,
+	0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x53, 0x41, 0x54, 0x49,
+	0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x4d, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16,
+	0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x53, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x59, 0x50,
+	0x45, 0x5f, 0x53, 0x59, 0x4e, 0x43, 0x10, 0x03, 0x42, 0xf2, 0x01, 0x0a, 0x1d, 0x63, 0x6f, 0x6d,
+	0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x12, 0x47, 0x72, 0x6f, 0x75,
+	0x70, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x6d, 0x74,
+	0x70, 0x2f, 0x78, 0x6d, 0x74, 0x70, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2d, 0x67, 0x6f, 0x2f, 0x70,
+	0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6d, 0x6c, 0x73, 0x2f, 0x6d, 0x65, 0x73,
+	0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0xa2, 0x02, 0x03,
+	0x58, 0x4d, 0x4d, 0xaa, 0x02, 0x18, 0x58, 0x6d, 0x74, 0x70, 0x2e, 0x4d, 0x6c, 0x73, 0x2e, 0x4d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0xca, 0x02,
+	0x18, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x4d, 0x6c, 0x73, 0x5c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0xe2, 0x02, 0x24, 0x58, 0x6d, 0x74, 0x70,
+	0x5c, 0x4d, 0x6c, 0x73, 0x5c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x74,
+	0x65, 0x6e, 0x74, 0x73, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
+	0xea, 0x02, 0x1a, 0x58, 0x6d, 0x74, 0x70, 0x3a, 0x3a, 0x4d, 0x6c, 0x73, 0x3a, 0x3a, 0x4d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -200,18 +331,23 @@ func file_mls_message_contents_group_metadata_proto_rawDescGZIP() []byte {
 }
 
 var file_mls_message_contents_group_metadata_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_mls_message_contents_group_metadata_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_mls_message_contents_group_metadata_proto_goTypes = []interface{}{
+var file_mls_message_contents_group_metadata_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_mls_message_contents_group_metadata_proto_goTypes = []any{
 	(ConversationType)(0),   // 0: xmtp.mls.message_contents.ConversationType
 	(*GroupMetadataV1)(nil), // 1: xmtp.mls.message_contents.GroupMetadataV1
+	(*Inbox)(nil),           // 2: xmtp.mls.message_contents.Inbox
+	(*DmMembers)(nil),       // 3: xmtp.mls.message_contents.DmMembers
 }
 var file_mls_message_contents_group_metadata_proto_depIdxs = []int32{
 	0, // 0: xmtp.mls.message_contents.GroupMetadataV1.conversation_type:type_name -> xmtp.mls.message_contents.ConversationType
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
+	3, // 1: xmtp.mls.message_contents.GroupMetadataV1.dm_members:type_name -> xmtp.mls.message_contents.DmMembers
+	2, // 2: xmtp.mls.message_contents.DmMembers.dm_member_one:type_name -> xmtp.mls.message_contents.Inbox
+	2, // 3: xmtp.mls.message_contents.DmMembers.dm_member_two:type_name -> xmtp.mls.message_contents.Inbox
+	4, // [4:4] is the sub-list for method output_type
+	4, // [4:4] is the sub-list for method input_type
+	4, // [4:4] is the sub-list for extension type_name
+	4, // [4:4] is the sub-list for extension extendee
+	0, // [0:4] is the sub-list for field type_name
 }
 
 func init() { file_mls_message_contents_group_metadata_proto_init() }
@@ -220,7 +356,7 @@ func file_mls_message_contents_group_metadata_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_mls_message_contents_group_metadata_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_group_metadata_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*GroupMetadataV1); i {
 			case 0:
 				return &v.state
@@ -232,14 +368,39 @@ func file_mls_message_contents_group_metadata_proto_init() {
 				return nil
 			}
 		}
+		file_mls_message_contents_group_metadata_proto_msgTypes[1].Exporter = func(v any, i int) any {
+			switch v := v.(*Inbox); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_mls_message_contents_group_metadata_proto_msgTypes[2].Exporter = func(v any, i int) any {
+			switch v := v.(*DmMembers); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
+	file_mls_message_contents_group_metadata_proto_msgTypes[0].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_mls_message_contents_group_metadata_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   1,
+			NumMessages:   3,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pkg/proto/mls/message_contents/group_mutable_metadata.pb.go b/pkg/proto/mls/message_contents/group_mutable_metadata.pb.go
index 985932f4..a8e6dc10 100644
--- a/pkg/proto/mls/message_contents/group_mutable_metadata.pb.go
+++ b/pkg/proto/mls/message_contents/group_mutable_metadata.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: mls/message_contents/group_mutable_metadata.proto
 
@@ -200,7 +200,7 @@ func file_mls_message_contents_group_mutable_metadata_proto_rawDescGZIP() []byte
 }
 
 var file_mls_message_contents_group_mutable_metadata_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_mls_message_contents_group_mutable_metadata_proto_goTypes = []interface{}{
+var file_mls_message_contents_group_mutable_metadata_proto_goTypes = []any{
 	(*GroupMutableMetadataV1)(nil), // 0: xmtp.mls.message_contents.GroupMutableMetadataV1
 	(*Inboxes)(nil),                // 1: xmtp.mls.message_contents.Inboxes
 	nil,                            // 2: xmtp.mls.message_contents.GroupMutableMetadataV1.AttributesEntry
@@ -222,7 +222,7 @@ func file_mls_message_contents_group_mutable_metadata_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_mls_message_contents_group_mutable_metadata_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_group_mutable_metadata_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*GroupMutableMetadataV1); i {
 			case 0:
 				return &v.state
@@ -234,7 +234,7 @@ func file_mls_message_contents_group_mutable_metadata_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_group_mutable_metadata_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_group_mutable_metadata_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*Inboxes); i {
 			case 0:
 				return &v.state
diff --git a/pkg/proto/mls/message_contents/group_permissions.pb.go b/pkg/proto/mls/message_contents/group_permissions.pb.go
index cc392ca3..dfcc170e 100644
--- a/pkg/proto/mls/message_contents/group_permissions.pb.go
+++ b/pkg/proto/mls/message_contents/group_permissions.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: mls/message_contents/group_permissions.proto
 
@@ -1120,7 +1120,7 @@ func file_mls_message_contents_group_permissions_proto_rawDescGZIP() []byte {
 
 var file_mls_message_contents_group_permissions_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
 var file_mls_message_contents_group_permissions_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
-var file_mls_message_contents_group_permissions_proto_goTypes = []interface{}{
+var file_mls_message_contents_group_permissions_proto_goTypes = []any{
 	(MembershipPolicy_BasePolicy)(0),                   // 0: xmtp.mls.message_contents.MembershipPolicy.BasePolicy
 	(MetadataPolicy_MetadataBasePolicy)(0),             // 1: xmtp.mls.message_contents.MetadataPolicy.MetadataBasePolicy
 	(PermissionsUpdatePolicy_PermissionsBasePolicy)(0), // 2: xmtp.mls.message_contents.PermissionsUpdatePolicy.PermissionsBasePolicy
@@ -1174,7 +1174,7 @@ func file_mls_message_contents_group_permissions_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_mls_message_contents_group_permissions_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_group_permissions_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*GroupMutablePermissionsV1); i {
 			case 0:
 				return &v.state
@@ -1186,7 +1186,7 @@ func file_mls_message_contents_group_permissions_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_group_permissions_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_group_permissions_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*PolicySet); i {
 			case 0:
 				return &v.state
@@ -1198,7 +1198,7 @@ func file_mls_message_contents_group_permissions_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_group_permissions_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_group_permissions_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*MembershipPolicy); i {
 			case 0:
 				return &v.state
@@ -1210,7 +1210,7 @@ func file_mls_message_contents_group_permissions_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_group_permissions_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_group_permissions_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*MetadataPolicy); i {
 			case 0:
 				return &v.state
@@ -1222,7 +1222,7 @@ func file_mls_message_contents_group_permissions_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_group_permissions_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_group_permissions_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*PermissionsUpdatePolicy); i {
 			case 0:
 				return &v.state
@@ -1234,7 +1234,7 @@ func file_mls_message_contents_group_permissions_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_group_permissions_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_group_permissions_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*MembershipPolicy_AndCondition); i {
 			case 0:
 				return &v.state
@@ -1246,7 +1246,7 @@ func file_mls_message_contents_group_permissions_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_group_permissions_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_group_permissions_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*MembershipPolicy_AnyCondition); i {
 			case 0:
 				return &v.state
@@ -1258,7 +1258,7 @@ func file_mls_message_contents_group_permissions_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_group_permissions_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_group_permissions_proto_msgTypes[8].Exporter = func(v any, i int) any {
 			switch v := v.(*MetadataPolicy_AndCondition); i {
 			case 0:
 				return &v.state
@@ -1270,7 +1270,7 @@ func file_mls_message_contents_group_permissions_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_group_permissions_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_group_permissions_proto_msgTypes[9].Exporter = func(v any, i int) any {
 			switch v := v.(*MetadataPolicy_AnyCondition); i {
 			case 0:
 				return &v.state
@@ -1282,7 +1282,7 @@ func file_mls_message_contents_group_permissions_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_group_permissions_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_group_permissions_proto_msgTypes[10].Exporter = func(v any, i int) any {
 			switch v := v.(*PermissionsUpdatePolicy_AndCondition); i {
 			case 0:
 				return &v.state
@@ -1294,7 +1294,7 @@ func file_mls_message_contents_group_permissions_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_group_permissions_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_group_permissions_proto_msgTypes[11].Exporter = func(v any, i int) any {
 			switch v := v.(*PermissionsUpdatePolicy_AnyCondition); i {
 			case 0:
 				return &v.state
@@ -1307,17 +1307,17 @@ func file_mls_message_contents_group_permissions_proto_init() {
 			}
 		}
 	}
-	file_mls_message_contents_group_permissions_proto_msgTypes[2].OneofWrappers = []interface{}{
+	file_mls_message_contents_group_permissions_proto_msgTypes[2].OneofWrappers = []any{
 		(*MembershipPolicy_Base)(nil),
 		(*MembershipPolicy_AndCondition_)(nil),
 		(*MembershipPolicy_AnyCondition_)(nil),
 	}
-	file_mls_message_contents_group_permissions_proto_msgTypes[3].OneofWrappers = []interface{}{
+	file_mls_message_contents_group_permissions_proto_msgTypes[3].OneofWrappers = []any{
 		(*MetadataPolicy_Base)(nil),
 		(*MetadataPolicy_AndCondition_)(nil),
 		(*MetadataPolicy_AnyCondition_)(nil),
 	}
-	file_mls_message_contents_group_permissions_proto_msgTypes[4].OneofWrappers = []interface{}{
+	file_mls_message_contents_group_permissions_proto_msgTypes[4].OneofWrappers = []any{
 		(*PermissionsUpdatePolicy_Base)(nil),
 		(*PermissionsUpdatePolicy_AndCondition_)(nil),
 		(*PermissionsUpdatePolicy_AnyCondition_)(nil),
diff --git a/pkg/proto/mls/message_contents/transcript_messages.pb.go b/pkg/proto/mls/message_contents/transcript_messages.pb.go
index 5a074194..524dbde5 100644
--- a/pkg/proto/mls/message_contents/transcript_messages.pb.go
+++ b/pkg/proto/mls/message_contents/transcript_messages.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: mls/message_contents/transcript_messages.proto
 
@@ -461,7 +461,7 @@ func file_mls_message_contents_transcript_messages_proto_rawDescGZIP() []byte {
 }
 
 var file_mls_message_contents_transcript_messages_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
-var file_mls_message_contents_transcript_messages_proto_goTypes = []interface{}{
+var file_mls_message_contents_transcript_messages_proto_goTypes = []any{
 	(*MembershipChange)(nil),                 // 0: xmtp.mls.message_contents.MembershipChange
 	(*GroupMembershipChanges)(nil),           // 1: xmtp.mls.message_contents.GroupMembershipChanges
 	(*GroupUpdated)(nil),                     // 2: xmtp.mls.message_contents.GroupUpdated
@@ -489,7 +489,7 @@ func file_mls_message_contents_transcript_messages_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_mls_message_contents_transcript_messages_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_transcript_messages_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*MembershipChange); i {
 			case 0:
 				return &v.state
@@ -501,7 +501,7 @@ func file_mls_message_contents_transcript_messages_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_transcript_messages_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_transcript_messages_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*GroupMembershipChanges); i {
 			case 0:
 				return &v.state
@@ -513,7 +513,7 @@ func file_mls_message_contents_transcript_messages_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_transcript_messages_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_transcript_messages_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*GroupUpdated); i {
 			case 0:
 				return &v.state
@@ -525,7 +525,7 @@ func file_mls_message_contents_transcript_messages_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_transcript_messages_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_transcript_messages_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*GroupUpdated_Inbox); i {
 			case 0:
 				return &v.state
@@ -537,7 +537,7 @@ func file_mls_message_contents_transcript_messages_proto_init() {
 				return nil
 			}
 		}
-		file_mls_message_contents_transcript_messages_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_message_contents_transcript_messages_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*GroupUpdated_MetadataFieldChange); i {
 			case 0:
 				return &v.state
@@ -550,7 +550,7 @@ func file_mls_message_contents_transcript_messages_proto_init() {
 			}
 		}
 	}
-	file_mls_message_contents_transcript_messages_proto_msgTypes[4].OneofWrappers = []interface{}{}
+	file_mls_message_contents_transcript_messages_proto_msgTypes[4].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/pkg/proto/mls_validation/v1/service.pb.go b/pkg/proto/mls_validation/v1/service.pb.go
index 49c95f9e..94e13133 100644
--- a/pkg/proto/mls_validation/v1/service.pb.go
+++ b/pkg/proto/mls_validation/v1/service.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.1
+// 	protoc-gen-go v1.34.2
 // 	protoc        (unknown)
 // source: mls_validation/v1/service.proto
 
@@ -1179,7 +1179,7 @@ func file_mls_validation_v1_service_proto_rawDescGZIP() []byte {
 }
 
 var file_mls_validation_v1_service_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
-var file_mls_validation_v1_service_proto_goTypes = []interface{}{
+var file_mls_validation_v1_service_proto_goTypes = []any{
 	(*ValidateInboxIdKeyPackagesResponse)(nil),               // 0: xmtp.mls_validation.v1.ValidateInboxIdKeyPackagesResponse
 	(*ValidateKeyPackagesRequest)(nil),                       // 1: xmtp.mls_validation.v1.ValidateKeyPackagesRequest
 	(*ValidateKeyPackagesResponse)(nil),                      // 2: xmtp.mls_validation.v1.ValidateKeyPackagesResponse
@@ -1239,7 +1239,7 @@ func file_mls_validation_v1_service_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_mls_validation_v1_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*ValidateInboxIdKeyPackagesResponse); i {
 			case 0:
 				return &v.state
@@ -1251,7 +1251,7 @@ func file_mls_validation_v1_service_proto_init() {
 				return nil
 			}
 		}
-		file_mls_validation_v1_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*ValidateKeyPackagesRequest); i {
 			case 0:
 				return &v.state
@@ -1263,7 +1263,7 @@ func file_mls_validation_v1_service_proto_init() {
 				return nil
 			}
 		}
-		file_mls_validation_v1_service_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*ValidateKeyPackagesResponse); i {
 			case 0:
 				return &v.state
@@ -1275,7 +1275,7 @@ func file_mls_validation_v1_service_proto_init() {
 				return nil
 			}
 		}
-		file_mls_validation_v1_service_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*ValidateGroupMessagesRequest); i {
 			case 0:
 				return &v.state
@@ -1287,7 +1287,7 @@ func file_mls_validation_v1_service_proto_init() {
 				return nil
 			}
 		}
-		file_mls_validation_v1_service_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*ValidateGroupMessagesResponse); i {
 			case 0:
 				return &v.state
@@ -1299,7 +1299,7 @@ func file_mls_validation_v1_service_proto_init() {
 				return nil
 			}
 		}
-		file_mls_validation_v1_service_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*GetAssociationStateRequest); i {
 			case 0:
 				return &v.state
@@ -1311,7 +1311,7 @@ func file_mls_validation_v1_service_proto_init() {
 				return nil
 			}
 		}
-		file_mls_validation_v1_service_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*GetAssociationStateResponse); i {
 			case 0:
 				return &v.state
@@ -1323,7 +1323,7 @@ func file_mls_validation_v1_service_proto_init() {
 				return nil
 			}
 		}
-		file_mls_validation_v1_service_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*ValidateInboxIdsRequest); i {
 			case 0:
 				return &v.state
@@ -1335,7 +1335,7 @@ func file_mls_validation_v1_service_proto_init() {
 				return nil
 			}
 		}
-		file_mls_validation_v1_service_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[8].Exporter = func(v any, i int) any {
 			switch v := v.(*ValidateInboxIdsResponse); i {
 			case 0:
 				return &v.state
@@ -1347,7 +1347,7 @@ func file_mls_validation_v1_service_proto_init() {
 				return nil
 			}
 		}
-		file_mls_validation_v1_service_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[9].Exporter = func(v any, i int) any {
 			switch v := v.(*ValidateInboxIdKeyPackagesResponse_Response); i {
 			case 0:
 				return &v.state
@@ -1359,7 +1359,7 @@ func file_mls_validation_v1_service_proto_init() {
 				return nil
 			}
 		}
-		file_mls_validation_v1_service_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[10].Exporter = func(v any, i int) any {
 			switch v := v.(*ValidateKeyPackagesRequest_KeyPackage); i {
 			case 0:
 				return &v.state
@@ -1371,7 +1371,7 @@ func file_mls_validation_v1_service_proto_init() {
 				return nil
 			}
 		}
-		file_mls_validation_v1_service_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[11].Exporter = func(v any, i int) any {
 			switch v := v.(*ValidateKeyPackagesResponse_ValidationResponse); i {
 			case 0:
 				return &v.state
@@ -1383,7 +1383,7 @@ func file_mls_validation_v1_service_proto_init() {
 				return nil
 			}
 		}
-		file_mls_validation_v1_service_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[12].Exporter = func(v any, i int) any {
 			switch v := v.(*ValidateGroupMessagesRequest_GroupMessage); i {
 			case 0:
 				return &v.state
@@ -1395,7 +1395,7 @@ func file_mls_validation_v1_service_proto_init() {
 				return nil
 			}
 		}
-		file_mls_validation_v1_service_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[13].Exporter = func(v any, i int) any {
 			switch v := v.(*ValidateGroupMessagesResponse_ValidationResponse); i {
 			case 0:
 				return &v.state
@@ -1407,7 +1407,7 @@ func file_mls_validation_v1_service_proto_init() {
 				return nil
 			}
 		}
-		file_mls_validation_v1_service_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[14].Exporter = func(v any, i int) any {
 			switch v := v.(*ValidateInboxIdsRequest_ValidationRequest); i {
 			case 0:
 				return &v.state
@@ -1419,7 +1419,7 @@ func file_mls_validation_v1_service_proto_init() {
 				return nil
 			}
 		}
-		file_mls_validation_v1_service_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_mls_validation_v1_service_proto_msgTypes[15].Exporter = func(v any, i int) any {
 			switch v := v.(*ValidateInboxIdsResponse_ValidationResponse); i {
 			case 0:
 				return &v.state
diff --git a/pkg/proto/openapi/identity/api/v1/identity.swagger.json b/pkg/proto/openapi/identity/api/v1/identity.swagger.json
index ce2bc819..53768ce0 100644
--- a/pkg/proto/openapi/identity/api/v1/identity.swagger.json
+++ b/pkg/proto/openapi/identity/api/v1/identity.swagger.json
@@ -210,26 +210,6 @@
       },
       "description": "The first entry of any XID log. The XID must be deterministically derivable\nfrom the address and nonce.\nThe recovery address defaults to the initial associated_address unless\nthere is a subsequent ChangeRecoveryAddress in the log."
     },
-    "associationsErc1271Signature": {
-      "type": "object",
-      "properties": {
-        "accountId": {
-          "type": "string",
-          "title": "CAIP-10\nhttps://github.com/ChainAgnostic/CAIPs/blob/main/CAIPs/caip-10.md"
-        },
-        "blockNumber": {
-          "type": "string",
-          "format": "uint64",
-          "title": "Specify the block number to verify the signature against"
-        },
-        "signature": {
-          "type": "string",
-          "format": "byte",
-          "title": "The actual signature bytes"
-        }
-      },
-      "title": "Smart wallet signature"
-    },
     "associationsIdentityAction": {
       "type": "object",
       "properties": {
@@ -321,6 +301,30 @@
       },
       "description": "Revokes a member from an XID. The recovery address must sign the revocation."
     },
+    "associationsSmartContractWalletSignature": {
+      "type": "object",
+      "properties": {
+        "accountId": {
+          "type": "string",
+          "title": "CAIP-10 string\nhttps://github.com/ChainAgnostic/CAIPs/blob/main/CAIPs/caip-10.md"
+        },
+        "blockNumber": {
+          "type": "string",
+          "format": "uint64",
+          "title": "Specify the block number to verify the signature against"
+        },
+        "signature": {
+          "type": "string",
+          "format": "byte",
+          "title": "The actual signature bytes"
+        },
+        "chainRpcUrl": {
+          "type": "string",
+          "title": "The RPC URL specifies a chain to verify the signature against"
+        }
+      },
+      "title": "Smart Contract Wallet signature"
+    },
     "identityassociationsRecoverableEcdsaSignature": {
       "type": "object",
       "properties": {
@@ -338,8 +342,8 @@
         "erc191": {
           "$ref": "#/definitions/identityassociationsRecoverableEcdsaSignature"
         },
-        "erc1271": {
-          "$ref": "#/definitions/associationsErc1271Signature"
+        "erc6492": {
+          "$ref": "#/definitions/associationsSmartContractWalletSignature"
         },
         "installationKey": {
           "$ref": "#/definitions/associationsRecoverableEd25519Signature"
diff --git a/pkg/proto/openapi/mls/api/v1/mls.swagger.json b/pkg/proto/openapi/mls/api/v1/mls.swagger.json
index f3f6582d..3068282b 100644
--- a/pkg/proto/openapi/mls/api/v1/mls.swagger.json
+++ b/pkg/proto/openapi/mls/api/v1/mls.swagger.json
@@ -604,7 +604,8 @@
       "properties": {
         "data": {
           "type": "string",
-          "format": "byte"
+          "format": "byte",
+          "title": "Serialized MlsProtocolMessage"
         },
         "senderHmac": {
           "type": "string",
diff --git a/pkg/proto/openapi/mls_validation/v1/service.swagger.json b/pkg/proto/openapi/mls_validation/v1/service.swagger.json
index b64068e6..18e906b8 100644
--- a/pkg/proto/openapi/mls_validation/v1/service.swagger.json
+++ b/pkg/proto/openapi/mls_validation/v1/service.swagger.json
@@ -159,26 +159,6 @@
       },
       "description": "The first entry of any XID log. The XID must be deterministically derivable\nfrom the address and nonce.\nThe recovery address defaults to the initial associated_address unless\nthere is a subsequent ChangeRecoveryAddress in the log."
     },
-    "associationsErc1271Signature": {
-      "type": "object",
-      "properties": {
-        "accountId": {
-          "type": "string",
-          "title": "CAIP-10\nhttps://github.com/ChainAgnostic/CAIPs/blob/main/CAIPs/caip-10.md"
-        },
-        "blockNumber": {
-          "type": "string",
-          "format": "uint64",
-          "title": "Specify the block number to verify the signature against"
-        },
-        "signature": {
-          "type": "string",
-          "format": "byte",
-          "title": "The actual signature bytes"
-        }
-      },
-      "title": "Smart wallet signature"
-    },
     "associationsIdentityAction": {
       "type": "object",
       "properties": {
@@ -294,6 +274,30 @@
       },
       "description": "Revokes a member from an XID. The recovery address must sign the revocation."
     },
+    "associationsSmartContractWalletSignature": {
+      "type": "object",
+      "properties": {
+        "accountId": {
+          "type": "string",
+          "title": "CAIP-10 string\nhttps://github.com/ChainAgnostic/CAIPs/blob/main/CAIPs/caip-10.md"
+        },
+        "blockNumber": {
+          "type": "string",
+          "format": "uint64",
+          "title": "Specify the block number to verify the signature against"
+        },
+        "signature": {
+          "type": "string",
+          "format": "byte",
+          "title": "The actual signature bytes"
+        },
+        "chainRpcUrl": {
+          "type": "string",
+          "title": "The RPC URL specifies a chain to verify the signature against"
+        }
+      },
+      "title": "Smart Contract Wallet signature"
+    },
     "identityassociationsRecoverableEcdsaSignature": {
       "type": "object",
       "properties": {
@@ -311,8 +315,8 @@
         "erc191": {
           "$ref": "#/definitions/identityassociationsRecoverableEcdsaSignature"
         },
-        "erc1271": {
-          "$ref": "#/definitions/associationsErc1271Signature"
+        "erc6492": {
+          "$ref": "#/definitions/associationsSmartContractWalletSignature"
         },
         "installationKey": {
           "$ref": "#/definitions/associationsRecoverableEd25519Signature"
diff --git a/pkg/proto/openapi/xmtpv4/message_api/message_api.swagger.json b/pkg/proto/openapi/xmtpv4/message_api/message_api.swagger.json
new file mode 100644
index 00000000..9b1ce809
--- /dev/null
+++ b/pkg/proto/openapi/xmtpv4/message_api/message_api.swagger.json
@@ -0,0 +1,328 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "xmtpv4/message_api/message_api.proto",
+    "version": "version not set"
+  },
+  "tags": [
+    {
+      "name": "ReplicationApi"
+    }
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "paths": {
+    "/mls/v2/publish-envelope": {
+      "post": {
+        "summary": "Publish envelope",
+        "operationId": "ReplicationApi_PublishEnvelope",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/xmtpv4PublishEnvelopeResponse"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "$ref": "#/definitions/rpcStatus"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/xmtpv4PublishEnvelopeRequest"
+            }
+          }
+        ],
+        "tags": [
+          "ReplicationApi"
+        ]
+      }
+    },
+    "/mls/v2/query-envelopes": {
+      "post": {
+        "summary": "Query envelopes",
+        "operationId": "ReplicationApi_QueryEnvelopes",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/xmtpv4QueryEnvelopesResponse"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "$ref": "#/definitions/rpcStatus"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/xmtpv4QueryEnvelopesRequest"
+            }
+          }
+        ],
+        "tags": [
+          "ReplicationApi"
+        ]
+      }
+    },
+    "/mls/v2/subscribe-envelopes": {
+      "post": {
+        "summary": "Subscribe to envelopes",
+        "operationId": "ReplicationApi_BatchSubscribeEnvelopes",
+        "responses": {
+          "200": {
+            "description": "A successful response.(streaming responses)",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "result": {
+                  "$ref": "#/definitions/xmtpv4BatchSubscribeEnvelopesResponse"
+                },
+                "error": {
+                  "$ref": "#/definitions/rpcStatus"
+                }
+              },
+              "title": "Stream result of xmtpv4BatchSubscribeEnvelopesResponse"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "$ref": "#/definitions/rpcStatus"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/xmtpv4BatchSubscribeEnvelopesRequest"
+            }
+          }
+        ],
+        "tags": [
+          "ReplicationApi"
+        ]
+      }
+    }
+  },
+  "definitions": {
+    "BatchSubscribeEnvelopesRequestSubscribeEnvelopesRequest": {
+      "type": "object",
+      "properties": {
+        "query": {
+          "$ref": "#/definitions/xmtpv4EnvelopesQuery"
+        }
+      },
+      "title": "Single subscription request for envelopes"
+    },
+    "identityassociationsRecoverableEcdsaSignature": {
+      "type": "object",
+      "properties": {
+        "bytes": {
+          "type": "string",
+          "format": "byte",
+          "title": "65-bytes [ R || S || V ], with recovery id as the last byte"
+        }
+      },
+      "title": "RecoverableEcdsaSignature for EIP-191 and V2 signatures"
+    },
+    "protobufAny": {
+      "type": "object",
+      "properties": {
+        "@type": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": {}
+    },
+    "rpcStatus": {
+      "type": "object",
+      "properties": {
+        "code": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "message": {
+          "type": "string"
+        },
+        "details": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "$ref": "#/definitions/protobufAny"
+          }
+        }
+      }
+    },
+    "xmtpv4BatchSubscribeEnvelopesRequest": {
+      "type": "object",
+      "properties": {
+        "requests": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "$ref": "#/definitions/BatchSubscribeEnvelopesRequestSubscribeEnvelopesRequest"
+          }
+        }
+      },
+      "title": "Batch subscribe to envelopes"
+    },
+    "xmtpv4BatchSubscribeEnvelopesResponse": {
+      "type": "object",
+      "properties": {
+        "envelopes": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "$ref": "#/definitions/xmtpv4GatewayEnvelope"
+          }
+        }
+      },
+      "title": "Streamed response for batch subscribe - can be multiple envelopes at once"
+    },
+    "xmtpv4BlockchainProof": {
+      "type": "object",
+      "properties": {
+        "blockNumber": {
+          "type": "string",
+          "format": "uint64"
+        },
+        "publisherId": {
+          "type": "integer",
+          "format": "int64"
+        }
+      },
+      "title": "An alternative to a signature for blockchain payloads"
+    },
+    "xmtpv4EnvelopesQuery": {
+      "type": "object",
+      "properties": {
+        "topic": {
+          "type": "string",
+          "format": "byte",
+          "title": "Client queries"
+        },
+        "originatorId": {
+          "type": "integer",
+          "format": "int64",
+          "title": "Node queries"
+        },
+        "originatorSid": {
+          "type": "string",
+          "format": "uint64"
+        },
+        "gatewaySid": {
+          "type": "string",
+          "format": "uint64"
+        }
+      },
+      "title": "Query for envelopes, shared by query and subscribe endpoints"
+    },
+    "xmtpv4GatewayEnvelope": {
+      "type": "object",
+      "properties": {
+        "gatewaySid": {
+          "type": "string",
+          "format": "uint64"
+        },
+        "originatorEnvelope": {
+          "$ref": "#/definitions/xmtpv4OriginatorEnvelope"
+        }
+      },
+      "title": "Wraps originator envelope with a sequence ID assigned by the gateway"
+    },
+    "xmtpv4OriginatorEnvelope": {
+      "type": "object",
+      "properties": {
+        "unsignedOriginatorEnvelope": {
+          "type": "string",
+          "format": "byte",
+          "title": "Protobuf serialized"
+        },
+        "originatorSignature": {
+          "$ref": "#/definitions/identityassociationsRecoverableEcdsaSignature"
+        },
+        "blockchainProof": {
+          "$ref": "#/definitions/xmtpv4BlockchainProof"
+        }
+      },
+      "title": "Signed originator envelope"
+    },
+    "xmtpv4PayerEnvelope": {
+      "type": "object",
+      "properties": {
+        "unsignedClientEnvelope": {
+          "type": "string",
+          "format": "byte",
+          "title": "Protobuf serialized"
+        },
+        "payerSignature": {
+          "$ref": "#/definitions/identityassociationsRecoverableEcdsaSignature"
+        }
+      },
+      "title": "Wraps client envelope with payer signature"
+    },
+    "xmtpv4PublishEnvelopeRequest": {
+      "type": "object",
+      "properties": {
+        "payerEnvelope": {
+          "$ref": "#/definitions/xmtpv4PayerEnvelope"
+        }
+      }
+    },
+    "xmtpv4PublishEnvelopeResponse": {
+      "type": "object",
+      "properties": {
+        "originatorEnvelope": {
+          "$ref": "#/definitions/xmtpv4OriginatorEnvelope"
+        }
+      }
+    },
+    "xmtpv4QueryEnvelopesRequest": {
+      "type": "object",
+      "properties": {
+        "query": {
+          "$ref": "#/definitions/xmtpv4EnvelopesQuery"
+        },
+        "limit": {
+          "type": "integer",
+          "format": "int64"
+        }
+      },
+      "title": "Query envelopes request"
+    },
+    "xmtpv4QueryEnvelopesResponse": {
+      "type": "object",
+      "properties": {
+        "envelopes": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "$ref": "#/definitions/xmtpv4GatewayEnvelope"
+          }
+        }
+      },
+      "title": "Query envelopes response"
+    }
+  }
+}
diff --git a/pkg/proto/xmtpv4/message_api/message_api.pb.go b/pkg/proto/xmtpv4/message_api/message_api.pb.go
new file mode 100644
index 00000000..781761c8
--- /dev/null
+++ b/pkg/proto/xmtpv4/message_api/message_api.pb.go
@@ -0,0 +1,1658 @@
+// Message API for XMTP V4
+
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.34.2
+// 	protoc        (unknown)
+// source: xmtpv4/message_api/message_api.proto
+
+package message_api
+
+import (
+	associations "github.com/xmtp/xmtp-node-go/pkg/proto/identity/associations"
+	v1 "github.com/xmtp/xmtp-node-go/pkg/proto/mls/api/v1"
+	_ "google.golang.org/genproto/googleapis/api/annotations"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// Misbehavior types
+type Misbehavior int32
+
+const (
+	Misbehavior_MISBEHAVIOR_UNSPECIFIED                 Misbehavior = 0
+	Misbehavior_MISBEHAVIOR_UNAVAILABLE_NODE            Misbehavior = 1
+	Misbehavior_MISBEHAVIOR_OUT_OF_ORDER_ORIGINATOR_SID Misbehavior = 2
+	Misbehavior_MISBEHAVIOR_DUPLICATE_ORIGINATOR_SID    Misbehavior = 3
+	Misbehavior_MISBEHAVIOR_CYCLICAL_MESSAGE_ORDERING   Misbehavior = 4
+)
+
+// Enum value maps for Misbehavior.
+var (
+	Misbehavior_name = map[int32]string{
+		0: "MISBEHAVIOR_UNSPECIFIED",
+		1: "MISBEHAVIOR_UNAVAILABLE_NODE",
+		2: "MISBEHAVIOR_OUT_OF_ORDER_ORIGINATOR_SID",
+		3: "MISBEHAVIOR_DUPLICATE_ORIGINATOR_SID",
+		4: "MISBEHAVIOR_CYCLICAL_MESSAGE_ORDERING",
+	}
+	Misbehavior_value = map[string]int32{
+		"MISBEHAVIOR_UNSPECIFIED":                 0,
+		"MISBEHAVIOR_UNAVAILABLE_NODE":            1,
+		"MISBEHAVIOR_OUT_OF_ORDER_ORIGINATOR_SID": 2,
+		"MISBEHAVIOR_DUPLICATE_ORIGINATOR_SID":    3,
+		"MISBEHAVIOR_CYCLICAL_MESSAGE_ORDERING":   4,
+	}
+)
+
+func (x Misbehavior) Enum() *Misbehavior {
+	p := new(Misbehavior)
+	*p = x
+	return p
+}
+
+func (x Misbehavior) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (Misbehavior) Descriptor() protoreflect.EnumDescriptor {
+	return file_xmtpv4_message_api_message_api_proto_enumTypes[0].Descriptor()
+}
+
+func (Misbehavior) Type() protoreflect.EnumType {
+	return &file_xmtpv4_message_api_message_api_proto_enumTypes[0]
+}
+
+func (x Misbehavior) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use Misbehavior.Descriptor instead.
+func (Misbehavior) EnumDescriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{0}
+}
+
+// Data visible to the server that has been authenticated by the client.
+type AuthenticatedData struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	TargetOriginator   uint32   `protobuf:"varint,1,opt,name=target_originator,json=targetOriginator,proto3" json:"target_originator,omitempty"`
+	TargetTopic        []byte   `protobuf:"bytes,2,opt,name=target_topic,json=targetTopic,proto3" json:"target_topic,omitempty"`
+	LastOriginatorSids []uint64 `protobuf:"varint,3,rep,packed,name=last_originator_sids,json=lastOriginatorSids,proto3" json:"last_originator_sids,omitempty"`
+}
+
+func (x *AuthenticatedData) Reset() {
+	*x = AuthenticatedData{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AuthenticatedData) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AuthenticatedData) ProtoMessage() {}
+
+func (x *AuthenticatedData) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use AuthenticatedData.ProtoReflect.Descriptor instead.
+func (*AuthenticatedData) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *AuthenticatedData) GetTargetOriginator() uint32 {
+	if x != nil {
+		return x.TargetOriginator
+	}
+	return 0
+}
+
+func (x *AuthenticatedData) GetTargetTopic() []byte {
+	if x != nil {
+		return x.TargetTopic
+	}
+	return nil
+}
+
+func (x *AuthenticatedData) GetLastOriginatorSids() []uint64 {
+	if x != nil {
+		return x.LastOriginatorSids
+	}
+	return nil
+}
+
+type ClientEnvelope struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Types that are assignable to Payload:
+	//
+	//	*ClientEnvelope_GroupMessage
+	//	*ClientEnvelope_WelcomeMessage
+	//	*ClientEnvelope_RegisterInstallation
+	//	*ClientEnvelope_UploadKeyPackage
+	//	*ClientEnvelope_RevokeInstallation
+	Payload isClientEnvelope_Payload `protobuf_oneof:"payload"`
+	Aad     *AuthenticatedData       `protobuf:"bytes,6,opt,name=aad,proto3" json:"aad,omitempty"`
+}
+
+func (x *ClientEnvelope) Reset() {
+	*x = ClientEnvelope{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ClientEnvelope) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ClientEnvelope) ProtoMessage() {}
+
+func (x *ClientEnvelope) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ClientEnvelope.ProtoReflect.Descriptor instead.
+func (*ClientEnvelope) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{1}
+}
+
+func (m *ClientEnvelope) GetPayload() isClientEnvelope_Payload {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+func (x *ClientEnvelope) GetGroupMessage() *v1.GroupMessageInput {
+	if x, ok := x.GetPayload().(*ClientEnvelope_GroupMessage); ok {
+		return x.GroupMessage
+	}
+	return nil
+}
+
+func (x *ClientEnvelope) GetWelcomeMessage() *v1.WelcomeMessageInput {
+	if x, ok := x.GetPayload().(*ClientEnvelope_WelcomeMessage); ok {
+		return x.WelcomeMessage
+	}
+	return nil
+}
+
+func (x *ClientEnvelope) GetRegisterInstallation() *v1.RegisterInstallationRequest {
+	if x, ok := x.GetPayload().(*ClientEnvelope_RegisterInstallation); ok {
+		return x.RegisterInstallation
+	}
+	return nil
+}
+
+func (x *ClientEnvelope) GetUploadKeyPackage() *v1.UploadKeyPackageRequest {
+	if x, ok := x.GetPayload().(*ClientEnvelope_UploadKeyPackage); ok {
+		return x.UploadKeyPackage
+	}
+	return nil
+}
+
+func (x *ClientEnvelope) GetRevokeInstallation() *v1.RevokeInstallationRequest {
+	if x, ok := x.GetPayload().(*ClientEnvelope_RevokeInstallation); ok {
+		return x.RevokeInstallation
+	}
+	return nil
+}
+
+func (x *ClientEnvelope) GetAad() *AuthenticatedData {
+	if x != nil {
+		return x.Aad
+	}
+	return nil
+}
+
+type isClientEnvelope_Payload interface {
+	isClientEnvelope_Payload()
+}
+
+type ClientEnvelope_GroupMessage struct {
+	GroupMessage *v1.GroupMessageInput `protobuf:"bytes,1,opt,name=group_message,json=groupMessage,proto3,oneof"`
+}
+
+type ClientEnvelope_WelcomeMessage struct {
+	WelcomeMessage *v1.WelcomeMessageInput `protobuf:"bytes,2,opt,name=welcome_message,json=welcomeMessage,proto3,oneof"`
+}
+
+type ClientEnvelope_RegisterInstallation struct {
+	RegisterInstallation *v1.RegisterInstallationRequest `protobuf:"bytes,3,opt,name=register_installation,json=registerInstallation,proto3,oneof"`
+}
+
+type ClientEnvelope_UploadKeyPackage struct {
+	UploadKeyPackage *v1.UploadKeyPackageRequest `protobuf:"bytes,4,opt,name=upload_key_package,json=uploadKeyPackage,proto3,oneof"`
+}
+
+type ClientEnvelope_RevokeInstallation struct {
+	RevokeInstallation *v1.RevokeInstallationRequest `protobuf:"bytes,5,opt,name=revoke_installation,json=revokeInstallation,proto3,oneof"`
+}
+
+func (*ClientEnvelope_GroupMessage) isClientEnvelope_Payload() {}
+
+func (*ClientEnvelope_WelcomeMessage) isClientEnvelope_Payload() {}
+
+func (*ClientEnvelope_RegisterInstallation) isClientEnvelope_Payload() {}
+
+func (*ClientEnvelope_UploadKeyPackage) isClientEnvelope_Payload() {}
+
+func (*ClientEnvelope_RevokeInstallation) isClientEnvelope_Payload() {}
+
+// Wraps client envelope with payer signature
+type PayerEnvelope struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	UnsignedClientEnvelope []byte                                  `protobuf:"bytes,1,opt,name=unsigned_client_envelope,json=unsignedClientEnvelope,proto3" json:"unsigned_client_envelope,omitempty"` // Protobuf serialized
+	PayerSignature         *associations.RecoverableEcdsaSignature `protobuf:"bytes,2,opt,name=payer_signature,json=payerSignature,proto3" json:"payer_signature,omitempty"`
+}
+
+func (x *PayerEnvelope) Reset() {
+	*x = PayerEnvelope{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PayerEnvelope) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PayerEnvelope) ProtoMessage() {}
+
+func (x *PayerEnvelope) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PayerEnvelope.ProtoReflect.Descriptor instead.
+func (*PayerEnvelope) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *PayerEnvelope) GetUnsignedClientEnvelope() []byte {
+	if x != nil {
+		return x.UnsignedClientEnvelope
+	}
+	return nil
+}
+
+func (x *PayerEnvelope) GetPayerSignature() *associations.RecoverableEcdsaSignature {
+	if x != nil {
+		return x.PayerSignature
+	}
+	return nil
+}
+
+// For blockchain envelopes, the originator_sid is set by the smart contract,
+// but the originator_ns is set by the publishing node
+type UnsignedOriginatorEnvelope struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	OriginatorSid uint64         `protobuf:"varint,1,opt,name=originator_sid,json=originatorSid,proto3" json:"originator_sid,omitempty"`
+	OriginatorNs  int64          `protobuf:"varint,2,opt,name=originator_ns,json=originatorNs,proto3" json:"originator_ns,omitempty"`
+	PayerEnvelope *PayerEnvelope `protobuf:"bytes,3,opt,name=payer_envelope,json=payerEnvelope,proto3" json:"payer_envelope,omitempty"`
+}
+
+func (x *UnsignedOriginatorEnvelope) Reset() {
+	*x = UnsignedOriginatorEnvelope{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UnsignedOriginatorEnvelope) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UnsignedOriginatorEnvelope) ProtoMessage() {}
+
+func (x *UnsignedOriginatorEnvelope) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UnsignedOriginatorEnvelope.ProtoReflect.Descriptor instead.
+func (*UnsignedOriginatorEnvelope) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *UnsignedOriginatorEnvelope) GetOriginatorSid() uint64 {
+	if x != nil {
+		return x.OriginatorSid
+	}
+	return 0
+}
+
+func (x *UnsignedOriginatorEnvelope) GetOriginatorNs() int64 {
+	if x != nil {
+		return x.OriginatorNs
+	}
+	return 0
+}
+
+func (x *UnsignedOriginatorEnvelope) GetPayerEnvelope() *PayerEnvelope {
+	if x != nil {
+		return x.PayerEnvelope
+	}
+	return nil
+}
+
+// An alternative to a signature for blockchain payloads
+type BlockchainProof struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	BlockNumber uint64 `protobuf:"varint,1,opt,name=block_number,json=blockNumber,proto3" json:"block_number,omitempty"`
+	PublisherId uint32 `protobuf:"varint,2,opt,name=publisher_id,json=publisherId,proto3" json:"publisher_id,omitempty"`
+}
+
+func (x *BlockchainProof) Reset() {
+	*x = BlockchainProof{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BlockchainProof) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BlockchainProof) ProtoMessage() {}
+
+func (x *BlockchainProof) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use BlockchainProof.ProtoReflect.Descriptor instead.
+func (*BlockchainProof) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *BlockchainProof) GetBlockNumber() uint64 {
+	if x != nil {
+		return x.BlockNumber
+	}
+	return 0
+}
+
+func (x *BlockchainProof) GetPublisherId() uint32 {
+	if x != nil {
+		return x.PublisherId
+	}
+	return 0
+}
+
+// Signed originator envelope
+type OriginatorEnvelope struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	UnsignedOriginatorEnvelope []byte `protobuf:"bytes,1,opt,name=unsigned_originator_envelope,json=unsignedOriginatorEnvelope,proto3" json:"unsigned_originator_envelope,omitempty"` // Protobuf serialized
+	// Types that are assignable to Proof:
+	//
+	//	*OriginatorEnvelope_OriginatorSignature
+	//	*OriginatorEnvelope_BlockchainProof
+	Proof isOriginatorEnvelope_Proof `protobuf_oneof:"proof"`
+}
+
+func (x *OriginatorEnvelope) Reset() {
+	*x = OriginatorEnvelope{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *OriginatorEnvelope) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*OriginatorEnvelope) ProtoMessage() {}
+
+func (x *OriginatorEnvelope) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use OriginatorEnvelope.ProtoReflect.Descriptor instead.
+func (*OriginatorEnvelope) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *OriginatorEnvelope) GetUnsignedOriginatorEnvelope() []byte {
+	if x != nil {
+		return x.UnsignedOriginatorEnvelope
+	}
+	return nil
+}
+
+func (m *OriginatorEnvelope) GetProof() isOriginatorEnvelope_Proof {
+	if m != nil {
+		return m.Proof
+	}
+	return nil
+}
+
+func (x *OriginatorEnvelope) GetOriginatorSignature() *associations.RecoverableEcdsaSignature {
+	if x, ok := x.GetProof().(*OriginatorEnvelope_OriginatorSignature); ok {
+		return x.OriginatorSignature
+	}
+	return nil
+}
+
+func (x *OriginatorEnvelope) GetBlockchainProof() *BlockchainProof {
+	if x, ok := x.GetProof().(*OriginatorEnvelope_BlockchainProof); ok {
+		return x.BlockchainProof
+	}
+	return nil
+}
+
+type isOriginatorEnvelope_Proof interface {
+	isOriginatorEnvelope_Proof()
+}
+
+type OriginatorEnvelope_OriginatorSignature struct {
+	OriginatorSignature *associations.RecoverableEcdsaSignature `protobuf:"bytes,2,opt,name=originator_signature,json=originatorSignature,proto3,oneof"`
+}
+
+type OriginatorEnvelope_BlockchainProof struct {
+	BlockchainProof *BlockchainProof `protobuf:"bytes,3,opt,name=blockchain_proof,json=blockchainProof,proto3,oneof"`
+}
+
+func (*OriginatorEnvelope_OriginatorSignature) isOriginatorEnvelope_Proof() {}
+
+func (*OriginatorEnvelope_BlockchainProof) isOriginatorEnvelope_Proof() {}
+
+// Wraps originator envelope with a sequence ID assigned by the gateway
+type GatewayEnvelope struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	GatewaySid         uint64              `protobuf:"varint,1,opt,name=gateway_sid,json=gatewaySid,proto3" json:"gateway_sid,omitempty"`
+	OriginatorEnvelope *OriginatorEnvelope `protobuf:"bytes,2,opt,name=originator_envelope,json=originatorEnvelope,proto3" json:"originator_envelope,omitempty"`
+}
+
+func (x *GatewayEnvelope) Reset() {
+	*x = GatewayEnvelope{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GatewayEnvelope) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GatewayEnvelope) ProtoMessage() {}
+
+func (x *GatewayEnvelope) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GatewayEnvelope.ProtoReflect.Descriptor instead.
+func (*GatewayEnvelope) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *GatewayEnvelope) GetGatewaySid() uint64 {
+	if x != nil {
+		return x.GatewaySid
+	}
+	return 0
+}
+
+func (x *GatewayEnvelope) GetOriginatorEnvelope() *OriginatorEnvelope {
+	if x != nil {
+		return x.OriginatorEnvelope
+	}
+	return nil
+}
+
+// Reports node misbehavior, submittable by nodes or by clients
+type MisbehaviorReport struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Type      Misbehavior           `protobuf:"varint,1,opt,name=type,proto3,enum=xmtp.xmtpv4.Misbehavior" json:"type,omitempty"`
+	Envelopes []*OriginatorEnvelope `protobuf:"bytes,2,rep,name=envelopes,proto3" json:"envelopes,omitempty"`
+}
+
+func (x *MisbehaviorReport) Reset() {
+	*x = MisbehaviorReport{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MisbehaviorReport) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MisbehaviorReport) ProtoMessage() {}
+
+func (x *MisbehaviorReport) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use MisbehaviorReport.ProtoReflect.Descriptor instead.
+func (*MisbehaviorReport) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *MisbehaviorReport) GetType() Misbehavior {
+	if x != nil {
+		return x.Type
+	}
+	return Misbehavior_MISBEHAVIOR_UNSPECIFIED
+}
+
+func (x *MisbehaviorReport) GetEnvelopes() []*OriginatorEnvelope {
+	if x != nil {
+		return x.Envelopes
+	}
+	return nil
+}
+
+// Query for envelopes, shared by query and subscribe endpoints
+type EnvelopesQuery struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Types that are assignable to Filter:
+	//
+	//	*EnvelopesQuery_Topic
+	//	*EnvelopesQuery_OriginatorId
+	Filter isEnvelopesQuery_Filter `protobuf_oneof:"filter"`
+	// Types that are assignable to LastSeen:
+	//
+	//	*EnvelopesQuery_OriginatorSid
+	//	*EnvelopesQuery_GatewaySid
+	LastSeen isEnvelopesQuery_LastSeen `protobuf_oneof:"last_seen"`
+}
+
+func (x *EnvelopesQuery) Reset() {
+	*x = EnvelopesQuery{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EnvelopesQuery) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EnvelopesQuery) ProtoMessage() {}
+
+func (x *EnvelopesQuery) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[8]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use EnvelopesQuery.ProtoReflect.Descriptor instead.
+func (*EnvelopesQuery) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{8}
+}
+
+func (m *EnvelopesQuery) GetFilter() isEnvelopesQuery_Filter {
+	if m != nil {
+		return m.Filter
+	}
+	return nil
+}
+
+func (x *EnvelopesQuery) GetTopic() []byte {
+	if x, ok := x.GetFilter().(*EnvelopesQuery_Topic); ok {
+		return x.Topic
+	}
+	return nil
+}
+
+func (x *EnvelopesQuery) GetOriginatorId() uint32 {
+	if x, ok := x.GetFilter().(*EnvelopesQuery_OriginatorId); ok {
+		return x.OriginatorId
+	}
+	return 0
+}
+
+func (m *EnvelopesQuery) GetLastSeen() isEnvelopesQuery_LastSeen {
+	if m != nil {
+		return m.LastSeen
+	}
+	return nil
+}
+
+func (x *EnvelopesQuery) GetOriginatorSid() uint64 {
+	if x, ok := x.GetLastSeen().(*EnvelopesQuery_OriginatorSid); ok {
+		return x.OriginatorSid
+	}
+	return 0
+}
+
+func (x *EnvelopesQuery) GetGatewaySid() uint64 {
+	if x, ok := x.GetLastSeen().(*EnvelopesQuery_GatewaySid); ok {
+		return x.GatewaySid
+	}
+	return 0
+}
+
+type isEnvelopesQuery_Filter interface {
+	isEnvelopesQuery_Filter()
+}
+
+type EnvelopesQuery_Topic struct {
+	// Client queries
+	Topic []byte `protobuf:"bytes,1,opt,name=topic,proto3,oneof"`
+}
+
+type EnvelopesQuery_OriginatorId struct {
+	// Node queries
+	OriginatorId uint32 `protobuf:"varint,2,opt,name=originator_id,json=originatorId,proto3,oneof"`
+}
+
+func (*EnvelopesQuery_Topic) isEnvelopesQuery_Filter() {}
+
+func (*EnvelopesQuery_OriginatorId) isEnvelopesQuery_Filter() {}
+
+type isEnvelopesQuery_LastSeen interface {
+	isEnvelopesQuery_LastSeen()
+}
+
+type EnvelopesQuery_OriginatorSid struct {
+	OriginatorSid uint64 `protobuf:"varint,3,opt,name=originator_sid,json=originatorSid,proto3,oneof"`
+}
+
+type EnvelopesQuery_GatewaySid struct {
+	GatewaySid uint64 `protobuf:"varint,4,opt,name=gateway_sid,json=gatewaySid,proto3,oneof"`
+}
+
+func (*EnvelopesQuery_OriginatorSid) isEnvelopesQuery_LastSeen() {}
+
+func (*EnvelopesQuery_GatewaySid) isEnvelopesQuery_LastSeen() {}
+
+// Batch subscribe to envelopes
+type BatchSubscribeEnvelopesRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Requests []*BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest `protobuf:"bytes,1,rep,name=requests,proto3" json:"requests,omitempty"`
+}
+
+func (x *BatchSubscribeEnvelopesRequest) Reset() {
+	*x = BatchSubscribeEnvelopesRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BatchSubscribeEnvelopesRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BatchSubscribeEnvelopesRequest) ProtoMessage() {}
+
+func (x *BatchSubscribeEnvelopesRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[9]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use BatchSubscribeEnvelopesRequest.ProtoReflect.Descriptor instead.
+func (*BatchSubscribeEnvelopesRequest) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{9}
+}
+
+func (x *BatchSubscribeEnvelopesRequest) GetRequests() []*BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest {
+	if x != nil {
+		return x.Requests
+	}
+	return nil
+}
+
+// Streamed response for batch subscribe - can be multiple envelopes at once
+type BatchSubscribeEnvelopesResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Envelopes []*GatewayEnvelope `protobuf:"bytes,1,rep,name=envelopes,proto3" json:"envelopes,omitempty"`
+}
+
+func (x *BatchSubscribeEnvelopesResponse) Reset() {
+	*x = BatchSubscribeEnvelopesResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[10]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BatchSubscribeEnvelopesResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BatchSubscribeEnvelopesResponse) ProtoMessage() {}
+
+func (x *BatchSubscribeEnvelopesResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[10]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use BatchSubscribeEnvelopesResponse.ProtoReflect.Descriptor instead.
+func (*BatchSubscribeEnvelopesResponse) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{10}
+}
+
+func (x *BatchSubscribeEnvelopesResponse) GetEnvelopes() []*GatewayEnvelope {
+	if x != nil {
+		return x.Envelopes
+	}
+	return nil
+}
+
+// Query envelopes request
+type QueryEnvelopesRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Query *EnvelopesQuery `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
+	Limit uint32          `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"`
+}
+
+func (x *QueryEnvelopesRequest) Reset() {
+	*x = QueryEnvelopesRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[11]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *QueryEnvelopesRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*QueryEnvelopesRequest) ProtoMessage() {}
+
+func (x *QueryEnvelopesRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[11]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use QueryEnvelopesRequest.ProtoReflect.Descriptor instead.
+func (*QueryEnvelopesRequest) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{11}
+}
+
+func (x *QueryEnvelopesRequest) GetQuery() *EnvelopesQuery {
+	if x != nil {
+		return x.Query
+	}
+	return nil
+}
+
+func (x *QueryEnvelopesRequest) GetLimit() uint32 {
+	if x != nil {
+		return x.Limit
+	}
+	return 0
+}
+
+// Query envelopes response
+type QueryEnvelopesResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Envelopes []*GatewayEnvelope `protobuf:"bytes,1,rep,name=envelopes,proto3" json:"envelopes,omitempty"`
+}
+
+func (x *QueryEnvelopesResponse) Reset() {
+	*x = QueryEnvelopesResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[12]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *QueryEnvelopesResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*QueryEnvelopesResponse) ProtoMessage() {}
+
+func (x *QueryEnvelopesResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[12]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use QueryEnvelopesResponse.ProtoReflect.Descriptor instead.
+func (*QueryEnvelopesResponse) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{12}
+}
+
+func (x *QueryEnvelopesResponse) GetEnvelopes() []*GatewayEnvelope {
+	if x != nil {
+		return x.Envelopes
+	}
+	return nil
+}
+
+type PublishEnvelopeRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	PayerEnvelope *PayerEnvelope `protobuf:"bytes,1,opt,name=payer_envelope,json=payerEnvelope,proto3" json:"payer_envelope,omitempty"`
+}
+
+func (x *PublishEnvelopeRequest) Reset() {
+	*x = PublishEnvelopeRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[13]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PublishEnvelopeRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PublishEnvelopeRequest) ProtoMessage() {}
+
+func (x *PublishEnvelopeRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[13]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PublishEnvelopeRequest.ProtoReflect.Descriptor instead.
+func (*PublishEnvelopeRequest) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{13}
+}
+
+func (x *PublishEnvelopeRequest) GetPayerEnvelope() *PayerEnvelope {
+	if x != nil {
+		return x.PayerEnvelope
+	}
+	return nil
+}
+
+type PublishEnvelopeResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	OriginatorEnvelope *OriginatorEnvelope `protobuf:"bytes,1,opt,name=originator_envelope,json=originatorEnvelope,proto3" json:"originator_envelope,omitempty"`
+}
+
+func (x *PublishEnvelopeResponse) Reset() {
+	*x = PublishEnvelopeResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[14]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PublishEnvelopeResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PublishEnvelopeResponse) ProtoMessage() {}
+
+func (x *PublishEnvelopeResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[14]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PublishEnvelopeResponse.ProtoReflect.Descriptor instead.
+func (*PublishEnvelopeResponse) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{14}
+}
+
+func (x *PublishEnvelopeResponse) GetOriginatorEnvelope() *OriginatorEnvelope {
+	if x != nil {
+		return x.OriginatorEnvelope
+	}
+	return nil
+}
+
+// Single subscription request for envelopes
+type BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Query *EnvelopesQuery `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"`
+}
+
+func (x *BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest) Reset() {
+	*x = BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[15]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest) ProtoMessage() {}
+
+func (x *BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[15]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest.ProtoReflect.Descriptor instead.
+func (*BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest) Descriptor() ([]byte, []int) {
+	return file_xmtpv4_message_api_message_api_proto_rawDescGZIP(), []int{9, 0}
+}
+
+func (x *BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest) GetQuery() *EnvelopesQuery {
+	if x != nil {
+		return x.Query
+	}
+	return nil
+}
+
+var File_xmtpv4_message_api_message_api_proto protoreflect.FileDescriptor
+
+var file_xmtpv4_message_api_message_api_proto_rawDesc = []byte{
+	0x0a, 0x24, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x5f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x61, 0x70, 0x69,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0b, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74,
+	0x70, 0x76, 0x34, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f,
+	0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x1a, 0x25, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x61, 0x73, 0x73, 0x6f,
+	0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
+	0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x6d, 0x6c, 0x73, 0x2f, 0x61, 0x70,
+	0x69, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x6c, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x95,
+	0x01, 0x0a, 0x11, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64,
+	0x44, 0x61, 0x74, 0x61, 0x12, 0x2b, 0x0a, 0x11, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x6f,
+	0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52,
+	0x10, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f,
+	0x72, 0x12, 0x21, 0x0a, 0x0c, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x74, 0x6f, 0x70, 0x69,
+	0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x54,
+	0x6f, 0x70, 0x69, 0x63, 0x12, 0x30, 0x0a, 0x14, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x6f, 0x72, 0x69,
+	0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x73, 0x69, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x04, 0x52, 0x12, 0x6c, 0x61, 0x73, 0x74, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74,
+	0x6f, 0x72, 0x53, 0x69, 0x64, 0x73, 0x22, 0x87, 0x04, 0x0a, 0x0e, 0x43, 0x6c, 0x69, 0x65, 0x6e,
+	0x74, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x12, 0x49, 0x0a, 0x0d, 0x67, 0x72, 0x6f,
+	0x75, 0x70, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x22, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x76, 0x31, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49,
+	0x6e, 0x70, 0x75, 0x74, 0x48, 0x00, 0x52, 0x0c, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x73,
+	0x73, 0x61, 0x67, 0x65, 0x12, 0x4f, 0x0a, 0x0f, 0x77, 0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x65, 0x5f,
+	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e,
+	0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e,
+	0x57, 0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x6e,
+	0x70, 0x75, 0x74, 0x48, 0x00, 0x52, 0x0e, 0x77, 0x65, 0x6c, 0x63, 0x6f, 0x6d, 0x65, 0x4d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x63, 0x0a, 0x15, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65,
+	0x72, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x49,
+	0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x48, 0x00, 0x52, 0x14, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x49, 0x6e,
+	0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x58, 0x0a, 0x12, 0x75, 0x70,
+	0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x6c,
+	0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x4b,
+	0x65, 0x79, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x48, 0x00, 0x52, 0x10, 0x75, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x4b, 0x65, 0x79, 0x50, 0x61, 0x63,
+	0x6b, 0x61, 0x67, 0x65, 0x12, 0x5d, 0x0a, 0x13, 0x72, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x5f, 0x69,
+	0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x2a, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x6d, 0x6c, 0x73, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c,
+	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52,
+	0x12, 0x72, 0x65, 0x76, 0x6f, 0x6b, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x30, 0x0a, 0x03, 0x61, 0x61, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x1e, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x41,
+	0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x44, 0x61, 0x74, 0x61,
+	0x52, 0x03, 0x61, 0x61, 0x64, 0x42, 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64,
+	0x22, 0xa9, 0x01, 0x0a, 0x0d, 0x50, 0x61, 0x79, 0x65, 0x72, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f,
+	0x70, 0x65, 0x12, 0x38, 0x0a, 0x18, 0x75, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x63,
+	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x65, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0c, 0x52, 0x16, 0x75, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x43, 0x6c,
+	0x69, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x12, 0x5e, 0x0a, 0x0f,
+	0x70, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65,
+	0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x63,
+	0x64, 0x73, 0x61, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x0e, 0x70, 0x61,
+	0x79, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0xab, 0x01, 0x0a,
+	0x1a, 0x55, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61,
+	0x74, 0x6f, 0x72, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x6f,
+	0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x04, 0x52, 0x0d, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x53,
+	0x69, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72,
+	0x5f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x6f, 0x72, 0x69, 0x67, 0x69,
+	0x6e, 0x61, 0x74, 0x6f, 0x72, 0x4e, 0x73, 0x12, 0x41, 0x0a, 0x0e, 0x70, 0x61, 0x79, 0x65, 0x72,
+	0x5f, 0x65, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1a, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x50, 0x61,
+	0x79, 0x65, 0x72, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x52, 0x0d, 0x70, 0x61, 0x79,
+	0x65, 0x72, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x22, 0x57, 0x0a, 0x0f, 0x42, 0x6c,
+	0x6f, 0x63, 0x6b, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x12, 0x21, 0x0a,
+	0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+	0x12, 0x21, 0x0a, 0x0c, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x65,
+	0x72, 0x49, 0x64, 0x22, 0x96, 0x02, 0x0a, 0x12, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74,
+	0x6f, 0x72, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x12, 0x40, 0x0a, 0x1c, 0x75, 0x6e,
+	0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x5f, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f,
+	0x72, 0x5f, 0x65, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c,
+	0x52, 0x1a, 0x75, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e,
+	0x61, 0x74, 0x6f, 0x72, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x12, 0x6a, 0x0a, 0x14,
+	0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61,
+	0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x78, 0x6d, 0x74,
+	0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x73, 0x73, 0x6f, 0x63,
+	0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x61,
+	0x62, 0x6c, 0x65, 0x45, 0x63, 0x64, 0x73, 0x61, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72,
+	0x65, 0x48, 0x00, 0x52, 0x13, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x53,
+	0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x49, 0x0a, 0x10, 0x62, 0x6c, 0x6f, 0x63,
+	0x6b, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34,
+	0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x6f, 0x66,
+	0x48, 0x00, 0x52, 0x0f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x50, 0x72,
+	0x6f, 0x6f, 0x66, 0x42, 0x07, 0x0a, 0x05, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x22, 0x84, 0x01, 0x0a,
+	0x0f, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65,
+	0x12, 0x1f, 0x0a, 0x0b, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x5f, 0x73, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0a, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x69,
+	0x64, 0x12, 0x50, 0x0a, 0x13, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x5f,
+	0x65, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f,
+	0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x4f, 0x72, 0x69,
+	0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x52,
+	0x12, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x45, 0x6e, 0x76, 0x65, 0x6c,
+	0x6f, 0x70, 0x65, 0x22, 0x80, 0x01, 0x0a, 0x11, 0x4d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76,
+	0x69, 0x6f, 0x72, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x2c, 0x0a, 0x04, 0x74, 0x79, 0x70,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78,
+	0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x4d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f,
+	0x72, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x3d, 0x0a, 0x09, 0x65, 0x6e, 0x76, 0x65, 0x6c,
+	0x6f, 0x70, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x78, 0x6d, 0x74,
+	0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61,
+	0x74, 0x6f, 0x72, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x52, 0x09, 0x65, 0x6e, 0x76,
+	0x65, 0x6c, 0x6f, 0x70, 0x65, 0x73, 0x22, 0xb2, 0x01, 0x0a, 0x0e, 0x45, 0x6e, 0x76, 0x65, 0x6c,
+	0x6f, 0x70, 0x65, 0x73, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x16, 0x0a, 0x05, 0x74, 0x6f, 0x70,
+	0x69, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x05, 0x74, 0x6f, 0x70, 0x69,
+	0x63, 0x12, 0x25, 0x0a, 0x0d, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x5f,
+	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0c, 0x6f, 0x72, 0x69, 0x67,
+	0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x12, 0x27, 0x0a, 0x0e, 0x6f, 0x72, 0x69, 0x67,
+	0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04,
+	0x48, 0x01, 0x52, 0x0d, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x53, 0x69,
+	0x64, 0x12, 0x21, 0x0a, 0x0b, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x5f, 0x73, 0x69, 0x64,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x48, 0x01, 0x52, 0x0a, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61,
+	0x79, 0x53, 0x69, 0x64, 0x42, 0x08, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x42, 0x0b,
+	0x0a, 0x09, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x73, 0x65, 0x65, 0x6e, 0x22, 0xd3, 0x01, 0x0a, 0x1e,
+	0x42, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x45, 0x6e,
+	0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x61,
+	0x0a, 0x08, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x45, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x42,
+	0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x45, 0x6e, 0x76,
+	0x65, 0x6c, 0x6f, 0x70, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x53, 0x75,
+	0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x08, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x73, 0x1a, 0x4e, 0x0a, 0x19, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x45, 0x6e,
+	0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x31,
+	0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e,
+	0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x45, 0x6e, 0x76, 0x65,
+	0x6c, 0x6f, 0x70, 0x65, 0x73, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72,
+	0x79, 0x22, 0x5d, 0x0a, 0x1f, 0x42, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72,
+	0x69, 0x62, 0x65, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x09, 0x65, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78,
+	0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x6e, 0x76,
+	0x65, 0x6c, 0x6f, 0x70, 0x65, 0x52, 0x09, 0x65, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x73,
+	0x22, 0x60, 0x0a, 0x15, 0x51, 0x75, 0x65, 0x72, 0x79, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70,
+	0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x31, 0x0a, 0x05, 0x71, 0x75, 0x65,
+	0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e,
+	0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x73,
+	0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x14, 0x0a, 0x05,
+	0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x6c, 0x69, 0x6d,
+	0x69, 0x74, 0x22, 0x54, 0x0a, 0x16, 0x51, 0x75, 0x65, 0x72, 0x79, 0x45, 0x6e, 0x76, 0x65, 0x6c,
+	0x6f, 0x70, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x09,
+	0x65, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x1c, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x47, 0x61,
+	0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x52, 0x09, 0x65,
+	0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x73, 0x22, 0x5b, 0x0a, 0x16, 0x50, 0x75, 0x62, 0x6c,
+	0x69, 0x73, 0x68, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x41, 0x0a, 0x0e, 0x70, 0x61, 0x79, 0x65, 0x72, 0x5f, 0x65, 0x6e, 0x76, 0x65,
+	0x6c, 0x6f, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x78, 0x6d, 0x74,
+	0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x50, 0x61, 0x79, 0x65, 0x72, 0x45, 0x6e,
+	0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x52, 0x0d, 0x70, 0x61, 0x79, 0x65, 0x72, 0x45, 0x6e, 0x76,
+	0x65, 0x6c, 0x6f, 0x70, 0x65, 0x22, 0x6b, 0x0a, 0x17, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68,
+	0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x50, 0x0a, 0x13, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x65,
+	0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e,
+	0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x4f, 0x72, 0x69, 0x67,
+	0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x52, 0x12,
+	0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f,
+	0x70, 0x65, 0x2a, 0xce, 0x01, 0x0a, 0x0b, 0x4d, 0x69, 0x73, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69,
+	0x6f, 0x72, 0x12, 0x1b, 0x0a, 0x17, 0x4d, 0x49, 0x53, 0x42, 0x45, 0x48, 0x41, 0x56, 0x49, 0x4f,
+	0x52, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12,
+	0x20, 0x0a, 0x1c, 0x4d, 0x49, 0x53, 0x42, 0x45, 0x48, 0x41, 0x56, 0x49, 0x4f, 0x52, 0x5f, 0x55,
+	0x4e, 0x41, 0x56, 0x41, 0x49, 0x4c, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x4e, 0x4f, 0x44, 0x45, 0x10,
+	0x01, 0x12, 0x2b, 0x0a, 0x27, 0x4d, 0x49, 0x53, 0x42, 0x45, 0x48, 0x41, 0x56, 0x49, 0x4f, 0x52,
+	0x5f, 0x4f, 0x55, 0x54, 0x5f, 0x4f, 0x46, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x5f, 0x4f, 0x52,
+	0x49, 0x47, 0x49, 0x4e, 0x41, 0x54, 0x4f, 0x52, 0x5f, 0x53, 0x49, 0x44, 0x10, 0x02, 0x12, 0x28,
+	0x0a, 0x24, 0x4d, 0x49, 0x53, 0x42, 0x45, 0x48, 0x41, 0x56, 0x49, 0x4f, 0x52, 0x5f, 0x44, 0x55,
+	0x50, 0x4c, 0x49, 0x43, 0x41, 0x54, 0x45, 0x5f, 0x4f, 0x52, 0x49, 0x47, 0x49, 0x4e, 0x41, 0x54,
+	0x4f, 0x52, 0x5f, 0x53, 0x49, 0x44, 0x10, 0x03, 0x12, 0x29, 0x0a, 0x25, 0x4d, 0x49, 0x53, 0x42,
+	0x45, 0x48, 0x41, 0x56, 0x49, 0x4f, 0x52, 0x5f, 0x43, 0x59, 0x43, 0x4c, 0x49, 0x43, 0x41, 0x4c,
+	0x5f, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x49, 0x4e,
+	0x47, 0x10, 0x04, 0x32, 0xb4, 0x03, 0x0a, 0x0e, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x41, 0x70, 0x69, 0x12, 0x9e, 0x01, 0x0a, 0x17, 0x42, 0x61, 0x74, 0x63, 0x68,
+	0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70,
+	0x65, 0x73, 0x12, 0x2b, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34,
+	0x2e, 0x42, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x45,
+	0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x2c, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x42, 0x61,
+	0x74, 0x63, 0x68, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x45, 0x6e, 0x76, 0x65,
+	0x6c, 0x6f, 0x70, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82,
+	0xd3, 0xe4, 0x93, 0x02, 0x20, 0x3a, 0x01, 0x2a, 0x22, 0x1b, 0x2f, 0x6d, 0x6c, 0x73, 0x2f, 0x76,
+	0x32, 0x2f, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2d, 0x65, 0x6e, 0x76, 0x65,
+	0x6c, 0x6f, 0x70, 0x65, 0x73, 0x30, 0x01, 0x12, 0x7d, 0x0a, 0x0e, 0x51, 0x75, 0x65, 0x72, 0x79,
+	0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x73, 0x12, 0x22, 0x2e, 0x78, 0x6d, 0x74, 0x70,
+	0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x45, 0x6e, 0x76,
+	0x65, 0x6c, 0x6f, 0x70, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e,
+	0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x51, 0x75, 0x65, 0x72,
+	0x79, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x3a, 0x01, 0x2a, 0x22, 0x17, 0x2f,
+	0x6d, 0x6c, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2d, 0x65, 0x6e, 0x76,
+	0x65, 0x6c, 0x6f, 0x70, 0x65, 0x73, 0x12, 0x81, 0x01, 0x0a, 0x0f, 0x50, 0x75, 0x62, 0x6c, 0x69,
+	0x73, 0x68, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x12, 0x23, 0x2e, 0x78, 0x6d, 0x74,
+	0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68,
+	0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x24, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x50, 0x75,
+	0x62, 0x6c, 0x69, 0x73, 0x68, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x3a, 0x01, 0x2a,
+	0x22, 0x18, 0x2f, 0x6d, 0x6c, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x73,
+	0x68, 0x2d, 0x65, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x42, 0xaa, 0x01, 0x0a, 0x0f, 0x63,
+	0x6f, 0x6d, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x42, 0x0f,
+	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x41, 0x70, 0x69, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x6d,
+	0x74, 0x70, 0x2f, 0x78, 0x6d, 0x74, 0x70, 0x2d, 0x6e, 0x6f, 0x64, 0x65, 0x2d, 0x67, 0x6f, 0x2f,
+	0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34,
+	0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x61, 0x70, 0x69, 0xa2, 0x02, 0x03, 0x58,
+	0x58, 0x58, 0xaa, 0x02, 0x0b, 0x58, 0x6d, 0x74, 0x70, 0x2e, 0x58, 0x6d, 0x74, 0x70, 0x76, 0x34,
+	0xca, 0x02, 0x0b, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x58, 0x6d, 0x74, 0x70, 0x76, 0x34, 0xe2, 0x02,
+	0x17, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x58, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x5c, 0x47, 0x50, 0x42,
+	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0c, 0x58, 0x6d, 0x74, 0x70, 0x3a,
+	0x3a, 0x58, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_xmtpv4_message_api_message_api_proto_rawDescOnce sync.Once
+	file_xmtpv4_message_api_message_api_proto_rawDescData = file_xmtpv4_message_api_message_api_proto_rawDesc
+)
+
+func file_xmtpv4_message_api_message_api_proto_rawDescGZIP() []byte {
+	file_xmtpv4_message_api_message_api_proto_rawDescOnce.Do(func() {
+		file_xmtpv4_message_api_message_api_proto_rawDescData = protoimpl.X.CompressGZIP(file_xmtpv4_message_api_message_api_proto_rawDescData)
+	})
+	return file_xmtpv4_message_api_message_api_proto_rawDescData
+}
+
+var file_xmtpv4_message_api_message_api_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_xmtpv4_message_api_message_api_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
+var file_xmtpv4_message_api_message_api_proto_goTypes = []any{
+	(Misbehavior)(0),                                                 // 0: xmtp.xmtpv4.Misbehavior
+	(*AuthenticatedData)(nil),                                        // 1: xmtp.xmtpv4.AuthenticatedData
+	(*ClientEnvelope)(nil),                                           // 2: xmtp.xmtpv4.ClientEnvelope
+	(*PayerEnvelope)(nil),                                            // 3: xmtp.xmtpv4.PayerEnvelope
+	(*UnsignedOriginatorEnvelope)(nil),                               // 4: xmtp.xmtpv4.UnsignedOriginatorEnvelope
+	(*BlockchainProof)(nil),                                          // 5: xmtp.xmtpv4.BlockchainProof
+	(*OriginatorEnvelope)(nil),                                       // 6: xmtp.xmtpv4.OriginatorEnvelope
+	(*GatewayEnvelope)(nil),                                          // 7: xmtp.xmtpv4.GatewayEnvelope
+	(*MisbehaviorReport)(nil),                                        // 8: xmtp.xmtpv4.MisbehaviorReport
+	(*EnvelopesQuery)(nil),                                           // 9: xmtp.xmtpv4.EnvelopesQuery
+	(*BatchSubscribeEnvelopesRequest)(nil),                           // 10: xmtp.xmtpv4.BatchSubscribeEnvelopesRequest
+	(*BatchSubscribeEnvelopesResponse)(nil),                          // 11: xmtp.xmtpv4.BatchSubscribeEnvelopesResponse
+	(*QueryEnvelopesRequest)(nil),                                    // 12: xmtp.xmtpv4.QueryEnvelopesRequest
+	(*QueryEnvelopesResponse)(nil),                                   // 13: xmtp.xmtpv4.QueryEnvelopesResponse
+	(*PublishEnvelopeRequest)(nil),                                   // 14: xmtp.xmtpv4.PublishEnvelopeRequest
+	(*PublishEnvelopeResponse)(nil),                                  // 15: xmtp.xmtpv4.PublishEnvelopeResponse
+	(*BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest)(nil), // 16: xmtp.xmtpv4.BatchSubscribeEnvelopesRequest.SubscribeEnvelopesRequest
+	(*v1.GroupMessageInput)(nil),                                     // 17: xmtp.mls.api.v1.GroupMessageInput
+	(*v1.WelcomeMessageInput)(nil),                                   // 18: xmtp.mls.api.v1.WelcomeMessageInput
+	(*v1.RegisterInstallationRequest)(nil),                           // 19: xmtp.mls.api.v1.RegisterInstallationRequest
+	(*v1.UploadKeyPackageRequest)(nil),                               // 20: xmtp.mls.api.v1.UploadKeyPackageRequest
+	(*v1.RevokeInstallationRequest)(nil),                             // 21: xmtp.mls.api.v1.RevokeInstallationRequest
+	(*associations.RecoverableEcdsaSignature)(nil),                   // 22: xmtp.identity.associations.RecoverableEcdsaSignature
+}
+var file_xmtpv4_message_api_message_api_proto_depIdxs = []int32{
+	17, // 0: xmtp.xmtpv4.ClientEnvelope.group_message:type_name -> xmtp.mls.api.v1.GroupMessageInput
+	18, // 1: xmtp.xmtpv4.ClientEnvelope.welcome_message:type_name -> xmtp.mls.api.v1.WelcomeMessageInput
+	19, // 2: xmtp.xmtpv4.ClientEnvelope.register_installation:type_name -> xmtp.mls.api.v1.RegisterInstallationRequest
+	20, // 3: xmtp.xmtpv4.ClientEnvelope.upload_key_package:type_name -> xmtp.mls.api.v1.UploadKeyPackageRequest
+	21, // 4: xmtp.xmtpv4.ClientEnvelope.revoke_installation:type_name -> xmtp.mls.api.v1.RevokeInstallationRequest
+	1,  // 5: xmtp.xmtpv4.ClientEnvelope.aad:type_name -> xmtp.xmtpv4.AuthenticatedData
+	22, // 6: xmtp.xmtpv4.PayerEnvelope.payer_signature:type_name -> xmtp.identity.associations.RecoverableEcdsaSignature
+	3,  // 7: xmtp.xmtpv4.UnsignedOriginatorEnvelope.payer_envelope:type_name -> xmtp.xmtpv4.PayerEnvelope
+	22, // 8: xmtp.xmtpv4.OriginatorEnvelope.originator_signature:type_name -> xmtp.identity.associations.RecoverableEcdsaSignature
+	5,  // 9: xmtp.xmtpv4.OriginatorEnvelope.blockchain_proof:type_name -> xmtp.xmtpv4.BlockchainProof
+	6,  // 10: xmtp.xmtpv4.GatewayEnvelope.originator_envelope:type_name -> xmtp.xmtpv4.OriginatorEnvelope
+	0,  // 11: xmtp.xmtpv4.MisbehaviorReport.type:type_name -> xmtp.xmtpv4.Misbehavior
+	6,  // 12: xmtp.xmtpv4.MisbehaviorReport.envelopes:type_name -> xmtp.xmtpv4.OriginatorEnvelope
+	16, // 13: xmtp.xmtpv4.BatchSubscribeEnvelopesRequest.requests:type_name -> xmtp.xmtpv4.BatchSubscribeEnvelopesRequest.SubscribeEnvelopesRequest
+	7,  // 14: xmtp.xmtpv4.BatchSubscribeEnvelopesResponse.envelopes:type_name -> xmtp.xmtpv4.GatewayEnvelope
+	9,  // 15: xmtp.xmtpv4.QueryEnvelopesRequest.query:type_name -> xmtp.xmtpv4.EnvelopesQuery
+	7,  // 16: xmtp.xmtpv4.QueryEnvelopesResponse.envelopes:type_name -> xmtp.xmtpv4.GatewayEnvelope
+	3,  // 17: xmtp.xmtpv4.PublishEnvelopeRequest.payer_envelope:type_name -> xmtp.xmtpv4.PayerEnvelope
+	6,  // 18: xmtp.xmtpv4.PublishEnvelopeResponse.originator_envelope:type_name -> xmtp.xmtpv4.OriginatorEnvelope
+	9,  // 19: xmtp.xmtpv4.BatchSubscribeEnvelopesRequest.SubscribeEnvelopesRequest.query:type_name -> xmtp.xmtpv4.EnvelopesQuery
+	10, // 20: xmtp.xmtpv4.ReplicationApi.BatchSubscribeEnvelopes:input_type -> xmtp.xmtpv4.BatchSubscribeEnvelopesRequest
+	12, // 21: xmtp.xmtpv4.ReplicationApi.QueryEnvelopes:input_type -> xmtp.xmtpv4.QueryEnvelopesRequest
+	14, // 22: xmtp.xmtpv4.ReplicationApi.PublishEnvelope:input_type -> xmtp.xmtpv4.PublishEnvelopeRequest
+	11, // 23: xmtp.xmtpv4.ReplicationApi.BatchSubscribeEnvelopes:output_type -> xmtp.xmtpv4.BatchSubscribeEnvelopesResponse
+	13, // 24: xmtp.xmtpv4.ReplicationApi.QueryEnvelopes:output_type -> xmtp.xmtpv4.QueryEnvelopesResponse
+	15, // 25: xmtp.xmtpv4.ReplicationApi.PublishEnvelope:output_type -> xmtp.xmtpv4.PublishEnvelopeResponse
+	23, // [23:26] is the sub-list for method output_type
+	20, // [20:23] is the sub-list for method input_type
+	20, // [20:20] is the sub-list for extension type_name
+	20, // [20:20] is the sub-list for extension extendee
+	0,  // [0:20] is the sub-list for field type_name
+}
+
+func init() { file_xmtpv4_message_api_message_api_proto_init() }
+func file_xmtpv4_message_api_message_api_proto_init() {
+	if File_xmtpv4_message_api_message_api_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_xmtpv4_message_api_message_api_proto_msgTypes[0].Exporter = func(v any, i int) any {
+			switch v := v.(*AuthenticatedData); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_xmtpv4_message_api_message_api_proto_msgTypes[1].Exporter = func(v any, i int) any {
+			switch v := v.(*ClientEnvelope); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_xmtpv4_message_api_message_api_proto_msgTypes[2].Exporter = func(v any, i int) any {
+			switch v := v.(*PayerEnvelope); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_xmtpv4_message_api_message_api_proto_msgTypes[3].Exporter = func(v any, i int) any {
+			switch v := v.(*UnsignedOriginatorEnvelope); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_xmtpv4_message_api_message_api_proto_msgTypes[4].Exporter = func(v any, i int) any {
+			switch v := v.(*BlockchainProof); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_xmtpv4_message_api_message_api_proto_msgTypes[5].Exporter = func(v any, i int) any {
+			switch v := v.(*OriginatorEnvelope); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_xmtpv4_message_api_message_api_proto_msgTypes[6].Exporter = func(v any, i int) any {
+			switch v := v.(*GatewayEnvelope); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_xmtpv4_message_api_message_api_proto_msgTypes[7].Exporter = func(v any, i int) any {
+			switch v := v.(*MisbehaviorReport); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_xmtpv4_message_api_message_api_proto_msgTypes[8].Exporter = func(v any, i int) any {
+			switch v := v.(*EnvelopesQuery); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_xmtpv4_message_api_message_api_proto_msgTypes[9].Exporter = func(v any, i int) any {
+			switch v := v.(*BatchSubscribeEnvelopesRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_xmtpv4_message_api_message_api_proto_msgTypes[10].Exporter = func(v any, i int) any {
+			switch v := v.(*BatchSubscribeEnvelopesResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_xmtpv4_message_api_message_api_proto_msgTypes[11].Exporter = func(v any, i int) any {
+			switch v := v.(*QueryEnvelopesRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_xmtpv4_message_api_message_api_proto_msgTypes[12].Exporter = func(v any, i int) any {
+			switch v := v.(*QueryEnvelopesResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_xmtpv4_message_api_message_api_proto_msgTypes[13].Exporter = func(v any, i int) any {
+			switch v := v.(*PublishEnvelopeRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_xmtpv4_message_api_message_api_proto_msgTypes[14].Exporter = func(v any, i int) any {
+			switch v := v.(*PublishEnvelopeResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_xmtpv4_message_api_message_api_proto_msgTypes[15].Exporter = func(v any, i int) any {
+			switch v := v.(*BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	file_xmtpv4_message_api_message_api_proto_msgTypes[1].OneofWrappers = []any{
+		(*ClientEnvelope_GroupMessage)(nil),
+		(*ClientEnvelope_WelcomeMessage)(nil),
+		(*ClientEnvelope_RegisterInstallation)(nil),
+		(*ClientEnvelope_UploadKeyPackage)(nil),
+		(*ClientEnvelope_RevokeInstallation)(nil),
+	}
+	file_xmtpv4_message_api_message_api_proto_msgTypes[5].OneofWrappers = []any{
+		(*OriginatorEnvelope_OriginatorSignature)(nil),
+		(*OriginatorEnvelope_BlockchainProof)(nil),
+	}
+	file_xmtpv4_message_api_message_api_proto_msgTypes[8].OneofWrappers = []any{
+		(*EnvelopesQuery_Topic)(nil),
+		(*EnvelopesQuery_OriginatorId)(nil),
+		(*EnvelopesQuery_OriginatorSid)(nil),
+		(*EnvelopesQuery_GatewaySid)(nil),
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_xmtpv4_message_api_message_api_proto_rawDesc,
+			NumEnums:      1,
+			NumMessages:   16,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_xmtpv4_message_api_message_api_proto_goTypes,
+		DependencyIndexes: file_xmtpv4_message_api_message_api_proto_depIdxs,
+		EnumInfos:         file_xmtpv4_message_api_message_api_proto_enumTypes,
+		MessageInfos:      file_xmtpv4_message_api_message_api_proto_msgTypes,
+	}.Build()
+	File_xmtpv4_message_api_message_api_proto = out.File
+	file_xmtpv4_message_api_message_api_proto_rawDesc = nil
+	file_xmtpv4_message_api_message_api_proto_goTypes = nil
+	file_xmtpv4_message_api_message_api_proto_depIdxs = nil
+}
diff --git a/pkg/proto/xmtpv4/message_api/message_api.pb.gw.go b/pkg/proto/xmtpv4/message_api/message_api.pb.gw.go
new file mode 100644
index 00000000..c3840125
--- /dev/null
+++ b/pkg/proto/xmtpv4/message_api/message_api.pb.gw.go
@@ -0,0 +1,294 @@
+// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT.
+// source: xmtpv4/message_api/message_api.proto
+
+/*
+Package message_api is a reverse proxy.
+
+It translates gRPC into RESTful JSON APIs.
+*/
+package message_api
+
+import (
+	"context"
+	"io"
+	"net/http"
+
+	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
+)
+
+// Suppress "imported and not used" errors
+var _ codes.Code
+var _ io.Reader
+var _ status.Status
+var _ = runtime.String
+var _ = utilities.NewDoubleArray
+var _ = metadata.Join
+
+func request_ReplicationApi_BatchSubscribeEnvelopes_0(ctx context.Context, marshaler runtime.Marshaler, client ReplicationApiClient, req *http.Request, pathParams map[string]string) (ReplicationApi_BatchSubscribeEnvelopesClient, runtime.ServerMetadata, error) {
+	var protoReq BatchSubscribeEnvelopesRequest
+	var metadata runtime.ServerMetadata
+
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	stream, err := client.BatchSubscribeEnvelopes(ctx, &protoReq)
+	if err != nil {
+		return nil, metadata, err
+	}
+	header, err := stream.Header()
+	if err != nil {
+		return nil, metadata, err
+	}
+	metadata.HeaderMD = header
+	return stream, metadata, nil
+
+}
+
+func request_ReplicationApi_QueryEnvelopes_0(ctx context.Context, marshaler runtime.Marshaler, client ReplicationApiClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq QueryEnvelopesRequest
+	var metadata runtime.ServerMetadata
+
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := client.QueryEnvelopes(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func local_request_ReplicationApi_QueryEnvelopes_0(ctx context.Context, marshaler runtime.Marshaler, server ReplicationApiServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq QueryEnvelopesRequest
+	var metadata runtime.ServerMetadata
+
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := server.QueryEnvelopes(ctx, &protoReq)
+	return msg, metadata, err
+
+}
+
+func request_ReplicationApi_PublishEnvelope_0(ctx context.Context, marshaler runtime.Marshaler, client ReplicationApiClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq PublishEnvelopeRequest
+	var metadata runtime.ServerMetadata
+
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := client.PublishEnvelope(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func local_request_ReplicationApi_PublishEnvelope_0(ctx context.Context, marshaler runtime.Marshaler, server ReplicationApiServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq PublishEnvelopeRequest
+	var metadata runtime.ServerMetadata
+
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := server.PublishEnvelope(ctx, &protoReq)
+	return msg, metadata, err
+
+}
+
+// RegisterReplicationApiHandlerServer registers the http handlers for service ReplicationApi to "mux".
+// UnaryRPC     :call ReplicationApiServer directly.
+// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
+// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterReplicationApiHandlerFromEndpoint instead.
+func RegisterReplicationApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ReplicationApiServer) error {
+
+	mux.Handle("POST", pattern_ReplicationApi_BatchSubscribeEnvelopes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport")
+		_, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+		return
+	})
+
+	mux.Handle("POST", pattern_ReplicationApi_QueryEnvelopes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		var err error
+		var annotatedContext context.Context
+		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/xmtp.xmtpv4.ReplicationApi/QueryEnvelopes", runtime.WithHTTPPathPattern("/mls/v2/query-envelopes"))
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := local_request_ReplicationApi_QueryEnvelopes_0(annotatedContext, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
+		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+		if err != nil {
+			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ReplicationApi_QueryEnvelopes_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
+	mux.Handle("POST", pattern_ReplicationApi_PublishEnvelope_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		var err error
+		var annotatedContext context.Context
+		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/xmtp.xmtpv4.ReplicationApi/PublishEnvelope", runtime.WithHTTPPathPattern("/mls/v2/publish-envelope"))
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := local_request_ReplicationApi_PublishEnvelope_0(annotatedContext, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
+		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+		if err != nil {
+			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ReplicationApi_PublishEnvelope_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
+	return nil
+}
+
+// RegisterReplicationApiHandlerFromEndpoint is same as RegisterReplicationApiHandler but
+// automatically dials to "endpoint" and closes the connection when "ctx" gets done.
+func RegisterReplicationApiHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) {
+	conn, err := grpc.DialContext(ctx, endpoint, opts...)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err != nil {
+			if cerr := conn.Close(); cerr != nil {
+				grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr)
+			}
+			return
+		}
+		go func() {
+			<-ctx.Done()
+			if cerr := conn.Close(); cerr != nil {
+				grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr)
+			}
+		}()
+	}()
+
+	return RegisterReplicationApiHandler(ctx, mux, conn)
+}
+
+// RegisterReplicationApiHandler registers the http handlers for service ReplicationApi to "mux".
+// The handlers forward requests to the grpc endpoint over "conn".
+func RegisterReplicationApiHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {
+	return RegisterReplicationApiHandlerClient(ctx, mux, NewReplicationApiClient(conn))
+}
+
+// RegisterReplicationApiHandlerClient registers the http handlers for service ReplicationApi
+// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "ReplicationApiClient".
+// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "ReplicationApiClient"
+// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
+// "ReplicationApiClient" to call the correct interceptors.
+func RegisterReplicationApiHandlerClient(ctx context.Context, mux *runtime.ServeMux, client ReplicationApiClient) error {
+
+	mux.Handle("POST", pattern_ReplicationApi_BatchSubscribeEnvelopes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		var err error
+		var annotatedContext context.Context
+		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/xmtp.xmtpv4.ReplicationApi/BatchSubscribeEnvelopes", runtime.WithHTTPPathPattern("/mls/v2/subscribe-envelopes"))
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_ReplicationApi_BatchSubscribeEnvelopes_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+		if err != nil {
+			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ReplicationApi_BatchSubscribeEnvelopes_0(annotatedContext, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...)
+
+	})
+
+	mux.Handle("POST", pattern_ReplicationApi_QueryEnvelopes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		var err error
+		var annotatedContext context.Context
+		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/xmtp.xmtpv4.ReplicationApi/QueryEnvelopes", runtime.WithHTTPPathPattern("/mls/v2/query-envelopes"))
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_ReplicationApi_QueryEnvelopes_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+		if err != nil {
+			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ReplicationApi_QueryEnvelopes_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
+	mux.Handle("POST", pattern_ReplicationApi_PublishEnvelope_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		var err error
+		var annotatedContext context.Context
+		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/xmtp.xmtpv4.ReplicationApi/PublishEnvelope", runtime.WithHTTPPathPattern("/mls/v2/publish-envelope"))
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_ReplicationApi_PublishEnvelope_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+		if err != nil {
+			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ReplicationApi_PublishEnvelope_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
+	return nil
+}
+
+var (
+	pattern_ReplicationApi_BatchSubscribeEnvelopes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"mls", "v2", "subscribe-envelopes"}, ""))
+
+	pattern_ReplicationApi_QueryEnvelopes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"mls", "v2", "query-envelopes"}, ""))
+
+	pattern_ReplicationApi_PublishEnvelope_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"mls", "v2", "publish-envelope"}, ""))
+)
+
+var (
+	forward_ReplicationApi_BatchSubscribeEnvelopes_0 = runtime.ForwardResponseStream
+
+	forward_ReplicationApi_QueryEnvelopes_0 = runtime.ForwardResponseMessage
+
+	forward_ReplicationApi_PublishEnvelope_0 = runtime.ForwardResponseMessage
+)
diff --git a/pkg/proto/xmtpv4/message_api/message_api_grpc.pb.go b/pkg/proto/xmtpv4/message_api/message_api_grpc.pb.go
new file mode 100644
index 00000000..5cbff7c5
--- /dev/null
+++ b/pkg/proto/xmtpv4/message_api/message_api_grpc.pb.go
@@ -0,0 +1,219 @@
+// Message API for XMTP V4
+
+// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
+// versions:
+// - protoc-gen-go-grpc v1.3.0
+// - protoc             (unknown)
+// source: xmtpv4/message_api/message_api.proto
+
+package message_api
+
+import (
+	context "context"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+)
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
+const _ = grpc.SupportPackageIsVersion7
+
+const (
+	ReplicationApi_BatchSubscribeEnvelopes_FullMethodName = "/xmtp.xmtpv4.ReplicationApi/BatchSubscribeEnvelopes"
+	ReplicationApi_QueryEnvelopes_FullMethodName          = "/xmtp.xmtpv4.ReplicationApi/QueryEnvelopes"
+	ReplicationApi_PublishEnvelope_FullMethodName         = "/xmtp.xmtpv4.ReplicationApi/PublishEnvelope"
+)
+
+// ReplicationApiClient is the client API for ReplicationApi service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type ReplicationApiClient interface {
+	// Subscribe to envelopes
+	BatchSubscribeEnvelopes(ctx context.Context, in *BatchSubscribeEnvelopesRequest, opts ...grpc.CallOption) (ReplicationApi_BatchSubscribeEnvelopesClient, error)
+	// Query envelopes
+	QueryEnvelopes(ctx context.Context, in *QueryEnvelopesRequest, opts ...grpc.CallOption) (*QueryEnvelopesResponse, error)
+	// Publish envelope
+	PublishEnvelope(ctx context.Context, in *PublishEnvelopeRequest, opts ...grpc.CallOption) (*PublishEnvelopeResponse, error)
+}
+
+type replicationApiClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewReplicationApiClient(cc grpc.ClientConnInterface) ReplicationApiClient {
+	return &replicationApiClient{cc}
+}
+
+func (c *replicationApiClient) BatchSubscribeEnvelopes(ctx context.Context, in *BatchSubscribeEnvelopesRequest, opts ...grpc.CallOption) (ReplicationApi_BatchSubscribeEnvelopesClient, error) {
+	stream, err := c.cc.NewStream(ctx, &ReplicationApi_ServiceDesc.Streams[0], ReplicationApi_BatchSubscribeEnvelopes_FullMethodName, opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &replicationApiBatchSubscribeEnvelopesClient{stream}
+	if err := x.ClientStream.SendMsg(in); err != nil {
+		return nil, err
+	}
+	if err := x.ClientStream.CloseSend(); err != nil {
+		return nil, err
+	}
+	return x, nil
+}
+
+type ReplicationApi_BatchSubscribeEnvelopesClient interface {
+	Recv() (*BatchSubscribeEnvelopesResponse, error)
+	grpc.ClientStream
+}
+
+type replicationApiBatchSubscribeEnvelopesClient struct {
+	grpc.ClientStream
+}
+
+func (x *replicationApiBatchSubscribeEnvelopesClient) Recv() (*BatchSubscribeEnvelopesResponse, error) {
+	m := new(BatchSubscribeEnvelopesResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func (c *replicationApiClient) QueryEnvelopes(ctx context.Context, in *QueryEnvelopesRequest, opts ...grpc.CallOption) (*QueryEnvelopesResponse, error) {
+	out := new(QueryEnvelopesResponse)
+	err := c.cc.Invoke(ctx, ReplicationApi_QueryEnvelopes_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *replicationApiClient) PublishEnvelope(ctx context.Context, in *PublishEnvelopeRequest, opts ...grpc.CallOption) (*PublishEnvelopeResponse, error) {
+	out := new(PublishEnvelopeResponse)
+	err := c.cc.Invoke(ctx, ReplicationApi_PublishEnvelope_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// ReplicationApiServer is the server API for ReplicationApi service.
+// All implementations must embed UnimplementedReplicationApiServer
+// for forward compatibility
+type ReplicationApiServer interface {
+	// Subscribe to envelopes
+	BatchSubscribeEnvelopes(*BatchSubscribeEnvelopesRequest, ReplicationApi_BatchSubscribeEnvelopesServer) error
+	// Query envelopes
+	QueryEnvelopes(context.Context, *QueryEnvelopesRequest) (*QueryEnvelopesResponse, error)
+	// Publish envelope
+	PublishEnvelope(context.Context, *PublishEnvelopeRequest) (*PublishEnvelopeResponse, error)
+	mustEmbedUnimplementedReplicationApiServer()
+}
+
+// UnimplementedReplicationApiServer must be embedded to have forward compatible implementations.
+type UnimplementedReplicationApiServer struct {
+}
+
+func (UnimplementedReplicationApiServer) BatchSubscribeEnvelopes(*BatchSubscribeEnvelopesRequest, ReplicationApi_BatchSubscribeEnvelopesServer) error {
+	return status.Errorf(codes.Unimplemented, "method BatchSubscribeEnvelopes not implemented")
+}
+func (UnimplementedReplicationApiServer) QueryEnvelopes(context.Context, *QueryEnvelopesRequest) (*QueryEnvelopesResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method QueryEnvelopes not implemented")
+}
+func (UnimplementedReplicationApiServer) PublishEnvelope(context.Context, *PublishEnvelopeRequest) (*PublishEnvelopeResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method PublishEnvelope not implemented")
+}
+func (UnimplementedReplicationApiServer) mustEmbedUnimplementedReplicationApiServer() {}
+
+// UnsafeReplicationApiServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to ReplicationApiServer will
+// result in compilation errors.
+type UnsafeReplicationApiServer interface {
+	mustEmbedUnimplementedReplicationApiServer()
+}
+
+func RegisterReplicationApiServer(s grpc.ServiceRegistrar, srv ReplicationApiServer) {
+	s.RegisterService(&ReplicationApi_ServiceDesc, srv)
+}
+
+func _ReplicationApi_BatchSubscribeEnvelopes_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(BatchSubscribeEnvelopesRequest)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(ReplicationApiServer).BatchSubscribeEnvelopes(m, &replicationApiBatchSubscribeEnvelopesServer{stream})
+}
+
+type ReplicationApi_BatchSubscribeEnvelopesServer interface {
+	Send(*BatchSubscribeEnvelopesResponse) error
+	grpc.ServerStream
+}
+
+type replicationApiBatchSubscribeEnvelopesServer struct {
+	grpc.ServerStream
+}
+
+func (x *replicationApiBatchSubscribeEnvelopesServer) Send(m *BatchSubscribeEnvelopesResponse) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func _ReplicationApi_QueryEnvelopes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(QueryEnvelopesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ReplicationApiServer).QueryEnvelopes(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ReplicationApi_QueryEnvelopes_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ReplicationApiServer).QueryEnvelopes(ctx, req.(*QueryEnvelopesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _ReplicationApi_PublishEnvelope_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(PublishEnvelopeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ReplicationApiServer).PublishEnvelope(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ReplicationApi_PublishEnvelope_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ReplicationApiServer).PublishEnvelope(ctx, req.(*PublishEnvelopeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+// ReplicationApi_ServiceDesc is the grpc.ServiceDesc for ReplicationApi service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var ReplicationApi_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "xmtp.xmtpv4.ReplicationApi",
+	HandlerType: (*ReplicationApiServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "QueryEnvelopes",
+			Handler:    _ReplicationApi_QueryEnvelopes_Handler,
+		},
+		{
+			MethodName: "PublishEnvelope",
+			Handler:    _ReplicationApi_PublishEnvelope_Handler,
+		},
+	},
+	Streams: []grpc.StreamDesc{
+		{
+			StreamName:    "BatchSubscribeEnvelopes",
+			Handler:       _ReplicationApi_BatchSubscribeEnvelopes_Handler,
+			ServerStreams: true,
+		},
+	},
+	Metadata: "xmtpv4/message_api/message_api.proto",
+}