@neutral-trade/sdk 0.1.4 → 0.1.5

package/dist/index.d.mts

@@ -5127,7 +5127,7 @@ declare enum VaultType {
   Hyperliquid = "Hyperliquid",
   Kamino = "Kamino",
 }
-/** Raw vault entry from registry JSON (without program IDs) */
+/** Raw vault entry from registry JSON */
 interface VaultRegistryEntry {
   vaultId: number;
   name: string;
@@ -5136,13 +5136,17 @@ interface VaultRegistryEntry {
   vaultAddress: string;
   depositToken: SupportedToken;
   pfee?: number;
+  /** Optional Drift program ID (only for Drift vaults with non-default program) */
+  driftProgramId?: string;
+  /** Optional Bundle program ID (only for Bundle vaults with non-default V2 program) */
+  bundleProgramId?: string;
 }
-/** Vault config with required program IDs (transformed from registry entry) */
+/** Vault config (same as registry entry, program IDs are optional) */
 interface VaultConfig extends VaultRegistryEntry {
   /** Required for Drift vaults */
-  driftProgramId?: string;
+  driftProgramId: string;
   /** Required for Bundle vaults */
-  bundleProgramId?: string;
+  bundleProgramId: string;
 }
 /** Vault registry as a record keyed by vaultId */
 type VaultConfigRecord = Record<number, VaultConfig>;
@@ -5172,15 +5176,15 @@ type UserBalanceResult = Record<number, VaultBalanceData | null>;
 //#endregion
 //#region src/constants/vaults.d.ts
 /**
- * Get Bundle Program ID for a vault
- * All bundle vaults use V1 except vaultId 69 and 72 which use V2
+ * Get Bundle Program ID for a vault config
+ * Uses registry value if present, otherwise defaults to V1
  */
-declare function getBundleProgramId(vaultId: number): BundleProgramId;
+declare function getBundleProgramId(vault: VaultRegistryEntry): BundleProgramId;
 /**
- * Get Drift Program ID for a vault
- * All drift vaults use default program ID except vaultId 0
+ * Get Drift Program ID for a vault config as PublicKey
+ * Uses registry value if present, otherwise defaults to VAULT_PROGRAM_ID
  */
-declare function getDriftProgramPK(vaultId: number): PublicKey;
+declare function getDriftProgramId(vault: VaultRegistryEntry): string;
 declare const vaults: VaultConfigRecord;
 declare function isValidVaultAddress(address: string): boolean;
 declare function getVaultByAddress(address: string): VaultConfig | undefined;
@@ -5243,4 +5247,4 @@ declare function deriveUserPDA(userKey: PublicKey, bundlePDA: PublicKey, program
  */
 declare function getVaultDepositorAddressSync(programId: PublicKey, vault: PublicKey, authority: PublicKey): PublicKey;
 //#endregion
-export { type BundleAccount, BundleProgramId, NeutralTrade, type NeutralTradeConfig, type OracleData, SupportedChain, SupportedToken, type Token, type UserBalanceResult, type UserBundleAccount, type VaultBalanceData, type VaultConfig, type VaultConfigRecord, VaultId, VaultType, deriveOraclePDA, deriveUserPDA, getBundleProgramId, getDriftProgramPK, getVaultByAddress, getVaultById, getVaultDepositorAddressSync, isValidVaultAddress, tokens, vaults };
+export { type BundleAccount, BundleProgramId, NeutralTrade, type NeutralTradeConfig, type OracleData, SupportedChain, SupportedToken, type Token, type UserBalanceResult, type UserBundleAccount, type VaultBalanceData, type VaultConfig, type VaultConfigRecord, VaultId, VaultType, deriveOraclePDA, deriveUserPDA, getBundleProgramId, getDriftProgramId, getVaultByAddress, getVaultById, getVaultDepositorAddressSync, isValidVaultAddress, tokens, vaults };

package/dist/index.mjs

@@ -8246,7 +8246,8 @@ var vaults_default = [
 		"subname": "Atlas Research",
 		"type": "Bundle",
 		"vaultAddress": "Eo3m78EQcHnwMyHtxaiz1vw4nwHa85RuGE8jLsrELhxj",
-		"depositToken": "USDC"
+		"depositToken": "USDC",
+		"bundleProgramId": "BUNDeH5A4c47bcEoAjBhN3sCjLgYnRsmt9ibMztqVkC9"
 	},
 	{
 		"vaultId": 71,
@@ -8268,7 +8269,8 @@ var vaults_default = [
 		"subname": "vault-jupiter",
 		"type": "Bundle",
 		"vaultAddress": "GiNbTRuRqvVGEEQGZKMjmwX84LrsbqfzVVNtWYbcZPCY",
-		"depositToken": "USDC"
+		"depositToken": "USDC",
+		"bundleProgramId": "BUNDeH5A4c47bcEoAjBhN3sCjLgYnRsmt9ibMztqVkC9"
 	},
 	{
 		"vaultId": 68,
@@ -8855,7 +8857,8 @@ var vaults_default = [
 		"type": "Drift",
 		"vaultAddress": "3Nkctq19AW7gs5hkxixUDjS9UVjmCwcNCo7rqPpub87c",
 		"depositToken": "USDC",
-		"pfee": .25
+		"pfee": .25,
+		"driftProgramId": "9Fcn3Fd4d5ocrb12xCUtEvezxcjFEAyHBPfrZDiPt9Qj"
 	}
 ];
 
@@ -8961,7 +8964,9 @@ const VaultRegistryEntrySchema = z.object({
 	type: z.nativeEnum(VaultType),
 	vaultAddress: z.string().min(32).max(44),
 	depositToken: z.nativeEnum(SupportedToken),
-	pfee: z.number().min(0).max(1).optional()
+	pfee: z.number().min(0).max(1).optional(),
+	driftProgramId: z.string().min(32).max(44).optional(),
+	bundleProgramId: z.string().min(32).max(44).optional()
 });
 /** Schema for validating array of registry entries */
 const VaultRegistryArraySchema = z.array(VaultRegistryEntrySchema).superRefine((vaults$1, ctx) => {
@@ -8977,25 +8982,23 @@ const VaultRegistryArraySchema = z.array(VaultRegistryEntrySchema).superRefine((
 
 //#endregion
 //#region src/constants/vaults.ts
-/** Special Drift Program ID for jlpdnv1 (vaultId: 0) */
-const JLPDNV1_DRIFT_PROGRAM_ID = "9Fcn3Fd4d5ocrb12xCUtEvezxcjFEAyHBPfrZDiPt9Qj";
-/** V2 Bundle vault IDs */
-const V2_BUNDLE_VAULT_IDS = [69, 72];
 /**
-* Get Bundle Program ID for a vault
-* All bundle vaults use V1 except vaultId 69 and 72 which use V2
+* Get Bundle Program ID for a vault config
+* Uses registry value if present, otherwise defaults to V1
 */
-function getBundleProgramId(vaultId) {
-	if (V2_BUNDLE_VAULT_IDS.includes(vaultId)) return BundleProgramId.V2;
+function getBundleProgramId(vault) {
+	if (vault.bundleProgramId) {
+		if (Object.values(BundleProgramId).includes(vault.bundleProgramId)) return vault.bundleProgramId;
+	}
 	return BundleProgramId.V1;
 }
 /**
-* Get Drift Program ID for a vault
-* All drift vaults use default program ID except vaultId 0
+* Get Drift Program ID for a vault config as PublicKey
+* Uses registry value if present, otherwise defaults to VAULT_PROGRAM_ID
 */
-function getDriftProgramPK(vaultId) {
-	if (vaultId === 0) return new PublicKey(JLPDNV1_DRIFT_PROGRAM_ID);
-	return VAULT_PROGRAM_ID;
+function getDriftProgramId(vault) {
+	if (vault.driftProgramId) return vault.driftProgramId;
+	return VAULT_PROGRAM_ID.toBase58();
 }
 /**
 * Transform a registry entry to VaultConfig with program IDs
@@ -9005,8 +9008,8 @@ function getDriftProgramPK(vaultId) {
 function toVaultConfig(entry) {
 	return {
 		...entry,
-		driftProgramId: entry.type === VaultType.Drift ? getDriftProgramPK(entry.vaultId).toBase58() : void 0,
-		bundleProgramId: entry.type === VaultType.Bundle ? getBundleProgramId(entry.vaultId) : void 0
+		driftProgramId: getDriftProgramId(entry),
+		bundleProgramId: getBundleProgramId(entry)
 	};
 }
 /**
@@ -9147,7 +9150,7 @@ async function getBundleBalances({ vaultIds, userAddress, vaults: vaults$1, bund
 	for (const vaultId of vaultIds) {
 		const config = vaults$1[vaultId];
 		if (!config) continue;
-		if (getBundleProgramId(vaultId) === BundleProgramId.V2) v2Vaults.push({
+		if (config.bundleProgramId === BundleProgramId.V2) v2Vaults.push({
 			vaultId,
 			config
 		});
@@ -9285,9 +9288,9 @@ async function getDriftBalances({ vaultIds, userAddress, vaults: vaults$1, drift
 	})).filter((entry) => entry.config !== void 0);
 	if (vaultEntries.length === 0) return result;
 	const vaultAddresses = vaultEntries.map(({ config }) => new PublicKey(config.vaultAddress));
-	const vaultDepositorPDAs = vaultEntries.map(({ vaultId, config }) => {
+	const vaultDepositorPDAs = vaultEntries.map(({ config }) => {
 		const vaultPubkey = new PublicKey(config.vaultAddress);
-		return getVaultDepositorAddressSync(getDriftProgramPK(vaultId), vaultPubkey, userPublicKey);
+		return getVaultDepositorAddressSync(new PublicKey(config.driftProgramId), vaultPubkey, userPublicKey);
 	});
 	const [vaultsData, vaultDepositors] = await Promise.all([driftVaultClient.program.account.vault.fetchMultiple(vaultAddresses), driftVaultClient.program.account.vaultDepositor.fetchMultiple(vaultDepositorPDAs)]);
 	for (let i = 0; i < vaultEntries.length; i++) {
@@ -9488,4 +9491,4 @@ var NeutralTrade = class NeutralTrade {
 };
 
 //#endregion
-export { BundleProgramId, NeutralTrade, SupportedChain, SupportedToken, VaultId, VaultType, deriveOraclePDA, deriveUserPDA, getBundleProgramId, getDriftProgramPK, getVaultByAddress, getVaultById, getVaultDepositorAddressSync, isValidVaultAddress, tokens, vaults };
+export { BundleProgramId, NeutralTrade, SupportedChain, SupportedToken, VaultId, VaultType, deriveOraclePDA, deriveUserPDA, getBundleProgramId, getDriftProgramId, getVaultByAddress, getVaultById, getVaultDepositorAddressSync, isValidVaultAddress, tokens, vaults };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@neutral-trade/sdk",
   "type": "module",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "SDK for Neutral Trade vaults",
   "license": "MIT",
   "homepage": "https://github.com/neutral-trade/sdk#readme",