Merge branch 'develop' into justjanne/feat/thread-list-api-proof-of-concept

Author: justjanne

CHANGELOG.md

@@ -1,3 +1,9 @@
+Changes in [20.0.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v20.0.0) (2022-09-28)
+==================================================================================================
+
+## 🚨 BREAKING CHANGES
+ * Bump IDB crypto store version ([\#2705](https://github.com/matrix-org/matrix-js-sdk/pull/2705)).
+
 Changes in [19.7.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v19.7.0) (2022-09-28)
 ==================================================================================================
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-js-sdk",
-  "version": "19.7.0",
+  "version": "20.0.0",
   "description": "Matrix Client-Server SDK for Javascript",
   "engines": {
     "node": ">=12.9.0"

spec/unit/crypto/secrets.spec.ts

@@ -251,7 +251,6 @@ describe("Secrets", function() {
 
         osborne2.client.crypto.deviceList.storeDevicesForUser("@alice:example.com", {
             "VAX": {
-                verified: 0,
                 known: false,
                 algorithms: [olmlib.OLM_ALGORITHM, olmlib.MEGOLM_ALGORITHM],
                 keys: {

spec/unit/crypto/verification/sas.spec.ts

@@ -573,7 +573,7 @@ describe("SAS verification", function() {
                     null,
                     null,
                     { "ed25519:Dynabook": "bob+base64+ed25519+key" },
-            );
+                );
             expect(bob.client.crypto.setDeviceVerification)
                 .toHaveBeenCalledWith(
                     alice.client.getUserId(),
@@ -582,7 +582,7 @@ describe("SAS verification", function() {
                     null,
                     null,
                     { "ed25519:Osborne2": "alice+base64+ed25519+key" },
-            );
+                );
         });
     });
 });

spec/unit/models/beacon.spec.ts

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { REFERENCE_RELATION } from "matrix-events-sdk";
+
 import { MatrixEvent } from "../../../src";
 import { M_BEACON_INFO } from "../../../src/@types/beacon";
 import {
@@ -22,7 +24,6 @@ import {
     BeaconEvent,
 } from "../../../src/models/beacon";
 import { makeBeaconEvent, makeBeaconInfoEvent } from "../../test-utils/beacon";
-import { REFERENCE_RELATION } from "matrix-events-sdk";
 
 jest.useFakeTimers();
 

src/crypto/store/indexeddb-crypto-store-backend.ts

@@ -34,7 +34,7 @@ import { IRoomEncryption } from "../RoomList";
 import { InboundGroupSessionData } from "../OlmDevice";
 import { IEncryptedPayload } from "../aes";
 
-export const VERSION = 10;
+export const VERSION = 11;
 const PROFILE_TRANSACTIONS = false;
 
 /**