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

package/dist/flashloan/index.d.mts

@@ -35,7 +35,6 @@ declare function getFlashloanContext({ signer, asset, connection, market, }: Fla
     liquidity: PublicKey;
     liquidityProgram: PublicKey;
     tokenProgram: PublicKey;
-    associatedTokenProgram: PublicKey;
     systemProgram: PublicKey;
     instructionSysvar: PublicKey;
 }>;

package/dist/flashloan/index.d.ts

@@ -35,7 +35,6 @@ declare function getFlashloanContext({ signer, asset, connection, market, }: Fla
     liquidity: PublicKey;
     liquidityProgram: PublicKey;
     tokenProgram: PublicKey;
-    associatedTokenProgram: PublicKey;
     systemProgram: PublicKey;
     instructionSysvar: PublicKey;
 }>;

package/dist/flashloan/index.mjs

@@ -1,13 +1,13 @@
 import { SYSVAR_INSTRUCTIONS_PUBKEY, SystemProgram, PublicKey } from '@solana/web3.js';
 import BN from 'bn.js';
-import { ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync } from '@solana/spl-token';
+import { getAssociatedTokenAddressSync } from '@solana/spl-token';
 import { Program } from '@coral-xyz/anchor';
 import { g as getLiquidity, a as getRateModel, b as getFlashloanBorrowPosition, c as getLiquidityReserve, d as getFlashloanAdmin } from '../shared/lend.BXNM1zms.mjs';
 
 const address = "jupgfSgfuAXv4B6R2Uxu85Z1qdzgju79s6MfZekN6XS";
 const metadata = {
 	name: "flashloan",
-	version: "0.1.0",
+	version: "0.1.4",
 	spec: "0.1.0",
 	description: "Created with Anchor"
 };
@@ -61,60 +61,7 @@ const instructions = [
 			},
 			{
 				name: "signer_borrow_token_account",
-				writable: true,
-				pda: {
-					seeds: [
-						{
-							kind: "account",
-							path: "signer"
-						},
-						{
-							kind: "account",
-							path: "token_program"
-						},
-						{
-							kind: "account",
-							path: "mint"
-						}
-					],
-					program: {
-						kind: "const",
-						value: [
-							140,
-							151,
-							37,
-							143,
-							78,
-							36,
-							137,
-							241,
-							187,
-							61,
-							16,
-							41,
-							20,
-							142,
-							13,
-							131,
-							11,
-							90,
-							19,
-							153,
-							218,
-							255,
-							16,
-							132,
-							4,
-							142,
-							123,
-							216,
-							219,
-							233,
-							248,
-							89
-						]
-					}
-				}
+				writable: true
 			},
 			{
 				name: "mint"
@@ -148,6 +95,7 @@ const instructions = [
 			},
 			{
 				name: "associated_token_program",
+				optional: true,
 				address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
 			},
 			{
@@ -190,60 +138,7 @@ const instructions = [
 			},
 			{
 				name: "signer_borrow_token_account",
-				writable: true,
-				pda: {
-					seeds: [
-						{
-							kind: "account",
-							path: "signer"
-						},
-						{
-							kind: "account",
-							path: "token_program"
-						},
-						{
-							kind: "account",
-							path: "mint"
-						}
-					],
-					program: {
-						kind: "const",
-						value: [
-							140,
-							151,
-							37,
-							143,
-							78,
-							36,
-							137,
-							241,
-							187,
-							61,
-							16,
-							41,
-							20,
-							142,
-							13,
-							131,
-							11,
-							90,
-							19,
-							153,
-							218,
-							255,
-							16,
-							132,
-							4,
-							142,
-							123,
-							216,
-							219,
-							233,
-							248,
-							89
-						]
-					}
-				}
+				writable: true
 			},
 			{
 				name: "mint"
@@ -277,6 +172,7 @@ const instructions = [
 			},
 			{
 				name: "associated_token_program",
+				optional: true,
 				address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
 			},
 			{
@@ -736,7 +632,6 @@ async function getFlashloanContext({
     liquidity: getLiquidity(market),
     liquidityProgram: getLiquidityProgramId(market),
     tokenProgram,
-    associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
     systemProgram: SystemProgram.programId,
     instructionSysvar: SYSVAR_INSTRUCTIONS_PUBKEY
   };

package/dist/index.mjs

@@ -8,6 +8,6 @@ import '@solana/web3.js';
 import '@solana/spl-token';
 import 'bn.js';
 
-const version = "0.2.0-beta.2";
+const version = "0.2.0-beta.4";
 
 export { version };

package/dist/refinance/index.d.mts

@@ -1,6 +1,6 @@
 import * as _solana_web3_js from '@solana/web3.js';
 import { PublicKey } from '@solana/web3.js';
-import { O as OperateContextParams } from '../shared/lend.BT41yQVJ.mjs';
+import { O as OperateContextParams } from '../shared/lend.CZaDpI67.mjs';
 import 'bn.js';
 import '@coral-xyz/anchor';
 
@@ -40,7 +40,6 @@ declare function getRefinanceIx(params: OperateContextParams): Promise<{
         oracleProgram: PublicKey;
         supplyTokenProgram: PublicKey;
         borrowTokenProgram: PublicKey;
-        associatedTokenProgram: PublicKey;
         systemProgram: PublicKey;
     };
     remainingAccounts: {

package/dist/refinance/index.d.ts

@@ -1,6 +1,6 @@
 import * as _solana_web3_js from '@solana/web3.js';
 import { PublicKey } from '@solana/web3.js';
-import { O as OperateContextParams } from '../shared/lend.BT41yQVJ.js';
+import { O as OperateContextParams } from '../shared/lend.CZaDpI67.js';
 import 'bn.js';
 import '@coral-xyz/anchor';
 
@@ -40,7 +40,6 @@ declare function getRefinanceIx(params: OperateContextParams): Promise<{
         oracleProgram: PublicKey;
         supplyTokenProgram: PublicKey;
         borrowTokenProgram: PublicKey;
-        associatedTokenProgram: PublicKey;
         systemProgram: PublicKey;
     };
     remainingAccounts: {

package/dist/refinance/index.mjs

@@ -1,11 +1,12 @@
-import { A as vaultsIdl } from '../shared/lend.DcHJFKzT.mjs';
-import { e as getOperateIx } from '../shared/lend.siYu8A-9.mjs';
+import { C as vaultsIdl } from '../shared/lend.TR2SYmUo.mjs';
+import { e as getOperateIx } from '../shared/lend.BFWi2x2e.mjs';
 import { PublicKey } from '@solana/web3.js';
 import { Program } from '@coral-xyz/anchor';
 import 'bn.js';
 import '../shared/lend.a53XYkl5.mjs';
 import '@solana/spl-token';
 import '../shared/lend.C3XdrR6R.mjs';
+import '../shared/lend.BR8HvUg-.mjs';
 
 const address = "jup8QcdtqecBGw1iXHW3hQAsHQbTgEqbLbNMvvULmeK";
 const metadata = {

package/dist/shared/{lend.siYu8A-9.mjs → lend.BFWi2x2e.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.TR2SYmUo.mjs';
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync, NATIVE_MINT } from '@solana/spl-token';
+import { c as getOrCreateATAInstruction } from './lend.BR8HvUg-.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);
   }