Merge pull request #194 from alastria/feature/193-createNewGetCurrent…

…PublicKeyFunction Feature/193 create new get current public key function
alastria · May 20, 2024 · 079a097 · 079a097
2 parents 7d56a55 + dcbe2e3
commit 079a097
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alastria-identity-lib",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "A library to interact with alastria-identity smart contracts",
   "main": "src/index.js",
   "bin": {

diff --git a/src/txFactory/publicKeyRegistryTransactionFactory.ts b/src/txFactory/publicKeyRegistryTransactionFactory.ts
@@ -105,7 +105,7 @@ export function deletePublicKeyHash(web3, publicKeyHash) {
 }
 
 /**
- * function getCurrentPublicKey(address subject) view public validAddress(subject) returns (string)
+ * THIS METHOD WILL BE DEPREATED
  * @param web3
  * @param did
  */
@@ -121,6 +121,23 @@ export function getCurrentPublicKey(web3, did) {
   return transaction
 }
 
+/**
+ * @param web3
+ * @param did
+ * @param publicKeyHash
+ */
+export function getCurrentPublicKeyHash(web3, did, publicKeyHash) {
+  const subjectAddr = AIdUtils.getProxyAddress(did)
+  const transaction = Object.assign({}, config.basicTransaction)
+  transaction.data = web3.eth.abi.encodeFunctionCall(
+    config.contractsAbi.AlastriaPublicKeyRegistry.getCurrentPublicKey,
+    [subjectAddr, publicKeyHash]
+  )
+  transaction.to = config.alastriaPublicKeyRegistry
+  transaction.gasLimit = 600000
+  return transaction
+}
+
 /**
  * THIS METHOD WILL BE DEPREATED
  * @param web3

diff --git a/src/txFactory/transactionFactory.ts b/src/txFactory/transactionFactory.ts
@@ -56,7 +56,8 @@ import {
   getPublicKeyStatusHash,
   deletePublicKeyHash,
   revokePublicKeyHash,
-  addPublicKey
+  addPublicKey,
+  getCurrentPublicKeyHash
 } from './publicKeyRegistryTransactionFactory'
 
 export const transactionFactory = {
@@ -109,6 +110,7 @@ export const transactionFactory = {
     deletePublicKey: deletePublicKey,
     deletePublicKeyHash: deletePublicKeyHash,
     getCurrentPublicKey: getCurrentPublicKey,
+    getCurrentPublicKeyHash: getCurrentPublicKeyHash,
     getPublicKeyStatus: getPublicKeyStatus,
     getPublicKeyStatusHash: getPublicKeyStatusHash,
     getPublicKeyStatusDecodedAsJSON: getPublicKeyStatusDecodedAsJSON,