@glamsystems/glam-cli 1.0.14-alpha.3 → 1.0.14-alpha.5

package/main.js

@@ -3642,7 +3642,7 @@ class GlamClient extends base_1.BaseClient {
     }
     get jupiterSwap() {
         if (!this._jupiterSwap) {
-            this._jupiterSwap = new jupiter_1.JupiterSwapClient(this, this.vault);
+            this._jupiterSwap = new jupiter_1.JupiterSwapClient(this, this.vault, this.kaminoLending);
         }
         return this._jupiterSwap;
     }
@@ -4673,7 +4673,12 @@ class TxBuilder extends base_1.BaseTxBuilder {
         const inputStakePool = assets_1.STAKE_POOLS_MAP.get(inputMint.toBase58())?.poolState || null;
         const outputStakePool = assets_1.STAKE_POOLS_MAP.get(outputMint.toBase58())?.poolState || null;
         const preInstructions = await this.getPreInstructions(glamSigner, inputMint, outputMint, amount, outputTokenProgram);
-        // glam_config is auto-resolved by Anchor via its PDA seeds declaration.
+        if (oracleAccounts?.kaminoReservesToRefresh &&
+            oracleAccounts.kaminoReservesToRefresh.length > 0) {
+            const reserves = await this.client.klend.fetchAndParseReserves(oracleAccounts.kaminoReservesToRefresh);
+            const refreshReservesIx = this.client.klend.txBuilder.refreshReservesBatchIx(reserves, false);
+            preInstructions.push(refreshReservesIx);
+        }
         const ix = await this.client.base.protocolProgram.methods
             .jupiterSwapV2(skipQuotePriceCheck, swapIx.data)
             .accounts({
@@ -4701,9 +4706,10 @@ class TxBuilder extends base_1.BaseTxBuilder {
     }
 }
 class JupiterSwapClient {
-    constructor(base, vault) {
+    constructor(base, vault, klend) {
         this.base = base;
         this.vault = vault;
+        this.klend = klend;
         this.txBuilder = new TxBuilder(this);
         this.jupApi =
             this.base.jupiterApiClient ||
@@ -6263,11 +6269,7 @@ class Reserve extends base_1.Decodable {
         return this.config.tokenInfo.scopeConfiguration.priceFeed;
     }
     get liquidityFeeReceiver() {
-        return web3_js_1.PublicKey.findProgramAddressSync([
-            Buffer.from("fee_receiver"),
-            this.lendingMarket.toBuffer(),
-            this.liquidity.mintPubkey.toBuffer(),
-        ], constants_1.KAMINO_LENDING_PROGRAM)[0];
+        return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("fee_receiver"), this._address.toBuffer()], constants_1.KAMINO_LENDING_PROGRAM)[0];
     }
     get farmDebtNullable() {
         return this.farmDebt.equals(web3_js_1.PublicKey.default) ? null : this.farmDebt;
@@ -47649,10 +47651,19 @@ async function getJupiterSwapV2OracleAccounts(context, tokenFrom, tokenTo, optio
         outputAssetMeta = await context.glamClient.getAssetMeta(tokenTo.address);
     }
     catch { }
+    // input and output asset metas might be kaminoReserve
+    const kaminoReservesToRefresh = [];
+    if (inputAssetMeta?.oracleSource === "KaminoReserve") {
+        kaminoReservesToRefresh.push(inputAssetMeta.oracle);
+    }
+    if (outputAssetMeta?.oracleSource === "KaminoReserve") {
+        kaminoReservesToRefresh.push(outputAssetMeta.oracle);
+    }
     const oracleAccounts = {
         solUsdOracle: await context.glamClient.getSolOracle(),
         inputTokenOracle: inputAssetMeta?.oracle,
         outputTokenOracle: outputAssetMeta?.oracle,
+        kaminoReservesToRefresh,
     };
     if (!options.skipQuotePriceCheck &&
         (!oracleAccounts.inputTokenOracle || !oracleAccounts.outputTokenOracle)) {
@@ -48554,6 +48565,43 @@ function installVaultCommands(program, context) {
             message: `Confirm removing ${asset} from allowlist?`,
         }, (txSig) => `${asset} removed from allowlist: ${txSig}`);
     });
+    program
+        .command("allowlist-borrowable-asset")
+        .argument("<asset>", "Borrowable asset mint public key", utils_1.validatePublicKey)
+        .option("-y, --yes", "Skip confirmation prompt", false)
+        .description("Add a borrowable asset to the global borrowable allowlist")
+        .action(async (asset, options) => {
+        const stateModel = await context.glamClient.fetchStateModel();
+        const borrowableSet = new glam_sdk_1.PkSet(stateModel.borrowable || []);
+        if (borrowableSet.has(asset)) {
+            console.error(`Borrowable asset ${asset} already allowlisted`);
+            process.exit(1);
+        }
+        const borrowable = Array.from(borrowableSet.add(asset));
+        await (0, utils_1.executeTxWithErrorHandling)(() => context.glamClient.state.update({ borrowable }, context.txOptions), {
+            skip: options?.yes,
+            message: `Confirm adding ${asset} to global borrowable allowlist?`,
+        }, (txSig) => `${asset} added to global borrowable allowlist: ${txSig}`);
+    });
+    program
+        .command("remove-borrowable-asset")
+        .argument("<asset>", "Borrowable asset mint public key", utils_1.validatePublicKey)
+        .option("-y, --yes", "Skip confirmation prompt", false)
+        .description("Remove a borrowable asset from the global borrowable allowlist")
+        .action(async (asset, options) => {
+        const stateModel = await context.glamClient.fetchStateModel();
+        const borrowableSet = new glam_sdk_1.PkSet(stateModel.borrowable || []);
+        const removed = borrowableSet.delete(asset);
+        if (!removed) {
+            console.error(`${asset} not found in global borrowable allowlist, nothing to remove`);
+            process.exit(1);
+        }
+        const borrowable = Array.from(borrowableSet);
+        await (0, utils_1.executeTxWithErrorHandling)(() => context.glamClient.state.update({ borrowable }, context.txOptions), {
+            skip: options?.yes,
+            message: `Confirm removing ${asset} from global borrowable allowlist?`,
+        }, (txSig) => `${asset} removed from global borrowable allowlist: ${txSig}`);
+    });
     program
         .command("holdings")
         .description("Get all vault holdings")
@@ -50326,7 +50374,7 @@ program
     initialize(config, skipSimulation);
     await (0, idl_1.idlCheck)(context.glamClient);
 })
-    .version("1.0.14-alpha.3");
+    .version("1.0.14-alpha.5");
 program
     .command("env")
     .description("Display current environment setup")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glamsystems/glam-cli",
-  "version": "1.0.14-alpha.3",
+  "version": "1.0.14-alpha.5",
   "description": "CLI for interacting with the GLAM Protocol",
   "main": "./main.js",
   "bin": {
@@ -21,7 +21,7 @@
     "node": ">=20.20.0"
   },
   "dependencies": {
-    "@glamsystems/glam-sdk": "1.0.14-alpha.3",
+    "@glamsystems/glam-sdk": "1.0.14-alpha.5",
     "@switchboard-xyz/common": "^3.0.0",
     "commander": "^11.1.0",
     "decimal.js": "^10.6.0",