matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-07-30 04:23:07 +03:00
Code Activity

Element-R: Add the git sha of the binding crate to CryptoApi#getVersion (#3838)

Browse Source 
* Update `@matrix-org/matrix-sdk-crypto-wasm` to `v2.2.0`

* Add the git sha of the binding crate to `CryptoApi#getVersions`
This commit is contained in:
Florian Duros
2023-10-31 10:15:14 +01:00
committed by GitHub
parent e0dacf7529
commit 1cd8bed705
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -51,7 +51,7 @@
], ],
"dependencies": { "dependencies": {
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
"@matrix-org/matrix-sdk-crypto-wasm": "^2.1.1", "@matrix-org/matrix-sdk-crypto-wasm": "^2.2.0",
"another-json": "^0.2.0", "another-json": "^0.2.0",
"bs58": "^5.0.0", "bs58": "^5.0.0",
"content-type": "^1.0.4", "content-type": "^1.0.4",

4
spec/unit/rust-crypto/rust-crypto.spec.ts
View File

@ -135,7 +135,9 @@ describe("RustCrypto", () => {
it("getVersion() should return the current version of the rust sdk and vodozemac", async () => { it("getVersion() should return the current version of the rust sdk and vodozemac", async () => {
const rustCrypto = await makeTestRustCrypto(); const rustCrypto = await makeTestRustCrypto();
const versions = RustSdkCryptoJs.getVersions(); const versions = RustSdkCryptoJs.getVersions();
expect(rustCrypto.getVersion()).toBe(`Rust SDK ${versions.matrix_sdk_crypto}, Vodozemac ${versions.vodozemac}`); expect(rustCrypto.getVersion()).toBe(
`Rust SDK ${versions.matrix_sdk_crypto} (${versions.git_sha}), Vodozemac ${versions.vodozemac}`,
);
}); });
describe(".importRoomKeys and .exportRoomKeys", () => { describe(".importRoomKeys and .exportRoomKeys", () => {

2
src/crypto-api.ts
View File

@ -41,7 +41,7 @@ export interface CryptoApi {
/** /**
* Return the current version of the crypto module. * Return the current version of the crypto module.
* For example: `Rust SDK ${versions.matrix_sdk_crypto}, Vodozemac ${versions.vodozemac}`. * For example: `Rust SDK ${versions.matrix_sdk_crypto} (${versions.git_sha}), Vodozemac ${versions.vodozemac}`.
* @returns the formatted version * @returns the formatted version
*/ */
getVersion(): string; getVersion(): string;

2
src/rust-crypto/rust-crypto.ts
View File

@ -369,7 +369,7 @@ export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, RustCryptoEv
*/ */
public getVersion(): string { public getVersion(): string {
const versions = RustSdkCryptoJs.getVersions(); const versions = RustSdkCryptoJs.getVersions();
return `Rust SDK ${versions.matrix_sdk_crypto}, Vodozemac ${versions.vodozemac}`; return `Rust SDK ${versions.matrix_sdk_crypto} (${versions.git_sha}), Vodozemac ${versions.vodozemac}`;
} }
public prepareToEncrypt(room: Room): void { public prepareToEncrypt(room: Room): void {

8
yarn.lock
View File

@ -1582,10 +1582,10 @@
"@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/resolve-uri" "^3.1.0"
"@jridgewell/sourcemap-codec" "^1.4.14" "@jridgewell/sourcemap-codec" "^1.4.14"
"@matrix-org/matrix-sdk-crypto-wasm@^2.1.1": "@matrix-org/matrix-sdk-crypto-wasm@^2.2.0":
version "2.1.1" version "2.2.0"
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.1.1.tgz#5b20125d73eb404b1c49b61380f443c5fcfbacd2" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-2.2.0.tgz#7c60afe01915281a6b71502821bc8e01afbfa70d"
integrity sha512-PNFdLr68uLNT81iFmJL0PH98t7/U4g+a51d5+BmbKo0LEqchLkEKNraD1vq/kzPK6X7p/3IapQI5P+5Lr8jHsg== integrity sha512-txmvaTiZpVV0/kWCRcE7tZvRESCEc1ynLJDVh9OUsFlaXfl13c7qdD3E6IJEJ8YiPMIn+PHogdfBZsO84reaMg==
"@matrix-org/olm@3.2.15": "@matrix-org/olm@3.2.15":
version "3.2.15" version "3.2.15"