@dhedge/backend-flatcoin-core 0.2.75 → 0.2.77

package/dist/service/graph-query.service.d.ts

@@ -1,20 +1,18 @@
 import { Logger } from '@nestjs/common';
-import { AnnouncedLimitOrder, AnnouncedOrder, DepositEvent, LeverageAdjust, LeverageClose, LeverageOpen, LeveragePositionEvent, LimitOrderExecuted, Position, UnitHolder, WithdrawEvent } from '../utils';
+import { AnnouncedLimitOrder, AnnouncedOrder, DepositEvent, LeverageAdjust, LeverageClose, LeverageOpen, LimitOrderExecuted, Position, PositionLiquidated, UnitHolder, WithdrawEvent } from '../utils';
 import { GraphQLClient } from 'graphql-request';
 export declare class GraphQueryService {
     private readonly graphQLClient;
     private readonly logger;
     constructor(graphQLClient: GraphQLClient, logger: Logger);
     getAnnouncedOrders(timestampFrom: number): Promise<AnnouncedOrder[]>;
-    getLeverageOpens(blockFrom: number): Promise<LeveragePositionEvent[]>;
     getLeverageOpensFromBLock(blockFrom: number): Promise<LeverageOpen[]>;
-    getLeverageOpensByTimestampFrom(timestampFrom: number): Promise<LeveragePositionEvent[]>;
-    getLeverageCloses(blockFrom: number): Promise<LeveragePositionEvent[]>;
+    getLeverageOpensByTimestampFrom(timestampFrom: number): Promise<LeverageOpen[]>;
     getLeverageClosesFromBlock(blockFrom: number): Promise<LeverageClose[]>;
-    getLeverageClosesByTimestampFrom(timestampFrom: number): Promise<LeveragePositionEvent[]>;
+    getLeverageClosesByTimestampFrom(timestampFrom: number): Promise<LeverageClose[]>;
     getLeverageAdjustsByTimestampFrom(timestampFrom: number): Promise<LeverageAdjust[]>;
-    getLeverageAdjustsByBlockNumberFrom(blockNumber: number): Promise<LeverageAdjust[]>;
-    getPositionLiquidateds(blockFrom: number): Promise<LeveragePositionEvent[]>;
+    getLeverageAdjustsFromBlock(blockNumber: number): Promise<LeverageAdjust[]>;
+    getPositionLiquidateds(blockFrom: number): Promise<PositionLiquidated[]>;
     getDeposits(blockFrom: number): Promise<DepositEvent[]>;
     getDepositsByTimestampFrom(timestampFrom: number): Promise<DepositEvent[]>;
     getDepositsByDepositorAddress(account: string, blockFrom: number): Promise<DepositEvent[]>;

package/dist/service/graph-query.service.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUnitHoldersQueryPaginated = exports.getClosedPositionsQueryByCloseBlockFrom = exports.getClosedPositionsQuery = exports.getClosedPositionsQueryPaginated = exports.getOpenPositionsQueryPaginated = exports.getLimitOrderExecutedsByTimestampFromQuery = exports.getLimitOrderAnnouncedsQuery = exports.getWithdrawsByWithdrawerAddressQuery = exports.getWithdrawsByTimestampFromQuery = exports.getWithdrawsQuery = exports.getDepositsByDepositorAddressQuery = exports.getDepositsByTimestampFromQuery = exports.getDepositsQuery = exports.getPositionLiquidatedsQuery = exports.getLeverageAdjustsByBlockFromQuery = exports.getLeverageAdjustsByTimestampFromQuery = exports.getLeverageClosesByTimestampFromQuery = exports.getLeverageClosesQuery = exports.getLeverageOpensByTimestampFromQuery = exports.getLeverageOpensQuery = exports.getAnnouncedOrdersQuery = exports.GraphQueryService = void 0;
 const common_1 = require("@nestjs/common");
 const graphql_request_1 = require("graphql-request");
-const constants_1 = require("../constants");
 let GraphQueryService = class GraphQueryService {
     constructor(graphQLClient, logger) {
         this.graphQLClient = graphQLClient;
@@ -30,19 +29,6 @@ let GraphQueryService = class GraphQueryService {
             throw error;
         }
     }
-    async getLeverageOpens(blockFrom) {
-        const variables = { fromBlock: blockFrom };
-        try {
-            const response = await this.graphQLClient.request(exports.getLeverageOpensQuery, variables);
-            this.logger.log(`Fetched ${response.leverageOpens.length} leverageOpens events from the graph`);
-            response.leverageOpens.forEach((events) => (events.eventType = constants_1.LeveragePositionStatus.OPEN));
-            return response.leverageOpens;
-        }
-        catch (error) {
-            this.logger.error('Error fetching leverageOpens events from the graph:', error);
-            throw error;
-        }
-    }
     async getLeverageOpensFromBLock(blockFrom) {
         const variables = { fromBlock: blockFrom };
         try {
@@ -60,7 +46,6 @@ let GraphQueryService = class GraphQueryService {
         try {
             const response = await this.graphQLClient.request(exports.getLeverageOpensByTimestampFromQuery, variables);
             this.logger.log(`Fetched ${response.leverageOpens.length} leverageOpens events from the graph from timestamp: ${timestampFrom}`);
-            response.leverageOpens.forEach((events) => (events.eventType = constants_1.LeveragePositionStatus.OPEN));
             return response.leverageOpens;
         }
         catch (error) {
@@ -68,19 +53,6 @@ let GraphQueryService = class GraphQueryService {
             throw error;
         }
     }
-    async getLeverageCloses(blockFrom) {
-        const variables = { fromBlock: blockFrom };
-        try {
-            const response = await this.graphQLClient.request(exports.getLeverageClosesQuery, variables);
-            this.logger.log(`Fetched ${response.leverageCloses.length} leverageCloses events from the graph`);
-            response.leverageCloses.forEach((events) => (events.eventType = constants_1.LeveragePositionStatus.CLOSED));
-            return response.leverageCloses;
-        }
-        catch (error) {
-            this.logger.error('Error fetching leverageCloses events from the graph:', error);
-            throw error;
-        }
-    }
     async getLeverageClosesFromBlock(blockFrom) {
         const variables = { fromBlock: blockFrom };
         try {
@@ -98,7 +70,6 @@ let GraphQueryService = class GraphQueryService {
         try {
             const response = await this.graphQLClient.request(exports.getLeverageClosesByTimestampFromQuery, variables);
             this.logger.log(`Fetched ${response.leverageCloses.length} leverageCloses events from the graph from timestamp: ${timestampFrom}`);
-            response.leverageCloses.forEach((events) => (events.eventType = constants_1.LeveragePositionStatus.CLOSED));
             return response.leverageCloses;
         }
         catch (error) {
@@ -118,7 +89,7 @@ let GraphQueryService = class GraphQueryService {
             throw error;
         }
     }
-    async getLeverageAdjustsByBlockNumberFrom(blockNumber) {
+    async getLeverageAdjustsFromBlock(blockNumber) {
         const variables = { blockNumber: blockNumber };
         try {
             const response = await this.graphQLClient.request(exports.getLeverageAdjustsByBlockFromQuery, variables);
@@ -135,7 +106,6 @@ let GraphQueryService = class GraphQueryService {
         try {
             const response = await this.graphQLClient.request(exports.getPositionLiquidatedsQuery, variables);
             this.logger.log(`Fetched ${response.positionLiquidateds.length} positionLiquidateds events from the graph`);
-            response.positionLiquidateds.forEach((events) => (events.eventType = constants_1.LeveragePositionStatus.LIQUIDATED));
             return response.positionLiquidateds;
         }
         catch (error) {
@@ -366,6 +336,7 @@ exports.getLeverageOpensQuery = (0, graphql_request_1.gql) `
     leverageOpens(where: { blockNumber_gt: $fromBlock }, first: 1000) {
       blockNumber
       blockTimestamp
+      entryPrice
       tokenId
       account
       margin
@@ -378,6 +349,7 @@ exports.getLeverageOpensByTimestampFromQuery = (0, graphql_request_1.gql) `
     leverageOpens(where: { blockTimestamp_gt: $blockTimestamp }) {
       blockNumber
       blockTimestamp
+      entryPrice
       tokenId
       account
       transactionHash
@@ -391,6 +363,7 @@ exports.getLeverageClosesQuery = (0, graphql_request_1.gql) `
       blockNumber
       blockTimestamp
       tokenId
+      closePrice
       settledMargin
       size
     }
@@ -402,30 +375,35 @@ exports.getLeverageClosesByTimestampFromQuery = (0, graphql_request_1.gql) `
       blockNumber
       blockTimestamp
       tokenId
+      closePrice
       transactionHash
       executedBy
     }
   }
 `;
 exports.getLeverageAdjustsByTimestampFromQuery = (0, graphql_request_1.gql) `
-  query GetLeverageAdhusts($blockTimestamp: Int) {
+  query GetLeverageAdjusts($blockTimestamp: Int) {
     leverageAdjusts(where: { blockTimestamp_gt: $blockTimestamp }) {
       tokenId
+      marginDelta
+      sizeDelta
       blockTimestamp
       transactionHash
+      adjustPrice
       executedBy
       blockNumber
     }
   }
 `;
 exports.getLeverageAdjustsByBlockFromQuery = (0, graphql_request_1.gql) `
-  query GetLeverageAdhusts($blockNumber: Int) {
+  query GetLeverageAdjusts($blockNumber: Int) {
     leverageAdjusts(where: { blockNumber_gt: $blockNumber }, first: 1000) {
       tokenId
       marginDelta
       sizeDelta
       blockNumber
       transactionHash
+      adjustPrice
       executedBy
       blockNumber
     }

package/dist/utils/shared-types.d.ts

@@ -35,19 +35,9 @@ export declare class AnnouncedOrder {
     executeInTime: number;
     expirationTime: number;
 }
-export interface LeveragePositionEvent {
-    blockNumber: number;
-    blockTimestamp: number;
-    tokenId: number;
-    account: string;
-    liquidator: string;
-    closePrice: string;
-    eventType: string;
-    transactionHash: string;
-    executedBy: string;
-}
 export interface LeverageOpen {
     tokenId: number;
+    entryPrice: string;
     blockTimestamp: number;
     account: string;
     blockNumber: number;
@@ -56,6 +46,7 @@ export interface LeverageOpen {
 }
 export interface LeverageAdjust {
     tokenId: number;
+    adjustPrice: string;
     blockTimestamp: number;
     transactionHash: string;
     executedBy: string;
@@ -65,11 +56,19 @@ export interface LeverageAdjust {
 }
 export interface LeverageClose {
     tokenId: number;
+    closePrice: string;
     blockTimestamp: number;
     blockNumber: number;
     settledMargin: string;
     size: string;
 }
+export interface PositionLiquidated {
+    tokenId: number;
+    blockTimestamp: number;
+    blockNumber: number;
+    liquidator: string;
+    closePrice: string;
+}
 export interface AnnouncedLimitOrder {
     id: string;
     tokenId: number;
@@ -104,20 +103,14 @@ export interface DepositEventsData {
 export interface WithdrawEventsData {
     withdraws: WithdrawEvent[];
 }
-export interface LeverageClosesDataOld {
-    leverageCloses: LeveragePositionEvent[];
-}
 export interface LeverageClosesData {
     leverageCloses: LeverageClose[];
 }
-export interface LeverageOpensDataOld {
-    leverageOpens: LeveragePositionEvent[];
-}
 export interface LeverageOpensData {
     leverageOpens: LeverageOpen[];
 }
 export interface PositionLiquidatedsData {
-    positionLiquidateds: LeveragePositionEvent[];
+    positionLiquidateds: PositionLiquidated[];
 }
 export interface LeverageAdjustsData {
     leverageAdjusts: LeverageAdjust[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhedge/backend-flatcoin-core",
-  "version": "0.2.75",
+  "version": "0.2.77",
   "description": "Backend Flatcoin Core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",