@lavarage/sdk 7.5.4 → 7.5.6

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { Program, ProgramAccount, BN } from '@coral-xyz/anchor';
-import { PublicKey, VersionedTransaction, Keypair } from '@solana/web3.js';
+import { PublicKey, VersionedTransaction, Keypair, AccountInfo } from '@solana/web3.js';
 import { Provider, BigNumberish, ContractTransaction } from 'ethers';
 
 type Lavarage$1 = {
@@ -3306,6 +3306,11 @@ type UserVault = {
                 {
                     "name": "user";
                     "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "funder";
+                    "isMut": true;
                     "isSigner": true;
                 },
                 {
@@ -3766,6 +3771,12 @@ declare namespace lending {
   export { lending_addToWithdrawalAccessList as addToWithdrawalAccessList, lending_createOffer as createOffer, lending_depositFunds as depositFunds, lending_getNodeWalletPDA as getNodeWalletPDA, lending_getTradingPoolPDA as getTradingPoolPDA, lending_getWithdrawalAccessList as getWithdrawalAccessList, lending_getWithdrawalAccessListPDA as getWithdrawalAccessListPDA, lending_removeFromWithdrawalAccessList as removeFromWithdrawalAccessList, lending_updateInterestRate as updateInterestRate, lending_updateMaxBorrow as updateMaxBorrow, lending_updateMaxExposure as updateMaxExposure, lending_updateOffer as updateOffer, lending_withdrawFunds as withdrawFunds, lending_withdrawFundsV1 as withdrawFundsV1, lending_withdrawFundsV2 as withdrawFundsV2 };
 }
 
+type OptionalRPCResults = {
+    addressLookupTableAccounts?: AccountInfo<Buffer>[];
+    latestBlockhash?: string;
+    tokenAccountConfirmCreatedAddresses?: PublicKey[];
+    quoteMintAccountInfo?: AccountInfo<Buffer>;
+};
 declare function getPda(seed: Buffer | Buffer[], programId: PublicKey): PublicKey;
 declare function getPositionAccountPDA(lavarageProgram: Program<Lavarage$1> | Program<Lavarage>, offer: ProgramAccount, seed: PublicKey): PublicKey;
 
@@ -3853,7 +3864,7 @@ declare const openTradeV1: (lavarageProgram: Program<Lavarage$1>, offer: Program
         swapInstruction: Record<string, unknown>;
         addressLookupTableAddresses: string[];
     };
-}, marginSOL: BN, leverage: number, randomSeed: Keypair, tokenProgram: PublicKey, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number, computeBudgetMicroLamports?: number, platformFeeRecipient?: PublicKey, splitTransactions?: boolean, discountBps?: number, referralBps?: number) => Promise<VersionedTransaction | VersionedTransaction[]>;
+}, marginSOL: BN, leverage: number, randomSeed: Keypair, tokenProgram: PublicKey, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number, computeBudgetMicroLamports?: number, platformFeeRecipient?: PublicKey, splitTransactions?: boolean, discountBps?: number, referralBps?: number, optionalRPCResults?: OptionalRPCResults) => Promise<VersionedTransaction | VersionedTransaction[]>;
 declare const openTradeV2: (lavarageProgram: Program<Lavarage>, offer: ProgramAccount<{
     nodeWallet: PublicKey;
     interestRate: number;
@@ -3864,7 +3875,7 @@ declare const openTradeV2: (lavarageProgram: Program<Lavarage>, offer: ProgramAc
         swapInstruction: Record<string, unknown>;
         addressLookupTableAddresses: string[];
     };
-}, marginSOL: BN, leverage: number, randomSeed: Keypair, quoteToken: PublicKey, tokenProgram: PublicKey, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number, computeBudgetMicroLamports?: number, platformFeeRecipient?: PublicKey, splitTransactions?: boolean, discountBps?: number, referralBps?: number) => Promise<VersionedTransaction | VersionedTransaction[]>;
+}, marginSOL: BN, leverage: number, randomSeed: Keypair, quoteToken: PublicKey, tokenProgram: PublicKey, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number, computeBudgetMicroLamports?: number, platformFeeRecipient?: PublicKey, splitTransactions?: boolean, discountBps?: number, referralBps?: number, optionalRPCResults?: OptionalRPCResults) => Promise<VersionedTransaction | VersionedTransaction[]>;
 declare const createTpDelegate: (lavarageProgram: Program<Lavarage$1> | Program<Lavarage>, position: ProgramAccount<{
     pool: PublicKey;
     seed: PublicKey;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Program, ProgramAccount, BN } from '@coral-xyz/anchor';
-import { PublicKey, VersionedTransaction, Keypair } from '@solana/web3.js';
+import { PublicKey, VersionedTransaction, Keypair, AccountInfo } from '@solana/web3.js';
 import { Provider, BigNumberish, ContractTransaction } from 'ethers';
 
 type Lavarage$1 = {
@@ -3306,6 +3306,11 @@ type UserVault = {
                 {
                     "name": "user";
                     "isMut": true;
+                    "isSigner": false;
+                },
+                {
+                    "name": "funder";
+                    "isMut": true;
                     "isSigner": true;
                 },
                 {
@@ -3766,6 +3771,12 @@ declare namespace lending {
   export { lending_addToWithdrawalAccessList as addToWithdrawalAccessList, lending_createOffer as createOffer, lending_depositFunds as depositFunds, lending_getNodeWalletPDA as getNodeWalletPDA, lending_getTradingPoolPDA as getTradingPoolPDA, lending_getWithdrawalAccessList as getWithdrawalAccessList, lending_getWithdrawalAccessListPDA as getWithdrawalAccessListPDA, lending_removeFromWithdrawalAccessList as removeFromWithdrawalAccessList, lending_updateInterestRate as updateInterestRate, lending_updateMaxBorrow as updateMaxBorrow, lending_updateMaxExposure as updateMaxExposure, lending_updateOffer as updateOffer, lending_withdrawFunds as withdrawFunds, lending_withdrawFundsV1 as withdrawFundsV1, lending_withdrawFundsV2 as withdrawFundsV2 };
 }
 
+type OptionalRPCResults = {
+    addressLookupTableAccounts?: AccountInfo<Buffer>[];
+    latestBlockhash?: string;
+    tokenAccountConfirmCreatedAddresses?: PublicKey[];
+    quoteMintAccountInfo?: AccountInfo<Buffer>;
+};
 declare function getPda(seed: Buffer | Buffer[], programId: PublicKey): PublicKey;
 declare function getPositionAccountPDA(lavarageProgram: Program<Lavarage$1> | Program<Lavarage>, offer: ProgramAccount, seed: PublicKey): PublicKey;
 
@@ -3853,7 +3864,7 @@ declare const openTradeV1: (lavarageProgram: Program<Lavarage$1>, offer: Program
         swapInstruction: Record<string, unknown>;
         addressLookupTableAddresses: string[];
     };
-}, marginSOL: BN, leverage: number, randomSeed: Keypair, tokenProgram: PublicKey, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number, computeBudgetMicroLamports?: number, platformFeeRecipient?: PublicKey, splitTransactions?: boolean, discountBps?: number, referralBps?: number) => Promise<VersionedTransaction | VersionedTransaction[]>;
+}, marginSOL: BN, leverage: number, randomSeed: Keypair, tokenProgram: PublicKey, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number, computeBudgetMicroLamports?: number, platformFeeRecipient?: PublicKey, splitTransactions?: boolean, discountBps?: number, referralBps?: number, optionalRPCResults?: OptionalRPCResults) => Promise<VersionedTransaction | VersionedTransaction[]>;
 declare const openTradeV2: (lavarageProgram: Program<Lavarage>, offer: ProgramAccount<{
     nodeWallet: PublicKey;
     interestRate: number;
@@ -3864,7 +3875,7 @@ declare const openTradeV2: (lavarageProgram: Program<Lavarage>, offer: ProgramAc
         swapInstruction: Record<string, unknown>;
         addressLookupTableAddresses: string[];
     };
-}, marginSOL: BN, leverage: number, randomSeed: Keypair, quoteToken: PublicKey, tokenProgram: PublicKey, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number, computeBudgetMicroLamports?: number, platformFeeRecipient?: PublicKey, splitTransactions?: boolean, discountBps?: number, referralBps?: number) => Promise<VersionedTransaction | VersionedTransaction[]>;
+}, marginSOL: BN, leverage: number, randomSeed: Keypair, quoteToken: PublicKey, tokenProgram: PublicKey, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number, computeBudgetMicroLamports?: number, platformFeeRecipient?: PublicKey, splitTransactions?: boolean, discountBps?: number, referralBps?: number, optionalRPCResults?: OptionalRPCResults) => Promise<VersionedTransaction | VersionedTransaction[]>;
 declare const createTpDelegate: (lavarageProgram: Program<Lavarage$1> | Program<Lavarage>, position: ProgramAccount<{
     pool: PublicKey;
     seed: PublicKey;

package/dist/index.js

@@ -130,6 +130,11 @@ var IDL = {
         {
           "name": "user",
           "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "funder",
+          "isMut": true,
           "isSigner": true
         },
         {
@@ -5036,7 +5041,7 @@ function getPositionAccountPDA(lavarageProgram, offer, seed) {
     lavarageProgram.programId
   );
 }
-function getTokenAccountOrCreateIfNotExists(lavarageProgram, ownerPublicKey, tokenAddress, tokenProgram) {
+function getTokenAccountOrCreateIfNotExists(lavarageProgram, ownerPublicKey, tokenAddress, tokenProgram, confirmCreatedAddresses) {
   return __async(this, null, function* () {
     const associatedTokenAddress = (0, import_spl_token2.getAssociatedTokenAddressSync)(
       tokenAddress,
@@ -5045,6 +5050,14 @@ function getTokenAccountOrCreateIfNotExists(lavarageProgram, ownerPublicKey, tok
       tokenProgram,
       import_spl_token2.ASSOCIATED_TOKEN_PROGRAM_ID
     );
+    if (confirmCreatedAddresses == null ? void 0 : confirmCreatedAddresses.includes(associatedTokenAddress)) {
+      return {
+        account: {
+          address: associatedTokenAddress
+        },
+        instruction: void 0
+      };
+    }
     const instruction = (0, import_spl_token2.createAssociatedTokenAccountIdempotentInstruction)(
       lavarageProgram.provider.publicKey,
       associatedTokenAddress,
@@ -5171,7 +5184,8 @@ var borrowV1 = (lavarageProgram, offer, marginSOL, leverage, randomSeed, tokenPr
     if (!vaultAccountInfo) {
       partnerFeeRecipientCreateIx = yield referralVaultProgram.methods.initializeVault().accountsStrict({
         userVault: userVaultPda,
-        user: lavarageProgram.provider.publicKey,
+        user: partnerFeeRecipient,
+        funder: lavarageProgram.provider.publicKey,
         systemProgram: import_web32.SystemProgram.programId
       }).instruction();
     }
@@ -5306,7 +5320,8 @@ var borrowV2 = (lavarageProgram, offer, marginSOL, leverage, randomSeed, quoteTo
     if (!vaultAccountInfo) {
       partnerFeeRecipientVaultCreateIx = yield referralVaultProgram.methods.initializeVault().accountsStrict({
         userVault: userVaultPda,
-        user: lavarageProgram.provider.publicKey,
+        user: partnerFeeRecipient,
+        funder: lavarageProgram.provider.publicKey,
         systemProgram: import_web32.SystemProgram.programId
       }).instruction();
     }
@@ -5448,7 +5463,8 @@ var borrowV2 = (lavarageProgram, offer, marginSOL, leverage, randomSeed, quoteTo
   const tx = new import_web32.VersionedTransaction(messageV0);
   return tx;
 });
-var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, tokenProgram, partnerFeeRecipient, partnerFeeMarkup, computeBudgetMicroLamports, platformFeeRecipient, splitTransactions, discountBps, referralBps) => __async(void 0, null, function* () {
+var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, tokenProgram, partnerFeeRecipient, partnerFeeMarkup, computeBudgetMicroLamports, platformFeeRecipient, splitTransactions, discountBps, referralBps, optionalRPCResults) => __async(void 0, null, function* () {
+  var _a;
   let partnerFeeMarkupAsPkey;
   const referralVaultProgram = new import_anchor2.Program(IDL, REFFERAL_VAULT_PROGRAM_ID, lavarageProgram.provider);
   if (partnerFeeMarkup) {
@@ -5467,19 +5483,22 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     lavarageProgram,
     lavarageProgram.provider.publicKey,
     offer.account.collateralType,
-    tokenProgram
+    tokenProgram,
+    optionalRPCResults == null ? void 0 : optionalRPCResults.tokenAccountConfirmCreatedAddresses
   );
   const toTokenAccount = yield getTokenAccountOrCreateIfNotExists(
     lavarageProgram,
     positionAccount,
     offer.account.collateralType,
-    tokenProgram
+    tokenProgram,
+    optionalRPCResults == null ? void 0 : optionalRPCResults.tokenAccountConfirmCreatedAddresses
   );
   const platformFeeRecipientAccount = platformFeeRecipient ? yield getTokenAccountOrCreateIfNotExists(
     lavarageProgram,
     platformFeeRecipient,
     offer.account.collateralType,
-    tokenProgram
+    tokenProgram,
+    optionalRPCResults == null ? void 0 : optionalRPCResults.tokenAccountConfirmCreatedAddresses
   ) : void 0;
   const tokenAccountCreationTx = new import_web32.Transaction();
   if (fromTokenAccount.instruction) {
@@ -5509,7 +5528,8 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     });
   };
   const getAddressLookupTableAccounts = (keys) => __async(void 0, null, function* () {
-    const addressLookupTableAccountInfos = yield lavarageProgram.provider.connection.getMultipleAccountsInfo(
+    var _a2;
+    const addressLookupTableAccountInfos = (_a2 = optionalRPCResults == null ? void 0 : optionalRPCResults.addressLookupTableAccounts) != null ? _a2 : yield lavarageProgram.provider.connection.getMultipleAccountsInfo(
       keys.map((key) => new import_web32.PublicKey(key))
     );
     return addressLookupTableAccountInfos.reduce((acc, accountInfo, index) => {
@@ -5533,7 +5553,7 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
       ...addressLookupTableAddresses
     ])
   );
-  const { blockhash } = yield lavarageProgram.provider.connection.getLatestBlockhash("finalized");
+  const blockhash = (_a = optionalRPCResults == null ? void 0 : optionalRPCResults.latestBlockhash) != null ? _a : (yield lavarageProgram.provider.connection.getLatestBlockhash("finalized")).blockhash;
   const useReferral = discountBps !== void 0 && referralBps !== void 0;
   let partnerFeeRecipientCreateIx;
   let userVaultPda;
@@ -5546,7 +5566,8 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     if (!vaultAccountInfo) {
       partnerFeeRecipientCreateIx = yield referralVaultProgram.methods.initializeVault().accountsStrict({
         userVault: userVaultPda,
-        user: lavarageProgram.provider.publicKey,
+        user: partnerFeeRecipient,
+        funder: lavarageProgram.provider.publicKey,
         systemProgram: import_web32.SystemProgram.programId
       }).instruction();
     }
@@ -5662,7 +5683,8 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
   const tx = new import_web32.VersionedTransaction(messageV0);
   return tx;
 });
-var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, quoteToken, tokenProgram, partnerFeeRecipient, partnerFeeMarkup, computeBudgetMicroLamports, platformFeeRecipient, splitTransactions, discountBps, referralBps) => __async(void 0, null, function* () {
+var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, quoteToken, tokenProgram, partnerFeeRecipient, partnerFeeMarkup, computeBudgetMicroLamports, platformFeeRecipient, splitTransactions, discountBps, referralBps, optionalRPCResults) => __async(void 0, null, function* () {
+  var _a;
   let partnerFeeMarkupAsPkey;
   const referralVaultProgram = new import_anchor2.Program(IDL, REFFERAL_VAULT_PROGRAM_ID, lavarageProgram.provider);
   if (partnerFeeMarkup) {
@@ -5677,25 +5699,28 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     offer,
     randomSeed.publicKey
   );
-  const quoteMintAccount = yield lavarageProgram.provider.connection.getAccountInfo(quoteToken);
+  const quoteMintAccount = (_a = optionalRPCResults == null ? void 0 : optionalRPCResults.quoteMintAccountInfo) != null ? _a : yield lavarageProgram.provider.connection.getAccountInfo(quoteToken);
   const quoteTokenProgram = quoteMintAccount == null ? void 0 : quoteMintAccount.owner;
   const fromTokenAccount = yield getTokenAccountOrCreateIfNotExists(
     lavarageProgram,
     lavarageProgram.provider.publicKey,
     offer.account.collateralType,
-    tokenProgram
+    tokenProgram,
+    optionalRPCResults == null ? void 0 : optionalRPCResults.tokenAccountConfirmCreatedAddresses
   );
   const toTokenAccount = yield getTokenAccountOrCreateIfNotExists(
     lavarageProgram,
     positionAccount,
     offer.account.collateralType,
-    tokenProgram
+    tokenProgram,
+    optionalRPCResults == null ? void 0 : optionalRPCResults.tokenAccountConfirmCreatedAddresses
   );
   const platformFeeRecipientAccount = platformFeeRecipient ? yield getTokenAccountOrCreateIfNotExists(
     lavarageProgram,
     platformFeeRecipient,
     offer.account.collateralType,
-    tokenProgram
+    tokenProgram,
+    optionalRPCResults == null ? void 0 : optionalRPCResults.tokenAccountConfirmCreatedAddresses
   ) : void 0;
   const tokenAccountCreationTx = new import_web32.Transaction();
   if (fromTokenAccount.instruction) {
@@ -5725,7 +5750,8 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     });
   };
   const getAddressLookupTableAccounts = (keys) => __async(void 0, null, function* () {
-    const addressLookupTableAccountInfos = yield lavarageProgram.provider.connection.getMultipleAccountsInfo(
+    var _a2;
+    const addressLookupTableAccountInfos = (_a2 = optionalRPCResults == null ? void 0 : optionalRPCResults.addressLookupTableAccounts) != null ? _a2 : yield lavarageProgram.provider.connection.getMultipleAccountsInfo(
       keys.map((key) => new import_web32.PublicKey(key))
     );
     return addressLookupTableAccountInfos.reduce((acc, accountInfo, index) => {
@@ -5774,7 +5800,8 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     if (!vaultAccountInfo) {
       partnerFeeRecipientVaultCreateIx = yield referralVaultProgram.methods.initializeVault().accountsStrict({
         userVault: userVaultPda,
-        user: lavarageProgram.provider.publicKey,
+        user: partnerFeeRecipient,
+        funder: lavarageProgram.provider.publicKey,
         systemProgram: import_web32.SystemProgram.programId
       }).instruction();
     }