Merge pull request #224 from pshenmic/feat/getCreditsCount

Add platform total credits API in the status
pshenmic · Sep 3, 2024 · 7d1dbf6 · 7d1dbf6
2 parents 9ed566b + d73a6be
commit 7d1dbf6
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 12 deletions.
diff --git a/packages/api/.env b/packages/api/.env
@@ -8,6 +8,4 @@ DASHCORE_PORT=19998
 DASHCORE_USER=username
 DASHCORE_PASS=password
 EPOCH_CHANGE_TIME=3600000
-DAPI_HOST=127.0.0.1
-DAPI_PORT=1443
-DAPI_PROTOCOL=http
+DAPI_URL=127.0.0.1:1443:self-signed
diff --git a/packages/api/README.md b/packages/api/README.md
@@ -81,6 +81,7 @@ HTTP /status
         endTime: "2024-04-09T14:00:00.000Z"
     },
     identitiesCount: 12,
+    totalCredits: 100000,
     transactionsCount: 3,
     transfersCount: 0,
     dataContractsCount: 1,

diff --git a/packages/api/src/controllers/MainController.js b/packages/api/src/controllers/MainController.js
@@ -23,11 +23,12 @@ class MainController {
   }
 
   getStatus = async (request, response) => {
-    const [blocks, stats, tdStatus, genesisTime] = (await Promise.allSettled([
+    const [blocks, stats, tdStatus, genesisTime, totalCredits] = (await Promise.allSettled([
       this.blocksDAO.getBlocks(1, 1, 'desc'),
       this.blocksDAO.getStats(),
       TenderdashRPC.getStatus(),
-      Constants.genesisTime
+      Constants.genesisTime,
+      this.dapi.getTotalCredits()
     ])).map((e) => e.value ?? null)
 
     const [currentBlock] = blocks?.resultSet ?? []
@@ -42,6 +43,7 @@ class MainController {
     response.send({
       epoch,
       transactionsCount: stats?.transactionsCount,
+      totalCredits,
       transfersCount: stats?.transfersCount,
       dataContractsCount: stats?.dataContractsCount,
       documentsCount: stats?.documentsCount,

diff --git a/packages/api/src/dapi.js b/packages/api/src/dapi.js
@@ -13,6 +13,11 @@ class DAPI {
     const identity = await this.dapi.platform.getIdentity(Identifier.from(identifier))
     return this.dpp.identity.createFromBuffer(identity.getIdentity()).balance
   }
+
+  async getTotalCredits () {
+    const { totalCreditsInPlatform } = await this.dapi.platform.getTotalCreditsInPlatform()
+    return totalCreditsInPlatform
+  }
 }
 
 module.exports = DAPI
diff --git a/packages/api/src/server.js b/packages/api/src/server.js
@@ -48,13 +48,8 @@ module.exports = {
     await client.platform.initialize()
 
     const dapiClient = new DAPIClient({
-      dapiAddresses: [
-        {
-          host: process.env.DAPI_HOST ?? 'localhost',
-          port: process.env.DAPI_PORT ?? '1443',
-          protocol: process.env.DAPI_PROTOCOL ?? 'http'
-        }
-      ]
+      dapiAddresses: process.env.DAPI_URL.split(','),
+      network: process.env.NETWORK ?? 'testnet'
     })
 
     const { dpp } = client.platform

diff --git a/packages/api/test/integration/main.spec.js b/packages/api/test/integration/main.spec.js
@@ -28,6 +28,7 @@ describe('Other routes', () => {
 
   before(async () => {
     mock.method(DAPI.prototype, 'getIdentityBalance', async () => 0)
+    mock.method(DAPI.prototype, 'getTotalCredits', async () => 0)
 
     mock.method(tenderdashRpc, 'getBlockByHeight', async () => ({
       block: {
@@ -258,6 +259,7 @@ describe('Other routes', () => {
         epoch: null,
         identitiesCount: 1,
         transactionsCount: 3,
+        totalCredits: 0,
         transfersCount: 0,
         dataContractsCount: 1,
         documentsCount: 1,
@@ -312,6 +314,7 @@ describe('Other routes', () => {
         epoch: null,
         identitiesCount: 1,
         transactionsCount: 3,
+        totalCredits: 0,
         transfersCount: 0,
         dataContractsCount: 1,
         documentsCount: 1,
@@ -350,6 +353,7 @@ describe('Other routes', () => {
         }
       }
       mock.reset()
+      mock.method(DAPI.prototype, 'getTotalCredits', async () => 0)
       mock.method(tenderdashRpc, 'getStatus', async () => (mockTDStatus))
       mock.method(tenderdashRpc, 'getBlockByHeight', async () => ({
         block: {
@@ -371,6 +375,7 @@ describe('Other routes', () => {
         },
         identitiesCount: 1,
         transactionsCount: 3,
+        totalCredits: 0,
         transfersCount: 0,
         dataContractsCount: 1,
         documentsCount: 1,

diff --git a/packages/frontend/src/app/api/content.md b/packages/frontend/src/app/api/content.md
@@ -48,6 +48,7 @@ HTTP /status
         endTime: "2024-04-09T14:00:00.000Z"
     },
     identitiesCount: 12,
+    totalCredits: 100000,
     transactionsCount: 3,
     transfersCount: 0,
     dataContractsCount: 1,