diff --git a/cli/package-lock.json b/cli/package-lock.json index 0f67ac0..0ceb5ee 100755 --- a/cli/package-lock.json +++ b/cli/package-lock.json @@ -9,10 +9,10 @@ "version": "0.3.1", "license": "MIT", "dependencies": { - "@icp-sdk/canisters": "^2.0.1", + "@icp-sdk/canisters": "^3.0.0", "@icp-sdk/core": "^4.2.3", - "@junobuild/admin": "^3.0.4", - "@junobuild/cdn": "^2.0.4", + "@junobuild/admin": "^3.1.0", + "@junobuild/cdn": "^2.1.0", "@junobuild/cli-tools": "^0.9.4", "@junobuild/config": "^2.7.0", "@junobuild/config-loader": "^0.4.6", @@ -536,55 +536,6 @@ "integrity": "sha512-GPJpH73kDEKbUBdUjY80lz7cq9l0vm1h/7ppejPV6O0ZTqCLrYspssYvqjRmK4aNnJ/SKXsP0rg9LYX7zpegaA==", "license": "Apache-2.0" }, - "node_modules/@dfinity/ckbtc": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@dfinity/ckbtc/-/ckbtc-6.0.1.tgz", - "integrity": "sha512-fYC266GrFtaKt4U1USWzL742S0kKf8oUgXJy7S/ciGxNAuru++mIMyvlqaJXJ/4avm3BxBhOZhJ+qqhLFnHyEg==", - "license": "Apache-2.0", - "peer": true, - "dependencies": { - "@noble/hashes": "^1.8.0", - "base58-js": "^3.0.3", - "bech32": "^2.0.0" - }, - "peerDependencies": { - "@dfinity/utils": "^4", - "@icp-sdk/core": "^4" - } - }, - "node_modules/@dfinity/cketh": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@dfinity/cketh/-/cketh-6.0.1.tgz", - "integrity": "sha512-Y90UFGC8TXiQHyU52QEgKWjWqDsbNrr/Y+fJrBYrB7UUSQj+IGl4Z1ppavdxCvS69F0RBnjb3Iqg4/IikqLUBw==", - "license": "Apache-2.0", - "peer": true, - "peerDependencies": { - "@dfinity/utils": "^4", - "@icp-sdk/core": "^4" - } - }, - "node_modules/@dfinity/cmc": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@dfinity/cmc/-/cmc-8.0.1.tgz", - "integrity": "sha512-gpcBNadlIFfa1I2OqRDU8Sojd/GwX+eBG/cEMmCNOIMKuZz7sHvaFbJ5qdtmbjG2nN/e0sBg+YAezomVGU2WBg==", - "license": "Apache-2.0", - "peer": true, - "peerDependencies": { - "@dfinity/utils": "^4", - "@icp-sdk/core": "^4" - } - }, - "node_modules/@dfinity/ic-management": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@dfinity/ic-management/-/ic-management-9.0.1.tgz", - "integrity": "sha512-r4n+m1vjZGH3OD3XCq+E3PhBpDfIFwl4g8ldwv1VZN5FrzuVuTdeCaVIFZW/pe6dIL1Y1FxHoSu61qaykfRwmQ==", - "license": "Apache-2.0", - "peer": true, - "peerDependencies": { - "@dfinity/utils": "^4", - "@icp-sdk/core": "^4" - } - }, "node_modules/@dfinity/identity": { "version": "3.4.3", "resolved": "https://registry.npmjs.org/@dfinity/identity/-/identity-3.4.3.tgz", @@ -617,43 +568,6 @@ "@noble/hashes": "^1.8.0" } }, - "node_modules/@dfinity/ledger-icp": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@dfinity/ledger-icp/-/ledger-icp-8.0.1.tgz", - "integrity": "sha512-0X49iB+4uZ/xerP8VYR59egpzeUfR7fADZV2FVvkgmVKS1Jq7lOLp450zUV08f5I5g6+9i1gXUZKRb1pXj02OQ==", - "license": "Apache-2.0", - "peer": true, - "peerDependencies": { - "@dfinity/utils": "^4", - "@icp-sdk/core": "^4" - } - }, - "node_modules/@dfinity/ledger-icrc": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@dfinity/ledger-icrc/-/ledger-icrc-6.0.1.tgz", - "integrity": "sha512-YESLczg6fcoYA0TDY0Sez7fD0M6+qI+nTD4KM5cfrSvAxef4rgm7ylp3SzEL4BTZrX2vnjwSohQ+TR7cAl+aUg==", - "license": "Apache-2.0", - "peer": true, - "peerDependencies": { - "@dfinity/utils": "^4", - "@icp-sdk/core": "^4" - } - }, - "node_modules/@dfinity/nns": { - "version": "11.1.4", - "resolved": "https://registry.npmjs.org/@dfinity/nns/-/nns-11.1.4.tgz", - "integrity": "sha512-1XAl7fHnhZhcibgNQIDnDBy+Hr56pdxI6vaBCFSoWxOmxRUffaWLOFmKKVACCHSN/8Tpzv91HMwQjUYO0z3WDw==", - "license": "Apache-2.0", - "peer": true, - "dependencies": { - "@noble/hashes": "^1.8.0" - }, - "peerDependencies": { - "@dfinity/ledger-icp": ">=7", - "@dfinity/utils": "^4", - "@icp-sdk/core": "^4" - } - }, "node_modules/@dfinity/principal": { "version": "3.4.3", "resolved": "https://registry.npmjs.org/@dfinity/principal/-/principal-3.4.3.tgz", @@ -664,25 +578,10 @@ "@noble/hashes": "^1.8.0" } }, - "node_modules/@dfinity/sns": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@dfinity/sns/-/sns-6.0.1.tgz", - "integrity": "sha512-cKttlC1/Ap2rrszwuIVn5IJNPptxk9WO1Dub10ElcRHUBdb7C5eG36pXZy4OtxxViPkcxX1WfaRcNWdTdPtECA==", - "license": "Apache-2.0", - "peer": true, - "dependencies": { - "@noble/hashes": "^1.8.0" - }, - "peerDependencies": { - "@dfinity/ledger-icrc": "^6", - "@dfinity/utils": "^4", - "@icp-sdk/core": "^4" - } - }, "node_modules/@dfinity/utils": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@dfinity/utils/-/utils-4.0.1.tgz", - "integrity": "sha512-OyEzJAOd4LzYJHcqCDjWWcBpi4Jn76djBFL1f9pzVxumlseeyBHIGUOm9LFnz1XU/RqA2Ccj0WrC96xcZJsWDA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@dfinity/utils/-/utils-4.0.2.tgz", + "integrity": "sha512-K3VPflH3EXWVHLZw9ouvY6fT+FwZNCcHcVtxI1Et/QJvk2A360929BqUE2SsotzN6HnHCaaBmwmyINh1oetpag==", "license": "Apache-2.0", "peer": true, "peerDependencies": { @@ -690,9 +589,9 @@ } }, "node_modules/@dfinity/zod-schemas": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@dfinity/zod-schemas/-/zod-schemas-3.0.1.tgz", - "integrity": "sha512-y3wcjr8sEq+Wqtzj06fomXlO6fqfg/SkP0vIQaaFMW62lNgqUNfr9RG4H6hZ/FcpwjkZqcf+ot/luQm12wZhZQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@dfinity/zod-schemas/-/zod-schemas-3.0.2.tgz", + "integrity": "sha512-cbOsAcPgOVjbJbP91VP4hMckwiGSVZ8Q41XWXZ0doG8Vaw3e1wt0blJLiomPYnZy++ycW6iGSfoxh4DiJmumgw==", "license": "Apache-2.0", "peer": true, "peerDependencies": { @@ -1353,20 +1252,17 @@ } }, "node_modules/@icp-sdk/canisters": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@icp-sdk/canisters/-/canisters-2.0.1.tgz", - "integrity": "sha512-EUo1pxjXyreE8AcxNWI3obUIVB8nacNRyvT3LqtDxvyzBOmxsT6JDxm0FN/j6gsejDYUs63L0gn5j5opzU+DdQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@icp-sdk/canisters/-/canisters-3.0.0.tgz", + "integrity": "sha512-O2xAQdXfG7hwYPbwNP2wxW1+9wR2TLVyOLYFqghtGand+2A1hM6seABUvMD6SLKgPggNCam9n1ZCg6iTvR9JjA==", "license": "Apache-2.0", "peer": true, + "dependencies": { + "@noble/hashes": "^1.8.0", + "base58-js": "^3.0.3", + "bech32": "^2.0.0" + }, "peerDependencies": { - "@dfinity/ckbtc": "^6", - "@dfinity/cketh": "^6", - "@dfinity/cmc": "^8", - "@dfinity/ic-management": "^9", - "@dfinity/ledger-icp": "^8", - "@dfinity/ledger-icrc": "^6", - "@dfinity/nns": "^11", - "@dfinity/sns": "^6", "@dfinity/utils": "^4", "@icp-sdk/core": "^4" } @@ -1452,13 +1348,13 @@ } }, "node_modules/@junobuild/admin": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-3.0.4.tgz", - "integrity": "sha512-SQ2qZDbYPw3cBARtn9BZEruMQZkBZuBEVUHP1FjPAqU/95MhfsrRUPXKvVrOsZ7X+EiAILCINC2JhieqhEv17Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@junobuild/admin/-/admin-3.1.0.tgz", + "integrity": "sha512-VNBvcRrUPsyKjl5F8/ZhDqXPU/o/l+VRJMklS5qt6nwHZBFT5+5MyTmxOU0lqWRpDMRWkEwEhEwGMsxqYkUflg==", "license": "MIT", "peerDependencies": { "@dfinity/utils": "^4", - "@icp-sdk/canisters": "^2", + "@icp-sdk/canisters": "^3", "@icp-sdk/core": "^4.2", "@junobuild/config": "*", "@junobuild/ic-client": "^7", @@ -1467,14 +1363,14 @@ } }, "node_modules/@junobuild/cdn": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@junobuild/cdn/-/cdn-2.0.4.tgz", - "integrity": "sha512-p6eRl1RlxkcE3IPJlZOBfZHP28Kmv+5pBpCIw9yNM8gcXyJdvKOmQcm15xpjxCVqVux8BhgTKo80i42Tg7jwcg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@junobuild/cdn/-/cdn-2.1.0.tgz", + "integrity": "sha512-1waXnd1M7uPbsOp4mk3q8wjkpgBYhMgH+02DETmg6nW82NnOhTUlkcuS9oKVvEypKq7hfTLZRAdvQiakdopFyg==", "license": "MIT", "peer": true, "peerDependencies": { "@dfinity/utils": "^4", - "@icp-sdk/canisters": "^2", + "@icp-sdk/canisters": "^3", "@icp-sdk/core": "^4.2", "@junobuild/config": "*", "@junobuild/ic-client": "^7", @@ -2205,9 +2101,9 @@ } }, "node_modules/asn1js": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/asn1js/-/asn1js-3.0.6.tgz", - "integrity": "sha512-UOCGPYbl0tv8+006qks/dTgV9ajs97X2p0FAbyS2iyCRrmLSRolDaHdp+v/CLgnzHc3fVB+CwYiUmei7ndFcgA==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/asn1js/-/asn1js-3.0.7.tgz", + "integrity": "sha512-uLvq6KJu04qoQM6gvBfKFjlh6Gl0vOKQuR5cJMDHQkmwfMOQeN3F3SHCv9SNYSL+CRoHvOGFfllDlVz03GQjvQ==", "license": "BSD-3-Clause", "dependencies": { "pvtsutils": "^1.3.6", @@ -2271,9 +2167,9 @@ } }, "node_modules/baseline-browser-mapping": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.0.tgz", - "integrity": "sha512-Mh++g+2LPfzZToywfE1BUzvZbfOY52Nil0rn9H1CPC5DJ7fX+Vir7nToBeoiSbB1zTNeGYbELEvJESujgGrzXw==", + "version": "2.9.6", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.6.tgz", + "integrity": "sha512-v9BVVpOTLB59C9E7aSnmIF8h7qRsFpx+A2nugVMTszEOMcfjlZMsXRm4LF23I3Z9AJxc8ANpIvzbzONoX9VJlg==", "license": "Apache-2.0", "bin": { "baseline-browser-mapping": "dist/cli.js" @@ -2402,9 +2298,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001759", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001759.tgz", - "integrity": "sha512-Pzfx9fOKoKvevQf8oCXoyNRQ5QyxJj+3O0Rqx2V5oxT61KGx8+n6hV/IUyJeifUci2clnmmKVpvtiqRzgiWjSw==", + "version": "1.0.30001760", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001760.tgz", + "integrity": "sha512-7AAMPcueWELt1p3mi13HR/LHH0TJLT11cnwDJEs3xA4+CK/PLKeO9Kl1oru24htkyUKtkGCvAx4ohB0Ttry8Dw==", "funding": [ { "type": "opencollective", @@ -2716,9 +2612,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.263", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.263.tgz", - "integrity": "sha512-DrqJ11Knd+lo+dv+lltvfMDLU27g14LMdH2b0O3Pio4uk0x+z7OR+JrmyacTPN2M8w3BrZ7/RTwG3R9B7irPlg==", + "version": "1.5.267", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz", + "integrity": "sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -5909,9 +5805,9 @@ "license": "MIT" }, "node_modules/update-browserslist-db": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.0.tgz", - "integrity": "sha512-Dn+NlSF/7+0lVSEZ57SYQg6/E44arLzsVOGgrElBn/BlG1B8WKdbLppOocFrXwRNTkNlgdGNaBgH1o0lggDPiw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.2.tgz", + "integrity": "sha512-E85pfNzMQ9jpKkA7+TJAi4TJN+tBCuWh5rUcS/sv6cFi+1q9LYDwDI5dpUL0u/73EElyQ8d3TEaeW4sPedBqYA==", "funding": [ { "type": "opencollective", diff --git a/cli/package.json b/cli/package.json index 46a5b9d..350aadb 100755 --- a/cli/package.json +++ b/cli/package.json @@ -26,10 +26,10 @@ "lint": "eslint --max-warnings 0 'src/**/*.ts'" }, "dependencies": { - "@icp-sdk/canisters": "^2.0.1", + "@icp-sdk/canisters": "^3.0.0", "@icp-sdk/core": "^4.2.3", - "@junobuild/admin": "^3.0.4", - "@junobuild/cdn": "^2.0.4", + "@junobuild/admin": "^3.1.0", + "@junobuild/cdn": "^2.1.0", "@junobuild/cli-tools": "^0.9.4", "@junobuild/config": "^2.7.0", "@junobuild/config-loader": "^0.4.6", diff --git a/cli/src/constants/upgrade.constants.ts b/cli/src/constants/upgrade.constants.ts index 8314619..0bff880 100644 --- a/cli/src/constants/upgrade.constants.ts +++ b/cli/src/constants/upgrade.constants.ts @@ -1,7 +1,7 @@ -import type {canister_install_mode} from '@icp-sdk/canisters/ic-management'; +import type {IcManagementDid} from '@icp-sdk/canisters/ic-management'; -export const INSTALL_MODE_INSTALL: canister_install_mode = {install: null}; +export const INSTALL_MODE_INSTALL: IcManagementDid.canister_install_mode = {install: null}; -export const INSTALL_MODE_UPGRADE: canister_install_mode = { +export const INSTALL_MODE_UPGRADE: IcManagementDid.canister_install_mode = { upgrade: [{skip_pre_upgrade: [false], wasm_memory_persistence: [{replace: null}]}] }; diff --git a/cli/src/modules/cmc/cmc.post-install.ts b/cli/src/modules/cmc/cmc.post-install.ts index 1a375f1..f45573d 100644 --- a/cli/src/modules/cmc/cmc.post-install.ts +++ b/cli/src/modules/cmc/cmc.post-install.ts @@ -1,5 +1,5 @@ import {hexStringToUint8Array} from '@dfinity/utils'; -import {GovernanceCanister, NnsFunction, type MakeProposalRequest} from '@icp-sdk/canisters/nns'; +import {NnsFunction, NnsGovernanceCanister, type MakeProposalRequest} from '@icp-sdk/canisters/nns'; import {IC_ROOT_KEY} from '@icp-sdk/core/agent'; import {IDL} from '@icp-sdk/core/candid'; import {Principal} from '@icp-sdk/core/principal'; @@ -19,7 +19,7 @@ export const makeAuthorizedSubnetworksProposal = async ({ port }); - const {makeProposal} = GovernanceCanister.create({ + const {makeProposal} = NnsGovernanceCanister.create({ agent }); diff --git a/cli/src/modules/governance/governance.post-install.ts b/cli/src/modules/governance/governance.post-install.ts index 125d150..30876d5 100644 --- a/cli/src/modules/governance/governance.post-install.ts +++ b/cli/src/modules/governance/governance.post-install.ts @@ -1,4 +1,4 @@ -import {GovernanceCanister, NnsFunction, type MakeProposalRequest} from '@icp-sdk/canisters/nns'; +import {NnsFunction, NnsGovernanceCanister, type MakeProposalRequest} from '@icp-sdk/canisters/nns'; import {IDL} from '@icp-sdk/core/candid'; import {createAgent} from '../../api/agent.api'; import {MAIN_IDENTITY_KEY} from '../../constants/constants'; @@ -16,7 +16,7 @@ export const makeIcpXdrProposal = async ({ port }); - const {makeProposal} = GovernanceCanister.create({ + const {makeProposal} = NnsGovernanceCanister.create({ agent }); diff --git a/cli/src/modules/satellite/dynamic.ts b/cli/src/modules/satellite/dynamic.ts index 58ea141..5df907c 100644 --- a/cli/src/modules/satellite/dynamic.ts +++ b/cli/src/modules/satellite/dynamic.ts @@ -1,5 +1,5 @@ import {fromNullable, isNullish, nonNullish, uint8ArrayToHexString} from '@dfinity/utils'; -import {ICManagementCanister} from '@icp-sdk/canisters/ic-management'; +import {IcManagementCanister} from '@icp-sdk/canisters/ic-management'; import {Principal} from '@icp-sdk/core/principal'; import { junoConfigExist as junoConfigExistTools, @@ -71,7 +71,7 @@ class SatelliteDynamicModule extends SatelliteModule { }: SatelliteDynamicModuleRegisterParams): Promise { const {agent} = context; - const {canisterStatus} = ICManagementCanister.create({ + const {canisterStatus} = IcManagementCanister.create({ agent }); diff --git a/cli/src/modules/satellite/satellite.config.ts b/cli/src/modules/satellite/satellite.config.ts index 3b5d8f1..cb1805a 100644 --- a/cli/src/modules/satellite/satellite.config.ts +++ b/cli/src/modules/satellite/satellite.config.ts @@ -1,6 +1,6 @@ import {isNullish} from '@dfinity/utils'; import type {PrincipalText} from '@dfinity/zod-schemas'; -import {ICManagementCanister} from '@icp-sdk/canisters/ic-management'; +import {IcManagementCanister} from '@icp-sdk/canisters/ic-management'; import {Principal} from '@icp-sdk/core/principal'; import { listSatelliteControllers, @@ -74,7 +74,7 @@ export const setSatelliteControllers = async ({ // We do not have mission control in the satellite image, therefore we set the admin controllers ourselves. if (admin.length > 0) { - const {updateSettings} = ICManagementCanister.create({ + const {updateSettings} = IcManagementCanister.create({ agent }); diff --git a/cli/src/services/modules/juno.module.services.ts b/cli/src/services/modules/juno.module.services.ts index 831d7d7..b0f467a 100644 --- a/cli/src/services/modules/juno.module.services.ts +++ b/cli/src/services/modules/juno.module.services.ts @@ -1,5 +1,5 @@ import {isNullish} from '@dfinity/utils'; -import {ICManagementCanister} from '@icp-sdk/canisters/ic-management'; +import {IcManagementCanister} from '@icp-sdk/canisters/ic-management'; import {Principal} from '@icp-sdk/core/principal'; import type {ControllerScope} from '../../declarations/console'; import type {CliContext} from '../../types/context'; @@ -37,7 +37,7 @@ export class JunoModule extends Module { const updateControllers = async () => { // Set the controller to the canister. - const {updateSettings, canisterStatus} = ICManagementCanister.create({ + const {updateSettings, canisterStatus} = IcManagementCanister.create({ agent }); diff --git a/cli/src/services/modules/module.services.ts b/cli/src/services/modules/module.services.ts index c154c87..5d2fc2d 100644 --- a/cli/src/services/modules/module.services.ts +++ b/cli/src/services/modules/module.services.ts @@ -1,5 +1,5 @@ import {isNullish, nonNullish} from '@dfinity/utils'; -import {ICManagementCanister, type canister_install_mode} from '@icp-sdk/canisters/ic-management'; +import {IcManagementCanister, type IcManagementDid} from '@icp-sdk/canisters/ic-management'; import {IDL} from '@icp-sdk/core/candid'; import {Principal} from '@icp-sdk/core/principal'; import {upgradeModule} from '@junobuild/admin'; @@ -37,7 +37,7 @@ const createCanister = async ({ agent, canisterId: canisterIdParam }: CliContext & Pick): Promise => { - const {provisionalCreateCanisterWithCycles} = ICManagementCanister.create({ + const {provisionalCreateCanisterWithCycles} = IcManagementCanister.create({ agent }); @@ -60,7 +60,7 @@ const installCode = async ({ Omit & { arg?: Uint8Array; wasm: Buffer; - mode: canister_install_mode; + mode: IcManagementDid.canister_install_mode; }) => { await upgradeModule({ actor: {