@lavarage/sdk 7.5.14 → 7.5.15

package/dist/index.mjs

@@ -3947,13 +3947,23 @@ var IDL3 = {
         },
         {
           "name": "toTokenAccount",
-          "isMut": false,
+          "isMut": true,
           "isSigner": false
         },
         {
           "name": "randomAccountAsId",
           "isMut": false,
           "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "associatedTokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
       "args": [
@@ -4020,6 +4030,11 @@ var IDL3 = {
           "name": "randomAccountAsId",
           "isMut": false,
           "isSigner": false
+        },
+        {
+          "name": "associatedTokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
       "args": []
@@ -4713,6 +4728,57 @@ var IDL3 = {
           "type": "string"
         }
       ]
+    },
+    {
+      "name": "rescueStuckTokens",
+      "accounts": [
+        {
+          "name": "position",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "pool",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "nodeWallet",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "positionTokenAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "traderTokenAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "positionMint",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "admin",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "amount",
+          "type": "u64"
+        }
+      ]
     }
   ],
   "accounts": [
@@ -5580,14 +5646,15 @@ var borrowV2 = (lavarageProgram, offer, marginSOL, leverage, randomSeed, quoteTo
     toTokenAccount: toTokenAccount.account.address,
     systemProgram: SystemProgram2.programId,
     positionAccount,
-    randomAccountAsId: randomSeed.publicKey.toBase58()
+    randomAccountAsId: randomSeed.publicKey.toBase58(),
+    tokenProgram,
+    associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID
   }).instruction();
   const computeFeeIx = ComputeBudgetProgram2.setComputeUnitPrice({
     microLamports: computeBudgetMicroLamports != null ? computeBudgetMicroLamports : 1e5
   });
   const allInstructions = [
     fromTokenAccount.instruction,
-    toTokenAccount.instruction,
     partnerFeeRecipientVaultCreateIx,
     partnerFeeRecipientTokenAccountCreateIx,
     tradingOpenBorrowInstruction,
@@ -5921,6 +5988,12 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
   let partnerFeeRecipientVaultCreateIx;
   let partnerFeeRecipientTokenAccountCreateIx;
   let userVaultPda;
+  const partnerDirectAta = partnerFeeRecipient ? getAssociatedTokenAddressSync2(
+    quoteToken,
+    partnerFeeRecipient,
+    true,
+    quoteTokenProgram
+  ) : void 0;
   if (partnerFeeRecipient && partnerFeeMarkupAsPkey && referralVaultProgram) {
     [userVaultPda] = PublicKey2.findProgramAddressSync(
       [Buffer.from("user_vault"), new PublicKey2(partnerFeeRecipient).toBuffer()],
@@ -5955,13 +6028,21 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
         ASSOCIATED_TOKEN_PROGRAM_ID
       );
     }
+  } else if (partnerFeeRecipient && partnerDirectAta) {
+    const [partnerDirectAtaInfo] = yield lavarageProgram.provider.connection.getMultipleAccountsInfo([
+      partnerDirectAta
+    ]);
+    if (!partnerDirectAtaInfo) {
+      partnerFeeRecipientTokenAccountCreateIx = createAssociatedTokenAccountIdempotentInstruction2(
+        lavarageProgram.provider.publicKey,
+        partnerDirectAta,
+        partnerFeeRecipient,
+        quoteToken,
+        quoteTokenProgram,
+        ASSOCIATED_TOKEN_PROGRAM_ID
+      );
+    }
   }
-  const partnerDirectAta = partnerFeeRecipient ? getAssociatedTokenAddressSync2(
-    quoteToken,
-    partnerFeeRecipient,
-    true,
-    quoteTokenProgram
-  ) : void 0;
   const tradingOpenBorrowInstruction = useReferral ? yield lavarageProgram.methods.tradingOpenBorrowWithReferral(
     new BN2((marginSOL.toNumber() * leverage).toFixed(0)),
     marginSOL,
@@ -6061,7 +6142,9 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     toTokenAccount: toTokenAccount.account.address,
     systemProgram: SystemProgram2.programId,
     positionAccount,
-    randomAccountAsId: randomSeed.publicKey.toBase58()
+    randomAccountAsId: randomSeed.publicKey.toBase58(),
+    tokenProgram,
+    associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID
   }).instruction();
   const jupiterIxs = [
     ...setupInstructions.map(deserializeInstruction),
@@ -6073,7 +6156,6 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
   if (splitTransactions) {
     const setUpInstructions = [
       fromTokenAccount.instruction,
-      toTokenAccount.instruction,
       partnerFeeRecipientVaultCreateIx,
       partnerFeeRecipientTokenAccountCreateIx,
       ...setupInstructions.map(deserializeInstruction)
@@ -6101,7 +6183,6 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
   }
   const allInstructions = [
     fromTokenAccount.instruction,
-    toTokenAccount.instruction,
     partnerFeeRecipientVaultCreateIx,
     partnerFeeRecipientTokenAccountCreateIx,
     tradingOpenBorrowInstruction,
@@ -6680,7 +6761,8 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
     systemProgram: SystemProgram2.programId,
     trader: lavarageProgram.provider.publicKey,
     tokenProgram,
-    randomAccountAsId: position.account.seed
+    randomAccountAsId: position.account.seed,
+    associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID
   }).instruction();
   let repaySolIx = null;
   let jupiterIxs = [];
@@ -6914,8 +6996,8 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
     const setUpInstructions = [
       partnerFeeRecipientVaultCreateIx,
       partnerFeeRecipientTokenAccountCreateIx,
-      jupInstruction.instructions && (platformFeeRecipientAccount == null ? void 0 : platformFeeRecipientAccount.instruction) ? platformFeeRecipientAccount.instruction : null,
-      createAssociatedTokenAccountInstruction2
+      jupInstruction.instructions && (platformFeeRecipientAccount == null ? void 0 : platformFeeRecipientAccount.instruction) ? platformFeeRecipientAccount.instruction : null
+      //createAssociatedTokenAccountInstruction,
     ].filter((i) => !!i);
     const allInstructions2 = [
       ((_a = jupInstruction.instructions) == null ? void 0 : _a.tokenLedgerInstruction) ? deserializeInstruction(
@@ -6944,7 +7026,7 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
     partnerFeeRecipientVaultCreateIx,
     partnerFeeRecipientTokenAccountCreateIx,
     jupInstruction.instructions && (platformFeeRecipientAccount == null ? void 0 : platformFeeRecipientAccount.instruction) ? platformFeeRecipientAccount.instruction : null,
-    createAssociatedTokenAccountInstruction2,
+    //createAssociatedTokenAccountInstruction,
     ((_b = jupInstruction.instructions) == null ? void 0 : _b.tokenLedgerInstruction) ? deserializeInstruction(
       jupInstruction.instructions.tokenLedgerInstruction
     ) : null,