Merge pull request #124 from xmtp/jazzz/revert-bundle-versioning

Revert "Merge pull request #121 from xmtp/jazzz/bundle-versioning"

src/Client.ts

@@ -25,7 +25,6 @@ import {
 import { decompress, compress } from './Compression'
 import { Compression } from './proto/messaging'
 import * as proto from './proto/messaging'
-import ContactBundle from './ContactBundle'
 
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -196,12 +195,10 @@ export default class Client {
       callback: (msgs: WakuMessage[]) => {
         for (const msg of msgs) {
           if (!msg.payload) continue
-          const bundle = ContactBundle.fromBytes(msg.payload as Uint8Array)
-          const keyBundle = bundle.keyBundle
-
-          const address = keyBundle?.walletSignatureAddress()
+          const bundle = PublicKeyBundle.fromBytes(msg.payload as Uint8Array)
+          const address = bundle.walletSignatureAddress()
           if (address === peerAddress) {
-            recipientKey = keyBundle
+            recipientKey = bundle
             break
           }
         }

src/crypto/PrivateKeyBundle.ts

@@ -11,7 +11,7 @@ import { NoMatchingPreKeyError } from './errors'
 // PrivateKeyBundle bundles the private keys corresponding to a PublicKeyBundle for convenience.
 // This bundle must not be shared with anyone, although will have to be persisted
 // somehow so that older messages can be decrypted again.
-export default class PrivateKeyBundle implements proto.PrivateKeyBundleV1 {
+export default class PrivateKeyBundle implements proto.PrivateKeyBundle {
   identityKey: PrivateKey
   preKeys: PrivateKey[]
 
@@ -121,21 +121,17 @@ export default class PrivateKeyBundle implements proto.PrivateKeyBundleV1 {
       throw new Error('missing identity key')
     }
     const bytes = proto.PrivateKeyBundle.encode({
-      v1: {
-        identityKey: this.identityKey,
-        preKeys: this.preKeys,
-      },
+      identityKey: this.identityKey,
+      preKeys: this.preKeys,
     }).finish()
     const wPreKey = getRandomValues(new Uint8Array(32))
     const secret = hexToBytes(
       await wallet.signMessage(PrivateKeyBundle.storageSigRequestText(wPreKey))
     )
     const ciphertext = await encrypt(bytes, secret)
     return proto.EncryptedPrivateKeyBundle.encode({
-      v1: {
-        walletPreKey: wPreKey,
-        ciphertext,
-      },
+      walletPreKey: wPreKey,
+      ciphertext,
     }).finish()
   }
 
@@ -145,29 +141,29 @@ export default class PrivateKeyBundle implements proto.PrivateKeyBundleV1 {
     bytes: Uint8Array
   ): Promise<PrivateKeyBundle> {
     const encrypted = proto.EncryptedPrivateKeyBundle.decode(bytes)
-    if (!encrypted.v1?.walletPreKey) {
+    if (!encrypted.walletPreKey) {
       throw new Error('missing wallet pre-key')
     }
     const secret = hexToBytes(
       await wallet.signMessage(
-        PrivateKeyBundle.storageSigRequestText(encrypted.v1.walletPreKey)
+        PrivateKeyBundle.storageSigRequestText(encrypted.walletPreKey)
       )
     )
-    if (!encrypted.v1?.ciphertext?.aes256GcmHkdfSha256) {
+    if (!encrypted.ciphertext?.aes256GcmHkdfSha256) {
       throw new Error('missing bundle ciphertext')
     }
-    const ciphertext = new Ciphertext(encrypted.v1.ciphertext)
+    const ciphertext = new Ciphertext(encrypted.ciphertext)
     const decrypted = await decrypt(ciphertext, secret)
     const bundle = proto.PrivateKeyBundle.decode(decrypted)
-    if (!bundle.v1?.identityKey) {
+    if (!bundle.identityKey) {
       throw new Error('missing identity key')
     }
-    if (bundle.v1?.preKeys.length === 0) {
+    if (bundle.preKeys.length === 0) {
       throw new Error('missing pre-keys')
     }
     return new PrivateKeyBundle(
-      new PrivateKey(bundle.v1.identityKey),
-      bundle.v1.preKeys.map((protoKey) => new PrivateKey(protoKey))
+      new PrivateKey(bundle.identityKey),
+      bundle.preKeys.map((protoKey) => new PrivateKey(protoKey))
     )
   }
 }

src/proto/messaging.proto

@@ -32,16 +32,6 @@ message PublicKeyBundle {
   PublicKey preKey = 2;
 }
 
-message ContactBundleV1 {
-  PublicKeyBundle keyBundle = 1;
-}
-
-message ContactBundle {
-  oneof version {
-    ContactBundleV1 v1 = 1;
-  }
-}
-
 // ContentTypeId is used to identify the type of content stored in a Message.
 message ContentTypeId {
   string authorityId = 1;  // authority governing this content type

src/proto/private_key.proto

@@ -18,24 +18,12 @@ message PrivateKey {
   PublicKey publicKey = 3;
 }
 
-message PrivateKeyBundleV1 {
+message PrivateKeyBundle {
   PrivateKey identityKey = 1;
   repeated PrivateKey preKeys = 2;
 }
 
-message PrivateKeyBundle {
-   oneof version {
-      PrivateKeyBundleV1 v1 = 1;
-  }
-}
-
-message EncryptedPrivateKeyBundleV1 {
+message EncryptedPrivateKeyBundle {
   bytes walletPreKey = 1;
   Ciphertext ciphertext = 2;
 }
-
-message EncryptedPrivateKeyBundle {
-   oneof version {
-      EncryptedPrivateKeyBundleV1 v1 = 1;
-  }
-}