@elmntl/jlpd-sdk 0.1.9 → 0.1.11

package/dist/index.js

@@ -28,10 +28,12 @@ __export(index_exports, {
   FLAG_REBALANCE_DISABLED: () => FLAG_REBALANCE_DISABLED,
   FLAG_WITHDRAWALS_DISABLED: () => FLAG_WITHDRAWALS_DISABLED,
   JLPD_PROGRAM_ID: () => JLPD_PROGRAM_ID,
+  JLP_POOL_PUBKEY: () => JLP_POOL_PUBKEY,
   JLP_VAULT_ACCOUNT_SIZE: () => JLP_VAULT_ACCOUNT_SIZE,
   JLP_VAULT_DATA_SIZE: () => JLP_VAULT_DATA_SIZE,
   JLP_VAULT_DISCRIMINATOR: () => JLP_VAULT_DISCRIMINATOR,
   JUPITER_LEND_PROGRAM_ID: () => JUPITER_LEND_PROGRAM_ID,
+  JUPITER_PERPS_PROGRAM_ID: () => JUPITER_PERPS_PROGRAM_ID,
   JUPITER_SWAP_PROGRAM_ID: () => JUPITER_SWAP_PROGRAM_ID,
   JUPUSD_POOL: () => JUPUSD_POOL,
   JUP_LEND_PROGRAM_ID: () => JUPITER_LEND_PROGRAM_ID2,
@@ -76,7 +78,6 @@ __export(index_exports, {
   createProgram: () => createProgram,
   createSettleYieldInstruction: () => createSettleYieldInstruction,
   createSwapJlxJlpInstruction: () => createSwapJlxJlpInstruction,
-  createSwapJlxJlxInstruction: () => createSwapJlxJlxInstruction,
   createUpdateStvInstruction: () => createUpdateStvInstruction,
   createWithdrawInstruction: () => createWithdrawInstruction,
   deriveAta: () => deriveAta,
@@ -902,17 +903,15 @@ var jlp_d_program_default = {
         "2. Values total base_loaned across all STVs in USD",
         "3. Distributes surplus (yield) or deficit (bad debt) proportionally",
         "",
-        "# Parameters",
-        "- `jlp_rate`: Manager-provided JLP price (8 decimals), cross-checked against Pyth",
-        "",
         "# Security",
         "- BTC/ETH/SOL prices come from Doves oracles (manipulation-resistant)",
-        "- JLP price from Pyth oracle, validated against manager rate (50 bps tolerance)",
+        "- JLP price computed directly from Jupiter Perps Pool account (aumUsd / jlp_supply)",
         "- Exchange rates come from Jupiter Earn (audited, TWAP-based)",
         "- Distribution is proportional to each STV's share of total loans",
         "",
         "# Accounts",
-        "Requires all 5 STVs, 5 staging jlX ATAs, 3 Doves oracles (BTC/ETH/SOL), 1 Pyth oracle (JLP)",
+        "Requires all 5 STVs, 5 staging jlX ATAs, 3 Doves oracles (BTC/ETH/SOL),",
+        "Jupiter Perps Pool account, JLP mint account",
         "",
         "# Remaining Accounts (15 accounts)",
         "For exchange rate calculation with time-accrued rewards:",
@@ -986,7 +985,10 @@ var jlp_d_program_default = {
           name: "doves_sol_usd"
         },
         {
-          name: "pyth_jlp_usd"
+          name: "jlp_pool"
+        },
+        {
+          name: "jlp_mint_account"
         },
         {
           name: "manager",
@@ -996,16 +998,7 @@ var jlp_d_program_default = {
           signer: true
         }
       ],
-      args: [
-        {
-          name: "params",
-          type: {
-            defined: {
-              name: "SettleYieldParams"
-            }
-          }
-        }
-      ]
+      args: []
     },
     {
       name: "swap_jlx_to_from_jlp",
@@ -1705,8 +1698,8 @@ var jlp_d_program_default = {
     },
     {
       code: 6043,
-      name: "JlpRateExceedsTolerance",
-      msg: "Manager JLP rate exceeds tolerance vs Pyth oracle (>50 bps)"
+      name: "JlpPriceOutOfRange",
+      msg: "JLP price out of reasonable range ($0.50 - $50.00)"
     },
     {
       code: 6044,
@@ -2571,25 +2564,6 @@ var jlp_d_program_default = {
         ]
       }
     },
-    {
-      name: "SettleYieldParams",
-      docs: [
-        "Parameters for settle_yield instruction"
-      ],
-      type: {
-        kind: "struct",
-        fields: [
-          {
-            name: "jlp_rate",
-            docs: [
-              "Manager-provided JLP rate (8 decimals, e.g., 450000000 = $4.50)",
-              "Cross-checked against Pyth oracle, must be within 50 bps tolerance"
-            ],
-            type: "u64"
-          }
-        ]
-      }
-    },
     {
       name: "SettleYieldSkipped",
       docs: [
@@ -2869,6 +2843,33 @@ var jlp_d_program_default = {
             type: {
               option: "pubkey"
             }
+          },
+          {
+            name: "pps",
+            docs: [
+              "Override price per share (9 decimals, e.g. 1_000_000_000 = 1.0)"
+            ],
+            type: {
+              option: "u64"
+            }
+          },
+          {
+            name: "hwm",
+            docs: [
+              "Override high water mark (9 decimals)"
+            ],
+            type: {
+              option: "u64"
+            }
+          },
+          {
+            name: "base_loaned",
+            docs: [
+              "Override base_loaned accounting field"
+            ],
+            type: {
+              option: "u64"
+            }
           }
         ]
       }
@@ -2961,10 +2962,10 @@ var ORACLES = {
   // Doves oracles (Jupiter Perps oracle system)
   DOVES_BTC_USD: new import_web32.PublicKey("4HBbPx9QJdjJ7GUe6bsiJjGybvfpDhQMMPXP1UEa7VT5"),
   DOVES_ETH_USD: new import_web32.PublicKey("5URYohbPy32nxK1t3jAHVNfdWY2xTubHiFvLrE3VhXEp"),
-  DOVES_SOL_USD: new import_web32.PublicKey("39cWjvHrpHNz2SbXv6ME4NPhqBDBd4KsjUYv5JkHEAJU"),
-  // Pyth oracle for JLP price
-  PYTH_JLP_USD: new import_web32.PublicKey("2TTGSRSezqFzeLUH8JwRUbtN66XLLaymfYsWRTMjfiMw")
+  DOVES_SOL_USD: new import_web32.PublicKey("39cWjvHrpHNz2SbXv6ME4NPhqBDBd4KsjUYv5JkHEAJU")
 };
+var JLP_POOL_PUBKEY = new import_web32.PublicKey("5BUwFW4nRbftYTDMbgxykoFWqWHPzahFSNAaaaJtVKsq");
+var JUPITER_PERPS_PROGRAM_ID = new import_web32.PublicKey("PERPHjGBqRHArX4DySjwM6UJHiR3sWAatqfdBS2qQJu");
 
 // src/accounts/pdas.ts
 var import_web33 = require("@solana/web3.js");
@@ -3737,24 +3738,6 @@ async function createMoveJlxInstruction(program, params, accounts, remainingAcco
     tokenProgram: accounts.tokenProgram
   }).remainingAccounts(remainingAccounts).instruction();
 }
-async function createSwapJlxJlxInstruction(program, params, accounts, remainingAccounts = []) {
-  return await program.methods.swapJlxJlx({
-    fromIndex: params.fromIndex,
-    toIndex: params.toIndex,
-    amountIn: params.amountIn,
-    minOut: params.minOut,
-    jupiterData: params.jupiterData
-  }).accounts({
-    manager: accounts.manager,
-    jlpVault: accounts.jlpVault,
-    fromJlxMint: accounts.fromJlxMint,
-    toJlxMint: accounts.toJlxMint,
-    fromJlxAta: accounts.fromJlxAta,
-    toJlxAta: accounts.toJlxAta,
-    tokenProgram: accounts.tokenProgram,
-    jupiterProgram: accounts.jupiterProgram
-  }).remainingAccounts(remainingAccounts).instruction();
-}
 async function createSwapJlxJlpInstruction(program, params, accounts, remainingAccounts = []) {
   return await program.methods.swapJlxToFromJlp({
     stvIndex: params.stvIndex,
@@ -3773,9 +3756,7 @@ async function createSwapJlxJlpInstruction(program, params, accounts, remainingA
   }).remainingAccounts(remainingAccounts).instruction();
 }
 async function createSettleYieldInstruction(program, params, accounts, remainingAccounts = []) {
-  return await program.methods.settleYield({
-    jlpRate: params.jlpRate
-  }).accounts({
+  return await program.methods.settleYield().accounts({
     jlpVault: accounts.jlpVault,
     vaultJlpAta: accounts.vaultJlpAta,
     stv0: accounts.stvBtc,
@@ -3791,7 +3772,8 @@ async function createSettleYieldInstruction(program, params, accounts, remaining
     dovesBtcUsd: accounts.oracleBtc,
     dovesEthUsd: accounts.oracleEth,
     dovesSolUsd: accounts.oracleSol,
-    pythJlpUsd: accounts.oracleJlp,
+    jlpPool: accounts.jlpPool,
+    jlpMintAccount: accounts.jlpMintAccount,
     manager: accounts.manager
   }).remainingAccounts(remainingAccounts).instruction();
 }
@@ -4284,83 +4266,6 @@ var SwapContext = class {
     }).compileToV0Message(params.quote.addressLookupTables);
     return new import_web39.VersionedTransaction(message);
   }
-  // Get a quote for jlX <-> jlX swap
-  async quoteJlxJlx(params) {
-    const fromPoolConfig = getPoolByName(params.fromPool);
-    const toPoolConfig = getPoolByName(params.toPool);
-    if (!fromPoolConfig) throw new JlpdClientError(`Unknown pool: ${params.fromPool}`);
-    if (!toPoolConfig) throw new JlpdClientError(`Unknown pool: ${params.toPool}`);
-    const inputMint = fromPoolConfig.fTokenMint;
-    const outputMint = toPoolConfig.fTokenMint;
-    const quote = await getJupiterQuote(
-      inputMint,
-      outputMint,
-      BigInt(params.amountIn.toString()),
-      params.slippageBps ?? 30,
-      40,
-      this.client.jupiterApiKey
-    );
-    const swapIxs = await getJupiterSwapInstructions(quote, this.client.vaultPda, this.client.jupiterApiKey);
-    const remainingAccounts = parseSwapRemainingAccounts(swapIxs.swapInstruction);
-    const alts = await fetchAddressLookupTables(
-      this.client.connection,
-      swapIxs.addressLookupTableAddresses
-    );
-    return {
-      inputMint,
-      outputMint,
-      inAmount: new import_anchor6.BN(quote.inAmount),
-      outAmount: new import_anchor6.BN(quote.outAmount),
-      minOutAmount: new import_anchor6.BN(quote.otherAmountThreshold),
-      priceImpactPct: parseFloat(quote.priceImpactPct),
-      route: quote.routePlan.map((r) => r.swapInfo.label || "unknown"),
-      jupiterData: Buffer.from(swapIxs.swapInstruction.data, "base64"),
-      remainingAccounts,
-      addressLookupTables: alts,
-      computeUnitLimit: swapIxs.computeUnitLimit ?? 6e5
-    };
-  }
-  // Build jlX <-> jlX swap transaction
-  async swapJlxJlx(params) {
-    const fromPoolConfig = getPoolByName(params.fromPool);
-    const toPoolConfig = getPoolByName(params.toPool);
-    if (!fromPoolConfig) throw new JlpdClientError(`Unknown pool: ${params.fromPool}`);
-    if (!toPoolConfig) throw new JlpdClientError(`Unknown pool: ${params.toPool}`);
-    const fromPoolCtx = this.client.pool(params.fromPool);
-    const toPoolCtx = this.client.pool(params.toPool);
-    const computeIx = import_web39.ComputeBudgetProgram.setComputeUnitLimit({
-      units: params.quote.computeUnitLimit
-    });
-    const jupiterProgram = JUPITER_SWAP_PROGRAM_ID;
-    const swapIx = await createSwapJlxJlxInstruction(
-      this.client.program,
-      {
-        fromIndex: fromPoolConfig.stvIndex,
-        toIndex: toPoolConfig.stvIndex,
-        amountIn: params.amountIn,
-        minOut: params.minOut,
-        jupiterData: params.quote.jupiterData
-      },
-      {
-        manager: params.manager,
-        jlpVault: this.client.vaultPda,
-        fromJlxMint: fromPoolConfig.fTokenMint,
-        toJlxMint: toPoolConfig.fTokenMint,
-        fromJlxAta: fromPoolCtx.vaultStagingAta,
-        toJlxAta: toPoolCtx.vaultStagingAta,
-        tokenProgram: import_spl_token5.TOKEN_PROGRAM_ID,
-        jupiterProgram
-      },
-      params.quote.remainingAccounts
-    );
-    const { blockhash } = await this.client.connection.getLatestBlockhash("confirmed");
-    const message = new import_web39.TransactionMessage({
-      payerKey: params.manager,
-      recentBlockhash: blockhash,
-      instructions: [computeIx, swapIx]
-    }).compileToV0Message(params.quote.addressLookupTables);
-    return new import_web39.VersionedTransaction(message);
-  }
 };
 var AdminContext = class {
   constructor(client) {
@@ -4441,7 +4346,7 @@ var AdminContext = class {
     const remainingAccounts = [...lendingAccounts, ...rewardsAccounts, ...mintAccounts];
     const ix = await createSettleYieldInstruction(
       this.client.program,
-      { jlpRate: params.jlpRate },
+      {},
       {
         manager: params.manager,
         jlpVault: this.client.vaultPda,
@@ -4460,7 +4365,8 @@ var AdminContext = class {
         oracleBtc: ORACLES.DOVES_BTC_USD,
         oracleEth: ORACLES.DOVES_ETH_USD,
         oracleSol: ORACLES.DOVES_SOL_USD,
-        oracleJlp: ORACLES.PYTH_JLP_USD
+        jlpPool: JLP_POOL_PUBKEY,
+        jlpMintAccount: MINTS.JLP
       },
       remainingAccounts
     );
@@ -4477,10 +4383,12 @@ var AdminContext = class {
   FLAG_REBALANCE_DISABLED,
   FLAG_WITHDRAWALS_DISABLED,
   JLPD_PROGRAM_ID,
+  JLP_POOL_PUBKEY,
   JLP_VAULT_ACCOUNT_SIZE,
   JLP_VAULT_DATA_SIZE,
   JLP_VAULT_DISCRIMINATOR,
   JUPITER_LEND_PROGRAM_ID,
+  JUPITER_PERPS_PROGRAM_ID,
   JUPITER_SWAP_PROGRAM_ID,
   JUPUSD_POOL,
   JUP_LEND_PROGRAM_ID,
@@ -4525,7 +4433,6 @@ var AdminContext = class {
   createProgram,
   createSettleYieldInstruction,
   createSwapJlxJlpInstruction,
-  createSwapJlxJlxInstruction,
   createUpdateStvInstruction,
   createWithdrawInstruction,
   deriveAta,

package/dist/index.mjs

@@ -806,17 +806,15 @@ var jlp_d_program_default = {
         "2. Values total base_loaned across all STVs in USD",
         "3. Distributes surplus (yield) or deficit (bad debt) proportionally",
         "",
-        "# Parameters",
-        "- `jlp_rate`: Manager-provided JLP price (8 decimals), cross-checked against Pyth",
-        "",
         "# Security",
         "- BTC/ETH/SOL prices come from Doves oracles (manipulation-resistant)",
-        "- JLP price from Pyth oracle, validated against manager rate (50 bps tolerance)",
+        "- JLP price computed directly from Jupiter Perps Pool account (aumUsd / jlp_supply)",
         "- Exchange rates come from Jupiter Earn (audited, TWAP-based)",
         "- Distribution is proportional to each STV's share of total loans",
         "",
         "# Accounts",
-        "Requires all 5 STVs, 5 staging jlX ATAs, 3 Doves oracles (BTC/ETH/SOL), 1 Pyth oracle (JLP)",
+        "Requires all 5 STVs, 5 staging jlX ATAs, 3 Doves oracles (BTC/ETH/SOL),",
+        "Jupiter Perps Pool account, JLP mint account",
         "",
         "# Remaining Accounts (15 accounts)",
         "For exchange rate calculation with time-accrued rewards:",
@@ -890,7 +888,10 @@ var jlp_d_program_default = {
           name: "doves_sol_usd"
         },
         {
-          name: "pyth_jlp_usd"
+          name: "jlp_pool"
+        },
+        {
+          name: "jlp_mint_account"
         },
         {
           name: "manager",
@@ -900,16 +901,7 @@ var jlp_d_program_default = {
           signer: true
         }
       ],
-      args: [
-        {
-          name: "params",
-          type: {
-            defined: {
-              name: "SettleYieldParams"
-            }
-          }
-        }
-      ]
+      args: []
     },
     {
       name: "swap_jlx_to_from_jlp",
@@ -1609,8 +1601,8 @@ var jlp_d_program_default = {
     },
     {
       code: 6043,
-      name: "JlpRateExceedsTolerance",
-      msg: "Manager JLP rate exceeds tolerance vs Pyth oracle (>50 bps)"
+      name: "JlpPriceOutOfRange",
+      msg: "JLP price out of reasonable range ($0.50 - $50.00)"
     },
     {
       code: 6044,
@@ -2475,25 +2467,6 @@ var jlp_d_program_default = {
         ]
       }
     },
-    {
-      name: "SettleYieldParams",
-      docs: [
-        "Parameters for settle_yield instruction"
-      ],
-      type: {
-        kind: "struct",
-        fields: [
-          {
-            name: "jlp_rate",
-            docs: [
-              "Manager-provided JLP rate (8 decimals, e.g., 450000000 = $4.50)",
-              "Cross-checked against Pyth oracle, must be within 50 bps tolerance"
-            ],
-            type: "u64"
-          }
-        ]
-      }
-    },
     {
       name: "SettleYieldSkipped",
       docs: [
@@ -2773,6 +2746,33 @@ var jlp_d_program_default = {
             type: {
               option: "pubkey"
             }
+          },
+          {
+            name: "pps",
+            docs: [
+              "Override price per share (9 decimals, e.g. 1_000_000_000 = 1.0)"
+            ],
+            type: {
+              option: "u64"
+            }
+          },
+          {
+            name: "hwm",
+            docs: [
+              "Override high water mark (9 decimals)"
+            ],
+            type: {
+              option: "u64"
+            }
+          },
+          {
+            name: "base_loaned",
+            docs: [
+              "Override base_loaned accounting field"
+            ],
+            type: {
+              option: "u64"
+            }
           }
         ]
       }
@@ -2865,10 +2865,10 @@ var ORACLES = {
   // Doves oracles (Jupiter Perps oracle system)
   DOVES_BTC_USD: new PublicKey("4HBbPx9QJdjJ7GUe6bsiJjGybvfpDhQMMPXP1UEa7VT5"),
   DOVES_ETH_USD: new PublicKey("5URYohbPy32nxK1t3jAHVNfdWY2xTubHiFvLrE3VhXEp"),
-  DOVES_SOL_USD: new PublicKey("39cWjvHrpHNz2SbXv6ME4NPhqBDBd4KsjUYv5JkHEAJU"),
-  // Pyth oracle for JLP price
-  PYTH_JLP_USD: new PublicKey("2TTGSRSezqFzeLUH8JwRUbtN66XLLaymfYsWRTMjfiMw")
+  DOVES_SOL_USD: new PublicKey("39cWjvHrpHNz2SbXv6ME4NPhqBDBd4KsjUYv5JkHEAJU")
 };
+var JLP_POOL_PUBKEY = new PublicKey("5BUwFW4nRbftYTDMbgxykoFWqWHPzahFSNAaaaJtVKsq");
+var JUPITER_PERPS_PROGRAM_ID = new PublicKey("PERPHjGBqRHArX4DySjwM6UJHiR3sWAatqfdBS2qQJu");
 
 // src/accounts/pdas.ts
 import { PublicKey as PublicKey2 } from "@solana/web3.js";
@@ -3644,24 +3644,6 @@ async function createMoveJlxInstruction(program, params, accounts, remainingAcco
     tokenProgram: accounts.tokenProgram
   }).remainingAccounts(remainingAccounts).instruction();
 }
-async function createSwapJlxJlxInstruction(program, params, accounts, remainingAccounts = []) {
-  return await program.methods.swapJlxJlx({
-    fromIndex: params.fromIndex,
-    toIndex: params.toIndex,
-    amountIn: params.amountIn,
-    minOut: params.minOut,
-    jupiterData: params.jupiterData
-  }).accounts({
-    manager: accounts.manager,
-    jlpVault: accounts.jlpVault,
-    fromJlxMint: accounts.fromJlxMint,
-    toJlxMint: accounts.toJlxMint,
-    fromJlxAta: accounts.fromJlxAta,
-    toJlxAta: accounts.toJlxAta,
-    tokenProgram: accounts.tokenProgram,
-    jupiterProgram: accounts.jupiterProgram
-  }).remainingAccounts(remainingAccounts).instruction();
-}
 async function createSwapJlxJlpInstruction(program, params, accounts, remainingAccounts = []) {
   return await program.methods.swapJlxToFromJlp({
     stvIndex: params.stvIndex,
@@ -3680,9 +3662,7 @@ async function createSwapJlxJlpInstruction(program, params, accounts, remainingA
   }).remainingAccounts(remainingAccounts).instruction();
 }
 async function createSettleYieldInstruction(program, params, accounts, remainingAccounts = []) {
-  return await program.methods.settleYield({
-    jlpRate: params.jlpRate
-  }).accounts({
+  return await program.methods.settleYield().accounts({
     jlpVault: accounts.jlpVault,
     vaultJlpAta: accounts.vaultJlpAta,
     stv0: accounts.stvBtc,
@@ -3698,7 +3678,8 @@ async function createSettleYieldInstruction(program, params, accounts, remaining
     dovesBtcUsd: accounts.oracleBtc,
     dovesEthUsd: accounts.oracleEth,
     dovesSolUsd: accounts.oracleSol,
-    pythJlpUsd: accounts.oracleJlp,
+    jlpPool: accounts.jlpPool,
+    jlpMintAccount: accounts.jlpMintAccount,
     manager: accounts.manager
   }).remainingAccounts(remainingAccounts).instruction();
 }
@@ -4191,83 +4172,6 @@ var SwapContext = class {
     }).compileToV0Message(params.quote.addressLookupTables);
     return new VersionedTransaction(message);
   }
-  // Get a quote for jlX <-> jlX swap
-  async quoteJlxJlx(params) {
-    const fromPoolConfig = getPoolByName(params.fromPool);
-    const toPoolConfig = getPoolByName(params.toPool);
-    if (!fromPoolConfig) throw new JlpdClientError(`Unknown pool: ${params.fromPool}`);
-    if (!toPoolConfig) throw new JlpdClientError(`Unknown pool: ${params.toPool}`);
-    const inputMint = fromPoolConfig.fTokenMint;
-    const outputMint = toPoolConfig.fTokenMint;
-    const quote = await getJupiterQuote(
-      inputMint,
-      outputMint,
-      BigInt(params.amountIn.toString()),
-      params.slippageBps ?? 30,
-      40,
-      this.client.jupiterApiKey
-    );
-    const swapIxs = await getJupiterSwapInstructions(quote, this.client.vaultPda, this.client.jupiterApiKey);
-    const remainingAccounts = parseSwapRemainingAccounts(swapIxs.swapInstruction);
-    const alts = await fetchAddressLookupTables(
-      this.client.connection,
-      swapIxs.addressLookupTableAddresses
-    );
-    return {
-      inputMint,
-      outputMint,
-      inAmount: new BN5(quote.inAmount),
-      outAmount: new BN5(quote.outAmount),
-      minOutAmount: new BN5(quote.otherAmountThreshold),
-      priceImpactPct: parseFloat(quote.priceImpactPct),
-      route: quote.routePlan.map((r) => r.swapInfo.label || "unknown"),
-      jupiterData: Buffer.from(swapIxs.swapInstruction.data, "base64"),
-      remainingAccounts,
-      addressLookupTables: alts,
-      computeUnitLimit: swapIxs.computeUnitLimit ?? 6e5
-    };
-  }
-  // Build jlX <-> jlX swap transaction
-  async swapJlxJlx(params) {
-    const fromPoolConfig = getPoolByName(params.fromPool);
-    const toPoolConfig = getPoolByName(params.toPool);
-    if (!fromPoolConfig) throw new JlpdClientError(`Unknown pool: ${params.fromPool}`);
-    if (!toPoolConfig) throw new JlpdClientError(`Unknown pool: ${params.toPool}`);
-    const fromPoolCtx = this.client.pool(params.fromPool);
-    const toPoolCtx = this.client.pool(params.toPool);
-    const computeIx = ComputeBudgetProgram.setComputeUnitLimit({
-      units: params.quote.computeUnitLimit
-    });
-    const jupiterProgram = JUPITER_SWAP_PROGRAM_ID;
-    const swapIx = await createSwapJlxJlxInstruction(
-      this.client.program,
-      {
-        fromIndex: fromPoolConfig.stvIndex,
-        toIndex: toPoolConfig.stvIndex,
-        amountIn: params.amountIn,
-        minOut: params.minOut,
-        jupiterData: params.quote.jupiterData
-      },
-      {
-        manager: params.manager,
-        jlpVault: this.client.vaultPda,
-        fromJlxMint: fromPoolConfig.fTokenMint,
-        toJlxMint: toPoolConfig.fTokenMint,
-        fromJlxAta: fromPoolCtx.vaultStagingAta,
-        toJlxAta: toPoolCtx.vaultStagingAta,
-        tokenProgram: TOKEN_PROGRAM_ID2,
-        jupiterProgram
-      },
-      params.quote.remainingAccounts
-    );
-    const { blockhash } = await this.client.connection.getLatestBlockhash("confirmed");
-    const message = new TransactionMessage({
-      payerKey: params.manager,
-      recentBlockhash: blockhash,
-      instructions: [computeIx, swapIx]
-    }).compileToV0Message(params.quote.addressLookupTables);
-    return new VersionedTransaction(message);
-  }
 };
 var AdminContext = class {
   constructor(client) {
@@ -4348,7 +4252,7 @@ var AdminContext = class {
     const remainingAccounts = [...lendingAccounts, ...rewardsAccounts, ...mintAccounts];
     const ix = await createSettleYieldInstruction(
       this.client.program,
-      { jlpRate: params.jlpRate },
+      {},
       {
         manager: params.manager,
         jlpVault: this.client.vaultPda,
@@ -4367,7 +4271,8 @@ var AdminContext = class {
         oracleBtc: ORACLES.DOVES_BTC_USD,
         oracleEth: ORACLES.DOVES_ETH_USD,
         oracleSol: ORACLES.DOVES_SOL_USD,
-        oracleJlp: ORACLES.PYTH_JLP_USD
+        jlpPool: JLP_POOL_PUBKEY,
+        jlpMintAccount: MINTS.JLP
       },
       remainingAccounts
     );
@@ -4383,10 +4288,12 @@ export {
   FLAG_REBALANCE_DISABLED,
   FLAG_WITHDRAWALS_DISABLED,
   JLPD_PROGRAM_ID,
+  JLP_POOL_PUBKEY,
   JLP_VAULT_ACCOUNT_SIZE,
   JLP_VAULT_DATA_SIZE,
   JLP_VAULT_DISCRIMINATOR,
   JUPITER_LEND_PROGRAM_ID,
+  JUPITER_PERPS_PROGRAM_ID,
   JUPITER_SWAP_PROGRAM_ID,
   JUPUSD_POOL,
   JUPITER_LEND_PROGRAM_ID2 as JUP_LEND_PROGRAM_ID,
@@ -4431,7 +4338,6 @@ export {
   createProgram,
   createSettleYieldInstruction,
   createSwapJlxJlpInstruction,
-  createSwapJlxJlxInstruction,
   createUpdateStvInstruction,
   createWithdrawInstruction,
   deriveAta,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elmntl/jlpd-sdk",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "SDK for JLP.D (JLP Deconstructed) by Elemental",
   "main": "dist/index.js",
   "module": "dist/index.mjs",