@jup-ag/lend 0.0.107-beta.1 → 0.1.0

package/README.md

@@ -11,24 +11,22 @@ npm install @jup-ag/lend
 #### Earning
 
 ```ts
-import { getDepositIx, getWithdrawIx } from "@jup-ag/lend/earn";
+import { getDepositIxs, getWithdrawIxs } from "@jup-ag/lend/earn";
 
 const connection = new Connection("https://api.mainnet-beta.solana.com");
 const signer = new PublicKey("signerAddress");
 const usdc = new PublicKey("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");
 
-const depositIx = await getDepositIx({
+const { ixs: depositIxs } = await getDepositIxs({
   amount: new BN(1000000),
   asset: usdc,
-
   signer,
   connection,
 });
 
-const withdrawIx = await getWithdrawIx({
+const { ixs: withdrawIxs } = await getWithdrawIxs({
   amount: new BN(10000),
   asset: usdc,
-
   signer,
   connection,
 });

package/dist/earn/index.d.mts

@@ -1,5 +1,4 @@
-import * as _solana_web3_js from '@solana/web3.js';
-import { Connection, PublicKey } from '@solana/web3.js';
+import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import BN from 'bn.js';
 import { Program } from '@coral-xyz/anchor';
 
@@ -40,8 +39,26 @@ declare function getDepositContext({ asset, signer, connection, }: DepositContex
     systemProgram: PublicKey;
     sysvarInstruction: PublicKey;
 }>;
-declare const getDepositIx: ({ amount, asset, signer, connection, }: DepositParams) => Promise<_solana_web3_js.TransactionInstruction>;
-declare const getMintIx: ({ shares, asset, signer, connection, }: MintParams) => Promise<_solana_web3_js.TransactionInstruction>;
+/**
+ * @param amount - The amount of assets to deposit
+ * @param asset - The asset to deposit (Mint address)
+ * @param signer - The signer of the transaction
+ * @param connection - The connection
+ * @returns { ixs: TransactionInstruction[] } - The instructions to deposit the assets
+ */
+declare const getDepositIxs: ({ amount, asset, signer, connection, }: DepositParams) => Promise<{
+    ixs: TransactionInstruction[];
+}>;
+/**
+ * @param shares - The number of shares to mint
+ * @param asset - The asset to mint (Mint address)
+ * @param signer - The signer of the transaction
+ * @param connection - The connection
+ * @returns { ixs: TransactionInstruction[] } - The instructions to mint the shares
+ */
+declare const getMintIxs: ({ shares, asset, signer, connection, }: MintParams) => Promise<{
+    ixs: TransactionInstruction[];
+}>;
 type WithdrawContextParams = {
     asset: PublicKey;
     signer: PublicKey;
@@ -73,8 +90,26 @@ declare function getWithdrawContext({ asset, signer, connection, }: WithdrawCont
     systemProgram: PublicKey;
     sysvarInstruction: PublicKey;
 }>;
-declare const getWithdrawIx: ({ amount, asset, signer, connection, }: WithdrawParams) => Promise<_solana_web3_js.TransactionInstruction>;
-declare const getRedeemIx: ({ shares, asset, signer, connection, }: RedeemParams) => Promise<_solana_web3_js.TransactionInstruction>;
+/**
+ * @param amount - The amount of assets to withdraw
+ * @param asset - The asset to withdraw (Mint address)
+ * @param signer - The signer of the transaction
+ * @param connection - The connection
+ * @returns { ixs: TransactionInstruction[] } - The instructions to withdraw the assets
+ */
+declare const getWithdrawIxs: ({ amount, asset, signer, connection, }: WithdrawParams) => Promise<{
+    ixs: TransactionInstruction[];
+}>;
+/**
+ * @param shares - The number of shares to redeem
+ * @param asset - The asset to redeem (Mint address)
+ * @param signer - The signer of the transaction
+ * @param connection - The connection
+ * @returns { ixs: TransactionInstruction[] } - The instructions to redeem the shares
+ */
+declare const getRedeemIxs: ({ shares, asset, signer, connection, }: RedeemParams) => Promise<{
+    ixs: TransactionInstruction[];
+}>;
 
 /**
  * Program IDL in camelCase format in order to be used in JS/TS.
@@ -1824,6 +1859,7 @@ declare const getLendingProgram: ({ connection, signer, }: {
     signer?: PublicKey;
 }) => Program<Lending>;
 declare const getAccountOwner: (account: PublicKey, connection: Connection) => Promise<PublicKey>;
+declare const getOrCreateATAInstruction: (owner: PublicKey, mint: PublicKey, connection: Connection) => Promise<TransactionInstruction[]>;
 
 declare const getLendingTokens: ({ connection, }: {
     connection: Connection;
@@ -1853,5 +1889,5 @@ declare const getUserLendingPositionByAsset: ({ user, asset, connection, }: {
     underlyingBalance: BN;
 }>;
 
-export { getAccountOwner, getDepositContext, getDepositIx, getLendingProgram, getLendingTokenDetails, getLendingTokens, getMintIx, getRedeemIx, getUserLendingPositionByAsset, getWithdrawContext, getWithdrawIx };
+export { getAccountOwner, getDepositContext, getDepositIxs, getLendingProgram, getLendingTokenDetails, getLendingTokens, getMintIxs, getOrCreateATAInstruction, getRedeemIxs, getUserLendingPositionByAsset, getWithdrawContext, getWithdrawIxs };
 export type { ConnectionParams, DepositContextParams, DepositParams, MintParams, RedeemParams, WithdrawContextParams, WithdrawParams };

package/dist/earn/index.d.ts

@@ -1,5 +1,4 @@
-import * as _solana_web3_js from '@solana/web3.js';
-import { Connection, PublicKey } from '@solana/web3.js';
+import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import BN from 'bn.js';
 import { Program } from '@coral-xyz/anchor';
 
@@ -40,8 +39,26 @@ declare function getDepositContext({ asset, signer, connection, }: DepositContex
     systemProgram: PublicKey;
     sysvarInstruction: PublicKey;
 }>;
-declare const getDepositIx: ({ amount, asset, signer, connection, }: DepositParams) => Promise<_solana_web3_js.TransactionInstruction>;
-declare const getMintIx: ({ shares, asset, signer, connection, }: MintParams) => Promise<_solana_web3_js.TransactionInstruction>;
+/**
+ * @param amount - The amount of assets to deposit
+ * @param asset - The asset to deposit (Mint address)
+ * @param signer - The signer of the transaction
+ * @param connection - The connection
+ * @returns { ixs: TransactionInstruction[] } - The instructions to deposit the assets
+ */
+declare const getDepositIxs: ({ amount, asset, signer, connection, }: DepositParams) => Promise<{
+    ixs: TransactionInstruction[];
+}>;
+/**
+ * @param shares - The number of shares to mint
+ * @param asset - The asset to mint (Mint address)
+ * @param signer - The signer of the transaction
+ * @param connection - The connection
+ * @returns { ixs: TransactionInstruction[] } - The instructions to mint the shares
+ */
+declare const getMintIxs: ({ shares, asset, signer, connection, }: MintParams) => Promise<{
+    ixs: TransactionInstruction[];
+}>;
 type WithdrawContextParams = {
     asset: PublicKey;
     signer: PublicKey;
@@ -73,8 +90,26 @@ declare function getWithdrawContext({ asset, signer, connection, }: WithdrawCont
     systemProgram: PublicKey;
     sysvarInstruction: PublicKey;
 }>;
-declare const getWithdrawIx: ({ amount, asset, signer, connection, }: WithdrawParams) => Promise<_solana_web3_js.TransactionInstruction>;
-declare const getRedeemIx: ({ shares, asset, signer, connection, }: RedeemParams) => Promise<_solana_web3_js.TransactionInstruction>;
+/**
+ * @param amount - The amount of assets to withdraw
+ * @param asset - The asset to withdraw (Mint address)
+ * @param signer - The signer of the transaction
+ * @param connection - The connection
+ * @returns { ixs: TransactionInstruction[] } - The instructions to withdraw the assets
+ */
+declare const getWithdrawIxs: ({ amount, asset, signer, connection, }: WithdrawParams) => Promise<{
+    ixs: TransactionInstruction[];
+}>;
+/**
+ * @param shares - The number of shares to redeem
+ * @param asset - The asset to redeem (Mint address)
+ * @param signer - The signer of the transaction
+ * @param connection - The connection
+ * @returns { ixs: TransactionInstruction[] } - The instructions to redeem the shares
+ */
+declare const getRedeemIxs: ({ shares, asset, signer, connection, }: RedeemParams) => Promise<{
+    ixs: TransactionInstruction[];
+}>;
 
 /**
  * Program IDL in camelCase format in order to be used in JS/TS.
@@ -1824,6 +1859,7 @@ declare const getLendingProgram: ({ connection, signer, }: {
     signer?: PublicKey;
 }) => Program<Lending>;
 declare const getAccountOwner: (account: PublicKey, connection: Connection) => Promise<PublicKey>;
+declare const getOrCreateATAInstruction: (owner: PublicKey, mint: PublicKey, connection: Connection) => Promise<TransactionInstruction[]>;
 
 declare const getLendingTokens: ({ connection, }: {
     connection: Connection;
@@ -1853,5 +1889,5 @@ declare const getUserLendingPositionByAsset: ({ user, asset, connection, }: {
     underlyingBalance: BN;
 }>;
 
-export { getAccountOwner, getDepositContext, getDepositIx, getLendingProgram, getLendingTokenDetails, getLendingTokens, getMintIx, getRedeemIx, getUserLendingPositionByAsset, getWithdrawContext, getWithdrawIx };
+export { getAccountOwner, getDepositContext, getDepositIxs, getLendingProgram, getLendingTokenDetails, getLendingTokens, getMintIxs, getOrCreateATAInstruction, getRedeemIxs, getUserLendingPositionByAsset, getWithdrawContext, getWithdrawIxs };
 export type { ConnectionParams, DepositContextParams, DepositParams, MintParams, RedeemParams, WithdrawContextParams, WithdrawParams };

package/dist/earn/index.mjs

@@ -1,5 +1,5 @@
 import { SYSVAR_INSTRUCTIONS_PUBKEY, SystemProgram, PublicKey } from '@solana/web3.js';
-import { ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync } from '@solana/spl-token';
+import { getAssociatedTokenAddress, getAccount, createAssociatedTokenAccountInstruction, ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync } from '@solana/spl-token';
 import { l as liquidity } from '../shared/lend.CioR9-te.mjs';
 import { Program } from '@coral-xyz/anchor';
 import { b as lending, g as getLendingToken, c as getLending, d as getLendingRewardsRateModel, e as getClaimAccount, f as getLendingAdmin } from '../shared/lend.DS0KoPpL.mjs';
@@ -19,6 +19,24 @@ const getAccountOwner = async (account, connection) => {
     throw new Error(`Account info not found for ${account.toString()}`);
   return info.owner;
 };
+const getOrCreateATAInstruction = async (owner, mint, connection) => {
+  const associatedTokenAccount = await getAssociatedTokenAddress(mint, owner);
+  const account = await getAccount(connection, associatedTokenAccount).catch(
+    () => null
+  );
+  const ixs = [];
+  if (!account) {
+    ixs.push(
+      createAssociatedTokenAccountInstruction(
+        owner,
+        associatedTokenAccount,
+        owner,
+        mint
+      )
+    );
+  }
+  return ixs;
+};
 
 const LIQUIDITY_PROGRAM_ID = new PublicKey(liquidity.address);
 async function getDepositContext({
@@ -78,7 +96,7 @@ async function getDepositContext({
     sysvarInstruction: SYSVAR_INSTRUCTIONS_PUBKEY
   };
 }
-const getDepositIx = async ({
+const getDepositIxs = async ({
   amount,
   asset,
   signer,
@@ -88,15 +106,26 @@ const getDepositIx = async ({
     connection,
     signer
   });
-  return await program.methods.deposit(amount).accounts(
-    await getDepositContext({
-      asset,
+  const ixs = [];
+  ixs.push(
+    ...await getOrCreateATAInstruction(
       signer,
+      getLendingToken(asset),
       connection
-    })
-  ).instruction();
+    )
+  );
+  ixs.push(
+    await program.methods.deposit(amount).accounts(
+      await getDepositContext({
+        asset,
+        signer,
+        connection
+      })
+    ).instruction()
+  );
+  return { ixs };
 };
-const getMintIx = async ({
+const getMintIxs = async ({
   shares,
   asset,
   signer,
@@ -106,13 +135,24 @@ const getMintIx = async ({
     connection,
     signer
   });
-  return await program.methods.mint(shares).accounts(
-    await getDepositContext({
-      asset,
+  const ixs = [];
+  ixs.push(
+    ...await getOrCreateATAInstruction(
       signer,
+      getLendingToken(asset),
       connection
-    })
-  ).instruction();
+    )
+  );
+  ixs.push(
+    await program.methods.mint(shares).accounts(
+      await getDepositContext({
+        asset,
+        signer,
+        connection
+      })
+    ).instruction()
+  );
+  return { ixs };
 };
 async function getWithdrawContext({
   asset,
@@ -166,7 +206,7 @@ async function getWithdrawContext({
     sysvarInstruction: SYSVAR_INSTRUCTIONS_PUBKEY
   };
 }
-const getWithdrawIx = async ({
+const getWithdrawIxs = async ({
   amount,
   asset,
   signer,
@@ -176,15 +216,20 @@ const getWithdrawIx = async ({
     connection,
     signer
   });
-  return await program.methods.withdraw(amount).accounts(
-    await getWithdrawContext({
-      asset,
-      signer,
-      connection
-    })
-  ).instruction();
+  const ixs = [];
+  ixs.push(...await getOrCreateATAInstruction(signer, asset, connection));
+  ixs.push(
+    await program.methods.withdraw(amount).accounts(
+      await getWithdrawContext({
+        asset,
+        signer,
+        connection
+      })
+    ).instruction()
+  );
+  return { ixs };
 };
-const getRedeemIx = async ({
+const getRedeemIxs = async ({
   shares,
   asset,
   signer,
@@ -194,13 +239,18 @@ const getRedeemIx = async ({
     connection,
     signer
   });
-  return await program.methods.redeem(shares).accounts(
-    await getWithdrawContext({
-      asset,
-      signer,
-      connection
-    })
-  ).instruction();
+  const ixs = [];
+  ixs.push(...await getOrCreateATAInstruction(signer, asset, connection));
+  ixs.push(
+    await program.methods.redeem(shares).accounts(
+      await getWithdrawContext({
+        asset,
+        signer,
+        connection
+      })
+    ).instruction()
+  );
+  return { ixs };
 };
 
 const LENDING_CONSTANTS = {
@@ -536,4 +586,4 @@ const getUserLendingPositionByAsset = async ({
   };
 };
 
-export { getAccountOwner, getDepositContext, getDepositIx, getLendingProgram, getLendingTokenDetails, getLendingTokens, getMintIx, getRedeemIx, getUserLendingPositionByAsset, getWithdrawContext, getWithdrawIx };
+export { getAccountOwner, getDepositContext, getDepositIxs, getLendingProgram, getLendingTokenDetails, getLendingTokens, getMintIxs, getOrCreateATAInstruction, getRedeemIxs, getUserLendingPositionByAsset, getWithdrawContext, getWithdrawIxs };

package/dist/index.mjs

@@ -8,6 +8,6 @@ import './shared/lend.CioR9-te.mjs';
 import '@solana/spl-token';
 import 'bn.js';
 
-const version = "0.0.107-beta.1";
+const version = "0.1.0";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jup-ag/lend",
-  "version": "0.0.107-beta.1",
+  "version": "0.1.0",
   "license": "MIT",
   "sideEffects": false,
   "type": "module",