@lavarage/sdk 7.5.13 → 7.5.14

package/idl/lavaragev2.ts

@@ -553,13 +553,23 @@ export type Lavarage = {
         },
         {
           "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": [
@@ -626,6 +636,11 @@ export type Lavarage = {
           "name": "randomAccountAsId",
           "isMut": false,
           "isSigner": false
+        },
+        {
+          "name": "associatedTokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
       "args": []
@@ -1319,6 +1334,57 @@ export type Lavarage = {
           "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": [
@@ -2323,13 +2389,23 @@ export const IDL: Lavarage = {
         },
         {
           "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": [
@@ -2396,6 +2472,11 @@ export const IDL: Lavarage = {
           "name": "randomAccountAsId",
           "isMut": false,
           "isSigner": false
+        },
+        {
+          "name": "associatedTokenProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
       "args": []
@@ -3089,6 +3170,57 @@ export const IDL: Lavarage = {
           "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": [

package/index.ts

@@ -816,6 +816,8 @@ export const borrowV2 = async (
       systemProgram: SystemProgram.programId,
       positionAccount,
       randomAccountAsId: randomSeed.publicKey.toBase58(),
+      tokenProgram: tokenProgram,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
     })
     .instruction();
 
@@ -825,7 +827,6 @@ export const borrowV2 = async (
 
   const allInstructions = [
     fromTokenAccount.instruction!,
-    toTokenAccount.instruction!,
     partnerFeeRecipientVaultCreateIx,
     partnerFeeRecipientTokenAccountCreateIx,
     tradingOpenBorrowInstruction!,
@@ -1418,6 +1419,13 @@ export const openTradeV2 = async (
   let partnerFeeRecipientVaultCreateIx: TransactionInstruction | undefined;
   let partnerFeeRecipientTokenAccountCreateIx: TransactionInstruction | undefined;
   let userVaultPda: PublicKey | undefined;
+
+  const partnerDirectAta = partnerFeeRecipient ? getAssociatedTokenAddressSync(
+    quoteToken,
+    partnerFeeRecipient,
+    true,
+    quoteTokenProgram
+  ) : undefined;
   
   if (partnerFeeRecipient && partnerFeeMarkupAsPkey && referralVaultProgram) {
     // Derive the userVault PDA
@@ -1464,14 +1472,23 @@ export const openTradeV2 = async (
         ASSOCIATED_TOKEN_PROGRAM_ID
       );
     }
+  } else if (partnerFeeRecipient && partnerDirectAta) {
+    const [partnerDirectAtaInfo] = await lavarageProgram.provider.connection.getMultipleAccountsInfo([
+      partnerDirectAta
+    ]);
+    if (!partnerDirectAtaInfo) {
+      partnerFeeRecipientTokenAccountCreateIx = createAssociatedTokenAccountIdempotentInstruction(
+        lavarageProgram.provider.publicKey!,
+        partnerDirectAta,
+        partnerFeeRecipient!,
+        quoteToken,
+        quoteTokenProgram,
+        ASSOCIATED_TOKEN_PROGRAM_ID
+      );
+    }
   }
 
-  const partnerDirectAta = partnerFeeRecipient ? getAssociatedTokenAddressSync(
-    quoteToken,
-    partnerFeeRecipient,
-    true,
-    quoteTokenProgram
-  ) : undefined;
+  
 
   const tradingOpenBorrowInstruction = useReferral
     ? await lavarageProgram.methods
@@ -1589,6 +1606,8 @@ export const openTradeV2 = async (
       systemProgram: SystemProgram.programId,
       positionAccount,
       randomAccountAsId: randomSeed.publicKey.toBase58(),
+      tokenProgram: tokenProgram,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
     })
     .instruction();
 
@@ -1604,7 +1623,6 @@ export const openTradeV2 = async (
   if (splitTransactions) {
     const setUpInstructions = [
       fromTokenAccount.instruction!,
-      toTokenAccount.instruction!,
       partnerFeeRecipientVaultCreateIx,
       partnerFeeRecipientTokenAccountCreateIx,
       ...setupInstructions.map(deserializeInstruction),
@@ -1638,7 +1656,6 @@ export const openTradeV2 = async (
 
   const allInstructions = [
     fromTokenAccount.instruction!,
-    toTokenAccount.instruction!,
     partnerFeeRecipientVaultCreateIx,
     partnerFeeRecipientTokenAccountCreateIx,
     tradingOpenBorrowInstruction!,
@@ -2740,6 +2757,7 @@ export const closeTradeV2 = async (
       trader: lavarageProgram.provider.publicKey!,
       tokenProgram: tokenProgram!,
       randomAccountAsId: position.account.seed,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
     })
     .instruction();
 
@@ -3010,7 +3028,7 @@ export const closeTradeV2 = async (
       partnerFeeRecipientVaultCreateIx,
       partnerFeeRecipientTokenAccountCreateIx,
       jupInstruction.instructions && platformFeeRecipientAccount?.instruction ? platformFeeRecipientAccount.instruction : null,
-      createAssociatedTokenAccountInstruction,
+      //createAssociatedTokenAccountInstruction,
     ].filter((i) => !!i);
 
     const allInstructions = [
@@ -3048,7 +3066,7 @@ export const closeTradeV2 = async (
     partnerFeeRecipientVaultCreateIx,
     partnerFeeRecipientTokenAccountCreateIx,
     jupInstruction.instructions && platformFeeRecipientAccount?.instruction ? platformFeeRecipientAccount.instruction : null,
-    createAssociatedTokenAccountInstruction,
+    //createAssociatedTokenAccountInstruction,
     jupInstruction.instructions?.tokenLedgerInstruction
       ? deserializeInstruction(
         jupInstruction.instructions.tokenLedgerInstruction

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lavarage/sdk",
-  "version": "7.5.13",
+  "version": "7.5.14",
   "description": "Lavarage SDK",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",