diff --git a/package-lock.json b/package-lock.json index 86cb0c52c..8d58bbab0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,9 +40,9 @@ } }, "node_modules/@dfinity/agent": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@dfinity/agent/-/agent-3.2.4.tgz", - "integrity": "sha512-2TpFyaInmdRemQ8QlP4yZusO+6Dqe98SBvSSGOWcCL2zQ7u/dgKA1jXwXb7tdHHMXvdC1bXFjeyBGqpqTG6avA==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@dfinity/agent/-/agent-3.3.0.tgz", + "integrity": "sha512-CymEzXEfWpY+ecLlRhVa5occAQBIx5xVghZZ6EH1PSQVHm2bUXXPGmhC0SbEG+1qFgfiBSGCpJ2bMhrA1kBifw==", "license": "Apache-2.0", "peer": true, "dependencies": { @@ -50,19 +50,19 @@ "@noble/curves": "^1.9.2" }, "peerDependencies": { - "@dfinity/candid": "3.2.4", - "@dfinity/principal": "3.2.4", + "@dfinity/candid": "3.3.0", + "@dfinity/principal": "3.3.0", "@noble/hashes": "^1.8.0" } }, "node_modules/@dfinity/candid": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@dfinity/candid/-/candid-3.2.4.tgz", - "integrity": "sha512-VpzY4mFHmm/F4iuqW3AMehKEsTeFbM5CDkRqp0IHS2gqxBm0XDkreJhIyv5S4P93NxGx1QzPCN1wzO5wPuH8OA==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@dfinity/candid/-/candid-3.3.0.tgz", + "integrity": "sha512-cBK1B4EAr5FcwHjcXC5Hh9tFjWt8suFTggprhBJ0pJb7A7sztJJMxZrFbkfE8GdYoaIl3FUV0TatKT3C7FJ7ow==", "license": "Apache-2.0", "peer": true, "peerDependencies": { - "@dfinity/principal": "3.2.4" + "@dfinity/principal": "3.3.0" } }, "node_modules/@dfinity/cbor": { @@ -117,6 +117,38 @@ "resolved": "packages/ic-management", "link": true }, + "node_modules/@dfinity/identity": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@dfinity/identity/-/identity-3.3.0.tgz", + "integrity": "sha512-991/j+PSgxSeaFLHBL6oD3whsjbpII+EtUsc8YfLi89mW9Prt8HAmxx39lLNQ2xykBitAopDcrAA7RJ6de/xiA==", + "license": "Apache-2.0", + "peer": true, + "peerDependencies": { + "@dfinity/agent": "3.3.0", + "@dfinity/candid": "3.3.0", + "@dfinity/principal": "3.3.0", + "@noble/curves": "^1.9.2", + "@noble/hashes": "^1.8.0" + } + }, + "node_modules/@dfinity/identity-secp256k1": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@dfinity/identity-secp256k1/-/identity-secp256k1-3.3.0.tgz", + "integrity": "sha512-j8+mPMpdivq40A1AjhoJRUwJt026e8G0DdAeITu5mKrqLzgou5w3iDS1l/RYdh4k6hJzz50VYJ5BBfIHoVkiMA==", + "license": "Apache-2.0", + "peer": true, + "dependencies": { + "@dfinity/agent": "3.3.0", + "@scure/bip32": "^1.7.0", + "@scure/bip39": "^1.6.0", + "asn1js": "^3.0.5" + }, + "peerDependencies": { + "@dfinity/candid": "3.3.0", + "@noble/curves": "^1.9.2", + "@noble/hashes": "^1.8.0" + } + }, "node_modules/@dfinity/ledger-icp": { "resolved": "packages/ledger-icp", "link": true @@ -134,9 +166,9 @@ "link": true }, "node_modules/@dfinity/principal": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@dfinity/principal/-/principal-3.2.4.tgz", - "integrity": "sha512-7qTjDb9k/J/55k0/ZnD8s2+L+IgfG6K1lC7iywhQQL/4Qe0UIljUTasDk85kooY2QeNvWSl7MsLWp69LPBiYjw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@dfinity/principal/-/principal-3.3.0.tgz", + "integrity": "sha512-0oisjzg6n7U7raayhcpmBLGxPQ4o/FbsMv0JN7OecVHaXo7+RfTrv+Dr5ty4JHTZJEw/4q+3sSPG9otRpbjaMA==", "license": "Apache-2.0", "peer": true, "dependencies": { @@ -842,6 +874,20 @@ "resolved": "packages/canisters", "link": true }, + "node_modules/@icp-sdk/core": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@icp-sdk/core/-/core-4.1.0.tgz", + "integrity": "sha512-PTQMmszYGJ6hVgOlHI3Sys5BkN3rYphYeDeaodQo6X+gLtitdvNg4/wbwSdnWeVfODM6/1Z4MCuEN+YVqOjsCQ==", + "license": "Apache-2.0", + "peer": true, + "peerDependencies": { + "@dfinity/agent": "3.3.0", + "@dfinity/candid": "3.3.0", + "@dfinity/identity": "3.3.0", + "@dfinity/identity-secp256k1": "3.3.0", + "@dfinity/principal": "3.3.0" + } + }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", @@ -1220,6 +1266,45 @@ "license": "MIT", "peer": true }, + "node_modules/@scure/base": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.2.6.tgz", + "integrity": "sha512-g/nm5FgUa//MCj1gV09zTJTaM6KBAHqLN907YVQqf7zC49+DcO4B1so4ZX07Ef10Twr6nuqYEH9GEggFXA4Fmg==", + "license": "MIT", + "peer": true, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@scure/bip32": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.7.0.tgz", + "integrity": "sha512-E4FFX/N3f4B80AKWp5dP6ow+flD1LQZo/w8UnLGYZO674jS6YnYeepycOOksv+vLPSpgN35wgKgy+ybfTb2SMw==", + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/curves": "~1.9.0", + "@noble/hashes": "~1.8.0", + "@scure/base": "~1.2.5" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@scure/bip39": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.6.0.tgz", + "integrity": "sha512-+lF0BbLiJNwVlev4eKelw1WWLaiKXw7sSl8T6FvBlWkdX+94aGJ4o8XjUdlyhTCjd8c+B3KT3JfS8P0bLRNU6A==", + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/hashes": "~1.8.0", + "@scure/base": "~1.2.5" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@size-limit/esbuild": { "version": "11.2.0", "resolved": "https://registry.npmjs.org/@size-limit/esbuild/-/esbuild-11.2.0.tgz", @@ -1941,6 +2026,21 @@ "url": "https://github.com/sponsors/ljharb" } }, + "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==", + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "pvtsutils": "^1.3.6", + "pvutils": "^1.1.3", + "tslib": "^2.8.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/assertion-error": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", @@ -5039,6 +5139,26 @@ "node": ">=6" } }, + "node_modules/pvtsutils": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/pvtsutils/-/pvtsutils-1.3.6.tgz", + "integrity": "sha512-PLgQXQ6H2FWCaeRak8vvk1GW462lMxB5s3Jm673N82zI4vqtVUPuZdffdZbPDFRoU8kAhItWFtPCWiPpp4/EDg==", + "license": "MIT", + "peer": true, + "dependencies": { + "tslib": "^2.8.1" + } + }, + "node_modules/pvutils": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/pvutils/-/pvutils-1.1.3.tgz", + "integrity": "sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==", + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -5948,6 +6068,13 @@ "typescript": "^5" } }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD", + "peer": true + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -6528,8 +6655,7 @@ "packages/canisters": { "name": "@icp-sdk/canisters", "version": "1.0.0", - "license": "Apache-2.0", - "devDependencies": {} + "license": "Apache-2.0" }, "packages/ckbtc": { "name": "@dfinity/ckbtc", @@ -6541,10 +6667,8 @@ "bech32": "^2.0.0" }, "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" } }, "packages/ckbtc/node_modules/base58-js": { @@ -6562,10 +6686,8 @@ "version": "4.0.6", "license": "Apache-2.0", "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" } }, "packages/cmc": { @@ -6573,10 +6695,8 @@ "version": "6.0.6", "license": "Apache-2.0", "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" } }, "packages/ic-management": { @@ -6584,10 +6704,8 @@ "version": "7.1.3", "license": "Apache-2.0", "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" } }, "packages/ledger-icp": { @@ -6595,10 +6713,8 @@ "version": "6.1.2", "license": "Apache-2.0", "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" } }, "packages/ledger-icrc": { @@ -6606,10 +6722,8 @@ "version": "4.1.2", "license": "Apache-2.0", "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" } }, "packages/nns": { @@ -6620,11 +6734,9 @@ "@noble/hashes": "^1.8.0" }, "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", "@dfinity/ledger-icp": "^6", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" } }, "packages/nns-proto": { @@ -6646,11 +6758,9 @@ "@noble/hashes": "^1.8.0" }, "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", "@dfinity/ledger-icrc": "^4", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" } }, "packages/utils": { @@ -6658,9 +6768,7 @@ "version": "3.2.0", "license": "Apache-2.0", "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", - "@dfinity/principal": "^3" + "@icp-sdk/core": "^4" } }, "packages/zod-schemas": { @@ -6668,16 +6776,16 @@ "version": "2.1.0", "license": "Apache-2.0", "peerDependencies": { - "@dfinity/principal": "*", + "@icp-sdk/core": "*", "zod": "^4" } } }, "dependencies": { "@dfinity/agent": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@dfinity/agent/-/agent-3.2.4.tgz", - "integrity": "sha512-2TpFyaInmdRemQ8QlP4yZusO+6Dqe98SBvSSGOWcCL2zQ7u/dgKA1jXwXb7tdHHMXvdC1bXFjeyBGqpqTG6avA==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@dfinity/agent/-/agent-3.3.0.tgz", + "integrity": "sha512-CymEzXEfWpY+ecLlRhVa5occAQBIx5xVghZZ6EH1PSQVHm2bUXXPGmhC0SbEG+1qFgfiBSGCpJ2bMhrA1kBifw==", "peer": true, "requires": { "@dfinity/cbor": "^0.2.2", @@ -6685,9 +6793,9 @@ } }, "@dfinity/candid": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@dfinity/candid/-/candid-3.2.4.tgz", - "integrity": "sha512-VpzY4mFHmm/F4iuqW3AMehKEsTeFbM5CDkRqp0IHS2gqxBm0XDkreJhIyv5S4P93NxGx1QzPCN1wzO5wPuH8OA==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@dfinity/candid/-/candid-3.3.0.tgz", + "integrity": "sha512-cBK1B4EAr5FcwHjcXC5Hh9tFjWt8suFTggprhBJ0pJb7A7sztJJMxZrFbkfE8GdYoaIl3FUV0TatKT3C7FJ7ow==", "peer": true, "requires": {} }, @@ -6731,6 +6839,25 @@ "version": "file:packages/ic-management", "requires": {} }, + "@dfinity/identity": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@dfinity/identity/-/identity-3.3.0.tgz", + "integrity": "sha512-991/j+PSgxSeaFLHBL6oD3whsjbpII+EtUsc8YfLi89mW9Prt8HAmxx39lLNQ2xykBitAopDcrAA7RJ6de/xiA==", + "peer": true, + "requires": {} + }, + "@dfinity/identity-secp256k1": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@dfinity/identity-secp256k1/-/identity-secp256k1-3.3.0.tgz", + "integrity": "sha512-j8+mPMpdivq40A1AjhoJRUwJt026e8G0DdAeITu5mKrqLzgou5w3iDS1l/RYdh4k6hJzz50VYJ5BBfIHoVkiMA==", + "peer": true, + "requires": { + "@dfinity/agent": "3.3.0", + "@scure/bip32": "^1.7.0", + "@scure/bip39": "^1.6.0", + "asn1js": "^3.0.5" + } + }, "@dfinity/ledger-icp": { "version": "file:packages/ledger-icp", "requires": {} @@ -6753,9 +6880,9 @@ } }, "@dfinity/principal": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@dfinity/principal/-/principal-3.2.4.tgz", - "integrity": "sha512-7qTjDb9k/J/55k0/ZnD8s2+L+IgfG6K1lC7iywhQQL/4Qe0UIljUTasDk85kooY2QeNvWSl7MsLWp69LPBiYjw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@dfinity/principal/-/principal-3.3.0.tgz", + "integrity": "sha512-0oisjzg6n7U7raayhcpmBLGxPQ4o/FbsMv0JN7OecVHaXo7+RfTrv+Dr5ty4JHTZJEw/4q+3sSPG9otRpbjaMA==", "peer": true, "requires": { "@noble/hashes": "^1.8.0" @@ -7107,6 +7234,13 @@ "@icp-sdk/canisters": { "version": "file:packages/canisters" }, + "@icp-sdk/core": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@icp-sdk/core/-/core-4.1.0.tgz", + "integrity": "sha512-PTQMmszYGJ6hVgOlHI3Sys5BkN3rYphYeDeaodQo6X+gLtitdvNg4/wbwSdnWeVfODM6/1Z4MCuEN+YVqOjsCQ==", + "peer": true, + "requires": {} + }, "@jridgewell/sourcemap-codec": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", @@ -7310,6 +7444,33 @@ "dev": true, "peer": true }, + "@scure/base": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.2.6.tgz", + "integrity": "sha512-g/nm5FgUa//MCj1gV09zTJTaM6KBAHqLN907YVQqf7zC49+DcO4B1so4ZX07Ef10Twr6nuqYEH9GEggFXA4Fmg==", + "peer": true + }, + "@scure/bip32": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.7.0.tgz", + "integrity": "sha512-E4FFX/N3f4B80AKWp5dP6ow+flD1LQZo/w8UnLGYZO674jS6YnYeepycOOksv+vLPSpgN35wgKgy+ybfTb2SMw==", + "peer": true, + "requires": { + "@noble/curves": "~1.9.0", + "@noble/hashes": "~1.8.0", + "@scure/base": "~1.2.5" + } + }, + "@scure/bip39": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.6.0.tgz", + "integrity": "sha512-+lF0BbLiJNwVlev4eKelw1WWLaiKXw7sSl8T6FvBlWkdX+94aGJ4o8XjUdlyhTCjd8c+B3KT3JfS8P0bLRNU6A==", + "peer": true, + "requires": { + "@noble/hashes": "~1.8.0", + "@scure/base": "~1.2.5" + } + }, "@size-limit/esbuild": { "version": "11.2.0", "resolved": "https://registry.npmjs.org/@size-limit/esbuild/-/esbuild-11.2.0.tgz", @@ -7771,6 +7932,17 @@ "is-array-buffer": "^3.0.4" } }, + "asn1js": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/asn1js/-/asn1js-3.0.6.tgz", + "integrity": "sha512-UOCGPYbl0tv8+006qks/dTgV9ajs97X2p0FAbyS2iyCRrmLSRolDaHdp+v/CLgnzHc3fVB+CwYiUmei7ndFcgA==", + "peer": true, + "requires": { + "pvtsutils": "^1.3.6", + "pvutils": "^1.1.3", + "tslib": "^2.8.1" + } + }, "assertion-error": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", @@ -9786,6 +9958,21 @@ "dev": true, "peer": true }, + "pvtsutils": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/pvtsutils/-/pvtsutils-1.3.6.tgz", + "integrity": "sha512-PLgQXQ6H2FWCaeRak8vvk1GW462lMxB5s3Jm673N82zI4vqtVUPuZdffdZbPDFRoU8kAhItWFtPCWiPpp4/EDg==", + "peer": true, + "requires": { + "tslib": "^2.8.1" + } + }, + "pvutils": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/pvutils/-/pvutils-1.1.3.tgz", + "integrity": "sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==", + "peer": true + }, "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -10357,6 +10544,12 @@ "dev": true, "requires": {} }, + "tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "peer": true + }, "type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", diff --git a/package.json b/package.json index bfdcb0723..6944b40a4 100644 --- a/package.json +++ b/package.json @@ -63,6 +63,7 @@ "@dfinity/agent", "@dfinity/candid", "@dfinity/principal", + "@icp-sdk/core", "@dfinity/utils" ] }, @@ -75,6 +76,7 @@ "@dfinity/agent", "@dfinity/candid", "@dfinity/principal", + "@icp-sdk/core", "@dfinity/utils" ] }, @@ -87,6 +89,7 @@ "@dfinity/agent", "@dfinity/candid", "@dfinity/principal", + "@icp-sdk/core", "@dfinity/utils" ] }, @@ -99,6 +102,7 @@ "@dfinity/agent", "@dfinity/candid", "@dfinity/principal", + "@icp-sdk/core", "@dfinity/utils" ] }, @@ -111,6 +115,7 @@ "@dfinity/agent", "@dfinity/candid", "@dfinity/principal", + "@icp-sdk/core", "@dfinity/utils" ] }, @@ -123,6 +128,7 @@ "@dfinity/agent", "@dfinity/candid", "@dfinity/principal", + "@icp-sdk/core", "@dfinity/utils", "@dfinity/ledger-icp" ] @@ -142,6 +148,7 @@ "@dfinity/agent", "@dfinity/candid", "@dfinity/principal", + "@icp-sdk/core", "@dfinity/utils", "@dfinity/ledger-icrc" ] @@ -154,7 +161,8 @@ "ignore": [ "@dfinity/agent", "@dfinity/candid", - "@dfinity/principal" + "@dfinity/principal", + "@icp-sdk/core" ] }, { @@ -164,7 +172,8 @@ "gzip": true, "ignore": [ "zod", - "@dfinity/principal" + "@dfinity/principal", + "@icp-sdk/core" ] }, { @@ -176,6 +185,7 @@ "@dfinity/agent", "@dfinity/candid", "@dfinity/principal", + "@icp-sdk/core", "@dfinity/utils" ] } diff --git a/packages/ckbtc/package.json b/packages/ckbtc/package.json index ad92b5f43..9ec1d7cf8 100644 --- a/packages/ckbtc/package.json +++ b/packages/ckbtc/package.json @@ -51,10 +51,8 @@ ], "homepage": "https://github.com/dfinity/ic-js#readme", "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" }, "dependencies": { "@noble/hashes": "^1.8.0", diff --git a/packages/cketh/package.json b/packages/cketh/package.json index f2d0362a0..4175e4a2f 100644 --- a/packages/cketh/package.json +++ b/packages/cketh/package.json @@ -51,9 +51,7 @@ ], "homepage": "https://github.com/dfinity/ic-js#readme", "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" } } diff --git a/packages/cmc/package.json b/packages/cmc/package.json index c440370ec..d444998a4 100644 --- a/packages/cmc/package.json +++ b/packages/cmc/package.json @@ -49,9 +49,7 @@ ], "homepage": "https://github.com/dfinity/ic-js#readme", "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" } } diff --git a/packages/ic-management/package.json b/packages/ic-management/package.json index b91052cc5..3394e1b24 100644 --- a/packages/ic-management/package.json +++ b/packages/ic-management/package.json @@ -47,9 +47,7 @@ ], "homepage": "https://github.com/dfinity/ic-js#readme", "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" } } diff --git a/packages/ledger-icp/package.json b/packages/ledger-icp/package.json index b9a524d84..2b3147f1f 100644 --- a/packages/ledger-icp/package.json +++ b/packages/ledger-icp/package.json @@ -51,9 +51,7 @@ ], "homepage": "https://github.com/dfinity/ic-js#readme", "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" } } diff --git a/packages/ledger-icrc/package.json b/packages/ledger-icrc/package.json index cda4e2d97..065a46cc3 100644 --- a/packages/ledger-icrc/package.json +++ b/packages/ledger-icrc/package.json @@ -50,9 +50,7 @@ ], "homepage": "https://github.com/dfinity/ic-js#readme", "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" } } diff --git a/packages/nns/package.json b/packages/nns/package.json index b31300f9d..61211f5c0 100644 --- a/packages/nns/package.json +++ b/packages/nns/package.json @@ -60,10 +60,8 @@ "network-nervous-system" ], "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", "@dfinity/ledger-icp": "^6", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" } } diff --git a/packages/sns/package.json b/packages/sns/package.json index db8adf266..2cf839f34 100644 --- a/packages/sns/package.json +++ b/packages/sns/package.json @@ -49,11 +49,9 @@ "sns" ], "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", "@dfinity/ledger-icrc": "^4", - "@dfinity/principal": "^3", - "@dfinity/utils": "^3" + "@dfinity/utils": "^3", + "@icp-sdk/core": "^4" }, "dependencies": { "@noble/hashes": "^1.8.0" diff --git a/packages/utils/package.json b/packages/utils/package.json index 5d170e0db..91ca39fae 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -60,8 +60,6 @@ "service-nervous-system" ], "peerDependencies": { - "@dfinity/agent": "^3", - "@dfinity/candid": "^3", - "@dfinity/principal": "^3" + "@icp-sdk/core": "^4" } } diff --git a/packages/zod-schemas/package.json b/packages/zod-schemas/package.json index 66e2e9e33..d0d428066 100644 --- a/packages/zod-schemas/package.json +++ b/packages/zod-schemas/package.json @@ -60,7 +60,7 @@ "service-nervous-system" ], "peerDependencies": { - "@dfinity/principal": "*", + "@icp-sdk/core": "*", "zod": "^4" } } diff --git a/scripts/esbuild.mjs b/scripts/esbuild.mjs index 6d6e8f0c0..f93584251 100644 --- a/scripts/esbuild.mjs +++ b/scripts/esbuild.mjs @@ -24,7 +24,16 @@ const rootPeerDependencies = () => { return peerDependencies(packageJson); }; -const commonPeerDependencies = rootPeerDependencies(); +// TODO: To be removed once all imports have been migrated to `@icp-sdk/core/...` +const agentJsPeerDependencies = { + "@dfinity/agent": "^3", + "@dfinity/candid": "^3", + "@dfinity/principal": "^3", +}; +const commonPeerDependencies = { + ...rootPeerDependencies(), + ...agentJsPeerDependencies, +}; const workspacePeerDependencies = peerDependencies( join(process.cwd(), "package.json"), ); diff --git a/scripts/update-agent b/scripts/update-agent index 8ff35fae4..80f29dbd7 100755 --- a/scripts/update-agent +++ b/scripts/update-agent @@ -3,38 +3,25 @@ function rm_agent() { local package=$1 - npm rm @dfinity/agent @dfinity/candid @dfinity/principal --workspace=packages/"$package" -} - -function install_agent() { - local package=$1 + npm rm @icp-sdk/core --workspace=packages/"$package" - npm i @dfinity/agent@latest @dfinity/candid@latest @dfinity/principal@latest --workspace=packages/"$package" --save-peer + # Just in case, make sure the dependencies re-exported by `@icp-sdk/core` are properly removed + npm rm @dfinity/agent @dfinity/candid @dfinity/principal @dfinity/identity @dfinity/identity-secp256k1 --workspace=packages/"$package" } -function install_principal() { +function install_agent() { local package=$1 - npm i @dfinity/principal@latest --workspace=packages/"$package" --save-peer + npm i @icp-sdk/core@latest --workspace=packages/"$package" --save-peer } -PACKAGES=utils,ckbtc,cketh,cmc,ic-management,ledger-icp,ledger-icrc,nns,sns - -PACKAGES_PRINCIPAL_ONLY=zod-schemas +PACKAGES=utils,ckbtc,cketh,cmc,ic-management,ledger-icp,ledger-icrc,nns,sns,zod-schemas # Remove agent-js libraries from all packages first to avoid resolve conflicts between those for package in $(echo $PACKAGES | sed "s/,/ /g"); do rm_agent "$package" done -for package in $(echo $PACKAGES_PRINCIPAL_ONLY | sed "s/,/ /g"); do - rm_agent "$package" -done - for package in $(echo $PACKAGES | sed "s/,/ /g"); do install_agent "$package" done - -for package in $(echo $PACKAGES_PRINCIPAL_ONLY | sed "s/,/ /g"); do - install_principal "$package" -done