fix(cheqd): cheqd revocationRegistryDefinition resource name (#2139)

Signed-off-by: DaevMithran <daevmithran1999@gmail.com>

Author: DaevMithran

.changeset/wet-pianos-walk.md

@@ -0,0 +1,7 @@
+---
+"@credo-ts/cheqd": patch
+---
+
+fix(cheqd): cheqd revocationRegistryDefinition resource name
+
+Creating two revocation registries with same name would lead to updating the resource. Adding credential definition tag in the resource name fixes this issue

packages/cheqd/package.json

@@ -26,8 +26,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "@cheqd/sdk": "2.5.1",
-    "@cheqd/ts-proto": "~2.3.2",
+    "@cheqd/sdk": "~2.6.0",
+    "@cheqd/ts-proto": "~2.4.0",
     "@cosmjs/crypto": "~0.30.0",
     "@cosmjs/proto-signing": "~0.30.0",
     "@cosmjs/stargate": "~0.30.0",

packages/cheqd/src/anoncreds/services/CheqdAnonCredsRegistry.ts

@@ -19,7 +19,11 @@ import type { AgentContext } from '@credo-ts/core'
 import { CredoError, Hasher, JsonTransformer, TypedArrayEncoder, utils } from '@credo-ts/core'
 
 import { CheqdDidResolver, CheqdDidRegistrar } from '../../dids'
-import { cheqdSdkAnonCredsRegistryIdentifierRegex, parseCheqdDid } from '../utils/identifiers'
+import {
+  cheqdAnonCredsResourceTypes,
+  cheqdSdkAnonCredsRegistryIdentifierRegex,
+  parseCheqdDid,
+} from '../utils/identifiers'
 import {
   CheqdCredentialDefinition,
   CheqdRevocationRegistryDefinition,
@@ -87,7 +91,7 @@ export class CheqdAnonCredsRegistry implements AnonCredsRegistry {
       const schemaResource = {
         id: utils.uuid(),
         name: `${schema.name}-Schema`,
-        resourceType: 'anonCredsSchema',
+        resourceType: cheqdAnonCredsResourceTypes.schema,
         data: {
           name: schema.name,
           version: schema.version,
@@ -145,7 +149,7 @@ export class CheqdAnonCredsRegistry implements AnonCredsRegistry {
       const credDefResource = {
         id: utils.uuid(),
         name: TypedArrayEncoder.toHex(credDefNameHashBuffer),
-        resourceType: 'anonCredsCredDef',
+        resourceType: cheqdAnonCredsResourceTypes.credentialDefinition,
         data: {
           type: credentialDefinition.type,
           tag: credentialDefinition.tag,
@@ -250,9 +254,9 @@ export class CheqdAnonCredsRegistry implements AnonCredsRegistry {
 
       const searchDid = parsedDid.path
         ? revocationRegistryDefinitionId
-        : `${revocationRegistryDefinitionId}${
-            revocationRegistryDefinitionId.includes('?') ? '&' : '?'
-          }resourceType=anonCredsRevocRegDef`
+        : `${revocationRegistryDefinitionId}${revocationRegistryDefinitionId.includes('?') ? '&' : '?'}resourceType=${
+            cheqdAnonCredsResourceTypes.revocationRegistryDefinition
+          }`
 
       const response = await cheqdDidResolver.resolveResource(agentContext, searchDid)
       const revocationRegistryDefinition = JsonTransformer.fromJSON(
@@ -306,10 +310,13 @@ export class CheqdAnonCredsRegistry implements AnonCredsRegistry {
 
       const cheqdDidRegistrar = agentContext.dependencyManager.resolve(CheqdDidRegistrar)
 
+      const revocDefName = `${credentialDefinitionName}-${revocationRegistryDefinition.tag}`
+      const revocDefNameHashedBuffer = Hasher.hash(revocDefName, 'sha-256')
+
       const revocationRegistryDefinitionResource = {
         id: utils.uuid(),
-        name: credentialDefinitionName as string,
-        resourceType: 'anonCredsRevocRegDef',
+        name: TypedArrayEncoder.toHex(revocDefNameHashedBuffer),
+        resourceType: cheqdAnonCredsResourceTypes.revocationRegistryDefinition,
         data: {
           credDefId: revocationRegistryDefinition.credDefId,
           revocDefType: revocationRegistryDefinition.revocDefType,
@@ -385,7 +392,7 @@ export class CheqdAnonCredsRegistry implements AnonCredsRegistry {
 
       const response = await cheqdDidResolver.resolveResource(
         agentContext,
-        `${parsedDid.did}?resourceType=anonCredsStatusList&resourceVersionTime=${timestamp}&resourceName=${revocationRegistryDefinitionName}`
+        `${parsedDid.did}?resourceType=${cheqdAnonCredsResourceTypes.revocationStatusList}&resourceVersionTime=${timestamp}&resourceName=${revocationRegistryDefinitionName}`
       )
 
       const revocationStatusList = JsonTransformer.fromJSON(response.resource, CheqdRevocationStatusList)
@@ -444,7 +451,7 @@ export class CheqdAnonCredsRegistry implements AnonCredsRegistry {
       const revocationStatusListResource = {
         id: utils.uuid(),
         name: revocationRegistryDefinitionName as string,
-        resourceType: 'anonCredsStatusList',
+        resourceType: cheqdAnonCredsResourceTypes.revocationStatusList,
         data: {
           currentAccumulator: revocationStatusList.currentAccumulator,
           revRegDefId: revocationStatusList.revRegDefId,

packages/cheqd/src/anoncreds/utils/identifiers.ts

@@ -63,3 +63,10 @@ export function parseCheqdDid(didUrl: string): ParsedCheqdDid | null {
   }
   return null
 }
+
+export const cheqdAnonCredsResourceTypes = {
+  schema: 'anonCredsSchema',
+  credentialDefinition: 'anonCredsCredDef',
+  revocationRegistryDefinition: 'anonCredsRevocRegDef',
+  revocationStatusList: 'anonCredsStatusList',
+}