test: register revocation registry definition and status list

Signed-off-by: Berend Sliedrecht <sliedrecht@berend.io>
openwallet-foundation · Jan 16, 2024 · 5c6e03c · 5c6e03c
1 parent 419443b
commit 5c6e03c
Show file tree

Hide file tree

Showing 12 changed files with 359 additions and 264 deletions.
diff --git a/demo/package.json b/demo/package.json
@@ -14,7 +14,7 @@
     "refresh": "rm -rf ./node_modules ./yarn.lock && yarn"
   },
   "dependencies": {
-    "@hyperledger/indy-vdr-nodejs": "^0.2.0-dev.5",
+    "@hyperledger/indy-vdr-nodejs": "^0.2.0-dev.6",
     "@hyperledger/anoncreds-nodejs": "^0.2.0-dev.5",
     "@hyperledger/aries-askar-nodejs": "^0.2.0-dev.5",
     "inquirer": "^8.2.5"

diff --git a/packages/anoncreds/src/models/registry.ts b/packages/anoncreds/src/models/registry.ts
@@ -39,7 +39,5 @@ export interface AnonCredsRevocationStatusList {
   revRegDefId: string
   revocationList: Array<number>
   currentAccumulator: string
-  issued?: Array<number>
-  revoked?: Array<number>
   timestamp: number
 }
diff --git a/packages/anoncreds/src/utils/indyIdentifiers.ts b/packages/anoncreds/src/utils/indyIdentifiers.ts
@@ -50,15 +50,6 @@ export function getUnqualifiedRevocationRegistryDefinitionId(
   return `${unqualifiedDid}:4:${unqualifiedDid}:3:CL:${schemaSeqNo}:${credentialDefinitionTag}:CL_ACCUM:${revocationRegistryTag}`
 }
 
-export function getUnqualifiedRevocationRegistryEntryId(
-  unqualifiedDid: string,
-  schemaSeqNo: string | number,
-  credentialDefinitionTag: string,
-  revocationRegistryTag: string
-) {
-  return `${unqualifiedDid}:5:${unqualifiedDid}:3:CL:${schemaSeqNo}:${credentialDefinitionTag}:CL_ACCUM:${revocationRegistryTag}`
-}
-
 export function isUnqualifiedCredentialDefinitionId(credentialDefinitionId: string) {
   return unqualifiedCredentialDefinitionIdRegex.test(credentialDefinitionId)
 }

diff --git a/packages/anoncreds/tests/InMemoryAnonCredsRegistry.ts b/packages/anoncreds/tests/InMemoryAnonCredsRegistry.ts
@@ -25,7 +25,7 @@ import BigNumber from 'bn.js'
 
 import {
   getDidIndyCredentialDefinitionId,
-  getDidIndyRevocationRegistryId,
+  getDidIndyRevocationRegistryDefinitionId,
   getDidIndySchemaId,
 } from '../../indy-sdk/src/anoncreds/utils/identifiers'
 import {
@@ -249,7 +249,7 @@ export class InMemoryAnonCredsRegistry implements AnonCredsRegistry {
 
     const { namespace, namespaceIdentifier } = parseIndyDid(options.revocationRegistryDefinition.issuerId)
     const legacyIssuerId = namespaceIdentifier
-    const didIndyRevocationRegistryDefinitionId = getDidIndyRevocationRegistryId(
+    const didIndyRevocationRegistryDefinitionId = getDidIndyRevocationRegistryDefinitionId(
       namespace,
       namespaceIdentifier,
       indyLedgerSeqNo,

diff --git a/packages/indy-sdk/src/anoncreds/utils/__tests__/identifiers.test.ts b/packages/indy-sdk/src/anoncreds/utils/__tests__/identifiers.test.ts
@@ -1,6 +1,6 @@
 import {
   getDidIndyCredentialDefinitionId,
-  getDidIndyRevocationRegistryId,
+  getDidIndyRevocationRegistryDefinitionId,
   getDidIndySchemaId,
   indySdkAnonCredsRegistryIdentifierRegex,
 } from '../identifiers'
@@ -72,7 +72,7 @@ describe('identifiers', () => {
     const credentialDefinitionTag = 'someTag'
     const tag = 'anotherTag'
 
-    expect(getDidIndyRevocationRegistryId(namespace, did, seqNo, credentialDefinitionTag, tag)).toEqual(
+    expect(getDidIndyRevocationRegistryDefinitionId(namespace, did, seqNo, credentialDefinitionTag, tag)).toEqual(
       'did:indy:sovrin:test:12345/anoncreds/v0/REV_REG_DEF/420/someTag/anotherTag'
     )
   })

diff --git a/packages/indy-sdk/src/anoncreds/utils/identifiers.ts b/packages/indy-sdk/src/anoncreds/utils/identifiers.ts
@@ -46,18 +46,18 @@ export function getDidIndySchemaId(namespace: string, unqualifiedDid: string, na
 export function getDidIndyCredentialDefinitionId(
   namespace: string,
   unqualifiedDid: string,
-  seqNo: string | number,
+  schemaSeqNo: string | number,
   tag: string
 ) {
-  return `did:indy:${namespace}:${unqualifiedDid}/anoncreds/v0/CLAIM_DEF/${seqNo}/${tag}`
+  return `did:indy:${namespace}:${unqualifiedDid}/anoncreds/v0/CLAIM_DEF/${schemaSeqNo}/${tag}`
 }
 
-export function getDidIndyRevocationRegistryId(
+export function getDidIndyRevocationRegistryDefinitionId(
   namespace: string,
   unqualifiedDid: string,
-  seqNo: string | number,
+  schemaSeqNo: string | number,
   credentialDefinitionTag: string,
   revocationRegistryTag: string
 ) {
-  return `did:indy:${namespace}:${unqualifiedDid}/anoncreds/v0/REV_REG_DEF/${seqNo}/${credentialDefinitionTag}/${revocationRegistryTag}`
+  return `did:indy:${namespace}:${unqualifiedDid}/anoncreds/v0/REV_REG_DEF/${schemaSeqNo}/${credentialDefinitionTag}/${revocationRegistryTag}`
 }
diff --git a/packages/indy-sdk/src/anoncreds/utils/transform.ts b/packages/indy-sdk/src/anoncreds/utils/transform.ts
@@ -103,8 +103,6 @@ export function anonCredsRevocationStatusListFromIndySdk(
   return {
     issuerId: revocationRegistryDefinition.issuerId,
     currentAccumulator: delta.value.accum,
-    revoked: delta.value.revoked,
-    issued: delta.value.issued,
     revRegDefId: revocationRegistryDefinitionId,
     revocationList,
     timestamp,

diff --git a/packages/indy-vdr/package.json b/packages/indy-vdr/package.json
@@ -28,8 +28,8 @@
     "@aries-framework/core": "0.4.2"
   },
   "devDependencies": {
-    "@hyperledger/indy-vdr-nodejs": "^0.2.0-dev.5",
-    "@hyperledger/indy-vdr-shared": "^0.2.0-dev.5",
+    "@hyperledger/indy-vdr-nodejs": "^0.2.0-dev.6",
+    "@hyperledger/indy-vdr-shared": "^0.2.0-dev.6",
     "@stablelib/ed25519": "^1.0.2",
     "@types/ref-array-di": "^1.2.6",
     "@types/ref-struct-di": "^1.1.10",
@@ -38,6 +38,6 @@
     "typescript": "~4.9.5"
   },
   "peerDependencies": {
-    "@hyperledger/indy-vdr-shared": "^0.2.0-dev.5"
+    "@hyperledger/indy-vdr-shared": "^0.2.0-dev.6"
   }
 }