@lavarage/sdk 6.6.0 → 6.7.1

package/evm.ts

@@ -145,25 +145,32 @@ export async function getPositionsEvm(
   const filter = contract.filters.Buy();
   const events = await contract.queryFilter(filter, fromBlock);
 
-  return events.map((event: any) => {
-    const {
-      buyer,
-      tokenCollateral,
-      loanId,
-      openingPositionSize,
-      collateralAmount,
-      initialMargin,
-    } = event.args as unknown as any;
-    
-    return {
-      trader: buyer,
-      tokenCollateral,
-      loanId,
-      openingPositionSize,
-      collateralAmount,
-      initialMargin,
-    };
-  });
+  return Promise.all(
+    events.map(async (event: any) => {
+      const {
+        buyer,
+        tokenCollateral,
+        loanId,
+        openingPositionSize,
+        collateralAmount,
+        initialMargin,
+      } = event.args as unknown as any;
+
+      const block = await provider.getBlock(event.blockNumber);
+      const timestamp = Number(block?.timestamp) || 0;
+
+      return {
+        trader: buyer,
+        tokenCollateral,
+        loanId,
+        openingPositionSize,
+        collateralAmount,
+        initialMargin,
+        transactionHash: event.transactionHash,
+        timestamp,
+      };
+    })
+  );
 }
 
 /**
@@ -187,23 +194,25 @@ export async function getClosedPositionsEvm(
   const filter = contract.filters.Sell();
   const events = await contract.queryFilter(filter, fromBlock);
 
-  return events.map((event: any) => {
-    const { 
-      buyer,
-      tokenCollateral, 
-      loanId, 
-      closingPositionSize, 
-      profit 
-    } = event.args as unknown as any;
-    
-    return {
-      trader: buyer,
-      tokenCollateral,
-      loanId,
-      closingPositionSize,
-      profit,
-    };
-  });
+  return Promise.all(
+    events.map(async (event: any) => {
+      const { buyer, tokenCollateral, loanId, closingPositionSize, profit } =
+        event.args as unknown as any;
+
+      const block = await provider.getBlock(event.blockNumber);
+      const timestamp = block ? Number(block.timestamp) : 0;
+
+      return {
+        trader: buyer,
+        tokenCollateral,
+        loanId,
+        closingPositionSize,
+        profit,
+        transactionHash: event.transactionHash,
+        timestamp,
+      };
+    })
+  );
 }
 
 /**
@@ -227,23 +236,30 @@ export async function getLiquidatedPositionsEvm(
   const filter = contract.filters.Liquidation();
   const events = await contract.queryFilter(filter, fromBlock);
 
-  return events.map((event: any) => {
-    const {
-      borrower,
-      tokenCollateral,
-      loanId,
-      closingPositionSize,
-      liquidatorRepaidAmount,
-    } = event.args as unknown as any;
-    
-    return {
-      trader: borrower,
-      tokenCollateral,
-      loanId,
-      closingPositionSize,
-      liquidatorRepaidAmount,
-    };
-  });
+  return Promise.all(
+    events.map(async (event: any) => {
+      const {
+        borrower,
+        tokenCollateral,
+        loanId,
+        closingPositionSize,
+        liquidatorRepaidAmount,
+      } = event.args as unknown as any;
+
+      const block = await provider.getBlock(event.blockNumber);
+      const timestamp = block ? Number(block.timestamp) : 0;
+
+      return {
+        trader: borrower,
+        tokenCollateral,
+        loanId,
+        closingPositionSize,
+        liquidatorRepaidAmount,
+        transactionHash: event.transactionHash,
+        timestamp,
+      };
+    })
+  );
 }
 
 /**
@@ -347,4 +363,58 @@ export async function getOffersEvm(
   }
 
   return activeCollaterals;
-}
+}
+
+/**
+ * Get the opening fee percentage
+ * @param provider - Ethers provider
+ * @param borrowerOpsContractAddress - BorrowerOperations contract address
+ * @returns Opening fee as a BigNumber
+ */
+export async function getOpeningFeeEvm(
+  provider: Provider,
+  borrowerOpsContractAddress: string
+): Promise<bigint> {
+  const contract = new Contract(
+    borrowerOpsContractAddress,
+    borrowerOperationsAbi,
+    provider
+  );
+  return contract.openingFee();
+}
+
+/**
+ * Get the profit fee percentage
+ * @param provider - Ethers provider
+ * @param borrowerOpsContractAddress - BorrowerOperations contract address
+ * @returns Profit fee as a BigNumber
+ */
+export async function getProfitFeeEvm(
+  provider: Provider,
+  borrowerOpsContractAddress: string
+): Promise<bigint> {
+  const contract = new Contract(
+    borrowerOpsContractAddress,
+    borrowerOperationsAbi,
+    provider
+  );
+  return contract.profitFee();
+}
+
+/**
+ * Get the token balance of the token holder contract
+ * @param provider - Ethers provider
+ * @param tokenHolderContractAddress - Address of the TokenHolder contract
+ * @returns Token balance as a BigNumber
+ */
+export async function getTokenBalanceEvm(
+  provider: Provider,
+  tokenHolderContractAddress: string
+): Promise<bigint> {
+  const contract = new Contract(
+    tokenHolderContractAddress,
+    tokenHolderAbi,
+    provider
+  );
+  return contract.getBalance();
+}

package/index.ts

@@ -190,6 +190,7 @@ export const openTradeV1 = async (
   marginSOL: BN,
   leverage: number,
   randomSeed: Keypair,
+  tokenProgram: PublicKey,
   partnerFeeRecipient?: PublicKey,
   partnerFeeMarkup?: number
 ) => {
@@ -208,11 +209,6 @@ export const openTradeV1 = async (
     randomSeed.publicKey
   );
 
-  const mintAccount = await lavarageProgram.provider.connection.getAccountInfo(
-    offer.account.collateralType
-  );
-  const tokenProgram = mintAccount?.owner;
-
   const fromTokenAccount = await getTokenAccountOrCreateIfNotExists(
     lavarageProgram,
     lavarageProgram.provider.publicKey!,
@@ -383,6 +379,7 @@ export const openTradeV2 = async (
   leverage: number,
   randomSeed: Keypair,
   quoteToken: PublicKey,
+  tokenProgram: PublicKey,
   partnerFeeRecipient?: PublicKey,
   partnerFeeMarkup?: number
 ) => {
@@ -401,11 +398,6 @@ export const openTradeV2 = async (
     randomSeed.publicKey
   );
 
-  const mintAccount = await lavarageProgram.provider.connection.getAccountInfo(
-    offer.account.collateralType
-  );
-  const tokenProgram = mintAccount?.owner;
-
   const quoteMintAccount =
     await lavarageProgram.provider.connection.getAccountInfo(quoteToken);
   const quoteTokenProgram = quoteMintAccount?.owner;

package/interfaces/evm.ts

@@ -1,3 +1,5 @@
+import { Block } from "ethers";
+
 export interface Collateral {
   collateralAddress: string;
   maxLendPerToken: bigint;
@@ -23,6 +25,8 @@ export interface BuyEvent {
   openingPositionSize: bigint;
   collateralAmount: bigint;
   initialMargin: bigint;
+  transactionHash: string;
+  timestamp: number;
 }
 
 export interface SellEvent {
@@ -31,6 +35,8 @@ export interface SellEvent {
   loanId: bigint;
   closingPositionSize: bigint;
   profit: bigint;
+  transactionHash: string;
+  timestamp: number;
 }
 
 export interface LiquidationEvent {
@@ -39,4 +45,6 @@ export interface LiquidationEvent {
   loanId: bigint;
   closingPositionSize: bigint;
   liquidatorRepaidAmount: bigint;
+  transactionHash: string;
+  timestamp: number;
 }

package/package.json

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