@glamsystems/glam-sdk 0.1.29 → 0.1.30

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.33",
+    version: "0.4.35",
     spec: "0.1.0",
     description: "Glam Protocol"
 };
@@ -6900,7 +6900,9 @@ var instructions = [
         docs: [
             "Extra accounts for pricing N vault depositors:",
             "- (vault_depositor, drift_vault, drift_user) x N",
-            "- markets and oracles used by all drift users (no specific order)"
+            "- spot_market used by drift users of vaults (no specific order)",
+            "- perp markets used by drift users of vaults (no specific order)",
+            "- oracles of spot markets and perp markets (no specific order)"
         ],
         discriminator: [
             234,
@@ -7021,6 +7023,14 @@ var instructions = [
             {
                 name: "num_vault_depositors",
                 type: "u8"
+            },
+            {
+                name: "num_spot_markets",
+                type: "u8"
+            },
+            {
+                name: "num_perp_markets",
+                type: "u8"
             }
         ]
     },
@@ -7167,9 +7177,14 @@ var instructions = [
     {
         name: "price_kamino_vault_shares",
         docs: [
+            "Price Kamino vault shares.",
+            "- `num_vaults` Number of kamino vaults to price.",
+            "",
             "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"
+            "- reserve x M",
+            "- M = number of reserves used by all kvaults' allocations",
+            "- reserve pubkeys must follow the same order of reserves used by each allocation"
         ],
         discriminator: [
             112,
@@ -7212,10 +7227,6 @@ var instructions = [
                 writable: true,
                 signer: true
             },
-            {
-                name: "kamino_lending_program",
-                address: "KLend2g3cP87fffoy8q1mQqGKjrxjC8boSyAYavgmjD"
-            },
             {
                 name: "sol_oracle"
             },
@@ -7280,22 +7291,6 @@ var instructions = [
                         ]
                     }
                 }
-            },
-            {
-                name: "pyth_oracle",
-                optional: true
-            },
-            {
-                name: "switchboard_price_oracle",
-                optional: true
-            },
-            {
-                name: "switchboard_twap_oracle",
-                optional: true
-            },
-            {
-                name: "scope_prices",
-                optional: true
             }
         ],
         args: [
@@ -9608,6 +9603,10 @@ var instructions = [
             {
                 name: "stake_history",
                 address: "SysvarStakeHistory1111111111111111111111111"
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
             }
         ],
         args: [
@@ -15604,12 +15603,12 @@ class BaseClient {
             const { t: lookupTables } = data;
             const pubkeys = Object.keys(lookupTables);
             if (pubkeys.length > 0) {
-                return await this.fetchAdressLookupTableAccounts(pubkeys);
+                return await this.fetchAddressLookupTableAccounts(pubkeys);
             }
         }
         const tablePubkey = STATES_LOOKUP_TABLES_MAP.get(this.statePda.toBase58());
         if (tablePubkey) {
-            return await this.fetchAdressLookupTableAccounts([
+            return await this.fetchAddressLookupTableAccounts([
                 tablePubkey
             ]);
         }
@@ -15660,12 +15659,12 @@ class BaseClient {
         }
         const lookupTableAccounts = [];
         if (lookupTables.every((t)=>t instanceof web3_js.AddressLookupTableAccount)) {
-            const accounts = await this.fetchAdressLookupTableAccounts([
+            const accounts = await this.fetchAddressLookupTableAccounts([
                 ...LOOKUP_TABLES
             ]);
             lookupTableAccounts.push(...lookupTables, ...accounts);
         } else {
-            const accounts = await this.fetchAdressLookupTableAccounts([
+            const accounts = await this.fetchAddressLookupTableAccounts([
                 ...lookupTables,
                 ...LOOKUP_TABLES
             ]);
@@ -15749,7 +15748,7 @@ class BaseClient {
    *
    * @param pubkeys Array of lookup table public keys.
    * @returns
-   */ async fetchAdressLookupTableAccounts(pubkeys) {
+   */ async fetchAddressLookupTableAccounts(pubkeys) {
         if (!pubkeys) {
             throw new Error("addressLookupTableAddresses is undefined");
         }
@@ -20824,9 +20823,7 @@ class KaminoVaultsClient {
         return vaultState;
     }
     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 reserves = allocationStrategies.map((strategy)=>strategy.reserve);
         const parsedReserves = await this.kaminoLending.fetchAndParseReserves(reserves);
         const reserveMetas = reserves.map((pubkey)=>({
                 pubkey,
@@ -21439,26 +21436,41 @@ class PriceClient {
                 oracles[i]
             ].map((pubkey)=>{
                 remainingAccounts.push({
-                    pubkey,
+                    pubkey: pubkey,
                     isSigner: false,
                     isWritable: false
                 });
             });
         }
-        // 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 processed = new Set();
+        const preInstructions = [];
+        const chunkSize = 2;
+        for(let i = 0; i < marketsAndReserves.length; i += chunkSize){
+            const chunk = marketsAndReserves.slice(i, i + chunkSize);
+            const market = chunk[0].pubkey;
+            const reserve = chunk[1].pubkey;
+            // reserve should always be added to remaining accounts
+            remainingAccounts.push(chunk[1]);
+            // each reserve should only be refreshed once
+            if (!processed.has(reserve.toBase58())) {
+                const ix = this.klend.refreshReserveIxs(market, [
+                    reserve
+                ]);
+                preInstructions.push(...ix);
+                processed.add(reserve.toBase58());
+            }
+        }
         const priceIx = await this.base.program.methods.priceKaminoVaultShares(priceDenom, shareAtas.length).accounts({
             glamState: this.base.statePda,
-            solOracle: SOL_ORACLE,
-            pythOracle: null,
-            switchboardPriceOracle: null,
-            switchboardTwapOracle: null,
-            scopePrices: KAMINO_SCOPE_PRICES
+            solOracle: SOL_ORACLE
         }).remainingAccounts(remainingAccounts).instruction();
-        return priceIx;
+        return [
+            ...preInstructions,
+            priceIx
+        ];
     }
     /**
    * Returns an instruction that prices all Drift users (aka sub-accounts) controlled by the GLAM vault.
@@ -21526,43 +21538,8 @@ class PriceClient {
         if (parsedVaultDepositors.length === 0) {
             return null;
         }
-        // For each vault deposit, we need the following pubkeys in remaining accounts:
-        // - depositor
-        // - drift vault
-        // - drift user of the vault
-        // - oracles
-        // - spot & perp markets
-        // There might be overlaps between markets and oracles so we use a set to avoid duplicates
-        const remainingAccounts = [];
-        const marketsAndOracles = new Set();
-        for (const depositor of parsedVaultDepositors){
-            const { user: driftUser } = await this.dvaults.parseDriftVault(depositor.driftVault);
-            remainingAccounts.push({
-                pubkey: depositor.address,
-                isSigner: false,
-                isWritable: false
-            });
-            remainingAccounts.push({
-                pubkey: depositor.driftVault,
-                isSigner: false,
-                isWritable: false
-            });
-            remainingAccounts.push({
-                pubkey: driftUser,
-                isSigner: false,
-                isWritable: false
-            });
-            const markets_and_oracles = (await this.dvaults.composeRemainingAccounts(driftUser)).map((a)=>a.pubkey.toBase58());
-            for (const k of markets_and_oracles){
-                marketsAndOracles.add(k);
-            }
-        }
-        Array.from(marketsAndOracles).forEach((k)=>remainingAccounts.push({
-                pubkey: new web3_js.PublicKey(k),
-                isSigner: false,
-                isWritable: false
-            }));
-        const priceIx = await this.base.program.methods.priceDriftVaultDepositors(priceDenom, parsedVaultDepositors.length).accounts({
+        const { remainingAccounts, numSpotMarkets, numPerpMarkets } = await this.remainingAccountsForPricingDriftVaultDepositors(parsedVaultDepositors);
+        const priceIx = await this.base.program.methods.priceDriftVaultDepositors(priceDenom, parsedVaultDepositors.length, numSpotMarkets, numPerpMarkets).accounts({
             glamState: this.base.statePda,
             solOracle: SOL_ORACLE
         }).remainingAccounts(remainingAccounts).instruction();
@@ -21629,12 +21606,11 @@ class PriceClient {
         }
         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),
-            kaminoVaults: this.priceKaminoVaultSharesIx.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)
         };
         const pricingFns = integrations.map((integration)=>integrationsToPricingFns[integration]).filter(Boolean);
         const pricingIxs = [
@@ -21642,72 +21618,130 @@ class PriceClient {
         ];
         for (const fn of pricingFns){
             const ix = await fn(priceDenom);
-            pricingIxs.push(ix);
+            if (Array.isArray(ix)) {
+                pricingIxs.push(...ix);
+            } else {
+                pricingIxs.push(ix);
+            }
         }
         return pricingIxs.filter(Boolean);
     }
+    async remainingAccountsForPricingDriftVaultDepositors(parsedVaultDepositors) {
+        // Extra accounts for pricing N vault depositors:
+        // - (vault_depositor, drift_vault, drift_user) x N
+        // - spot_market used by drift users of vaults (no specific order)
+        // - perp markets used by drift users of vaults (no specific order)
+        // - oracles of spot markets and perp markets (no specific order)
+        const remainingAccounts = [];
+        const spotMarketsSet = new Set();
+        const perpMarketsSet = new Set();
+        const oraclesSet = new Set();
+        for (const { address: depositor, driftVault } of parsedVaultDepositors){
+            const { user } = await this.dvaults.parseDriftVault(driftVault); // get drift user used by the vault
+            [
+                depositor,
+                driftVault,
+                user
+            ].forEach((k)=>remainingAccounts.push({
+                    pubkey: k,
+                    isSigner: false,
+                    isWritable: false
+                }));
+            const { spotPositions, perpPositions } = await this.dvaults.fetchUserPositions(user);
+            const spotMarketIndexes = spotPositions.map((p)=>p.marketIndex);
+            const perpMarketIndexes = perpPositions.map((p)=>p.marketIndex);
+            // If there are perp positions, add spot market 0 as it's used as quote market for perp
+            if (perpMarketIndexes.length > 0 && !spotMarketIndexes.includes(0)) {
+                spotMarketIndexes.push(0);
+            }
+            const spotMarkets = await this.drift.fetchAndParseSpotMarkets(spotMarketIndexes);
+            const perpMarkets = await this.drift.fetchAndParsePerpMarkets(perpMarketIndexes);
+            spotMarkets.forEach((m)=>{
+                oraclesSet.add(m.oracle.toBase58());
+                spotMarketsSet.add(m.marketPda.toBase58());
+            });
+            perpMarkets.forEach((m)=>{
+                oraclesSet.add(m.oracle.toBase58());
+                perpMarketsSet.add(m.marketPda.toBase58());
+            });
+        }
+        [
+            ...spotMarketsSet,
+            ...perpMarketsSet,
+            ...oraclesSet
+        ].forEach((k)=>remainingAccounts.push({
+                pubkey: new web3_js.PublicKey(k),
+                isSigner: false,
+                isWritable: false
+            }));
+        return {
+            remainingAccounts,
+            numSpotMarkets: spotMarketsSet.size,
+            numPerpMarkets: perpMarketsSet.size
+        };
+    }
+    async remainingAccountsForPricingMeteora() {
+        const positions = await fetchMeteoraPositions(this.base.provider.connection, this.base.vaultPda);
+        let chunks = await Promise.all(positions.map(async (pubkey)=>{
+            const { lbPair, binArrayLower, binArrayUpper } = await parseMeteoraPosition(this.base.provider.connection, pubkey);
+            return [
+                pubkey,
+                lbPair,
+                binArrayLower,
+                binArrayUpper,
+                SOL_ORACLE,
+                USDC_ORACLE
+            ].map((k)=>({
+                    pubkey: k,
+                    isSigner: false,
+                    isWritable: false
+                }));
+        }));
+        return chunks.flat();
+    }
+    async remainingAccountsForPricingVaultAssets(baseAssetOnly = false) {
+        const stateModel = await this.base.fetchStateModel();
+        if (baseAssetOnly) {
+            if (!stateModel.baseAsset) {
+                throw new Error("Base asset not configured for the vault");
+            }
+            // FIXME: support token 2022 base asset
+            const ata = this.base.getVaultAta(stateModel.baseAsset);
+            // Set oracle to default pubkey (aka system program) to indicate oracle isn't needed
+            return [
+                ata,
+                stateModel.baseAsset,
+                web3_js.PublicKey.default
+            ].map((k)=>({
+                    pubkey: k,
+                    isSigner: false,
+                    isWritable: false
+                }));
+        }
+        const assetsForPricing = (stateModel.borrowableAssets || []).concat(stateModel.assets || []);
+        return assetsForPricing.map((mint)=>{
+            const assetMeta = ASSETS_MAINNET.get(mint.toBase58());
+            if (!assetMeta) {
+                throw new Error(`Asset meta not found for ${mint}`);
+            }
+            const ata = this.base.getVaultAta(mint, assetMeta?.programId);
+            return [
+                ata,
+                mint,
+                assetMeta?.oracle
+            ];
+        }).flat().map((a)=>({
+                pubkey: a,
+                isSigner: false,
+                isWritable: false
+            }));
+    }
     constructor(base, klend, kvaults, drift, dvaults){
         this.base = base;
         this.klend = klend;
         this.kvaults = kvaults;
         this.drift = drift;
         this.dvaults = dvaults;
-        this.remainingAccountsForPricingMeteora = async ()=>{
-            const positions = await fetchMeteoraPositions(this.base.provider.connection, this.base.vaultPda);
-            let chunks = await Promise.all(positions.map(async (pubkey)=>{
-                const { lbPair, binArrayLower, binArrayUpper } = await parseMeteoraPosition(this.base.provider.connection, pubkey);
-                return [
-                    pubkey,
-                    lbPair,
-                    binArrayLower,
-                    binArrayUpper,
-                    SOL_ORACLE,
-                    USDC_ORACLE
-                ].map((k)=>({
-                        pubkey: k,
-                        isSigner: false,
-                        isWritable: false
-                    }));
-            }));
-            return chunks.flat();
-        };
-        this.remainingAccountsForPricingVaultAssets = async (baseAssetOnly = false)=>{
-            const stateModel = await this.base.fetchStateModel();
-            if (baseAssetOnly) {
-                if (!stateModel.baseAsset) {
-                    throw new Error("Base asset not configured for the vault");
-                }
-                // FIXME: support token 2022 base asset
-                const ata = this.base.getVaultAta(stateModel.baseAsset);
-                // Set oracle to default pubkey (aka system program) to indicate oracle isn't needed
-                return [
-                    ata,
-                    stateModel.baseAsset,
-                    web3_js.PublicKey.default
-                ].map((k)=>({
-                        pubkey: k,
-                        isSigner: false,
-                        isWritable: false
-                    }));
-            }
-            const assetsForPricing = (stateModel.borrowableAssets || []).concat(stateModel.assets || []);
-            return assetsForPricing.map((mint)=>{
-                const assetMeta = ASSETS_MAINNET.get(mint.toBase58());
-                if (!assetMeta) {
-                    throw new Error(`Asset meta not found for ${mint}`);
-                }
-                const ata = this.base.getVaultAta(mint, assetMeta?.programId);
-                return [
-                    ata,
-                    mint,
-                    assetMeta?.oracle
-                ];
-            }).flat().map((a)=>({
-                    pubkey: a,
-                    isSigner: false,
-                    isWritable: false
-                }));
-        };
     }
 }
 

package/index.esm.js

@@ -14,7 +14,7 @@ import { getStakePoolAccount } from '@solana/spl-stake-pool';
 var address = "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc";
 var metadata = {
     name: "glam_protocol",
-    version: "0.4.33",
+    version: "0.4.35",
     spec: "0.1.0",
     description: "Glam Protocol"
 };
@@ -6880,7 +6880,9 @@ var instructions = [
         docs: [
             "Extra accounts for pricing N vault depositors:",
             "- (vault_depositor, drift_vault, drift_user) x N",
-            "- markets and oracles used by all drift users (no specific order)"
+            "- spot_market used by drift users of vaults (no specific order)",
+            "- perp markets used by drift users of vaults (no specific order)",
+            "- oracles of spot markets and perp markets (no specific order)"
         ],
         discriminator: [
             234,
@@ -7001,6 +7003,14 @@ var instructions = [
             {
                 name: "num_vault_depositors",
                 type: "u8"
+            },
+            {
+                name: "num_spot_markets",
+                type: "u8"
+            },
+            {
+                name: "num_perp_markets",
+                type: "u8"
             }
         ]
     },
@@ -7147,9 +7157,14 @@ var instructions = [
     {
         name: "price_kamino_vault_shares",
         docs: [
+            "Price Kamino vault shares.",
+            "- `num_vaults` Number of kamino vaults to price.",
+            "",
             "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"
+            "- reserve x M",
+            "- M = number of reserves used by all kvaults' allocations",
+            "- reserve pubkeys must follow the same order of reserves used by each allocation"
         ],
         discriminator: [
             112,
@@ -7192,10 +7207,6 @@ var instructions = [
                 writable: true,
                 signer: true
             },
-            {
-                name: "kamino_lending_program",
-                address: "KLend2g3cP87fffoy8q1mQqGKjrxjC8boSyAYavgmjD"
-            },
             {
                 name: "sol_oracle"
             },
@@ -7260,22 +7271,6 @@ var instructions = [
                         ]
                     }
                 }
-            },
-            {
-                name: "pyth_oracle",
-                optional: true
-            },
-            {
-                name: "switchboard_price_oracle",
-                optional: true
-            },
-            {
-                name: "switchboard_twap_oracle",
-                optional: true
-            },
-            {
-                name: "scope_prices",
-                optional: true
             }
         ],
         args: [
@@ -9588,6 +9583,10 @@ var instructions = [
             {
                 name: "stake_history",
                 address: "SysvarStakeHistory1111111111111111111111111"
+            },
+            {
+                name: "system_program",
+                address: "11111111111111111111111111111111"
             }
         ],
         args: [
@@ -15584,12 +15583,12 @@ class BaseClient {
             const { t: lookupTables } = data;
             const pubkeys = Object.keys(lookupTables);
             if (pubkeys.length > 0) {
-                return await this.fetchAdressLookupTableAccounts(pubkeys);
+                return await this.fetchAddressLookupTableAccounts(pubkeys);
             }
         }
         const tablePubkey = STATES_LOOKUP_TABLES_MAP.get(this.statePda.toBase58());
         if (tablePubkey) {
-            return await this.fetchAdressLookupTableAccounts([
+            return await this.fetchAddressLookupTableAccounts([
                 tablePubkey
             ]);
         }
@@ -15640,12 +15639,12 @@ class BaseClient {
         }
         const lookupTableAccounts = [];
         if (lookupTables.every((t)=>t instanceof AddressLookupTableAccount)) {
-            const accounts = await this.fetchAdressLookupTableAccounts([
+            const accounts = await this.fetchAddressLookupTableAccounts([
                 ...LOOKUP_TABLES
             ]);
             lookupTableAccounts.push(...lookupTables, ...accounts);
         } else {
-            const accounts = await this.fetchAdressLookupTableAccounts([
+            const accounts = await this.fetchAddressLookupTableAccounts([
                 ...lookupTables,
                 ...LOOKUP_TABLES
             ]);
@@ -15729,7 +15728,7 @@ class BaseClient {
    *
    * @param pubkeys Array of lookup table public keys.
    * @returns
-   */ async fetchAdressLookupTableAccounts(pubkeys) {
+   */ async fetchAddressLookupTableAccounts(pubkeys) {
         if (!pubkeys) {
             throw new Error("addressLookupTableAddresses is undefined");
         }
@@ -20804,9 +20803,7 @@ class KaminoVaultsClient {
         return vaultState;
     }
     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 reserves = allocationStrategies.map((strategy)=>strategy.reserve);
         const parsedReserves = await this.kaminoLending.fetchAndParseReserves(reserves);
         const reserveMetas = reserves.map((pubkey)=>({
                 pubkey,
@@ -21419,26 +21416,41 @@ class PriceClient {
                 oracles[i]
             ].map((pubkey)=>{
                 remainingAccounts.push({
-                    pubkey,
+                    pubkey: pubkey,
                     isSigner: false,
                     isWritable: false
                 });
             });
         }
-        // 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 processed = new Set();
+        const preInstructions = [];
+        const chunkSize = 2;
+        for(let i = 0; i < marketsAndReserves.length; i += chunkSize){
+            const chunk = marketsAndReserves.slice(i, i + chunkSize);
+            const market = chunk[0].pubkey;
+            const reserve = chunk[1].pubkey;
+            // reserve should always be added to remaining accounts
+            remainingAccounts.push(chunk[1]);
+            // each reserve should only be refreshed once
+            if (!processed.has(reserve.toBase58())) {
+                const ix = this.klend.refreshReserveIxs(market, [
+                    reserve
+                ]);
+                preInstructions.push(...ix);
+                processed.add(reserve.toBase58());
+            }
+        }
         const priceIx = await this.base.program.methods.priceKaminoVaultShares(priceDenom, shareAtas.length).accounts({
             glamState: this.base.statePda,
-            solOracle: SOL_ORACLE,
-            pythOracle: null,
-            switchboardPriceOracle: null,
-            switchboardTwapOracle: null,
-            scopePrices: KAMINO_SCOPE_PRICES
+            solOracle: SOL_ORACLE
         }).remainingAccounts(remainingAccounts).instruction();
-        return priceIx;
+        return [
+            ...preInstructions,
+            priceIx
+        ];
     }
     /**
    * Returns an instruction that prices all Drift users (aka sub-accounts) controlled by the GLAM vault.
@@ -21506,43 +21518,8 @@ class PriceClient {
         if (parsedVaultDepositors.length === 0) {
             return null;
         }
-        // For each vault deposit, we need the following pubkeys in remaining accounts:
-        // - depositor
-        // - drift vault
-        // - drift user of the vault
-        // - oracles
-        // - spot & perp markets
-        // There might be overlaps between markets and oracles so we use a set to avoid duplicates
-        const remainingAccounts = [];
-        const marketsAndOracles = new Set();
-        for (const depositor of parsedVaultDepositors){
-            const { user: driftUser } = await this.dvaults.parseDriftVault(depositor.driftVault);
-            remainingAccounts.push({
-                pubkey: depositor.address,
-                isSigner: false,
-                isWritable: false
-            });
-            remainingAccounts.push({
-                pubkey: depositor.driftVault,
-                isSigner: false,
-                isWritable: false
-            });
-            remainingAccounts.push({
-                pubkey: driftUser,
-                isSigner: false,
-                isWritable: false
-            });
-            const markets_and_oracles = (await this.dvaults.composeRemainingAccounts(driftUser)).map((a)=>a.pubkey.toBase58());
-            for (const k of markets_and_oracles){
-                marketsAndOracles.add(k);
-            }
-        }
-        Array.from(marketsAndOracles).forEach((k)=>remainingAccounts.push({
-                pubkey: new PublicKey(k),
-                isSigner: false,
-                isWritable: false
-            }));
-        const priceIx = await this.base.program.methods.priceDriftVaultDepositors(priceDenom, parsedVaultDepositors.length).accounts({
+        const { remainingAccounts, numSpotMarkets, numPerpMarkets } = await this.remainingAccountsForPricingDriftVaultDepositors(parsedVaultDepositors);
+        const priceIx = await this.base.program.methods.priceDriftVaultDepositors(priceDenom, parsedVaultDepositors.length, numSpotMarkets, numPerpMarkets).accounts({
             glamState: this.base.statePda,
             solOracle: SOL_ORACLE
         }).remainingAccounts(remainingAccounts).instruction();
@@ -21609,12 +21586,11 @@ class PriceClient {
         }
         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),
-            kaminoVaults: this.priceKaminoVaultSharesIx.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)
         };
         const pricingFns = integrations.map((integration)=>integrationsToPricingFns[integration]).filter(Boolean);
         const pricingIxs = [
@@ -21622,72 +21598,130 @@ class PriceClient {
         ];
         for (const fn of pricingFns){
             const ix = await fn(priceDenom);
-            pricingIxs.push(ix);
+            if (Array.isArray(ix)) {
+                pricingIxs.push(...ix);
+            } else {
+                pricingIxs.push(ix);
+            }
         }
         return pricingIxs.filter(Boolean);
     }
+    async remainingAccountsForPricingDriftVaultDepositors(parsedVaultDepositors) {
+        // Extra accounts for pricing N vault depositors:
+        // - (vault_depositor, drift_vault, drift_user) x N
+        // - spot_market used by drift users of vaults (no specific order)
+        // - perp markets used by drift users of vaults (no specific order)
+        // - oracles of spot markets and perp markets (no specific order)
+        const remainingAccounts = [];
+        const spotMarketsSet = new Set();
+        const perpMarketsSet = new Set();
+        const oraclesSet = new Set();
+        for (const { address: depositor, driftVault } of parsedVaultDepositors){
+            const { user } = await this.dvaults.parseDriftVault(driftVault); // get drift user used by the vault
+            [
+                depositor,
+                driftVault,
+                user
+            ].forEach((k)=>remainingAccounts.push({
+                    pubkey: k,
+                    isSigner: false,
+                    isWritable: false
+                }));
+            const { spotPositions, perpPositions } = await this.dvaults.fetchUserPositions(user);
+            const spotMarketIndexes = spotPositions.map((p)=>p.marketIndex);
+            const perpMarketIndexes = perpPositions.map((p)=>p.marketIndex);
+            // If there are perp positions, add spot market 0 as it's used as quote market for perp
+            if (perpMarketIndexes.length > 0 && !spotMarketIndexes.includes(0)) {
+                spotMarketIndexes.push(0);
+            }
+            const spotMarkets = await this.drift.fetchAndParseSpotMarkets(spotMarketIndexes);
+            const perpMarkets = await this.drift.fetchAndParsePerpMarkets(perpMarketIndexes);
+            spotMarkets.forEach((m)=>{
+                oraclesSet.add(m.oracle.toBase58());
+                spotMarketsSet.add(m.marketPda.toBase58());
+            });
+            perpMarkets.forEach((m)=>{
+                oraclesSet.add(m.oracle.toBase58());
+                perpMarketsSet.add(m.marketPda.toBase58());
+            });
+        }
+        [
+            ...spotMarketsSet,
+            ...perpMarketsSet,
+            ...oraclesSet
+        ].forEach((k)=>remainingAccounts.push({
+                pubkey: new PublicKey(k),
+                isSigner: false,
+                isWritable: false
+            }));
+        return {
+            remainingAccounts,
+            numSpotMarkets: spotMarketsSet.size,
+            numPerpMarkets: perpMarketsSet.size
+        };
+    }
+    async remainingAccountsForPricingMeteora() {
+        const positions = await fetchMeteoraPositions(this.base.provider.connection, this.base.vaultPda);
+        let chunks = await Promise.all(positions.map(async (pubkey)=>{
+            const { lbPair, binArrayLower, binArrayUpper } = await parseMeteoraPosition(this.base.provider.connection, pubkey);
+            return [
+                pubkey,
+                lbPair,
+                binArrayLower,
+                binArrayUpper,
+                SOL_ORACLE,
+                USDC_ORACLE
+            ].map((k)=>({
+                    pubkey: k,
+                    isSigner: false,
+                    isWritable: false
+                }));
+        }));
+        return chunks.flat();
+    }
+    async remainingAccountsForPricingVaultAssets(baseAssetOnly = false) {
+        const stateModel = await this.base.fetchStateModel();
+        if (baseAssetOnly) {
+            if (!stateModel.baseAsset) {
+                throw new Error("Base asset not configured for the vault");
+            }
+            // FIXME: support token 2022 base asset
+            const ata = this.base.getVaultAta(stateModel.baseAsset);
+            // Set oracle to default pubkey (aka system program) to indicate oracle isn't needed
+            return [
+                ata,
+                stateModel.baseAsset,
+                PublicKey.default
+            ].map((k)=>({
+                    pubkey: k,
+                    isSigner: false,
+                    isWritable: false
+                }));
+        }
+        const assetsForPricing = (stateModel.borrowableAssets || []).concat(stateModel.assets || []);
+        return assetsForPricing.map((mint)=>{
+            const assetMeta = ASSETS_MAINNET.get(mint.toBase58());
+            if (!assetMeta) {
+                throw new Error(`Asset meta not found for ${mint}`);
+            }
+            const ata = this.base.getVaultAta(mint, assetMeta?.programId);
+            return [
+                ata,
+                mint,
+                assetMeta?.oracle
+            ];
+        }).flat().map((a)=>({
+                pubkey: a,
+                isSigner: false,
+                isWritable: false
+            }));
+    }
     constructor(base, klend, kvaults, drift, dvaults){
         this.base = base;
         this.klend = klend;
         this.kvaults = kvaults;
         this.drift = drift;
         this.dvaults = dvaults;
-        this.remainingAccountsForPricingMeteora = async ()=>{
-            const positions = await fetchMeteoraPositions(this.base.provider.connection, this.base.vaultPda);
-            let chunks = await Promise.all(positions.map(async (pubkey)=>{
-                const { lbPair, binArrayLower, binArrayUpper } = await parseMeteoraPosition(this.base.provider.connection, pubkey);
-                return [
-                    pubkey,
-                    lbPair,
-                    binArrayLower,
-                    binArrayUpper,
-                    SOL_ORACLE,
-                    USDC_ORACLE
-                ].map((k)=>({
-                        pubkey: k,
-                        isSigner: false,
-                        isWritable: false
-                    }));
-            }));
-            return chunks.flat();
-        };
-        this.remainingAccountsForPricingVaultAssets = async (baseAssetOnly = false)=>{
-            const stateModel = await this.base.fetchStateModel();
-            if (baseAssetOnly) {
-                if (!stateModel.baseAsset) {
-                    throw new Error("Base asset not configured for the vault");
-                }
-                // FIXME: support token 2022 base asset
-                const ata = this.base.getVaultAta(stateModel.baseAsset);
-                // Set oracle to default pubkey (aka system program) to indicate oracle isn't needed
-                return [
-                    ata,
-                    stateModel.baseAsset,
-                    PublicKey.default
-                ].map((k)=>({
-                        pubkey: k,
-                        isSigner: false,
-                        isWritable: false
-                    }));
-            }
-            const assetsForPricing = (stateModel.borrowableAssets || []).concat(stateModel.assets || []);
-            return assetsForPricing.map((mint)=>{
-                const assetMeta = ASSETS_MAINNET.get(mint.toBase58());
-                if (!assetMeta) {
-                    throw new Error(`Asset meta not found for ${mint}`);
-                }
-                const ata = this.base.getVaultAta(mint, assetMeta?.programId);
-                return [
-                    ata,
-                    mint,
-                    assetMeta?.oracle
-                ];
-            }).flat().map((a)=>({
-                    pubkey: a,
-                    isSigner: false,
-                    isWritable: false
-                }));
-        };
     }
 }
 

package/package.json

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

package/src/client/base.d.ts

@@ -62,7 +62,7 @@ export declare class BaseClient {
      * @param pubkeys Array of lookup table public keys.
      * @returns
      */
-    fetchAdressLookupTableAccounts(pubkeys?: string[] | PublicKey[]): Promise<AddressLookupTableAccount[]>;
+    fetchAddressLookupTableAccounts(pubkeys?: string[] | PublicKey[]): Promise<AddressLookupTableAccount[]>;
     getWallet(): Wallet;
     getSigner(): PublicKey;
     get signer(): PublicKey;

package/src/client/price.d.ts

@@ -1,4 +1,4 @@
-import { PublicKey, TransactionInstruction } from "@solana/web3.js";
+import { AccountMeta, PublicKey, TransactionInstruction } from "@solana/web3.js";
 import { KaminoLendingClient, KaminoVaultsClient } from "./kamino";
 import { BaseClient } from "./base";
 import { PriceDenom } from "../models";
@@ -21,7 +21,7 @@ export declare class PriceClient {
      * If there are no Kamino obligations, returns null.
      */
     priceKaminoObligationsIx(priceDenom: PriceDenom): Promise<TransactionInstruction | null>;
-    priceKaminoVaultSharesIx(priceDenom: PriceDenom): Promise<TransactionInstruction | null>;
+    priceKaminoVaultSharesIx(priceDenom: PriceDenom): Promise<TransactionInstruction[] | null>;
     /**
      * Returns an instruction that prices all Drift users (aka sub-accounts) controlled by the GLAM vault.
      */
@@ -46,14 +46,15 @@ export declare class PriceClient {
      */
     priceMeteoraPositionsIx(priceDenom: PriceDenom): Promise<TransactionInstruction | null>;
     priceVaultIxs(priceDenom: PriceDenom): Promise<TransactionInstruction[]>;
-    remainingAccountsForPricingMeteora: () => Promise<{
-        pubkey: PublicKey;
-        isSigner: boolean;
-        isWritable: boolean;
-    }[]>;
-    remainingAccountsForPricingVaultAssets: (baseAssetOnly?: boolean) => Promise<{
-        pubkey: PublicKey;
-        isSigner: boolean;
-        isWritable: boolean;
-    }[]>;
+    remainingAccountsForPricingDriftVaultDepositors(parsedVaultDepositors: {
+        address: PublicKey;
+        driftVault: PublicKey;
+        shares: any;
+    }[]): Promise<{
+        remainingAccounts: AccountMeta[];
+        numSpotMarkets: number;
+        numPerpMarkets: number;
+    }>;
+    remainingAccountsForPricingMeteora(): Promise<AccountMeta[]>;
+    remainingAccountsForPricingVaultAssets(baseAssetOnly?: boolean): Promise<AccountMeta[]>;
 }

package/target/idl/glam_protocol.json

@@ -2,7 +2,7 @@
   "address": "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc",
   "metadata": {
     "name": "glam_protocol",
-    "version": "0.4.33",
+    "version": "0.4.35",
     "spec": "0.1.0",
     "description": "Glam Protocol"
   },
@@ -6868,7 +6868,9 @@
       "docs": [
         "Extra accounts for pricing N vault depositors:",
         "- (vault_depositor, drift_vault, drift_user) x N",
-        "- markets and oracles used by all drift users (no specific order)"
+        "- spot_market used by drift users of vaults (no specific order)",
+        "- perp markets used by drift users of vaults (no specific order)",
+        "- oracles of spot markets and perp markets (no specific order)"
       ],
       "discriminator": [
         234,
@@ -6989,6 +6991,14 @@
         {
           "name": "num_vault_depositors",
           "type": "u8"
+        },
+        {
+          "name": "num_spot_markets",
+          "type": "u8"
+        },
+        {
+          "name": "num_perp_markets",
+          "type": "u8"
         }
       ]
     },
@@ -7135,9 +7145,14 @@
     {
       "name": "price_kamino_vault_shares",
       "docs": [
+        "Price Kamino vault shares.",
+        "- `num_vaults` Number of kamino vaults to price.",
+        "",
         "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"
+        "- reserve x M",
+        "- M = number of reserves used by all kvaults' allocations",
+        "- reserve pubkeys must follow the same order of reserves used by each allocation"
       ],
       "discriminator": [
         112,
@@ -7180,10 +7195,6 @@
           "writable": true,
           "signer": true
         },
-        {
-          "name": "kamino_lending_program",
-          "address": "KLend2g3cP87fffoy8q1mQqGKjrxjC8boSyAYavgmjD"
-        },
         {
           "name": "sol_oracle"
         },
@@ -7248,22 +7259,6 @@
               ]
             }
           }
-        },
-        {
-          "name": "pyth_oracle",
-          "optional": true
-        },
-        {
-          "name": "switchboard_price_oracle",
-          "optional": true
-        },
-        {
-          "name": "switchboard_twap_oracle",
-          "optional": true
-        },
-        {
-          "name": "scope_prices",
-          "optional": true
         }
       ],
       "args": [
@@ -9576,6 +9571,10 @@
         {
           "name": "stake_history",
           "address": "SysvarStakeHistory1111111111111111111111111"
+        },
+        {
+          "name": "system_program",
+          "address": "11111111111111111111111111111111"
         }
       ],
       "args": [

package/target/types/glam_protocol.d.ts

@@ -8,7 +8,7 @@ export type GlamProtocol = {
     "address": "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc";
     "metadata": {
         "name": "glamProtocol";
-        "version": "0.4.33";
+        "version": "0.4.35";
         "spec": "0.1.0";
         "description": "Glam Protocol";
     };
@@ -6874,7 +6874,9 @@ export type GlamProtocol = {
             "docs": [
                 "Extra accounts for pricing N vault depositors:",
                 "- (vault_depositor, drift_vault, drift_user) x N",
-                "- markets and oracles used by all drift users (no specific order)"
+                "- spot_market used by drift users of vaults (no specific order)",
+                "- perp markets used by drift users of vaults (no specific order)",
+                "- oracles of spot markets and perp markets (no specific order)"
             ];
             "discriminator": [
                 234,
@@ -6995,6 +6997,14 @@ export type GlamProtocol = {
                 {
                     "name": "numVaultDepositors";
                     "type": "u8";
+                },
+                {
+                    "name": "numSpotMarkets";
+                    "type": "u8";
+                },
+                {
+                    "name": "numPerpMarkets";
+                    "type": "u8";
                 }
             ];
         },
@@ -7141,9 +7151,14 @@ export type GlamProtocol = {
         {
             "name": "priceKaminoVaultShares";
             "docs": [
+                "Price Kamino vault shares.",
+                "- `num_vaults` Number of kamino vaults to price.",
+                "",
                 "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"
+                "- reserve x M",
+                "- M = number of reserves used by all kvaults' allocations",
+                "- reserve pubkeys must follow the same order of reserves used by each allocation"
             ];
             "discriminator": [
                 112,
@@ -7186,10 +7201,6 @@ export type GlamProtocol = {
                     "writable": true;
                     "signer": true;
                 },
-                {
-                    "name": "kaminoLendingProgram";
-                    "address": "KLend2g3cP87fffoy8q1mQqGKjrxjC8boSyAYavgmjD";
-                },
                 {
                     "name": "solOracle";
                 },
@@ -7254,22 +7265,6 @@ export type GlamProtocol = {
                             ];
                         };
                     };
-                },
-                {
-                    "name": "pythOracle";
-                    "optional": true;
-                },
-                {
-                    "name": "switchboardPriceOracle";
-                    "optional": true;
-                },
-                {
-                    "name": "switchboardTwapOracle";
-                    "optional": true;
-                },
-                {
-                    "name": "scopePrices";
-                    "optional": true;
                 }
             ];
             "args": [
@@ -9582,6 +9577,10 @@ export type GlamProtocol = {
                 {
                     "name": "stakeHistory";
                     "address": "SysvarStakeHistory1111111111111111111111111";
+                },
+                {
+                    "name": "systemProgram";
+                    "address": "11111111111111111111111111111111";
                 }
             ];
             "args": [

package/target/types/glam_protocol.ts

@@ -8,7 +8,7 @@ export type GlamProtocol = {
   "address": "GLAMbTqav9N9witRjswJ8enwp9vv5G8bsSJ2kPJ4rcyc",
   "metadata": {
     "name": "glamProtocol",
-    "version": "0.4.33",
+    "version": "0.4.35",
     "spec": "0.1.0",
     "description": "Glam Protocol"
   },
@@ -6874,7 +6874,9 @@ export type GlamProtocol = {
       "docs": [
         "Extra accounts for pricing N vault depositors:",
         "- (vault_depositor, drift_vault, drift_user) x N",
-        "- markets and oracles used by all drift users (no specific order)"
+        "- spot_market used by drift users of vaults (no specific order)",
+        "- perp markets used by drift users of vaults (no specific order)",
+        "- oracles of spot markets and perp markets (no specific order)"
       ],
       "discriminator": [
         234,
@@ -6995,6 +6997,14 @@ export type GlamProtocol = {
         {
           "name": "numVaultDepositors",
           "type": "u8"
+        },
+        {
+          "name": "numSpotMarkets",
+          "type": "u8"
+        },
+        {
+          "name": "numPerpMarkets",
+          "type": "u8"
         }
       ]
     },
@@ -7141,9 +7151,14 @@ export type GlamProtocol = {
     {
       "name": "priceKaminoVaultShares",
       "docs": [
+        "Price Kamino vault shares.",
+        "- `num_vaults` Number of kamino vaults to price.",
+        "",
         "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"
+        "- reserve x M",
+        "- M = number of reserves used by all kvaults' allocations",
+        "- reserve pubkeys must follow the same order of reserves used by each allocation"
       ],
       "discriminator": [
         112,
@@ -7186,10 +7201,6 @@ export type GlamProtocol = {
           "writable": true,
           "signer": true
         },
-        {
-          "name": "kaminoLendingProgram",
-          "address": "KLend2g3cP87fffoy8q1mQqGKjrxjC8boSyAYavgmjD"
-        },
         {
           "name": "solOracle"
         },
@@ -7254,22 +7265,6 @@ export type GlamProtocol = {
               ]
             }
           }
-        },
-        {
-          "name": "pythOracle",
-          "optional": true
-        },
-        {
-          "name": "switchboardPriceOracle",
-          "optional": true
-        },
-        {
-          "name": "switchboardTwapOracle",
-          "optional": true
-        },
-        {
-          "name": "scopePrices",
-          "optional": true
         }
       ],
       "args": [
@@ -9582,6 +9577,10 @@ export type GlamProtocol = {
         {
           "name": "stakeHistory",
           "address": "SysvarStakeHistory1111111111111111111111111"
+        },
+        {
+          "name": "systemProgram",
+          "address": "11111111111111111111111111111111"
         }
       ],
       "args": [