@unlink-xyz/cli 0.1.4 → 0.1.5

package/dist/commands/deposit.js

@@ -20,7 +20,8 @@ export function registerDepositCommands(program) {
         const token = cmdOpts["token"];
         const ethRpcUrl = options.nodeUrl ?? ctx.gatewayUrl;
         const provider = new ethers.JsonRpcProvider(ethRpcUrl, ctx.wallet.chainId, { staticNetwork: true });
-        const signer = new ethers.Wallet(options.privateKey, provider);
+        const wallet = new ethers.Wallet(options.privateKey, provider);
+        const signer = new ethers.NonceManager(wallet);
         const depositor = await signer.getAddress();
         const erc20 = new ethers.Contract(token, [
             "function allowance(address,address) view returns (uint256)",
@@ -38,11 +39,9 @@ export function registerDepositCommands(program) {
             deposits: [{ token, amount }],
         });
         log(`Relay ID: ${relay.relayId}\nSubmitting transaction...`, options);
-        const nonce = await provider.getTransactionCount(depositor, "pending");
         const tx = await signer.sendTransaction({
             to: relay.to,
             data: relay.calldata,
-            nonce,
         });
         log(`Tx hash: ${tx.hash}\nWaiting for confirmation...`, options);
         await tx.wait();

package/dist/commands/multisig.d.ts

@@ -1,2 +1,2 @@
-import type { Command } from "commander";
+import { type Command } from "commander";
 export declare function registerMultisigCommands(program: Command): void;

package/dist/commands/multisig.js

@@ -1,10 +1,13 @@
+import * as readline from "node:readline";
 import { createMultisigWallet, runSigningListener, signMultisig, } from "@unlink-xyz/multisig";
+import { Option } from "commander";
 import { ethers } from "ethers";
 import { createContext } from "../lib/context.js";
 import { withErrorHandler } from "../lib/errors.js";
 import { listMultisigAccounts, loadMultisigAccount, saveMultisigAccount, } from "../lib/multisig-store.js";
 import { requireChainId, requireGatewayUrl, requirePoolAddress, requirePrivateKey, resolveOptions, } from "../lib/options.js";
 import { log, output } from "../lib/output.js";
+import { isRelaySuccess, pollRelayStatus } from "../lib/relay.js";
 async function loadAccountView(options, groupId) {
     const account = await loadMultisigAccount(options.dataDir, groupId);
     const msWallet = createMultisigWallet({
@@ -22,6 +25,49 @@ function parseOptionalParticipantIndex(cmdOpts) {
     }
     return participantIndex;
 }
+function parseParticipants(raw, config) {
+    if (raw === undefined) {
+        return Array.from({ length: config.threshold }, (_, i) => i + 1);
+    }
+    const indices = raw.split(",").map(Number);
+    for (const idx of indices) {
+        if (!Number.isInteger(idx) || idx < 1 || idx > config.totalShares) {
+            throw new Error(`Invalid participant index ${idx}: must be between 1 and ${config.totalShares}`);
+        }
+    }
+    const unique = new Set(indices);
+    if (unique.size !== indices.length) {
+        throw new Error("Duplicate participant indices are not allowed");
+    }
+    if (indices.length < config.threshold) {
+        throw new Error(`Need at least ${config.threshold} participants (threshold), got ${indices.length}`);
+    }
+    return indices;
+}
+async function promptApproval(signal) {
+    if (signal.aborted)
+        return false;
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stderr,
+    });
+    return new Promise((resolve) => {
+        let settled = false;
+        const finish = (approved) => {
+            if (settled)
+                return;
+            settled = true;
+            signal.removeEventListener("abort", onAbort);
+            rl.close();
+            resolve(approved);
+        };
+        const onAbort = () => finish(false);
+        signal.addEventListener("abort", onAbort, { once: true });
+        rl.question("Approve? [y/N] ", (answer) => {
+            finish(answer.toLowerCase() === "y");
+        });
+    });
+}
 export function registerMultisigCommands(program) {
     const multisig = program
         .command("multisig")
@@ -172,25 +218,50 @@ export function registerMultisigCommands(program) {
     }));
     multisig
         .command("listen")
-        .description("Listen for signing sessions and auto-sign (co-signer mode)")
+        .description("Listen for signing sessions and co-sign after approval")
         .requiredOption("-g, --group-id <id>", "Multisig group ID")
         .option("-p, --participant-index <n>", "Participant index override when multiple local participants exist for a group")
+        .option("--auto-approve", "Skip approval prompt (auto-sign, for dev/testing)")
         .action(withErrorHandler(async (cmdOpts, cmd) => {
         const options = resolveOptions(cmd.optsWithGlobals());
         const groupId = cmdOpts["groupId"];
         const participantIndex = parseOptionalParticipantIndex(cmdOpts);
+        const autoApprove = cmdOpts["autoApprove"] === true;
         const account = await loadMultisigAccount(options.dataDir, groupId, participantIndex);
         log(`Listening for signing sessions on group ${groupId} (participant ${account.participantIndex})...`, options);
+        if (autoApprove) {
+            log("Auto-approve enabled — signing all sessions automatically.", options);
+        }
         log("Press Ctrl+C to stop.", options);
         const controller = new AbortController();
-        process.on("SIGINT", () => controller.abort());
-        await runSigningListener({
-            account,
-            signal: controller.signal,
-            onSession: (session) => {
-                log(`Joining session ${session.code} (message: ${session.message})`, options);
-            },
-        });
+        const onSigint = () => controller.abort();
+        process.on("SIGINT", onSigint);
+        try {
+            await runSigningListener({
+                account,
+                signal: controller.signal,
+                onSession: (session) => {
+                    log(`\nSession ${session.code} (message: ${session.message})`, options);
+                    if (session.metadata) {
+                        const m = session.metadata;
+                        if (m["type"])
+                            log(`  Type: ${m["type"]}`, options);
+                        if (m["recipient"])
+                            log(`  To: ${m["recipient"]}`, options);
+                        if (m["token"])
+                            log(`  Token: ${m["token"]}`, options);
+                        if (m["amount"])
+                            log(`  Amount: ${m["amount"]}`, options);
+                    }
+                },
+                approve: autoApprove
+                    ? undefined
+                    : () => promptApproval(controller.signal),
+            });
+        }
+        finally {
+            process.off("SIGINT", onSigint);
+        }
         log("Listener stopped.", options);
     }));
     // --- Pool operations (require createContext for UnlinkWallet) ---
@@ -213,7 +284,8 @@ export function registerMultisigCommands(program) {
         const ctx = await createContext(options);
         const ethRpcUrl = options.nodeUrl ?? ctx.gatewayUrl;
         const provider = new ethers.JsonRpcProvider(ethRpcUrl, ctx.wallet.chainId, { staticNetwork: true });
-        const signer = new ethers.Wallet(options.privateKey, provider);
+        const wallet = new ethers.Wallet(options.privateKey, provider);
+        const signer = new ethers.NonceManager(wallet);
         const depositor = await signer.getAddress();
         const erc20 = new ethers.Contract(token, [
             "function allowance(address,address) view returns (uint256)",
@@ -232,11 +304,9 @@ export function registerMultisigCommands(program) {
             account: accountView,
         });
         log(`Relay ID: ${relay.relayId}\nSubmitting transaction...`, options);
-        const nonce = await provider.getTransactionCount(depositor, "pending");
         const tx = await signer.sendTransaction({
             to: relay.to,
             data: relay.calldata,
-            nonce,
         });
         log(`Tx hash: ${tx.hash}\nWaiting for confirmation...`, options);
         await tx.wait();
@@ -315,6 +385,7 @@ export function registerMultisigCommands(program) {
         .requiredOption("-r, --to <address>", "Recipient Unlink address (0zk1...)")
         .requiredOption("-t, --token <address>", "Token contract address")
         .requiredOption("-a, --amount <value>", "Amount (raw atomic units)")
+        .option("-P, --participants <indices>", "Comma-separated participant indices for threshold signing (default: first t)")
         .action(withErrorHandler(async (cmdOpts, cmd) => {
         const options = resolveOptions(cmd.optsWithGlobals());
         requireGatewayUrl(options);
@@ -323,21 +394,91 @@ export function registerMultisigCommands(program) {
         const groupId = cmdOpts["groupId"];
         const { account, accountView } = await loadAccountView(options, groupId);
         const ctx = await createContext(options);
-        const participants = Array.from({ length: account.config.totalShares }, (_, i) => i + 1);
+        const participants = parseParticipants(cmdOpts["participants"], account.config);
+        const token = cmdOpts["token"];
+        const recipient = cmdOpts["to"];
+        const amount = BigInt(cmdOpts["amount"]);
         const msWallet = createMultisigWallet({
             gatewayUrl: account.gatewayUrl,
         });
-        const signer = msWallet.createSigner({ account, participants });
+        const signer = msWallet.createSigner({
+            account,
+            participants,
+            metadata: {
+                type: "transfer",
+                recipient,
+                token,
+                amount: amount.toString(),
+            },
+            onSessionCreated: (code) => {
+                log(`Signing session created: ${code}`, options);
+                const cliName = cmd.parent?.parent?.name() ?? "unlink";
+                log(`Co-signers can run:\n  ${cliName} multisig sign -g ${groupId} -s ${code} -m <message>`, options);
+                log("Waiting for co-signers...", options);
+            },
+        });
         log("Planning and submitting transfer...", options);
         const result = await ctx.wallet.transfer({
-            transfers: [
-                {
-                    token: cmdOpts["token"],
-                    recipient: cmdOpts["to"],
-                    amount: BigInt(cmdOpts["amount"]),
-                },
-            ],
+            transfers: [{ token, recipient, amount }],
         }, { signer, account: accountView });
         output({ relayId: result.relayId, status: "submitted" }, options);
     }));
+    multisig
+        .command("withdraw")
+        .description("Withdraw from a multisig account to an EOA (FROST signing)")
+        .requiredOption("-g, --group-id <id>", "Multisig group ID")
+        .requiredOption("--to <address>", "Recipient EOA address (0x...)")
+        .requiredOption("-t, --token <address>", "Token contract address")
+        .requiredOption("-a, --amount <value>", "Amount (raw atomic units)")
+        .option("-P, --participants <indices>", "Comma-separated participant indices for threshold signing (default: first t)")
+        .addOption(new Option("--wait", "Wait for relay confirmation").default(true))
+        .addOption(new Option("--no-wait", "Fire-and-forget (do not wait for confirmation)"))
+        .action(withErrorHandler(async (cmdOpts, cmd) => {
+        const options = resolveOptions(cmd.optsWithGlobals());
+        requireGatewayUrl(options);
+        requireChainId(options);
+        requirePoolAddress(options);
+        const groupId = cmdOpts["groupId"];
+        const { account, accountView } = await loadAccountView(options, groupId);
+        const ctx = await createContext(options);
+        const participants = parseParticipants(cmdOpts["participants"], account.config);
+        const token = cmdOpts["token"];
+        const recipient = cmdOpts["to"];
+        const amount = BigInt(cmdOpts["amount"]);
+        const msWallet = createMultisigWallet({
+            gatewayUrl: account.gatewayUrl,
+        });
+        const signer = msWallet.createSigner({
+            account,
+            participants,
+            metadata: {
+                type: "withdraw",
+                recipient,
+                token,
+                amount: amount.toString(),
+            },
+            onSessionCreated: (code) => {
+                log(`Signing session created: ${code}`, options);
+                const cliName = cmd.parent?.parent?.name() ?? "unlink";
+                log(`Co-signers can run:\n  ${cliName} multisig sign -g ${groupId} -s ${code} -m <message>`, options);
+                log("Waiting for co-signers...", options);
+            },
+        });
+        log("Planning and submitting withdrawal...", options);
+        const result = await ctx.wallet.withdraw({
+            withdrawals: [{ token, recipient, amount }],
+        }, { signer, account: accountView });
+        log(`Relay ID: ${result.relayId}`, options);
+        const shouldWait = cmdOpts["wait"];
+        if (shouldWait) {
+            const final = await pollRelayStatus(ctx.wallet, result.relayId, options);
+            if (!isRelaySuccess(final)) {
+                throw new Error(`Withdrawal relay ${final.relayId} ended with status "${final.status}"${final.error ? `: ${final.error}` : ""}`);
+            }
+            output(final, options);
+        }
+        else {
+            output({ relayId: result.relayId, status: "submitted" }, options);
+        }
+    }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unlink-xyz/cli",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "type": "module",
   "bin": {
     "unlink-cli": "./dist/index.js"
@@ -26,9 +26,9 @@
     "format:check": "prettier . --check"
   },
   "dependencies": {
-    "@unlink-xyz/core": "0.1.4",
-    "@unlink-xyz/multisig": "0.1.4",
-    "@unlink-xyz/node": "0.1.4",
+    "@unlink-xyz/core": "0.1.5",
+    "@unlink-xyz/multisig": "0.1.5",
+    "@unlink-xyz/node": "0.1.5",
     "commander": "^13.0.0",
     "dotenv": "^16.0.0",
     "ethers": "6.15.0"