@augustdigital/sdk 4.24.5 → 4.24.7

package/lib/adapters/solana/getters.d.ts

@@ -1,3 +1,3 @@
 import { ITokenizedVault, IVault } from '../../types';
-import { IVaultBaseOptions } from '../../modules/vaults';
+import type { IVaultBaseOptions } from '../../modules/vaults/types';
 export declare const getSolanaVault: (tokenizedVault: ITokenizedVault, options: IVaultBaseOptions) => Promise<IVault>;

package/lib/adapters/solana/getters.js

@@ -1,53 +1,111 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSolanaVault = void 0;
-const _1 = require(".");
+const utils_1 = require("./utils");
+const SolanaConstants = __importStar(require("./constants"));
 const core_1 = require("../../core");
+const utils_2 = require("../../modules/vaults/utils");
 const getSolanaVault = async (tokenizedVault, options) => {
     const solanaRpcUrl = options.rpcUrl;
-    const vaultState = await _1.Solana.utils.getVaultStateReadOnly({
-        idl: _1.Solana.constants.vaultIdl,
-        vaultProgramId: tokenizedVault.address,
-        endpoint: solanaRpcUrl,
-        connection: options?.solanaService.connection,
-    });
+    const solanaMetadata = tokenizedVault.solana_vault_metadata;
+    const programId = utils_1.SolanaUtils.resolveProgramId(tokenizedVault.address, solanaMetadata);
+    const fallbackDecimals = solanaMetadata?.deposit_token_decimals ?? SolanaConstants.fallbackDecimals;
+    let vaultState = null;
     let depositMint = null;
-    if (vaultState.vaultState && vaultState.vaultState.depositMint) {
-        depositMint = await _1.Solana.utils.getToken({
-            mintAddress: vaultState.vaultState.depositMint,
+    let onChainAvailable = false;
+    try {
+        vaultState = await utils_1.SolanaUtils.getVaultStateReadOnly({
+            idl: SolanaConstants.vaultIdl,
+            vaultProgramId: programId,
+            vaultAddress: (solanaMetadata?.vault_state_pda ?? undefined),
             endpoint: solanaRpcUrl,
             connection: options?.solanaService?.connection,
         });
-    }
-    const apy = {
-        apy: tokenizedVault?.reported_apy?.apy * 100,
-        explainer: tokenizedVault?.reported_apy?.explainer,
-        pointsApy: tokenizedVault?.reported_apy?.points_apy
-            ? tokenizedVault.reported_apy.points_apy * 100
-            : null,
-        campaignApy: tokenizedVault?.campaign_apy
-            ? tokenizedVault.campaign_apy * 100
-            : null,
-        liquidApy: tokenizedVault?.reported_apy?.liquid_apy * 100,
-        rewardsClaimable: tokenizedVault?.reported_apy?.rewards_claimable,
-        rewardsCompounded: tokenizedVault?.reported_apy?.rewards_compounded,
-        underlyingApy: tokenizedVault?.reported_apy?.underlying_apy * 100,
-    };
-    let totalSupply = (0, core_1.toNormalizedBn)(0, vaultState.depositMintDecimals || 0);
-    try {
-        const shareMintPda = _1.Solana.utils.deriveShareMintPda(tokenizedVault.address);
-        const shareMintAccountInfo = await options.solanaService?.connection.getParsedAccountInfo(shareMintPda);
-        if (shareMintAccountInfo?.value) {
-            const parsedData = shareMintAccountInfo.value.data;
-            const { supply, decimals } = parsedData.parsed.info;
-            totalSupply = (0, core_1.toNormalizedBn)(BigInt(supply), decimals);
+        onChainAvailable = true;
+        if (vaultState?.vaultState && vaultState.vaultState.depositMint) {
+            try {
+                depositMint = await utils_1.SolanaUtils.getToken({
+                    mintAddress: vaultState.vaultState.depositMint,
+                    endpoint: solanaRpcUrl,
+                    connection: options?.solanaService?.connection,
+                });
+            }
+            catch (tokenError) {
+                console.warn(`[getSolanaVault] Token fetch failed for ${tokenizedVault.address}, using backend metadata:`, tokenError);
+            }
         }
     }
     catch (error) {
-        console.warn('Error fetching share mint info:', error);
+        console.warn(`[getSolanaVault] RPC unavailable for ${tokenizedVault.address}, using backend-only data:`, error);
     }
-    const deployedAum = vaultState.vaultState?.deployedAum;
-    const totalAssets = (0, core_1.toNormalizedBn)(deployedAum ? BigInt(deployedAum.toString()) : BigInt(0), vaultState.depositMintDecimals || 0);
+    const decimals = vaultState?.depositMintDecimals ?? fallbackDecimals;
+    const apy = (0, utils_2.formatVaultApy)(tokenizedVault);
+    let totalSupply = (0, core_1.toNormalizedBn)(0, decimals);
+    if (onChainAvailable) {
+        try {
+            const shareMintPda = utils_1.SolanaUtils.deriveShareMintPda(programId);
+            const shareMintAccountInfo = await options.solanaService?.connection.getParsedAccountInfo(shareMintPda);
+            if (shareMintAccountInfo?.value) {
+                const parsedData = shareMintAccountInfo.value.data;
+                const { supply, decimals: mintDecimals } = parsedData.parsed.info;
+                totalSupply = (0, core_1.toNormalizedBn)(BigInt(supply), mintDecimals);
+            }
+        }
+        catch (error) {
+            console.warn(`[getSolanaVault] Error fetching share mint info for vault ${tokenizedVault.address}:`, error);
+        }
+    }
+    let totalAssets;
+    if (onChainAvailable) {
+        const deployedAum = vaultState?.vaultState?.deployedAum;
+        totalAssets = (0, core_1.toNormalizedBn)(deployedAum ? BigInt(deployedAum.toString()) : BigInt(0), decimals);
+    }
+    else if (tokenizedVault.latest_reported_tvl != null) {
+        const scaleFactor = BigInt(10) ** BigInt(decimals);
+        const tvlWhole = BigInt(Math.round(tokenizedVault.latest_reported_tvl));
+        totalAssets = (0, core_1.toNormalizedBn)(tvlWhole * scaleFactor, decimals);
+    }
+    else {
+        totalAssets = (0, core_1.toNormalizedBn)(BigInt(0), decimals);
+    }
+    const depositAsset = {
+        address: depositMint?.address ?? solanaMetadata?.deposit_mint,
+        symbol: depositMint?.symbol ?? solanaMetadata?.deposit_token_symbol,
+        decimals: depositMint?.decimals ?? fallbackDecimals,
+    };
     const returnObj = {
         operator: '0x',
         eoa_operators: [],
@@ -59,15 +117,9 @@ const getSolanaVault = async (tokenizedVault, options) => {
         receipt: {
             address: tokenizedVault.address,
             symbol: tokenizedVault?.receipt_token_symbol || 'upSOL',
-            decimals: vaultState.depositMintDecimals || 0,
+            decimals: decimals,
         },
-        depositAssets: [
-            {
-                address: depositMint?.address,
-                symbol: depositMint?.symbol,
-                decimals: depositMint?.decimals || _1.Solana.constants.fallbackDecimals,
-            },
-        ],
+        depositAssets: [depositAsset],
         chainId: core_1.SPECIAL_CHAINS.solana.chainId,
         name: tokenizedVault?.vault_name || 'Solana Program',
         logoUrl: tokenizedVault?.vault_logo_url || '/img/strategist/august.svg',
@@ -82,7 +134,7 @@ const getSolanaVault = async (tokenizedVault, options) => {
         isVisible: tokenizedVault?.is_visible || false,
         reserveTarget: tokenizedVault?.reserve_target || 0,
         reserveTolerance: tokenizedVault?.reserve_tolerance || 0,
-        decimals: vaultState.depositMintDecimals || 0,
+        decimals: decimals,
         totalAssets: totalAssets,
         totalSupply: totalSupply,
         maxSupply: (0, core_1.toNormalizedBn)(1000000000),
@@ -98,7 +150,11 @@ const getSolanaVault = async (tokenizedVault, options) => {
             performance: tokenizedVault?.weekly_performance_fee_bps || 0,
             management: tokenizedVault?.platform_fee_override?.management_fee || 0,
             isManagementWaived: false,
+            managementFeeWaivedUntilDate: tokenizedVault?.management_fee_waived_until_date ?? null,
+            managementFeeWaivedUntilTvl: tokenizedVault?.management_fee_waived_until_tvl ?? null,
             isPerformanceWaived: false,
+            performanceFeeWaivedUntilDate: tokenizedVault?.performance_fee_waived_until_date ?? null,
+            performanceFeeWaivedUntilTvl: tokenizedVault?.performance_fee_waived_until_tvl ?? null,
         },
         lagDuration: 0,
         maxDailyDrawdown: tokenizedVault?.max_daily_drawdown || 0,
@@ -134,22 +190,10 @@ const getSolanaVault = async (tokenizedVault, options) => {
             redeemable: (0, core_1.toNormalizedBn)(0),
             walletBalance: (0, core_1.toNormalizedBn)(0),
         },
-        composabilityIntegrations: tokenizedVault.composability_integrations?.map((integration) => ({
-            name: integration.name,
-            description: integration.description,
-            earningMultiplier: integration.earning_multiplier,
-            protocolUrl: integration.protocol_url,
-            logoUrl: integration.logo_url,
-            tokenizedVaultId: integration.tokenized_vault_id,
-            id: integration.id,
-        })) || [],
-        strategists: tokenizedVault.subaccounts?.map((s) => ({
-            address: s.address,
-            logo: s.strategist?.strategist_logo,
-            name: s.strategist?.strategist_name,
-            type: 'subaccount',
-        })),
+        composabilityIntegrations: (0, utils_2.mapComposabilityIntegrations)(tokenizedVault),
+        strategists: (0, utils_2.mapStrategists)(tokenizedVault),
         cachedAt: tokenizedVault?.cached_at ?? null,
+        programId: programId,
     };
     return returnObj;
 };

package/lib/adapters/solana/getters.js.map

@@ -1 +1 @@
-{"version":3,"file":"getters.js","sourceRoot":"","sources":["../../../src.ts/adapters/solana/getters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getters.js","sourceRoot":"","sources":["../../../src.ts/adapters/solana/getters.ts"],"names":[],"mappings":"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"}

package/lib/adapters/solana/index.d.ts

@@ -24,22 +24,22 @@ export declare const Solana: {
         getReadOnlyProvider: ({ connection }: import("./types").ISolanaConnectionOptions) => AnchorProvider;
         deriveShareMintPda: (vaultProgramId: PublicKey | string) => web3.PublicKey;
         deriveVaultStatePda: (vaultProgramId: PublicKey | string) => web3.PublicKey;
-        deriveVaultTokenAtaPda: (vaultProgramId: PublicKey | string, depositMint: PublicKey) => web3.PublicKey;
-        getVaultState: ({ provider, connection, vaultProgramId, idl, }: {
+        deriveVaultTokenAtaPda: (vaultProgramId: PublicKey | string, depositMint: PublicKey, vaultVersion?: number) => web3.PublicKey;
+        getVaultState: ({ provider, connection, vaultProgramId, vaultAddress, idl, }: {
             vaultProgramId: PublicKey | string;
+            vaultAddress?: PublicKey | string;
             idl: any;
         } & import("./types").ISolanaConnectionOptions) => Promise<{
             vaultState: unknown | null;
             depositMintDecimals: number | null;
-            vaultToken: import("./types").ISolanaTokenBalance;
         }>;
-        getVaultStateReadOnly: ({ vaultProgramId, connection, idl, }: {
+        getVaultStateReadOnly: ({ vaultProgramId, vaultAddress, connection, idl, }: {
             vaultProgramId: PublicKey | string;
+            vaultAddress?: PublicKey | string;
             idl: any;
         } & import("./types").ISolanaConnectionOptions) => Promise<{
             vaultState: unknown | null;
             depositMintDecimals: number | null;
-            vaultToken: import("./types").ISolanaTokenBalance;
         }>;
         getToken: ({ mintAddress, endpoint, connection, }: {
             mintAddress: string | PublicKey;
@@ -61,7 +61,7 @@ export declare const Solana: {
             publicKey: PublicKey | string;
             shareMint?: PublicKey | string;
         } & import("./types").ISolanaConnectionOptions) => Promise<number>;
-        getBestRpcEndpoint: ({ endpoint, network, connection, }: import("./types").ISolanaConnectionOptions) => Promise<"http://127.0.0.1:8899" | `https://${string}`>;
+        getBestRpcEndpoint: ({ endpoint, network, connection, }: import("./types").ISolanaConnectionOptions) => Promise<`https://${string}` | "http://127.0.0.1:8899">;
         fallbackDecimals: number;
         fallbackNetwork: import("../..").ISolanaNetwork;
         programIds: {
@@ -78,13 +78,18 @@ export declare const Solana: {
                 vault: string;
             };
         };
-        getVaultMints: ({ vaultProgramId, connection, idl, }: {
+        getVaultMints: ({ vaultProgramId, vaultAddress, connection, idl, }: {
             vaultProgramId: PublicKey | string;
+            vaultAddress?: PublicKey | string;
             idl: any;
         } & import("./types").ISolanaConnectionOptions) => Promise<{
             depositMint: string;
             shareMint: string;
+            vaultVersion: number | undefined;
         }>;
+        resolveProgramId: (vaultAddress: string, solanaMetadata?: {
+            program_id?: string;
+        } | null) => string;
     };
     constants: typeof SolanaConstants;
     actions: typeof SolanaActions;
@@ -102,15 +107,13 @@ declare class SolanaAdapter {
     get provider(): AnchorProvider;
     setWalletProvider(_publicKey: PublicKey | string, signTransaction: (<T extends Transaction | web3.VersionedTransaction>(transaction: T) => Promise<T>) | undefined): void;
     getProgram(programIdl: any): import("@coral-xyz/anchor").Program<any>;
-    getVaultState(vaultProgramId: PublicKey | string, idl: any): Promise<{
+    getVaultState(vaultProgramId: PublicKey | string, idl: any, vaultAddress?: PublicKey | string): Promise<{
         vaultState: unknown | null;
         depositMintDecimals: number | null;
-        vaultToken: import("./types").ISolanaTokenBalance;
     }>;
-    getVaultStateReadOnly(vaultProgramId: PublicKey | string, idl: any): Promise<{
+    getVaultStateReadOnly(vaultProgramId: PublicKey | string, idl: any, vaultAddress?: PublicKey | string): Promise<{
         vaultState: unknown | null;
         depositMintDecimals: number | null;
-        vaultToken: import("./types").ISolanaTokenBalance;
     }>;
     getToken(mintAddress: string | PublicKey): Promise<{
         address: string;
@@ -122,8 +125,8 @@ declare class SolanaAdapter {
     getTokenSymbol(mintAddress: string | PublicKey): Promise<string>;
     fetchUserTokenBalance(publicKey: PublicKey | string, depositMint: PublicKey | string): Promise<any>;
     fetchUserShareBalance(publicKey: PublicKey | string, shareMint: PublicKey | string): Promise<number>;
-    vaultDeposit(vaultProgramId: PublicKey | string, idl: any, publicKey: PublicKey | string, depositAmount: number, sendTransaction: (transaction: Transaction | web3.VersionedTransaction, connection: Connection, options?: SendTransactionOptions) => Promise<web3.TransactionSignature>): Promise<any>;
-    vaultRedeem(vaultProgramId: PublicKey | string, idl: any, publicKey: PublicKey | string, redeemShares: number, sendTransaction: (transaction: Transaction | web3.VersionedTransaction, connection: Connection, options?: SendTransactionOptions) => Promise<web3.TransactionSignature>): Promise<any>;
+    vaultDeposit(vaultProgramId: PublicKey | string, idl: any, publicKey: PublicKey | string, depositAmount: number, sendTransaction: (transaction: Transaction | web3.VersionedTransaction, connection: Connection, options?: SendTransactionOptions) => Promise<web3.TransactionSignature>, vaultAddress?: PublicKey | string): Promise<any>;
+    vaultRedeem(vaultProgramId: PublicKey | string, idl: any, publicKey: PublicKey | string, redeemShares: number, sendTransaction: (transaction: Transaction | web3.VersionedTransaction, connection: Connection, options?: SendTransactionOptions) => Promise<web3.TransactionSignature>, vaultAddress?: PublicKey | string): Promise<any>;
     getProgramId(type: 'vault'): string;
 }
 export default SolanaAdapter;

package/lib/adapters/solana/index.js

@@ -94,20 +94,22 @@ class SolanaAdapter {
             idl: programIdl,
         });
     }
-    async getVaultState(vaultProgramId, idl) {
+    async getVaultState(vaultProgramId, idl, vaultAddress) {
         return await utils_1.SolanaUtils.getVaultState({
             network: this._network,
             provider: this._provider,
             connection: this._connection,
             vaultProgramId,
+            vaultAddress,
             idl,
         });
     }
-    async getVaultStateReadOnly(vaultProgramId, idl) {
+    async getVaultStateReadOnly(vaultProgramId, idl, vaultAddress) {
         return await utils_1.SolanaUtils.getVaultStateReadOnly({
             network: this._network,
             connection: this._connection,
             vaultProgramId,
+            vaultAddress,
             idl,
         });
     }
@@ -141,24 +143,26 @@ class SolanaAdapter {
             shareMint,
         });
     }
-    async vaultDeposit(vaultProgramId, idl, publicKey, depositAmount, sendTransaction) {
+    async vaultDeposit(vaultProgramId, idl, publicKey, depositAmount, sendTransaction, vaultAddress) {
         return await (0, vault_actions_1.handleSolanaDeposit)({
             network: this._network,
             provider: this._provider,
             connection: this._connection,
             vaultProgramId,
+            vaultAddress,
             idl,
             publicKey,
             depositAmount,
             sendTransaction,
         });
     }
-    async vaultRedeem(vaultProgramId, idl, publicKey, redeemShares, sendTransaction) {
+    async vaultRedeem(vaultProgramId, idl, publicKey, redeemShares, sendTransaction, vaultAddress) {
         return await (0, vault_actions_1.handleSolanaRedeem)({
             network: this._network,
             provider: this._provider,
             connection: this._connection,
             vaultProgramId,
+            vaultAddress,
             idl,
             publicKey,
             redeemShares,

package/lib/adapters/solana/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src.ts/adapters/solana/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src.ts/adapters/solana/index.ts"],"names":[],"mappings":"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"}

package/lib/adapters/solana/types.d.ts

@@ -18,6 +18,7 @@ export interface ISolanaVaultState {
     deployedAum: number | null;
     pdaBump: number[] | null;
     paused: boolean | null;
+    vaultVersion: number[] | null;
 }
 export interface ISolanaToken {
     address: string;
@@ -39,13 +40,6 @@ export interface ISolanaVaultConfig {
     depositMint: string;
     network: ISolanaNetwork;
 }
-export interface ISolanaTokenBalance {
-    balance: number;
-    decimals: number;
-    rawAmount: string;
-    symbol?: string;
-    name?: string;
-}
 export interface ISolanaDepositResult {
     success: boolean;
     signature?: string;

package/lib/adapters/solana/utils.d.ts

@@ -1,6 +1,6 @@
 import { AnchorProvider, Program, web3 } from '@coral-xyz/anchor';
 import { PublicKey, Transaction } from '@solana/web3.js';
-import { ISolanaConnectionOptions, ISolanaTokenBalance } from './types';
+import { ISolanaConnectionOptions } from './types';
 declare function getExplorerLink({ signature, type, network, }: {
     signature: string;
     type: 'tx' | 'address' | 'token';
@@ -11,7 +11,7 @@ declare function getProgram({ provider, idl, programId, network, }: {
     idl: any;
     programId?: string;
 } & ISolanaConnectionOptions): Program<any>;
-declare function getBestRpcEndpoint({ endpoint, network, connection, }: ISolanaConnectionOptions): Promise<"http://127.0.0.1:8899" | `https://${string}`>;
+declare function getBestRpcEndpoint({ endpoint, network, connection, }: ISolanaConnectionOptions): Promise<`https://${string}` | "http://127.0.0.1:8899">;
 declare function getProvider({ connection, publicKey, signTransaction, }: {
     publicKey: PublicKey;
     signTransaction: (<T extends Transaction | web3.VersionedTransaction>(transaction: T) => Promise<T>) | undefined;
@@ -19,29 +19,31 @@ declare function getProvider({ connection, publicKey, signTransaction, }: {
 declare function getReadOnlyProvider({ connection }: ISolanaConnectionOptions): AnchorProvider;
 declare function deriveVaultStatePda(vaultProgramId: PublicKey | string): web3.PublicKey;
 declare function deriveShareMintPda(vaultProgramId: PublicKey | string): web3.PublicKey;
-declare function deriveVaultTokenAtaPda(vaultProgramId: PublicKey | string, depositMint: PublicKey): web3.PublicKey;
-declare function getVaultState({ provider, connection, vaultProgramId, idl, }: {
+declare function deriveVaultTokenAtaPda(vaultProgramId: PublicKey | string, depositMint: PublicKey, vaultVersion?: number): web3.PublicKey;
+declare function getVaultState({ provider, connection, vaultProgramId, vaultAddress, idl, }: {
     vaultProgramId: PublicKey | string;
+    vaultAddress?: PublicKey | string;
     idl: any;
 } & ISolanaConnectionOptions): Promise<{
     vaultState: unknown | null;
     depositMintDecimals: number | null;
-    vaultToken: ISolanaTokenBalance;
 }>;
-declare function getVaultStateReadOnly({ vaultProgramId, connection, idl, }: {
+declare function getVaultStateReadOnly({ vaultProgramId, vaultAddress, connection, idl, }: {
     vaultProgramId: PublicKey | string;
+    vaultAddress?: PublicKey | string;
     idl: any;
 } & ISolanaConnectionOptions): Promise<{
     vaultState: unknown | null;
     depositMintDecimals: number | null;
-    vaultToken: ISolanaTokenBalance;
 }>;
-declare function getVaultMints({ vaultProgramId, connection, idl, }: {
+declare function getVaultMints({ vaultProgramId, vaultAddress, connection, idl, }: {
     vaultProgramId: PublicKey | string;
+    vaultAddress?: PublicKey | string;
     idl: any;
 } & ISolanaConnectionOptions): Promise<{
     depositMint: string;
     shareMint: string;
+    vaultVersion: number | undefined;
 }>;
 declare function getToken({ mintAddress, endpoint, connection, }: {
     mintAddress: string | PublicKey;
@@ -63,6 +65,9 @@ declare function fetchUserShareBalance({ connection, publicKey, shareMint, netwo
     publicKey: PublicKey | string;
     shareMint?: PublicKey | string;
 } & ISolanaConnectionOptions): Promise<number>;
+declare function resolveProgramId(vaultAddress: string, solanaMetadata?: {
+    program_id?: string;
+} | null): string;
 export declare const SolanaUtils: {
     getExplorerLink: typeof getExplorerLink;
     isSolanaAddress: typeof isSolanaAddress;
@@ -97,5 +102,6 @@ export declare const SolanaUtils: {
         };
     };
     getVaultMints: typeof getVaultMints;
+    resolveProgramId: typeof resolveProgramId;
 };
 export {};