@elemental-stv-core/sdk 0.9.3 → 0.12.0

package/dist/jlpd-strategy/base-to-base-swap.js

@@ -0,0 +1,199 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createBaseToBaseSwapIx = createBaseToBaseSwapIx;
+exports.buildBaseToBaseSwapTransaction = buildBaseToBaseSwapTransaction;
+const web3_js_1 = require("@solana/web3.js");
+const spl_token_1 = require("@solana/spl-token");
+const ata_1 = require("../common/ata");
+const constants_1 = require("./constants");
+const pda_1 = require("./pda");
+const accounts_1 = require("./accounts");
+const swap_jlp_1 = require("./swap-jlp");
+// ---------------------------------------------------------------------------
+// Stable-asset detection (mirrors swap-jlp.ts)
+// ---------------------------------------------------------------------------
+// Stablecoin mints use a hardcoded $1 price on-chain — the oracle account is
+// passed but ignored. We pass PublicKey.default as a safe placeholder for them
+// so callers never need to supply or fetch a feed for USDC/JupUSD.
+// ---------------------------------------------------------------------------
+/** 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());
+}
+function toBigInt(v) {
+    if (typeof v === "bigint")
+        return v;
+    const bn = v;
+    if (typeof bn.toBigInt === "function")
+        return bn.toBigInt();
+    return BigInt(bn.toString());
+}
+// ---------------------------------------------------------------------------
+// Low-level instruction builder
+// ---------------------------------------------------------------------------
+/**
+ * Build the on-chain `base_to_base_swap` instruction.
+ *
+ * Instruction data layout (Anchor Borsh):
+ *   [8-byte disc, 8-byte amount_in (LE), 8-byte min_out (LE),
+ *    4-byte jupiter_data_len (LE), ...jupiter_data_bytes]
+ */
+function createBaseToBaseSwapIx(args, programId = constants_1.PROGRAM_ID) {
+    const { manager, config, managerRole, strategyStateIn, strategyStateOut, baseInAta, baseOutAta, baseInMint, baseOutMint, tokenProgram, jupiterProgram, priceOracleIn, priceOracleOut, amountIn, minOut, jupiterData, remainingAccounts = [], } = args;
+    const amountInBi = toBigInt(amountIn);
+    const minOutBi = toBigInt(minOut);
+    const jupBytes = Buffer.from(jupiterData);
+    const dataLen = 8 + 8 + 8 + 4 + jupBytes.length;
+    const data = Buffer.alloc(dataLen);
+    constants_1.IX_BASE_TO_BASE_SWAP.copy(data, 0);
+    data.writeBigUInt64LE(amountInBi, 8);
+    data.writeBigUInt64LE(minOutBi, 16);
+    data.writeUInt32LE(jupBytes.length, 24);
+    jupBytes.copy(data, 28);
+    const keys = [
+        { pubkey: manager, isSigner: true, isWritable: false },
+        { pubkey: config, isSigner: false, isWritable: false },
+        { pubkey: managerRole, isSigner: false, isWritable: false },
+        { pubkey: strategyStateIn, isSigner: false, isWritable: true },
+        { pubkey: strategyStateOut, isSigner: false, isWritable: true },
+        { pubkey: baseInAta, isSigner: false, isWritable: true },
+        { pubkey: baseOutAta, isSigner: false, isWritable: true },
+        { pubkey: baseInMint, isSigner: false, isWritable: false },
+        { pubkey: baseOutMint, isSigner: false, isWritable: false },
+        { pubkey: tokenProgram, isSigner: false, isWritable: false },
+        { pubkey: jupiterProgram, isSigner: false, isWritable: false },
+        { pubkey: priceOracleIn, isSigner: false, isWritable: false },
+        { pubkey: priceOracleOut, isSigner: false, isWritable: false },
+        ...remainingAccounts,
+    ];
+    return new web3_js_1.TransactionInstruction({ keys, programId, data });
+}
+// ---------------------------------------------------------------------------
+// High-level builder (Jupiter quote + ALTs + ix)
+// ---------------------------------------------------------------------------
+/**
+ * Build a complete base_to_base_swap transaction:
+ *   1. Derive PDAs for both strategies
+ *   2. Resolve oracle accounts (from strategy_state.price_oracle on-chain, or overrides)
+ *   3. Get Jupiter quote (base_in → base_out)
+ *   4. Get Jupiter swap instructions (strategy_state_in PDA signs)
+ *   5. Build instruction + return ALTs
+ *
+ * Oracle resolution:
+ *   - Stablecoins (USDC/JupUSD): always PublicKey.default (program ignores oracle for $1 assets).
+ *   - Volatile assets: use caller-supplied override, or fetch strategy_state on-chain
+ *     to read the stored price_oracle field. To avoid two extra RPC calls, pass
+ *     priceOracleIn/priceOracleOut when you already have the strategy states.
+ */
+async function buildBaseToBaseSwapTransaction(args) {
+    const { connection, manager, baseInMint, baseOutMint, amountIn, slippageBps = 50, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID, programId = constants_1.PROGRAM_ID, } = args;
+    if (baseInMint.equals(baseOutMint)) {
+        throw new Error("base_to_base_swap: baseInMint must differ from baseOutMint");
+    }
+    // 1. Derive PDAs
+    const [config] = (0, pda_1.findJlpdConfigPda)(programId);
+    const [managerRole] = (0, pda_1.findJlpdManagerRolePda)(config, manager, programId);
+    const [strategyStateIn] = (0, pda_1.findStrategyStatePda)(baseInMint, programId);
+    const [strategyStateOut] = (0, pda_1.findStrategyStatePda)(baseOutMint, programId);
+    const baseInAta = (0, ata_1.findAta)(baseInMint, strategyStateIn, tokenProgram);
+    const baseOutAta = (0, ata_1.findAta)(baseOutMint, strategyStateOut, tokenProgram);
+    // 2. Resolve oracle accounts.
+    //    Stablecoins always get PublicKey.default — on-chain ignores the feed.
+    //    Volatile assets: use caller override, or fetch strategy state to read price_oracle.
+    //    The two fetches are issued in parallel when both are needed.
+    const needFetchIn = !isStableMint(baseInMint) && args.priceOracleIn === undefined;
+    const needFetchOut = !isStableMint(baseOutMint) && args.priceOracleOut === undefined;
+    const [fetchedIn, fetchedOut] = await Promise.all([
+        needFetchIn ? (0, accounts_1.fetchJlpStrategyState)(connection, baseInMint, programId) : Promise.resolve(null),
+        needFetchOut ? (0, accounts_1.fetchJlpStrategyState)(connection, baseOutMint, programId) : Promise.resolve(null),
+    ]);
+    const priceOracleIn = isStableMint(baseInMint)
+        ? web3_js_1.PublicKey.default
+        : (args.priceOracleIn ?? fetchedIn.priceOracle);
+    const priceOracleOut = isStableMint(baseOutMint)
+        ? web3_js_1.PublicKey.default
+        : (args.priceOracleOut ?? fetchedOut.priceOracle);
+    // 3. Jupiter quote
+    const quote = await (0, swap_jlp_1.getJupiterSwapQuote)({
+        inputMint: baseInMint,
+        outputMint: baseOutMint,
+        amount: amountIn,
+        slippageBps,
+    });
+    // 4. Jupiter swap instructions (strategy_state_in PDA signs via CPI seeds).
+    //    We override destinationTokenAccount to baseOutAta (ATA owned by strategy_state_OUT)
+    //    because Jupiter defaults destination to userPublicKey's ATA, which for base_to_base
+    //    would set it to ATA(baseOutMint, strategy_state_IN) — the wrong owner.
+    //    On-chain: base_to_base_swap validates destination == base_out_ata → InvalidOwner if wrong.
+    const jupSwap = await (0, swap_jlp_1.getJupiterSwapInstructions)({
+        quoteResponse: quote,
+        userPublicKey: strategyStateIn,
+        destinationTokenAccount: baseOutAta,
+    });
+    // Defensive guard: verify the first writable non-signer account in the Jupiter swap
+    // instruction's accounts list that matches baseOutAta.
+    //
+    // NOTE: Jupiter's swap-instructions route account ordering is not guaranteed to be
+    // stable across route variants (shared-accounts vs standard-route layout). Reliably
+    // identifying the destination-ATA index requires parsing the Jupiter instruction
+    // discriminator and routing into variant-specific offset tables — which would
+    // duplicate on-chain logic and drift. Instead we do a membership check: confirm
+    // baseOutAta appears somewhere in the account list (necessary condition), and rely
+    // on the destinationTokenAccount override above to ensure it is wired as destination.
+    const baseOutAtaStr = baseOutAta.toBase58();
+    const baseInAtaStr = baseInAta.toBase58();
+    const routeKeys = jupSwap.remainingAccounts.map((a) => a.pubkey.toBase58());
+    if (!routeKeys.includes(baseOutAtaStr)) {
+        throw new Error(`base_to_base_swap: Jupiter route does not include baseOutAta (${baseOutAtaStr}). ` +
+            `destinationTokenAccount override may not have been honored. ` +
+            `Source: ${baseInAtaStr}. Route accounts: ${routeKeys.join(", ")}`);
+    }
+    if (!routeKeys.includes(baseInAtaStr)) {
+        throw new Error(`base_to_base_swap: Jupiter route does not include baseInAta (${baseInAtaStr}). ` +
+            `Unexpected route configuration. Route accounts: ${routeKeys.join(", ")}`);
+    }
+    const minOut = BigInt(quote.otherAmountThreshold);
+    // 5. Build ix
+    const ix = createBaseToBaseSwapIx({
+        manager,
+        config,
+        managerRole,
+        strategyStateIn,
+        strategyStateOut,
+        baseInAta,
+        baseOutAta,
+        baseInMint,
+        baseOutMint,
+        tokenProgram,
+        jupiterProgram: constants_1.JUPITER_PROGRAM,
+        priceOracleIn,
+        priceOracleOut,
+        amountIn,
+        minOut,
+        jupiterData: jupSwap.swapInstructionData,
+        remainingAccounts: jupSwap.remainingAccounts,
+    }, programId);
+    // 6. Resolve ALTs
+    const altAddresses = jupSwap.addressLookupTableAddresses;
+    const altPubkeys = altAddresses.map((a) => new web3_js_1.PublicKey(a));
+    const altInfos = await connection.getMultipleAccountsInfo(altPubkeys);
+    const addressLookupTables = [];
+    for (let i = 0; i < altInfos.length; i++) {
+        const info = altInfos[i];
+        if (!info)
+            continue;
+        addressLookupTables.push(new web3_js_1.AddressLookupTableAccount({
+            key: altPubkeys[i],
+            state: web3_js_1.AddressLookupTableAccount.deserialize(info.data),
+        }));
+    }
+    return {
+        instructions: [ix],
+        addressLookupTables,
+        quoteInAmount: BigInt(quote.inAmount),
+        quoteOutAmount: BigInt(quote.outAmount),
+        minOut,
+        quote,
+    };
+}

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

@@ -6,11 +6,18 @@ export declare const PROGRAM_ID_DEVNET: PublicKey;
 export declare const JLP_MINT: PublicKey;
 /** Jupiter aggregator program (swap routing) */
 export declare const JUPITER_PROGRAM: PublicKey;
-/** Doves oracle: BTC/USD price feed */
+/**
+ * Reference/backfill defaults for the Doves price oracle feeds.
+ * Pending Jupiter confirmation; runtime feed comes from StrategyState.priceOracle.
+ * These constants are NOT used at runtime — swap_jlp, base_to_base_swap, and
+ * settle_yield all read the feed from strategy_state.price_oracle on-chain.
+ * Use these for backfill scripts, LUT tooling, and admin init calls only.
+ */
+/** Doves oracle: BTC/USD price feed (reference/backfill default only) */
 export declare const DOVES_BTC_USD: PublicKey;
-/** Doves oracle: ETH/USD price feed */
+/** Doves oracle: ETH/USD price feed (reference/backfill default only) */
 export declare const DOVES_ETH_USD: PublicKey;
-/** Doves oracle: SOL/USD price feed */
+/** Doves oracle: SOL/USD price feed (reference/backfill default only) */
 export declare const DOVES_SOL_USD: PublicKey;
 /** Jupiter Perps Pool account (stores aumUsd for JLP price calculation) */
 export declare const JLP_POOL_ACCOUNT: PublicKey;
@@ -30,6 +37,7 @@ export declare const IX_DEPOSIT: Buffer<ArrayBuffer>;
 export declare const IX_WITHDRAW: Buffer<ArrayBuffer>;
 export declare const IX_UPDATE_AUM: Buffer<ArrayBuffer>;
 export declare const IX_SWAP_JLP: Buffer<ArrayBuffer>;
+export declare const IX_BASE_TO_BASE_SWAP: Buffer<ArrayBuffer>;
 export declare const IX_SETTLE_YIELD: Buffer<ArrayBuffer>;
 export declare const IX_DEPOSIT_TO_ADAPTER: Buffer<ArrayBuffer>;
 export declare const IX_WITHDRAW_FROM_ADAPTER: Buffer<ArrayBuffer>;

package/dist/jlpd-strategy/constants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JLPD_VAULT_IDS_BY_POOL = exports.JLPD_VAULT_IDS = exports.JLPD_POOLS = exports.BPS_DENOMINATOR = exports.PPS_DECIMALS = exports.MAX_PERF_FEE_BPS = exports.MAX_MGMT_FEE_BPS = exports.NUM_ASSETS = exports.FLAG_TEST_MODE = exports.FLAG_REBALANCE_DISABLED = exports.FLAG_JLP_DISABLED = exports.FLAG_WITHDRAWALS_DISABLED = exports.FLAG_DEPOSITS_DISABLED = exports.FLAG_PAUSED = exports.STV_POSITION_SIZE = exports.STRATEGY_STATE_SIZE = exports.MANAGER_ROLE_SIZE = exports.JLPD_CONFIG_SIZE = exports.IX_REMOVE_MANAGER = exports.IX_ADD_MANAGER = exports.IX_ADAPTER_MANAGE = exports.IX_WITHDRAW_FROM_ADAPTER = exports.IX_DEPOSIT_TO_ADAPTER = exports.IX_SETTLE_YIELD = exports.IX_SWAP_JLP = exports.IX_UPDATE_AUM = exports.IX_WITHDRAW = exports.IX_DEPOSIT = exports.IX_CLOSE_POSITION = exports.IX_INIT_POSITION = exports.IX_INIT_OR_UPDATE_STRATEGY_STATE = exports.IX_INIT_OR_UPDATE_CONFIG = exports.DISC_MANAGER_ROLE = exports.DISC_STV_POSITION = exports.DISC_STRATEGY_STATE = exports.DISC_JLPD_CONFIG = exports.POSITION_SEED = exports.STRATEGY_STATE_SEED = exports.MANAGER_SEED = exports.CONFIG_SEED = exports.JUPITER_PERPS_PROGRAM = exports.JLP_POOL_ACCOUNT = exports.DOVES_SOL_USD = exports.DOVES_ETH_USD = exports.DOVES_BTC_USD = exports.JUPITER_PROGRAM = exports.JLP_MINT = exports.PROGRAM_ID_DEVNET = exports.PROGRAM_ID_MAINNET = exports.PROGRAM_ID = void 0;
-exports.JLPD_POOL_DECIMALS = void 0;
+exports.JLPD_VAULT_IDS = exports.JLPD_POOLS = exports.BPS_DENOMINATOR = exports.PPS_DECIMALS = exports.MAX_PERF_FEE_BPS = exports.MAX_MGMT_FEE_BPS = exports.NUM_ASSETS = exports.FLAG_TEST_MODE = exports.FLAG_REBALANCE_DISABLED = exports.FLAG_JLP_DISABLED = exports.FLAG_WITHDRAWALS_DISABLED = exports.FLAG_DEPOSITS_DISABLED = exports.FLAG_PAUSED = exports.STV_POSITION_SIZE = exports.STRATEGY_STATE_SIZE = exports.MANAGER_ROLE_SIZE = exports.JLPD_CONFIG_SIZE = exports.IX_REMOVE_MANAGER = exports.IX_ADD_MANAGER = exports.IX_ADAPTER_MANAGE = exports.IX_WITHDRAW_FROM_ADAPTER = exports.IX_DEPOSIT_TO_ADAPTER = exports.IX_SETTLE_YIELD = exports.IX_BASE_TO_BASE_SWAP = exports.IX_SWAP_JLP = exports.IX_UPDATE_AUM = exports.IX_WITHDRAW = exports.IX_DEPOSIT = exports.IX_CLOSE_POSITION = exports.IX_INIT_POSITION = exports.IX_INIT_OR_UPDATE_STRATEGY_STATE = exports.IX_INIT_OR_UPDATE_CONFIG = exports.DISC_MANAGER_ROLE = exports.DISC_STV_POSITION = exports.DISC_STRATEGY_STATE = exports.DISC_JLPD_CONFIG = exports.POSITION_SEED = exports.STRATEGY_STATE_SEED = exports.MANAGER_SEED = exports.CONFIG_SEED = exports.JUPITER_PERPS_PROGRAM = exports.JLP_POOL_ACCOUNT = exports.DOVES_SOL_USD = exports.DOVES_ETH_USD = exports.DOVES_BTC_USD = exports.JUPITER_PROGRAM = exports.JLP_MINT = exports.PROGRAM_ID_DEVNET = exports.PROGRAM_ID_MAINNET = exports.PROGRAM_ID = void 0;
+exports.JLPD_POOL_DECIMALS = exports.JLPD_VAULT_IDS_BY_POOL = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.PROGRAM_ID = new web3_js_1.PublicKey("GXqt4ZH2UUBsLWwMNJiZMXza3q7xEGChfW8XjVRjLxr5");
 exports.PROGRAM_ID_MAINNET = exports.PROGRAM_ID;
@@ -13,12 +13,19 @@ exports.PROGRAM_ID_DEVNET = new web3_js_1.PublicKey("AcVcAihjB9Z3Lg3ZiboWxni2sTz
 exports.JLP_MINT = new web3_js_1.PublicKey("27G8MtK7VtTcCHkpASjSDdkWWYfoqT6ggEuKidVJidD4");
 /** Jupiter aggregator program (swap routing) */
 exports.JUPITER_PROGRAM = new web3_js_1.PublicKey("JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4");
-/** Doves oracle: BTC/USD price feed */
-exports.DOVES_BTC_USD = new web3_js_1.PublicKey("4HBbPx9QJdjJ7GUe6bsiJjGybvfpDhQMMPXP1UEa7VT5");
-/** Doves oracle: ETH/USD price feed */
-exports.DOVES_ETH_USD = new web3_js_1.PublicKey("5URYohbPy32nxK1t3jAHVNfdWY2xTubHiFvLrE3VhXEp");
-/** Doves oracle: SOL/USD price feed */
-exports.DOVES_SOL_USD = new web3_js_1.PublicKey("39cWjvHrpHNz2SbXv6ME4NPhqBDBd4KsjUYv5JkHEAJU");
+/**
+ * Reference/backfill defaults for the Doves price oracle feeds.
+ * Pending Jupiter confirmation; runtime feed comes from StrategyState.priceOracle.
+ * These constants are NOT used at runtime — swap_jlp, base_to_base_swap, and
+ * settle_yield all read the feed from strategy_state.price_oracle on-chain.
+ * Use these for backfill scripts, LUT tooling, and admin init calls only.
+ */
+/** Doves oracle: BTC/USD price feed (reference/backfill default only) */
+exports.DOVES_BTC_USD = new web3_js_1.PublicKey("FxSvTMvZS9S1jjjixHPh7QEn99WuVWaEHqvw8NqfWmB8");
+/** Doves oracle: ETH/USD price feed (reference/backfill default only) */
+exports.DOVES_ETH_USD = new web3_js_1.PublicKey("9QEL8K51uZrqoqTp6Zfjmr65gYqvivVrd2Yg5bo6joGV");
+/** Doves oracle: SOL/USD price feed (reference/backfill default only) */
+exports.DOVES_SOL_USD = new web3_js_1.PublicKey("A5d4aY4K4BYEtXdAY7WNBHTKxRMeyAA6RYHWVYEW22Fe");
 /** Jupiter Perps Pool account (stores aumUsd for JLP price calculation) */
 exports.JLP_POOL_ACCOUNT = new web3_js_1.PublicKey("5BUwFW4nRbftYTDMbgxykoFWqWHPzahFSNAaaaJtVKsq");
 /** Jupiter Perpetuals Program ID */
@@ -37,14 +44,16 @@ Object.defineProperty(exports, "DISC_STRATEGY_STATE", { enumerable: true, get: f
 Object.defineProperty(exports, "DISC_STV_POSITION", { enumerable: true, get: function () { return constants_1.DISC_STV_POSITION; } });
 Object.defineProperty(exports, "DISC_MANAGER_ROLE", { enumerable: true, get: function () { return constants_1.DISC_MANAGER_ROLE; } });
 // Instruction discriminators (Anchor 8-byte)
-exports.IX_INIT_OR_UPDATE_CONFIG = Buffer.from([234, 24, 218, 120, 213, 149, 245, 213]);
-exports.IX_INIT_OR_UPDATE_STRATEGY_STATE = Buffer.from([223, 7, 93, 99, 12, 44, 180, 255]);
+exports.IX_INIT_OR_UPDATE_CONFIG = Buffer.from([120, 208, 225, 179, 75, 21, 139, 209]);
+exports.IX_INIT_OR_UPDATE_STRATEGY_STATE = Buffer.from([148, 75, 234, 144, 185, 1, 1, 111]);
 exports.IX_INIT_POSITION = Buffer.from([197, 20, 10, 1, 97, 160, 177, 91]);
 exports.IX_CLOSE_POSITION = Buffer.from([123, 134, 81, 0, 49, 68, 98, 98]);
 exports.IX_DEPOSIT = Buffer.from([242, 35, 198, 137, 82, 225, 242, 182]);
 exports.IX_WITHDRAW = Buffer.from([183, 18, 70, 156, 148, 109, 161, 34]);
 exports.IX_UPDATE_AUM = Buffer.from([162, 40, 227, 16, 84, 169, 182, 185]);
 exports.IX_SWAP_JLP = Buffer.from([190, 44, 224, 191, 169, 243, 146, 127]);
+// sha256("global:base_to_base_swap")[..8]
+exports.IX_BASE_TO_BASE_SWAP = Buffer.from([138, 14, 49, 99, 201, 152, 239, 96]);
 exports.IX_SETTLE_YIELD = Buffer.from([64, 28, 44, 24, 43, 204, 58, 215]);
 // sha256("global:deposit_to_adapter")[..8]
 exports.IX_DEPOSIT_TO_ADAPTER = Buffer.from([123, 167, 9, 180, 75, 80, 195, 219]);

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

@@ -4,6 +4,7 @@ export * from "./pda";
 export * from "./accounts";
 export * from "./instructions";
 export * from "./swap-jlp";
+export * from "./base-to-base-swap";
 export * from "./settle-yield";
 export * from "./jlp-data";
 export * from "./jlp-borrow";

package/dist/jlpd-strategy/index.js

@@ -20,6 +20,7 @@ __exportStar(require("./pda"), exports);
 __exportStar(require("./accounts"), exports);
 __exportStar(require("./instructions"), exports);
 __exportStar(require("./swap-jlp"), exports);
+__exportStar(require("./base-to-base-swap"), exports);
 __exportStar(require("./settle-yield"), exports);
 __exportStar(require("./jlp-data"), exports);
 __exportStar(require("./jlp-borrow"), exports);

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

@@ -1,4 +1,53 @@
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
+export interface InitOrUpdateStrategyStateArgs {
+    /** Admin signer; also the rent payer for the init_if_needed ATAs (writable). */
+    admin: PublicKey;
+    config: PublicKey;
+    strategyState: PublicKey;
+    baseMint: PublicKey;
+    jlpMint: PublicKey;
+    strategyBaseAta: PublicKey;
+    strategyJlpAta: PublicKey;
+    tokenProgram: PublicKey;
+    systemProgram?: PublicKey;
+    associatedTokenProgram?: PublicKey;
+    rent?: PublicKey;
+    /** New admin/authority Pubkey, or null to leave unchanged. */
+    authority?: PublicKey | null;
+    /** New flags value, or null to leave unchanged. */
+    flags?: number | null;
+    /**
+     * Doves price-feed account to store in strategy_state.price_oracle.
+     * Serialized as the THIRD optional field in InitOrUpdateStrategyStateParams.
+     * Pass null to leave unchanged.
+     */
+    priceOracle?: PublicKey | null;
+}
+/**
+ * Create an `init_or_update_strategy_state` instruction for the JLPD program.
+ *
+ * Instruction data: [8-byte disc,
+ *   Option<Pubkey> authority,   (1 tag + 32 bytes if Some)
+ *   Option<u16>   flags,        (1 tag + 2 bytes if Some)
+ *   Option<Pubkey> price_oracle (1 tag + 32 bytes if Some)]
+ *
+ * Field order matches Rust `InitOrUpdateStrategyStateParams`:
+ *   authority: Option<Pubkey>, flags: Option<u16>, price_oracle: Option<Pubkey>
+ *
+ * Accounts (match on-chain InitOrUpdateStrategyState exactly):
+ *   0. admin            (signer, writable — pays init_if_needed ATA rent)
+ *   1. config
+ *   2. strategy_state   (writable — init_if_needed)
+ *   3. base_mint
+ *   4. jlp_mint
+ *   5. strategy_base_ata (writable — init_if_needed)
+ *   6. strategy_jlp_ata  (writable — init_if_needed)
+ *   7. system_program
+ *   8. token_program
+ *   9. associated_token_program
+ *  10. rent
+ */
+export declare function createInitOrUpdateStrategyStateIx(args: InitOrUpdateStrategyStateArgs, programId?: PublicKey): TransactionInstruction;
 export interface AddManagerArgs {
     admin: PublicKey;
     payer: PublicKey;

package/dist/jlpd-strategy/instructions.js

@@ -1,9 +1,64 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createInitOrUpdateStrategyStateIx = createInitOrUpdateStrategyStateIx;
 exports.createAddManagerIx = createAddManagerIx;
 exports.createRemoveManagerIx = createRemoveManagerIx;
 const web3_js_1 = require("@solana/web3.js");
+const spl_token_1 = require("@solana/spl-token");
+const buffer_1 = require("../common/buffer");
 const constants_1 = require("./constants");
+/**
+ * Create an `init_or_update_strategy_state` instruction for the JLPD program.
+ *
+ * Instruction data: [8-byte disc,
+ *   Option<Pubkey> authority,   (1 tag + 32 bytes if Some)
+ *   Option<u16>   flags,        (1 tag + 2 bytes if Some)
+ *   Option<Pubkey> price_oracle (1 tag + 32 bytes if Some)]
+ *
+ * Field order matches Rust `InitOrUpdateStrategyStateParams`:
+ *   authority: Option<Pubkey>, flags: Option<u16>, price_oracle: Option<Pubkey>
+ *
+ * Accounts (match on-chain InitOrUpdateStrategyState exactly):
+ *   0. admin            (signer, writable — pays init_if_needed ATA rent)
+ *   1. config
+ *   2. strategy_state   (writable — init_if_needed)
+ *   3. base_mint
+ *   4. jlp_mint
+ *   5. strategy_base_ata (writable — init_if_needed)
+ *   6. strategy_jlp_ata  (writable — init_if_needed)
+ *   7. system_program
+ *   8. token_program
+ *   9. associated_token_program
+ *  10. rent
+ */
+function createInitOrUpdateStrategyStateIx(args, programId = constants_1.PROGRAM_ID) {
+    const { admin, config, strategyState, baseMint, jlpMint, strategyBaseAta, strategyJlpAta, tokenProgram, systemProgram = web3_js_1.SystemProgram.programId, associatedTokenProgram = spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, rent = web3_js_1.SYSVAR_RENT_PUBKEY, authority, flags, priceOracle, } = args;
+    // Serialize Borsh Option<T> fields in Rust param order:
+    //   1. authority:    Option<Pubkey>
+    //   2. flags:        Option<u16>
+    //   3. price_oracle: Option<Pubkey>
+    const parts = [...constants_1.IX_INIT_OR_UPDATE_STRATEGY_STATE];
+    (0, buffer_1.writeOptionalPubkey)(parts, authority ?? null);
+    (0, buffer_1.writeOptionalU16)(parts, flags ?? null);
+    (0, buffer_1.writeOptionalPubkey)(parts, priceOracle ?? null);
+    return new web3_js_1.TransactionInstruction({
+        keys: [
+            { pubkey: admin, isSigner: true, isWritable: true },
+            { pubkey: config, isSigner: false, isWritable: false },
+            { pubkey: strategyState, isSigner: false, isWritable: true },
+            { pubkey: baseMint, isSigner: false, isWritable: false },
+            { pubkey: jlpMint, isSigner: false, isWritable: false },
+            { pubkey: strategyBaseAta, isSigner: false, isWritable: true },
+            { pubkey: strategyJlpAta, isSigner: false, isWritable: true },
+            { pubkey: systemProgram, isSigner: false, isWritable: false },
+            { pubkey: tokenProgram, isSigner: false, isWritable: false },
+            { pubkey: associatedTokenProgram, isSigner: false, isWritable: false },
+            { pubkey: rent, isSigner: false, isWritable: false },
+        ],
+        programId,
+        data: Buffer.from(parts),
+    });
+}
 /**
  * Create an `add_manager` instruction for the JLPD Strategy program.
  *

package/dist/jlpd-strategy/jlp-data.d.ts

@@ -37,6 +37,17 @@ export interface JlpPoolDetails {
     jlpPrice: number;
     jlpSupply: number;
 }
+/**
+ * Reset the price memo. Intended for unit tests that mock global fetch with
+ * scenario-specific prices — module-level cache pollutes across tests when
+ * TTL has not expired, leading to assertion failures that depend on test
+ * ordering.
+ *
+ * Not part of the public surface for application code; cache TTL handles
+ * production. Exported under `__test__*` namespace convention so consumers
+ * tree-shake it out and never accidentally rely on cache invalidation.
+ */
+export declare function __test__resetPricesCache(): void;
 /**
  * Fetch full JLP pool details: fee parameters, per-custody target/current
  * weights, pool AUM, and JLP price.

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.__test__resetPricesCache = __test__resetPricesCache;
 exports.fetchJlpPoolDetails = fetchJlpPoolDetails;
 exports.computeAddLiquidityFee = computeAddLiquidityFee;
 exports.fetchJlpCustodyData = fetchJlpCustodyData;
@@ -113,6 +114,20 @@ async function fetchAllCustodies(connection) {
 const PRICES_TTL_MS = 30000;
 let pricesCache = null;
 let pricesInFlight = null;
+/**
+ * Reset the price memo. Intended for unit tests that mock global fetch with
+ * scenario-specific prices — module-level cache pollutes across tests when
+ * TTL has not expired, leading to assertion failures that depend on test
+ * ordering.
+ *
+ * Not part of the public surface for application code; cache TTL handles
+ * production. Exported under `__test__*` namespace convention so consumers
+ * tree-shake it out and never accidentally rely on cache invalidation.
+ */
+function __test__resetPricesCache() {
+    pricesCache = null;
+    pricesInFlight = null;
+}
 async function fetchPrices() {
     if (pricesCache && Date.now() - pricesCache.at < PRICES_TTL_MS) {
         return pricesCache.data;

package/dist/jlpd-strategy/settle-yield.d.ts

@@ -1,4 +1,4 @@
-import { PublicKey, TransactionInstruction } from "@solana/web3.js";
+import { PublicKey, TransactionInstruction, AccountMeta } from "@solana/web3.js";
 /** Arguments accepted by `createSettleYieldIx`. */
 export interface CreateSettleYieldIxArgs {
     manager: PublicKey;
@@ -7,6 +7,25 @@ export interface CreateSettleYieldIxArgs {
     jlpMint?: PublicKey;
     tokenProgram?: PublicKey;
     programId?: PublicKey;
+    /**
+     * Adapter accounts for the earn-yield accrual CPI, appended after the 14
+     * fixed accounts. REQUIRED whenever `config.jlp_earn_amount > 0` (the program
+     * rejects settle with no adapter accounts when JLP is deployed in an adapter).
+     * Order: [adapter_state (writable), adapter_program (executable),
+     * ...adapter update_yield protocol accounts]. Omit when no earn is active.
+     */
+    adapterAccounts?: AccountMeta[];
+    /**
+     * Doves price-feed accounts for BTC/ETH/SOL. These MUST equal the on-chain
+     * `strategy_state.price_oracle` of each respective strategy (the program now
+     * validates the passed oracle against the stored feed). To stay rotation-proof,
+     * read each strategy's `priceOracle` from chain and pass it here. If omitted,
+     * falls back to the `DOVES_*_USD` reference constants (correct only while they
+     * match the backfilled on-chain value).
+     */
+    priceOracleBtc?: PublicKey;
+    priceOracleEth?: PublicKey;
+    priceOracleSol?: PublicKey;
 }
 /**
  * Build a `settle_yield` instruction with automatic PDA derivation.

package/dist/jlpd-strategy/settle-yield.js

@@ -29,14 +29,15 @@ const ata_1 = require("../common/ata");
  *  11: jlp_pool (Jupiter Perps Pool)
  *  12: jlp_mint_account
  *  13: manager (signer)
+ *  14+: optional adapter accounts (earn accrual CPI; required when earn active)
  */
 function buildRawSettleYieldIx(args, programId = constants_1.PROGRAM_ID) {
-    const { config, managerRole, vaultJlpAta, stv0, stv1, stv2, stv3, stv4, dovesBtcUsd, dovesEthUsd, dovesSolUsd, jlpPool, jlpMintAccount, manager, } = args;
+    const { config, managerRole, vaultJlpAta, stv0, stv1, stv2, stv3, stv4, dovesBtcUsd, dovesEthUsd, dovesSolUsd, jlpPool, jlpMintAccount, manager, adapterAccounts = [], } = args;
     // Instruction data: just the 8-byte discriminator (no params)
     const data = Buffer.alloc(8);
     constants_1.IX_SETTLE_YIELD.copy(data, 0);
     const keys = [
-        { pubkey: config, isSigner: false, isWritable: false },
+        { pubkey: config, isSigner: false, isWritable: true },
         { pubkey: managerRole, isSigner: false, isWritable: false },
         { pubkey: vaultJlpAta, isSigner: false, isWritable: false },
         { pubkey: stv0, isSigner: false, isWritable: true },
@@ -50,6 +51,7 @@ function buildRawSettleYieldIx(args, programId = constants_1.PROGRAM_ID) {
         { pubkey: jlpPool, isSigner: false, isWritable: false },
         { pubkey: jlpMintAccount, isSigner: false, isWritable: false },
         { pubkey: manager, isSigner: true, isWritable: false },
+        ...adapterAccounts,
     ];
     return new web3_js_1.TransactionInstruction({ keys, programId, data });
 }
@@ -67,7 +69,7 @@ function buildRawSettleYieldIx(args, programId = constants_1.PROGRAM_ID) {
  * (if any) are named `build*Transaction`.
  */
 function createSettleYieldIx(args) {
-    const { manager, baseAssetMints, jlpMint = constants_1.JLP_MINT, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID, programId = constants_1.PROGRAM_ID, } = args;
+    const { manager, baseAssetMints, jlpMint = constants_1.JLP_MINT, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID, programId = constants_1.PROGRAM_ID, adapterAccounts, priceOracleBtc = constants_1.DOVES_BTC_USD, priceOracleEth = constants_1.DOVES_ETH_USD, priceOracleSol = constants_1.DOVES_SOL_USD, } = args;
     // Derive PDAs
     const [config] = (0, pda_1.findJlpdConfigPda)(programId);
     const [managerRole] = (0, pda_1.findJlpdManagerRolePda)(config, manager, programId);
@@ -88,11 +90,12 @@ function createSettleYieldIx(args) {
         stv2,
         stv3,
         stv4,
-        dovesBtcUsd: constants_1.DOVES_BTC_USD,
-        dovesEthUsd: constants_1.DOVES_ETH_USD,
-        dovesSolUsd: constants_1.DOVES_SOL_USD,
+        dovesBtcUsd: priceOracleBtc,
+        dovesEthUsd: priceOracleEth,
+        dovesSolUsd: priceOracleSol,
         jlpPool: constants_1.JLP_POOL_ACCOUNT,
         jlpMintAccount: jlpMint,
         manager,
+        adapterAccounts,
     }, programId);
 }

package/dist/jlpd-strategy/swap-jlp.d.ts

@@ -16,6 +16,16 @@ export interface CreateSwapJlpIxArgs {
     jlpMint: PublicKey;
     tokenProgram: PublicKey;
     jupiterProgram: PublicKey;
+    /**
+     * Doves price-feed account for this base asset. Must match
+     * strategy_state.price_oracle on-chain. Stablecoins (USDC/JupUSD) use
+     * PublicKey.default — the program ignores the oracle for $1-pegged assets.
+     */
+    priceOracle: PublicKey;
+    /** Jupiter Perps JLP pool account — must equal the on-chain JLP_POOL_ACCOUNT. */
+    jlpPool: PublicKey;
+    /** JLP mint account (raw) for pool-price supply read — equals config.jlp_mint. */
+    jlpMintAccount: PublicKey;
     direction: SwapDirection;
     amount: bigint | BN;
     minOut: bigint | BN;
@@ -78,10 +88,15 @@ export declare 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.
  */
 export declare function getJupiterSwapInstructions(args: {
     quoteResponse: JupiterQuote;
     userPublicKey: PublicKey;
+    destinationTokenAccount?: PublicKey;
 }): Promise<{
     swapInstructionData: Buffer;
     remainingAccounts: AccountMeta[];
@@ -107,6 +122,17 @@ export declare function buildSwapJlpTransaction(args: {
     jlpMint?: PublicKey;
     tokenProgram?: PublicKey;
     programId?: PublicKey;
+    /**
+     * Doves price-feed account for this base asset. Must equal
+     * strategy_state.price_oracle on-chain.
+     *
+     * - For non-stable assets (BTC/ETH/SOL): if omitted the strategy state is
+     *   fetched from the chain to read the stored feed. Provide this when you
+     *   already have the strategy state in memory to avoid an extra RPC call.
+     * - For stable assets (USDC/JupUSD): pass `PublicKey.default` or omit —
+     *   the program uses a hardcoded $1 price and ignores the oracle account.
+     */
+    priceOracle?: PublicKey;
 }): Promise<{
     instructions: TransactionInstruction[];
     addressLookupTables: AddressLookupTableAccount[];