Toolchain Management

.github/workflows/ci.yml

@@ -13,7 +13,8 @@ jobs:
       max-parallel: 2
       matrix:
         moc-version: [0.10.1]
-        mops-version: [./cli, ic-mops@latest, [email protected]]
+        # mops-version: [./cli, ic-mops@latest, [email protected]]
+        mops-version: [./cli]
         node-version: [20]
 
     runs-on: ubuntu-latest
@@ -40,9 +41,6 @@ jobs:
           path: |
             ~/.cache/mops
 
-      - name: Select moc version
-        run: npx mocv use ${{ matrix.moc-version }}
-
       - name: Install npm packages
         run: npm install
 
@@ -53,12 +51,12 @@ jobs:
       - name: Install mops
         run: npm i -g ${{ matrix.mops-version }}
 
-      - name: Install mocv
-        run: npm i -g mocv
-
       - name: Install mops packages
         run: mops install
 
+      - name: Select moc version
+        run: mops toolchain use moc ${{ matrix.moc-version }}
+
       - name: Build and Deploy
         run: |
             npm run replica

.github/workflows/mops-test.yml

@@ -12,8 +12,9 @@ jobs:
     strategy:
       max-parallel: 3
       matrix:
+        # mops-version: [./cli, ic-mops@latest, [email protected]]
         moc-version: [0.10.1, latest]
-        mops-version: [./cli, ic-mops@latest, [email protected]]
+        mops-version: [./cli]
         node-version: [18, 20]
 
     runs-on: ubuntu-latest
@@ -26,12 +27,6 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
 
-      - name: install wasmtime
-        run: |
-          curl https://wasmtime.dev/install.sh -sSf | bash
-          bash -ci "$(curl -fsSL https://wasmtime.dev/install.sh)" -- --version v13.0.0
-          echo "$HOME/.wasmtime/bin" >> $GITHUB_PATH
-
       - name: Cache mops packages
         uses: actions/cache@v3
         with:
@@ -42,9 +37,6 @@ jobs:
           path: |
             ~/.cache/mops
 
-      - name: Select moc version
-        run: npx mocv use ${{ matrix.moc-version }}
-
       - name: Install npm packages
         run: |
             cd cli
@@ -60,5 +52,8 @@ jobs:
       - name: Install mops packages
         run: mops install
 
+      - name: Select moc version
+        run: mops toolchain use moc ${{ matrix.moc-version }}
+
       - name: Run tests
         run: mops test

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-npm test && (cd cli && npm run check)
+npm test && (cd cli && npm run check)

backend/main/DownloadLog.mo

@@ -106,7 +106,7 @@ module {
 		func _getTrend(snapshotsOpt : ?Buffer.Buffer<DownloadsSnapshot>, max : Nat) : [DownloadsSnapshot] {
 			switch (snapshotsOpt) {
 				case (?snapshots) {
-					Utils.arrayTake(Buffer.toArray(snapshots), -max);
+					Array.take(Buffer.toArray(snapshots), -max);
 				};
 				case (null) {
 					[];

backend/main/main-canister.mo

@@ -2,26 +2,16 @@ import Text "mo:base/Text";
 import Array "mo:base/Array";
 import Buffer "mo:base/Buffer";
 import TrieMap "mo:base/TrieMap";
-import HashMap "mo:base/HashMap";
 import Iter "mo:base/Iter";
 import Time "mo:base/Time";
-import Nat "mo:base/Nat";
 import Int "mo:base/Int";
 import Result "mo:base/Result";
 import Debug "mo:base/Debug";
-import Option "mo:base/Option";
 import Principal "mo:base/Principal";
 import Order "mo:base/Order";
-import Char "mo:base/Char";
-import Hash "mo:base/Hash";
-import TrieSet "mo:base/TrieSet";
-import ExperimentalCycles "mo:base/ExperimentalCycles";
 import Blob "mo:base/Blob";
-import Prim "mo:prim";
 
 import {DAY} "mo:time-consts";
-import {ic} "mo:ic";
-import Map "mo:map/Map";
 import Backup "mo:backup";
 import Sha256 "mo:sha2/Sha256";
 import HttpTypes "mo:http-types";
@@ -34,8 +24,6 @@ import StorageManager "../storage/storage-manager";
 import Storage "../storage/storage-canister";
 import Users "./Users";
 import Badges "./badges";
-import {validateConfig} "./utils/validateConfig";
-import {generateId} "../generate-id";
 
 import Registry "./registry/Registry";
 import PackagePublisher "./PackagePublisher";
@@ -308,10 +296,6 @@ actor class Main() {
 		};
 	};
 
-	func _toLowerCase(text : Text) : Text {
-		Text.map(text, Prim.charToLower);
-	};
-
 	public query func search(searchText : Text.Text, limitOpt : ?Nat, pageIndexOpt : ?Nat) : async ([PackageSummary], PageCount) {
 		searchInRegistry(registry, users, downloadLog, searchText, limitOpt, pageIndexOpt);
 	};
@@ -413,7 +397,7 @@ actor class Main() {
 
 		packagesFirstPub.vals()
 			|> Iter.toArray(_)
-			|> Utils.arrayTake(_, 5)
+			|> Array.take(_, 5)
 			|> Array.reverse(_);
 	};
 

backend/main/registry/packagesByCategory.mo

@@ -120,6 +120,7 @@ module {
 				"icrc7-mo",
 				"icrc30-mo",
 				"icrc-nft-mo",
+				"icrc1-mo",
 			]
 		),
 	];

backend/utils.mo

@@ -39,10 +39,4 @@ module {
 			items.size() / limit + (if (items.size() % limit == 0) 0 else 1),
 		);
 	};
-
-	public func arrayTake<T>(ar : [T], n : Int) : [T] {
-		let resSize = Nat.min(Int.abs(n), ar.size());
-		let start : Nat = if (n > 0) 0 else ar.size() - resSize;
-		Array.subArray(ar, start, resSize);
-	};
 }

cli/bin/moc-wrapper.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+mocPath="$(mops toolchain bin moc --fallback)"
+$mocPath "$@"

cli/bin/mops.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+import '../cli.js';

cli/cache.ts

@@ -39,7 +39,7 @@ export let copyCache = (pkgId: string, dest: string) => {
 };
 
 export let cacheSize = async () => {
-	let dir = path.join(globalCacheDir, 'packages');
+	let dir = path.join(globalCacheDir);
 	fs.mkdirSync(dir, {recursive: true});
 
 	let size = await getFolderSize.strict(dir);
@@ -50,6 +50,6 @@ export let cacheSize = async () => {
 };
 
 export let cleanCache = async () => {
-	let dir = path.join(globalCacheDir, 'packages');
+	let dir = path.join(globalCacheDir);
 	fs.rmSync(dir, {recursive: true, force: true});
 };

cli/cli.ts

@@ -1,7 +1,5 @@
-#!/usr/bin/env node
-
 import fs from 'node:fs';
-import {program, Argument, Option} from 'commander';
+import {Command, Argument, Option} from 'commander';
 import chalk from 'chalk';
 
 import {init} from './commands/init.js';
@@ -26,6 +24,8 @@ import {outdated} from './commands/outdated.js';
 import {update} from './commands/update.js';
 import {bench} from './commands/bench.js';
 import {transferOwnership} from './commands/transfer-ownership.js';
+import {toolchain} from './commands/toolchain/index.js';
+import {Tool} from './types.js';
 // import {docs} from './commands/docs.js';
 
 declare global {
@@ -38,6 +38,7 @@ if (fs.existsSync(networkFile)) {
 	globalThis.MOPS_NETWORK = fs.readFileSync(networkFile).toString() || 'ic';
 }
 
+let program = new Command();
 
 program.name('mops');
 
@@ -101,13 +102,16 @@ program
 			return;
 		}
 
+		await toolchain.ensureToolchainInited({strict: false});
+
 		if (pkg) {
 			// @deprecated
 			console.log(chalk.yellow('Consider using the \'mops add\' command to install a specific package.'));
 			await add(pkg, options);
 		}
 		else {
 			await installAll(options);
+			await toolchain.installAll(options);
 		}
 	});
 
@@ -166,6 +170,7 @@ program
 			process.exit(1);
 		}
 		await installAll({silent: true, lock: 'ignore'});
+		await toolchain.ensureToolchainInited({strict: false});
 		let sourcesArr = await sources(options);
 		console.log(sourcesArr.join('\n'));
 	});
@@ -328,4 +333,56 @@ program
 		await transferOwnership(toPrincipal);
 	});
 
+// toolchain
+const toolchainCommand = new Command('toolchain').description('Toolchain management');
+
+toolchainCommand
+	.command('init')
+	.description('One-time initialization of toolchain management')
+	.action(async () => {
+		await toolchain.init();
+	});
+
+toolchainCommand
+	.command('reset')
+	.description('Uninstall toolchain management')
+	.action(async () => {
+		await toolchain.init({reset: true});
+	});
+
+toolchainCommand
+	.command('use')
+	.description('Install specified tool version and update mops.toml')
+	.addArgument(new Argument('<tool>').choices(['moc', 'wasmtime', 'pocket-ic']))
+	.addArgument(new Argument('[version]'))
+	.action(async (tool, version) => {
+		if (!checkConfigFile()) {
+			process.exit(1);
+		}
+		await toolchain.use(tool, version);
+	});
+
+toolchainCommand
+	.command('update')
+	.description('Update specified tool or all tools to the latest version and update mops.toml')
+	.addArgument(new Argument('[tool]').choices(['moc', 'wasmtime', 'pocket-ic']))
+	.action(async (tool?: Tool) => {
+		if (!checkConfigFile()) {
+			process.exit(1);
+		}
+		await toolchain.update(tool);
+	});
+
+toolchainCommand
+	.command('bin')
+	.description('Get path to the tool binary\n<tool> can be one of "moc", "wasmtime", "pocket-ic"')
+	.addArgument(new Argument('<tool>').choices(['moc', 'wasmtime', 'pocket-ic']))
+	.addOption(new Option('--fallback', 'Fallback to the moc that comes with dfx if moc is not specified in the [toolchain] section'))
+	.action(async (tool, options) => {
+		let bin = await toolchain.bin(tool, options);
+		console.log(bin);
+	});
+
+program.addCommand(toolchainCommand);
+
 program.parse();

cli/commands/add.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import chalk from 'chalk';
-import logUpdate from 'log-update';
+import {createLogUpdate} from 'log-update';
 import {checkConfigFile, getGithubCommit, parseGithubURL, readConfig, writeConfig} from '../mops.js';
 import {getHighestVersion} from '../api/getHighestVersion.js';
 import {installFromGithub} from '../vessel.js';
@@ -109,6 +109,8 @@ export async function add(name: string, {verbose = false, dev = false, lock}: Ad
 
 	writeConfig(config);
 
+	let logUpdate = createLogUpdate(process.stdout, {showCursor: true});
+
 	if (lock !== 'ignore') {
 		logUpdate('Checking integrity...');
 	}

cli/commands/bench-replica.ts

@@ -2,9 +2,10 @@ import {execSync} from 'node:child_process';
 import path from 'node:path';
 import fs from 'node:fs';
 import {execaCommand} from 'execa';
-import {PocketIc} from '@hadronous/pic';
+import {PocketIc} from 'pic-ic';
 import {getRootDir} from '../mops.js';
 import {createActor, idlFactory} from '../declarations/bench/index.js';
+import {toolchain} from './toolchain/index.js';
 
 export class BenchReplica {
 	type : 'dfx' | 'pocket-ic';
@@ -27,7 +28,8 @@ export class BenchReplica {
 			execSync('dfx start --background --clean --artificial-delay 0' + (this.verbose ? '' : ' -qqqq'), {cwd: dir, stdio: ['inherit', this.verbose ? 'inherit' : 'ignore', 'inherit']});
 		}
 		else {
-			this.pocketIc = await PocketIc.create();
+			let pocketIcBin = await toolchain.bin('pocket-ic');
+			this.pocketIc = await PocketIc.create(pocketIcBin);
 		}
 	}
 
@@ -37,7 +39,7 @@ export class BenchReplica {
 			execSync('dfx stop' + (this.verbose ? '' : ' -qqqq'), {cwd: dir, stdio: ['pipe', this.verbose ? 'inherit' : 'ignore', 'pipe']});
 		}
 		else if (this.pocketIc) {
-			this.pocketIc.tearDown();
+			await this.pocketIc.tearDown();
 		}
 	}