@jpool/bond-cli 1.6.3 → 1.7.0-next.2

package/dist/cli.js

@@ -6075,7 +6075,7 @@ function initContext({ cluster, env: env2, keypair }) {
   const connection = new import_web3.Connection(rpcUrl, opts.commitment);
   const wallet = new import_anchor.Wallet(resolveKeypair(keypair));
   const provider = new import_anchor.AnchorProvider(connection, wallet, opts);
-  const client = new import_bond_sdk.JBondClient(provider).env(env2);
+  const client = new import_bond_sdk.JBondClient(provider, { debug: true }).env(env2);
   context = {
     cluster: cluster || "mainnet-beta",
     keypair: wallet.payer,
@@ -6146,20 +6146,9 @@ function parseCollateralType(input) {
   }
   throw new Error("Invalid collateral type. Use: native | token:<mint> | stakeAccount");
 }
-function parseBondType(type) {
-  const normalized = (type || "").toLowerCase();
-  if (normalized === "crowdfunding") {
-    return { crowdfunding: {} };
-  }
-  if (normalized === "standard") {
-    return { standard: {} };
-  }
-  console.error(source_default.red(`Invalid bond type: ${type}`));
-  process.exit(1);
-}
 
 // package.json
-var version = "1.6.3";
+var version = "1.7.0-next.2";
 
 // src/cli.ts
 var log = {
@@ -6171,7 +6160,7 @@ var log = {
 `)),
   json: (data, color) => console.log(source_default[color ?? "magenta"](JSON.stringify(data, null, 2)))
 };
-import_commander.program.name("jbond").description("CLI to interact with the JPool Bond program").version(process.env.VERSION ?? version).option("-c, --cluster <cluster>", "Solana cluster (mainnet-beta, devnet, testnet) or RPC URL", process.env.CLUSTER ?? "mainnet-beta").option("-k, --keypair <path>", "Path to Solana keypair file").option("-b, --bond <name>", "Bond name (or set JBOND_BOND env var)", process.env.JBOND_BOND).option("-t, --bond-type <type>", "Bond type: standard|crowdfunding", "standard").hook("preAction", async (command) => {
+import_commander.program.name("jbond").description("CLI to interact with the JPool Bond program").version(process.env.VERSION ?? version).option("-c, --cluster <cluster>", "Solana cluster (mainnet-beta, devnet, testnet) or RPC URL [env:CLUSTER]", process.env.CLUSTER ?? "mainnet-beta").option("-e, --env <env>", "JBond program environment: dev | prod [env:JBOND_ENV]", process.env.JBOND_ENV || "prod").option("-k, --keypair <path>", "Path to Solana keypair file [env:CLI_SOLANA_KEYPAIR] (default: ~/.config/solana/id.json)").option("-b, --bond <name>", "Bond name [env:JBOND_BOND]", process.env.JBOND_BOND).option("-t, --bond-type <type>", "Bond type: standard|crowdfunding", "standard").hook("preAction", async (command) => {
   const opts = command.opts();
   const { provider, client } = initContext(opts);
   log.json({
@@ -6195,8 +6184,7 @@ import_commander.program.command("init").description("Initialize global bond pro
     });
   } catch (error2) {
     spinner.fail("Failed to initialize global state");
-    log.error(String(error2));
-    process.exit(1);
+    throw error2;
   }
 });
 var bond = import_commander.program.command("bond").description("Manage bond projects");
@@ -6206,7 +6194,7 @@ bond.command("init <name>").description("Initialize a new bond project").option(
   try {
     const reserve = opts.reserve ? new import_web33.PublicKey(opts.reserve) : keypair.publicKey;
     const authority = opts.authority ? new import_web33.PublicKey(opts.authority) : void 0;
-    const bondType = parseBondType(import_commander.program.opts().bondType);
+    const bondType = getBondType();
     const collateralType = parseCollateralType(opts.collateral);
     await client.bondInitialize({ bondType, name, authority, collateralType, reserve });
     spinner.succeed("Bond initialized");
@@ -6217,14 +6205,13 @@ bond.command("init <name>").description("Initialize a new bond project").option(
     });
   } catch (error2) {
     spinner.fail("Failed to initialize bond");
-    log.error(String(error2));
-    process.exit(1);
+    throw error2;
   }
 });
-bond.command("config").description("Update bond configuration").option("-a, --authority <pubkey>", "New authority address").option("-r, --reserve <pubkey>", "New reserve address").action(async (opts) => {
+bond.command("configure").description("Update bond configuration").option("-a, --authority <pubkey>", "New authority address").option("-r, --reserve <pubkey>", "New reserve address").action(async (opts) => {
   const spinner = ora("Updating bond configuration").start();
   const { client } = useContext();
-  const bondType = parseBondType(import_commander.program.opts().bondType);
+  const bondType = getBondType();
   const bondName = getBondName();
   try {
     if (!opts.authority && !opts.reserve) {
@@ -6241,75 +6228,111 @@ bond.command("config").description("Update bond configuration").option("-a, --au
     spinner.succeed("Bond configuration updated");
     const details = {};
     if (newAuthority) {
-      details.authority = newAuthority.toString();
+      details.newAuthority = newAuthority.toString();
     }
     if (newReserve) {
-      details.reserve = newReserve.toString();
+      details.newReserve = newReserve.toString();
     }
     details.transaction = tx;
     log.json(details);
   } catch (error2) {
     spinner.fail("Failed to update bond configuration");
-    log.error(String(error2));
-    process.exit(1);
+    throw error2;
   }
 });
 bond.command("info").description("Show bond state information").action(async () => {
   const { client } = useContext();
-  const bondType = parseBondType(import_commander.program.opts().bondType);
+  const bondType = getBondType();
+  const bondName = getBondName();
+  const state = await client.getBondState(bondType, bondName);
+  if (!state) {
+    log.warn("Bond state not found");
+    return;
+  }
+  log.header("Bond State Information");
+  log.json(state);
+});
+bond.command("list").description("List all bond states").action(async () => {
+  const { client } = useContext();
+  const bondType = getBondType();
+  const states = await client.getAllBondStates(bondType);
+  if (states.length === 0) {
+    log.warn("No bond states found");
+    return;
+  }
+  log.header(`Found ${states.length} bond state(s)
+`);
+  states.forEach((state, index) => {
+    log.info(`Bond ${index + 1}:`);
+    log.json(state);
+    console.log("");
+  });
+});
+bond.command("claim-all").description("Claim compensations from all validator bonds to reserve").action(async () => {
+  const spinner = ora("Claiming all compensations").start();
+  const { client, keypair, provider } = useContext();
+  const bondType = getBondType();
   const bondName = getBondName();
+  const BATCH_SIZE = 10;
   try {
-    const state = await client.getBondState(bondType, bondName);
-    if (!state) {
-      log.warn("Bond state not found");
-      return;
+    const ix = await client.getClaimAllCompensationsIxs({
+      bondType,
+      name: bondName,
+      authority: keypair.publicKey
+    });
+    console.log(`Total claims to process: ${ix.length}`);
+    for (let i = 0; i < ix.length; i += BATCH_SIZE) {
+      const chunk = ix.slice(i, i + BATCH_SIZE);
+      const tx = await provider.connection.sendTransaction(new import_web33.Transaction().add(...chunk), [keypair]);
+      log.info(`Processed batch ${i / BATCH_SIZE + 1}: ${chunk.length} claims (tx: ${tx})`);
     }
-    log.header("Bond State Information");
-    log.json(state);
+    spinner.succeed("All compensations claimed");
   } catch (error2) {
-    log.error(`Failed to get bond state: ${error2}`);
-    process.exit(1);
+    spinner.fail("Failed to claim all compensations");
+    throw error2;
   }
 });
-bond.command("list").description("List all bond states").action(async () => {
+bond.command("balances").description("Show total collateral balances for bond").action(async () => {
   const { client } = useContext();
-  const bondType = parseBondType(import_commander.program.opts().bondType);
+  const bondType = getBondType();
+  const bondName = getBondName();
   try {
-    const states = await client.getAllBondStates(bondType);
-    if (states.length === 0) {
-      log.warn("No bond states found");
-      return;
-    }
-    log.header(`Found ${states.length} bond state(s)
-`);
-    states.forEach((state, index) => {
-      log.info(`Bond ${index + 1}:`);
-      log.json(state);
-      console.log("");
+    const validatorBalances = await client.getBondStateValidatorBondBalances(bondType, bondName);
+    log.header("Bond Total Validator Collateral Balance");
+    log.json({
+      bond: bondName,
+      bondType,
+      validatorBalances: validatorBalances.map((vb) => ({
+        voteAccount: vb.voteAccount.toString(),
+        balance: `${lamportsToSol(vb.balance)}`
+      }))
     });
   } catch (error2) {
-    log.error(`Failed to list bond states: ${error2}`);
-    process.exit(1);
+    throw new Error(`Failed to get bond balances: ${error2}`);
   }
 });
-bond.command("collateral-type").description("Show bond collateral type").action(async () => {
-  const { client } = useContext();
-  const bondType = parseBondType(import_commander.program.opts().bondType);
+bond.command("remove").description("Remove bond state").action(async () => {
+  const spinner = ora("Removing bond state").start();
+  const { client, keypair } = useContext();
+  const bondType = getBondType();
   const bondName = getBondName();
   try {
-    const collateralType = await client.getBondCollateralType(bondType, bondName);
-    log.header("Collateral Type:");
-    log.json(collateralType);
+    const tx = await client.bondRemove({ bondType, name: bondName, authority: keypair.publicKey });
+    spinner.succeed("Bond state removed");
+    log.json({
+      name: bondName,
+      transaction: tx
+    });
   } catch (error2) {
-    log.error(`Failed to get collateral type: ${error2}`);
-    process.exit(1);
+    spinner.fail("Failed to remove bond state");
+    throw error2;
   }
 });
 var validator = import_commander.program.command("validator").description("Manage validator bonds");
 validator.command("register <vote>").description("Register validator and create bond account").action(async (vote) => {
   const spinner = ora("Registering validator").start();
   const { keypair, client } = useContext();
-  const bondType = parseBondType(import_commander.program.opts().bondType);
+  const bondType = getBondType();
   const bondName = getBondName();
   try {
     const voteAccount = new import_web33.PublicKey(vote);
@@ -6326,19 +6349,18 @@ validator.command("register <vote>").description("Register validator and create
     });
   } catch (error2) {
     spinner.fail("Failed to register validator");
-    log.error(String(error2));
-    process.exit(1);
+    throw error2;
   }
 });
-validator.command("topup <vote> <amount>").description("Add collateral to validator bond account").action(async (vote, amount) => {
+validator.command("topup <vote> <amount>").description("Add collateral to validator bond account").action(async (vote, amountStr) => {
   const spinner = ora("Adding collateral").start();
   const { client, keypair } = useContext();
-  const bondType = parseBondType(import_commander.program.opts().bondType);
+  const bondType = getBondType();
   const bondName = getBondName();
   try {
     const voteAccount = new import_web33.PublicKey(vote);
-    const topUpAmount = Number.parseFloat(amount);
-    if (Number.isNaN(topUpAmount) || topUpAmount <= 0) {
+    const amount = Number.parseFloat(amountStr);
+    if (Number.isNaN(amount) || amount <= 0) {
       throw new Error("Invalid amount: must be positive number");
     }
     const signature = await client.topUpCollateral({
@@ -6346,29 +6368,28 @@ validator.command("topup <vote> <amount>").description("Add collateral to valida
       name: bondName,
       identity: keypair.publicKey,
       voteAccount,
-      collateral: { amount: topUpAmount }
+      amount
     });
     spinner.succeed("Collateral added");
     log.json({
-      amount: `${topUpAmount} SOL`,
+      amount: `${amount} SOL`,
       transaction: signature
     });
   } catch (error2) {
     spinner.fail("Failed to add collateral");
-    log.error(String(error2));
-    process.exit(1);
+    throw error2;
   }
 });
-validator.command("withdraw <vote-account> <amount> <destination>").description("Withdraw collateral from validator bond account").action(async (voteAccountStr, amount, destinationStr) => {
+validator.command("withdraw <vote> <amount> <destination>").description("Withdraw collateral from validator bond account").action(async (voteAccountStr, amountStr, destinationStr) => {
   const spinner = ora("Withdrawing collateral").start();
   const { client } = useContext();
-  const bondType = parseBondType(import_commander.program.opts().bondType);
+  const bondType = getBondType();
   const bondName = getBondName();
   try {
     const voteAccount = new import_web33.PublicKey(voteAccountStr);
     const destination = new import_web33.PublicKey(destinationStr);
-    const withdrawAmount = Number.parseFloat(amount);
-    if (Number.isNaN(withdrawAmount) || withdrawAmount <= 0) {
+    const amount = Number.parseFloat(amountStr);
+    if (Number.isNaN(amount) || amount <= 0) {
       throw new Error("Invalid amount: must be positive number");
     }
     const bond2 = await client.getValidatorBond(bondType, bondName, voteAccount);
@@ -6380,51 +6401,49 @@ validator.command("withdraw <vote-account> <amount> <destination>").description(
       name: bondName,
       voteAccount,
       destination,
-      withdraw: { amount: withdrawAmount }
+      amount
     });
     spinner.succeed("Collateral withdrawn");
     log.json({
-      amount: `${withdrawAmount} SOL`,
+      amount: `${amount} SOL`,
       destination: destinationStr,
       transaction: tx
     });
   } catch (error2) {
     spinner.fail("Failed to withdraw collateral");
-    log.error(String(error2));
-    process.exit(1);
+    throw error2;
   }
 });
-validator.command("claim <vote> <amount>").description("Claim collateral from validator to reserve").action(async (vote, amount) => {
+validator.command("claim <vote> <amount>").description("Claim collateral from validator to reserve").action(async (vote, amountStr) => {
   const spinner = ora("Claiming collateral").start();
   const { client } = useContext();
-  const bondType = parseBondType(import_commander.program.opts().bondType);
+  const bondType = getBondType();
   const bondName = getBondName();
   try {
     const voteAccount = new import_web33.PublicKey(vote);
-    const claimAmount = Number.parseFloat(amount);
-    if (Number.isNaN(claimAmount) || claimAmount <= 0) {
+    const amount = Number.parseFloat(amountStr);
+    if (Number.isNaN(amount) || amount <= 0) {
       throw new Error("Invalid amount: must be positive number");
     }
     const tx = await client.claimCompensation({
       bondType,
       name: bondName,
       voteAccount,
-      claim: { amount: claimAmount }
+      amount
     });
     spinner.succeed("Collateral claimed");
     log.json({
-      amount: `${claimAmount} SOL`,
+      amount: `${amount} SOL`,
       transaction: tx
     });
   } catch (error2) {
     spinner.fail("Failed to claim collateral");
-    log.error(String(error2));
-    process.exit(1);
+    throw error2;
   }
 });
 validator.command("info <vote>").description("Show validator bond account information").action(async (vote) => {
   const { client } = useContext();
-  const bondType = parseBondType(import_commander.program.opts().bondType);
+  const bondType = getBondType();
   const bondName = getBondName();
   try {
     const voteAccount = new import_web33.PublicKey(vote);
@@ -6441,19 +6460,22 @@ validator.command("info <vote>").description("Show validator bond account inform
       validator: bond2.identity,
       voteAccount: bond2.voteAccount,
       balance: `${lamportsToSol(balance)} SOL`,
+      // TODO: handle non-native collateral
       authority: bond2.withdrawalAuthority || "identity only",
       createdAt: bond2.createdAt,
-      creator: bond2.creator
+      creator: bond2.creator,
+      currentEpochLocked: bond2.locked,
+      pendingUnlock: bond2.pendingUnlock,
+      pendingUnlockEpoch: bond2.pendingUnlockEpoch
     });
   } catch (error2) {
-    log.error(`Failed to get validator info: ${error2}`);
-    process.exit(1);
+    throw new Error(`Failed to get validator info: ${error2}`);
   }
 });
 validator.command("set-authority <vote>").description("Set withdrawal authority for validator bond").option("-a, --authority <pubkey>", "New withdrawal authority (omit to remove)").action(async (vote, opts) => {
   const spinner = ora("Setting withdrawal authority").start();
   const { client, keypair } = useContext();
-  const bondType = parseBondType(import_commander.program.opts().bondType);
+  const bondType = getBondType();
   const bondName = getBondName();
   try {
     const voteAccount = new import_web33.PublicKey(vote);
@@ -6478,37 +6500,95 @@ validator.command("set-authority <vote>").description("Set withdrawal authority
     });
   } catch (error2) {
     spinner.fail("Failed to set withdrawal authority");
-    log.error(String(error2));
-    process.exit(1);
+    throw error2;
   }
 });
 validator.command("history <vote>").description("Show transaction history for validator").option("-l, --limit <number>", "Number of records", "10").action(async (vote, opts) => {
   const { client } = useContext();
-  const bondType = parseBondType(import_commander.program.opts().bondType);
+  const bondType = getBondType();
   const bondName = getBondName();
   const limit = Number.parseInt(opts.limit, 10);
   const voteAccount = new import_web33.PublicKey(vote);
   const cluster = import_commander.program.opts().cluster || "mainnet-beta";
+  const history = await client.history.getHistory(bondType, bondName, voteAccount, { limit, cluster });
+  log.header(`Transaction History (limit: ${limit})`);
+  log.json(history);
+});
+validator.command("lock-funds <vote> <amount>").description("Lock funds in validator bond account (standard bonds only)").action(async (vote, amountStr) => {
+  const spinner = ora("Locking funds").start();
+  const { client, keypair } = useContext();
+  const bondType = getBondType();
+  const bondName = getBondName();
+  try {
+    if (bondType !== "standard") {
+      throw new Error("Locking funds is only supported for standard bonds");
+    }
+    const voteAccount = new import_web33.PublicKey(vote);
+    const amount = Number.parseFloat(amountStr);
+    if (Number.isNaN(amount) || amount <= 0) {
+      throw new Error("Invalid amount: must be positive number");
+    }
+    const tx = await client.lockFunds({
+      bondType,
+      name: bondName,
+      voteAccount,
+      amount,
+      withdrawAuthority: keypair.publicKey
+    });
+    spinner.succeed("Funds locked");
+    log.json({
+      amount: `${amount} SOL`,
+      transaction: tx
+    });
+  } catch (error2) {
+    spinner.fail("Failed to lock funds");
+    throw error2;
+  }
+});
+validator.command("close <vote>").description("Close validator bond account and reclaim funds").option("-r, --receiver <pubkey>", "Rent receiver address (defaults to signer)").action(async (vote, opts) => {
+  const spinner = ora("Closing validator bond").start();
+  const { client, keypair } = useContext();
+  const bondType = getBondType();
+  const bondName = getBondName();
   try {
-    const history = await client.getHistory(bondType, bondName, voteAccount, { limit, cluster });
-    log.header(`Transaction History (limit: ${limit})`);
-    log.json(history);
+    const voteAccount = new import_web33.PublicKey(vote);
+    const rentReceiver = opts.receiver ? new import_web33.PublicKey(opts.receiver) : keypair.publicKey;
+    const bond2 = await client.getValidatorBond(bondType, bondName, voteAccount);
+    if (!bond2) {
+      throw new Error("Validator bond account not found");
+    }
+    if (bond2.locked.toNumber() > 0 || bond2.pendingUnlock.toNumber() > 0) {
+      throw new Error("Cannot close: funds are still locked or pending unlock");
+    }
+    const tx = await client.closeValidatorBond({
+      bondType,
+      name: bondName,
+      voteAccount,
+      rentReceiver,
+      authority: keypair.publicKey
+    });
+    spinner.succeed("Validator bond closed");
+    log.json({
+      voteAccount: vote,
+      rentReceiver: rentReceiver.toString(),
+      transaction: tx
+    });
   } catch (error2) {
-    log.error(`Failed to get transaction history: ${error2}`);
-    process.exit(1);
+    spinner.fail("Failed to close validator bond");
+    throw error2;
   }
 });
 var session = import_commander.program.command("session").description("Manage bond sessions");
 session.command("start <duration>").description("Start a bond session").action(async (duration) => {
   const spinner = ora("Starting bond session").start();
   const { client } = useContext();
-  const bondType = parseBondType(import_commander.program.opts().bondType);
+  const bondType = getBondType();
   const bondName = getBondName();
   try {
     if (Number.isNaN(duration) || duration <= 0) {
       throw new Error("Invalid duration: must be positive number");
     }
-    const tx = await client.bondStart({ bondType, name: bondName, duration_secs: duration });
+    const tx = await client.bondStart({ bondType, name: bondName, duration });
     spinner.succeed("Bond session started");
     log.json({
       duration: `${duration} seconds`,
@@ -6516,14 +6596,13 @@ session.command("start <duration>").description("Start a bond session").action(a
     });
   } catch (error2) {
     spinner.fail("Failed to start bond session");
-    log.error(String(error2));
-    process.exit(1);
+    throw error2;
   }
 });
 session.command("finish").description("Finish current bond session").action(async () => {
   const spinner = ora("Finishing bond session").start();
   const { client } = useContext();
-  const bondType = parseBondType(import_commander.program.opts().bondType);
+  const bondType = getBondType();
   const bondName = getBondName();
   try {
     const transaction = await client.bondFinish({ bondType, name: bondName });
@@ -6531,17 +6610,13 @@ session.command("finish").description("Finish current bond session").action(asyn
     log.json({ transaction });
   } catch (error2) {
     spinner.fail("Failed to finish bond session");
-    log.error(String(error2));
-    process.exit(1);
+    throw error2;
   }
 });
 import_commander.program.command("*", { isDefault: true, hidden: true }).allowExcessArguments(true).action(() => import_commander.program.help());
 import_commander.program.parseAsync().catch((e) => {
   log.error(`
 ${e.message}`);
-  if (e.logs) {
-    log.json(e.logs, "red");
-  }
   process.exit(1);
 });
 function getBondName() {
@@ -6551,3 +6626,6 @@ function getBondName() {
   }
   return bond2;
 }
+function getBondType() {
+  return import_commander.program.opts().bondType;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jpool/bond-cli",
-  "version": "1.6.3",
+  "version": "1.7.0-next.2",
   "description": "JBond CLI for interacting with the Solana program",
   "main": "./dist/cli.js",
   "bin": {
@@ -16,7 +16,7 @@
     "commander": "^14.0.1",
     "dotenv": "^17.2.3",
     "ora": "^9.0.0",
-    "@jpool/bond-sdk": "0.10.4"
+    "@jpool/bond-sdk": "0.11.0-next.22"
   },
   "devDependencies": {
     "tsup": "^8.5.0",