@glamsystems/glam-sdk 1.0.5 → 1.0.7

package/index.cjs.js

@@ -3015,6 +3015,11 @@ var constants$d = [
         type: "u16",
         value: "1"
     },
+    {
+        name: "PROTO_SYSTEM_PERM_EMERGENCY_UPDATE",
+        type: "u64",
+        value: "4"
+    },
     {
         name: "PROTO_SYSTEM_PERM_TRANSFER",
         type: "u64",
@@ -41803,27 +41808,69 @@ function getExtCctpProgram(provider) {
     return new anchor.Program(ExtCctpIdlJson, provider);
 }
 
-/**
- * Compares two sets for equality
- */ const setsAreEqual = (a, b)=>{
-    if (a.size !== b.size) return false;
-    for (let item of a){
-        if (!b.has(item)) return false;
-    }
-    return true;
-};
 /**
  * Converts a buffer or array of character codes to a string
- */ function charsToName(chars) {
+ */ function charsToString(chars) {
     return String.fromCharCode(...chars).replace(/\0/g, "").trim();
 }
 /**
- * Converts a string to an array of character codes (max 32 bytes)
- */ function nameToChars(name) {
-    return Array.from(Buffer.from(name).subarray(0, 32));
+ * Converts a string to an array of character codes
+ */ function stringToChars(name, length = 32) {
+    return Array.from(Buffer.from(name).subarray(0, length));
+}
+/**
+ * Safely converts a BN amount to a UI amount (with decimals).
+ *
+ * @param amount - The amount in base units (BN)
+ * @param decimals - The number of decimals (e.g., 9)
+ * @returns The UI amount as a number
+ *
+ * @example
+ * // Convert 10010000000 base units with 9 decimals
+ * const uiAmount = toUiAmount(new BN(10010000000), 9); // Returns 10.01
+ *
+ * @throws Error if the BN amount is too large to safely convert to number
+ */ function toUiAmount(amount, decimals) {
+    const divisor = new anchor.BN(10).pow(new anchor.BN(decimals));
+    const integerPart = amount.div(divisor);
+    const fractionalPart = amount.mod(divisor);
+    // Convert to number - will throw if too large for Number.MAX_SAFE_INTEGER
+    const intNum = integerPart.toNumber();
+    const fracNum = fractionalPart.toNumber();
+    return intNum + fracNum / Math.pow(10, decimals);
 }
-function toUiAmount(amount, decimals) {
-    return amount.toNumber() / 10 ** decimals;
+/**
+ * Safely converts a UI amount (with decimals) to a BN amount.
+ *
+ * @param amount - The UI amount (e.g., 10.01)
+ * @param decimals - The number of decimals (e.g., 9)
+ * @returns BN representing the amount in base units
+ *
+ * @example
+ * // Convert 10.01 with 9 decimals
+ * const amount = fromUiAmount(10.01, 9); // Returns BN(10010000000)
+ */ function fromUiAmount(amount, decimals) {
+    // Handle scientific notation by converting to fixed-point string
+    let amountStr;
+    if (typeof amount === "number") {
+        // Convert number to fixed-point string to avoid scientific notation
+        amountStr = amount.toFixed(decimals);
+    } else {
+        amountStr = amount;
+    }
+    const [integerPart, fractionalPart = ""] = amountStr.split(".");
+    // Convert integer part
+    const integerBN = new anchor.BN(integerPart || "0");
+    // Convert fractional part
+    let fractionalBN = new anchor.BN(0);
+    if (fractionalPart) {
+        // Pad or truncate fractional part to match decimals
+        const paddedFractional = fractionalPart.padEnd(decimals, "0").slice(0, decimals);
+        fractionalBN = new anchor.BN(paddedFractional);
+    }
+    // Combine: (integer * 10^decimals) + fractional
+    const multiplier = new anchor.BN(10).pow(new anchor.BN(decimals));
+    return integerBN.mul(multiplier).add(fractionalBN);
 }
 
 class MintPolicy {
@@ -42051,7 +42098,7 @@ class MintIdlModel {
 }
 class MintModel extends MintIdlModel {
     get nameStr() {
-        return this.name ? charsToName(this.name) : "";
+        return this.name ? charsToString(this.name) : "";
     }
     constructor(data){
         super(data);
@@ -42171,27 +42218,32 @@ const GLAM_CONFIG_PROGRAM = new web3_js.PublicKey("gConFzxKL9USmwTdJoeQJvfKmqhJ2
     3: "Exponent Market"
 };
 /**
- * Get protocol and permission mappings at runtime to ensure correct program IDs based on environment
+ * Get protocol and permission mappings at runtime to ensure correct program IDs based on environment.
+ *
+ * This method provides the source of truth for protocol and permission mappings and staging status in SDK.
  */ const getProtocolsAndPermissions = ()=>({
         // Supported protocols and permissions are defined in:
         // @anchor/programs/glam_protocol/src/state/acl.rs
         [getGlamProtocolProgramId().toBase58()]: {
             "0000000000000001": {
-                name: "System Program",
+                name: "SystemProgram",
+                staging: false,
                 permissions: {
                     [1 << 0]: "WSOL",
                     [1 << 1]: "Transfer"
                 }
             },
             "0000000000000010": {
-                name: "Stake Program",
+                name: "StakeProgram",
+                staging: true,
                 permissions: {
                     [1 << 0]: "Stake",
                     [1 << 1]: "Unstake"
                 }
             },
             "0000000000000100": {
-                name: "Jupiter Swap",
+                name: "JupiterSwap",
+                staging: false,
                 permissions: {
                     [1 << 0]: "SwapAny",
                     [1 << 1]: "SwapLST",
@@ -42203,7 +42255,8 @@ const GLAM_CONFIG_PROGRAM = new web3_js.PublicKey("gConFzxKL9USmwTdJoeQJvfKmqhJ2
         // @anchor/programs/glam_mint/src/state/acl.rs
         [getGlamMintProgramId().toBase58()]: {
             "0000000000000001": {
-                name: "Glam Mint",
+                name: "GlamMint",
+                staging: false,
                 permissions: {
                     [1 << 0]: "MintTokens",
                     [1 << 1]: "BurnTokens",
@@ -42221,7 +42274,8 @@ const GLAM_CONFIG_PROGRAM = new web3_js.PublicKey("gConFzxKL9USmwTdJoeQJvfKmqhJ2
         // @anchor/programs/ext_kamino/src/state/acl.rs
         [getExtKaminoProgramId().toBase58()]: {
             "0000000000000001": {
-                name: "Kamino Lend",
+                name: "KaminoLend",
+                staging: false,
                 permissions: {
                     [1 << 0]: "Init",
                     [1 << 1]: "Deposit",
@@ -42231,14 +42285,16 @@ const GLAM_CONFIG_PROGRAM = new web3_js.PublicKey("gConFzxKL9USmwTdJoeQJvfKmqhJ2
                 }
             },
             "0000000000000010": {
-                name: "Kamino Vaults",
+                name: "KaminoVaults",
+                staging: false,
                 permissions: {
                     [1 << 0]: "Deposit",
                     [1 << 1]: "Withdraw"
                 }
             },
             "0000000000000100": {
-                name: "Kamino Farms",
+                name: "KaminoFarms",
+                staging: false,
                 permissions: {
                     [1 << 0]: "Stake",
                     [1 << 1]: "Unstake",
@@ -42250,7 +42306,8 @@ const GLAM_CONFIG_PROGRAM = new web3_js.PublicKey("gConFzxKL9USmwTdJoeQJvfKmqhJ2
         // @anchor/programs/ext_drift/src/state/acl.rs
         [getExtDriftProgramId().toBase58()]: {
             "0000000000000001": {
-                name: "Drift Protocol",
+                name: "DriftProtocol",
+                staging: false,
                 permissions: {
                     [1 << 0]: "InitUser",
                     [1 << 1]: "UpdateUser",
@@ -42266,7 +42323,8 @@ const GLAM_CONFIG_PROGRAM = new web3_js.PublicKey("gConFzxKL9USmwTdJoeQJvfKmqhJ2
                 }
             },
             "0000000000000010": {
-                name: "Drift Vaults",
+                name: "DriftVaults",
+                staging: false,
                 permissions: {
                     [1 << 0]: "Deposit",
                     [1 << 1]: "Withdraw"
@@ -42277,7 +42335,8 @@ const GLAM_CONFIG_PROGRAM = new web3_js.PublicKey("gConFzxKL9USmwTdJoeQJvfKmqhJ2
         // @anchor/programs/ext_spl/src/state/acl.rs
         [getExtSplProgramId().toBase58()]: {
             "0000000000000001": {
-                name: "Spl Token",
+                name: "SplToken",
+                staging: false,
                 permissions: {
                     [1 << 0]: "Transfer"
                 }
@@ -42288,6 +42347,7 @@ const GLAM_CONFIG_PROGRAM = new web3_js.PublicKey("gConFzxKL9USmwTdJoeQJvfKmqhJ2
         [getExtCctpProgramId().toBase58()]: {
             "0000000000000001": {
                 name: "CCTP",
+                staging: false,
                 permissions: {
                     [1 << 0]: "Transfer"
                 }
@@ -42298,6 +42358,7 @@ const GLAM_CONFIG_PROGRAM = new web3_js.PublicKey("gConFzxKL9USmwTdJoeQJvfKmqhJ2
         [getExtMarinadeProgramId().toBase58()]: {
             "0000000000000001": {
                 name: "Marinade",
+                staging: true,
                 permissions: {
                     [1 << 0]: "Stake",
                     [1 << 1]: "Unstake"
@@ -42308,7 +42369,8 @@ const GLAM_CONFIG_PROGRAM = new web3_js.PublicKey("gConFzxKL9USmwTdJoeQJvfKmqhJ2
         // @anchor/programs/ext_stake_pool/src/state/acl.rs
         [getExtStakePoolProgramId().toBase58()]: {
             "0000000000000001": {
-                name: "Stake Pool",
+                name: "StakePool",
+                staging: true,
                 permissions: {
                     [1 << 0]: "DepositSol",
                     [1 << 1]: "DepositStake",
@@ -42319,7 +42381,8 @@ const GLAM_CONFIG_PROGRAM = new web3_js.PublicKey("gConFzxKL9USmwTdJoeQJvfKmqhJ2
                 }
             },
             "0000000000000010": {
-                name: "Sanctum Single",
+                name: "SanctumSingle",
+                staging: true,
                 permissions: {
                     [1 << 0]: "DepositSol",
                     [1 << 1]: "DepositStake",
@@ -42330,7 +42393,8 @@ const GLAM_CONFIG_PROGRAM = new web3_js.PublicKey("gConFzxKL9USmwTdJoeQJvfKmqhJ2
                 }
             },
             "0000000000000100": {
-                name: "Sanctum Multi",
+                name: "SanctumMulti",
+                staging: true,
                 permissions: {
                     [1 << 0]: "DepositSol",
                     [1 << 1]: "DepositStake",
@@ -42360,7 +42424,7 @@ const GLAM_CONFIG_PROGRAM = new web3_js.PublicKey("gConFzxKL9USmwTdJoeQJvfKmqhJ2
     const mapping = {};
     Object.entries(getProtocolsAndPermissions()).forEach(([programId, protocols])=>{
         Object.entries(protocols).forEach(([bitflag, protocol])=>{
-            const name = protocol.name.replace(" ", "");
+            const name = protocol.name;
             mapping[name] = [
                 programId,
                 bitflag
@@ -42723,7 +42787,15 @@ const getStakeAccountsWithStates = async (connection, withdrawAuthority)=>{
                         1,
                         0,
                         0,
-                        0
+                        0,
+                        0xff,
+                        0xff,
+                        0xff,
+                        0xff,
+                        0xff,
+                        0xff,
+                        0xff,
+                        0xff
                     ])
                 }
             },
@@ -42860,6 +42932,37 @@ const getStakeAccountsWithStates = async (connection, withdrawAuthority)=>{
         permissions
     };
 }
+/**
+ * Given the protocol name and a list of permission names, returns the permissions bitmask.
+ */ function parsePermissionNames({ protocolName, permissionNames }) {
+    const protocolConfig = getProgramAndBitflagByProtocolName()[protocolName];
+    if (!protocolConfig) {
+        throw new Error(`Unknown protocol name ${protocolName}`);
+    }
+    const [programIdStr, bitflagStr] = protocolConfig;
+    const protocolPermissions = getProtocolsAndPermissions()[programIdStr]?.[bitflagStr];
+    if (!protocolPermissions) {
+        throw new Error(`Protocol mapping not found for protocol name ${protocolName}`);
+    }
+    const integrationProgram = new web3_js.PublicKey(programIdStr);
+    const protocolBitflag = parseInt(bitflagStr, 2);
+    // Calculate permissions bitmask
+    const permissionNameToBitflag = {};
+    for (const [bitflag, name] of Object.entries(protocolPermissions.permissions)){
+        permissionNameToBitflag[name] = new anchor.BN(bitflag);
+    }
+    const permissionsBitmask = permissionNames.reduce((mask, p)=>{
+        if (!permissionNameToBitflag[p]) {
+            throw new Error(`Unknown permission name ${p} for protocol name ${protocolName}`);
+        }
+        return mask.or(permissionNameToBitflag[p]);
+    }, new anchor.BN(0));
+    return {
+        integrationProgram,
+        protocolBitflag,
+        permissionsBitmask
+    };
+}
 
 class BlockhashWithCache {
     async get() {
@@ -42962,6 +43065,12 @@ const publicKeyToEvmAddress = (publicKey)=>{
     const evmAddress = hex.slice(-40);
     return `0x${evmAddress}`;
 };
+/**
+ * Validates if a string is a valid EVM address (40 hex characters)
+ */ const isValidEvmAddress = (addr)=>{
+    const cleanAddr = addr.startsWith("0x") ? addr.slice(2) : addr;
+    return /^[0-9a-fA-F]{40}$/.test(cleanAddr);
+};
 
 function getStatePda(initKey, owner, programId) {
     const [pda, _bump] = web3_js.PublicKey.findProgramAddressSync([
@@ -43575,8 +43684,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 +44148,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 +44186,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 +44222,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
 });
@@ -44235,6 +44270,21 @@ function bfToDecimal(x) {
     return new Fraction(accSf).toDecimal();
 }
 
+class JupTokenList {
+    getByMint(mintAddress) {
+        return this.mintMap.get(mintAddress.toString());
+    }
+    getBySymbol(symbol) {
+        return this.tokens.find((token)=>token.symbol === symbol);
+    }
+    constructor(tokens){
+        this.tokens = tokens;
+        this.mintMap = new Map(tokens.map((token)=>[
+                token.address,
+                token
+            ]));
+    }
+}
 const TOKEN_LIST_CACHE_TTL = 5 * 60 * 1000; // 5 minutes
 const JUPITER_API_DEFAULT = "https://api.jup.ag";
 // Zod schemas for runtime validation
@@ -44293,11 +44343,12 @@ class JupiterApiClient {
                 usdPrice: t.usdPrice,
                 slot: t.priceBlockId
             }));
+        const jupTokenList = new JupTokenList(tokenList);
         this.tokenListCache = {
-            data: tokenList,
+            data: jupTokenList,
             timestamp: Date.now()
         };
-        return tokenList;
+        return jupTokenList;
     }
     async fetchProgramLabels() {
         if (!this.apiKey) {
@@ -44399,7 +44450,7 @@ class JupiterApiClient {
         return this.id?.toBase58() || "";
     }
     get nameStr() {
-        return this.name ? charsToName(this.name) : "";
+        return this.name ? charsToString(this.name) : "";
     }
     get productType() {
         // @ts-ignore
@@ -44411,12 +44462,8 @@ class JupiterApiClient {
         return new Date(createdAt * 1000).toISOString().split("T")[0] || "Unknown";
     }
     get sparkleKey() {
-        if (!this.mint && !this.id) {
-            throw new Error("Cannot generate sparkle key");
-        }
-        // An edge case is mint is closed but state account is not
-        // this.mint would be `null`
-        return (!this.mint?.equals(web3_js.PublicKey.default) ? this.id : this.mint)?.toBase58();
+        const pubkey = (this.mint?.equals(web3_js.PublicKey.default) ? this.id : this.mint) || web3_js.PublicKey.default;
+        return pubkey.toBase58();
     }
     get baseAssetTokenProgramId() {
         switch(this.baseAssetTokenProgram){
@@ -44498,7 +44545,7 @@ class JupiterApiClient {
             const extMetadata = splToken.getExtensionData(splToken.ExtensionType.TokenMetadata, glamMint.tlvData);
             const tokenMetadata = extMetadata ? splTokenMetadata.unpack(extMetadata) : {};
             mintModel["symbol"] = tokenMetadata?.symbol;
-            mintModel["name"] = nameToChars(tokenMetadata?.name);
+            mintModel["name"] = stringToChars(tokenMetadata?.name);
             mintModel["uri"] = tokenMetadata?.uri;
             if (tokenMetadata?.additionalMetadata) {
                 tokenMetadata.additionalMetadata.forEach(([k, v])=>{
@@ -44564,6 +44611,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 +45156,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 +45184,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 +45205,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"),
@@ -45184,7 +45322,7 @@ DriftVaultDepositor._layout = borsh.struct([
 ]);
 class DriftVault extends Decodable {
     get name() {
-        return charsToName(this.nameBytes);
+        return charsToString(this.nameBytes);
     }
     marketPda(marketType, marketIndex) {
         const marketTypeStr = marketType === MarketType.SPOT ? "spot" : "perp";
@@ -45195,21 +45333,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 +45455,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 +45497,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++){
@@ -45612,7 +45744,7 @@ class DriftUser {
         return instance;
     }
     get name() {
-        return charsToName(this.nameBytes);
+        return charsToString(this.nameBytes);
     }
     getAddress() {
         return this._address;
@@ -45620,7 +45752,7 @@ class DriftUser {
 }
 class DriftSpotMarket extends Decodable {
     get name() {
-        return charsToName(this.nameBytes);
+        return charsToString(this.nameBytes);
     }
     get oracleSource() {
         return OracleSource.get(this.oracleSourceOrd);
@@ -45628,24 +45760,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"),
@@ -45680,24 +45794,11 @@ class DriftPerpMarket extends Decodable {
         return instance;
     }
     get name() {
-        return charsToName(this.nameBytes);
+        return charsToString(this.nameBytes);
     }
     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 +45815,31 @@ DriftPerpMarket._layout = borsh.struct([
     borsh.u16("quoteSpotMarketIndex")
 ]);
 
+const DRIFT_SIGNER = new web3_js.PublicKey("JCNCMFXo5M5qwUPg2Utu1u6YWp3MbygxqBsBeXXJfrw");
+const DRIFT_MARGIN_PRECISION = 10000;
+class DriftMarketConfigs {
+    getPerp(marketIndex) {
+        const market = this.perpMarkets[marketIndex];
+        if (market.marketIndex === marketIndex) {
+            return market;
+        }
+    }
+    getSpot(mintOrIndex) {
+        if (typeof mintOrIndex === "number") {
+            const market = this.spotMarkets[mintOrIndex];
+            if (market.marketIndex === mintOrIndex) {
+                return market;
+            }
+        } else {
+            return this.spotMarkets.find(({ mint })=>mint.equals(mintOrIndex));
+        }
+    }
+    constructor(orderConstants, perpMarkets, spotMarkets){
+        this.orderConstants = orderConstants;
+        this.perpMarkets = perpMarkets;
+        this.spotMarkets = spotMarkets;
+    }
+}
 let TxBuilder$g = class TxBuilder extends BaseTxBuilder {
     async initializeUserStatsIx(glamSigner) {
         const { userStats } = this.client.getDriftUserPdas();
@@ -46115,6 +46241,15 @@ class DriftProtocolClient {
             userStats: this.getUserStatsPda(vault)
         };
     }
+    getSubAccountId(driftUser) {
+        for(let i = 0; i < 100; ++i){
+            const { user } = this.getDriftUserPdas(i);
+            if (user.equals(driftUser)) {
+                return i;
+            }
+        }
+        throw new Error("Sub account not found");
+    }
     get driftStatePda() {
         return web3_js.PublicKey.findProgramAddressSync([
             Buffer.from("drift_state")
@@ -46181,7 +46316,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;
@@ -46193,14 +46328,10 @@ class DriftProtocolClient {
         // FIXME: one day the number of markets will exceed 100 and a better solution will be needed
         const perpMarkets = await this.fetchAndParsePerpMarkets(Array.from(Array(100).keys()), skipCache);
         const spotMarkets = await this.fetchAndParseSpotMarkets(Array.from(Array(100).keys()), skipCache);
-        this.marketConfigs = {
-            orderConstants: {
-                perpBaseScale: 9,
-                quoteScale: 6
-            },
-            perpMarkets,
-            spotMarkets
-        };
+        this.marketConfigs = new DriftMarketConfigs({
+            perpBaseScale: 9,
+            quoteScale: 6
+        }, perpMarkets, spotMarkets);
         return this.marketConfigs;
     }
     async fetchAndParseDriftUser(subAccountId = 0) {
@@ -47074,7 +47205,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
+        });
     }
 }
 
@@ -47579,7 +47712,7 @@ let TxBuilder$b = class TxBuilder extends BaseTxBuilder {
         // stateInitKey = hash state name and get first 8 bytes
         // useful for re-computing state account PDA in the future
         const stateInitKey = [
-            ...Buffer.from(anchor__namespace.utils.sha256.hash(charsToName(params.name))).subarray(0, 8)
+            ...Buffer.from(anchor__namespace.utils.sha256.hash(charsToString(params.name))).subarray(0, 8)
         ];
         const created = new CreatedModel({
             key: stateInitKey
@@ -47701,7 +47834,7 @@ const KAMINO_VAULTS_EVENT_AUTHORITY = new web3_js.PublicKey("24tHwQyJJ9akVXxnvke
 const MAX_RESERVES = 25;
 class KVaultState extends Decodable {
     get nameStr() {
-        return charsToName(this.name);
+        return charsToString(this.name);
     }
     get validAllocations() {
         return this.vaultAllocationStrategy.filter(({ reserve })=>!reserve.equals(web3_js.PublicKey.default));
@@ -49545,6 +49678,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 +49694,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 +49731,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 +49754,7 @@ class PriceClient {
             ...tokenPubkeys,
             ...glamDriftUsers,
             ...glamDriftSpotMarkets,
+            ...glamDriftPerpMarkets,
             ...dvaultDepositors,
             ...dvaultUsers,
             ...dvaultUserSpotMarkets,
@@ -49655,6 +49794,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) {
@@ -49682,13 +49828,13 @@ class PriceClient {
         }
         // Build a map of token prices (in USD)
         const tokenPricesMap = new PkMap();
-        const tokenList = await this.jupiterApi.fetchTokensList();
-        tokenList.forEach((item)=>{
+        const tokenList = await this.jupiterApi.fetchTokensList(true);
+        tokenList.tokens.forEach((item)=>{
             const tokenMint = new web3_js.PublicKey(item.address);
             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");
@@ -49808,7 +49954,6 @@ class PriceClient {
         }
         for (const pubkey of tokenAccountPubkeys){
             const data = accountsDataMap.get(pubkey);
-            if (!data) continue;
             const { amount, mint } = splToken.AccountLayout.decode(data);
             const tokenInfo = tokenPricesMap.get(mint);
             if (tokenInfo) {
@@ -49824,28 +49969,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,16 +50015,15 @@ 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;
             const { usdPrice, slot } = tokenPrice;
             const holding = new Holding(mint, decimals, amount, usdPrice, {
                 slot,
                 source: priceSource
             }, "DriftVaults", {
-                vault: pubkey,
+                vault: dvault.getAddress(),
                 depositor: depositor.getAddress()
             });
             holdings.push(holding);
@@ -49879,16 +50034,13 @@ class PriceClient {
         const holdings = [];
         for (const obligation of obligationPubkeys){
             const obligationData = accountsDataMap.get(obligation);
-            if (!obligationData) continue;
             const { activeDeposits, activeBorrows } = Obligation.decode(obligation, obligationData);
             for (const { depositReserve, depositedAmount } of activeDeposits){
                 const reserve = reservesMap.get(depositReserve);
-                if (!reserve) continue;
                 const { collateralExchangeRate, lendingMarket, liquidity } = reserve;
                 const supplyAmount = new Decimal(depositedAmount.toString()).div(collateralExchangeRate).floor();
                 const amount = new anchor.BN(supplyAmount.toString());
                 const tokenPrice = tokenPricesMap.get(liquidity.mintPubkey);
-                if (!tokenPrice) continue;
                 const { usdPrice, slot } = tokenPrice;
                 const holding = new Holding(liquidity.mintPubkey, liquidity.mintDecimals.toNumber(), amount, usdPrice, {
                     slot,
@@ -49903,13 +50055,11 @@ class PriceClient {
             }
             for (const { borrowReserve, borrowedAmountSf, cumulativeBorrowRateBsf } of activeBorrows){
                 const reserve = reservesMap.get(borrowReserve);
-                if (!reserve) continue;
                 const { cumulativeBorrowRate, lendingMarket, liquidity } = reserve;
                 const obligationCumulativeBorrowRate = bfToDecimal(cumulativeBorrowRateBsf);
                 const borrowAmount = new Fraction(borrowedAmountSf).toDecimal().mul(cumulativeBorrowRate).div(obligationCumulativeBorrowRate).ceil();
                 const amount = new anchor.BN(borrowAmount.toString());
                 const tokenPrice = tokenPricesMap.get(liquidity.mintPubkey);
-                if (!tokenPrice) continue;
                 const { usdPrice, slot } = tokenPrice;
                 const holding = new Holding(liquidity.mintPubkey, liquidity.mintDecimals.toNumber(), amount, usdPrice, {
                     slot,
@@ -49929,12 +50079,10 @@ class PriceClient {
         const holdings = [];
         for (const [ata, kvaultState] of kvaultAtasAndStates.pkEntries()){
             const ataData = accountsDataMap.get(ata);
-            if (!ataData) continue;
             const tokenAccount = splToken.AccountLayout.decode(ataData);
             let aum = new Decimal(kvaultState.tokenAvailable.toString());
             kvaultState.validAllocations.map((allocation)=>{
                 const reserve = reservesMap.get(allocation.reserve);
-                if (!reserve) return;
                 const { collateralExchangeRate } = reserve;
                 // allocation ctoken amount to liq asset amount
                 const liqAmount = new Decimal(allocation.ctokenAllocation.toString()).div(collateralExchangeRate).floor();
@@ -49943,7 +50091,6 @@ class PriceClient {
             // calculate liquidity token amount
             const amount = new Decimal(tokenAccount.amount.toString()).div(new Decimal(kvaultState.sharesIssued.toString())).mul(aum).floor();
             const tokenPrice = tokenPricesMap.get(kvaultState.tokenMint);
-            if (!tokenPrice) continue;
             const { usdPrice, slot } = tokenPrice;
             const holding = new Holding(kvaultState.tokenMint, kvaultState.tokenMintDecimals.toNumber(), new anchor.BN(amount.toString()), usdPrice, {
                 slot,
@@ -50654,7 +50801,7 @@ let TxBuilder$5 = class TxBuilder extends BaseTxBuilder {
     async initializeIxs(initMintParams, stateParams, glamSigner) {
         const decimals = typeof initMintParams.decimals === "number" ? initMintParams.decimals : null;
         const stateInitKey = [
-            ...Buffer.from(anchor.utils.sha256.hash(charsToName(initMintParams.name))).subarray(0, 8)
+            ...Buffer.from(anchor.utils.sha256.hash(charsToString(initMintParams.name))).subarray(0, 8)
         ];
         const glamState = getStatePda(stateInitKey, glamSigner, this.client.base.protocolProgram.programId);
         const postInstructions = [];
@@ -51527,12 +51674,14 @@ 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){
+    constructor(amount, sourceDomain, sourceAddress, destinationDomain, destinationCaller, destinationAddress, attestation, nonce, status, txHash){
         this.amount = amount;
         this.sourceDomain = sourceDomain;
         this.sourceAddress = sourceAddress;
         this.destinationDomain = destinationDomain;
+        this.destinationCaller = destinationCaller;
         this.destinationAddress = destinationAddress;
         this.attestation = attestation;
         this.nonce = nonce;
@@ -51552,7 +51701,7 @@ let TxBuilder = class TxBuilder extends BaseTxBuilder {
             amount,
             destinationDomain: domain,
             mintRecipient: recipient,
-            destinationCaller: web3_js.PublicKey.default,
+            destinationCaller: params.destinationCaller || web3_js.PublicKey.default,
             ...params
         };
         const denylistAccount = web3_js.PublicKey.findProgramAddressSync([
@@ -51878,9 +52027,6 @@ class CctpClient {
             ...options.commitment ? {
                 commitment: options.commitment
             } : {},
-            ...options.minSlot ? {
-                minContextSlot: options.minSlot
-            } : {},
             filters: [
                 {
                     dataSize: 428
@@ -51933,6 +52079,7 @@ class CctpClient {
             const status = message.status;
             const nonce = message.decodedMessage.nonce;
             const destinationDomain = Number(message.decodedMessage.destinationDomain);
+            const destinationCaller = message.decodedMessage.destinationCaller;
             const destinationAddress = message.decodedMessage.decodedMessageBody.mintRecipient;
             const sourceAddress = message.decodedMessage.decodedMessageBody.messageSender;
             const amount = message.decodedMessage.decodedMessageBody.amount;
@@ -51940,7 +52087,7 @@ class CctpClient {
             if (sourceDomain === 5 && token !== USDC.toBase58()) {
                 throw new Error("Invalid message, expected burn token to be USDC");
             }
-            return new CctpBridgeEvent(new anchor.BN(amount), sourceDomain, sourceAddress, destinationDomain, destinationAddress, attestation, nonce, status, txHash ?? "");
+            return new CctpBridgeEvent(new anchor.BN(amount), sourceDomain, sourceAddress, destinationDomain, destinationCaller, destinationAddress, attestation, nonce, status, txHash ?? "");
         });
     }
     /**
@@ -51952,16 +52099,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 +52156,9 @@ class CctpClient {
                         nonce,
                         txHash
                     });
+                    for (const event of events){
+                        event.slot = txSlots.get(txHash);
+                    }
                     allEvents.push(...events);
                 }
             }
@@ -52023,34 +52173,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;
@@ -52203,6 +52361,7 @@ exports.DefaultOrderParams = DefaultOrderParams;
 exports.DelegateAcl = DelegateAcl;
 exports.DepositDirection = DepositDirection;
 exports.DepositExplanation = DepositExplanation;
+exports.DriftMarketConfigs = DriftMarketConfigs;
 exports.DriftProtocolClient = DriftProtocolClient;
 exports.DriftProtocolPolicy = DriftProtocolPolicy;
 exports.DriftVaultsClient = DriftVaultsClient;
@@ -52211,11 +52370,11 @@ 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;
 exports.GlamError = GlamError;
+exports.Holding = Holding;
 exports.InsuranceFundOperation = InsuranceFundOperation;
 exports.IntegrationAcl = IntegrationAcl;
 exports.IntegrationPermissions = IntegrationPermissions;
@@ -52223,6 +52382,7 @@ exports.JITO_TIP_DEFAULT = JITO_TIP_DEFAULT;
 exports.JUP = JUP;
 exports.JUPITER_API_DEFAULT = JUPITER_API_DEFAULT;
 exports.JUPITER_PROGRAM_ID = JUPITER_PROGRAM_ID;
+exports.JupTokenList = JupTokenList;
 exports.JupiterApiClient = JupiterApiClient;
 exports.JupiterSwapClient = JupiterSwapClient;
 exports.JupiterSwapPolicy = JupiterSwapPolicy;
@@ -52234,8 +52394,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 +52417,12 @@ exports.OrderType = OrderType;
 exports.PerpOperation = PerpOperation;
 exports.PkMap = PkMap;
 exports.PkSet = PkSet;
-exports.PlaceAndTakeOrderSuccessCondition = PlaceAndTakeOrderSuccessCondition;
 exports.PositionDirection = PositionDirection;
 exports.PostOnlyParams = PostOnlyParams;
+exports.PriceClient = PriceClient;
 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 +52440,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,24 +52450,23 @@ 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;
 exports.USDC_ORACLE = USDC_ORACLE;
 exports.UserStatus = UserStatus;
+exports.VaultHoldings = VaultHoldings;
 exports.VoteAuthorize = VoteAuthorize;
 exports.WSOL = WSOL;
 exports.ZERO = ZERO;
 exports.bfToDecimal = bfToDecimal;
 exports.buildComputeBudgetInstructions = buildComputeBudgetInstructions;
 exports.bytesToHex = bytesToHex;
-exports.charsToName = charsToName;
+exports.charsToString = charsToString;
 exports.compareDelegateAcls = compareDelegateAcls;
 exports.compareIntegrationAcls = compareIntegrationAcls;
 exports.evmAddressToBytes32 = evmAddressToBytes32;
@@ -52324,6 +52479,7 @@ exports.fetchMintsAndTokenPrograms = fetchMintsAndTokenPrograms;
 exports.findGlamLookupTables = findGlamLookupTables;
 exports.findStakeAccounts = findStakeAccounts;
 exports.formatBits = formatBits;
+exports.fromUiAmount = fromUiAmount;
 exports.getAccountPolicyPda = getAccountPolicyPda;
 exports.getAssetMeta = getAssetMeta;
 exports.getEscrowPda = getEscrowPda;
@@ -52375,18 +52531,17 @@ 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.isValidEvmAddress = isValidEvmAddress;
 exports.parseMintAccountInfo = parseMintAccountInfo;
+exports.parsePermissionNames = parsePermissionNames;
 exports.parseProgramLogs = parseProgramLogs;
 exports.parseProtocolPermissionsBitmask = parseProtocolPermissionsBitmask;
 exports.parseProtocolsBitmask = parseProtocolsBitmask;
 exports.publicKeyToEvmAddress = publicKeyToEvmAddress;
+exports.readI128LE = readI128LE;
 exports.readSignedBigInt64LE = readSignedBigInt64LE;
 exports.readUnsignedBigInt64LE = readUnsignedBigInt64LE;
-exports.setsAreEqual = setsAreEqual;
+exports.stringToChars = stringToChars;
 exports.toUiAmount = toUiAmount;