@glamsystems/glam-cli 0.1.33 → 0.1.34

package/main.js

@@ -6496,7 +6496,6 @@ class KaminoLendingClient {
         const vault = this.base.vaultPda;
         const userMetadata = this.getUserMetadataPda(vault);
         const lookupTable = new web3_js_1.PublicKey(0); // FIXME: create lookup table
-        // @ts-ignore
         const tx = await this.base.program.methods
             .kaminoLendingInitUserMetadata(lookupTable)
             .accounts({
@@ -6553,7 +6552,7 @@ class KaminoLendingClient {
             const obligationFarmAccount = await this.base.provider.connection.getAccountInfo(obligationFarm);
             if (!obligationFarmAccount) {
                 preInstructions.push(await this.base.program.methods
-                    .kaminoLendingInitObligationFarmsForReserve(0) // TODO: What does mode do?
+                    .kaminoLendingInitObligationFarmsForReserve(0) // 0 - collateral farm
                     .accounts({
                     glamState: this.base.statePda,
                     glamSigner,
@@ -6591,7 +6590,8 @@ class KaminoLendingClient {
             postInstructions.push(...ixs); // farms must be refreshed after deposit
         }
         // If deposit asset is WSOL, wrap SOL first in case vault doesn't have enough wSOL
-        const userSourceLiquidity = this.base.getVaultAta(asset);
+        const { tokenProgram } = await this.base.fetchMintAndTokenProgram(asset);
+        const userSourceLiquidity = this.base.getVaultAta(asset, tokenProgram);
         if (asset.equals(constants_1.WSOL)) {
             const wrapSolIxs = await this.base.maybeWrapSol(amount);
             preInstructions.unshift(...wrapSolIxs);
@@ -6609,7 +6609,6 @@ class KaminoLendingClient {
                 postInstructions.push(closeIx);
             }
         }
-        // @ts-ignore
         const tx = await this.base.program.methods
             .kaminoLendingDepositReserveLiquidityAndObligationCollateralV2(amount)
             .accounts({
@@ -6626,7 +6625,7 @@ class KaminoLendingClient {
             userSourceLiquidity,
             placeholderUserDestinationCollateral: constants_1.KAMINO_LENDING_PROGRAM,
             collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            liquidityTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            liquidityTokenProgram: tokenProgram,
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             obligationFarmUserState: obligationFarm,
             reserveFarmState: depositReserve.farmCollateral,
@@ -6652,7 +6651,7 @@ class KaminoLendingClient {
             const obligationFarmAccount = await this.base.provider.connection.getAccountInfo(obligationFarm);
             if (!obligationFarmAccount) {
                 preInstructions.push(await this.base.program.methods
-                    .kaminoLendingInitObligationFarmsForReserve(0) // TODO: What does mode do?
+                    .kaminoLendingInitObligationFarmsForReserve(0) // 0 - collateral farm
                     .accounts({
                     glamState: this.base.statePda,
                     glamSigner,
@@ -6690,8 +6689,9 @@ class KaminoLendingClient {
             postInstructions.push(...ixs); // farms must be refreshed after withdraw
         }
         // Create asset ATA in case it doesn't exist. Add it to the beginning of preInstructions
-        const userDestinationLiquidity = this.base.getVaultAta(asset);
-        const createAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(glamSigner, userDestinationLiquidity, vault, asset);
+        const { tokenProgram } = await this.base.fetchMintAndTokenProgram(asset);
+        const userDestinationLiquidity = this.base.getVaultAta(asset, tokenProgram);
+        const createAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(glamSigner, userDestinationLiquidity, vault, asset, tokenProgram);
         preInstructions.unshift(createAtaIx);
         const withdrawIx = await this.base.program.methods
             .kaminoLendingWithdrawObligationCollateralAndRedeemReserveCollateralV2(amount)
@@ -6709,12 +6709,19 @@ class KaminoLendingClient {
             userDestinationLiquidity,
             placeholderUserDestinationCollateral: null,
             collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            liquidityTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            liquidityTokenProgram: tokenProgram,
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             obligationFarmUserState: obligationFarm,
             reserveFarmState: withdrawReserve.farmCollateral,
             farmsProgram: constants_1.KAMINO_FARM_PROGRAM,
         })
+            .remainingAccounts([
+            {
+                pubkey: web3_js_1.SystemProgram.programId,
+                isSigner: false,
+                isWritable: false,
+            },
+        ])
             .instruction();
         // The final instructions in the tx:
         // - refreshReserve * N
@@ -6741,7 +6748,7 @@ class KaminoLendingClient {
             const obligationFarmAccount = await this.base.provider.connection.getAccountInfo(obligationFarm);
             if (!obligationFarmAccount) {
                 preInstructions.push(await this.base.program.methods
-                    .kaminoLendingInitObligationFarmsForReserve(0) // TODO: What does mode do?
+                    .kaminoLendingInitObligationFarmsForReserve(1) // 1 - debt farm
                     .accounts({
                     glamState: this.base.statePda,
                     glamSigner,
@@ -6784,8 +6791,9 @@ class KaminoLendingClient {
         }
         */
         // Create asset ATA in case it doesn't exist. Add it to the beginning of preInstructions
-        const userDestinationLiquidity = this.base.getVaultAta(asset);
-        const createAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(glamSigner, userDestinationLiquidity, vault, asset);
+        const { tokenProgram } = await this.base.fetchMintAndTokenProgram(asset);
+        const userDestinationLiquidity = this.base.getVaultAta(asset, tokenProgram);
+        const createAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(glamSigner, userDestinationLiquidity, vault, asset, tokenProgram);
         preInstructions.unshift(createAtaIx);
         const borrowIx = await this.base.program.methods
             .kaminoLendingBorrowObligationLiquidityV2(amount)
@@ -6802,7 +6810,7 @@ class KaminoLendingClient {
             userDestinationLiquidity,
             referrerTokenState: null,
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            tokenProgram,
             obligationFarmUserState: obligationFarm,
             reserveFarmState: borrowReserve.farmDebt,
             farmsProgram: constants_1.KAMINO_FARM_PROGRAM,
@@ -6830,7 +6838,7 @@ class KaminoLendingClient {
             const obligationFarmAccount = await this.base.provider.connection.getAccountInfo(obligationFarm);
             if (!obligationFarmAccount) {
                 preInstructions.push(await this.base.program.methods
-                    .kaminoLendingInitObligationFarmsForReserve(0) // TODO: What does mode do?
+                    .kaminoLendingInitObligationFarmsForReserve(1) // 1 - debt farm
                     .accounts({
                     glamState: this.base.statePda,
                     glamSigner,
@@ -6862,6 +6870,7 @@ class KaminoLendingClient {
             obligation,
             reserves: reservesInUse,
         }));
+        const { tokenProgram } = await this.base.fetchMintAndTokenProgram(asset);
         const repayIx = await this.base.program.methods
             .kaminoLendingRepayObligationLiquidityV2(amount)
             .accounts({
@@ -6873,9 +6882,9 @@ class KaminoLendingClient {
             repayReserve: repayReserve.address,
             reserveLiquidityMint: asset,
             reserveDestinationLiquidity: repayReserve.liquiditySupplyVault,
-            userSourceLiquidity: this.base.getVaultAta(asset),
+            userSourceLiquidity: this.base.getVaultAta(asset, tokenProgram),
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            tokenProgram,
             obligationFarmUserState: obligationFarm,
             reserveFarmState: repayReserve.farmDebt,
             farmsProgram: constants_1.KAMINO_FARM_PROGRAM,
@@ -10633,7 +10642,7 @@ program
     .hook("preSubcommand", async (thisCommand, actionCommand) => {
     await (0, idl_1.idlCheck)(glamClient);
 })
-    .version("0.1.33");
+    .version("0.1.34");
 program
     .command("env")
     .description("Display current environment setup")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glamsystems/glam-cli",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "description": "CLI for interacting with the GLAM Protocol",
   "main": "./main.js",
   "bin": {
@@ -21,7 +21,7 @@
     "node": ">=20.18.0"
   },
   "dependencies": {
-    "@glamsystems/glam-sdk": "0.1.33",
+    "@glamsystems/glam-sdk": "0.1.34",
     "commander": "^11.1.0",
     "inquirer": "^8.2.6",
     "@switchboard-xyz/common": "^3.0.0"