@neutral-trade/sdk 0.2.5 → 0.2.7

package/dist/index.mjs

@@ -1,8 +1,8 @@
-import { AnchorProvider, BN, Program } from "@coral-xyz/anchor";
-import { AnchorProvider as AnchorProvider$1, Program as Program$1 } from "@coral-xyz/anchor-32";
+import { AnchorProvider, Program } from "@coral-xyz/anchor";
 import { Connection, Keypair, PublicKey, SYSVAR_RENT_PUBKEY, SystemProgram } from "@solana/web3.js";
 import { z } from "zod";
 import { TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync } from "@solana/spl-token";
+import BN from "bn.js";
 
 //#region src/constants/addr.ts
 const ZERO_ADDRESS = new PublicKey("11111111111111111111111111111111");
@@ -21,2411 +21,14 @@ function createDummyWallet() {
 function createConnection(rpcUrl) {
 	return new Connection(rpcUrl, "confirmed");
 }
-function createAnchorProviderV29(connection, wallet) {
+function createAnchorProvider(connection, wallet) {
 	return new AnchorProvider(connection, wallet ?? createDummyWallet(), AnchorProvider.defaultOptions());
 }
-function createAnchorProviderV32(connection, wallet) {
-	return new AnchorProvider$1(connection, wallet ?? createDummyWallet(), AnchorProvider$1.defaultOptions());
-}
-
-//#endregion
-//#region src/constants/points-vaults.ts
-/**
-* Get vaults that earn points, filtered by pointsEnabled !== false.
-* Returns entries ready for points backend consumption.
-*/
-function getPointsVaults(registry) {
-	return Object.values(registry).filter((v) => v.pointsEnabled !== false).map((v) => toPointsVaultEntry(v));
-}
-function toPointsVaultEntry(entry) {
-	return {
-		vaultId: entry.vaultId,
-		name: entry.subname ? `${entry.name} -- ${entry.subname}` : entry.name,
-		address: entry.vaultAddress,
-		depositToken: entry.depositToken,
-		type: entry.type,
-		multiplier: entry.pointsMultiplier ?? 1,
-		enabled: entry.pointsEnabled !== false,
-		bundleProgramId: entry.bundleProgramId
-	};
-}
-
-//#endregion
-//#region src/idl/bundle-v1.json
-var bundle_v1_default = {
-	version: "0.1.0",
-	name: "ntbundle",
-	instructions: [
-		{
-			"name": "initializeBundleMasterAccount",
-			"accounts": [
-				{
-					"name": "admin",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "bundleMasterAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "systemProgram",
-					"isMut": false,
-					"isSigner": false
-				}
-			],
-			"args": []
-		},
-		{
-			"name": "changeBundleMasterAdmin",
-			"accounts": [{
-				"name": "admin",
-				"isMut": true,
-				"isSigner": true
-			}, {
-				"name": "bundleMasterAccount",
-				"isMut": true,
-				"isSigner": false
-			}],
-			"args": [{
-				"name": "newAdmin",
-				"type": "publicKey"
-			}]
-		},
-		{
-			"name": "setBundleCreator",
-			"accounts": [
-				{
-					"name": "admin",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "bundleMasterAccount",
-					"isMut": false,
-					"isSigner": false
-				},
-				{
-					"name": "creator",
-					"isMut": false,
-					"isSigner": false,
-					"docs": ["CHECK safe as only the pubkey is read"]
-				},
-				{
-					"name": "bundleCreatorAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "systemProgram",
-					"isMut": false,
-					"isSigner": false
-				}
-			],
-			"args": [{
-				"name": "allowed",
-				"type": "bool"
-			}]
-		},
-		{
-			"name": "initializeBundle",
-			"accounts": [
-				{
-					"name": "creator",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "bundleCreatorAccount",
-					"isMut": false,
-					"isSigner": false
-				},
-				{
-					"name": "systemProgram",
-					"isMut": false,
-					"isSigner": false
-				},
-				{
-					"name": "treasuryAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "assetAddress",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleTempData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "oracleData",
-					"isMut": true,
-					"isSigner": false
-				}
-			],
-			"args": [
-				{
-					"name": "name",
-					"type": { "array": ["u8", 32] }
-				},
-				{
-					"name": "keeper",
-					"type": "publicKey"
-				},
-				{
-					"name": "depositFee",
-					"type": "u32"
-				},
-				{
-					"name": "withdrawalFee",
-					"type": "u32"
-				},
-				{
-					"name": "performanceFee",
-					"type": "u32"
-				},
-				{
-					"name": "managementFeeBps",
-					"type": "u32"
-				},
-				{
-					"name": "oracleBuffer",
-					"type": "u64"
-				},
-				{
-					"name": "maxDepositAmount",
-					"type": "u64"
-				},
-				{
-					"name": "withdrawalDelay",
-					"type": "u64"
-				},
-				{
-					"name": "withdrawalTMin",
-					"type": "i64"
-				},
-				{
-					"name": "withdrawalTMax",
-					"type": "i64"
-				},
-				{
-					"name": "withdrawalCurve",
-					"type": "f32"
-				},
-				{
-					"name": "permissionned",
-					"type": "bool"
-				}
-			]
-		},
-		{
-			"name": "initializeBundleDepositor",
-			"accounts": [
-				{
-					"name": "payer",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "authority",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "systemProgram",
-					"isMut": false,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "userBundleAccount",
-					"isMut": true,
-					"isSigner": false,
-					"docs": ["each user gets one UserBundleAccount account; it will be created if it doesn't exist."]
-				}
-			],
-			"args": []
-		},
-		{
-			"name": "setOracleBuffer",
-			"accounts": [{
-				"name": "manager",
-				"isMut": true,
-				"isSigner": true
-			}, {
-				"name": "bundleAccount",
-				"isMut": true,
-				"isSigner": false
-			}],
-			"args": [{
-				"name": "oracleBuffer",
-				"type": "u64"
-			}]
-		},
-		{
-			"name": "setDelays",
-			"accounts": [{
-				"name": "manager",
-				"isMut": true,
-				"isSigner": true
-			}, {
-				"name": "bundleAccount",
-				"isMut": true,
-				"isSigner": false
-			}],
-			"args": [
-				{
-					"name": "withdrawalDelay",
-					"type": "u64"
-				},
-				{
-					"name": "withdrawalTMin",
-					"type": "i64"
-				},
-				{
-					"name": "withdrawalTMax",
-					"type": "i64"
-				},
-				{
-					"name": "withdrawalCurve",
-					"type": "f32"
-				}
-			]
-		},
-		{
-			"name": "setMaxDepositAmount",
-			"accounts": [{
-				"name": "manager",
-				"isMut": true,
-				"isSigner": true
-			}, {
-				"name": "bundleAccount",
-				"isMut": true,
-				"isSigner": false
-			}],
-			"args": [{
-				"name": "maxDepositAmount",
-				"type": "u64"
-			}]
-		},
-		{
-			"name": "setKeeper",
-			"accounts": [{
-				"name": "manager",
-				"isMut": true,
-				"isSigner": true
-			}, {
-				"name": "bundleAccount",
-				"isMut": true,
-				"isSigner": false
-			}],
-			"args": [{
-				"name": "newkeeper",
-				"type": "publicKey"
-			}]
-		},
-		{
-			"name": "addStrategy",
-			"accounts": [
-				{
-					"name": "manager",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "strategyAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "receiverAddress",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "systemProgram",
-					"isMut": false,
-					"isSigner": false
-				}
-			],
-			"args": [{
-				"name": "allocationBps",
-				"type": "u32"
-			}]
-		},
-		{
-			"name": "removeStrategy",
-			"accounts": [
-				{
-					"name": "manager",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "strategyAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "receiverAddress",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "systemProgram",
-					"isMut": false,
-					"isSigner": false
-				}
-			],
-			"args": []
-		},
-		{
-			"name": "enableStrategy",
-			"accounts": [
-				{
-					"name": "manager",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "strategyAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "receiverAddress",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "systemProgram",
-					"isMut": false,
-					"isSigner": false
-				}
-			],
-			"args": []
-		},
-		{
-			"name": "updateAllocations",
-			"accounts": [
-				{
-					"name": "manager",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "receiverAddress",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "strategyAccount",
-					"isMut": true,
-					"isSigner": false
-				}
-			],
-			"args": [{
-				"name": "newAllocationBps",
-				"type": "u32"
-			}]
-		},
-		{
-			"name": "changeManager",
-			"accounts": [{
-				"name": "manager",
-				"isMut": true,
-				"isSigner": true
-			}, {
-				"name": "bundleAccount",
-				"isMut": true,
-				"isSigner": false
-			}],
-			"args": [{
-				"name": "newManager",
-				"type": "publicKey"
-			}]
-		},
-		{
-			"name": "setFees",
-			"accounts": [{
-				"name": "manager",
-				"isMut": true,
-				"isSigner": true
-			}, {
-				"name": "bundleAccount",
-				"isMut": true,
-				"isSigner": false
-			}],
-			"args": [
-				{
-					"name": "treasury",
-					"type": "publicKey"
-				},
-				{
-					"name": "depositFee",
-					"type": "u32"
-				},
-				{
-					"name": "withdrawalFee",
-					"type": "u32"
-				},
-				{
-					"name": "performanceFee",
-					"type": "u32"
-				},
-				{
-					"name": "managementFeeBps",
-					"type": "u32"
-				}
-			]
-		},
-		{
-			"name": "updateOracle",
-			"accounts": [
-				{
-					"name": "keeper",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleTempData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "oracleData",
-					"isMut": true,
-					"isSigner": false
-				}
-			],
-			"args": [{
-				"name": "newEquity",
-				"type": "u64"
-			}]
-		},
-		{
-			"name": "applyFeesToUser",
-			"accounts": [
-				{
-					"name": "keeper",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "userBundleAccountOwner",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "userBundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "oracleData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAssetAuthority",
-					"isMut": true,
-					"isSigner": false
-				}
-			],
-			"args": []
-		},
-		{
-			"name": "managerWithdraw",
-			"accounts": [
-				{
-					"name": "manager",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "managerTokenAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "assetAddress",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAssetAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "oracleData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAssetAuthority",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "tokenProgram",
-					"isMut": false,
-					"isSigner": false
-				}
-			],
-			"args": []
-		},
-		{
-			"name": "netPendingTransactions",
-			"accounts": [
-				{
-					"name": "keeper",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "pendingDepositTokenAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAssetAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "assetAddress",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "pendingBundleAssetAuthority",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "oracleData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleTempData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAssetAuthority",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "tokenProgram",
-					"isMut": false,
-					"isSigner": false
-				}
-			],
-			"args": []
-		},
-		{
-			"name": "requestDeposit",
-			"accounts": [
-				{
-					"name": "user",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "userTokenAccount",
-					"isMut": true,
-					"isSigner": false,
-					"docs": ["user token account (source of funds)"]
-				},
-				{
-					"name": "pendingDepositTokenAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "treasuryAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "userBundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "assetAddress",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "oracleData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleTempData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "pendingBundleAssetAuthority",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "tokenProgram",
-					"isMut": false,
-					"isSigner": false
-				},
-				{
-					"name": "systemProgram",
-					"isMut": false,
-					"isSigner": false
-				}
-			],
-			"args": [{
-				"name": "amount",
-				"type": "u64"
-			}]
-		},
-		{
-			"name": "processDeposit",
-			"accounts": [
-				{
-					"name": "keeper",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "userBundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "pendingDepositTokenAccount",
-					"isMut": true,
-					"isSigner": false,
-					"docs": ["the account holding the user's deposited asset before allocation."]
-				},
-				{
-					"name": "userBundleAccountOwner",
-					"isMut": false,
-					"isSigner": false,
-					"docs": ["the owner of the pending request (for event purposes)."]
-				},
-				{
-					"name": "assetAddress",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAssetAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleTempData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "oracleData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "pendingBundleAssetAuthority",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAssetAuthority",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "tokenProgram",
-					"isMut": false,
-					"isSigner": false
-				},
-				{
-					"name": "systemProgram",
-					"isMut": false,
-					"isSigner": false
-				}
-			],
-			"args": []
-		},
-		{
-			"name": "refundDeposit",
-			"accounts": [
-				{
-					"name": "keeper",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "userBundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "userBundleAccountOwner",
-					"isMut": false,
-					"isSigner": false,
-					"docs": ["the owner of the pending request (for event purposes)."]
-				},
-				{
-					"name": "userTokenAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "assetAddress",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAssetAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAssetAuthority",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleTempData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "tokenProgram",
-					"isMut": false,
-					"isSigner": false
-				},
-				{
-					"name": "systemProgram",
-					"isMut": false,
-					"isSigner": false
-				}
-			],
-			"args": []
-		},
-		{
-			"name": "requestWithdrawal",
-			"accounts": [
-				{
-					"name": "user",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "userBundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "oracleData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleTempData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "tokenProgram",
-					"isMut": false,
-					"isSigner": false
-				},
-				{
-					"name": "systemProgram",
-					"isMut": false,
-					"isSigner": false
-				},
-				{
-					"name": "rent",
-					"isMut": false,
-					"isSigner": false
-				}
-			],
-			"args": [{
-				"name": "sharesAmount",
-				"type": "u128"
-			}]
-		},
-		{
-			"name": "processWithdrawal",
-			"accounts": [
-				{
-					"name": "keeper",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "userBundleAccountOwner",
-					"isMut": false,
-					"isSigner": false
-				},
-				{
-					"name": "userTokenAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "assetAddress",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAssetAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "pendingBundleAssetAuthority",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "userBundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "treasuryAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAssetAuthority",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleTempData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "oracleData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "tokenProgram",
-					"isMut": false,
-					"isSigner": false
-				},
-				{
-					"name": "systemProgram",
-					"isMut": false,
-					"isSigner": false
-				}
-			],
-			"args": []
-		},
-		{
-			"name": "pauseDepositsWithdrawals",
-			"accounts": [
-				{
-					"name": "keeper",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleTempData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "oracleData",
-					"isMut": true,
-					"isSigner": false
-				}
-			],
-			"args": [{
-				"name": "pause",
-				"type": "bool"
-			}]
-		},
-		{
-			"name": "startDistribution",
-			"accounts": [
-				{
-					"name": "keeper",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleTempData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "oracleData",
-					"isMut": true,
-					"isSigner": false
-				}
-			],
-			"args": []
-		},
-		{
-			"name": "endDistribution",
-			"accounts": [
-				{
-					"name": "keeper",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleTempData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "oracleData",
-					"isMut": true,
-					"isSigner": false
-				}
-			],
-			"args": []
-		},
-		{
-			"name": "performRefill",
-			"accounts": [
-				{
-					"name": "receiverAddress",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "bundleAssetAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "receiverAta",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "assetAddress",
-					"isMut": false,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "strategyAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "oracleData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAssetAuthority",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "tokenProgram",
-					"isMut": false,
-					"isSigner": false
-				}
-			],
-			"args": [{
-				"name": "refillAmount",
-				"type": "u64"
-			}]
-		},
-		{
-			"name": "distributeToReceivers",
-			"accounts": [
-				{
-					"name": "keeper",
-					"isMut": true,
-					"isSigner": true
-				},
-				{
-					"name": "receiverAddress",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAssetAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "receiverAta",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "assetAddress",
-					"isMut": false,
-					"isSigner": false
-				},
-				{
-					"name": "oracleData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAssetAuthority",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "tokenProgram",
-					"isMut": false,
-					"isSigner": false
-				},
-				{
-					"name": "bundleAccount",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "bundleTempData",
-					"isMut": true,
-					"isSigner": false
-				},
-				{
-					"name": "strategyAccount",
-					"isMut": true,
-					"isSigner": false
-				}
-			],
-			"args": []
-		}
-	],
-	accounts: [
-		{
-			"name": "BundleMasterAccount",
-			"type": {
-				"kind": "struct",
-				"fields": [{
-					"name": "admin",
-					"type": "publicKey"
-				}, {
-					"name": "padding",
-					"type": { "array": ["u8", 96] }
-				}]
-			}
-		},
-		{
-			"name": "BundleCreatorAccount",
-			"type": {
-				"kind": "struct",
-				"fields": [{
-					"name": "allowed",
-					"type": "bool"
-				}, {
-					"name": "padding",
-					"type": { "array": ["u8", 64] }
-				}]
-			}
-		},
-		{
-			"name": "UserBundleAccount",
-			"type": {
-				"kind": "struct",
-				"fields": [
-					{
-						"name": "owner",
-						"type": "publicKey"
-					},
-					{
-						"name": "lastDepositTimestamp",
-						"type": "i64"
-					},
-					{
-						"name": "shares",
-						"type": "u128"
-					},
-					{
-						"name": "pendingDeposit",
-						"type": "u64"
-					},
-					{
-						"name": "pendingShares",
-						"type": "u128"
-					},
-					{
-						"name": "estimatedPendingWithdrawalValue",
-						"type": "u64"
-					},
-					{
-						"name": "withdrawalAvailableTimestamp",
-						"type": "i64"
-					},
-					{
-						"name": "lastWithdrawalProcessTimestamp",
-						"type": "i64"
-					},
-					{
-						"name": "lastHighWaterMark",
-						"type": "u128"
-					},
-					{
-						"name": "hwmPerShare",
-						"type": "u128"
-					},
-					{
-						"name": "lastManagementFeeTimestamp",
-						"type": "i64"
-					},
-					{
-						"name": "netDeposits",
-						"type": "i128"
-					},
-					{
-						"name": "totalFeeCharged",
-						"type": "u64"
-					},
-					{
-						"name": "padding",
-						"type": { "array": ["u8", 264] }
-					}
-				]
-			}
-		},
-		{
-			"name": "OracleData",
-			"type": {
-				"kind": "struct",
-				"fields": [
-					{
-						"name": "averageExternalEquity",
-						"type": "u64"
-					},
-					{
-						"name": "lastUpdateTime",
-						"type": "i64"
-					},
-					{
-						"name": "padding",
-						"type": { "array": ["u8", 64] }
-					}
-				]
-			}
-		},
-		{
-			"name": "Strategy",
-			"type": {
-				"kind": "struct",
-				"fields": [
-					{
-						"name": "receiverAddress",
-						"type": "publicKey"
-					},
-					{
-						"name": "allocationBps",
-						"type": "u32"
-					},
-					{
-						"name": "allowed",
-						"type": "bool"
-					},
-					{
-						"name": "padding",
-						"type": { "array": ["u8", 96] }
-					}
-				]
-			}
-		},
-		{
-			"name": "BundleTempData",
-			"type": {
-				"kind": "struct",
-				"fields": [
-					{
-						"name": "cumulativePendingDeposits",
-						"type": "u64"
-					},
-					{
-						"name": "pendingDepositsCounter",
-						"type": "u64"
-					},
-					{
-						"name": "pendingWithdrawalsCounter",
-						"type": "u64"
-					},
-					{
-						"name": "pendingLockedWithdrawalsCounter",
-						"type": "u64"
-					},
-					{
-						"name": "lastTotalSharesMinted",
-						"type": "u128"
-					},
-					{
-						"name": "lastNettingTimestamp",
-						"type": "i64"
-					},
-					{
-						"name": "isNettingDone",
-						"type": "bool"
-					},
-					{
-						"name": "distributionBaseAmount",
-						"type": "u64"
-					},
-					{
-						"name": "isDistributionStarted",
-						"type": "bool"
-					},
-					{
-						"name": "pausedDepositsWithdrawals",
-						"type": "bool"
-					},
-					{
-						"name": "leftToDistribute",
-						"type": "u64"
-					},
-					{
-						"name": "padding",
-						"type": { "array": ["u8", 184] }
-					}
-				]
-			}
-		},
-		{
-			"name": "Bundle",
-			"type": {
-				"kind": "struct",
-				"fields": [
-					{
-						"name": "name",
-						"type": { "array": ["u8", 32] }
-					},
-					{
-						"name": "manager",
-						"type": "publicKey"
-					},
-					{
-						"name": "keeper",
-						"type": "publicKey"
-					},
-					{
-						"name": "treasuryAccount",
-						"type": "publicKey"
-					},
-					{
-						"name": "allocatedReceivers",
-						"type": { "vec": "publicKey" }
-					},
-					{
-						"name": "bundleUnderlyingBalance",
-						"type": "u64"
-					},
-					{
-						"name": "maxDepositAmount",
-						"type": "u64"
-					},
-					{
-						"name": "withdrawalDelay",
-						"type": "u64"
-					},
-					{
-						"name": "performanceFee",
-						"type": "u32"
-					},
-					{
-						"name": "managementFeeBps",
-						"type": "u32"
-					},
-					{
-						"name": "depositFee",
-						"type": "u32"
-					},
-					{
-						"name": "withdrawalFee",
-						"type": "u32"
-					},
-					{
-						"name": "managerPfeeShares",
-						"type": "u128"
-					},
-					{
-						"name": "currentAllocationBps",
-						"type": "u32"
-					},
-					{
-						"name": "oracleBuffer",
-						"type": "u64"
-					},
-					{
-						"name": "totalShares",
-						"type": "u128"
-					},
-					{
-						"name": "assetPrecision",
-						"type": "u64"
-					},
-					{
-						"name": "assetAddress",
-						"type": "publicKey"
-					},
-					{
-						"name": "assetDecimals",
-						"type": "u8"
-					},
-					{
-						"name": "withdrawalTMin",
-						"type": "i64"
-					},
-					{
-						"name": "withdrawalTMax",
-						"type": "i64"
-					},
-					{
-						"name": "withdrawalCurve",
-						"type": "f32"
-					},
-					{
-						"name": "permissionned",
-						"type": "bool"
-					},
-					{
-						"name": "managerMfeeShares",
-						"type": "u128"
-					},
-					{
-						"name": "padding",
-						"type": { "array": ["u8", 255] }
-					}
-				]
-			}
-		}
-	],
-	events: [
-		{
-			"name": "BundleDepositorInitialized",
-			"fields": [{
-				"name": "bundleDepositor",
-				"type": "publicKey",
-				"index": false
-			}]
-		},
-		{
-			"name": "BundleMasterAccountInitialized",
-			"fields": [{
-				"name": "admin",
-				"type": "publicKey",
-				"index": false
-			}]
-		},
-		{
-			"name": "BundleMasterAdminChanged",
-			"fields": [{
-				"name": "newAdmin",
-				"type": "publicKey",
-				"index": false
-			}]
-		},
-		{
-			"name": "BundleCreatorAccountChanged",
-			"fields": [{
-				"name": "creator",
-				"type": "publicKey",
-				"index": false
-			}, {
-				"name": "allowed",
-				"type": "bool",
-				"index": false
-			}]
-		},
-		{
-			"name": "NettingCompleted",
-			"fields": [{
-				"name": "timestamp",
-				"type": "i64",
-				"index": false
-			}]
-		},
-		{
-			"name": "RefundedDeposit",
-			"fields": [
-				{
-					"name": "user",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "amount",
-					"type": "u64",
-					"index": false
-				},
-				{
-					"name": "timestamp",
-					"type": "i64",
-					"index": false
-				},
-				{
-					"name": "bundleAccountKey",
-					"type": "publicKey",
-					"index": false
-				}
-			]
-		},
-		{
-			"name": "ChargedFeesToUser",
-			"fields": [
-				{
-					"name": "totalFeeShares",
-					"type": "u128",
-					"index": false
-				},
-				{
-					"name": "totalFeeValue",
-					"type": "u64",
-					"index": false
-				},
-				{
-					"name": "managementFeeShares",
-					"type": "u128",
-					"index": false
-				},
-				{
-					"name": "performanceFeeShares",
-					"type": "u128",
-					"index": false
-				},
-				{
-					"name": "sharePrice",
-					"type": "u128",
-					"index": false
-				},
-				{
-					"name": "bundleAccountKey",
-					"type": "publicKey",
-					"index": false
-				}
-			]
-		},
-		{
-			"name": "WithdrawnFromDriftVault",
-			"fields": [
-				{
-					"name": "amount",
-					"type": "u64",
-					"index": false
-				},
-				{
-					"name": "from",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "to",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "timestamp",
-					"type": "i64",
-					"index": false
-				}
-			]
-		},
-		{
-			"name": "RequestedWithdrawalToDriftVault",
-			"fields": [
-				{
-					"name": "amount",
-					"type": "u64",
-					"index": false
-				},
-				{
-					"name": "from",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "to",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "timestamp",
-					"type": "i64",
-					"index": false
-				}
-			]
-		},
-		{
-			"name": "DepositedToDriftVault",
-			"fields": [
-				{
-					"name": "amount",
-					"type": "u64",
-					"index": false
-				},
-				{
-					"name": "from",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "to",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "timestamp",
-					"type": "i64",
-					"index": false
-				}
-			]
-		},
-		{
-			"name": "InitializedNewVaultDepositor",
-			"fields": [
-				{
-					"name": "vault",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "vaultDepositor",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "keeper",
-					"type": "publicKey",
-					"index": false
-				}
-			]
-		},
-		{
-			"name": "OracleUpdated",
-			"fields": [{
-				"name": "averageExternalEquity",
-				"type": "u64",
-				"index": false
-			}]
-		},
-		{
-			"name": "DistributionEnded",
-			"fields": [{
-				"name": "amount",
-				"type": "u64",
-				"index": false
-			}, {
-				"name": "timestamp",
-				"type": "i64",
-				"index": false
-			}]
-		},
-		{
-			"name": "DistributionStarted",
-			"fields": [{
-				"name": "amount",
-				"type": "u64",
-				"index": false
-			}, {
-				"name": "timestamp",
-				"type": "i64",
-				"index": false
-			}]
-		},
-		{
-			"name": "NewManagerSet",
-			"fields": [{
-				"name": "manager",
-				"type": "publicKey",
-				"index": false
-			}]
-		},
-		{
-			"name": "NewKeeperSet",
-			"fields": [{
-				"name": "keeper",
-				"type": "publicKey",
-				"index": false
-			}]
-		},
-		{
-			"name": "InitializedVault",
-			"fields": [{
-				"name": "manager",
-				"type": "publicKey",
-				"index": false
-			}]
-		},
-		{
-			"name": "InitializedReceivers",
-			"fields": [{
-				"name": "manager",
-				"type": "publicKey",
-				"index": false
-			}]
-		},
-		{
-			"name": "AuthorizedReceiverAdded",
-			"fields": [{
-				"name": "allowed",
-				"type": "bool",
-				"index": false
-			}]
-		},
-		{
-			"name": "AuthorizedReceiverRemoved",
-			"fields": [{
-				"name": "allowed",
-				"type": "bool",
-				"index": false
-			}]
-		},
-		{
-			"name": "Allocated",
-			"fields": [
-				{
-					"name": "from",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "to",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "amount",
-					"type": "u64",
-					"index": false
-				},
-				{
-					"name": "timestamp",
-					"type": "i64",
-					"index": false
-				},
-				{
-					"name": "bundleAccountKey",
-					"type": "publicKey",
-					"index": false
-				}
-			]
-		},
-		{
-			"name": "Redeemed",
-			"fields": [
-				{
-					"name": "from",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "to",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "netAmount",
-					"type": "u64",
-					"index": false
-				},
-				{
-					"name": "feeAmount",
-					"type": "u64",
-					"index": false
-				},
-				{
-					"name": "timestamp",
-					"type": "i64",
-					"index": false
-				},
-				{
-					"name": "bundleAccountKey",
-					"type": "publicKey",
-					"index": false
-				}
-			]
-		},
-		{
-			"name": "VaultNeutralFeeIncrementerSet",
-			"fields": [{
-				"name": "neutralFeeIncrementer",
-				"type": "publicKey",
-				"index": false
-			}]
-		},
-		{
-			"name": "ChangedCoreParams",
-			"fields": [
-				{
-					"name": "treasury",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "depositFee",
-					"type": "u32",
-					"index": false
-				},
-				{
-					"name": "withdrawalFee",
-					"type": "u32",
-					"index": false
-				},
-				{
-					"name": "performanceFee",
-					"type": "u32",
-					"index": false
-				},
-				{
-					"name": "managementFeeBps",
-					"type": "u32",
-					"index": false
-				}
-			]
-		},
-		{
-			"name": "AssignedProfitShare",
-			"fields": [{
-				"name": "amount",
-				"type": "u128",
-				"index": false
-			}]
-		},
-		{
-			"name": "StrategyRemoved",
-			"fields": [{
-				"name": "receiverAddress",
-				"type": "publicKey",
-				"index": false
-			}]
-		},
-		{
-			"name": "StrategyEnabled",
-			"fields": [{
-				"name": "receiverAddress",
-				"type": "publicKey",
-				"index": false
-			}]
-		},
-		{
-			"name": "DistributedToReceivers",
-			"fields": [
-				{
-					"name": "amount",
-					"type": "u64",
-					"index": false
-				},
-				{
-					"name": "from",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "receiver",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "timestamp",
-					"type": "i64",
-					"index": false
-				}
-			]
-		},
-		{
-			"name": "StrategyAdded",
-			"fields": [{
-				"name": "receiverAddress",
-				"type": "publicKey",
-				"index": false
-			}, {
-				"name": "allocationBps",
-				"type": "u32",
-				"index": false
-			}]
-		},
-		{
-			"name": "AllocationsUpdated",
-			"fields": [{
-				"name": "receiverAddress",
-				"type": "publicKey",
-				"index": false
-			}, {
-				"name": "allocationBps",
-				"type": "u32",
-				"index": false
-			}]
-		},
-		{
-			"name": "Refilled",
-			"fields": [
-				{
-					"name": "from",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "refillValue",
-					"type": "u64",
-					"index": false
-				},
-				{
-					"name": "timestamp",
-					"type": "i64",
-					"index": false
-				}
-			]
-		},
-		{
-			"name": "DepositRequested",
-			"fields": [
-				{
-					"name": "user",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "amount",
-					"type": "u64",
-					"index": false
-				},
-				{
-					"name": "timestamp",
-					"type": "i64",
-					"index": false
-				},
-				{
-					"name": "bundleAccountKey",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "toppingUp",
-					"type": "bool",
-					"index": false
-				}
-			]
-		},
-		{
-			"name": "WithdrawalRequested",
-			"fields": [
-				{
-					"name": "user",
-					"type": "publicKey",
-					"index": false
-				},
-				{
-					"name": "amount",
-					"type": "u128",
-					"index": false
-				},
-				{
-					"name": "timestamp",
-					"type": "i64",
-					"index": false
-				},
-				{
-					"name": "cooldownPeriod",
-					"type": "i64",
-					"index": false
-				},
-				{
-					"name": "estimatedPendingWithdrawalValue",
-					"type": "u64",
-					"index": false
-				},
-				{
-					"name": "bundleAccountKey",
-					"type": "publicKey",
-					"index": false
-				}
-			]
-		},
-		{
-			"name": "OracleBufferSet",
-			"fields": [{
-				"name": "oracleBuffer",
-				"type": "u64",
-				"index": false
-			}]
-		},
-		{
-			"name": "DelaysSet",
-			"fields": [
-				{
-					"name": "withdrawalDelay",
-					"type": "u64",
-					"index": false
-				},
-				{
-					"name": "withdrawalTMin",
-					"type": "i64",
-					"index": false
-				},
-				{
-					"name": "withdrawalTMax",
-					"type": "i64",
-					"index": false
-				},
-				{
-					"name": "withdrawalCurve",
-					"type": "f32",
-					"index": false
-				}
-			]
-		},
-		{
-			"name": "MaxDepositAmountSet",
-			"fields": [{
-				"name": "maxDepositAmount",
-				"type": "u64",
-				"index": false
-			}]
-		},
-		{
-			"name": "ManagerWithdrawal",
-			"fields": [{
-				"name": "managerShares",
-				"type": "u128",
-				"index": false
-			}, {
-				"name": "redemptionAmount",
-				"type": "u64",
-				"index": false
-			}]
-		},
-		{
-			"name": "PausedDepositsWithdrawals",
-			"fields": [{
-				"name": "paused",
-				"type": "bool",
-				"index": false
-			}, {
-				"name": "bundleAccountKey",
-				"type": "publicKey",
-				"index": false
-			}]
-		}
-	],
-	errors: [
-		{
-			"code": 6e3,
-			"name": "InsufficientFunds",
-			"msg": "Insufficient funds to process withdrawal"
-		},
-		{
-			"code": 6001,
-			"name": "AllocationAmountZero",
-			"msg": "Allocation amount must be > 0"
-		},
-		{
-			"code": 6002,
-			"name": "RedemptionAmountExceeded",
-			"msg": "Redemption exceeds bundle balance"
-		},
-		{
-			"code": 6003,
-			"name": "RefillAmountInvalid",
-			"msg": "Refill amount must be > 0"
-		},
-		{
-			"code": 6004,
-			"name": "UnauthorizedKeeperAction",
-			"msg": "Not bundle keeper"
-		},
-		{
-			"code": 6005,
-			"name": "UnauthorizedManagerAction",
-			"msg": "Not bundle manager"
-		},
-		{
-			"code": 6006,
-			"name": "UnauthorizedAdminAction",
-			"msg": "Not bundle admin"
-		},
-		{
-			"code": 6007,
-			"name": "UnauthorizedBundleCreator",
-			"msg": "Not whitelisted bundle creator"
-		},
-		{
-			"code": 6008,
-			"name": "CallerNotNeutralFeeIncrementer",
-			"msg": "Not neutral fee incrementer"
-		},
-		{
-			"code": 6009,
-			"name": "AmountMustBeBelowMax",
-			"msg": "Amount above max limit"
-		},
-		{
-			"code": 6010,
-			"name": "InvalidNeutralFeeIncrementer",
-			"msg": "Invalid fee incrementer"
-		},
-		{
-			"code": 6011,
-			"name": "InvalidReceiver",
-			"msg": "Invalid receiver address"
-		},
-		{
-			"code": 6012,
-			"name": "MathError",
-			"msg": "Math error"
-		},
-		{
-			"code": 6013,
-			"name": "InvalidAllocations",
-			"msg": "Invalid allocations"
-		},
-		{
-			"code": 6014,
-			"name": "MustBeInWhitelist",
-			"msg": "Not in whitelist"
-		},
-		{
-			"code": 6015,
-			"name": "DistributionAlreadyStarted",
-			"msg": "Distribution already started"
-		},
-		{
-			"code": 6016,
-			"name": "DistributionNotStarted",
-			"msg": "Distribution not started"
-		},
-		{
-			"code": 6017,
-			"name": "LeftToDistributeNotZero",
-			"msg": "Distribution amount not zero"
-		},
-		{
-			"code": 6018,
-			"name": "ReceiverAlreadyAllocated",
-			"msg": "Receiver already allocated"
-		},
-		{
-			"code": 6019,
-			"name": "RawTransferReceiver",
-			"msg": "Not a raw transfer receiver"
-		},
-		{
-			"code": 6020,
-			"name": "InvalidTwapPeriod",
-			"msg": "Invalid twap period"
-		},
-		{
-			"code": 6021,
-			"name": "RefillAmountExceeded",
-			"msg": "Refill amount exceeded"
-		},
-		{
-			"code": 6022,
-			"name": "PodTokenTotalSupplyZero",
-			"msg": "Pod token total supply is zero"
-		},
-		{
-			"code": 6023,
-			"name": "AllocationBpsGreaterThanGlobalAllocationBps",
-			"msg": "Allocation bps greater than global allocation bps"
-		},
-		{
-			"code": 6024,
-			"name": "EquityOutOfBufferBound",
-			"msg": "Equity out of buffer bound"
-		},
-		{
-			"code": 6025,
-			"name": "RedemptionAmountZero",
-			"msg": "Redemption amount must be > 0"
-		},
-		{
-			"code": 6026,
-			"name": "PendingDepositExists",
-			"msg": "Pending deposit exists"
-		},
-		{
-			"code": 6027,
-			"name": "InsufficientSharesBalance",
-			"msg": "Insufficient Shares balance"
-		},
-		{
-			"code": 6028,
-			"name": "PendingWithdrawalExists",
-			"msg": "Pending withdrawal exists"
-		},
-		{
-			"code": 6029,
-			"name": "PendingDepositOrWithdrawalExists",
-			"msg": "Pending deposit or withdrawal exists"
-		},
-		{
-			"code": 6030,
-			"name": "NoPendingWithdrawal",
-			"msg": "No pending withdrawal"
-		},
-		{
-			"code": 6031,
-			"name": "WithdrawalAlreadyProcessed",
-			"msg": "Withdrawal already processed"
-		},
-		{
-			"code": 6032,
-			"name": "PendingDepositAmountZero",
-			"msg": "Pending deposit amount is zero"
-		},
-		{
-			"code": 6033,
-			"name": "InsufficientBundleBalance",
-			"msg": "Insufficient bundle balance"
-		},
-		{
-			"code": 6034,
-			"name": "NoPendingTransactions",
-			"msg": "No pending transactions"
-		},
-		{
-			"code": 6035,
-			"name": "DepositsExtraInPendingsNotZero",
-			"msg": "Deposits extra in pendings not zero"
-		},
-		{
-			"code": 6036,
-			"name": "PendingTransactionsExist",
-			"msg": "Pending transactions exist"
-		},
-		{
-			"code": 6037,
-			"name": "ManagerSharesZero",
-			"msg": "Manager shares is zero"
-		},
-		{
-			"code": 6038,
-			"name": "PausedDepositsWithdrawals",
-			"msg": "Paused deposits withdrawals"
-		},
-		{
-			"code": 6039,
-			"name": "UnpausedDepositsWithdrawals",
-			"msg": "Unpaused deposits withdrawals"
-		},
-		{
-			"code": 6040,
-			"name": "NettingNotDone",
-			"msg": "Netting not done"
-		},
-		{
-			"code": 6041,
-			"name": "NettingAlreadyDone",
-			"msg": "Netting already done"
-		},
-		{
-			"code": 6042,
-			"name": "OracleNotUpdated",
-			"msg": "Oracle not updated"
-		},
-		{
-			"code": 6043,
-			"name": "MaxDepositAmountExceeded",
-			"msg": "Max deposit amount exceeded"
-		},
-		{
-			"code": 6044,
-			"name": "TotalAssetExceedNewMaxDepositAmount",
-			"msg": "Total asset exceed new max deposit amount"
-		},
-		{
-			"code": 6045,
-			"name": "AllocationBpsIsZero",
-			"msg": "Allocation bps is zero"
-		},
-		{
-			"code": 6046,
-			"name": "DepositAmountZero",
-			"msg": "Deposit amount is zero"
-		},
-		{
-			"code": 6047,
-			"name": "InvalidWithdrawalDelay",
-			"msg": "Invalid withdrawal delay"
-		},
-		{
-			"code": 6048,
-			"name": "InvalidWithdrawalCooldownPeriod",
-			"msg": "Invalid withdrawal cooldown period"
-		},
-		{
-			"code": 6049,
-			"name": "InvalidOracleBuffer",
-			"msg": "Invalid oracle buffer"
-		},
-		{
-			"code": 6050,
-			"name": "ExcessivePerformanceFee",
-			"msg": "Excessive performance fee"
-		},
-		{
-			"code": 6051,
-			"name": "ExcessiveManagementFee",
-			"msg": "Excessive management fee"
-		},
-		{
-			"code": 6052,
-			"name": "ExcessiveDepositFee",
-			"msg": "Excessive deposit fee"
-		},
-		{
-			"code": 6053,
-			"name": "ExcessiveWithdrawFee",
-			"msg": "Excessive withdraw fee"
-		},
-		{
-			"code": 6054,
-			"name": "WithdrawalDelayNotMet",
-			"msg": "Withdrawal delay not met"
-		},
-		{
-			"code": 6055,
-			"name": "InvalidAssetPrecision",
-			"msg": "Invalid asset precision"
-		},
-		{
-			"code": 6056,
-			"name": "InvalidAssetAddress",
-			"msg": "Invalid asset address"
-		},
-		{
-			"code": 6057,
-			"name": "InvalidPermissionnedDepositor",
-			"msg": "Invalid permissionned depositor"
-		},
-		{
-			"code": 6058,
-			"name": "PayerNotAuthority",
-			"msg": "Payer is not the authority"
-		},
-		{
-			"code": 6059,
-			"name": "StrategyAlreadyEnabled",
-			"msg": "Strategy is already enabled"
-		},
-		{
-			"code": 6060,
-			"name": "StrategyDisabled",
-			"msg": "Strategy is disabled"
-		}
-	]
-};
 
 //#endregion
-//#region src/idl/bundle-v2.json
-var bundle_v2_default = {
-	address: "BUNDeH5A4c47bcEoAjBhN3sCjLgYnRsmt9ibMztqVkC9",
+//#region src/idl/ntbundle.json
+var ntbundle_default = {
+	address: "BUNDDh4P5XviMm1f3gCvnq2qKx6TGosAGnoUK12e7cXU",
 	metadata: {
 		"name": "ntbundle",
 		"version": "0.1.0",
@@ -3274,6 +877,18 @@ var bundle_v2_default = {
 					"name": "oracle_update_time_limit",
 					"type": "i64"
 				},
+				{
+					"name": "withdrawal_redemption_request_cutoff_ts",
+					"type": "i64"
+				},
+				{
+					"name": "withdrawal_redemption_unlock_current_cycle_ts",
+					"type": "i64"
+				},
+				{
+					"name": "withdrawal_redemption_unlock_next_cycle_ts",
+					"type": "i64"
+				},
 				{
 					"name": "permissionned",
 					"type": "bool"
@@ -5883,6 +3498,41 @@ var bundle_v2_default = {
 				"type": "i64"
 			}]
 		},
+		{
+			"name": "set_withdrawal_redemption_schedule",
+			"discriminator": [
+				134,
+				108,
+				237,
+				103,
+				185,
+				13,
+				177,
+				105
+			],
+			"accounts": [{
+				"name": "manager",
+				"writable": true,
+				"signer": true
+			}, {
+				"name": "bundle_account",
+				"writable": true
+			}],
+			"args": [
+				{
+					"name": "withdrawal_redemption_request_cutoff_ts",
+					"type": "i64"
+				},
+				{
+					"name": "withdrawal_redemption_unlock_current_cycle_ts",
+					"type": "i64"
+				},
+				{
+					"name": "withdrawal_redemption_unlock_next_cycle_ts",
+					"type": "i64"
+				}
+			]
+		},
 		{
 			"name": "start_distribution",
 			"discriminator": [
@@ -6715,6 +4365,19 @@ var bundle_v2_default = {
 				207
 			]
 		},
+		{
+			"name": "WithdrawalRedemptionScheduleSet",
+			"discriminator": [
+				245,
+				195,
+				40,
+				76,
+				237,
+				247,
+				150,
+				107
+			]
+		},
 		{
 			"name": "WithdrawalRequested",
 			"discriminator": [
@@ -7092,6 +4755,11 @@ var bundle_v2_default = {
 			"code": 6069,
 			"name": "InvalidOracleUpdateTimeLimit",
 			"msg": "Invalid oracle update time limit"
+		},
+		{
+			"code": 6070,
+			"name": "InvalidWithdrawalRedemptionSchedule",
+			"msg": "Invalid withdrawal redemption schedule"
 		}
 	],
 	types: [
@@ -7119,6 +4787,26 @@ var bundle_v2_default = {
 					{
 						"name": "bundle_account_key",
 						"type": "pubkey"
+					},
+					{
+						"name": "net_amount",
+						"type": "u64"
+					},
+					{
+						"name": "share_price",
+						"type": "u128"
+					},
+					{
+						"name": "user_shares_before",
+						"type": "u128"
+					},
+					{
+						"name": "user_shares_after",
+						"type": "u128"
+					},
+					{
+						"name": "total_shares",
+						"type": "u128"
 					}
 				]
 			}
@@ -7199,10 +4887,6 @@ var bundle_v2_default = {
 						"name": "max_deposit_amount",
 						"type": "u64"
 					},
-					{
-						"name": "min_deposit_amount",
-						"type": "u64"
-					},
 					{
 						"name": "withdrawal_delay",
 						"type": "u64"
@@ -7235,14 +4919,6 @@ var bundle_v2_default = {
 						"name": "oracle_buffer",
 						"type": "u64"
 					},
-					{
-						"name": "oracle_update_time_limit",
-						"type": "i64"
-					},
-					{
-						"name": "oracle_max_age",
-						"type": "i64"
-					},
 					{
 						"name": "total_shares",
 						"type": "u128"
@@ -7279,9 +4955,33 @@ var bundle_v2_default = {
 						"name": "manager_mfee_shares",
 						"type": "u128"
 					},
+					{
+						"name": "min_deposit_amount",
+						"type": "u64"
+					},
+					{
+						"name": "oracle_update_time_limit",
+						"type": "i64"
+					},
+					{
+						"name": "oracle_max_age",
+						"type": "i64"
+					},
+					{
+						"name": "withdrawal_redemption_request_cutoff_ts",
+						"type": "i64"
+					},
+					{
+						"name": "withdrawal_redemption_unlock_current_cycle_ts",
+						"type": "i64"
+					},
+					{
+						"name": "withdrawal_redemption_unlock_next_cycle_ts",
+						"type": "i64"
+					},
 					{
 						"name": "padding",
-						"type": { "array": ["u8", 239] }
+						"type": { "array": ["u8", 207] }
 					}
 				]
 			}
@@ -7523,6 +5223,22 @@ var bundle_v2_default = {
 					{
 						"name": "topping_up",
 						"type": "bool"
+					},
+					{
+						"name": "gross_amount",
+						"type": "u64"
+					},
+					{
+						"name": "fee_amount",
+						"type": "u64"
+					},
+					{
+						"name": "net_amount",
+						"type": "u64"
+					},
+					{
+						"name": "asset_mint",
+						"type": "pubkey"
 					}
 				]
 			}
@@ -7828,6 +5544,30 @@ var bundle_v2_default = {
 					{
 						"name": "bundle_account_key",
 						"type": "pubkey"
+					},
+					{
+						"name": "gross_amount",
+						"type": "u64"
+					},
+					{
+						"name": "share_price",
+						"type": "u128"
+					},
+					{
+						"name": "user_shares_before",
+						"type": "u128"
+					},
+					{
+						"name": "user_shares_after",
+						"type": "u128"
+					},
+					{
+						"name": "total_shares_before",
+						"type": "u128"
+					},
+					{
+						"name": "total_shares_after",
+						"type": "u128"
 					}
 				]
 			}
@@ -8051,6 +5791,26 @@ var bundle_v2_default = {
 				}]
 			}
 		},
+		{
+			"name": "WithdrawalRedemptionScheduleSet",
+			"type": {
+				"kind": "struct",
+				"fields": [
+					{
+						"name": "withdrawal_redemption_request_cutoff_ts",
+						"type": "i64"
+					},
+					{
+						"name": "withdrawal_redemption_unlock_current_cycle_ts",
+						"type": "i64"
+					},
+					{
+						"name": "withdrawal_redemption_unlock_next_cycle_ts",
+						"type": "i64"
+					}
+				]
+			}
+		},
 		{
 			"name": "WithdrawalRequested",
 			"type": {
@@ -8079,6 +5839,14 @@ var bundle_v2_default = {
 					{
 						"name": "bundle_account_key",
 						"type": "pubkey"
+					},
+					{
+						"name": "cooldown_end_timestamp",
+						"type": "i64"
+					},
+					{
+						"name": "estimated_net_amount",
+						"type": "u64"
 					}
 				]
 			}
@@ -8112,31 +5880,36 @@ var bundle_v2_default = {
 
 //#endregion
 //#region src/constants/programs.ts
-let BundleProgramId = /* @__PURE__ */ function(BundleProgramId$1) {
-	BundleProgramId$1["V1"] = "BUNDDh4P5XviMm1f3gCvnq2qKx6TGosAGnoUK12e7cXU";
-	BundleProgramId$1["V2"] = "BUNDeH5A4c47bcEoAjBhN3sCjLgYnRsmt9ibMztqVkC9";
-	return BundleProgramId$1;
-}({});
+function toCustomProgramPublicKey(programId) {
+	try {
+		return new PublicKey(programId);
+	} catch {
+		throw new Error(`Invalid custom bundle program id: ${programId}`);
+	}
+}
+const DEFAULT_BUNDLE_PROGRAM_ID_MAINNET = "BUNDDh4P5XviMm1f3gCvnq2qKx6TGosAGnoUK12e7cXU";
 /**
-* Create Bundle Program instances for a given provider
+* Secondary mainnet ntbundle program id (used when a vault sets `bundleProgramId` to this value).
+* Kept in sync with `sdk/src/registry/vaults.json` (e.g. vaultId 69 JLP Delta Neutral).
 */
-function createBundleProgramV1(provider) {
-	return new Program(bundle_v1_default, new PublicKey(BundleProgramId.V1), provider);
-}
-function createBundleProgramV2(provider) {
-	return new Program$1(bundle_v2_default, provider);
+const BUNDLE_PROGRAM_ID_V2_MAINNET = "BUNDeH5A4c47bcEoAjBhN3sCjLgYnRsmt9ibMztqVkC9";
+const DEFAULT_BUNDLE_PROGRAM_ID_DEVNET = "7trSyt7d1ZRnvfGh9JaQZwZMWtfAXMvMwN3UxgMzVFbv";
+const DEFAULT_BUNDLE_PROGRAM_IDS_BY_CLUSTER = {
+	mainnet: DEFAULT_BUNDLE_PROGRAM_ID_MAINNET,
+	devnet: DEFAULT_BUNDLE_PROGRAM_ID_DEVNET
+};
+function getDefaultBundleProgramIdByCluster(cluster = "mainnet") {
+	return DEFAULT_BUNDLE_PROGRAM_IDS_BY_CLUSTER[cluster];
 }
 /**
-* Create both Bundle Program instances from a connection.
-* Use bundleProgramV1 for V1 vaults, bundleProgramV2 for V2 vaults (e.g. vault 69).
+* Create Bundle Program client for a specific program id.
 */
-function createBundlePrograms(connection) {
-	const providerV29 = createAnchorProviderV29(connection);
-	const providerV32 = createAnchorProviderV32(connection);
-	return {
-		bundleProgramV1: createBundleProgramV1(providerV29),
-		bundleProgramV2: createBundleProgramV2(providerV32)
-	};
+function createBundleProgramById(provider, programId) {
+	const resolved = toCustomProgramPublicKey(programId).toBase58();
+	return new Program({
+		...ntbundle_default,
+		address: resolved
+	}, provider);
 }
 
 //#endregion
@@ -9296,17 +7069,14 @@ const VaultRegistryArraySchema = z.array(VaultRegistryEntrySchema).superRefine((
 
 //#endregion
 //#region src/constants/vaults.ts
-const VAULT_PROGRAM_ID = new PublicKey("vAuLTsyrvSfZRuRB3XgvkPwNGgYSs9YRYymVebLKoxR");
 /**
 * Get Bundle Program ID for a vault config
-* Uses registry value if present, otherwise defaults to V1
+* Uses registry value if present, otherwise falls back to cluster default.
 */
-function getBundleProgramId(vault) {
+function getBundleProgramId(vault, cluster = "mainnet") {
 	if (vault.type !== VaultType.Bundle) return;
-	if (vault.bundleProgramId) {
-		if (Object.values(BundleProgramId).includes(vault.bundleProgramId)) return vault.bundleProgramId;
-	}
-	return BundleProgramId.V1;
+	if (vault.bundleProgramId) return vault.bundleProgramId;
+	return getDefaultBundleProgramIdByCluster(cluster);
 }
 /**
 * Get Drift Program ID for a vault config as PublicKey
@@ -9315,7 +7085,7 @@ function getBundleProgramId(vault) {
 function getDriftProgramId(vault) {
 	if (vault.type !== VaultType.Drift) return;
 	if (vault.driftProgramId) return vault.driftProgramId;
-	return VAULT_PROGRAM_ID.toBase58();
+	return "vAuLTsyrvSfZRuRB3XgvkPwNGgYSs9YRYymVebLKoxR";
 }
 /**
 * Transform a registry entry to VaultConfig with program IDs
@@ -9326,7 +7096,7 @@ function toVaultConfig(entry) {
 	return {
 		...entry,
 		driftProgramId: getDriftProgramId(entry),
-		bundleProgramId: getBundleProgramId(entry)
+		bundleProgramId: entry.bundleProgramId
 	};
 }
 /**
@@ -9393,9 +7163,9 @@ function derivePendingAuthPDA(bundlePDA, programId) {
 function getVaultDepositorAddressSync(programId, vault, authority) {
 	let _vault = vault;
 	if (vault.toBase58() === "3Nkctq19AW7gs5hkxixUDjS9UVjmCwcNCo7rqPpub87c") {
-		const name$1 = new Uint8Array(32);
-		name$1.set(encoder.encode("Neutral Trade"));
-		_vault = PublicKey.findProgramAddressSync([encoder.encode("vault"), name$1], programId)[0];
+		const name = new Uint8Array(32);
+		name.set(encoder.encode("Neutral Trade"));
+		_vault = PublicKey.findProgramAddressSync([encoder.encode("vault"), name], programId)[0];
 	}
 	return PublicKey.findProgramAddressSync([
 		encoder.encode("vault_depositor"),
@@ -9493,68 +7263,41 @@ function calculateBundleUserBalance({ oracleData, bundleData, userBundle, assetD
 		asset
 	};
 }
-async function getBundleBalances({ vaultIds, userAddress, vaults: vaults$1, bundleProgramV1, bundleProgramV2, priceMap }) {
+async function getBundleBalances({ vaultIds, userAddress, vaults: vaults$1, bundlePrograms, bundleCluster = "mainnet", priceMap }) {
 	const result = {};
 	const userPublicKey = new PublicKey(userAddress);
-	const v1Vaults = [];
-	const v2Vaults = [];
+	const matchingVaultsByProgram = {};
 	for (const vaultId of vaultIds) {
 		const config = vaults$1[vaultId];
 		if (!config) continue;
-		if (config.bundleProgramId === BundleProgramId.V2) v2Vaults.push({
-			vaultId,
-			config
-		});
-		else v1Vaults.push({
+		const expectedProgramId = getBundleProgramId(config, bundleCluster);
+		if (!expectedProgramId) continue;
+		if (!bundlePrograms[expectedProgramId]) {
+			result[vaultId] = null;
+			continue;
+		}
+		if (!matchingVaultsByProgram[expectedProgramId]) matchingVaultsByProgram[expectedProgramId] = [];
+		matchingVaultsByProgram[expectedProgramId].push({
 			vaultId,
 			config
 		});
 	}
-	if (v1Vaults.length > 0) {
-		const v1BundlePDAs = v1Vaults.map(({ config }) => new PublicKey(config.vaultAddress));
-		const v1OraclePDAs = v1BundlePDAs.map((bundlePDA) => deriveOraclePDA(bundlePDA, bundleProgramV1.programId));
-		const v1UserPDAs = v1BundlePDAs.map((bundlePDA) => deriveUserPDA(userPublicKey, bundlePDA, bundleProgramV1.programId));
-		const [v1Bundles, v1Oracles, v1Users] = await Promise.all([
-			bundleProgramV1.account.bundle.fetchMultiple(v1BundlePDAs),
-			bundleProgramV1.account.oracleData.fetchMultiple(v1OraclePDAs),
-			bundleProgramV1.account.userBundleAccount.fetchMultiple(v1UserPDAs)
-		]);
-		for (let i = 0; i < v1Vaults.length; i++) {
-			const { vaultId, config } = v1Vaults[i];
-			const bundle = v1Bundles[i];
-			const oracle = v1Oracles[i];
-			const userBundle = v1Users[i];
-			if (!bundle || !oracle || !userBundle) {
-				result[vaultId] = null;
-				continue;
-			}
-			const assetDecimals = tokens[config.depositToken]?.onChain?.Solana?.decimals || 6;
-			const spotPrice = priceMap.get(config.depositToken);
-			if (spotPrice === void 0) throw new Error(`Price not found for token ${config.depositToken}. This should not happen as prices are initialized during creation.`);
-			result[vaultId] = calculateBundleUserBalance({
-				oracleData: oracle,
-				bundleData: bundle,
-				userBundle,
-				assetDecimals,
-				spotPrice,
-				asset: config.depositToken
-			});
-		}
-	}
-	if (v2Vaults.length > 0) {
-		const v2BundlePDAs = v2Vaults.map(({ config }) => new PublicKey(config.vaultAddress));
-		const v2OraclePDAs = v2BundlePDAs.map((bundlePDA) => deriveOraclePDA(bundlePDA, bundleProgramV2.programId));
-		const v2UserPDAs = v2BundlePDAs.map((bundlePDA) => deriveUserPDA(userPublicKey, bundlePDA, bundleProgramV2.programId));
-		const [v2Bundles, v2Oracles, v2Users] = await Promise.all([
-			bundleProgramV2.account.bundle.fetchMultiple(v2BundlePDAs),
-			bundleProgramV2.account.oracleData.fetchMultiple(v2OraclePDAs),
-			bundleProgramV2.account.userBundleAccount.fetchMultiple(v2UserPDAs)
+	for (const [programId, matchingVaults] of Object.entries(matchingVaultsByProgram)) {
+		const bundleProgram = bundlePrograms[programId];
+		if (!bundleProgram) continue;
+		const bundlePDAs = matchingVaults.map(({ config }) => new PublicKey(config.vaultAddress));
+		const oraclePDAs = bundlePDAs.map((bundlePDA) => deriveOraclePDA(bundlePDA, bundleProgram.programId));
+		const userPDAs = bundlePDAs.map((bundlePDA) => deriveUserPDA(userPublicKey, bundlePDA, bundleProgram.programId));
+		const [bundles, oracles, users] = await Promise.all([
+			bundleProgram.account.bundle.fetchMultiple(bundlePDAs),
+			bundleProgram.account.oracleData.fetchMultiple(oraclePDAs),
+			bundleProgram.account.userBundleAccount.fetchMultiple(userPDAs)
 		]);
-		for (let i = 0; i < v2Vaults.length; i++) {
-			const { vaultId, config } = v2Vaults[i];
-			const bundle = v2Bundles[i];
-			const oracle = v2Oracles[i];
-			const userBundle = v2Users[i];
+		for (let i = 0; i < matchingVaults.length; i++) {
+			const { vaultId, config } = matchingVaults[i];
+			const bundle = bundles[i];
+			const oracle = oracles[i];
+			const userBundle = users[i];
 			if (!bundle || !oracle || !userBundle) {
 				result[vaultId] = null;
 				continue;
@@ -9587,58 +7330,40 @@ function computeRequestWithdrawalSharesAmount({ amount, userVaultBalance, pps, a
 function assertBundleVault(vault) {
 	if (vault.type !== VaultType.Bundle) throw new Error(`Vault ${vault.vaultId} is not a Bundle vault`);
 }
-function bundleProgramIdForVault(vault) {
-	const id = getBundleProgramId(vault);
+function bundleProgramIdForVault(vault, bundleCluster = "mainnet") {
+	const id = getBundleProgramId(vault, bundleCluster);
 	if (!id) throw new Error(`Vault ${vault.vaultId} has no Bundle program id`);
 	return id;
 }
 /**
 * Optional `initializeBundleDepositor` + `requestDeposit`. Fetches bundle account internally.
 */
-async function buildBundleDepositInstructions({ bundleProgramV1, bundleProgramV2, vault, user, amount, needsInit = false }) {
+async function buildBundleDepositInstructions({ bundleProgram, bundleCluster = "mainnet", vault, user, amount, needsInit = false }) {
 	assertBundleVault(vault);
 	const bundlePDA = new PublicKey(vault.vaultAddress);
-	const isV2 = bundleProgramIdForVault(vault) === BundleProgramId.V2;
-	const bundleInfo = isV2 ? await bundleProgramV2.account.bundle.fetch(bundlePDA) : await bundleProgramV1.account.bundle.fetch(bundlePDA);
+	const programId = bundleProgramIdForVault(vault, bundleCluster);
+	if (programId !== bundleProgram.programId.toBase58()) throw new Error(`Vault ${vault.vaultId} program id mismatch: vault=${programId}, client=${bundleProgram.programId.toBase58()}`);
+	const bundleInfo = await bundleProgram.account.bundle.fetch(bundlePDA);
 	const depositAmountBN = new BN(Math.floor(amount * 10 ** bundleInfo.assetDecimals));
-	const programPk = isV2 ? bundleProgramV2.programId : bundleProgramV1.programId;
+	const programPk = bundleProgram.programId;
 	const oraclePDA = deriveOraclePDA(bundlePDA, programPk);
 	const userPDA = deriveUserPDA(user, bundlePDA, programPk);
 	const tempDataPDA = deriveTempDataPDA(bundlePDA, programPk);
 	const pendingAuthPDA = derivePendingAuthPDA(bundlePDA, programPk);
 	const userTokenAcct = getAssociatedTokenAddressSync(bundleInfo.assetAddress, user, true);
 	const pendingTokenAcct = getAssociatedTokenAddressSync(bundleInfo.assetAddress, pendingAuthPDA, true);
-	const instructions$2 = [];
+	const instructions$1 = [];
 	if (needsInit) {
-		const initIx = isV2 ? await bundleProgramV2.methods.initializeBundleDepositor().accounts({
-			payer: user,
-			authority: user,
-			systemProgram: SystemProgram.programId,
-			bundleAccount: bundlePDA,
-			userBundleAccount: userPDA
-		}).instruction() : await bundleProgramV1.methods.initializeBundleDepositor().accounts({
+		const initIx = await bundleProgram.methods.initializeBundleDepositor().accounts({
 			payer: user,
 			authority: user,
 			systemProgram: SystemProgram.programId,
 			bundleAccount: bundlePDA,
 			userBundleAccount: userPDA
 		}).instruction();
-		instructions$2.push(initIx);
+		instructions$1.push(initIx);
 	}
-	const depositIx = isV2 ? await bundleProgramV2.methods.requestDeposit(depositAmountBN).accounts({
-		user,
-		userTokenAccount: userTokenAcct,
-		pendingDepositTokenAccount: pendingTokenAcct,
-		treasuryAccount: bundleInfo.treasuryAccount,
-		userBundleAccount: userPDA,
-		assetAddress: bundleInfo.assetAddress,
-		oracleData: oraclePDA,
-		bundleTempData: tempDataPDA,
-		bundleAccount: bundlePDA,
-		pendingBundleAssetAuthority: pendingAuthPDA,
-		tokenProgram: TOKEN_PROGRAM_ID,
-		systemProgram: SystemProgram.programId
-	}).instruction() : await bundleProgramV1.methods.requestDeposit(depositAmountBN).accounts({
+	const depositIx = await bundleProgram.methods.requestDeposit(depositAmountBN).accounts({
 		user,
 		userTokenAccount: userTokenAcct,
 		pendingDepositTokenAccount: pendingTokenAcct,
@@ -9652,24 +7377,25 @@ async function buildBundleDepositInstructions({ bundleProgramV1, bundleProgramV2
 		tokenProgram: TOKEN_PROGRAM_ID,
 		systemProgram: SystemProgram.programId
 	}).instruction();
-	instructions$2.push(depositIx);
-	return instructions$2;
+	instructions$1.push(depositIx);
+	return instructions$1;
 }
 /**
 * `requestWithdrawal` only. Fetches bundle, oracle, and user bundle internally.
 */
-async function buildBundleRequestWithdrawInstruction({ bundleProgramV1, bundleProgramV2, vault, user, amount }) {
+async function buildBundleRequestWithdrawInstruction({ bundleProgram, bundleCluster = "mainnet", vault, user, amount }) {
 	assertBundleVault(vault);
 	const bundlePDA = new PublicKey(vault.vaultAddress);
-	const isV2 = bundleProgramIdForVault(vault) === BundleProgramId.V2;
-	const programPk = isV2 ? bundleProgramV2.programId : bundleProgramV1.programId;
+	const programId = bundleProgramIdForVault(vault, bundleCluster);
+	if (programId !== bundleProgram.programId.toBase58()) throw new Error(`Vault ${vault.vaultId} program id mismatch: vault=${programId}, client=${bundleProgram.programId.toBase58()}`);
+	const programPk = bundleProgram.programId;
 	const oraclePDA = deriveOraclePDA(bundlePDA, programPk);
 	const userPDA = deriveUserPDA(user, bundlePDA, programPk);
 	const tempDataPDA = deriveTempDataPDA(bundlePDA, programPk);
 	const [bundleAccount, oracleData, userBundle] = await Promise.all([
-		isV2 ? bundleProgramV2.account.bundle.fetch(bundlePDA) : bundleProgramV1.account.bundle.fetch(bundlePDA),
-		isV2 ? bundleProgramV2.account.oracleData.fetch(oraclePDA) : bundleProgramV1.account.oracleData.fetch(oraclePDA),
-		isV2 ? bundleProgramV2.account.userBundleAccount.fetch(userPDA) : bundleProgramV1.account.userBundleAccount.fetch(userPDA)
+		bundleProgram.account.bundle.fetch(bundlePDA),
+		bundleProgram.account.oracleData.fetch(oraclePDA),
+		bundleProgram.account.userBundleAccount.fetch(userPDA)
 	]);
 	const pps = calculateOnChainPps({
 		oracleAverageExternalEquity: BigInt(oracleData.averageExternalEquity.toString()),
@@ -9685,16 +7411,7 @@ async function buildBundleRequestWithdrawInstruction({ bundleProgramV1, bundlePr
 		assetDecimals: bundleAccount.assetDecimals,
 		userShares: new BN(userBundle.shares.toString())
 	});
-	return isV2 ? await bundleProgramV2.methods.requestWithdrawal(sharesAmount).accounts({
-		user,
-		userBundleAccount: userPDA,
-		bundleAccount: bundlePDA,
-		oracleData: oraclePDA,
-		bundleTempData: tempDataPDA,
-		tokenProgram: TOKEN_PROGRAM_ID,
-		systemProgram: SystemProgram.programId,
-		rent: SYSVAR_RENT_PUBKEY
-	}).instruction() : await bundleProgramV1.methods.requestWithdrawal(sharesAmount).accounts({
+	return await bundleProgram.methods.requestWithdrawal(sharesAmount).accounts({
 		user,
 		userBundleAccount: userPDA,
 		bundleAccount: bundlePDA,
@@ -9775,49 +7492,73 @@ async function initializePrices(fallbackPrices) {
 //#region src/NeutralTrade.ts
 var NeutralTrade = class NeutralTrade {
 	connection;
-	bundleProgramV1;
-	bundleProgramV2;
-	/** Vault configurations (built-in merged with remote if registryUrl was provided) */
+	bundlePrograms;
+	bundleCluster;
+	/** Vault configurations after merge order: built-in < local registry < registryUrl */
 	vaults;
 	/** Price map for deposit tokens */
 	priceMap;
-	constructor(connection, bundleProgramV1, bundleProgramV2, vaults$1, priceMap) {
+	constructor(connection, bundlePrograms, bundleCluster, vaults$1, priceMap) {
 		this.connection = connection;
-		this.bundleProgramV1 = bundleProgramV1;
-		this.bundleProgramV2 = bundleProgramV2;
+		this.bundlePrograms = bundlePrograms;
+		this.bundleCluster = bundleCluster;
 		this.vaults = vaults$1;
 		this.priceMap = priceMap;
 	}
 	/**
 	* Create a new NeutralTrade instance
-	* @throws Error if registryUrl is provided but fetch fails or validation fails
+	* Merge order: built-in (when allowed) < local registry < registryUrl
+	* @throws Error if registry or registryUrl validation fails (or fetch fails for registryUrl)
 	*/
 	static async initCore(config) {
 		const connection = createConnection(config.rpcUrl);
-		const providerV29 = createAnchorProviderV29(connection);
-		const providerV32 = createAnchorProviderV32(connection);
-		const bundleProgramV1 = createBundleProgramV1(providerV29);
-		const bundleProgramV2 = createBundleProgramV2(providerV32);
-		let vaults$1 = { ...vaults };
+		const provider = createAnchorProvider(connection);
+		const cluster = config.bundleCluster ?? "mainnet";
+		let vaults$1 = config.includeBuiltInVaults !== false ? { ...vaults } : {};
+		if (config.registry) {
+			const localVaults = NeutralTrade.parseVaultRegistryEntries(config.registry, "registry");
+			vaults$1 = {
+				...vaults$1,
+				...localVaults
+			};
+		}
 		if (config.registryUrl) {
 			const remoteVaults = await NeutralTrade.fetchVaultsFromRegistry(config.registryUrl);
 			vaults$1 = {
-				...vaults,
+				...vaults$1,
 				...remoteVaults
 			};
 		}
+		const programIds = /* @__PURE__ */ new Set();
+		for (const vault of Object.values(vaults$1)) {
+			const programId = getBundleProgramId(vault, cluster);
+			if (programId) programIds.add(programId);
+		}
+		const bundlePrograms = {};
+		for (const programId of programIds) bundlePrograms[programId] = createBundleProgramById(provider, programId);
 		const priceMap = await initializePrices(config.fallbackPrices);
 		return {
 			connection,
-			bundleProgramV1,
-			bundleProgramV2,
+			bundlePrograms,
 			vaults: vaults$1,
 			priceMap
 		};
 	}
 	static async create(config) {
 		const core = await this.initCore(config);
-		return new NeutralTrade(core.connection, core.bundleProgramV1, core.bundleProgramV2, core.vaults, core.priceMap);
+		return new NeutralTrade(core.connection, core.bundlePrograms, config.bundleCluster ?? "mainnet", core.vaults, core.priceMap);
+	}
+	getBundleProgramForVault(vault) {
+		const programId = getBundleProgramId(vault, this.bundleCluster);
+		if (!programId) throw new Error(`Vault ${vault.vaultId} has no Bundle program id`);
+		const bundleProgram = this.bundlePrograms[programId];
+		if (!bundleProgram) throw new Error(`Bundle program client not initialized for vault ${vault.vaultId}: ${programId}. Please add it to bundlePrograms config or registry.`);
+		return bundleProgram;
+	}
+	static parseVaultRegistryEntries(entries, sourceLabel) {
+		const parseResult = VaultRegistryArraySchema.safeParse(entries);
+		if (!parseResult.success) throw new Error(`Invalid ${sourceLabel} data: ${parseResult.error.message}`);
+		return toVaultRegistry(parseResult.data);
 	}
 	/**
 	* Fetch vault configurations from a remote registry URL
@@ -9828,9 +7569,7 @@ var NeutralTrade = class NeutralTrade {
 		const response = await fetch(registryUrl);
 		if (!response.ok) throw new Error(`Failed to fetch vaults from registry: ${response.status} ${response.statusText}`);
 		const data = await response.json();
-		const parseResult = VaultRegistryArraySchema.safeParse(data);
-		if (!parseResult.success) throw new Error(`Invalid vault registry data: ${parseResult.error.message}`);
-		return toVaultRegistry(parseResult.data);
+		return NeutralTrade.parseVaultRegistryEntries(data, "vault registry");
 	}
 	/**
 	* Get user balance for Bundle vaults only.
@@ -9846,8 +7585,8 @@ var NeutralTrade = class NeutralTrade {
 			vaultIds: bundleVaultIds,
 			userAddress,
 			vaults: this.vaults,
-			bundleProgramV1: this.bundleProgramV1,
-			bundleProgramV2: this.bundleProgramV2,
+			bundlePrograms: this.bundlePrograms,
+			bundleCluster: this.bundleCluster,
 			priceMap: this.priceMap
 		});
 	}
@@ -9858,8 +7597,8 @@ var NeutralTrade = class NeutralTrade {
 		const vault = this.vaults[vaultId];
 		if (!vault) throw new Error(`Vault config not found for vaultId ${vaultId}`);
 		return buildBundleDepositInstructions({
-			bundleProgramV1: this.bundleProgramV1,
-			bundleProgramV2: this.bundleProgramV2,
+			bundleProgram: this.getBundleProgramForVault(vault),
+			bundleCluster: this.bundleCluster,
 			vault,
 			user: new PublicKey(userAddress),
 			amount,
@@ -9873,8 +7612,8 @@ var NeutralTrade = class NeutralTrade {
 		const vault = this.vaults[vaultId];
 		if (!vault) throw new Error(`Vault config not found for vaultId ${vaultId}`);
 		return buildBundleRequestWithdrawInstruction({
-			bundleProgramV1: this.bundleProgramV1,
-			bundleProgramV2: this.bundleProgramV2,
+			bundleProgram: this.getBundleProgramForVault(vault),
+			bundleCluster: this.bundleCluster,
 			vault,
 			user: new PublicKey(userAddress),
 			amount
@@ -9883,4 +7622,4 @@ var NeutralTrade = class NeutralTrade {
 };
 
 //#endregion
-export { BundleProgramId, NeutralTrade, SupportedChain, SupportedToken, VaultCategory, VaultId, VaultType, buildBundleDepositInstructions, buildBundleRequestWithdrawInstruction, computeRequestWithdrawalSharesAmount, createAnchorProviderV29, createAnchorProviderV32, createBundleProgramV1, createBundleProgramV2, createBundlePrograms, createConnection, createDummyWallet, deriveOraclePDA, derivePendingAuthPDA, deriveTempDataPDA, deriveUserPDA, estimatePendingBundleFeeToken, getBundleProgramId, getPointsVaults, getVaultByAddress, getVaultById, getVaultDepositorAddressSync, isValidVaultAddress, tokens, vaults };
+export { BUNDLE_PROGRAM_ID_V2_MAINNET, DEFAULT_BUNDLE_PROGRAM_ID_DEVNET, DEFAULT_BUNDLE_PROGRAM_ID_MAINNET, NeutralTrade, SEED_ORACLE, SEED_PENDING_AUTH, SEED_TEMP, SEED_USER, SupportedChain, SupportedToken, VaultCategory, VaultId, VaultType, buildBundleDepositInstructions, buildBundleRequestWithdrawInstruction, createBundleProgramById, createDummyWallet, deriveOraclePDA, derivePendingAuthPDA, deriveTempDataPDA, deriveUserPDA, getBundleProgramId, getDefaultBundleProgramIdByCluster, getVaultByAddress, getVaultById, getVaultDepositorAddressSync, isValidVaultAddress, tokens, vaults };