Aliases with ContestedResourceVoteState

packages/api/README.md

@@ -412,7 +412,16 @@ GET /transaction/DEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEE
     type: 0,
     gasUsed: 1337000,
     status: "SUCCESS",
-    error: null
+    error: null,
+    owner: {
+      identifier: "6q9RFbeea73tE31LGMBLFZhtBUX3wZL3TcNynqE18Zgs",
+      aliases: [
+        {
+          alias: "alias.dash",
+          status: "locked"
+        }
+      ]
+    }
 }
 ```
 
@@ -450,7 +459,16 @@ GET /transactions?=1&limit=10&order=asc
         type: 0,
         gasUsed: 1337000,
         status: "SUCCESS",
-        error: null
+        error: null,
+        owner: {
+          identifier: "6q9RFbeea73tE31LGMBLFZhtBUX3wZL3TcNynqE18Zgs",
+          aliases: [
+            {
+              alias: "alias.dash",
+              status: "locked"
+            }
+          ]
+        }
     }, ...
     ]
 }
@@ -599,7 +617,12 @@ GET /identity/GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec
     totalDocuments: 0,
     totalDataContracts: 0,
     isSystem: false,
-    aliases: ["test.dash"...]
+    aliases: [
+      {
+        alias: "alias.dash",
+        status: "locked"
+      }
+    ]
 }
 ```
 Response codes:
@@ -612,21 +635,11 @@ Response codes:
 ### Identity by DPNS
 Return identity by given DPNS/alias
 ```
-GET /dpns/identity?dpns=test-name.1.dash
+GET /dpns/identity?dpns=canuseethat2.dash
 
 {
-    identifier: "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec",
-    owner: "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec",
-    revision: 1,
-    balance: 1000000,
-    timestamp: "2024-03-18T10:13:54.150Z",
-    txHash: "DEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF",
-    totalTxs: 1,
-    totalTransfers: 0,
-    totalDocuments: 0,
-    totalDataContracts: 0,
-    isSystem: false,
-    aliases: []
+  "identity_identifier": "8eTDkBhpQjHeqgbVeriwLeZr1tCa6yBGw76SckvD1cwc",
+  "alias": "canuseethat2.dash"
 }
 ```
 Response codes:
@@ -651,20 +664,25 @@ GET /identities?page=1&limit=10&order=asc&order_by=block_height
         total: 10
     },
     resultSet: [
-    {
-        identifier: "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec",
-        owner: "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec",
-        revision: 1,
-        balance: 1000000,
-        timestamp: "2024-03-18T10:13:54.150Z",
-        txHash: "DEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF",
-        totalTxs: 1,
-        totalTransfers: 0,
-        totalDocuments: 0,
-        totalDataContracts: 0,
-        isSystem: false,
-        aliases: ["test.dash"]
-    }, ...
+      {
+          identifier: "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec",
+          owner: "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec",
+          revision: 1,
+          balance: 1000000,
+          timestamp: "2024-03-18T10:13:54.150Z",
+          txHash: "DEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF",
+          totalTxs: 1,
+          totalTransfers: 0,
+          totalDocuments: 0,
+          totalDataContracts: 0,
+          isSystem: false,
+          aliases: [
+            {
+              alias: "alias.dash",
+              status: "locked"
+            }
+          ]
+      }, ...
     ]
 }
 ```
@@ -768,7 +786,8 @@ GET /identities/GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec/transactions?page=1
         timestamp: "2024-03-18T10:13:54.150Z",
         gasUsed: 1337000,
         status: "SUCCESS",
-        error: null
+        error: null,
+        owner: "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec"
     }, ...
     ]
 }

packages/api/package.json

@@ -12,7 +12,6 @@
     "lint": "standard ."
   },
   "dependencies": {
-    "@dashevo/dapi-client": "1.5.1",
     "@dashevo/dashd-rpc": "19.0.0",
     "@fastify/cors": "^8.3.0",
     "@scure/base": "^1.1.5",
@@ -24,7 +23,8 @@
     "fastify-metrics": "^11.0.0",
     "knex": "^2.5.1",
     "node-fetch": "^2.6.11",
-    "pg": "^8.11.3"
+    "pg": "^8.11.3",
+    "@dashevo/dapi-client": "github:owl352/dapi-client"
   },
   "devDependencies": {
     "standard": "^17.1.0",

packages/api/src/DAPI.js

@@ -23,6 +23,41 @@ class DAPI {
     const { epochsInfo } = await this.dapi.platform.getEpochsInfo(start, count, { ascending })
     return epochsInfo
   }
+
+  /**
+   * Fetch the version upgrade votes status
+   * @typedef {getContestedState}
+   * @param {string} contractId - base64 contractId
+   * @param {string} documentTypeName
+   * @param {string} indexName
+   * @param {number} resultType
+   * @param {Array<Buffer>} indexValuesList
+   * @param {Buffer} [startAtIdentifierInfo]
+   * @param {bool} [allowIncludeLockedAndAbstainingVoteTally]
+   * @param {number} [count]
+   * @returns {Promise<contestedResourceContenders>}
+   */
+  async getContestedState (contractId,
+    documentTypeName,
+    indexName,
+    resultType,
+    indexValuesList,
+    startAtIdentifierInfo,
+    allowIncludeLockedAndAbstainingVoteTally,
+    count
+  ) {
+    const { contestedResourceContenders } = await this.dapi.platform.getContestedResourceVoteState(
+      Buffer.from(contractId, 'base64'),
+      documentTypeName,
+      indexName,
+      resultType,
+      indexValuesList,
+      startAtIdentifierInfo,
+      allowIncludeLockedAndAbstainingVoteTally,
+      count
+    )
+    return contestedResourceContenders
+  }
 }
 
 module.exports = DAPI

packages/api/src/constants.js

@@ -5,6 +5,7 @@ let genesisTime
 module.exports = {
   EPOCH_CHANGE_TIME: Number(process.env.EPOCH_CHANGE_TIME),
   TCP_CONNECT_TIMEOUT: Number(process.env.TCP_CONNECT_TIMEOUT),
+  DPNS_CONTRACT: 'GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec',
   get genesisTime () {
     if (!genesisTime || isNaN(genesisTime)) {
       return TenderdashRPC.getBlockByHeight(1).then((blockInfo) => {

packages/api/src/controllers/IdentitiesController.js

@@ -3,7 +3,7 @@ const { IDENTITY_CREDIT_WITHDRAWAL } = require('../enums/StateTransitionEnum')
 
 class IdentitiesController {
   constructor (knex, dapi) {
-    this.identitiesDAO = new IdentitiesDAO(knex)
+    this.identitiesDAO = new IdentitiesDAO(knex, dapi)
     this.dapi = dapi
   }
 
@@ -16,36 +16,27 @@ class IdentitiesController {
       return response.status(404).send({ message: 'not found' })
     }
 
-    const balance = await this.dapi.getIdentityBalance(identifier)
-
-    response.send({ ...identity, balance })
+    response.send(identity)
   }
 
-  getIdentityByDPNS = async (request, response) => {
+  getIdentityByDPNSName = async (request, response) => {
     const { dpns } = request.query
 
-    const identity = await this.identitiesDAO.getIdentityByDPNS(dpns)
+    const identity = await this.identitiesDAO.getIdentityByDPNSName(dpns)
 
     if (!identity) {
       return response.status(404).send({ message: 'not found' })
     }
 
-    const balance = await this.dapi.getIdentityBalance(identity.identifier)
-
-    response.send({ ...identity, balance })
+    response.send(identity)
   }
 
   getIdentities = async (request, response) => {
     const { page = 1, limit = 10, order = 'asc', order_by: orderBy = 'block_height' } = request.query
 
     const identities = await this.identitiesDAO.getIdentities(Number(page ?? 1), Number(limit ?? 10), order, orderBy)
 
-    const identitiesWithBalance = await Promise.all(identities.resultSet.map(async identity => {
-      const balance = await this.dapi.getIdentityBalance(identity.identifier)
-      return { ...identity, balance }
-    }))
-
-    response.send({ ...identities, resultSet: identitiesWithBalance })
+    response.send(identities)
   }
 
   getTransactionsByIdentity = async (request, response) => {

packages/api/src/controllers/MainController.js

@@ -15,8 +15,8 @@ class MainController {
     this.blocksDAO = new BlocksDAO(knex)
     this.dataContractsDAO = new DataContractsDAO(knex)
     this.documentsDAO = new DocumentsDAO(knex)
-    this.transactionsDAO = new TransactionsDAO(knex)
-    this.identitiesDAO = new IdentitiesDAO(knex)
+    this.transactionsDAO = new TransactionsDAO(knex, dapi)
+    this.identitiesDAO = new IdentitiesDAO(knex, dapi)
     this.validatorsDAO = new ValidatorsDAO(knex)
     this.dapi = dapi
   }
@@ -115,9 +115,7 @@ class MainController {
       const identity = await this.identitiesDAO.getIdentityByIdentifier(query)
 
       if (identity) {
-        const balance = await this.dapi.getIdentityBalance(identity.identifier)
-
-        return response.send({ identity: { ...identity, balance } })
+        return response.send({ identity })
       }
 
       // search data contracts
@@ -135,13 +133,12 @@ class MainController {
       }
     }
 
+    // by dpns name
     if (/^[^\s.]+(\.[^\s.]+)*$/.test(query)) {
-      const identity = await this.identitiesDAO.getIdentityByDPNS(query)
+      const identity = await this.identitiesDAO.getIdentityByDPNSName(query)
 
       if (identity) {
-        const balance = await this.dapi.getIdentityBalance(identity.identifier)
-
-        return response.send({ identity: { ...identity, balance } })
+        return response.send({ identity })
       }
     }
 

packages/api/src/controllers/TransactionsController.js

@@ -3,9 +3,10 @@ const utils = require('../utils')
 const { calculateInterval } = require('../utils')
 
 class TransactionsController {
-  constructor (client, knex) {
+  constructor (client, knex, dapi) {
     this.client = client
-    this.transactionsDAO = new TransactionsDAO(knex)
+    this.transactionsDAO = new TransactionsDAO(knex, dapi)
+    this.dapi = dapi
   }
 
   getTransactionByHash = async (request, reply) => {