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

package/dist/dex/index.mjs

@@ -1,8 +1,11 @@
 import { PublicKey } from '@solana/web3.js';
 import { Program } from '@coral-xyz/anchor';
-import { ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync } from '@solana/spl-token';
+import { getAssociatedTokenAddressSync, ASSOCIATED_TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { r as getOracleSources } from '../shared/lend.CVtn-ehf.mjs';
 import { g as getLiquidityProgramId, a as getLiquidity, b as getUserBorrowPosition, c as getUserSupplyPosition, d as getRateModel, e as getReserve } from '../shared/lend.C3XdrR6R.mjs';
-import { g as getDex } from '../shared/lend.BC5Y1398.mjs';
+import { g as getDex, a as getDexMetadata } from '../shared/lend.s0kjiHy3.mjs';
+import 'bn.js';
+import '../shared/lend.a53XYkl5.mjs';
 
 const address = "jupZ4m2GqUCJ5iueMfzQf8khFfH31d4XAQt3RzCT9Vd";
 const metadata = {
@@ -613,6 +616,36 @@ const instructions = [
 					]
 				}
 			},
+			{
+				name: "dex_metadata",
+				writable: true,
+				pda: {
+					seeds: [
+						{
+							kind: "const",
+							value: [
+								100,
+								101,
+								120,
+								95,
+								109,
+								101,
+								116,
+								97,
+								100,
+								97,
+								116,
+								97
+							]
+						},
+						{
+							kind: "account",
+							path: "dex_admin.next_dex_id",
+							account: "DexAdmin"
+						}
+					]
+				}
+			},
 			{
 				name: "token_0"
 			},
@@ -691,6 +724,91 @@ const instructions = [
 			}
 		]
 	},
+	{
+		name: "init_dex_metadata",
+		discriminator: [
+			114,
+			167,
+			144,
+			220,
+			143,
+			73,
+			224,
+			8
+		],
+		accounts: [
+			{
+				name: "authority",
+				writable: true,
+				signer: true
+			},
+			{
+				name: "dex_admin"
+			},
+			{
+				name: "dex",
+				pda: {
+					seeds: [
+						{
+							kind: "const",
+							value: [
+								100,
+								101,
+								120
+							]
+						},
+						{
+							kind: "arg",
+							path: "dex_id"
+						}
+					]
+				}
+			},
+			{
+				name: "dex_metadata",
+				writable: true,
+				pda: {
+					seeds: [
+						{
+							kind: "const",
+							value: [
+								100,
+								101,
+								120,
+								95,
+								109,
+								101,
+								116,
+								97,
+								100,
+								97,
+								116,
+								97
+							]
+						},
+						{
+							kind: "arg",
+							path: "dex_id"
+						}
+					]
+				}
+			},
+			{
+				name: "system_program",
+				address: "11111111111111111111111111111111"
+			}
+		],
+		args: [
+			{
+				name: "dex_id",
+				type: "u16"
+			},
+			{
+				name: "lookup_table",
+				type: "pubkey"
+			}
+		]
+	},
 	{
 		name: "init_position",
 		discriminator: [
@@ -2075,6 +2193,45 @@ const instructions = [
 			}
 		]
 	},
+	{
+		name: "update_dex_lookup_table",
+		discriminator: [
+			87,
+			149,
+			96,
+			95,
+			24,
+			20,
+			211,
+			43
+		],
+		accounts: [
+			{
+				name: "authority",
+				signer: true
+			},
+			{
+				name: "dex_admin"
+			},
+			{
+				name: "dex_metadata",
+				docs: [
+					"@dev Verification inside instruction logic"
+				],
+				writable: true
+			}
+		],
+		args: [
+			{
+				name: "dex_id",
+				type: "u16"
+			},
+			{
+				name: "lookup_table",
+				type: "pubkey"
+			}
+		]
+	},
 	{
 		name: "update_fee_and_revenue_cut",
 		discriminator: [
@@ -2855,6 +3012,19 @@ const accounts = [
 			155
 		]
 	},
+	{
+		name: "DexMetadata",
+		discriminator: [
+			177,
+			231,
+			57,
+			253,
+			64,
+			12,
+			205,
+			37
+		]
+	},
 	{
 		name: "DexPosition",
 		discriminator: [
@@ -2987,6 +3157,19 @@ const events = [
 			132
 		]
 	},
+	{
+		name: "LogInitDexMetadata",
+		discriminator: [
+			53,
+			61,
+			248,
+			111,
+			245,
+			219,
+			167,
+			73
+		]
+	},
 	{
 		name: "LogInitDexPriceParams",
 		discriminator: [
@@ -3208,6 +3391,19 @@ const events = [
 			17
 		]
 	},
+	{
+		name: "LogUpdateDexLookupTable",
+		discriminator: [
+			135,
+			31,
+			232,
+			96,
+			2,
+			64,
+			116,
+			229
+		]
+	},
 	{
 		name: "LogUpdateFeeAndRevenueCut",
 		discriminator: [
@@ -3780,6 +3976,11 @@ const errors = [
 		code: 6082,
 		name: "DexSwapOutResult",
 		msg: "DEX_SWAP_OUT_RESULT"
+	},
+	{
+		code: 6083,
+		name: "DexAdminDexIdMismatch",
+		msg: "DEX_ADMIN_DEX_ID_MISMATCH"
 	}
 ];
 const types = [
@@ -4051,6 +4252,31 @@ const types = [
 			]
 		}
 	},
+	{
+		name: "DexMetadata",
+		type: {
+			kind: "struct",
+			fields: [
+				{
+					name: "dex_id",
+					type: "u16"
+				},
+				{
+					name: "lookup_table",
+					type: "pubkey"
+				},
+				{
+					name: "_reserved",
+					type: {
+						array: [
+							"u8",
+							32
+						]
+					}
+				}
+			]
+		}
+	},
 	{
 		name: "DexPosition",
 		docs: [
@@ -4411,6 +4637,22 @@ const types = [
 			]
 		}
 	},
+	{
+		name: "LogInitDexMetadata",
+		type: {
+			kind: "struct",
+			fields: [
+				{
+					name: "dex_id",
+					type: "u16"
+				},
+				{
+					name: "lookup_table",
+					type: "pubkey"
+				}
+			]
+		}
+	},
 	{
 		name: "LogInitDexPriceParams",
 		type: {
@@ -4777,6 +5019,22 @@ const types = [
 			]
 		}
 	},
+	{
+		name: "LogUpdateDexLookupTable",
+		type: {
+			kind: "struct",
+			fields: [
+				{
+					name: "dex_id",
+					type: "u16"
+				},
+				{
+					name: "lookup_table",
+					type: "pubkey"
+				}
+			]
+		}
+	},
 	{
 		name: "LogUpdateFeeAndRevenueCut",
 		type: {
@@ -5338,7 +5596,6 @@ const getAccountOwner = async (account, connection) => {
     throw new Error(`Account info not found for ${account.toString()}`);
   return info.owner;
 };
-const decodeBool = (v) => Number(v) === 1;
 
 const getDexProgram = ({
   connection,
@@ -5350,6 +5607,12 @@ const getDexProgram = ({
     publicKey: signer
   });
 };
+async function resolveDexMetadata(dexId, connection) {
+  const dex2 = getDexMetadata(dexId);
+  const program = getDexProgram({ connection });
+  const dexMetadata = await program.account.dexMetadata.fetch(dex2);
+  return dexMetadata;
+}
 async function resolvePool(dexId, connection) {
   const dex2 = getDex(dexId);
   const program = getDexProgram({ connection });
@@ -5368,8 +5631,8 @@ async function resolvePool(dexId, connection) {
     token1,
     token0Program,
     token1Program,
-    smartCol: decodeBool(dexAccount.isSmartCollateralEnabled),
-    smartDebt: decodeBool(dexAccount.isSmartDebtEnabled),
+    smartCol: dexAccount.isSmartCollateralEnabled === 1,
+    smartDebt: dexAccount.isSmartDebtEnabled === 1,
     centerPriceAddress: dexAccount.centerPriceAddress,
     liquidity: liquidity$1,
     token0Reserve: getReserve(token0, "main"),
@@ -5395,17 +5658,62 @@ async function resolvePool(dexId, connection) {
   };
   return resolved;
 }
-const getSwapAccounts = async (params) => {
+async function getCenterPriceRemainingAccounts({
+  connection,
+  oracle
+}) {
+  if (oracle.equals(PublicKey.default)) {
+    return [];
+  }
+  const accounts = [
+    oracle,
+    // 0th accounts is center price address
+    ...// rest of the accounts are oracle sources
+    (await getOracleSources({
+      connection,
+      oracle
+    })).map((s) => s.source)
+  ];
+  return accounts.map((a) => ({
+    pubkey: a,
+    isWritable: false,
+    isSigner: false
+  }));
+}
+const getSwapContext = async (params) => {
   const { signer, recipient, connection, dexId } = params;
-  const pool = await resolvePool(dexId, connection);
-  return {
+  const [pool, dexMetadata] = await Promise.all([
+    resolvePool(dexId, connection),
+    resolveDexMetadata(dexId, connection)
+  ]);
+  const accounts = {
     signer,
     dex: pool.dex,
-    userToken0Account: getAssociatedTokenAddressSync(pool.token0, signer, true, pool.token0Program),
-    userToken1Account: getAssociatedTokenAddressSync(pool.token1, signer, true, pool.token1Program),
+    userToken0Account: getAssociatedTokenAddressSync(
+      pool.token0,
+      signer,
+      true,
+      pool.token0Program
+    ),
+    userToken1Account: getAssociatedTokenAddressSync(
+      pool.token1,
+      signer,
+      true,
+      pool.token1Program
+    ),
     recipient,
-    recipientToken0Account: getAssociatedTokenAddressSync(pool.token0, recipient ?? signer, true, pool.token0Program),
-    recipientToken1Account: getAssociatedTokenAddressSync(pool.token1, recipient ?? signer, true, pool.token1Program),
+    recipientToken0Account: getAssociatedTokenAddressSync(
+      pool.token0,
+      recipient ?? signer,
+      true,
+      pool.token0Program
+    ),
+    recipientToken1Account: getAssociatedTokenAddressSync(
+      pool.token1,
+      recipient ?? signer,
+      true,
+      pool.token1Program
+    ),
     token0: pool.token0,
     token1: pool.token1,
     token0Reserve: pool.token0Reserve,
@@ -5425,36 +5733,57 @@ const getSwapAccounts = async (params) => {
     oracleProgram: new PublicKey("jupnw4B6Eqs7ft6rxpzYLJZYSnrpRgPcr589n5Kv4oc"),
     associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID
   };
+  const centerPriceRemainingAccounts = await getCenterPriceRemainingAccounts({
+    connection,
+    oracle: pool.centerPriceAddress
+  });
+  return {
+    accounts,
+    remainingAccounts: [...centerPriceRemainingAccounts],
+    lookupTable: dexMetadata.lookupTable
+  };
 };
-async function swapIn(params) {
-  const { connection, signer, swap0to1, amountIn, amountOutMin, centerPriceRemainingAccounts } = params;
+async function getSwapInIx(params) {
+  const { connection, signer, swap0to1, amountIn, amountOutMin } = params;
   const program = getDexProgram({ connection, signer });
-  const ix = await program.methods.swapIn(swap0to1, amountIn, amountOutMin).accountsPartial(await getSwapAccounts({
+  const { accounts, remainingAccounts, lookupTable } = await getSwapContext({
     dexId: params.dexId,
     connection: params.connection,
     signer: params.signer,
     recipient: params.recipient
-  })).remainingAccounts(
-    (centerPriceRemainingAccounts || []).map((a) => ({ pubkey: a, isSigner: false, isWritable: false }))
-  ).instruction();
+  });
+  const [ix, addressLookupTable] = await Promise.all([
+    program.methods.swapIn(swap0to1, amountIn, amountOutMin).accountsPartial(accounts).remainingAccounts(remainingAccounts).instruction(),
+    connection.getAddressLookupTable(lookupTable)
+  ]);
   return {
-    ixs: [ix]
+    ixs: [ix],
+    accounts,
+    remainingAccounts,
+    addressLookupTableAddresses: lookupTable ? [lookupTable] : [],
+    addressLookupTableAccounts: addressLookupTable.value ? [addressLookupTable.value] : []
   };
 }
-async function swapOut(params) {
-  const { connection, signer, swap0to1, amountIn, amountInMax, centerPriceRemainingAccounts } = params;
+async function getSwapOutIx(params) {
+  const { connection, signer, swap0to1, amountOut, amountInMax } = params;
   const program = getDexProgram({ connection, signer });
-  const ix = await program.methods.swapIn(swap0to1, amountIn, amountInMax).accountsPartial(await getSwapAccounts({
+  const { accounts, remainingAccounts, lookupTable } = await getSwapContext({
     dexId: params.dexId,
     connection: params.connection,
     signer: params.signer,
     recipient: params.recipient
-  })).remainingAccounts(
-    (centerPriceRemainingAccounts || []).map((a) => ({ pubkey: a, isSigner: false, isWritable: false }))
-  ).instruction();
+  });
+  const [ix, addressLookupTable] = await Promise.all([
+    program.methods.swapOut(swap0to1, amountOut, amountInMax).accountsPartial(accounts).remainingAccounts(remainingAccounts).instruction(),
+    connection.getAddressLookupTable(lookupTable)
+  ]);
   return {
-    ixs: [ix]
+    ixs: [ix],
+    accounts,
+    remainingAccounts,
+    addressLookupTableAddresses: lookupTable ? [lookupTable] : [],
+    addressLookupTableAccounts: addressLookupTable.value ? [addressLookupTable.value] : []
   };
 }
 
-export { getDexProgram, swapIn, swapOut };
+export { getDexProgram, getSwapInIx, getSwapOutIx };

package/dist/earn/index.d.mts

@@ -39,7 +39,6 @@ declare function getDepositContext({ asset, signer, connection, market, }: Depos
     liquidityProgram: PublicKey;
     rewardsRateModel: PublicKey;
     tokenProgram: PublicKey;
-    associatedTokenProgram: PublicKey;
     systemProgram: PublicKey;
     sysvarInstruction: PublicKey;
 }>;
@@ -92,7 +91,6 @@ declare function getWithdrawContext({ asset, signer, connection, market, }: With
     liquidityProgram: PublicKey;
     rewardsRateModel: PublicKey;
     tokenProgram: PublicKey;
-    associatedTokenProgram: PublicKey;
     systemProgram: PublicKey;
     sysvarInstruction: PublicKey;
 }>;
@@ -127,7 +125,7 @@ type Lending = {
     address: "jup3YeL8QhtSx1e253b2FDvsMNC87fDrgQZivbrndc9";
     metadata: {
         name: "lending";
-        version: "0.1.0";
+        version: "0.1.2";
         spec: "0.1.0";
         description: "Created with Anchor";
     };
@@ -186,7 +184,6 @@ type Lending = {
                 },
                 {
                     name: "liquidityProgram";
-                    writable: true;
                     relations: ["lendingAdmin"];
                 },
                 {
@@ -197,6 +194,7 @@ type Lending = {
                 },
                 {
                     name: "associatedTokenProgram";
+                    optional: true;
                     address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
                 },
                 {
@@ -266,7 +264,6 @@ type Lending = {
                 },
                 {
                     name: "liquidityProgram";
-                    writable: true;
                     relations: ["lendingAdmin"];
                 },
                 {
@@ -277,6 +274,7 @@ type Lending = {
                 },
                 {
                     name: "associatedTokenProgram";
+                    optional: true;
                     address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
                 },
                 {
@@ -594,7 +592,6 @@ type Lending = {
                 },
                 {
                     name: "liquidityProgram";
-                    writable: true;
                     relations: ["lendingAdmin"];
                 },
                 {
@@ -605,6 +602,7 @@ type Lending = {
                 },
                 {
                     name: "associatedTokenProgram";
+                    optional: true;
                     address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
                 },
                 {
@@ -674,7 +672,6 @@ type Lending = {
                 },
                 {
                     name: "liquidityProgram";
-                    writable: true;
                     relations: ["lendingAdmin"];
                 },
                 {
@@ -685,6 +682,7 @@ type Lending = {
                 },
                 {
                     name: "associatedTokenProgram";
+                    optional: true;
                     address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
                 },
                 {
@@ -808,7 +806,6 @@ type Lending = {
                 },
                 {
                     name: "liquidityProgram";
-                    writable: true;
                     relations: ["lendingAdmin"];
                 },
                 {
@@ -879,6 +876,7 @@ type Lending = {
                 {
                     name: "claimAccount";
                     writable: true;
+                    optional: true;
                 },
                 {
                     name: "liquidity";
@@ -886,7 +884,6 @@ type Lending = {
                 },
                 {
                     name: "liquidityProgram";
-                    writable: true;
                     relations: ["lendingAdmin"];
                 },
                 {
@@ -897,6 +894,7 @@ type Lending = {
                 },
                 {
                     name: "associatedTokenProgram";
+                    optional: true;
                     address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
                 },
                 {
@@ -963,6 +961,7 @@ type Lending = {
                 {
                     name: "claimAccount";
                     writable: true;
+                    optional: true;
                 },
                 {
                     name: "liquidity";
@@ -970,7 +969,6 @@ type Lending = {
                 },
                 {
                     name: "liquidityProgram";
-                    writable: true;
                     relations: ["lendingAdmin"];
                 },
                 {
@@ -981,6 +979,7 @@ type Lending = {
                 },
                 {
                     name: "associatedTokenProgram";
+                    optional: true;
                     address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
                 },
                 {
@@ -1174,6 +1173,7 @@ type Lending = {
                 {
                     name: "claimAccount";
                     writable: true;
+                    optional: true;
                 },
                 {
                     name: "liquidity";
@@ -1181,7 +1181,6 @@ type Lending = {
                 },
                 {
                     name: "liquidityProgram";
-                    writable: true;
                     relations: ["lendingAdmin"];
                 },
                 {
@@ -1192,6 +1191,7 @@ type Lending = {
                 },
                 {
                     name: "associatedTokenProgram";
+                    optional: true;
                     address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
                 },
                 {
@@ -1258,6 +1258,7 @@ type Lending = {
                 {
                     name: "claimAccount";
                     writable: true;
+                    optional: true;
                 },
                 {
                     name: "liquidity";
@@ -1265,7 +1266,6 @@ type Lending = {
                 },
                 {
                     name: "liquidityProgram";
-                    writable: true;
                     relations: ["lendingAdmin"];
                 },
                 {
@@ -1276,6 +1276,7 @@ type Lending = {
                 },
                 {
                     name: "associatedTokenProgram";
+                    optional: true;
                     address: "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
                 },
                 {
@@ -1832,7 +1833,11 @@ type Lending = {
                     },
                     {
                         name: "withdrawalLimit";
-                        type: "u128";
+                        type: "u64";
+                    },
+                    {
+                        name: "decayAmount";
+                        type: "u64";
                     },
                     {
                         name: "lastUpdate";
@@ -1844,7 +1849,11 @@ type Lending = {
                     },
                     {
                         name: "expandDuration";
-                        type: "u64";
+                        type: "u32";
+                    },
+                    {
+                        name: "decayDuration";
+                        type: "u32";
                     },
                     {
                         name: "baseWithdrawalLimit";