@jup-ag/lend 0.0.14 → 0.0.16

package/dist/borrow/index.d.mts

@@ -695,9 +695,6 @@ type Vaults = {
                         };
                     };
                 },
-                {
-                    name: "vaultAdmin";
-                },
                 {
                     name: "vaultConfig";
                     docs: [
@@ -721,10 +718,6 @@ type Vaults = {
                 {
                     name: "oracle";
                 },
-                {
-                    name: "topTick";
-                    writable: true;
-                },
                 {
                     name: "newBranch";
                     writable: true;
@@ -756,6 +749,7 @@ type Vaults = {
                 {
                     name: "supplyTokenClaimAccount";
                     writable: true;
+                    optional: true;
                 },
                 {
                     name: "liquidity";
@@ -804,6 +798,16 @@ type Vaults = {
                     name: "absorb";
                     type: "bool";
                 },
+                {
+                    name: "transferType";
+                    type: {
+                        option: {
+                            defined: {
+                                name: "transferType";
+                            };
+                        };
+                    };
+                },
                 {
                     name: "remainingAccountsIndices";
                     type: "bytes";
@@ -1135,10 +1139,12 @@ type Vaults = {
                 {
                     name: "supplyTokenClaimAccount";
                     writable: true;
+                    optional: true;
                 },
                 {
                     name: "borrowTokenClaimAccount";
                     writable: true;
+                    optional: true;
                 },
                 {
                     name: "liquidity";
@@ -1175,6 +1181,16 @@ type Vaults = {
                     name: "newDebt";
                     type: "i128";
                 },
+                {
+                    name: "transferType";
+                    type: {
+                        option: {
+                            defined: {
+                                name: "transferType";
+                            };
+                        };
+                    };
+                },
                 {
                     name: "remainingAccountsIndices";
                     type: "bytes";
@@ -2270,51 +2286,56 @@ type Vaults = {
         },
         {
             code: 6056;
+            name: "vaultClaimAccountRequired";
+            msg: "vaultClaimAccountRequired";
+        },
+        {
+            code: 6057;
             name: "vaultAdminValueAboveLimit";
             msg: "vaultAdminValueAboveLimit";
         },
         {
-            code: 6057;
+            code: 6058;
             name: "vaultAdminOnlyAuths";
             msg: "vaultAdminOnlyAuthAccounts";
         },
         {
-            code: 6058;
+            code: 6059;
             name: "vaultAdminAddressZeroNotAllowed";
             msg: "vaultAdminAddressZeroNotAllowed";
         },
         {
-            code: 6059;
+            code: 6060;
             name: "vaultAdminVaultIdMismatch";
             msg: "vaultAdminVaultIdMismatch";
         },
         {
-            code: 6060;
+            code: 6061;
             name: "vaultAdminTotalIdsMismatch";
             msg: "vaultAdminTotalIdsMismatch";
         },
         {
-            code: 6061;
+            code: 6062;
             name: "vaultAdminTickMismatch";
             msg: "vaultAdminTickMismatch";
         },
         {
-            code: 6062;
+            code: 6063;
             name: "vaultAdminLiquidityProgramMismatch";
             msg: "vaultAdminLiquidityProgramMismatch";
         },
         {
-            code: 6063;
+            code: 6064;
             name: "vaultAdminMaxAuthCountReached";
             msg: "vaultAdminMaxAuthCountReached";
         },
         {
-            code: 6064;
+            code: 6065;
             name: "vaultAdminInvalidParams";
             msg: "vaultAdminInvalidParams";
         },
         {
-            code: 6065;
+            code: 6066;
             name: "vaultAdminOnlyAuthority";
             msg: "vaultAdminOnlyAuthority";
         }
@@ -2884,10 +2905,6 @@ type Vaults = {
                     {
                         name: "dustDebtAmount";
                         type: "u64";
-                    },
-                    {
-                        name: "bump";
-                        type: "u8";
                     }
                 ];
             };
@@ -2977,10 +2994,6 @@ type Vaults = {
                     {
                         name: "debtFactor";
                         type: "u64";
-                    },
-                    {
-                        name: "bump";
-                        type: "u8";
                     }
                 ];
             };
@@ -3192,6 +3205,23 @@ type Vaults = {
                 ];
             };
         },
+        {
+            name: "transferType";
+            type: {
+                kind: "enum";
+                variants: [
+                    {
+                        name: "skip";
+                    },
+                    {
+                        name: "direct";
+                    },
+                    {
+                        name: "claim";
+                    }
+                ];
+            };
+        },
         {
             name: "updateCoreSettingsParams";
             type: {

package/dist/borrow/index.d.ts

@@ -695,9 +695,6 @@ type Vaults = {
                         };
                     };
                 },
-                {
-                    name: "vaultAdmin";
-                },
                 {
                     name: "vaultConfig";
                     docs: [
@@ -721,10 +718,6 @@ type Vaults = {
                 {
                     name: "oracle";
                 },
-                {
-                    name: "topTick";
-                    writable: true;
-                },
                 {
                     name: "newBranch";
                     writable: true;
@@ -756,6 +749,7 @@ type Vaults = {
                 {
                     name: "supplyTokenClaimAccount";
                     writable: true;
+                    optional: true;
                 },
                 {
                     name: "liquidity";
@@ -804,6 +798,16 @@ type Vaults = {
                     name: "absorb";
                     type: "bool";
                 },
+                {
+                    name: "transferType";
+                    type: {
+                        option: {
+                            defined: {
+                                name: "transferType";
+                            };
+                        };
+                    };
+                },
                 {
                     name: "remainingAccountsIndices";
                     type: "bytes";
@@ -1135,10 +1139,12 @@ type Vaults = {
                 {
                     name: "supplyTokenClaimAccount";
                     writable: true;
+                    optional: true;
                 },
                 {
                     name: "borrowTokenClaimAccount";
                     writable: true;
+                    optional: true;
                 },
                 {
                     name: "liquidity";
@@ -1175,6 +1181,16 @@ type Vaults = {
                     name: "newDebt";
                     type: "i128";
                 },
+                {
+                    name: "transferType";
+                    type: {
+                        option: {
+                            defined: {
+                                name: "transferType";
+                            };
+                        };
+                    };
+                },
                 {
                     name: "remainingAccountsIndices";
                     type: "bytes";
@@ -2270,51 +2286,56 @@ type Vaults = {
         },
         {
             code: 6056;
+            name: "vaultClaimAccountRequired";
+            msg: "vaultClaimAccountRequired";
+        },
+        {
+            code: 6057;
             name: "vaultAdminValueAboveLimit";
             msg: "vaultAdminValueAboveLimit";
         },
         {
-            code: 6057;
+            code: 6058;
             name: "vaultAdminOnlyAuths";
             msg: "vaultAdminOnlyAuthAccounts";
         },
         {
-            code: 6058;
+            code: 6059;
             name: "vaultAdminAddressZeroNotAllowed";
             msg: "vaultAdminAddressZeroNotAllowed";
         },
         {
-            code: 6059;
+            code: 6060;
             name: "vaultAdminVaultIdMismatch";
             msg: "vaultAdminVaultIdMismatch";
         },
         {
-            code: 6060;
+            code: 6061;
             name: "vaultAdminTotalIdsMismatch";
             msg: "vaultAdminTotalIdsMismatch";
         },
         {
-            code: 6061;
+            code: 6062;
             name: "vaultAdminTickMismatch";
             msg: "vaultAdminTickMismatch";
         },
         {
-            code: 6062;
+            code: 6063;
             name: "vaultAdminLiquidityProgramMismatch";
             msg: "vaultAdminLiquidityProgramMismatch";
         },
         {
-            code: 6063;
+            code: 6064;
             name: "vaultAdminMaxAuthCountReached";
             msg: "vaultAdminMaxAuthCountReached";
         },
         {
-            code: 6064;
+            code: 6065;
             name: "vaultAdminInvalidParams";
             msg: "vaultAdminInvalidParams";
         },
         {
-            code: 6065;
+            code: 6066;
             name: "vaultAdminOnlyAuthority";
             msg: "vaultAdminOnlyAuthority";
         }
@@ -2884,10 +2905,6 @@ type Vaults = {
                     {
                         name: "dustDebtAmount";
                         type: "u64";
-                    },
-                    {
-                        name: "bump";
-                        type: "u8";
                     }
                 ];
             };
@@ -2977,10 +2994,6 @@ type Vaults = {
                     {
                         name: "debtFactor";
                         type: "u64";
-                    },
-                    {
-                        name: "bump";
-                        type: "u8";
                     }
                 ];
             };
@@ -3192,6 +3205,23 @@ type Vaults = {
                 ];
             };
         },
+        {
+            name: "transferType";
+            type: {
+                kind: "enum";
+                variants: [
+                    {
+                        name: "skip";
+                    },
+                    {
+                        name: "direct";
+                    },
+                    {
+                        name: "claim";
+                    }
+                ];
+            };
+        },
         {
             name: "updateCoreSettingsParams";
             type: {

package/dist/borrow/index.mjs

@@ -1,7 +1,7 @@
 import { PublicKey, SystemProgram } from '@solana/web3.js';
 import BN from 'bn.js';
 import { Program } from '@coral-xyz/anchor';
-import { g as getTick, a as getTickIdLiquidation, c as getVaultState, d as getVaultConfig, e as getBranch, f as getTickHasDebt, h as getVaultMetadata, i as getPosition, j as getLiquidity, k as getClaimAccount, l as getRateModel, m as getUserBorrowPosition, n as getUserSupplyPosition, o as getLiquidityReserve, p as getPositionTokenAccount, q as getPositionMint, r as getVaultAdmin, v as vaults } from '../shared/lend.gEWT9qRO.mjs';
+import { g as getTick, a as getTickIdLiquidation, c as getVaultState, d as getVaultConfig, e as getBranch, f as getTickHasDebt, h as getVaultMetadata, i as getPosition, j as getLiquidity, k as getClaimAccount, l as getRateModel, m as getUserBorrowPosition, n as getUserSupplyPosition, o as getLiquidityReserve, p as getPositionTokenAccount, q as getPositionMint, r as getVaultAdmin, v as vaults } from '../shared/lend.DfnSwnoV.mjs';
 import { l as liquidity } from '../shared/lend.D5fnz2Fg.mjs';
 import { getMint, getAssociatedTokenAddressSync, TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID } from '@solana/spl-token';
 
@@ -475,12 +475,12 @@ const oracle = {
 	types: types
 };
 
-const MIN_TICK$2 = -16383;
+const MIN_TICK$1 = -16383;
 const MAX_TICK$1 = 16383;
 const ZERO_TICK_SCALED_RATIO$1 = new BN(281474976710656);
 function getRatioAtTick(tick) {
-  if (tick < MIN_TICK$2 || tick > MAX_TICK$1) {
-    throw new Error(`Tick ${tick} out of range [${MIN_TICK$2}, ${MAX_TICK$1}]`);
+  if (tick < MIN_TICK$1 || tick > MAX_TICK$1) {
+    throw new Error(`Tick ${tick} out of range [${MIN_TICK$1}, ${MAX_TICK$1}]`);
   }
   const FACTOR00 = new BN("18446744073709551616");
   const FACTOR01 = new BN("18419115400608638658");
@@ -669,7 +669,7 @@ function mulBigNumber(bigNumber1, bigNumber2) {
 }
 
 const INIT_TICK = -2147483648;
-const MIN_TICK$1 = -16383;
+const MIN_TICK = -16383;
 const MAX_TICK = 16383;
 const MAX_MASK_DEBT_FACTOR = new BN("1125899906842623");
 const EXCHANGE_PRICES_PRECISION = new BN(10).pow(new BN(12));
@@ -684,11 +684,11 @@ const getCurrentPositionState = async ({
 }) => {
   let positionTick = position.tick;
   if (positionTick === INIT_TICK) {
-    positionTick = MIN_TICK$1;
+    positionTick = MIN_TICK;
   }
   if (position.isSupplyOnlyPosition) {
     return {
-      tick: MIN_TICK$1,
+      tick: MIN_TICK,
       tickId: 0,
       colRaw: new BN(position.supplyAmount.toString()),
       finalAmount: new BN(position.supplyAmount.toString()),
@@ -700,14 +700,14 @@ const getCurrentPositionState = async ({
   let colRaw = new BN(position.supplyAmount.toString());
   let dustDebtRaw = new BN(position.dustDebtAmount.toString());
   let debtRaw = new BN(0);
-  if (positionTick > MIN_TICK$1) {
+  if (positionTick > MIN_TICK) {
     const collateralForDebtCalc = colRaw.add(new BN(1));
     const ratio = getRatioAtTick(positionTick);
     debtRaw = ratio.mul(collateralForDebtCalc).shrn(48).add(new BN(1));
   } else {
     debtRaw = new BN(0);
   }
-  if (positionTick > MIN_TICK$1) {
+  if (positionTick > MIN_TICK) {
     const tickData = await program.account.tick.fetch(
       getTick(vaultId, positionTick)
     );
@@ -719,7 +719,7 @@ const getCurrentPositionState = async ({
       const { isFullyLiquidated, branchId, connectionFactor } = getLiquidationStatus(position.tickId, tickData, tickIdData);
       if (isFullyLiquidated) {
         return {
-          tick: MIN_TICK$1,
+          tick: MIN_TICK,
           tickId: 0,
           colRaw: new BN(0),
           debtRaw: new BN(0),
@@ -742,7 +742,7 @@ const getCurrentPositionState = async ({
         debtRaw: finalDebtRaw,
         dustDebtRaw,
         finalAmount: netDebtRaw2.gt(new BN(0)) ? finalColRaw : new BN(0),
-        isSupplyOnlyPosition: finalTick === MIN_TICK$1
+        isSupplyOnlyPosition: finalTick === MIN_TICK
       };
     }
   }
@@ -754,7 +754,7 @@ const getCurrentPositionState = async ({
     debtRaw,
     dustDebtRaw,
     finalAmount: netDebtRaw.gt(new BN(0)) ? colRaw : new BN(0),
-    isSupplyOnlyPosition: positionTick === MIN_TICK$1
+    isSupplyOnlyPosition: positionTick === MIN_TICK
   };
 };
 async function getAllBranches({
@@ -841,7 +841,7 @@ async function processLiquidatedPosition({
   let positionDebtRaw = new BN(0);
   if (currentBranch.status === 3 || currentConnectionFactor.eq(MAX_MASK_DEBT_FACTOR)) {
     positionDebtRaw = new BN(0);
-    finalTick = MIN_TICK$1;
+    finalTick = MIN_TICK;
   } else {
     positionDebtRaw = mulDivNormal(
       initialDebtRaw,
@@ -862,7 +862,7 @@ async function processLiquidatedPosition({
         ratioLength.mul(new BN(currentBranch.minimaTickPartials)).div(X30)
       );
       finalColRaw = positionDebtRaw.mul(ZERO_TICK_SCALED_RATIO).div(finalRatio);
-    } else finalTick = MIN_TICK$1;
+    } else finalTick = MIN_TICK;
   }
   return {
     finalTick,
@@ -920,7 +920,7 @@ const calculateFinalPosition = async ({
   let finalTick;
   let isSupplyOnlyPosition;
   if (netDebtRaw.eq(new BN(0)) || colRaw.eq(new BN(0))) {
-    finalTick = MIN_TICK$1;
+    finalTick = MIN_TICK;
     isSupplyOnlyPosition = true;
   } else {
     const marginAdjustedDebt = netDebtRaw.mul(new BN(1000000001)).div(new BN(1e9)).add(new BN(1));
@@ -930,8 +930,8 @@ const calculateFinalPosition = async ({
     finalTick = baseTickAtRatio + 1;
     const ratioNew = ratioAtTick.mul(TICK_SPACING).div(new BN(1e4));
     ratioNew.mul(colRaw).shrn(48);
-    if (finalTick < MIN_TICK$1) {
-      finalTick = MIN_TICK$1;
+    if (finalTick < MIN_TICK) {
+      finalTick = MIN_TICK;
     } else if (finalTick > MAX_TICK) {
       finalTick = MAX_TICK;
     }
@@ -1007,7 +1007,7 @@ async function loadRelevantBranches(vaultId, vaultState, program) {
       branches.push({
         branchId: 1,
         status: 0,
-        minimaTick: MIN_TICK$1,
+        minimaTick: MIN_TICK,
         minimaTickPartials: 0,
         debtLiquidity: 0,
         debtFactor: 0,
@@ -1030,15 +1030,13 @@ async function loadRelevantTicksHasDebtArrays(vaultId, program) {
 }
 
 const MIN_I128 = new BN("170141183460469231731687303715884105728").neg();
-const MIN_TICK = -16383;
 async function getOtherInstructionsOperate(vaultId, vaultState, currentPosition, finalPosition, currentTick, program, signer) {
   const otherIxs = [];
   const tickToRead = [currentTick];
   let currentTickData;
   let finalTickData;
-  if (currentPosition.tick > MIN_TICK) tickToRead.push(currentPosition.tick);
-  if (finalPosition.tick > MIN_TICK && finalPosition.tick !== currentPosition.tick)
-    tickToRead.push(finalPosition.tick);
+  tickToRead.push(currentPosition.tick);
+  tickToRead.push(finalPosition.tick);
   if (tickToRead.length > 0) {
     const tickData = await program.account.tick.fetchMultiple(
       tickToRead.map((tick) => getTick(vaultId, tick))
@@ -1082,11 +1080,22 @@ async function getOtherInstructionsOperate(vaultId, vaultState, currentPosition,
     finalPosition.tick,
     finalTickData ? finalTickData.totalIds : 0
   );
-  if (finalPosition.tick !== currentTick && finalTickData)
-    tickIdsToRead.push({
-      tick: finalPosition.tick,
-      totalIds: finalTickData.totalIds
-    });
+  if (finalPosition.tick !== currentTick)
+    if (finalTickData) {
+      tickIdsToRead.push({
+        tick: finalPosition.tick,
+        totalIds: finalTickData.totalIds
+      });
+    } else {
+      const context = await getInitTickIdLiquidationContext(
+        vaultId,
+        finalPosition.tick,
+        signer,
+        program
+      );
+      const ix = await program.methods.initTickIdLiquidation(vaultId, finalPosition.tick, 0).accounts(context).instruction();
+      otherIxs.push(ix);
+    }
   const tickIdData = await program.account.tickIdLiquidation.fetchMultiple(
     tickIdsToRead.map(
       ({ tick, totalIds }) => getTickIdLiquidation(vaultId, tick, totalIds)
@@ -1373,7 +1382,12 @@ const getOperateIx = async ({
     program
   });
   const [operateIx, addressLookupTable] = await Promise.all([
-    program.methods.operate(colAmount, debtAmount, Buffer.from(remainingAccountsIndices)).accounts(accounts).remainingAccounts(remainingAccounts).instruction(),
+    program.methods.operate(
+      colAmount,
+      debtAmount,
+      { direct: {} },
+      Buffer.from(remainingAccountsIndices)
+    ).accounts(accounts).remainingAccounts(remainingAccounts).instruction(),
     connection.getAddressLookupTable(lookupTable)
   ]);
   return {

package/dist/index.mjs

@@ -1,5 +1,5 @@
 export { l as lendingPda, b as lendingRewardRateModelPda, a as liquidityPda } from './shared/lend.Cbyx-MDB.mjs';
-export { b as borrowPda } from './shared/lend.gEWT9qRO.mjs';
+export { b as borrowPda } from './shared/lend.DfnSwnoV.mjs';
 import '@solana/web3.js';
 import './shared/lend.D5fnz2Fg.mjs';
 import '@solana/spl-token';

package/dist/shared/{lend.gEWT9qRO.mjs → lend.DfnSwnoV.mjs}

@@ -827,9 +827,6 @@ const instructions = [
 					}
 				}
 			},
-			{
-				name: "vault_admin"
-			},
 			{
 				name: "vault_config",
 				docs: [
@@ -853,10 +850,6 @@ const instructions = [
 			{
 				name: "oracle"
 			},
-			{
-				name: "top_tick",
-				writable: true
-			},
 			{
 				name: "new_branch",
 				writable: true
@@ -887,7 +880,8 @@ const instructions = [
 			},
 			{
 				name: "supply_token_claim_account",
-				writable: true
+				writable: true,
+				optional: true
 			},
 			{
 				name: "liquidity",
@@ -936,6 +930,16 @@ const instructions = [
 				name: "absorb",
 				type: "bool"
 			},
+			{
+				name: "transfer_type",
+				type: {
+					option: {
+						defined: {
+							name: "TransferType"
+						}
+					}
+				}
+			},
 			{
 				name: "remaining_accounts_indices",
 				type: "bytes"
@@ -1279,11 +1283,13 @@ const instructions = [
 			},
 			{
 				name: "supply_token_claim_account",
-				writable: true
+				writable: true,
+				optional: true
 			},
 			{
 				name: "borrow_token_claim_account",
-				writable: true
+				writable: true,
+				optional: true
 			},
 			{
 				name: "liquidity",
@@ -1320,6 +1326,16 @@ const instructions = [
 				name: "new_debt",
 				type: "i128"
 			},
+			{
+				name: "transfer_type",
+				type: {
+					option: {
+						defined: {
+							name: "TransferType"
+						}
+					}
+				}
+			},
 			{
 				name: "remaining_accounts_indices",
 				type: "bytes"
@@ -2944,51 +2960,56 @@ const errors = [
 	},
 	{
 		code: 6056,
+		name: "VaultClaimAccountRequired",
+		msg: "VAULT_CLAIM_ACCOUNT_REQUIRED"
+	},
+	{
+		code: 6057,
 		name: "VaultAdminValueAboveLimit",
 		msg: "VAULT_ADMIN_VALUE_ABOVE_LIMIT"
 	},
 	{
-		code: 6057,
+		code: 6058,
 		name: "VaultAdminOnlyAuths",
 		msg: "VAULT_ADMIN_ONLY_AUTH_ACCOUNTS"
 	},
 	{
-		code: 6058,
+		code: 6059,
 		name: "VaultAdminAddressZeroNotAllowed",
 		msg: "VAULT_ADMIN_ADDRESS_ZERO_NOT_ALLOWED"
 	},
 	{
-		code: 6059,
+		code: 6060,
 		name: "VaultAdminVaultIdMismatch",
 		msg: "VAULT_ADMIN_VAULT_ID_MISMATCH"
 	},
 	{
-		code: 6060,
+		code: 6061,
 		name: "VaultAdminTotalIdsMismatch",
 		msg: "VAULT_ADMIN_TOTAL_IDS_MISMATCH"
 	},
 	{
-		code: 6061,
+		code: 6062,
 		name: "VaultAdminTickMismatch",
 		msg: "VAULT_ADMIN_TICK_MISMATCH"
 	},
 	{
-		code: 6062,
+		code: 6063,
 		name: "VaultAdminLiquidityProgramMismatch",
 		msg: "VAULT_ADMIN_LIQUIDITY_PROGRAM_MISMATCH"
 	},
 	{
-		code: 6063,
+		code: 6064,
 		name: "VaultAdminMaxAuthCountReached",
 		msg: "VAULT_ADMIN_MAX_AUTH_COUNT_REACHED"
 	},
 	{
-		code: 6064,
+		code: 6065,
 		name: "VaultAdminInvalidParams",
 		msg: "VAULT_ADMIN_INVALID_PARAMS"
 	},
 	{
-		code: 6065,
+		code: 6066,
 		name: "VaultAdminOnlyAuthority",
 		msg: "VAULT_ADMIN_ONLY_AUTHORITY"
 	}
@@ -3562,10 +3583,6 @@ const types = [
 				{
 					name: "dust_debt_amount",
 					type: "u64"
-				},
-				{
-					name: "bump",
-					type: "u8"
 				}
 			]
 		}
@@ -3657,10 +3674,6 @@ const types = [
 				{
 					name: "debt_factor",
 					type: "u64"
-				},
-				{
-					name: "bump",
-					type: "u8"
 				}
 			]
 		}
@@ -3879,6 +3892,23 @@ const types = [
 			]
 		}
 	},
+	{
+		name: "TransferType",
+		type: {
+			kind: "enum",
+			variants: [
+				{
+					name: "SKIP"
+				},
+				{
+					name: "DIRECT"
+				},
+				{
+					name: "CLAIM"
+				}
+			]
+		}
+	},
 	{
 		name: "UpdateCoreSettingsParams",
 		type: {

package/package.json

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