@lavarage/sdk 8.0.14 → 8.0.16

package/idl/userVault.json

@@ -1,5 +1,5 @@
 {
-  "address": "F7L3T5fjHbD13SH8UhNuYxCdabHX9CRg2zxbPjmiwU7R",
+  "address": "FFe8xWs9iBdWB6vsxg8yBLirZHsbACFNbXqAM4K3fPPB",
   "metadata": {
     "name": "user_vault",
     "version": "0.1.0",

package/idl/userVault.ts

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/user_vault.json`.
  */
 export type UserVault = {
-  "address": "F7L3T5fjHbD13SH8UhNuYxCdabHX9CRg2zxbPjmiwU7R",
+  "address": "FFe8xWs9iBdWB6vsxg8yBLirZHsbACFNbXqAM4K3fPPB",
   "metadata": {
     "name": "userVault",
     "version": "0.1.0",

package/index.ts

@@ -57,7 +57,6 @@ type OptionalRPCResults = {
   tokenAccountConfirmCreatedAddresses?: PublicKey[];
   quoteMintAccountInfo?: AccountInfo<Buffer>;
 }
-const REFFERAL_VAULT_PROGRAM_ID = new PublicKey("FFe8xWs9iBdWB6vsxg8yBLirZHsbACFNbXqAM4K3fPPB");
 
 const LAVARAGE_LOOKUP_TABLE = "CDPmKb5VggsHABwDCTaxiw5XXLjcgkqSJMNKRTzHWXwK";
 
@@ -908,7 +907,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)
  * 
@@ -1079,7 +1078,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;
@@ -1104,13 +1103,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,
@@ -1284,7 +1283,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)
  * 
@@ -1472,7 +1471,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;
@@ -1547,13 +1546,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,
@@ -2194,7 +2194,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
@@ -2337,7 +2337,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;
@@ -2383,13 +2383,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,
@@ -2446,13 +2446,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,
@@ -2622,7 +2622,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
@@ -2771,7 +2771,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;
@@ -2846,13 +2846,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,
@@ -2959,13 +2959,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.14",
+  "version": "8.0.16",
   "description": "Lavarage SDK",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/utils.ts

@@ -43,18 +43,12 @@ export function stringToU8Array(input: string): number[] {
 }
 
 export function u8ArrayToString(input: number[]): string {
-  // Strip trailing zero-padding and decode
-  const end = input.indexOf(0);
-  const bytes = new Uint8Array(end === -1 ? input : input.slice(0, end));
-  const decoder = new TextDecoder("utf-8", { fatal: true });
-  try {
-    return decoder.decode(bytes);
-  } catch {
-    // Not valid UTF-8 (e.g. raw binary/hash); return hex
-    return '0x' + Array.from(bytes)
-      .map((b) => b.toString(16).padStart(2, "0"))
-      .join("");
+  // validate that input has no more than 32 bytes
+  if (input.length > 32) {
+    throw new Error('Input has more than 32 bytes');
   }
+  
+  return '0x' + Buffer.from(input).toString('hex');
 }
 
 export function isSolProgram(program: Program<any>): boolean {