@jup-ag/lend 0.2.0-beta.2 → 0.2.0-beta.3

package/dist/shared/{lend.siYu8A-9.mjs → lend.CS-bkwRq.mjs}

@@ -1,8 +1,9 @@
 import { SYSVAR_RENT_PUBKEY, PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY, SystemProgram } from '@solana/web3.js';
 import BN from 'bn.js';
 import { Program } from '@coral-xyz/anchor';
-import { g as getVaultsProgram, k as getAccountOwner, t as getTickIndices, p as getLiquidityProgramId, c as MIN_I128, m as getCurrentPositionState, n as getFinalPosition, y as readOraclePrice, s as getTickAtRatio, v as loadRelevantBranchesForLiquidate, x as loadRelevantTicksHasDebtArraysLiquidate, B as oracle, u as loadRelevantBranches, w as loadRelevantTicksHasDebtArrays, d as MIN_TICK, j as findNextTickWithDebt, I as INIT_TICK } from './lend.DcHJFKzT.mjs';
+import { g as getVaultsProgram, k as getAccountOwner, u as getTickIndices, p as getLiquidityProgramId, c as MIN_I128, m as getCurrentPositionState, n as getFinalPosition, z as readOraclePrice, t as getTickAtRatio, w as loadRelevantBranchesForLiquidate, y as loadRelevantTicksHasDebtArraysLiquidate, D as oracle, v as loadRelevantBranches, x as loadRelevantTicksHasDebtArrays, d as MIN_TICK, j as findNextTickWithDebt, I as INIT_TICK } from './lend.CVtn-ehf.mjs';
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync, NATIVE_MINT } from '@solana/spl-token';
+import { c as getOrCreateATAInstruction } from './lend.B80NmXTG.mjs';
 import { a as getPositionMetadata, c as getPositionTokenAccount, d as getPositionMint, e as getPosition, f as getVaultState, g as getVaultAdmin, h as getVaultConfig, i as getVaultMetadata, j as getLiquidity, k as getClaimAccount, l as getRateModel, m as getUserBorrowPosition, n as getUserSupplyPosition, o as getLiquidityReserve, p as getTickHasDebt, q as getTick, r as getBranch, s as getTickIdLiquidation } from './lend.a53XYkl5.mjs';
 
 const MPL_TOKEN_METADATA_PROGRAM_ID = new PublicKey(
@@ -225,7 +226,8 @@ async function getOperateContext({
     vaultId,
     position: positionData,
     program,
-    market
+    market,
+    borrowMintDecimals: vaultBorrowDecimals
   });
   if (existingPositionTick === -2147483648) {
     existingPositionTick = currentPosition.tick;
@@ -351,7 +353,6 @@ async function getOperateContext({
     oracleProgram: new PublicKey(vaultConfig.oracleProgram),
     supplyTokenProgram,
     borrowTokenProgram,
-    associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
     systemProgram: SystemProgram.programId
   };
   return {
@@ -424,7 +425,8 @@ const getOperateIx = async ({
   signer,
   recipient,
   positionOwner,
-  market = "main"
+  market = "main",
+  includeATASetup = false
 }) => {
   const program = getVaultsProgram({ connection, signer, market });
   const {
@@ -467,6 +469,16 @@ const getOperateIx = async ({
     ).accounts(accounts).remainingAccounts(remainingAccounts).instruction(),
     connection.getAddressLookupTable(lookupTable)
   ]);
+  let preIxs = [];
+  if (includeATASetup) {
+    const owners = !recipient || recipient.equals(signer) ? [signer] : [signer, recipient];
+    const mints = [accounts.supplyToken, accounts.borrowToken];
+    preIxs = await Promise.all(
+      owners.flatMap(
+        (owner) => mints.map((mint) => getOrCreateATAInstruction(owner, mint, connection))
+      )
+    ).then((ixs) => ixs.flat());
+  }
   return {
     nftId,
     accounts,
@@ -474,7 +486,7 @@ const getOperateIx = async ({
     remainingAccountsIndices,
     addressLookupTableAddresses: lookupTable ? [lookupTable] : [],
     addressLookupTableAccounts: addressLookupTable.value ? [addressLookupTable.value] : [],
-    ixs: initPositionIx ? [initPositionIx, ...otherIxs, operateIx] : [...otherIxs, operateIx]
+    ixs: initPositionIx ? [initPositionIx, ...preIxs, ...otherIxs, operateIx] : [...preIxs, ...otherIxs, operateIx]
   };
 };
 function getInitBranchContext(vaultId, branchId, signer, market) {
@@ -637,8 +649,7 @@ async function getLiquidateContext({
       oracleProgram: new PublicKey(vaultConfig.oracleProgram),
       supplyTokenProgram,
       borrowTokenProgram,
-      systemProgram: SystemProgram.programId,
-      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID
+      systemProgram: SystemProgram.programId
     },
     remainingAccounts,
     otherIxs: finalOtherIxs,
@@ -654,7 +665,8 @@ const getLiquidateIx = async ({
   signer,
   to = signer,
   connection,
-  market
+  market,
+  includeATASetup = false
 }) => {
   const program = getVaultsProgram({ connection, signer, market });
   const {
@@ -672,6 +684,16 @@ const getLiquidateIx = async ({
     market
   });
   const ixs = [];
+  if (includeATASetup) {
+    const owners = !to || to.equals(signer) ? [signer] : [signer, to];
+    const mints = [accounts.supplyToken, accounts.borrowToken];
+    const preIxs = await Promise.all(
+      owners.flatMap(
+        (owner) => mints.map((mint) => getOrCreateATAInstruction(owner, mint, connection))
+      )
+    ).then((ixs2) => ixs2.flat());
+    ixs.push(...preIxs);
+  }
   if (otherIxs.length > 0) {
     ixs.push(...otherIxs);
   }