@lavarage/sdk 6.4.5 → 6.4.7

package/dist/index.js

@@ -2737,30 +2737,20 @@ function getPositionAccountPDA(lavarageProgram, offer, seed) {
 function getTokenAccountOrCreateIfNotExists(lavarageProgram, ownerPublicKey, tokenAddress, tokenProgram) {
   return __async(this, null, function* () {
     const associatedTokenAddress = (0, import_spl_token.getAssociatedTokenAddressSync)(tokenAddress, ownerPublicKey, true, tokenProgram, import_spl_token.ASSOCIATED_TOKEN_PROGRAM_ID);
-    try {
-      const tokenAccount = yield (0, import_spl_token.getAccount)(lavarageProgram.provider.connection, associatedTokenAddress, "finalized", tokenProgram);
-      return { account: tokenAccount, instruction: null };
-    } catch (error) {
-      if (error instanceof import_spl_token.TokenAccountNotFoundError || error instanceof import_spl_token.TokenInvalidAccountOwnerError) {
-        const instruction = (0, import_spl_token.createAssociatedTokenAccountInstruction)(
-          lavarageProgram.provider.publicKey,
-          associatedTokenAddress,
-          ownerPublicKey,
-          tokenAddress,
-          tokenProgram,
-          import_spl_token.ASSOCIATED_TOKEN_PROGRAM_ID
-        );
-        return {
-          account: {
-            address: associatedTokenAddress
-          },
-          instruction
-        };
-      } else {
-        console.error("Error in getTokenAccountOrCreateIfNotExists: ", error);
-        return { account: null, instruction: null };
-      }
-    }
+    const instruction = (0, import_spl_token.createAssociatedTokenAccountIdempotentInstruction)(
+      lavarageProgram.provider.publicKey,
+      associatedTokenAddress,
+      ownerPublicKey,
+      tokenAddress,
+      tokenProgram,
+      import_spl_token.ASSOCIATED_TOKEN_PROGRAM_ID
+    );
+    return {
+      account: {
+        address: associatedTokenAddress
+      },
+      instruction
+    };
   });
 }
 var getOffers = (lavarageProgram) => {
@@ -3160,7 +3150,7 @@ var partialRepayV2 = (lavarageProgram, position, repaymentBps) => __async(void 0
   return new import_web3.VersionedTransaction(messageV0);
 });
 var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFeeRecipient, partnerFeeMarkup) => __async(void 0, null, function* () {
-  var _a;
+  var _a, _b;
   let partnerFeeMarkupAsPkey;
   if (partnerFeeMarkup) {
     const feeBuffer = Buffer.alloc(8);
@@ -3268,8 +3258,16 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
     addressLookupTableAccounts.push(...yield getAddressLookupTableAccounts(["5LEAB3owNUSKvECm7vkr58tDtQpzbngQ2NYpc7qmRFdi", ...addressLookupTableAddresses]));
   }
   const profit = new import_anchor.BN(jupInstruction.quoteResponse.outAmount).sub(position.account.amount).sub(position.account.userPaid);
+  let createAssociatedTokenAccountInstruction2 = (0, import_spl_token.createAssociatedTokenAccountIdempotentInstruction)(
+    lavarageProgram.provider.publicKey,
+    toTokenAccount.account.address,
+    lavarageProgram.provider.publicKey,
+    offer.account.collateralType,
+    tokenProgram
+  );
   const allInstructions = [
-    ((_a = jupInstruction.instructions) == null ? void 0 : _a.tokenLedgerInstruction) ? deserializeInstruction(jupInstruction.instructions.tokenLedgerInstruction) : null,
+    ((_a = jupInstruction.instructions) == null ? void 0 : _a.tokenLedgerInstruction) ? createAssociatedTokenAccountInstruction2 : null,
+    ((_b = jupInstruction.instructions) == null ? void 0 : _b.tokenLedgerInstruction) ? deserializeInstruction(jupInstruction.instructions.tokenLedgerInstruction) : null,
     toTokenAccount.instruction,
     closePositionIx,
     ...jupiterIxs,
@@ -3284,7 +3282,7 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
   return tx;
 });
 var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken, partnerFeeRecipient, partnerFeeMarkup) => __async(void 0, null, function* () {
-  var _a;
+  var _a, _b;
   let partnerFeeMarkupAsPkey;
   if (partnerFeeMarkup) {
     const feeBuffer = Buffer.alloc(8);
@@ -3402,8 +3400,16 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
     addressLookupTableAccounts.push(...yield getAddressLookupTableAccounts([...addressLookupTableAddresses, getQuoteCurrencySpecificAddressLookupTable(quoteToken.toBase58()), "5LEAB3owNUSKvECm7vkr58tDtQpzbngQ2NYpc7qmRFdi"]));
   }
   const profit = new import_anchor.BN(jupInstruction.quoteResponse.outAmount).sub(position.account.amount).sub(position.account.userPaid);
+  let createAssociatedTokenAccountInstruction2 = (0, import_spl_token.createAssociatedTokenAccountIdempotentInstruction)(
+    lavarageProgram.provider.publicKey,
+    toTokenAccount.account.address,
+    lavarageProgram.provider.publicKey,
+    offer.account.collateralType,
+    tokenProgram
+  );
   const allInstructions = [
-    ((_a = jupInstruction.instructions) == null ? void 0 : _a.tokenLedgerInstruction) ? deserializeInstruction(jupInstruction.instructions.tokenLedgerInstruction) : null,
+    ((_a = jupInstruction.instructions) == null ? void 0 : _a.tokenLedgerInstruction) ? createAssociatedTokenAccountInstruction2 : null,
+    ((_b = jupInstruction.instructions) == null ? void 0 : _b.tokenLedgerInstruction) ? deserializeInstruction(jupInstruction.instructions.tokenLedgerInstruction) : null,
     toTokenAccount.instruction,
     closePositionIx,
     ...jupiterIxs,