@lavarage/sdk 7.5.7 → 7.5.9

package/dist/index.mjs

@@ -2394,6 +2394,69 @@ var IDL2 = {
         }
       ]
     },
+    {
+      "name": "tradingCloseRepaySolWithReferral",
+      "accounts": [
+        {
+          "name": "positionAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "trader",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "tradingPool",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "nodeWallet",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "clock",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "randomAccountAsId",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "feeReceipient",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "closingPositionSize",
+          "type": "u64"
+        },
+        {
+          "name": "closeType",
+          "type": "u64"
+        },
+        {
+          "name": "discountBps",
+          "type": "u64"
+        },
+        {
+          "name": "referralBps",
+          "type": "u64"
+        }
+      ]
+    },
     {
       "name": "tradingClosePartialRepaySol",
       "accounts": [
@@ -4077,6 +4140,89 @@ var IDL3 = {
         }
       ]
     },
+    {
+      "name": "tradingCloseRepaySolWithReferral",
+      "accounts": [
+        {
+          "name": "positionAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "trader",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "tradingPool",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "nodeWallet",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "clock",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "randomAccountAsId",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "mint",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "fromTokenAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "toTokenAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "feeTokenAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "closingPositionSize",
+          "type": "u64"
+        },
+        {
+          "name": "closeType",
+          "type": "u64"
+        },
+        {
+          "name": "discountBps",
+          "type": "u64"
+        },
+        {
+          "name": "referralBps",
+          "type": "u64"
+        }
+      ]
+    },
     {
       "name": "tradingPartialRepaySol",
       "accounts": [
@@ -6104,9 +6250,10 @@ var partialRepayV2 = (lavarageProgram, position, repaymentBps) => __async(void 0
   }).compileToV0Message();
   return new VersionedTransaction2(messageV0);
 });
-var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFeeRecipient, partnerFeeMarkup, computeBudgetMicroLamports, platformFeeRecipient, splitTransactions) => __async(void 0, null, function* () {
+var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFeeRecipient, partnerFeeMarkup, computeBudgetMicroLamports, platformFeeRecipient, splitTransactions, discountBps, referralBps) => __async(void 0, null, function* () {
   var _a, _b;
   let partnerFeeMarkupAsPkey;
+  const referralVaultProgram = new Program2(IDL, REFFERAL_VAULT_PROGRAM_ID, lavarageProgram.provider);
   if (partnerFeeMarkup) {
     const feeBuffer = Buffer.alloc(8);
     feeBuffer.writeBigUInt64LE(BigInt(partnerFeeMarkup));
@@ -6174,6 +6321,24 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
   });
   const addressLookupTableAccounts = [];
   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: partnerFeeRecipient,
+        funder: lavarageProgram.provider.publicKey,
+        systemProgram: SystemProgram2.programId
+      }).instruction();
+    }
+  }
   const closePositionIx = yield lavarageProgram.methods.tradingCloseBorrowCollateral().accountsStrict({
     tradingPool: poolPubKey,
     instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -6190,7 +6355,29 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
   let repaySolIx = null;
   let jupiterIxs = [];
   if (jupInstruction.instructions == void 0) {
-    repaySolIx = yield lavarageProgram.methods.tradingCloseRepaySol(
+    repaySolIx = useReferral ? yield lavarageProgram.methods.tradingCloseRepaySolWithReferral(
+      new BN2(jupInstruction.quoteResponse.outAmount),
+      new BN2(9997),
+      new BN2(discountBps),
+      new BN2(referralBps)
+    ).accountsStrict({
+      nodeWallet: pool.account.nodeWallet,
+      positionAccount: positionAccountPDA,
+      tradingPool: poolPubKey,
+      trader: lavarageProgram.provider.publicKey,
+      systemProgram: SystemProgram2.programId,
+      clock: SYSVAR_CLOCK_PUBKEY,
+      randomAccountAsId: position.account.seed,
+      feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"
+    }).remainingAccounts(
+      partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda ? [
+        {
+          pubkey: userVaultPda,
+          isSigner: false,
+          isWritable: true
+        }
+      ] : []
+    ).instruction() : yield lavarageProgram.methods.tradingCloseRepaySol(
       new BN2(jupInstruction.quoteResponse.outAmount),
       new BN2(9997)
     ).accountsStrict({
@@ -6217,7 +6404,29 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
       ] : []
     ).instruction();
   } else {
-    repaySolIx = yield lavarageProgram.methods.tradingCloseRepaySol(
+    repaySolIx = useReferral ? yield lavarageProgram.methods.tradingCloseRepaySolWithReferral(
+      new BN2(jupInstruction.quoteResponse.outAmount),
+      new BN2(9998),
+      new BN2(discountBps),
+      new BN2(referralBps)
+    ).accountsStrict({
+      nodeWallet: pool.account.nodeWallet,
+      positionAccount: positionAccountPDA,
+      tradingPool: poolPubKey,
+      trader: lavarageProgram.provider.publicKey,
+      systemProgram: SystemProgram2.programId,
+      clock: SYSVAR_CLOCK_PUBKEY,
+      randomAccountAsId: position.account.seed,
+      feeReceipient: "6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"
+    }).remainingAccounts(
+      partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda ? [
+        {
+          pubkey: userVaultPda,
+          isSigner: false,
+          isWritable: true
+        }
+      ] : []
+    ).instruction() : yield lavarageProgram.methods.tradingCloseRepaySol(
       new BN2(jupInstruction.quoteResponse.outAmount),
       new BN2(9998)
     ).accountsStrict({
@@ -6274,6 +6483,7 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
   });
   if (splitTransactions) {
     const setUpInstructions = [
+      partnerFeeRecipientCreateIx,
       jupInstruction.instructions && (platformFeeRecipientAccount == null ? void 0 : platformFeeRecipientAccount.instruction) ? platformFeeRecipientAccount.instruction : null,
       createAssociatedTokenAccountInstruction2
     ].filter((i) => !!i);
@@ -6301,6 +6511,7 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
     return [tx2, tx22];
   }
   const allInstructions = [
+    partnerFeeRecipientCreateIx,
     jupInstruction.instructions && (platformFeeRecipientAccount == null ? void 0 : platformFeeRecipientAccount.instruction) ? platformFeeRecipientAccount.instruction : null,
     createAssociatedTokenAccountInstruction2,
     ((_b = jupInstruction.instructions) == null ? void 0 : _b.tokenLedgerInstruction) ? deserializeInstruction(
@@ -6319,9 +6530,10 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
   const tx = new VersionedTransaction2(messageV0);
   return tx;
 });
-var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken, partnerFeeRecipient, partnerFeeMarkup, computeBudgetMicroLamports, platformFeeRecipient, splitTransactions) => __async(void 0, null, function* () {
+var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken, partnerFeeRecipient, partnerFeeMarkup, computeBudgetMicroLamports, platformFeeRecipient, splitTransactions, discountBps, referralBps) => __async(void 0, null, function* () {
   var _a, _b;
   let partnerFeeMarkupAsPkey;
+  const referralVaultProgram = new Program2(IDL, REFFERAL_VAULT_PROGRAM_ID, lavarageProgram.provider);
   if (partnerFeeMarkup) {
     const feeBuffer = Buffer.alloc(8);
     feeBuffer.writeBigUInt64LE(BigInt(partnerFeeMarkup));
@@ -6391,6 +6603,45 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
   });
   const addressLookupTableAccounts = [];
   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: partnerFeeRecipient,
+        funder: lavarageProgram.provider.publicKey,
+        systemProgram: SystemProgram2.programId
+      }).instruction();
+    }
+    if (!vaultTokenAccountInfo) {
+      partnerFeeRecipientTokenAccountCreateIx = createAssociatedTokenAccountIdempotentInstruction2(
+        lavarageProgram.provider.publicKey,
+        vaultTokenAccount,
+        userVaultPda,
+        quoteToken,
+        quoteTokenProgram,
+        ASSOCIATED_TOKEN_PROGRAM_ID
+      );
+    }
+  }
   const closePositionIx = yield lavarageProgram.methods.tradingCloseBorrowCollateral().accountsStrict({
     tradingPool: poolPubKey,
     instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -6407,7 +6658,54 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
   let repaySolIx = null;
   let jupiterIxs = [];
   if (jupInstruction.instructions == void 0) {
-    repaySolIx = yield lavarageProgram.methods.tradingCloseRepaySol(
+    repaySolIx = useReferral ? yield lavarageProgram.methods.tradingCloseRepaySolWithReferral(
+      new BN2(jupInstruction.quoteResponse.outAmount),
+      new BN2(9997),
+      new BN2(discountBps),
+      new BN2(referralBps)
+    ).accountsStrict({
+      nodeWallet: pool.account.nodeWallet,
+      positionAccount: positionAccountPDA,
+      tradingPool: poolPubKey,
+      trader: lavarageProgram.provider.publicKey,
+      systemProgram: SystemProgram2.programId,
+      clock: SYSVAR_CLOCK_PUBKEY,
+      randomAccountAsId: position.account.seed,
+      feeTokenAccount: getAssociatedTokenAddressSync2(
+        quoteToken,
+        new PublicKey2("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"),
+        false,
+        quoteTokenProgram
+      ),
+      fromTokenAccount: getAssociatedTokenAddressSync2(
+        quoteToken,
+        lavarageProgram.provider.publicKey,
+        false,
+        quoteTokenProgram
+      ),
+      tokenProgram: quoteTokenProgram,
+      toTokenAccount: getAssociatedTokenAddressSync2(
+        quoteToken,
+        pool.account.nodeWallet,
+        true,
+        quoteTokenProgram
+      ),
+      mint: quoteToken
+    }).remainingAccounts(
+      partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda ? [
+        {
+          pubkey: getAssociatedTokenAddressSync2(
+            quoteToken,
+            userVaultPda,
+            true,
+            // allowOwnerOffCurve for PDA
+            quoteTokenProgram
+          ),
+          isSigner: false,
+          isWritable: true
+        }
+      ] : []
+    ).instruction() : yield lavarageProgram.methods.tradingCloseRepaySol(
       new BN2(jupInstruction.quoteResponse.outAmount),
       new BN2(9997)
     ).accountsStrict({
@@ -6458,7 +6756,54 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
       ] : []
     ).instruction();
   } else {
-    repaySolIx = yield lavarageProgram.methods.tradingCloseRepaySol(
+    repaySolIx = useReferral ? yield lavarageProgram.methods.tradingCloseRepaySolWithReferral(
+      new BN2(jupInstruction.quoteResponse.outAmount),
+      new BN2(9998),
+      new BN2(discountBps),
+      new BN2(referralBps)
+    ).accountsStrict({
+      nodeWallet: pool.account.nodeWallet,
+      positionAccount: positionAccountPDA,
+      tradingPool: poolPubKey,
+      trader: lavarageProgram.provider.publicKey,
+      systemProgram: SystemProgram2.programId,
+      clock: SYSVAR_CLOCK_PUBKEY,
+      randomAccountAsId: position.account.seed,
+      feeTokenAccount: getAssociatedTokenAddressSync2(
+        quoteToken,
+        new PublicKey2("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"),
+        false,
+        quoteTokenProgram
+      ),
+      fromTokenAccount: getAssociatedTokenAddressSync2(
+        quoteToken,
+        lavarageProgram.provider.publicKey,
+        false,
+        quoteTokenProgram
+      ),
+      tokenProgram: quoteTokenProgram,
+      toTokenAccount: getAssociatedTokenAddressSync2(
+        quoteToken,
+        pool.account.nodeWallet,
+        true,
+        quoteTokenProgram
+      ),
+      mint: quoteToken
+    }).remainingAccounts(
+      partnerFeeRecipient && partnerFeeMarkupAsPkey && userVaultPda ? [
+        {
+          pubkey: getAssociatedTokenAddressSync2(
+            quoteToken,
+            userVaultPda,
+            true,
+            // allowOwnerOffCurve for PDA
+            quoteTokenProgram
+          ),
+          isSigner: false,
+          isWritable: true
+        }
+      ] : []
+    ).instruction() : yield lavarageProgram.methods.tradingCloseRepaySol(
       new BN2(jupInstruction.quoteResponse.outAmount),
       new BN2(9998)
     ).accountsStrict({
@@ -6540,6 +6885,8 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
   });
   if (splitTransactions) {
     const setUpInstructions = [
+      partnerFeeRecipientVaultCreateIx,
+      partnerFeeRecipientTokenAccountCreateIx,
       jupInstruction.instructions && (platformFeeRecipientAccount == null ? void 0 : platformFeeRecipientAccount.instruction) ? platformFeeRecipientAccount.instruction : null,
       createAssociatedTokenAccountInstruction2
     ].filter((i) => !!i);
@@ -6567,6 +6914,8 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
     return [tx2, tx22];
   }
   const allInstructions = [
+    partnerFeeRecipientVaultCreateIx,
+    partnerFeeRecipientTokenAccountCreateIx,
     jupInstruction.instructions && (platformFeeRecipientAccount == null ? void 0 : platformFeeRecipientAccount.instruction) ? platformFeeRecipientAccount.instruction : null,
     createAssociatedTokenAccountInstruction2,
     ((_b = jupInstruction.instructions) == null ? void 0 : _b.tokenLedgerInstruction) ? deserializeInstruction(