@lavarage/sdk 8.0.15 → 8.0.17

package/index.ts

@@ -846,6 +846,7 @@ export const borrowV2 = async (
       tradingPool: offer.publicKey,
       trader: lavarageProgram.provider.publicKey!,
       mint: offer.account.collateralType,
+      quoteMint: quoteToken,
       toTokenAccount: toTokenAccount.account!.address,
       systemProgram: SystemProgram.programId,
       positionAccount,
@@ -907,7 +908,7 @@ export const borrowV2 = async (
  * @param computeBudgetMicroLamports - Optional compute budget for priority fees
  * @param platformFeeRecipient - Optional wallet to receive platform fees (jup, okx)
  * @param splitTransactions - Optional boolean to split the transaction into multiple transactions (jito bundle)
- * @param discountBps - Optional discount basis points for the referral program
+ * @param discountBps - Optional discount basis points for the referral program and discount program
  * @param referralBps - Optional referral basis points for the referral program
  * @param optionalRPCResults - Optional RPC results to use for the transaction (speeds up the transaction building)
  * 
@@ -1078,7 +1079,7 @@ export const openTradeV1 = async (
   const blockhash =
     optionalRPCResults?.latestBlockhash ?? (await lavarageProgram.provider.connection.getLatestBlockhash("finalized")).blockhash;
 
-  const useReferral = discountBps !== undefined && referralBps !== undefined;
+  const shouldUseDiscountProgram = (discountBps !== undefined && discountBps > 0) || referralBps !== undefined;
 
   // Check if partner fee recipient vault needs to be initialized via referralVaultProgram
   let partnerFeeRecipientCreateIx: TransactionInstruction | undefined;
@@ -1103,13 +1104,13 @@ export const openTradeV1 = async (
     }
   }
 
-  const tradingOpenBorrowInstruction = useReferral
+  const tradingOpenBorrowInstruction = shouldUseDiscountProgram
     ? await lavarageProgram.methods
         .tradingOpenBorrowWithReferral(
           new BN((marginSOL.toNumber() * leverage).toFixed(0)),
           marginSOL,
-          new BN(discountBps),
-          new BN(referralBps)
+          new BN(discountBps || 0),
+          new BN(referralBps || 0)
         )
         .accountsStrict({
           nodeWallet: offer.account.nodeWallet,
@@ -1207,12 +1208,12 @@ export const openTradeV1 = async (
       fromTokenAccount.instruction!,
       toTokenAccount.instruction!,
       partnerFeeRecipientCreateIx,
-      ...setupInstructions.map(deserializeInstruction),
     ].filter(Boolean) as TransactionInstruction[];
 
     const allInstructions = [
       tradingOpenBorrowInstruction!,
-      deserializeInstruction(swapInstructionPayload), ,
+      ...setupInstructions.map(deserializeInstruction),
+      deserializeInstruction(swapInstructionPayload),
       openAddCollateralInstruction!,
       computeBudgetMicroLamports ? computeFeeIx : undefined,
     ].filter(Boolean) as TransactionInstruction[];
@@ -1283,7 +1284,7 @@ export const openTradeV1 = async (
  * @param computeBudgetMicroLamports - Optional compute budget for priority fees
  * @param platformFeeRecipient - Optional wallet to receive platform fees (jup, okx)
  * @param splitTransactions - Optional boolean to split the transaction into multiple transactions (jito bundle)
- * @param discountBps - Optional discount basis points for the referral program
+ * @param discountBps - Optional discount basis points for the referral program and discount program
  * @param referralBps - Optional referral basis points for the referral program
  * @param optionalRPCResults - Optional RPC results to use for the transaction (speeds up the transaction building)
  * 
@@ -1471,7 +1472,7 @@ export const openTradeV2 = async (
   const { blockhash } =
     await program.provider.connection.getLatestBlockhash("finalized");
 
-  const useReferral = discountBps !== undefined && referralBps !== undefined;
+  const shouldUseDiscountProgram = (discountBps !== undefined && discountBps > 0) || referralBps !== undefined;
 
   // Check if partner fee recipient vault and token account need to be created
   let partnerFeeRecipientVaultCreateIx: TransactionInstruction | undefined;
@@ -1546,13 +1547,14 @@ export const openTradeV2 = async (
     }
   }
 
-  const tradingOpenBorrowInstruction = useReferral
+
+  const tradingOpenBorrowInstruction = shouldUseDiscountProgram
     ? await program.methods
         .tradingOpenBorrow(
           new BN((marginSOL.toNumber() * leverage).toFixed(0)),
           marginSOL,
-          new BN(discountBps),
-          new BN(referralBps)
+          new BN(discountBps || 0),
+          new BN(referralBps || 0)
         )
         .accountsStrict({
           nodeWallet: offer.account.nodeWallet,
@@ -1676,6 +1678,7 @@ export const openTradeV2 = async (
       tradingPool: offer.publicKey,
       trader: program.provider.publicKey!,
       mint: offer.account.collateralType,
+      quoteMint: quoteToken,
       toTokenAccount: toTokenAccount.account!.address,
       systemProgram: SystemProgram.programId,
       positionAccount,
@@ -2193,7 +2196,7 @@ export const partialRepayV2 = async (
  * @param computeBudgetMicroLamports - Optional compute budget for priority fees
  * @param platformFeeRecipient - Optional wallet to receive platform fees (jup, okx)
  * @param splitTransactions - Optional boolean to split the transaction into multiple transactions (jito bundle)
- * @param discountBps - Optional discount basis points for the referral program
+ * @param discountBps - Optional discount basis points for the referral program and discount program
  * @param referralBps - Optional referral basis points for the referral program
  * 
  * @returns Transaction to close the position
@@ -2336,7 +2339,7 @@ export const closeTradeV1 = async (
   const { blockhash } =
     await lavarageProgram.provider.connection.getLatestBlockhash("finalized");
 
-  const useReferral = discountBps !== undefined && referralBps !== undefined;
+  const shouldUseDiscountProgram = (discountBps !== undefined && discountBps > 0) || referralBps !== undefined;
 
   // Check if partner fee recipient vault needs to be initialized via referralVaultProgram
   let partnerFeeRecipientCreateIx: TransactionInstruction | undefined;
@@ -2382,13 +2385,13 @@ export const closeTradeV1 = async (
   let repaySolIx: TransactionInstruction | null = null;
   let jupiterIxs: TransactionInstruction[] = [];
   if (jupInstruction.instructions == undefined) {
-    repaySolIx = useReferral
+    repaySolIx = shouldUseDiscountProgram
       ? await lavarageProgram.methods
           .tradingCloseRepaySolWithReferral(
             new BN(jupInstruction.quoteResponse.outAmount),
             new BN(9997),
-            new BN(discountBps),
-            new BN(referralBps)
+            new BN(discountBps || 0),
+            new BN(referralBps || 0)
           )
           .accountsStrict({
             nodeWallet: pool.account.nodeWallet,
@@ -2445,13 +2448,13 @@ export const closeTradeV1 = async (
           )
           .instruction();
   } else {
-    repaySolIx = useReferral
+    repaySolIx = shouldUseDiscountProgram
       ? await lavarageProgram.methods
           .tradingCloseRepaySolWithReferral(
             new BN(jupInstruction.quoteResponse.outAmount),
             new BN(9998),
-            new BN(discountBps),
-            new BN(referralBps)
+            new BN(discountBps || 0),
+            new BN(referralBps || 0)
           )
           .accountsStrict({
             nodeWallet: pool.account.nodeWallet,
@@ -2621,7 +2624,7 @@ export const closeTradeV1 = async (
  * @param computeBudgetMicroLamports - Optional compute budget for priority fees
 * @param platformFeeRecipient - Optional wallet to receive platform fees (jup, okx)
  * @param splitTransactions - Optional boolean to split the transaction into multiple transactions (jito bundle)
- * @param discountBps - Optional discount basis points for the referral program
+ * @param discountBps - Optional discount basis points for the referral program and discount program
  * @param referralBps - Optional referral basis points for the referral program
  * 
  * @returns Transaction to close the position
@@ -2770,7 +2773,7 @@ export const closeTradeV2 = async (
   const { blockhash } =
     await lavarageProgram.provider.connection.getLatestBlockhash("finalized");
 
-  const useReferral = discountBps !== undefined && referralBps !== undefined;
+  const shouldUseDiscountProgram = (discountBps !== undefined && discountBps > 0) || referralBps !== undefined;
 
   // Check if partner fee recipient vault and token account need to be created
   let partnerFeeRecipientVaultCreateIx: TransactionInstruction | undefined;
@@ -2845,13 +2848,13 @@ export const closeTradeV2 = async (
   let repaySolIx: TransactionInstruction | null = null;
   let jupiterIxs: TransactionInstruction[] = [];
   if (jupInstruction.instructions == undefined) {
-    repaySolIx = useReferral
+    repaySolIx = shouldUseDiscountProgram
       ? await lavarageProgram.methods
           .tradingCloseRepaySol(
             new BN(jupInstruction.quoteResponse.outAmount),
             new BN(9997),
-            new BN(discountBps),
-            new BN(referralBps)
+            new BN(discountBps || 0),
+            new BN(referralBps || 0)
           )
           .accountsStrict({
             nodeWallet: pool.account.nodeWallet,
@@ -2958,13 +2961,13 @@ export const closeTradeV2 = async (
           )
           .instruction();
   } else {
-    repaySolIx = useReferral
+    repaySolIx = shouldUseDiscountProgram
       ? await lavarageProgram.methods
           .tradingCloseRepaySol(
             new BN(jupInstruction.quoteResponse.outAmount),
             new BN(9998),
-            new BN(discountBps),
-            new BN(referralBps)
+            new BN(discountBps || 0),
+            new BN(referralBps || 0)
           )
           .accountsStrict({
             nodeWallet: pool.account.nodeWallet,

package/package.json

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