diff --git a/pkg/proto/identity/api/v1/identity.pb.go b/pkg/proto/identity/api/v1/identity.pb.go
index 0e8058db..8db581f0 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: identity/api/v1/identity.proto
 
@@ -30,16 +30,14 @@ type VerifySmartContractWalletSignaturesRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Signatures []*UnverifiedSmartContractWalletSignature `protobuf:"bytes,1,rep,name=signatures,proto3" json:"signatures,omitempty"`
+	Signatures []*VerifySmartContractWalletSignatureRequestSignature `protobuf:"bytes,1,rep,name=signatures,proto3" json:"signatures,omitempty"`
 }
 
 func (x *VerifySmartContractWalletSignaturesRequest) Reset() {
 	*x = VerifySmartContractWalletSignaturesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_api_v1_identity_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_api_v1_identity_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *VerifySmartContractWalletSignaturesRequest) String() string {
@@ -50,7 +48,7 @@ func (*VerifySmartContractWalletSignaturesRequest) ProtoMessage() {}
 
 func (x *VerifySmartContractWalletSignaturesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_api_v1_identity_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -65,41 +63,44 @@ func (*VerifySmartContractWalletSignaturesRequest) Descriptor() ([]byte, []int)
 	return file_identity_api_v1_identity_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *VerifySmartContractWalletSignaturesRequest) GetSignatures() []*UnverifiedSmartContractWalletSignature {
+func (x *VerifySmartContractWalletSignaturesRequest) GetSignatures() []*VerifySmartContractWalletSignatureRequestSignature {
 	if x != nil {
 		return x.Signatures
 	}
 	return nil
 }
 
-type UnverifiedSmartContractWalletSignature struct {
+type VerifySmartContractWalletSignatureRequestSignature struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	ScwSignature *associations.SmartContractWalletSignature `protobuf:"bytes,1,opt,name=scw_signature,json=scwSignature,proto3" json:"scw_signature,omitempty"`
-	// SHA256 hash of the signature payload
-	Hash []byte `protobuf:"bytes,5,opt,name=hash,proto3" json:"hash,omitempty"`
+	// 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,oneof" json:"block_number,omitempty"`
+	// The signature bytes
+	Signature []byte `protobuf:"bytes,3,opt,name=signature,proto3" json:"signature,omitempty"`
+	Hash      []byte `protobuf:"bytes,4,opt,name=hash,proto3" json:"hash,omitempty"`
 }
 
-func (x *UnverifiedSmartContractWalletSignature) Reset() {
-	*x = UnverifiedSmartContractWalletSignature{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_api_v1_identity_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+func (x *VerifySmartContractWalletSignatureRequestSignature) Reset() {
+	*x = VerifySmartContractWalletSignatureRequestSignature{}
+	mi := &file_identity_api_v1_identity_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
-func (x *UnverifiedSmartContractWalletSignature) String() string {
+func (x *VerifySmartContractWalletSignatureRequestSignature) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*UnverifiedSmartContractWalletSignature) ProtoMessage() {}
+func (*VerifySmartContractWalletSignatureRequestSignature) ProtoMessage() {}
 
-func (x *UnverifiedSmartContractWalletSignature) ProtoReflect() protoreflect.Message {
+func (x *VerifySmartContractWalletSignatureRequestSignature) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_api_v1_identity_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -109,19 +110,33 @@ func (x *UnverifiedSmartContractWalletSignature) ProtoReflect() protoreflect.Mes
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UnverifiedSmartContractWalletSignature.ProtoReflect.Descriptor instead.
-func (*UnverifiedSmartContractWalletSignature) Descriptor() ([]byte, []int) {
+// Deprecated: Use VerifySmartContractWalletSignatureRequestSignature.ProtoReflect.Descriptor instead.
+func (*VerifySmartContractWalletSignatureRequestSignature) Descriptor() ([]byte, []int) {
 	return file_identity_api_v1_identity_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *UnverifiedSmartContractWalletSignature) GetScwSignature() *associations.SmartContractWalletSignature {
+func (x *VerifySmartContractWalletSignatureRequestSignature) GetAccountId() string {
 	if x != nil {
-		return x.ScwSignature
+		return x.AccountId
+	}
+	return ""
+}
+
+func (x *VerifySmartContractWalletSignatureRequestSignature) GetBlockNumber() uint64 {
+	if x != nil && x.BlockNumber != nil {
+		return *x.BlockNumber
+	}
+	return 0
+}
+
+func (x *VerifySmartContractWalletSignatureRequestSignature) GetSignature() []byte {
+	if x != nil {
+		return x.Signature
 	}
 	return nil
 }
 
-func (x *UnverifiedSmartContractWalletSignature) GetHash() []byte {
+func (x *VerifySmartContractWalletSignatureRequestSignature) GetHash() []byte {
 	if x != nil {
 		return x.Hash
 	}
@@ -138,11 +153,9 @@ type VerifySmartContractWalletSignaturesResponse struct {
 
 func (x *VerifySmartContractWalletSignaturesResponse) Reset() {
 	*x = VerifySmartContractWalletSignaturesResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_api_v1_identity_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_api_v1_identity_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *VerifySmartContractWalletSignaturesResponse) String() string {
@@ -153,7 +166,7 @@ func (*VerifySmartContractWalletSignaturesResponse) ProtoMessage() {}
 
 func (x *VerifySmartContractWalletSignaturesResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_api_v1_identity_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -186,11 +199,9 @@ type PublishIdentityUpdateRequest struct {
 
 func (x *PublishIdentityUpdateRequest) Reset() {
 	*x = PublishIdentityUpdateRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_api_v1_identity_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_api_v1_identity_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PublishIdentityUpdateRequest) String() string {
@@ -201,7 +212,7 @@ func (*PublishIdentityUpdateRequest) ProtoMessage() {}
 
 func (x *PublishIdentityUpdateRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_api_v1_identity_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -232,11 +243,9 @@ type PublishIdentityUpdateResponse struct {
 
 func (x *PublishIdentityUpdateResponse) Reset() {
 	*x = PublishIdentityUpdateResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_api_v1_identity_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_api_v1_identity_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PublishIdentityUpdateResponse) String() string {
@@ -247,7 +256,7 @@ func (*PublishIdentityUpdateResponse) ProtoMessage() {}
 
 func (x *PublishIdentityUpdateResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_api_v1_identity_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -273,11 +282,9 @@ type GetIdentityUpdatesRequest struct {
 
 func (x *GetIdentityUpdatesRequest) Reset() {
 	*x = GetIdentityUpdatesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_api_v1_identity_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_api_v1_identity_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetIdentityUpdatesRequest) String() string {
@@ -288,7 +295,7 @@ func (*GetIdentityUpdatesRequest) ProtoMessage() {}
 
 func (x *GetIdentityUpdatesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_api_v1_identity_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -321,11 +328,9 @@ type GetIdentityUpdatesResponse struct {
 
 func (x *GetIdentityUpdatesResponse) Reset() {
 	*x = GetIdentityUpdatesResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_api_v1_identity_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_api_v1_identity_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetIdentityUpdatesResponse) String() string {
@@ -336,7 +341,7 @@ func (*GetIdentityUpdatesResponse) ProtoMessage() {}
 
 func (x *GetIdentityUpdatesResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_api_v1_identity_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -369,11 +374,9 @@ type GetInboxIdsRequest struct {
 
 func (x *GetInboxIdsRequest) Reset() {
 	*x = GetInboxIdsRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_api_v1_identity_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_api_v1_identity_proto_msgTypes[7]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetInboxIdsRequest) String() string {
@@ -384,7 +387,7 @@ func (*GetInboxIdsRequest) ProtoMessage() {}
 
 func (x *GetInboxIdsRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_api_v1_identity_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -417,11 +420,9 @@ type GetInboxIdsResponse struct {
 
 func (x *GetInboxIdsResponse) Reset() {
 	*x = GetInboxIdsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_api_v1_identity_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_api_v1_identity_proto_msgTypes[8]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetInboxIdsResponse) String() string {
@@ -432,7 +433,7 @@ func (*GetInboxIdsResponse) ProtoMessage() {}
 
 func (x *GetInboxIdsResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_api_v1_identity_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -459,17 +460,16 @@ type VerifySmartContractWalletSignaturesResponse_ValidationResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	IsValid bool    `protobuf:"varint,1,opt,name=is_valid,json=isValid,proto3" json:"is_valid,omitempty"`
-	Error   *string `protobuf:"bytes,2,opt,name=error,proto3,oneof" json:"error,omitempty"`
+	IsValid     bool    `protobuf:"varint,1,opt,name=is_valid,json=isValid,proto3" json:"is_valid,omitempty"`
+	BlockNumber *uint64 `protobuf:"varint,2,opt,name=block_number,json=blockNumber,proto3,oneof" json:"block_number,omitempty"`
+	Error       *string `protobuf:"bytes,3,opt,name=error,proto3,oneof" json:"error,omitempty"`
 }
 
 func (x *VerifySmartContractWalletSignaturesResponse_ValidationResponse) Reset() {
 	*x = VerifySmartContractWalletSignaturesResponse_ValidationResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_api_v1_identity_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_api_v1_identity_proto_msgTypes[9]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *VerifySmartContractWalletSignaturesResponse_ValidationResponse) String() string {
@@ -480,7 +480,7 @@ func (*VerifySmartContractWalletSignaturesResponse_ValidationResponse) ProtoMess
 
 func (x *VerifySmartContractWalletSignaturesResponse_ValidationResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_api_v1_identity_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -502,6 +502,13 @@ func (x *VerifySmartContractWalletSignaturesResponse_ValidationResponse) GetIsVa
 	return false
 }
 
+func (x *VerifySmartContractWalletSignaturesResponse_ValidationResponse) GetBlockNumber() uint64 {
+	if x != nil && x.BlockNumber != nil {
+		return *x.BlockNumber
+	}
+	return 0
+}
+
 func (x *VerifySmartContractWalletSignaturesResponse_ValidationResponse) GetError() string {
 	if x != nil && x.Error != nil {
 		return *x.Error
@@ -522,11 +529,9 @@ type GetIdentityUpdatesRequest_Request struct {
 
 func (x *GetIdentityUpdatesRequest_Request) Reset() {
 	*x = GetIdentityUpdatesRequest_Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_api_v1_identity_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_api_v1_identity_proto_msgTypes[10]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetIdentityUpdatesRequest_Request) String() string {
@@ -537,7 +542,7 @@ func (*GetIdentityUpdatesRequest_Request) ProtoMessage() {}
 
 func (x *GetIdentityUpdatesRequest_Request) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_api_v1_identity_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -579,11 +584,9 @@ type GetIdentityUpdatesResponse_IdentityUpdateLog struct {
 
 func (x *GetIdentityUpdatesResponse_IdentityUpdateLog) Reset() {
 	*x = GetIdentityUpdatesResponse_IdentityUpdateLog{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_api_v1_identity_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_api_v1_identity_proto_msgTypes[11]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetIdentityUpdatesResponse_IdentityUpdateLog) String() string {
@@ -594,7 +597,7 @@ func (*GetIdentityUpdatesResponse_IdentityUpdateLog) ProtoMessage() {}
 
 func (x *GetIdentityUpdatesResponse_IdentityUpdateLog) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_api_v1_identity_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -642,11 +645,9 @@ type GetIdentityUpdatesResponse_Response struct {
 
 func (x *GetIdentityUpdatesResponse_Response) Reset() {
 	*x = GetIdentityUpdatesResponse_Response{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_api_v1_identity_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_api_v1_identity_proto_msgTypes[12]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetIdentityUpdatesResponse_Response) String() string {
@@ -657,7 +658,7 @@ func (*GetIdentityUpdatesResponse_Response) ProtoMessage() {}
 
 func (x *GetIdentityUpdatesResponse_Response) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_api_v1_identity_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -697,11 +698,9 @@ type GetInboxIdsRequest_Request struct {
 
 func (x *GetInboxIdsRequest_Request) Reset() {
 	*x = GetInboxIdsRequest_Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_api_v1_identity_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_api_v1_identity_proto_msgTypes[13]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetInboxIdsRequest_Request) String() string {
@@ -712,7 +711,7 @@ func (*GetInboxIdsRequest_Request) ProtoMessage() {}
 
 func (x *GetInboxIdsRequest_Request) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_api_v1_identity_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -746,11 +745,9 @@ type GetInboxIdsResponse_Response struct {
 
 func (x *GetInboxIdsResponse_Response) Reset() {
 	*x = GetInboxIdsResponse_Response{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_api_v1_identity_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_api_v1_identity_proto_msgTypes[14]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetInboxIdsResponse_Response) String() string {
@@ -761,7 +758,7 @@ func (*GetInboxIdsResponse_Response) ProtoMessage() {}
 
 func (x *GetInboxIdsResponse_Response) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_api_v1_identity_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -806,171 +803,178 @@ var file_identity_api_v1_identity_proto_rawDesc = []byte{
 	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e,
 	0x2d, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f,
 	0x6e, 0x73, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8a, 0x01, 0x0a, 0x2a, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x53,
+	0x72, 0x6f, 0x74, 0x6f, 0x22, 0x96, 0x01, 0x0a, 0x2a, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 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, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x5c, 0x0a, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69,
-	0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x55,
-	0x6e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x53, 0x6d, 0x61, 0x72, 0x74, 0x43, 0x6f,
+	0x65, 0x73, 0x74, 0x12, 0x68, 0x0a, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x48, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69,
+	0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56,
+	0x65, 0x72, 0x69, 0x66, 0x79, 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, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72,
+	0x65, 0x52, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x22, 0xbe, 0x01,
+	0x0a, 0x32, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 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, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 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, 0x26, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d,
+	0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x0b, 0x62, 0x6c, 0x6f,
+	0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x88, 0x01, 0x01, 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, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73,
+	0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x42, 0x0f, 0x0a,
+	0x0d, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0xb1,
+	0x02, 0x0a, 0x2b, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 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, 0x52, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
-	0x73, 0x22, 0x9b, 0x01, 0x0a, 0x26, 0x55, 0x6e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64,
-	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, 0x5d, 0x0a, 0x0d,
-	0x73, 0x63, 0x77, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x01, 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, 0x52, 0x0c, 0x73,
-	0x63, 0x77, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x68,
-	0x61, 0x73, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x22,
-	0xf7, 0x01, 0x0a, 0x2b, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 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, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x72, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x54, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79,
-	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, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x73, 0x1a, 0x54, 0x0a, 0x12, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f,
+	0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x72,
+	0x0a, 0x09, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x54, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 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, 0x73, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x73, 0x1a, 0x8d, 0x01, 0x0a, 0x12, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f,
 	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x69, 0x73, 0x5f,
 	0x76, 0x61, 0x6c, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x56,
-	0x61, 0x6c, 0x69, 0x64, 0x12, 0x19, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x88, 0x01, 0x01, 0x42,
-	0x08, 0x0a, 0x06, 0x5f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x73, 0x0a, 0x1c, 0x50, 0x75, 0x62,
-	0x6c, 0x69, 0x73, 0x68, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x53, 0x0a, 0x0f, 0x69, 0x64, 0x65,
-	0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x2a, 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,
-	0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x0e,
-	0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x22, 0x1f,
-	0x0a, 0x1d, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
-	0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0xb7, 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x53, 0x0a,
-	0x08, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x37, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x08, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x73, 0x1a, 0x45, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x65, 0x71, 0x75,
-	0x65, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0a, 0x73,
-	0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x22, 0xa6, 0x03, 0x0a, 0x1a, 0x47, 0x65,
-	0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x57, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x78, 0x6d,
-	0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x73, 0x1a, 0xa8, 0x01, 0x0a, 0x11, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x4c, 0x6f, 0x67, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x65, 0x71, 0x75, 0x65,
-	0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0a, 0x73, 0x65,
-	0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x13, 0x73, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x5f, 0x6e, 0x73, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x11, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x54, 0x69, 0x6d,
-	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x4e, 0x73, 0x12, 0x42, 0x0a, 0x06, 0x75, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 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, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x52, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x1a, 0x83, 0x01, 0x0a,
-	0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 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, 0x12, 0x5c, 0x0a, 0x07, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65,
-	0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
-	0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x6f, 0x67, 0x52, 0x07, 0x75, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x73, 0x22, 0x87, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x49,
-	0x64, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4c, 0x0a, 0x08, 0x72, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x78, 0x6d,
-	0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x49, 0x64, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x08, 0x72,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x1a, 0x23, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0xba, 0x01, 0x0a,
-	0x13, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x49, 0x64, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x50, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69,
-	0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47,
-	0x65, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x49, 0x64, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x1a, 0x51, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1e, 0x0a, 0x08,
-	0x69, 0x6e, 0x62, 0x6f, 0x78, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00,
-	0x52, 0x07, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0b, 0x0a, 0x09,
-	0x5f, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x5f, 0x69, 0x64, 0x32, 0xe3, 0x05, 0x0a, 0x0b, 0x49, 0x64,
-	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x41, 0x70, 0x69, 0x12, 0xb1, 0x01, 0x0a, 0x15, 0x50, 0x75,
-	0x62, 0x6c, 0x69, 0x73, 0x68, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x12, 0x32, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74,
-	0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x75, 0x62, 0x6c, 0x69,
+	0x61, 0x6c, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75,
+	0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x0b, 0x62, 0x6c,
+	0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x88, 0x01, 0x01, 0x12, 0x19, 0x0a, 0x05,
+	0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x05, 0x65,
+	0x72, 0x72, 0x6f, 0x72, 0x88, 0x01, 0x01, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x62, 0x6c, 0x6f, 0x63,
+	0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x65, 0x72, 0x72,
+	0x6f, 0x72, 0x22, 0x73, 0x0a, 0x1c, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x49, 0x64, 0x65,
+	0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x53, 0x0a, 0x0f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x75,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 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, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x0e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x22, 0x1f, 0x0a, 0x1d, 0x50, 0x75, 0x62, 0x6c, 0x69,
 	0x73, 0x68, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x33, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69,
-	0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x50,
-	0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3,
-	0xe4, 0x93, 0x02, 0x29, 0x3a, 0x01, 0x2a, 0x22, 0x24, 0x2f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x2d, 0x69, 0x64,
-	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2d, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0xa5, 0x01,
-	0x0a, 0x12, 0x47, 0x65, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x73, 0x12, 0x2f, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xb7, 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74,
+	0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x53, 0x0a, 0x08, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e,
+	0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e,
+	0x47, 0x65, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x52, 0x08, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x1a, 0x45, 0x0a, 0x07, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0a, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65,
+	0x49, 0x64, 0x22, 0xa6, 0x03, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69,
+	0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x57, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e,
 	0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49,
 	0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65,
-	0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
-	0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x3a,
-	0x01, 0x2a, 0x22, 0x21, 0x2f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x76, 0x31,
-	0x2f, 0x67, 0x65, 0x74, 0x2d, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2d, 0x75, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x73, 0x12, 0x89, 0x01, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x62,
-	0x6f, 0x78, 0x49, 0x64, 0x73, 0x12, 0x28, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65,
-	0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74,
-	0x49, 0x6e, 0x62, 0x6f, 0x78, 0x49, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x29, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x49,
-	0x64, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93,
-	0x02, 0x1f, 0x3a, 0x01, 0x2a, 0x22, 0x1a, 0x2f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
-	0x2f, 0x76, 0x31, 0x2f, 0x67, 0x65, 0x74, 0x2d, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x2d, 0x69, 0x64,
-	0x73, 0x12, 0xeb, 0x01, 0x0a, 0x23, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 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, 0x73, 0x12, 0x40, 0x2e, 0x78, 0x6d, 0x74, 0x70,
-	0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31,
-	0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 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, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x41, 0x2e, 0x78, 0x6d,
-	0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x76, 0x31, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 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, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3f,
-	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x39, 0x3a, 0x01, 0x2a, 0x22, 0x34, 0x2f, 0x69, 0x64, 0x65, 0x6e,
-	0x74, 0x69, 0x74, 0x79, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x2d, 0x73,
-	0x6d, 0x61, 0x72, 0x74, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2d, 0x77, 0x61,
-	0x6c, 0x6c, 0x65, 0x74, 0x2d, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x42,
-	0xf1, 0x01, 0x92, 0x41, 0x14, 0x12, 0x12, 0x0a, 0x0b, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
-	0x79, 0x41, 0x70, 0x69, 0x32, 0x03, 0x31, 0x2e, 0x30, 0x0a, 0x18, 0x63, 0x6f, 0x6d, 0x2e, 0x78,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52,
+	0x09, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x1a, 0xa8, 0x01, 0x0a, 0x11, 0x49,
+	0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x6f, 0x67,
+	0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0a, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x49,
+	0x64, 0x12, 0x2e, 0x0a, 0x13, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d, 0x65,
+	0x73, 0x74, 0x61, 0x6d, 0x70, 0x5f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x11,
+	0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x4e,
+	0x73, 0x12, 0x42, 0x0a, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x2a, 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, 0x49,
+	0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x06, 0x75,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x1a, 0x83, 0x01, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 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, 0x12, 0x5c, 0x0a,
+	0x07, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x42,
+	0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x2e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c,
+	0x6f, 0x67, 0x52, 0x07, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x22, 0x87, 0x01, 0x0a, 0x12,
+	0x47, 0x65, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x49, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x4c, 0x0a, 0x08, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e,
+	0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49,
+	0x6e, 0x62, 0x6f, 0x78, 0x49, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x08, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73,
+	0x1a, 0x23, 0x0a, 0x07, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61,
+	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0xba, 0x01, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x62,
+	0x6f, 0x78, 0x49, 0x64, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x50, 0x0a,
+	0x09, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x32, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78,
+	0x49, 0x64, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x1a,
+	0x51, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61,
+	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1e, 0x0a, 0x08, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x5f, 0x69,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x69, 0x6e, 0x62, 0x6f, 0x78,
+	0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x5f,
+	0x69, 0x64, 0x32, 0xe3, 0x05, 0x0a, 0x0b, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x41,
+	0x70, 0x69, 0x12, 0xb1, 0x01, 0x0a, 0x15, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x49, 0x64,
+	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x32, 0x2e, 0x78,
 	0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x76, 0x31, 0x42, 0x0d, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 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, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x3b, 0x61, 0x70, 0x69,
-	0x76, 0x31, 0xa2, 0x02, 0x03, 0x58, 0x49, 0x41, 0xaa, 0x02, 0x14, 0x58, 0x6d, 0x74, 0x70, 0x2e,
-	0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x31, 0xca,
-	0x02, 0x14, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5c,
-	0x41, 0x70, 0x69, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x20, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x49, 0x64,
-	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50,
-	0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x17, 0x58, 0x6d, 0x74, 0x70,
-	0x3a, 0x3a, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a,
-	0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x2e, 0x76, 0x31, 0x2e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x49, 0x64, 0x65, 0x6e, 0x74,
+	0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x33, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x49,
+	0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x3a, 0x01, 0x2a,
+	0x22, 0x24, 0x2f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x76, 0x31, 0x2f, 0x70,
+	0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x2d, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2d,
+	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0xa5, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x49, 0x64,
+	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x12, 0x2f, 0x2e,
+	0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30,
+	0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x3a, 0x01, 0x2a, 0x22, 0x21, 0x2f, 0x69, 0x64,
+	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x65, 0x74, 0x2d, 0x69, 0x64,
+	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2d, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x12, 0x89,
+	0x01, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x49, 0x64, 0x73, 0x12, 0x28,
+	0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x49, 0x64,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e,
+	0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e,
+	0x47, 0x65, 0x74, 0x49, 0x6e, 0x62, 0x6f, 0x78, 0x49, 0x64, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x3a, 0x01, 0x2a, 0x22, 0x1a,
+	0x2f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x65, 0x74,
+	0x2d, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x2d, 0x69, 0x64, 0x73, 0x12, 0xeb, 0x01, 0x0a, 0x23, 0x56,
+	0x65, 0x72, 0x69, 0x66, 0x79, 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, 0x73, 0x12, 0x40, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
+	0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79,
+	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, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x41, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65, 0x6e,
+	0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, 0x72, 0x69,
+	0x66, 0x79, 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, 0x73, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x39, 0x3a,
+	0x01, 0x2a, 0x22, 0x34, 0x2f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x76, 0x31,
+	0x2f, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x2d, 0x73, 0x6d, 0x61, 0x72, 0x74, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2d, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x2d, 0x73, 0x69,
+	0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x42, 0xf1, 0x01, 0x92, 0x41, 0x14, 0x12, 0x12,
+	0x0a, 0x0b, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x41, 0x70, 0x69, 0x32, 0x03, 0x31,
+	0x2e, 0x30, 0x0a, 0x18, 0x63, 0x6f, 0x6d, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x69, 0x64, 0x65,
+	0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x42, 0x0d, 0x49, 0x64,
+	0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 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,
+	0x70, 0x69, 0x2f, 0x76, 0x31, 0x3b, 0x61, 0x70, 0x69, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x58, 0x49,
+	0x41, 0xaa, 0x02, 0x14, 0x58, 0x6d, 0x74, 0x70, 0x2e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x14, 0x58, 0x6d, 0x74, 0x70, 0x5c,
+	0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x31, 0xe2,
+	0x02, 0x20, 0x58, 0x6d, 0x74, 0x70, 0x5c, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5c,
+	0x41, 0x70, 0x69, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
+	0x74, 0x61, 0xea, 0x02, 0x17, 0x58, 0x6d, 0x74, 0x70, 0x3a, 0x3a, 0x49, 0x64, 0x65, 0x6e, 0x74,
+	0x69, 0x74, 0x79, 0x3a, 0x3a, 0x41, 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -988,7 +992,7 @@ func file_identity_api_v1_identity_proto_rawDescGZIP() []byte {
 var file_identity_api_v1_identity_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
 var file_identity_api_v1_identity_proto_goTypes = []any{
 	(*VerifySmartContractWalletSignaturesRequest)(nil),                     // 0: xmtp.identity.api.v1.VerifySmartContractWalletSignaturesRequest
-	(*UnverifiedSmartContractWalletSignature)(nil),                         // 1: xmtp.identity.api.v1.UnverifiedSmartContractWalletSignature
+	(*VerifySmartContractWalletSignatureRequestSignature)(nil),             // 1: xmtp.identity.api.v1.VerifySmartContractWalletSignatureRequestSignature
 	(*VerifySmartContractWalletSignaturesResponse)(nil),                    // 2: xmtp.identity.api.v1.VerifySmartContractWalletSignaturesResponse
 	(*PublishIdentityUpdateRequest)(nil),                                   // 3: xmtp.identity.api.v1.PublishIdentityUpdateRequest
 	(*PublishIdentityUpdateResponse)(nil),                                  // 4: xmtp.identity.api.v1.PublishIdentityUpdateResponse
@@ -1002,33 +1006,31 @@ var file_identity_api_v1_identity_proto_goTypes = []any{
 	(*GetIdentityUpdatesResponse_Response)(nil),                            // 12: xmtp.identity.api.v1.GetIdentityUpdatesResponse.Response
 	(*GetInboxIdsRequest_Request)(nil),                                     // 13: xmtp.identity.api.v1.GetInboxIdsRequest.Request
 	(*GetInboxIdsResponse_Response)(nil),                                   // 14: xmtp.identity.api.v1.GetInboxIdsResponse.Response
-	(*associations.SmartContractWalletSignature)(nil),                      // 15: xmtp.identity.associations.SmartContractWalletSignature
-	(*associations.IdentityUpdate)(nil),                                    // 16: xmtp.identity.associations.IdentityUpdate
+	(*associations.IdentityUpdate)(nil),                                    // 15: xmtp.identity.associations.IdentityUpdate
 }
 var file_identity_api_v1_identity_proto_depIdxs = []int32{
-	1,  // 0: xmtp.identity.api.v1.VerifySmartContractWalletSignaturesRequest.signatures:type_name -> xmtp.identity.api.v1.UnverifiedSmartContractWalletSignature
-	15, // 1: xmtp.identity.api.v1.UnverifiedSmartContractWalletSignature.scw_signature:type_name -> xmtp.identity.associations.SmartContractWalletSignature
-	9,  // 2: xmtp.identity.api.v1.VerifySmartContractWalletSignaturesResponse.responses:type_name -> xmtp.identity.api.v1.VerifySmartContractWalletSignaturesResponse.ValidationResponse
-	16, // 3: xmtp.identity.api.v1.PublishIdentityUpdateRequest.identity_update:type_name -> xmtp.identity.associations.IdentityUpdate
-	10, // 4: xmtp.identity.api.v1.GetIdentityUpdatesRequest.requests:type_name -> xmtp.identity.api.v1.GetIdentityUpdatesRequest.Request
-	12, // 5: xmtp.identity.api.v1.GetIdentityUpdatesResponse.responses:type_name -> xmtp.identity.api.v1.GetIdentityUpdatesResponse.Response
-	13, // 6: xmtp.identity.api.v1.GetInboxIdsRequest.requests:type_name -> xmtp.identity.api.v1.GetInboxIdsRequest.Request
-	14, // 7: xmtp.identity.api.v1.GetInboxIdsResponse.responses:type_name -> xmtp.identity.api.v1.GetInboxIdsResponse.Response
-	16, // 8: xmtp.identity.api.v1.GetIdentityUpdatesResponse.IdentityUpdateLog.update:type_name -> xmtp.identity.associations.IdentityUpdate
-	11, // 9: xmtp.identity.api.v1.GetIdentityUpdatesResponse.Response.updates:type_name -> xmtp.identity.api.v1.GetIdentityUpdatesResponse.IdentityUpdateLog
-	3,  // 10: xmtp.identity.api.v1.IdentityApi.PublishIdentityUpdate:input_type -> xmtp.identity.api.v1.PublishIdentityUpdateRequest
-	5,  // 11: xmtp.identity.api.v1.IdentityApi.GetIdentityUpdates:input_type -> xmtp.identity.api.v1.GetIdentityUpdatesRequest
-	7,  // 12: xmtp.identity.api.v1.IdentityApi.GetInboxIds:input_type -> xmtp.identity.api.v1.GetInboxIdsRequest
-	0,  // 13: xmtp.identity.api.v1.IdentityApi.VerifySmartContractWalletSignatures:input_type -> xmtp.identity.api.v1.VerifySmartContractWalletSignaturesRequest
-	4,  // 14: xmtp.identity.api.v1.IdentityApi.PublishIdentityUpdate:output_type -> xmtp.identity.api.v1.PublishIdentityUpdateResponse
-	6,  // 15: xmtp.identity.api.v1.IdentityApi.GetIdentityUpdates:output_type -> xmtp.identity.api.v1.GetIdentityUpdatesResponse
-	8,  // 16: xmtp.identity.api.v1.IdentityApi.GetInboxIds:output_type -> xmtp.identity.api.v1.GetInboxIdsResponse
-	2,  // 17: xmtp.identity.api.v1.IdentityApi.VerifySmartContractWalletSignatures:output_type -> xmtp.identity.api.v1.VerifySmartContractWalletSignaturesResponse
-	14, // [14:18] is the sub-list for method output_type
-	10, // [10:14] is the sub-list for method input_type
-	10, // [10:10] is the sub-list for extension type_name
-	10, // [10:10] is the sub-list for extension extendee
-	0,  // [0:10] is the sub-list for field type_name
+	1,  // 0: xmtp.identity.api.v1.VerifySmartContractWalletSignaturesRequest.signatures:type_name -> xmtp.identity.api.v1.VerifySmartContractWalletSignatureRequestSignature
+	9,  // 1: xmtp.identity.api.v1.VerifySmartContractWalletSignaturesResponse.responses:type_name -> xmtp.identity.api.v1.VerifySmartContractWalletSignaturesResponse.ValidationResponse
+	15, // 2: xmtp.identity.api.v1.PublishIdentityUpdateRequest.identity_update:type_name -> xmtp.identity.associations.IdentityUpdate
+	10, // 3: xmtp.identity.api.v1.GetIdentityUpdatesRequest.requests:type_name -> xmtp.identity.api.v1.GetIdentityUpdatesRequest.Request
+	12, // 4: xmtp.identity.api.v1.GetIdentityUpdatesResponse.responses:type_name -> xmtp.identity.api.v1.GetIdentityUpdatesResponse.Response
+	13, // 5: xmtp.identity.api.v1.GetInboxIdsRequest.requests:type_name -> xmtp.identity.api.v1.GetInboxIdsRequest.Request
+	14, // 6: xmtp.identity.api.v1.GetInboxIdsResponse.responses:type_name -> xmtp.identity.api.v1.GetInboxIdsResponse.Response
+	15, // 7: xmtp.identity.api.v1.GetIdentityUpdatesResponse.IdentityUpdateLog.update:type_name -> xmtp.identity.associations.IdentityUpdate
+	11, // 8: xmtp.identity.api.v1.GetIdentityUpdatesResponse.Response.updates:type_name -> xmtp.identity.api.v1.GetIdentityUpdatesResponse.IdentityUpdateLog
+	3,  // 9: xmtp.identity.api.v1.IdentityApi.PublishIdentityUpdate:input_type -> xmtp.identity.api.v1.PublishIdentityUpdateRequest
+	5,  // 10: xmtp.identity.api.v1.IdentityApi.GetIdentityUpdates:input_type -> xmtp.identity.api.v1.GetIdentityUpdatesRequest
+	7,  // 11: xmtp.identity.api.v1.IdentityApi.GetInboxIds:input_type -> xmtp.identity.api.v1.GetInboxIdsRequest
+	0,  // 12: xmtp.identity.api.v1.IdentityApi.VerifySmartContractWalletSignatures:input_type -> xmtp.identity.api.v1.VerifySmartContractWalletSignaturesRequest
+	4,  // 13: xmtp.identity.api.v1.IdentityApi.PublishIdentityUpdate:output_type -> xmtp.identity.api.v1.PublishIdentityUpdateResponse
+	6,  // 14: xmtp.identity.api.v1.IdentityApi.GetIdentityUpdates:output_type -> xmtp.identity.api.v1.GetIdentityUpdatesResponse
+	8,  // 15: xmtp.identity.api.v1.IdentityApi.GetInboxIds:output_type -> xmtp.identity.api.v1.GetInboxIdsResponse
+	2,  // 16: xmtp.identity.api.v1.IdentityApi.VerifySmartContractWalletSignatures:output_type -> xmtp.identity.api.v1.VerifySmartContractWalletSignaturesResponse
+	13, // [13:17] is the sub-list for method output_type
+	9,  // [9:13] 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
 }
 
 func init() { file_identity_api_v1_identity_proto_init() }
@@ -1036,188 +1038,7 @@ func file_identity_api_v1_identity_proto_init() {
 	if File_identity_api_v1_identity_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		file_identity_api_v1_identity_proto_msgTypes[0].Exporter = func(v any, i int) any {
-			switch v := v.(*VerifySmartContractWalletSignaturesRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_api_v1_identity_proto_msgTypes[1].Exporter = func(v any, i int) any {
-			switch v := v.(*UnverifiedSmartContractWalletSignature); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_api_v1_identity_proto_msgTypes[2].Exporter = func(v any, i int) any {
-			switch v := v.(*VerifySmartContractWalletSignaturesResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_api_v1_identity_proto_msgTypes[3].Exporter = func(v any, i int) any {
-			switch v := v.(*PublishIdentityUpdateRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_api_v1_identity_proto_msgTypes[4].Exporter = func(v any, i int) any {
-			switch v := v.(*PublishIdentityUpdateResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_api_v1_identity_proto_msgTypes[5].Exporter = func(v any, i int) any {
-			switch v := v.(*GetIdentityUpdatesRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_api_v1_identity_proto_msgTypes[6].Exporter = func(v any, i int) any {
-			switch v := v.(*GetIdentityUpdatesResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_api_v1_identity_proto_msgTypes[7].Exporter = func(v any, i int) any {
-			switch v := v.(*GetInboxIdsRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_api_v1_identity_proto_msgTypes[8].Exporter = func(v any, i int) any {
-			switch v := v.(*GetInboxIdsResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_api_v1_identity_proto_msgTypes[9].Exporter = func(v any, i int) any {
-			switch v := v.(*VerifySmartContractWalletSignaturesResponse_ValidationResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_api_v1_identity_proto_msgTypes[10].Exporter = func(v any, i int) any {
-			switch v := v.(*GetIdentityUpdatesRequest_Request); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_api_v1_identity_proto_msgTypes[11].Exporter = func(v any, i int) any {
-			switch v := v.(*GetIdentityUpdatesResponse_IdentityUpdateLog); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_api_v1_identity_proto_msgTypes[12].Exporter = func(v any, i int) any {
-			switch v := v.(*GetIdentityUpdatesResponse_Response); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_api_v1_identity_proto_msgTypes[13].Exporter = func(v any, i int) any {
-			switch v := v.(*GetInboxIdsRequest_Request); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_api_v1_identity_proto_msgTypes[14].Exporter = func(v any, i int) any {
-			switch v := v.(*GetInboxIdsResponse_Response); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
+	file_identity_api_v1_identity_proto_msgTypes[1].OneofWrappers = []any{}
 	file_identity_api_v1_identity_proto_msgTypes[9].OneofWrappers = []any{}
 	file_identity_api_v1_identity_proto_msgTypes[14].OneofWrappers = []any{}
 	type x struct{}
diff --git a/pkg/proto/identity/associations/association.pb.go b/pkg/proto/identity/associations/association.pb.go
index da0d70ab..cb2b338c 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: identity/associations/association.proto
 
@@ -37,11 +37,9 @@ type MemberIdentifier struct {
 
 func (x *MemberIdentifier) Reset() {
 	*x = MemberIdentifier{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_association_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_association_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MemberIdentifier) String() string {
@@ -52,7 +50,7 @@ func (*MemberIdentifier) ProtoMessage() {}
 
 func (x *MemberIdentifier) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_association_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -117,11 +115,9 @@ type Member struct {
 
 func (x *Member) Reset() {
 	*x = Member{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_association_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_association_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Member) String() string {
@@ -132,7 +128,7 @@ func (*Member) ProtoMessage() {}
 
 func (x *Member) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_association_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -184,11 +180,9 @@ type CreateInbox struct {
 
 func (x *CreateInbox) Reset() {
 	*x = CreateInbox{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_association_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_association_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CreateInbox) String() string {
@@ -199,7 +193,7 @@ func (*CreateInbox) ProtoMessage() {}
 
 func (x *CreateInbox) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_association_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -251,11 +245,9 @@ type AddAssociation struct {
 
 func (x *AddAssociation) Reset() {
 	*x = AddAssociation{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_association_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_association_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *AddAssociation) String() string {
@@ -266,7 +258,7 @@ func (*AddAssociation) ProtoMessage() {}
 
 func (x *AddAssociation) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_association_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -314,11 +306,9 @@ type RevokeAssociation struct {
 
 func (x *RevokeAssociation) Reset() {
 	*x = RevokeAssociation{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_association_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_association_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *RevokeAssociation) String() string {
@@ -329,7 +319,7 @@ func (*RevokeAssociation) ProtoMessage() {}
 
 func (x *RevokeAssociation) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_association_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -372,11 +362,9 @@ type ChangeRecoveryAddress struct {
 
 func (x *ChangeRecoveryAddress) Reset() {
 	*x = ChangeRecoveryAddress{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_association_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_association_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ChangeRecoveryAddress) String() string {
@@ -387,7 +375,7 @@ func (*ChangeRecoveryAddress) ProtoMessage() {}
 
 func (x *ChangeRecoveryAddress) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_association_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -433,11 +421,9 @@ type IdentityAction struct {
 
 func (x *IdentityAction) Reset() {
 	*x = IdentityAction{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_association_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_association_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *IdentityAction) String() string {
@@ -448,7 +434,7 @@ func (*IdentityAction) ProtoMessage() {}
 
 func (x *IdentityAction) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_association_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -545,11 +531,9 @@ type IdentityUpdate struct {
 
 func (x *IdentityUpdate) Reset() {
 	*x = IdentityUpdate{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_association_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_association_proto_msgTypes[7]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *IdentityUpdate) String() string {
@@ -560,7 +544,7 @@ func (*IdentityUpdate) ProtoMessage() {}
 
 func (x *IdentityUpdate) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_association_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -608,11 +592,9 @@ type MemberMap struct {
 
 func (x *MemberMap) Reset() {
 	*x = MemberMap{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_association_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_association_proto_msgTypes[8]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MemberMap) String() string {
@@ -623,7 +605,7 @@ func (*MemberMap) ProtoMessage() {}
 
 func (x *MemberMap) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_association_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -666,11 +648,9 @@ type AssociationState struct {
 
 func (x *AssociationState) Reset() {
 	*x = AssociationState{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_association_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_association_proto_msgTypes[9]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *AssociationState) String() string {
@@ -681,7 +661,7 @@ func (*AssociationState) ProtoMessage() {}
 
 func (x *AssociationState) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_association_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -736,11 +716,9 @@ type AssociationStateDiff struct {
 
 func (x *AssociationStateDiff) Reset() {
 	*x = AssociationStateDiff{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_association_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_association_proto_msgTypes[10]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *AssociationStateDiff) String() string {
@@ -751,7 +729,7 @@ func (*AssociationStateDiff) ProtoMessage() {}
 
 func (x *AssociationStateDiff) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_association_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1013,140 +991,6 @@ func file_identity_associations_association_proto_init() {
 		return
 	}
 	file_identity_associations_signature_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_identity_associations_association_proto_msgTypes[0].Exporter = func(v any, i int) any {
-			switch v := v.(*MemberIdentifier); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_associations_association_proto_msgTypes[1].Exporter = func(v any, i int) any {
-			switch v := v.(*Member); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_associations_association_proto_msgTypes[2].Exporter = func(v any, i int) any {
-			switch v := v.(*CreateInbox); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_associations_association_proto_msgTypes[3].Exporter = func(v any, i int) any {
-			switch v := v.(*AddAssociation); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_associations_association_proto_msgTypes[4].Exporter = func(v any, i int) any {
-			switch v := v.(*RevokeAssociation); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_associations_association_proto_msgTypes[5].Exporter = func(v any, i int) any {
-			switch v := v.(*ChangeRecoveryAddress); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_associations_association_proto_msgTypes[6].Exporter = func(v any, i int) any {
-			switch v := v.(*IdentityAction); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_associations_association_proto_msgTypes[7].Exporter = func(v any, i int) any {
-			switch v := v.(*IdentityUpdate); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_associations_association_proto_msgTypes[8].Exporter = func(v any, i int) any {
-			switch v := v.(*MemberMap); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_associations_association_proto_msgTypes[9].Exporter = func(v any, i int) any {
-			switch v := v.(*AssociationState); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_associations_association_proto_msgTypes[10].Exporter = func(v any, i int) any {
-			switch v := v.(*AssociationStateDiff); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_identity_associations_association_proto_msgTypes[0].OneofWrappers = []any{
 		(*MemberIdentifier_Address)(nil),
 		(*MemberIdentifier_InstallationPublicKey)(nil),
diff --git a/pkg/proto/identity/associations/signature.pb.go b/pkg/proto/identity/associations/signature.pb.go
index 66c2db73..975ca91b 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: identity/associations/signature.proto
 
@@ -35,11 +35,9 @@ type RecoverableEcdsaSignature struct {
 
 func (x *RecoverableEcdsaSignature) Reset() {
 	*x = RecoverableEcdsaSignature{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_signature_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_signature_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *RecoverableEcdsaSignature) String() string {
@@ -50,7 +48,7 @@ func (*RecoverableEcdsaSignature) ProtoMessage() {}
 
 func (x *RecoverableEcdsaSignature) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_signature_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -86,11 +84,9 @@ type RecoverableEd25519Signature struct {
 
 func (x *RecoverableEd25519Signature) Reset() {
 	*x = RecoverableEd25519Signature{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_signature_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_signature_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *RecoverableEd25519Signature) String() string {
@@ -101,7 +97,7 @@ func (*RecoverableEd25519Signature) ProtoMessage() {}
 
 func (x *RecoverableEd25519Signature) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_signature_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -147,11 +143,9 @@ type SmartContractWalletSignature struct {
 
 func (x *SmartContractWalletSignature) Reset() {
 	*x = SmartContractWalletSignature{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_signature_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_signature_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SmartContractWalletSignature) String() string {
@@ -162,7 +156,7 @@ func (*SmartContractWalletSignature) ProtoMessage() {}
 
 func (x *SmartContractWalletSignature) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_signature_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -215,11 +209,9 @@ type LegacyDelegatedSignature struct {
 
 func (x *LegacyDelegatedSignature) Reset() {
 	*x = LegacyDelegatedSignature{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_signature_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_signature_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *LegacyDelegatedSignature) String() string {
@@ -230,7 +222,7 @@ func (*LegacyDelegatedSignature) ProtoMessage() {}
 
 func (x *LegacyDelegatedSignature) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_signature_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -282,11 +274,9 @@ type Signature struct {
 
 func (x *Signature) Reset() {
 	*x = Signature{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_associations_signature_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_associations_signature_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Signature) String() string {
@@ -297,7 +287,7 @@ func (*Signature) ProtoMessage() {}
 
 func (x *Signature) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_associations_signature_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -496,68 +486,6 @@ func file_identity_associations_signature_proto_init() {
 	if File_identity_associations_signature_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		file_identity_associations_signature_proto_msgTypes[0].Exporter = func(v any, i int) any {
-			switch v := v.(*RecoverableEcdsaSignature); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_associations_signature_proto_msgTypes[1].Exporter = func(v any, i int) any {
-			switch v := v.(*RecoverableEd25519Signature); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_associations_signature_proto_msgTypes[3].Exporter = func(v any, i int) any {
-			switch v := v.(*LegacyDelegatedSignature); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_identity_associations_signature_proto_msgTypes[4].Exporter = func(v any, i int) any {
-			switch v := v.(*Signature); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_identity_associations_signature_proto_msgTypes[4].OneofWrappers = []any{
 		(*Signature_Erc_191)(nil),
 		(*Signature_Erc_6492)(nil),
diff --git a/pkg/proto/identity/credential.pb.go b/pkg/proto/identity/credential.pb.go
index e08838c1..e39848ac 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: identity/credential.proto
 
@@ -33,11 +33,9 @@ type MlsCredential struct {
 
 func (x *MlsCredential) Reset() {
 	*x = MlsCredential{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_identity_credential_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_identity_credential_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MlsCredential) String() string {
@@ -48,7 +46,7 @@ func (*MlsCredential) ProtoMessage() {}
 
 func (x *MlsCredential) ProtoReflect() protoreflect.Message {
 	mi := &file_identity_credential_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -121,20 +119,6 @@ func file_identity_credential_proto_init() {
 	if File_identity_credential_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		file_identity_credential_proto_msgTypes[0].Exporter = func(v any, i int) any {
-			switch v := v.(*MlsCredential); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/pkg/proto/keystore_api/v1/keystore.pb.go b/pkg/proto/keystore_api/v1/keystore.pb.go
index 1f910d6c..30cd04b1 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: keystore_api/v1/keystore.proto
 
@@ -188,11 +188,9 @@ type KeystoreError struct {
 
 func (x *KeystoreError) Reset() {
 	*x = KeystoreError{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *KeystoreError) String() string {
@@ -203,7 +201,7 @@ func (*KeystoreError) ProtoMessage() {}
 
 func (x *KeystoreError) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -243,11 +241,9 @@ type DecryptV1Request struct {
 
 func (x *DecryptV1Request) Reset() {
 	*x = DecryptV1Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *DecryptV1Request) String() string {
@@ -258,7 +254,7 @@ func (*DecryptV1Request) ProtoMessage() {}
 
 func (x *DecryptV1Request) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -291,11 +287,9 @@ type DecryptResponse struct {
 
 func (x *DecryptResponse) Reset() {
 	*x = DecryptResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *DecryptResponse) String() string {
@@ -306,7 +300,7 @@ func (*DecryptResponse) ProtoMessage() {}
 
 func (x *DecryptResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -339,11 +333,9 @@ type DecryptV2Request struct {
 
 func (x *DecryptV2Request) Reset() {
 	*x = DecryptV2Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *DecryptV2Request) String() string {
@@ -354,7 +346,7 @@ func (*DecryptV2Request) ProtoMessage() {}
 
 func (x *DecryptV2Request) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -387,11 +379,9 @@ type EncryptV1Request struct {
 
 func (x *EncryptV1Request) Reset() {
 	*x = EncryptV1Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EncryptV1Request) String() string {
@@ -402,7 +392,7 @@ func (*EncryptV1Request) ProtoMessage() {}
 
 func (x *EncryptV1Request) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -435,11 +425,9 @@ type EncryptResponse struct {
 
 func (x *EncryptResponse) Reset() {
 	*x = EncryptResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EncryptResponse) String() string {
@@ -450,7 +438,7 @@ func (*EncryptResponse) ProtoMessage() {}
 
 func (x *EncryptResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -483,11 +471,9 @@ type EncryptV2Request struct {
 
 func (x *EncryptV2Request) Reset() {
 	*x = EncryptV2Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EncryptV2Request) String() string {
@@ -498,7 +484,7 @@ func (*EncryptV2Request) ProtoMessage() {}
 
 func (x *EncryptV2Request) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -531,11 +517,9 @@ type SelfEncryptRequest struct {
 
 func (x *SelfEncryptRequest) Reset() {
 	*x = SelfEncryptRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[7]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SelfEncryptRequest) String() string {
@@ -546,7 +530,7 @@ func (*SelfEncryptRequest) ProtoMessage() {}
 
 func (x *SelfEncryptRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -579,11 +563,9 @@ type SelfEncryptResponse struct {
 
 func (x *SelfEncryptResponse) Reset() {
 	*x = SelfEncryptResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[8]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SelfEncryptResponse) String() string {
@@ -594,7 +576,7 @@ func (*SelfEncryptResponse) ProtoMessage() {}
 
 func (x *SelfEncryptResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -627,11 +609,9 @@ type SelfDecryptRequest struct {
 
 func (x *SelfDecryptRequest) Reset() {
 	*x = SelfDecryptRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[9]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SelfDecryptRequest) String() string {
@@ -642,7 +622,7 @@ func (*SelfDecryptRequest) ProtoMessage() {}
 
 func (x *SelfDecryptRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -675,11 +655,9 @@ type GetPrivatePreferencesTopicIdentifierResponse struct {
 
 func (x *GetPrivatePreferencesTopicIdentifierResponse) Reset() {
 	*x = GetPrivatePreferencesTopicIdentifierResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[10]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetPrivatePreferencesTopicIdentifierResponse) String() string {
@@ -690,7 +668,7 @@ func (*GetPrivatePreferencesTopicIdentifierResponse) ProtoMessage() {}
 
 func (x *GetPrivatePreferencesTopicIdentifierResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -726,11 +704,9 @@ type CreateInviteRequest struct {
 
 func (x *CreateInviteRequest) Reset() {
 	*x = CreateInviteRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[11]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CreateInviteRequest) String() string {
@@ -741,7 +717,7 @@ func (*CreateInviteRequest) ProtoMessage() {}
 
 func (x *CreateInviteRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -796,11 +772,9 @@ type CreateInviteResponse struct {
 
 func (x *CreateInviteResponse) Reset() {
 	*x = CreateInviteResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[12]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CreateInviteResponse) String() string {
@@ -811,7 +785,7 @@ func (*CreateInviteResponse) ProtoMessage() {}
 
 func (x *CreateInviteResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -851,11 +825,9 @@ type SaveInvitesRequest struct {
 
 func (x *SaveInvitesRequest) Reset() {
 	*x = SaveInvitesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[13]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SaveInvitesRequest) String() string {
@@ -866,7 +838,7 @@ func (*SaveInvitesRequest) ProtoMessage() {}
 
 func (x *SaveInvitesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -899,11 +871,9 @@ type SaveInvitesResponse struct {
 
 func (x *SaveInvitesResponse) Reset() {
 	*x = SaveInvitesResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[14]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SaveInvitesResponse) String() string {
@@ -914,7 +884,7 @@ func (*SaveInvitesResponse) ProtoMessage() {}
 
 func (x *SaveInvitesResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -947,11 +917,9 @@ type CreateAuthTokenRequest struct {
 
 func (x *CreateAuthTokenRequest) Reset() {
 	*x = CreateAuthTokenRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[15]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CreateAuthTokenRequest) String() string {
@@ -962,7 +930,7 @@ func (*CreateAuthTokenRequest) ProtoMessage() {}
 
 func (x *CreateAuthTokenRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -996,11 +964,9 @@ type SaveV1ConversationsRequest struct {
 
 func (x *SaveV1ConversationsRequest) Reset() {
 	*x = SaveV1ConversationsRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[16]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SaveV1ConversationsRequest) String() string {
@@ -1011,7 +977,7 @@ func (*SaveV1ConversationsRequest) ProtoMessage() {}
 
 func (x *SaveV1ConversationsRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1042,11 +1008,9 @@ type SaveV1ConversationsResponse struct {
 
 func (x *SaveV1ConversationsResponse) Reset() {
 	*x = SaveV1ConversationsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[17]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[17]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SaveV1ConversationsResponse) String() string {
@@ -1057,7 +1021,7 @@ func (*SaveV1ConversationsResponse) ProtoMessage() {}
 
 func (x *SaveV1ConversationsResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[17]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1083,11 +1047,9 @@ type GetConversationsResponse struct {
 
 func (x *GetConversationsResponse) Reset() {
 	*x = GetConversationsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[18]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[18]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetConversationsResponse) String() string {
@@ -1098,7 +1060,7 @@ func (*GetConversationsResponse) ProtoMessage() {}
 
 func (x *GetConversationsResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[18]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1132,11 +1094,9 @@ type GetKeystoreStatusRequest struct {
 
 func (x *GetKeystoreStatusRequest) Reset() {
 	*x = GetKeystoreStatusRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[19]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[19]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetKeystoreStatusRequest) String() string {
@@ -1147,7 +1107,7 @@ func (*GetKeystoreStatusRequest) ProtoMessage() {}
 
 func (x *GetKeystoreStatusRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[19]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1180,11 +1140,9 @@ type GetKeystoreStatusResponse struct {
 
 func (x *GetKeystoreStatusResponse) Reset() {
 	*x = GetKeystoreStatusResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[20]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[20]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetKeystoreStatusResponse) String() string {
@@ -1195,7 +1153,7 @@ func (*GetKeystoreStatusResponse) ProtoMessage() {}
 
 func (x *GetKeystoreStatusResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[20]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1232,11 +1190,9 @@ type InitKeystoreRequest struct {
 
 func (x *InitKeystoreRequest) Reset() {
 	*x = InitKeystoreRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[21]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[21]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *InitKeystoreRequest) String() string {
@@ -1247,7 +1203,7 @@ func (*InitKeystoreRequest) ProtoMessage() {}
 
 func (x *InitKeystoreRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[21]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1297,11 +1253,9 @@ type InitKeystoreResponse struct {
 
 func (x *InitKeystoreResponse) Reset() {
 	*x = InitKeystoreResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[22]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[22]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *InitKeystoreResponse) String() string {
@@ -1312,7 +1266,7 @@ func (*InitKeystoreResponse) ProtoMessage() {}
 
 func (x *InitKeystoreResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[22]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1351,11 +1305,9 @@ type SignDigestRequest struct {
 
 func (x *SignDigestRequest) Reset() {
 	*x = SignDigestRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[23]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[23]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SignDigestRequest) String() string {
@@ -1366,7 +1318,7 @@ func (*SignDigestRequest) ProtoMessage() {}
 
 func (x *SignDigestRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[23]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1436,11 +1388,9 @@ type GetRefreshJobRequest struct {
 
 func (x *GetRefreshJobRequest) Reset() {
 	*x = GetRefreshJobRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[24]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[24]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetRefreshJobRequest) String() string {
@@ -1451,7 +1401,7 @@ func (*GetRefreshJobRequest) ProtoMessage() {}
 
 func (x *GetRefreshJobRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[24]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1484,11 +1434,9 @@ type GetRefreshJobResponse struct {
 
 func (x *GetRefreshJobResponse) Reset() {
 	*x = GetRefreshJobResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[25]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[25]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetRefreshJobResponse) String() string {
@@ -1499,7 +1447,7 @@ func (*GetRefreshJobResponse) ProtoMessage() {}
 
 func (x *GetRefreshJobResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[25]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1533,11 +1481,9 @@ type SetRefeshJobRequest struct {
 
 func (x *SetRefeshJobRequest) Reset() {
 	*x = SetRefeshJobRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[26]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[26]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SetRefeshJobRequest) String() string {
@@ -1548,7 +1494,7 @@ func (*SetRefeshJobRequest) ProtoMessage() {}
 
 func (x *SetRefeshJobRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[26]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1586,11 +1532,9 @@ type SetRefreshJobResponse struct {
 
 func (x *SetRefreshJobResponse) Reset() {
 	*x = SetRefreshJobResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[27]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[27]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SetRefreshJobResponse) String() string {
@@ -1601,7 +1545,7 @@ func (*SetRefreshJobResponse) ProtoMessage() {}
 
 func (x *SetRefreshJobResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[27]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1627,11 +1571,9 @@ type TopicMap struct {
 
 func (x *TopicMap) Reset() {
 	*x = TopicMap{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[28]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[28]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *TopicMap) String() string {
@@ -1642,7 +1584,7 @@ func (*TopicMap) ProtoMessage() {}
 
 func (x *TopicMap) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[28]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1675,11 +1617,9 @@ type GetConversationHmacKeysRequest struct {
 
 func (x *GetConversationHmacKeysRequest) Reset() {
 	*x = GetConversationHmacKeysRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[29]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[29]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetConversationHmacKeysRequest) String() string {
@@ -1690,7 +1630,7 @@ func (*GetConversationHmacKeysRequest) ProtoMessage() {}
 
 func (x *GetConversationHmacKeysRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[29]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1723,11 +1663,9 @@ type GetConversationHmacKeysResponse struct {
 
 func (x *GetConversationHmacKeysResponse) Reset() {
 	*x = GetConversationHmacKeysResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[30]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[30]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetConversationHmacKeysResponse) String() string {
@@ -1738,7 +1676,7 @@ func (*GetConversationHmacKeysResponse) ProtoMessage() {}
 
 func (x *GetConversationHmacKeysResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[30]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1771,11 +1709,9 @@ type PrivatePreferencesActionMap struct {
 
 func (x *PrivatePreferencesActionMap) Reset() {
 	*x = PrivatePreferencesActionMap{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[31]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[31]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PrivatePreferencesActionMap) String() string {
@@ -1786,7 +1722,7 @@ func (*PrivatePreferencesActionMap) ProtoMessage() {}
 
 func (x *PrivatePreferencesActionMap) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[31]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1822,11 +1758,9 @@ type DecryptV1Request_Request struct {
 
 func (x *DecryptV1Request_Request) Reset() {
 	*x = DecryptV1Request_Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[32]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[32]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *DecryptV1Request_Request) String() string {
@@ -1837,7 +1771,7 @@ func (*DecryptV1Request_Request) ProtoMessage() {}
 
 func (x *DecryptV1Request_Request) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[32]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1895,11 +1829,9 @@ type DecryptResponse_Response struct {
 
 func (x *DecryptResponse_Response) Reset() {
 	*x = DecryptResponse_Response{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[33]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[33]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *DecryptResponse_Response) String() string {
@@ -1910,7 +1842,7 @@ func (*DecryptResponse_Response) ProtoMessage() {}
 
 func (x *DecryptResponse_Response) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[33]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1973,11 +1905,9 @@ type DecryptResponse_Response_Success struct {
 
 func (x *DecryptResponse_Response_Success) Reset() {
 	*x = DecryptResponse_Response_Success{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[34]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[34]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *DecryptResponse_Response_Success) String() string {
@@ -1988,7 +1918,7 @@ func (*DecryptResponse_Response_Success) ProtoMessage() {}
 
 func (x *DecryptResponse_Response_Success) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[34]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2023,11 +1953,9 @@ type DecryptV2Request_Request struct {
 
 func (x *DecryptV2Request_Request) Reset() {
 	*x = DecryptV2Request_Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[35]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[35]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *DecryptV2Request_Request) String() string {
@@ -2038,7 +1966,7 @@ func (*DecryptV2Request_Request) ProtoMessage() {}
 
 func (x *DecryptV2Request_Request) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[35]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2087,11 +2015,9 @@ type EncryptV1Request_Request struct {
 
 func (x *EncryptV1Request_Request) Reset() {
 	*x = EncryptV1Request_Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[36]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[36]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EncryptV1Request_Request) String() string {
@@ -2102,7 +2028,7 @@ func (*EncryptV1Request_Request) ProtoMessage() {}
 
 func (x *EncryptV1Request_Request) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[36]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2153,11 +2079,9 @@ type EncryptResponse_Response struct {
 
 func (x *EncryptResponse_Response) Reset() {
 	*x = EncryptResponse_Response{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[37]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[37]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EncryptResponse_Response) String() string {
@@ -2168,7 +2092,7 @@ func (*EncryptResponse_Response) ProtoMessage() {}
 
 func (x *EncryptResponse_Response) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[37]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2232,11 +2156,9 @@ type EncryptResponse_Response_Success struct {
 
 func (x *EncryptResponse_Response_Success) Reset() {
 	*x = EncryptResponse_Response_Success{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[38]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[38]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EncryptResponse_Response_Success) String() string {
@@ -2247,7 +2169,7 @@ func (*EncryptResponse_Response_Success) ProtoMessage() {}
 
 func (x *EncryptResponse_Response_Success) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[38]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2289,11 +2211,9 @@ type EncryptV2Request_Request struct {
 
 func (x *EncryptV2Request_Request) Reset() {
 	*x = EncryptV2Request_Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[39]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[39]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EncryptV2Request_Request) String() string {
@@ -2304,7 +2224,7 @@ func (*EncryptV2Request_Request) ProtoMessage() {}
 
 func (x *EncryptV2Request_Request) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[39]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2351,11 +2271,9 @@ type SelfEncryptRequest_Request struct {
 
 func (x *SelfEncryptRequest_Request) Reset() {
 	*x = SelfEncryptRequest_Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[40]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[40]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SelfEncryptRequest_Request) String() string {
@@ -2366,7 +2284,7 @@ func (*SelfEncryptRequest_Request) ProtoMessage() {}
 
 func (x *SelfEncryptRequest_Request) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[40]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2403,11 +2321,9 @@ type SelfEncryptResponse_Response struct {
 
 func (x *SelfEncryptResponse_Response) Reset() {
 	*x = SelfEncryptResponse_Response{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[41]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[41]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SelfEncryptResponse_Response) String() string {
@@ -2418,7 +2334,7 @@ func (*SelfEncryptResponse_Response) ProtoMessage() {}
 
 func (x *SelfEncryptResponse_Response) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[41]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2481,11 +2397,9 @@ type SelfEncryptResponse_Response_Success struct {
 
 func (x *SelfEncryptResponse_Response_Success) Reset() {
 	*x = SelfEncryptResponse_Response_Success{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[42]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[42]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SelfEncryptResponse_Response_Success) String() string {
@@ -2496,7 +2410,7 @@ func (*SelfEncryptResponse_Response_Success) ProtoMessage() {}
 
 func (x *SelfEncryptResponse_Response_Success) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[42]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2529,11 +2443,9 @@ type SelfDecryptRequest_Request struct {
 
 func (x *SelfDecryptRequest_Request) Reset() {
 	*x = SelfDecryptRequest_Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[43]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[43]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SelfDecryptRequest_Request) String() string {
@@ -2544,7 +2456,7 @@ func (*SelfDecryptRequest_Request) ProtoMessage() {}
 
 func (x *SelfDecryptRequest_Request) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[43]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2579,11 +2491,9 @@ type SaveInvitesRequest_Request struct {
 
 func (x *SaveInvitesRequest_Request) Reset() {
 	*x = SaveInvitesRequest_Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[44]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[44]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SaveInvitesRequest_Request) String() string {
@@ -2594,7 +2504,7 @@ func (*SaveInvitesRequest_Request) ProtoMessage() {}
 
 func (x *SaveInvitesRequest_Request) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[44]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2645,11 +2555,9 @@ type SaveInvitesResponse_Response struct {
 
 func (x *SaveInvitesResponse_Response) Reset() {
 	*x = SaveInvitesResponse_Response{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[45]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[45]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SaveInvitesResponse_Response) String() string {
@@ -2660,7 +2568,7 @@ func (*SaveInvitesResponse_Response) ProtoMessage() {}
 
 func (x *SaveInvitesResponse_Response) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[45]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2723,11 +2631,9 @@ type SaveInvitesResponse_Response_Success struct {
 
 func (x *SaveInvitesResponse_Response_Success) Reset() {
 	*x = SaveInvitesResponse_Response_Success{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[46]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[46]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SaveInvitesResponse_Response_Success) String() string {
@@ -2738,7 +2644,7 @@ func (*SaveInvitesResponse_Response_Success) ProtoMessage() {}
 
 func (x *SaveInvitesResponse_Response_Success) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[46]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2773,11 +2679,9 @@ type TopicMap_TopicData struct {
 
 func (x *TopicMap_TopicData) Reset() {
 	*x = TopicMap_TopicData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[47]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[47]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *TopicMap_TopicData) String() string {
@@ -2788,7 +2692,7 @@ func (*TopicMap_TopicData) ProtoMessage() {}
 
 func (x *TopicMap_TopicData) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[47]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2836,11 +2740,9 @@ type GetConversationHmacKeysResponse_HmacKeyData struct {
 
 func (x *GetConversationHmacKeysResponse_HmacKeyData) Reset() {
 	*x = GetConversationHmacKeysResponse_HmacKeyData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[49]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[49]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetConversationHmacKeysResponse_HmacKeyData) String() string {
@@ -2851,7 +2753,7 @@ func (*GetConversationHmacKeysResponse_HmacKeyData) ProtoMessage() {}
 
 func (x *GetConversationHmacKeysResponse_HmacKeyData) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[49]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2891,11 +2793,9 @@ type GetConversationHmacKeysResponse_HmacKeys struct {
 
 func (x *GetConversationHmacKeysResponse_HmacKeys) Reset() {
 	*x = GetConversationHmacKeysResponse_HmacKeys{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_keystore_api_v1_keystore_proto_msgTypes[50]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_keystore_api_v1_keystore_proto_msgTypes[50]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetConversationHmacKeysResponse_HmacKeys) String() string {
@@ -2906,7 +2806,7 @@ func (*GetConversationHmacKeysResponse_HmacKeys) ProtoMessage() {}
 
 func (x *GetConversationHmacKeysResponse_HmacKeys) ProtoReflect() protoreflect.Message {
 	mi := &file_keystore_api_v1_keystore_proto_msgTypes[50]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3479,608 +3379,6 @@ func file_keystore_api_v1_keystore_proto_init() {
 	if File_keystore_api_v1_keystore_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[31].Exporter = func(v any, i int) any {
-			switch v := v.(*PrivatePreferencesActionMap); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[32].Exporter = func(v any, i int) any {
-			switch v := v.(*DecryptV1Request_Request); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[33].Exporter = func(v any, i int) any {
-			switch v := v.(*DecryptResponse_Response); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[34].Exporter = func(v any, i int) any {
-			switch v := v.(*DecryptResponse_Response_Success); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[35].Exporter = func(v any, i int) any {
-			switch v := v.(*DecryptV2Request_Request); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[36].Exporter = func(v any, i int) any {
-			switch v := v.(*EncryptV1Request_Request); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[37].Exporter = func(v any, i int) any {
-			switch v := v.(*EncryptResponse_Response); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[38].Exporter = func(v any, i int) any {
-			switch v := v.(*EncryptResponse_Response_Success); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[39].Exporter = func(v any, i int) any {
-			switch v := v.(*EncryptV2Request_Request); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[40].Exporter = func(v any, i int) any {
-			switch v := v.(*SelfEncryptRequest_Request); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[41].Exporter = func(v any, i int) any {
-			switch v := v.(*SelfEncryptResponse_Response); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[42].Exporter = func(v any, i int) any {
-			switch v := v.(*SelfEncryptResponse_Response_Success); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[43].Exporter = func(v any, i int) any {
-			switch v := v.(*SelfDecryptRequest_Request); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[44].Exporter = func(v any, i int) any {
-			switch v := v.(*SaveInvitesRequest_Request); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[45].Exporter = func(v any, i int) any {
-			switch v := v.(*SaveInvitesResponse_Response); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[46].Exporter = func(v any, i int) any {
-			switch v := v.(*SaveInvitesResponse_Response_Success); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[47].Exporter = func(v any, i int) any {
-			switch v := v.(*TopicMap_TopicData); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[49].Exporter = func(v any, i int) any {
-			switch v := v.(*GetConversationHmacKeysResponse_HmacKeyData); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_keystore_api_v1_keystore_proto_msgTypes[50].Exporter = func(v any, i int) any {
-			switch v := v.(*GetConversationHmacKeysResponse_HmacKeys); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_keystore_api_v1_keystore_proto_msgTypes[15].OneofWrappers = []any{}
 	file_keystore_api_v1_keystore_proto_msgTypes[21].OneofWrappers = []any{
 		(*InitKeystoreRequest_V1)(nil),
diff --git a/pkg/proto/message_api/v1/authn.pb.go b/pkg/proto/message_api/v1/authn.pb.go
index c3584167..015b4fb3 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_api/v1/authn.proto
 
@@ -40,11 +40,9 @@ type Token struct {
 
 func (x *Token) Reset() {
 	*x = Token{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_api_v1_authn_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_api_v1_authn_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Token) String() string {
@@ -55,7 +53,7 @@ func (*Token) ProtoMessage() {}
 
 func (x *Token) ProtoReflect() protoreflect.Message {
 	mi := &file_message_api_v1_authn_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -109,11 +107,9 @@ type AuthData struct {
 
 func (x *AuthData) Reset() {
 	*x = AuthData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_api_v1_authn_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_api_v1_authn_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *AuthData) String() string {
@@ -124,7 +120,7 @@ func (*AuthData) ProtoMessage() {}
 
 func (x *AuthData) ProtoReflect() protoreflect.Message {
 	mi := &file_message_api_v1_authn_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -231,32 +227,6 @@ func file_message_api_v1_authn_proto_init() {
 	if File_message_api_v1_authn_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/pkg/proto/message_api/v1/message_api.pb.go b/pkg/proto/message_api/v1/message_api.pb.go
index 11a0a628..7eb65927 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_api/v1/message_api.proto
 
@@ -88,11 +88,9 @@ type IndexCursor struct {
 
 func (x *IndexCursor) Reset() {
 	*x = IndexCursor{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_api_v1_message_api_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_api_v1_message_api_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *IndexCursor) String() string {
@@ -103,7 +101,7 @@ func (*IndexCursor) ProtoMessage() {}
 
 func (x *IndexCursor) ProtoReflect() protoreflect.Message {
 	mi := &file_message_api_v1_message_api_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -150,11 +148,9 @@ type Cursor struct {
 
 func (x *Cursor) Reset() {
 	*x = Cursor{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_api_v1_message_api_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_api_v1_message_api_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Cursor) String() string {
@@ -165,7 +161,7 @@ func (*Cursor) ProtoMessage() {}
 
 func (x *Cursor) ProtoReflect() protoreflect.Message {
 	mi := &file_message_api_v1_message_api_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -219,11 +215,9 @@ type PagingInfo struct {
 
 func (x *PagingInfo) Reset() {
 	*x = PagingInfo{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_api_v1_message_api_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_api_v1_message_api_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PagingInfo) String() string {
@@ -234,7 +228,7 @@ func (*PagingInfo) ProtoMessage() {}
 
 func (x *PagingInfo) ProtoReflect() protoreflect.Message {
 	mi := &file_message_api_v1_message_api_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -289,11 +283,9 @@ type Envelope struct {
 
 func (x *Envelope) Reset() {
 	*x = Envelope{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_api_v1_message_api_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_api_v1_message_api_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Envelope) String() string {
@@ -304,7 +296,7 @@ func (*Envelope) ProtoMessage() {}
 
 func (x *Envelope) ProtoReflect() protoreflect.Message {
 	mi := &file_message_api_v1_message_api_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -351,11 +343,9 @@ type PublishRequest struct {
 
 func (x *PublishRequest) Reset() {
 	*x = PublishRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_api_v1_message_api_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_api_v1_message_api_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PublishRequest) String() string {
@@ -366,7 +356,7 @@ func (*PublishRequest) ProtoMessage() {}
 
 func (x *PublishRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_message_api_v1_message_api_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -397,11 +387,9 @@ type PublishResponse struct {
 
 func (x *PublishResponse) Reset() {
 	*x = PublishResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_api_v1_message_api_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_api_v1_message_api_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PublishResponse) String() string {
@@ -412,7 +400,7 @@ func (*PublishResponse) ProtoMessage() {}
 
 func (x *PublishResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_message_api_v1_message_api_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -438,11 +426,9 @@ type SubscribeRequest struct {
 
 func (x *SubscribeRequest) Reset() {
 	*x = SubscribeRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_api_v1_message_api_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_api_v1_message_api_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SubscribeRequest) String() string {
@@ -453,7 +439,7 @@ func (*SubscribeRequest) ProtoMessage() {}
 
 func (x *SubscribeRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_message_api_v1_message_api_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -484,11 +470,9 @@ type SubscribeAllRequest struct {
 
 func (x *SubscribeAllRequest) Reset() {
 	*x = SubscribeAllRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_api_v1_message_api_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_api_v1_message_api_proto_msgTypes[7]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SubscribeAllRequest) String() string {
@@ -499,7 +483,7 @@ func (*SubscribeAllRequest) ProtoMessage() {}
 
 func (x *SubscribeAllRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_message_api_v1_message_api_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -528,11 +512,9 @@ type QueryRequest struct {
 
 func (x *QueryRequest) Reset() {
 	*x = QueryRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_api_v1_message_api_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_api_v1_message_api_proto_msgTypes[8]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *QueryRequest) String() string {
@@ -543,7 +525,7 @@ func (*QueryRequest) ProtoMessage() {}
 
 func (x *QueryRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_message_api_v1_message_api_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -598,11 +580,9 @@ type QueryResponse struct {
 
 func (x *QueryResponse) Reset() {
 	*x = QueryResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_api_v1_message_api_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_api_v1_message_api_proto_msgTypes[9]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *QueryResponse) String() string {
@@ -613,7 +593,7 @@ func (*QueryResponse) ProtoMessage() {}
 
 func (x *QueryResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_message_api_v1_message_api_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -653,11 +633,9 @@ type BatchQueryRequest struct {
 
 func (x *BatchQueryRequest) Reset() {
 	*x = BatchQueryRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_api_v1_message_api_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_api_v1_message_api_proto_msgTypes[10]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *BatchQueryRequest) String() string {
@@ -668,7 +646,7 @@ func (*BatchQueryRequest) ProtoMessage() {}
 
 func (x *BatchQueryRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_message_api_v1_message_api_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -701,11 +679,9 @@ type BatchQueryResponse struct {
 
 func (x *BatchQueryResponse) Reset() {
 	*x = BatchQueryResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_api_v1_message_api_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_api_v1_message_api_proto_msgTypes[11]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *BatchQueryResponse) String() string {
@@ -716,7 +692,7 @@ func (*BatchQueryResponse) ProtoMessage() {}
 
 func (x *BatchQueryResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_message_api_v1_message_api_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -951,152 +927,6 @@ func file_message_api_v1_message_api_proto_init() {
 	if File_message_api_v1_message_api_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_message_api_v1_message_api_proto_msgTypes[1].OneofWrappers = []any{
 		(*Cursor_Index)(nil),
 	}
diff --git a/pkg/proto/message_contents/ciphertext.pb.go b/pkg/proto/message_contents/ciphertext.pb.go
index b8fa21a6..061d3396 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_contents/ciphertext.proto
 
@@ -39,11 +39,9 @@ type Ciphertext struct {
 
 func (x *Ciphertext) Reset() {
 	*x = Ciphertext{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_ciphertext_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_ciphertext_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Ciphertext) String() string {
@@ -54,7 +52,7 @@ func (*Ciphertext) ProtoMessage() {}
 
 func (x *Ciphertext) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_ciphertext_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -107,11 +105,9 @@ type SignedEciesCiphertext struct {
 
 func (x *SignedEciesCiphertext) Reset() {
 	*x = SignedEciesCiphertext{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_ciphertext_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_ciphertext_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SignedEciesCiphertext) String() string {
@@ -122,7 +118,7 @@ func (*SignedEciesCiphertext) ProtoMessage() {}
 
 func (x *SignedEciesCiphertext) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_ciphertext_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -165,11 +161,9 @@ type Ciphertext_Aes256GcmHkdfsha256 struct {
 
 func (x *Ciphertext_Aes256GcmHkdfsha256) Reset() {
 	*x = Ciphertext_Aes256GcmHkdfsha256{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_ciphertext_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_ciphertext_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Ciphertext_Aes256GcmHkdfsha256) String() string {
@@ -180,7 +174,7 @@ func (*Ciphertext_Aes256GcmHkdfsha256) ProtoMessage() {}
 
 func (x *Ciphertext_Aes256GcmHkdfsha256) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_ciphertext_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -230,11 +224,9 @@ type SignedEciesCiphertext_Ecies struct {
 
 func (x *SignedEciesCiphertext_Ecies) Reset() {
 	*x = SignedEciesCiphertext_Ecies{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_ciphertext_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_ciphertext_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SignedEciesCiphertext_Ecies) String() string {
@@ -245,7 +237,7 @@ func (*SignedEciesCiphertext_Ecies) ProtoMessage() {}
 
 func (x *SignedEciesCiphertext_Ecies) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_ciphertext_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -380,56 +372,6 @@ func file_message_contents_ciphertext_proto_init() {
 		return
 	}
 	file_message_contents_signature_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_message_contents_ciphertext_proto_msgTypes[0].Exporter = func(v any, i int) any {
-			switch v := v.(*Ciphertext); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_message_contents_ciphertext_proto_msgTypes[1].Exporter = func(v any, i int) any {
-			switch v := v.(*SignedEciesCiphertext); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_message_contents_ciphertext_proto_msgTypes[0].OneofWrappers = []any{
 		(*Ciphertext_Aes256GcmHkdfSha256)(nil),
 	}
diff --git a/pkg/proto/message_contents/composite.pb.go b/pkg/proto/message_contents/composite.pb.go
index 25c74d6a..ad77d364 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_contents/composite.proto
 
@@ -33,11 +33,9 @@ type Composite struct {
 
 func (x *Composite) Reset() {
 	*x = Composite{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_composite_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_composite_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Composite) String() string {
@@ -48,7 +46,7 @@ func (*Composite) ProtoMessage() {}
 
 func (x *Composite) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_composite_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -85,11 +83,9 @@ type Composite_Part struct {
 
 func (x *Composite_Part) Reset() {
 	*x = Composite_Part{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_composite_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_composite_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Composite_Part) String() string {
@@ -100,7 +96,7 @@ func (*Composite_Part) ProtoMessage() {}
 
 func (x *Composite_Part) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_composite_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -226,32 +222,6 @@ func file_message_contents_composite_proto_init() {
 		return
 	}
 	file_message_contents_content_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_message_contents_composite_proto_msgTypes[0].Exporter = func(v any, i int) any {
-			switch v := v.(*Composite); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	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 f7097872..66d6b2ec 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_contents/contact.proto
 
@@ -38,11 +38,9 @@ type ContactBundleV1 struct {
 
 func (x *ContactBundleV1) Reset() {
 	*x = ContactBundleV1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_contact_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_contact_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ContactBundleV1) String() string {
@@ -53,7 +51,7 @@ func (*ContactBundleV1) ProtoMessage() {}
 
 func (x *ContactBundleV1) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_contact_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -86,11 +84,9 @@ type ContactBundleV2 struct {
 
 func (x *ContactBundleV2) Reset() {
 	*x = ContactBundleV2{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_contact_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_contact_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ContactBundleV2) String() string {
@@ -101,7 +97,7 @@ func (*ContactBundleV2) ProtoMessage() {}
 
 func (x *ContactBundleV2) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_contact_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -138,11 +134,9 @@ type ContactBundle struct {
 
 func (x *ContactBundle) Reset() {
 	*x = ContactBundle{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_contact_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_contact_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ContactBundle) String() string {
@@ -153,7 +147,7 @@ func (*ContactBundle) ProtoMessage() {}
 
 func (x *ContactBundle) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_contact_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -289,44 +283,6 @@ func file_message_contents_contact_proto_init() {
 		return
 	}
 	file_message_contents_public_key_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_message_contents_contact_proto_msgTypes[0].Exporter = func(v any, i int) any {
-			switch v := v.(*ContactBundleV1); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_message_contents_contact_proto_msgTypes[1].Exporter = func(v any, i int) any {
-			switch v := v.(*ContactBundleV2); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_message_contents_contact_proto_msgTypes[2].Exporter = func(v any, i int) any {
-			switch v := v.(*ContactBundle); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	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 2bd5effc..0ef5b8b0 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_contents/content.proto
 
@@ -84,11 +84,9 @@ type ContentTypeId struct {
 
 func (x *ContentTypeId) Reset() {
 	*x = ContentTypeId{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_content_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_content_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ContentTypeId) String() string {
@@ -99,7 +97,7 @@ func (*ContentTypeId) ProtoMessage() {}
 
 func (x *ContentTypeId) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_content_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -166,11 +164,9 @@ type EncodedContent struct {
 
 func (x *EncodedContent) Reset() {
 	*x = EncodedContent{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_content_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_content_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EncodedContent) String() string {
@@ -181,7 +177,7 @@ func (*EncodedContent) ProtoMessage() {}
 
 func (x *EncodedContent) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_content_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -248,11 +244,9 @@ type SignedContent struct {
 
 func (x *SignedContent) Reset() {
 	*x = SignedContent{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_content_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_content_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SignedContent) String() string {
@@ -263,7 +257,7 @@ func (*SignedContent) ProtoMessage() {}
 
 func (x *SignedContent) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_content_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -418,44 +412,6 @@ 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 any, i int) any {
-			switch v := v.(*ContentTypeId); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_message_contents_content_proto_msgTypes[1].Exporter = func(v any, i int) any {
-			switch v := v.(*EncodedContent); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_message_contents_content_proto_msgTypes[2].Exporter = func(v any, i int) any {
-			switch v := v.(*SignedContent); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_message_contents_content_proto_msgTypes[1].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
diff --git a/pkg/proto/message_contents/conversation_reference.pb.go b/pkg/proto/message_contents/conversation_reference.pb.go
index 020d4203..2ce65cfd 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_contents/conversation_reference.proto
 
@@ -37,11 +37,9 @@ type ConversationReference struct {
 
 func (x *ConversationReference) Reset() {
 	*x = ConversationReference{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_conversation_reference_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_conversation_reference_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ConversationReference) String() string {
@@ -52,7 +50,7 @@ func (*ConversationReference) ProtoMessage() {}
 
 func (x *ConversationReference) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_conversation_reference_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -180,20 +178,6 @@ func file_message_contents_conversation_reference_proto_init() {
 		return
 	}
 	file_message_contents_invitation_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/pkg/proto/message_contents/ecies.pb.go b/pkg/proto/message_contents/ecies.pb.go
index ce692960..031a5ab6 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_contents/ecies.proto
 
@@ -36,11 +36,9 @@ type EciesMessage struct {
 
 func (x *EciesMessage) Reset() {
 	*x = EciesMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_ecies_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_ecies_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EciesMessage) String() string {
@@ -51,7 +49,7 @@ func (*EciesMessage) ProtoMessage() {}
 
 func (x *EciesMessage) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_ecies_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -145,20 +143,6 @@ func file_message_contents_ecies_proto_init() {
 	if File_message_contents_ecies_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		file_message_contents_ecies_proto_msgTypes[0].Exporter = func(v any, i int) any {
-			switch v := v.(*EciesMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_message_contents_ecies_proto_msgTypes[0].OneofWrappers = []any{
 		(*EciesMessage_V1)(nil),
 	}
diff --git a/pkg/proto/message_contents/frames.pb.go b/pkg/proto/message_contents/frames.pb.go
index 4e2e6bed..cd3e532e 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_contents/frames.proto
 
@@ -55,11 +55,9 @@ type FrameActionBody struct {
 
 func (x *FrameActionBody) Reset() {
 	*x = FrameActionBody{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_frames_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_frames_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *FrameActionBody) String() string {
@@ -70,7 +68,7 @@ func (*FrameActionBody) ProtoMessage() {}
 
 func (x *FrameActionBody) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_frames_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -167,11 +165,9 @@ type FrameAction struct {
 
 func (x *FrameAction) Reset() {
 	*x = FrameAction{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_frames_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_frames_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *FrameAction) String() string {
@@ -182,7 +178,7 @@ func (*FrameAction) ProtoMessage() {}
 
 func (x *FrameAction) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_frames_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -316,32 +312,6 @@ 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 any, i int) any {
-			switch v := v.(*FrameActionBody); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_message_contents_frames_proto_msgTypes[1].Exporter = func(v any, i int) any {
-			switch v := v.(*FrameAction); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/pkg/proto/message_contents/invitation.pb.go b/pkg/proto/message_contents/invitation.pb.go
index 979a3371..0350cd72 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_contents/invitation.proto
 
@@ -95,11 +95,9 @@ type InvitationV1 struct {
 
 func (x *InvitationV1) Reset() {
 	*x = InvitationV1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_invitation_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_invitation_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *InvitationV1) String() string {
@@ -110,7 +108,7 @@ func (*InvitationV1) ProtoMessage() {}
 
 func (x *InvitationV1) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_invitation_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -187,11 +185,9 @@ type SealedInvitationHeaderV1 struct {
 
 func (x *SealedInvitationHeaderV1) Reset() {
 	*x = SealedInvitationHeaderV1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_invitation_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_invitation_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SealedInvitationHeaderV1) String() string {
@@ -202,7 +198,7 @@ func (*SealedInvitationHeaderV1) ProtoMessage() {}
 
 func (x *SealedInvitationHeaderV1) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_invitation_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -255,11 +251,9 @@ type SealedInvitationV1 struct {
 
 func (x *SealedInvitationV1) Reset() {
 	*x = SealedInvitationV1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_invitation_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_invitation_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SealedInvitationV1) String() string {
@@ -270,7 +264,7 @@ func (*SealedInvitationV1) ProtoMessage() {}
 
 func (x *SealedInvitationV1) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_invitation_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -313,11 +307,9 @@ type SealedInvitation struct {
 
 func (x *SealedInvitation) Reset() {
 	*x = SealedInvitation{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_invitation_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_invitation_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SealedInvitation) String() string {
@@ -328,7 +320,7 @@ func (*SealedInvitation) ProtoMessage() {}
 
 func (x *SealedInvitation) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_invitation_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -384,11 +376,9 @@ type ConsentProofPayload struct {
 
 func (x *ConsentProofPayload) Reset() {
 	*x = ConsentProofPayload{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_invitation_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_invitation_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ConsentProofPayload) String() string {
@@ -399,7 +389,7 @@ func (*ConsentProofPayload) ProtoMessage() {}
 
 func (x *ConsentProofPayload) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_invitation_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -447,11 +437,9 @@ type InvitationV1_Aes256GcmHkdfsha256 struct {
 
 func (x *InvitationV1_Aes256GcmHkdfsha256) Reset() {
 	*x = InvitationV1_Aes256GcmHkdfsha256{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_invitation_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_invitation_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *InvitationV1_Aes256GcmHkdfsha256) String() string {
@@ -462,7 +450,7 @@ func (*InvitationV1_Aes256GcmHkdfsha256) ProtoMessage() {}
 
 func (x *InvitationV1_Aes256GcmHkdfsha256) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_invitation_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -499,11 +487,9 @@ type InvitationV1_Context struct {
 
 func (x *InvitationV1_Context) Reset() {
 	*x = InvitationV1_Context{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_invitation_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_invitation_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *InvitationV1_Context) String() string {
@@ -514,7 +500,7 @@ func (*InvitationV1_Context) ProtoMessage() {}
 
 func (x *InvitationV1_Context) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_invitation_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -702,92 +688,6 @@ 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 any, i int) any {
-			switch v := v.(*InvitationV1); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_message_contents_invitation_proto_msgTypes[1].Exporter = func(v any, i int) any {
-			switch v := v.(*SealedInvitationHeaderV1); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_message_contents_invitation_proto_msgTypes[2].Exporter = func(v any, i int) any {
-			switch v := v.(*SealedInvitationV1); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_message_contents_invitation_proto_msgTypes[3].Exporter = func(v any, i int) any {
-			switch v := v.(*SealedInvitation); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_message_contents_invitation_proto_msgTypes[4].Exporter = func(v any, i int) any {
-			switch v := v.(*ConsentProofPayload); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_message_contents_invitation_proto_msgTypes[0].OneofWrappers = []any{
 		(*InvitationV1_Aes256GcmHkdfSha256)(nil),
 	}
diff --git a/pkg/proto/message_contents/message.pb.go b/pkg/proto/message_contents/message.pb.go
index b0ac159a..c913f9b9 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_contents/message.proto
 
@@ -36,11 +36,9 @@ type MessageHeaderV1 struct {
 
 func (x *MessageHeaderV1) Reset() {
 	*x = MessageHeaderV1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_message_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_message_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MessageHeaderV1) String() string {
@@ -51,7 +49,7 @@ func (*MessageHeaderV1) ProtoMessage() {}
 
 func (x *MessageHeaderV1) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_message_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -101,11 +99,9 @@ type MessageV1 struct {
 
 func (x *MessageV1) Reset() {
 	*x = MessageV1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_message_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_message_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MessageV1) String() string {
@@ -116,7 +112,7 @@ func (*MessageV1) ProtoMessage() {}
 
 func (x *MessageV1) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_message_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -162,11 +158,9 @@ type MessageHeaderV2 struct {
 
 func (x *MessageHeaderV2) Reset() {
 	*x = MessageHeaderV2{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_message_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_message_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MessageHeaderV2) String() string {
@@ -177,7 +171,7 @@ func (*MessageHeaderV2) ProtoMessage() {}
 
 func (x *MessageHeaderV2) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_message_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -226,11 +220,9 @@ type MessageV2 struct {
 
 func (x *MessageV2) Reset() {
 	*x = MessageV2{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_message_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_message_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MessageV2) String() string {
@@ -241,7 +233,7 @@ func (*MessageV2) ProtoMessage() {}
 
 func (x *MessageV2) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_message_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -299,11 +291,9 @@ type Message struct {
 
 func (x *Message) Reset() {
 	*x = Message{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_message_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_message_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Message) String() string {
@@ -314,7 +304,7 @@ func (*Message) ProtoMessage() {}
 
 func (x *Message) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_message_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -386,11 +376,9 @@ type DecodedMessage struct {
 
 func (x *DecodedMessage) Reset() {
 	*x = DecodedMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_message_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_message_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *DecodedMessage) String() string {
@@ -401,7 +389,7 @@ func (*DecodedMessage) ProtoMessage() {}
 
 func (x *DecodedMessage) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_message_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -617,80 +605,6 @@ func file_message_contents_message_proto_init() {
 	file_message_contents_ciphertext_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 any, i int) any {
-			switch v := v.(*MessageHeaderV1); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_message_contents_message_proto_msgTypes[1].Exporter = func(v any, i int) any {
-			switch v := v.(*MessageV1); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_message_contents_message_proto_msgTypes[2].Exporter = func(v any, i int) any {
-			switch v := v.(*MessageHeaderV2); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_message_contents_message_proto_msgTypes[3].Exporter = func(v any, i int) any {
-			switch v := v.(*MessageV2); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_message_contents_message_proto_msgTypes[4].Exporter = func(v any, i int) any {
-			switch v := v.(*Message); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_message_contents_message_proto_msgTypes[5].Exporter = func(v any, i int) any {
-			switch v := v.(*DecodedMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_message_contents_message_proto_msgTypes[3].OneofWrappers = []any{}
 	file_message_contents_message_proto_msgTypes[4].OneofWrappers = []any{
 		(*Message_V1)(nil),
diff --git a/pkg/proto/message_contents/private_key.pb.go b/pkg/proto/message_contents/private_key.pb.go
index 0607e9ae..716b4107 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_contents/private_key.proto
 
@@ -45,11 +45,9 @@ type SignedPrivateKey struct {
 
 func (x *SignedPrivateKey) Reset() {
 	*x = SignedPrivateKey{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_key_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_key_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SignedPrivateKey) String() string {
@@ -60,7 +58,7 @@ func (*SignedPrivateKey) ProtoMessage() {}
 
 func (x *SignedPrivateKey) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_key_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -127,11 +125,9 @@ type PrivateKeyBundleV2 struct {
 
 func (x *PrivateKeyBundleV2) Reset() {
 	*x = PrivateKeyBundleV2{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_key_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_key_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PrivateKeyBundleV2) String() string {
@@ -142,7 +138,7 @@ func (*PrivateKeyBundleV2) ProtoMessage() {}
 
 func (x *PrivateKeyBundleV2) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_key_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -191,11 +187,9 @@ type PrivateKey struct {
 
 func (x *PrivateKey) Reset() {
 	*x = PrivateKey{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_key_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_key_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PrivateKey) String() string {
@@ -206,7 +200,7 @@ func (*PrivateKey) ProtoMessage() {}
 
 func (x *PrivateKey) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_key_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -272,11 +266,9 @@ type PrivateKeyBundleV1 struct {
 
 func (x *PrivateKeyBundleV1) Reset() {
 	*x = PrivateKeyBundleV1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_key_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_key_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PrivateKeyBundleV1) String() string {
@@ -287,7 +279,7 @@ func (*PrivateKeyBundleV1) ProtoMessage() {}
 
 func (x *PrivateKeyBundleV1) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_key_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -331,11 +323,9 @@ type PrivateKeyBundle struct {
 
 func (x *PrivateKeyBundle) Reset() {
 	*x = PrivateKeyBundle{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_key_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_key_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PrivateKeyBundle) String() string {
@@ -346,7 +336,7 @@ func (*PrivateKeyBundle) ProtoMessage() {}
 
 func (x *PrivateKeyBundle) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_key_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -416,11 +406,9 @@ type EncryptedPrivateKeyBundleV1 struct {
 
 func (x *EncryptedPrivateKeyBundleV1) Reset() {
 	*x = EncryptedPrivateKeyBundleV1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_key_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_key_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EncryptedPrivateKeyBundleV1) String() string {
@@ -431,7 +419,7 @@ func (*EncryptedPrivateKeyBundleV1) ProtoMessage() {}
 
 func (x *EncryptedPrivateKeyBundleV1) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_key_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -474,11 +462,9 @@ type EncryptedPrivateKeyBundle struct {
 
 func (x *EncryptedPrivateKeyBundle) Reset() {
 	*x = EncryptedPrivateKeyBundle{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_key_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_key_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EncryptedPrivateKeyBundle) String() string {
@@ -489,7 +475,7 @@ func (*EncryptedPrivateKeyBundle) ProtoMessage() {}
 
 func (x *EncryptedPrivateKeyBundle) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_key_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -539,11 +525,9 @@ type SignedPrivateKey_Secp256K1 struct {
 
 func (x *SignedPrivateKey_Secp256K1) Reset() {
 	*x = SignedPrivateKey_Secp256K1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_key_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_key_proto_msgTypes[7]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SignedPrivateKey_Secp256K1) String() string {
@@ -554,7 +538,7 @@ func (*SignedPrivateKey_Secp256K1) ProtoMessage() {}
 
 func (x *SignedPrivateKey_Secp256K1) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_key_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -587,11 +571,9 @@ type PrivateKey_Secp256K1 struct {
 
 func (x *PrivateKey_Secp256K1) Reset() {
 	*x = PrivateKey_Secp256K1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_key_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_key_proto_msgTypes[8]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PrivateKey_Secp256K1) String() string {
@@ -602,7 +584,7 @@ func (*PrivateKey_Secp256K1) ProtoMessage() {}
 
 func (x *PrivateKey_Secp256K1) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_key_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -781,116 +763,6 @@ 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 any, i int) any {
-			switch v := v.(*SignedPrivateKey); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_message_contents_private_key_proto_msgTypes[0].OneofWrappers = []any{
 		(*SignedPrivateKey_Secp256K1_)(nil),
 	}
diff --git a/pkg/proto/message_contents/private_preferences.pb.go b/pkg/proto/message_contents/private_preferences.pb.go
index 800e9138..d348e1dc 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_contents/private_preferences.proto
 
@@ -45,11 +45,9 @@ type PrivatePreferencesAction struct {
 
 func (x *PrivatePreferencesAction) Reset() {
 	*x = PrivatePreferencesAction{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_preferences_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_preferences_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PrivatePreferencesAction) String() string {
@@ -60,7 +58,7 @@ func (*PrivatePreferencesAction) ProtoMessage() {}
 
 func (x *PrivatePreferencesAction) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_preferences_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -178,11 +176,9 @@ type PrivatePreferencesPayload struct {
 
 func (x *PrivatePreferencesPayload) Reset() {
 	*x = PrivatePreferencesPayload{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_preferences_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_preferences_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PrivatePreferencesPayload) String() string {
@@ -193,7 +189,7 @@ func (*PrivatePreferencesPayload) ProtoMessage() {}
 
 func (x *PrivatePreferencesPayload) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_preferences_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -244,11 +240,9 @@ type PrivatePreferencesAction_AllowAddress struct {
 
 func (x *PrivatePreferencesAction_AllowAddress) Reset() {
 	*x = PrivatePreferencesAction_AllowAddress{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_preferences_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_preferences_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PrivatePreferencesAction_AllowAddress) String() string {
@@ -259,7 +253,7 @@ func (*PrivatePreferencesAction_AllowAddress) ProtoMessage() {}
 
 func (x *PrivatePreferencesAction_AllowAddress) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_preferences_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -293,11 +287,9 @@ type PrivatePreferencesAction_DenyAddress struct {
 
 func (x *PrivatePreferencesAction_DenyAddress) Reset() {
 	*x = PrivatePreferencesAction_DenyAddress{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_preferences_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_preferences_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PrivatePreferencesAction_DenyAddress) String() string {
@@ -308,7 +300,7 @@ func (*PrivatePreferencesAction_DenyAddress) ProtoMessage() {}
 
 func (x *PrivatePreferencesAction_DenyAddress) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_preferences_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -342,11 +334,9 @@ type PrivatePreferencesAction_AllowInboxId struct {
 
 func (x *PrivatePreferencesAction_AllowInboxId) Reset() {
 	*x = PrivatePreferencesAction_AllowInboxId{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_preferences_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_preferences_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PrivatePreferencesAction_AllowInboxId) String() string {
@@ -357,7 +347,7 @@ func (*PrivatePreferencesAction_AllowInboxId) ProtoMessage() {}
 
 func (x *PrivatePreferencesAction_AllowInboxId) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_preferences_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -391,11 +381,9 @@ type PrivatePreferencesAction_DenyInboxId struct {
 
 func (x *PrivatePreferencesAction_DenyInboxId) Reset() {
 	*x = PrivatePreferencesAction_DenyInboxId{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_preferences_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_preferences_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PrivatePreferencesAction_DenyInboxId) String() string {
@@ -406,7 +394,7 @@ func (*PrivatePreferencesAction_DenyInboxId) ProtoMessage() {}
 
 func (x *PrivatePreferencesAction_DenyInboxId) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_preferences_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -440,11 +428,9 @@ type PrivatePreferencesAction_AllowGroup struct {
 
 func (x *PrivatePreferencesAction_AllowGroup) Reset() {
 	*x = PrivatePreferencesAction_AllowGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_preferences_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_preferences_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PrivatePreferencesAction_AllowGroup) String() string {
@@ -455,7 +441,7 @@ func (*PrivatePreferencesAction_AllowGroup) ProtoMessage() {}
 
 func (x *PrivatePreferencesAction_AllowGroup) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_preferences_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -489,11 +475,9 @@ type PrivatePreferencesAction_DenyGroup struct {
 
 func (x *PrivatePreferencesAction_DenyGroup) Reset() {
 	*x = PrivatePreferencesAction_DenyGroup{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_private_preferences_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_private_preferences_proto_msgTypes[7]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PrivatePreferencesAction_DenyGroup) String() string {
@@ -504,7 +488,7 @@ func (*PrivatePreferencesAction_DenyGroup) ProtoMessage() {}
 
 func (x *PrivatePreferencesAction_DenyGroup) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_private_preferences_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -661,104 +645,6 @@ func file_message_contents_private_preferences_proto_init() {
 		return
 	}
 	file_message_contents_ciphertext_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_message_contents_private_preferences_proto_msgTypes[0].OneofWrappers = []any{
 		(*PrivatePreferencesAction_AllowAddress_)(nil),
 		(*PrivatePreferencesAction_DenyAddress_)(nil),
diff --git a/pkg/proto/message_contents/public_key.pb.go b/pkg/proto/message_contents/public_key.pb.go
index 644eafdf..9fd2cd9e 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_contents/public_key.proto
 
@@ -39,11 +39,9 @@ type UnsignedPublicKey struct {
 
 func (x *UnsignedPublicKey) Reset() {
 	*x = UnsignedPublicKey{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_public_key_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_public_key_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UnsignedPublicKey) String() string {
@@ -54,7 +52,7 @@ func (*UnsignedPublicKey) ProtoMessage() {}
 
 func (x *UnsignedPublicKey) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_public_key_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -112,11 +110,9 @@ type SignedPublicKey struct {
 
 func (x *SignedPublicKey) Reset() {
 	*x = SignedPublicKey{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_public_key_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_public_key_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SignedPublicKey) String() string {
@@ -127,7 +123,7 @@ func (*SignedPublicKey) ProtoMessage() {}
 
 func (x *SignedPublicKey) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_public_key_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -170,11 +166,9 @@ type SignedPublicKeyBundle struct {
 
 func (x *SignedPublicKeyBundle) Reset() {
 	*x = SignedPublicKeyBundle{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_public_key_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_public_key_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SignedPublicKeyBundle) String() string {
@@ -185,7 +179,7 @@ func (*SignedPublicKeyBundle) ProtoMessage() {}
 
 func (x *SignedPublicKeyBundle) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_public_key_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -231,11 +225,9 @@ type PublicKey struct {
 
 func (x *PublicKey) Reset() {
 	*x = PublicKey{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_public_key_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_public_key_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PublicKey) String() string {
@@ -246,7 +238,7 @@ func (*PublicKey) ProtoMessage() {}
 
 func (x *PublicKey) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_public_key_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -314,11 +306,9 @@ type PublicKeyBundle struct {
 
 func (x *PublicKeyBundle) Reset() {
 	*x = PublicKeyBundle{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_public_key_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_public_key_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PublicKeyBundle) String() string {
@@ -329,7 +319,7 @@ func (*PublicKeyBundle) ProtoMessage() {}
 
 func (x *PublicKeyBundle) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_public_key_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -370,11 +360,9 @@ type UnsignedPublicKey_Secp256K1Uncompressed struct {
 
 func (x *UnsignedPublicKey_Secp256K1Uncompressed) Reset() {
 	*x = UnsignedPublicKey_Secp256K1Uncompressed{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_public_key_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_public_key_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UnsignedPublicKey_Secp256K1Uncompressed) String() string {
@@ -385,7 +373,7 @@ func (*UnsignedPublicKey_Secp256K1Uncompressed) ProtoMessage() {}
 
 func (x *UnsignedPublicKey_Secp256K1Uncompressed) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_public_key_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -419,11 +407,9 @@ type PublicKey_Secp256K1Uncompressed struct {
 
 func (x *PublicKey_Secp256K1Uncompressed) Reset() {
 	*x = PublicKey_Secp256K1Uncompressed{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_public_key_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_public_key_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PublicKey_Secp256K1Uncompressed) String() string {
@@ -434,7 +420,7 @@ func (*PublicKey_Secp256K1Uncompressed) ProtoMessage() {}
 
 func (x *PublicKey_Secp256K1Uncompressed) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_public_key_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -586,92 +572,6 @@ func file_message_contents_public_key_proto_init() {
 		return
 	}
 	file_message_contents_signature_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_message_contents_public_key_proto_msgTypes[0].OneofWrappers = []any{
 		(*UnsignedPublicKey_Secp256K1Uncompressed_)(nil),
 	}
diff --git a/pkg/proto/message_contents/signature.pb.go b/pkg/proto/message_contents/signature.pb.go
index 331a86ed..c60a7602 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_contents/signature.proto
 
@@ -38,11 +38,9 @@ type Signature struct {
 
 func (x *Signature) Reset() {
 	*x = Signature{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_signature_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_signature_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Signature) String() string {
@@ -53,7 +51,7 @@ func (*Signature) ProtoMessage() {}
 
 func (x *Signature) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_signature_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -117,11 +115,9 @@ type Signature_ECDSACompact struct {
 
 func (x *Signature_ECDSACompact) Reset() {
 	*x = Signature_ECDSACompact{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_signature_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_signature_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Signature_ECDSACompact) String() string {
@@ -132,7 +128,7 @@ func (*Signature_ECDSACompact) ProtoMessage() {}
 
 func (x *Signature_ECDSACompact) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_signature_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -176,11 +172,9 @@ type Signature_WalletECDSACompact struct {
 
 func (x *Signature_WalletECDSACompact) Reset() {
 	*x = Signature_WalletECDSACompact{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_signature_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_signature_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Signature_WalletECDSACompact) String() string {
@@ -191,7 +185,7 @@ func (*Signature_WalletECDSACompact) ProtoMessage() {}
 
 func (x *Signature_WalletECDSACompact) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_signature_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -298,44 +292,6 @@ func file_message_contents_signature_proto_init() {
 	if File_message_contents_signature_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		file_message_contents_signature_proto_msgTypes[0].Exporter = func(v any, i int) any {
-			switch v := v.(*Signature); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	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 6b6bc702..c2981f36 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: message_contents/signed_payload.proto
 
@@ -34,11 +34,9 @@ type SignedPayload struct {
 
 func (x *SignedPayload) Reset() {
 	*x = SignedPayload{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_message_contents_signed_payload_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_message_contents_signed_payload_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SignedPayload) String() string {
@@ -49,7 +47,7 @@ func (*SignedPayload) ProtoMessage() {}
 
 func (x *SignedPayload) ProtoReflect() protoreflect.Message {
 	mi := &file_message_contents_signed_payload_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -142,20 +140,6 @@ func file_message_contents_signed_payload_proto_init() {
 		return
 	}
 	file_message_contents_signature_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/pkg/proto/mls/api/v1/mls.pb.go b/pkg/proto/mls/api/v1/mls.pb.go
index 92cb491b..1a96d3ff 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: mls/api/v1/mls.proto
 
@@ -90,11 +90,9 @@ type WelcomeMessage struct {
 
 func (x *WelcomeMessage) Reset() {
 	*x = WelcomeMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *WelcomeMessage) String() string {
@@ -105,7 +103,7 @@ func (*WelcomeMessage) ProtoMessage() {}
 
 func (x *WelcomeMessage) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -158,11 +156,9 @@ type WelcomeMessageInput struct {
 
 func (x *WelcomeMessageInput) Reset() {
 	*x = WelcomeMessageInput{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *WelcomeMessageInput) String() string {
@@ -173,7 +169,7 @@ func (*WelcomeMessageInput) ProtoMessage() {}
 
 func (x *WelcomeMessageInput) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -226,11 +222,9 @@ type GroupMessage struct {
 
 func (x *GroupMessage) Reset() {
 	*x = GroupMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GroupMessage) String() string {
@@ -241,7 +235,7 @@ func (*GroupMessage) ProtoMessage() {}
 
 func (x *GroupMessage) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -294,11 +288,9 @@ type GroupMessageInput struct {
 
 func (x *GroupMessageInput) Reset() {
 	*x = GroupMessageInput{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GroupMessageInput) String() string {
@@ -309,7 +301,7 @@ func (*GroupMessageInput) ProtoMessage() {}
 
 func (x *GroupMessageInput) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -359,11 +351,9 @@ type SendGroupMessagesRequest struct {
 
 func (x *SendGroupMessagesRequest) Reset() {
 	*x = SendGroupMessagesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SendGroupMessagesRequest) String() string {
@@ -374,7 +364,7 @@ func (*SendGroupMessagesRequest) ProtoMessage() {}
 
 func (x *SendGroupMessagesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -407,11 +397,9 @@ type SendWelcomeMessagesRequest struct {
 
 func (x *SendWelcomeMessagesRequest) Reset() {
 	*x = SendWelcomeMessagesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SendWelcomeMessagesRequest) String() string {
@@ -422,7 +410,7 @@ func (*SendWelcomeMessagesRequest) ProtoMessage() {}
 
 func (x *SendWelcomeMessagesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -457,11 +445,9 @@ type KeyPackageUpload struct {
 
 func (x *KeyPackageUpload) Reset() {
 	*x = KeyPackageUpload{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *KeyPackageUpload) String() string {
@@ -472,7 +458,7 @@ func (*KeyPackageUpload) ProtoMessage() {}
 
 func (x *KeyPackageUpload) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -507,11 +493,9 @@ type RegisterInstallationRequest struct {
 
 func (x *RegisterInstallationRequest) Reset() {
 	*x = RegisterInstallationRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[7]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *RegisterInstallationRequest) String() string {
@@ -522,7 +506,7 @@ func (*RegisterInstallationRequest) ProtoMessage() {}
 
 func (x *RegisterInstallationRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -562,11 +546,9 @@ type RegisterInstallationResponse struct {
 
 func (x *RegisterInstallationResponse) Reset() {
 	*x = RegisterInstallationResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[8]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *RegisterInstallationResponse) String() string {
@@ -577,7 +559,7 @@ func (*RegisterInstallationResponse) ProtoMessage() {}
 
 func (x *RegisterInstallationResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -612,11 +594,9 @@ type UploadKeyPackageRequest struct {
 
 func (x *UploadKeyPackageRequest) Reset() {
 	*x = UploadKeyPackageRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[9]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UploadKeyPackageRequest) String() string {
@@ -627,7 +607,7 @@ func (*UploadKeyPackageRequest) ProtoMessage() {}
 
 func (x *UploadKeyPackageRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -670,11 +650,9 @@ type FetchKeyPackagesRequest struct {
 
 func (x *FetchKeyPackagesRequest) Reset() {
 	*x = FetchKeyPackagesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[10]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *FetchKeyPackagesRequest) String() string {
@@ -685,7 +663,7 @@ func (*FetchKeyPackagesRequest) ProtoMessage() {}
 
 func (x *FetchKeyPackagesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -721,11 +699,9 @@ type FetchKeyPackagesResponse struct {
 
 func (x *FetchKeyPackagesResponse) Reset() {
 	*x = FetchKeyPackagesResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[11]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *FetchKeyPackagesResponse) String() string {
@@ -736,7 +712,7 @@ func (*FetchKeyPackagesResponse) ProtoMessage() {}
 
 func (x *FetchKeyPackagesResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -772,11 +748,9 @@ type RevokeInstallationRequest struct {
 
 func (x *RevokeInstallationRequest) Reset() {
 	*x = RevokeInstallationRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[12]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *RevokeInstallationRequest) String() string {
@@ -787,7 +761,7 @@ func (*RevokeInstallationRequest) ProtoMessage() {}
 
 func (x *RevokeInstallationRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -828,11 +802,9 @@ type GetIdentityUpdatesRequest struct {
 
 func (x *GetIdentityUpdatesRequest) Reset() {
 	*x = GetIdentityUpdatesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[13]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetIdentityUpdatesRequest) String() string {
@@ -843,7 +815,7 @@ func (*GetIdentityUpdatesRequest) ProtoMessage() {}
 
 func (x *GetIdentityUpdatesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -885,11 +857,9 @@ type GetIdentityUpdatesResponse struct {
 
 func (x *GetIdentityUpdatesResponse) Reset() {
 	*x = GetIdentityUpdatesResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[14]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetIdentityUpdatesResponse) String() string {
@@ -900,7 +870,7 @@ func (*GetIdentityUpdatesResponse) ProtoMessage() {}
 
 func (x *GetIdentityUpdatesResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -935,11 +905,9 @@ type PagingInfo struct {
 
 func (x *PagingInfo) Reset() {
 	*x = PagingInfo{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[15]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PagingInfo) String() string {
@@ -950,7 +918,7 @@ func (*PagingInfo) ProtoMessage() {}
 
 func (x *PagingInfo) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -998,11 +966,9 @@ type QueryGroupMessagesRequest struct {
 
 func (x *QueryGroupMessagesRequest) Reset() {
 	*x = QueryGroupMessagesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[16]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *QueryGroupMessagesRequest) String() string {
@@ -1013,7 +979,7 @@ func (*QueryGroupMessagesRequest) ProtoMessage() {}
 
 func (x *QueryGroupMessagesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1054,11 +1020,9 @@ type QueryGroupMessagesResponse struct {
 
 func (x *QueryGroupMessagesResponse) Reset() {
 	*x = QueryGroupMessagesResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[17]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[17]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *QueryGroupMessagesResponse) String() string {
@@ -1069,7 +1033,7 @@ func (*QueryGroupMessagesResponse) ProtoMessage() {}
 
 func (x *QueryGroupMessagesResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[17]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1110,11 +1074,9 @@ type QueryWelcomeMessagesRequest struct {
 
 func (x *QueryWelcomeMessagesRequest) Reset() {
 	*x = QueryWelcomeMessagesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[18]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[18]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *QueryWelcomeMessagesRequest) String() string {
@@ -1125,7 +1087,7 @@ func (*QueryWelcomeMessagesRequest) ProtoMessage() {}
 
 func (x *QueryWelcomeMessagesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[18]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1166,11 +1128,9 @@ type QueryWelcomeMessagesResponse struct {
 
 func (x *QueryWelcomeMessagesResponse) Reset() {
 	*x = QueryWelcomeMessagesResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[19]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[19]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *QueryWelcomeMessagesResponse) String() string {
@@ -1181,7 +1141,7 @@ func (*QueryWelcomeMessagesResponse) ProtoMessage() {}
 
 func (x *QueryWelcomeMessagesResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[19]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1221,11 +1181,9 @@ type SubscribeGroupMessagesRequest struct {
 
 func (x *SubscribeGroupMessagesRequest) Reset() {
 	*x = SubscribeGroupMessagesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[20]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[20]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SubscribeGroupMessagesRequest) String() string {
@@ -1236,7 +1194,7 @@ func (*SubscribeGroupMessagesRequest) ProtoMessage() {}
 
 func (x *SubscribeGroupMessagesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[20]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1269,11 +1227,9 @@ type SubscribeWelcomeMessagesRequest struct {
 
 func (x *SubscribeWelcomeMessagesRequest) Reset() {
 	*x = SubscribeWelcomeMessagesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[21]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[21]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SubscribeWelcomeMessagesRequest) String() string {
@@ -1284,7 +1240,7 @@ func (*SubscribeWelcomeMessagesRequest) ProtoMessage() {}
 
 func (x *SubscribeWelcomeMessagesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[21]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1321,11 +1277,9 @@ type WelcomeMessage_V1 struct {
 
 func (x *WelcomeMessage_V1) Reset() {
 	*x = WelcomeMessage_V1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[22]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[22]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *WelcomeMessage_V1) String() string {
@@ -1336,7 +1290,7 @@ func (*WelcomeMessage_V1) ProtoMessage() {}
 
 func (x *WelcomeMessage_V1) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[22]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1399,11 +1353,9 @@ type WelcomeMessageInput_V1 struct {
 
 func (x *WelcomeMessageInput_V1) Reset() {
 	*x = WelcomeMessageInput_V1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[23]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[23]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *WelcomeMessageInput_V1) String() string {
@@ -1414,7 +1366,7 @@ func (*WelcomeMessageInput_V1) ProtoMessage() {}
 
 func (x *WelcomeMessageInput_V1) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[23]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1465,11 +1417,9 @@ type GroupMessage_V1 struct {
 
 func (x *GroupMessage_V1) Reset() {
 	*x = GroupMessage_V1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[24]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[24]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GroupMessage_V1) String() string {
@@ -1480,7 +1430,7 @@ func (*GroupMessage_V1) ProtoMessage() {}
 
 func (x *GroupMessage_V1) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[24]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1542,11 +1492,9 @@ type GroupMessageInput_V1 struct {
 
 func (x *GroupMessageInput_V1) Reset() {
 	*x = GroupMessageInput_V1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[25]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[25]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GroupMessageInput_V1) String() string {
@@ -1557,7 +1505,7 @@ func (*GroupMessageInput_V1) ProtoMessage() {}
 
 func (x *GroupMessageInput_V1) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[25]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1597,11 +1545,9 @@ type FetchKeyPackagesResponse_KeyPackage struct {
 
 func (x *FetchKeyPackagesResponse_KeyPackage) Reset() {
 	*x = FetchKeyPackagesResponse_KeyPackage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[26]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[26]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *FetchKeyPackagesResponse_KeyPackage) String() string {
@@ -1612,7 +1558,7 @@ func (*FetchKeyPackagesResponse_KeyPackage) ProtoMessage() {}
 
 func (x *FetchKeyPackagesResponse_KeyPackage) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[26]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1646,11 +1592,9 @@ type GetIdentityUpdatesResponse_NewInstallationUpdate struct {
 
 func (x *GetIdentityUpdatesResponse_NewInstallationUpdate) Reset() {
 	*x = GetIdentityUpdatesResponse_NewInstallationUpdate{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[27]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[27]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetIdentityUpdatesResponse_NewInstallationUpdate) String() string {
@@ -1661,7 +1605,7 @@ func (*GetIdentityUpdatesResponse_NewInstallationUpdate) ProtoMessage() {}
 
 func (x *GetIdentityUpdatesResponse_NewInstallationUpdate) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[27]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1701,11 +1645,9 @@ type GetIdentityUpdatesResponse_RevokedInstallationUpdate struct {
 
 func (x *GetIdentityUpdatesResponse_RevokedInstallationUpdate) Reset() {
 	*x = GetIdentityUpdatesResponse_RevokedInstallationUpdate{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[28]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[28]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetIdentityUpdatesResponse_RevokedInstallationUpdate) String() string {
@@ -1716,7 +1658,7 @@ func (*GetIdentityUpdatesResponse_RevokedInstallationUpdate) ProtoMessage() {}
 
 func (x *GetIdentityUpdatesResponse_RevokedInstallationUpdate) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[28]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1754,11 +1696,9 @@ type GetIdentityUpdatesResponse_Update struct {
 
 func (x *GetIdentityUpdatesResponse_Update) Reset() {
 	*x = GetIdentityUpdatesResponse_Update{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[29]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[29]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetIdentityUpdatesResponse_Update) String() string {
@@ -1769,7 +1709,7 @@ func (*GetIdentityUpdatesResponse_Update) ProtoMessage() {}
 
 func (x *GetIdentityUpdatesResponse_Update) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[29]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1841,11 +1781,9 @@ type GetIdentityUpdatesResponse_WalletUpdates struct {
 
 func (x *GetIdentityUpdatesResponse_WalletUpdates) Reset() {
 	*x = GetIdentityUpdatesResponse_WalletUpdates{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[30]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[30]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetIdentityUpdatesResponse_WalletUpdates) String() string {
@@ -1856,7 +1794,7 @@ func (*GetIdentityUpdatesResponse_WalletUpdates) ProtoMessage() {}
 
 func (x *GetIdentityUpdatesResponse_WalletUpdates) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[30]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1890,11 +1828,9 @@ type SubscribeGroupMessagesRequest_Filter struct {
 
 func (x *SubscribeGroupMessagesRequest_Filter) Reset() {
 	*x = SubscribeGroupMessagesRequest_Filter{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[31]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[31]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SubscribeGroupMessagesRequest_Filter) String() string {
@@ -1905,7 +1841,7 @@ func (*SubscribeGroupMessagesRequest_Filter) ProtoMessage() {}
 
 func (x *SubscribeGroupMessagesRequest_Filter) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[31]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1946,11 +1882,9 @@ type SubscribeWelcomeMessagesRequest_Filter struct {
 
 func (x *SubscribeWelcomeMessagesRequest_Filter) Reset() {
 	*x = SubscribeWelcomeMessagesRequest_Filter{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_api_v1_mls_proto_msgTypes[32]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_api_v1_mls_proto_msgTypes[32]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SubscribeWelcomeMessagesRequest_Filter) String() string {
@@ -1961,7 +1895,7 @@ func (*SubscribeWelcomeMessagesRequest_Filter) ProtoMessage() {}
 
 func (x *SubscribeWelcomeMessagesRequest_Filter) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_api_v1_mls_proto_msgTypes[32]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2472,404 +2406,6 @@ func file_mls_api_v1_mls_proto_init() {
 	if File_mls_api_v1_mls_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_mls_api_v1_mls_proto_msgTypes[0].OneofWrappers = []any{
 		(*WelcomeMessage_V1_)(nil),
 	}
diff --git a/pkg/proto/mls/database/intents.pb.go b/pkg/proto/mls/database/intents.pb.go
index 518bc240..acac457a 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: mls/database/intents.proto
 
@@ -207,11 +207,9 @@ type SendMessageData struct {
 
 func (x *SendMessageData) Reset() {
 	*x = SendMessageData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SendMessageData) String() string {
@@ -222,7 +220,7 @@ func (*SendMessageData) ProtoMessage() {}
 
 func (x *SendMessageData) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -272,11 +270,9 @@ type AccountAddresses struct {
 
 func (x *AccountAddresses) Reset() {
 	*x = AccountAddresses{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *AccountAddresses) String() string {
@@ -287,7 +283,7 @@ func (*AccountAddresses) ProtoMessage() {}
 
 func (x *AccountAddresses) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -320,11 +316,9 @@ type InstallationIds struct {
 
 func (x *InstallationIds) Reset() {
 	*x = InstallationIds{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *InstallationIds) String() string {
@@ -335,7 +329,7 @@ func (*InstallationIds) ProtoMessage() {}
 
 func (x *InstallationIds) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -372,11 +366,9 @@ type AddressesOrInstallationIds struct {
 
 func (x *AddressesOrInstallationIds) Reset() {
 	*x = AddressesOrInstallationIds{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *AddressesOrInstallationIds) String() string {
@@ -387,7 +379,7 @@ func (*AddressesOrInstallationIds) ProtoMessage() {}
 
 func (x *AddressesOrInstallationIds) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -455,11 +447,9 @@ type AddMembersData struct {
 
 func (x *AddMembersData) Reset() {
 	*x = AddMembersData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *AddMembersData) String() string {
@@ -470,7 +460,7 @@ func (*AddMembersData) ProtoMessage() {}
 
 func (x *AddMembersData) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -523,11 +513,9 @@ type RemoveMembersData struct {
 
 func (x *RemoveMembersData) Reset() {
 	*x = RemoveMembersData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *RemoveMembersData) String() string {
@@ -538,7 +526,7 @@ func (*RemoveMembersData) ProtoMessage() {}
 
 func (x *RemoveMembersData) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -592,11 +580,9 @@ type UpdateGroupMembershipData struct {
 
 func (x *UpdateGroupMembershipData) Reset() {
 	*x = UpdateGroupMembershipData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UpdateGroupMembershipData) String() string {
@@ -607,7 +593,7 @@ func (*UpdateGroupMembershipData) ProtoMessage() {}
 
 func (x *UpdateGroupMembershipData) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -660,11 +646,9 @@ type UpdateMetadataData struct {
 
 func (x *UpdateMetadataData) Reset() {
 	*x = UpdateMetadataData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[7]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UpdateMetadataData) String() string {
@@ -675,7 +659,7 @@ func (*UpdateMetadataData) ProtoMessage() {}
 
 func (x *UpdateMetadataData) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -728,11 +712,9 @@ type UpdateAdminListsData struct {
 
 func (x *UpdateAdminListsData) Reset() {
 	*x = UpdateAdminListsData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[8]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UpdateAdminListsData) String() string {
@@ -743,7 +725,7 @@ func (*UpdateAdminListsData) ProtoMessage() {}
 
 func (x *UpdateAdminListsData) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -796,11 +778,9 @@ type UpdatePermissionData struct {
 
 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)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[9]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UpdatePermissionData) String() string {
@@ -811,7 +791,7 @@ func (*UpdatePermissionData) ProtoMessage() {}
 
 func (x *UpdatePermissionData) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -864,11 +844,9 @@ type PostCommitAction struct {
 
 func (x *PostCommitAction) Reset() {
 	*x = PostCommitAction{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[10]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PostCommitAction) String() string {
@@ -879,7 +857,7 @@ func (*PostCommitAction) ProtoMessage() {}
 
 func (x *PostCommitAction) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -929,11 +907,9 @@ type SendMessageData_V1 struct {
 
 func (x *SendMessageData_V1) Reset() {
 	*x = SendMessageData_V1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[11]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *SendMessageData_V1) String() string {
@@ -944,7 +920,7 @@ func (*SendMessageData_V1) ProtoMessage() {}
 
 func (x *SendMessageData_V1) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -977,11 +953,9 @@ type AddMembersData_V1 struct {
 
 func (x *AddMembersData_V1) Reset() {
 	*x = AddMembersData_V1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[12]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *AddMembersData_V1) String() string {
@@ -992,7 +966,7 @@ func (*AddMembersData_V1) ProtoMessage() {}
 
 func (x *AddMembersData_V1) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1025,11 +999,9 @@ type RemoveMembersData_V1 struct {
 
 func (x *RemoveMembersData_V1) Reset() {
 	*x = RemoveMembersData_V1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[13]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *RemoveMembersData_V1) String() string {
@@ -1040,7 +1012,7 @@ func (*RemoveMembersData_V1) ProtoMessage() {}
 
 func (x *RemoveMembersData_V1) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1076,11 +1048,9 @@ type UpdateGroupMembershipData_V1 struct {
 
 func (x *UpdateGroupMembershipData_V1) Reset() {
 	*x = UpdateGroupMembershipData_V1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[14]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UpdateGroupMembershipData_V1) String() string {
@@ -1091,7 +1061,7 @@ func (*UpdateGroupMembershipData_V1) ProtoMessage() {}
 
 func (x *UpdateGroupMembershipData_V1) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1132,11 +1102,9 @@ type UpdateMetadataData_V1 struct {
 
 func (x *UpdateMetadataData_V1) Reset() {
 	*x = UpdateMetadataData_V1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[16]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UpdateMetadataData_V1) String() string {
@@ -1147,7 +1115,7 @@ func (*UpdateMetadataData_V1) ProtoMessage() {}
 
 func (x *UpdateMetadataData_V1) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1188,11 +1156,9 @@ type UpdateAdminListsData_V1 struct {
 
 func (x *UpdateAdminListsData_V1) Reset() {
 	*x = UpdateAdminListsData_V1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[17]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[17]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UpdateAdminListsData_V1) String() string {
@@ -1203,7 +1169,7 @@ func (*UpdateAdminListsData_V1) ProtoMessage() {}
 
 func (x *UpdateAdminListsData_V1) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[17]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1246,11 +1212,9 @@ type UpdatePermissionData_V1 struct {
 
 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)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[18]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UpdatePermissionData_V1) String() string {
@@ -1261,7 +1225,7 @@ func (*UpdatePermissionData_V1) ProtoMessage() {}
 
 func (x *UpdatePermissionData_V1) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[18]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1309,11 +1273,9 @@ type PostCommitAction_Installation struct {
 
 func (x *PostCommitAction_Installation) Reset() {
 	*x = PostCommitAction_Installation{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[19]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[19]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PostCommitAction_Installation) String() string {
@@ -1324,7 +1286,7 @@ func (*PostCommitAction_Installation) ProtoMessage() {}
 
 func (x *PostCommitAction_Installation) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[19]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1365,11 +1327,9 @@ type PostCommitAction_SendWelcomes struct {
 
 func (x *PostCommitAction_SendWelcomes) Reset() {
 	*x = PostCommitAction_SendWelcomes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_database_intents_proto_msgTypes[20]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_database_intents_proto_msgTypes[20]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PostCommitAction_SendWelcomes) String() string {
@@ -1380,7 +1340,7 @@ func (*PostCommitAction_SendWelcomes) ProtoMessage() {}
 
 func (x *PostCommitAction_SendWelcomes) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_database_intents_proto_msgTypes[20]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1694,248 +1654,6 @@ func file_mls_database_intents_proto_init() {
 	if File_mls_database_intents_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		file_mls_database_intents_proto_msgTypes[0].Exporter = func(v any, i int) any {
-			switch v := v.(*SendMessageData); 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[1].Exporter = func(v any, i int) any {
-			switch v := v.(*AccountAddresses); 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[2].Exporter = func(v any, i int) any {
-			switch v := v.(*InstallationIds); 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[3].Exporter = func(v any, i int) any {
-			switch v := v.(*AddressesOrInstallationIds); 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[4].Exporter = func(v any, i int) any {
-			switch v := v.(*AddMembersData); 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[5].Exporter = func(v any, i int) any {
-			switch v := v.(*RemoveMembersData); 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[6].Exporter = func(v any, i int) any {
-			switch v := v.(*UpdateGroupMembershipData); 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[7].Exporter = func(v any, i int) any {
-			switch v := v.(*UpdateMetadataData); 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[8].Exporter = func(v any, i int) any {
-			switch v := v.(*UpdateAdminListsData); 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[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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_mls_database_intents_proto_msgTypes[0].OneofWrappers = []any{
 		(*SendMessageData_V1_)(nil),
 	}
diff --git a/pkg/proto/mls/message_contents/content.pb.go b/pkg/proto/mls/message_contents/content.pb.go
index e2bd5ea3..3749bc40 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: mls/message_contents/content.proto
 
@@ -85,11 +85,9 @@ type ContentTypeId struct {
 
 func (x *ContentTypeId) Reset() {
 	*x = ContentTypeId{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_content_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_content_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ContentTypeId) String() string {
@@ -100,7 +98,7 @@ func (*ContentTypeId) ProtoMessage() {}
 
 func (x *ContentTypeId) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_content_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -167,11 +165,9 @@ type EncodedContent struct {
 
 func (x *EncodedContent) Reset() {
 	*x = EncodedContent{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_content_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_content_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EncodedContent) String() string {
@@ -182,7 +178,7 @@ func (*EncodedContent) ProtoMessage() {}
 
 func (x *EncodedContent) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_content_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -250,11 +246,9 @@ type PlaintextEnvelope struct {
 
 func (x *PlaintextEnvelope) Reset() {
 	*x = PlaintextEnvelope{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_content_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_content_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PlaintextEnvelope) String() string {
@@ -265,7 +259,7 @@ func (*PlaintextEnvelope) ProtoMessage() {}
 
 func (x *PlaintextEnvelope) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_content_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -331,11 +325,9 @@ type MessageHistoryRequest struct {
 
 func (x *MessageHistoryRequest) Reset() {
 	*x = MessageHistoryRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_content_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_content_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MessageHistoryRequest) String() string {
@@ -346,7 +338,7 @@ func (*MessageHistoryRequest) ProtoMessage() {}
 
 func (x *MessageHistoryRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_content_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -391,11 +383,9 @@ type MessageHistoryReply struct {
 
 func (x *MessageHistoryReply) Reset() {
 	*x = MessageHistoryReply{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_content_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_content_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MessageHistoryReply) String() string {
@@ -406,7 +396,7 @@ func (*MessageHistoryReply) ProtoMessage() {}
 
 func (x *MessageHistoryReply) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_content_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -456,11 +446,9 @@ type MessageHistoryKeyType struct {
 
 func (x *MessageHistoryKeyType) Reset() {
 	*x = MessageHistoryKeyType{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_content_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_content_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MessageHistoryKeyType) String() string {
@@ -471,7 +459,7 @@ func (*MessageHistoryKeyType) ProtoMessage() {}
 
 func (x *MessageHistoryKeyType) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_content_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -525,11 +513,9 @@ type PlaintextEnvelope_V1 struct {
 
 func (x *PlaintextEnvelope_V1) Reset() {
 	*x = PlaintextEnvelope_V1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_content_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_content_proto_msgTypes[7]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PlaintextEnvelope_V1) String() string {
@@ -540,7 +526,7 @@ func (*PlaintextEnvelope_V1) ProtoMessage() {}
 
 func (x *PlaintextEnvelope_V1) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_content_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -588,11 +574,9 @@ type PlaintextEnvelope_V2 struct {
 
 func (x *PlaintextEnvelope_V2) Reset() {
 	*x = PlaintextEnvelope_V2{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_content_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_content_proto_msgTypes[8]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PlaintextEnvelope_V2) String() string {
@@ -603,7 +587,7 @@ func (*PlaintextEnvelope_V2) ProtoMessage() {}
 
 func (x *PlaintextEnvelope_V2) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_content_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -839,104 +823,6 @@ func file_mls_message_contents_content_proto_init() {
 	if File_mls_message_contents_content_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_mls_message_contents_content_proto_msgTypes[1].OneofWrappers = []any{}
 	file_mls_message_contents_content_proto_msgTypes[2].OneofWrappers = []any{
 		(*PlaintextEnvelope_V1_)(nil),
diff --git a/pkg/proto/mls/message_contents/group_membership.pb.go b/pkg/proto/mls/message_contents/group_membership.pb.go
index 7bf9362c..a16c0393 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: mls/message_contents/group_membership.proto
 
@@ -34,11 +34,9 @@ type GroupMembership struct {
 
 func (x *GroupMembership) Reset() {
 	*x = GroupMembership{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_group_membership_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_group_membership_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GroupMembership) String() string {
@@ -49,7 +47,7 @@ func (*GroupMembership) ProtoMessage() {}
 
 func (x *GroupMembership) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_membership_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -138,20 +136,6 @@ func file_mls_message_contents_group_membership_proto_init() {
 	if File_mls_message_contents_group_membership_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/pkg/proto/mls/message_contents/group_metadata.pb.go b/pkg/proto/mls/message_contents/group_metadata.pb.go
index 92e8029c..6727b5f1 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: mls/message_contents/group_metadata.proto
 
@@ -91,11 +91,9 @@ type GroupMetadataV1 struct {
 
 func (x *GroupMetadataV1) Reset() {
 	*x = GroupMetadataV1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_group_metadata_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_group_metadata_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GroupMetadataV1) String() string {
@@ -106,7 +104,7 @@ func (*GroupMetadataV1) ProtoMessage() {}
 
 func (x *GroupMetadataV1) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_metadata_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -160,11 +158,9 @@ type Inbox struct {
 
 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)
-	}
+	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 {
@@ -175,7 +171,7 @@ func (*Inbox) ProtoMessage() {}
 
 func (x *Inbox) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_metadata_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -209,11 +205,9 @@ type DmMembers struct {
 
 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)
-	}
+	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 {
@@ -224,7 +218,7 @@ func (*DmMembers) ProtoMessage() {}
 
 func (x *DmMembers) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_metadata_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -355,44 +349,6 @@ func file_mls_message_contents_group_metadata_proto_init() {
 	if File_mls_message_contents_group_metadata_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				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{
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 a8e6dc10..80ca4b34 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: mls/message_contents/group_mutable_metadata.proto
 
@@ -38,11 +38,9 @@ type GroupMutableMetadataV1 struct {
 
 func (x *GroupMutableMetadataV1) Reset() {
 	*x = GroupMutableMetadataV1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_group_mutable_metadata_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_group_mutable_metadata_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GroupMutableMetadataV1) String() string {
@@ -53,7 +51,7 @@ func (*GroupMutableMetadataV1) ProtoMessage() {}
 
 func (x *GroupMutableMetadataV1) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_mutable_metadata_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -100,11 +98,9 @@ type Inboxes struct {
 
 func (x *Inboxes) Reset() {
 	*x = Inboxes{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_group_mutable_metadata_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_group_mutable_metadata_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Inboxes) String() string {
@@ -115,7 +111,7 @@ func (*Inboxes) ProtoMessage() {}
 
 func (x *Inboxes) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_mutable_metadata_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -221,32 +217,6 @@ func file_mls_message_contents_group_mutable_metadata_proto_init() {
 	if File_mls_message_contents_group_mutable_metadata_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/pkg/proto/mls/message_contents/group_permissions.pb.go b/pkg/proto/mls/message_contents/group_permissions.pb.go
index dfcc170e..5797bc44 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: mls/message_contents/group_permissions.proto
 
@@ -198,11 +198,9 @@ type GroupMutablePermissionsV1 struct {
 
 func (x *GroupMutablePermissionsV1) Reset() {
 	*x = GroupMutablePermissionsV1{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_group_permissions_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GroupMutablePermissionsV1) String() string {
@@ -213,7 +211,7 @@ func (*GroupMutablePermissionsV1) ProtoMessage() {}
 
 func (x *GroupMutablePermissionsV1) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -251,11 +249,9 @@ type PolicySet struct {
 
 func (x *PolicySet) Reset() {
 	*x = PolicySet{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_group_permissions_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PolicySet) String() string {
@@ -266,7 +262,7 @@ func (*PolicySet) ProtoMessage() {}
 
 func (x *PolicySet) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -339,11 +335,9 @@ type MembershipPolicy struct {
 
 func (x *MembershipPolicy) Reset() {
 	*x = MembershipPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_group_permissions_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MembershipPolicy) String() string {
@@ -354,7 +348,7 @@ func (*MembershipPolicy) ProtoMessage() {}
 
 func (x *MembershipPolicy) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -435,11 +429,9 @@ type MetadataPolicy struct {
 
 func (x *MetadataPolicy) Reset() {
 	*x = MetadataPolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_group_permissions_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MetadataPolicy) String() string {
@@ -450,7 +442,7 @@ func (*MetadataPolicy) ProtoMessage() {}
 
 func (x *MetadataPolicy) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -531,11 +523,9 @@ type PermissionsUpdatePolicy struct {
 
 func (x *PermissionsUpdatePolicy) Reset() {
 	*x = PermissionsUpdatePolicy{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_group_permissions_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PermissionsUpdatePolicy) String() string {
@@ -546,7 +536,7 @@ func (*PermissionsUpdatePolicy) ProtoMessage() {}
 
 func (x *PermissionsUpdatePolicy) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -622,11 +612,9 @@ type MembershipPolicy_AndCondition struct {
 
 func (x *MembershipPolicy_AndCondition) Reset() {
 	*x = MembershipPolicy_AndCondition{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_group_permissions_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MembershipPolicy_AndCondition) String() string {
@@ -637,7 +625,7 @@ func (*MembershipPolicy_AndCondition) ProtoMessage() {}
 
 func (x *MembershipPolicy_AndCondition) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -670,11 +658,9 @@ type MembershipPolicy_AnyCondition struct {
 
 func (x *MembershipPolicy_AnyCondition) Reset() {
 	*x = MembershipPolicy_AnyCondition{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_group_permissions_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[7]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MembershipPolicy_AnyCondition) String() string {
@@ -685,7 +671,7 @@ func (*MembershipPolicy_AnyCondition) ProtoMessage() {}
 
 func (x *MembershipPolicy_AnyCondition) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -718,11 +704,9 @@ type MetadataPolicy_AndCondition struct {
 
 func (x *MetadataPolicy_AndCondition) Reset() {
 	*x = MetadataPolicy_AndCondition{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_group_permissions_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[8]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MetadataPolicy_AndCondition) String() string {
@@ -733,7 +717,7 @@ func (*MetadataPolicy_AndCondition) ProtoMessage() {}
 
 func (x *MetadataPolicy_AndCondition) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -766,11 +750,9 @@ type MetadataPolicy_AnyCondition struct {
 
 func (x *MetadataPolicy_AnyCondition) Reset() {
 	*x = MetadataPolicy_AnyCondition{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_group_permissions_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[9]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MetadataPolicy_AnyCondition) String() string {
@@ -781,7 +763,7 @@ func (*MetadataPolicy_AnyCondition) ProtoMessage() {}
 
 func (x *MetadataPolicy_AnyCondition) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -814,11 +796,9 @@ type PermissionsUpdatePolicy_AndCondition struct {
 
 func (x *PermissionsUpdatePolicy_AndCondition) Reset() {
 	*x = PermissionsUpdatePolicy_AndCondition{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_group_permissions_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[10]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PermissionsUpdatePolicy_AndCondition) String() string {
@@ -829,7 +809,7 @@ func (*PermissionsUpdatePolicy_AndCondition) ProtoMessage() {}
 
 func (x *PermissionsUpdatePolicy_AndCondition) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -862,11 +842,9 @@ type PermissionsUpdatePolicy_AnyCondition struct {
 
 func (x *PermissionsUpdatePolicy_AnyCondition) Reset() {
 	*x = PermissionsUpdatePolicy_AnyCondition{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_group_permissions_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[11]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PermissionsUpdatePolicy_AnyCondition) String() string {
@@ -877,7 +855,7 @@ func (*PermissionsUpdatePolicy_AnyCondition) ProtoMessage() {}
 
 func (x *PermissionsUpdatePolicy_AnyCondition) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_group_permissions_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1173,140 +1151,6 @@ func file_mls_message_contents_group_permissions_proto_init() {
 	if File_mls_message_contents_group_permissions_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_mls_message_contents_group_permissions_proto_msgTypes[2].OneofWrappers = []any{
 		(*MembershipPolicy_Base)(nil),
 		(*MembershipPolicy_AndCondition_)(nil),
diff --git a/pkg/proto/mls/message_contents/transcript_messages.pb.go b/pkg/proto/mls/message_contents/transcript_messages.pb.go
index 524dbde5..10347bfa 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: mls/message_contents/transcript_messages.proto
 
@@ -35,11 +35,9 @@ type MembershipChange struct {
 
 func (x *MembershipChange) Reset() {
 	*x = MembershipChange{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_transcript_messages_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_transcript_messages_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MembershipChange) String() string {
@@ -50,7 +48,7 @@ func (*MembershipChange) ProtoMessage() {}
 
 func (x *MembershipChange) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_transcript_messages_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -104,11 +102,9 @@ type GroupMembershipChanges struct {
 
 func (x *GroupMembershipChanges) Reset() {
 	*x = GroupMembershipChanges{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_transcript_messages_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_transcript_messages_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GroupMembershipChanges) String() string {
@@ -119,7 +115,7 @@ func (*GroupMembershipChanges) ProtoMessage() {}
 
 func (x *GroupMembershipChanges) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_transcript_messages_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -180,11 +176,9 @@ type GroupUpdated struct {
 
 func (x *GroupUpdated) Reset() {
 	*x = GroupUpdated{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_transcript_messages_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_transcript_messages_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GroupUpdated) String() string {
@@ -195,7 +189,7 @@ func (*GroupUpdated) ProtoMessage() {}
 
 func (x *GroupUpdated) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_transcript_messages_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -249,11 +243,9 @@ type GroupUpdated_Inbox struct {
 
 func (x *GroupUpdated_Inbox) Reset() {
 	*x = GroupUpdated_Inbox{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_transcript_messages_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_transcript_messages_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GroupUpdated_Inbox) String() string {
@@ -264,7 +256,7 @@ func (*GroupUpdated_Inbox) ProtoMessage() {}
 
 func (x *GroupUpdated_Inbox) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_transcript_messages_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -302,11 +294,9 @@ type GroupUpdated_MetadataFieldChange struct {
 
 func (x *GroupUpdated_MetadataFieldChange) Reset() {
 	*x = GroupUpdated_MetadataFieldChange{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_message_contents_transcript_messages_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_message_contents_transcript_messages_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GroupUpdated_MetadataFieldChange) String() string {
@@ -317,7 +307,7 @@ func (*GroupUpdated_MetadataFieldChange) ProtoMessage() {}
 
 func (x *GroupUpdated_MetadataFieldChange) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_message_contents_transcript_messages_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -488,68 +478,6 @@ func file_mls_message_contents_transcript_messages_proto_init() {
 	if File_mls_message_contents_transcript_messages_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		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
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_mls_message_contents_transcript_messages_proto_msgTypes[4].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
diff --git a/pkg/proto/mls_validation/v1/service.pb.go b/pkg/proto/mls_validation/v1/service.pb.go
index a4fbe393..e19e8fea 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.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: mls_validation/v1/service.proto
 
@@ -36,11 +36,9 @@ type ValidateInboxIdKeyPackagesRequest struct {
 
 func (x *ValidateInboxIdKeyPackagesRequest) Reset() {
 	*x = ValidateInboxIdKeyPackagesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateInboxIdKeyPackagesRequest) String() string {
@@ -51,7 +49,7 @@ func (*ValidateInboxIdKeyPackagesRequest) ProtoMessage() {}
 
 func (x *ValidateInboxIdKeyPackagesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -84,11 +82,9 @@ type ValidateInboxIdKeyPackagesResponse struct {
 
 func (x *ValidateInboxIdKeyPackagesResponse) Reset() {
 	*x = ValidateInboxIdKeyPackagesResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateInboxIdKeyPackagesResponse) String() string {
@@ -99,7 +95,7 @@ func (*ValidateInboxIdKeyPackagesResponse) ProtoMessage() {}
 
 func (x *ValidateInboxIdKeyPackagesResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -132,11 +128,9 @@ type ValidateKeyPackagesRequest struct {
 
 func (x *ValidateKeyPackagesRequest) Reset() {
 	*x = ValidateKeyPackagesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateKeyPackagesRequest) String() string {
@@ -147,7 +141,7 @@ func (*ValidateKeyPackagesRequest) ProtoMessage() {}
 
 func (x *ValidateKeyPackagesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -180,11 +174,9 @@ type ValidateKeyPackagesResponse struct {
 
 func (x *ValidateKeyPackagesResponse) Reset() {
 	*x = ValidateKeyPackagesResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateKeyPackagesResponse) String() string {
@@ -195,7 +187,7 @@ func (*ValidateKeyPackagesResponse) ProtoMessage() {}
 
 func (x *ValidateKeyPackagesResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -228,11 +220,9 @@ type ValidateGroupMessagesRequest struct {
 
 func (x *ValidateGroupMessagesRequest) Reset() {
 	*x = ValidateGroupMessagesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateGroupMessagesRequest) String() string {
@@ -243,7 +233,7 @@ func (*ValidateGroupMessagesRequest) ProtoMessage() {}
 
 func (x *ValidateGroupMessagesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -276,11 +266,9 @@ type ValidateGroupMessagesResponse struct {
 
 func (x *ValidateGroupMessagesResponse) Reset() {
 	*x = ValidateGroupMessagesResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateGroupMessagesResponse) String() string {
@@ -291,7 +279,7 @@ func (*ValidateGroupMessagesResponse) ProtoMessage() {}
 
 func (x *ValidateGroupMessagesResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -326,11 +314,9 @@ type GetAssociationStateRequest struct {
 
 func (x *GetAssociationStateRequest) Reset() {
 	*x = GetAssociationStateRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetAssociationStateRequest) String() string {
@@ -341,7 +327,7 @@ func (*GetAssociationStateRequest) ProtoMessage() {}
 
 func (x *GetAssociationStateRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -383,11 +369,9 @@ type GetAssociationStateResponse struct {
 
 func (x *GetAssociationStateResponse) Reset() {
 	*x = GetAssociationStateResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[7]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetAssociationStateResponse) String() string {
@@ -398,7 +382,7 @@ func (*GetAssociationStateResponse) ProtoMessage() {}
 
 func (x *GetAssociationStateResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -439,11 +423,9 @@ type ValidateInboxIdsRequest struct {
 
 func (x *ValidateInboxIdsRequest) Reset() {
 	*x = ValidateInboxIdsRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[8]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateInboxIdsRequest) String() string {
@@ -454,7 +436,7 @@ func (*ValidateInboxIdsRequest) ProtoMessage() {}
 
 func (x *ValidateInboxIdsRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -488,11 +470,9 @@ type ValidateInboxIdsResponse struct {
 
 func (x *ValidateInboxIdsResponse) Reset() {
 	*x = ValidateInboxIdsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[9]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateInboxIdsResponse) String() string {
@@ -503,7 +483,7 @@ func (*ValidateInboxIdsResponse) ProtoMessage() {}
 
 func (x *ValidateInboxIdsResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -537,11 +517,9 @@ type ValidateInboxIdKeyPackagesRequest_KeyPackage struct {
 
 func (x *ValidateInboxIdKeyPackagesRequest_KeyPackage) Reset() {
 	*x = ValidateInboxIdKeyPackagesRequest_KeyPackage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[10]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateInboxIdKeyPackagesRequest_KeyPackage) String() string {
@@ -552,7 +530,7 @@ func (*ValidateInboxIdKeyPackagesRequest_KeyPackage) ProtoMessage() {}
 
 func (x *ValidateInboxIdKeyPackagesRequest_KeyPackage) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -596,11 +574,9 @@ type ValidateInboxIdKeyPackagesResponse_Response struct {
 
 func (x *ValidateInboxIdKeyPackagesResponse_Response) Reset() {
 	*x = ValidateInboxIdKeyPackagesResponse_Response{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[11]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateInboxIdKeyPackagesResponse_Response) String() string {
@@ -611,7 +587,7 @@ func (*ValidateInboxIdKeyPackagesResponse_Response) ProtoMessage() {}
 
 func (x *ValidateInboxIdKeyPackagesResponse_Response) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -673,11 +649,9 @@ type ValidateKeyPackagesRequest_KeyPackage struct {
 
 func (x *ValidateKeyPackagesRequest_KeyPackage) Reset() {
 	*x = ValidateKeyPackagesRequest_KeyPackage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[12]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateKeyPackagesRequest_KeyPackage) String() string {
@@ -688,7 +662,7 @@ func (*ValidateKeyPackagesRequest_KeyPackage) ProtoMessage() {}
 
 func (x *ValidateKeyPackagesRequest_KeyPackage) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -733,11 +707,9 @@ type ValidateKeyPackagesResponse_ValidationResponse struct {
 
 func (x *ValidateKeyPackagesResponse_ValidationResponse) Reset() {
 	*x = ValidateKeyPackagesResponse_ValidationResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[13]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateKeyPackagesResponse_ValidationResponse) String() string {
@@ -748,7 +720,7 @@ func (*ValidateKeyPackagesResponse_ValidationResponse) ProtoMessage() {}
 
 func (x *ValidateKeyPackagesResponse_ValidationResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -816,11 +788,9 @@ type ValidateGroupMessagesRequest_GroupMessage struct {
 
 func (x *ValidateGroupMessagesRequest_GroupMessage) Reset() {
 	*x = ValidateGroupMessagesRequest_GroupMessage{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[14]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateGroupMessagesRequest_GroupMessage) String() string {
@@ -831,7 +801,7 @@ func (*ValidateGroupMessagesRequest_GroupMessage) ProtoMessage() {}
 
 func (x *ValidateGroupMessagesRequest_GroupMessage) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -866,11 +836,9 @@ type ValidateGroupMessagesResponse_ValidationResponse struct {
 
 func (x *ValidateGroupMessagesResponse_ValidationResponse) Reset() {
 	*x = ValidateGroupMessagesResponse_ValidationResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[15]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateGroupMessagesResponse_ValidationResponse) String() string {
@@ -881,7 +849,7 @@ func (*ValidateGroupMessagesResponse_ValidationResponse) ProtoMessage() {}
 
 func (x *ValidateGroupMessagesResponse_ValidationResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -930,11 +898,9 @@ type ValidateInboxIdsRequest_ValidationRequest struct {
 
 func (x *ValidateInboxIdsRequest_ValidationRequest) Reset() {
 	*x = ValidateInboxIdsRequest_ValidationRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[16]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateInboxIdsRequest_ValidationRequest) String() string {
@@ -945,7 +911,7 @@ func (*ValidateInboxIdsRequest_ValidationRequest) ProtoMessage() {}
 
 func (x *ValidateInboxIdsRequest_ValidationRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -994,11 +960,9 @@ type ValidateInboxIdsResponse_ValidationResponse struct {
 
 func (x *ValidateInboxIdsResponse_ValidationResponse) Reset() {
 	*x = ValidateInboxIdsResponse_ValidationResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_mls_validation_v1_service_proto_msgTypes[17]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_mls_validation_v1_service_proto_msgTypes[17]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ValidateInboxIdsResponse_ValidationResponse) String() string {
@@ -1009,7 +973,7 @@ func (*ValidateInboxIdsResponse_ValidationResponse) ProtoMessage() {}
 
 func (x *ValidateInboxIdsResponse_ValidationResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_mls_validation_v1_service_proto_msgTypes[17]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1383,224 +1347,6 @@ func file_mls_validation_v1_service_proto_init() {
 	if File_mls_validation_v1_service_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		file_mls_validation_v1_service_proto_msgTypes[0].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateInboxIdKeyPackagesRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[1].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateInboxIdKeyPackagesResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[2].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateKeyPackagesRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[3].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateKeyPackagesResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[4].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateGroupMessagesRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[5].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateGroupMessagesResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[6].Exporter = func(v any, i int) any {
-			switch v := v.(*GetAssociationStateRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[7].Exporter = func(v any, i int) any {
-			switch v := v.(*GetAssociationStateResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[8].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateInboxIdsRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[9].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateInboxIdsResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[10].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateInboxIdKeyPackagesRequest_KeyPackage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[11].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateInboxIdKeyPackagesResponse_Response); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[12].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateKeyPackagesRequest_KeyPackage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[13].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateKeyPackagesResponse_ValidationResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[14].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateGroupMessagesRequest_GroupMessage); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[15].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateGroupMessagesResponse_ValidationResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[16].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateInboxIdsRequest_ValidationRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_mls_validation_v1_service_proto_msgTypes[17].Exporter = func(v any, i int) any {
-			switch v := v.(*ValidateInboxIdsResponse_ValidationResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/pkg/proto/openapi/identity/api/v1/identity.swagger.json b/pkg/proto/openapi/identity/api/v1/identity.swagger.json
index 11cd8163..a96fa40c 100644
--- a/pkg/proto/openapi/identity/api/v1/identity.swagger.json
+++ b/pkg/proto/openapi/identity/api/v1/identity.swagger.json
@@ -515,16 +515,26 @@
       "type": "object",
       "title": "The response when an identity update is published"
     },
-    "v1UnverifiedSmartContractWalletSignature": {
+    "v1VerifySmartContractWalletSignatureRequestSignature": {
       "type": "object",
       "properties": {
-        "scwSignature": {
-          "$ref": "#/definitions/associationsSmartContractWalletSignature"
+        "accountId": {
+          "type": "string",
+          "title": "CAIP-10 string\nhttps://github.com/ChainAgnostic/CAIPs/blob/main/CAIPs/caip-10.md"
         },
-        "hash": {
+        "blockNumber": {
+          "type": "string",
+          "format": "uint64",
+          "title": "Specify the block number to verify the signature against"
+        },
+        "signature": {
           "type": "string",
           "format": "byte",
-          "title": "SHA256 hash of the signature payload"
+          "title": "The signature bytes"
+        },
+        "hash": {
+          "type": "string",
+          "format": "byte"
         }
       }
     },
@@ -535,7 +545,7 @@
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/v1UnverifiedSmartContractWalletSignature"
+            "$ref": "#/definitions/v1VerifySmartContractWalletSignatureRequestSignature"
           }
         }
       }
@@ -558,6 +568,10 @@
         "isValid": {
           "type": "boolean"
         },
+        "blockNumber": {
+          "type": "string",
+          "format": "uint64"
+        },
         "error": {
           "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 6f6b72b4..e9d2bebd 100644
--- a/pkg/proto/openapi/mls_validation/v1/service.swagger.json
+++ b/pkg/proto/openapi/mls_validation/v1/service.swagger.json
@@ -391,19 +391,6 @@
       },
       "title": "Response to GetAssociationStateRequest, containing the final association state\nfor an InboxID"
     },
-    "v1UnverifiedSmartContractWalletSignature": {
-      "type": "object",
-      "properties": {
-        "scwSignature": {
-          "$ref": "#/definitions/associationsSmartContractWalletSignature"
-        },
-        "hash": {
-          "type": "string",
-          "format": "byte",
-          "title": "SHA256 hash of the signature payload"
-        }
-      }
-    },
     "v1ValidateGroupMessagesRequestGroupMessage": {
       "type": "object",
       "properties": {
@@ -560,6 +547,29 @@
       },
       "title": "An individual response to one key package"
     },
+    "v1VerifySmartContractWalletSignatureRequestSignature": {
+      "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 signature bytes"
+        },
+        "hash": {
+          "type": "string",
+          "format": "byte"
+        }
+      }
+    },
     "v1VerifySmartContractWalletSignaturesResponse": {
       "type": "object",
       "properties": {
@@ -578,6 +588,10 @@
         "isValid": {
           "type": "boolean"
         },
+        "blockNumber": {
+          "type": "string",
+          "format": "uint64"
+        },
         "error": {
           "type": "string"
         }
diff --git a/pkg/proto/xmtpv4/message_api/message_api.pb.go b/pkg/proto/xmtpv4/message_api/message_api.pb.go
index 43a0fa3c..8de036bc 100644
--- a/pkg/proto/xmtpv4/message_api/message_api.pb.go
+++ b/pkg/proto/xmtpv4/message_api/message_api.pb.go
@@ -2,7 +2,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: xmtpv4/message_api/message_api.proto
 
@@ -93,11 +93,9 @@ type VectorClock struct {
 
 func (x *VectorClock) Reset() {
 	*x = VectorClock{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *VectorClock) String() string {
@@ -108,7 +106,7 @@ func (*VectorClock) ProtoMessage() {}
 
 func (x *VectorClock) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -143,11 +141,9 @@ type AuthenticatedData struct {
 
 func (x *AuthenticatedData) Reset() {
 	*x = AuthenticatedData{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *AuthenticatedData) String() string {
@@ -158,7 +154,7 @@ func (*AuthenticatedData) ProtoMessage() {}
 
 func (x *AuthenticatedData) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -206,17 +202,16 @@ type ClientEnvelope struct {
 	//	*ClientEnvelope_RegisterInstallation
 	//	*ClientEnvelope_UploadKeyPackage
 	//	*ClientEnvelope_RevokeInstallation
+	//	*ClientEnvelope_IdentityUpdate
 	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[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ClientEnvelope) String() string {
@@ -227,7 +222,7 @@ func (*ClientEnvelope) ProtoMessage() {}
 
 func (x *ClientEnvelope) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -284,6 +279,13 @@ func (x *ClientEnvelope) GetRevokeInstallation() *v1.RevokeInstallationRequest {
 	return nil
 }
 
+func (x *ClientEnvelope) GetIdentityUpdate() *associations.IdentityUpdate {
+	if x, ok := x.GetPayload().(*ClientEnvelope_IdentityUpdate); ok {
+		return x.IdentityUpdate
+	}
+	return nil
+}
+
 func (x *ClientEnvelope) GetAad() *AuthenticatedData {
 	if x != nil {
 		return x.Aad
@@ -315,6 +317,10 @@ type ClientEnvelope_RevokeInstallation struct {
 	RevokeInstallation *v1.RevokeInstallationRequest `protobuf:"bytes,5,opt,name=revoke_installation,json=revokeInstallation,proto3,oneof"`
 }
 
+type ClientEnvelope_IdentityUpdate struct {
+	IdentityUpdate *associations.IdentityUpdate `protobuf:"bytes,7,opt,name=identity_update,json=identityUpdate,proto3,oneof"`
+}
+
 func (*ClientEnvelope_GroupMessage) isClientEnvelope_Payload() {}
 
 func (*ClientEnvelope_WelcomeMessage) isClientEnvelope_Payload() {}
@@ -325,6 +331,8 @@ func (*ClientEnvelope_UploadKeyPackage) isClientEnvelope_Payload() {}
 
 func (*ClientEnvelope_RevokeInstallation) isClientEnvelope_Payload() {}
 
+func (*ClientEnvelope_IdentityUpdate) isClientEnvelope_Payload() {}
+
 // Wraps client envelope with payer signature
 type PayerEnvelope struct {
 	state         protoimpl.MessageState
@@ -337,11 +345,9 @@ type PayerEnvelope struct {
 
 func (x *PayerEnvelope) Reset() {
 	*x = PayerEnvelope{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PayerEnvelope) String() string {
@@ -352,7 +358,7 @@ func (*PayerEnvelope) ProtoMessage() {}
 
 func (x *PayerEnvelope) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -396,11 +402,9 @@ type UnsignedOriginatorEnvelope struct {
 
 func (x *UnsignedOriginatorEnvelope) Reset() {
 	*x = UnsignedOriginatorEnvelope{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UnsignedOriginatorEnvelope) String() string {
@@ -411,7 +415,7 @@ func (*UnsignedOriginatorEnvelope) ProtoMessage() {}
 
 func (x *UnsignedOriginatorEnvelope) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -466,11 +470,9 @@ type BlockchainProof struct {
 
 func (x *BlockchainProof) Reset() {
 	*x = BlockchainProof{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *BlockchainProof) String() string {
@@ -481,7 +483,7 @@ func (*BlockchainProof) ProtoMessage() {}
 
 func (x *BlockchainProof) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -526,11 +528,9 @@ type OriginatorEnvelope struct {
 
 func (x *OriginatorEnvelope) Reset() {
 	*x = OriginatorEnvelope{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *OriginatorEnvelope) String() string {
@@ -541,7 +541,7 @@ func (*OriginatorEnvelope) ProtoMessage() {}
 
 func (x *OriginatorEnvelope) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -612,11 +612,9 @@ type MisbehaviorReport struct {
 
 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)
-	}
+	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 {
@@ -627,7 +625,7 @@ func (*MisbehaviorReport) ProtoMessage() {}
 
 func (x *MisbehaviorReport) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -672,11 +670,9 @@ type EnvelopesQuery struct {
 
 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)
-	}
+	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 {
@@ -687,7 +683,7 @@ func (*EnvelopesQuery) ProtoMessage() {}
 
 func (x *EnvelopesQuery) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -759,11 +755,9 @@ type BatchSubscribeEnvelopesRequest struct {
 
 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)
-	}
+	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 {
@@ -774,7 +768,7 @@ func (*BatchSubscribeEnvelopesRequest) ProtoMessage() {}
 
 func (x *BatchSubscribeEnvelopesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -807,11 +801,9 @@ type BatchSubscribeEnvelopesResponse struct {
 
 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)
-	}
+	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 {
@@ -822,7 +814,7 @@ func (*BatchSubscribeEnvelopesResponse) ProtoMessage() {}
 
 func (x *BatchSubscribeEnvelopesResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -856,11 +848,9 @@ type QueryEnvelopesRequest struct {
 
 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)
-	}
+	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 {
@@ -871,7 +861,7 @@ func (*QueryEnvelopesRequest) ProtoMessage() {}
 
 func (x *QueryEnvelopesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -911,11 +901,9 @@ type QueryEnvelopesResponse struct {
 
 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)
-	}
+	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 {
@@ -926,7 +914,7 @@ func (*QueryEnvelopesResponse) ProtoMessage() {}
 
 func (x *QueryEnvelopesResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -958,11 +946,9 @@ type PublishEnvelopeRequest struct {
 
 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)
-	}
+	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 {
@@ -973,7 +959,7 @@ func (*PublishEnvelopeRequest) ProtoMessage() {}
 
 func (x *PublishEnvelopeRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1005,11 +991,9 @@ type PublishEnvelopeResponse struct {
 
 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)
-	}
+	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 {
@@ -1020,7 +1004,7 @@ func (*PublishEnvelopeResponse) ProtoMessage() {}
 
 func (x *PublishEnvelopeResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1053,11 +1037,9 @@ type GetInboxIdsRequest struct {
 
 func (x *GetInboxIdsRequest) Reset() {
 	*x = GetInboxIdsRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[15]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetInboxIdsRequest) String() string {
@@ -1068,7 +1050,7 @@ func (*GetInboxIdsRequest) ProtoMessage() {}
 
 func (x *GetInboxIdsRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1101,11 +1083,9 @@ type GetInboxIdsResponse struct {
 
 func (x *GetInboxIdsResponse) Reset() {
 	*x = GetInboxIdsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[16]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetInboxIdsResponse) String() string {
@@ -1116,7 +1096,7 @@ func (*GetInboxIdsResponse) ProtoMessage() {}
 
 func (x *GetInboxIdsResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1149,11 +1129,9 @@ type BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest struct {
 
 func (x *BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest) Reset() {
 	*x = BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[18]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[18]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest) String() string {
@@ -1164,7 +1142,7 @@ func (*BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest) ProtoMessage()
 
 func (x *BatchSubscribeEnvelopesRequest_SubscribeEnvelopesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[18]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1197,11 +1175,9 @@ type GetInboxIdsRequest_Request struct {
 
 func (x *GetInboxIdsRequest_Request) Reset() {
 	*x = GetInboxIdsRequest_Request{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[19]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[19]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetInboxIdsRequest_Request) String() string {
@@ -1212,7 +1188,7 @@ func (*GetInboxIdsRequest_Request) ProtoMessage() {}
 
 func (x *GetInboxIdsRequest_Request) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[19]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1246,11 +1222,9 @@ type GetInboxIdsResponse_Response struct {
 
 func (x *GetInboxIdsResponse_Response) Reset() {
 	*x = GetInboxIdsResponse_Response{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[20]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[20]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GetInboxIdsResponse_Response) String() string {
@@ -1261,7 +1235,7 @@ func (*GetInboxIdsResponse_Response) ProtoMessage() {}
 
 func (x *GetInboxIdsResponse_Response) ProtoReflect() protoreflect.Message {
 	mi := &file_xmtpv4_message_api_message_api_proto_msgTypes[20]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1298,61 +1272,69 @@ var file_xmtpv4_message_api_message_api_proto_rawDesc = []byte{
 	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, 0xba,
-	0x01, 0x0a, 0x0b, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x43, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x64,
-	0x0a, 0x16, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x69, 0x64, 0x5f, 0x74, 0x6f, 0x5f, 0x73, 0x65, 0x71,
-	0x75, 0x65, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30,
-	0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x56, 0x65, 0x63,
-	0x74, 0x6f, 0x72, 0x43, 0x6c, 0x6f, 0x63, 0x6b, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x54,
-	0x6f, 0x53, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x12, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x54, 0x6f, 0x53, 0x65, 0x71, 0x75, 0x65, 0x6e,
-	0x63, 0x65, 0x49, 0x64, 0x1a, 0x45, 0x0a, 0x17, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x54, 0x6f,
-	0x53, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x9a, 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, 0x35, 0x0a, 0x09, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x73, 0x65, 0x65, 0x6e, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70,
-	0x76, 0x34, 0x2e, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x43, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x08,
-	0x6c, 0x61, 0x73, 0x74, 0x53, 0x65, 0x65, 0x6e, 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,
+	0x6f, 0x1a, 0x27, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2f, 0x61, 0x73, 0x73, 0x6f,
+	0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 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, 0xba, 0x01, 0x0a, 0x0b, 0x56, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x43, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x64, 0x0a, 0x16, 0x6e, 0x6f, 0x64, 0x65, 0x5f,
+	0x69, 0x64, 0x5f, 0x74, 0x6f, 0x5f, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x5f, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78,
+	0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x43, 0x6c, 0x6f, 0x63,
+	0x6b, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x54, 0x6f, 0x53, 0x65, 0x71, 0x75, 0x65, 0x6e,
+	0x63, 0x65, 0x49, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x12, 0x6e, 0x6f, 0x64, 0x65, 0x49,
+	0x64, 0x54, 0x6f, 0x53, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x1a, 0x45, 0x0a,
+	0x17, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x54, 0x6f, 0x53, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63,
+	0x65, 0x49, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x3a, 0x02, 0x38, 0x01, 0x22, 0x9a, 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, 0x35, 0x0a, 0x09, 0x6c, 0x61,
+	0x73, 0x74, 0x5f, 0x73, 0x65, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e,
+	0x78, 0x6d, 0x74, 0x70, 0x2e, 0x78, 0x6d, 0x74, 0x70, 0x76, 0x34, 0x2e, 0x56, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x43, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x53, 0x65, 0x65,
+	0x6e, 0x22, 0xde, 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, 0x55,
+	0x0a, 0x0f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 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, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x0e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 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,
@@ -1590,7 +1572,8 @@ var file_xmtpv4_message_api_message_api_proto_goTypes = []any{
 	(*v1.RegisterInstallationRequest)(nil),                           // 24: xmtp.mls.api.v1.RegisterInstallationRequest
 	(*v1.UploadKeyPackageRequest)(nil),                               // 25: xmtp.mls.api.v1.UploadKeyPackageRequest
 	(*v1.RevokeInstallationRequest)(nil),                             // 26: xmtp.mls.api.v1.RevokeInstallationRequest
-	(*associations.RecoverableEcdsaSignature)(nil),                   // 27: xmtp.identity.associations.RecoverableEcdsaSignature
+	(*associations.IdentityUpdate)(nil),                              // 27: xmtp.identity.associations.IdentityUpdate
+	(*associations.RecoverableEcdsaSignature)(nil),                   // 28: xmtp.identity.associations.RecoverableEcdsaSignature
 }
 var file_xmtpv4_message_api_message_api_proto_depIdxs = []int32{
 	18, // 0: xmtp.xmtpv4.VectorClock.node_id_to_sequence_id:type_name -> xmtp.xmtpv4.VectorClock.NodeIdToSequenceIdEntry
@@ -1600,36 +1583,37 @@ var file_xmtpv4_message_api_message_api_proto_depIdxs = []int32{
 	24, // 4: xmtp.xmtpv4.ClientEnvelope.register_installation:type_name -> xmtp.mls.api.v1.RegisterInstallationRequest
 	25, // 5: xmtp.xmtpv4.ClientEnvelope.upload_key_package:type_name -> xmtp.mls.api.v1.UploadKeyPackageRequest
 	26, // 6: xmtp.xmtpv4.ClientEnvelope.revoke_installation:type_name -> xmtp.mls.api.v1.RevokeInstallationRequest
-	2,  // 7: xmtp.xmtpv4.ClientEnvelope.aad:type_name -> xmtp.xmtpv4.AuthenticatedData
-	27, // 8: xmtp.xmtpv4.PayerEnvelope.payer_signature:type_name -> xmtp.identity.associations.RecoverableEcdsaSignature
-	4,  // 9: xmtp.xmtpv4.UnsignedOriginatorEnvelope.payer_envelope:type_name -> xmtp.xmtpv4.PayerEnvelope
-	27, // 10: xmtp.xmtpv4.OriginatorEnvelope.originator_signature:type_name -> xmtp.identity.associations.RecoverableEcdsaSignature
-	6,  // 11: xmtp.xmtpv4.OriginatorEnvelope.blockchain_proof:type_name -> xmtp.xmtpv4.BlockchainProof
-	0,  // 12: xmtp.xmtpv4.MisbehaviorReport.type:type_name -> xmtp.xmtpv4.Misbehavior
-	7,  // 13: xmtp.xmtpv4.MisbehaviorReport.envelopes:type_name -> xmtp.xmtpv4.OriginatorEnvelope
-	1,  // 14: xmtp.xmtpv4.EnvelopesQuery.last_seen:type_name -> xmtp.xmtpv4.VectorClock
-	19, // 15: xmtp.xmtpv4.BatchSubscribeEnvelopesRequest.requests:type_name -> xmtp.xmtpv4.BatchSubscribeEnvelopesRequest.SubscribeEnvelopesRequest
-	7,  // 16: xmtp.xmtpv4.BatchSubscribeEnvelopesResponse.envelopes:type_name -> xmtp.xmtpv4.OriginatorEnvelope
-	9,  // 17: xmtp.xmtpv4.QueryEnvelopesRequest.query:type_name -> xmtp.xmtpv4.EnvelopesQuery
-	7,  // 18: xmtp.xmtpv4.QueryEnvelopesResponse.envelopes:type_name -> xmtp.xmtpv4.OriginatorEnvelope
-	4,  // 19: xmtp.xmtpv4.PublishEnvelopeRequest.payer_envelope:type_name -> xmtp.xmtpv4.PayerEnvelope
-	7,  // 20: xmtp.xmtpv4.PublishEnvelopeResponse.originator_envelope:type_name -> xmtp.xmtpv4.OriginatorEnvelope
-	20, // 21: xmtp.xmtpv4.GetInboxIdsRequest.requests:type_name -> xmtp.xmtpv4.GetInboxIdsRequest.Request
-	21, // 22: xmtp.xmtpv4.GetInboxIdsResponse.responses:type_name -> xmtp.xmtpv4.GetInboxIdsResponse.Response
-	9,  // 23: xmtp.xmtpv4.BatchSubscribeEnvelopesRequest.SubscribeEnvelopesRequest.query:type_name -> xmtp.xmtpv4.EnvelopesQuery
-	10, // 24: xmtp.xmtpv4.ReplicationApi.BatchSubscribeEnvelopes:input_type -> xmtp.xmtpv4.BatchSubscribeEnvelopesRequest
-	12, // 25: xmtp.xmtpv4.ReplicationApi.QueryEnvelopes:input_type -> xmtp.xmtpv4.QueryEnvelopesRequest
-	14, // 26: xmtp.xmtpv4.ReplicationApi.PublishEnvelope:input_type -> xmtp.xmtpv4.PublishEnvelopeRequest
-	16, // 27: xmtp.xmtpv4.ReplicationApi.GetInboxIds:input_type -> xmtp.xmtpv4.GetInboxIdsRequest
-	11, // 28: xmtp.xmtpv4.ReplicationApi.BatchSubscribeEnvelopes:output_type -> xmtp.xmtpv4.BatchSubscribeEnvelopesResponse
-	13, // 29: xmtp.xmtpv4.ReplicationApi.QueryEnvelopes:output_type -> xmtp.xmtpv4.QueryEnvelopesResponse
-	15, // 30: xmtp.xmtpv4.ReplicationApi.PublishEnvelope:output_type -> xmtp.xmtpv4.PublishEnvelopeResponse
-	17, // 31: xmtp.xmtpv4.ReplicationApi.GetInboxIds:output_type -> xmtp.xmtpv4.GetInboxIdsResponse
-	28, // [28:32] is the sub-list for method output_type
-	24, // [24:28] is the sub-list for method input_type
-	24, // [24:24] is the sub-list for extension type_name
-	24, // [24:24] is the sub-list for extension extendee
-	0,  // [0:24] is the sub-list for field type_name
+	27, // 7: xmtp.xmtpv4.ClientEnvelope.identity_update:type_name -> xmtp.identity.associations.IdentityUpdate
+	2,  // 8: xmtp.xmtpv4.ClientEnvelope.aad:type_name -> xmtp.xmtpv4.AuthenticatedData
+	28, // 9: xmtp.xmtpv4.PayerEnvelope.payer_signature:type_name -> xmtp.identity.associations.RecoverableEcdsaSignature
+	4,  // 10: xmtp.xmtpv4.UnsignedOriginatorEnvelope.payer_envelope:type_name -> xmtp.xmtpv4.PayerEnvelope
+	28, // 11: xmtp.xmtpv4.OriginatorEnvelope.originator_signature:type_name -> xmtp.identity.associations.RecoverableEcdsaSignature
+	6,  // 12: xmtp.xmtpv4.OriginatorEnvelope.blockchain_proof:type_name -> xmtp.xmtpv4.BlockchainProof
+	0,  // 13: xmtp.xmtpv4.MisbehaviorReport.type:type_name -> xmtp.xmtpv4.Misbehavior
+	7,  // 14: xmtp.xmtpv4.MisbehaviorReport.envelopes:type_name -> xmtp.xmtpv4.OriginatorEnvelope
+	1,  // 15: xmtp.xmtpv4.EnvelopesQuery.last_seen:type_name -> xmtp.xmtpv4.VectorClock
+	19, // 16: xmtp.xmtpv4.BatchSubscribeEnvelopesRequest.requests:type_name -> xmtp.xmtpv4.BatchSubscribeEnvelopesRequest.SubscribeEnvelopesRequest
+	7,  // 17: xmtp.xmtpv4.BatchSubscribeEnvelopesResponse.envelopes:type_name -> xmtp.xmtpv4.OriginatorEnvelope
+	9,  // 18: xmtp.xmtpv4.QueryEnvelopesRequest.query:type_name -> xmtp.xmtpv4.EnvelopesQuery
+	7,  // 19: xmtp.xmtpv4.QueryEnvelopesResponse.envelopes:type_name -> xmtp.xmtpv4.OriginatorEnvelope
+	4,  // 20: xmtp.xmtpv4.PublishEnvelopeRequest.payer_envelope:type_name -> xmtp.xmtpv4.PayerEnvelope
+	7,  // 21: xmtp.xmtpv4.PublishEnvelopeResponse.originator_envelope:type_name -> xmtp.xmtpv4.OriginatorEnvelope
+	20, // 22: xmtp.xmtpv4.GetInboxIdsRequest.requests:type_name -> xmtp.xmtpv4.GetInboxIdsRequest.Request
+	21, // 23: xmtp.xmtpv4.GetInboxIdsResponse.responses:type_name -> xmtp.xmtpv4.GetInboxIdsResponse.Response
+	9,  // 24: xmtp.xmtpv4.BatchSubscribeEnvelopesRequest.SubscribeEnvelopesRequest.query:type_name -> xmtp.xmtpv4.EnvelopesQuery
+	10, // 25: xmtp.xmtpv4.ReplicationApi.BatchSubscribeEnvelopes:input_type -> xmtp.xmtpv4.BatchSubscribeEnvelopesRequest
+	12, // 26: xmtp.xmtpv4.ReplicationApi.QueryEnvelopes:input_type -> xmtp.xmtpv4.QueryEnvelopesRequest
+	14, // 27: xmtp.xmtpv4.ReplicationApi.PublishEnvelope:input_type -> xmtp.xmtpv4.PublishEnvelopeRequest
+	16, // 28: xmtp.xmtpv4.ReplicationApi.GetInboxIds:input_type -> xmtp.xmtpv4.GetInboxIdsRequest
+	11, // 29: xmtp.xmtpv4.ReplicationApi.BatchSubscribeEnvelopes:output_type -> xmtp.xmtpv4.BatchSubscribeEnvelopesResponse
+	13, // 30: xmtp.xmtpv4.ReplicationApi.QueryEnvelopes:output_type -> xmtp.xmtpv4.QueryEnvelopesResponse
+	15, // 31: xmtp.xmtpv4.ReplicationApi.PublishEnvelope:output_type -> xmtp.xmtpv4.PublishEnvelopeResponse
+	17, // 32: xmtp.xmtpv4.ReplicationApi.GetInboxIds:output_type -> xmtp.xmtpv4.GetInboxIdsResponse
+	29, // [29:33] is the sub-list for method output_type
+	25, // [25:29] is the sub-list for method input_type
+	25, // [25:25] is the sub-list for extension type_name
+	25, // [25:25] is the sub-list for extension extendee
+	0,  // [0:25] is the sub-list for field type_name
 }
 
 func init() { file_xmtpv4_message_api_message_api_proto_init() }
@@ -1637,254 +1621,13 @@ 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.(*VectorClock); 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.(*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[2].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[3].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[4].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[5].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[6].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[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.(*GetInboxIdsRequest); 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[16].Exporter = func(v any, i int) any {
-			switch v := v.(*GetInboxIdsResponse); 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[18].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[19].Exporter = func(v any, i int) any {
-			switch v := v.(*GetInboxIdsRequest_Request); 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[20].Exporter = func(v any, i int) any {
-			switch v := v.(*GetInboxIdsResponse_Response); 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].OneofWrappers = []any{
 		(*ClientEnvelope_GroupMessage)(nil),
 		(*ClientEnvelope_WelcomeMessage)(nil),
 		(*ClientEnvelope_RegisterInstallation)(nil),
 		(*ClientEnvelope_UploadKeyPackage)(nil),
 		(*ClientEnvelope_RevokeInstallation)(nil),
+		(*ClientEnvelope_IdentityUpdate)(nil),
 	}
 	file_xmtpv4_message_api_message_api_proto_msgTypes[6].OneofWrappers = []any{
 		(*OriginatorEnvelope_OriginatorSignature)(nil),