@dhedge/backend-flatcoin-core 0.2.42 → 0.2.43

package/dist/entity/index.d.ts

@@ -14,4 +14,4 @@ export * from './position-entity';
 export * from './borrowing-rate-apy-history';
 export * from './leverage-leaderboard';
 export * from './order-execution';
-export * from './protocol-metrics';
+export * from './leverage-monthly-pnl';

package/dist/entity/index.js

@@ -30,4 +30,4 @@ __exportStar(require("./position-entity"), exports);
 __exportStar(require("./borrowing-rate-apy-history"), exports);
 __exportStar(require("./leverage-leaderboard"), exports);
 __exportStar(require("./order-execution"), exports);
-__exportStar(require("./protocol-metrics"), exports);
+__exportStar(require("./leverage-monthly-pnl"), exports);

package/dist/entity/leverage-monthly-pnl.d.ts

@@ -0,0 +1,9 @@
+import { BigNumber } from 'ethers';
+export declare class LeverageMonthlyPnl {
+    id: number;
+    account: string;
+    pnlReth: BigNumber;
+    pnlRethFormatted: number;
+    timestamp: number;
+    lastClosedPositionTimestamp: number;
+}

package/dist/entity/leverage-monthly-pnl.js

@@ -0,0 +1,51 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LeverageMonthlyPnl = void 0;
+const graphql_1 = require("@nestjs/graphql");
+const typeorm_1 = require("typeorm");
+const utils_1 = require("../utils");
+const ethers_1 = require("ethers");
+let LeverageMonthlyPnl = class LeverageMonthlyPnl {
+};
+exports.LeverageMonthlyPnl = LeverageMonthlyPnl;
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)({ name: 'id' }),
+    __metadata("design:type", Number)
+], LeverageMonthlyPnl.prototype, "id", void 0);
+__decorate([
+    (0, graphql_1.Field)(() => String, { nullable: false }),
+    (0, typeorm_1.Column)({ name: 'account', unique: true, nullable: false }),
+    __metadata("design:type", String)
+], LeverageMonthlyPnl.prototype, "account", void 0);
+__decorate([
+    (0, graphql_1.Field)(() => graphql_1.Float, { nullable: true }),
+    (0, typeorm_1.Column)({ name: 'pnl_reth', type: 'bigint', precision: 30, transformer: utils_1.bigNumberTransformer }),
+    __metadata("design:type", ethers_1.BigNumber)
+], LeverageMonthlyPnl.prototype, "pnlReth", void 0);
+__decorate([
+    (0, graphql_1.Field)(() => graphql_1.Float, { nullable: true }),
+    (0, typeorm_1.Column)({ name: 'pnl_reth_formatted', type: 'decimal', precision: 30, scale: 4, transformer: utils_1.numericTransformer }),
+    __metadata("design:type", Number)
+], LeverageMonthlyPnl.prototype, "pnlRethFormatted", void 0);
+__decorate([
+    (0, graphql_1.Field)(() => graphql_1.Float, { nullable: true }),
+    (0, typeorm_1.Column)({ name: 'timestamp', type: 'numeric', precision: 25, transformer: utils_1.numericTransformer }),
+    __metadata("design:type", Number)
+], LeverageMonthlyPnl.prototype, "timestamp", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'last_closed_position_timestamp', type: 'numeric', precision: 25, transformer: utils_1.numericTransformer }),
+    __metadata("design:type", Number)
+], LeverageMonthlyPnl.prototype, "lastClosedPositionTimestamp", void 0);
+exports.LeverageMonthlyPnl = LeverageMonthlyPnl = __decorate([
+    (0, graphql_1.ObjectType)(),
+    (0, typeorm_1.Entity)({ name: 'leverage_leaderboard' })
+], LeverageMonthlyPnl);

package/dist/repository/index.d.ts

@@ -7,4 +7,4 @@ export * from './price.repository';
 export * from './borrowing-rate-apy-history.repository';
 export * from './leverage-leaderboard.repository';
 export * from './order-execution.repository';
-export * from './protocol-metrics.repository';
+export * from './leverage-monthly-pnl.repository';

package/dist/repository/index.js

@@ -23,4 +23,4 @@ __exportStar(require("./price.repository"), exports);
 __exportStar(require("./borrowing-rate-apy-history.repository"), exports);
 __exportStar(require("./leverage-leaderboard.repository"), exports);
 __exportStar(require("./order-execution.repository"), exports);
-__exportStar(require("./protocol-metrics.repository"), exports);
+__exportStar(require("./leverage-monthly-pnl.repository"), exports);

package/dist/repository/leverage-monthly-pnl.repository.d.ts

@@ -0,0 +1,10 @@
+import { LeverageMonthlyPnl } from '../entity';
+import { Repository } from 'typeorm';
+export declare class LeverageMonthlyPnlRepository {
+    private repository;
+    constructor(repository: Repository<LeverageMonthlyPnl>);
+    findAllByAccount(account: string): Promise<LeverageMonthlyPnl[]>;
+    findByLastTimestamp(): Promise<LeverageMonthlyPnl | null>;
+    findByAccountAndTimestamp(account: string, timestamp: number): Promise<LeverageMonthlyPnl | null>;
+    saveAll(leverageLeaderboard: LeverageMonthlyPnl[]): Promise<void>;
+}

package/dist/repository/leverage-monthly-pnl.repository.js

@@ -0,0 +1,57 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LeverageMonthlyPnlRepository = void 0;
+const common_1 = require("@nestjs/common");
+const typeorm_1 = require("@nestjs/typeorm");
+const entity_1 = require("../entity");
+const typeorm_2 = require("typeorm");
+let LeverageMonthlyPnlRepository = class LeverageMonthlyPnlRepository {
+    constructor(repository) {
+        this.repository = repository;
+    }
+    async findAllByAccount(account) {
+        return await this.repository
+            .createQueryBuilder('leverageMonthlyPnl')
+            .where('leverageMonthlyPnl.account = :account')
+            .setParameter('account', account)
+            .getMany();
+    }
+    async findByLastTimestamp() {
+        return await this.repository
+            .createQueryBuilder('leverageMonthlyPnl')
+            .orderBy('leverageMonthlyPnl.last_closed_position_timestamp', 'DESC')
+            .take(1)
+            .getOne();
+    }
+    async findByAccountAndTimestamp(account, timestamp) {
+        return await this.repository
+            .createQueryBuilder('leverageMonthlyPnl')
+            .where('leverageMonthlyPnl.account = :account')
+            .andWhere('leverageMonthlyPnl.timestamp = :timestamp')
+            .setParameter('account', account)
+            .setParameter('timestamp', timestamp)
+            .take(1)
+            .getOne();
+    }
+    async saveAll(leverageLeaderboard) {
+        await this.repository.save(leverageLeaderboard);
+    }
+};
+exports.LeverageMonthlyPnlRepository = LeverageMonthlyPnlRepository;
+exports.LeverageMonthlyPnlRepository = LeverageMonthlyPnlRepository = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, typeorm_1.InjectRepository)(entity_1.LeverageMonthlyPnl)),
+    __metadata("design:paramtypes", [typeorm_2.Repository])
+], LeverageMonthlyPnlRepository);

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

@@ -23,7 +23,6 @@ export declare class GraphQueryService {
     getAllOpenPositions(): Promise<Position[]>;
     getOpenPositions(skip: number, first: number): Promise<Position[]>;
     getClosedPositions(closeTimestampVar: number): Promise<Position[]>;
-    getClosedPositionsByCloseBlockFrom(closeBlockFrom: number): Promise<Position[]>;
 }
 export declare const getAnnouncedOrdersQuery: string;
 export declare const getLeverageOpensQuery: string;
@@ -42,4 +41,3 @@ export declare const getLimitOrderAnnouncedsQuery: string;
 export declare const getLimitOrderExecutedsByTimestampFromQuery: string;
 export declare const getOpenPositionsQuery: string;
 export declare const getClosedPositionsQuery: string;
-export declare const getClosedPositionsQueryByCloseBlockFrom: string;

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

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getClosedPositionsQueryByCloseBlockFrom = exports.getClosedPositionsQuery = exports.getOpenPositionsQuery = exports.getLimitOrderExecutedsByTimestampFromQuery = exports.getLimitOrderAnnouncedsQuery = exports.getWithdrawsByWithdrawerAddressQuery = exports.getWithdrawsByTimestampFromQuery = exports.getWithdrawsQuery = exports.getDepositsByDepositorAddressQuery = exports.getDepositsByTimestampFromQuery = exports.getDepositsQuery = exports.getPositionLiquidatedsQuery = exports.getLeverageAdjustsByTimestampFromQuery = exports.getLeverageClosesByTimestampFromQuery = exports.getLeverageClosesQuery = exports.getLeverageOpensByTimestampFromQuery = exports.getLeverageOpensQuery = exports.getAnnouncedOrdersQuery = exports.GraphQueryService = void 0;
+exports.getClosedPositionsQuery = exports.getOpenPositionsQuery = exports.getLimitOrderExecutedsByTimestampFromQuery = exports.getLimitOrderAnnouncedsQuery = exports.getWithdrawsByWithdrawerAddressQuery = exports.getWithdrawsByTimestampFromQuery = exports.getWithdrawsQuery = exports.getDepositsByDepositorAddressQuery = exports.getDepositsByTimestampFromQuery = exports.getDepositsQuery = exports.getPositionLiquidatedsQuery = 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");
@@ -242,18 +242,6 @@ let GraphQueryService = class GraphQueryService {
             throw error;
         }
     }
-    async getClosedPositionsByCloseBlockFrom(closeBlockFrom) {
-        const variables = { closeBlockFrom };
-        try {
-            const response = await this.graphQLClient.request(exports.getClosedPositionsQueryByCloseBlockFrom, variables);
-            this.logger.log(`Fetched ${response.positions.length} closed positions from the graph from block ${closeBlockFrom}`);
-            return response.positions;
-        }
-        catch (error) {
-            this.logger.error(`Error fetching open positions from the graph from block ${closeBlockFrom}:`, error);
-            throw error;
-        }
-    }
 };
 exports.GraphQueryService = GraphQueryService;
 exports.GraphQueryService = GraphQueryService = __decorate([
@@ -445,7 +433,7 @@ exports.getOpenPositionsQuery = (0, graphql_request_1.gql) `
   }
 `;
 exports.getClosedPositionsQuery = (0, graphql_request_1.gql) `
-  query GetClosedPositions($closeTimestampVar: Int) {
+  query GetOpenPositions($closeTimestampVar: Int) {
     positions(
       where: { status_in: [1, 2, 3], closeTimestamp_gt: $closeTimestampVar }
       orderBy: closeTimestamp
@@ -456,23 +444,6 @@ exports.getClosedPositionsQuery = (0, graphql_request_1.gql) `
       margin
       status
       closeTimestamp
-      accruedFunding
-    }
-  }
-`;
-exports.getClosedPositionsQueryByCloseBlockFrom = (0, graphql_request_1.gql) `
-  query GetClosedPositions($closeBlockFrom: Int) {
-    positions(
-      where: { status_in: [1, 2, 3], closeBlock_gt: $closeBlockFrom }
-      orderBy: closeBlock
-      orderDirection: desc
-    ) {
-      account
-      profitLoss
-      margin
-      status
-      closeTimestamp
-      accruedFunding
     }
   }
 `;

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

@@ -72,7 +72,6 @@ export interface Position {
     profitLoss: number;
     margin: number;
     closeTimestamp: number;
-    accruedFunding: number;
 }
 export interface DepositEventsData {
     deposits: DepositEvent[];

package/package.json

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

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

@@ -1,10 +0,0 @@
-import { BigNumber } from 'ethers';
-export declare class ProtocolMetrics {
-    id: number;
-    unitDepositsVolume: BigNumber;
-    unitWithdrawalsVolume: BigNumber;
-    leverageOpensVolume: BigNumber;
-    leverageAdjustsVolume: BigNumber;
-    leverageClosesVolume: BigNumber;
-    blockSynced: number;
-}

package/dist/entity/protocol-metrics.js

@@ -1,49 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProtocolMetrics = void 0;
-const typeorm_1 = require("typeorm");
-const utils_1 = require("../utils");
-const ethers_1 = require("ethers");
-let ProtocolMetrics = class ProtocolMetrics {
-};
-exports.ProtocolMetrics = ProtocolMetrics;
-__decorate([
-    (0, typeorm_1.PrimaryGeneratedColumn)({ name: 'id' }),
-    __metadata("design:type", Number)
-], ProtocolMetrics.prototype, "id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ name: 'unit_deposits_volume', type: 'bigint', precision: 30, transformer: utils_1.bigNumberTransformer }),
-    __metadata("design:type", ethers_1.BigNumber)
-], ProtocolMetrics.prototype, "unitDepositsVolume", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ name: 'unit_withdrawals_volume', type: 'bigint', precision: 30, transformer: utils_1.bigNumberTransformer }),
-    __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);
-__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);
-__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);
-__decorate([
-    (0, typeorm_1.Column)({ name: 'block_synced', type: 'numeric', precision: 25, transformer: utils_1.numericTransformer }),
-    __metadata("design:type", Number)
-], ProtocolMetrics.prototype, "blockSynced", void 0);
-exports.ProtocolMetrics = ProtocolMetrics = __decorate([
-    (0, typeorm_1.Entity)({ name: 'protocol_metrics' })
-], ProtocolMetrics);

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

@@ -1,8 +0,0 @@
-import { Repository } from 'typeorm';
-import { ProtocolMetrics } from '../entity';
-export declare class ProtocolMetricsRepository {
-    private repository;
-    constructor(repository: Repository<ProtocolMetrics>);
-    save(protocolMetrics: ProtocolMetrics): Promise<ProtocolMetrics>;
-    getLatestRecord(): Promise<ProtocolMetrics | null>;
-}

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

@@ -1,36 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProtocolMetricsRepository = void 0;
-const common_1 = require("@nestjs/common");
-const typeorm_1 = require("@nestjs/typeorm");
-const typeorm_2 = require("typeorm");
-const entity_1 = require("../entity");
-let ProtocolMetricsRepository = class ProtocolMetricsRepository {
-    constructor(repository) {
-        this.repository = repository;
-    }
-    async save(protocolMetrics) {
-        return this.repository.save(protocolMetrics);
-    }
-    async getLatestRecord() {
-        return this.repository.createQueryBuilder().orderBy('block_synced', 'DESC').limit(1).getOne();
-    }
-};
-exports.ProtocolMetricsRepository = ProtocolMetricsRepository;
-exports.ProtocolMetricsRepository = ProtocolMetricsRepository = __decorate([
-    (0, common_1.Injectable)(),
-    __param(0, (0, typeorm_1.InjectRepository)(entity_1.ProtocolMetrics)),
-    __metadata("design:paramtypes", [typeorm_2.Repository])
-], ProtocolMetricsRepository);