@jup-ag/lend 0.1.4 → 0.1.6

package/dist/borrow/index.d.mts

@@ -1,5 +1,5 @@
-import { V as Vaults, L as LiquidateParams } from '../shared/lend.DNFQlLzM.mjs';
-export { C as ConnectionParams, I as InitPositionIxParams, e as LiquidateContextParams, O as OperateContextParams, a as OperateParams, c as getInitPositionContext, b as getInitPositionIx, f as getLiquidateContext, h as getLiquidateIx, g as getOperateContext, d as getOperateIx } from '../shared/lend.DNFQlLzM.mjs';
+import { V as Vaults, L as LiquidateParams } from '../shared/lend.D69BluYU.mjs';
+export { C as ConnectionParams, I as InitPositionIxParams, e as LiquidateContextParams, O as OperateContextParams, a as OperateParams, c as getInitPositionContext, b as getInitPositionIx, f as getLiquidateContext, h as getLiquidateIx, g as getOperateContext, d as getOperateIx } from '../shared/lend.D69BluYU.mjs';
 import { Program } from '@coral-xyz/anchor';
 import BN from 'bn.js';
 import * as _solana_web3_js from '@solana/web3.js';

package/dist/borrow/index.d.ts

@@ -1,5 +1,5 @@
-import { V as Vaults, L as LiquidateParams } from '../shared/lend.DNFQlLzM.js';
-export { C as ConnectionParams, I as InitPositionIxParams, e as LiquidateContextParams, O as OperateContextParams, a as OperateParams, c as getInitPositionContext, b as getInitPositionIx, f as getLiquidateContext, h as getLiquidateIx, g as getOperateContext, d as getOperateIx } from '../shared/lend.DNFQlLzM.js';
+import { V as Vaults, L as LiquidateParams } from '../shared/lend.D69BluYU.js';
+export { C as ConnectionParams, I as InitPositionIxParams, e as LiquidateContextParams, O as OperateContextParams, a as OperateParams, c as getInitPositionContext, b as getInitPositionIx, f as getLiquidateContext, h as getLiquidateIx, g as getOperateContext, d as getOperateIx } from '../shared/lend.D69BluYU.js';
 import { Program } from '@coral-xyz/anchor';
 import BN from 'bn.js';
 import * as _solana_web3_js from '@solana/web3.js';

package/dist/borrow/index.mjs

@@ -1,8 +1,8 @@
-import { g as getLiquidateIx, a as getVaultsProgram } from '../shared/lend.8pE8Zw9V.mjs';
-export { I as INIT_TICK, p as MAX_TICK, M as MIN_TICK, q as TICKS_PER_TICK_HAS_DEBT, T as TICK_HAS_DEBT_ARRAY_SIZE, s as TICK_HAS_DEBT_CHILDREN_SIZE, t as TICK_HAS_DEBT_CHILDREN_SIZE_IN_BITS, u as TOTAL_INDICES_NEEDED, Z as ZERO_TICK_SCALED_RATIO, A as findNextTickWithDebt, h as getAccountOwner, i as getCurrentPosition, j as getCurrentPositionState, k as getFinalPosition, x as getFirstTickForIndex, d as getInitPositionContext, c as getInitPositionIx, f as getLiquidateContext, b as getOperateContext, e as getOperateIx, v as getRatioAtTick, w as getTickAtRatio, y as getTickIndices, l as loadRelevantBranches, o as loadRelevantBranchesForLiquidate, m as loadRelevantTicksHasDebtArrays, n as loadRelevantTicksHasDebtArraysLiquidate, r as readOraclePrice, z as readTickHasDebtArray } from '../shared/lend.8pE8Zw9V.mjs';
+import { g as getLiquidateIx, a as getVaultsProgram } from '../shared/lend.aTMYZYEH.mjs';
+export { I as INIT_TICK, p as MAX_TICK, M as MIN_TICK, q as TICKS_PER_TICK_HAS_DEBT, T as TICK_HAS_DEBT_ARRAY_SIZE, s as TICK_HAS_DEBT_CHILDREN_SIZE, t as TICK_HAS_DEBT_CHILDREN_SIZE_IN_BITS, u as TOTAL_INDICES_NEEDED, Z as ZERO_TICK_SCALED_RATIO, A as findNextTickWithDebt, h as getAccountOwner, i as getCurrentPosition, j as getCurrentPositionState, k as getFinalPosition, x as getFirstTickForIndex, d as getInitPositionContext, c as getInitPositionIx, f as getLiquidateContext, b as getOperateContext, e as getOperateIx, v as getRatioAtTick, w as getTickAtRatio, y as getTickIndices, l as loadRelevantBranches, o as loadRelevantBranchesForLiquidate, m as loadRelevantTicksHasDebtArrays, n as loadRelevantTicksHasDebtArraysLiquidate, r as readOraclePrice, z as readTickHasDebtArray } from '../shared/lend.aTMYZYEH.mjs';
 import { PublicKey, TransactionMessage, ComputeBudgetProgram, VersionedTransaction } from '@solana/web3.js';
 import BN from 'bn.js';
-import { g as getVaultAdmin } from '../shared/lend.D6kcj1Qv.mjs';
+import { g as getVaultAdmin } from '../shared/lend.CsYeVtpe.mjs';
 import '@coral-xyz/anchor';
 import '../shared/lend.CioR9-te.mjs';
 import '@solana/spl-token';

package/dist/earn/index.mjs

@@ -20,10 +20,20 @@ const getAccountOwner = async (account, connection) => {
   return info.owner;
 };
 const getOrCreateATAInstruction = async (owner, mint, connection) => {
-  const associatedTokenAccount = await getAssociatedTokenAddress(mint, owner);
-  const account = await getAccount(connection, associatedTokenAccount).catch(
-    () => null
+  const tokenProgram = await getAccountOwner(mint, connection);
+  const associatedTokenAccount = await getAssociatedTokenAddress(
+    mint,
+    owner,
+    true,
+    // allowOwnerOffCurve - supports PDA owners
+    tokenProgram
   );
+  const account = await getAccount(
+    connection,
+    associatedTokenAccount,
+    "confirmed",
+    tokenProgram
+  ).catch(() => null);
   const ixs = [];
   if (!account) {
     ixs.push(
@@ -31,7 +41,8 @@ const getOrCreateATAInstruction = async (owner, mint, connection) => {
         owner,
         associatedTokenAccount,
         owner,
-        mint
+        mint,
+        tokenProgram
       )
     );
   }

package/dist/flashloan/index.mjs

@@ -25,7 +25,7 @@ async function getFlashloanContext({
     signerBorrowTokenAccount: getAssociatedTokenAddressSync(
       asset,
       signer,
-      false,
+      true,
       tokenProgram
     ),
     mint: asset,

package/dist/index.mjs

@@ -1,6 +1,6 @@
 export { l as lendingPda, a as lendingRewardRateModelPda } from './shared/lend.DS0KoPpL.mjs';
 export { l as liquidityPda } from './shared/lend.BzG5ldOV.mjs';
-export { b as borrowPda } from './shared/lend.D6kcj1Qv.mjs';
+export { b as borrowPda } from './shared/lend.CsYeVtpe.mjs';
 export { f as flashloanPda } from './shared/lend.Cr2l14_0.mjs';
 export { m as merkleDistributorPda } from './shared/lend.Bpqe1Iia.mjs';
 import '@solana/web3.js';
@@ -8,6 +8,6 @@ import './shared/lend.CioR9-te.mjs';
 import '@solana/spl-token';
 import 'bn.js';
 
-const version = "0.1.4";
+const version = "0.1.6";
 
 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.DNFQlLzM.mjs';
+import { O as OperateContextParams } from '../shared/lend.D69BluYU.mjs';
 import 'bn.js';
 import '@coral-xyz/anchor';
 

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.DNFQlLzM.js';
+import { O as OperateContextParams } from '../shared/lend.D69BluYU.js';
 import 'bn.js';
 import '@coral-xyz/anchor';
 

package/dist/refinance/index.mjs

@@ -1,5 +1,5 @@
-import { v as vaultsIdl } from '../shared/lend.D6kcj1Qv.mjs';
-import { e as getOperateIx } from '../shared/lend.8pE8Zw9V.mjs';
+import { v as vaultsIdl } from '../shared/lend.CsYeVtpe.mjs';
+import { e as getOperateIx } from '../shared/lend.aTMYZYEH.mjs';
 import { PublicKey } from '@solana/web3.js';
 import { Program } from '@coral-xyz/anchor';
 import '../shared/lend.CioR9-te.mjs';

package/dist/shared/{lend.D6kcj1Qv.mjs → lend.CsYeVtpe.mjs}

@@ -776,8 +776,7 @@ const instructions = [
 				signer: true
 			},
 			{
-				name: "vault_admin",
-				writable: true
+				name: "vault_admin"
 			},
 			{
 				name: "vault_config",
@@ -2287,8 +2286,7 @@ const instructions = [
 				writable: true
 			},
 			{
-				name: "new_oracle",
-				writable: true
+				name: "new_oracle"
 			},
 			{
 				name: "supply_token_reserves_liquidity",
@@ -2787,6 +2785,19 @@ const events = [
 			83
 		]
 	},
+	{
+		name: "LogLiquidationRoundingDiff",
+		discriminator: [
+			35,
+			189,
+			179,
+			90,
+			218,
+			51,
+			104,
+			128
+		]
+	},
 	{
 		name: "LogOperate",
 		discriminator: [
@@ -3679,6 +3690,30 @@ const types = [
 			]
 		}
 	},
+	{
+		name: "LogLiquidationRoundingDiff",
+		type: {
+			kind: "struct",
+			fields: [
+				{
+					name: "vault_id",
+					type: "u16"
+				},
+				{
+					name: "actual_debt_amt",
+					type: "u64"
+				},
+				{
+					name: "debt_amount",
+					type: "u64"
+				},
+				{
+					name: "diff",
+					type: "u64"
+				}
+			]
+		}
+	},
 	{
 		name: "LogOperate",
 		type: {
@@ -4081,6 +4116,9 @@ const types = [
 				},
 				{
 					name: "SinglePool"
+				},
+				{
+					name: "JupLend"
 				}
 			]
 		}

package/dist/shared/{lend.DNFQlLzM.d.mts → lend.D69BluYU.d.mts}

@@ -655,7 +655,6 @@ type Vaults = {
                 },
                 {
                     name: "vaultAdmin";
-                    writable: true;
                 },
                 {
                     name: "vaultConfig";
@@ -1930,7 +1929,6 @@ type Vaults = {
                 },
                 {
                     name: "newOracle";
-                    writable: true;
                 },
                 {
                     name: "supplyTokenReservesLiquidity";
@@ -2167,6 +2165,10 @@ type Vaults = {
             name: "logLiquidateInfo";
             discriminator: [169, 150, 46, 42, 178, 89, 98, 83];
         },
+        {
+            name: "logLiquidationRoundingDiff";
+            discriminator: [35, 189, 179, 90, 218, 51, 104, 128];
+        },
         {
             name: "logOperate";
             discriminator: [180, 8, 81, 71, 19, 132, 173, 8];
@@ -2895,6 +2897,30 @@ type Vaults = {
                 ];
             };
         },
+        {
+            name: "logLiquidationRoundingDiff";
+            type: {
+                kind: "struct";
+                fields: [
+                    {
+                        name: "vaultId";
+                        type: "u16";
+                    },
+                    {
+                        name: "actualDebtAmt";
+                        type: "u64";
+                    },
+                    {
+                        name: "debtAmount";
+                        type: "u64";
+                    },
+                    {
+                        name: "diff";
+                        type: "u64";
+                    }
+                ];
+            };
+        },
         {
             name: "logOperate";
             type: {
@@ -3295,6 +3321,9 @@ type Vaults = {
                     },
                     {
                         name: "singlePool";
+                    },
+                    {
+                        name: "jupLend";
                     }
                 ];
             };

package/dist/shared/{lend.DNFQlLzM.d.ts → lend.D69BluYU.d.ts}

@@ -655,7 +655,6 @@ type Vaults = {
                 },
                 {
                     name: "vaultAdmin";
-                    writable: true;
                 },
                 {
                     name: "vaultConfig";
@@ -1930,7 +1929,6 @@ type Vaults = {
                 },
                 {
                     name: "newOracle";
-                    writable: true;
                 },
                 {
                     name: "supplyTokenReservesLiquidity";
@@ -2167,6 +2165,10 @@ type Vaults = {
             name: "logLiquidateInfo";
             discriminator: [169, 150, 46, 42, 178, 89, 98, 83];
         },
+        {
+            name: "logLiquidationRoundingDiff";
+            discriminator: [35, 189, 179, 90, 218, 51, 104, 128];
+        },
         {
             name: "logOperate";
             discriminator: [180, 8, 81, 71, 19, 132, 173, 8];
@@ -2895,6 +2897,30 @@ type Vaults = {
                 ];
             };
         },
+        {
+            name: "logLiquidationRoundingDiff";
+            type: {
+                kind: "struct";
+                fields: [
+                    {
+                        name: "vaultId";
+                        type: "u16";
+                    },
+                    {
+                        name: "actualDebtAmt";
+                        type: "u64";
+                    },
+                    {
+                        name: "debtAmount";
+                        type: "u64";
+                    },
+                    {
+                        name: "diff";
+                        type: "u64";
+                    }
+                ];
+            };
+        },
         {
             name: "logOperate";
             type: {
@@ -3295,6 +3321,9 @@ type Vaults = {
                     },
                     {
                         name: "singlePool";
+                    },
+                    {
+                        name: "jupLend";
                     }
                 ];
             };

package/dist/shared/{lend.8pE8Zw9V.mjs → lend.aTMYZYEH.mjs}

@@ -2,14 +2,14 @@ import { PublicKey, Transaction, SystemProgram, SYSVAR_RENT_PUBKEY, SYSVAR_INSTR
 import BN from 'bn.js';
 import { Program, AnchorProvider } from '@coral-xyz/anchor';
 import { l as liquidity } from './lend.CioR9-te.mjs';
-import { getAssociatedTokenAddressSync, ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token';
-import { a as getTickHasDebt, v as vaultsIdl, c as getPosition, d as getTick, e as getTickIdLiquidation, f as getVaultConfig, h as getBranch, i as getVaultState, j as getVaultMetadata, k as getLiquidity, l as getRateModel, m as getUserBorrowPosition, n as getUserSupplyPosition, o as getLiquidityReserve, p as getPositionTokenAccount, q as getPositionMetadata, r as getPositionMint, g as getVaultAdmin, s as getClaimAccount } from './lend.D6kcj1Qv.mjs';
+import { getAssociatedTokenAddressSync, ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID, NATIVE_MINT } from '@solana/spl-token';
+import { a as getTickHasDebt, v as vaultsIdl, c as getPosition, d as getTick, e as getTickIdLiquidation, f as getVaultConfig, h as getBranch, i as getVaultState, j as getVaultMetadata, k as getLiquidity, l as getRateModel, m as getUserBorrowPosition, n as getUserSupplyPosition, o as getLiquidityReserve, p as getPositionTokenAccount, q as getPositionMetadata, r as getPositionMint, g as getVaultAdmin, s as getClaimAccount } from './lend.CsYeVtpe.mjs';
 import { e as getReserve } from './lend.BzG5ldOV.mjs';
 
 const address = "jupnw4B6Eqs7ft6rxpzYLJZYSnrpRgPcr589n5Kv4oc";
 const metadata = {
 	name: "oracle",
-	version: "0.1.2",
+	version: "0.1.0",
 	spec: "0.1.0",
 	description: "Created with Anchor"
 };
@@ -1575,9 +1575,13 @@ async function getOtherInstructionsOperate(vaultId, vaultState, currentPosition,
   let newBranchId;
   if (vaultState.branchLiquidated) {
     newBranchId = vaultState.totalBranchId + 1;
-    const newBranchData = await program.account.branch.fetch(
-      getBranch(vaultId, newBranchId)
-    );
+    let newBranchData = null;
+    try {
+      newBranchData = await program.account.branch.fetch(
+        getBranch(vaultId, newBranchId)
+      );
+    } catch {
+    }
     if (!newBranchData) {
       const ix = await program.methods.initBranch(vaultId, newBranchId).accounts(getInitBranchContext(vaultId, newBranchId, signer)).instruction();
       otherIxs.push(ix);
@@ -1758,6 +1762,7 @@ async function getOperateContext({
   });
   if (existingPositionTick === -2147483648) {
     existingPositionTick = currentPosition.tick;
+    existingPositionTickId = 0;
   }
   const currentPositionTickPda = getTick(
     vaultId,
@@ -1952,6 +1957,14 @@ const getOperateIx = async ({
     recipient,
     program
   });
+  if (accounts.borrowToken.toString() !== NATIVE_MINT.toString()) {
+    const userDebtTokenBalance = await connection.getTokenAccountBalance(
+      accounts.signerBorrowTokenAccount
+    );
+    if (debtAmount.lt(new BN(0)) && userDebtTokenBalance.value.amount === debtAmount.abs().toString()) {
+      debtAmount = debtAmount.add(new BN(1));
+    }
+  }
   const [operateIx, addressLookupTable] = await Promise.all([
     program.methods.operate(
       colAmount,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jup-ag/lend",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "license": "MIT",
   "sideEffects": false,
   "type": "module",