@lavarage/sdk 6.7.3 → 6.7.5

package/dist/index.d.mts

@@ -2717,13 +2717,12 @@ declare const closePositionEvm: (provider: Provider, borrowerOpsContractAddress:
     gasPrice?: string | number;
 }) => Promise<ContractTransaction>;
 /**
- * Get all positions from events
+ * Get all positions from active loans
  * @param provider - Ethers provider
- * @param borrowerOpsContractAddress - BorrowerOperations contract address
- * @param fromBlock - Block to start searching from
- * @returns Array of Buy events representing positions
+ * @param tokenHolderContractAddress - TokenHolder contract address
+ * @returns Array of active positions
  */
-declare function getPositionsEvm(provider: Provider, borrowerOpsContractAddress: string, fromBlock?: number): Promise<BuyEvent[]>;
+declare function getPositionsEvm(provider: Provider, tokenHolderContractAddress: string): Promise<BuyEvent[]>;
 /**
  * Get closed positions from events
  * @param provider - Ethers provider

package/dist/index.d.ts

@@ -2717,13 +2717,12 @@ declare const closePositionEvm: (provider: Provider, borrowerOpsContractAddress:
     gasPrice?: string | number;
 }) => Promise<ContractTransaction>;
 /**
- * Get all positions from events
+ * Get all positions from active loans
  * @param provider - Ethers provider
- * @param borrowerOpsContractAddress - BorrowerOperations contract address
- * @param fromBlock - Block to start searching from
- * @returns Array of Buy events representing positions
+ * @param tokenHolderContractAddress - TokenHolder contract address
+ * @returns Array of active positions
  */
-declare function getPositionsEvm(provider: Provider, borrowerOpsContractAddress: string, fromBlock?: number): Promise<BuyEvent[]>;
+declare function getPositionsEvm(provider: Provider, tokenHolderContractAddress: string): Promise<BuyEvent[]>;
 /**
  * Get closed positions from events
  * @param provider - Ethers provider

package/dist/index.js

@@ -3715,39 +3715,34 @@ var closePositionEvm = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function* (
     Object.keys(txOptions).length > 0 ? txOptions : {}
   );
 });
-function getPositionsEvm(provider, borrowerOpsContractAddress, fromBlock = 42960845) {
+function getPositionsEvm(provider, tokenHolderContractAddress) {
   return __async(this, null, function* () {
     const contract = new import_ethers.Contract(
-      borrowerOpsContractAddress,
-      borrowerOperationsAbi,
+      tokenHolderContractAddress,
+      tokenHolderAbi,
       provider
     );
-    const filter = contract.filters.Buy();
-    const events = yield contract.queryFilter(filter, fromBlock);
-    return Promise.all(
-      events.map((event) => __async(this, null, function* () {
-        const {
-          buyer,
-          tokenCollateral,
-          loanId,
-          openingPositionSize,
-          collateralAmount,
-          initialMargin
-        } = event.args;
-        const block = yield provider.getBlock(event.blockNumber);
-        const timestamp = Number(block == null ? void 0 : block.timestamp) || 0;
-        return {
-          trader: buyer,
-          tokenCollateral,
-          loanId,
-          openingPositionSize,
-          collateralAmount,
-          initialMargin,
-          transactionHash: event.transactionHash,
-          timestamp
-        };
-      }))
-    );
+    const activeLoanCount = yield contract.getActiveLoanCount();
+    const batchSize = 100;
+    const positions = [];
+    for (let i = 0; i < activeLoanCount; i += batchSize) {
+      const currentBatchSize = Math.min(Number(activeLoanCount) - i, batchSize);
+      const loans = yield contract.getActiveLoansBatch(i, currentBatchSize);
+      for (const loan of loans) {
+        positions.push({
+          trader: loan.borrower,
+          tokenCollateral: loan.collateral.collateralAddress,
+          loanId: loan.id,
+          openingPositionSize: loan.amount,
+          collateralAmount: loan.collateralAmount,
+          initialMargin: loan.userPaid,
+          transactionHash: "",
+          // Not available from loan data
+          timestamp: Number(loan.timestamp)
+        });
+      }
+    }
+    return positions;
   });
 }
 function getClosedPositionsEvm(provider, borrowerOpsContractAddress, fromBlock = 42960845) {
@@ -3757,10 +3752,16 @@ function getClosedPositionsEvm(provider, borrowerOpsContractAddress, fromBlock =
       borrowerOperationsAbi,
       provider
     );
+    const currentBlock = yield provider.getBlockNumber();
     const filter = contract.filters.Sell();
-    const events = yield contract.queryFilter(filter, fromBlock);
+    const allEvents = [];
+    for (let start = fromBlock; start <= currentBlock; start += 1e4) {
+      const end = Math.min(start + 9999, currentBlock);
+      const events = yield contract.queryFilter(filter, start, end);
+      allEvents.push(...events);
+    }
     return Promise.all(
-      events.map((event) => __async(this, null, function* () {
+      allEvents.map((event) => __async(this, null, function* () {
         const { buyer, tokenCollateral, loanId, closingPositionSize, profit } = event.args;
         const block = yield provider.getBlock(event.blockNumber);
         const timestamp = block ? Number(block.timestamp) : 0;
@@ -3784,10 +3785,16 @@ function getLiquidatedPositionsEvm(provider, borrowerOpsContractAddress, fromBlo
       borrowerOperationsAbi,
       provider
     );
+    const currentBlock = yield provider.getBlockNumber();
     const filter = contract.filters.Liquidation();
-    const events = yield contract.queryFilter(filter, fromBlock);
+    const allEvents = [];
+    for (let start = fromBlock; start <= currentBlock; start += 1e4) {
+      const end = Math.min(start + 9999, currentBlock);
+      const events = yield contract.queryFilter(filter, start, end);
+      allEvents.push(...events);
+    }
     return Promise.all(
-      events.map((event) => __async(this, null, function* () {
+      allEvents.map((event) => __async(this, null, function* () {
         const {
           borrower,
           tokenCollateral,