@glamsystems/glam-sdk 0.1.30 → 0.1.32

package/index.cjs.js

@@ -5,7 +5,7 @@ var web3_js = require('@solana/web3.js');
 var splToken = require('@solana/spl-token');
 var splTokenMetadata = require('@solana/spl-token-metadata');
 var DLMM = require('@meteora-ag/dlmm');
-var sanctumLstList = require('sanctum-lst-list');
+var sanctumLstList = require('@glamsystems/sanctum-lst-list');
 var bytes = require('@coral-xyz/anchor/dist/cjs/utils/bytes');
 var borsh = require('@coral-xyz/borsh');
 var marinadeTsSdk = require('@marinade.finance/marinade-ts-sdk');
@@ -34,7 +34,7 @@ var borsh__namespace = /*#__PURE__*/_interopNamespaceDefault(borsh);
 var address = "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc";
 var metadata = {
     name: "glam_protocol",
-    version: "0.4.35",
+    version: "0.4.36",
     spec: "0.1.0",
     description: "Glam Protocol"
 };
@@ -1007,7 +1007,7 @@ var instructions = [
                                 98,
                                 97,
                                 108,
-                                95,
+                                45,
                                 99,
                                 111,
                                 110,
@@ -6830,7 +6830,7 @@ var instructions = [
                                 98,
                                 97,
                                 108,
-                                95,
+                                45,
                                 99,
                                 111,
                                 110,
@@ -6961,7 +6961,7 @@ var instructions = [
                                 98,
                                 97,
                                 108,
-                                95,
+                                45,
                                 99,
                                 111,
                                 110,
@@ -7097,7 +7097,7 @@ var instructions = [
                                 98,
                                 97,
                                 108,
-                                95,
+                                45,
                                 99,
                                 111,
                                 110,
@@ -7243,7 +7243,7 @@ var instructions = [
                                 98,
                                 97,
                                 108,
-                                95,
+                                45,
                                 99,
                                 111,
                                 110,
@@ -7367,7 +7367,7 @@ var instructions = [
                                 98,
                                 97,
                                 108,
-                                95,
+                                45,
                                 99,
                                 111,
                                 110,
@@ -7487,7 +7487,7 @@ var instructions = [
                                 98,
                                 97,
                                 108,
-                                95,
+                                45,
                                 99,
                                 111,
                                 110,
@@ -7553,8 +7553,11 @@ var instructions = [
         docs: [
             "Price vault SOL balance and tokens it holds.",
             "",
+            "If aggregation oracle is used for token #`i`, `agg_indexes[i]` must be set to its index in the oracle mapping account.",
+            "",
             "Extra accounts for pricing N tokens:",
-            "- (ata, mint, oracle) x N"
+            "- (ata, mint, oracle) x N",
+            "- optional oracle mapping (only add it if any token uses an agg oracle)"
         ],
         discriminator: [
             54,
@@ -7613,7 +7616,7 @@ var instructions = [
                                 98,
                                 97,
                                 108,
-                                95,
+                                45,
                                 99,
                                 111,
                                 110,
@@ -7671,6 +7674,12 @@ var instructions = [
                         name: "PriceDenom"
                     }
                 }
+            },
+            {
+                name: "agg_indexes",
+                type: {
+                    vec: "i16"
+                }
             }
         ]
     },
@@ -8079,7 +8088,7 @@ var instructions = [
                                 98,
                                 97,
                                 108,
-                                95,
+                                45,
                                 99,
                                 111,
                                 110,
@@ -10025,7 +10034,8 @@ var instructions = [
         ],
         accounts: [
             {
-                name: "glam_state"
+                name: "glam_state",
+                writable: true
             },
             {
                 name: "glam_vault",
@@ -11225,6 +11235,23 @@ var types = [
                             name: "OracleSource"
                         }
                     }
+                },
+                {
+                    name: "max_age_seconds",
+                    type: "u16"
+                },
+                {
+                    name: "priority",
+                    type: "u8"
+                },
+                {
+                    name: "padding",
+                    type: {
+                        array: [
+                            "u8",
+                            3
+                        ]
+                    }
                 }
             ]
         }
@@ -12325,8 +12352,7 @@ var types = [
                 {
                     name: "fee_authority",
                     docs: [
-                        "The authority that can modify fee structure of individual glam state",
-                        "and claim protocol fees"
+                        "The authority that can modify fee structure of individual glam state and claim protocol fees"
                     ],
                     type: "pubkey"
                 },
@@ -13237,6 +13263,9 @@ var types = [
                 {
                     name: "PythLazerStableCoin"
                 },
+                {
+                    name: "NotSet"
+                },
                 {
                     name: "LstPoolState"
                 },
@@ -13245,6 +13274,9 @@ var types = [
                 },
                 {
                     name: "BaseAsset"
+                },
+                {
+                    name: "ChainlinkRWA"
                 }
             ]
         }
@@ -13572,6 +13604,9 @@ var types = [
                 },
                 {
                     name: "Fulfill"
+                },
+                {
+                    name: "ClaimFees"
                 }
             ]
         }
@@ -14949,6 +14984,15 @@ class PriceDenom {
         }
         return PriceDenom.ASSET;
     }
+    static fromString(str) {
+        if (str === "SOL") {
+            return PriceDenom.SOL;
+        }
+        if (str === "USD") {
+            return PriceDenom.USD;
+        }
+        throw new Error("Invalid price denomination");
+    }
 }
 PriceDenom.SOL = {
     sol: {}
@@ -14984,6 +15028,67 @@ var ClusterNetwork = /*#__PURE__*/ function(ClusterNetwork) {
     return ClusterNetwork;
 }({});
 
+/**
+ * Fetches all the token accounts owned by the specified pubkey.
+ */ async function getTokenAccountsByOwner(connection, owner) {
+    const tokenAccounts = await connection.getTokenAccountsByOwner(owner, {
+        programId: splToken.TOKEN_PROGRAM_ID
+    });
+    const token2022Accounts = await connection.getTokenAccountsByOwner(owner, {
+        programId: splToken.TOKEN_2022_PROGRAM_ID
+    });
+    const mintPubkeys = [];
+    const parseTokenAccountInfo = (pubkey, account)=>{
+        const { mint, amount, state } = splToken.AccountLayout.decode(account.data);
+        mintPubkeys.push(mint);
+        return {
+            owner,
+            pubkey,
+            mint,
+            amount: amount.toString(),
+            frozen: state !== 1
+        };
+    };
+    // Parse token accounts
+    const partialTokenAccounts = tokenAccounts.value.map(({ pubkey, account })=>({
+            ...parseTokenAccountInfo(pubkey, account),
+            programId: splToken.TOKEN_PROGRAM_ID
+        })).concat(token2022Accounts.value.map(({ pubkey, account })=>({
+            ...parseTokenAccountInfo(pubkey, account),
+            programId: splToken.TOKEN_2022_PROGRAM_ID
+        })));
+    // Get mint decimals
+    const mintDecimalMap = new Map();
+    const mintAccountsInfo = await connection.getMultipleAccountsInfo(mintPubkeys);
+    mintAccountsInfo.forEach((accountInfo, i)=>{
+        if (accountInfo) {
+            const mint = splToken.unpackMint(mintPubkeys[i], accountInfo, accountInfo.owner);
+            mintDecimalMap.set(mintPubkeys[i].toBase58(), mint.decimals);
+        }
+    });
+    // Enrich token accounts with decimals and uiAmount
+    return partialTokenAccounts.map((ta)=>{
+        const decimals = mintDecimalMap.get(ta.mint.toBase58());
+        if (!decimals) {
+            return null;
+        }
+        return {
+            ...ta,
+            decimals,
+            uiAmount: Number(ta.amount) / 10 ** decimals
+        };
+    }).filter((ta)=>ta !== null);
+}
+async function getSolAndTokenBalances(connection, owner) {
+    const balanceLamports = await connection.getBalance(owner);
+    const tokenAccounts = await getTokenAccountsByOwner(connection, owner);
+    const uiAmount = balanceLamports / web3_js.LAMPORTS_PER_SOL;
+    return {
+        balanceLamports,
+        uiAmount,
+        tokenAccounts
+    };
+}
 const findStakeAccounts = async (connection, withdrawAuthority)=>{
     // stake authority offset: 12
     // withdraw authority offset: 44
@@ -15181,7 +15286,7 @@ const setsAreEqual = (a, b)=>{
     return true;
 };
 
-const STAKE_POOLS = sanctumLstList.LstList.filter((lst)=>!lst.name.includes("Sanctum Automated") && (lst.pool.program === "Spl" || lst.pool.program === "Marinade" || lst.pool.program === "SanctumSpl" || lst.pool.program === "SanctumSplMulti")).map((lst)=>{
+const STAKE_POOLS = sanctumLstList.LstList.filter((lst)=>lst.pool.program === "Spl" || lst.pool.program === "Marinade" || lst.pool.program === "SanctumSpl" || lst.pool.program === "SanctumSplMulti").map((lst)=>{
     const { pool, program } = lst.pool;
     const poolState = program === "Marinade" ? "8szGkuLTAux9XMgZ2vtY39jVSowEcpBfFfD8hXSEqdGC" : pool;
     if (!poolState) {
@@ -15197,15 +15302,6 @@ 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
@@ -15283,6 +15379,15 @@ const ASSETS_MAINNET = new Map([
             oracle: new web3_js.PublicKey("9PgHM68FNGDK6nHb29ERDBcFrV6gNMD8LyUqwxbyyeb2")
         }
     ],
+    [
+        // USDG
+        "2u1tszSeqZ3qBWF3uNGPFc8TzMk2tdiwknnRMWGWjGWH",
+        {
+            decimals: 6,
+            oracle: new web3_js.PublicKey("6JkZmXGgWnzsyTQaqRARzP64iFYnpMNT4siiuUDUaB8s"),
+            programId: splToken.TOKEN_2022_PROGRAM_ID
+        }
+    ],
     [
         // PYUSD
         "2b1kV6DkPAnxd5ixfnxCpjxmKwqjjaYmCZfHsFu24GXo",
@@ -15350,6 +15455,46 @@ const ASSETS_MAINNET = new Map([
             oracle: new web3_js.PublicKey("9mhGNSPArRMHpLDMSmxAvuoizBqtBGqYdT8WGuqgxNdn"),
             isLst: true
         }
+    ],
+    [
+        // GOOGLx
+        "XsCPL9dNWBMvFtTmwcCA5v3xWPSMEBCszbQdiLLq6aN",
+        {
+            decimals: 8,
+            oracle: new web3_js.PublicKey("3NJYftD5sjVfxSnUdZ1wVML8f3aC6mp1CXCL6L7TnU8C"),
+            programId: splToken.TOKEN_2022_PROGRAM_ID,
+            aggIndex: 342
+        }
+    ],
+    [
+        // AAPLx
+        "XsbEhLAtcf6HdfpFZ5xEMdqW8nfAvcsP5bdudRLJzJp",
+        {
+            decimals: 8,
+            oracle: new web3_js.PublicKey("3NJYftD5sjVfxSnUdZ1wVML8f3aC6mp1CXCL6L7TnU8C"),
+            programId: splToken.TOKEN_2022_PROGRAM_ID,
+            aggIndex: 343
+        }
+    ],
+    [
+        // TSLAx
+        "XsDoVfqeBukxuZHWhdvWHBhgEHjGNst4MLodqsJHzoB",
+        {
+            decimals: 8,
+            oracle: new web3_js.PublicKey("3NJYftD5sjVfxSnUdZ1wVML8f3aC6mp1CXCL6L7TnU8C"),
+            programId: splToken.TOKEN_2022_PROGRAM_ID,
+            aggIndex: 335
+        }
+    ],
+    [
+        // NVDAx
+        "Xsc9qvGR1efVDFGLrVsmkzv3qi45LTBjeUKSPmx9qEh",
+        {
+            decimals: 8,
+            oracle: new web3_js.PublicKey("3NJYftD5sjVfxSnUdZ1wVML8f3aC6mp1CXCL6L7TnU8C"),
+            programId: splToken.TOKEN_2022_PROGRAM_ID,
+            aggIndex: 341
+        }
     ]
 ]);
 const ASSETS_TESTS = new Map([]);
@@ -15506,12 +15651,6 @@ 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() {
@@ -15600,17 +15739,16 @@ class BaseClient {
         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.fetchAddressLookupTableAccounts(pubkeys);
+            const lookupTables = data.t || {};
+            const lookupTableAccounts = [];
+            for (const [key, lookupTableData] of Object.entries(lookupTables)){
+                const account = new web3_js.AddressLookupTableAccount({
+                    key: new web3_js.PublicKey(key),
+                    state: web3_js.AddressLookupTableAccount.deserialize(new Uint8Array(Buffer.from(lookupTableData, "base64")))
+                });
+                lookupTableAccounts.push(account);
             }
-        }
-        const tablePubkey = STATES_LOOKUP_TABLES_MAP.get(this.statePda.toBase58());
-        if (tablePubkey) {
-            return await this.fetchAddressLookupTableAccounts([
-                tablePubkey
-            ]);
+            return lookupTableAccounts;
         }
         // 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"
@@ -15670,6 +15808,24 @@ class BaseClient {
             ]);
             lookupTableAccounts.push(...accounts);
         }
+        const glamApi = process.env.NEXT_PUBLIC_GLAM_API || process.env.GLAM_API;
+        if (glamApi) {
+            try {
+                const response = await fetch(`${glamApi}/v0/lut/glam/?state=${this.statePda}`);
+                const data = await response.json();
+                const lookupTables = data.t || {};
+                for (const [key, lookupTableData] of Object.entries(lookupTables)){
+                    const account = new web3_js.AddressLookupTableAccount({
+                        key: new web3_js.PublicKey(key),
+                        state: web3_js.AddressLookupTableAccount.deserialize(new Uint8Array(Buffer.from(lookupTableData, "base64")))
+                    });
+                    lookupTableAccounts.push(account);
+                }
+            } catch (e) {
+                console.error("Failed to fetch lookup tables:", e); // Fail open
+            }
+        }
+        console.log("lookupTableAccounts:", lookupTableAccounts.map((t)=>t.key.toBase58()));
         const recentBlockhash = (await this.blockhashWithCache.get()).blockhash;
         const { unitsConsumed, error, serializedTx } = await getSimulationResult(this.provider.connection, instructions, signer, lookupTableAccounts);
         computeUnitLimit = unitsConsumed;
@@ -19761,176 +19917,6 @@ const DEFAULT_OBLIGATION_ARGS = {
     id: 0
 };
 const EVENT_AUTHORITY$1 = new web3_js.PublicKey("24tHwQyJJ9akVXxnvkekGfAoeUJXXS7mE6kQNioNySsK");
-function refreshObligation(accounts, programId = KAMINO_LENDING_PROGRAM) {
-    const keys = [
-        {
-            pubkey: accounts.lendingMarket,
-            isSigner: false,
-            isWritable: false
-        },
-        {
-            pubkey: accounts.obligation,
-            isSigner: false,
-            isWritable: true
-        }
-    ];
-    accounts.reserves.forEach((reserve)=>{
-        keys.push({
-            pubkey: reserve,
-            isSigner: false,
-            isWritable: false
-        });
-    });
-    const identifier = Buffer.from([
-        33,
-        132,
-        147,
-        228,
-        151,
-        192,
-        72,
-        89
-    ]);
-    const data = identifier;
-    const ix = new web3_js.TransactionInstruction({
-        keys,
-        programId,
-        data
-    });
-    return ix;
-}
-function refreshReserve(accounts, programId = KAMINO_LENDING_PROGRAM) {
-    const keys = [
-        {
-            pubkey: accounts.reserve,
-            isSigner: false,
-            isWritable: true
-        },
-        {
-            pubkey: accounts.lendingMarket,
-            isSigner: false,
-            isWritable: false
-        },
-        {
-            pubkey: accounts.pythOracle,
-            isSigner: false,
-            isWritable: false
-        },
-        {
-            pubkey: accounts.switchboardPriceOracle,
-            isSigner: false,
-            isWritable: false
-        },
-        {
-            pubkey: accounts.switchboardTwapOracle,
-            isSigner: false,
-            isWritable: false
-        },
-        {
-            pubkey: accounts.scopePrices,
-            isSigner: false,
-            isWritable: false
-        }
-    ];
-    const identifier = Buffer.from([
-        2,
-        218,
-        138,
-        235,
-        79,
-        201,
-        25,
-        102
-    ]);
-    const data = identifier;
-    const ix = new web3_js.TransactionInstruction({
-        keys,
-        programId,
-        data
-    });
-    return ix;
-}
-function refreshObligationFarmsForReserve(args, accounts, programId = KAMINO_LENDING_PROGRAM) {
-    const keys = [
-        {
-            pubkey: accounts.crank,
-            isSigner: true,
-            isWritable: false
-        },
-        {
-            pubkey: accounts.baseAccounts.obligation,
-            isSigner: false,
-            isWritable: false
-        },
-        {
-            pubkey: accounts.baseAccounts.lendingMarketAuthority,
-            isSigner: false,
-            isWritable: true
-        },
-        {
-            pubkey: accounts.baseAccounts.reserve,
-            isSigner: false,
-            isWritable: false
-        },
-        {
-            pubkey: accounts.baseAccounts.reserveFarmState,
-            isSigner: false,
-            isWritable: true
-        },
-        {
-            pubkey: accounts.baseAccounts.obligationFarmUserState,
-            isSigner: false,
-            isWritable: true
-        },
-        {
-            pubkey: accounts.baseAccounts.lendingMarket,
-            isSigner: false,
-            isWritable: false
-        },
-        {
-            pubkey: accounts.farmsProgram,
-            isSigner: false,
-            isWritable: false
-        },
-        {
-            pubkey: accounts.rent,
-            isSigner: false,
-            isWritable: false
-        },
-        {
-            pubkey: accounts.systemProgram,
-            isSigner: false,
-            isWritable: false
-        }
-    ];
-    const identifier = Buffer.from([
-        140,
-        144,
-        253,
-        21,
-        10,
-        74,
-        248,
-        3
-    ]);
-    const buffer = Buffer.alloc(1000);
-    const layout = borsh__namespace.struct([
-        borsh__namespace.u8("mode")
-    ]);
-    const len = layout.encode({
-        mode: args.mode
-    }, buffer);
-    const data = Buffer.concat([
-        identifier,
-        buffer
-    ]).subarray(0, 8 + len);
-    const ix = new web3_js.TransactionInstruction({
-        keys,
-        programId,
-        data
-    });
-    return ix;
-}
 class KaminoLendingClient {
     /**
    * Initializes Kamino user metadata
@@ -20022,8 +20008,228 @@ class KaminoLendingClient {
         ], KAMINO_FARM_PROGRAM);
         return obligationFarm;
     }
+    refreshObligationIx(accounts, programId = KAMINO_LENDING_PROGRAM) {
+        const keys = [
+            {
+                pubkey: accounts.lendingMarket,
+                isSigner: false,
+                isWritable: false
+            },
+            {
+                pubkey: accounts.obligation,
+                isSigner: false,
+                isWritable: true
+            }
+        ];
+        accounts.reserves.forEach((reserve)=>{
+            keys.push({
+                pubkey: reserve,
+                isSigner: false,
+                isWritable: false
+            });
+        });
+        const identifier = Buffer.from([
+            33,
+            132,
+            147,
+            228,
+            151,
+            192,
+            72,
+            89
+        ]);
+        const data = identifier;
+        return new web3_js.TransactionInstruction({
+            keys,
+            programId,
+            data
+        });
+    }
+    refreshReserveIx(accounts, programId = KAMINO_LENDING_PROGRAM) {
+        const keys = [
+            {
+                pubkey: accounts.reserve,
+                isSigner: false,
+                isWritable: true
+            },
+            {
+                pubkey: accounts.lendingMarket,
+                isSigner: false,
+                isWritable: false
+            },
+            {
+                pubkey: accounts.pythOracle,
+                isSigner: false,
+                isWritable: false
+            },
+            {
+                pubkey: accounts.switchboardPriceOracle,
+                isSigner: false,
+                isWritable: false
+            },
+            {
+                pubkey: accounts.switchboardTwapOracle,
+                isSigner: false,
+                isWritable: false
+            },
+            {
+                pubkey: accounts.scopePrices,
+                isSigner: false,
+                isWritable: false
+            }
+        ];
+        const identifier = Buffer.from([
+            2,
+            218,
+            138,
+            235,
+            79,
+            201,
+            25,
+            102
+        ]);
+        const data = identifier;
+        return new web3_js.TransactionInstruction({
+            keys,
+            programId,
+            data
+        });
+    }
+    refreshObligationFarmsForReserveIx(args, accounts, programId = KAMINO_LENDING_PROGRAM) {
+        const keys = [
+            {
+                pubkey: accounts.crank,
+                isSigner: true,
+                isWritable: false
+            },
+            {
+                pubkey: accounts.baseAccounts.obligation,
+                isSigner: false,
+                isWritable: false
+            },
+            {
+                pubkey: accounts.baseAccounts.lendingMarketAuthority,
+                isSigner: false,
+                isWritable: true
+            },
+            {
+                pubkey: accounts.baseAccounts.reserve,
+                isSigner: false,
+                isWritable: false
+            },
+            {
+                pubkey: accounts.baseAccounts.reserveFarmState,
+                isSigner: false,
+                isWritable: true
+            },
+            {
+                pubkey: accounts.baseAccounts.obligationFarmUserState,
+                isSigner: false,
+                isWritable: true
+            },
+            {
+                pubkey: accounts.baseAccounts.lendingMarket,
+                isSigner: false,
+                isWritable: false
+            },
+            {
+                pubkey: accounts.farmsProgram,
+                isSigner: false,
+                isWritable: false
+            },
+            {
+                pubkey: accounts.rent,
+                isSigner: false,
+                isWritable: false
+            },
+            {
+                pubkey: accounts.systemProgram,
+                isSigner: false,
+                isWritable: false
+            }
+        ];
+        const identifier = Buffer.from([
+            140,
+            144,
+            253,
+            21,
+            10,
+            74,
+            248,
+            3
+        ]);
+        const buffer = Buffer.alloc(1000);
+        const layout = borsh__namespace.struct([
+            borsh__namespace.u8("mode")
+        ]);
+        const len = layout.encode({
+            mode: args.mode
+        }, buffer);
+        const data = Buffer.concat([
+            identifier,
+            buffer
+        ]).subarray(0, 8 + len);
+        return new web3_js.TransactionInstruction({
+            keys,
+            programId,
+            data
+        });
+    }
+    refreshReservesBatchIx(reserves, lendingMarkets, skipPriceUpdates, programId = KAMINO_LENDING_PROGRAM) {
+        const keys = [];
+        for(let i = 0; i < reserves.length; i++){
+            keys.push({
+                pubkey: reserves[i],
+                isSigner: false,
+                isWritable: false
+            });
+            keys.push({
+                pubkey: lendingMarkets[i],
+                isSigner: false,
+                isWritable: true
+            });
+            if (!skipPriceUpdates) {
+                [
+                    KAMINO_LENDING_PROGRAM,
+                    KAMINO_LENDING_PROGRAM,
+                    KAMINO_LENDING_PROGRAM,
+                    KAMINO_SCOPE_PRICES
+                ].forEach((p)=>keys.push({
+                        pubkey: p,
+                        isSigner: false,
+                        isWritable: false
+                    }));
+            }
+        }
+        const identifier = Buffer.from([
+            144,
+            110,
+            26,
+            103,
+            162,
+            204,
+            252,
+            147
+        ]);
+        const buffer = Buffer.alloc(1000);
+        const layout = borsh__namespace.struct([
+            borsh__namespace.bool("skipPriceUpdates")
+        ]);
+        const len = layout.encode({
+            skipPriceUpdates
+        }, buffer);
+        const data = Buffer.concat([
+            identifier,
+            buffer
+        ]).subarray(0, 8 + len);
+        return new web3_js.TransactionInstruction({
+            keys,
+            programId,
+            data
+        });
+    }
     refreshReserveIxs(lendingMarket, reserves) {
-        return reserves.map((reserve)=>refreshReserve({
+        return reserves.map((reserve)=>this.refreshReserveIx({
                 reserve,
                 lendingMarket,
                 pythOracle: KAMINO_LENDING_PROGRAM,
@@ -20039,7 +20245,7 @@ class KaminoLendingClient {
                 farmCollateral
             ].filter((farm)=>!!farm).map((farm)=>{
                 const obligationFarmUserState = this.getObligationFarmState(obligation, farm);
-                return refreshObligationFarmsForReserve({
+                return this.refreshObligationFarmsForReserveIx({
                     mode: 0
                 }, {
                     crank: this.base.getSigner(),
@@ -20065,7 +20271,7 @@ class KaminoLendingClient {
                 farmDebt
             ].filter((farm)=>!!farm).map((farm)=>{
                 const obligationFarmUserState = this.getObligationFarmState(obligation, farm);
-                return refreshObligationFarmsForReserve({
+                return this.refreshObligationFarmsForReserveIx({
                     mode: 0
                 }, {
                     crank: this.base.getSigner(),
@@ -20351,7 +20557,7 @@ class KaminoLendingClient {
         // Refresh reserves, including deposit reserve and reserves in use
         preInstructions.push(...this.refreshReserveIxs(market, reservesToRefresh));
         // Refresh obligation with reserves in use
-        preInstructions.push(refreshObligation({
+        preInstructions.push(this.refreshObligationIx({
             lendingMarket: market,
             obligation,
             reserves: reservesInUse
@@ -20441,7 +20647,7 @@ class KaminoLendingClient {
         // Refresh reserves, including deposit reserve and reserves in use
         preInstructions.push(...this.refreshReserveIxs(market, reservesToRefresh));
         // Refresh obligation with reserves in use
-        preInstructions.push(refreshObligation({
+        preInstructions.push(this.refreshObligationIx({
             lendingMarket: market,
             obligation,
             reserves: reservesInUse
@@ -20525,7 +20731,7 @@ class KaminoLendingClient {
         // Refresh reserves, including deposit reserve and reserves in use
         preInstructions.push(...this.refreshReserveIxs(market, reservesToRefresh));
         // Refresh obligation with reserves in use
-        preInstructions.push(refreshObligation({
+        preInstructions.push(this.refreshObligationIx({
             lendingMarket: market,
             obligation,
             reserves: reservesInUse
@@ -20607,7 +20813,7 @@ class KaminoLendingClient {
         // Refresh reserves, including deposit reserve and reserves in use
         preInstructions.push(...this.refreshReserveIxs(market, reservesToRefresh));
         // Refresh obligation with reserves in use
-        preInstructions.push(refreshObligation({
+        preInstructions.push(this.refreshObligationIx({
             lendingMarket: market,
             obligation,
             reserves: reservesInUse
@@ -20810,7 +21016,7 @@ class KaminoVaultsClient {
         if (this.vaultStates.size === 0) {
             await this.findAndParseKaminoVaults();
         }
-        return mints.map((mint)=>this.shareMintToVaultPdaMap.get(mint.toBase58()));
+        return mints.map((mint)=>this.shareMintToVaultPdaMap.get(mint.toBase58())).filter((p)=>!!p);
     }
     async fetchAndParseVaultState(vault) {
         const vaultAccount = await this.base.provider.connection.getAccountInfo(vault);
@@ -21365,6 +21571,21 @@ class InvestClient {
 }
 
 class PriceClient {
+    get stateModel() {
+        if (!this._stateModel) {
+            throw new Error("State model not cached");
+        }
+        return this._stateModel;
+    }
+    set stateModel(stateModel) {
+        this._stateModel = stateModel;
+    }
+    get lookupTables() {
+        return Array.from(this._lookupTables).map((k)=>new web3_js.PublicKey(k));
+    }
+    get kaminoVaults() {
+        return Array.from(this._kaminoVaults).map((k)=>new web3_js.PublicKey(k));
+    }
     /**
    * !! This is a convenience method that calculates the AUM of the vault based on priced assets.
    * !! It doesn't reflect the actual AUM of the vault.
@@ -21408,7 +21629,7 @@ class PriceClient {
     async priceKaminoVaultSharesIx(priceDenom) {
         const allKvaultStates = await this.kvaults.findAndParseKaminoVaults();
         const allKvaultMints = allKvaultStates.map((kvault)=>kvault.sharesMint);
-        // All share token accounts GLAM vault could possibly hold
+        // All kvaut share token accounts GLAM vault could possibly hold
         const possibleShareAtas = allKvaultMints.map((mint)=>this.base.getVaultAta(mint));
         const possibleShareAtaAccountsInfo = await this.base.provider.connection.getMultipleAccountsInfo(possibleShareAtas);
         const shareAtas = [];
@@ -21416,16 +21637,24 @@ class PriceClient {
         const kvaultStates = [];
         const oracles = []; // oracle of kvault deposit token
         possibleShareAtaAccountsInfo.forEach((info, i)=>{
-            if (info !== null) {
+            // share ata must exist and it must be tracked by glam state
+            // otherwise skip it for pricing
+            if (info !== null && this.stateModel.externalVaultAccounts?.find((a)=>a.equals(possibleShareAtas[i]))) {
                 shareAtas.push(possibleShareAtas[i]);
                 shareMints.push(allKvaultMints[i]);
                 kvaultStates.push(allKvaultStates[i]);
-                const { tokenMint } = allKvaultStates[i];
+                // get oracle and lookup table from kvault state
+                const { tokenMint, vaultLookupTable } = allKvaultStates[i];
                 const assetMeta = ASSETS_MAINNET.get(tokenMint.toBase58());
-                oracles.push(assetMeta?.oracle);
+                if (!assetMeta || !assetMeta.oracle) {
+                    throw new Error(`Oracle unavailable for asset ${tokenMint}`);
+                }
+                oracles.push(assetMeta.oracle);
+                this._lookupTables.add(vaultLookupTable.toBase58()); // cache lookup table
             }
         });
         const kvaultPdas = await this.kvaults.getVaultPdasByShareMints(shareMints);
+        kvaultPdas.forEach((p)=>this._kaminoVaults.add(p.toBase58())); // cache kvault keys
         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++){
@@ -21446,7 +21675,8 @@ class PriceClient {
             return this.kvaults.composeRemainingAccounts(kvault.vaultAllocationStrategy.filter((alloc)=>!alloc.reserve.equals(web3_js.PublicKey.default)), true);
         }))).flat();
         const processed = new Set();
-        const preInstructions = [];
+        const reserves = [];
+        const markets = [];
         const chunkSize = 2;
         for(let i = 0; i < marketsAndReserves.length; i += chunkSize){
             const chunk = marketsAndReserves.slice(i, i + chunkSize);
@@ -21454,15 +21684,17 @@ class PriceClient {
             const reserve = chunk[1].pubkey;
             // reserve should always be added to remaining accounts
             remainingAccounts.push(chunk[1]);
-            // each reserve should only be refreshed once
+            // record reserves and markets for refreshReservesBatchIx
             if (!processed.has(reserve.toBase58())) {
-                const ix = this.klend.refreshReserveIxs(market, [
-                    reserve
-                ]);
-                preInstructions.push(...ix);
+                reserves.push(reserve);
+                markets.push(market);
                 processed.add(reserve.toBase58());
             }
         }
+        const refreshReservesIx = this.klend.refreshReservesBatchIx(reserves, markets, false);
+        const preInstructions = [
+            refreshReservesIx
+        ];
         const priceIx = await this.base.program.methods.priceKaminoVaultShares(priceDenom, shareAtas.length).accounts({
             glamState: this.base.statePda,
             solOracle: SOL_ORACLE
@@ -21549,7 +21781,23 @@ 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.priceVaultTokens(priceDenom).accounts({
+        const aggIndexes = [];
+        const chunkSize = 3;
+        for(let i = 0; i < remainingAccounts.length; i += chunkSize){
+            const chunk = remainingAccounts.slice(i, i + chunkSize);
+            const mint = chunk[1].pubkey;
+            const aggIndex = ASSETS_MAINNET.get(mint.toBase58())?.aggIndex || -1;
+            aggIndexes.push(aggIndex);
+        }
+        // Add oracle mapping if agg oracle is used for any token
+        if (aggIndexes.find((i)=>i >= 0)) {
+            remainingAccounts.push({
+                pubkey: new web3_js.PublicKey("Chpu5ZgfWX5ZzVpUx9Xvv4WPM75Xd7zPJNDPsFnCpLpk"),
+                isSigner: false,
+                isWritable: false
+            });
+        }
+        const priceVaultIx = await this.base.program.methods.priceVaultTokens(priceDenom, aggIndexes).accounts({
             glamState: this.base.statePda,
             solOracle: SOL_ORACLE
         }).remainingAccounts(remainingAccounts).instruction();
@@ -21599,18 +21847,20 @@ class PriceClient {
         }
         // If there are no external assets, we don't need to price DeFi positions
         const stateModel = await this.base.fetchStateModel();
-        if ((stateModel.externalVaultAccounts || []).length === 0) {
+        this.stateModel = stateModel;
+        if ((this.stateModel.externalVaultAccounts || []).length === 0) {
             return [
                 priceVaultIx
             ];
         }
         const integrations = (stateModel.integrations || []).map((i)=>Object.keys(i)[0]);
         const integrationsToPricingFns = {
-            // drift: this.priceDriftUsersIx.bind(this),
-            // kaminoLending: this.priceKaminoObligationsIx.bind(this),
-            // nativeStaking: this.priceStakesIx.bind(this),
-            // meteoraDlmm: this.priceMeteoraPositionsIx.bind(this),
-            driftVaults: this.priceDriftVaultDepositorsIx.bind(this)
+            drift: this.priceDriftUsersIx.bind(this),
+            kaminoLending: this.priceKaminoObligationsIx.bind(this),
+            nativeStaking: this.priceStakesIx.bind(this),
+            meteoraDlmm: this.priceMeteoraPositionsIx.bind(this),
+            driftVaults: this.priceDriftVaultDepositorsIx.bind(this),
+            kaminoVaults: this.priceKaminoVaultSharesIx.bind(this)
         };
         const pricingFns = integrations.map((integration)=>integrationsToPricingFns[integration]).filter(Boolean);
         const pricingIxs = [
@@ -21742,6 +21992,9 @@ class PriceClient {
         this.kvaults = kvaults;
         this.drift = drift;
         this.dvaults = dvaults;
+        this._stateModel = null;
+        this._lookupTables = new Set();
+        this._kaminoVaults = new Set();
     }
 }
 
@@ -22163,8 +22416,10 @@ exports.getOpenfundsPda = getOpenfundsPda;
 exports.getOrderParams = getOrderParams;
 exports.getPriorityFeeEstimate = getPriorityFeeEstimate;
 exports.getSimulationResult = getSimulationResult;
+exports.getSolAndTokenBalances = getSolAndTokenBalances;
 exports.getStakeAccountsWithStates = getStakeAccountsWithStates;
 exports.getStatePda = getStatePda;
+exports.getTokenAccountsByOwner = getTokenAccountsByOwner;
 exports.getTriggerLimitOrderParams = getTriggerLimitOrderParams;
 exports.getTriggerMarketOrderParams = getTriggerMarketOrderParams;
 exports.getVariant = getVariant;