@jpool/bond-cli 1.1.0 → 1.2.0-next.1

package/README.md

@@ -52,7 +52,7 @@ Example:
 Add additional collateral to an existing validator bond.
 
 ```bash
-pnpm jbond topup-collateral <vote-account> <amount> -k <path>
+pnpm jbond topup <vote-account> <amount> -k <path>
 
 Arguments:
   vote-account          Vote account public key
@@ -63,15 +63,15 @@ Options:
   -c, --cluster <CLUSTER_NAME> Solana cluster(devnet or mainnet-beta)
 
 Example:
-  pnpm jbond topup-collateral 686JcEJ98r8fMtUiVuKiz4WRoBpJ2Sm9zMhdc2b6H4bu 50 -c mainnet-beta
+  pnpm jbond topup 686JcEJ98r8fMtUiVuKiz4WRoBpJ2Sm9zMhdc2b6H4bu 50 -c mainnet-beta
 ```
 
 ### Withdraw Collateral
 
-Withdraw collateral from validator bond account.
+Withdraw collateral from a validator bond account to a specified destination address.
 
 ```bash
-pnpm jbond withdraw-collateral <vote-account> <destination> <amount> [options]
+pnpm jbond withdraw <vote-account> <destination> <amount> [options]
 
 Arguments:
   vote-account          Vote account public key
@@ -83,13 +83,42 @@ Options:
   -c, --cluster <CLUSTER_NAME> Solana cluster(devnet or mainnet-beta)
 
 Example:
-  pnpm jbond withdraw-collateral 686JcEJ98r8fMtUiVuKiz4WRoBpJ2Sm9zMhdc2b6H4bu 3K2coMGaZhrSkyF52wUBUXBeRBRpGLnmB3znzLRKjgiP 25 -c mainnet-beta
+  pnpm jbond withdraw 686JcEJ98r8fMtUiVuKiz4WRoBpJ2Sm9zMhdc2b6H4bu 3K2coMGaZhrSkyF52wUBUXBeRBRpGLnmB3znzLRKjgiP 25 -c mainnet-beta
 ```
 
 **Requirements**:
 
 Only the validator identity or withdrawal authority can execute withdrawals. The validator bond account must have sufficient collateral
 
+### Set Withdrawal Authority
+
+Set or update the withdrawal authority for a validator bond account. This allows delegating withdrawal permissions to another address.
+
+```bash
+pnpm jbond set-withdraw-authority <vote-account> [options]
+
+Arguments:
+  vote-account          Vote account public key
+
+Options:
+  -k, --keypair <path>  Path to keypair file (default: ~/.config/solana/id.json)
+  -w, --new-authority <pubkey>  New withdrawal authority (omit to remove authority)
+  -c, --cluster <CLUSTER_NAME> Solana cluster(devnet or mainnet-beta)
+
+Examples:
+  # Set a withdrawal authority
+  pnpm jbond set-withdraw-authority 686JcEJ98r8fMtUiVuKiz4WRoBpJ2Sm9zMhdc2b6H4bu -w 9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin -c mainnet-beta
+
+  # Remove withdrawal authority (revert to identity-only)
+  pnpm jbond set-withdraw-authority 686JcEJ98r8fMtUiVuKiz4WRoBpJ2Sm9zMhdc2b6H4bu -c mainnet-beta
+```
+
+**Requirements**:
+
+- Only the validator identity can set or update the withdrawal authority
+- When a withdrawal authority is set, only that authority (or validator identity) can withdraw collateral
+- Omitting the `--new-authority` option removes the withdrawal authority, reverting to identity-only withdrawals
+
 ### Claim Compensation
 
 Claim compensation from a validator's collateral to the reserve (authority only).
@@ -195,7 +224,7 @@ pnpm jbond register-validator GHRvDXj9BfACkJ9CoLWbpi2UkMVti9DwXJGsaFT9XDcD 100
 pnpm jbond validator-info GHRvDXj9BfACkJ9CoLWbpi2UkMVti9DwXJGsaFT9XDcD -c mainnet-beta
 
 # 4. Top up with additional 50 SOL
-pnpm jbond topup-collateral GHRvDXj9BfACkJ9CoLWbpi2UkMVti9DwXJGsaFT9XDcD 50 -c mainnet-beta
+pnpm jbond topup GHRvDXj9BfACkJ9CoLWbpi2UkMVti9DwXJGsaFT9XDcD 50 -c mainnet-beta
 ```
 
 ### Authority Operations
@@ -231,4 +260,4 @@ Common errors and solutions:
 ### `Account already in use`
 
 - The validator is already registered
-- Use `topup-collateral` to add more funds instead
+- Use `topup` to add more funds instead

package/dist/cli.js

@@ -81,7 +81,7 @@ function resolveKeypair(path) {
 }
 
 // package.json
-var version = "1.0.1";
+var version = "1.2.0-next.0";
 
 // src/cli.ts
 import_commander.program.name("jbond").description("CLI to interact with the JPool Bond program").version(process.env.VERSION ?? version).allowExcessArguments(false).option("-c, --cluster <CLUSTER>", "Solana cluster or RPC URL").option("-k, --keypair <KEYPAIR>", "Filepath to Solana keypair").hook("preAction", async (command) => {
@@ -103,13 +103,28 @@ import_commander.program.command("info").description("Get global state informati
       console.log(import_chalk.default.yellow("Global state not initialized"));
       return;
     }
-    console.log(import_chalk.default.cyan("Global State Information:"));
+    console.log(import_chalk.default.cyan("====== Global State: ======\n"));
     console.log(import_chalk.default.white(`  Authority: ${state.authority}`));
     console.log(import_chalk.default.white(`  Reserve: ${state.reserve}`));
     console.log(import_chalk.default.white(`  Total Validators: ${state.totalValidators}`));
     console.log(import_chalk.default.white(`  Total Compensation Amount: ${state.totalCompensationAmount.toString()}`));
     const epochInfo = await provider.connection.getEpochInfo();
     console.log(import_chalk.default.white(`  Current Epoch: ${epochInfo.epoch}`));
+    console.log(import_chalk.default.cyan("\n====== Validators: ======\n"));
+    const bonds = await client.program.account.validatorBond.all();
+    const publicKeys = bonds.map((b) => b.publicKey);
+    const bondAccounts = await provider.connection.getMultipleAccountsInfo(publicKeys);
+    const bondBalances = bondAccounts.map((acc) => acc?.lamports ?? 0);
+    if (bonds.length === 0) {
+      console.log(import_chalk.default.dim("No validators found"));
+    } else {
+      bonds.forEach((b, i) => {
+        console.log(import_chalk.default.magenta(prettyJson({
+          balance: `${bondBalances[i] / import_web32.LAMPORTS_PER_SOL} SOL`,
+          ...b
+        })));
+      });
+    }
   } catch (error) {
     console.error(import_chalk.default.red(`Failed to get global state info: ${error}`));
     process.exit(1);
@@ -152,7 +167,7 @@ import_commander.program.command("register-validator").description("Register val
     spinner.fail(import_chalk.default.red(`Failed to register validator: ${error}`));
   }
 });
-import_commander.program.command("topup-collateral").description("Top up collateral for existing validator").argument("<vote-account>", "Vote account public key").argument("<amount>", "Amount to top up in SOL").action(async (voteAccountStr, amount) => {
+import_commander.program.command("topup").description("Top up collateral for validator bond account").argument("<vote-account>", "Vote account public key").argument("<amount>", "Amount to top up in SOL").action(async (voteAccountStr, amount) => {
   const spinner = (0, import_ora.default)("Topping up collateral...").start();
   const { client } = useContext();
   try {
@@ -170,7 +185,7 @@ import_commander.program.command("topup-collateral").description("Top up collate
     process.exit(1);
   }
 });
-import_commander.program.command("withdraw-collateral").description("Withdraw collateral from validator bond account").argument("<vote-account>", "Vote account public key").argument("<destination>", "Destination address for withdrawn funds").argument("<amount>", "Amount to withdraw in SOL").action(async (voteAccountStr, destinationStr, amount) => {
+import_commander.program.command("withdraw").description("Withdraw collateral from validator bond account").argument("<vote-account>", "Vote account public key").argument("<destination>", "Destination address for withdrawn funds").argument("<amount>", "Amount to withdraw in SOL").action(async (voteAccountStr, destinationStr, amount) => {
   const spinner = (0, import_ora.default)("Withdrawing collateral...").start();
   const { client } = useContext();
   try {
@@ -314,3 +329,32 @@ import_commander.program.parseAsync().catch((e) => {
   }
   process.exit();
 });
+function prettyJson(obj, omitKeys = ["bump"]) {
+  const convertValue = (value) => {
+    if (value === null || value === void 0) {
+      return null;
+    }
+    if (typeof value === "boolean" || typeof value === "number" || typeof value === "string") {
+      return value;
+    }
+    if (value && typeof value === "object") {
+      if (typeof value.toString === "function" && value.constructor.name !== "Object") {
+        return value.toString();
+      }
+      if (Array.isArray(value)) {
+        return value.map((item) => convertValue(item));
+      }
+      const converted2 = {};
+      for (const [k, v] of Object.entries(value)) {
+        if (omitKeys.includes(k)) {
+          continue;
+        }
+        converted2[k] = convertValue(v);
+      }
+      return converted2;
+    }
+    return String(value);
+  };
+  const converted = convertValue(obj);
+  return JSON.stringify(converted, null, 2);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jpool/bond-cli",
-  "version": "1.1.0",
+  "version": "1.2.0-next.1",
   "description": "JBond CLI for interacting with the Solana program",
   "main": "./dist/cli.js",
   "bin": {