@lavarage/sdk 6.5.0 → 6.6.0

package/evm.ts

@@ -3,7 +3,6 @@ import {
   Contract,
   ContractTransaction,
   Provider,
-  Signer,
   ZeroAddress,
 } from "ethers";
 import { borrowerOperationsAbi } from "./abi/borrowerOperations";
@@ -17,14 +16,14 @@ import {
 } from "./interfaces/evm";
 
 /**
- * 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
  */
 export const openPositionEvm = async (
-  signer: Signer,
+  provider: Provider,
   borrowerOpsContractAddress: string,
   {
     buyingCode,
@@ -34,6 +33,8 @@ export const openPositionEvm = async (
     inchRouter,
     integratorFeeAddress = ZeroAddress,
     buyerContribution,
+    gasLimit,
+    gasPrice,
   }: {
     buyingCode: string;
     tokenCollateral: string;
@@ -42,34 +43,47 @@ export const openPositionEvm = async (
     inchRouter: string;
     integratorFeeAddress?: string;
     buyerContribution: BigNumberish;
+    gasLimit?: string | number;
+    gasPrice?: string | number;
   }
 ): Promise<ContractTransaction> => {
   const contract = new Contract(
     borrowerOpsContractAddress,
     borrowerOperationsAbi,
-    signer
+    provider
   );
 
-  return contract.buy(
+  const txOptions: {
+    value: BigNumberish;
+    gasLimit?: BigNumberish;
+    gasPrice?: BigNumberish;
+  } = {
+    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
   );
 };
 
 /**
- * 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
  */
 export const closePositionEvm = async (
-  signer: Signer,
+  provider: Provider,
   borrowerOpsContractAddress: string,
   {
     loanId,
@@ -77,26 +91,36 @@ export const closePositionEvm = async (
     tokenHolder,
     inchRouter,
     integratorFeeAddress = ZeroAddress,
+    gasLimit,
+    gasPrice,
   }: {
     loanId: BigNumberish;
     sellingCode: string;
     tokenHolder: string;
     inchRouter: string;
     integratorFeeAddress?: string;
+    gasLimit?: string | number;
+    gasPrice?: string | number;
   }
 ): Promise<ContractTransaction> => {
   const contract = new Contract(
     borrowerOpsContractAddress,
     borrowerOperationsAbi,
-    signer
+    provider
   );
 
-  return contract.sell(
+  const txOptions: { gasLimit?: BigNumberish; gasPrice?: BigNumberish } = {};
+
+  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 : {}
   );
 };
 
@@ -110,7 +134,7 @@ export const closePositionEvm = async (
 export async function getPositionsEvm(
   provider: Provider,
   borrowerOpsContractAddress: string,
-  fromBlock: number = 0
+  fromBlock: number = 42960845 // block contract was initialized
 ): Promise<BuyEvent[]> {
   const contract = new Contract(
     borrowerOpsContractAddress,
@@ -123,15 +147,16 @@ export async function getPositionsEvm(
 
   return events.map((event: any) => {
     const {
-      trader,
+      buyer,
       tokenCollateral,
       loanId,
       openingPositionSize,
       collateralAmount,
       initialMargin,
-    } = event.args as unknown as BuyEvent;
+    } = event.args as unknown as any;
+    
     return {
-      trader,
+      trader: buyer,
       tokenCollateral,
       loanId,
       openingPositionSize,
@@ -151,7 +176,7 @@ export async function getPositionsEvm(
 export async function getClosedPositionsEvm(
   provider: Provider,
   borrowerOpsContractAddress: string,
-  fromBlock: number = 0
+  fromBlock: number = 42960845 // block contract was initialized
 ): Promise<SellEvent[]> {
   const contract = new Contract(
     borrowerOpsContractAddress,
@@ -163,10 +188,16 @@ export async function getClosedPositionsEvm(
   const events = await contract.queryFilter(filter, fromBlock);
 
   return events.map((event: any) => {
-    const { trader, tokenCollateral, loanId, closingPositionSize, profit } =
-      event.args as unknown as SellEvent;
+    const { 
+      buyer,
+      tokenCollateral, 
+      loanId, 
+      closingPositionSize, 
+      profit 
+    } = event.args as unknown as any;
+    
     return {
-      trader,
+      trader: buyer,
       tokenCollateral,
       loanId,
       closingPositionSize,
@@ -185,7 +216,7 @@ export async function getClosedPositionsEvm(
 export async function getLiquidatedPositionsEvm(
   provider: Provider,
   borrowerOpsContractAddress: string,
-  fromBlock: number = 0
+  fromBlock: number = 42960845 // block contract was initialized
 ): Promise<LiquidationEvent[]> {
   const contract = new Contract(
     borrowerOpsContractAddress,
@@ -198,14 +229,15 @@ export async function getLiquidatedPositionsEvm(
 
   return events.map((event: any) => {
     const {
-      trader,
+      borrower,
       tokenCollateral,
       loanId,
       closingPositionSize,
       liquidatorRepaidAmount,
-    } = event.args as unknown as LiquidationEvent;
+    } = event.args as unknown as any;
+    
     return {
-      trader,
+      trader: borrower,
       tokenCollateral,
       loanId,
       closingPositionSize,
@@ -315,4 +347,4 @@ export async function getOffersEvm(
   }
 
   return activeCollaterals;
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lavarage/sdk",
-  "version": "6.5.0",
+  "version": "6.6.0",
   "description": "Lavarage SDK",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",