@lavarage/sdk 6.5.0 → 6.7.0

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { Program, ProgramAccount, BN } from '@coral-xyz/anchor';
 import { PublicKey, Keypair, VersionedTransaction } from '@solana/web3.js';
-import { Signer, BigNumberish, ContractTransaction, Provider } from 'ethers';
+import { Provider, BigNumberish, ContractTransaction } from 'ethers';
 
 type Lavarage$1 = {
     "version": "0.1.0";
@@ -2675,13 +2675,13 @@ interface LiquidationEvent {
 }
 
 /**
- * Opens a trading position on EVM chain
- * @param signer - Ethers signer
+ * Creates an unsigned transaction to open a trading position on EVM chain
+ * @param provider - Ethers provider
  * @param borrowerOpsContractAddress - BorrowerOperations contract address
  * @param params - Trading parameters
- * @returns Transaction object
+ * @returns Unsigned transaction object
  */
-declare const openPositionEvm: (signer: Signer, borrowerOpsContractAddress: string, { buyingCode, tokenCollateral, borrowAmount, tokenHolder, inchRouter, integratorFeeAddress, buyerContribution, }: {
+declare const openPositionEvm: (provider: Provider, borrowerOpsContractAddress: string, { buyingCode, tokenCollateral, borrowAmount, tokenHolder, inchRouter, integratorFeeAddress, buyerContribution, gasLimit, gasPrice, }: {
     buyingCode: string;
     tokenCollateral: string;
     borrowAmount: BigNumberish;
@@ -2689,20 +2689,24 @@ declare const openPositionEvm: (signer: Signer, borrowerOpsContractAddress: stri
     inchRouter: string;
     integratorFeeAddress?: string;
     buyerContribution: BigNumberish;
+    gasLimit?: string | number;
+    gasPrice?: string | number;
 }) => Promise<ContractTransaction>;
 /**
- * Closes a trading position on EVM chain
- * @param signer - Ethers signer
+ * Creates an unsigned transaction to close a trading position on EVM chain
+ * @param provider - Ethers provider
  * @param borrowerOpsContractAddress - BorrowerOperations contract address
  * @param params - Trading parameters
- * @returns Transaction object
+ * @returns Unsigned transaction object
  */
-declare const closePositionEvm: (signer: Signer, borrowerOpsContractAddress: string, { loanId, sellingCode, tokenHolder, inchRouter, integratorFeeAddress, }: {
+declare const closePositionEvm: (provider: Provider, borrowerOpsContractAddress: string, { loanId, sellingCode, tokenHolder, inchRouter, integratorFeeAddress, gasLimit, gasPrice, }: {
     loanId: BigNumberish;
     sellingCode: string;
     tokenHolder: string;
     inchRouter: string;
     integratorFeeAddress?: string;
+    gasLimit?: string | number;
+    gasPrice?: string | number;
 }) => Promise<ContractTransaction>;
 /**
  * Get all positions from events
@@ -2841,7 +2845,7 @@ declare const openTradeV1: (lavarageProgram: Program<Lavarage$1>, offer: Program
         swapInstruction: Record<string, unknown>;
         addressLookupTableAddresses: string[];
     };
-}, marginSOL: BN, leverage: number, randomSeed: Keypair, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number) => Promise<VersionedTransaction>;
+}, marginSOL: BN, leverage: number, randomSeed: Keypair, tokenProgram: PublicKey, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number) => Promise<VersionedTransaction>;
 declare const openTradeV2: (lavarageProgram: Program<Lavarage>, offer: ProgramAccount<{
     nodeWallet: PublicKey;
     interestRate: number;
@@ -2852,7 +2856,7 @@ declare const openTradeV2: (lavarageProgram: Program<Lavarage>, offer: ProgramAc
         swapInstruction: Record<string, unknown>;
         addressLookupTableAddresses: string[];
     };
-}, marginSOL: BN, leverage: number, randomSeed: Keypair, quoteToken: PublicKey, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number) => Promise<VersionedTransaction>;
+}, marginSOL: BN, leverage: number, randomSeed: Keypair, quoteToken: PublicKey, tokenProgram: PublicKey, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number) => Promise<VersionedTransaction>;
 declare const createTpDelegate: (lavarageProgram: Program<Lavarage$1> | Program<Lavarage>, position: ProgramAccount<{
     pool: PublicKey;
     seed: PublicKey;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Program, ProgramAccount, BN } from '@coral-xyz/anchor';
 import { PublicKey, Keypair, VersionedTransaction } from '@solana/web3.js';
-import { Signer, BigNumberish, ContractTransaction, Provider } from 'ethers';
+import { Provider, BigNumberish, ContractTransaction } from 'ethers';
 
 type Lavarage$1 = {
     "version": "0.1.0";
@@ -2675,13 +2675,13 @@ interface LiquidationEvent {
 }
 
 /**
- * Opens a trading position on EVM chain
- * @param signer - Ethers signer
+ * Creates an unsigned transaction to open a trading position on EVM chain
+ * @param provider - Ethers provider
  * @param borrowerOpsContractAddress - BorrowerOperations contract address
  * @param params - Trading parameters
- * @returns Transaction object
+ * @returns Unsigned transaction object
  */
-declare const openPositionEvm: (signer: Signer, borrowerOpsContractAddress: string, { buyingCode, tokenCollateral, borrowAmount, tokenHolder, inchRouter, integratorFeeAddress, buyerContribution, }: {
+declare const openPositionEvm: (provider: Provider, borrowerOpsContractAddress: string, { buyingCode, tokenCollateral, borrowAmount, tokenHolder, inchRouter, integratorFeeAddress, buyerContribution, gasLimit, gasPrice, }: {
     buyingCode: string;
     tokenCollateral: string;
     borrowAmount: BigNumberish;
@@ -2689,20 +2689,24 @@ declare const openPositionEvm: (signer: Signer, borrowerOpsContractAddress: stri
     inchRouter: string;
     integratorFeeAddress?: string;
     buyerContribution: BigNumberish;
+    gasLimit?: string | number;
+    gasPrice?: string | number;
 }) => Promise<ContractTransaction>;
 /**
- * Closes a trading position on EVM chain
- * @param signer - Ethers signer
+ * Creates an unsigned transaction to close a trading position on EVM chain
+ * @param provider - Ethers provider
  * @param borrowerOpsContractAddress - BorrowerOperations contract address
  * @param params - Trading parameters
- * @returns Transaction object
+ * @returns Unsigned transaction object
  */
-declare const closePositionEvm: (signer: Signer, borrowerOpsContractAddress: string, { loanId, sellingCode, tokenHolder, inchRouter, integratorFeeAddress, }: {
+declare const closePositionEvm: (provider: Provider, borrowerOpsContractAddress: string, { loanId, sellingCode, tokenHolder, inchRouter, integratorFeeAddress, gasLimit, gasPrice, }: {
     loanId: BigNumberish;
     sellingCode: string;
     tokenHolder: string;
     inchRouter: string;
     integratorFeeAddress?: string;
+    gasLimit?: string | number;
+    gasPrice?: string | number;
 }) => Promise<ContractTransaction>;
 /**
  * Get all positions from events
@@ -2841,7 +2845,7 @@ declare const openTradeV1: (lavarageProgram: Program<Lavarage$1>, offer: Program
         swapInstruction: Record<string, unknown>;
         addressLookupTableAddresses: string[];
     };
-}, marginSOL: BN, leverage: number, randomSeed: Keypair, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number) => Promise<VersionedTransaction>;
+}, marginSOL: BN, leverage: number, randomSeed: Keypair, tokenProgram: PublicKey, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number) => Promise<VersionedTransaction>;
 declare const openTradeV2: (lavarageProgram: Program<Lavarage>, offer: ProgramAccount<{
     nodeWallet: PublicKey;
     interestRate: number;
@@ -2852,7 +2856,7 @@ declare const openTradeV2: (lavarageProgram: Program<Lavarage>, offer: ProgramAc
         swapInstruction: Record<string, unknown>;
         addressLookupTableAddresses: string[];
     };
-}, marginSOL: BN, leverage: number, randomSeed: Keypair, quoteToken: PublicKey, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number) => Promise<VersionedTransaction>;
+}, marginSOL: BN, leverage: number, randomSeed: Keypair, quoteToken: PublicKey, tokenProgram: PublicKey, partnerFeeRecipient?: PublicKey, partnerFeeMarkup?: number) => Promise<VersionedTransaction>;
 declare const createTpDelegate: (lavarageProgram: Program<Lavarage$1> | Program<Lavarage>, position: ProgramAccount<{
     pool: PublicKey;
     seed: PublicKey;

package/dist/index.js

@@ -3434,51 +3434,64 @@ var tokenHolderAbi = [
 ];
 
 // evm.ts
-var openPositionEvm = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function* (signer, borrowerOpsContractAddress, {
+var openPositionEvm = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function* (provider, borrowerOpsContractAddress, {
   buyingCode,
   tokenCollateral,
   borrowAmount,
   tokenHolder,
   inchRouter,
   integratorFeeAddress = import_ethers.ZeroAddress,
-  buyerContribution
+  buyerContribution,
+  gasLimit,
+  gasPrice
 }) {
   const contract = new import_ethers.Contract(
     borrowerOpsContractAddress,
     borrowerOperationsAbi,
-    signer
+    provider
   );
-  return contract.buy(
+  const txOptions = {
+    value: buyerContribution
+  };
+  if (gasLimit) txOptions.gasLimit = gasLimit;
+  if (gasPrice) txOptions.gasPrice = gasPrice;
+  return contract.buy.populateTransaction(
     buyingCode,
     tokenCollateral,
     borrowAmount,
     tokenHolder,
     inchRouter,
     integratorFeeAddress,
-    { value: buyerContribution }
+    txOptions
   );
 });
-var closePositionEvm = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function* (signer, borrowerOpsContractAddress, {
+var closePositionEvm = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function* (provider, borrowerOpsContractAddress, {
   loanId,
   sellingCode,
   tokenHolder,
   inchRouter,
-  integratorFeeAddress = import_ethers.ZeroAddress
+  integratorFeeAddress = import_ethers.ZeroAddress,
+  gasLimit,
+  gasPrice
 }) {
   const contract = new import_ethers.Contract(
     borrowerOpsContractAddress,
     borrowerOperationsAbi,
-    signer
+    provider
   );
-  return contract.sell(
+  const txOptions = {};
+  if (gasLimit) txOptions.gasLimit = gasLimit;
+  if (gasPrice) txOptions.gasPrice = gasPrice;
+  return contract.sell.populateTransaction(
     loanId,
     sellingCode,
     tokenHolder,
     inchRouter,
-    integratorFeeAddress
+    integratorFeeAddress,
+    Object.keys(txOptions).length > 0 ? txOptions : {}
   );
 });
-function getPositionsEvm(provider, borrowerOpsContractAddress, fromBlock = 0) {
+function getPositionsEvm(provider, borrowerOpsContractAddress, fromBlock = 42960845) {
   return __async(this, null, function* () {
     const contract = new import_ethers.Contract(
       borrowerOpsContractAddress,
@@ -3489,7 +3502,7 @@ function getPositionsEvm(provider, borrowerOpsContractAddress, fromBlock = 0) {
     const events = yield contract.queryFilter(filter, fromBlock);
     return events.map((event) => {
       const {
-        trader,
+        buyer,
         tokenCollateral,
         loanId,
         openingPositionSize,
@@ -3497,17 +3510,18 @@ function getPositionsEvm(provider, borrowerOpsContractAddress, fromBlock = 0) {
         initialMargin
       } = event.args;
       return {
-        trader,
+        trader: buyer,
         tokenCollateral,
         loanId,
         openingPositionSize,
         collateralAmount,
-        initialMargin
+        initialMargin,
+        transactionHash: event.transactionHash
       };
     });
   });
 }
-function getClosedPositionsEvm(provider, borrowerOpsContractAddress, fromBlock = 0) {
+function getClosedPositionsEvm(provider, borrowerOpsContractAddress, fromBlock = 42960845) {
   return __async(this, null, function* () {
     const contract = new import_ethers.Contract(
       borrowerOpsContractAddress,
@@ -3517,18 +3531,19 @@ function getClosedPositionsEvm(provider, borrowerOpsContractAddress, fromBlock =
     const filter = contract.filters.Sell();
     const events = yield contract.queryFilter(filter, fromBlock);
     return events.map((event) => {
-      const { trader, tokenCollateral, loanId, closingPositionSize, profit } = event.args;
+      const { buyer, tokenCollateral, loanId, closingPositionSize, profit } = event.args;
       return {
-        trader,
+        trader: buyer,
         tokenCollateral,
         loanId,
         closingPositionSize,
-        profit
+        profit,
+        transactionHash: event.transactionHash
       };
     });
   });
 }
-function getLiquidatedPositionsEvm(provider, borrowerOpsContractAddress, fromBlock = 0) {
+function getLiquidatedPositionsEvm(provider, borrowerOpsContractAddress, fromBlock = 42960845) {
   return __async(this, null, function* () {
     const contract = new import_ethers.Contract(
       borrowerOpsContractAddress,
@@ -3539,18 +3554,19 @@ function getLiquidatedPositionsEvm(provider, borrowerOpsContractAddress, fromBlo
     const events = yield contract.queryFilter(filter, fromBlock);
     return events.map((event) => {
       const {
-        trader,
+        borrower,
         tokenCollateral,
         loanId,
         closingPositionSize,
         liquidatorRepaidAmount
       } = event.args;
       return {
-        trader,
+        trader: borrower,
         tokenCollateral,
         loanId,
         closingPositionSize,
-        liquidatorRepaidAmount
+        liquidatorRepaidAmount,
+        transactionHash: event.transactionHash
       };
     });
   });
@@ -3726,7 +3742,7 @@ var getLiquidatedPositions = (lavarageProgram) => {
 var getAllPositions = (lavarageProgram) => {
   return lavarageProgram.account.position.all([{ dataSize: 178 }]);
 };
-var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, partnerFeeRecipient, partnerFeeMarkup) => __async(void 0, null, function* () {
+var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, tokenProgram, partnerFeeRecipient, partnerFeeMarkup) => __async(void 0, null, function* () {
   let partnerFeeMarkupAsPkey;
   if (partnerFeeMarkup) {
     const feeBuffer = Buffer.alloc(8);
@@ -3740,10 +3756,6 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     offer,
     randomSeed.publicKey
   );
-  const mintAccount = yield lavarageProgram.provider.connection.getAccountInfo(
-    offer.account.collateralType
-  );
-  const tokenProgram = mintAccount == null ? void 0 : mintAccount.owner;
   const fromTokenAccount = yield getTokenAccountOrCreateIfNotExists(
     lavarageProgram,
     lavarageProgram.provider.publicKey,
@@ -3861,7 +3873,7 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
   const tx = new import_web3.VersionedTransaction(messageV0);
   return tx;
 });
-var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, quoteToken, partnerFeeRecipient, partnerFeeMarkup) => __async(void 0, null, function* () {
+var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, quoteToken, tokenProgram, partnerFeeRecipient, partnerFeeMarkup) => __async(void 0, null, function* () {
   let partnerFeeMarkupAsPkey;
   if (partnerFeeMarkup) {
     const feeBuffer = Buffer.alloc(8);
@@ -3875,10 +3887,6 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     offer,
     randomSeed.publicKey
   );
-  const mintAccount = yield lavarageProgram.provider.connection.getAccountInfo(
-    offer.account.collateralType
-  );
-  const tokenProgram = mintAccount == null ? void 0 : mintAccount.owner;
   const quoteMintAccount = yield lavarageProgram.provider.connection.getAccountInfo(quoteToken);
   const quoteTokenProgram = quoteMintAccount == null ? void 0 : quoteMintAccount.owner;
   const fromTokenAccount = yield getTokenAccountOrCreateIfNotExists(