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

package/dist/shared/{lend.DcHJFKzT.mjs → lend.TR2SYmUo.mjs}

@@ -1,13 +1,13 @@
 import { Program, AnchorProvider } from '@coral-xyz/anchor';
 import BN from 'bn.js';
-import { p as getTickHasDebt, e as getPosition, q as getTick, s as getTickIdLiquidation, h as getVaultConfig, r as getBranch, f as getVaultState } from './lend.a53XYkl5.mjs';
+import { p as getTickHasDebt, e as getPosition, q as getTick, s as getTickIdLiquidation, i as getVaultMetadata, h as getVaultConfig, r as getBranch, f as getVaultState } from './lend.a53XYkl5.mjs';
 import { PublicKey, Transaction } from '@solana/web3.js';
 import { e as getReserve } from './lend.C3XdrR6R.mjs';
 
 const address$1 = "jupnw4B6Eqs7ft6rxpzYLJZYSnrpRgPcr589n5Kv4oc";
 const metadata$1 = {
 	name: "oracle",
-	version: "0.1.3",
+	version: "0.1.4",
 	spec: "0.1.0",
 	description: "Created with Anchor"
 };
@@ -894,6 +894,26 @@ const errors$1 = [
 		code: 6044,
 		name: "ChainlinkDataStreamsNoFeedKeepers",
 		msg: "CHAINLINK_DATA_STREAMS_NO_FEED_KEEPERS"
+	},
+	{
+		code: 6045,
+		name: "PstPoolInvalidState",
+		msg: "PST_POOL_INVALID_STATE"
+	},
+	{
+		code: 6046,
+		name: "PstPoolModeStatesEmpty",
+		msg: "PST_POOL_MODE_STATES_EMPTY"
+	},
+	{
+		code: 6047,
+		name: "PstPoolMintMismatch",
+		msg: "PST_POOL_MINT_MISMATCH"
+	},
+	{
+		code: 6048,
+		name: "PstPoolMintSupplyZero",
+		msg: "PST_POOL_MINT_SUPPLY_ZERO"
 	}
 ];
 const types$1 = [
@@ -1287,6 +1307,9 @@ const types$1 = [
 				},
 				{
 					name: "ChainlinkDataStreams"
+				},
+				{
+					name: "PstPool"
 				}
 			]
 		}
@@ -1431,7 +1454,7 @@ function mulShift64(n0, n1) {
 }
 function getTickAtRatio(ratioX48) {
   const MIN_RATIOX48 = new BN(6093);
-  const MAX_RATIOX48 = new BN("13002088133096036565414295");
+  const MAX_RATIOX48 = new BN("13002088162051014298412982");
   const _1E13 = new BN("10000000000000");
   if (ratioX48.lt(MIN_RATIOX48) || ratioX48.gt(MAX_RATIOX48)) {
     throw new Error(`Ratio ${ratioX48.toString()} out of bounds`);
@@ -1704,7 +1727,7 @@ function mulBigNumber(bigNumber1, bigNumber2) {
 const address = "jupr81YtYssSyPt8jbnGuiWon5f6x9TcDEFxYe3Bdzi";
 const metadata = {
 	name: "vaults",
-	version: "0.1.2",
+	version: "0.1.4",
 	spec: "0.1.0",
 	description: "Created with Anchor"
 };
@@ -2554,120 +2577,14 @@ const instructions = [
 			},
 			{
 				name: "signer_token_account",
-				writable: true,
-				pda: {
-					seeds: [
-						{
-							kind: "account",
-							path: "signer"
-						},
-						{
-							kind: "account",
-							path: "borrow_token_program"
-						},
-						{
-							kind: "account",
-							path: "borrow_token"
-						}
-					],
-					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: "to"
 			},
 			{
 				name: "to_token_account",
-				writable: true,
-				pda: {
-					seeds: [
-						{
-							kind: "account",
-							path: "to"
-						},
-						{
-							kind: "account",
-							path: "supply_token_program"
-						},
-						{
-							kind: "account",
-							path: "supply_token"
-						}
-					],
-					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: "vault_config",
@@ -2746,6 +2663,7 @@ const instructions = [
 			},
 			{
 				name: "associated_token_program",
+				optional: true,
 				address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
 			},
 			{
@@ -2801,117 +2719,11 @@ const instructions = [
 			},
 			{
 				name: "signer_supply_token_account",
-				writable: true,
-				pda: {
-					seeds: [
-						{
-							kind: "account",
-							path: "signer"
-						},
-						{
-							kind: "account",
-							path: "supply_token_program"
-						},
-						{
-							kind: "account",
-							path: "supply_token"
-						}
-					],
-					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: "signer_borrow_token_account",
-				writable: true,
-				pda: {
-					seeds: [
-						{
-							kind: "account",
-							path: "signer"
-						},
-						{
-							kind: "account",
-							path: "borrow_token_program"
-						},
-						{
-							kind: "account",
-							path: "borrow_token"
-						}
-					],
-					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: "recipient",
@@ -2920,118 +2732,12 @@ const instructions = [
 			{
 				name: "recipient_borrow_token_account",
 				writable: true,
-				optional: true,
-				pda: {
-					seeds: [
-						{
-							kind: "account",
-							path: "recipient"
-						},
-						{
-							kind: "account",
-							path: "borrow_token_program"
-						},
-						{
-							kind: "account",
-							path: "borrow_token"
-						}
-					],
-					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
-						]
-					}
-				}
+				optional: true
 			},
-			{
-				name: "recipient_supply_token_account",
-				writable: true,
-				optional: true,
-				pda: {
-					seeds: [
-						{
-							kind: "account",
-							path: "recipient"
-						},
-						{
-							kind: "account",
-							path: "supply_token_program"
-						},
-						{
-							kind: "account",
-							path: "supply_token"
-						}
-					],
-					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
-						]
-					}
-				}
+			{
+				name: "recipient_supply_token_account",
+				writable: true,
+				optional: true
 			},
 			{
 				name: "vault_config",
@@ -3142,6 +2848,7 @@ const instructions = [
 			},
 			{
 				name: "associated_token_program",
+				optional: true,
 				address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
 			},
 			{
@@ -3197,117 +2904,122 @@ const instructions = [
 			},
 			{
 				name: "rebalancer_supply_token_account",
-				writable: true,
-				pda: {
-					seeds: [
-						{
-							kind: "account",
-							path: "rebalancer"
-						},
-						{
-							kind: "account",
-							path: "supply_token_program"
-						},
-						{
-							kind: "account",
-							path: "supply_token"
-						}
-					],
-					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: "rebalancer_borrow_token_account",
+				writable: true
+			},
+			{
+				name: "vault_config",
+				docs: [
+					"@dev mut because this PDA signs the CPI to liquidity program",
+					"@dev verification inside instruction logic"
+				],
+				writable: true
+			},
+			{
+				name: "vault_state",
+				docs: [
+					"@dev verification inside instruction logic"
+				],
+				writable: true
+			},
+			{
+				name: "supply_token",
+				relations: [
+					"vault_config"
+				]
+			},
+			{
+				name: "borrow_token",
+				relations: [
+					"vault_config"
+				]
+			},
+			{
+				name: "supply_token_reserves_liquidity",
+				writable: true
+			},
+			{
+				name: "borrow_token_reserves_liquidity",
+				writable: true
+			},
+			{
+				name: "vault_supply_position_on_liquidity",
+				writable: true
+			},
+			{
+				name: "vault_borrow_position_on_liquidity",
+				writable: true
+			},
+			{
+				name: "supply_rate_model"
+			},
+			{
+				name: "borrow_rate_model"
+			},
+			{
+				name: "liquidity"
+			},
+			{
+				name: "liquidity_program"
+			},
+			{
+				name: "vault_supply_token_account",
+				writable: true
+			},
+			{
+				name: "vault_borrow_token_account",
+				writable: true
+			},
+			{
+				name: "system_program",
+				address: "11111111111111111111111111111111"
+			},
+			{
+				name: "supply_token_program"
+			},
+			{
+				name: "borrow_token_program"
+			},
+			{
+				name: "associated_token_program",
+				optional: true,
+				address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+			}
+		],
+		args: [
+		]
+	},
+	{
+		name: "rebalance_with_amounts",
+		discriminator: [
+			190,
+			33,
+			144,
+			182,
+			86,
+			4,
+			141,
+			73
+		],
+		accounts: [
+			{
+				name: "rebalancer",
 				writable: true,
-				pda: {
-					seeds: [
-						{
-							kind: "account",
-							path: "rebalancer"
-						},
-						{
-							kind: "account",
-							path: "borrow_token_program"
-						},
-						{
-							kind: "account",
-							path: "borrow_token"
-						}
-					],
-					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
-						]
-					}
-				}
+				signer: true,
+				relations: [
+					"vault_config"
+				]
+			},
+			{
+				name: "rebalancer_supply_token_account",
+				writable: true
+			},
+			{
+				name: "rebalancer_borrow_token_account",
+				writable: true
 			},
 			{
 				name: "vault_config",
@@ -3384,10 +3096,23 @@ const instructions = [
 			},
 			{
 				name: "associated_token_program",
+				optional: true,
 				address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
 			}
 		],
 		args: [
+			{
+				name: "supply_amount",
+				type: {
+					option: "u128"
+				}
+			},
+			{
+				name: "borrow_amount",
+				type: {
+					option: "u128"
+				}
+			}
 		]
 	},
 	{
@@ -5820,6 +5545,9 @@ const types = [
 				},
 				{
 					name: "ChainlinkDataStreams"
+				},
+				{
+					name: "PstPool"
 				}
 			]
 		}
@@ -6266,7 +5994,11 @@ const types = [
 				},
 				{
 					name: "withdrawal_limit",
-					type: "u128"
+					type: "u64"
+				},
+				{
+					name: "decay_amount",
+					type: "u64"
 				},
 				{
 					name: "last_update",
@@ -6278,7 +6010,11 @@ const types = [
 				},
 				{
 					name: "expand_duration",
-					type: "u64"
+					type: "u32"
+				},
+				{
+					name: "decay_duration",
+					type: "u32"
 				},
 				{
 					name: "base_withdrawal_limit",
@@ -6538,6 +6274,45 @@ const X30 = new BN(1073741823);
 const MIN_I128 = new BN("170141183460469231731687303715884105728").neg();
 const MAX_REPAY_AMOUNT = MIN_I128;
 const MAX_WITHDRAW_AMOUNT = MIN_I128;
+const MAX_TOKEN_DECIMALS = 9;
+const LOWER_DECIMALS_OPERATE = 4;
+const MIN_DEBT = new BN(1e3);
+const MIN_DEBT_LOWER_DECIMALS = new BN(10);
+const LIQUIDATED_POSITION_DEBT_MULTIPLIER = new BN(2);
+function getMinimumDebt(decimals) {
+  if (decimals > MAX_TOKEN_DECIMALS) {
+    throw new Error(`Unsupported token decimals: ${decimals}`);
+  }
+  const base = decimals >= LOWER_DECIMALS_OPERATE ? MIN_DEBT : MIN_DEBT_LOWER_DECIMALS;
+  return base.mul(new BN(10).pow(new BN(MAX_TOKEN_DECIMALS - decimals)));
+}
+function reconcileLiquidatedDust({
+  finalTick,
+  finalColRaw,
+  finalDebtRaw,
+  dustDebtRaw,
+  borrowMintDecimals
+}) {
+  const absorbThreshold = getMinimumDebt(borrowMintDecimals).mul(
+    LIQUIDATED_POSITION_DEBT_MULTIPLIER
+  );
+  if (finalDebtRaw.lt(dustDebtRaw) || finalDebtRaw.lt(absorbThreshold)) {
+    return {
+      tick: MIN_TICK,
+      colRaw: new BN(0),
+      debtRaw: new BN(0),
+      dustDebtRaw: new BN(0),
+      isWiped: true
+    };
+  }
+  return {
+    tick: finalTick,
+    colRaw: finalColRaw,
+    debtRaw: finalDebtRaw,
+    dustDebtRaw,
+    isWiped: false
+  };
+}
 const getAccountOwner = async (account, connection) => {
   const info = await connection.getAccountInfo(account);
   if (!info)
@@ -6565,7 +6340,8 @@ const getCurrentPositionState = async ({
   vaultId,
   position,
   program,
-  market
+  market,
+  borrowMintDecimals
 }) => {
   let positionTick = position.tick;
   if (positionTick === INIT_TICK) {
@@ -6650,17 +6426,27 @@ const getCurrentPositionState = async ({
         initialConnectionFactor: connectionFactor,
         initialDebtRaw: debtRaw
       });
-      const netDebtRaw2 = finalDebtRaw.gt(dustDebtRaw) ? finalDebtRaw.sub(dustDebtRaw) : new BN(0);
-      return {
-        tick: finalTick,
-        tickId: position.tickId,
-        colRaw: finalColRaw,
-        debtRaw: finalDebtRaw,
+      const borrowDecimals = borrowMintDecimals ?? (await program.account.vaultMetadata.fetch(
+        getVaultMetadata(vaultId, market)
+      )).borrowMintDecimals;
+      const reconciled = reconcileLiquidatedDust({
+        finalTick,
+        finalColRaw,
+        finalDebtRaw,
         dustDebtRaw,
-        finalAmount: netDebtRaw2.gt(new BN(0)) ? finalColRaw : new BN(0),
-        isSupplyOnlyPosition: finalTick === MIN_TICK,
+        borrowMintDecimals: borrowDecimals
+      });
+      const netDebtRaw2 = reconciled.debtRaw.gt(reconciled.dustDebtRaw) ? reconciled.debtRaw.sub(reconciled.dustDebtRaw) : new BN(0);
+      return {
+        tick: reconciled.tick,
+        tickId: reconciled.isWiped ? 0 : position.tickId,
+        colRaw: reconciled.colRaw,
+        debtRaw: reconciled.debtRaw,
+        dustDebtRaw: reconciled.dustDebtRaw,
+        finalAmount: netDebtRaw2.gt(new BN(0)) ? reconciled.colRaw : new BN(0),
+        isSupplyOnlyPosition: reconciled.tick === MIN_TICK,
         userLiquidationStatus,
-        postLiquidationBranchId
+        postLiquidationBranchId: reconciled.isWiped ? 0 : postLiquidationBranchId
       };
     }
   }
@@ -7114,4 +6900,4 @@ const getLiquidityProgramId = (market) => {
   return market === "ethena" ? new PublicKey("jup6QF1sNDGpkkcu6F4qaFHcRBmnSS1VgyB4uFbBvNS") : new PublicKey("jupeiUmn818Jg1ekPURTpr4mFo29p46vygyykFJ3wZC");
 };
 
-export { vaultsIdl as A, oracle as B, INIT_TICK as I, MAX_REPAY_AMOUNT as M, TICKS_PER_TICK_HAS_DEBT as T, ZERO_TICK_SCALED_RATIO$1 as Z, MAX_TICK$1 as a, MAX_WITHDRAW_AMOUNT as b, MIN_I128 as c, MIN_TICK$1 as d, TICK_HAS_DEBT_ARRAY_SIZE as e, TICK_HAS_DEBT_CHILDREN_SIZE as f, getVaultsProgram as g, TICK_HAS_DEBT_CHILDREN_SIZE_IN_BITS as h, TOTAL_INDICES_NEEDED as i, findNextTickWithDebt as j, getAccountOwner as k, getCurrentPosition as l, getCurrentPositionState as m, getFinalPosition as n, getFirstTickForIndex as o, getLiquidityProgramId as p, getOracleSources as q, getRatioAtTick as r, getTickAtRatio as s, getTickIndices as t, loadRelevantBranches as u, loadRelevantBranchesForLiquidate as v, loadRelevantTicksHasDebtArrays as w, loadRelevantTicksHasDebtArraysLiquidate as x, readOraclePrice as y, readTickHasDebtArray as z };
+export { readTickHasDebtArray as A, reconcileLiquidatedDust as B, vaultsIdl as C, oracle as D, INIT_TICK as I, MAX_REPAY_AMOUNT as M, TICKS_PER_TICK_HAS_DEBT as T, ZERO_TICK_SCALED_RATIO$1 as Z, MAX_TICK$1 as a, MAX_WITHDRAW_AMOUNT as b, MIN_I128 as c, MIN_TICK$1 as d, TICK_HAS_DEBT_ARRAY_SIZE as e, TICK_HAS_DEBT_CHILDREN_SIZE as f, getVaultsProgram as g, TICK_HAS_DEBT_CHILDREN_SIZE_IN_BITS as h, TOTAL_INDICES_NEEDED as i, findNextTickWithDebt as j, getAccountOwner as k, getCurrentPosition as l, getCurrentPositionState as m, getFinalPosition as n, getFirstTickForIndex as o, getLiquidityProgramId as p, getMinimumDebt as q, getOracleSources as r, getRatioAtTick as s, getTickAtRatio as t, getTickIndices as u, loadRelevantBranches as v, loadRelevantBranchesForLiquidate as w, loadRelevantTicksHasDebtArrays as x, loadRelevantTicksHasDebtArraysLiquidate as y, readOraclePrice as z };