@lavarage/sdk 7.1.2 → 7.2.1

package/index.ts

@@ -198,6 +198,7 @@ export const openTradeV1 = async (
   partnerFeeMarkup?: number,
   computeBudgetMicroLamports?: number,
   platformFeeRecipient?: PublicKey,
+  splitTransactions?: boolean,
 ) => {
   let partnerFeeMarkupAsPkey;
   if (partnerFeeMarkup) {
@@ -325,17 +326,17 @@ export const openTradeV1 = async (
     .remainingAccounts(
       partnerFeeRecipient && partnerFeeMarkupAsPkey
         ? [
-            {
-              pubkey: partnerFeeRecipient,
-              isSigner: false,
-              isWritable: true,
-            },
-            {
-              pubkey: partnerFeeMarkupAsPkey,
-              isSigner: false,
-              isWritable: false,
-            },
-          ]
+          {
+            pubkey: partnerFeeRecipient,
+            isSigner: false,
+            isWritable: true,
+          },
+          {
+            pubkey: partnerFeeMarkupAsPkey,
+            isSigner: false,
+            isWritable: false,
+          },
+        ]
         : []
     )
     .instruction();
@@ -362,6 +363,39 @@ export const openTradeV1 = async (
     microLamports: computeBudgetMicroLamports ?? 100000,
   });
 
+  if (splitTransactions) {
+    const setUpInstructions = [
+      fromTokenAccount.instruction!,
+      toTokenAccount.instruction!,
+      ...setupInstructions.map(deserializeInstruction),
+    ]
+
+    const allInstructions = [
+      tradingOpenBorrowInstruction!,
+      deserializeInstruction(swapInstructionPayload), ,
+      openAddCollateralInstruction!,
+      computeBudgetMicroLamports ? computeFeeIx : undefined,
+    ].filter(Boolean) as TransactionInstruction[];
+
+    const messageV01 = new TransactionMessage({
+      payerKey: lavarageProgram.provider.publicKey!,
+      recentBlockhash: blockhash,
+      instructions: setUpInstructions,
+    }).compileToV0Message(addressLookupTableAccounts);
+
+    const tx2 = new VersionedTransaction(messageV01);
+
+    const messageV0 = new TransactionMessage({
+      payerKey: lavarageProgram.provider.publicKey!,
+      recentBlockhash: blockhash,
+      instructions: allInstructions,
+    }).compileToV0Message(addressLookupTableAccounts);
+
+    const tx = new VersionedTransaction(messageV0);
+
+    return [tx2, tx];
+  }
+
   const allInstructions = [
     fromTokenAccount.instruction!,
     toTokenAccount.instruction!,
@@ -405,6 +439,7 @@ export const openTradeV2 = async (
   partnerFeeMarkup?: number,
   computeBudgetMicroLamports?: number,
   platformFeeRecipient?: PublicKey,
+  splitTransactions?: boolean,
 ) => {
   let partnerFeeMarkupAsPkey;
   if (partnerFeeMarkup) {
@@ -555,22 +590,22 @@ export const openTradeV2 = async (
     .remainingAccounts(
       partnerFeeRecipient && partnerFeeMarkupAsPkey
         ? [
-            {
-              pubkey: getAssociatedTokenAddressSync(
-                quoteToken,
-                partnerFeeRecipient,
-                false,
-                quoteTokenProgram
-              ),
-              isSigner: false,
-              isWritable: true,
-            },
-            {
-              pubkey: partnerFeeMarkupAsPkey,
-              isSigner: false,
-              isWritable: false,
-            },
-          ]
+          {
+            pubkey: getAssociatedTokenAddressSync(
+              quoteToken,
+              partnerFeeRecipient,
+              false,
+              quoteTokenProgram
+            ),
+            isSigner: false,
+            isWritable: true,
+          },
+          {
+            pubkey: partnerFeeMarkupAsPkey,
+            isSigner: false,
+            isWritable: false,
+          },
+        ]
         : []
     )
     .instruction();
@@ -597,6 +632,39 @@ export const openTradeV2 = async (
     microLamports: computeBudgetMicroLamports ?? 100000,
   });
 
+  if (splitTransactions) {
+    const setUpInstructions = [
+      fromTokenAccount.instruction!,
+      toTokenAccount.instruction!,
+      ...setupInstructions.map(deserializeInstruction),
+    ]
+
+    const allInstructions = [
+      tradingOpenBorrowInstruction!,
+      deserializeInstruction(swapInstructionPayload), ,
+      openAddCollateralInstruction!,
+      computeBudgetMicroLamports ? computeFeeIx : undefined,
+    ].filter(Boolean) as TransactionInstruction[];
+
+    const messageV01 = new TransactionMessage({
+      payerKey: lavarageProgram.provider.publicKey!,
+      recentBlockhash: blockhash,
+      instructions: setUpInstructions,
+    }).compileToV0Message(addressLookupTableAccounts);
+
+    const tx2 = new VersionedTransaction(messageV01);
+
+    const messageV0 = new TransactionMessage({
+      payerKey: lavarageProgram.provider.publicKey!,
+      recentBlockhash: blockhash,
+      instructions: allInstructions,
+    }).compileToV0Message(addressLookupTableAccounts);
+
+    const tx = new VersionedTransaction(messageV0);
+
+    return [tx2, tx];
+  }
+
   const allInstructions = [
     fromTokenAccount.instruction!,
     toTokenAccount.instruction!,
@@ -652,20 +720,20 @@ export const createTpDelegate = async (
     .remainingAccounts(
       partnerFeeRecipient
         ? [
-            {
-              pubkey:
-                quoteToken.toBase58() ==
+          {
+            pubkey:
+              quoteToken.toBase58() ==
                 "So11111111111111111111111111111111111111112"
-                  ? partnerFeeRecipient
-                  : getAssociatedTokenAddressSync(
-                      quoteToken,
-                      partnerFeeRecipient,
-                      false
-                    ),
-              isSigner: false,
-              isWritable: true,
-            },
-          ]
+                ? partnerFeeRecipient
+                : getAssociatedTokenAddressSync(
+                  quoteToken,
+                  partnerFeeRecipient,
+                  false
+                ),
+            isSigner: false,
+            isWritable: true,
+          },
+        ]
         : []
     )
     .instruction();
@@ -728,20 +796,20 @@ export const modifyTpDelegate = async (
     .remainingAccounts(
       partnerFeeRecipient
         ? [
-            {
-              pubkey:
-                quoteToken.toBase58() ==
+          {
+            pubkey:
+              quoteToken.toBase58() ==
                 "So11111111111111111111111111111111111111112"
-                  ? partnerFeeRecipient
-                  : getAssociatedTokenAddressSync(
-                      quoteToken,
-                      partnerFeeRecipient,
-                      false
-                    ),
-              isSigner: false,
-              isWritable: true,
-            },
-          ]
+                ? partnerFeeRecipient
+                : getAssociatedTokenAddressSync(
+                  quoteToken,
+                  partnerFeeRecipient,
+                  false
+                ),
+            isSigner: false,
+            isWritable: true,
+          },
+        ]
         : []
     )
     .instruction();
@@ -911,6 +979,7 @@ export const closeTradeV1 = async (
   partnerFeeMarkup?: number,
   computeBudgetMicroLamports?: number,
   platformFeeRecipient?: PublicKey,
+  splitTransactions?: boolean,
 ) => {
   let partnerFeeMarkupAsPkey;
   if (partnerFeeMarkup) {
@@ -1037,17 +1106,17 @@ export const closeTradeV1 = async (
       .remainingAccounts(
         partnerFeeRecipient && partnerFeeMarkupAsPkey
           ? [
-              {
-                pubkey: partnerFeeRecipient,
-                isSigner: false,
-                isWritable: true,
-              },
-              {
-                pubkey: partnerFeeMarkupAsPkey,
-                isSigner: false,
-                isWritable: false,
-              },
-            ]
+            {
+              pubkey: partnerFeeRecipient,
+              isSigner: false,
+              isWritable: true,
+            },
+            {
+              pubkey: partnerFeeMarkupAsPkey,
+              isSigner: false,
+              isWritable: false,
+            },
+          ]
           : []
       )
       .instruction();
@@ -1070,22 +1139,21 @@ export const closeTradeV1 = async (
       .remainingAccounts(
         partnerFeeRecipient && partnerFeeMarkupAsPkey
           ? [
-              {
-                pubkey: partnerFeeRecipient,
-                isSigner: false,
-                isWritable: true,
-              },
-              {
-                pubkey: partnerFeeMarkupAsPkey,
-                isSigner: false,
-                isWritable: false,
-              },
-            ]
+            {
+              pubkey: partnerFeeRecipient,
+              isSigner: false,
+              isWritable: true,
+            },
+            {
+              pubkey: partnerFeeMarkupAsPkey,
+              isSigner: false,
+              isWritable: false,
+            },
+          ]
           : []
       )
       .instruction();
 
-      
     const {
       setupInstructions,
       swapInstruction: swapInstructionPayload,
@@ -1121,17 +1189,51 @@ export const closeTradeV1 = async (
     microLamports: computeBudgetMicroLamports ?? 100000,
   });
 
+  if (splitTransactions) {
+    const setUpInstructions = [
+      jupInstruction.instructions && platformFeeRecipientAccount?.instruction ? platformFeeRecipientAccount.instruction : null,
+      createAssociatedTokenAccountInstruction
+    ].filter((i) => !!i);
+
+    const allInstructions = [
+      jupInstruction.instructions?.tokenLedgerInstruction
+        ? deserializeInstruction(
+          jupInstruction.instructions.tokenLedgerInstruction
+        )
+        : null,
+      closePositionIx,
+      ...jupiterIxs,
+      repaySolIx,
+      computeBudgetMicroLamports ? computeFeeIx : undefined,
+    ].filter((i) => !!i);
+
+    const messageV01 = new TransactionMessage({
+      payerKey: lavarageProgram.provider.publicKey!,
+      recentBlockhash: blockhash,
+      instructions: setUpInstructions,
+    }).compileToV0Message(addressLookupTableAccounts);
+
+    const tx = new VersionedTransaction(messageV01);
+
+    const messageV02 = new TransactionMessage({
+      payerKey: lavarageProgram.provider.publicKey!,
+      recentBlockhash: blockhash,
+      instructions: allInstructions,
+    }).compileToV0Message(addressLookupTableAccounts);
+
+    const tx2 = new VersionedTransaction(messageV02);
+
+    return [tx, tx2];
+  }
+
   const allInstructions = [
     jupInstruction.instructions && platformFeeRecipientAccount?.instruction ? platformFeeRecipientAccount.instruction : null,
-    jupInstruction.instructions?.tokenLedgerInstruction
-      ? createAssociatedTokenAccountInstruction
-      : null,
+    createAssociatedTokenAccountInstruction,
     jupInstruction.instructions?.tokenLedgerInstruction
       ? deserializeInstruction(
-          jupInstruction.instructions.tokenLedgerInstruction
-        )
+        jupInstruction.instructions.tokenLedgerInstruction
+      )
       : null,
-    toTokenAccount.instruction!,
     closePositionIx,
     ...jupiterIxs,
     repaySolIx,
@@ -1177,6 +1279,7 @@ export const closeTradeV2 = async (
   partnerFeeMarkup?: number,
   computeBudgetMicroLamports?: number,
   platformFeeRecipient?: PublicKey,
+  splitTransactions?: boolean,
 ) => {
   let partnerFeeMarkupAsPkey;
   if (partnerFeeMarkup) {
@@ -1326,22 +1429,22 @@ export const closeTradeV2 = async (
       .remainingAccounts(
         partnerFeeRecipient && partnerFeeMarkupAsPkey
           ? [
-              {
-                pubkey: getAssociatedTokenAddressSync(
-                  quoteToken,
-                  partnerFeeRecipient,
-                  false,
-                  quoteTokenProgram
-                ),
-                isSigner: false,
-                isWritable: true,
-              },
-              {
-                pubkey: partnerFeeMarkupAsPkey,
-                isSigner: false,
-                isWritable: false,
-              },
-            ]
+            {
+              pubkey: getAssociatedTokenAddressSync(
+                quoteToken,
+                partnerFeeRecipient,
+                false,
+                quoteTokenProgram
+              ),
+              isSigner: false,
+              isWritable: true,
+            },
+            {
+              pubkey: partnerFeeMarkupAsPkey,
+              isSigner: false,
+              isWritable: false,
+            },
+          ]
           : []
       )
       .instruction();
@@ -1383,17 +1486,17 @@ export const closeTradeV2 = async (
       .remainingAccounts(
         partnerFeeRecipient && partnerFeeMarkupAsPkey
           ? [
-              {
-                pubkey: partnerFeeRecipient,
-                isSigner: false,
-                isWritable: true,
-              },
-              {
-                pubkey: partnerFeeMarkupAsPkey,
-                isSigner: false,
-                isWritable: false,
-              },
-            ]
+            {
+              pubkey: partnerFeeRecipient,
+              isSigner: false,
+              isWritable: true,
+            },
+            {
+              pubkey: partnerFeeMarkupAsPkey,
+              isSigner: false,
+              isWritable: false,
+            },
+          ]
           : []
       )
       .instruction();
@@ -1435,17 +1538,51 @@ export const closeTradeV2 = async (
     microLamports: computeBudgetMicroLamports ?? 100000,
   });
 
+  if (splitTransactions) {
+    const setUpInstructions = [
+      jupInstruction.instructions && platformFeeRecipientAccount?.instruction ? platformFeeRecipientAccount.instruction : null,
+      createAssociatedTokenAccountInstruction,
+    ].filter((i) => !!i);
+
+    const allInstructions = [
+      jupInstruction.instructions?.tokenLedgerInstruction
+        ? deserializeInstruction(
+          jupInstruction.instructions.tokenLedgerInstruction
+        )
+        : null,
+      closePositionIx,
+      ...jupiterIxs,
+      repaySolIx,
+      computeBudgetMicroLamports ? computeFeeIx : undefined,
+    ].filter((i) => !!i);
+
+    const messageV01 = new TransactionMessage({
+      payerKey: lavarageProgram.provider.publicKey!,
+      recentBlockhash: blockhash,
+      instructions: setUpInstructions,
+    }).compileToV0Message(addressLookupTableAccounts);
+
+    const tx = new VersionedTransaction(messageV01);
+
+    const messageV02 = new TransactionMessage({
+      payerKey: lavarageProgram.provider.publicKey!,
+      recentBlockhash: blockhash,
+      instructions: allInstructions,
+    }).compileToV0Message(addressLookupTableAccounts);
+
+    const tx2 = new VersionedTransaction(messageV02);
+
+    return [tx, tx2];
+  }
+
   const allInstructions = [
     jupInstruction.instructions && platformFeeRecipientAccount?.instruction ? platformFeeRecipientAccount.instruction : null,
-    jupInstruction.instructions?.tokenLedgerInstruction
-      ? createAssociatedTokenAccountInstruction
-      : null,
+    createAssociatedTokenAccountInstruction,
     jupInstruction.instructions?.tokenLedgerInstruction
       ? deserializeInstruction(
-          jupInstruction.instructions.tokenLedgerInstruction
-        )
+        jupInstruction.instructions.tokenLedgerInstruction
+      )
       : null,
-    toTokenAccount.instruction!,
     closePositionIx,
     ...jupiterIxs,
     repaySolIx,
@@ -1470,13 +1607,13 @@ export const getDelegateAccounts = async (
   const delegateAccounts = await lavarageProgram.account.delegate.all(
     userPubKey
       ? [
-          {
-            memcmp: {
-              offset: 104,
-              bytes: userPubKey.toBase58(),
-            },
+        {
+          memcmp: {
+            offset: 104,
+            bytes: userPubKey.toBase58(),
           },
-        ]
+        },
+      ]
       : undefined
   );
   return delegateAccounts.map((d) => ({
@@ -1615,7 +1752,17 @@ export const splitPositionV2 = async (
 
   const tx = new VersionedTransaction(messageV0);
 
-  return tx;
+  return {
+    transaction: tx,
+    newPositionAddresses: [
+      newPosition1AccountPDA.toBase58(),
+      newPosition2AccountPDA.toBase58(),
+    ],
+    newPositionSeeds: [
+      newPosition1Seed.toBase58(),
+      newPosition2Seed.toBase58(),
+    ],
+  };
 };
 
 export const mergePositionV2 = async (

package/package.json

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