@elemental-stv-core/sdk 0.9.3 → 0.12.0

package/dist/jlpd-strategy/swap-jlp.js

@@ -23,6 +23,7 @@ const constants_2 = require("../p-stv-core/constants");
 const pda_3 = require("../elemental-lend/pda");
 const jupiter_lend_1 = require("../elemental-lend/jupiter-lend");
 const instructions_2 = require("../elemental-lend/instructions");
+const accounts_3 = require("../elemental-lend/accounts");
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
@@ -33,7 +34,7 @@ const JUPITER_API_BASE = "https://api.jup.ag/swap/v1";
  * limits. Read once instead of per-call so the env var is consistent across
  * the lifetime of the process.
  */
-const JUPITER_API_KEY = process.env.NEXT_PUBLIC_JUPITER_API_KEY;
+const JUPITER_API_KEY = process.env.NEXT_PUBLIC_JUPITER_API_KEY ?? process.env.JUPITER_API_KEY;
 function toBigInt(v) {
     if (typeof v === "bigint")
         return v;
@@ -53,7 +54,7 @@ function toBigInt(v) {
  *    4-byte jupiter_data_len (LE), ...jupiter_data_bytes]
  */
 function createSwapJlpIx(args, programId = constants_1.PROGRAM_ID) {
-    const { manager, config, managerRole, strategyState, strategyBaseAta, strategyJlpAta, vaultJlpAta, baseMint, jlpMint, tokenProgram, jupiterProgram, direction, amount, minOut, jupiterData, remainingAccounts = [], } = args;
+    const { manager, config, managerRole, strategyState, strategyBaseAta, strategyJlpAta, vaultJlpAta, baseMint, jlpMint, tokenProgram, jupiterProgram, priceOracle, jlpPool, jlpMintAccount, direction, amount, minOut, jupiterData, remainingAccounts = [], } = args;
     const amountBi = toBigInt(amount);
     const minOutBi = toBigInt(minOut);
     // Serialize instruction data
@@ -83,11 +84,22 @@ function createSwapJlpIx(args, programId = constants_1.PROGRAM_ID) {
         { pubkey: jlpMint, isSigner: false, isWritable: false },
         { pubkey: tokenProgram, isSigner: false, isWritable: false },
         { pubkey: jupiterProgram, isSigner: false, isWritable: false },
+        { pubkey: priceOracle, isSigner: false, isWritable: false },
+        { pubkey: jlpPool, isSigner: false, isWritable: false },
+        { pubkey: jlpMintAccount, isSigner: false, isWritable: false },
         ...remainingAccounts,
     ];
     return new web3_js_1.TransactionInstruction({ keys, programId, data });
 }
 // ---------------------------------------------------------------------------
+// Stable-asset detection
+// ---------------------------------------------------------------------------
+/** Mints that use a hardcoded $1 price on-chain (oracle account ignored). */
+const STABLE_MINTS = new Set(constants_1.JLPD_POOLS.filter((p) => p.name === "USDC" || p.name === "JupUSD").map((p) => p.mint));
+function isStableMint(mint) {
+    return STABLE_MINTS.has(mint.toBase58());
+}
+// ---------------------------------------------------------------------------
 // Jupiter API helpers
 // ---------------------------------------------------------------------------
 /**
@@ -123,9 +135,13 @@ async function getJupiterSwapQuote(args) {
  *
  * @param quoteResponse The quote from getJupiterSwapQuote
  * @param userPublicKey The account that signs the swap -- for JLPD this is the strategy_state PDA
+ * @param destinationTokenAccount Optional override for the destination token account.
+ *   For base_to_base_swap: must be base_out_ata (ATA owned by strategy_state_OUT) so
+ *   Jupiter routes output tokens there instead of to userPublicKey's default ATA.
+ *   For swap_jlp: omit — Jupiter defaults destination to userPublicKey's ATA which is correct.
  */
 async function getJupiterSwapInstructions(args) {
-    const { quoteResponse, userPublicKey } = args;
+    const { quoteResponse, userPublicKey, destinationTokenAccount } = args;
     const url = `${JUPITER_API_BASE}/swap-instructions`;
     const body = {
         quoteResponse,
@@ -134,6 +150,9 @@ async function getJupiterSwapInstructions(args) {
         dynamicComputeUnitLimit: true,
         skipUserAccountsRpcCalls: true,
     };
+    if (destinationTokenAccount !== undefined) {
+        body["destinationTokenAccount"] = destinationTokenAccount.toBase58();
+    }
     const headers = {
         "Content-Type": "application/json",
     };
@@ -214,22 +233,53 @@ async function buildSwapJlpTransaction(args) {
     const strategyBaseAta = (0, ata_1.findAta)(baseMint, strategyState, tokenProgram);
     const strategyJlpAta = (0, ata_1.findAta)(jlpMint, strategyState, tokenProgram);
     const vaultJlpAta = (0, ata_1.findAta)(jlpMint, config, tokenProgram);
-    // 2. Determine input/output mints for the Jupiter quote
+    // 2. Resolve oracle + pending swap_arb. Fetch the strategy state once if we need
+    //    the stored price_oracle (volatile asset, no override) OR swap_arb (BaseToJlp).
+    const needOracleFetch = !isStableMint(baseMint) && args.priceOracle === undefined;
+    const needArb = direction === "BaseToJlp";
+    const state = needOracleFetch || needArb
+        ? await (0, accounts_1.fetchJlpStrategyState)(connection, baseMint, programId)
+        : null;
+    let priceOracle;
+    if (isStableMint(baseMint)) {
+        priceOracle = web3_js_1.PublicKey.default;
+    }
+    else if (args.priceOracle !== undefined) {
+        priceOracle = args.priceOracle;
+    }
+    else {
+        priceOracle = state.priceOracle;
+    }
+    // 3. BaseToJlp folds pending swap_arb into the Jupiter input:
+    //    total_in = amount + swap_arb (signed; an unfavorable b2b banked a negative
+    //    deficit that reduces it). The on-chain handler pins base-spent == total_in,
+    //    so the Jupiter route MUST be quoted for total_in. The instruction `amount`
+    //    stays = principal (the program credits base_loaned with principal only).
+    let quoteAmount = amount;
+    if (direction === "BaseToJlp" && state) {
+        const arb = BigInt(state.swapArb.toString()); // signed i64
+        const totalIn = amount + arb;
+        if (totalIn <= 0n) {
+            throw new Error(`swap_arb deficit (${arb}) cancels principal (${amount}); cannot Base->JLP — wait for a settle or larger amount.`);
+        }
+        quoteAmount = totalIn;
+    }
+    // 4. Determine input/output mints for the Jupiter quote
     const inputMint = direction === "BaseToJlp" ? baseMint : jlpMint;
     const outputMint = direction === "BaseToJlp" ? jlpMint : baseMint;
-    // 3. Get Jupiter quote
+    // 5. Get Jupiter quote (for total_in on BaseToJlp; principal otherwise)
     const quote = await getJupiterSwapQuote({
         inputMint,
         outputMint,
-        amount,
+        amount: quoteAmount,
         slippageBps,
     });
-    // 4. Get Jupiter swap instructions (strategy_state PDA signs via CPI)
+    // 5. Get Jupiter swap instructions (strategy_state PDA signs via CPI)
     const jupSwap = await getJupiterSwapInstructions({
         quoteResponse: quote,
         userPublicKey: strategyState,
     });
-    // 5. Build the swap_jlp instruction
+    // 6. Build the swap_jlp instruction
     const minOut = BigInt(quote.otherAmountThreshold);
     const swapJlpIx = createSwapJlpIx({
         manager,
@@ -243,13 +293,16 @@ async function buildSwapJlpTransaction(args) {
         jlpMint,
         tokenProgram,
         jupiterProgram: constants_1.JUPITER_PROGRAM,
+        priceOracle,
+        jlpPool: constants_1.JLP_POOL_ACCOUNT,
+        jlpMintAccount: jlpMint,
         direction,
         amount,
         minOut,
         jupiterData: jupSwap.swapInstructionData,
         remainingAccounts: jupSwap.remainingAccounts,
     }, programId);
-    // 6. Fetch ALTs
+    // 7. Fetch ALTs
     const addressLookupTables = await fetchAddressLookupTables(connection, jupSwap.addressLookupTableAddresses);
     return {
         instructions: [swapJlpIx],
@@ -401,8 +454,12 @@ async function buildJlpToBaseRebalance(args) {
     const [jlpdStvPosition] = (0, pda_1.findStvPositionPda)(stvAddress, programId);
     const strategyBaseAta = (0, ata_1.findAta)(baseMint, strategyState, tokenProgram);
     const vaultAta = (0, ata_1.findAta)(baseMint, stvAddress, tokenProgram);
-    // Build lend remaining_accounts for auto-sweep after withdraw
+    // Build lend remaining_accounts for auto-sweep after withdraw:
+    //   [4 fixed lend, protocolAumCount protocol-AUM accounts]
+    // The protocol-AUM accounts feed the pre-sweep update_aum refresh; on-chain lend
+    // rejects an incomplete tail, so we must cover the strategy's full protocol set.
     const lendAccounts = [];
+    let lendProtocolAumCount = 0;
     const DEFAULT_PUBKEY = web3_js_1.PublicKey.default;
     if (!stv.lendProgram.equals(DEFAULT_PUBKEY)) {
         const [lendStrategyState] = (0, pda_3.findStrategyStatePda)(baseMint, stv.lendProgram);
@@ -414,6 +471,12 @@ async function buildJlpToBaseRebalance(args) {
             lendStvPosition: lendPosition,
             lendBaseAta,
         }));
+        const lendState = await (0, accounts_3.fetchLendStrategyState)(connection, baseMint, stv.lendProgram).catch(() => null);
+        if (lendState) {
+            const protocolAumAccounts = await (0, accounts_3.buildProtocolAccountsForAum)(connection, lendState, lendStrategyState, tokenProgram);
+            lendProtocolAumCount = protocolAumAccounts.length;
+            lendAccounts.push(...protocolAumAccounts);
+        }
     }
     const [configPda] = (0, pda_2.findConfigPda)(pStvProgramId);
     const withdrawIx = (0, instructions_1.createWithdrawFromStrategyIx)({
@@ -429,6 +492,7 @@ async function buildJlpToBaseRebalance(args) {
         strategyBaseAta,
         tokenProgram,
         shares: new bn_js_1.default(sharesToWithdraw.toString()),
+        protocolAumCount: lendProtocolAumCount,
         remainingAccounts: lendAccounts,
     }, pStvProgramId);
     // Build Jupiter Lend deposit instruction to route funds from Elemental Lend → Jupiter Lend.

package/dist/jlpd-strategy/types.d.ts

@@ -22,9 +22,11 @@ export interface ManagerRole {
     manager: PublicKey;
     bump: number;
 }
-/** JLP StrategyState (160 bytes) — extends standard 104-byte header */
+/** JLP StrategyState (224 bytes) — extends standard 104-byte header */
 export interface JlpStrategyState extends StrategyStateHeader {
     baseLoaned: BN;
+    swapArb: BN;
+    priceOracle: PublicKey;
 }
 export type { StvPosition } from "../common/strategy-interface";
 export interface ConfigInitializedEvent {

package/dist/p-stv-core/accounts.d.ts

@@ -1,7 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import BN from "bn.js";
 import type { SolanaConnection } from "../common/connection";
-import { GlobalConfig, Stv, WithdrawRequest, ManagerRole } from "./types";
+import { GlobalConfig, Stv, WithdrawRequest, DelayedDepositRequest, ManagerRole } from "./types";
 /**
  * GlobalConfig — singleton protocol registry. Total 56 bytes.
  *
@@ -18,39 +18,51 @@ export declare function deserializeGlobalConfig(data: Buffer): GlobalConfig;
 /**
  * STV — per-vault state. Total 664 bytes (v2 layout).
  *
- * Layout (offsets include the 8-byte discriminator):
+ * v2 layout (offsets include the 8-byte Anchor-compatible discriminator).
+ * All compile-time asserts in p-stv-core/programs/p-stv-core/src/state/stv.rs
+ * are the canonical source of truth; offsets here are copied from those asserts.
+ *
  *   [  0..  8]  discriminator                (sha256("account:Stv")[..8])
- *   [  8.. 40]  baseMint                      Pubkey
- *   [ 40.. 72]  evMint                        Pubkey
- *   [ 72..104]  strategy                      Pubkey   (immutable strategy program)
- *   [104..136]  feeReceiver                   Pubkey
- *   [136..168]  lendProgram                   Pubkey   (zero pubkey if lend not opted-in)
- *   [168..200]  vaultAta                      Pubkey   (canonical ATA for stv_pda+base_mint+token_program)
- *   [200..248]  childVaults[6]                [u64; 6]  (allocator child vault IDs)
- *   [248..256]  vaultId                       u64
- *   [256..264]  reservedBase                  u64      (base reserved for pending claims)
- *   [264..272]  requestedShares               u64      (shares pending in escrow — multiply × PPS to estimate base)
- *   [272..280]  vaultCapacity                 u64      (0 = uncapped)
- *   [280..288]  minDeposit                    u64
- *   [288..296]  hwm                           u64      (high-water mark for perf fees)
- *   [296..304]  lastFeeTs                     u64      (last fee crystallization timestamp)
- *   [304..312]  epochPps                      u64      (locked PPS for current epoch claims)
- *   [312..320]  lastNav                       u64      (snapshot for the rate-limit window)
- *   [320..328]  dailyWithdrawnBase            u64      (rate-limit accumulator)
- *   [328..332]  nextEpochTs                   u32
- *   [332..336]  epochSec                      u32
- *   [336..340]  currentEpochId                u32
- *   [340..344]  pendingWithdrawals            u32
- *   [344..348]  withdrawWindowStart           u32
- *   [348..350]  mgmtFeeBps                    u16
- *   [350..352]  perfFeeBps                    u16
- *   [352..354]  flags                         u16      (FLAG_PAUSED / DEPOSITS_DISABLED / …)
- *   [354..356]  dailyWithdrawLimitBps         u16
- *   [356..357]  childVaultCount               u8
- *   [357..358]  version                       u8
- *   [358..359]  bump                          u8
- *   [359..360]  _padding                      [u8; 1]
- *   [360..664]  _reserved                     [u8; 304]
+ *   [  8.. 40]  baseMint                      Pubkey   (_OFFSET_BASE_MINT == 8)
+ *   [ 40.. 72]  evMint                        Pubkey   (_OFFSET_EV_MINT == 40)
+ *   [ 72..104]  strategy                      Pubkey   (_OFFSET_STRATEGY == 72; immutable)
+ *   [104..136]  feeReceiver                   Pubkey   (_OFFSET_FEE_RECEIVER == 104)
+ *   [136..168]  lendProgram                   Pubkey   (_OFFSET_LEND_PROGRAM == 136; zero = inactive)
+ *   [168..200]  vaultAta                      Pubkey   (_OFFSET_VAULT_ATA == 168; canonical ATA)
+ *   [200..232]  admin                         Pubkey   (_OFFSET_ADMIN == 200; per-vault admin, never zero on v2)
+ *   [232..264]  pendingAdmin                  Pubkey   (_OFFSET_PENDING_ADMIN == 232; zero = no rotation in progress)
+ *   [264..296]  childVaults[4]                [u64; 4] (_OFFSET_CHILD_VAULTS == 264; MAX_CHILD_VAULTS = 4)
+ *   [296..304]  vaultId                       u64      (_OFFSET_VAULT_ID == 296)
+ *   [304..312]  reservedBase                  u64
+ *   [312..320]  requestedShares               u64      (shares pending in escrow)
+ *   [320..328]  vaultCapacity                 u64      (0 = uncapped)
+ *   [328..336]  minDeposit                    u64
+ *   [336..344]  hwm                           u64      (high-water mark for perf fees)
+ *   [344..352]  lastFeeTs                     u64
+ *   [352..360]  epochPps                      u64      (locked PPS for current epoch claims)
+ *   [360..368]  lastNav                       u64      (snapshot for rate-limit window)
+ *   [368..376]  dailyWithdrawnBase            u64      (rate-limit accumulator)
+ *   [376..380]  nextEpochTs                   u32
+ *   [380..384]  epochSec                      u32
+ *   [384..388]  currentEpochId                u32
+ *   [388..392]  pendingWithdrawals            u32
+ *   [392..396]  withdrawWindowStart           u32
+ *   [396..398]  mgmtFeeBps                    u16
+ *   [398..400]  perfFeeBps                    u16
+ *   [400..402]  flags                         u16
+ *   [402..404]  dailyWithdrawLimitBps         u16
+ *   [404..405]  childVaultCount               u8
+ *   [405..406]  version                       u8       (== 2 for v2 accounts)
+ *   [406..407]  bump                          u8
+ *   [407..408]  _padding                      [u8; 1]
+ *   [408..410]  depositFeeBps                 u16      (_OFFSET_DEPOSIT_FEE_BPS == 408)
+ *   [410..412]  withdrawalFeeBps              u16      (_OFFSET_WITHDRAWAL_FEE_BPS == 410)
+ *   [412..416]  pendingDepositCount           u32      (_OFFSET_PENDING_DEPOSIT_COUNT == 412)
+ *   [416..424]  pendingDepositBase            u64      (_OFFSET_PENDING_DEPOSIT_BASE == 416)
+ *   [424..456]  feeReceiverEvAta              Pubkey   (_OFFSET_FEE_RECEIVER_EV_ATA == 424)
+ *   [456..464]  lockedSeedShares              u64      (_OFFSET_LOCKED_SEED_SHARES == 456)
+ *   [464..465]  withdrawalMode                u8       (_OFFSET_WITHDRAWAL_MODE == 464; 0=instant, 1=X, 2=X+1)
+ *   [465..664]  _reserved                     [u8; 199] (_OFFSET_RESERVED == 465)
  */
 export declare function deserializeStv(data: Buffer): Stv;
 /**
@@ -65,9 +77,34 @@ export declare function deserializeStv(data: Buffer): Stv;
  *   [ 88.. 92]  epochId                  u32
  *   [ 92.. 96]  claimAvailableAfter      u32   (unix seconds)
  *   [ 96.. 97]  bump                     u8
- *   [ 97..168]  _reserved                [u8; 71]
+ *   [ 97.. 98]  version                  u8
+ *   [ 98.. 99]  requestFlags             u8   (bit0 WR_FLAG_MIGRATE: 0=withdraw, 1=migrate)
+ *   [ 99..104]  _padding                 [u8; 5]
+ *   [104..112]  destVaultId              u64  (migrate: dest STV vault_id; withdraw: 0)
+ *   [112..120]  minDestShares            u64  (migrate: slippage floor; withdraw: 0)
+ *   [120..168]  _reserved0               [u8; 48]
  */
 export declare function deserializeWithdrawRequest(data: Buffer): WithdrawRequest;
+/**
+ * WithdrawRequest kind from `requestFlags` bit 0.
+ * Returns `"migrate"` when WR_FLAG_MIGRATE (0x01) is set, else `"withdraw"`.
+ */
+export declare function withdrawRequestKind(wr: WithdrawRequest): "withdraw" | "migrate";
+/**
+ * DelayedDepositRequest — per-(STV, user, epoch) pending deposit. Total 152 bytes.
+ *
+ * Layout (offsets include the 8-byte discriminator):
+ *   [  0..  8]  discriminator           (sha256("account:DelayedDepositRequest")[..8])
+ *   [  8.. 40]  stv                      Pubkey
+ *   [ 40.. 72]  user                     Pubkey
+ *   [ 72.. 80]  amount                   u64
+ *   [ 80.. 84]  epochId                  u32   (offset_of == 80, asserted on-chain)
+ *   [ 84.. 85]  bump                     u8
+ *   [ 85.. 86]  version                  u8
+ *   [ 86.. 88]  _padding                 [u8; 2]
+ *   [ 88..152]  _reserved                [u8; 64]
+ */
+export declare function deserializeDelayedDepositRequest(data: Buffer): DelayedDepositRequest;
 /**
  * ManagerRole — per-(STV, manager) authorization record. Total 80 bytes.
  *
@@ -85,7 +122,10 @@ export declare function fetchStv(connection: SolanaConnection, vaultId: number |
 export declare function fetchStvByAddress(connection: SolanaConnection, address: PublicKey): Promise<Stv>;
 export declare function fetchWithdrawRequest(connection: SolanaConnection, stv: PublicKey, user: PublicKey, epochId: number, programId?: PublicKey): Promise<WithdrawRequest>;
 export declare function fetchWithdrawRequestByAddress(connection: SolanaConnection, address: PublicKey): Promise<WithdrawRequest>;
+export declare function fetchDelayedDepositRequest(connection: SolanaConnection, stv: PublicKey, user: PublicKey, epochId: number, programId?: PublicKey): Promise<DelayedDepositRequest>;
+export declare function fetchDelayedDepositRequestByAddress(connection: SolanaConnection, address: PublicKey): Promise<DelayedDepositRequest>;
 export declare function fetchAllStvs(connection: SolanaConnection, programId?: PublicKey): Promise<[PublicKey, Stv][]>;
 export declare function fetchPendingWithdrawRequests(connection: SolanaConnection, stv: PublicKey, epochId: number, programId?: PublicKey): Promise<[PublicKey, WithdrawRequest][]>;
+export declare function fetchPendingDelayedDepositRequests(connection: SolanaConnection, stv: PublicKey, epochId: number, programId?: PublicKey): Promise<[PublicKey, DelayedDepositRequest][]>;
 export declare function fetchManagerRole(connection: SolanaConnection, stv: PublicKey, manager: PublicKey, programId?: PublicKey): Promise<ManagerRole | null>;
 export declare function fetchManagersForStv(connection: SolanaConnection, stv: PublicKey, programId?: PublicKey): Promise<[PublicKey, ManagerRole][]>;

package/dist/p-stv-core/accounts.js

@@ -3,14 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deserializeGlobalConfig = deserializeGlobalConfig;
 exports.deserializeStv = deserializeStv;
 exports.deserializeWithdrawRequest = deserializeWithdrawRequest;
+exports.withdrawRequestKind = withdrawRequestKind;
+exports.deserializeDelayedDepositRequest = deserializeDelayedDepositRequest;
 exports.deserializeManagerRole = deserializeManagerRole;
 exports.fetchGlobalConfig = fetchGlobalConfig;
 exports.fetchStv = fetchStv;
 exports.fetchStvByAddress = fetchStvByAddress;
 exports.fetchWithdrawRequest = fetchWithdrawRequest;
 exports.fetchWithdrawRequestByAddress = fetchWithdrawRequestByAddress;
+exports.fetchDelayedDepositRequest = fetchDelayedDepositRequest;
+exports.fetchDelayedDepositRequestByAddress = fetchDelayedDepositRequestByAddress;
 exports.fetchAllStvs = fetchAllStvs;
 exports.fetchPendingWithdrawRequests = fetchPendingWithdrawRequests;
+exports.fetchPendingDelayedDepositRequests = fetchPendingDelayedDepositRequests;
 exports.fetchManagerRole = fetchManagerRole;
 exports.fetchManagersForStv = fetchManagersForStv;
 const buffer_1 = require("../common/buffer");
@@ -56,39 +61,51 @@ function deserializeGlobalConfig(data) {
 /**
  * STV — per-vault state. Total 664 bytes (v2 layout).
  *
- * Layout (offsets include the 8-byte discriminator):
+ * v2 layout (offsets include the 8-byte Anchor-compatible discriminator).
+ * All compile-time asserts in p-stv-core/programs/p-stv-core/src/state/stv.rs
+ * are the canonical source of truth; offsets here are copied from those asserts.
+ *
  *   [  0..  8]  discriminator                (sha256("account:Stv")[..8])
- *   [  8.. 40]  baseMint                      Pubkey
- *   [ 40.. 72]  evMint                        Pubkey
- *   [ 72..104]  strategy                      Pubkey   (immutable strategy program)
- *   [104..136]  feeReceiver                   Pubkey
- *   [136..168]  lendProgram                   Pubkey   (zero pubkey if lend not opted-in)
- *   [168..200]  vaultAta                      Pubkey   (canonical ATA for stv_pda+base_mint+token_program)
- *   [200..248]  childVaults[6]                [u64; 6]  (allocator child vault IDs)
- *   [248..256]  vaultId                       u64
- *   [256..264]  reservedBase                  u64      (base reserved for pending claims)
- *   [264..272]  requestedShares               u64      (shares pending in escrow — multiply × PPS to estimate base)
- *   [272..280]  vaultCapacity                 u64      (0 = uncapped)
- *   [280..288]  minDeposit                    u64
- *   [288..296]  hwm                           u64      (high-water mark for perf fees)
- *   [296..304]  lastFeeTs                     u64      (last fee crystallization timestamp)
- *   [304..312]  epochPps                      u64      (locked PPS for current epoch claims)
- *   [312..320]  lastNav                       u64      (snapshot for the rate-limit window)
- *   [320..328]  dailyWithdrawnBase            u64      (rate-limit accumulator)
- *   [328..332]  nextEpochTs                   u32
- *   [332..336]  epochSec                      u32
- *   [336..340]  currentEpochId                u32
- *   [340..344]  pendingWithdrawals            u32
- *   [344..348]  withdrawWindowStart           u32
- *   [348..350]  mgmtFeeBps                    u16
- *   [350..352]  perfFeeBps                    u16
- *   [352..354]  flags                         u16      (FLAG_PAUSED / DEPOSITS_DISABLED / …)
- *   [354..356]  dailyWithdrawLimitBps         u16
- *   [356..357]  childVaultCount               u8
- *   [357..358]  version                       u8
- *   [358..359]  bump                          u8
- *   [359..360]  _padding                      [u8; 1]
- *   [360..664]  _reserved                     [u8; 304]
+ *   [  8.. 40]  baseMint                      Pubkey   (_OFFSET_BASE_MINT == 8)
+ *   [ 40.. 72]  evMint                        Pubkey   (_OFFSET_EV_MINT == 40)
+ *   [ 72..104]  strategy                      Pubkey   (_OFFSET_STRATEGY == 72; immutable)
+ *   [104..136]  feeReceiver                   Pubkey   (_OFFSET_FEE_RECEIVER == 104)
+ *   [136..168]  lendProgram                   Pubkey   (_OFFSET_LEND_PROGRAM == 136; zero = inactive)
+ *   [168..200]  vaultAta                      Pubkey   (_OFFSET_VAULT_ATA == 168; canonical ATA)
+ *   [200..232]  admin                         Pubkey   (_OFFSET_ADMIN == 200; per-vault admin, never zero on v2)
+ *   [232..264]  pendingAdmin                  Pubkey   (_OFFSET_PENDING_ADMIN == 232; zero = no rotation in progress)
+ *   [264..296]  childVaults[4]                [u64; 4] (_OFFSET_CHILD_VAULTS == 264; MAX_CHILD_VAULTS = 4)
+ *   [296..304]  vaultId                       u64      (_OFFSET_VAULT_ID == 296)
+ *   [304..312]  reservedBase                  u64
+ *   [312..320]  requestedShares               u64      (shares pending in escrow)
+ *   [320..328]  vaultCapacity                 u64      (0 = uncapped)
+ *   [328..336]  minDeposit                    u64
+ *   [336..344]  hwm                           u64      (high-water mark for perf fees)
+ *   [344..352]  lastFeeTs                     u64
+ *   [352..360]  epochPps                      u64      (locked PPS for current epoch claims)
+ *   [360..368]  lastNav                       u64      (snapshot for rate-limit window)
+ *   [368..376]  dailyWithdrawnBase            u64      (rate-limit accumulator)
+ *   [376..380]  nextEpochTs                   u32
+ *   [380..384]  epochSec                      u32
+ *   [384..388]  currentEpochId                u32
+ *   [388..392]  pendingWithdrawals            u32
+ *   [392..396]  withdrawWindowStart           u32
+ *   [396..398]  mgmtFeeBps                    u16
+ *   [398..400]  perfFeeBps                    u16
+ *   [400..402]  flags                         u16
+ *   [402..404]  dailyWithdrawLimitBps         u16
+ *   [404..405]  childVaultCount               u8
+ *   [405..406]  version                       u8       (== 2 for v2 accounts)
+ *   [406..407]  bump                          u8
+ *   [407..408]  _padding                      [u8; 1]
+ *   [408..410]  depositFeeBps                 u16      (_OFFSET_DEPOSIT_FEE_BPS == 408)
+ *   [410..412]  withdrawalFeeBps              u16      (_OFFSET_WITHDRAWAL_FEE_BPS == 410)
+ *   [412..416]  pendingDepositCount           u32      (_OFFSET_PENDING_DEPOSIT_COUNT == 412)
+ *   [416..424]  pendingDepositBase            u64      (_OFFSET_PENDING_DEPOSIT_BASE == 416)
+ *   [424..456]  feeReceiverEvAta              Pubkey   (_OFFSET_FEE_RECEIVER_EV_ATA == 424)
+ *   [456..464]  lockedSeedShares              u64      (_OFFSET_LOCKED_SEED_SHARES == 456)
+ *   [464..465]  withdrawalMode                u8       (_OFFSET_WITHDRAWAL_MODE == 464; 0=instant, 1=X, 2=X+1)
+ *   [465..664]  _reserved                     [u8; 199] (_OFFSET_RESERVED == 465)
  */
 function deserializeStv(data) {
     if (data.length < constants_1.STV_SIZE) {
@@ -98,9 +115,18 @@ function deserializeStv(data) {
     if (!disc.equals(constants_1.DISC_STV)) {
         throw new Error(`Invalid Stv discriminator`);
     }
+    // v2 freeze gate: version must be 2 AND admin must be nonzero.
+    // (mirrors the combined gate in Stv::from_account in stv.rs)
+    const version = (0, buffer_1.readU8)(data, 405);
+    const adminBytes = data.subarray(200, 232);
+    const adminIsZero = adminBytes.every((b) => b === 0);
+    if (version !== 2 || adminIsZero) {
+        throw new Error(`Stv account is not v2-migrated: version=${version}, admin=${adminIsZero ? "zero" : "nonzero"}`);
+    }
+    // childVaults: [u64; 4] at offset 264, MAX_CHILD_VAULTS = 4
     const childVaults = [];
     for (let i = 0; i < constants_1.MAX_STRATEGIES; i++) {
-        childVaults.push((0, buffer_1.readU64)(data, 200 + i * 8));
+        childVaults.push((0, buffer_1.readU64)(data, 264 + i * 8));
     }
     return {
         baseMint: (0, buffer_1.readPubkey)(data, 8),
@@ -109,29 +135,38 @@ function deserializeStv(data) {
         feeReceiver: (0, buffer_1.readPubkey)(data, 104),
         lendProgram: (0, buffer_1.readPubkey)(data, 136),
         vaultAta: (0, buffer_1.readPubkey)(data, 168),
+        admin: (0, buffer_1.readPubkey)(data, 200),
+        pendingAdmin: (0, buffer_1.readPubkey)(data, 232),
         childVaults,
-        vaultId: (0, buffer_1.readU64)(data, 248),
-        reservedBase: (0, buffer_1.readU64)(data, 256),
-        requestedShares: (0, buffer_1.readU64)(data, 264),
-        vaultCapacity: (0, buffer_1.readU64)(data, 272),
-        minDeposit: (0, buffer_1.readU64)(data, 280),
-        hwm: (0, buffer_1.readU64)(data, 288),
-        lastFeeTs: (0, buffer_1.readU64)(data, 296),
-        epochPps: (0, buffer_1.readU64)(data, 304),
-        lastNav: (0, buffer_1.readU64)(data, 312),
-        dailyWithdrawnBase: (0, buffer_1.readU64)(data, 320),
-        nextEpochTs: (0, buffer_1.readU32)(data, 328),
-        epochSec: (0, buffer_1.readU32)(data, 332),
-        currentEpochId: (0, buffer_1.readU32)(data, 336),
-        pendingWithdrawals: (0, buffer_1.readU32)(data, 340),
-        withdrawWindowStart: (0, buffer_1.readU32)(data, 344),
-        mgmtFeeBps: (0, buffer_1.readU16)(data, 348),
-        perfFeeBps: (0, buffer_1.readU16)(data, 350),
-        flags: (0, buffer_1.readU16)(data, 352),
-        dailyWithdrawLimitBps: (0, buffer_1.readU16)(data, 354),
-        childVaultCount: (0, buffer_1.readU8)(data, 356),
-        version: (0, buffer_1.readU8)(data, 357),
-        bump: (0, buffer_1.readU8)(data, 358),
+        vaultId: (0, buffer_1.readU64)(data, 296),
+        reservedBase: (0, buffer_1.readU64)(data, 304),
+        requestedShares: (0, buffer_1.readU64)(data, 312),
+        vaultCapacity: (0, buffer_1.readU64)(data, 320),
+        minDeposit: (0, buffer_1.readU64)(data, 328),
+        hwm: (0, buffer_1.readU64)(data, 336),
+        lastFeeTs: (0, buffer_1.readU64)(data, 344),
+        epochPps: (0, buffer_1.readU64)(data, 352),
+        lastNav: (0, buffer_1.readU64)(data, 360),
+        dailyWithdrawnBase: (0, buffer_1.readU64)(data, 368),
+        nextEpochTs: (0, buffer_1.readU32)(data, 376),
+        epochSec: (0, buffer_1.readU32)(data, 380),
+        currentEpochId: (0, buffer_1.readU32)(data, 384),
+        pendingWithdrawals: (0, buffer_1.readU32)(data, 388),
+        withdrawWindowStart: (0, buffer_1.readU32)(data, 392),
+        mgmtFeeBps: (0, buffer_1.readU16)(data, 396),
+        perfFeeBps: (0, buffer_1.readU16)(data, 398),
+        flags: (0, buffer_1.readU16)(data, 400),
+        dailyWithdrawLimitBps: (0, buffer_1.readU16)(data, 402),
+        childVaultCount: (0, buffer_1.readU8)(data, 404),
+        version,
+        bump: (0, buffer_1.readU8)(data, 406),
+        depositFeeBps: (0, buffer_1.readU16)(data, 408),
+        withdrawalFeeBps: (0, buffer_1.readU16)(data, 410),
+        pendingDepositCount: (0, buffer_1.readU32)(data, 412),
+        pendingDepositBase: (0, buffer_1.readU64)(data, 416),
+        feeReceiverEvAta: (0, buffer_1.readPubkey)(data, 424),
+        lockedSeedShares: (0, buffer_1.readU64)(data, 456),
+        withdrawalMode: (0, buffer_1.readU8)(data, 464),
     };
 }
 /**
@@ -146,7 +181,12 @@ function deserializeStv(data) {
  *   [ 88.. 92]  epochId                  u32
  *   [ 92.. 96]  claimAvailableAfter      u32   (unix seconds)
  *   [ 96.. 97]  bump                     u8
- *   [ 97..168]  _reserved                [u8; 71]
+ *   [ 97.. 98]  version                  u8
+ *   [ 98.. 99]  requestFlags             u8   (bit0 WR_FLAG_MIGRATE: 0=withdraw, 1=migrate)
+ *   [ 99..104]  _padding                 [u8; 5]
+ *   [104..112]  destVaultId              u64  (migrate: dest STV vault_id; withdraw: 0)
+ *   [112..120]  minDestShares            u64  (migrate: slippage floor; withdraw: 0)
+ *   [120..168]  _reserved0               [u8; 48]
  */
 function deserializeWithdrawRequest(data) {
     if (data.length < constants_1.WITHDRAW_REQUEST_SIZE) {
@@ -164,6 +204,47 @@ function deserializeWithdrawRequest(data) {
         epochId: (0, buffer_1.readU32)(data, 88),
         claimAvailableAfter: (0, buffer_1.readU32)(data, 92),
         bump: (0, buffer_1.readU8)(data, 96),
+        requestFlags: (0, buffer_1.readU8)(data, 98),
+        destVaultId: (0, buffer_1.readU64)(data, 104),
+        minDestShares: (0, buffer_1.readU64)(data, 112),
+    };
+}
+/**
+ * WithdrawRequest kind from `requestFlags` bit 0.
+ * Returns `"migrate"` when WR_FLAG_MIGRATE (0x01) is set, else `"withdraw"`.
+ */
+function withdrawRequestKind(wr) {
+    return (wr.requestFlags & 0x01) !== 0 ? "migrate" : "withdraw";
+}
+/**
+ * DelayedDepositRequest — per-(STV, user, epoch) pending deposit. Total 152 bytes.
+ *
+ * Layout (offsets include the 8-byte discriminator):
+ *   [  0..  8]  discriminator           (sha256("account:DelayedDepositRequest")[..8])
+ *   [  8.. 40]  stv                      Pubkey
+ *   [ 40.. 72]  user                     Pubkey
+ *   [ 72.. 80]  amount                   u64
+ *   [ 80.. 84]  epochId                  u32   (offset_of == 80, asserted on-chain)
+ *   [ 84.. 85]  bump                     u8
+ *   [ 85.. 86]  version                  u8
+ *   [ 86.. 88]  _padding                 [u8; 2]
+ *   [ 88..152]  _reserved                [u8; 64]
+ */
+function deserializeDelayedDepositRequest(data) {
+    if (data.length < constants_1.DELAYED_DEPOSIT_REQUEST_SIZE) {
+        throw new Error(`DelayedDepositRequest data too short: ${data.length} < ${constants_1.DELAYED_DEPOSIT_REQUEST_SIZE}`);
+    }
+    const disc = data.subarray(0, 8);
+    if (!disc.equals(constants_1.DISC_DELAYED_DEPOSIT_REQUEST)) {
+        throw new Error(`Invalid DelayedDepositRequest discriminator`);
+    }
+    return {
+        stv: (0, buffer_1.readPubkey)(data, 8),
+        user: (0, buffer_1.readPubkey)(data, 40),
+        amount: (0, buffer_1.readU64)(data, 72),
+        epochId: (0, buffer_1.readU32)(data, 80),
+        bump: (0, buffer_1.readU8)(data, 84),
+        version: (0, buffer_1.readU8)(data, 85),
     };
 }
 /**
@@ -227,6 +308,19 @@ async function fetchWithdrawRequestByAddress(connection, address) {
         throw new Error(`WithdrawRequest not found at ${address.toBase58()}`);
     return deserializeWithdrawRequest(info.data);
 }
+async function fetchDelayedDepositRequest(connection, stv, user, epochId, programId = constants_1.PROGRAM_ID) {
+    const [pda] = (0, pda_1.findDelayedDepositRequestPda)(stv, user, epochId, programId);
+    const info = await connection.getAccountInfo(pda);
+    if (!info)
+        throw new Error("DelayedDepositRequest account not found");
+    return deserializeDelayedDepositRequest(info.data);
+}
+async function fetchDelayedDepositRequestByAddress(connection, address) {
+    const info = await connection.getAccountInfo(address);
+    if (!info)
+        throw new Error(`DelayedDepositRequest not found at ${address.toBase58()}`);
+    return deserializeDelayedDepositRequest(info.data);
+}
 // ---------------------------------------------------------------------------
 // GPA Helpers
 // ---------------------------------------------------------------------------
@@ -252,6 +346,19 @@ async function fetchPendingWithdrawRequests(connection, stv, epochId, programId
     });
     return accounts.map((a) => [a.pubkey, deserializeWithdrawRequest(a.account.data)]);
 }
+async function fetchPendingDelayedDepositRequests(connection, stv, epochId, programId = constants_1.PROGRAM_ID) {
+    const epochBuf = Buffer.alloc(4);
+    epochBuf.writeUInt32LE(epochId, 0);
+    const accounts = await connection.getProgramAccounts(programId, {
+        filters: [
+            { dataSize: constants_1.DELAYED_DEPOSIT_REQUEST_SIZE },
+            { memcmp: { offset: 0, bytes: constants_1.DISC_DELAYED_DEPOSIT_REQUEST.toString("base64"), encoding: "base64" } },
+            { memcmp: { offset: 8, bytes: stv.toBuffer().toString("base64"), encoding: "base64" } },
+            { memcmp: { offset: 80, bytes: epochBuf.toString("base64"), encoding: "base64" } },
+        ],
+    });
+    return accounts.map((a) => [a.pubkey, deserializeDelayedDepositRequest(a.account.data)]);
+}
 async function fetchManagerRole(connection, stv, manager, programId = constants_1.PROGRAM_ID) {
     const [pda] = (0, pda_1.findStvManagerRolePda)(stv, manager, programId);
     const info = await connection.getAccountInfo(pda);