Merge branch 'main' into class_context

demergent-labs · Sep 1, 2024 · 29de7fa · 29de7fa
2 parents be3c4be + 71de06a
commit 29de7fa
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 17 deletions.
diff --git a/canisters/ledger/address/index.ts b/canisters/ledger/address/index.ts
@@ -1,5 +1,5 @@
 import { getCrc32 } from '@dfinity/principal/lib/esm/utils/getCrc';
-import { sha224 } from 'js-sha256';
+import jsSHA from 'jssha';
 
 import { blob, Principal } from '../../../src/lib/experimental';
 import { Address } from '../index';
@@ -50,11 +50,15 @@ function addressFromPrincipal(
     const principalBytes = principal.toUint8Array();
     const subaccountBytes = getSubAccountArray(subaccount);
 
-    const hash = new Uint8Array(
-        sha224
-            .update([...prefixBytes, ...principalBytes, ...subaccountBytes])
-            .digest()
-    );
+    const hash = new jsSHA('SHA-224', 'UINT8ARRAY')
+        .update(
+            Uint8Array.from([
+                ...prefixBytes,
+                ...principalBytes,
+                ...subaccountBytes
+            ])
+        )
+        .getHash('UINT8ARRAY');
     const checksum = to32Bits(getCrc32(hash));
 
     return toHexString(new Uint8Array([...checksum, ...hash]));

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,6 +45,7 @@
         "http-message-parser": "^0.0.34",
         "intl": "^1.2.5",
         "js-sha256": "0.9.0",
+        "jssha": "^3.3.1",
         "net": "^1.0.2",
         "pako": "^2.1.0",
         "reflect-metadata": "^0.2.2",

diff --git a/tests/end_to_end/candid_rpc/class_syntax/imports/package-lock.json b/tests/end_to_end/candid_rpc/class_syntax/imports/package-lock.json
diff --git a/tests/end_to_end/candid_rpc/class_syntax/imports/package.json b/tests/end_to_end/candid_rpc/class_syntax/imports/package.json
@@ -5,7 +5,7 @@
     },
     "dependencies": {
         "azle": "0.23.0",
-        "js-sha256": "0.9.0"
+        "jssha": "^3.3.1"
     },
     "devDependencies": {
         "@dfinity/agent": "^0.19.2",

diff --git a/tests/end_to_end/candid_rpc/class_syntax/imports/src/index.ts b/tests/end_to_end/candid_rpc/class_syntax/imports/src/index.ts
@@ -1,5 +1,5 @@
 import { IDL, query } from 'azle';
-import { sha224 } from 'js-sha256';
+import jsSHA from 'jssha';
 
 import { one, three, two } from './library';
 
@@ -21,7 +21,7 @@ export default class {
 
     @query([IDL.Text], IDL.Text)
     sha224Hash(message: string): string {
-        return sha224.update(message).hex();
+        return new jsSHA('SHA-224', 'TEXT').update(message).getHash('HEX');
     }
 
     @query([], IDL.Int)

diff --git a/tests/end_to_end/candid_rpc/class_syntax/vanilla_js/package-lock.json b/tests/end_to_end/candid_rpc/class_syntax/vanilla_js/package-lock.json
diff --git a/tests/end_to_end/candid_rpc/class_syntax/vanilla_js/package.json b/tests/end_to_end/candid_rpc/class_syntax/vanilla_js/package.json
@@ -5,7 +5,7 @@
     },
     "dependencies": {
         "azle": "0.23.0",
-        "js-sha256": "0.9.0"
+        "jssha": "^3.3.1"
     },
     "devDependencies": {
         "@dfinity/agent": "^0.19.2",

diff --git a/tests/end_to_end/candid_rpc/class_syntax/vanilla_js/src/index.js b/tests/end_to_end/candid_rpc/class_syntax/vanilla_js/src/index.js
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
 import { IDL, query } from 'azle';
-import { sha224 } from 'js-sha256';
+import jsSHA from 'jssha';
 
 import { relativeImport } from './library';
 
@@ -12,7 +12,7 @@ export default class {
 
     @query([IDL.Text], IDL.Text)
     packageImport(message) {
-        return sha224.update(message).hex();
+        return new jsSHA('SHA-224', 'TEXT').update(message).getHash('HEX');
     }
 
     @query([], IDL.Int)