@lavarage/sdk 7.5.7 → 7.5.8

package/index.ts

@@ -2464,8 +2464,12 @@ export const closeTradeV2 = async (
   computeBudgetMicroLamports?: number,
   platformFeeRecipient?: PublicKey,
   splitTransactions?: boolean,
+  discountBps?: number,
+  referralBps?: number,
 ) => {
   let partnerFeeMarkupAsPkey;
+  const referralVaultProgram = new Program<UserVault>(userVaultIDL, REFFERAL_VAULT_PROGRAM_ID, lavarageProgram.provider);
+  
   if (partnerFeeMarkup) {
     const feeBuffer = Buffer.alloc(8);
     feeBuffer.writeBigUInt64LE(BigInt(partnerFeeMarkup));
@@ -2556,6 +2560,60 @@ export const closeTradeV2 = async (
   const { blockhash } =
     await lavarageProgram.provider.connection.getLatestBlockhash("finalized");
 
+  const useReferral = discountBps !== undefined && referralBps !== undefined;
+
+  // Check if partner fee recipient vault and token account need to be created
+  let partnerFeeRecipientVaultCreateIx: TransactionInstruction | undefined;
+  let partnerFeeRecipientTokenAccountCreateIx: TransactionInstruction | undefined;
+  let userVaultPda: PublicKey | undefined;
+  
+  if (partnerFeeRecipient && partnerFeeMarkupAsPkey && referralVaultProgram) {
+    // Derive the userVault PDA
+    [userVaultPda] = PublicKey.findProgramAddressSync(
+      [Buffer.from("user_vault"), new PublicKey(partnerFeeRecipient).toBuffer()],
+      referralVaultProgram.programId
+    );
+    
+    // Get the vault's associated token account
+    const vaultTokenAccount = getAssociatedTokenAddressSync(
+      quoteToken,
+      userVaultPda,
+      true, // allowOwnerOffCurve for PDA
+      quoteTokenProgram
+    );
+    
+    // Check both accounts at the same time
+    const [vaultAccountInfo, vaultTokenAccountInfo] = await lavarageProgram.provider.connection.getMultipleAccountsInfo([
+      userVaultPda,
+      vaultTokenAccount
+    ]);
+    
+    // Create vault if it doesn't exist
+    if (!vaultAccountInfo) {
+      partnerFeeRecipientVaultCreateIx = await referralVaultProgram.methods
+        .initializeVault()
+        .accountsStrict({
+          userVault: userVaultPda,
+          user: partnerFeeRecipient!,
+          funder: lavarageProgram.provider.publicKey!,
+          systemProgram: SystemProgram.programId,
+        })
+        .instruction();
+    }
+    
+    // Create token account if it doesn't exist
+    if (!vaultTokenAccountInfo) {
+      partnerFeeRecipientTokenAccountCreateIx = createAssociatedTokenAccountIdempotentInstruction(
+        lavarageProgram.provider.publicKey!,
+        vaultTokenAccount,
+        userVaultPda,
+        quoteToken,
+        quoteTokenProgram,
+        ASSOCIATED_TOKEN_PROGRAM_ID
+      );
+    }
+  }
+
   const closePositionIx = await lavarageProgram.methods
     .tradingCloseBorrowCollateral()
     .accountsStrict({
@@ -2576,119 +2634,227 @@ export const closeTradeV2 = async (
   let repaySolIx: TransactionInstruction | null = null;
   let jupiterIxs: TransactionInstruction[] = [];
   if (jupInstruction.instructions == undefined) {
-    repaySolIx = await lavarageProgram.methods
-      .tradingCloseRepaySol(
-        new BN(jupInstruction.quoteResponse.outAmount),
-        new BN(9997)
-      )
-      .accountsStrict({
-        nodeWallet: pool.account.nodeWallet,
-        positionAccount: positionAccountPDA,
-        tradingPool: poolPubKey,
-        trader: lavarageProgram.provider.publicKey!,
-        systemProgram: SystemProgram.programId,
-        clock: SYSVAR_CLOCK_PUBKEY,
-        randomAccountAsId: position.account.seed,
-        feeTokenAccount: getAssociatedTokenAddressSync(
-          quoteToken,
-          new PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"),
-          false,
-          quoteTokenProgram
-        ),
-        fromTokenAccount: getAssociatedTokenAddressSync(
-          quoteToken,
-          lavarageProgram.provider.publicKey!,
-          false,
-          quoteTokenProgram
-        ),
-        tokenProgram: quoteTokenProgram!,
-        toTokenAccount: getAssociatedTokenAddressSync(
-          quoteToken,
-          pool.account.nodeWallet,
-          true,
-          quoteTokenProgram
-        ),
-        mint: quoteToken,
-      })
-      .remainingAccounts(
-        partnerFeeRecipient && partnerFeeMarkupAsPkey
-          ? [
-            {
-              pubkey: getAssociatedTokenAddressSync(
-                quoteToken,
-                partnerFeeRecipient,
-                false,
-                quoteTokenProgram
-              ),
-              isSigner: false,
-              isWritable: true,
-            },
-            {
-              pubkey: partnerFeeMarkupAsPkey,
-              isSigner: false,
-              isWritable: false,
-            },
-          ]
-          : []
-      )
-      .instruction();
+    repaySolIx = useReferral
+      ? await lavarageProgram.methods
+          .tradingCloseRepaySolWithReferral(
+            new BN(jupInstruction.quoteResponse.outAmount),
+            new BN(9997),
+            new BN(discountBps),
+            new BN(referralBps)
+          )
+          .accountsStrict({
+            nodeWallet: pool.account.nodeWallet,
+            positionAccount: positionAccountPDA,
+            tradingPool: poolPubKey,
+            trader: lavarageProgram.provider.publicKey!,
+            systemProgram: SystemProgram.programId,
+            clock: SYSVAR_CLOCK_PUBKEY,
+            randomAccountAsId: position.account.seed,
+            feeTokenAccount: getAssociatedTokenAddressSync(
+              quoteToken,
+              new PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"),
+              false,
+              quoteTokenProgram
+            ),
+            fromTokenAccount: getAssociatedTokenAddressSync(
+              quoteToken,
+              lavarageProgram.provider.publicKey!,
+              false,
+              quoteTokenProgram
+            ),
+            tokenProgram: quoteTokenProgram!,
+            toTokenAccount: getAssociatedTokenAddressSync(
+              quoteToken,
+              pool.account.nodeWallet,
+              true,
+              quoteTokenProgram
+            ),
+            mint: quoteToken,
+          })
+          .remainingAccounts(
+            partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda
+              ? [
+                {
+                  pubkey: getAssociatedTokenAddressSync(
+                    quoteToken,
+                    userVaultPda,
+                    true, // allowOwnerOffCurve for PDA
+                    quoteTokenProgram
+                  ),
+                  isSigner: false,
+                  isWritable: true,
+                }
+              ]
+              : []
+          )
+          .instruction()
+      : await lavarageProgram.methods
+          .tradingCloseRepaySol(
+            new BN(jupInstruction.quoteResponse.outAmount),
+            new BN(9997)
+          )
+          .accountsStrict({
+            nodeWallet: pool.account.nodeWallet,
+            positionAccount: positionAccountPDA,
+            tradingPool: poolPubKey,
+            trader: lavarageProgram.provider.publicKey!,
+            systemProgram: SystemProgram.programId,
+            clock: SYSVAR_CLOCK_PUBKEY,
+            randomAccountAsId: position.account.seed,
+            feeTokenAccount: getAssociatedTokenAddressSync(
+              quoteToken,
+              new PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"),
+              false,
+              quoteTokenProgram
+            ),
+            fromTokenAccount: getAssociatedTokenAddressSync(
+              quoteToken,
+              lavarageProgram.provider.publicKey!,
+              false,
+              quoteTokenProgram
+            ),
+            tokenProgram: quoteTokenProgram!,
+            toTokenAccount: getAssociatedTokenAddressSync(
+              quoteToken,
+              pool.account.nodeWallet,
+              true,
+              quoteTokenProgram
+            ),
+            mint: quoteToken,
+          })
+          .remainingAccounts(
+            partnerFeeRecipient && partnerFeeMarkupAsPkey
+              ? [
+                {
+                  pubkey: getAssociatedTokenAddressSync(
+                    quoteToken,
+                    partnerFeeRecipient,
+                    false,
+                    quoteTokenProgram
+                  ),
+                  isSigner: false,
+                  isWritable: true,
+                },
+                {
+                  pubkey: partnerFeeMarkupAsPkey,
+                  isSigner: false,
+                  isWritable: false,
+                },
+              ]
+              : []
+          )
+          .instruction();
   } else {
-    repaySolIx = await lavarageProgram.methods
-      .tradingCloseRepaySol(
-        new BN(jupInstruction.quoteResponse.outAmount),
-        new BN(9998)
-      )
-      .accountsStrict({
-        nodeWallet: pool.account.nodeWallet,
-        positionAccount: positionAccountPDA,
-        tradingPool: poolPubKey,
-        trader: lavarageProgram.provider.publicKey!,
-        systemProgram: SystemProgram.programId,
-        clock: SYSVAR_CLOCK_PUBKEY,
-        randomAccountAsId: position.account.seed,
-        feeTokenAccount: getAssociatedTokenAddressSync(
-          quoteToken,
-          new PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"),
-          false,
-          quoteTokenProgram
-        ),
-        fromTokenAccount: getAssociatedTokenAddressSync(
-          quoteToken,
-          lavarageProgram.provider.publicKey!,
-          false,
-          quoteTokenProgram
-        ),
-        tokenProgram: quoteTokenProgram!,
-        toTokenAccount: getAssociatedTokenAddressSync(
-          quoteToken,
-          pool.account.nodeWallet,
-          true,
-          quoteTokenProgram
-        ),
-        mint: quoteToken,
-      })
-      .remainingAccounts(
-        partnerFeeRecipient && partnerFeeMarkupAsPkey
-          ? [
-            {
-              pubkey: getAssociatedTokenAddressSync(
-                quoteToken,
-                partnerFeeRecipient,
-                false,
-                quoteTokenProgram
-              ),
-              isSigner: false,
-              isWritable: true,
-            },
-            {
-              pubkey: partnerFeeMarkupAsPkey,
-              isSigner: false,
-              isWritable: false,
-            },
-          ]
-          : []
-      )
-      .instruction();
+    repaySolIx = useReferral
+      ? await lavarageProgram.methods
+          .tradingCloseRepaySolWithReferral(
+            new BN(jupInstruction.quoteResponse.outAmount),
+            new BN(9998),
+            new BN(discountBps),
+            new BN(referralBps)
+          )
+          .accountsStrict({
+            nodeWallet: pool.account.nodeWallet,
+            positionAccount: positionAccountPDA,
+            tradingPool: poolPubKey,
+            trader: lavarageProgram.provider.publicKey!,
+            systemProgram: SystemProgram.programId,
+            clock: SYSVAR_CLOCK_PUBKEY,
+            randomAccountAsId: position.account.seed,
+            feeTokenAccount: getAssociatedTokenAddressSync(
+              quoteToken,
+              new PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"),
+              false,
+              quoteTokenProgram
+            ),
+            fromTokenAccount: getAssociatedTokenAddressSync(
+              quoteToken,
+              lavarageProgram.provider.publicKey!,
+              false,
+              quoteTokenProgram
+            ),
+            tokenProgram: quoteTokenProgram!,
+            toTokenAccount: getAssociatedTokenAddressSync(
+              quoteToken,
+              pool.account.nodeWallet,
+              true,
+              quoteTokenProgram
+            ),
+            mint: quoteToken,
+          })
+          .remainingAccounts(
+            partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda
+              ? [
+                {
+                  pubkey: getAssociatedTokenAddressSync(
+                    quoteToken,
+                    userVaultPda,
+                    true, // allowOwnerOffCurve for PDA
+                    quoteTokenProgram
+                  ),
+                  isSigner: false,
+                  isWritable: true,
+                }
+              ]
+              : []
+          )
+          .instruction()
+      : await lavarageProgram.methods
+          .tradingCloseRepaySol(
+            new BN(jupInstruction.quoteResponse.outAmount),
+            new BN(9998)
+          )
+          .accountsStrict({
+            nodeWallet: pool.account.nodeWallet,
+            positionAccount: positionAccountPDA,
+            tradingPool: poolPubKey,
+            trader: lavarageProgram.provider.publicKey!,
+            systemProgram: SystemProgram.programId,
+            clock: SYSVAR_CLOCK_PUBKEY,
+            randomAccountAsId: position.account.seed,
+            feeTokenAccount: getAssociatedTokenAddressSync(
+              quoteToken,
+              new PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"),
+              false,
+              quoteTokenProgram
+            ),
+            fromTokenAccount: getAssociatedTokenAddressSync(
+              quoteToken,
+              lavarageProgram.provider.publicKey!,
+              false,
+              quoteTokenProgram
+            ),
+            tokenProgram: quoteTokenProgram!,
+            toTokenAccount: getAssociatedTokenAddressSync(
+              quoteToken,
+              pool.account.nodeWallet,
+              true,
+              quoteTokenProgram
+            ),
+            mint: quoteToken,
+          })
+          .remainingAccounts(
+            partnerFeeRecipient && partnerFeeMarkupAsPkey
+              ? [
+                {
+                  pubkey: getAssociatedTokenAddressSync(
+                    quoteToken,
+                    partnerFeeRecipient,
+                    false,
+                    quoteTokenProgram
+                  ),
+                  isSigner: false,
+                  isWritable: true,
+                },
+                {
+                  pubkey: partnerFeeMarkupAsPkey,
+                  isSigner: false,
+                  isWritable: false,
+                },
+              ]
+              : []
+          )
+          .instruction();
     const {
       setupInstructions,
       swapInstruction: swapInstructionPayload,
@@ -2729,6 +2895,8 @@ export const closeTradeV2 = async (
 
   if (splitTransactions) {
     const setUpInstructions = [
+      partnerFeeRecipientVaultCreateIx,
+      partnerFeeRecipientTokenAccountCreateIx,
       jupInstruction.instructions && platformFeeRecipientAccount?.instruction ? platformFeeRecipientAccount.instruction : null,
       createAssociatedTokenAccountInstruction,
     ].filter((i) => !!i);
@@ -2765,6 +2933,8 @@ export const closeTradeV2 = async (
   }
 
   const allInstructions = [
+    partnerFeeRecipientVaultCreateIx,
+    partnerFeeRecipientTokenAccountCreateIx,
     jupInstruction.instructions && platformFeeRecipientAccount?.instruction ? platformFeeRecipientAccount.instruction : null,
     createAssociatedTokenAccountInstruction,
     jupInstruction.instructions?.tokenLedgerInstruction

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lavarage/sdk",
-  "version": "7.5.7",
+  "version": "7.5.8",
   "description": "Lavarage SDK",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "tsup": "^8.2.4",
-    "typedoc": "^0.28.12"
+    "typedoc": "^0.28.15"
   },
   "publishConfig": {
     "access": "public"