Merge pull request #254 from pshenmic/feat/validators-hash

Identity field for Validators
pshenmic · Sep 6, 2024 · ce9cf93 · ce9cf93
2 parents ccd5873 + 5e9d3b4
commit ce9cf93
Show file tree

Hide file tree

Showing 6 changed files with 644 additions and 499 deletions.
diff --git a/packages/api/README.md b/packages/api/README.md
@@ -263,7 +263,8 @@ GET /validators
             payoutAddress: "yeRZBWYfeNE4yVUHV4ZLs83Ppn9aMRH57A",
             pubKeyOperator: "b928fa4e127214ccb2b5de1660b5e371d2f3c9845077bc3900fc6aabe82ddd2e61530be3765cea15752e30fc761ab730"
         }
-      }
+      },
+      identity: "8tsWRSwsTM5AXv4ViCF9gu39kzjbtfFDM6rCyL2RcFzd"
     }, ...
   ],
   pagination: { 
@@ -318,7 +319,8 @@ GET /validator/F60A6BF9EC0794BB0CFD1E0F2217933F4B33EDE6FE810692BC275CA18148AEF0
         payoutAddress: "yeRZBWYfeNE4yVUHV4ZLs83Ppn9aMRH57A",
         pubKeyOperator: "b928fa4e127214ccb2b5de1660b5e371d2f3c9845077bc3900fc6aabe82ddd2e61530be3765cea15752e30fc761ab730"
     }
-  }
+  },
+  "identity: "8tsWRSwsTM5AXv4ViCF9gu39kzjbtfFDM6rCyL2RcFzd"
 }
 ```
 ---

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -17,6 +17,7 @@
     "@dashevo/dashd-rpc": "^19.0.0",
     "@fastify/cors": "^8.3.0",
     "@scure/base": "^1.1.5",
+    "bs58": "^6.0.0",
     "dash": "4.2.0",
     "dotenv": "^16.3.1",
     "fastify": "^4.21.0",

diff --git a/packages/api/src/controllers/ValidatorsController.js b/packages/api/src/controllers/ValidatorsController.js
@@ -55,11 +55,12 @@ class ValidatorsController {
     return response.send({
       ...validators,
       resultSet: validatorsWithInfo.map(validator =>
-        new Validator(validator.proTxHash, activeValidators.some(activeValidator =>
-          activeValidator.pro_tx_hash === validator.proTxHash),
-        validator.proposedBlocksAmount,
-        validator.lastProposedBlockHeader,
-        ProTxInfo.fromObject(validator.proTxInfo)
+        new Validator(
+          validator.proTxHash, activeValidators.some(activeValidator =>
+            activeValidator.pro_tx_hash === validator.proTxHash),
+          validator.proposedBlocksAmount,
+          validator.lastProposedBlockHeader,
+          ProTxInfo.fromObject(validator.proTxInfo)
         )
       )
     })

diff --git a/packages/api/src/models/Validator.js b/packages/api/src/models/Validator.js
@@ -1,12 +1,15 @@
 /* eslint-disable camelcase */
 const BlockHeader = require('./BlockHeader')
+const Base58 = require('bs58').default
 
 module.exports = class Validator {
   proTxHash
   isActive
   proposedBlocksAmount
   lastProposedBlockHeader
   proTxInfo
+  identity
+
   constructor (
     proTxHash,
     isActive,
@@ -19,6 +22,7 @@ module.exports = class Validator {
     this.proposedBlocksAmount = proposedBlocksAmount ?? null
     this.lastProposedBlockHeader = lastProposedBlockHeader ?? null
     this.proTxInfo = proTxInfo ?? null
+    this.identity = proTxHash ? Base58.encode(Buffer.from(proTxHash, 'hex')) : null
   }
 
   static fromRow ({