[DO NOT MERGE] Decentralised MLS proof-of-concept

package.json

@@ -82,6 +82,7 @@
         "@babel/register": "^7.12.10",
         "@casualbot/jest-sonar-reporter": "^2.2.5",
         "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz",
+        "@matrix-org/matrix-dmls-wasm": "https://gitlab.matrix.org/api/v4/projects/876/packages/npm/@matrix-org/matrix-dmls-wasm/-/@matrix-org/matrix-dmls-wasm-0.0.4.tgz",
         "@types/bs58": "^4.0.1",
         "@types/content-type": "^1.1.5",
         "@types/debug": "^4.1.7",

src/client.ts

@@ -21,6 +21,7 @@ limitations under the License.
 import { Optional } from "matrix-events-sdk";
 
 import type { IDeviceKeys, IMegolmSessionData, IOneTimeKey } from "./@types/crypto";
+import type { IMlsSessionData } from "./crypto/algorithms/dmls";
 import { ISyncStateData, SyncApi, SyncApiOptions, SyncState } from "./sync";
 import {
     EventStatus,
@@ -3105,7 +3106,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
      *
      * @returns a promise which resolves when the keys have been imported
      */
-    public importRoomKeys(keys: IMegolmSessionData[], opts?: IImportRoomKeysOpts): Promise<void> {
+    public importRoomKeys(keys: IMlsSessionData[], opts?: IImportRoomKeysOpts): Promise<void> {
         if (!this.crypto) {
             throw new Error("End-to-end encryption disabled");
         }
@@ -3640,7 +3641,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
         }
 
         let totalKeyCount = 0;
-        let keys: IMegolmSessionData[] = [];
+        let keys: IMlsSessionData[] = [];
 
         const path = this.makeKeyBackupPath(targetRoomId!, targetSessionId!, backupInfo.version);
 
@@ -3706,8 +3707,8 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
                     const [key] = await algorithm.decryptSessions({
                         [targetSessionId!]: res as IKeyBackupSession,
                     });
-                    key.room_id = targetRoomId!;
-                    key.session_id = targetSessionId!;
+                    const [epochNum, epochCreator] = targetSessionId!.split("|");
+                    key.epoch = [parseInt(epochNum), epochCreator];
                     keys.push(key);
                 } catch (e) {
                     logger.log("Failed to decrypt megolm session from backup", e);

src/crypto/algorithms/base.ts

@@ -18,7 +18,7 @@ limitations under the License.
  * Internal module. Defines the base classes of the encryption implementations
  */
 
-import type { IMegolmSessionData } from "../../@types/crypto";
+import type { IMlsSessionData } from "./dmls";
 import { MatrixClient } from "../../client";
 import { Room } from "../../models/room";
 import { OlmDevice } from "../OlmDevice";
@@ -161,7 +161,7 @@ export abstract class DecryptionAlgorithm {
      *
      * @param opts - object
      */
-    public async importRoomKey(session: IMegolmSessionData, opts: object): Promise<void> {
+    public async importRoomKey(session: IMlsSessionData, opts: object): Promise<void> {
         // ignore by default
     }