@glamsystems/glam-sdk 0.1.28 → 0.1.29

package/index.cjs.js

@@ -34,7 +34,7 @@ var borsh__namespace = /*#__PURE__*/_interopNamespaceDefault(borsh);
 var address = "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc";
 var metadata = {
     name: "glam_protocol",
-    version: "0.4.32",
+    version: "0.4.33",
     spec: "0.1.0",
     description: "Glam Protocol"
 };
@@ -7166,6 +7166,11 @@ var instructions = [
     },
     {
         name: "price_kamino_vault_shares",
+        docs: [
+            "Extra accounts for pricing N kamino vault shares:",
+            "- (kvault_share_ata, kvault_share_mint, kvault_state, kvault_deposit_token_oracle) x N",
+            "- (lending_market, reserve) x M, M = number of unique markets used by all kvaults involved"
+        ],
         discriminator: [
             112,
             92,
@@ -7301,6 +7306,10 @@ var instructions = [
                         name: "PriceDenom"
                     }
                 }
+            },
+            {
+                name: "num_vaults",
+                type: "u8"
             }
         ]
     },
@@ -7545,16 +7554,22 @@ var instructions = [
         ]
     },
     {
-        name: "price_vault",
+        name: "price_vault_tokens",
+        docs: [
+            "Price vault SOL balance and tokens it holds.",
+            "",
+            "Extra accounts for pricing N tokens:",
+            "- (ata, mint, oracle) x N"
+        ],
         discriminator: [
-            47,
-            213,
-            36,
-            17,
+            54,
+            42,
+            16,
+            199,
+            20,
             183,
-            5,
-            141,
-            45
+            50,
+            137
         ],
         accounts: [
             {
@@ -14561,6 +14576,7 @@ const KAMINO_LENDING_PROGRAM = new web3_js.PublicKey("KLend2g3cP87fffoy8q1mQqGKj
 const KAMINO_VAULTS_PROGRAM = new web3_js.PublicKey("KvauGMspG5k6rtzrqqn7WNn3oZdyKqLKwK2XWQ8FLjd");
 const KAMINO_FARM_PROGRAM = new web3_js.PublicKey("FarmsPZpWu9i7Kky8tPN37rs2TpmMrAZrC7S7vJa91Hr");
 const MEMO_PROGRAM = new web3_js.PublicKey("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr");
+const ALT_PROGRAM_ID = new web3_js.PublicKey("AddressLookupTab1e1111111111111111111111111");
 /**
  * Stake pools
  */ const JITO_STAKE_POOL = new web3_js.PublicKey("Jito4APyf642JPZPx3hGc6WWJ8zPKtRbRs4P815Awbb");
@@ -14969,12 +14985,6 @@ var ClusterNetwork = /*#__PURE__*/ function(ClusterNetwork) {
     return ClusterNetwork;
 }({});
 
-const LOOKUP_TABLES_MAP = new Map([
-    [
-        "3tfbxaHBDjczQo3eyNJGGG64ChZ9nG4V3Gywa4k59d5a",
-        new web3_js.PublicKey("8HUXT9abWS2z3z92QyDzg51nMcc18LyWFvaEQZJMPixu")
-    ]
-]);
 const findStakeAccounts = async (connection, withdrawAuthority)=>{
     // stake authority offset: 12
     // withdraw authority offset: 44
@@ -15079,45 +15089,6 @@ const parseMeteoraPosition = async (connection, position)=>{
         binArrayUpper
     };
 };
-async function fetchLookupTables(connection, authority, firstEntry) {
-    const ALT_PROGRAM_ID = new web3_js.PublicKey("AddressLookupTab1e1111111111111111111111111");
-    const tablePubkey = LOOKUP_TABLES_MAP.get(firstEntry.toBase58());
-    if (tablePubkey) {
-        const accountInfo = await connection.getAccountInfo(tablePubkey);
-        if (accountInfo) {
-            return [
-                new web3_js.AddressLookupTableAccount({
-                    key: tablePubkey,
-                    state: web3_js.AddressLookupTableAccount.deserialize(accountInfo.data)
-                })
-            ];
-        }
-    } else {
-        // Fetch all accounts owned by the ALT program
-        // This is currently disabled due to RPC error "Request deprioritized due to number of accounts requested. Slow down requests or add filters to narrow down results"
-        const accounts = await connection.getProgramAccounts(ALT_PROGRAM_ID, {
-            filters: [
-                {
-                    memcmp: {
-                        offset: 22,
-                        bytes: authority.toBase58()
-                    }
-                },
-                {
-                    memcmp: {
-                        offset: 56,
-                        bytes: firstEntry.toBase58()
-                    }
-                }
-            ]
-        });
-        return accounts.map(({ pubkey, account })=>new web3_js.AddressLookupTableAccount({
-                key: pubkey,
-                state: web3_js.AddressLookupTableAccount.deserialize(account.data)
-            }));
-    }
-    return [];
-}
 /**
  * Parses program logs to extract error message
  */ function parseProgramLogs(logs) {
@@ -15227,6 +15198,15 @@ const STAKE_POOLS = sanctumLstList.LstList.filter((lst)=>!lst.name.includes("San
         poolState: new web3_js.PublicKey(poolState)
     };
 });
+STAKE_POOLS.push({
+    name: "Phantom Staked SOL",
+    symbol: "PSOL",
+    mint: "pSo1f9nQXWgXibFtKf7NWYxb5enAM4qfP6UJSiXRQfL",
+    decimals: 9,
+    logoURI: "https://assets.phantom.app/assets/metadata/PSOL-512.png",
+    tokenProgram: splToken.TOKEN_PROGRAM_ID,
+    poolState: new web3_js.PublicKey("pSPcvR8GmG9aKDUbn9nbKYjkxt9hxMS7kF1qqKJaPqJ")
+});
 const STAKE_POOLS_MAP = new Map(STAKE_POOLS.map((p)=>[
         p.mint,
         p
@@ -15527,6 +15507,12 @@ const LOOKUP_TABLES = [
     new web3_js.PublicKey("D9cnvzswDikQDf53k4HpQ3KJ9y1Fv3HGGDFYMXnK5T6c"),
     new web3_js.PublicKey("EiWSskK5HXnBTptiS5DH6gpAJRVNQ3cAhTKBGaiaysAb")
 ];
+const STATES_LOOKUP_TABLES_MAP = new Map([
+    [
+        "3tfbxaHBDjczQo3eyNJGGG64ChZ9nG4V3Gywa4k59d5a",
+        new web3_js.PublicKey("8HUXT9abWS2z3z92QyDzg51nMcc18LyWFvaEQZJMPixu")
+    ]
+]);
 const isBrowser = process.env.ANCHOR_BROWSER || typeof window !== "undefined" && !window.process?.hasOwnProperty("type");
 class BaseClient {
     get detectedCluster() {
@@ -15608,6 +15594,59 @@ class BaseClient {
             })
         ];
     }
+    /**
+   * Fetches lookup tables for the current GLAM instance
+   */ async findLookupTables() {
+        const glamApi = process.env.NEXT_PUBLIC_GLAM_API || process.env.GLAM_API;
+        if (glamApi) {
+            const response = await fetch(`${glamApi}/v0/lut/glam/?state=${this.statePda}`);
+            const data = await response.json();
+            const { t: lookupTables } = data;
+            const pubkeys = Object.keys(lookupTables);
+            if (pubkeys.length > 0) {
+                return await this.fetchAdressLookupTableAccounts(pubkeys);
+            }
+        }
+        const tablePubkey = STATES_LOOKUP_TABLES_MAP.get(this.statePda.toBase58());
+        if (tablePubkey) {
+            return await this.fetchAdressLookupTableAccounts([
+                tablePubkey
+            ]);
+        }
+        // Fetch all accounts owned by the ALT program
+        // This is very likely to hit the RPC error "Request deprioritized due to number of accounts requested. Slow down requests or add filters to narrow down results"
+        const accounts = await this.provider.connection.getProgramAccounts(ALT_PROGRAM_ID, {
+            filters: [
+                {
+                    memcmp: {
+                        offset: 0,
+                        bytes: bytes.bs58.encode([
+                            1,
+                            0,
+                            0,
+                            0
+                        ])
+                    }
+                },
+                {
+                    memcmp: {
+                        offset: 56,
+                        bytes: this.statePda.toBase58()
+                    }
+                },
+                {
+                    memcmp: {
+                        offset: 88,
+                        bytes: this.vaultPda.toBase58()
+                    }
+                }
+            ]
+        });
+        return accounts.map(({ pubkey, account })=>new web3_js.AddressLookupTableAccount({
+                key: pubkey,
+                state: web3_js.AddressLookupTableAccount.deserialize(account.data)
+            }));
+    }
     async intoVersionedTransaction(tx, { lookupTables = [], signer, computeUnitLimit, getPriorityFeeMicroLamports, maxFeeLamports, useMaxFee = false, jitoTipLamports, simulate = false }) {
         signer = signer || this.getSigner();
         const instructions = tx.instructions;
@@ -15619,15 +15658,26 @@ class BaseClient {
                 lamports: jitoTipLamports
             }));
         }
-        lookupTables.push(...await this.getAdressLookupTableAccounts(LOOKUP_TABLES));
+        const lookupTableAccounts = [];
+        if (lookupTables.every((t)=>t instanceof web3_js.AddressLookupTableAccount)) {
+            const accounts = await this.fetchAdressLookupTableAccounts([
+                ...LOOKUP_TABLES
+            ]);
+            lookupTableAccounts.push(...lookupTables, ...accounts);
+        } else {
+            const accounts = await this.fetchAdressLookupTableAccounts([
+                ...lookupTables,
+                ...LOOKUP_TABLES
+            ]);
+            lookupTableAccounts.push(...accounts);
+        }
         const recentBlockhash = (await this.blockhashWithCache.get()).blockhash;
-        const { unitsConsumed, error, serializedTx } = await getSimulationResult(this.provider.connection, instructions, signer, lookupTables);
+        const { unitsConsumed, error, serializedTx } = await getSimulationResult(this.provider.connection, instructions, signer, lookupTableAccounts);
         computeUnitLimit = unitsConsumed;
         // by default, a simulation error doesn't prevent the tx from being sent
         // - gui: wallet apps usually do the simulation themselves, we should ignore the simulation error here by default
         // - cli: we should set simulate=true
         if (error && simulate) {
-            console.log("Lookup tables:", lookupTables.map((lt)=>lt.key.toString()));
             console.log("Tx (base64):", serializedTx);
             console.error("Simulation failed:", error.message);
             console.error("If error message is too obscure, inspect and simulate the tx in explorer: https://explorer.solana.com/tx/inspector");
@@ -15638,7 +15688,7 @@ class BaseClient {
                 payerKey: signer,
                 recentBlockhash,
                 instructions
-            }).compileToV0Message(lookupTables));
+            }).compileToV0Message(lookupTableAccounts));
             const cuIxs = await this.getComputeBudgetIxs(vTx, computeUnitLimit, getPriorityFeeMicroLamports, maxFeeLamports, useMaxFee);
             instructions.unshift(...cuIxs);
         }
@@ -15646,7 +15696,7 @@ class BaseClient {
             payerKey: signer,
             recentBlockhash,
             instructions
-        }).compileToV0Message(lookupTables));
+        }).compileToV0Message(lookupTableAccounts));
     }
     async sendAndConfirm(tx, additionalSigners = []) {
         const connection = this.provider.connection;
@@ -15694,13 +15744,21 @@ class BaseClient {
         }
         return txSig;
     }
-    async getAdressLookupTableAccounts(keys) {
-        if (!keys) {
+    /**
+   * Fetches multiple address lookup table accounts.
+   *
+   * @param pubkeys Array of lookup table public keys.
+   * @returns
+   */ async fetchAdressLookupTableAccounts(pubkeys) {
+        if (!pubkeys) {
             throw new Error("addressLookupTableAddresses is undefined");
         }
-        const addressLookupTableAccountInfos = await this.provider.connection.getMultipleAccountsInfo(keys.map((key)=>new web3_js.PublicKey(key)));
+        if (pubkeys.length === 0) {
+            return [];
+        }
+        const addressLookupTableAccountInfos = await this.provider.connection.getMultipleAccountsInfo(pubkeys.map((key)=>new web3_js.PublicKey(key)));
         return addressLookupTableAccountInfos.reduce((acc, accountInfo, index)=>{
-            const tableAddress = keys[index];
+            const tableAddress = pubkeys[index];
             if (accountInfo) {
                 const tableAccount = new web3_js.AddressLookupTableAccount({
                     key: new web3_js.PublicKey(tableAddress),
@@ -17997,7 +18055,7 @@ class JupiterSwapClient {
             swapInstruction = swapInstructions.swapInstruction;
             addressLookupTableAddresses = swapInstructions.addressLookupTableAddresses;
         }
-        const lookupTables = await this.base.getAdressLookupTableAccounts(addressLookupTableAddresses);
+        const lookupTables = addressLookupTableAddresses.map((pubkey)=>new web3_js.PublicKey(pubkey));
         const swapIx = this.toTransactionInstruction(swapInstruction, glamVault.toBase58());
         const [inputTokenProgram, outputTokenProgram] = (await this.base.fetchMintsAndTokenPrograms([
             inputMint,
@@ -19699,7 +19757,6 @@ const KVaultStateLayout = borsh.struct([
     borsh.array(borsh.u128(), 242, "padding3")
 ]);
 
-const LOOKUP_TABLE = new web3_js.PublicKey("284iwGtA9X9aLy3KsyV8uT2pXLARhYbiSi5SiM2g47M2");
 const DEFAULT_OBLIGATION_ARGS = {
     tag: 0,
     id: 0
@@ -20344,13 +20401,7 @@ class KaminoLendingClient {
             reserveFarmState: depositReserve.farmCollateral,
             farmsProgram: KAMINO_FARM_PROGRAM
         }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
-        const lookupTables = txOptions.lookupTables || await this.base.getAdressLookupTableAccounts([
-            LOOKUP_TABLE
-        ]);
-        const vTx = await this.base.intoVersionedTransaction(tx, {
-            ...txOptions,
-            lookupTables
-        });
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return vTx;
     }
     async withdrawTx(market, asset, amount, txOptions) {
@@ -20435,13 +20486,7 @@ class KaminoLendingClient {
         // - refreshObligationFarmsForReserve (if farm exists)
         const tx = new web3_js.Transaction();
         tx.add(...preInstructions, withdrawIx, ...postInstructions);
-        const lookupTables = txOptions.lookupTables || await this.base.getAdressLookupTableAccounts([
-            LOOKUP_TABLE
-        ]);
-        const vTx = await this.base.intoVersionedTransaction(tx, {
-            ...txOptions,
-            lookupTables
-        });
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return vTx;
     }
     async borrowTx(market, asset, amount, txOptions) {
@@ -20523,13 +20568,7 @@ class KaminoLendingClient {
         // - borrowObligationLiquidityV2
         const tx = new web3_js.Transaction();
         tx.add(...preInstructions, borrowIx);
-        const lookupTables = txOptions.lookupTables || await this.base.getAdressLookupTableAccounts([
-            LOOKUP_TABLE
-        ]);
-        const vTx = await this.base.intoVersionedTransaction(tx, {
-            ...txOptions,
-            lookupTables
-        });
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return vTx;
     }
     async repayTx(market, asset, amount, txOptions = {}) {
@@ -20596,13 +20635,7 @@ class KaminoLendingClient {
         // - repayObligationLiquidityV2
         const tx = new web3_js.Transaction();
         tx.add(...preInstructions, repayIx);
-        const lookupTables = txOptions.lookupTables || await this.base.getAdressLookupTableAccounts([
-            LOOKUP_TABLE
-        ]);
-        const vTx = await this.base.intoVersionedTransaction(tx, {
-            ...txOptions,
-            lookupTables
-        });
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return vTx;
     }
     constructor(base){
@@ -20724,13 +20757,7 @@ class KaminoFarmClient {
                 tx.add(createAtaIx, harvestIx);
             }
         }
-        const lookupTables = txOptions.lookupTables || await this.base.getAdressLookupTableAccounts([
-            LOOKUP_TABLE
-        ]);
-        const vTx = await this.base.intoVersionedTransaction(tx, {
-            ...txOptions,
-            lookupTables
-        });
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return vTx;
     }
     constructor(base){
@@ -20796,9 +20823,10 @@ class KaminoVaultsClient {
         this.shareMintToVaultPdaMap.set(vaultState.sharesMint.toBase58(), vault);
         return vaultState;
     }
-    async composeRemainingAccounts(allocationStrategies) {
-        // For each allocation get reserve and market pubkeys
-        const reserves = allocationStrategies.map((strategy)=>strategy.reserve);
+    async composeRemainingAccounts(allocationStrategies, pricingMode = false) {
+        // Iterate over allocation strategies and get reserve pubkeys, using a Set to avoid dupes
+        const reservesSet = new Set(allocationStrategies.map((strategy)=>strategy.reserve.toBase58()));
+        const reserves = Array.from(reservesSet).map((p)=>new web3_js.PublicKey(p));
         const parsedReserves = await this.kaminoLending.fetchAndParseReserves(reserves);
         const reserveMetas = reserves.map((pubkey)=>({
                 pubkey,
@@ -20810,15 +20838,21 @@ class KaminoVaultsClient {
                 isSigner: false,
                 isWritable: false
             }));
+        if (pricingMode) {
+            // (market, reserve) must be paired
+            return marketMetas.reduce((acc, marketMeta, i)=>{
+                acc.push(marketMeta, reserveMetas[i]);
+                return acc;
+            }, []);
+        }
         return [
             ...reserveMetas,
             ...marketMetas
-        ];
+        ]; // Non pricing mode
     }
     async depositTx(vault, amount, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.getSigner();
         const vaultState = await this.fetchAndParseVaultState(vault);
-        const amountBN = amount.mul(new anchor.BN(10).pow(vaultState.tokenMintDecimals));
         const { tokenProgram: sharesTokenProgram } = await this.base.fetchMintAndTokenProgram(vaultState.sharesMint);
         const userTokenAta = this.base.getVaultAta(vaultState.tokenMint, vaultState.tokenProgram);
         const userSharesAta = this.base.getVaultAta(vaultState.sharesMint, sharesTokenProgram);
@@ -20828,7 +20862,7 @@ class KaminoVaultsClient {
         ];
         // Remaining accounts, skip empty allocation strategies
         const remainingAccounts = await this.composeRemainingAccounts(vaultState.vaultAllocationStrategy.filter(({ reserve })=>!reserve.equals(web3_js.PublicKey.default)));
-        const tx = await this.base.program.methods.kaminoVaultsDeposit(amountBN).accounts({
+        const tx = await this.base.program.methods.kaminoVaultsDeposit(amount).accounts({
             glamState: this.base.statePda,
             glamSigner,
             vaultState: vault,
@@ -20853,7 +20887,6 @@ class KaminoVaultsClient {
         const userTokenAta = this.base.getVaultAta(vaultState.tokenMint, vaultState.tokenProgram);
         const { tokenProgram: sharesTokenProgram } = await this.base.fetchMintAndTokenProgram(vaultState.sharesMint);
         const userSharesAta = this.base.getVaultAta(vaultState.sharesMint, sharesTokenProgram);
-        const amountBN = amount.mul(new anchor.BN(10).pow(vaultState.sharesMintDecimals));
         const reserves = vaultState.vaultAllocationStrategy.filter(({ reserve })=>!reserve.equals(web3_js.PublicKey.default));
         // Withdraw from the first reserve when kvault does not have enough liquidity
         const idx = 0;
@@ -20863,7 +20896,7 @@ class KaminoVaultsClient {
         const preInstructions = [
             splToken.createAssociatedTokenAccountIdempotentInstruction(glamSigner, userTokenAta, this.base.vaultPda, vaultState.tokenMint, vaultState.tokenProgram)
         ];
-        const tx = await this.base.program.methods.kaminoVaultsWithdraw(amountBN).accounts({
+        const tx = await this.base.program.methods.kaminoVaultsWithdraw(amount).accounts({
             glamState: this.base.statePda,
             glamSigner,
             withdrawFromAvailableVaultState: vault,
@@ -21384,28 +21417,40 @@ class PriceClient {
         const shareAtas = [];
         const shareMints = [];
         const kvaultStates = [];
+        const oracles = []; // oracle of kvault deposit token
         possibleShareAtaAccountsInfo.forEach((info, i)=>{
             if (info !== null) {
                 shareAtas.push(possibleShareAtas[i]);
                 shareMints.push(allKvaultMints[i]);
                 kvaultStates.push(allKvaultStates[i]);
+                const { tokenMint } = allKvaultStates[i];
+                const assetMeta = ASSETS_MAINNET.get(tokenMint.toBase58());
+                oracles.push(assetMeta?.oracle);
             }
         });
         const kvaultPdas = await this.kvaults.getVaultPdasByShareMints(shareMints);
-        const remainingAccounts = (await Promise.all(kvaultStates.map((kvault)=>{
-            return this.kvaults.composeRemainingAccounts(kvault.vaultAllocationStrategy.filter((alloc)=>!alloc.reserve.equals(web3_js.PublicKey.default)));
-        }))).flat();
-        [
-            ...kvaultPdas,
-            ...shareAtas
-        ].map((pubkey)=>{
-            remainingAccounts.unshift({
-                pubkey: pubkey,
-                isSigner: false,
-                isWritable: false
+        const remainingAccounts = [];
+        // first 3N remaining accounts are N tuples of (kvault_shares_ata, kvault_shares_mint, kvault_state)
+        for(let i = 0; i < shareAtas.length; i++){
+            [
+                shareAtas[i],
+                shareMints[i],
+                kvaultPdas[i],
+                oracles[i]
+            ].map((pubkey)=>{
+                remainingAccounts.push({
+                    pubkey,
+                    isSigner: false,
+                    isWritable: false
+                });
             });
-        });
-        const priceIx = await this.base.program.methods.priceKaminoVaultShares(priceDenom).accounts({
+        }
+        // markets and reserves
+        const marketsAndReserves = (await Promise.all(kvaultStates.map((kvault)=>{
+            return this.kvaults.composeRemainingAccounts(kvault.vaultAllocationStrategy.filter((alloc)=>!alloc.reserve.equals(web3_js.PublicKey.default)), true);
+        }))).flat();
+        remainingAccounts.push(...marketsAndReserves);
+        const priceIx = await this.base.program.methods.priceKaminoVaultShares(priceDenom, shareAtas.length).accounts({
             glamState: this.base.statePda,
             solOracle: SOL_ORACLE,
             pythOracle: null,
@@ -21527,7 +21572,7 @@ class PriceClient {
    * Returns an instruction that prices vault balance and tokens the vault holds
    */ async priceVaultIx(priceDenom) {
         const remainingAccounts = await this.remainingAccountsForPricingVaultAssets(priceDenom == PriceDenom.ASSET);
-        const priceVaultIx = await this.base.program.methods.priceVault(priceDenom).accounts({
+        const priceVaultIx = await this.base.program.methods.priceVaultTokens(priceDenom).accounts({
             glamState: this.base.statePda,
             solOracle: SOL_ORACLE
         }).remainingAccounts(remainingAccounts).instruction();
@@ -21592,7 +21637,9 @@ class PriceClient {
             kaminoVaults: this.priceKaminoVaultSharesIx.bind(this)
         };
         const pricingFns = integrations.map((integration)=>integrationsToPricingFns[integration]).filter(Boolean);
-        const pricingIxs = [];
+        const pricingIxs = [
+            priceVaultIx
+        ];
         for (const fn of pricingFns){
             const ix = await fn(priceDenom);
             pricingIxs.push(ix);
@@ -21957,6 +22004,7 @@ function getMarketOrderParams(params) {
     return Object.assign({}, DefaultOrderParams, optionalOrderParams, overridingParams);
 }
 
+exports.ALT_PROGRAM_ID = ALT_PROGRAM_ID;
 exports.ASSETS_MAINNET = ASSETS_MAINNET;
 exports.ASSETS_TESTS = ASSETS_TESTS;
 exports.AssetTier = AssetTier;
@@ -22064,7 +22112,6 @@ exports.VoteAuthorize = VoteAuthorize;
 exports.WSOL = WSOL;
 exports.ZERO = ZERO;
 exports.decodeUser = decodeUser;
-exports.fetchLookupTables = fetchLookupTables;
 exports.fetchMeteoraPositions = fetchMeteoraPositions;
 exports.fetchProgramLabels = fetchProgramLabels;
 exports.fetchTokenPrices = fetchTokenPrices;

package/index.esm.js

@@ -1,7 +1,7 @@
 import * as anchor from '@coral-xyz/anchor';
 import { Program, BN } from '@coral-xyz/anchor';
-import { PublicKey, StakeProgram, AddressLookupTableAccount, ComputeBudgetProgram, VersionedTransaction, TransactionMessage, SystemProgram, Connection, Transaction, sendAndConfirmTransaction, LAMPORTS_PER_SOL, TransactionInstruction, SYSVAR_CLOCK_PUBKEY, Keypair, STAKE_CONFIG_ID, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_RENT_PUBKEY } from '@solana/web3.js';
-import { getExtensionData, ExtensionType, TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync, getAccount, TokenAccountNotFoundError, unpackMint, createAssociatedTokenAccountIdempotentInstruction, createSyncNativeInstruction, createTransferCheckedInstruction, unpackAccount, createCloseAccountInstruction } from '@solana/spl-token';
+import { PublicKey, StakeProgram, ComputeBudgetProgram, VersionedTransaction, TransactionMessage, AddressLookupTableAccount, SystemProgram, Connection, Transaction, sendAndConfirmTransaction, LAMPORTS_PER_SOL, TransactionInstruction, SYSVAR_CLOCK_PUBKEY, Keypair, STAKE_CONFIG_ID, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_RENT_PUBKEY } from '@solana/web3.js';
+import { getExtensionData, ExtensionType, TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID, getAssociatedTokenAddressSync, getAccount, TokenAccountNotFoundError, unpackMint, createAssociatedTokenAccountIdempotentInstruction, createSyncNativeInstruction, createTransferCheckedInstruction, unpackAccount, createCloseAccountInstruction } from '@solana/spl-token';
 import { unpack } from '@solana/spl-token-metadata';
 import DLMM, { binIdToBinArrayIndex, deriveBinArray, Strategy } from '@meteora-ag/dlmm';
 import { LstList } from 'sanctum-lst-list';
@@ -14,7 +14,7 @@ import { getStakePoolAccount } from '@solana/spl-stake-pool';
 var address = "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc";
 var metadata = {
     name: "glam_protocol",
-    version: "0.4.32",
+    version: "0.4.33",
     spec: "0.1.0",
     description: "Glam Protocol"
 };
@@ -7146,6 +7146,11 @@ var instructions = [
     },
     {
         name: "price_kamino_vault_shares",
+        docs: [
+            "Extra accounts for pricing N kamino vault shares:",
+            "- (kvault_share_ata, kvault_share_mint, kvault_state, kvault_deposit_token_oracle) x N",
+            "- (lending_market, reserve) x M, M = number of unique markets used by all kvaults involved"
+        ],
         discriminator: [
             112,
             92,
@@ -7281,6 +7286,10 @@ var instructions = [
                         name: "PriceDenom"
                     }
                 }
+            },
+            {
+                name: "num_vaults",
+                type: "u8"
             }
         ]
     },
@@ -7525,16 +7534,22 @@ var instructions = [
         ]
     },
     {
-        name: "price_vault",
+        name: "price_vault_tokens",
+        docs: [
+            "Price vault SOL balance and tokens it holds.",
+            "",
+            "Extra accounts for pricing N tokens:",
+            "- (ata, mint, oracle) x N"
+        ],
         discriminator: [
-            47,
-            213,
-            36,
-            17,
+            54,
+            42,
+            16,
+            199,
+            20,
             183,
-            5,
-            141,
-            45
+            50,
+            137
         ],
         accounts: [
             {
@@ -14541,6 +14556,7 @@ const KAMINO_LENDING_PROGRAM = new PublicKey("KLend2g3cP87fffoy8q1mQqGKjrxjC8boS
 const KAMINO_VAULTS_PROGRAM = new PublicKey("KvauGMspG5k6rtzrqqn7WNn3oZdyKqLKwK2XWQ8FLjd");
 const KAMINO_FARM_PROGRAM = new PublicKey("FarmsPZpWu9i7Kky8tPN37rs2TpmMrAZrC7S7vJa91Hr");
 const MEMO_PROGRAM = new PublicKey("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr");
+const ALT_PROGRAM_ID = new PublicKey("AddressLookupTab1e1111111111111111111111111");
 /**
  * Stake pools
  */ const JITO_STAKE_POOL = new PublicKey("Jito4APyf642JPZPx3hGc6WWJ8zPKtRbRs4P815Awbb");
@@ -14949,12 +14965,6 @@ var ClusterNetwork = /*#__PURE__*/ function(ClusterNetwork) {
     return ClusterNetwork;
 }({});
 
-const LOOKUP_TABLES_MAP = new Map([
-    [
-        "3tfbxaHBDjczQo3eyNJGGG64ChZ9nG4V3Gywa4k59d5a",
-        new PublicKey("8HUXT9abWS2z3z92QyDzg51nMcc18LyWFvaEQZJMPixu")
-    ]
-]);
 const findStakeAccounts = async (connection, withdrawAuthority)=>{
     // stake authority offset: 12
     // withdraw authority offset: 44
@@ -15059,45 +15069,6 @@ const parseMeteoraPosition = async (connection, position)=>{
         binArrayUpper
     };
 };
-async function fetchLookupTables(connection, authority, firstEntry) {
-    const ALT_PROGRAM_ID = new PublicKey("AddressLookupTab1e1111111111111111111111111");
-    const tablePubkey = LOOKUP_TABLES_MAP.get(firstEntry.toBase58());
-    if (tablePubkey) {
-        const accountInfo = await connection.getAccountInfo(tablePubkey);
-        if (accountInfo) {
-            return [
-                new AddressLookupTableAccount({
-                    key: tablePubkey,
-                    state: AddressLookupTableAccount.deserialize(accountInfo.data)
-                })
-            ];
-        }
-    } else {
-        // Fetch all accounts owned by the ALT program
-        // This is currently disabled due to RPC error "Request deprioritized due to number of accounts requested. Slow down requests or add filters to narrow down results"
-        const accounts = await connection.getProgramAccounts(ALT_PROGRAM_ID, {
-            filters: [
-                {
-                    memcmp: {
-                        offset: 22,
-                        bytes: authority.toBase58()
-                    }
-                },
-                {
-                    memcmp: {
-                        offset: 56,
-                        bytes: firstEntry.toBase58()
-                    }
-                }
-            ]
-        });
-        return accounts.map(({ pubkey, account })=>new AddressLookupTableAccount({
-                key: pubkey,
-                state: AddressLookupTableAccount.deserialize(account.data)
-            }));
-    }
-    return [];
-}
 /**
  * Parses program logs to extract error message
  */ function parseProgramLogs(logs) {
@@ -15207,6 +15178,15 @@ const STAKE_POOLS = LstList.filter((lst)=>!lst.name.includes("Sanctum Automated"
         poolState: new PublicKey(poolState)
     };
 });
+STAKE_POOLS.push({
+    name: "Phantom Staked SOL",
+    symbol: "PSOL",
+    mint: "pSo1f9nQXWgXibFtKf7NWYxb5enAM4qfP6UJSiXRQfL",
+    decimals: 9,
+    logoURI: "https://assets.phantom.app/assets/metadata/PSOL-512.png",
+    tokenProgram: TOKEN_PROGRAM_ID,
+    poolState: new PublicKey("pSPcvR8GmG9aKDUbn9nbKYjkxt9hxMS7kF1qqKJaPqJ")
+});
 const STAKE_POOLS_MAP = new Map(STAKE_POOLS.map((p)=>[
         p.mint,
         p
@@ -15507,6 +15487,12 @@ const LOOKUP_TABLES = [
     new PublicKey("D9cnvzswDikQDf53k4HpQ3KJ9y1Fv3HGGDFYMXnK5T6c"),
     new PublicKey("EiWSskK5HXnBTptiS5DH6gpAJRVNQ3cAhTKBGaiaysAb")
 ];
+const STATES_LOOKUP_TABLES_MAP = new Map([
+    [
+        "3tfbxaHBDjczQo3eyNJGGG64ChZ9nG4V3Gywa4k59d5a",
+        new PublicKey("8HUXT9abWS2z3z92QyDzg51nMcc18LyWFvaEQZJMPixu")
+    ]
+]);
 const isBrowser = process.env.ANCHOR_BROWSER || typeof window !== "undefined" && !window.process?.hasOwnProperty("type");
 class BaseClient {
     get detectedCluster() {
@@ -15588,6 +15574,59 @@ class BaseClient {
             })
         ];
     }
+    /**
+   * Fetches lookup tables for the current GLAM instance
+   */ async findLookupTables() {
+        const glamApi = process.env.NEXT_PUBLIC_GLAM_API || process.env.GLAM_API;
+        if (glamApi) {
+            const response = await fetch(`${glamApi}/v0/lut/glam/?state=${this.statePda}`);
+            const data = await response.json();
+            const { t: lookupTables } = data;
+            const pubkeys = Object.keys(lookupTables);
+            if (pubkeys.length > 0) {
+                return await this.fetchAdressLookupTableAccounts(pubkeys);
+            }
+        }
+        const tablePubkey = STATES_LOOKUP_TABLES_MAP.get(this.statePda.toBase58());
+        if (tablePubkey) {
+            return await this.fetchAdressLookupTableAccounts([
+                tablePubkey
+            ]);
+        }
+        // Fetch all accounts owned by the ALT program
+        // This is very likely to hit the RPC error "Request deprioritized due to number of accounts requested. Slow down requests or add filters to narrow down results"
+        const accounts = await this.provider.connection.getProgramAccounts(ALT_PROGRAM_ID, {
+            filters: [
+                {
+                    memcmp: {
+                        offset: 0,
+                        bytes: bs58.encode([
+                            1,
+                            0,
+                            0,
+                            0
+                        ])
+                    }
+                },
+                {
+                    memcmp: {
+                        offset: 56,
+                        bytes: this.statePda.toBase58()
+                    }
+                },
+                {
+                    memcmp: {
+                        offset: 88,
+                        bytes: this.vaultPda.toBase58()
+                    }
+                }
+            ]
+        });
+        return accounts.map(({ pubkey, account })=>new AddressLookupTableAccount({
+                key: pubkey,
+                state: AddressLookupTableAccount.deserialize(account.data)
+            }));
+    }
     async intoVersionedTransaction(tx, { lookupTables = [], signer, computeUnitLimit, getPriorityFeeMicroLamports, maxFeeLamports, useMaxFee = false, jitoTipLamports, simulate = false }) {
         signer = signer || this.getSigner();
         const instructions = tx.instructions;
@@ -15599,15 +15638,26 @@ class BaseClient {
                 lamports: jitoTipLamports
             }));
         }
-        lookupTables.push(...await this.getAdressLookupTableAccounts(LOOKUP_TABLES));
+        const lookupTableAccounts = [];
+        if (lookupTables.every((t)=>t instanceof AddressLookupTableAccount)) {
+            const accounts = await this.fetchAdressLookupTableAccounts([
+                ...LOOKUP_TABLES
+            ]);
+            lookupTableAccounts.push(...lookupTables, ...accounts);
+        } else {
+            const accounts = await this.fetchAdressLookupTableAccounts([
+                ...lookupTables,
+                ...LOOKUP_TABLES
+            ]);
+            lookupTableAccounts.push(...accounts);
+        }
         const recentBlockhash = (await this.blockhashWithCache.get()).blockhash;
-        const { unitsConsumed, error, serializedTx } = await getSimulationResult(this.provider.connection, instructions, signer, lookupTables);
+        const { unitsConsumed, error, serializedTx } = await getSimulationResult(this.provider.connection, instructions, signer, lookupTableAccounts);
         computeUnitLimit = unitsConsumed;
         // by default, a simulation error doesn't prevent the tx from being sent
         // - gui: wallet apps usually do the simulation themselves, we should ignore the simulation error here by default
         // - cli: we should set simulate=true
         if (error && simulate) {
-            console.log("Lookup tables:", lookupTables.map((lt)=>lt.key.toString()));
             console.log("Tx (base64):", serializedTx);
             console.error("Simulation failed:", error.message);
             console.error("If error message is too obscure, inspect and simulate the tx in explorer: https://explorer.solana.com/tx/inspector");
@@ -15618,7 +15668,7 @@ class BaseClient {
                 payerKey: signer,
                 recentBlockhash,
                 instructions
-            }).compileToV0Message(lookupTables));
+            }).compileToV0Message(lookupTableAccounts));
             const cuIxs = await this.getComputeBudgetIxs(vTx, computeUnitLimit, getPriorityFeeMicroLamports, maxFeeLamports, useMaxFee);
             instructions.unshift(...cuIxs);
         }
@@ -15626,7 +15676,7 @@ class BaseClient {
             payerKey: signer,
             recentBlockhash,
             instructions
-        }).compileToV0Message(lookupTables));
+        }).compileToV0Message(lookupTableAccounts));
     }
     async sendAndConfirm(tx, additionalSigners = []) {
         const connection = this.provider.connection;
@@ -15674,13 +15724,21 @@ class BaseClient {
         }
         return txSig;
     }
-    async getAdressLookupTableAccounts(keys) {
-        if (!keys) {
+    /**
+   * Fetches multiple address lookup table accounts.
+   *
+   * @param pubkeys Array of lookup table public keys.
+   * @returns
+   */ async fetchAdressLookupTableAccounts(pubkeys) {
+        if (!pubkeys) {
             throw new Error("addressLookupTableAddresses is undefined");
         }
-        const addressLookupTableAccountInfos = await this.provider.connection.getMultipleAccountsInfo(keys.map((key)=>new PublicKey(key)));
+        if (pubkeys.length === 0) {
+            return [];
+        }
+        const addressLookupTableAccountInfos = await this.provider.connection.getMultipleAccountsInfo(pubkeys.map((key)=>new PublicKey(key)));
         return addressLookupTableAccountInfos.reduce((acc, accountInfo, index)=>{
-            const tableAddress = keys[index];
+            const tableAddress = pubkeys[index];
             if (accountInfo) {
                 const tableAccount = new AddressLookupTableAccount({
                     key: new PublicKey(tableAddress),
@@ -17977,7 +18035,7 @@ class JupiterSwapClient {
             swapInstruction = swapInstructions.swapInstruction;
             addressLookupTableAddresses = swapInstructions.addressLookupTableAddresses;
         }
-        const lookupTables = await this.base.getAdressLookupTableAccounts(addressLookupTableAddresses);
+        const lookupTables = addressLookupTableAddresses.map((pubkey)=>new PublicKey(pubkey));
         const swapIx = this.toTransactionInstruction(swapInstruction, glamVault.toBase58());
         const [inputTokenProgram, outputTokenProgram] = (await this.base.fetchMintsAndTokenPrograms([
             inputMint,
@@ -19679,7 +19737,6 @@ const KVaultStateLayout = struct([
     array(u128(), 242, "padding3")
 ]);
 
-const LOOKUP_TABLE = new PublicKey("284iwGtA9X9aLy3KsyV8uT2pXLARhYbiSi5SiM2g47M2");
 const DEFAULT_OBLIGATION_ARGS = {
     tag: 0,
     id: 0
@@ -20324,13 +20381,7 @@ class KaminoLendingClient {
             reserveFarmState: depositReserve.farmCollateral,
             farmsProgram: KAMINO_FARM_PROGRAM
         }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
-        const lookupTables = txOptions.lookupTables || await this.base.getAdressLookupTableAccounts([
-            LOOKUP_TABLE
-        ]);
-        const vTx = await this.base.intoVersionedTransaction(tx, {
-            ...txOptions,
-            lookupTables
-        });
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return vTx;
     }
     async withdrawTx(market, asset, amount, txOptions) {
@@ -20415,13 +20466,7 @@ class KaminoLendingClient {
         // - refreshObligationFarmsForReserve (if farm exists)
         const tx = new Transaction();
         tx.add(...preInstructions, withdrawIx, ...postInstructions);
-        const lookupTables = txOptions.lookupTables || await this.base.getAdressLookupTableAccounts([
-            LOOKUP_TABLE
-        ]);
-        const vTx = await this.base.intoVersionedTransaction(tx, {
-            ...txOptions,
-            lookupTables
-        });
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return vTx;
     }
     async borrowTx(market, asset, amount, txOptions) {
@@ -20503,13 +20548,7 @@ class KaminoLendingClient {
         // - borrowObligationLiquidityV2
         const tx = new Transaction();
         tx.add(...preInstructions, borrowIx);
-        const lookupTables = txOptions.lookupTables || await this.base.getAdressLookupTableAccounts([
-            LOOKUP_TABLE
-        ]);
-        const vTx = await this.base.intoVersionedTransaction(tx, {
-            ...txOptions,
-            lookupTables
-        });
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return vTx;
     }
     async repayTx(market, asset, amount, txOptions = {}) {
@@ -20576,13 +20615,7 @@ class KaminoLendingClient {
         // - repayObligationLiquidityV2
         const tx = new Transaction();
         tx.add(...preInstructions, repayIx);
-        const lookupTables = txOptions.lookupTables || await this.base.getAdressLookupTableAccounts([
-            LOOKUP_TABLE
-        ]);
-        const vTx = await this.base.intoVersionedTransaction(tx, {
-            ...txOptions,
-            lookupTables
-        });
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return vTx;
     }
     constructor(base){
@@ -20704,13 +20737,7 @@ class KaminoFarmClient {
                 tx.add(createAtaIx, harvestIx);
             }
         }
-        const lookupTables = txOptions.lookupTables || await this.base.getAdressLookupTableAccounts([
-            LOOKUP_TABLE
-        ]);
-        const vTx = await this.base.intoVersionedTransaction(tx, {
-            ...txOptions,
-            lookupTables
-        });
+        const vTx = await this.base.intoVersionedTransaction(tx, txOptions);
         return vTx;
     }
     constructor(base){
@@ -20776,9 +20803,10 @@ class KaminoVaultsClient {
         this.shareMintToVaultPdaMap.set(vaultState.sharesMint.toBase58(), vault);
         return vaultState;
     }
-    async composeRemainingAccounts(allocationStrategies) {
-        // For each allocation get reserve and market pubkeys
-        const reserves = allocationStrategies.map((strategy)=>strategy.reserve);
+    async composeRemainingAccounts(allocationStrategies, pricingMode = false) {
+        // Iterate over allocation strategies and get reserve pubkeys, using a Set to avoid dupes
+        const reservesSet = new Set(allocationStrategies.map((strategy)=>strategy.reserve.toBase58()));
+        const reserves = Array.from(reservesSet).map((p)=>new PublicKey(p));
         const parsedReserves = await this.kaminoLending.fetchAndParseReserves(reserves);
         const reserveMetas = reserves.map((pubkey)=>({
                 pubkey,
@@ -20790,15 +20818,21 @@ class KaminoVaultsClient {
                 isSigner: false,
                 isWritable: false
             }));
+        if (pricingMode) {
+            // (market, reserve) must be paired
+            return marketMetas.reduce((acc, marketMeta, i)=>{
+                acc.push(marketMeta, reserveMetas[i]);
+                return acc;
+            }, []);
+        }
         return [
             ...reserveMetas,
             ...marketMetas
-        ];
+        ]; // Non pricing mode
     }
     async depositTx(vault, amount, txOptions = {}) {
         const glamSigner = txOptions.signer || this.base.getSigner();
         const vaultState = await this.fetchAndParseVaultState(vault);
-        const amountBN = amount.mul(new BN(10).pow(vaultState.tokenMintDecimals));
         const { tokenProgram: sharesTokenProgram } = await this.base.fetchMintAndTokenProgram(vaultState.sharesMint);
         const userTokenAta = this.base.getVaultAta(vaultState.tokenMint, vaultState.tokenProgram);
         const userSharesAta = this.base.getVaultAta(vaultState.sharesMint, sharesTokenProgram);
@@ -20808,7 +20842,7 @@ class KaminoVaultsClient {
         ];
         // Remaining accounts, skip empty allocation strategies
         const remainingAccounts = await this.composeRemainingAccounts(vaultState.vaultAllocationStrategy.filter(({ reserve })=>!reserve.equals(PublicKey.default)));
-        const tx = await this.base.program.methods.kaminoVaultsDeposit(amountBN).accounts({
+        const tx = await this.base.program.methods.kaminoVaultsDeposit(amount).accounts({
             glamState: this.base.statePda,
             glamSigner,
             vaultState: vault,
@@ -20833,7 +20867,6 @@ class KaminoVaultsClient {
         const userTokenAta = this.base.getVaultAta(vaultState.tokenMint, vaultState.tokenProgram);
         const { tokenProgram: sharesTokenProgram } = await this.base.fetchMintAndTokenProgram(vaultState.sharesMint);
         const userSharesAta = this.base.getVaultAta(vaultState.sharesMint, sharesTokenProgram);
-        const amountBN = amount.mul(new BN(10).pow(vaultState.sharesMintDecimals));
         const reserves = vaultState.vaultAllocationStrategy.filter(({ reserve })=>!reserve.equals(PublicKey.default));
         // Withdraw from the first reserve when kvault does not have enough liquidity
         const idx = 0;
@@ -20843,7 +20876,7 @@ class KaminoVaultsClient {
         const preInstructions = [
             createAssociatedTokenAccountIdempotentInstruction(glamSigner, userTokenAta, this.base.vaultPda, vaultState.tokenMint, vaultState.tokenProgram)
         ];
-        const tx = await this.base.program.methods.kaminoVaultsWithdraw(amountBN).accounts({
+        const tx = await this.base.program.methods.kaminoVaultsWithdraw(amount).accounts({
             glamState: this.base.statePda,
             glamSigner,
             withdrawFromAvailableVaultState: vault,
@@ -21364,28 +21397,40 @@ class PriceClient {
         const shareAtas = [];
         const shareMints = [];
         const kvaultStates = [];
+        const oracles = []; // oracle of kvault deposit token
         possibleShareAtaAccountsInfo.forEach((info, i)=>{
             if (info !== null) {
                 shareAtas.push(possibleShareAtas[i]);
                 shareMints.push(allKvaultMints[i]);
                 kvaultStates.push(allKvaultStates[i]);
+                const { tokenMint } = allKvaultStates[i];
+                const assetMeta = ASSETS_MAINNET.get(tokenMint.toBase58());
+                oracles.push(assetMeta?.oracle);
             }
         });
         const kvaultPdas = await this.kvaults.getVaultPdasByShareMints(shareMints);
-        const remainingAccounts = (await Promise.all(kvaultStates.map((kvault)=>{
-            return this.kvaults.composeRemainingAccounts(kvault.vaultAllocationStrategy.filter((alloc)=>!alloc.reserve.equals(PublicKey.default)));
-        }))).flat();
-        [
-            ...kvaultPdas,
-            ...shareAtas
-        ].map((pubkey)=>{
-            remainingAccounts.unshift({
-                pubkey: pubkey,
-                isSigner: false,
-                isWritable: false
+        const remainingAccounts = [];
+        // first 3N remaining accounts are N tuples of (kvault_shares_ata, kvault_shares_mint, kvault_state)
+        for(let i = 0; i < shareAtas.length; i++){
+            [
+                shareAtas[i],
+                shareMints[i],
+                kvaultPdas[i],
+                oracles[i]
+            ].map((pubkey)=>{
+                remainingAccounts.push({
+                    pubkey,
+                    isSigner: false,
+                    isWritable: false
+                });
             });
-        });
-        const priceIx = await this.base.program.methods.priceKaminoVaultShares(priceDenom).accounts({
+        }
+        // markets and reserves
+        const marketsAndReserves = (await Promise.all(kvaultStates.map((kvault)=>{
+            return this.kvaults.composeRemainingAccounts(kvault.vaultAllocationStrategy.filter((alloc)=>!alloc.reserve.equals(PublicKey.default)), true);
+        }))).flat();
+        remainingAccounts.push(...marketsAndReserves);
+        const priceIx = await this.base.program.methods.priceKaminoVaultShares(priceDenom, shareAtas.length).accounts({
             glamState: this.base.statePda,
             solOracle: SOL_ORACLE,
             pythOracle: null,
@@ -21507,7 +21552,7 @@ class PriceClient {
    * Returns an instruction that prices vault balance and tokens the vault holds
    */ async priceVaultIx(priceDenom) {
         const remainingAccounts = await this.remainingAccountsForPricingVaultAssets(priceDenom == PriceDenom.ASSET);
-        const priceVaultIx = await this.base.program.methods.priceVault(priceDenom).accounts({
+        const priceVaultIx = await this.base.program.methods.priceVaultTokens(priceDenom).accounts({
             glamState: this.base.statePda,
             solOracle: SOL_ORACLE
         }).remainingAccounts(remainingAccounts).instruction();
@@ -21572,7 +21617,9 @@ class PriceClient {
             kaminoVaults: this.priceKaminoVaultSharesIx.bind(this)
         };
         const pricingFns = integrations.map((integration)=>integrationsToPricingFns[integration]).filter(Boolean);
-        const pricingIxs = [];
+        const pricingIxs = [
+            priceVaultIx
+        ];
         for (const fn of pricingFns){
             const ix = await fn(priceDenom);
             pricingIxs.push(ix);
@@ -21937,4 +21984,4 @@ function getMarketOrderParams(params) {
     return Object.assign({}, DefaultOrderParams, optionalOrderParams, overridingParams);
 }
 
-export { ASSETS_MAINNET, ASSETS_TESTS, AssetTier, BaseClient, ClusterNetwork, CompanyModel, ContractTier, ContractType, CreatedModel, DRIFT_PROGRAM_ID, DRIFT_VAULTS_PROGRAM_ID, DRIFT_VAULT_DEPOSITOR_SIZE, DefaultOrderParams, DelegateAcl, DepositDirection, DepositExplanation, DriftClient, DriftVaultsClient, ExchangeStatus, FuelOverflowStatus, FundOpenfundsModel, GLAM_REFERRER, GOVERNANCE_PROGRAM_ID, GlamClient, GlamError, GlamIdl, GlamIntegrations, GlamPermissions, GlamProtocolIdlJson, InsuranceFundOperation, JITO_STAKE_POOL, JITO_TIP_DEFAULT, JUP, JUPITER_API_DEFAULT, JUPITER_PROGRAM_ID, JUPSOL_STAKE_POOL, JUP_VOTE_PROGRAM, JupiterSwapClient, JupiterVoteClient, KAMINO_FARM_PROGRAM, KAMINO_LENDING_PROGRAM, KAMINO_OBTRIGATION_SIZE, KAMINO_SCOPE_PRICES, KAMINO_VAULTS_PROGRAM, LPAction, LiquidationType, MARINADE_NATIVE_STAKE_AUTHORITY, MARINADE_PROGRAM_ID, MEMO_PROGRAM, MERKLE_DISTRIBUTOR_PROGRAM, METEORA_DLMM_PROGRAM, METEORA_POSITION_SIZE, MSOL, ManagerModel, MarginMode, MarketStatus, MarketType, Metadata, MintIdlModel, MintModel, MintOpenfundsModel, ModifyOrderPolicy, OracleSource, OracleSourceNum, OrderAction, OrderActionExplanation, OrderStatus, OrderTriggerCondition, OrderType, PerpOperation, PlaceAndTakeOrderSuccessCondition, PositionDirection, PostOnlyParams, PriceDenom, ReferrerStatus, SANCTUM_STAKE_POOL_PROGRAM_ID, SEED_ESCROW, SEED_METADATA, SEED_MINT, SEED_STATE, SEED_VAULT, SOL_ORACLE, STAKE_ACCOUNT_SIZE, STAKE_POOLS, STAKE_POOLS_MAP, SettlePnlExplanation, SettlePnlMode, SpotBalanceType, SpotFulfillmentConfigStatus, SpotFulfillmentStatus, SpotFulfillmentType, SpotOperation, StakeAction, StateIdlModel, StateModel, SwapDirection, SwapReduceOnly, TRANSFER_HOOK_PROGRAM, TimeUnit, TradeSide, USDC, USDC_ORACLE, UserStatus, VoteAuthorize, WSOL, ZERO, decodeUser, fetchLookupTables, fetchMeteoraPositions, fetchProgramLabels, fetchTokenPrices, fetchTokensList, findStakeAccounts, getAccountPolicyPda, getEscrowPda, getExtraMetasPda, getGlamProgram, getGlamProgramId, getLimitOrderParams, getMarketOrderParams, getMintPda, getOpenfundsPda, getOrderParams, getPriorityFeeEstimate, getSimulationResult, getStakeAccountsWithStates, getStatePda, getTriggerLimitOrderParams, getTriggerMarketOrderParams, getVariant, getVaultPda, isBrowser, isOneOfVariant, isVariant, parseMeteoraPosition, parseProgramLogs, setsAreEqual };
+export { ALT_PROGRAM_ID, ASSETS_MAINNET, ASSETS_TESTS, AssetTier, BaseClient, ClusterNetwork, CompanyModel, ContractTier, ContractType, CreatedModel, DRIFT_PROGRAM_ID, DRIFT_VAULTS_PROGRAM_ID, DRIFT_VAULT_DEPOSITOR_SIZE, DefaultOrderParams, DelegateAcl, DepositDirection, DepositExplanation, DriftClient, DriftVaultsClient, ExchangeStatus, FuelOverflowStatus, FundOpenfundsModel, GLAM_REFERRER, GOVERNANCE_PROGRAM_ID, GlamClient, GlamError, GlamIdl, GlamIntegrations, GlamPermissions, GlamProtocolIdlJson, InsuranceFundOperation, JITO_STAKE_POOL, JITO_TIP_DEFAULT, JUP, JUPITER_API_DEFAULT, JUPITER_PROGRAM_ID, JUPSOL_STAKE_POOL, JUP_VOTE_PROGRAM, JupiterSwapClient, JupiterVoteClient, KAMINO_FARM_PROGRAM, KAMINO_LENDING_PROGRAM, KAMINO_OBTRIGATION_SIZE, KAMINO_SCOPE_PRICES, KAMINO_VAULTS_PROGRAM, LPAction, LiquidationType, MARINADE_NATIVE_STAKE_AUTHORITY, MARINADE_PROGRAM_ID, MEMO_PROGRAM, MERKLE_DISTRIBUTOR_PROGRAM, METEORA_DLMM_PROGRAM, METEORA_POSITION_SIZE, MSOL, ManagerModel, MarginMode, MarketStatus, MarketType, Metadata, MintIdlModel, MintModel, MintOpenfundsModel, ModifyOrderPolicy, OracleSource, OracleSourceNum, OrderAction, OrderActionExplanation, OrderStatus, OrderTriggerCondition, OrderType, PerpOperation, PlaceAndTakeOrderSuccessCondition, PositionDirection, PostOnlyParams, PriceDenom, ReferrerStatus, SANCTUM_STAKE_POOL_PROGRAM_ID, SEED_ESCROW, SEED_METADATA, SEED_MINT, SEED_STATE, SEED_VAULT, SOL_ORACLE, STAKE_ACCOUNT_SIZE, STAKE_POOLS, STAKE_POOLS_MAP, SettlePnlExplanation, SettlePnlMode, SpotBalanceType, SpotFulfillmentConfigStatus, SpotFulfillmentStatus, SpotFulfillmentType, SpotOperation, StakeAction, StateIdlModel, StateModel, SwapDirection, SwapReduceOnly, TRANSFER_HOOK_PROGRAM, TimeUnit, TradeSide, USDC, USDC_ORACLE, UserStatus, VoteAuthorize, WSOL, ZERO, decodeUser, fetchMeteoraPositions, fetchProgramLabels, fetchTokenPrices, fetchTokensList, findStakeAccounts, getAccountPolicyPda, getEscrowPda, getExtraMetasPda, getGlamProgram, getGlamProgramId, getLimitOrderParams, getMarketOrderParams, getMintPda, getOpenfundsPda, getOrderParams, getPriorityFeeEstimate, getSimulationResult, getStakeAccountsWithStates, getStatePda, getTriggerLimitOrderParams, getTriggerMarketOrderParams, getVariant, getVaultPda, isBrowser, isOneOfVariant, isVariant, parseMeteoraPosition, parseProgramLogs, setsAreEqual };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glamsystems/glam-sdk",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "description": "TypeScript SDK for the GLAM Protocol",
   "main": "./index.cjs.js",
   "module": "./index.esm.js",

package/src/client/base.d.ts

@@ -17,7 +17,7 @@ export type TxOptions = {
     useMaxFee?: boolean;
     jitoTipLamports?: number;
     preInstructions?: TransactionInstruction[];
-    lookupTables?: AddressLookupTableAccount[];
+    lookupTables?: PublicKey[] | AddressLookupTableAccount[];
     simulate?: boolean;
 };
 export type TokenAccount = {
@@ -50,9 +50,19 @@ export declare class BaseClient {
      */
     getAssetMeta(assetMint: string): AssetMeta;
     private getComputeBudgetIxs;
+    /**
+     * Fetches lookup tables for the current GLAM instance
+     */
+    findLookupTables(): Promise<AddressLookupTableAccount[]>;
     intoVersionedTransaction(tx: Transaction, { lookupTables, signer, computeUnitLimit, getPriorityFeeMicroLamports, maxFeeLamports, useMaxFee, jitoTipLamports, simulate, }: TxOptions): Promise<VersionedTransaction>;
     sendAndConfirm(tx: VersionedTransaction | Transaction, additionalSigners?: Keypair[]): Promise<TransactionSignature>;
-    getAdressLookupTableAccounts(keys?: string[] | PublicKey[]): Promise<AddressLookupTableAccount[]>;
+    /**
+     * Fetches multiple address lookup table accounts.
+     *
+     * @param pubkeys Array of lookup table public keys.
+     * @returns
+     */
+    fetchAdressLookupTableAccounts(pubkeys?: string[] | PublicKey[]): Promise<AddressLookupTableAccount[]>;
     getWallet(): Wallet;
     getSigner(): PublicKey;
     get signer(): PublicKey;

package/src/client/kamino.d.ts

@@ -146,7 +146,7 @@ export declare class KaminoVaultsClient {
     findAndParseKaminoVaults(): Promise<KVaultState[]>;
     getVaultPdasByShareMints(mints: PublicKey[]): Promise<PublicKey[]>;
     fetchAndParseVaultState(vault: PublicKey): Promise<KVaultState>;
-    composeRemainingAccounts(allocationStrategies: KVaultAllocation[]): Promise<AccountMeta[]>;
+    composeRemainingAccounts(allocationStrategies: KVaultAllocation[], pricingMode?: boolean): Promise<AccountMeta[]>;
     depositTx(vault: PublicKey, amount: BN, txOptions?: TxOptions): Promise<VersionedTransaction>;
     withdrawTx(vault: PublicKey, amount: BN, txOptions?: TxOptions): Promise<VersionedTransaction>;
 }

package/src/constants.d.ts

@@ -38,6 +38,7 @@ export declare const KAMINO_LENDING_PROGRAM: PublicKey;
 export declare const KAMINO_VAULTS_PROGRAM: PublicKey;
 export declare const KAMINO_FARM_PROGRAM: PublicKey;
 export declare const MEMO_PROGRAM: PublicKey;
+export declare const ALT_PROGRAM_ID: PublicKey;
 /**
  * Stake pools
  */

package/src/react/glam.d.ts

@@ -22,7 +22,6 @@ interface GlamProviderContext {
     prices: TokenPrice[];
     jupTokenList?: TokenListItem[];
     driftMarketConfigs: DriftMarketConfigs;
-    driftUser: DriftUser;
     setActiveGlamState: (f: GlamStateCache) => void;
     refresh: () => Promise<void>;
     refetchGlamStates: () => Promise<void>;

package/src/utils/helpers.d.ts

@@ -15,7 +15,6 @@ export declare const parseMeteoraPosition: (connection: Connection, position: Pu
     binArrayLower: PublicKey;
     binArrayUpper: PublicKey;
 }>;
-export declare function fetchLookupTables(connection: Connection, authority: PublicKey, firstEntry: PublicKey): Promise<AddressLookupTableAccount[]>;
 /**
  * Parses program logs to extract error message
  */

package/target/idl/glam_protocol.json

@@ -2,7 +2,7 @@
   "address": "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc",
   "metadata": {
     "name": "glam_protocol",
-    "version": "0.4.32",
+    "version": "0.4.33",
     "spec": "0.1.0",
     "description": "Glam Protocol"
   },
@@ -7134,6 +7134,11 @@
     },
     {
       "name": "price_kamino_vault_shares",
+      "docs": [
+        "Extra accounts for pricing N kamino vault shares:",
+        "- (kvault_share_ata, kvault_share_mint, kvault_state, kvault_deposit_token_oracle) x N",
+        "- (lending_market, reserve) x M, M = number of unique markets used by all kvaults involved"
+      ],
       "discriminator": [
         112,
         92,
@@ -7269,6 +7274,10 @@
               "name": "PriceDenom"
             }
           }
+        },
+        {
+          "name": "num_vaults",
+          "type": "u8"
         }
       ]
     },
@@ -7513,16 +7522,22 @@
       ]
     },
     {
-      "name": "price_vault",
+      "name": "price_vault_tokens",
+      "docs": [
+        "Price vault SOL balance and tokens it holds.",
+        "",
+        "Extra accounts for pricing N tokens:",
+        "- (ata, mint, oracle) x N"
+      ],
       "discriminator": [
-        47,
-        213,
-        36,
-        17,
+        54,
+        42,
+        16,
+        199,
+        20,
         183,
-        5,
-        141,
-        45
+        50,
+        137
       ],
       "accounts": [
         {

package/target/types/glam_protocol.d.ts

@@ -8,7 +8,7 @@ export type GlamProtocol = {
     "address": "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc";
     "metadata": {
         "name": "glamProtocol";
-        "version": "0.4.32";
+        "version": "0.4.33";
         "spec": "0.1.0";
         "description": "Glam Protocol";
     };
@@ -7140,6 +7140,11 @@ export type GlamProtocol = {
         },
         {
             "name": "priceKaminoVaultShares";
+            "docs": [
+                "Extra accounts for pricing N kamino vault shares:",
+                "- (kvault_share_ata, kvault_share_mint, kvault_state, kvault_deposit_token_oracle) x N",
+                "- (lending_market, reserve) x M, M = number of unique markets used by all kvaults involved"
+            ];
             "discriminator": [
                 112,
                 92,
@@ -7275,6 +7280,10 @@ export type GlamProtocol = {
                             "name": "priceDenom";
                         };
                     };
+                },
+                {
+                    "name": "numVaults";
+                    "type": "u8";
                 }
             ];
         },
@@ -7519,16 +7528,22 @@ export type GlamProtocol = {
             ];
         },
         {
-            "name": "priceVault";
+            "name": "priceVaultTokens";
+            "docs": [
+                "Price vault SOL balance and tokens it holds.",
+                "",
+                "Extra accounts for pricing N tokens:",
+                "- (ata, mint, oracle) x N"
+            ];
             "discriminator": [
-                47,
-                213,
-                36,
-                17,
+                54,
+                42,
+                16,
+                199,
+                20,
                 183,
-                5,
-                141,
-                45
+                50,
+                137
             ];
             "accounts": [
                 {

package/target/types/glam_protocol.ts

@@ -8,7 +8,7 @@ export type GlamProtocol = {
   "address": "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc",
   "metadata": {
     "name": "glamProtocol",
-    "version": "0.4.32",
+    "version": "0.4.33",
     "spec": "0.1.0",
     "description": "Glam Protocol"
   },
@@ -7140,6 +7140,11 @@ export type GlamProtocol = {
     },
     {
       "name": "priceKaminoVaultShares",
+      "docs": [
+        "Extra accounts for pricing N kamino vault shares:",
+        "- (kvault_share_ata, kvault_share_mint, kvault_state, kvault_deposit_token_oracle) x N",
+        "- (lending_market, reserve) x M, M = number of unique markets used by all kvaults involved"
+      ],
       "discriminator": [
         112,
         92,
@@ -7275,6 +7280,10 @@ export type GlamProtocol = {
               "name": "priceDenom"
             }
           }
+        },
+        {
+          "name": "numVaults",
+          "type": "u8"
         }
       ]
     },
@@ -7519,16 +7528,22 @@ export type GlamProtocol = {
       ]
     },
     {
-      "name": "priceVault",
+      "name": "priceVaultTokens",
+      "docs": [
+        "Price vault SOL balance and tokens it holds.",
+        "",
+        "Extra accounts for pricing N tokens:",
+        "- (ata, mint, oracle) x N"
+      ],
       "discriminator": [
-        47,
-        213,
-        36,
-        17,
+        54,
+        42,
+        16,
+        199,
+        20,
         183,
-        5,
-        141,
-        45
+        50,
+        137
       ],
       "accounts": [
         {