ic-mops 1.11.0 → 1.12.0

package/dist/commands/bench-replica.js

@@ -4,6 +4,7 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { execaCommand } from 'execa';
 import { PocketIc, PocketIcServer } from 'pic-ic';
+import { PocketIc as PocketIcMops, PocketIcServer as PocketIcServerMops } from 'pic-js-mops';
 import { getRootDir, readConfig } from '../mops.js';
 import { createActor, idlFactory } from '../declarations/bench/index.js';
 import { toolchain } from './toolchain/index.js';
@@ -31,14 +32,24 @@ export class BenchReplica {
         else {
             let pocketIcBin = await toolchain.bin('pocket-ic');
             let config = readConfig();
-            if (config.toolchain?.['pocket-ic'] !== '4.0.0') {
-                console.error('Current Mops CLI only supports pocket-ic 4.0.0');
+            if (config.toolchain?.['pocket-ic'] !== '4.0.0' && !config.toolchain?.['pocket-ic']?.startsWith('9.')) {
+                console.error('Current Mops CLI only supports pocket-ic 9.x.x and 4.0.0');
                 process.exit(1);
             }
-            this.pocketIcServer = await PocketIcServer.start({
-                binPath: pocketIcBin,
-            });
-            this.pocketIc = await PocketIc.create(this.pocketIcServer.getUrl());
+            // pocket-ic 9.x.x
+            if (config.toolchain?.['pocket-ic']?.startsWith('9.')) {
+                this.pocketIcServer = await PocketIcServerMops.start({
+                    binPath: pocketIcBin,
+                });
+                this.pocketIc = await PocketIcMops.create(this.pocketIcServer.getUrl());
+            }
+            // pocket-ic 4.0.0
+            else {
+                this.pocketIcServer = await PocketIcServer.start({
+                    binPath: pocketIcBin,
+                });
+                this.pocketIc = await PocketIc.create(this.pocketIcServer.getUrl());
+            }
         }
     }
     async stop() {

package/dist/commands/maintainer.js

@@ -2,7 +2,7 @@ import process from 'node:process';
 import chalk from 'chalk';
 import { checkConfigFile, getIdentity, readConfig } from '../mops.js';
 import { mainActor } from '../api/actors.js';
-import { Principal } from '@dfinity/principal';
+import { Principal } from '@icp-sdk/core/principal';
 import prompts from 'prompts';
 export async function printMaintainers() {
     if (!checkConfigFile()) {

package/dist/commands/outdated.js

@@ -1,6 +1,7 @@
 import chalk from 'chalk';
 import { checkConfigFile, readConfig } from '../mops.js';
 import { getAvailableUpdates } from './available-updates.js';
+import { getDepName, getDepPinnedVersion } from '../helpers/get-dep-name.js';
 export async function outdated() {
     if (!checkConfigFile()) {
         return;
@@ -12,8 +13,13 @@ export async function outdated() {
     }
     else {
         console.log('Available updates:');
+        let allDeps = [...Object.keys(config.dependencies || {}), ...Object.keys(config['dev-dependencies'] || {})];
         for (let dep of available) {
-            console.log(`${dep[0]} ${chalk.yellow(dep[1])} -> ${chalk.green(dep[2])}`);
+            let name = allDeps.find((d) => {
+                let pinnedVersion = getDepPinnedVersion(d);
+                return getDepName(d) === dep[0] && (!pinnedVersion || dep[1].startsWith(pinnedVersion));
+            }) || dep[0];
+            console.log(`${name} ${chalk.yellow(dep[1])} -> ${chalk.green(dep[2])}`);
         }
     }
 }

package/dist/commands/owner.js

@@ -2,7 +2,7 @@ import process from 'node:process';
 import chalk from 'chalk';
 import { checkConfigFile, getIdentity, readConfig } from '../mops.js';
 import { mainActor } from '../api/actors.js';
-import { Principal } from '@dfinity/principal';
+import { Principal } from '@icp-sdk/core/principal';
 import prompts from 'prompts';
 export async function printOwners() {
     if (!checkConfigFile()) {

package/dist/commands/replica.d.ts

@@ -1,7 +1,8 @@
 import { ChildProcessWithoutNullStreams } from 'node:child_process';
 import { PassThrough } from 'node:stream';
-import { IDL } from '@dfinity/candid';
+import { IDL } from '@icp-sdk/core/candid';
 import { PocketIc, PocketIcServer } from 'pic-ic';
+import { PocketIc as PocketIcMops, PocketIcServer as PocketIcServerMops } from 'pic-js-mops';
 type StartOptions = {
     type?: 'dfx' | 'pocket-ic' | 'dfx-pocket-ic';
     dir?: string;
@@ -17,8 +18,8 @@ export declare class Replica {
         actor: any;
         stream: PassThrough;
     }>;
-    pocketIcServer?: PocketIcServer;
-    pocketIc?: PocketIc;
+    pocketIcServer?: PocketIcServer | PocketIcServerMops;
+    pocketIc?: PocketIc | PocketIcMops;
     dfxProcess?: ChildProcessWithoutNullStreams;
     dir: string;
     ttl: number;

package/dist/commands/replica.js

@@ -4,8 +4,9 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { PassThrough } from 'node:stream';
 import { spawn as spawnAsync } from 'promisify-child-process';
-import { Actor, HttpAgent } from '@dfinity/agent';
+import { Actor, HttpAgent } from '@icp-sdk/core/agent';
 import { PocketIc, PocketIcServer } from 'pic-ic';
+import { PocketIc as PocketIcMops, PocketIcServer as PocketIcServerMops } from 'pic-js-mops';
 import chalk from 'chalk';
 import { readConfig } from '../mops.js';
 import { toolchain } from './toolchain/index.js';
@@ -64,19 +65,31 @@ export class Replica {
         }
         else {
             let pocketIcBin = await toolchain.bin('pocket-ic');
-            // eslint-disable-next-line
             let config = readConfig();
-            if (config.toolchain?.['pocket-ic'] !== '4.0.0') {
-                console.error('Current Mops CLI only supports pocket-ic 4.0.0');
+            if (config.toolchain?.['pocket-ic'] !== '4.0.0' && !config.toolchain?.['pocket-ic']?.startsWith('9.')) {
+                console.error('Current Mops CLI only supports pocket-ic 9.x.x and 4.0.0');
                 process.exit(1);
             }
-            this.pocketIcServer = await PocketIcServer.start({
-                showRuntimeLogs: false,
-                showCanisterLogs: false,
-                binPath: pocketIcBin,
-                ttl: this.ttl,
-            });
-            this.pocketIc = await PocketIc.create(this.pocketIcServer.getUrl());
+            // pocket-ic 9.x.x
+            if (config.toolchain?.['pocket-ic']?.startsWith('9.')) {
+                this.pocketIcServer = await PocketIcServerMops.start({
+                    showRuntimeLogs: false,
+                    showCanisterLogs: false,
+                    binPath: pocketIcBin,
+                    ttl: this.ttl,
+                });
+                this.pocketIc = await PocketIcMops.create(this.pocketIcServer.getUrl());
+            }
+            // pocket-ic 4.0.0
+            else {
+                this.pocketIcServer = await PocketIcServer.start({
+                    showRuntimeLogs: false,
+                    showCanisterLogs: false,
+                    binPath: pocketIcBin,
+                    ttl: this.ttl,
+                });
+                this.pocketIc = await PocketIc.create(this.pocketIcServer.getUrl());
+            }
             // process canister logs
             this._attachCanisterLogHandler(this.pocketIcServer.serverProcess);
         }
@@ -182,10 +195,9 @@ export class Replica {
             };
         }
         else if (this.pocketIc) {
-            // let {canisterId, actor} = await this.pocketIc.setupCanister(idlFactory, wasm);
             let { canisterId, actor } = await this.pocketIc.setupCanister({
-                idlFactory,
                 wasm,
+                idlFactory,
             });
             if (signal?.aborted) {
                 return;

package/dist/commands/test/test.js

@@ -3,6 +3,7 @@ import { spawn } from 'node:child_process';
 import path from 'node:path';
 import fs from 'node:fs';
 import os from 'node:os';
+import { PassThrough } from 'node:stream';
 import chalk from 'chalk';
 import { globSync } from 'glob';
 import chokidar from 'chokidar';
@@ -12,14 +13,13 @@ import { sources } from '../sources.js';
 import { getRootDir, readConfig } from '../../mops.js';
 import { parallel } from '../../parallel.js';
 import { MMF1 } from './mmf1.js';
-import { absToRel } from './utils.js';
+import { absToRel, pipeMMF, pipeStderrToMMF, pipeStdoutToMMF } from './utils.js';
 import { VerboseReporter } from './reporters/verbose-reporter.js';
 import { FilesReporter } from './reporters/files-reporter.js';
 import { CompactReporter } from './reporters/compact-reporter.js';
 import { SilentReporter } from './reporters/silent-reporter.js';
 import { toolchain } from '../toolchain/index.js';
 import { Replica } from '../replica.js';
-import { PassThrough } from 'node:stream';
 import { getDfxVersion } from '../../helpers/get-dfx-version.js';
 let ignore = [
     '**/node_modules/**',
@@ -171,12 +171,7 @@ export async function testWithReporter(reporterName, filter = '', defaultMode =
     replica.dir = testTempDir;
     fs.rmSync(testTempDir, { recursive: true, force: true });
     fs.mkdirSync(testTempDir, { recursive: true });
-    await parallel(os.cpus().length, files, async (file) => {
-        if (signal?.aborted) {
-            return;
-        }
-        let mmf = new MMF1('store', absToRel(file));
-        // mode overrides
+    let filesWithMode = files.map((file) => {
         let lines = fs.readFileSync(file, 'utf8').split('\n');
         let mode = defaultMode;
         if (lines.includes('// @testmode wasi')) {
@@ -185,18 +180,29 @@ export async function testWithReporter(reporterName, filter = '', defaultMode =
         else if (lines.includes('// @testmode replica') || lines.find(line => line.match(/^(persistent )?actor( class)?/))) {
             mode = 'replica';
         }
-        if (mode === 'wasi' && !wasmtimePath) {
-            // ensure wasmtime is installed or specified in config
-            if (config.toolchain?.wasmtime) {
-                wasmtimePath = await toolchain.bin('wasmtime');
-            }
-            // fallback wasmtime to global binary if not specified in config (legacy)
-            else {
-                wasmtimePath = 'wasmtime';
-                console.log(chalk.yellow('Warning:'), 'Wasmtime is not specified in config. Using global binary "wasmtime". This will be removed in the future.');
-                console.log(`Run ${chalk.green('mops toolchain use wasmtime')} or add ${chalk.green('wasmtime = "<version>"')} in mops.toml to avoid breaking changes with future versions of mops.`);
-            }
+        return { file, mode };
+    });
+    let hasWasiTests = filesWithMode.some(({ mode }) => mode === 'wasi');
+    let hasReplicaTests = filesWithMode.some(({ mode }) => mode === 'replica');
+    // prepare wasmtime path
+    if (hasWasiTests && !wasmtimePath) {
+        // ensure wasmtime is installed or specified in config
+        if (config.toolchain?.wasmtime) {
+            wasmtimePath = await toolchain.bin('wasmtime');
+        }
+        // fallback wasmtime to global binary if not specified in config (legacy)
+        else {
+            wasmtimePath = 'wasmtime';
+            console.log(chalk.yellow('Warning:'), 'Wasmtime is not specified in config. Using global binary "wasmtime". This will be removed in the future.');
+            console.log(`Run ${chalk.green('mops toolchain use wasmtime')} or add ${chalk.green('wasmtime = "<version>"')} in mops.toml to avoid breaking changes with future versions of mops.`);
+        }
+    }
+    let runTestFile = async ({ file, mode }) => {
+        if (signal?.aborted) {
+            return;
         }
+        // print logs immediately for replica tests because we run them one-by-one
+        let mmf = new MMF1(mode === 'replica' ? 'print' : 'store', absToRel(file));
         let promise = new Promise((resolve) => {
             let mocArgs = ['--hide-warnings', '--error-detail=2', ...sourcesArr.join(' ').split(' '), file].filter(x => x);
             // interpret
@@ -257,7 +263,6 @@ export async function testWithReporter(reporterName, filter = '', defaultMode =
             }
             // build and execute in replica
             else if (mode === 'replica') {
-                // mmf.strategy = 'print'; // because we run replica tests one-by-one
                 let wasmFile = `${path.join(testTempDir, path.parse(file).name)}.wasm`;
                 // build
                 let buildProc = spawn(mocPath, [`-o=${wasmFile}`, ...mocArgs], { signal });
@@ -320,8 +325,10 @@ export async function testWithReporter(reporterName, filter = '', defaultMode =
         }
         reporter.addRun(file, mmf, promise, mode);
         await promise;
-    });
-    if (replicaStartPromise && !watch) {
+    };
+    await parallel(os.cpus().length, filesWithMode.filter(({ mode }) => mode !== 'replica'), runTestFile);
+    await parallel(1, filesWithMode.filter(({ mode }) => mode === 'replica'), runTestFile);
+    if (hasReplicaTests && !watch) {
         await replica.stop();
         fs.rmSync(testTempDir, { recursive: true, force: true });
     }
@@ -330,62 +337,3 @@ export async function testWithReporter(reporterName, filter = '', defaultMode =
     }
     return reporter.done();
 }
-function pipeStdoutToMMF(stdout, mmf) {
-    stdout.on('data', (data) => {
-        for (let line of data.toString().split('\n')) {
-            line = line.trim();
-            if (line) {
-                mmf.parseLine(line);
-            }
-        }
-    });
-}
-function pipeStderrToMMF(stderr, mmf, dir = '') {
-    stderr.on('data', (data) => {
-        let text = data.toString().trim();
-        let failedLine = '';
-        text = text.replace(/([\w+._/-]+):(\d+).(\d+)(-\d+.\d+)/g, (_m0, m1, m2, m3) => {
-            // change absolute file path to relative
-            // change :line:col-line:col to :line:col to work in vscode
-            let res = `${absToRel(m1)}:${m2}:${m3}`;
-            let file = path.join(dir, m1);
-            if (!fs.existsSync(file)) {
-                return res;
-            }
-            // show failed line
-            let content = fs.readFileSync(file);
-            let lines = content.toString().split('\n') || [];
-            failedLine += chalk.dim('\n   ...');
-            let lineBefore = lines[+m2 - 2];
-            if (lineBefore) {
-                failedLine += chalk.dim(`\n   ${+m2 - 1}\t| ${lineBefore.replaceAll('\t', '  ')}`);
-            }
-            failedLine += `\n${chalk.redBright `->`} ${m2}\t| ${lines[+m2 - 1]?.replaceAll('\t', '  ')}`;
-            if (lines.length > +m2) {
-                failedLine += chalk.dim(`\n   ${+m2 + 1}\t| ${lines[+m2]?.replaceAll('\t', '  ')}`);
-            }
-            failedLine += chalk.dim('\n   ...');
-            return res;
-        });
-        if (failedLine) {
-            text += failedLine;
-        }
-        mmf.fail(text);
-    });
-}
-function pipeMMF(proc, mmf) {
-    return new Promise((resolve) => {
-        pipeStdoutToMMF(proc.stdout, mmf);
-        pipeStderrToMMF(proc.stderr, mmf);
-        // exit
-        proc.on('close', (code) => {
-            if (code === 0) {
-                mmf.strategy !== 'print' && mmf.pass();
-            }
-            else if (code !== 1) {
-                mmf.fail(`unknown exit code: ${code}`);
-            }
-            resolve();
-        });
-    });
-}

package/dist/commands/test/utils.d.ts

@@ -1 +1,7 @@
+import { ChildProcessWithoutNullStreams } from 'node:child_process';
+import { Readable } from 'node:stream';
+import { MMF1 } from './mmf1.js';
 export declare function absToRel(p: string): string;
+export declare function pipeStdoutToMMF(stdout: Readable, mmf: MMF1): void;
+export declare function pipeStderrToMMF(stderr: Readable, mmf: MMF1, dir?: string): void;
+export declare function pipeMMF(proc: ChildProcessWithoutNullStreams, mmf: MMF1): Promise<void>;

package/dist/commands/test/utils.js

@@ -1,6 +1,67 @@
 import path from 'node:path';
+import fs from 'node:fs';
+import chalk from 'chalk';
 import { getRootDir } from '../../mops.js';
 export function absToRel(p) {
     let rootDir = getRootDir();
     return path.relative(rootDir, path.resolve(p));
 }
+export function pipeStdoutToMMF(stdout, mmf) {
+    stdout.on('data', (data) => {
+        for (let line of data.toString().split('\n')) {
+            line = line.trim();
+            if (line) {
+                mmf.parseLine(line);
+            }
+        }
+    });
+}
+export function pipeStderrToMMF(stderr, mmf, dir = '') {
+    stderr.on('data', (data) => {
+        let text = data.toString().trim();
+        let failedLine = '';
+        text = text.replace(/([\w+._/-]+):(\d+).(\d+)(-\d+.\d+)/g, (_m0, m1, m2, m3) => {
+            // change absolute file path to relative
+            // change :line:col-line:col to :line:col to work in vscode
+            let res = `${absToRel(m1)}:${m2}:${m3}`;
+            let file = path.join(dir, m1);
+            if (!fs.existsSync(file)) {
+                return res;
+            }
+            // show failed line
+            let content = fs.readFileSync(file);
+            let lines = content.toString().split('\n') || [];
+            failedLine += chalk.dim('\n   ...');
+            let lineBefore = lines[+m2 - 2];
+            if (lineBefore) {
+                failedLine += chalk.dim(`\n   ${+m2 - 1}\t| ${lineBefore.replaceAll('\t', '  ')}`);
+            }
+            failedLine += `\n${chalk.redBright `->`} ${m2}\t| ${lines[+m2 - 1]?.replaceAll('\t', '  ')}`;
+            if (lines.length > +m2) {
+                failedLine += chalk.dim(`\n   ${+m2 + 1}\t| ${lines[+m2]?.replaceAll('\t', '  ')}`);
+            }
+            failedLine += chalk.dim('\n   ...');
+            return res;
+        });
+        if (failedLine) {
+            text += failedLine;
+        }
+        mmf.fail(text);
+    });
+}
+export function pipeMMF(proc, mmf) {
+    return new Promise((resolve) => {
+        pipeStdoutToMMF(proc.stdout, mmf);
+        pipeStderrToMMF(proc.stderr, mmf);
+        // exit
+        proc.on('close', (code) => {
+            if (code === 0) {
+                mmf.strategy !== 'print' && mmf.pass();
+            }
+            else if (code !== 1) {
+                mmf.fail(`unknown exit code: ${code}`);
+            }
+            resolve();
+        });
+    });
+}

package/dist/commands/update.js

@@ -3,6 +3,7 @@ import { checkConfigFile, getGithubCommit, parseGithubURL, readConfig } from '..
 import { add } from './add.js';
 import { getAvailableUpdates } from './available-updates.js';
 import { checkIntegrity } from '../integrity.js';
+import { getDepName, getDepPinnedVersion } from '../helpers/get-dep-name.js';
 export async function update(pkg, { lock } = {}) {
     if (!checkConfigFile()) {
         return;
@@ -39,8 +40,21 @@ export async function update(pkg, { lock } = {}) {
     }
     else {
         for (let dep of available) {
-            let dev = !!config['dev-dependencies']?.[dep[0]];
-            await add(`${dep[0]}@${dep[2]}`, { dev });
+            let devDeps = Object.keys(config['dev-dependencies'] || {});
+            let allDeps = [...Object.keys(config.dependencies || {}), ...devDeps];
+            let dev = false;
+            for (let d of devDeps) {
+                let pinnedVersion = getDepPinnedVersion(d);
+                if (getDepName(d) === dep[0] && (!pinnedVersion || dep[1].startsWith(pinnedVersion))) {
+                    dev = true;
+                    break;
+                }
+            }
+            let asName = allDeps.find((d) => {
+                let pinnedVersion = getDepPinnedVersion(d);
+                return getDepName(d) === dep[0] && (!pinnedVersion || dep[1].startsWith(pinnedVersion));
+            }) || dep[0];
+            await add(`${dep[0]}@${dep[2]}`, { dev }, asName);
         }
     }
     await checkIntegrity(lock);

package/dist/declarations/bench/bench.did.d.ts

@@ -1,6 +1,6 @@
-import type { Principal } from '@dfinity/principal';
-import type { ActorMethod } from '@dfinity/agent';
-import type { IDL } from '@dfinity/candid';
+import type { Principal } from '@icp-sdk/core/principal';
+import type { ActorMethod } from '@icp-sdk/core/agent';
+import type { IDL } from '@icp-sdk/core/candid';
 
 export interface BenchResult {
   'rts_stable_memory_size' : bigint,

package/dist/declarations/bench/index.d.ts

@@ -3,9 +3,9 @@ import type {
   HttpAgentOptions,
   ActorConfig,
   Agent,
-} from "@dfinity/agent";
-import type { Principal } from "@dfinity/principal";
-import type { IDL } from "@dfinity/candid";
+} from "@icp-sdk/core/agent";
+import type { Principal } from "@icp-sdk/core/principal";
+import type { IDL } from "@icp-sdk/core/candid";
 
 import { _SERVICE } from './bench.did';
 

package/dist/declarations/bench/index.js

@@ -1,4 +1,4 @@
-import { Actor, HttpAgent } from "@dfinity/agent";
+import { Actor, HttpAgent } from "@icp-sdk/core/agent";
 
 // Imports and re-exports candid interface
 import { idlFactory } from "./bench.did.js";

package/dist/declarations/main/index.d.ts

@@ -3,9 +3,9 @@ import type {
   HttpAgentOptions,
   ActorConfig,
   Agent,
-} from "@dfinity/agent";
-import type { Principal } from "@dfinity/principal";
-import type { IDL } from "@dfinity/candid";
+} from "@icp-sdk/core/agent";
+import type { Principal } from "@icp-sdk/core/principal";
+import type { IDL } from "@icp-sdk/core/candid";
 
 import { _SERVICE } from './main.did';
 

package/dist/declarations/main/index.js

@@ -1,4 +1,4 @@
-import { Actor, HttpAgent } from "@dfinity/agent";
+import { Actor, HttpAgent } from "@icp-sdk/core/agent";
 
 // Imports and re-exports candid interface
 import { idlFactory } from "./main.did.js";

package/dist/declarations/main/main.did.d.ts

@@ -1,6 +1,6 @@
-import type { Principal } from '@dfinity/principal';
-import type { ActorMethod } from '@dfinity/agent';
-import type { IDL } from '@dfinity/candid';
+import type { Principal } from '@icp-sdk/core/principal';
+import type { ActorMethod } from '@icp-sdk/core/agent';
+import type { IDL } from '@icp-sdk/core/candid';
 
 export interface Benchmark {
   'gc' : string,

package/dist/declarations/storage/index.d.ts

@@ -3,9 +3,9 @@ import type {
   HttpAgentOptions,
   ActorConfig,
   Agent,
-} from "@dfinity/agent";
-import type { Principal } from "@dfinity/principal";
-import type { IDL } from "@dfinity/candid";
+} from "@icp-sdk/core/agent";
+import type { Principal } from "@icp-sdk/core/principal";
+import type { IDL } from "@icp-sdk/core/candid";
 
 import { _SERVICE } from './storage.did';
 

package/dist/declarations/storage/index.js

@@ -1,4 +1,4 @@
-import { Actor, HttpAgent } from "@dfinity/agent";
+import { Actor, HttpAgent } from "@icp-sdk/core/agent";
 
 // Imports and re-exports candid interface
 import { idlFactory } from './storage.did.js';
@@ -6,9 +6,9 @@ export { idlFactory } from './storage.did.js';
 
 /**
  *
- * @param {string | import("@dfinity/principal").Principal} canisterId Canister ID of Agent
- * @param {{agentOptions?: import("@dfinity/agent").HttpAgentOptions; actorOptions?: import("@dfinity/agent").ActorConfig}} [options]
- * @return {import("@dfinity/agent").ActorSubclass<import("./storage.did.js")._SERVICE>}
+ * @param {string | import("@icp-sdk/core/principal").Principal} canisterId Canister ID of Agent
+ * @param {{agentOptions?: import("@icp-sdk/core/agent").HttpAgentOptions; actorOptions?: import("@icp-sdk/core/agent").ActorConfig}} [options]
+ * @return {import("@icp-sdk/core/agent").ActorSubclass<import("./storage.did.js")._SERVICE>}
  */
  export const createActor = (canisterId, options) => {
   const agent = new HttpAgent({ ...options?.agentOptions });

package/dist/declarations/storage/storage.did.d.ts

@@ -1,6 +1,6 @@
-import type { Principal } from '@dfinity/principal';
-import type { ActorMethod } from '@dfinity/agent';
-import type { IDL } from '@dfinity/candid';
+import type { Principal } from '@icp-sdk/core/principal';
+import type { ActorMethod } from '@icp-sdk/core/agent';
+import type { IDL } from '@icp-sdk/core/candid';
 
 export type Chunk = Array<number>;
 export type Err = string;

package/dist/helpers/get-dep-name.d.ts

@@ -1 +1,2 @@
 export declare function getDepName(name: string): string;
+export declare function getDepPinnedVersion(name: string): string;

package/dist/helpers/get-dep-name.js

@@ -1,3 +1,6 @@
 export function getDepName(name) {
     return name.split('@')[0] || '';
 }
+export function getDepPinnedVersion(name) {
+    return name.split('@')[1] || '';
+}

package/dist/mops.d.ts

@@ -1,4 +1,4 @@
-import { Identity } from '@dfinity/agent';
+import { Identity } from '@icp-sdk/core/agent';
 import { Config, Dependency } from './types.js';
 import { mainActor, storageActor } from './api/actors.js';
 import { getNetwork } from './api/network.js';

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "type": "module",
   "bin": {
     "mops": "bin/mops.js",
@@ -28,12 +28,8 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@dfinity/agent": "3.1.0",
-    "@dfinity/candid": "3.1.0",
-    "@dfinity/identity": "3.1.0",
-    "@dfinity/identity-secp256k1": "3.1.0",
-    "@dfinity/principal": "3.1.0",
     "@iarna/toml": "2.2.5",
+    "@icp-sdk/core": "4.0.2",
     "@noble/hashes": "1.8.0",
     "as-table": "1.0.55",
     "buffer": "6.0.3",
@@ -64,7 +60,8 @@
     "node-fetch": "3.3.2",
     "octokit": "3.1.2",
     "pem-file": "1.0.1",
-    "pic-ic": "0.5.3",
+    "pic-ic": "0.5.4",
+    "pic-js-mops": "0.14.8",
     "prettier": "3.5.3",
     "prettier-plugin-motoko": "0.11.0",
     "promisify-child-process": "4.1.2",
@@ -92,13 +89,6 @@
     "eslint": "8.57.0",
     "rexreplace": "7.1.13",
     "tsx": "4.19.2",
-    "typescript": "5.7.3"
-  },
-  "overrides": {
-    "@dfinity/agent": "3.1.0",
-    "@dfinity/candid": "3.1.0",
-    "@dfinity/identity": "3.1.0",
-    "@dfinity/identity-secp256k1": "3.1.0",
-    "@dfinity/principal": "3.1.0"
+    "typescript": "5.9.2"
   }
 }

package/dist/pem.d.ts

@@ -1,5 +1,5 @@
 import { Buffer } from 'node:buffer';
-import { Ed25519KeyIdentity } from '@dfinity/identity';
-import { Secp256k1KeyIdentity } from '@dfinity/identity-secp256k1';
+import { Ed25519KeyIdentity } from '@icp-sdk/core/identity';
+import { Secp256k1KeyIdentity } from '@icp-sdk/core/identity/secp256k1';
 export declare function decodeFile(file: string, password?: string): Secp256k1KeyIdentity | Ed25519KeyIdentity;
 export declare function encrypt(buffer: Buffer, password: string): Buffer<ArrayBuffer>;

package/dist/pem.js

@@ -1,8 +1,8 @@
 import fs from 'node:fs';
 import { Buffer } from 'node:buffer';
 import crypto from 'node:crypto';
-import { Ed25519KeyIdentity } from '@dfinity/identity';
-import { Secp256k1KeyIdentity } from '@dfinity/identity-secp256k1';
+import { Ed25519KeyIdentity } from '@icp-sdk/core/identity';
+import { Secp256k1KeyIdentity } from '@icp-sdk/core/identity/secp256k1';
 import pemfile from 'pem-file';
 export function decodeFile(file, password) {
     let rawKey = fs.readFileSync(file);

package/helpers/get-dep-name.ts

@@ -1,3 +1,7 @@
 export function getDepName(name : string) : string {
 	return name.split('@')[0] || '';
+}
+
+export function getDepPinnedVersion(name : string) : string {
+	return name.split('@')[1] || '';
 }