@glamsystems/glam-sdk 1.0.6 → 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));
 }
-function toUiAmount(amount, decimals) {
-    return amount.toNumber() / 10 ** decimals;
+/**
+ * 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);
+}
+/**
+ * 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
@@ -42868,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() {
@@ -42970,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([
@@ -44169,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
@@ -44227,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) {
@@ -44333,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
@@ -44345,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){
@@ -44432,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])=>{
@@ -45209,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";
@@ -45631,7 +45744,7 @@ class DriftUser {
         return instance;
     }
     get name() {
-        return charsToName(this.nameBytes);
+        return charsToString(this.nameBytes);
     }
     getAddress() {
         return this._address;
@@ -45639,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);
@@ -45681,7 +45794,7 @@ class DriftPerpMarket extends Decodable {
         return instance;
     }
     get name() {
-        return charsToName(this.nameBytes);
+        return charsToString(this.nameBytes);
     }
     get oracleSource() {
         return OracleSource.get(this.oracleSourceOrd);
@@ -45704,6 +45817,29 @@ DriftPerpMarket._layout = borsh.struct([
 
 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();
@@ -46105,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")
@@ -46183,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) {
@@ -47571,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
@@ -47693,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));
@@ -49687,8 +49828,8 @@ 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);
         });
@@ -49813,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) {
@@ -49878,13 +50018,12 @@ class PriceClient {
             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);
@@ -49895,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,
@@ -49919,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,
@@ -49945,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();
@@ -49959,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,
@@ -50670,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 = [];
@@ -51545,11 +51676,12 @@ const MESSAGE_RECEIVED_EVENT_DISCM = new Uint8Array([
 ]);
 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;
@@ -51569,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([
@@ -51947,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;
@@ -51954,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 ?? "");
         });
     }
     /**
@@ -52228,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;
@@ -52240,6 +52374,7 @@ 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;
@@ -52247,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;
@@ -52283,6 +52419,7 @@ exports.PkMap = PkMap;
 exports.PkSet = PkSet;
 exports.PositionDirection = PositionDirection;
 exports.PostOnlyParams = PostOnlyParams;
+exports.PriceClient = PriceClient;
 exports.PriceDenom = PriceDenom;
 exports.ProtocolPermissions = ProtocolPermissions;
 exports.ProtocolPolicy = ProtocolPolicy;
@@ -52322,13 +52459,14 @@ 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;
@@ -52341,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;
@@ -52394,8 +52533,9 @@ exports.getTriggerLimitOrderParams = getTriggerLimitOrderParams;
 exports.getTriggerMarketOrderParams = getTriggerMarketOrderParams;
 exports.getVaultPda = getVaultPda;
 exports.hexToBytes = hexToBytes;
-exports.nameToChars = nameToChars;
+exports.isValidEvmAddress = isValidEvmAddress;
 exports.parseMintAccountInfo = parseMintAccountInfo;
+exports.parsePermissionNames = parsePermissionNames;
 exports.parseProgramLogs = parseProgramLogs;
 exports.parseProtocolPermissionsBitmask = parseProtocolPermissionsBitmask;
 exports.parseProtocolsBitmask = parseProtocolsBitmask;
@@ -52403,5 +52543,5 @@ exports.publicKeyToEvmAddress = publicKeyToEvmAddress;
 exports.readI128LE = readI128LE;
 exports.readSignedBigInt64LE = readSignedBigInt64LE;
 exports.readUnsignedBigInt64LE = readUnsignedBigInt64LE;
-exports.setsAreEqual = setsAreEqual;
+exports.stringToChars = stringToChars;
 exports.toUiAmount = toUiAmount;