@neutral-trade/sdk 0.2.3 → 0.2.5

package/dist/index.d.mts

@@ -1,6 +1,6 @@
-import { AnchorProvider, IdlAccounts, Program, Wallet } from "@coral-xyz/anchor";
+import { AnchorProvider, BN, IdlAccounts, Program, Wallet } from "@coral-xyz/anchor";
 import { AnchorProvider as AnchorProvider$1, IdlAccounts as IdlAccounts$1, Program as Program$1 } from "@coral-xyz/anchor-32";
-import { Connection, PublicKey } from "@solana/web3.js";
+import { Connection, PublicKey, TransactionInstruction } from "@solana/web3.js";
 import { z } from "zod";
 
 //#region src/constants/client.d.ts
@@ -5291,6 +5291,32 @@ declare class NeutralTrade {
     vaultIds: number[];
     userAddress: string;
   }): Promise<UserBalanceResult>;
+  /**
+   * Build deposit instructions (optional init + requestDeposit). Fetches vault state on-chain.
+   */
+  buildDepositInstructions({
+    vaultId,
+    userAddress,
+    amount,
+    needsInit
+  }: {
+    vaultId: number;
+    userAddress: string;
+    amount: number;
+    needsInit?: boolean;
+  }): Promise<TransactionInstruction[]>;
+  /**
+   * Build request-withdraw instruction. Fetches vault, oracle, and depositor accounts on-chain.
+   */
+  buildRequestWithdrawInstruction({
+    vaultId,
+    userAddress,
+    amount
+  }: {
+    vaultId: number;
+    userAddress: string;
+    amount: number;
+  }): Promise<TransactionInstruction>;
 }
 //#endregion
 //#region src/utils/bundle.d.ts
@@ -5311,6 +5337,59 @@ declare function estimatePendingBundleFeeToken({
   nowUnixSeconds?: number;
 }): number;
 //#endregion
+//#region src/utils/bundle-instructions.d.ts
+interface BuildBundleDepositInstructionsParams {
+  bundleProgramV1: Program<NtbundleV1>;
+  bundleProgramV2: Program$1<NtbundleV2>;
+  vault: VaultRegistryEntry;
+  user: PublicKey;
+  /** UI token amount (multiplied by 10**on-chain decimals inside). */
+  amount: number;
+  needsInit?: boolean;
+}
+interface BuildBundleRequestWithdrawInstructionParams {
+  bundleProgramV1: Program<NtbundleV1>;
+  bundleProgramV2: Program$1<NtbundleV2>;
+  vault: VaultRegistryEntry;
+  user: PublicKey;
+  amount: number;
+}
+/** Same share math as legacy app `useBundleRequestWithdrawMutation`. */
+declare function computeRequestWithdrawalSharesAmount({
+  amount,
+  userVaultBalance,
+  pps,
+  assetDecimals,
+  userShares
+}: {
+  amount: number;
+  userVaultBalance: number;
+  pps: number;
+  assetDecimals: number;
+  userShares: BN;
+}): BN;
+/**
+ * Optional `initializeBundleDepositor` + `requestDeposit`. Fetches bundle account internally.
+ */
+declare function buildBundleDepositInstructions({
+  bundleProgramV1,
+  bundleProgramV2,
+  vault,
+  user,
+  amount,
+  needsInit
+}: BuildBundleDepositInstructionsParams): Promise<TransactionInstruction[]>;
+/**
+ * `requestWithdrawal` only. Fetches bundle, oracle, and user bundle internally.
+ */
+declare function buildBundleRequestWithdrawInstruction({
+  bundleProgramV1,
+  bundleProgramV2,
+  vault,
+  user,
+  amount
+}: BuildBundleRequestWithdrawInstructionParams): Promise<TransactionInstruction>;
+//#endregion
 //#region src/utils/pda.d.ts
 /**
  * Derive Oracle PDA for Bundle vault
@@ -5320,10 +5399,18 @@ declare function deriveOraclePDA(bundlePDA: PublicKey, programId: PublicKey): Pu
  * Derive User PDA for Bundle vault
  */
 declare function deriveUserPDA(userKey: PublicKey, bundlePDA: PublicKey, programId: PublicKey): PublicKey;
+/**
+ * Derive Temp Data PDA for Bundle vault
+ */
+declare function deriveTempDataPDA(bundlePDA: PublicKey, programId: PublicKey): PublicKey;
+/**
+ * Derive pending bundle asset authority PDA (pending deposit token ATA owner)
+ */
+declare function derivePendingAuthPDA(bundlePDA: PublicKey, programId: PublicKey): PublicKey;
 /**
  * Get Vault Depositor PDA for Drift vault
  * Custom code to handle jlpdnv1 special case
  */
 declare function getVaultDepositorAddressSync(programId: PublicKey, vault: PublicKey, authority: PublicKey): PublicKey;
 //#endregion
-export { type BundleAccount, BundleProgramId, NeutralTrade, type NeutralTradeConfig, type NeutralTradeCoreContext, type OracleData, type PointsVaultEntry, SupportedChain, SupportedToken, type Token, type UserBalanceResult, type UserBundleAccount, type UserBundleTempData, type VaultBalanceData, VaultCategory, type VaultRegistryEntry as VaultConfig, type VaultRegistry as VaultConfigRecord, VaultId, VaultType, createAnchorProviderV29, createAnchorProviderV32, createBundleProgramV1, createBundleProgramV2, createBundlePrograms, createConnection, createDummyWallet, deriveOraclePDA, deriveUserPDA, estimatePendingBundleFeeToken, getBundleProgramId, getPointsVaults, getVaultByAddress, getVaultById, getVaultDepositorAddressSync, isValidVaultAddress, tokens, vaults$1 as vaults };
+export { type BuildBundleDepositInstructionsParams, type BuildBundleRequestWithdrawInstructionParams, type BundleAccount, BundleProgramId, NeutralTrade, type NeutralTradeConfig, type NeutralTradeCoreContext, type OracleData, type PointsVaultEntry, SupportedChain, SupportedToken, type Token, type UserBalanceResult, type UserBundleAccount, type UserBundleTempData, type VaultBalanceData, VaultCategory, type VaultRegistryEntry as VaultConfig, type VaultRegistry as VaultConfigRecord, 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$1 as vaults };

package/dist/index.mjs

@@ -1,7 +1,8 @@
-import { AnchorProvider, Program } from "@coral-xyz/anchor";
+import { AnchorProvider, BN, Program } from "@coral-xyz/anchor";
 import { AnchorProvider as AnchorProvider$1, Program as Program$1 } from "@coral-xyz/anchor-32";
-import { Connection, Keypair, PublicKey } from "@solana/web3.js";
+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";
 
 //#region src/constants/addr.ts
 const ZERO_ADDRESS = new PublicKey("11111111111111111111111111111111");
@@ -9372,6 +9373,20 @@ function deriveUserPDA(userKey, bundlePDA, programId) {
 	return pda;
 }
 /**
+* Derive Temp Data PDA for Bundle vault
+*/
+function deriveTempDataPDA(bundlePDA, programId) {
+	const [pda] = PublicKey.findProgramAddressSync([SEED_TEMP, bundlePDA.toBuffer()], programId);
+	return pda;
+}
+/**
+* Derive pending bundle asset authority PDA (pending deposit token ATA owner)
+*/
+function derivePendingAuthPDA(bundlePDA, programId) {
+	const [pda] = PublicKey.findProgramAddressSync([SEED_PENDING_AUTH, bundlePDA.toBuffer()], programId);
+	return pda;
+}
+/**
 * Get Vault Depositor PDA for Drift vault
 * Custom code to handle jlpdnv1 special case
 */
@@ -9560,6 +9575,137 @@ async function getBundleBalances({ vaultIds, userAddress, vaults: vaults$1, bund
 	return result;
 }
 
+//#endregion
+//#region src/utils/bundle-instructions.ts
+/** Same share math as legacy app `useBundleRequestWithdrawMutation`. */
+function computeRequestWithdrawalSharesAmount({ amount, userVaultBalance, pps, assetDecimals, userShares }) {
+	let sharesAmount;
+	if (Number(amount) >= Number(userVaultBalance)) sharesAmount = userShares;
+	else sharesAmount = new BN(Math.floor(amount * 10 ** assetDecimals / pps));
+	return sharesAmount.lte(userShares) ? sharesAmount : userShares;
+}
+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);
+	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 }) {
+	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 depositAmountBN = new BN(Math.floor(amount * 10 ** bundleInfo.assetDecimals));
+	const programPk = isV2 ? bundleProgramV2.programId : bundleProgramV1.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 = [];
+	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({
+			payer: user,
+			authority: user,
+			systemProgram: SystemProgram.programId,
+			bundleAccount: bundlePDA,
+			userBundleAccount: userPDA
+		}).instruction();
+		instructions$2.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({
+		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();
+	instructions$2.push(depositIx);
+	return instructions$2;
+}
+/**
+* `requestWithdrawal` only. Fetches bundle, oracle, and user bundle internally.
+*/
+async function buildBundleRequestWithdrawInstruction({ bundleProgramV1, bundleProgramV2, 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 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)
+	]);
+	const pps = calculateOnChainPps({
+		oracleAverageExternalEquity: BigInt(oracleData.averageExternalEquity.toString()),
+		bundleUnderlyingBalance: BigInt(bundleAccount.bundleUnderlyingBalance.toString()),
+		totalShares: BigInt(bundleAccount.totalShares.toString())
+	});
+	const divisor = 10 ** bundleAccount.assetDecimals;
+	const userSharesNum = Number(userBundle.shares.toString());
+	const sharesAmount = computeRequestWithdrawalSharesAmount({
+		amount,
+		userVaultBalance: Math.round(userSharesNum * pps) / divisor,
+		pps,
+		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({
+		user,
+		userBundleAccount: userPDA,
+		bundleAccount: bundlePDA,
+		oracleData: oraclePDA,
+		bundleTempData: tempDataPDA,
+		tokenProgram: TOKEN_PROGRAM_ID,
+		systemProgram: SystemProgram.programId,
+		rent: SYSVAR_RENT_PUBKEY
+	}).instruction();
+}
+
 //#endregion
 //#region src/utils/price.ts
 /**
@@ -9705,7 +9851,36 @@ var NeutralTrade = class NeutralTrade {
 			priceMap: this.priceMap
 		});
 	}
+	/**
+	* Build deposit instructions (optional init + requestDeposit). Fetches vault state on-chain.
+	*/
+	async buildDepositInstructions({ vaultId, userAddress, amount, needsInit = false }) {
+		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,
+			vault,
+			user: new PublicKey(userAddress),
+			amount,
+			needsInit
+		});
+	}
+	/**
+	* Build request-withdraw instruction. Fetches vault, oracle, and depositor accounts on-chain.
+	*/
+	async buildRequestWithdrawInstruction({ vaultId, userAddress, amount }) {
+		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,
+			vault,
+			user: new PublicKey(userAddress),
+			amount
+		});
+	}
 };
 
 //#endregion
-export { BundleProgramId, NeutralTrade, SupportedChain, SupportedToken, VaultCategory, VaultId, VaultType, createAnchorProviderV29, createAnchorProviderV32, createBundleProgramV1, createBundleProgramV2, createBundlePrograms, createConnection, createDummyWallet, deriveOraclePDA, deriveUserPDA, estimatePendingBundleFeeToken, getBundleProgramId, getPointsVaults, getVaultByAddress, getVaultById, getVaultDepositorAddressSync, isValidVaultAddress, tokens, vaults };
+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 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@neutral-trade/sdk",
   "type": "module",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "SDK for Neutral Trade vaults",
   "license": "MIT",
   "homepage": "https://github.com/neutral-trade/sdk#readme",
@@ -25,6 +25,7 @@
   "dependencies": {
     "@coral-xyz/anchor": "0.29.0",
     "@coral-xyz/anchor-32": "npm:@coral-xyz/anchor@0.32.0",
+    "@solana/spl-token": "^0.4.14",
     "@solana/web3.js": "^1.98.4",
     "@types/bn.js": "^5.2.0",
     "bn.js": "^5.2.3",