@neutral-trade/sdk 0.4.4 → 0.4.8

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { A as SupportedToken, B as DEFAULT_BUNDLE_PROGRAM_ID_DEVNET, C as VaultRegistryEntry, D as UserBundleAccount, E as OracleData, F as ALLOWLISTED_BUNDLE_PROGRAM_IDS_BY_CLUSTER, G as getDefaultBundleProgramIdByCluster, H as assertAllowlistedBundleProgramId, I as BUNDLE_PROGRAM_ID_V2_MAINNET, K as isAllowlistedBundleProgramId, L as BundleCluster, M as getSolanaTokenDecimals, N as getSolanaTokenMint, O as UserBundleTempData, P as tokens, R as BundleProgram, S as VaultRegistry, T as BundleAccount, U as createAllowlistedBundleProgram, V as DEFAULT_BUNDLE_PROGRAM_ID_MAINNET, W as createBundleProgramById, _ as vaults, b as VaultBalanceData, d as NeutralTradeConfig, f as getBundleProgramId, g as isValidVaultAddress, h as getVaultRegistry, j as Token, k as SupportedChain, m as getVaultById, p as getVaultByAddress, t as NeutralTradeCoreContext, u as NeutralTrade, v as vaultsDevnet, w as VaultType, x as VaultCategory, y as UserBalanceResult, z as BundleProvider } from "./neutral-trade-core-BGjOiCsY.mjs";
-import { AnchorProvider, Wallet } from "@coral-xyz/anchor";
+import { A as SupportedToken, B as DEFAULT_BUNDLE_PROGRAM_ID_DEVNET, C as VaultRegistryEntry, D as UserBundleAccount, E as OracleData, F as ALLOWLISTED_BUNDLE_PROGRAM_IDS_BY_CLUSTER, G as getDefaultBundleProgramIdByCluster, H as assertAllowlistedBundleProgramId, I as BUNDLE_PROGRAM_ID_V2_MAINNET, K as isAllowlistedBundleProgramId, L as BundleCluster, M as getSolanaTokenDecimals, N as getSolanaTokenMint, O as UserBundleTempData, P as tokens, R as BundleProgram, S as VaultRegistry, T as BundleAccount, U as createAllowlistedBundleProgram, V as DEFAULT_BUNDLE_PROGRAM_ID_MAINNET, W as createBundleProgramById, _ as vaults$1, b as VaultBalanceData, d as NeutralTradeConfig, f as getBundleProgramId, g as isValidVaultAddress, h as getVaultRegistry, j as Token, k as SupportedChain, m as getVaultById, p as getVaultByAddress, t as NeutralTradeCoreContext, u as NeutralTrade, v as vaultsDevnet, w as VaultType, x as VaultCategory, y as UserBalanceResult, z as BundleProvider } from "./neutral-trade-core-BGjOiCsY.mjs";
+import { AnchorProvider, Program, Wallet } from "@coral-xyz/anchor";
 import { Connection, PublicKey, TransactionInstruction } from "@solana/web3.js";
 import BN from "bn.js";
 
@@ -199,6 +199,88 @@ declare function parseAmountRawToBigInt(amountRaw: string): bigint;
  */
 declare function humanFloatToAmountRawString(human: number, decimals: number): string;
 //#endregion
+//#region src/utils/bundle.d.ts
+/**
+ * Estimated unpaid bundle fees in deposit token (mgmt + performance), matching on-chain `charge_user_fees`.
+ */
+declare function estimatePendingBundleFeeToken({
+  oracleData,
+  bundleData,
+  userBundle,
+  assetDecimals,
+  nowUnixSeconds
+}: {
+  oracleData: OracleData;
+  bundleData: BundleAccount;
+  userBundle: UserBundleAccount;
+  assetDecimals: number;
+  nowUnixSeconds?: number;
+}): number;
+//#endregion
+//#region src/utils/bundle-fee-override.d.ts
+/** Mirrors `bundle-sc` `FEE_OVERRIDE_*` bit flags. */
+declare const FEE_OVERRIDE: {
+  readonly DEPOSIT: number;
+  readonly WITHDRAWAL: number;
+  readonly PERFORMANCE: number;
+  readonly MANAGEMENT: number;
+  readonly ALL: number;
+};
+interface EffectiveFeeBps {
+  depositFeeBps: number;
+  withdrawalFeeBps: number;
+  performanceFeeBps: number;
+  managementFeeBps: number;
+}
+/** Normalized per-user fee override fields (bps + flag mask). */
+interface UserFeeOverrideFields {
+  feeOverrideFlags: number;
+  customDepositFeeBps: number;
+  customWithdrawalFeeBps: number;
+  customPerformanceFeeBps: number;
+  customManagementFeeBps: number;
+}
+/** Decimal fees matching frontend `VaultConfig` (`0.01` = 1%). */
+interface EffectiveVaultFeeDecimals {
+  dfee: number;
+  wfee: number;
+  pfee: number;
+  mfee: number;
+}
+declare function bpsToFeeDecimal(bps: number): number;
+declare function feeDecimalToBps(decimal: number): number;
+declare function bpsToPercentLabel(bps: number): string;
+declare function hasFeeOverrideFlag(flags: number, bit: number): boolean;
+declare function buildFeeOverrideMask(flags: {
+  deposit?: boolean;
+  withdrawal?: boolean;
+  performance?: boolean;
+  management?: boolean;
+}): number;
+declare function formatFeeOverrideFlags(flags: number): string;
+declare function readUserFeeOverrideFields(account: Record<string, unknown>): UserFeeOverrideFields;
+declare function vaultFeeDecimalsToBps(fees: EffectiveVaultFeeDecimals): EffectiveFeeBps;
+declare function effectiveFeeBpsToDecimals(fees: EffectiveFeeBps): EffectiveVaultFeeDecimals;
+/**
+ * Apply per-user fee override flags onto default bps (bundle or vault-config defaults).
+ */
+declare function resolveEffectiveFeeBpsFromDefaults(defaults: EffectiveFeeBps, user: UserFeeOverrideFields): EffectiveFeeBps;
+/**
+ * Mirror on-chain `resolve_effective_fees`. Returns fee rates in bps.
+ */
+declare function resolveEffectiveFeeBps(bundle: BundleAccount, user: UserBundleAccount): EffectiveFeeBps;
+/**
+ * Resolve effective fees for UI vault config defaults + optional user bundle account.
+ * Returns decimal fees (`0.01` = 1%).
+ */
+declare function resolveEffectiveVaultFees(vaultDefaults: EffectiveVaultFeeDecimals, user?: UserBundleAccount | null): EffectiveVaultFeeDecimals;
+declare function hasAnyFeeOverride(user?: UserBundleAccount | null): boolean;
+declare function hasCustomFeeRate(effectiveFees: EffectiveVaultFeeDecimals, vaultDefaults: EffectiveVaultFeeDecimals): boolean;
+declare function computeDepositFeePreview(grossAmount: number, depositFeeDecimal: number): {
+  feeAmount: number;
+  netAmount: number;
+};
+//#endregion
 //#region src/utils/request-withdraw-shares.d.ts
 /**
  * Shares to burn for `requestWithdrawal`, from integer token raw and on-chain totals.
@@ -281,4 +363,4 @@ declare function derivePendingAuthPDA(bundlePDA: PublicKey, programId: PublicKey
  */
 declare function getVaultDepositorAddressSync(programId: PublicKey, vault: PublicKey, authority: PublicKey): PublicKey;
 //#endregion
-export { ALLOWLISTED_BUNDLE_PROGRAM_IDS_BY_CLUSTER, BUNDLE_PROGRAM_ID_V2_MAINNET, type BuildBundleDepositInstructionsParams, type BuildBundleRequestWithdrawInstructionParams, type BundleAccount, type BundleCluster, type BundleProgram, type BundleProvider, DEFAULT_BUNDLE_PROGRAM_ID_DEVNET, DEFAULT_BUNDLE_PROGRAM_ID_MAINNET, DevnetVaultId, NeutralTrade, type NeutralTradeConfig, type NeutralTradeCoreContext, type OracleData, SEED_ORACLE, SEED_PENDING_AUTH, SEED_TEMP, SEED_USER, SupportedChain, SupportedToken, type Token, type UserBalanceResult, type UserBundleAccount, type UserBundleTempData, type VaultBalanceData, VaultCategory, VaultId, type VaultRegistry, type VaultRegistryEntry, VaultType, assertAllowlistedBundleProgramId, buildBundleDepositInstructions, buildBundleRequestWithdrawInstruction, computeRequestWithdrawalSharesFromAmountRaw, createAllowlistedBundleProgram, createBundleProgramById, createDummyWallet, deriveOraclePDA, derivePendingAuthPDA, deriveTempDataPDA, deriveUserPDA, getBundleProgramId, getDefaultBundleProgramIdByCluster, getSolanaTokenDecimals, getSolanaTokenMint, getVaultByAddress, getVaultById, getVaultDepositorAddressSync, getVaultRegistry, humanFloatToAmountRawString, isAllowlistedBundleProgramId, isValidVaultAddress, parseAmountRawToBigInt, tokens, vaults, vaultsDevnet };
+export { ALLOWLISTED_BUNDLE_PROGRAM_IDS_BY_CLUSTER, BUNDLE_PROGRAM_ID_V2_MAINNET, type BuildBundleDepositInstructionsParams, type BuildBundleRequestWithdrawInstructionParams, type BundleAccount, type BundleCluster, type BundleProgram, type BundleProvider, DEFAULT_BUNDLE_PROGRAM_ID_DEVNET, DEFAULT_BUNDLE_PROGRAM_ID_MAINNET, DevnetVaultId, type EffectiveFeeBps, type EffectiveVaultFeeDecimals, FEE_OVERRIDE, NeutralTrade, type NeutralTradeConfig, type NeutralTradeCoreContext, type OracleData, SEED_ORACLE, SEED_PENDING_AUTH, SEED_TEMP, SEED_USER, SupportedChain, SupportedToken, type Token, type UserBalanceResult, type UserBundleAccount, type UserBundleTempData, type UserFeeOverrideFields, type VaultBalanceData, VaultCategory, VaultId, type VaultRegistry, type VaultRegistryEntry, VaultType, assertAllowlistedBundleProgramId, bpsToFeeDecimal, bpsToPercentLabel, buildBundleDepositInstructions, buildBundleRequestWithdrawInstruction, buildFeeOverrideMask, computeDepositFeePreview, computeRequestWithdrawalSharesFromAmountRaw, createAllowlistedBundleProgram, createBundleProgramById, createDummyWallet, deriveOraclePDA, derivePendingAuthPDA, deriveTempDataPDA, deriveUserPDA, effectiveFeeBpsToDecimals, estimatePendingBundleFeeToken, feeDecimalToBps, formatFeeOverrideFlags, getBundleProgramId, getDefaultBundleProgramIdByCluster, getSolanaTokenDecimals, getSolanaTokenMint, getVaultByAddress, getVaultById, getVaultDepositorAddressSync, getVaultRegistry, hasAnyFeeOverride, hasCustomFeeRate, hasFeeOverrideFlag, humanFloatToAmountRawString, isAllowlistedBundleProgramId, isValidVaultAddress, parseAmountRawToBigInt, readUserFeeOverrideFields, resolveEffectiveFeeBps, resolveEffectiveFeeBpsFromDefaults, resolveEffectiveVaultFees, tokens, vaultFeeDecimalsToBps, vaults$1 as vaults, vaultsDevnet };

package/dist/index.mjs

@@ -184,6 +184,131 @@ let DevnetVaultId = /* @__PURE__ */ function(DevnetVaultId$1) {
 	return DevnetVaultId$1;
 }({});
 
+//#endregion
+//#region src/utils/bundle-fee-override.ts
+/** Mirrors `bundle-sc` `FEE_OVERRIDE_*` bit flags. */
+const FEE_OVERRIDE = {
+	DEPOSIT: 1,
+	WITHDRAWAL: 2,
+	PERFORMANCE: 4,
+	MANAGEMENT: 8,
+	ALL: 15
+};
+const FEE_EPS = 1e-9;
+function bpsToFeeDecimal(bps) {
+	return bps / 1e4;
+}
+function feeDecimalToBps(decimal) {
+	return Math.round(decimal * 1e4);
+}
+function bpsToPercentLabel(bps) {
+	return (bps / 100).toFixed(4).replace(/\.?0+$/, "");
+}
+function hasFeeOverrideFlag(flags, bit) {
+	return (flags & bit) !== 0;
+}
+function buildFeeOverrideMask(flags) {
+	let mask = 0;
+	if (flags.deposit) mask |= FEE_OVERRIDE.DEPOSIT;
+	if (flags.withdrawal) mask |= FEE_OVERRIDE.WITHDRAWAL;
+	if (flags.performance) mask |= FEE_OVERRIDE.PERFORMANCE;
+	if (flags.management) mask |= FEE_OVERRIDE.MANAGEMENT;
+	return mask;
+}
+function formatFeeOverrideFlags(flags) {
+	const parts = [];
+	if (hasFeeOverrideFlag(flags, FEE_OVERRIDE.DEPOSIT)) parts.push("deposit");
+	if (hasFeeOverrideFlag(flags, FEE_OVERRIDE.WITHDRAWAL)) parts.push("withdrawal");
+	if (hasFeeOverrideFlag(flags, FEE_OVERRIDE.PERFORMANCE)) parts.push("performance");
+	if (hasFeeOverrideFlag(flags, FEE_OVERRIDE.MANAGEMENT)) parts.push("management");
+	return parts.length > 0 ? parts.join(", ") : "none";
+}
+function readUserFeeOverrideFields(account) {
+	return {
+		feeOverrideFlags: toNum(account.feeOverrideFlags ?? account.fee_override_flags),
+		customDepositFeeBps: toNum(account.customDepositFeeBps ?? account.custom_deposit_fee_bps),
+		customWithdrawalFeeBps: toNum(account.customWithdrawalFeeBps ?? account.custom_withdrawal_fee_bps),
+		customPerformanceFeeBps: toNum(account.customPerformanceFeeBps ?? account.custom_performance_fee_bps),
+		customManagementFeeBps: toNum(account.customManagementFeeBps ?? account.custom_management_fee_bps)
+	};
+}
+function toNum(value) {
+	if (typeof value === "number") return value;
+	if (typeof value === "bigint") return Number(value);
+	if (typeof value === "object" && value !== null && "toNumber" in value) return value.toNumber();
+	return Number(String(value ?? 0));
+}
+function bundleDefaultFeeBps(bundle) {
+	const b = bundle;
+	return {
+		depositFeeBps: toNum(b.depositFee),
+		withdrawalFeeBps: toNum(b.withdrawalFee),
+		performanceFeeBps: toNum(b.performanceFee),
+		managementFeeBps: toNum(b.managementFeeBps)
+	};
+}
+function vaultFeeDecimalsToBps(fees) {
+	return {
+		depositFeeBps: feeDecimalToBps(fees.dfee),
+		withdrawalFeeBps: feeDecimalToBps(fees.wfee),
+		performanceFeeBps: feeDecimalToBps(fees.pfee),
+		managementFeeBps: feeDecimalToBps(fees.mfee)
+	};
+}
+function effectiveFeeBpsToDecimals(fees) {
+	return {
+		dfee: bpsToFeeDecimal(fees.depositFeeBps),
+		wfee: bpsToFeeDecimal(fees.withdrawalFeeBps),
+		pfee: bpsToFeeDecimal(fees.performanceFeeBps),
+		mfee: bpsToFeeDecimal(fees.managementFeeBps)
+	};
+}
+/**
+* Apply per-user fee override flags onto default bps (bundle or vault-config defaults).
+*/
+function resolveEffectiveFeeBpsFromDefaults(defaults, user) {
+	const flags = toNum(user.feeOverrideFlags);
+	if (flags === 0) return defaults;
+	return {
+		depositFeeBps: (flags & FEE_OVERRIDE.DEPOSIT) !== 0 ? toNum(user.customDepositFeeBps) : defaults.depositFeeBps,
+		withdrawalFeeBps: (flags & FEE_OVERRIDE.WITHDRAWAL) !== 0 ? toNum(user.customWithdrawalFeeBps) : defaults.withdrawalFeeBps,
+		performanceFeeBps: (flags & FEE_OVERRIDE.PERFORMANCE) !== 0 ? toNum(user.customPerformanceFeeBps) : defaults.performanceFeeBps,
+		managementFeeBps: (flags & FEE_OVERRIDE.MANAGEMENT) !== 0 ? toNum(user.customManagementFeeBps) : defaults.managementFeeBps
+	};
+}
+/**
+* Mirror on-chain `resolve_effective_fees`. Returns fee rates in bps.
+*/
+function resolveEffectiveFeeBps(bundle, user) {
+	return resolveEffectiveFeeBpsFromDefaults(bundleDefaultFeeBps(bundle), user);
+}
+/**
+* Resolve effective fees for UI vault config defaults + optional user bundle account.
+* Returns decimal fees (`0.01` = 1%).
+*/
+function resolveEffectiveVaultFees(vaultDefaults, user) {
+	if (!user) return vaultDefaults;
+	return effectiveFeeBpsToDecimals(resolveEffectiveFeeBpsFromDefaults(vaultFeeDecimalsToBps(vaultDefaults), user));
+}
+function hasAnyFeeOverride(user) {
+	if (!user) return false;
+	return toNum(user.feeOverrideFlags) !== 0;
+}
+function hasCustomFeeRate(effectiveFees, vaultDefaults) {
+	return Math.abs(effectiveFees.dfee - vaultDefaults.dfee) > FEE_EPS || Math.abs(effectiveFees.wfee - vaultDefaults.wfee) > FEE_EPS || Math.abs(effectiveFees.pfee - vaultDefaults.pfee) > FEE_EPS || Math.abs(effectiveFees.mfee - vaultDefaults.mfee) > FEE_EPS;
+}
+function computeDepositFeePreview(grossAmount, depositFeeDecimal) {
+	if (grossAmount <= 0 || depositFeeDecimal <= 0) return {
+		feeAmount: 0,
+		netAmount: grossAmount
+	};
+	const feeAmount = grossAmount * depositFeeDecimal;
+	return {
+		feeAmount,
+		netAmount: grossAmount - feeAmount
+	};
+}
+
 //#endregion
 //#region src/utils/bundle.ts
 const SECONDS_PER_YEAR = 365n * 24n * 60n * 60n;
@@ -202,8 +327,9 @@ function estimatePendingBundleFeeToken({ oracleData, bundleData, userBundle, ass
 	const extra = bundleData;
 	const assetPrec = extra.assetPrecision != null ? BigInt(extra.assetPrecision.toString()) : BigInt(10 ** assetDecimals);
 	const sharePrice = totalShares > 0n ? totalAssets * assetPrec / totalShares : assetPrec;
-	const managementFeeBps = BigInt(Number(extra.managementFeeBps ?? 0));
-	const performanceFeeBps = BigInt(Number(extra.performanceFee ?? 0));
+	const effectiveFees = resolveEffectiveFeeBps(bundleData, userBundle);
+	const managementFeeBps = BigInt(effectiveFees.managementFeeBps);
+	const performanceFeeBps = BigInt(effectiveFees.performanceFeeBps);
 	const lastMgmtTs = bnToBigInt(userBundle.lastManagementFeeTimestamp);
 	const nowTs = BigInt(nowUnixSeconds);
 	let managementFeeShares = 0n;
@@ -406,4 +532,4 @@ var NeutralTrade = class NeutralTrade {
 };
 
 //#endregion
-export { ALLOWLISTED_BUNDLE_PROGRAM_IDS_BY_CLUSTER, BUNDLE_PROGRAM_ID_V2_MAINNET, DEFAULT_BUNDLE_PROGRAM_ID_DEVNET, DEFAULT_BUNDLE_PROGRAM_ID_MAINNET, DevnetVaultId, NeutralTrade, SEED_ORACLE, SEED_PENDING_AUTH, SEED_TEMP, SEED_USER, SupportedChain, SupportedToken, VaultCategory, VaultId, VaultType, assertAllowlistedBundleProgramId, buildBundleDepositInstructions, buildBundleRequestWithdrawInstruction, computeRequestWithdrawalSharesFromAmountRaw, createAllowlistedBundleProgram, createBundleProgramById, createDummyWallet, deriveOraclePDA, derivePendingAuthPDA, deriveTempDataPDA, deriveUserPDA, getBundleProgramId, getDefaultBundleProgramIdByCluster, getSolanaTokenDecimals, getSolanaTokenMint, getVaultByAddress, getVaultById, getVaultDepositorAddressSync, getVaultRegistry, humanFloatToAmountRawString, isAllowlistedBundleProgramId, isValidVaultAddress, parseAmountRawToBigInt, tokens, vaults, vaultsDevnet };
+export { ALLOWLISTED_BUNDLE_PROGRAM_IDS_BY_CLUSTER, BUNDLE_PROGRAM_ID_V2_MAINNET, DEFAULT_BUNDLE_PROGRAM_ID_DEVNET, DEFAULT_BUNDLE_PROGRAM_ID_MAINNET, DevnetVaultId, FEE_OVERRIDE, NeutralTrade, SEED_ORACLE, SEED_PENDING_AUTH, SEED_TEMP, SEED_USER, SupportedChain, SupportedToken, VaultCategory, VaultId, VaultType, assertAllowlistedBundleProgramId, bpsToFeeDecimal, bpsToPercentLabel, buildBundleDepositInstructions, buildBundleRequestWithdrawInstruction, buildFeeOverrideMask, computeDepositFeePreview, computeRequestWithdrawalSharesFromAmountRaw, createAllowlistedBundleProgram, createBundleProgramById, createDummyWallet, deriveOraclePDA, derivePendingAuthPDA, deriveTempDataPDA, deriveUserPDA, effectiveFeeBpsToDecimals, estimatePendingBundleFeeToken, feeDecimalToBps, formatFeeOverrideFlags, getBundleProgramId, getDefaultBundleProgramIdByCluster, getSolanaTokenDecimals, getSolanaTokenMint, getVaultByAddress, getVaultById, getVaultDepositorAddressSync, getVaultRegistry, hasAnyFeeOverride, hasCustomFeeRate, hasFeeOverrideFlag, humanFloatToAmountRawString, isAllowlistedBundleProgramId, isValidVaultAddress, parseAmountRawToBigInt, readUserFeeOverrideFields, resolveEffectiveFeeBps, resolveEffectiveFeeBpsFromDefaults, resolveEffectiveVaultFees, tokens, vaultFeeDecimalsToBps, vaults, vaultsDevnet };

package/package.json

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