diff --git a/canisters/icp/LICENSE b/canisters/icp/idl/LICENSE similarity index 100% rename from canisters/icp/LICENSE rename to canisters/icp/idl/LICENSE diff --git a/canisters/icp/NOTICE b/canisters/icp/idl/NOTICE similarity index 100% rename from canisters/icp/NOTICE rename to canisters/icp/idl/NOTICE diff --git a/canisters/icp/address/index.ts b/canisters/icp/idl/address/index.ts similarity index 97% rename from canisters/icp/address/index.ts rename to canisters/icp/idl/address/index.ts index 4f88118447..cd6bdbad8a 100755 --- a/canisters/icp/address/index.ts +++ b/canisters/icp/idl/address/index.ts @@ -1,7 +1,7 @@ import { getCrc32 } from '@dfinity/principal/lib/esm/utils/getCrc'; import jsSHA from 'jssha'; -import { blob, Principal } from '../../../src/lib/experimental'; +import { blob, Principal } from '../../../../src/lib/experimental'; // TODO we need to review these heavily export function hexAddressFromPrincipal( diff --git a/canisters/icp/index.ts b/canisters/icp/idl/index.ts similarity index 100% rename from canisters/icp/index.ts rename to canisters/icp/idl/index.ts diff --git a/canisters/icp/ledger.did b/canisters/icp/idl/ledger.did similarity index 100% rename from canisters/icp/ledger.did rename to canisters/icp/idl/ledger.did diff --git a/canisters/icrc_1/ICRC-1.did b/canisters/icrc_1/idl/ICRC-1.did similarity index 100% rename from canisters/icrc_1/ICRC-1.did rename to canisters/icrc_1/idl/ICRC-1.did diff --git a/canisters/icrc_1/LICENSE b/canisters/icrc_1/idl/LICENSE similarity index 100% rename from canisters/icrc_1/LICENSE rename to canisters/icrc_1/idl/LICENSE diff --git a/canisters/icrc_1/index.ts b/canisters/icrc_1/idl/index.ts similarity index 100% rename from canisters/icrc_1/index.ts rename to canisters/icrc_1/idl/index.ts diff --git a/canisters/icrc_10/ICRC-10.did b/canisters/icrc_10/idl/ICRC-10.did similarity index 100% rename from canisters/icrc_10/ICRC-10.did rename to canisters/icrc_10/idl/ICRC-10.did diff --git a/canisters/icrc_10/LICENSE b/canisters/icrc_10/idl/LICENSE similarity index 100% rename from canisters/icrc_10/LICENSE rename to canisters/icrc_10/idl/LICENSE diff --git a/canisters/icrc_10/index.ts b/canisters/icrc_10/idl/index.ts similarity index 100% rename from canisters/icrc_10/index.ts rename to canisters/icrc_10/idl/index.ts diff --git a/canisters/icrc_2/ICRC-2.did b/canisters/icrc_2/idl/ICRC-2.did similarity index 100% rename from canisters/icrc_2/ICRC-2.did rename to canisters/icrc_2/idl/ICRC-2.did diff --git a/canisters/icrc_2/LICENSE b/canisters/icrc_2/idl/LICENSE similarity index 100% rename from canisters/icrc_2/LICENSE rename to canisters/icrc_2/idl/LICENSE diff --git a/canisters/icrc_2/index.ts b/canisters/icrc_2/idl/index.ts similarity index 100% rename from canisters/icrc_2/index.ts rename to canisters/icrc_2/idl/index.ts diff --git a/canisters/icrc_3/ICRC-3.did b/canisters/icrc_3/idl/ICRC-3.did similarity index 100% rename from canisters/icrc_3/ICRC-3.did rename to canisters/icrc_3/idl/ICRC-3.did diff --git a/canisters/icrc_3/LICENSE b/canisters/icrc_3/idl/LICENSE similarity index 100% rename from canisters/icrc_3/LICENSE rename to canisters/icrc_3/idl/LICENSE diff --git a/canisters/icrc_3/index.ts b/canisters/icrc_3/idl/index.ts similarity index 100% rename from canisters/icrc_3/index.ts rename to canisters/icrc_3/idl/index.ts diff --git a/canisters/icrc_37/ICRC-37.did b/canisters/icrc_37/idl/ICRC-37.did similarity index 100% rename from canisters/icrc_37/ICRC-37.did rename to canisters/icrc_37/idl/ICRC-37.did diff --git a/canisters/icrc_37/LICENSE b/canisters/icrc_37/idl/LICENSE similarity index 100% rename from canisters/icrc_37/LICENSE rename to canisters/icrc_37/idl/LICENSE diff --git a/canisters/icrc_37/index.ts b/canisters/icrc_37/idl/index.ts similarity index 100% rename from canisters/icrc_37/index.ts rename to canisters/icrc_37/idl/index.ts diff --git a/canisters/icrc_7/ICRC-7.did b/canisters/icrc_7/idl/ICRC-7.did similarity index 100% rename from canisters/icrc_7/ICRC-7.did rename to canisters/icrc_7/idl/ICRC-7.did diff --git a/canisters/icrc_7/LICENSE b/canisters/icrc_7/idl/LICENSE similarity index 100% rename from canisters/icrc_7/LICENSE rename to canisters/icrc_7/idl/LICENSE diff --git a/canisters/icrc_7/index.ts b/canisters/icrc_7/idl/index.ts similarity index 100% rename from canisters/icrc_7/index.ts rename to canisters/icrc_7/idl/index.ts diff --git a/canisters/management/ic.did b/canisters/management/idl/ic.did similarity index 100% rename from canisters/management/ic.did rename to canisters/management/idl/ic.did diff --git a/canisters/management/index.ts b/canisters/management/idl/index.ts similarity index 100% rename from canisters/management/index.ts rename to canisters/management/idl/index.ts diff --git a/examples/experimental/demo/bitcoin_psbt/src/bitcoin_wallet.ts b/examples/experimental/demo/bitcoin_psbt/src/bitcoin_wallet.ts index 137d78eaa9..d0fa9b4c39 100644 --- a/examples/experimental/demo/bitcoin_psbt/src/bitcoin_wallet.ts +++ b/examples/experimental/demo/bitcoin_psbt/src/bitcoin_wallet.ts @@ -14,7 +14,7 @@ import { millisatoshi_per_byte, satoshi, utxo -} from 'azle/canisters/management'; +} from 'azle/canisters/management/idl'; import * as bitcoinApi from 'basic_bitcoin/src/bitcoin_api'; import { determineNetwork, diff --git a/examples/experimental/demo/bitcoin_psbt/src/index.ts b/examples/experimental/demo/bitcoin_psbt/src/index.ts index bc24efd01d..ef229214a3 100644 --- a/examples/experimental/demo/bitcoin_psbt/src/index.ts +++ b/examples/experimental/demo/bitcoin_psbt/src/index.ts @@ -1,5 +1,5 @@ import { jsonParse, jsonStringify } from 'azle'; -import { bitcoin_network } from 'azle/canisters/management'; +import { bitcoin_network } from 'azle/canisters/management/idl'; import { determineKeyName, determineNetwork } from 'basic_bitcoin/src'; import * as bitcoinApi from 'basic_bitcoin/src/bitcoin_api'; import express, { Request } from 'express'; diff --git a/examples/experimental/demo/ckbtc/wallet/backend/index.ts b/examples/experimental/demo/ckbtc/wallet/backend/index.ts index 5cc20cb3ab..4cb227d536 100644 --- a/examples/experimental/demo/ckbtc/wallet/backend/index.ts +++ b/examples/experimental/demo/ckbtc/wallet/backend/index.ts @@ -2,7 +2,11 @@ // better using the latest Wasm and did that I know of import { call, canisterSelf, IDL, msgCaller, Principal, update } from 'azle'; -import { Account, TransferArgs, TransferResult } from 'azle/canisters/icrc_1'; +import { + Account, + TransferArgs, + TransferResult +} from 'azle/canisters/icrc_1/idl'; import { GetBtcAddressArgs, diff --git a/examples/experimental/test/end_to_end/candid_rpc/ckbtc/wallet/backend/index.ts b/examples/experimental/test/end_to_end/candid_rpc/ckbtc/wallet/backend/index.ts index 85d29d9e43..56a0b0fc0d 100644 --- a/examples/experimental/test/end_to_end/candid_rpc/ckbtc/wallet/backend/index.ts +++ b/examples/experimental/test/end_to_end/candid_rpc/ckbtc/wallet/backend/index.ts @@ -2,7 +2,11 @@ // better using the latest Wasm and did that I know of import { call, canisterSelf, IDL, msgCaller } from 'azle'; -import { Account, TransferArgs, TransferResult } from 'azle/canisters/icrc_1'; +import { + Account, + TransferArgs, + TransferResult +} from 'azle/canisters/icrc_1/idl'; import { blob, Canister, diff --git a/examples/experimental/test/end_to_end/candid_rpc/ethereum_json_rpc/src/index.ts b/examples/experimental/test/end_to_end/candid_rpc/ethereum_json_rpc/src/index.ts index 0966160550..297c79365b 100644 --- a/examples/experimental/test/end_to_end/candid_rpc/ethereum_json_rpc/src/index.ts +++ b/examples/experimental/test/end_to_end/candid_rpc/ethereum_json_rpc/src/index.ts @@ -2,7 +2,7 @@ import { call, canisterSelf } from 'azle'; import { http_request_args, http_request_result -} from 'azle/canisters/management'; +} from 'azle/canisters/management/idl'; import { Canister, ic, diff --git a/examples/experimental/test/end_to_end/candid_rpc/icrc/canisters/proxy/index.ts b/examples/experimental/test/end_to_end/candid_rpc/icrc/canisters/proxy/index.ts index 6c5b4f22a1..5b647f5c18 100644 --- a/examples/experimental/test/end_to_end/candid_rpc/icrc/canisters/proxy/index.ts +++ b/examples/experimental/test/end_to_end/candid_rpc/icrc/canisters/proxy/index.ts @@ -5,7 +5,7 @@ import { SupportedStandard, TransferArgs, TransferResult -} from 'azle/canisters/icrc_1'; +} from 'azle/canisters/icrc_1/idl'; import { AllowanceArgs, AllowanceResult, @@ -13,7 +13,7 @@ import { ApproveResult, TransferFromArgs, TransferFromResult -} from 'azle/canisters/icrc_2'; +} from 'azle/canisters/icrc_2/idl'; import { Canister, nat, diff --git a/examples/experimental/test/end_to_end/candid_rpc/ledger_canister/src/ledger_canister/index.ts b/examples/experimental/test/end_to_end/candid_rpc/ledger_canister/src/ledger_canister/index.ts index 3005bec4b6..995e3e6db3 100644 --- a/examples/experimental/test/end_to_end/candid_rpc/ledger_canister/src/ledger_canister/index.ts +++ b/examples/experimental/test/end_to_end/candid_rpc/ledger_canister/src/ledger_canister/index.ts @@ -12,7 +12,7 @@ import { TransferFee, TransferFeeArg, TransferResult -} from 'azle/canisters/icp'; +} from 'azle/canisters/icp/idl'; import { Canister, nat32, diff --git a/examples/experimental/test/end_to_end/candid_rpc/management_canister/src/index.ts b/examples/experimental/test/end_to_end/candid_rpc/management_canister/src/index.ts index b8bb04079f..a5e1400bc1 100644 --- a/examples/experimental/test/end_to_end/candid_rpc/management_canister/src/index.ts +++ b/examples/experimental/test/end_to_end/candid_rpc/management_canister/src/index.ts @@ -23,7 +23,7 @@ import { uninstall_code_args, update_settings_args, upload_chunk_args -} from 'azle/canisters/management'; +} from 'azle/canisters/management/idl'; import { blob, bool, diff --git a/examples/experimental/test/end_to_end/candid_rpc/motoko_examples/threshold_ecdsa/src/index.ts b/examples/experimental/test/end_to_end/candid_rpc/motoko_examples/threshold_ecdsa/src/index.ts index f217334b14..d40a67e1e4 100644 --- a/examples/experimental/test/end_to_end/candid_rpc/motoko_examples/threshold_ecdsa/src/index.ts +++ b/examples/experimental/test/end_to_end/candid_rpc/motoko_examples/threshold_ecdsa/src/index.ts @@ -4,7 +4,7 @@ import { ecdsa_public_key_result, sign_with_ecdsa_args, sign_with_ecdsa_result -} from 'azle/canisters/management'; +} from 'azle/canisters/management/idl'; import { blob, Canister, Record, serialize, update } from 'azle/experimental'; const PublicKey = Record({ diff --git a/examples/experimental/test/end_to_end/candid_rpc/outgoing_http_requests/src/index.ts b/examples/experimental/test/end_to_end/candid_rpc/outgoing_http_requests/src/index.ts index def47decee..225ee3d0b1 100644 --- a/examples/experimental/test/end_to_end/candid_rpc/outgoing_http_requests/src/index.ts +++ b/examples/experimental/test/end_to_end/candid_rpc/outgoing_http_requests/src/index.ts @@ -2,7 +2,7 @@ import { call, candidEncode, canisterSelf, msgReply } from 'azle'; import { http_request_args, http_request_result -} from 'azle/canisters/management'; +} from 'azle/canisters/management/idl'; import { Canister, ic, diff --git a/examples/stable/test/end_to_end/candid_rpc/bitcoin/src/index.ts b/examples/stable/test/end_to_end/candid_rpc/bitcoin/src/index.ts index 2cf6af273b..d810f37b06 100644 --- a/examples/stable/test/end_to_end/candid_rpc/bitcoin/src/index.ts +++ b/examples/stable/test/end_to_end/candid_rpc/bitcoin/src/index.ts @@ -7,7 +7,7 @@ import { bitcoin_get_utxos_args, bitcoin_get_utxos_result, bitcoin_send_transaction_args -} from 'azle/canisters/management'; +} from 'azle/canisters/management/idl'; const BITCOIN_API_CYCLE_COST = 100_000_000n; const BITCOIN_BASE_TRANSACTION_COST = 5_000_000_000n; diff --git a/examples/stable/test/end_to_end/candid_rpc/ethereum_json_rpc/src/index.ts b/examples/stable/test/end_to_end/candid_rpc/ethereum_json_rpc/src/index.ts index 448d020d24..351edbbdcc 100644 --- a/examples/stable/test/end_to_end/candid_rpc/ethereum_json_rpc/src/index.ts +++ b/examples/stable/test/end_to_end/candid_rpc/ethereum_json_rpc/src/index.ts @@ -12,7 +12,7 @@ import { http_request_args, http_request_result, http_transform_args -} from 'azle/canisters/management'; +} from 'azle/canisters/management/idl'; export default class { stableStorage = new StableBTreeMap(0); diff --git a/examples/stable/test/end_to_end/candid_rpc/icrc/canisters/proxy/index.ts b/examples/stable/test/end_to_end/candid_rpc/icrc/canisters/proxy/index.ts index d028dadf96..9cacfd5e8b 100644 --- a/examples/stable/test/end_to_end/candid_rpc/icrc/canisters/proxy/index.ts +++ b/examples/stable/test/end_to_end/candid_rpc/icrc/canisters/proxy/index.ts @@ -4,7 +4,7 @@ import { TransferArgs, TransferResult, Value -} from 'azle/canisters/icrc_1'; +} from 'azle/canisters/icrc_1/idl'; import { AllowanceArgs, AllowanceResult, @@ -13,7 +13,7 @@ import { SupportedStandard, TransferFromArgs, TransferFromResult -} from 'azle/canisters/icrc_2'; +} from 'azle/canisters/icrc_2/idl'; export default class { icrcPrincipal = getIcrcPrincipal(); diff --git a/examples/stable/test/end_to_end/candid_rpc/ledger_canister/src/ledger_canister/index.ts b/examples/stable/test/end_to_end/candid_rpc/ledger_canister/src/ledger_canister/index.ts index da5ddbf228..2645ff6946 100644 --- a/examples/stable/test/end_to_end/candid_rpc/ledger_canister/src/ledger_canister/index.ts +++ b/examples/stable/test/end_to_end/candid_rpc/ledger_canister/src/ledger_canister/index.ts @@ -15,7 +15,7 @@ import { TransferFee, TransferFeeArg, TransferResult -} from 'azle/canisters/icp'; +} from 'azle/canisters/icp/idl'; export default class { icpCanisterPrincipal = getIcpCanisterPrincipal(); diff --git a/examples/stable/test/end_to_end/candid_rpc/management_canister/src/index.ts b/examples/stable/test/end_to_end/candid_rpc/management_canister/src/index.ts index 1b0528938f..938ac5495f 100644 --- a/examples/stable/test/end_to_end/candid_rpc/management_canister/src/index.ts +++ b/examples/stable/test/end_to_end/candid_rpc/management_canister/src/index.ts @@ -24,7 +24,7 @@ import { update_settings_args, upload_chunk_args, upload_chunk_result -} from 'azle/canisters/management'; +} from 'azle/canisters/management/idl'; type State = { createdCanisterId: Principal; diff --git a/examples/stable/test/end_to_end/candid_rpc/motoko_examples/threshold_ecdsa/src/index.ts b/examples/stable/test/end_to_end/candid_rpc/motoko_examples/threshold_ecdsa/src/index.ts index c73e02040c..fff4c78221 100644 --- a/examples/stable/test/end_to_end/candid_rpc/motoko_examples/threshold_ecdsa/src/index.ts +++ b/examples/stable/test/end_to_end/candid_rpc/motoko_examples/threshold_ecdsa/src/index.ts @@ -4,7 +4,7 @@ import { ecdsa_public_key_result, sign_with_ecdsa_args, sign_with_ecdsa_result -} from 'azle/canisters/management'; +} from 'azle/canisters/management/idl'; const PublicKey = IDL.Record({ publicKey: IDL.Vec(IDL.Nat8) diff --git a/examples/stable/test/end_to_end/candid_rpc/outgoing_http_requests/src/index.ts b/examples/stable/test/end_to_end/candid_rpc/outgoing_http_requests/src/index.ts index 14eb76852c..762da2ee9f 100644 --- a/examples/stable/test/end_to_end/candid_rpc/outgoing_http_requests/src/index.ts +++ b/examples/stable/test/end_to_end/candid_rpc/outgoing_http_requests/src/index.ts @@ -12,7 +12,7 @@ import { http_request_args, http_request_result, http_transform_args -} from 'azle/canisters/management'; +} from 'azle/canisters/management/idl'; export default class { @update([], IDL.Text) diff --git a/src/build/experimental/commands/compile/get_context.ts b/src/build/experimental/commands/compile/get_context.ts index ec50df727a..49c6ceb175 100644 --- a/src/build/experimental/commands/compile/get_context.ts +++ b/src/build/experimental/commands/compile/get_context.ts @@ -24,7 +24,7 @@ export async function getContext( const consumer = await getConsumer(canisterConfig); const managementDid = ( await readFile( - join(AZLE_PACKAGE_PATH, 'canisters', 'management', 'ic.did') + join(AZLE_PACKAGE_PATH, 'canisters', 'management', 'idl', 'ic.did') ) ).toString(); const wasmData: WasmData = { diff --git a/src/lib/experimental/fetch/http.ts b/src/lib/experimental/fetch/http.ts index 82b3f7729f..6f5552bf7e 100644 --- a/src/lib/experimental/fetch/http.ts +++ b/src/lib/experimental/fetch/http.ts @@ -2,7 +2,7 @@ import '../experimental'; import { inflate } from 'pako'; -import { http_transform } from '../../../../canisters/management'; +import { http_transform } from '../../../../canisters/management/idl'; import { canisterSelf } from '../../stable/ic_apis/canister_self'; import { azleFetch, serialize } from '.'; import { AzleFetchResponse } from './response';