Merge pull request #125 from xmtp/rich/legacy-create-identity-associa…

…tion Adds the option for v3 keys to be signed by v2 keys, to avoid additional wallet signatures on clients that already have a signed v2 key.
xmtp · Jan 11, 2024 · 2769931 · 2769931
2 parents 65bf2b2 + 059ce56
commit 2769931
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 21 deletions.
diff --git a/go/keystore_api/v1/keystore.pb.go b/go/keystore_api/v1/keystore.pb.go
diff --git a/go/message_api/v1/authn.pb.go b/go/message_api/v1/authn.pb.go
diff --git a/go/message_api/v1/message_api.pb.go b/go/message_api/v1/message_api.pb.go
diff --git a/go/message_api/v1/message_api_grpc.pb.go b/go/message_api/v1/message_api_grpc.pb.go
diff --git a/go/message_contents/ciphertext.pb.go b/go/message_contents/ciphertext.pb.go
diff --git a/go/message_contents/composite.pb.go b/go/message_contents/composite.pb.go
diff --git a/go/message_contents/contact.pb.go b/go/message_contents/contact.pb.go
diff --git a/go/message_contents/content.pb.go b/go/message_contents/content.pb.go
diff --git a/go/message_contents/conversation_reference.pb.go b/go/message_contents/conversation_reference.pb.go
diff --git a/go/message_contents/invitation.pb.go b/go/message_contents/invitation.pb.go
diff --git a/go/message_contents/message.pb.go b/go/message_contents/message.pb.go
diff --git a/go/message_contents/private_key.pb.go b/go/message_contents/private_key.pb.go
diff --git a/go/message_contents/public_key.pb.go b/go/message_contents/public_key.pb.go
diff --git a/go/message_contents/signature.pb.go b/go/message_contents/signature.pb.go
diff --git a/go/mls/api/v1/mls.pb.go b/go/mls/api/v1/mls.pb.go
diff --git a/go/mls/api/v1/mls_grpc.pb.go b/go/mls/api/v1/mls_grpc.pb.go
diff --git a/go/mls/message_contents/message.pb.go b/go/mls/message_contents/message.pb.go
diff --git a/go/mls_validation/v1/service.pb.go b/go/mls_validation/v1/service.pb.go
diff --git a/go/mls_validation/v1/service_grpc.pb.go b/go/mls_validation/v1/service_grpc.pb.go
diff --git a/proto/mls/message_contents/association.proto b/proto/mls/message_contents/association.proto
@@ -3,6 +3,8 @@ syntax = "proto3";
 
 package xmtp.mls.message_contents;
 
+import "message_contents/public_key.proto";
+
 option go_package = "github.com/xmtp/proto/v3/go/mls/message_contents";
 option java_package = "org.xmtp.proto.mls.message.contents";
 
@@ -21,6 +23,14 @@ message Eip191Association {
   string iso8601_time = 4;
 }
 
+// LegacyCreateIdentityAssociation is used when a v3 installation key
+// is signed by a v2 identity key, which in turn is signed via a
+// 'CreateIdentity' wallet signature
+message LegacyCreateIdentityAssociation {
+  RecoverableEcdsaSignature signature = 1;
+  xmtp.message_contents.SignedPublicKey signed_legacy_create_identity_key = 2;
+}
+
 // RecoverableEcdsaSignature
 message RecoverableEcdsaSignature {
   // Includes recovery id as the last byte

diff --git a/proto/mls/message_contents/credential.proto b/proto/mls/message_contents/credential.proto
@@ -13,13 +13,17 @@ message MlsCredential {
   bytes installation_public_key = 1;
   oneof association {
     Eip191Association eip_191 = 2;
+    LegacyCreateIdentityAssociation legacy_create_identity = 3;
   }
 }
 
 // A declaration and proof that a credential is no longer valid
 message CredentialRevocation {
-  bytes installation_public_key = 1;
+  oneof public_key {
+    bytes installation_key = 1;
+    bytes unsigned_legacy_create_identity_key = 2;
+  }
   oneof association {
-    Eip191Association eip_191 = 2;
+    Eip191Association eip_191 = 3;
   }
 }