@elemental-stv-core/sdk 0.9.3 → 0.12.0

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

@@ -7,14 +7,22 @@ exports.createRequestWithdrawIx = createRequestWithdrawIx;
 exports.createClaimWithdrawIx = createClaimWithdrawIx;
 exports.createOverrideClaimWithdrawIx = createOverrideClaimWithdrawIx;
 exports.createProcessEpochIx = createProcessEpochIx;
+exports.createProcessDelayedDepositIx = createProcessDelayedDepositIx;
 exports.createDepositToStrategyIx = createDepositToStrategyIx;
 exports.createWithdrawFromStrategyIx = createWithdrawFromStrategyIx;
 exports.createCloseStvIx = createCloseStvIx;
 exports.createAddManagerIx = createAddManagerIx;
 exports.createRemoveManagerIx = createRemoveManagerIx;
 exports.createMigrateLendIx = createMigrateLendIx;
+exports.createMigrateRequestIx = createMigrateRequestIx;
+exports.createMigrateExecuteIx = createMigrateExecuteIx;
 exports.buildLendRemainingAccounts = buildLendRemainingAccounts;
+exports.buildMigrateRemainingAccounts = buildMigrateRemainingAccounts;
 exports.buildStrategyRemainingAccounts = buildStrategyRemainingAccounts;
+exports.createInstantWithdrawIx = createInstantWithdrawIx;
+exports.createSeedStvIx = createSeedStvIx;
+exports.createMigrateStvLayoutIx = createMigrateStvLayoutIx;
+exports.createAcceptVaultAdminIx = createAcceptVaultAdminIx;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const buffer_1 = require("../common/buffer");
@@ -36,7 +44,7 @@ function createInitOrUpdateConfigIx(args, programId = constants_1.PROGRAM_ID) {
     });
 }
 function createInitOrUpdateStvIx(args, programId = constants_1.PROGRAM_ID) {
-    const { admin, payer, config, stv, evMint, baseMint, vaultAta, tokenProgram, ataProgram = spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, systemProgram = web3_js_1.SystemProgram.programId, vaultId, stvBump, evMintBump, feeReceiver, strategy, epochSec, mgmtFeeBps, perfFeeBps, vaultCapacity, minDeposit, flags, addStrategy, removeStrategy, lendProgram, dailyWithdrawLimitBps, remainingAccounts = [], } = args;
+    const { admin, payer, config, stv, evMint, baseMint, vaultAta, feeReceiverEvAta, tokenProgram, ataProgram = spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, systemProgram = web3_js_1.SystemProgram.programId, vaultId, stvBump, evMintBump, feeReceiver, strategy, epochSec, mgmtFeeBps, perfFeeBps, vaultCapacity, minDeposit, flags, addStrategy, removeStrategy, lendProgram, dailyWithdrawLimitBps, depositFeeBps, withdrawalFeeBps, withdrawalMode, vaultAdmin, pendingAdmin, remainingAccounts = [], } = args;
     const data = [constants_1.IX_INIT_OR_UPDATE_STV];
     (0, buffer_1.writeU64)(data, vaultId);
     data.push(stvBump & 0xff);
@@ -53,6 +61,19 @@ function createInitOrUpdateStvIx(args, programId = constants_1.PROGRAM_ID) {
     (0, buffer_1.writeOptionalPubkey)(data, removeStrategy);
     (0, buffer_1.writeOptionalPubkey)(data, lendProgram);
     (0, buffer_1.writeOptionalU16)(data, dailyWithdrawLimitBps);
+    (0, buffer_1.writeOptionalU16)(data, depositFeeBps);
+    (0, buffer_1.writeOptionalU16)(data, withdrawalFeeBps);
+    if (withdrawalMode != null && (withdrawalMode < 0 || withdrawalMode > 2)) {
+        throw new Error(`withdrawalMode must be 0 (instant), 1 (X) or 2 (X+1); got ${withdrawalMode}`);
+    }
+    (0, buffer_1.writeOptionalU8)(data, withdrawalMode);
+    // NEW (v2): vault_admin_or_pending — the last optional-pubkey field.
+    // CREATE path: pass vaultAdmin (required nonzero). Handler rejects None/zero.
+    // UPDATE path: pass pendingAdmin (optional; None = no change, zero pubkey = cancel).
+    // Both share the same wire position; interpretation is per create/update branch.
+    // Wire: 0x00 = None, 0x01 + 32 bytes = Some(pubkey).
+    const vaultAdminOrPending = vaultAdmin ?? pendingAdmin;
+    (0, buffer_1.writeOptionalPubkey)(data, vaultAdminOrPending);
     return new web3_js_1.TransactionInstruction({
         keys: [
             { pubkey: admin, isSigner: true, isWritable: false },
@@ -62,6 +83,7 @@ function createInitOrUpdateStvIx(args, programId = constants_1.PROGRAM_ID) {
             { pubkey: evMint, isSigner: false, isWritable: true },
             { pubkey: baseMint, isSigner: false, isWritable: false },
             { pubkey: vaultAta, isSigner: false, isWritable: true },
+            { pubkey: feeReceiverEvAta, isSigner: false, isWritable: false },
             { pubkey: tokenProgram, isSigner: false, isWritable: false },
             { pubkey: ataProgram, isSigner: false, isWritable: false },
             { pubkey: systemProgram, isSigner: false, isWritable: false },
@@ -72,12 +94,24 @@ function createInitOrUpdateStvIx(args, programId = constants_1.PROGRAM_ID) {
     });
 }
 function createDepositIx(args, programId = constants_1.PROGRAM_ID) {
-    const { user, config, stv, vaultAta, userBaseAta, userEvAta, evMint, feeReceiverEvAta, baseMint, tokenProgram, amount, minShares, protocolAumCount = 0, autoRouteCount = 0, remainingAccounts = [], } = args;
+    const { user, config, stv, vaultAta, userBaseAta, userEvAta, evMint, feeReceiverEvAta, baseMint, tokenProgram, amount, minShares, protocolAumCount = 0, autoRouteCount = 0, delayedDepositRequest, delayedDepositBump, systemProgram = web3_js_1.SystemProgram.programId, remainingAccounts = [], } = args;
     const data = [constants_1.IX_DEPOSIT];
     (0, buffer_1.writeU64)(data, amount);
     (0, buffer_1.writeU64)(data, minShares);
     data.push(protocolAumCount & 0xff);
     data.push(autoRouteCount & 0xff);
+    if (delayedDepositRequest) {
+        if (delayedDepositBump == null) {
+            throw new Error("delayedDepositBump is required when delayedDepositRequest is provided");
+        }
+        data.push(delayedDepositBump & 0xff);
+    }
+    const delayedAccounts = delayedDepositRequest
+        ? [
+            { pubkey: delayedDepositRequest, isSigner: false, isWritable: true },
+            { pubkey: systemProgram, isSigner: false, isWritable: false },
+        ]
+        : [];
     return new web3_js_1.TransactionInstruction({
         keys: [
             { pubkey: user, isSigner: true, isWritable: true },
@@ -90,6 +124,7 @@ function createDepositIx(args, programId = constants_1.PROGRAM_ID) {
             { pubkey: feeReceiverEvAta, isSigner: false, isWritable: true },
             { pubkey: baseMint, isSigner: false, isWritable: false },
             { pubkey: tokenProgram, isSigner: false, isWritable: false },
+            ...delayedAccounts,
             ...remainingAccounts,
         ],
         programId,
@@ -118,11 +153,10 @@ function createRequestWithdrawIx(args, programId = constants_1.PROGRAM_ID) {
     });
 }
 function createClaimWithdrawIx(args, programId = constants_1.PROGRAM_ID) {
-    const { user, config, stv, withdrawRequest, vaultAta, userBaseAta, baseMint, tokenProgram, remainingAccounts = [], autoUnrouteCount = 0, } = args;
-    // Always serialize the auto_unroute_count byte (write 0 when there's no
-    // auto-unroute). The on-chain handler always reads this byte from
-    // instruction data.
-    const data = Buffer.from([constants_1.IX_CLAIM_WITHDRAW, autoUnrouteCount & 0xff]);
+    const { user, config, stv, withdrawRequest, vaultAta, userBaseAta, feeReceiverBaseAta, baseMint, tokenProgram, remainingAccounts = [], autoUnrouteCount = 0, protocolAumCount = 0, } = args;
+    // Data: auto_unroute_count(1) + protocol_aum_count(1). Both always serialized —
+    // the on-chain handler reads data[0] and data[1].
+    const data = Buffer.from([constants_1.IX_CLAIM_WITHDRAW, autoUnrouteCount & 0xff, protocolAumCount & 0xff]);
     return new web3_js_1.TransactionInstruction({
         keys: [
             { pubkey: user, isSigner: true, isWritable: true },
@@ -131,6 +165,7 @@ function createClaimWithdrawIx(args, programId = constants_1.PROGRAM_ID) {
             { pubkey: withdrawRequest, isSigner: false, isWritable: true },
             { pubkey: vaultAta, isSigner: false, isWritable: true },
             { pubkey: userBaseAta, isSigner: false, isWritable: true },
+            { pubkey: feeReceiverBaseAta, isSigner: false, isWritable: true },
             { pubkey: baseMint, isSigner: false, isWritable: false },
             { pubkey: tokenProgram, isSigner: false, isWritable: false },
             ...remainingAccounts,
@@ -140,10 +175,10 @@ function createClaimWithdrawIx(args, programId = constants_1.PROGRAM_ID) {
     });
 }
 function createOverrideClaimWithdrawIx(args, programId = constants_1.PROGRAM_ID) {
-    const { manager, managerRole, config, user, stv, withdrawRequest, vaultAta, userBaseAta, baseMint, tokenProgram, remainingAccounts = [], autoUnrouteCount = 0, } = args;
-    const data = autoUnrouteCount > 0
-        ? Buffer.from([constants_1.IX_OVERRIDE_CLAIM_WITHDRAW, autoUnrouteCount & 0xff])
-        : Buffer.from([constants_1.IX_OVERRIDE_CLAIM_WITHDRAW]);
+    const { manager, managerRole, config, user, stv, withdrawRequest, vaultAta, userBaseAta, feeReceiverBaseAta, baseMint, tokenProgram, remainingAccounts = [], autoUnrouteCount = 0, protocolAumCount = 0, } = args;
+    // Data: auto_unroute_count(1) + protocol_aum_count(1) — protocol_aum_count is data[1],
+    // so always serialize both bytes (handler reads data[0]/data[1]).
+    const data = Buffer.from([constants_1.IX_OVERRIDE_CLAIM_WITHDRAW, autoUnrouteCount & 0xff, protocolAumCount & 0xff]);
     return new web3_js_1.TransactionInstruction({
         keys: [
             { pubkey: manager, isSigner: true, isWritable: false },
@@ -154,6 +189,7 @@ function createOverrideClaimWithdrawIx(args, programId = constants_1.PROGRAM_ID)
             { pubkey: withdrawRequest, isSigner: false, isWritable: true },
             { pubkey: vaultAta, isSigner: false, isWritable: true },
             { pubkey: userBaseAta, isSigner: false, isWritable: true },
+            { pubkey: feeReceiverBaseAta, isSigner: false, isWritable: true },
             { pubkey: baseMint, isSigner: false, isWritable: false },
             { pubkey: tokenProgram, isSigner: false, isWritable: false },
             ...remainingAccounts,
@@ -180,6 +216,26 @@ function createProcessEpochIx(args, programId = constants_1.PROGRAM_ID) {
         data: Buffer.from([constants_1.IX_PROCESS_EPOCH, advanceEpoch ? 1 : 0, protocolAumCount & 0xff]),
     });
 }
+function createProcessDelayedDepositIx(args, programId = constants_1.PROGRAM_ID) {
+    const { payer, config, stv, delayedDepositRequest, user, vaultAta, userEvAta, evMint, feeReceiverEvAta, tokenProgram, protocolAumCount = 0, remainingAccounts = [], } = args;
+    return new web3_js_1.TransactionInstruction({
+        keys: [
+            { pubkey: payer, isSigner: true, isWritable: false },
+            { pubkey: config, isSigner: false, isWritable: false },
+            { pubkey: stv, isSigner: false, isWritable: true },
+            { pubkey: delayedDepositRequest, isSigner: false, isWritable: true },
+            { pubkey: user, isSigner: false, isWritable: true },
+            { pubkey: vaultAta, isSigner: false, isWritable: true },
+            { pubkey: userEvAta, isSigner: false, isWritable: true },
+            { pubkey: evMint, isSigner: false, isWritable: true },
+            { pubkey: feeReceiverEvAta, isSigner: false, isWritable: true },
+            { pubkey: tokenProgram, isSigner: false, isWritable: false },
+            ...remainingAccounts,
+        ],
+        programId,
+        data: Buffer.from([constants_1.IX_PROCESS_DELAYED_DEPOSIT, protocolAumCount & 0xff]),
+    });
+}
 function createDepositToStrategyIx(args, programId = constants_1.PROGRAM_ID) {
     const { manager, managerRole, config, stv, vaultAta, baseMint, strategyProgram, strategyState, stvPosition, strategyBaseAta, tokenProgram, amount, minShares, protocolAumCount, autoUnrouteCount = 0, remainingAccounts = [], } = args;
     const data = [constants_1.IX_DEPOSIT_TO_STRATEGY];
@@ -211,9 +267,11 @@ function createDepositToStrategyIx(args, programId = constants_1.PROGRAM_ID) {
     });
 }
 function createWithdrawFromStrategyIx(args, programId = constants_1.PROGRAM_ID) {
-    const { manager, managerRole, config, stv, vaultAta, baseMint, strategyProgram, strategyState, stvPosition, strategyBaseAta, tokenProgram, shares, remainingAccounts = [], } = args;
+    const { manager, managerRole, config, stv, vaultAta, baseMint, strategyProgram, strategyState, stvPosition, strategyBaseAta, tokenProgram, shares, protocolAumCount = 0, remainingAccounts = [], } = args;
+    // Data: shares(8) + protocol_aum_count(1).
     const data = [constants_1.IX_WITHDRAW_FROM_STRATEGY];
     (0, buffer_1.writeU64)(data, shares);
+    data.push(protocolAumCount & 0xff);
     return new web3_js_1.TransactionInstruction({
         keys: [
             { pubkey: manager, isSigner: true, isWritable: true },
@@ -267,12 +325,12 @@ function createAddManagerIx(args, programId = constants_1.PROGRAM_ID) {
     });
 }
 function createRemoveManagerIx(args, programId = constants_1.PROGRAM_ID) {
-    const { admin, payer, config, managerRole } = args;
+    const { admin, payer, stv, managerRole } = args;
     return new web3_js_1.TransactionInstruction({
         keys: [
             { pubkey: admin, isSigner: true, isWritable: false },
             { pubkey: payer, isSigner: false, isWritable: true },
-            { pubkey: config, isSigner: false, isWritable: false },
+            { pubkey: stv, isSigner: false, isWritable: false },
             { pubkey: managerRole, isSigner: false, isWritable: true },
         ],
         programId,
@@ -280,12 +338,15 @@ function createRemoveManagerIx(args, programId = constants_1.PROGRAM_ID) {
     });
 }
 function createMigrateLendIx(args, programId = constants_1.PROGRAM_ID) {
-    const { admin, payer, config, stv, vaultAta, baseMint, tokenProgram, systemProgram = web3_js_1.SystemProgram.programId, oldLendProgram, newLendProgram, protocolAumCount, autoUnrouteCount, remainingAccounts = [], } = args;
+    const { admin, payer, config, stv, vaultAta, baseMint, tokenProgram, systemProgram = web3_js_1.SystemProgram.programId, oldLendProgram, newLendProgram, protocolAumCount, autoUnrouteCount, newProtocolAumCount = 0, remainingAccounts = [], } = args;
+    // Data: old_lend(32) + new_lend(32) + protocol_aum_count(1) + auto_unroute_count(1)
+    //        + new_protocol_aum_count(1).
     const data = [constants_1.IX_MIGRATE_LEND];
     data.push(...oldLendProgram.toBuffer());
     data.push(...newLendProgram.toBuffer());
     data.push(protocolAumCount & 0xff);
     data.push(autoUnrouteCount & 0xff);
+    data.push(newProtocolAumCount & 0xff);
     return new web3_js_1.TransactionInstruction({
         keys: [
             { pubkey: admin, isSigner: true, isWritable: false },
@@ -302,6 +363,73 @@ function createMigrateLendIx(args, programId = constants_1.PROGRAM_ID) {
         data: Buffer.from(data),
     });
 }
+/**
+ * Instruction data layout (17 bytes, after the 1-byte disc is stripped by the
+ * dispatcher): shares(u64 LE) + wr_bump(u8) + min_dest_shares(u64 LE).
+ * Confirmed against migrate_request.rs:53-66.
+ */
+function createMigrateRequestIx(args, programId = constants_1.PROGRAM_ID) {
+    const { user, config, sourceStv, destStv, evMint, userEvAta, escrowEvAta, migrateRequest, tokenProgram, systemProgram = web3_js_1.SystemProgram.programId, shares, wrBump, minDestShares, } = args;
+    const data = [constants_1.IX_MIGRATE_REQUEST];
+    (0, buffer_1.writeU64)(data, shares);
+    data.push(wrBump & 0xff);
+    (0, buffer_1.writeU64)(data, minDestShares);
+    return new web3_js_1.TransactionInstruction({
+        keys: [
+            { pubkey: user, isSigner: true, isWritable: true },
+            { pubkey: config, isSigner: false, isWritable: false },
+            { pubkey: sourceStv, isSigner: false, isWritable: true },
+            { pubkey: destStv, isSigner: false, isWritable: false },
+            { pubkey: evMint, isSigner: false, isWritable: false },
+            { pubkey: userEvAta, isSigner: false, isWritable: true },
+            { pubkey: escrowEvAta, isSigner: false, isWritable: true },
+            { pubkey: migrateRequest, isSigner: false, isWritable: true },
+            { pubkey: systemProgram, isSigner: false, isWritable: false },
+            { pubkey: tokenProgram, isSigner: false, isWritable: false },
+        ],
+        programId,
+        data: Buffer.from(data),
+    });
+}
+/**
+ * 15 fixed accounts confirmed against migrate_execute.rs:87-91 (destructure)
+ * and the doc header at lines 29-52. Slot 14 = wrUserAccount (writable; must
+ * equal wr.user). Instruction data (4 bytes): src_protocol_aum_count,
+ * dst_protocol_aum_count, src_auto_unroute_count, dst_auto_route_count
+ * (migrate_execute.rs:94-100).
+ */
+function createMigrateExecuteIx(args, programId = constants_1.PROGRAM_ID) {
+    const { manager, managerRole, config, sourceStv, destStv, wrAccount, sourceVaultAta, destVaultAta, destEvMint, userDestEvAta, sourceFeeRecvAta, destFeeRecvEvAta, baseMint, tokenProgram, wrUserAccount, srcProtocolAumCount, dstProtocolAumCount, srcAutoUnrouteCount, dstAutoRouteCount, remainingAccounts = [], } = args;
+    const data = Buffer.from([
+        constants_1.IX_MIGRATE_EXECUTE,
+        srcProtocolAumCount & 0xff,
+        dstProtocolAumCount & 0xff,
+        srcAutoUnrouteCount & 0xff,
+        dstAutoRouteCount & 0xff,
+    ]);
+    return new web3_js_1.TransactionInstruction({
+        keys: [
+            { pubkey: manager, isSigner: true, isWritable: false },
+            { pubkey: managerRole, isSigner: false, isWritable: false },
+            { pubkey: config, isSigner: false, isWritable: false },
+            { pubkey: sourceStv, isSigner: false, isWritable: true },
+            { pubkey: destStv, isSigner: false, isWritable: true },
+            { pubkey: wrAccount, isSigner: false, isWritable: true },
+            { pubkey: sourceVaultAta, isSigner: false, isWritable: true },
+            { pubkey: destVaultAta, isSigner: false, isWritable: true },
+            { pubkey: destEvMint, isSigner: false, isWritable: true },
+            { pubkey: userDestEvAta, isSigner: false, isWritable: true },
+            { pubkey: sourceFeeRecvAta, isSigner: false, isWritable: true },
+            { pubkey: destFeeRecvEvAta, isSigner: false, isWritable: true },
+            { pubkey: baseMint, isSigner: false, isWritable: false },
+            { pubkey: tokenProgram, isSigner: false, isWritable: false },
+            { pubkey: wrUserAccount, isSigner: false, isWritable: true },
+            ...remainingAccounts,
+        ],
+        programId,
+        data,
+    });
+}
 // ---------------------------------------------------------------------------
 // Remaining Accounts Helpers
 // ---------------------------------------------------------------------------
@@ -313,6 +441,50 @@ function buildLendRemainingAccounts(lend) {
         { pubkey: lend.lendBaseAta, isSigner: false, isWritable: true },
     ];
 }
+/**
+ * Assemble the migrate_execute remaining_accounts in the exact order
+ * parse_lend_accounts expects (migrate_execute.rs:298-338):
+ *
+ *   [ source-lend section ]  src.lend(4 fixed) + src.protocolAum(P_src)
+ *   [ source auto-unroute  ]  src.autoUnroute (U accounts)
+ *   [ dest-lend section    ]  dst.lend(4 fixed) + dst.protocolAum(P_dst)
+ *   [ dest strategy + route]  dst.strategy(0 or 2) + dst.autoRoute (R accounts)
+ *
+ * Pass `undefined` for a `lend` side whose STV has no lend_program (the 4
+ * fixed accounts + protocol AUM are omitted, matching the early return in
+ * parse_lend_accounts when lend_program_key == default).
+ *
+ * The 4 fixed lend accounts mirror `buildLendRemainingAccounts`:
+ *   [lendProgram(ro), lendStrategyState(w), lendStvPosition(w), lendBaseAta(w)]
+ * `protocolAum` / `autoUnroute` / `autoRoute` / `strategy` accounts are passed
+ * through verbatim; the caller sets their writable flags per protocol.
+ */
+function buildMigrateRemainingAccounts(opts) {
+    const out = [];
+    // ---- source-lend section ----
+    if (opts.source.lend) {
+        out.push(...buildLendRemainingAccounts(opts.source.lend));
+        if (opts.source.protocolAum)
+            out.push(...opts.source.protocolAum);
+    }
+    // ---- source auto-unroute ----
+    if (opts.source.autoUnroute)
+        out.push(...opts.source.autoUnroute);
+    // ---- dest-lend section ----
+    if (opts.dest.lend) {
+        out.push(...buildLendRemainingAccounts(opts.dest.lend));
+        if (opts.dest.protocolAum)
+            out.push(...opts.dest.protocolAum);
+    }
+    // ---- dest strategy pair (writable state, read-only position) ----
+    if (opts.dest.strategy) {
+        out.push({ pubkey: opts.dest.strategy.strategyState, isSigner: false, isWritable: true }, { pubkey: opts.dest.strategy.stvPosition, isSigner: false, isWritable: false });
+    }
+    // ---- dest auto-route ----
+    if (opts.dest.autoRoute)
+        out.push(...opts.dest.autoRoute);
+    return out;
+}
 function buildStrategyRemainingAccounts(strategies) {
     const accounts = [];
     for (const s of strategies) {
@@ -320,3 +492,93 @@ function buildStrategyRemainingAccounts(strategies) {
     }
     return accounts;
 }
+function createInstantWithdrawIx(args, programId = constants_1.PROGRAM_ID) {
+    const { user, config, stv, vaultAta, userBaseAta, feeReceiverBaseAta, feeReceiverEvAta, baseMint, evMint, userEvAta, tokenProgram, shares, minBaseOut, protocolAumCount = 0, autoUnrouteCount = 0, remainingAccounts = [], } = args;
+    // Data: shares(8) + min_base_out(8) + protocol_aum_count(1) + auto_unroute_count(1) = 18.
+    const data = [constants_1.IX_INSTANT_WITHDRAW];
+    (0, buffer_1.writeU64)(data, shares);
+    (0, buffer_1.writeU64)(data, minBaseOut);
+    data.push(protocolAumCount & 0xff);
+    data.push(autoUnrouteCount & 0xff);
+    return new web3_js_1.TransactionInstruction({
+        keys: [
+            { pubkey: user, isSigner: true, isWritable: true },
+            { pubkey: config, isSigner: false, isWritable: false },
+            { pubkey: stv, isSigner: false, isWritable: true },
+            { pubkey: vaultAta, isSigner: false, isWritable: true },
+            { pubkey: userBaseAta, isSigner: false, isWritable: true },
+            { pubkey: feeReceiverBaseAta, isSigner: false, isWritable: true },
+            { pubkey: feeReceiverEvAta, isSigner: false, isWritable: true },
+            { pubkey: baseMint, isSigner: false, isWritable: false },
+            { pubkey: evMint, isSigner: false, isWritable: true },
+            { pubkey: userEvAta, isSigner: false, isWritable: true },
+            { pubkey: tokenProgram, isSigner: false, isWritable: false },
+            ...remainingAccounts,
+        ],
+        programId,
+        data: Buffer.from(data),
+    });
+}
+function createSeedStvIx(args, programId = constants_1.PROGRAM_ID) {
+    const { admin, config, stv, evMint, escrowEvAta, vaultAta, adminBaseAta, baseMint, tokenProgram, ataProgram = spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, systemProgram = web3_js_1.SystemProgram.programId, amount, } = args;
+    // Data: amount(8).
+    const data = [constants_1.IX_SEED_STV];
+    (0, buffer_1.writeU64)(data, amount);
+    return new web3_js_1.TransactionInstruction({
+        keys: [
+            { pubkey: admin, isSigner: true, isWritable: true },
+            { pubkey: config, isSigner: false, isWritable: false },
+            { pubkey: stv, isSigner: false, isWritable: true },
+            { pubkey: evMint, isSigner: false, isWritable: true },
+            { pubkey: escrowEvAta, isSigner: false, isWritable: true },
+            { pubkey: vaultAta, isSigner: false, isWritable: true },
+            { pubkey: adminBaseAta, isSigner: false, isWritable: true },
+            { pubkey: baseMint, isSigner: false, isWritable: false },
+            { pubkey: tokenProgram, isSigner: false, isWritable: false },
+            { pubkey: ataProgram, isSigner: false, isWritable: false },
+            { pubkey: systemProgram, isSigner: false, isWritable: false },
+        ],
+        programId,
+        data: Buffer.from(data),
+    });
+}
+function createMigrateStvLayoutIx(args, programId = constants_1.PROGRAM_ID) {
+    const { admin, config, stv, expectedVaultId, expectedOldWithdrawalMode, newWithdrawalMode } = args;
+    // Data: expected_vault_id(8) + expected_old_withdrawal_mode(1)
+    //       + new_withdrawal_mode (0x00 or 0x01 + byte).
+    const data = [constants_1.IX_MIGRATE_STV_LAYOUT];
+    (0, buffer_1.writeU64)(data, expectedVaultId);
+    data.push(expectedOldWithdrawalMode & 0xff);
+    if (newWithdrawalMode !== undefined && newWithdrawalMode !== null) {
+        if (newWithdrawalMode < 0 || newWithdrawalMode > 2) {
+            throw new Error(`newWithdrawalMode must be 0 (instant), 1 (X) or 2 (X+1); got ${newWithdrawalMode}`);
+        }
+        // Some(m): 0x01 tag + mode byte
+        data.push(0x01);
+        data.push(newWithdrawalMode & 0xff);
+    }
+    else {
+        // None: 0x00 tag
+        data.push(0x00);
+    }
+    return new web3_js_1.TransactionInstruction({
+        keys: [
+            { pubkey: admin, isSigner: true, isWritable: false },
+            { pubkey: config, isSigner: false, isWritable: false },
+            { pubkey: stv, isSigner: false, isWritable: true },
+        ],
+        programId,
+        data: Buffer.from(data),
+    });
+}
+function createAcceptVaultAdminIx(args, programId = constants_1.PROGRAM_ID) {
+    const { pendingAdmin, stv } = args;
+    return new web3_js_1.TransactionInstruction({
+        keys: [
+            { pubkey: pendingAdmin, isSigner: true, isWritable: false },
+            { pubkey: stv, isSigner: false, isWritable: true },
+        ],
+        programId,
+        data: Buffer.from([constants_1.IX_ACCEPT_VAULT_ADMIN]),
+    });
+}

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

@@ -4,6 +4,21 @@ export declare function findConfigPda(programId?: PublicKey): [PublicKey, number
 export declare function findStvPda(vaultId: number | BN, programId?: PublicKey): [PublicKey, number];
 export declare function findEvMintPda(vaultId: number | BN, programId?: PublicKey): [PublicKey, number];
 export declare function findWithdrawRequestPda(stv: PublicKey, user: PublicKey, epochId: number, programId?: PublicKey): [PublicKey, number];
+/**
+ * Derive the migrate-kind WithdrawRequest PDA.
+ * Seeds: `["migrate_request", stv, user, epoch_id_le4]`.
+ *
+ * Distinct prefix from `findWithdrawRequestPda` so a user can hold both a
+ * withdraw and a migrate request for the same (stv, user, epoch) without
+ * a PDA collision. `stv` is the SOURCE STV; `epochId` is the source STV's
+ * `currentEpochId` at request time.
+ */
+export declare function findMigrateRequestPda(stv: PublicKey, user: PublicKey, epochId: number, programId?: PublicKey): [PublicKey, number];
+/**
+ * Derive the per-user delayed deposit request PDA.
+ * Seeds: `["delayed_deposit", stv, user, epoch_id_le4]`.
+ */
+export declare function findDelayedDepositRequestPda(stv: PublicKey, user: PublicKey, epochId: number, programId?: PublicKey): [PublicKey, number];
 /**
  * Derive the per-STV `ManagerRole` PDA for p-STV Core.
  * Seeds: `["manager", stv, manager]`.

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

@@ -7,6 +7,8 @@ exports.findConfigPda = findConfigPda;
 exports.findStvPda = findStvPda;
 exports.findEvMintPda = findEvMintPda;
 exports.findWithdrawRequestPda = findWithdrawRequestPda;
+exports.findMigrateRequestPda = findMigrateRequestPda;
+exports.findDelayedDepositRequestPda = findDelayedDepositRequestPda;
 exports.findStvManagerRolePda = findStvManagerRolePda;
 const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
@@ -27,6 +29,29 @@ function findWithdrawRequestPda(stv, user, epochId, programId = constants_1.PROG
     epochBuf.writeUInt32LE(epochId, 0);
     return web3_js_1.PublicKey.findProgramAddressSync([constants_1.WITHDRAW_REQUEST_SEED, stv.toBuffer(), user.toBuffer(), epochBuf], programId);
 }
+/**
+ * Derive the migrate-kind WithdrawRequest PDA.
+ * Seeds: `["migrate_request", stv, user, epoch_id_le4]`.
+ *
+ * Distinct prefix from `findWithdrawRequestPda` so a user can hold both a
+ * withdraw and a migrate request for the same (stv, user, epoch) without
+ * a PDA collision. `stv` is the SOURCE STV; `epochId` is the source STV's
+ * `currentEpochId` at request time.
+ */
+function findMigrateRequestPda(stv, user, epochId, programId = constants_1.PROGRAM_ID) {
+    const epochBuf = Buffer.alloc(4);
+    epochBuf.writeUInt32LE(epochId, 0);
+    return web3_js_1.PublicKey.findProgramAddressSync([constants_1.MIGRATE_REQUEST_SEED, stv.toBuffer(), user.toBuffer(), epochBuf], programId);
+}
+/**
+ * Derive the per-user delayed deposit request PDA.
+ * Seeds: `["delayed_deposit", stv, user, epoch_id_le4]`.
+ */
+function findDelayedDepositRequestPda(stv, user, epochId, programId = constants_1.PROGRAM_ID) {
+    const epochBuf = Buffer.alloc(4);
+    epochBuf.writeUInt32LE(epochId, 0);
+    return web3_js_1.PublicKey.findProgramAddressSync([constants_1.DELAYED_DEPOSIT_SEED, stv.toBuffer(), user.toBuffer(), epochBuf], programId);
+}
 /**
  * Derive the per-STV `ManagerRole` PDA for p-STV Core.
  * Seeds: `["manager", stv, manager]`.

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

@@ -29,6 +29,9 @@ export interface DepositContext {
 export interface ClaimWithdrawContext {
     remainingAccounts: AccountMeta[];
     autoUnrouteCount: number;
+    /** Protocol-AUM accounts placed between the 4 fixed lend accounts and auto-unroute,
+     *  feeding the pre-unsweep update_aum refresh. Pass to createClaimWithdrawIx.protocolAumCount. */
+    protocolAumCount: number;
     /**
      * Pre-instructions to add before the claim_withdraw ix.
      * Currently always empty — see DepositContext.preInstructions.
@@ -72,7 +75,7 @@ export declare function buildDepositContext(connection: SolanaConnection, vault:
  * - If lend is active, derives lend PDAs
  * - If USDC + Jupiter Lend, appends auto-unroute accounts
  */
-export declare function buildClaimWithdrawContext(vault: VaultInfo): Promise<ClaimWithdrawContext>;
+export declare function buildClaimWithdrawContext(connection: SolanaConnection, vault: VaultInfo): Promise<ClaimWithdrawContext>;
 /**
  * Build the complete remaining_accounts for a deposit_to_strategy instruction.
  *

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

@@ -144,13 +144,28 @@ async function buildDepositContext(connection, vault, payer) {
  * - If lend is active, derives lend PDAs
  * - If USDC + Jupiter Lend, appends auto-unroute accounts
  */
-async function buildClaimWithdrawContext(vault) {
+async function buildClaimWithdrawContext(connection, vault) {
     const remainingAccounts = [];
     const preInstructions = [];
     let autoUnrouteCount = 0;
+    let protocolAumCount = 0;
     if (!isDefault(vault.lendProgram)) {
         const { accounts: lendAccounts, lendStrategyState } = buildFixedLendAccounts(vault.lendProgram, vault.baseMint, vault.address);
         remainingAccounts.push(...lendAccounts);
+        // Protocol-AUM accounts (between fixed lend and auto-unroute) — feed the
+        // pre-unsweep update_aum refresh. The on-chain lend update_aum rejects an
+        // incomplete tail, so these MUST cover the strategy's full protocol set.
+        const lendState = await (0, accounts_1.fetchLendStrategyState)(connection, vault.baseMint, vault.lendProgram).catch(() => null);
+        if (lendState) {
+            try {
+                const protocolAccounts = await (0, accounts_1.buildProtocolAccountsForAum)(connection, lendState, lendStrategyState, TOKEN_PROGRAM);
+                protocolAumCount = protocolAccounts.length;
+                remainingAccounts.push(...protocolAccounts);
+            }
+            catch {
+                // Skip protocol accounts if resolution fails (no-protocol lend → 0).
+            }
+        }
         // Auto-unroute from Jupiter Lend (for any asset with a configured pool)
         const jupPoolForUnroute = jupiter_lend_1.JUP_LEND_POOLS[vault.baseMint.toBase58()];
         if (jupPoolForUnroute) {
@@ -166,7 +181,7 @@ async function buildClaimWithdrawContext(vault) {
             }
         }
     }
-    return { remainingAccounts, autoUnrouteCount, preInstructions };
+    return { remainingAccounts, autoUnrouteCount, protocolAumCount, preInstructions };
 }
 /**
  * Build the complete remaining_accounts for a deposit_to_strategy instruction.