@lavarage/sdk 6.1.4 → 6.2.0

package/dist/index.mjs

@@ -46,7 +46,7 @@ var __async = (__this, __arguments, generator) => {
 import { BN } from "@coral-xyz/anchor";
 import bs58 from "bs58";
 import { AddressLookupTableAccount, ComputeBudgetProgram, PublicKey, SystemProgram, SYSVAR_CLOCK_PUBKEY, SYSVAR_INSTRUCTIONS_PUBKEY, Transaction, TransactionInstruction, TransactionMessage, VersionedTransaction } from "@solana/web3.js";
-import { ASSOCIATED_TOKEN_PROGRAM_ID, createAssociatedTokenAccountInstruction, createTransferInstruction, getAccount, getAssociatedTokenAddressSync, TOKEN_PROGRAM_ID, TokenAccountNotFoundError, TokenInvalidAccountOwnerError } from "@solana/spl-token";
+import { ASSOCIATED_TOKEN_PROGRAM_ID, createAssociatedTokenAccountInstruction, getAccount, getAssociatedTokenAddressSync, TOKEN_PROGRAM_ID, TokenAccountNotFoundError, TokenInvalidAccountOwnerError } from "@solana/spl-token";
 
 // idl/lavarage.ts
 var IDL = {
@@ -2514,7 +2514,15 @@ var getAllPositions = (lavarageProgram) => {
     { dataSize: 178 }
   ]);
 };
-var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, partnerFeeRecipient) => __async(void 0, null, function* () {
+var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, partnerFeeRecipient, partnerFeeMarkup) => __async(void 0, null, function* () {
+  let partnerFeeMarkupAsPkey;
+  if (partnerFeeMarkup) {
+    const feeBuffer = Buffer.alloc(8);
+    feeBuffer.writeBigUInt64LE(BigInt(partnerFeeMarkup));
+    const feeBuffer32 = Buffer.alloc(32);
+    feeBuffer32.set(feeBuffer, 0);
+    partnerFeeMarkupAsPkey = new PublicKey(feeBuffer32);
+  }
   const positionAccount = getPositionAccountPDA(lavarageProgram, offer, randomSeed.publicKey);
   const mintAccount = yield lavarageProgram.provider.connection.getAccountInfo(offer.account.collateralType);
   const tokenProgram = mintAccount == null ? void 0 : mintAccount.owner;
@@ -2567,10 +2575,14 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     clock: SYSVAR_CLOCK_PUBKEY,
     randomAccountAsId: randomSeed.publicKey.toBase58(),
     feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"
-  }).remainingAccounts(partnerFeeRecipient ? [{
+  }).remainingAccounts(partnerFeeRecipient && partnerFeeMarkupAsPkey ? [{
     pubkey: partnerFeeRecipient,
     isSigner: false,
     isWritable: true
+  }, {
+    pubkey: partnerFeeMarkupAsPkey,
+    isSigner: false,
+    isWritable: false
   }] : []).instruction();
   const openAddCollateralInstruction = yield lavarageProgram.methods.tradingOpenAddCollateral(offer.account.interestRate).accountsStrict({
     tradingPool: offer.publicKey,
@@ -2600,7 +2612,15 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
   const tx = new VersionedTransaction(messageV0);
   return tx;
 });
-var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, quoteToken, partnerFeeRecipient) => __async(void 0, null, function* () {
+var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, quoteToken, partnerFeeRecipient, partnerFeeMarkup) => __async(void 0, null, function* () {
+  let partnerFeeMarkupAsPkey;
+  if (partnerFeeMarkup) {
+    const feeBuffer = Buffer.alloc(8);
+    feeBuffer.writeBigUInt64LE(BigInt(partnerFeeMarkup));
+    const feeBuffer32 = Buffer.alloc(32);
+    feeBuffer32.set(feeBuffer, 0);
+    partnerFeeMarkupAsPkey = new PublicKey(feeBuffer32);
+  }
   const positionAccount = getPositionAccountPDA(lavarageProgram, offer, randomSeed.publicKey);
   const mintAccount = yield lavarageProgram.provider.connection.getAccountInfo(offer.account.collateralType);
   const tokenProgram = mintAccount == null ? void 0 : mintAccount.owner;
@@ -2658,10 +2678,14 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     toTokenAccount: getAssociatedTokenAddressSync(quoteToken, lavarageProgram.provider.publicKey, true, quoteTokenProgram),
     tokenProgram,
     fromTokenAccount: getAssociatedTokenAddressSync(quoteToken, offer.account.nodeWallet, true, tokenProgram)
-  }).remainingAccounts(partnerFeeRecipient ? [{
+  }).remainingAccounts(partnerFeeRecipient && partnerFeeMarkupAsPkey ? [{
     pubkey: partnerFeeRecipient,
     isSigner: false,
     isWritable: true
+  }, {
+    pubkey: partnerFeeMarkupAsPkey,
+    isSigner: false,
+    isWritable: false
   }] : []).instruction();
   const openAddCollateralInstruction = yield lavarageProgram.methods.tradingOpenAddCollateral(offer.account.interestRate).accountsStrict({
     tradingPool: offer.publicKey,
@@ -2817,7 +2841,15 @@ var partialRepayV2 = (lavarageProgram, position, repaymentBps) => __async(void 0
   }).compileToV0Message();
   return new VersionedTransaction(messageV0);
 });
-var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFeeRecipient, profitFeeMarkup) => __async(void 0, null, function* () {
+var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFeeRecipient, partnerFeeMarkup) => __async(void 0, null, function* () {
+  let partnerFeeMarkupAsPkey;
+  if (partnerFeeMarkup) {
+    const feeBuffer = Buffer.alloc(8);
+    feeBuffer.writeBigUInt64LE(BigInt(partnerFeeMarkup));
+    const feeBuffer32 = Buffer.alloc(32);
+    feeBuffer32.set(feeBuffer, 0);
+    partnerFeeMarkupAsPkey = new PublicKey(feeBuffer32);
+  }
   if (position.account.pool.toBase58() != offer.publicKey.toBase58()) throw "Mismatch offer";
   const pool = offer;
   const poolPubKey = offer.publicKey;
@@ -2880,10 +2912,14 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
       clock: SYSVAR_CLOCK_PUBKEY,
       randomAccountAsId: position.account.seed,
       feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"
-    }).remainingAccounts(partnerFeeRecipient ? [{
+    }).remainingAccounts(partnerFeeRecipient && partnerFeeMarkupAsPkey ? [{
       pubkey: partnerFeeRecipient,
       isSigner: false,
       isWritable: true
+    }, {
+      pubkey: partnerFeeMarkupAsPkey,
+      isSigner: false,
+      isWritable: false
     }] : []).instruction();
   } else {
     repaySolIx = yield lavarageProgram.methods.tradingCloseRepaySol(new BN(jupInstruction.quoteResponse.outAmount), new BN(9998)).accountsStrict({
@@ -2895,10 +2931,14 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
       clock: SYSVAR_CLOCK_PUBKEY,
       randomAccountAsId: position.account.seed,
       feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"
-    }).remainingAccounts(partnerFeeRecipient ? [{
+    }).remainingAccounts(partnerFeeRecipient && partnerFeeMarkupAsPkey ? [{
       pubkey: partnerFeeRecipient,
       isSigner: false,
       isWritable: true
+    }, {
+      pubkey: partnerFeeMarkupAsPkey,
+      isSigner: false,
+      isWritable: false
     }] : []).instruction();
     const { setupInstructions, swapInstruction: swapInstructionPayload, cleanupInstruction, addressLookupTableAddresses } = jupiterSellIx;
     jupiterIxs = [
@@ -2913,14 +2953,7 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
     toTokenAccount.instruction,
     closePositionIx,
     ...jupiterIxs,
-    repaySolIx,
-    profitFeeMarkup && partnerFeeRecipient ? SystemProgram.transfer(
-      {
-        fromPubkey: lavarageProgram.provider.publicKey,
-        toPubkey: partnerFeeRecipient,
-        lamports: profit.toNumber() > 0 ? profit.mul(new BN(profitFeeMarkup * 1e4)).div(new BN(1e4)).toNumber() : 0
-      }
-    ) : null
+    repaySolIx
   ].filter((i) => !!i);
   const messageV0 = new TransactionMessage({
     payerKey: lavarageProgram.provider.publicKey,
@@ -2930,7 +2963,15 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
   const tx = new VersionedTransaction(messageV0);
   return tx;
 });
-var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken, partnerFeeRecipient, profitFeeMarkup) => __async(void 0, null, function* () {
+var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken, partnerFeeRecipient, partnerFeeMarkup) => __async(void 0, null, function* () {
+  let partnerFeeMarkupAsPkey;
+  if (partnerFeeMarkup) {
+    const feeBuffer = Buffer.alloc(8);
+    feeBuffer.writeBigUInt64LE(BigInt(partnerFeeMarkup));
+    const feeBuffer32 = Buffer.alloc(32);
+    feeBuffer32.set(feeBuffer, 0);
+    partnerFeeMarkupAsPkey = new PublicKey(feeBuffer32);
+  }
   if (position.account.pool.toBase58() != offer.publicKey.toBase58()) throw "Mismatch offer";
   const pool = offer;
   const poolPubKey = offer.publicKey;
@@ -2999,10 +3040,14 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
       tokenProgram: quoteTokenProgram,
       toTokenAccount: getAssociatedTokenAddressSync(quoteToken, pool.account.nodeWallet, true, quoteTokenProgram),
       mint: quoteToken
-    }).remainingAccounts(partnerFeeRecipient ? [{
+    }).remainingAccounts(partnerFeeRecipient && partnerFeeMarkupAsPkey ? [{
       pubkey: partnerFeeRecipient,
       isSigner: false,
       isWritable: true
+    }, {
+      pubkey: partnerFeeMarkupAsPkey,
+      isSigner: false,
+      isWritable: false
     }] : []).instruction();
   } else {
     repaySolIx = yield lavarageProgram.methods.tradingCloseRepaySol(new BN(jupInstruction.quoteResponse.outAmount), new BN(9998)).accountsStrict({
@@ -3018,10 +3063,14 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
       tokenProgram: quoteTokenProgram,
       toTokenAccount: getAssociatedTokenAddressSync(quoteToken, pool.account.nodeWallet, true, quoteTokenProgram),
       mint: quoteToken
-    }).remainingAccounts(partnerFeeRecipient ? [{
+    }).remainingAccounts(partnerFeeRecipient && partnerFeeMarkupAsPkey ? [{
       pubkey: partnerFeeRecipient,
       isSigner: false,
       isWritable: true
+    }, {
+      pubkey: partnerFeeMarkupAsPkey,
+      isSigner: false,
+      isWritable: false
     }] : []).instruction();
     const { setupInstructions, swapInstruction: swapInstructionPayload, cleanupInstruction, addressLookupTableAddresses } = jupiterSellIx;
     jupiterIxs = [
@@ -3036,15 +3085,7 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
     toTokenAccount.instruction,
     closePositionIx,
     ...jupiterIxs,
-    repaySolIx,
-    profitFeeMarkup && partnerFeeRecipient ? createTransferInstruction(
-      getAssociatedTokenAddressSync(quoteToken, lavarageProgram.provider.publicKey, false, quoteTokenProgram),
-      partnerFeeRecipient,
-      lavarageProgram.provider.publicKey,
-      profit.toNumber() > 0 ? profit.mul(new BN(profitFeeMarkup * 1e3)).div(new BN(1e3)).toNumber() : 0,
-      [],
-      quoteTokenProgram
-    ) : null
+    repaySolIx
   ].filter((i) => !!i);
   const messageV0 = new TransactionMessage({
     payerKey: lavarageProgram.provider.publicKey,