@glamsystems/glam-sdk 0.1.19 → 0.1.20

package/README.md

@@ -1,5 +1,7 @@
 # GLAM SDK
 
+![NPM Version](https://img.shields.io/npm/v/%40glamsystems%2Fglam-sdk)
+
 A TypeScript SDK for interacting with the GLAM Protocol.
 
 ## Installation
@@ -11,43 +13,7 @@ npm i @glamsystems/glam-sdk
 ## Getting Started
 
 - [GLAM docs](https://docs.glam.systems)
-- [TypeScript API docs](#)
 
 ## Examples
 
-### Set up a GLAM client and interact with a vault
-
-```ts
-import * as anchor from "@coral-xyz/anchor";
-import { GlamClient, WSOL } from "@glamsystems/glam-sdk";
-import { PublicKey } from "@solana/web3.js";
-
-// Need to set ANCHOR_PROVIDER_URL and ANCHOR_WALLET env variables
-// ANCHOR_PROVIDER_URL=...
-// ANCHOR_WALLET=...
-const glamClient = new GlamClient();
-const statePda = new PublicKey("FMHLPaEeCbuivqsAfHrr28FpWJ9oKHTx3jzFbb3tYhq4");
-
-async function main() {
-  const vaultPda = glamClient.getVaultPda(statePda);
-
-  console.log("statePda:", statePda.toBase58());
-  console.log("vaultPda:", vaultPda.toBase58());
-
-  const vaultWsolBalance = await glamClient.getVaultTokenBalance(statePda, WSOL);
-  console.log("vaultWsolBalance:", vaultWsolBalance.toString());
-
-  // Wrap 0.1 SOL
-  const txSig = await glamClient.wsol.wrap(statePda, new anchor.BN(100_000_000));
-  console.log("txSig:", txSig);
-
-  // wSOL balance after wrap should increase by 0.1 SOL
-  const vaultWsolBalanceAfter = await glamClient.getVaultTokenBalance(statePda, WSOL);
-  console.log("vaultWsolBalanceAfter:", vaultWsolBalanceAfter.toString());
-}
-
-main().catch((error) => {
-  console.error("Error:", error);
-  process.exit(1);
-});
-```
+See [examples](./examples).

package/index.cjs.js

@@ -3251,6 +3251,7 @@ var instructions = [
             },
             {
                 name: "glam_vault",
+                writable: true,
                 pda: {
                     seeds: [
                         {
@@ -12448,9 +12449,12 @@ const MEMO_PROGRAM = new web3_js.PublicKey("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgD
  * Stake pools
  */ const JITO_STAKE_POOL = new web3_js.PublicKey("Jito4APyf642JPZPx3hGc6WWJ8zPKtRbRs4P815Awbb");
 const JUPSOL_STAKE_POOL = new web3_js.PublicKey("8VpRhuxa7sUUepdY3kQiTmX9rS5vx4WgaXiAnXq4KCtr");
+/**
+ * Referrers
+ */ const GLAM_REFERRER = new web3_js.PublicKey("GLAMrG37ZqioqvzBNQGCfCUueDz3tsr7MwMFyRk9PS89");
 
 const GlamIntegrations = GlamProtocolIdlJson?.types?.find((t)=>t.name === "Integration")?.type?.variants?.map((v)=>v.name) ?? [];
-const GlamPermissions = GlamProtocolIdlJson?.types?.find((t)=>t.name === "Permission")?.type?.variants?.map((v)=>v.name) ?? [];
+const GlamPermissions = GlamProtocolIdlJson?.types?.find((t)=>t.name === "Permission")?.type?.variants?.map((v)=>v.name).filter((v)=>!v.startsWith("__")) ?? [];
 const GLAM_PROGRAM_ID_DEFAULT = new web3_js.PublicKey(GlamProtocolIdlJson.address);
 class StateIdlModel {
     constructor(data){
@@ -13660,6 +13664,12 @@ class DriftClient {
             sdk.getUserStatsAccountPublicKey(DRIFT_PROGRAM_ID, vault)
         ];
     }
+    getGlamReferrer() {
+        return [
+            sdk.getUserAccountPublicKeySync(DRIFT_PROGRAM_ID, GLAM_REFERRER, 0),
+            sdk.getUserStatsAccountPublicKey(DRIFT_PROGRAM_ID, GLAM_REFERRER)
+        ];
+    }
     async fetchMarketConfigs() {
         const response = await fetch("https://api.glam.systems/v0/drift/market_configs/");
         if (!response.ok) {
@@ -13753,15 +13763,18 @@ class DriftClient {
         const name = `GLAM *.+ ${subAccountId}`.split("").map((char)=>char.charCodeAt(0)).concat(Array(24).fill(0));
         const [user, userStats] = this.getUser(glamState, subAccountId);
         const state = await sdk.getDriftStateAccountPublicKey(DRIFT_PROGRAM_ID);
+        const remainingAccounts = this.getGlamReferrer().map((p)=>({
+                pubkey: p,
+                isWritable: true,
+                isSigner: false
+            }));
         return await this.base.program.methods.driftInitializeUser(subAccountId, name).accounts({
             glamState,
             user,
             userStats,
             state,
             glamSigner
-        })// We should only try to add referrer if it is the first user (subAccountId == 0)
-        // .remainingAccounts([]) TODO: set glam referral account
-        .instruction();
+        }).remainingAccounts(remainingAccounts).instruction();
     }
     async initializeTx(glamState, subAccountId = 0, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.getSigner();
@@ -13911,7 +13924,11 @@ class DriftClient {
     }
     async placeOrderTx(glamState, orderParams, subAccountId = 0, marketConfigs, txOptions = {}) {
         const { marketIndex, marketType } = orderParams;
-        const remainingAccounts = await this.composeRemainingAccounts(glamState, subAccountId, marketConfigs, marketType, marketIndex);
+        const remainingAccounts = (await this.composeRemainingAccounts(glamState, subAccountId, marketConfigs, marketType, marketIndex)).concat(this.getGlamReferrer().map((p)=>({
+                pubkey: p,
+                isWritable: true,
+                isSigner: false
+            })));
         const glamSigner = txOptions.signer || this.base.getSigner();
         const [user] = this.getUser(glamState, subAccountId);
         const state = await sdk.getDriftStateAccountPublicKey(DRIFT_PROGRAM_ID);
@@ -15674,7 +15691,7 @@ const DEFAULT_OBLIGATION_ARGS = {
     id: 0
 };
 const SCOPE_PRICES = new web3_js.PublicKey("3NJYftD5sjVfxSnUdZ1wVML8f3aC6mp1CXCL6L7TnU8C");
-function refreshObligation(accounts, programId) {
+function refreshObligation(accounts, programId = KAMINO_LENDING_PROGRAM) {
     const keys = [
         {
             pubkey: accounts.lendingMarket,
@@ -15712,7 +15729,7 @@ function refreshObligation(accounts, programId) {
     });
     return ix;
 }
-function refreshReserve(accounts, programId) {
+function refreshReserve(accounts, programId = KAMINO_LENDING_PROGRAM) {
     const keys = [
         {
             pubkey: accounts.reserve,
@@ -15763,7 +15780,7 @@ function refreshReserve(accounts, programId) {
     });
     return ix;
 }
-function refreshObligationFarmsForReserve(args, accounts, programId) {
+function refreshObligationFarmsForReserve(args, accounts, programId = KAMINO_LENDING_PROGRAM) {
     const keys = [
         {
             pubkey: accounts.crank,
@@ -15854,7 +15871,7 @@ class KaminoLendingClient {
    * @param txOptions
    * @returns
    */ async initUserMetadata(statePda, referrer, txOptions = {}) {
-        const tx = await this.initUserMetadataTx(new web3_js.PublicKey(statePda), referrer ? new web3_js.PublicKey(referrer) : web3_js.PublicKey.default, txOptions);
+        const tx = await this.initUserMetadataTx(new web3_js.PublicKey(statePda), referrer ? new web3_js.PublicKey(referrer) : null, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
     /**
@@ -15940,18 +15957,17 @@ class KaminoLendingClient {
         ], KAMINO_FARM_PROGRAM);
         return obligationFarm;
     }
-    async initUserMetadataTx(glamState, referrer, txOptions) {
+    async initUserMetadataTx(glamState, referrer, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.getSigner();
         const vault = this.base.getVaultPda(glamState);
         const userMetadata = this.getUserMetadataPda(vault);
         const lookupTable = new web3_js.PublicKey(0); // FIXME: create lookup table
-        const referrerUserMetadata = referrer.equals(web3_js.PublicKey.default) ? KAMINO_LENDING_PROGRAM : referrer;
         // @ts-ignore
         const tx = await this.base.program.methods.kaminoLendingInitUserMetadata(lookupTable).accounts({
             glamState,
             glamSigner,
             userMetadata,
-            referrerUserMetadata
+            referrerUserMetadata: referrer
         }).transaction();
         const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return vTx;
@@ -15964,7 +15980,7 @@ class KaminoLendingClient {
                 switchboardPriceOracle: KAMINO_LENDING_PROGRAM,
                 switchboardTwapOracle: KAMINO_LENDING_PROGRAM,
                 scopePrices: SCOPE_PRICES
-            }, KAMINO_LENDING_PROGRAM));
+            }));
     }
     refreshObligationFarmsForReserveIxs(obligation, lendingMarket, parsedReserves) {
         return parsedReserves.map((parsedReserve)=>{
@@ -15989,18 +16005,21 @@ class KaminoLendingClient {
                     farmsProgram: KAMINO_FARM_PROGRAM,
                     rent: web3_js.SYSVAR_RENT_PUBKEY,
                     systemProgram: web3_js.SystemProgram.programId
-                }, KAMINO_LENDING_PROGRAM);
+                });
             });
         }).flat();
     }
-    /**
-   * Returns an array of instructions for refreshing an existing obligation and reserves it depends on.
-   */ async getRefreshIxs(obligation, lendingMarket) {
-        // If obligation has deposits or borrows, we need the following refresh ixs:
-        // - refreshReserve x N_reserves
-        // - refreshObligation
-        // - refreshObligationFarmsForReserve x M_farms
-        const { deposits, borrows } = await this.fetchAndParseObligation(obligation);
+    // If obligation has deposits or borrows, we need the following refresh ixs:
+    // - refreshReserve x N_reserves
+    // - refreshObligation
+    // - refreshObligationFarmsForReserve x M_farms
+    //
+    // For pricing purpose, we don't need to refresh farm states
+    async getRefreshIxs(obligation, refreshFarms = true) {
+        const { lendingMarket, deposits, borrows } = await this.fetchAndParseObligation(obligation);
+        if (!lendingMarket) {
+            throw new Error("Lending market not found");
+        }
         const reserves = deposits.concat(borrows).map((d)=>d.reserve);
         const parsedReserves = await this.fetchAndParseReserves(reserves);
         return [
@@ -16009,8 +16028,8 @@ class KaminoLendingClient {
                 lendingMarket,
                 obligation,
                 reserves
-            }, KAMINO_LENDING_PROGRAM),
-            ...this.refreshObligationFarmsForReserveIxs(obligation, lendingMarket, parsedReserves)
+            }),
+            ...refreshFarms ? this.refreshObligationFarmsForReserveIxs(obligation, lendingMarket, parsedReserves) : []
         ];
     }
     getMarketAuthority(market) {
@@ -16061,11 +16080,14 @@ class KaminoLendingClient {
         const obligationAccount = await this.base.provider.connection.getAccountInfo(obligation);
         if (!obligationAccount) {
             return {
+                address: obligation,
+                lendingMarket: null,
                 deposits: [],
                 borrows: []
             };
         }
         const data = obligationAccount.data;
+        const lendingMarket = new web3_js.PublicKey(data.subarray(32, 64));
         // read deposits
         let depositsOffset = 96;
         let depositSize = 136;
@@ -16075,8 +16097,9 @@ class KaminoLendingClient {
             length: numDeposits
         }, (_, i)=>{
             const depositData = depositsData.subarray(i * depositSize, (i + 1) * depositSize);
+            const reserve = new web3_js.PublicKey(depositData.subarray(0, 32));
             return {
-                reserve: new web3_js.PublicKey(depositData.subarray(0, 32))
+                reserve
             };
         }).filter((d)=>!d.reserve.equals(web3_js.PublicKey.default));
         // read borrows
@@ -16088,24 +16111,33 @@ class KaminoLendingClient {
             length: numBorrows
         }, (_, i)=>{
             const borrowData = borrowsData.subarray(i * borrowSize, (i + 1) * borrowSize);
+            const reserve = new web3_js.PublicKey(borrowData.subarray(0, 32));
             return {
-                reserve: new web3_js.PublicKey(borrowData.subarray(0, 32))
+                reserve
             };
         }).filter((d)=>!d.reserve.equals(web3_js.PublicKey.default));
         const parsedObligation = {
+            address: obligation,
+            lendingMarket,
             deposits,
             borrows
         };
         this.obligations.set(obligation, parsedObligation);
         return parsedObligation;
     }
-    /**
-   * We only need pubkeys that don't change over time. No need to fetch them every time.
-   *
-   * @param market
-   * @param asset
-   * @returns
-   */ async fetchAndParseReserves(reserves) {
+    _parseReserveAccount(data) {
+        const market = new web3_js.PublicKey(data.subarray(32, 64));
+        const farmCollateral = new web3_js.PublicKey(data.subarray(64, 96));
+        const farmDebt = new web3_js.PublicKey(data.subarray(96, 128));
+        const liquidityMint = new web3_js.PublicKey(data.subarray(128, 160));
+        return {
+            farmCollateral: farmCollateral.equals(web3_js.PublicKey.default) ? null : farmCollateral,
+            farmDebt: farmDebt.equals(web3_js.PublicKey.default) ? null : farmDebt,
+            liquidityMint,
+            ...this.reservePdas(market, liquidityMint)
+        };
+    }
+    async fetchAndParseReserves(reserves) {
         if (this.pubkeyArraysEqual(reserves, Array.from(this.reserves.keys()))) {
             return Array.from(this.reserves.values());
         }
@@ -16114,20 +16146,12 @@ class KaminoLendingClient {
             throw new Error("Not all reserves can be found");
         }
         return reserveAccounts.filter((a)=>!!a).map((account, i)=>{
-            const data = account.data;
-            const market = new web3_js.PublicKey(data.subarray(32, 64));
-            const farmCollateral = new web3_js.PublicKey(data.subarray(64, 96));
-            const farmDebt = new web3_js.PublicKey(data.subarray(96, 128));
-            const liquidityMint = new web3_js.PublicKey(data.subarray(128, 160));
-            const parsed = {
+            const parsedReserve = {
                 address: reserves[i],
-                farmCollateral: farmCollateral.equals(web3_js.PublicKey.default) ? null : farmCollateral,
-                farmDebt: farmDebt.equals(web3_js.PublicKey.default) ? null : farmDebt,
-                liquidityMint,
-                ...this.reservePdas(market, liquidityMint)
+                ...this._parseReserveAccount(account.data)
             };
-            this.reserves.set(reserves[i], parsed);
-            return parsed;
+            this.reserves.set(reserves[i], parsedReserve);
+            return parsedReserve;
         });
     }
     async findAndParseReserve(market, asset) {
@@ -16154,18 +16178,12 @@ class KaminoLendingClient {
             throw new Error("Reserve not found");
         }
         const account = accounts[0];
-        const data = account.account.data;
-        const farmCollateral = new web3_js.PublicKey(data.subarray(64, 96));
-        const farmDebt = new web3_js.PublicKey(data.subarray(96, 128));
-        const parsed = {
+        const parsedReserve = {
             address: account.pubkey,
-            farmCollateral: farmCollateral.equals(web3_js.PublicKey.default) ? null : farmCollateral,
-            farmDebt: farmDebt.equals(web3_js.PublicKey.default) ? null : farmDebt,
-            liquidityMint: asset,
-            ...this.reservePdas(market, asset)
+            ...this._parseReserveAccount(account.account.data)
         };
-        this.reserves.set(account.pubkey, parsed);
-        return parsed;
+        this.reserves.set(account.pubkey, parsedReserve);
+        return parsedReserve;
     }
     async depositTx(glamState, market, asset, amount, txOptions) {
         const glamSigner = txOptions.signer || this.base.getSigner();
@@ -16223,7 +16241,7 @@ class KaminoLendingClient {
             lendingMarket: market,
             obligation,
             reserves: reservesInUse
-        }, KAMINO_LENDING_PROGRAM));
+        }));
         if (depositReserve.farmCollateral) {
             const ixs = this.refreshObligationFarmsForReserveIxs(obligation, market, [
                 depositReserve
@@ -16319,7 +16337,7 @@ class KaminoLendingClient {
             lendingMarket: market,
             obligation,
             reserves: reservesInUse
-        }, KAMINO_LENDING_PROGRAM));
+        }));
         if (withdrawReserve.farmCollateral) {
             const ixs = this.refreshObligationFarmsForReserveIxs(obligation, market, [
                 withdrawReserve
@@ -16409,7 +16427,7 @@ class KaminoLendingClient {
             lendingMarket: market,
             obligation,
             reserves: reservesInUse
-        }, KAMINO_LENDING_PROGRAM));
+        }));
         // Don't need to refresh debt farm for borrow
         /*
     if (borrowReserve.farmDebt) {
@@ -16497,7 +16515,7 @@ class KaminoLendingClient {
             lendingMarket: market,
             obligation,
             reserves: reservesInUse
-        }, KAMINO_LENDING_PROGRAM));
+        }));
         const repayIx = await this.base.program.methods.kaminoLendingRepayObligationLiquidityV2(amount).accounts({
             glamState,
             glamSigner,
@@ -16541,6 +16559,135 @@ class KaminoLendingClient {
         };
     }
 }
+class KaminoFarmClient {
+    async findAndParseFarmStates(owner) {
+        const accounts = await this.base.provider.connection.getProgramAccounts(KAMINO_FARM_PROGRAM, {
+            filters: [
+                {
+                    dataSize: 920
+                },
+                {
+                    memcmp: {
+                        offset: 48,
+                        bytes: owner.toBase58()
+                    }
+                }
+            ]
+        });
+        return accounts.map((account)=>{
+            const data = account.account.data;
+            const farmState = new web3_js.PublicKey(data.subarray(16, 48));
+            return {
+                userFarmState: account.pubkey,
+                farmState
+            };
+        });
+    }
+    async parseFarm(data) {
+        const globalConfig = new web3_js.PublicKey(data.subarray(40, 72));
+        const rewardsOffset = 192;
+        const numRewards = 10;
+        const rewardSize = 704;
+        const rewardsData = data.subarray(rewardsOffset, rewardsOffset + numRewards * rewardSize);
+        const rewards = Array.from({
+            length: numRewards
+        }, (_, i)=>{
+            const rewardData = rewardsData.subarray(i * rewardSize, (i + 1) * rewardSize);
+            const mint = new web3_js.PublicKey(rewardData.subarray(0, 32));
+            const tokenProgram = new web3_js.PublicKey(rewardData.subarray(40, 72));
+            const rewardsVault = new web3_js.PublicKey(rewardData.subarray(120, 152));
+            const minClaimDurationSeconds = new anchor.BN(rewardData.subarray(480, 488), "le");
+            return {
+                index: i,
+                mint,
+                minClaimDurationSeconds,
+                tokenProgram,
+                rewardsVault
+            };
+        }).filter((r)=>{
+            if (r.mint.equals(web3_js.PublicKey.default)) {
+                return false;
+            }
+            // Filter out rewards with minClaimDurationSeconds > 1 year, they are considered disabled
+            if (r.minClaimDurationSeconds.div(new anchor.BN(365 * 24 * 60 * 60)).gt(new anchor.BN(1))) {
+                return false;
+            }
+            return true;
+        });
+        return {
+            globalConfig,
+            rewards
+        };
+    }
+    async fetchAndParseFarms(farms) {
+        const farmAccounts = await this.base.provider.connection.getMultipleAccountsInfo(farms);
+        const map = new Map();
+        for(let i = 0; i < farmAccounts.length; i++){
+            const account = farmAccounts[i];
+            if (!account) {
+                continue;
+            }
+            const data = account.data;
+            const parsedFarm = await this.parseFarm(data);
+            map.set(farms[i].toBase58(), parsedFarm);
+        }
+        return map;
+    }
+    async harvest(statePda, txOptions = {}) {
+        const tx = await this.harvestTx(new web3_js.PublicKey(statePda), txOptions);
+        return await this.base.sendAndConfirm(tx);
+    }
+    async harvestTx(glamState, txOptions = {}) {
+        const glamSigner = txOptions.signer || this.base.getSigner();
+        const vault = this.base.getVaultPda(glamState);
+        const farmStates = await this.findAndParseFarmStates(vault);
+        const parsedFarms = await this.fetchAndParseFarms(farmStates.map((f)=>f.farmState));
+        const tx = new web3_js.Transaction();
+        for (const { userFarmState, farmState } of farmStates){
+            const { globalConfig, rewards } = parsedFarms.get(farmState.toBase58());
+            for (const { index, mint, tokenProgram, rewardsVault } of rewards){
+                console.log("Reward token:", mint.toBase58());
+                const vaultAta = this.base.getVaultAta(glamState, mint, tokenProgram);
+                const createAtaIx = splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, vaultAta, vault, mint, tokenProgram);
+                const harvestIx = await this.base.program.methods.kaminoFarmHarvestReward(new anchor.BN(index)).accounts({
+                    glamState,
+                    glamSigner,
+                    userState: userFarmState,
+                    farmState,
+                    globalConfig,
+                    rewardMint: mint,
+                    userRewardAta: vaultAta,
+                    rewardsVault,
+                    rewardsTreasuryVault: this.rewardsTreasuryVault(globalConfig, mint),
+                    farmVaultsAuthority: this.farmVaultsAuthority(farmState),
+                    scopePrices: null,
+                    tokenProgram
+                }).instruction();
+                tx.add(createAtaIx, harvestIx);
+            }
+        }
+        const lookupTables = txOptions.lookupTables || await this.base.getAdressLookupTableAccounts([
+            LOOKUP_TABLE
+        ]);
+        const vTx = await this.base.intoVersionedTransaction(tx, {
+            ...txOptions,
+            lookupTables
+        });
+        return vTx;
+    }
+    constructor(base){
+        this.base = base;
+        this.farmVaultsAuthority = (farm)=>web3_js.PublicKey.findProgramAddressSync([
+                Buffer.from("authority"),
+                farm.toBuffer()
+            ], KAMINO_FARM_PROGRAM)[0];
+        this.rewardsTreasuryVault = (globalConfig, mint)=>web3_js.PublicKey.findProgramAddressSync([
+                Buffer.from("tvault"),
+                globalConfig.toBuffer(),
+                mint.toBuffer()
+            ], KAMINO_FARM_PROGRAM)[0];
+    }
+}
 
 // Pubkey::find_program_address(&[b"__event_authority"], &dlmm_interface::ID)
 const EVENT_AUTHORITY = new web3_js.PublicKey("D1ZN9Wj1fRSUQfCjhvnu1hqDMT7hzjzBBpi12nVniYD6");
@@ -17017,6 +17164,28 @@ class PriceClient {
         });
         return pricedAssets.reduce((sum, p)=>new anchor.BN(p.amount).add(sum), new anchor.BN(0));
     }
+    async priceKaminoIxs(glamState, priceDenom) {
+        const glamVault = this.base.getVaultPda(glamState);
+        const obligations = await fetchKaminoObligations(this.base.provider.connection, glamVault);
+        const refreshIxs = [];
+        for (const obligation of obligations){
+            const ixs = await this.klend.getRefreshIxs(obligation, false); // skip farms
+            refreshIxs.push(...ixs);
+        }
+        // @ts-ignore
+        const priceIx = await this.base.program.methods.priceKaminoObligations(priceDenom).accounts({
+            glamState,
+            solOracle: SOL_ORACLE
+        }).remainingAccounts(obligations.map((o)=>({
+                pubkey: o,
+                isSigner: false,
+                isWritable: false
+            }))).instruction();
+        return [
+            ...refreshIxs,
+            priceIx
+        ];
+    }
     async priceVaultIxs(glamState, priceDenom) {
         const vault = this.base.getVaultPda(glamState);
         const tickets = await fetchMarinadeTicketAccounts(this.base.provider.connection, vault);
@@ -17046,29 +17215,18 @@ class PriceClient {
             glamState,
             solOracle: SOL_ORACLE
         }).remainingAccounts(await this.remainingAccountsForPricingMeteora(glamState)).instruction();
-        const priceKaminoIx = await this.base.program.methods.priceKaminoObligations(priceDenom).accounts({
-            glamState,
-            solOracle: SOL_ORACLE
-        }).remainingAccounts(await this.remainingAccountsForPricingKamino(glamState)).instruction();
+        const priceKaminoIxs = await this.priceKaminoIxs(glamState, priceDenom);
         return [
             priceTicketsIx,
             priceStakesIx,
             priceVaultIx,
             priceMeteoraIx,
-            priceKaminoIx
+            ...priceKaminoIxs
         ];
     }
-    constructor(base){
+    constructor(base, klend){
         this.base = base;
-        this.remainingAccountsForPricingKamino = async (glamState)=>{
-            const glamVault = this.base.getVaultPda(glamState);
-            const obligationAccounts = await fetchKaminoObligations(this.base.provider.connection, glamVault);
-            return obligationAccounts.map((a)=>({
-                    pubkey: a,
-                    isSigner: false,
-                    isWritable: false
-                }));
-        };
+        this.klend = klend;
         this.remainingAccountsForPricingMeteora = async (glamState)=>{
             const glamVault = this.base.getVaultPda(glamState);
             const positions = await fetchMeteoraPositions(this.base.provider.connection, glamVault);
@@ -17154,7 +17312,7 @@ class PriceClient {
     }
     get price() {
         if (!this._price) {
-            this._price = new PriceClient(this);
+            this._price = new PriceClient(this, this.kaminoLending);
         }
         return this._price;
     }
@@ -17176,6 +17334,12 @@ class PriceClient {
         }
         return this._kaminoLending;
     }
+    get kaminoFarm() {
+        if (!this._kaminoFarm) {
+            this._kaminoFarm = new KaminoFarmClient(this);
+        }
+        return this._kaminoFarm;
+    }
     get meteoraDlmm() {
         if (!this._meteoraDlmm) {
             this._meteoraDlmm = new MeteoraDlmmClient(this);
@@ -17191,7 +17355,7 @@ const getPriorityFeeEstimate = async (heliusApiKey, tx, accountKeys, priorityLev
     if (!tx && !accountKeys) {
         throw new Error("Either tx or accountKeys must be provided");
     }
-    const options = priorityLevel ? {
+    const options = priorityLevel && priorityLevel !== "Recommended" ? {
         priorityLevel
     } : {
         recommended: true
@@ -17233,6 +17397,7 @@ exports.DRIFT_PROGRAM_ID = DRIFT_PROGRAM_ID;
 exports.DelegateAcl = DelegateAcl;
 exports.DriftClient = DriftClient;
 exports.FundOpenfundsModel = FundOpenfundsModel;
+exports.GLAM_REFERRER = GLAM_REFERRER;
 exports.GOVERNANCE_PROGRAM_ID = GOVERNANCE_PROGRAM_ID;
 exports.GlamClient = GlamClient;
 exports.GlamError = GlamError;