update args type

demergent-labs · Nov 20, 2024 · 9005b85 · 9005b85
1 parent db47e85
commit 9005b85
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 18 deletions.
diff --git a/canister_templates/stable.wasm b/canister_templates/stable.wasm
diff --git a/...table/commands/compile/wasm_binary/rust/stable_canister_template/src/execute_method_js.rs b/...table/commands/compile/wasm_binary/rust/stable_canister_template/src/execute_method_js.rs
@@ -4,7 +4,7 @@ use ic_cdk::{
     api::{call::arg_data_raw, performance_counter},
     trap,
 };
-use rquickjs::{Function, Object};
+use rquickjs::{Function, Object, TypedArray};
 
 use crate::{
     benchmarking::record_benchmark, error::quickjs_call_with_error_handling, quickjs_with_ctx,
@@ -45,7 +45,9 @@ fn execute_method_js_with_result(
             vec![]
         };
 
-        quickjs_call_with_error_handling(ctx.clone(), method_callback, (candid_args,))?;
+        let candid_args_uint8_array = TypedArray::<u8>::new(ctx.clone(), candid_args)?;
+
+        quickjs_call_with_error_handling(ctx.clone(), method_callback, (candid_args_uint8_array,))?;
 
         Ok(())
     })?;

diff --git a/src/lib/stable/canister_methods/heartbeat.ts b/src/lib/stable/canister_methods/heartbeat.ts
@@ -18,7 +18,7 @@ export function heartbeat<This, Args extends any[], Return>(
         try {
             await executeAndReplyWithCandidSerde(
                 'heartbeat',
-                [],
+                new Uint8Array(),
                 originalMethod.bind(globalThis._azleCanisterClassInstance),
                 [],
                 undefined,

diff --git a/src/lib/stable/canister_methods/init.ts b/src/lib/stable/canister_methods/init.ts
@@ -24,12 +24,12 @@ export function init<This, Args extends any[], Return>(
         );
 
         globalThis._azleCallbacks[indexString] = async (
-            ...args: any[]
+            arg: Uint8Array
         ): Promise<void> => {
             try {
                 await executeAndReplyWithCandidSerde(
                     'init',
-                    args,
+                    arg,
                     originalMethod.bind(globalThis._azleCanisterClassInstance),
                     paramIdlTypes,
                     undefined,

diff --git a/src/lib/stable/canister_methods/inspect_message.ts b/src/lib/stable/canister_methods/inspect_message.ts
@@ -19,7 +19,7 @@ export function inspectMessage<This, Args extends any[], Return>(
         try {
             await executeAndReplyWithCandidSerde(
                 'inspectMessage',
-                [],
+                new Uint8Array(),
                 originalMethod.bind(globalThis._azleCanisterClassInstance),
                 [],
                 undefined,

diff --git a/src/lib/stable/canister_methods/post_upgrade.ts b/src/lib/stable/canister_methods/post_upgrade.ts
@@ -24,12 +24,12 @@ export function postUpgrade<This, Args extends any[], Return>(
         );
 
         globalThis._azleCallbacks[indexString] = async (
-            ...args: any[]
+            arg: Uint8Array
         ): Promise<void> => {
             try {
                 await executeAndReplyWithCandidSerde(
                     'postUpgrade',
-                    args,
+                    arg,
                     originalMethod.bind(globalThis._azleCanisterClassInstance),
                     paramIdlTypes,
                     undefined,

diff --git a/src/lib/stable/canister_methods/pre_upgrade.ts b/src/lib/stable/canister_methods/pre_upgrade.ts
@@ -18,7 +18,7 @@ export function preUpgrade<This, Args extends any[], Return>(
         try {
             await executeAndReplyWithCandidSerde(
                 'preUpgrade',
-                [],
+                new Uint8Array(),
                 originalMethod.bind(globalThis._azleCanisterClassInstance),
                 [],
                 undefined,

diff --git a/src/lib/stable/canister_methods/query.ts b/src/lib/stable/canister_methods/query.ts
@@ -33,12 +33,12 @@ export function query<This, Args extends any[], Return>(
         );
 
         globalThis._azleCallbacks[indexString] = async (
-            ...args: any[]
+            arg: Uint8Array
         ): Promise<void> => {
             try {
                 await executeAndReplyWithCandidSerde(
                     'query',
-                    args,
+                    arg,
                     originalMethod.bind(globalThis._azleCanisterClassInstance),
                     paramIdlTypes,
                     returnIdlType,

diff --git a/src/lib/stable/canister_methods/update.ts b/src/lib/stable/canister_methods/update.ts
@@ -25,12 +25,12 @@ export function update<This, Args extends any[], Return>(
         );
 
         globalThis._azleCallbacks[indexString] = async (
-            ...args: any[]
+            arg: Uint8Array
         ): Promise<void> => {
             try {
                 await executeAndReplyWithCandidSerde(
                     'update',
-                    args,
+                    arg,
                     originalMethod.bind(globalThis._azleCanisterClassInstance),
                     paramIdlTypes,
                     returnIdlType,

diff --git a/src/lib/stable/execute_with_candid_serde.ts b/src/lib/stable/execute_with_candid_serde.ts
@@ -13,7 +13,7 @@ type CanisterMethodMode =
 
 export async function executeAndReplyWithCandidSerde(
     mode: CanisterMethodMode,
-    args: any[],
+    args: Uint8Array,
     callback: (...args: any) => any,
     paramIdlTypes: IDL.Type[],
     returnIdlType: IDL.Type | undefined,
@@ -26,7 +26,7 @@ export async function executeAndReplyWithCandidSerde(
 
 function decodeArgs(
     mode: CanisterMethodMode,
-    args: any[],
+    args: Uint8Array,
     paramIdlTypes: IDL.Type[]
 ): JsonValue[] {
     if (
@@ -35,7 +35,7 @@ function decodeArgs(
         mode === 'query' ||
         mode === 'update'
     ) {
-        return idlDecode(paramIdlTypes, args[0]);
+        return idlDecode(paramIdlTypes, args);
     } else {
         return [];
     }
@@ -78,7 +78,7 @@ export function idlEncode(
 
 export function idlDecode(
     retTypes: IDL.Type[],
-    bytes: ArrayBuffer
+    bytes: Uint8Array
 ): JsonValue[] {
     try {
         return IDL.decode(retTypes, bytes);

diff --git a/src/lib/stable/ic_apis/call.ts b/src/lib/stable/ic_apis/call.ts
@@ -42,7 +42,9 @@ export async function call<Args extends any[] | undefined, Return = any>(
             } else {
                 const idlType =
                     returnTypeIdl === undefined ? [] : [returnTypeIdl];
-                resolve(idlDecode(idlType, result)[0] as Return);
+                resolve(
+                    idlDecode(idlType, new Uint8Array(result))[0] as Return
+                );
             }
 
             delete globalThis._azleResolveIds[globalResolveId];