Merge branch 'main' into harmonize_init_and_post_upgrade_1095

examples/experimental/test/end_to_end/candid_rpc/ic_api/src/index.ts

@@ -93,12 +93,6 @@ export default Canister({
     performanceCounter: query([], nat64, () => {
         return ic.performanceCounter(0);
     }),
-    // prints a message through the local replica's output
-    print: query([text], bool, (message) => {
-        ic.print(message);
-
-        return true;
-    }),
     reject: query(
         [text],
         Manual(empty),

examples/experimental/test/end_to_end/candid_rpc/ic_api/test/tests.ts

@@ -16,43 +16,6 @@ export function getTests(icApiCanister: ActorSubclass<_SERVICE>): Test {
             );
         });
 
-        // it('calls argData on the ic object with zero params', async () => {
-        //     const result = await icApiCanister.argDataZeroParams();
-
-        //     expect(Array.isArray(result)).toBe(true);
-        //     expect(result.length).toBe(0);
-        // });
-
-        // it('calls argData on the ic object with a single param', async () => {
-        //     const result = await icApiCanister.argDataOneParam(true);
-
-        //     expect(result).toBe(true);
-        // });
-
-        // it('calls argData on the ic object with multiple params', async () => {
-        //     const blobString = 'Surprise!';
-        //     const blob = blobString.split('').map((char) => char.charCodeAt(0));
-        //     const int = 127;
-        //     const bool = true;
-        //     const string = 'test';
-
-        //     const result = await icApiCanister.argDataMultipleParams(
-        //         blob,
-        //         int,
-        //         bool,
-        //         string
-        //     );
-
-        //     const expected = {
-        //         blob,
-        //         int,
-        //         boolean: bool,
-        //         string
-        //     };
-
-        //     expect(result).toStrictEqual(expected);
-        // });
-
         it('calls argDataRaw on the ic object', async () => {
             const blobString = 'Surprise!';
             const blob = Uint8Array.from(
@@ -132,12 +95,6 @@ export function getTests(icApiCanister: ActorSubclass<_SERVICE>): Test {
             expect(result).toBeGreaterThan(0n);
         });
 
-        it('calls print on the ic object', async () => {
-            const result = await icApiCanister.print('Hello World!');
-
-            expect(result).toBe(true);
-        });
-
         it('calls reject on the ic object', async () => {
             const rejectionMessage = 'Rejected!';
 

examples/experimental/test/end_to_end/candid_rpc/null_example/src/index.ts

@@ -1,6 +1,5 @@
 import {
     Canister,
-    ic,
     int,
     Null,
     query,
@@ -31,7 +30,7 @@ export default Canister({
         return param;
     }),
     voidIsNotNull: query([], Void, () => {
-        ic.print(
+        console.info(
             'Even though they are both None in Python, for Candid null and void are different.'
         );
     }),

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

@@ -9,7 +9,6 @@ import {
     isController,
     performanceCounter,
     Principal,
-    print,
     query,
     reject,
     setCertifiedData,
@@ -132,14 +131,6 @@ export default class {
         return performanceCounter(0);
     }
 
-    // prints a message through the local replica's output
-    @query([IDL.Text], IDL.Bool)
-    print(message: string): boolean {
-        print(message);
-
-        return true;
-    }
-
     @query([IDL.Text], IDL.Empty, { manual: true })
     reject(message: string): void {
         reject(message);

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

@@ -1,4 +1,4 @@
-import { IDL, print, query, update } from 'azle';
+import { IDL, query, update } from 'azle';
 
 const PartiallyNullRecord = IDL.Record({
     firstItem: IDL.Int,
@@ -39,7 +39,7 @@ export default class {
 
     @query
     voidIsNotNull(): void {
-        print(
+        console.info(
             'Even though they are both None in Python, for Candid null and void are different.'
         );
     }

src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/mod.rs

@@ -10,6 +10,7 @@ mod canister_version;
 mod clear_timer;
 mod cycles_burn;
 mod data_certificate;
+mod debug_print;
 mod id;
 mod is_controller;
 mod method_name;
@@ -18,7 +19,6 @@ mod msg_cycles_available;
 mod msg_cycles_refunded;
 mod notify_raw;
 mod performance_counter;
-mod print;
 mod reject;
 mod reject_code;
 mod reject_message;
@@ -125,6 +125,13 @@ pub fn register(context: &mut wasmedge_quickjs::Context) {
             .into(),
     );
 
+    ic.set(
+        "debugPrint",
+        context
+            .new_function::<debug_print::NativeFunction>("")
+            .into(),
+    );
+
     ic.set("id", context.new_function::<id::NativeFunction>("").into());
 
     ic.set(
@@ -176,11 +183,6 @@ pub fn register(context: &mut wasmedge_quickjs::Context) {
             .into(),
     );
 
-    ic.set(
-        "print",
-        context.new_function::<print::NativeFunction>("").into(),
-    );
-
     ic.set(
         "reject",
         context.new_function::<reject::NativeFunction>("").into(),

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/mod.rs

@@ -13,6 +13,7 @@ mod canister_version;
 mod clear_timer;
 mod cycles_burn;
 mod data_certificate;
+mod debug_print;
 mod id;
 mod is_controller;
 mod method_name;
@@ -21,7 +22,6 @@ mod msg_cycles_available;
 mod msg_cycles_refunded;
 mod notify_raw;
 mod performance_counter;
-mod print;
 mod reject;
 mod reject_code;
 mod reject_message;
@@ -77,6 +77,8 @@ pub fn register(ctx: Ctx) -> Result<()> {
         data_certificate::get_function(ctx.clone()),
     )?;
 
+    ic.set("debugPrint", debug_print::get_function(ctx.clone()))?;
+
     ic.set("id", id::get_function(ctx.clone()))?;
 
     ic.set("isController", is_controller::get_function(ctx.clone()))?;
@@ -105,8 +107,6 @@ pub fn register(ctx: Ctx) -> Result<()> {
         performance_counter::get_function(ctx.clone()),
     )?;
 
-    ic.set("print", print::get_function(ctx.clone()))?;
-
     ic.set("reject", reject::get_function(ctx.clone()))?;
 
     ic.set("rejectCode", reject_code::get_function(ctx.clone()))?;

src/lib/experimental/ic/azle_ic_experimental.ts

@@ -47,7 +47,7 @@ export type AzleIcExperimental = {
     // interceptor.
     acceptMessage: () => void;
     methodName: () => string;
-    print: (...args: any) => void;
+    debugPrint: (...args: any) => void;
     reject: (message: string) => void;
     rejectMessage: () => string;
     trap: (message: string) => never;

src/lib/experimental/ic/index.ts

@@ -22,7 +22,6 @@ import { msgCyclesRefunded } from './msg_cycles_refunded';
 import { notify } from './notify';
 import { notifyRaw } from './notify_raw';
 import { performanceCounter } from './performance_counter';
-import { print } from './print';
 import { reject } from './reject';
 import { rejectCode } from './reject_code';
 import { rejectMessage } from './reject_message';
@@ -60,7 +59,6 @@ export const ic = {
     notify,
     notifyRaw,
     performanceCounter,
-    print,
     reject,
     rejectCode,
     rejectMessage,

src/lib/stable/globals.ts

@@ -4,7 +4,6 @@ import { TextDecoder, TextEncoder } from '@sinonjs/text-encoding';
 import { AzleIcExperimental } from '../experimental/ic/azle_ic_experimental';
 import { jsonReplacer } from '../stable/stable_structures/stable_json';
 import { ExportedCanisterClass } from './canister_methods';
-import { print } from './ic_apis';
 import { AzleIcStable } from './ic_apis/azle_ic_stable';
 
 declare global {
@@ -80,7 +79,15 @@ if (globalThis._azleInsideCanister === true) {
             })
             .join(' ');
 
-        print(jsonStringifiedArgs);
+        if (globalThis._azleIcStable !== undefined) {
+            return globalThis._azleIcStable.debugPrint(jsonStringifiedArgs);
+        } else if (globalThis._azleIcExperimental !== undefined) {
+            return globalThis._azleIcExperimental.debugPrint(
+                jsonStringifiedArgs
+            );
+        }
+
+        throw new Error(`No global debugPrint implementation found`);
     };
 
     globalThis.console = {

src/lib/stable/ic_apis/azle_ic_stable.ts

@@ -43,7 +43,7 @@ export type AzleIcStable = {
     // interceptor.
     acceptMessage: () => void;
     methodName: () => string;
-    print: (...args: any) => void;
+    debugPrint: (...args: any) => void;
     reject: (message: string) => void;
     rejectMessage: () => string;
     trap: (message: string) => never;

src/lib/stable/ic_apis/index.ts

@@ -18,7 +18,6 @@ export { msgCyclesAvailable } from './msg_cycles_available';
 export { msgCyclesRefunded } from './msg_cycles_refunded';
 export { notify } from './notify';
 export { performanceCounter } from './performance_counter';
-export { print } from './print';
 export { reject } from './reject';
 export { rejectCode, RejectionCode } from './reject_code';
 export { rejectMessage } from './reject_message';

the_azle_book/src/SUMMARY.md

@@ -105,7 +105,6 @@
             - [instruction counter](./reference/canister_apis/instruction_counter.md)
             - [is controller](./reference/canister_apis/is_controller.md)
             - [performance counter](./reference/canister_apis/performance_counter.md)
-            - [print](./reference/canister_apis/print.md)
             - [set certified data](./reference/canister_apis/set_certified_data.md)
             - [time](./reference/canister_apis/time.md)
             - [trap](./reference/canister_apis/trap.md)

the_azle_book/src/reference/canister_apis/canister_apis.md

@@ -10,7 +10,6 @@
 - [instruction counter](./instruction_counter.md)
 - [is controller](./is_controller.md)
 - [performance counter](./performance_counter.md)
-- [print](./print.md)
 - [set certified data](./set_certified_data.md)
 - [time](./time.md)
 - [trap](./trap.md)