@dhedge/backend-flatcoin-core 0.2.72 → 0.2.74

package/dist/entity/protocol-metrics.d.ts

@@ -3,8 +3,8 @@ export declare class ProtocolMetrics {
     id: number;
     unitDepositsVolume: BigNumber;
     unitWithdrawalsVolume: BigNumber;
-    leverageOpensVolume: BigNumber;
-    leverageAdjustsVolume: BigNumber;
-    leverageClosesVolume: BigNumber;
+    leverageTotalVolumeUsd: number;
+    leverageWeekVolumeUsd: number;
+    leverageMonthVolumeUsd: number;
     blockSynced: number;
 }

package/dist/entity/protocol-metrics.js

@@ -29,17 +29,35 @@ __decorate([
     __metadata("design:type", ethers_1.BigNumber)
 ], ProtocolMetrics.prototype, "unitWithdrawalsVolume", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ name: 'leverage_opens_volume', type: 'bigint', precision: 30, transformer: utils_1.bigNumberTransformer }),
-    __metadata("design:type", ethers_1.BigNumber)
-], ProtocolMetrics.prototype, "leverageOpensVolume", void 0);
+    (0, typeorm_1.Column)({
+        name: 'leverage_total_volume_usd',
+        type: 'decimal',
+        precision: 30,
+        scale: 2,
+        transformer: utils_1.numericTransformer,
+    }),
+    __metadata("design:type", Number)
+], ProtocolMetrics.prototype, "leverageTotalVolumeUsd", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ name: 'leverage_adjusts_volume', type: 'bigint', precision: 30, transformer: utils_1.bigNumberTransformer }),
-    __metadata("design:type", ethers_1.BigNumber)
-], ProtocolMetrics.prototype, "leverageAdjustsVolume", void 0);
+    (0, typeorm_1.Column)({
+        name: 'leverage_week_volume_usd',
+        type: 'decimal',
+        precision: 30,
+        scale: 2,
+        transformer: utils_1.numericTransformer,
+    }),
+    __metadata("design:type", Number)
+], ProtocolMetrics.prototype, "leverageWeekVolumeUsd", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ name: 'leverage_closes_volume', type: 'bigint', precision: 30, transformer: utils_1.bigNumberTransformer }),
-    __metadata("design:type", ethers_1.BigNumber)
-], ProtocolMetrics.prototype, "leverageClosesVolume", void 0);
+    (0, typeorm_1.Column)({
+        name: 'leverage_month_volume_usd',
+        type: 'decimal',
+        precision: 30,
+        scale: 2,
+        transformer: utils_1.numericTransformer,
+    }),
+    __metadata("design:type", Number)
+], ProtocolMetrics.prototype, "leverageMonthVolumeUsd", void 0);
 __decorate([
     (0, typeorm_1.Column)({ name: 'block_synced', type: 'numeric', precision: 25, transformer: utils_1.numericTransformer }),
     __metadata("design:type", Number)

package/dist/repository/protocol-metrics.repository.js

@@ -25,7 +25,7 @@ let ProtocolMetricsRepository = class ProtocolMetricsRepository {
         return this.repository.save(protocolMetrics);
     }
     async getLatestRecord() {
-        return this.repository.createQueryBuilder().orderBy('block_synced', 'DESC').limit(1).getOne();
+        return this.repository.createQueryBuilder().limit(1).getOne();
     }
 };
 exports.ProtocolMetricsRepository = ProtocolMetricsRepository;

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

@@ -1,5 +1,5 @@
 import { Logger } from '@nestjs/common';
-import { AnnouncedLimitOrder, AnnouncedOrder, DepositEvent, LeverageAdjust, LeveragePositionEvent, LimitOrderExecuted, Position, UnitHolder, WithdrawEvent } from '../utils';
+import { AnnouncedLimitOrder, AnnouncedOrder, DepositEvent, LeverageAdjust, LeverageClose, LeverageOpen, LeveragePositionEvent, LimitOrderExecuted, Position, UnitHolder, WithdrawEvent } from '../utils';
 import { GraphQLClient } from 'graphql-request';
 export declare class GraphQueryService {
     private readonly graphQLClient;
@@ -7,8 +7,10 @@ export declare class GraphQueryService {
     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[]>;
+    getLeverageClosesFromBlock(blockFrom: number): Promise<LeverageClose[]>;
     getLeverageClosesByTimestampFrom(timestampFrom: number): Promise<LeveragePositionEvent[]>;
     getLeverageAdjustsByTimestampFrom(timestampFrom: number): Promise<LeverageAdjust[]>;
     getLeverageAdjustsByBlockNumberFrom(blockNumber: number): Promise<LeverageAdjust[]>;

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

@@ -43,6 +43,18 @@ let GraphQueryService = class GraphQueryService {
             throw error;
         }
     }
+    async getLeverageOpensFromBLock(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`);
+            return response.leverageOpens;
+        }
+        catch (error) {
+            this.logger.error('Error fetching leverageOpens events from the graph:', error);
+            throw error;
+        }
+    }
     async getLeverageOpensByTimestampFrom(timestampFrom) {
         const variables = { blockTimestamp: timestampFrom };
         try {
@@ -69,6 +81,18 @@ let GraphQueryService = class GraphQueryService {
             throw error;
         }
     }
+    async getLeverageClosesFromBlock(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`);
+            return response.leverageCloses;
+        }
+        catch (error) {
+            this.logger.error('Error fetching leverageCloses events from the graph:', error);
+            throw error;
+        }
+    }
     async getLeverageClosesByTimestampFrom(timestampFrom) {
         const variables = { blockTimestamp: timestampFrom };
         try {
@@ -339,11 +363,13 @@ exports.getAnnouncedOrdersQuery = (0, graphql_request_1.gql) `
 `;
 exports.getLeverageOpensQuery = (0, graphql_request_1.gql) `
   query GetLeverageOpens($fromBlock: Int) {
-    leverageOpens(where: { blockNumber_gt: $fromBlock }) {
+    leverageOpens(where: { blockNumber_gt: $fromBlock }, first: 1000) {
       blockNumber
       blockTimestamp
       tokenId
       account
+      margin
+      size
     }
   }
 `;
@@ -361,10 +387,12 @@ exports.getLeverageOpensByTimestampFromQuery = (0, graphql_request_1.gql) `
 `;
 exports.getLeverageClosesQuery = (0, graphql_request_1.gql) `
   query GetLeverageCloses($fromBlock: Int) {
-    leverageCloses(where: { blockNumber_gt: $fromBlock }) {
+    leverageCloses(where: { blockNumber_gt: $fromBlock }, first: 1000) {
       blockNumber
       blockTimestamp
       tokenId
+      settledMargin
+      size
     }
   }
 `;
@@ -392,8 +420,10 @@ exports.getLeverageAdjustsByTimestampFromQuery = (0, graphql_request_1.gql) `
 `;
 exports.getLeverageAdjustsByBlockFromQuery = (0, graphql_request_1.gql) `
   query GetLeverageAdhusts($blockNumber: Int) {
-    leverageAdjusts(where: { blockNumber_gt: $blockNumber }) {
+    leverageAdjusts(where: { blockNumber_gt: $blockNumber }, first: 1000) {
       tokenId
+      marginDelta
+      sizeDelta
       blockNumber
       transactionHash
       executedBy

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

@@ -46,12 +46,29 @@ export interface LeveragePositionEvent {
     transactionHash: string;
     executedBy: string;
 }
+export interface LeverageOpen {
+    tokenId: number;
+    blockTimestamp: number;
+    account: string;
+    blockNumber: number;
+    margin: string;
+    size: string;
+}
 export interface LeverageAdjust {
     tokenId: number;
     blockTimestamp: number;
     transactionHash: string;
     executedBy: string;
     blockNumber: number;
+    margin: string;
+    size: string;
+}
+export interface LeverageClose {
+    tokenId: number;
+    blockTimestamp: number;
+    blockNumber: number;
+    settledMargin: string;
+    size: string;
 }
 export interface AnnouncedLimitOrder {
     id: string;
@@ -87,12 +104,18 @@ export interface DepositEventsData {
 export interface WithdrawEventsData {
     withdraws: WithdrawEvent[];
 }
-export interface LeverageClosesData {
+export interface LeverageClosesDataOld {
     leverageCloses: LeveragePositionEvent[];
 }
-export interface LeverageOpensData {
+export interface LeverageClosesData {
+    leverageCloses: LeverageClose[];
+}
+export interface LeverageOpensDataOld {
     leverageOpens: LeveragePositionEvent[];
 }
+export interface LeverageOpensData {
+    leverageOpens: LeverageOpen[];
+}
 export interface PositionLiquidatedsData {
     positionLiquidateds: LeveragePositionEvent[];
 }

package/package.json

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