@parity/dotns-cli 0.6.7 → 0.6.8

package/dist/cli.js

@@ -272360,8 +272360,13 @@ function resolveAuthSourceFromEnv(account) {
   }
   return;
 }
+function isExplicitKeystorePath(keystorePath) {
+  if (keystorePath == null || keystorePath.trim().length === 0)
+    return false;
+  return resolveKeystorePath(keystorePath) !== resolveKeystorePath(undefined);
+}
 function hasKeystoreSelectionHint(opts) {
-  return Boolean(opts.account != null && String(opts.account).trim().length > 0 || opts.keystorePath != null && String(opts.keystorePath).trim().length > 0 || opts.password != null && String(opts.password).trim().length > 0);
+  return Boolean(opts.account != null && String(opts.account).trim().length > 0 || isExplicitKeystorePath(opts.keystorePath) || opts.password != null && String(opts.password).trim().length > 0);
 }
 async function resolveAuthSourceFromKeystore(opts, accountName, requireKeystore) {
   const keystoreDirectoryPath = resolveKeystorePath(opts.keystorePath);
@@ -276074,19 +276079,18 @@ init_ora();
 
 // src/commands/escrow.ts
 init_source();
+init__esm();
 init_constants();
 init_contractInteractions();
 init_formatting();
 var ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
-async function viewEscrowPosition(clientWrapper, originSubstrateAddress, label, spinner) {
+async function readPositionForName(clientWrapper, originSubstrateAddress, name10) {
+  const label = name10.replace(/\.dot$/, "");
   const tokenId = computeDomainTokenId(label);
-  spinner.start(`Reading escrow position for ${source_default.cyan(label + ".dot")}`);
   const raw = await performContractCall(clientWrapper, originSubstrateAddress, CONTRACTS.DOTNS_NAME_ESCROW, DOTNS_NAME_ESCROW_ABI, "getReleasePosition", [tokenId]);
   if (raw.recipient === ZERO_ADDRESS && raw.amount === 0n && !raw.released) {
-    spinner.succeed(`No escrow position for ${source_default.cyan(label + ".dot")}`);
     return null;
   }
-  spinner.succeed(`Position for ${source_default.cyan(label + ".dot")}`);
   return {
     domain: label,
     tokenId,
@@ -276098,6 +276102,79 @@ async function viewEscrowPosition(clientWrapper, originSubstrateAddress, label,
     claimed: raw.claimed
   };
 }
+async function viewEscrowPosition(clientWrapper, originSubstrateAddress, label, spinner) {
+  spinner.start(`Reading escrow position for ${source_default.cyan(label + ".dot")}`);
+  const position = await readPositionForName(clientWrapper, originSubstrateAddress, label);
+  spinner.succeed(position === null ? `No escrow position for ${source_default.cyan(label + ".dot")}` : `Position for ${source_default.cyan(label + ".dot")}`);
+  return position;
+}
+async function listAccountPositions(clientWrapper, originSubstrateAddress, recipient, names, spinner) {
+  spinner.start(`Reading escrow positions for ${source_default.white(recipient)}`);
+  const me = getAddress(recipient);
+  const positions = [];
+  for (const name10 of names) {
+    const position = await readPositionForName(clientWrapper, originSubstrateAddress, name10).catch(() => null);
+    if (position !== null && getAddress(position.recipient) === me) {
+      positions.push(position);
+    }
+  }
+  spinner.succeed(`Found ${positions.length} position(s)`);
+  return positions;
+}
+function totalEscrowAmount(positions) {
+  return positions.reduce((sum, position) => sum + position.amount, 0n);
+}
+function cooldownRemainingSeconds(position, nowSeconds) {
+  const remaining = position.withdrawAvailableAt - nowSeconds;
+  return remaining > 0n ? remaining : 0n;
+}
+function formatCooldown(seconds) {
+  if (seconds <= 0n)
+    return "0s";
+  const total = Number(seconds);
+  const minutes = Math.floor(total / 60);
+  const rest = total % 60;
+  return minutes > 0 ? `${minutes}m ${rest}s` : `${rest}s`;
+}
+function formatPositionStatus(position, nowSeconds) {
+  if (position.claimed)
+    return "claimed";
+  if (!position.released)
+    return "held";
+  const remaining = cooldownRemainingSeconds(position, nowSeconds);
+  return remaining > 0n ? `cooldown ${formatCooldown(remaining)}` : "claimable";
+}
+function colorPositionStatus(status) {
+  if (status === "claimable")
+    return source_default.green(status);
+  if (status.startsWith("cooldown"))
+    return source_default.yellow(status);
+  if (status === "held")
+    return source_default.cyan(status);
+  return source_default.gray(status);
+}
+function formatPositionsTable(positions, nowSeconds) {
+  if (positions.length === 0)
+    return [];
+  const rows = positions.map((position) => ({
+    name: `${position.domain}.dot`,
+    deposit: `${formatWeiAsEther(position.amount)} PAS`,
+    status: formatPositionStatus(position, nowSeconds)
+  }));
+  const nameWidth = Math.max("NAME".length, ...rows.map((row) => row.name.length));
+  const depositWidth = Math.max("DEPOSIT".length, ...rows.map((row) => row.deposit.length));
+  const header = `${source_default.bold("NAME".padEnd(nameWidth))}  ${source_default.bold("DEPOSIT".padEnd(depositWidth))}  ${source_default.bold("STATUS")}`;
+  return [
+    header,
+    ...rows.map((row) => `${source_default.cyan(row.name.padEnd(nameWidth))}  ${source_default.green(row.deposit.padEnd(depositWidth))}  ${colorPositionStatus(row.status)}`)
+  ];
+}
+async function getPendingWithdrawal(clientWrapper, originSubstrateAddress, recipient, spinner) {
+  spinner.start(`Reading pull-payment balance for ${source_default.white(recipient)}`);
+  const balance = await performContractCall(clientWrapper, originSubstrateAddress, CONTRACTS.DOTNS_NAME_ESCROW, DOTNS_NAME_ESCROW_ABI, "pendingWithdrawal", [recipient]);
+  spinner.succeed(`Pull-payment balance: ${source_default.green(formatWeiAsEther(balance))} PAS`);
+  return balance;
+}
 async function releaseDomain(clientWrapper, originSubstrateAddress, signer, label, spinner) {
   const tokenId = computeDomainTokenId(label);
   spinner.start(`Approving escrow for ${source_default.cyan(label + ".dot")}`);
@@ -276160,6 +276237,7 @@ function formatRefundEntryLine(entry4) {
 }
 
 // src/cli/commands/escrow.ts
+init_storeManagement();
 init_formatting();
 var DEFAULT_REFUND_PAGE_SIZE = 50;
 var MAX_REFUND_PAGE_SIZE = 200;
@@ -276192,6 +276270,8 @@ function attachEscrowCommands(root) {
           console.log(source_default.gray("  amount:    ") + source_default.green(formatWeiAsEther(position.amount) + " PAS"));
           console.log(source_default.gray("  released:  ") + source_default.white(String(position.released)));
           console.log(source_default.gray("  claimed:   ") + source_default.white(String(position.claimed)));
+          const nowSeconds = BigInt(Math.floor(Date.now() / 1000));
+          console.log(source_default.gray("  status:    ") + source_default.white(formatPositionStatus(position, nowSeconds)));
           if (position.withdrawAvailableAt > 0n) {
             const t2 = new Date(Number(position.withdrawAvailableAt) * 1000).toISOString();
             console.log(source_default.gray("  withdraw:  ") + source_default.white(t2));
@@ -276199,6 +276279,78 @@ function attachEscrowCommands(root) {
         }
         console.log(source_default.green(`
 ✓ Complete
+`));
+      }
+      process.exit(0);
+    } catch (error2) {
+      handleCommandError(jsonOutput, error2);
+    }
+  });
+  const balanceCommand = escrowCommand.command("balance").description("Show the caller's claimable pull-payment balance").option("--recipient <address>", "Recipient EVM address (defaults to caller)").option("--json", "Output result as JSON (suppresses all other output)", false);
+  addAuthOptions(balanceCommand).action(async (options2, command) => {
+    const jsonOutput = getJsonFlag(command);
+    try {
+      const mergedOptions = getMergedOptions(command, options2);
+      const context = await maybeQuiet(jsonOutput, () => prepareReadOnlyContext(mergedOptions));
+      const recipient = options2.recipient ?? context.evmAddress;
+      if (!jsonOutput)
+        console.log(source_default.bold(`
+▶ Escrow balance
+`));
+      const spinner = ora();
+      const balance = await maybeQuiet(jsonOutput, () => getPendingWithdrawal(context.clientWrapper, context.account.address, recipient, spinner));
+      if (!emitJsonResult(jsonOutput, { recipient, balance: balance.toString() })) {
+        console.log(source_default.gray("  claimable: ") + source_default.green(formatWeiAsEther(balance) + " PAS"));
+        console.log(source_default.green(`
+✓ Complete
+`));
+      }
+      process.exit(0);
+    } catch (error2) {
+      handleCommandError(jsonOutput, error2);
+    }
+  });
+  const positionsCommand = escrowCommand.command("positions").description("List all escrow positions for the caller and the total locked").option("--recipient <address>", "Recipient EVM address (defaults to caller)").option("--json", "Output result as JSON (suppresses all other output)", false);
+  addAuthOptions(positionsCommand).action(async (options2, command) => {
+    const jsonOutput = getJsonFlag(command);
+    try {
+      const mergedOptions = getMergedOptions(command, options2);
+      const context = await maybeQuiet(jsonOutput, () => prepareReadOnlyContext(mergedOptions));
+      const recipient = options2.recipient ?? context.evmAddress;
+      if (!jsonOutput)
+        console.log(source_default.bold(`
+▶ Escrow positions
+`));
+      const spinner = ora();
+      const names = await maybeQuiet(jsonOutput, () => listStoreNames(context.clientWrapper, context.account.address, recipient));
+      const positions = await maybeQuiet(jsonOutput, () => listAccountPositions(context.clientWrapper, context.account.address, recipient, names, spinner));
+      const total = totalEscrowAmount(positions);
+      const nowSeconds = BigInt(Math.floor(Date.now() / 1000));
+      const handled = emitJsonResult(jsonOutput, {
+        recipient,
+        total: total.toString(),
+        positions: positions.map((position) => ({
+          domain: position.domain,
+          tokenId: position.tokenId.toString(),
+          amount: position.amount.toString(),
+          released: position.released,
+          claimed: position.claimed,
+          withdrawAvailableAt: position.withdrawAvailableAt.toString(),
+          status: formatPositionStatus(position, nowSeconds),
+          cooldownSeconds: cooldownRemainingSeconds(position, nowSeconds).toString()
+        }))
+      });
+      if (!handled) {
+        if (positions.length === 0) {
+          console.log(source_default.gray("  no escrow positions"));
+        } else {
+          for (const line of formatPositionsTable(positions, nowSeconds))
+            console.log("  " + line);
+        }
+        console.log(source_default.gray(`
+  total in escrow: `) + source_default.green(formatWeiAsEther(total) + " PAS"));
+        console.log(source_default.green(`
+✓ Complete
 `));
       }
       process.exit(0);
@@ -276264,8 +276416,18 @@ function attachEscrowCommands(root) {
 ▶ Escrow claim-withdrawal
 `));
       const spinner = ora();
+      const balance = await maybeQuiet(jsonOutput, () => getPendingWithdrawal(context.clientWrapper, context.substrateAddress, context.evmAddress, spinner));
+      if (balance === 0n) {
+        if (!emitJsonResult(jsonOutput, { ok: true, txHash: null, balance: "0" })) {
+          console.log(source_default.gray("  nothing to claim; pull-payment balance is 0"));
+          console.log(source_default.green(`
+✓ Complete
+`));
+        }
+        process.exit(0);
+      }
       const txHash = await maybeQuiet(jsonOutput, () => claimWithdrawal(context.clientWrapper, context.substrateAddress, context.signer, spinner));
-      if (!emitJsonResult(jsonOutput, { ok: true, txHash })) {
+      if (!emitJsonResult(jsonOutput, { ok: true, txHash, balance: balance.toString() })) {
         console.log(source_default.gray("  tx: ") + source_default.blue(txHash));
         console.log(source_default.green(`
 ✓ Complete
@@ -276290,7 +276452,7 @@ function attachEscrowCommands(root) {
       if (!Number.isInteger(limit) || limit < 1 || limit > MAX_REFUND_PAGE_SIZE) {
         throw new Error(`limit must be between 1 and ${MAX_REFUND_PAGE_SIZE}`);
       }
-      const recipient = options2.recipient ?? context.account.address;
+      const recipient = options2.recipient ?? context.evmAddress;
       if (!jsonOutput)
         console.log(source_default.bold(`
 ▶ Refund ledger

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@parity/dotns-cli",
   "module": "index.ts",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "type": "module",
   "license": "MIT",
   "packageManager": "bun@1.2.6",