Handle tss txp deletion; Add cli session restoration; Bug fixes & improvements

.node-version

@@ -0,0 +1 @@
+22

.nvmrc

@@ -0,0 +1 @@
+22

eslint.config.mjs

@@ -101,7 +101,8 @@ export default defineConfig([
   {
     files: [
       'packages/bitcore-lib*/**/*.js',
-      'packages/bitcore-p2p*/**/*.js'
+      'packages/bitcore-p2p*/**/*.js',
+      'packages/bitcore-tss/**/*.js',
     ],
     languageOptions: { sourceType: 'commonjs' },
     rules: {

package.json

@@ -1,5 +1,8 @@
 {
   "version": "8.25.8",
+  "engines": {
+    "node": "^22"
+  },
   "scripts": {
     "build": "docker build -t bitcore-node . ",
     "build:docker": "lerna run build:docker --concurrency 1 --stream",

packages/bitcore-cli/src/cli.ts

@@ -214,8 +214,9 @@ if (require.main === module) {
                   // ...update status
                   cmdParams.status = await wallet.client.getStatus({ tokenAddress: tokenObj?.contractAddress });
                 }
-                cmdParams.opts.tokenAddress = tokenObj?.contractAddress;
-                cmdParams.opts.token = tokenObj?.displayCode;
+                // Update persistent opts (cmdParams.opts gets reset to opts since is susceptible to being overwritten in other commands)
+                opts.tokenAddress = tokenObj?.contractAddress;
+                opts.token = tokenObj?.displayCode;
                 break;
               case 'address':
                 await commands.address.createAddress(cmdParams);

packages/bitcore-cli/src/commands/create/createMultiSig.ts

@@ -23,7 +23,7 @@ export async function createMultiSigWallet(
 
   const copayerName = await getCopayerName();
   const addressType = await getAddressType({ chain, network, isMultiSig: true });
-  const password = await getPassword('Lock your wallet with a password:', { hidden: false });
+  const password = await getPassword('Lock your wallet with a password:', { hidden: false, confirm: true });
 
   const { key, secret } = await wallet.create({ chain, network, account: 0, n, m, password, mnemonic, addressType, copayerName });
 

packages/bitcore-cli/src/commands/create/createSingleSig.ts

@@ -14,7 +14,7 @@ export async function createSingleSigWallet(
   const { verbose, mnemonic } = opts;
 
   const addressType = await getAddressType({ chain, network });
-  const password = await getPassword('Lock your wallet with a password:', { hidden: false });
+  const password = await getPassword('Lock your wallet with a password:', { hidden: false, confirm: true });
   const copayerName = process.env.USER || 'copayer';
 
   const { key } = await wallet.create({

packages/bitcore-cli/src/commands/create/createThresholdSig.ts

@@ -27,7 +27,7 @@ export async function createThresholdSigWallet(
 
   const copayerName = await getCopayerName();
   const addressType = await getAddressType({ chain, network, isMultiSig: false, isTss: true });
-  const password = await getPassword('Lock your wallet with a password:', { hidden: false });
+  const password = await getPassword('Lock your wallet with a password:', { hidden: false, confirm: true });
 
   let key;
   if (mnemonic) {
@@ -115,16 +115,10 @@ export async function createThresholdSigWallet(
     } while (joinCodeAction !== 'continue');
   }
 
-  const spinner = prompt.spinner({ indicator: 'timer' });
+  const spinner = prompt.spinner({ indicator: 'timer', onCancel: () => { tss.unsubscribe(); } });
   spinner.start('Waiting for all parties to join...');
 
   await new Promise<void>((resolve, reject) => {
-    process.on('SIGINT', () => {
-      tss.unsubscribe();
-      spinner.stop('Cancelled by user');
-      reject(new UserCancelled());
-    });
-
     tss.subscribe({
       walletName: wallet.name,
       copayerName,
@@ -161,8 +155,14 @@ export async function createThresholdSigWallet(
         reject(err);
       }
     });
+    tss.on('unsubscribe', () => {
+      reject(new UserCancelled());
+    });
   });
 
+  // Clean up sensitive data from memory after wallet creation is complete
+  tss.cleanup();
+
 
   // Keyshare backup
   const ok = await promptKeyshareBackup();

packages/bitcore-cli/src/commands/export.ts

@@ -66,7 +66,7 @@ export async function exportWallet(args: CommonArgs<{ filename?: string; readonl
     throw new UserCancelled();
   }
 
-  const exportPassword = await getPassword('File encryption password:', { hidden: false, minLength: 6 });
+  const exportPassword = await getPassword('File encryption password:', { hidden: false, minLength: 6, confirm: true });
 
   await wallet.export({
     filename: replaceTilde(filename),

packages/bitcore-cli/src/commands/join/joinMultiSig.ts

@@ -24,7 +24,7 @@ export async function joinMultiSigWallet(args: CommonArgs<{ mnemonic?: string }>
   } = parsed;
 
   const copayerName = await getCopayerName();
-  const password = await getPassword('Lock your wallet with a password:', { hidden: false });
+  const password = await getPassword('Lock your wallet with a password:', { hidden: false, confirm: true });
   const { key, joinedWalletName } = await wallet.create({ chain, network, account: 0, n: 2, m: 1, password, mnemonic, copayerName, joinSecret }); // n gets overwritten
 
   prompt.log.success(Utils.colorText(`Wallet joined: ${joinedWalletName}`, 'green'));

packages/bitcore-cli/src/commands/join/joinThresholdSig.ts

@@ -16,7 +16,7 @@ export async function joinThresholdSigWallet(
 
   const network = await getNetwork();
   const copayerName = await getCopayerName();
-  const password = await getPassword('Lock your wallet with a password:', { hidden: false });
+  const password = await getPassword('Lock your wallet with a password:', { hidden: false, confirm: true });
 
   let key;
   if (mnemonic) {
@@ -130,6 +130,9 @@ export async function joinThresholdSigWallet(
     });
   });
 
+  // Clean up sensitive data from memory after wallet creation is complete
+  tss.cleanup();
+
 
   // Keyshare backup
   const ok = await promptKeyshareBackup();

packages/bitcore-cli/src/commands/txproposals.ts

@@ -78,9 +78,11 @@ export async function getTxProposals(
 
   const txps = opts.command && opts.proposalId
     ? [await wallet.client.getTx(opts.proposalId)]
-    : await wallet.client.getTxProposals({
+    : (await wallet.client.getTxProposals({
       forAirGapped: false, // TODO
-    });
+    }))
+      // Sort ascending by lowest nonce first, then by createdOn timestamp if nonce is not present
+      .sort((a, b) => (a.nonce != null || b.nonce != null) ? ((a.nonce || 0) - (b.nonce || 0)) : (a.createdOn - b.createdOn));
 
   let lastPage = 1;
   let printRaw = opts.raw ?? false;
@@ -189,9 +191,9 @@ export async function getTxProposals(
         : Utils.renderAmount(currency, BigInt(txp.amount) + BigInt(txp.fee))
       }`);
       txp.gasPrice && lines.push(`Gas Price: ${Utils.displayFeeRate(chain, txp.gasPrice)}`);
-      txp.gasLimit && lines.push(`Gas Limit: ${txp.gasLimit}`);
+      txp.gasLimit && lines.push(`Gas Limit: ${BigInt(txp.gasLimit)}`);
       txp.feePerKb && lines.push(`Fee Rate: ${Utils.displayFeeRate(chain, txp.feePerKb)}`);
-      txp.nonce != null && lines.push(`Nonce: ${txp.nonce}`);
+      txp.nonce != null && lines.push(`Nonce: ${BigInt(txp.nonce)}`);
       lines.push(`Status: ${txp.status}`);
       lines.push(`Creator: ${txp.creatorName}`);
       lines.push(`Created: ${Utils.formatDate(txp.createdOn * 1000)}`);

packages/bitcore-cli/src/errors.ts

@@ -4,3 +4,8 @@ export class UserCancelled extends Error {
   }
 };
 
+export class ProcessCancelled extends Error {
+  constructor() {
+    super('Cancelled by process');
+  }
+}

packages/bitcore-cli/src/filestorage.ts

@@ -35,4 +35,16 @@ export class FileStorage {
   exists() {
     return fs.existsSync(this.filename);
   }
+
+  /**
+   * Returns the path to the state directory for this wallet, creating it if it doesn't exist.
+   * The state directory is located at .state/<walletName> relative to the wallet file.
+   */
+  async getStatePath(): Promise<string> {
+    const walletName = path.basename(this.filename, path.extname(this.filename));
+    const statePath = path.join(path.dirname(this.filename), '.state', walletName);
+    // Ensure state directory exists
+    await fs.promises.mkdir(statePath, { recursive: true });
+    return statePath;
+  }
 };

packages/bitcore-cli/src/prompts.ts

@@ -75,26 +75,58 @@ export async function getPassword(
     hidden?: boolean;
     /** Custom validation function for the password input. Note, this does NOT override the minimum length check. */
     validate?: (input: string) => string | null;
+    /** Should user be prompted to confirm their password? */
+    confirm?: boolean;
+    /** Retry if confirmation fails (default: true) */
+    retry?: boolean;
   }
 ): Promise<string> {
   opts = opts || {};
-  opts.minLength = opts.minLength ?? 0;
-  const hidden = opts.hidden ?? true;
+  const { confirm, retry = true, hidden = true, minLength = 0 } = opts;
 
-  const password = await prompt.password({
-    message: (msg || 'Password:') + (hidden ? ' (hidden)' : ''),
-    mask: hidden ? '' : undefined,
-    clearOnError: hidden,
-    validate: (input) => {
-      if (input?.length < opts.minLength) {
-        return `Password must be at least ${opts.minLength} characters long.`;
+  let confirmed = false;
+  let password: string | symbol = null;
+  let beginAgain = false;
+  do {
+    password = await prompt.password({
+      message: (msg || 'Password:') + (hidden ? ' (hidden)' : ''),
+      mask: hidden ? '' : undefined,
+      clearOnError: hidden,
+      validate: (input) => {
+        if (input?.length < minLength) {
+          return `Password must be at least ${minLength} characters long.`;
+        }
+        return opts.validate?.(input);
       }
-      return opts.validate?.(input);
+    });
+    if (prompt.isCancel(password)) {
+      throw new UserCancelled();
     }
-  });
-  if (prompt.isCancel(password)) {
-    throw new UserCancelled();
+    if (confirm) {
+      beginAgain = false; // reset beginAgain flag for each iteration
+      let confirmTries = 0;
+      const password2 = await prompt.password({
+        message: 'Confirm:',
+        mask: hidden ? '' : undefined,
+        clearOnError: hidden,
+        validate: (input) => {
+          confirmTries++;
+          if (retry && input !== password) {
+            return 'Passwords do not match' + (confirmTries > 1 ? '. Type Ctrl+C to return to the previous prompt.' : '');
+          }
+        }
+      });
+      beginAgain = prompt.isCancel(password2);
+      confirmed = password === password2;
+    } else {
+      confirmed = true;
+    }
+  } while (!confirmed && beginAgain);
+
+  if (!confirmed) {
+    throw new Error('Passwords do not match');
   }
+
   return password as string;
 };