Merge branch 'main' into benchmark--0.33.0

Author: bdemann

examples/stable/test/end_to_end/candid_rpc/ledger_canister/package-lock.json

@@ -4,6 +4,7 @@
         "test": "jest"
     },
     "dependencies": {
-        "azle": "0.33.0"
+        "azle": "0.33.0",
+        "jssha": "^3.3.1"
     }
 }

examples/stable/test/end_to_end/candid_rpc/ledger_canister/package.json

@@ -1,11 +1,10 @@
+import { getCrc32 } from '@dfinity/principal';
 import { call, IDL, Principal, query, update } from 'azle';
 import {
     AccountIdentifierByteBuf,
     Archives,
-    binaryAddressFromAddress,
     Decimals,
     GetBlocksArgs,
-    hexAddressFromPrincipal,
     Name,
     QueryBlocksResponse,
     Result_6 as TransferResult,
@@ -15,6 +14,7 @@ import {
     TransferArgs,
     TransferFee
 } from 'azle/canisters/nns_icp_ledger/idl';
+import jsSHA from 'jssha';
 
 export default class {
     @update(
@@ -162,3 +162,80 @@ function getIcpCanisterPrincipal(): string {
         throw new Error('process.env.ICP_CANISTER_PRINCIPAL is undefined');
     }
 }
+
+function hexAddressFromPrincipal(
+    principal: Principal,
+    subaccount: number
+): string {
+    return addressFromPrincipal(principal, subaccount);
+}
+
+function binaryAddressFromAddress(address: string): Uint8Array {
+    return Uint8Array.from(
+        address.match(/.{1,2}/g)?.map((x) => parseInt(x, 16)) ?? []
+    );
+}
+
+function _binaryAddressFromPrincipal(
+    principal: Principal,
+    subaccount: number
+): Uint8Array {
+    const address = addressFromPrincipal(principal, subaccount);
+    return Uint8Array.from(
+        address.match(/.{1,2}/g)?.map((x) => parseInt(x, 16)) ?? []
+    );
+}
+
+// https://github.com/Toniq-Labs/extendable-token/blob/86eabb7336ea259876be9be830fb69b03046ea14/motoko/util/AccountIdentifier.mo
+// https://github.com/Toniq-Labs/entrepot-app/blob/5004eb5cb3c98805b665d3fa24d95483ce2a8cda/src/ic/utils.js
+// Some functions below licensed as follows
+// MIT License
+
+// Copyright (c) 2022 Toniq Labs
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+function addressFromPrincipal(
+    principal: Principal,
+    subaccount: number
+): string {
+    const prefixBytes = new Uint8Array([
+        10, 97, 99, 99, 111, 117, 110, 116, 45, 105, 100
+    ]); // \0xAaccount-id
+    const principalBytes = principal.toUint8Array();
+    const subaccountBytes = getSubAccountArray(subaccount);
+
+    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]));
+}
+
+function getSubAccountArray(subaccount: number): number[] {
+    return Array(28)
+        .fill(0)
+        .concat(to32Bits(subaccount ? subaccount : 0));
+}
+
+function to32Bits(number: number): number[] {
+    let b = new ArrayBuffer(4);
+    new DataView(b).setUint32(0, number);
+    return Array.from(new Uint8Array(b));
+}
+
+function toHexString(byteArray: Uint8Array): string {
+    return Array.from(byteArray, (byte) => {
+        return `0${(byte & 0xff).toString(16)}`.slice(-2);
+    }).join('');
+}

examples/stable/test/end_to_end/candid_rpc/ledger_canister/src/ledger_canister/index.ts

@@ -54,7 +54,6 @@
         "@sinonjs/text-encoding": "0.7.3",
         "binaryen": "^116.0.0",
         "esbuild": "^0.25.9",
-        "jssha": "^3.3.1",
         "tsx": "^4.20.4",
         "typescript": "^5.9.2"
     },
@@ -76,7 +75,7 @@
         "licensee": "^11.1.1",
         "lint-staged": "16.1.5",
         "prettier": "^3.6.2",
-        "puppeteer": "^24.16.2",
+        "puppeteer": "^24.17.0",
         "semver": "^7.7.2",
         "ts-jest": "^29.4.1",
         "typescript-eslint": "^8.40.0",

package-lock.json

@@ -1,6 +1,6 @@
 use std::{cell::RefCell, collections::BTreeMap};
 
-use ic_stable_structures::{storable::Bound, StableBTreeMap, Storable};
+use ic_stable_structures::{StableBTreeMap, Storable, storable::Bound};
 
 use crate::Memory;
 
@@ -17,7 +17,7 @@ pub struct AzleStableBTreeMapKey {
 }
 
 impl Storable for AzleStableBTreeMapKey {
-    fn to_bytes(&self) -> std::borrow::Cow<[u8]> {
+    fn to_bytes(&self) -> std::borrow::Cow<'_, [u8]> {
         std::borrow::Cow::Borrowed(&self.bytes)
     }
 
@@ -36,7 +36,7 @@ pub struct AzleStableBTreeMapValue {
 }
 
 impl Storable for AzleStableBTreeMapValue {
-    fn to_bytes(&self) -> std::borrow::Cow<[u8]> {
+    fn to_bytes(&self) -> std::borrow::Cow<'_, [u8]> {
         std::borrow::Cow::Borrowed(&self.bytes)
     }
 

package.json

@@ -1,9 +1,9 @@
 use std::{borrow::Cow, cell::RefCell, collections::BTreeMap};
 
-use ic_stable_structures::{storable::Bound, StableBTreeMap, Storable};
+use ic_stable_structures::{StableBTreeMap, Storable, storable::Bound};
 use rquickjs::{Ctx, Result};
 
-use crate::{ic::throw_error, Memory};
+use crate::{Memory, ic::throw_error};
 
 #[allow(unused)]
 pub type AzleStableBTreeMap =
@@ -19,7 +19,7 @@ pub struct AzleStableBTreeMapKey {
 }
 
 impl Storable for AzleStableBTreeMapKey {
-    fn to_bytes(&self) -> Cow<[u8]> {
+    fn to_bytes(&self) -> Cow<'_, [u8]> {
         Cow::Borrowed(&self.bytes)
     }
 
@@ -38,7 +38,7 @@ pub struct AzleStableBTreeMapValue {
 }
 
 impl Storable for AzleStableBTreeMapValue {
-    fn to_bytes(&self) -> Cow<[u8]> {
+    fn to_bytes(&self) -> Cow<'_, [u8]> {
         Cow::Borrowed(&self.bytes)
     }
 

src/experimental/build/commands/build/wasm_binary/rust/experimental_canister_template/src/stable_b_tree_map.rs

@@ -7,12 +7,3 @@
 2. Find the Candid on that page and copy it
 3. Paste the Candid into `index.did`
 4. From this directory run `npx azle generate index.did > index.ts`
-5. Add the following to the bottom of `index.ts`:
-
-```typescript
-export {
-    binaryAddressFromAddress,
-    binaryAddressFromPrincipal,
-    hexAddressFromPrincipal
-} from './address';
-```