@lavarage/sdk 6.5.0 → 6.7.0

package/dist/index.mjs

@@ -3399,51 +3399,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 = ZeroAddress,
-  buyerContribution
+  buyerContribution,
+  gasLimit,
+  gasPrice
 }) {
   const contract = new 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 = ZeroAddress
+  integratorFeeAddress = ZeroAddress,
+  gasLimit,
+  gasPrice
 }) {
   const contract = new 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 Contract(
       borrowerOpsContractAddress,
@@ -3454,7 +3467,7 @@ function getPositionsEvm(provider, borrowerOpsContractAddress, fromBlock = 0) {
     const events = yield contract.queryFilter(filter, fromBlock);
     return events.map((event) => {
       const {
-        trader,
+        buyer,
         tokenCollateral,
         loanId,
         openingPositionSize,
@@ -3462,17 +3475,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 Contract(
       borrowerOpsContractAddress,
@@ -3482,18 +3496,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 Contract(
       borrowerOpsContractAddress,
@@ -3504,18 +3519,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
       };
     });
   });
@@ -3691,7 +3707,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);
@@ -3705,10 +3721,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,
@@ -3826,7 +3838,7 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
   const tx = new 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);
@@ -3840,10 +3852,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(