@lavarage/sdk 7.5.2 → 7.5.4

package/dist/index.mjs

@@ -43,7 +43,143 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // index.ts
-import { BN as BN2 } from "@coral-xyz/anchor";
+import { BN as BN2, Program as Program2 } from "@coral-xyz/anchor";
+
+// idl/referralVault.ts
+var IDL = {
+  "version": "0.1.0",
+  "name": "user_vault",
+  "instructions": [
+    {
+      "name": "initializeVault",
+      "accounts": [
+        {
+          "name": "userVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "claimSol",
+      "accounts": [
+        {
+          "name": "userVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "signer",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "recipient",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "amount",
+          "type": "u64"
+        }
+      ]
+    },
+    {
+      "name": "claimToken",
+      "accounts": [
+        {
+          "name": "userVault",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "vaultTokenAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "recipientTokenAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "tokenMint",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "signer",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "amount",
+          "type": "u64"
+        }
+      ]
+    }
+  ],
+  "accounts": [
+    {
+      "name": "userVault",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "user",
+            "type": "publicKey"
+          },
+          {
+            "name": "authority",
+            "type": "publicKey"
+          },
+          {
+            "name": "bump",
+            "type": "u8"
+          },
+          {
+            "name": "totalSolClaimed",
+            "type": "u64"
+          }
+        ]
+      }
+    }
+  ],
+  "errors": [
+    {
+      "code": 6e3,
+      "name": "UnauthorizedClaim",
+      "msg": "Unauthorized: Only user or authority can claim"
+    }
+  ]
+};
+
+// index.ts
 import bs58 from "bs58";
 import {
   AddressLookupTableAccount,
@@ -1563,7 +1699,7 @@ function getWithdrawalAccessList(lavarageProgram, params) {
 }
 
 // idl/lavarage.ts
-var IDL = {
+var IDL2 = {
   "version": "0.1.0",
   "name": "lavarage",
   "instructions": [
@@ -3160,9 +3296,9 @@ var IDL = {
 // idl/lavaragev2.ts
 var lavaragev2_exports = {};
 __export(lavaragev2_exports, {
-  IDL: () => IDL2
+  IDL: () => IDL3
 });
-var IDL2 = {
+var IDL3 = {
   "version": "0.1.0",
   "name": "lavarage",
   "instructions": [
@@ -4850,6 +4986,7 @@ var IDL2 = {
 };
 
 // index.ts
+var REFFERAL_VAULT_PROGRAM_ID = new PublicKey2("FFe8xWs9iBdWB6vsxg8yBLirZHsbACFNbXqAM4K3fPPB");
 function getPda(seed, programId) {
   const seedsBuffer = Array.isArray(seed) ? seed : [seed];
   return PublicKey2.findProgramAddressSync(seedsBuffer, programId)[0];
@@ -4961,8 +5098,325 @@ var getLiquidatedPositions = (lavarageProgram) => {
 var getAllPositions = (lavarageProgram) => {
   return lavarageProgram.account.position.all([{ dataSize: 178 }]);
 };
+var borrowV1 = (lavarageProgram, offer, marginSOL, leverage, randomSeed, tokenProgram, partnerFeeRecipient, partnerFeeMarkup, computeBudgetMicroLamports, discountBps, referralBps, referralVaultProgram) => __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 PublicKey2(feeBuffer32);
+  }
+  const positionAccount = getPositionAccountPDA(
+    lavarageProgram,
+    offer,
+    randomSeed.publicKey
+  );
+  const fromTokenAccount = yield getTokenAccountOrCreateIfNotExists(
+    lavarageProgram,
+    lavarageProgram.provider.publicKey,
+    offer.account.collateralType,
+    tokenProgram
+  );
+  const toTokenAccount = yield getTokenAccountOrCreateIfNotExists(
+    lavarageProgram,
+    positionAccount,
+    offer.account.collateralType,
+    tokenProgram
+  );
+  const { blockhash } = yield lavarageProgram.provider.connection.getLatestBlockhash("finalized");
+  const useReferral = discountBps !== void 0 && referralBps !== void 0;
+  let partnerFeeRecipientCreateIx;
+  let userVaultPda;
+  if (partnerFeeRecipient && referralBps !== void 0 && referralVaultProgram) {
+    [userVaultPda] = PublicKey2.findProgramAddressSync(
+      [Buffer.from("user_vault"), new PublicKey2(partnerFeeRecipient).toBuffer()],
+      referralVaultProgram.programId
+    );
+    const vaultAccountInfo = yield lavarageProgram.provider.connection.getAccountInfo(userVaultPda);
+    if (!vaultAccountInfo) {
+      partnerFeeRecipientCreateIx = yield referralVaultProgram.methods.initializeVault().accountsStrict({
+        userVault: userVaultPda,
+        user: lavarageProgram.provider.publicKey,
+        systemProgram: SystemProgram2.programId
+      }).instruction();
+    }
+  }
+  const tradingOpenBorrowInstruction = useReferral ? yield lavarageProgram.methods.tradingOpenBorrowWithReferral(
+    new BN2((marginSOL.toNumber() * leverage).toFixed(0)),
+    marginSOL,
+    new BN2(discountBps),
+    new BN2(referralBps)
+  ).accountsStrict({
+    nodeWallet: offer.account.nodeWallet,
+    instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
+    tradingPool: offer.publicKey,
+    positionAccount,
+    trader: lavarageProgram.provider.publicKey,
+    systemProgram: SystemProgram2.programId,
+    clock: SYSVAR_CLOCK_PUBKEY,
+    randomAccountAsId: randomSeed.publicKey.toBase58(),
+    feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"
+  }).remainingAccounts(
+    partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda ? [
+      {
+        pubkey: userVaultPda,
+        isSigner: false,
+        isWritable: true
+      }
+    ] : []
+  ).instruction() : yield lavarageProgram.methods.tradingOpenBorrow(
+    new BN2((marginSOL.toNumber() * leverage).toFixed(0)),
+    marginSOL
+  ).accountsStrict({
+    nodeWallet: offer.account.nodeWallet,
+    instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
+    tradingPool: offer.publicKey,
+    positionAccount,
+    trader: lavarageProgram.provider.publicKey,
+    systemProgram: SystemProgram2.programId,
+    clock: SYSVAR_CLOCK_PUBKEY,
+    randomAccountAsId: randomSeed.publicKey.toBase58(),
+    feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"
+  }).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,
+    trader: lavarageProgram.provider.publicKey,
+    mint: offer.account.collateralType,
+    toTokenAccount: toTokenAccount.account.address,
+    systemProgram: SystemProgram2.programId,
+    positionAccount,
+    randomAccountAsId: randomSeed.publicKey.toBase58()
+  }).instruction();
+  const computeFeeIx = ComputeBudgetProgram2.setComputeUnitPrice({
+    microLamports: computeBudgetMicroLamports != null ? computeBudgetMicroLamports : 1e5
+  });
+  const allInstructions = [
+    fromTokenAccount.instruction,
+    toTokenAccount.instruction,
+    partnerFeeRecipientCreateIx,
+    tradingOpenBorrowInstruction,
+    openAddCollateralInstruction,
+    computeBudgetMicroLamports ? computeFeeIx : void 0
+  ].filter(Boolean);
+  const messageV0 = new TransactionMessage2({
+    payerKey: lavarageProgram.provider.publicKey,
+    recentBlockhash: blockhash,
+    instructions: allInstructions
+  }).compileToV0Message();
+  const tx = new VersionedTransaction2(messageV0);
+  return tx;
+});
+var borrowV2 = (lavarageProgram, offer, marginSOL, leverage, randomSeed, quoteToken, tokenProgram, partnerFeeRecipient, partnerFeeMarkup, computeBudgetMicroLamports, discountBps, referralBps, referralVaultProgram) => __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 PublicKey2(feeBuffer32);
+  }
+  const positionAccount = getPositionAccountPDA(
+    lavarageProgram,
+    offer,
+    randomSeed.publicKey
+  );
+  const quoteMintAccount = yield lavarageProgram.provider.connection.getAccountInfo(quoteToken);
+  const quoteTokenProgram = quoteMintAccount == null ? void 0 : quoteMintAccount.owner;
+  const fromTokenAccount = yield getTokenAccountOrCreateIfNotExists(
+    lavarageProgram,
+    lavarageProgram.provider.publicKey,
+    offer.account.collateralType,
+    tokenProgram
+  );
+  const toTokenAccount = yield getTokenAccountOrCreateIfNotExists(
+    lavarageProgram,
+    positionAccount,
+    offer.account.collateralType,
+    tokenProgram
+  );
+  const { blockhash } = yield lavarageProgram.provider.connection.getLatestBlockhash("finalized");
+  const useReferral = discountBps !== void 0 && referralBps !== void 0;
+  let partnerFeeRecipientVaultCreateIx;
+  let partnerFeeRecipientTokenAccountCreateIx;
+  let userVaultPda;
+  if (partnerFeeRecipient && partnerFeeMarkupAsPkey && referralVaultProgram) {
+    [userVaultPda] = PublicKey2.findProgramAddressSync(
+      [Buffer.from("user_vault"), new PublicKey2(partnerFeeRecipient).toBuffer()],
+      referralVaultProgram.programId
+    );
+    const vaultTokenAccount = getAssociatedTokenAddressSync2(
+      quoteToken,
+      userVaultPda,
+      true,
+      // allowOwnerOffCurve for PDA
+      quoteTokenProgram
+    );
+    const [vaultAccountInfo, vaultTokenAccountInfo] = yield lavarageProgram.provider.connection.getMultipleAccountsInfo([
+      userVaultPda,
+      vaultTokenAccount
+    ]);
+    if (!vaultAccountInfo) {
+      partnerFeeRecipientVaultCreateIx = yield referralVaultProgram.methods.initializeVault().accountsStrict({
+        userVault: userVaultPda,
+        user: lavarageProgram.provider.publicKey,
+        systemProgram: SystemProgram2.programId
+      }).instruction();
+    }
+    if (!vaultTokenAccountInfo) {
+      partnerFeeRecipientTokenAccountCreateIx = createAssociatedTokenAccountIdempotentInstruction2(
+        lavarageProgram.provider.publicKey,
+        vaultTokenAccount,
+        userVaultPda,
+        quoteToken,
+        quoteTokenProgram,
+        ASSOCIATED_TOKEN_PROGRAM_ID
+      );
+    }
+  }
+  const tradingOpenBorrowInstruction = useReferral ? yield lavarageProgram.methods.tradingOpenBorrowWithReferral(
+    new BN2((marginSOL.toNumber() * leverage).toFixed(0)),
+    marginSOL,
+    new BN2(discountBps),
+    new BN2(referralBps)
+  ).accountsStrict({
+    nodeWallet: offer.account.nodeWallet,
+    instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
+    tradingPool: offer.publicKey,
+    positionAccount,
+    trader: lavarageProgram.provider.publicKey,
+    systemProgram: SystemProgram2.programId,
+    clock: SYSVAR_CLOCK_PUBKEY,
+    randomAccountAsId: randomSeed.publicKey.toBase58(),
+    feeTokenAccount: getAssociatedTokenAddressSync2(
+      quoteToken,
+      new PublicKey2("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"),
+      true,
+      quoteTokenProgram
+    ),
+    toTokenAccount: getAssociatedTokenAddressSync2(
+      quoteToken,
+      lavarageProgram.provider.publicKey,
+      true,
+      quoteTokenProgram
+    ),
+    tokenProgram: quoteTokenProgram,
+    fromTokenAccount: getAssociatedTokenAddressSync2(
+      quoteToken,
+      offer.account.nodeWallet,
+      true,
+      quoteTokenProgram
+    )
+  }).remainingAccounts(
+    partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda ? [
+      {
+        pubkey: getAssociatedTokenAddressSync2(
+          quoteToken,
+          userVaultPda,
+          true,
+          // allowOwnerOffCurve for PDA
+          quoteTokenProgram
+        ),
+        isSigner: false,
+        isWritable: true
+      }
+    ] : []
+  ).instruction() : yield lavarageProgram.methods.tradingOpenBorrow(
+    new BN2((marginSOL.toNumber() * leverage).toFixed(0)),
+    marginSOL
+  ).accountsStrict({
+    nodeWallet: offer.account.nodeWallet,
+    instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
+    tradingPool: offer.publicKey,
+    positionAccount,
+    trader: lavarageProgram.provider.publicKey,
+    systemProgram: SystemProgram2.programId,
+    clock: SYSVAR_CLOCK_PUBKEY,
+    randomAccountAsId: randomSeed.publicKey.toBase58(),
+    feeTokenAccount: getAssociatedTokenAddressSync2(
+      quoteToken,
+      new PublicKey2("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"),
+      true,
+      quoteTokenProgram
+    ),
+    toTokenAccount: getAssociatedTokenAddressSync2(
+      quoteToken,
+      lavarageProgram.provider.publicKey,
+      true,
+      quoteTokenProgram
+    ),
+    tokenProgram: quoteTokenProgram,
+    fromTokenAccount: getAssociatedTokenAddressSync2(
+      quoteToken,
+      offer.account.nodeWallet,
+      true,
+      quoteTokenProgram
+    )
+  }).remainingAccounts(
+    partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda ? [
+      {
+        pubkey: getAssociatedTokenAddressSync2(
+          quoteToken,
+          userVaultPda,
+          true,
+          // allowOwnerOffCurve for PDA
+          quoteTokenProgram
+        ),
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: partnerFeeMarkupAsPkey,
+        isSigner: false,
+        isWritable: false
+      }
+    ] : []
+  ).instruction();
+  const openAddCollateralInstruction = yield lavarageProgram.methods.tradingOpenAddCollateral(offer.account.interestRate < 255 ? offer.account.interestRate + 1 : 255).accountsStrict({
+    tradingPool: offer.publicKey,
+    trader: lavarageProgram.provider.publicKey,
+    mint: offer.account.collateralType,
+    toTokenAccount: toTokenAccount.account.address,
+    systemProgram: SystemProgram2.programId,
+    positionAccount,
+    randomAccountAsId: randomSeed.publicKey.toBase58()
+  }).instruction();
+  const computeFeeIx = ComputeBudgetProgram2.setComputeUnitPrice({
+    microLamports: computeBudgetMicroLamports != null ? computeBudgetMicroLamports : 1e5
+  });
+  const allInstructions = [
+    fromTokenAccount.instruction,
+    toTokenAccount.instruction,
+    partnerFeeRecipientVaultCreateIx,
+    partnerFeeRecipientTokenAccountCreateIx,
+    tradingOpenBorrowInstruction,
+    openAddCollateralInstruction,
+    computeBudgetMicroLamports ? computeFeeIx : void 0
+  ].filter(Boolean);
+  const messageV0 = new TransactionMessage2({
+    payerKey: lavarageProgram.provider.publicKey,
+    recentBlockhash: blockhash,
+    instructions: allInstructions
+  }).compileToV0Message();
+  const tx = new VersionedTransaction2(messageV0);
+  return tx;
+});
 var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, tokenProgram, partnerFeeRecipient, partnerFeeMarkup, computeBudgetMicroLamports, platformFeeRecipient, splitTransactions, discountBps, referralBps) => __async(void 0, null, function* () {
   let partnerFeeMarkupAsPkey;
+  const referralVaultProgram = new Program2(IDL, REFFERAL_VAULT_PROGRAM_ID, lavarageProgram.provider);
   if (partnerFeeMarkup) {
     const feeBuffer = Buffer.alloc(8);
     feeBuffer.writeBigUInt64LE(BigInt(partnerFeeMarkup));
@@ -5048,14 +5502,19 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
   const { blockhash } = yield lavarageProgram.provider.connection.getLatestBlockhash("finalized");
   const useReferral = discountBps !== void 0 && referralBps !== void 0;
   let partnerFeeRecipientCreateIx;
-  if (partnerFeeRecipient && partnerFeeMarkupAsPkey) {
-    const partnerAccountInfo = yield lavarageProgram.provider.connection.getAccountInfo(partnerFeeRecipient);
-    if (!partnerAccountInfo) {
-      partnerFeeRecipientCreateIx = SystemProgram2.transfer({
-        fromPubkey: lavarageProgram.provider.publicKey,
-        toPubkey: partnerFeeRecipient,
-        lamports: 890880
-      });
+  let userVaultPda;
+  if (partnerFeeRecipient && referralBps !== void 0 && referralVaultProgram) {
+    [userVaultPda] = PublicKey2.findProgramAddressSync(
+      [Buffer.from("user_vault"), new PublicKey2(partnerFeeRecipient).toBuffer()],
+      referralVaultProgram.programId
+    );
+    const vaultAccountInfo = yield lavarageProgram.provider.connection.getAccountInfo(userVaultPda);
+    if (!vaultAccountInfo) {
+      partnerFeeRecipientCreateIx = yield referralVaultProgram.methods.initializeVault().accountsStrict({
+        userVault: userVaultPda,
+        user: lavarageProgram.provider.publicKey,
+        systemProgram: SystemProgram2.programId
+      }).instruction();
     }
   }
   const tradingOpenBorrowInstruction = useReferral ? yield lavarageProgram.methods.tradingOpenBorrowWithReferral(
@@ -5074,9 +5533,9 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     randomAccountAsId: randomSeed.publicKey.toBase58(),
     feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"
   }).remainingAccounts(
-    partnerFeeRecipient && partnerFeeMarkupAsPkey ? [
+    partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda ? [
       {
-        pubkey: partnerFeeRecipient,
+        pubkey: userVaultPda,
         isSigner: false,
         isWritable: true
       }
@@ -5171,6 +5630,7 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
 });
 var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, quoteToken, tokenProgram, partnerFeeRecipient, partnerFeeMarkup, computeBudgetMicroLamports, platformFeeRecipient, splitTransactions, discountBps, referralBps) => __async(void 0, null, function* () {
   let partnerFeeMarkupAsPkey;
+  const referralVaultProgram = new Program2(IDL, REFFERAL_VAULT_PROGRAM_ID, lavarageProgram.provider);
   if (partnerFeeMarkup) {
     const feeBuffer = Buffer.alloc(8);
     feeBuffer.writeBigUInt64LE(BigInt(partnerFeeMarkup));
@@ -5258,20 +5718,37 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
   );
   const { blockhash } = yield lavarageProgram.provider.connection.getLatestBlockhash("finalized");
   const useReferral = discountBps !== void 0 && referralBps !== void 0;
+  let partnerFeeRecipientVaultCreateIx;
   let partnerFeeRecipientTokenAccountCreateIx;
-  if (partnerFeeRecipient && partnerFeeMarkupAsPkey) {
-    const partnerTokenAccount = getAssociatedTokenAddressSync2(
+  let userVaultPda;
+  if (partnerFeeRecipient && partnerFeeMarkupAsPkey && referralVaultProgram) {
+    [userVaultPda] = PublicKey2.findProgramAddressSync(
+      [Buffer.from("user_vault"), new PublicKey2(partnerFeeRecipient).toBuffer()],
+      referralVaultProgram.programId
+    );
+    const vaultTokenAccount = getAssociatedTokenAddressSync2(
       quoteToken,
-      partnerFeeRecipient,
-      false,
+      userVaultPda,
+      true,
+      // allowOwnerOffCurve for PDA
       quoteTokenProgram
     );
-    const partnerTokenAccountInfo = yield lavarageProgram.provider.connection.getAccountInfo(partnerTokenAccount);
-    if (!partnerTokenAccountInfo) {
+    const [vaultAccountInfo, vaultTokenAccountInfo] = yield lavarageProgram.provider.connection.getMultipleAccountsInfo([
+      userVaultPda,
+      vaultTokenAccount
+    ]);
+    if (!vaultAccountInfo) {
+      partnerFeeRecipientVaultCreateIx = yield referralVaultProgram.methods.initializeVault().accountsStrict({
+        userVault: userVaultPda,
+        user: lavarageProgram.provider.publicKey,
+        systemProgram: SystemProgram2.programId
+      }).instruction();
+    }
+    if (!vaultTokenAccountInfo) {
       partnerFeeRecipientTokenAccountCreateIx = createAssociatedTokenAccountIdempotentInstruction2(
         lavarageProgram.provider.publicKey,
-        partnerTokenAccount,
-        partnerFeeRecipient,
+        vaultTokenAccount,
+        userVaultPda,
         quoteToken,
         quoteTokenProgram,
         ASSOCIATED_TOKEN_PROGRAM_ID
@@ -5312,12 +5789,13 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
       quoteTokenProgram
     )
   }).remainingAccounts(
-    partnerFeeRecipient && partnerFeeMarkupAsPkey ? [
+    partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda ? [
       {
         pubkey: getAssociatedTokenAddressSync2(
           quoteToken,
-          partnerFeeRecipient,
-          false,
+          userVaultPda,
+          true,
+          // allowOwnerOffCurve for PDA
           quoteTokenProgram
         ),
         isSigner: false,
@@ -5356,12 +5834,13 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
       quoteTokenProgram
     )
   }).remainingAccounts(
-    partnerFeeRecipient && partnerFeeMarkupAsPkey ? [
+    partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda ? [
       {
         pubkey: getAssociatedTokenAddressSync2(
           quoteToken,
-          partnerFeeRecipient,
-          false,
+          userVaultPda,
+          true,
+          // allowOwnerOffCurve for PDA
           quoteTokenProgram
         ),
         isSigner: false,
@@ -5394,6 +5873,7 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     const setUpInstructions = [
       fromTokenAccount.instruction,
       toTokenAccount.instruction,
+      partnerFeeRecipientVaultCreateIx,
       partnerFeeRecipientTokenAccountCreateIx,
       ...setupInstructions.map(deserializeInstruction)
     ].filter(Boolean);
@@ -5421,6 +5901,7 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
   const allInstructions = [
     fromTokenAccount.instruction,
     toTokenAccount.instruction,
+    partnerFeeRecipientVaultCreateIx,
     partnerFeeRecipientTokenAccountCreateIx,
     tradingOpenBorrowInstruction,
     ...jupiterIxs,
@@ -6264,8 +6745,10 @@ var mergePositionV2 = (lavarageProgram, position1, position2, offer, quoteToken,
   return tx;
 });
 export {
-  IDL,
+  IDL2 as IDL,
   lavaragev2_exports as IDLV2,
+  borrowV1,
+  borrowV2,
   closePositionEvm,
   closeTradeV1,
   closeTradeV2,