[DRAFT] DAP-377; add staked value to circulatingSupply

apps/web-api/src/circulating/circulating-supply.service.ts

@@ -1,4 +1,4 @@
-import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { Total } from '@entities/Total';
@@ -19,11 +19,13 @@ export class CirculatingSupplyService {
     const circulating = await this.repo.findOne({
       where: { name: 'circulating_supply' },
     });
+    const staked = await this.sdkService.getTotalStaked();
+    const circulatingTotal = BigInt(circulating.count) + BigInt(staked.json);
     const total = await this.sdkService.getTotalSupply();
     const count = BigInt(total.json).toString();
-    this.logger.log({ request: 'circulating supply', count, total });
+    this.logger.log({ request: 'circulating supply', count, total, staked });
     return {
-      circulatingSupply: Number(circulating.count),
+      circulatingSupply: Number(getAmount(circulatingTotal.toString())),
       totalSupply: Number(getAmount(count)),
     };
   }

common/sdk/sdk.service.ts

@@ -194,4 +194,13 @@ export class SdkService {
       method: 'totalIssuance',
     });
   }
+
+  @SdkCache('getTotalStaked')
+  async getTotalStaked(): Promise<ITotalIssuance> {
+    return await this.sdk.stateQueries.execute({
+      endpoint: 'query',
+      module: 'appPromotion',
+      method: 'totalStaked',
+    });
+  }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "polkastats-backend-uniquenetwork",
-  "version": "2.0.69",
+  "version": "2.0.71",
   "description": "",
   "author": "Unique Network Team",
   "private": true,