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

package/dist/cli.js

@@ -6148,10 +6148,9 @@ function parseCollateralType(input) {
 }
 
 // package.json
-var version = "1.7.0-next.1";
+var version = "1.7.0-next.2";
 
 // src/cli.ts
-process.env.CLUSTER = "https://mainnet.helius-rpc.com/?api-key=e7029c83-db93-4397-b540-114b2111e9f5";
 var log = {
   success: (...text) => console.log(source_default.green(...text)),
   warn: (...text) => console.log(source_default.yellow(...text)),
@@ -6161,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 [env:CLUSTER]", process.env.CLUSTER ?? "mainnet-beta").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) => {
+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({
@@ -6312,6 +6311,23 @@ bond.command("balances").description("Show total collateral balances for bond").
     throw new Error(`Failed to get bond balances: ${error2}`);
   }
 });
+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 tx = await client.bondRemove({ bondType, name: bondName, authority: keypair.publicKey });
+    spinner.succeed("Bond state removed");
+    log.json({
+      name: bondName,
+      transaction: tx
+    });
+  } catch (error2) {
+    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();
@@ -6449,7 +6465,8 @@ validator.command("info <vote>").description("Show validator bond account inform
       createdAt: bond2.createdAt,
       creator: bond2.creator,
       currentEpochLocked: bond2.locked,
-      nextEpochLocked: bond2.nextEpochLocked
+      pendingUnlock: bond2.pendingUnlock,
+      pendingUnlockEpoch: bond2.pendingUnlockEpoch
     });
   } catch (error2) {
     throw new Error(`Failed to get validator info: ${error2}`);
@@ -6528,6 +6545,39 @@ validator.command("lock-funds <vote> <amount>").description("Lock funds in valid
     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 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) {
+    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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jpool/bond-cli",
-  "version": "1.7.0-next.1",
+  "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.11.0-next.17"
+    "@jpool/bond-sdk": "0.11.0-next.22"
   },
   "devDependencies": {
     "tsup": "^8.5.0",