@elemental-stv-core/sdk 0.5.0 → 0.7.0

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

@@ -4,6 +4,17 @@
  *
  * The instruction builders for deposit/withdraw are in adapter.ts.
  * This file provides static account addresses and position parsing utilities.
+ *
+ * @remarks
+ * Read-only utilities for displaying JLP Borrow positions. This module exports
+ * **no instruction builders** — all on-chain operations against the Jupiter
+ * Lend Borrow program are routed through `adapter.ts`. The exports here are:
+ *
+ *   - Static program / account constants (program IDs, vault accounts, oracles)
+ *   - `parsePosition` — deserializes a position account
+ *   - `readBorrowExchangePrice` — reads the vault state exchange price
+ *
+ * Anything new that needs to *send transactions* should live in `adapter.ts`.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.POSITION_DISCRIMINATOR = exports.JLP_JUPUSD_VAULT_ID = exports.ORACLE_PROGRAM = exports.LIQUIDITY_PROGRAM = exports.LIQUIDITY = exports.NEW_BRANCH = exports.VAULT_BORROW_ATA = exports.VAULT_SUPPLY_ATA = exports.BORROW_RATE_MODEL = exports.SUPPLY_RATE_MODEL = exports.VAULT_BORROW_POS_ON_LIQ = exports.VAULT_SUPPLY_POS_ON_LIQ = exports.BORROW_RESERVES_LIQUIDITY = exports.SUPPLY_RESERVES_LIQUIDITY = exports.BORROW_ORACLE = exports.BORROW_VAULT_STATE = exports.BORROW_VAULT_CONFIG = exports.JUP_LEND_BORROW_PROGRAM = void 0;
@@ -38,6 +49,20 @@ exports.JLP_JUPUSD_VAULT_ID = 58;
 // Position Account Parsing
 // ============================================================================
 exports.POSITION_DISCRIMINATOR = Buffer.from([0xaa, 0xbc, 0x8f, 0xe4, 0x7a, 0x40, 0xf7, 0xd0]);
+/**
+ * Parse a Jupiter Lend Borrow Position account.
+ *
+ * Layout (offsets include the 8-byte discriminator):
+ *   [  0..  8]  discriminator         (sha256("account:Position")[..8] —
+ *                                       value documented in `POSITION_DISCRIMINATOR`)
+ *   [  8.. 14]  _padding              [u8; 6]
+ *   [ 14.. 46]  positionMint          Pubkey   (NFT mint that owns this position)
+ *   [ 46.. 47]  _padding              u8
+ *   [ 47.. 51]  tick                  i32      (signed Fluid Vaults tick)
+ *   [ 51.. 55]  _padding              [u8; 4]
+ *   [ 55.. 63]  supplyAmount          u64      (collateral)
+ *   [ 63.. 71]  dustDebtAmount        u64      (residual borrow)
+ */
 function parsePosition(data) {
     if (data.length < 71)
         throw new Error(`Position data too short: ${data.length}`);
@@ -51,9 +76,12 @@ function parsePosition(data) {
         dustDebtAmount: (0, buffer_1.readU64)(data, 63),
     };
 }
+/**
+ * Read the exchange price (1e12 precision) from a Jupiter Lend Borrow VaultState
+ * account. The price is at offset 107 (u64 LE) within the account data.
+ */
 function readBorrowExchangePrice(vaultStateData) {
     if (vaultStateData.length < 115)
         throw new Error("VaultState data too short");
     return (0, buffer_1.readU64)(vaultStateData, 107);
 }
-//# sourceMappingURL=jlp-borrow.js.map

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

@@ -1,4 +1,5 @@
-import { Connection, PublicKey } from "@solana/web3.js";
+import { PublicKey } from "@solana/web3.js";
+import type { SolanaConnection } from "../common/connection";
 export type CustodyName = "SOL" | "ETH" | "WBTC" | "USDC" | "USDT";
 export interface JlpCustody {
     name: CustodyName;
@@ -43,7 +44,7 @@ export interface JlpPoolDetails {
  * Reads the Pool account for fees and aumUsd, Custody accounts for per-asset
  * data including target weights, and the JLP mint for total supply.
  */
-export declare function fetchJlpPoolDetails(connection: Connection): Promise<JlpPoolDetails>;
+export declare function fetchJlpPoolDetails(connection: SolanaConnection): Promise<JlpPoolDetails>;
 /**
  * Estimate the addLiquidity fee for depositing into a specific JLP custody.
  *
@@ -69,5 +70,4 @@ export declare function computeAddLiquidityFee(args: {
     feeBps: number;
     isDiscount: boolean;
 };
-export declare function fetchJlpCustodyData(connection: Connection): Promise<JlpData>;
-//# sourceMappingURL=jlp-data.d.ts.map
+export declare function fetchJlpCustodyData(connection: SolanaConnection): Promise<JlpData>;

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

@@ -403,4 +403,3 @@ async function fetchJlpCustodyData(connection) {
         custodies: results,
     };
 }
-//# sourceMappingURL=jlp-data.js.map

package/dist/jlpd-strategy/jupusd-earn.d.ts

@@ -1,15 +1,33 @@
 /**
  * Jupiter Lend Earn SDK helpers for JLPD Strategy.
  *
- * Provides instruction builder and position reading for depositing
- * borrowed JupUSD into Jupiter Lend Earn for yield.
+ * Provides position reading and APR computation for the JupUSD Earn
+ * pool used by the JLP Borrow / JupUSD Earn route.
  *
  * Reuses the JupUSD pool config from elemental-lend/jupiter-lend.ts
  * since it's the same Jupiter Lend Earn program and pool.
+ *
+ * @remarks
+ * Read-only utilities for displaying JupUSD Earn positions. This module exports
+ * **no instruction builders** — all on-chain operations against the Jupiter
+ * Lend Earn program are routed through `adapter.ts`. The exports here are:
+ *
+ *   - Static program / account constants for the JupUSD Earn pool
+ *   - `computeExchangeRate`, `computeFTokenValue`, `computeEarnApr` — math
+ *   - `fetchEarnPosition` — read-only position fetcher
+ *
+ * Anything new that needs to *send transactions* should live in `adapter.ts`.
  */
-import { Connection, PublicKey } from "@solana/web3.js";
+import { PublicKey } from "@solana/web3.js";
 import BN from "bn.js";
-export declare const JUP_LEND_EARN_PROGRAM: PublicKey;
+import type { SolanaConnection } from "../common/connection";
+import { JUP_LEND_EARN_PROGRAM } from "../elemental-lend/constants";
+/**
+ * Jupiter Lend Earn program ID. Re-exported from `elemental-lend/constants`
+ * so callers of `jlpd-strategy/jupusd-earn` can reach it without an extra
+ * import path.
+ */
+export { JUP_LEND_EARN_PROGRAM };
 export declare const JUPUSD_LENDING: PublicKey;
 export declare const JUPUSD_FTOKEN_MINT: PublicKey;
 export declare const JUPUSD_RESERVES_LIQUIDITY: PublicKey;
@@ -21,6 +39,14 @@ export declare const JUPUSD_LENDING_ADMIN: PublicKey;
 /**
  * Read the earn exchange rate from lending account + rewards model.
  * Returns the rate scaled to 1e12.
+ *
+ * Jupiter Lend Earn lending account layout (relevant fields):
+ *   [115..123]  baseExchangePrice    u64   (1e12 precision)
+ *   [123..131]  lastUpdate            u64   (unix seconds)
+ *
+ * Jupiter Lend rewards rate model layout (relevant fields):
+ *   [ 56.. 64]  startTime             u64   (unix seconds)
+ *   [ 64.. 72]  yearlyReward          u64   (rewards distributed per year)
  */
 export declare function computeExchangeRate(lendingData: Buffer, rewardsModelData: Buffer, fTokenTotalSupply: BN, currentTimestamp: number): bigint;
 /**
@@ -61,5 +87,4 @@ export interface EarnPositionInfo {
  * Fetch the earn position for a jlpd_config PDA.
  * Returns null if no fToken ATA exists.
  */
-export declare function fetchEarnPosition(connection: Connection, fTokenAta: PublicKey): Promise<EarnPositionInfo | null>;
-//# sourceMappingURL=jupusd-earn.d.ts.map
+export declare function fetchEarnPosition(connection: SolanaConnection, fTokenAta: PublicKey): Promise<EarnPositionInfo | null>;

package/dist/jlpd-strategy/jupusd-earn.js

@@ -2,11 +2,22 @@
 /**
  * Jupiter Lend Earn SDK helpers for JLPD Strategy.
  *
- * Provides instruction builder and position reading for depositing
- * borrowed JupUSD into Jupiter Lend Earn for yield.
+ * Provides position reading and APR computation for the JupUSD Earn
+ * pool used by the JLP Borrow / JupUSD Earn route.
  *
  * Reuses the JupUSD pool config from elemental-lend/jupiter-lend.ts
  * since it's the same Jupiter Lend Earn program and pool.
+ *
+ * @remarks
+ * Read-only utilities for displaying JupUSD Earn positions. This module exports
+ * **no instruction builders** — all on-chain operations against the Jupiter
+ * Lend Earn program are routed through `adapter.ts`. The exports here are:
+ *
+ *   - Static program / account constants for the JupUSD Earn pool
+ *   - `computeExchangeRate`, `computeFTokenValue`, `computeEarnApr` — math
+ *   - `fetchEarnPosition` — read-only position fetcher
+ *
+ * Anything new that needs to *send transactions* should live in `adapter.ts`.
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -17,29 +28,26 @@ exports.computeExchangeRate = computeExchangeRate;
 exports.computeFTokenValue = computeFTokenValue;
 exports.computeEarnApr = computeEarnApr;
 exports.fetchEarnPosition = fetchEarnPosition;
-const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
 const buffer_1 = require("../common/buffer");
+const jupiter_lend_1 = require("../elemental-lend/jupiter-lend");
+const constants_1 = require("../elemental-lend/constants");
+Object.defineProperty(exports, "JUP_LEND_EARN_PROGRAM", { enumerable: true, get: function () { return constants_1.JUP_LEND_EARN_PROGRAM; } });
 // ============================================================================
-// Jupiter Lend Earn Program
-// ============================================================================
-exports.JUP_LEND_EARN_PROGRAM = new web3_js_1.PublicKey("jup3YeL8QhtSx1e253b2FDvsMNC87fDrgQZivbrndc9");
+// JupUSD Earn Pool — Static Accounts
+// ----------------------------------------------------------------------------
+// All pool addresses are imported from `elemental-lend/jupiter-lend.ts` so
+// there is exactly one canonical definition. The named re-exports below are
+// preserved for backwards compatibility with any external consumers.
 // ============================================================================
-// JupUSD Earn Pool — Static Accounts (same pool as elemental-lend)
-// ============================================================================
-const EARN_MINT = new web3_js_1.PublicKey("JuprjznTrTSp2UFa3ZBUFgwdAmtZCq4MQCwysN55USD");
-exports.JUPUSD_LENDING = new web3_js_1.PublicKey("papYEgeG5uPE4niUWZhihUUzVVotJn1mAWbYo2UBSHi");
-exports.JUPUSD_FTOKEN_MINT = new web3_js_1.PublicKey("7GxATsNMnaC88vdwd2t3mwrFuQwwGvmYPrUQ4D6FotXk");
-exports.JUPUSD_RESERVES_LIQUIDITY = new web3_js_1.PublicKey("2tQE8jVR5ezDw3PDa21BNzfyQ14Ug5cTf6n3swJNjkod");
-exports.JUPUSD_SUPPLY_POS_ON_LIQ = new web3_js_1.PublicKey("DXFoJruECdEch2KpzLQ2cSpxoBSsyg4bpYPnHYofsbD4");
-exports.JUPUSD_RATE_MODEL = new web3_js_1.PublicKey("2hT44GA9r5PiqsbbmqN5CuF7ymtquoEdokRncAs9CVej");
-exports.JUPUSD_VAULT = new web3_js_1.PublicKey("9kGqd5zsQGaFfFPdUuEgbRM4V7x72Jdt7WTS4uRouAQ7");
-exports.JUPUSD_REWARDS_RATE_MODEL = new web3_js_1.PublicKey("E3U32h49TL9Qof3NeLja9qJxTrGYpY1o1NQPtrSLJjcc");
-exports.JUPUSD_LENDING_ADMIN = new web3_js_1.PublicKey("5nmGjA4s7ATzpBQXC5RNceRpaJ7pYw2wKsNBWyuSAZV6");
-const LIQUIDITY = new web3_js_1.PublicKey("7s1da8DduuBFqGra5bJBjpnvL5E9mGzCuMk1Qkh4or2Z");
-const LIQUIDITY_PROGRAM = new web3_js_1.PublicKey("jupeiUmn818Jg1ekPURTpr4mFo29p46vygyykFJ3wZC");
-const TOKEN_PROGRAM = new web3_js_1.PublicKey("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
-const ATA_PROGRAM = new web3_js_1.PublicKey("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
+exports.JUPUSD_LENDING = jupiter_lend_1.JUPUSD_POOL.lending;
+exports.JUPUSD_FTOKEN_MINT = jupiter_lend_1.JUPUSD_POOL.fTokenMint;
+exports.JUPUSD_RESERVES_LIQUIDITY = jupiter_lend_1.JUPUSD_POOL.tokenReservesLiquidity;
+exports.JUPUSD_SUPPLY_POS_ON_LIQ = jupiter_lend_1.JUPUSD_POOL.supplyPositionOnLiquidity;
+exports.JUPUSD_RATE_MODEL = jupiter_lend_1.JUPUSD_POOL.rateModel;
+exports.JUPUSD_VAULT = jupiter_lend_1.JUPUSD_POOL.vault;
+exports.JUPUSD_REWARDS_RATE_MODEL = jupiter_lend_1.JUPUSD_POOL.rewardsRateModel;
+exports.JUPUSD_LENDING_ADMIN = jupiter_lend_1.LENDING_ADMIN;
 // ============================================================================
 // Exchange Rate / APR Computation
 // ============================================================================
@@ -48,14 +56,20 @@ const SECONDS_PER_YEAR = 31536000;
 /**
  * Read the earn exchange rate from lending account + rewards model.
  * Returns the rate scaled to 1e12.
+ *
+ * Jupiter Lend Earn lending account layout (relevant fields):
+ *   [115..123]  baseExchangePrice    u64   (1e12 precision)
+ *   [123..131]  lastUpdate            u64   (unix seconds)
+ *
+ * Jupiter Lend rewards rate model layout (relevant fields):
+ *   [ 56.. 64]  startTime             u64   (unix seconds)
+ *   [ 64.. 72]  yearlyReward          u64   (rewards distributed per year)
  */
 function computeExchangeRate(lendingData, rewardsModelData, fTokenTotalSupply, currentTimestamp) {
     if (lendingData.length < 131)
         throw new Error("Lending data too short");
-    // Base exchange price (offset 115, u64 LE, 1e12 precision)
     const baseRate = (0, buffer_1.readU64)(lendingData, 115).toNumber();
     const lastUpdate = (0, buffer_1.readU64)(lendingData, 123).toNumber();
-    // Rewards rate model (offset 56: start_time, 64: yearly_reward)
     if (rewardsModelData.length < 72)
         return BigInt(baseRate);
     const startTime = (0, buffer_1.readU64)(rewardsModelData, 56).toNumber();
@@ -132,14 +146,15 @@ async function fetchEarnPosition(connection, fTokenAta) {
     ]);
     if (!ataInfo || !lendingInfo || !rewardsInfo || !mintInfo)
         return null;
-    // Read fToken balance from token account (offset 64, u64)
+    // SPL Token Account layout: [mint(0..32)][owner(32..64)][amount(64..72)]…
     const ataData = ataInfo.data;
     if (ataData.length < 72)
         return null;
     const fTokenBalance = (0, buffer_1.readU64)(ataData, 64);
-    // Read fToken total supply from mint (offset 36, u64)
+    // SPL Token Mint layout: [mintAuthority(0..36)][supply(36..44)][decimals(44..45)]…
     const mintData = mintInfo.data;
     const fTokenSupply = (0, buffer_1.readU64)(mintData, 36);
+    // baseExchangePrice from Jupiter Lend Earn lending account (offset 115)
     const lendingData = lendingInfo.data;
     const rewardsData = rewardsInfo.data;
     const tokenExchangePrice = BigInt((0, buffer_1.readU64)(lendingData, 115).toString());
@@ -149,4 +164,3 @@ async function fetchEarnPosition(connection, fTokenAta) {
     const apr = computeEarnApr(rewardsData, fTokenSupply, tokenExchangePrice);
     return { fTokenBalance, jupusdValue, apr };
 }
-//# sourceMappingURL=jupusd-earn.js.map

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

@@ -1,8 +1,13 @@
 import { PublicKey } from "@solana/web3.js";
 export declare function findJlpdConfigPda(programId?: PublicKey): [PublicKey, number];
-/** @deprecated Use findJlpdConfigPda instead */
-export declare const findJlpVaultPda: typeof findJlpdConfigPda;
-export declare function findManagerRolePda(config: PublicKey, manager: PublicKey, programId?: PublicKey): [PublicKey, number];
+/**
+ * Derive the per-JlpdConfig `ManagerRole` PDA for JLPD Strategy.
+ * Seeds: `["manager", config, manager]`.
+ *
+ * Note the per-program prefix on the name: each Elemental program has its
+ * own `ManagerRole` PDA scoped to a different anchor account (`p-stv-core`
+ * → STV, `elemental-lend` → strategy_state).
+ */
+export declare function findJlpdManagerRolePda(config: PublicKey, manager: PublicKey, programId?: PublicKey): [PublicKey, number];
 export declare function findStrategyStatePda(baseMint: PublicKey, programId?: PublicKey): [PublicKey, number];
 export declare function findStvPositionPda(stv: PublicKey, programId?: PublicKey): [PublicKey, number];
-//# sourceMappingURL=pda.d.ts.map

package/dist/jlpd-strategy/pda.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findJlpVaultPda = void 0;
 exports.findJlpdConfigPda = findJlpdConfigPda;
-exports.findManagerRolePda = findManagerRolePda;
+exports.findJlpdManagerRolePda = findJlpdManagerRolePda;
 exports.findStrategyStatePda = findStrategyStatePda;
 exports.findStvPositionPda = findStvPositionPda;
 const web3_js_1 = require("@solana/web3.js");
@@ -10,9 +9,15 @@ const constants_1 = require("./constants");
 function findJlpdConfigPda(programId = constants_1.PROGRAM_ID) {
     return web3_js_1.PublicKey.findProgramAddressSync([constants_1.CONFIG_SEED], programId);
 }
-/** @deprecated Use findJlpdConfigPda instead */
-exports.findJlpVaultPda = findJlpdConfigPda;
-function findManagerRolePda(config, manager, programId = constants_1.PROGRAM_ID) {
+/**
+ * Derive the per-JlpdConfig `ManagerRole` PDA for JLPD Strategy.
+ * Seeds: `["manager", config, manager]`.
+ *
+ * Note the per-program prefix on the name: each Elemental program has its
+ * own `ManagerRole` PDA scoped to a different anchor account (`p-stv-core`
+ * → STV, `elemental-lend` → strategy_state).
+ */
+function findJlpdManagerRolePda(config, manager, programId = constants_1.PROGRAM_ID) {
     return web3_js_1.PublicKey.findProgramAddressSync([constants_1.MANAGER_SEED, config.toBuffer(), manager.toBuffer()], programId);
 }
 function findStrategyStatePda(baseMint, programId = constants_1.PROGRAM_ID) {
@@ -21,4 +26,3 @@ function findStrategyStatePda(baseMint, programId = constants_1.PROGRAM_ID) {
 function findStvPositionPda(stv, programId = constants_1.PROGRAM_ID) {
     return web3_js_1.PublicKey.findProgramAddressSync([constants_1.POSITION_SEED, stv.toBuffer()], programId);
 }
-//# sourceMappingURL=pda.js.map

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

@@ -1,54 +1,21 @@
 import { PublicKey, TransactionInstruction } from "@solana/web3.js";
-/** Arguments for building a settle_yield instruction with explicit accounts */
+/** Arguments accepted by `createSettleYieldIx`. */
 export interface CreateSettleYieldIxArgs {
-    config: PublicKey;
-    managerRole: PublicKey;
-    vaultJlpAta: PublicKey;
-    stv0: PublicKey;
-    stv1: PublicKey;
-    stv2: PublicKey;
-    stv3: PublicKey;
-    stv4: PublicKey;
-    dovesBtcUsd: PublicKey;
-    dovesEthUsd: PublicKey;
-    dovesSolUsd: PublicKey;
-    jlpPool: PublicKey;
-    jlpMintAccount: PublicKey;
     manager: PublicKey;
+    /** 5 base asset mints in order: [BTC, ETH, SOL, USDC, JupUSD]. */
+    baseAssetMints: [PublicKey, PublicKey, PublicKey, PublicKey, PublicKey];
+    jlpMint?: PublicKey;
+    tokenProgram?: PublicKey;
+    programId?: PublicKey;
 }
 /**
- * Build the on-chain `settle_yield` instruction.
- *
- * settle_yield takes no params -- instruction data is just the 8-byte discriminator.
- *
- * Accounts (14 total):
- *   0: config (JlpdConfig PDA)
- *   1: manager_role (ManagerRole PDA)
- *   2: vault_jlp_ata (JLP ATA owned by config)
- *   3: stv_0 (BTC strategy_state, mut)
- *   4: stv_1 (ETH strategy_state, mut)
- *   5: stv_2 (SOL strategy_state, mut)
- *   6: stv_3 (USDC strategy_state, mut)
- *   7: stv_4 (JupUSD strategy_state, mut)
- *   8: doves_btc_usd (oracle)
- *   9: doves_eth_usd (oracle)
- *  10: doves_sol_usd (oracle)
- *  11: jlp_pool (Jupiter Perps Pool)
- *  12: jlp_mint_account
- *  13: manager (signer)
- */
-export declare function createSettleYieldIx(args: CreateSettleYieldIxArgs, programId?: PublicKey): TransactionInstruction;
-/**
- * Build a settle_yield instruction with automatic PDA derivation.
+ * Build a `settle_yield` instruction with automatic PDA derivation.
  *
  * Requires the 5 base asset mints in order: [BTC, ETH, SOL, USDC, JupUSD].
  * These must match the `base_asset_mints` array on the JlpdConfig account.
+ *
+ * Naming follows the SDK convention: low-level instruction builders are named
+ * `create*Ix` (this is the canonical name); high-level transaction wrappers
+ * (if any) are named `build*Transaction`.
  */
-export declare function buildSettleYieldIx(args: {
-    manager: PublicKey;
-    baseAssetMints: [PublicKey, PublicKey, PublicKey, PublicKey, PublicKey];
-    jlpMint?: PublicKey;
-    tokenProgram?: PublicKey;
-    programId?: PublicKey;
-}): TransactionInstruction;
-//# sourceMappingURL=settle-yield.d.ts.map
+export declare function createSettleYieldIx(args: CreateSettleYieldIxArgs): TransactionInstruction;

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

@@ -1,24 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSettleYieldIx = createSettleYieldIx;
-exports.buildSettleYieldIx = buildSettleYieldIx;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const constants_1 = require("./constants");
 const pda_1 = require("./pda");
+const ata_1 = require("../common/ata");
 // ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-/** Derive ATA address */
-function findAta(mint, owner, tokenProgram) {
-    const [ata] = web3_js_1.PublicKey.findProgramAddressSync([owner.toBuffer(), tokenProgram.toBuffer(), mint.toBuffer()], spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
-    return ata;
-}
-// ---------------------------------------------------------------------------
-// Low-level instruction builder
+// Internal raw builder
 // ---------------------------------------------------------------------------
 /**
- * Build the on-chain `settle_yield` instruction.
+ * Build the on-chain `settle_yield` instruction from explicit account inputs.
  *
  * settle_yield takes no params -- instruction data is just the 8-byte discriminator.
  *
@@ -38,7 +30,7 @@ function findAta(mint, owner, tokenProgram) {
  *  12: jlp_mint_account
  *  13: manager (signer)
  */
-function createSettleYieldIx(args, programId = constants_1.PROGRAM_ID) {
+function buildRawSettleYieldIx(args, programId = constants_1.PROGRAM_ID) {
     const { config, managerRole, vaultJlpAta, stv0, stv1, stv2, stv3, stv4, dovesBtcUsd, dovesEthUsd, dovesSolUsd, jlpPool, jlpMintAccount, manager, } = args;
     // Instruction data: just the 8-byte discriminator (no params)
     const data = Buffer.alloc(8);
@@ -62,19 +54,23 @@ function createSettleYieldIx(args, programId = constants_1.PROGRAM_ID) {
     return new web3_js_1.TransactionInstruction({ keys, programId, data });
 }
 // ---------------------------------------------------------------------------
-// High-level builder
+// Public instruction builder
 // ---------------------------------------------------------------------------
 /**
- * Build a settle_yield instruction with automatic PDA derivation.
+ * Build a `settle_yield` instruction with automatic PDA derivation.
  *
  * Requires the 5 base asset mints in order: [BTC, ETH, SOL, USDC, JupUSD].
  * These must match the `base_asset_mints` array on the JlpdConfig account.
+ *
+ * Naming follows the SDK convention: low-level instruction builders are named
+ * `create*Ix` (this is the canonical name); high-level transaction wrappers
+ * (if any) are named `build*Transaction`.
  */
-function buildSettleYieldIx(args) {
+function createSettleYieldIx(args) {
     const { manager, baseAssetMints, jlpMint = constants_1.JLP_MINT, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID, programId = constants_1.PROGRAM_ID, } = args;
     // Derive PDAs
     const [config] = (0, pda_1.findJlpdConfigPda)(programId);
-    const [managerRole] = (0, pda_1.findManagerRolePda)(config, manager, programId);
+    const [managerRole] = (0, pda_1.findJlpdManagerRolePda)(config, manager, programId);
     // Derive strategy_state PDAs for all 5 base assets
     const [stv0] = (0, pda_1.findStrategyStatePda)(baseAssetMints[0], programId);
     const [stv1] = (0, pda_1.findStrategyStatePda)(baseAssetMints[1], programId);
@@ -82,8 +78,8 @@ function buildSettleYieldIx(args) {
     const [stv3] = (0, pda_1.findStrategyStatePda)(baseAssetMints[3], programId);
     const [stv4] = (0, pda_1.findStrategyStatePda)(baseAssetMints[4], programId);
     // Derive vault JLP ATA (owned by config PDA)
-    const vaultJlpAta = findAta(jlpMint, config, tokenProgram);
-    return createSettleYieldIx({
+    const vaultJlpAta = (0, ata_1.findAta)(jlpMint, config, tokenProgram);
+    return buildRawSettleYieldIx({
         config,
         managerRole,
         vaultJlpAta,
@@ -100,4 +96,3 @@ function buildSettleYieldIx(args) {
         manager,
     }, programId);
 }
-//# sourceMappingURL=settle-yield.js.map

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

@@ -1,4 +1,5 @@
-import { PublicKey, TransactionInstruction, Connection, AddressLookupTableAccount, AccountMeta } from "@solana/web3.js";
+import { PublicKey, TransactionInstruction, AddressLookupTableAccount, AccountMeta } from "@solana/web3.js";
+import type { SolanaConnection } from "../common/connection";
 import BN from "bn.js";
 /** Direction of the JLP swap */
 export type SwapDirection = "BaseToJlp" | "JlpToBase";
@@ -97,7 +98,7 @@ export declare function getJupiterSwapInstructions(args: {
  * 5. Returns instructions + ALTs for a versioned transaction
  */
 export declare function buildSwapJlpTransaction(args: {
-    connection: Connection;
+    connection: SolanaConnection;
     manager: PublicKey;
     baseMint: PublicKey;
     direction: SwapDirection;
@@ -113,7 +114,7 @@ export declare function buildSwapJlpTransaction(args: {
     quoteInAmount: bigint;
 }>;
 export interface RebalanceArgs {
-    connection: Connection;
+    connection: SolanaConnection;
     manager: PublicKey;
     baseMint: PublicKey;
     vaultId: number;
@@ -150,4 +151,3 @@ export interface RebalanceResult {
  * For JlpToBase: builds swap_jlp + withdraw_from_strategy in 1 tx.
  */
 export declare function buildRebalanceTransaction(args: RebalanceArgs): Promise<RebalanceResult>;
-//# sourceMappingURL=swap-jlp.d.ts.map