@glamsystems/glam-sdk 1.0.5 → 1.0.6

package/index.cjs.js

@@ -42723,7 +42723,15 @@ const getStakeAccountsWithStates = async (connection, withdrawAuthority)=>{
                         1,
                         0,
                         0,
-                        0
+                        0,
+                        0xff,
+                        0xff,
+                        0xff,
+                        0xff,
+                        0xff,
+                        0xff,
+                        0xff,
+                        0xff
                     ])
                 }
             },
@@ -43575,8 +43583,28 @@ const getErrorFromRpcResponse = (rpcResponse)=>{
     }
 };
 
+function readUnsignedBigInt64LE(buffer, offset) {
+    return new anchor.BN(buffer.subarray(offset, offset + 8), 10, "le");
+}
+function readSignedBigInt64LE(buffer, offset) {
+    const unsignedValue = new anchor.BN(buffer.subarray(offset, offset + 8), 10, "le");
+    if (unsignedValue.testn(63)) {
+        const inverted = unsignedValue.notn(64).addn(1);
+        return inverted.neg();
+    } else {
+        return unsignedValue;
+    }
+}
+function readI128LE(buffer, offset) {
+    const lo = buffer.readBigUInt64LE(offset);
+    const hi = buffer.readBigUInt64LE(offset + 8);
+    let v = (hi << 64n) + lo;
+    if ((hi & 1n << 63n) !== 0n) {
+        v -= 1n << 128n;
+    }
+    return new anchor.BN(v.toString());
+}
 const ZERO = new anchor.BN(0);
-// # Utility Types / Enums / Constants
 var ExchangeStatus = /*#__PURE__*/ function(ExchangeStatus) {
     ExchangeStatus[ExchangeStatus["ACTIVE"] = 0] = "ACTIVE";
     ExchangeStatus[ExchangeStatus["DEPOSIT_PAUSED"] = 1] = "DEPOSIT_PAUSED";
@@ -44019,65 +44047,6 @@ StakeAction.UNSTAKE_TRANSFER = {
 StakeAction.STAKE_TRANSFER = {
     stakeTransfer: {}
 };
-class SettlePnlMode {
-}
-SettlePnlMode.TRY_SETTLE = {
-    trySettle: {}
-};
-SettlePnlMode.MUST_SETTLE = {
-    mustSettle: {}
-};
-function isVariant(object, type) {
-    return object.hasOwnProperty(type);
-}
-function isOneOfVariant(object, types) {
-    return types.reduce((result, type)=>{
-        return result || object.hasOwnProperty(type);
-    }, false);
-}
-function getVariant(object) {
-    return Object.keys(object)[0];
-}
-var TradeSide = /*#__PURE__*/ function(TradeSide) {
-    TradeSide[TradeSide["None"] = 0] = "None";
-    TradeSide[TradeSide["Buy"] = 1] = "Buy";
-    TradeSide[TradeSide["Sell"] = 2] = "Sell";
-    return TradeSide;
-}({});
-class LPAction {
-}
-LPAction.ADD_LIQUIDITY = {
-    addLiquidity: {}
-};
-LPAction.REMOVE_LIQUIDITY = {
-    removeLiquidity: {}
-};
-LPAction.SETTLE_LIQUIDITY = {
-    settleLiquidity: {}
-};
-LPAction.REMOVE_LIQUIDITY_DERISK = {
-    removeLiquidityDerisk: {}
-};
-class LiquidationType {
-}
-LiquidationType.LIQUIDATE_PERP = {
-    liquidatePerp: {}
-};
-LiquidationType.LIQUIDATE_BORROW_FOR_PERP_PNL = {
-    liquidateBorrowForPerpPnl: {}
-};
-LiquidationType.LIQUIDATE_PERP_PNL_FOR_DEPOSIT = {
-    liquidatePerpPnlForDeposit: {}
-};
-LiquidationType.PERP_BANKRUPTCY = {
-    perpBankruptcy: {}
-};
-LiquidationType.SPOT_BANKRUPTCY = {
-    spotBankruptcy: {}
-};
-LiquidationType.LIQUIDATE_SPOT = {
-    liquidateSpot: {}
-};
 class PostOnlyParams {
 }
 PostOnlyParams.NONE = {
@@ -44116,28 +44085,6 @@ const DefaultOrderParams = {
     auctionStartPrice: null,
     auctionEndPrice: null
 };
-var ReferrerStatus = /*#__PURE__*/ function(ReferrerStatus) {
-    ReferrerStatus[ReferrerStatus["IsReferrer"] = 1] = "IsReferrer";
-    ReferrerStatus[ReferrerStatus["IsReferred"] = 2] = "IsReferred";
-    return ReferrerStatus;
-}({});
-var FuelOverflowStatus = /*#__PURE__*/ function(FuelOverflowStatus) {
-    FuelOverflowStatus[FuelOverflowStatus["Exists"] = 1] = "Exists";
-    return FuelOverflowStatus;
-}({});
-var PlaceAndTakeOrderSuccessCondition = /*#__PURE__*/ function(PlaceAndTakeOrderSuccessCondition) {
-    PlaceAndTakeOrderSuccessCondition[PlaceAndTakeOrderSuccessCondition["PartialFill"] = 1] = "PartialFill";
-    PlaceAndTakeOrderSuccessCondition[PlaceAndTakeOrderSuccessCondition["FullFill"] = 2] = "FullFill";
-    return PlaceAndTakeOrderSuccessCondition;
-}({});
-class SwapReduceOnly {
-}
-SwapReduceOnly.In = {
-    in: {}
-};
-SwapReduceOnly.Out = {
-    out: {}
-};
 
 function getLimitOrderParams(params) {
     return getOrderParams(Object.assign({}, params, {
@@ -44174,19 +44121,6 @@ function getMarketOrderParams(params) {
     return Object.assign({}, DefaultOrderParams, optionalOrderParams, overridingParams);
 }
 
-function readUnsignedBigInt64LE(buffer, offset) {
-    return new anchor.BN(buffer.subarray(offset, offset + 8), 10, "le");
-}
-function readSignedBigInt64LE(buffer, offset) {
-    const unsignedValue = new anchor.BN(buffer.subarray(offset, offset + 8), 10, "le");
-    if (unsignedValue.testn(63)) {
-        const inverted = unsignedValue.notn(64).addn(1);
-        return inverted.neg();
-    } else {
-        return unsignedValue;
-    }
-}
-
 const FractionDecimal = Decimal.clone({
     precision: 40
 });
@@ -44564,6 +44498,18 @@ class StateAccountType {
     static equals(a, b) {
         return Object.keys(a)[0] === Object.keys(b)[0];
     }
+    static from(s) {
+        if (s === "vault") {
+            return StateAccountType.VAULT;
+        }
+        if (s === "tokenizedVault") {
+            return StateAccountType.TOKENIZED_VAULT;
+        }
+        if (s === "mint") {
+            return StateAccountType.MINT;
+        }
+        throw new Error(`Invalid state account type: ${s}`);
+    }
 }
 StateAccountType.VAULT = {
     vault: {}
@@ -45097,10 +45043,11 @@ class BaseClient {
             });
             anchor__namespace.setProvider(this.provider);
         }
-        this.cluster = config?.cluster || exports.ClusterNetwork.fromUrl(this.provider.connection.rpcEndpoint);
         if (config?.statePda) {
             this.statePda = config.statePda;
         }
+        this.cluster = config?.cluster || exports.ClusterNetwork.fromUrl(this.provider.connection.rpcEndpoint);
+        this.jupiterApiKey = config?.jupiterApiKey;
         this.blockhashWithCache = new BlockhashWithCache(this.provider);
     }
 }
@@ -45124,9 +45071,6 @@ class BaseClient {
     }
 }
 
-const DRIFT_SIGNER = new web3_js.PublicKey("JCNCMFXo5M5qwUPg2Utu1u6YWp3MbygxqBsBeXXJfrw");
-const DRIFT_MARGIN_PRECISION = 10000;
-
 /**
  * Base class for decodable on-chain account structures.
  *
@@ -45148,16 +45092,97 @@ const DRIFT_MARGIN_PRECISION = 10000;
     }
 }
 
-function readI128LE(buffer, offset) {
-    const lo = buffer.readBigUInt64LE(offset);
-    const hi = buffer.readBigUInt64LE(offset + 8);
-    let v = (hi << 64n) + lo;
-    if ((hi & 1n << 63n) !== 0n) {
-        v -= 1n << 128n;
+class SpotPosition {
+    get marketPda() {
+        return web3_js.PublicKey.findProgramAddressSync([
+            Buffer.from("spot_market"),
+            new anchor.BN(this.marketIndex).toArrayLike(Buffer, "le", 2)
+        ], DRIFT_PROGRAM_ID)[0];
+    }
+    calcBalance(decimals, cumulativeDepositInterest, cumulativeBorrowInterest) {
+        const precisionAdjustment = new anchor.BN(10 ** (19 - decimals));
+        const balance = this.scaledBalance.mul(this._interest(cumulativeDepositInterest, cumulativeBorrowInterest)).div(precisionAdjustment);
+        const amount = this.balanceType === SpotBalanceType.BORROW ? balance.neg().toNumber() : balance.toNumber();
+        const uiAmount = amount / 10 ** decimals;
+        return {
+            amount,
+            uiAmount
+        };
+    }
+    calcBalanceBn(decimals, cumulativeDepositInterest, cumulativeBorrowInterest) {
+        const precisionAdjustment = new anchor.BN(10 ** (19 - decimals));
+        const sign = this.balanceType === SpotBalanceType.BORROW ? new anchor.BN(-1) : new anchor.BN(1);
+        return this.scaledBalance.mul(this._interest(cumulativeDepositInterest, cumulativeBorrowInterest)).div(precisionAdjustment).mul(sign);
+    }
+    _interest(cumulativeDepositInterest, cumulativeBorrowInterest) {
+        return this.balanceType === SpotBalanceType.BORROW ? cumulativeBorrowInterest : cumulativeDepositInterest;
+    }
+    get direction() {
+        return this.balanceType === SpotBalanceType.BORROW ? "borrow" : "deposit";
+    }
+    constructor(data){
+        this.marketIndex = data?.marketIndex;
+        this.balanceType = data?.balanceType;
+        this.scaledBalance = data?.scaledBalance;
+        this.openOrders = data?.openOrders;
+        this.openBids = data?.openBids;
+        this.openAsks = data?.openAsks;
+        this.cumulativeDeposits = data?.cumulativeDeposits;
+    }
+}
+class PerpPosition {
+    get marketPda() {
+        return web3_js.PublicKey.findProgramAddressSync([
+            Buffer.from("perp_market"),
+            new anchor.BN(this.marketIndex).toArrayLike(Buffer, "le", 2)
+        ], DRIFT_PROGRAM_ID)[0];
+    }
+    baseAssetValue(oraclePrice) {
+        return this.baseAssetAmount.mul(oraclePrice).div(new anchor.BN(1000000000));
+    }
+    unrealizedPnl(oraclePrice) {
+        return this.baseAssetValue(oraclePrice).add(this.quoteAssetAmount);
+    }
+    getUsdValueScaled(oraclePrice, cumulativeFundingRateLong, cumulativeFundingRateShort) {
+        const unrealizedPnl = this.unrealizedPnl(oraclePrice);
+        const fundingPayment = this.calcFundingPayment(cumulativeFundingRateLong, cumulativeFundingRateShort);
+        return unrealizedPnl.add(fundingPayment);
+    }
+    calcFundingPayment(cumulativeFundingRateLong, cumulativeFundingRateShort) {
+        const fundingRate = this.baseAssetAmount.isNeg() ? cumulativeFundingRateShort : cumulativeFundingRateLong;
+        const fundingRateDelta = fundingRate.sub(this.lastCumulativeFundingRate);
+        if (fundingRateDelta.eq(new anchor.BN(0))) {
+            return new anchor.BN(0);
+        }
+        const fundingRateDeltaSign = fundingRateDelta.isNeg() ? -1 : 1;
+        const usdPricePrecision = new anchor.BN(1000000);
+        const fundingRatePaymentMagnitude = fundingRateDelta.abs().mul(this.baseAssetAmount.abs()).div(usdPricePrecision).div(new anchor.BN(1000));
+        const fundingRatePaymentSign = this.baseAssetAmount.isNeg() ? 1 : -1;
+        const sign = fundingRatePaymentSign * fundingRateDeltaSign;
+        return sign < 0 ? fundingRatePaymentMagnitude.neg() : fundingRatePaymentMagnitude;
+    }
+    constructor(data){
+        this.baseAssetAmount = data?.baseAssetAmount;
+        this.lastCumulativeFundingRate = data?.lastCumulativeFundingRate;
+        this.marketIndex = data?.marketIndex;
+        this.quoteAssetAmount = data?.quoteAssetAmount;
+        this.quoteEntryAmount = data?.quoteEntryAmount;
+        this.quoteBreakEvenAmount = data?.quoteBreakEvenAmount;
+        this.openOrders = data?.openOrders;
+        this.openBids = data?.openBids;
+        this.openAsks = data?.openAsks;
+        this.settledPnl = data?.settledPnl;
+        this.lpShares = data?.lpShares;
+        this.remainderBaseAssetAmount = data?.remainderBaseAssetAmount;
+        this.lastBaseAssetAmountPerLp = data?.lastBaseAssetAmountPerLp;
+        this.lastQuoteAssetAmountPerLp = data?.lastQuoteAssetAmountPerLp;
+        this.perLpBase = data?.perLpBase;
     }
-    return new anchor.BN(v.toString());
 }
 class DriftVaultDepositor extends Decodable {
+    get netShares() {
+        return this.vaultShares.sub(this.lastWithdrawRequest.shares);
+    }
 }
 DriftVaultDepositor._layout = borsh.struct([
     borsh.array(borsh.u8(), 8, "discriminator"),
@@ -45195,21 +45220,15 @@ class DriftVault extends Decodable {
     }
     aum(spotPositions, perpPositions, spotMarketsMap, perpMarketsMap) {
         const positionBalances = [];
-        for (const { marketIndex, scaledBalance, balanceType } of spotPositions){
-            const marketPda = this.marketPda(MarketType.SPOT, marketIndex);
-            const spotMarket = spotMarketsMap.get(marketPda);
-            const amount = spotMarket.calcSpotBalanceBn(scaledBalance, balanceType);
-            const balance = amount.mul(spotMarket.lastOraclePrice).div(new anchor.BN(10 ** spotMarket.decimals));
+        for (const spotPosition of spotPositions){
+            const { decimals, lastOraclePrice, cumulativeDepositInterest, cumulativeBorrowInterest } = spotMarketsMap.get(spotPosition.marketPda);
+            const amount = spotPosition.calcBalanceBn(decimals, cumulativeDepositInterest, cumulativeBorrowInterest);
+            const balance = amount.mul(lastOraclePrice).div(new anchor.BN(10 ** decimals));
             positionBalances.push(balance);
         }
         for (const perpPosition of perpPositions){
-            const { baseAssetAmount, quoteAssetAmount, marketIndex } = perpPosition;
-            const marketPda = this.marketPda(MarketType.PERP, marketIndex);
-            const perpMarket = perpMarketsMap.get(marketPda);
-            const baseAssetValue = baseAssetAmount.mul(perpMarket.lastOraclePrice).div(new anchor.BN(1000000000));
-            const unrealizedPnl = baseAssetValue.add(quoteAssetAmount);
-            const fundingPayment = perpMarket.calcFundingPayment(perpPosition);
-            positionBalances.push(unrealizedPnl.add(fundingPayment));
+            const { lastOraclePrice, cumulativeFundingRateLong, cumulativeFundingRateShort } = perpMarketsMap.get(perpPosition.marketPda);
+            positionBalances.push(perpPosition.getUsdValueScaled(lastOraclePrice, cumulativeFundingRateLong, cumulativeFundingRateShort));
         }
         return positionBalances.reduce((a, b)=>a.add(b), new anchor.BN(0));
     }
@@ -45323,15 +45342,15 @@ class DriftUser {
                 balanceType = SpotBalanceType.BORROW;
             }
             offset += 6;
-            spotPositions.push({
+            spotPositions.push(new SpotPosition({
+                marketIndex,
+                balanceType,
                 scaledBalance,
+                openOrders,
                 openBids,
                 openAsks,
-                cumulativeDeposits,
-                marketIndex,
-                balanceType,
-                openOrders
-            });
+                cumulativeDeposits
+            }));
         }
         const perpPositions = [];
         for(let i = 0; i < 8; i++){
@@ -45365,23 +45384,23 @@ class DriftUser {
             offset += 3;
             const perLpBase = buffer.readUInt8(offset);
             offset += 1;
-            perpPositions.push({
-                lastCumulativeFundingRate,
+            perpPositions.push(new PerpPosition({
                 baseAssetAmount,
+                lastCumulativeFundingRate,
+                marketIndex,
                 quoteAssetAmount,
-                quoteBreakEvenAmount,
                 quoteEntryAmount,
+                quoteBreakEvenAmount,
+                openOrders,
                 openBids,
                 openAsks,
                 settledPnl,
                 lpShares,
+                remainderBaseAssetAmount,
                 lastBaseAssetAmountPerLp,
                 lastQuoteAssetAmountPerLp,
-                remainderBaseAssetAmount,
-                marketIndex,
-                openOrders,
                 perLpBase
-            });
+            }));
         }
         const orders = [];
         for(let i = 0; i < 32; i++){
@@ -45628,24 +45647,6 @@ class DriftSpotMarket extends Decodable {
     get tokenProgramId() {
         return this.tokenProgram === 0 ? splToken.TOKEN_PROGRAM_ID : splToken.TOKEN_2022_PROGRAM_ID;
     }
-    calcSpotBalance(scaledBalance, scaledBalanceType) {
-        const precisionAdjustment = new anchor.BN(10 ** (19 - this.decimals));
-        const balance = scaledBalance.mul(this._interest(scaledBalanceType)).div(precisionAdjustment);
-        const amount = scaledBalanceType === SpotBalanceType.BORROW ? balance.neg().toNumber() : balance.toNumber();
-        const uiAmount = amount / 10 ** this.decimals;
-        return {
-            amount,
-            uiAmount
-        };
-    }
-    calcSpotBalanceBn(scaledBalance, scaledBalanceType) {
-        const precisionAdjustment = new anchor.BN(10 ** (19 - this.decimals));
-        const sign = scaledBalanceType === SpotBalanceType.BORROW ? new anchor.BN(-1) : new anchor.BN(1);
-        return scaledBalance.mul(this._interest(scaledBalanceType)).div(precisionAdjustment).mul(sign);
-    }
-    _interest(balanceType) {
-        return balanceType === SpotBalanceType.BORROW ? this.cumulativeBorrowInterest : this.cumulativeDepositInterest;
-    }
 }
 DriftSpotMarket._layout = borsh.struct([
     borsh.array(borsh.u8(), 8, "discriminator"),
@@ -45685,19 +45686,6 @@ class DriftPerpMarket extends Decodable {
     get oracleSource() {
         return OracleSource.get(this.oracleSourceOrd);
     }
-    calcFundingPayment(perpPosition) {
-        const fundingRate = perpPosition.baseAssetAmount.isNeg() ? this.cumulativeFundingRateShort : this.cumulativeFundingRateLong;
-        const fundingRateDelta = fundingRate.sub(perpPosition.lastCumulativeFundingRate);
-        if (fundingRateDelta.eq(new anchor.BN(0))) {
-            return new anchor.BN(0);
-        }
-        const fundingRateDeltaSign = fundingRateDelta.isNeg() ? -1 : 1;
-        const usdPricePrecision = new anchor.BN(1000000);
-        const fundingRatePaymentMagnitude = fundingRateDelta.abs().mul(perpPosition.baseAssetAmount.abs()).div(usdPricePrecision).div(new anchor.BN(1000));
-        const fundingRatePaymentSign = perpPosition.baseAssetAmount.isNeg() ? 1 : -1;
-        const sign = fundingRatePaymentSign * fundingRateDeltaSign;
-        return sign < 0 ? fundingRatePaymentMagnitude.neg() : fundingRatePaymentMagnitude;
-    }
 }
 DriftPerpMarket._layout = borsh.struct([
     borsh.array(borsh.u8(), 8, "discriminator"),
@@ -45714,6 +45702,8 @@ DriftPerpMarket._layout = borsh.struct([
     borsh.u16("quoteSpotMarketIndex")
 ]);
 
+const DRIFT_SIGNER = new web3_js.PublicKey("JCNCMFXo5M5qwUPg2Utu1u6YWp3MbygxqBsBeXXJfrw");
+const DRIFT_MARGIN_PRECISION = 10000;
 let TxBuilder$g = class TxBuilder extends BaseTxBuilder {
     async initializeUserStatsIx(glamSigner) {
         const { userStats } = this.client.getDriftUserPdas();
@@ -46181,7 +46171,7 @@ class DriftProtocolClient {
         }
         const perpMarkets = marketIndexes.map((marketIndex)=>this.perpMarkets.get(marketIndex)).filter((m)=>m !== undefined);
         const invalidIndexes = marketIndexes.filter((marketIndex)=>!this.perpMarkets.has(marketIndex));
-        if (invalidIndexes.length > 0) {
+        if (invalidIndexes.length > 0 && process.env.NODE_ENV === "development") {
             console.warn(`The following perp markets could not be found: ${invalidIndexes.join(", ")}`);
         }
         return perpMarkets;
@@ -47074,7 +47064,9 @@ class JupiterSwapClient {
         this.base = base;
         this.vault = vault;
         this.txBuilder = new TxBuilder$e(this);
-        this.jupApi = new JupiterApiClient();
+        this.jupApi = new JupiterApiClient({
+            apiKey: this.base.jupiterApiKey
+        });
     }
 }
 
@@ -49545,6 +49537,7 @@ class PriceClient {
         const { integrationAcls, externalPositions } = await this.base.fetchStateAccount(); // fetch state account only, don't need to build entire state model
         const externalPositionsSet = new PkSet(externalPositions);
         let glamDriftUserSpotMarketsMap = new PkMap(); // glam-controlled drift user -> spot markets map
+        let glamDriftUserPerpMarketsMap = new PkMap(); // glam-controlled drift user -> perp markets map
         let dvaultDepositorsAndVaults = new PkMap(); // dvault depositor -> drift vault map
         let dvaultUserSpotMarketsMap = new PkMap(); // dvault drift user -> spot markets map
         let dvaultUserPerpMarketsMap = new PkMap(); // dvault drift user -> perp markets map
@@ -49560,6 +49553,7 @@ class PriceClient {
                     return user;
                 });
                 glamDriftUserSpotMarketsMap = await this.getPubkeysForSpotHoldings(userPdas, commitment);
+                glamDriftUserPerpMarketsMap = await this.getPubkeysForPerpHoldings(userPdas, commitment);
             }
             if (driftIntegrationAcl.protocolsBitmask & 0b10) {
                 // 1. find all depositors
@@ -49596,6 +49590,9 @@ class PriceClient {
         const glamDriftSpotMarkets = [
             ...glamDriftUserSpotMarketsMap.values()
         ].map((s)=>Array.from(s.pkValues())).flat();
+        const glamDriftPerpMarkets = [
+            ...glamDriftUserPerpMarketsMap.values()
+        ].map((s)=>Array.from(s.pkValues())).flat();
         const dvaultDepositors = Array.from(dvaultDepositorsAndVaults.pkKeys());
         const dvaultUsers = [
             ...dvaultDepositorsAndVaults.values()
@@ -49616,6 +49613,7 @@ class PriceClient {
             ...tokenPubkeys,
             ...glamDriftUsers,
             ...glamDriftSpotMarkets,
+            ...glamDriftPerpMarkets,
             ...dvaultDepositors,
             ...dvaultUsers,
             ...dvaultUserSpotMarkets,
@@ -49655,6 +49653,13 @@ class PriceClient {
         }
         // Build a map of parsed drift perp markets
         const driftPerpMarketsMap = new PkMap();
+        for (const marketPda of glamDriftPerpMarkets){
+            const data = accountsDataMap.get(marketPda);
+            if (data) {
+                const market = DriftPerpMarket.decode(marketPda, data);
+                driftPerpMarketsMap.set(marketPda, market);
+            }
+        }
         for (const marketPda of dvaultUserPerpMarkets){
             const data = accountsDataMap.get(marketPda);
             if (data) {
@@ -49688,7 +49693,7 @@ class PriceClient {
             tokenPricesMap.set(tokenMint, item);
         });
         const tokenHoldings = this.getTokenHoldings(tokenPubkeys, accountsDataMap, tokenPricesMap, "Jupiter");
-        const driftSpotHoldings = this.getDriftSpotHoldings(glamDriftUserSpotMarketsMap.pkKeys(), driftSpotMarketsMap, accountsDataMap, tokenPricesMap, "Jupiter");
+        const driftSpotHoldings = this.getDriftHoldings(glamDriftUserSpotMarketsMap.pkKeys(), driftSpotMarketsMap, driftPerpMarketsMap, accountsDataMap, tokenPricesMap, "Jupiter");
         const dvaultHoldings = this.getDriftVaultsHoldings(dvaultDepositorsAndVaults, dvaultDepositorsMap, driftSpotMarketsMap, driftPerpMarketsMap, accountsDataMap, tokenPricesMap, "Jupiter");
         const kaminoLendHoldings = this.getKaminoLendHoldings(kaminoPubkeys.pkKeys(), kaminoReservesMap, accountsDataMap, tokenPricesMap, "Jupiter");
         const kaminoVaultsHoldings = this.getKaminoVaultsHoldings(kvaultAtasAndStates, kaminoReservesMap, accountsDataMap, tokenPricesMap, "Jupiter");
@@ -49824,28 +49829,39 @@ class PriceClient {
         }
         return holdings;
     }
-    getDriftSpotHoldings(userPubkeys, spotMarketsMap, accountsDataMap, tokenPricesMap, priceSource) {
+    getDriftHoldings(userPubkeys, spotMarketsMap, perpMarketsMap, accountsDataMap, tokenPricesMap, priceSource) {
         const holdings = [];
         for (const userPda of userPubkeys){
             const userData = accountsDataMap.get(userPda);
-            if (!userData) continue;
-            const { spotPositions } = DriftUser.decode(userPda, userData);
-            for (const { marketIndex, scaledBalance, balanceType } of spotPositions){
-                const marketPda = this.drift.getMarketPda(MarketType.SPOT, marketIndex);
-                const spotMarket = spotMarketsMap.get(marketPda);
-                if (!spotMarket) continue;
-                const amount = spotMarket.calcSpotBalanceBn(scaledBalance, balanceType).abs();
-                const direction = Object.keys(balanceType)[0];
-                const tokenPrice = tokenPricesMap.get(spotMarket.mint);
-                if (!tokenPrice) continue;
+            const { spotPositions, perpPositions } = DriftUser.decode(userPda, userData);
+            for (const spotPosition of spotPositions){
+                const { marketIndex, mint, decimals, cumulativeDepositInterest, cumulativeBorrowInterest } = spotMarketsMap.get(spotPosition.marketPda);
+                const amount = spotPosition.calcBalanceBn(decimals, cumulativeDepositInterest, cumulativeBorrowInterest).abs();
+                const { usdPrice, slot } = tokenPricesMap.get(mint);
+                const holding = new Holding(mint, decimals, amount, usdPrice, {
+                    slot,
+                    source: priceSource
+                }, "DriftProtocol", {
+                    user: userPda,
+                    marketIndex,
+                    direction: spotPosition.direction,
+                    marketType: "spot"
+                });
+                holdings.push(holding);
+            }
+            for (const perpPosition of perpPositions){
+                const { marketIndex, marketPda } = perpPosition;
+                const { lastOraclePrice, cumulativeFundingRateLong, cumulativeFundingRateShort } = perpMarketsMap.get(marketPda);
+                const amount = perpPosition.getUsdValueScaled(lastOraclePrice, cumulativeFundingRateLong, cumulativeFundingRateShort);
+                const tokenPrice = tokenPricesMap.get(USDC);
                 const { usdPrice, slot } = tokenPrice;
-                const holding = new Holding(spotMarket.mint, spotMarket.decimals, amount, usdPrice, {
+                const holding = new Holding(USDC, 6, amount, usdPrice, {
                     slot,
                     source: priceSource
                 }, "DriftProtocol", {
                     user: userPda,
                     marketIndex,
-                    direction
+                    marketType: "perp"
                 });
                 holdings.push(holding);
             }
@@ -49859,7 +49875,7 @@ class PriceClient {
             const dvaultUserData = accountsDataMap.get(dvault.user);
             const { spotPositions, perpPositions } = DriftUser.decode(dvault.user, dvaultUserData);
             const aum = dvault.aumInBaseAsset(spotPositions, perpPositions, spotMarketsMap, perpMarketsMap);
-            const amount = depositor.vaultShares.mul(aum).div(dvault.totalShares);
+            const amount = depositor.netShares.mul(aum).div(dvault.totalShares).add(depositor.lastWithdrawRequest.value);
             const { mint, decimals } = dvault.getBaseAsset(spotMarketsMap);
             const tokenPrice = tokenPricesMap.get(mint);
             if (!tokenPrice) continue;
@@ -51527,6 +51543,7 @@ const MESSAGE_RECEIVED_EVENT_DISCM = new Uint8Array([
     0x9d,
     0xa6
 ]);
+const CCTP_DOMAIN_SOLANA = 5;
 class CctpBridgeEvent {
     constructor(amount, sourceDomain, sourceAddress, destinationDomain, destinationAddress, attestation, nonce, status, txHash){
         this.amount = amount;
@@ -51878,9 +51895,6 @@ class CctpClient {
             ...options.commitment ? {
                 commitment: options.commitment
             } : {},
-            ...options.minSlot ? {
-                minContextSlot: options.minSlot
-            } : {},
             filters: [
                 {
                     dataSize: 428
@@ -51952,16 +51966,16 @@ class CctpClient {
    * 2. Filter transactions that contain the bridge events
    * 3. Parse the bridge events from the transactions
    */ async getIncomingBridgeEvents(options) {
-        const { batchSize = 1, commitment = "confirmed", minSlot } = options;
+        const { batchSize = 1, commitment = "confirmed", minSlot = 0 } = options;
         const txHashes = new Set(options.txHashes ?? []);
+        const txSlots = new Map();
         // If no txHashes provided, find transactions involving vault's USDC token account
         if (txHashes.size === 0) {
-            const signatures = await this.base.connection.getSignaturesForAddress(this.base.getVaultAta(USDC), {
-                ...minSlot ? {
-                    minContextSlot: minSlot
-                } : {}
-            }, commitment);
-            signatures.forEach((sig)=>txHashes.add(sig.signature));
+            const signatures = await this.base.connection.getSignaturesForAddress(this.base.getVaultAta(USDC), {}, commitment);
+            signatures.filter((s)=>s.slot >= minSlot).forEach((sig)=>{
+                txHashes.add(sig.signature);
+                txSlots.set(sig.signature, sig.slot);
+            });
         }
         if (txHashes.size === 0) {
             return [];
@@ -52009,6 +52023,9 @@ class CctpClient {
                         nonce,
                         txHash
                     });
+                    for (const event of events){
+                        event.slot = txSlots.get(txHash);
+                    }
                     allEvents.push(...events);
                 }
             }
@@ -52023,34 +52040,42 @@ class CctpClient {
    * 2. Get the created transaction for each message account
    * 3. Call iris api to get the attestation status and parsed message using each tx hash
    */ async getOutgoingBridgeEvents(options) {
-        const { batchSize = 1, commitment = "confirmed", minSlot } = options;
+        const { batchSize = 1, commitment = "confirmed", minSlot = 0 } = options;
         const txHashes = new Set(options.txHashes ?? []);
+        const txSlots = new Map();
         // If no txHashes are provided, find all message accounts for the vault
         if (txHashes.size === 0) {
             const messagePubkeys = await this.findV2Messages(this.base.vaultPda, {
-                commitment,
-                minSlot
+                commitment
             });
             if (messagePubkeys.length === 0) {
                 return [];
             }
+            // Get account creation transaction for each message account
             for(let i = 0; i < messagePubkeys.length; i += batchSize){
                 const batch = messagePubkeys.slice(i, i + batchSize);
                 const signaturesPromises = batch.map((pubkey)=>this.base.connection.getSignaturesForAddress(pubkey));
                 const batchSignatures = await Promise.all(signaturesPromises);
                 // Process batch results and collect transaction signatures
                 for(let j = 0; j < batch.length; j++){
-                    const sigs = batchSignatures[j];
+                    const sigs = batchSignatures[j].filter((s)=>s.slot >= minSlot);
+                    if (sigs.length === 0) {
+                        continue;
+                    }
                     const createdTx = sigs.sort((a, b)=>a.slot - b.slot)[0];
                     txHashes.add(createdTx.signature);
+                    txSlots.set(createdTx.signature, createdTx.slot);
                 }
             }
         }
         const allEvents = [];
         for (const txHash of txHashes){
-            const events = await this.parseEventsFromAttestion(5, {
+            const events = await this.parseEventsFromAttestion(CCTP_DOMAIN_SOLANA, {
                 txHash
             });
+            for (const event of events){
+                event.slot = txSlots.get(txHash);
+            }
             allEvents.push(...events);
         }
         return allEvents;
@@ -52211,7 +52236,6 @@ exports.EmergencyAccessUpdateArgs = EmergencyAccessUpdateArgs;
 exports.EmergencyUpdateMintArgs = EmergencyUpdateMintArgs;
 exports.ExchangeStatus = ExchangeStatus;
 exports.Fraction = Fraction;
-exports.FuelOverflowStatus = FuelOverflowStatus;
 exports.GLAM_CONFIG_PROGRAM = GLAM_CONFIG_PROGRAM;
 exports.GLAM_REFERRER = GLAM_REFERRER;
 exports.GlamClient = GlamClient;
@@ -52234,8 +52258,6 @@ exports.KAMINO_VAULTS_PROGRAM = KAMINO_VAULTS_PROGRAM;
 exports.KAMINO_VAULT_STATE_SIZE = KAMINO_VAULT_STATE_SIZE;
 exports.KaminoLendingPolicy = KaminoLendingPolicy;
 exports.KaminoVaultsPolicy = KaminoVaultsPolicy;
-exports.LPAction = LPAction;
-exports.LiquidationType = LiquidationType;
 exports.MARINADE_NATIVE_STAKE_AUTHORITY = MARINADE_NATIVE_STAKE_AUTHORITY;
 exports.MARINADE_PROGRAM_ID = MARINADE_PROGRAM_ID;
 exports.MEMO_PROGRAM = MEMO_PROGRAM;
@@ -52259,13 +52281,11 @@ exports.OrderType = OrderType;
 exports.PerpOperation = PerpOperation;
 exports.PkMap = PkMap;
 exports.PkSet = PkSet;
-exports.PlaceAndTakeOrderSuccessCondition = PlaceAndTakeOrderSuccessCondition;
 exports.PositionDirection = PositionDirection;
 exports.PostOnlyParams = PostOnlyParams;
 exports.PriceDenom = PriceDenom;
 exports.ProtocolPermissions = ProtocolPermissions;
 exports.ProtocolPolicy = ProtocolPolicy;
-exports.ReferrerStatus = ReferrerStatus;
 exports.RequestType = RequestType;
 exports.SANCTUM_STAKE_POOL_PROGRAM_ID = SANCTUM_STAKE_POOL_PROGRAM_ID;
 exports.SEED_ACCOUNT_POLICY = SEED_ACCOUNT_POLICY;
@@ -52283,7 +52303,6 @@ exports.STAKE_ACCOUNT_SIZE = STAKE_ACCOUNT_SIZE;
 exports.STAKE_POOLS = STAKE_POOLS;
 exports.STAKE_POOLS_MAP = STAKE_POOLS_MAP;
 exports.SettlePnlExplanation = SettlePnlExplanation;
-exports.SettlePnlMode = SettlePnlMode;
 exports.SpotBalanceType = SpotBalanceType;
 exports.SpotFulfillmentConfigStatus = SpotFulfillmentConfigStatus;
 exports.SpotFulfillmentStatus = SpotFulfillmentStatus;
@@ -52294,12 +52313,10 @@ exports.StateAccountType = StateAccountType;
 exports.StateIdlModel = StateIdlModel;
 exports.StateModel = StateModel;
 exports.SwapDirection = SwapDirection;
-exports.SwapReduceOnly = SwapReduceOnly;
 exports.TOKEN_MESSENGER_MINTER_V2 = TOKEN_MESSENGER_MINTER_V2;
 exports.TRANSFER_HOOK_PROGRAM = TRANSFER_HOOK_PROGRAM;
 exports.TimeUnit = TimeUnit;
 exports.TimelockClient = TimelockClient;
-exports.TradeSide = TradeSide;
 exports.TransferPolicy = TransferPolicy;
 exports.USDC = USDC;
 exports.USDC_DEVNET = USDC_DEVNET;
@@ -52375,17 +52392,15 @@ exports.getStatePda = getStatePda;
 exports.getTokenAccountsByOwner = getTokenAccountsByOwner;
 exports.getTriggerLimitOrderParams = getTriggerLimitOrderParams;
 exports.getTriggerMarketOrderParams = getTriggerMarketOrderParams;
-exports.getVariant = getVariant;
 exports.getVaultPda = getVaultPda;
 exports.hexToBytes = hexToBytes;
-exports.isOneOfVariant = isOneOfVariant;
-exports.isVariant = isVariant;
 exports.nameToChars = nameToChars;
 exports.parseMintAccountInfo = parseMintAccountInfo;
 exports.parseProgramLogs = parseProgramLogs;
 exports.parseProtocolPermissionsBitmask = parseProtocolPermissionsBitmask;
 exports.parseProtocolsBitmask = parseProtocolsBitmask;
 exports.publicKeyToEvmAddress = publicKeyToEvmAddress;
+exports.readI128LE = readI128LE;
 exports.readSignedBigInt64LE = readSignedBigInt64LE;
 exports.readUnsignedBigInt64LE = readUnsignedBigInt64LE;
 exports.setsAreEqual = setsAreEqual;