fix: anoncreds revocation and presentations working

Signed-off-by: ryankoch13 <[email protected]>

Author: ryankoch13

packages/anoncreds/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@credo-ts/anoncreds",
-  "main": "src/index",
-  "types": "src/index",
-  "version": "0.5.6",
+  "main": "build/index",
+  "types": "build/index",
+  "version": "0.5.6-revocation",
   "files": [
     "build"
   ],
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@astronautlabs/jsonpath": "^1.1.2",
-    "@credo-ts/core": "file:./../core",
+    "@credo-ts/core": "0.5.6-revocation",
     "@sphereon/pex-models": "^2.2.4",
     "big-integer": "^1.6.51",
     "bn.js": "^5.2.1",

packages/anoncreds/src/utils/w3cAnonCredsUtils.ts

@@ -186,6 +186,14 @@ export function getStoreCredentialOptions(
   return storeCredentialOptions
 }
 
+// The issuer of the schema does not always match the issuer of the credential definition thus the unqualified schema id needs to be derived from both values
+function getUnqualifiedSchemaId(schemaIssuerId: string, schemaId: string) {
+  const schemaDid = schemaIssuerId.split(':')[3]
+  const split = getUnQualifiedDidIndyDid(schemaId).split(':')
+  split[0] = schemaDid
+  return split.join(':')
+}
+
 export function getW3cRecordAnonCredsTags(options: {
   credentialSubject: W3cCredentialSubject
   issuerId: string
@@ -222,7 +230,7 @@ export function getW3cRecordAnonCredsTags(options: {
     ...((isIndyDid(issuerId) || isUnqualifiedIndyDid(issuerId)) && {
       anonCredsUnqualifiedIssuerId: getUnQualifiedDidIndyDid(issuerId),
       anonCredsUnqualifiedCredentialDefinitionId: getUnQualifiedDidIndyDid(credentialDefinitionId),
-      anonCredsUnqualifiedSchemaId: getUnQualifiedDidIndyDid(issuerId),
+      anonCredsUnqualifiedSchemaId: getUnqualifiedSchemaId(schema.issuerId, schemaId),
       anonCredsUnqualifiedSchemaIssuerId: getUnQualifiedDidIndyDid(schema.issuerId),
       anonCredsUnqualifiedRevocationRegistryId: revocationRegistryId
         ? getUnQualifiedDidIndyDid(revocationRegistryId)

packages/core/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@credo-ts/core",
-  "main": "src/index",
-  "types": "src/index",
-  "version": "0.5.6",
+  "main": "build/index",
+  "types": "build/index",
+  "version": "0.5.6-revocation",
   "files": [
     "build"
   ],

packages/core/src/modules/dids/domain/DidDocument.ts

@@ -114,7 +114,7 @@ export class DidDocument {
     // TODO: once we use JSON-LD we should use that to resolve references in did documents.
     // for now we check whether the key id ends with the keyId.
     // so if looking for #123 and key.id is did:key:123#123, it is valid. But #123 as key.id is also valid
-    const verificationMethod = this.verificationMethod?.find((key) => key.id.endsWith(keyId))
+    const verificationMethod = this.verificationMethod?.find((key) => key.id.endsWith(keyId) || key.controller === keyId)
 
     if (!verificationMethod) {
       throw new CredoError(`Unable to locate verification method with id '${keyId}'`)

packages/core/src/modules/dids/domain/verificationMethod/Bls12381G1Key2020.ts

@@ -35,6 +35,13 @@ export function getKeyFromBls12381G1Key2020(verificationMethod: Bls12381G1Key202
   if (verificationMethod.publicKeyBase58) {
     return Key.fromPublicKeyBase58(verificationMethod.publicKeyBase58, KeyType.Bls12381g1)
   }
-
-  throw new CredoError('verification method is missing publicKeyBase58')
+  if (verificationMethod.publicKeyMultibase) {
+    const key = Key.fromFingerprint(verificationMethod.publicKeyMultibase)
+    if (key.keyType === KeyType.Bls12381g1) return key
+    else
+      throw new CredoError(
+        `Unexpected key type from resolving multibase encoding, key type was ${key.keyType} but expected ${KeyType.Bls12381g1}}`
+      )
+    }
+    throw new CredoError('verification method is missing publicKeyBase58 or publicKeyMultibase')
 }

packages/core/src/modules/dids/domain/verificationMethod/Bls12381G2Key2020.ts

@@ -35,6 +35,13 @@ export function getKeyFromBls12381G2Key2020(verificationMethod: Bls12381G2Key202
   if (verificationMethod.publicKeyBase58) {
     return Key.fromPublicKeyBase58(verificationMethod.publicKeyBase58, KeyType.Bls12381g2)
   }
-
-  throw new CredoError('verification method is missing publicKeyBase58')
+  if (verificationMethod.publicKeyMultibase) {
+    const key = Key.fromFingerprint(verificationMethod.publicKeyMultibase)
+    if (key.keyType === KeyType.Bls12381g2) return key
+    else
+      throw new CredoError(
+        `Unexpected key type from resolving multibase encoding, key type was ${key.keyType} but expected ${KeyType.Bls12381g2}}`
+      )
+    }
+    throw new CredoError('verification method is missing publicKeyBase58 or publicKeyMultibase')
 }

packages/core/src/modules/dids/domain/verificationMethod/EcdsaSecp256k1VerificationKey2019.ts

@@ -46,6 +46,13 @@ export function getKeyFromEcdsaSecp256k1VerificationKey2019(verificationMethod:
   if (verificationMethod.publicKeyBase58) {
     return Key.fromPublicKeyBase58(verificationMethod.publicKeyBase58, KeyType.K256)
   }
-
-  throw new CredoError('verification method is missing publicKeyBase58')
+  if (verificationMethod.publicKeyMultibase) {
+    const key = Key.fromFingerprint(verificationMethod.publicKeyMultibase)
+    if (key.keyType === KeyType.K256) return key
+    else
+      throw new CredoError(
+        `Unexpected key type from resolving multibase encoding, key type was ${key.keyType} but expected ${KeyType.K256}}`
+      )
+  }
+  throw new CredoError('verification method is missing publicKeyBase58 or publicKeyMultibase')
 }

packages/core/src/modules/dids/domain/verificationMethod/Ed25519VerificationKey2018.ts

@@ -37,6 +37,13 @@ export function getKeyFromEd25519VerificationKey2018(verificationMethod: Ed25519
   if (verificationMethod.publicKeyBase58) {
     return Key.fromPublicKeyBase58(verificationMethod.publicKeyBase58, KeyType.Ed25519)
   }
-
-  throw new CredoError('verification method is missing publicKeyBase58')
+  if (verificationMethod.publicKeyMultibase) {
+    const key = Key.fromFingerprint(verificationMethod.publicKeyMultibase)
+    if (key.keyType === KeyType.Ed25519) return key
+    else
+      throw new CredoError(
+        `Unexpected key type from resolving multibase encoding, key type was ${key.keyType} but expected ${KeyType.Ed25519}`
+      )
+    }
+    throw new CredoError('verification method is missing publicKeyBase58 or publicKeyMultibase')
 }

packages/core/src/modules/dids/domain/verificationMethod/X25519KeyAgreementKey2019.ts

@@ -44,7 +44,6 @@ export function getKeyFromX25519KeyAgreementKey2019(verificationMethod: X25519Ke
       throw new CredoError(
         `Unexpected key type from resolving multibase encoding, key type was ${key.keyType} but expected ${KeyType.X25519}`
       )
-  }
-
-  throw new CredoError('verification method is missing publicKeyBase58 or publicKeyMultibase')
+    }
+    throw new CredoError('verification method is missing publicKeyBase58 or publicKeyMultibase')
 }

packages/core/src/modules/dids/methods/peer/peerDidNumAlgo2.ts

@@ -72,7 +72,12 @@ export function didToNumAlgo2DidDocument(did: string) {
 
         service.id = `${did}#${service.type.toLowerCase()}-${serviceIndex++}`
 
-        didDocument.addService(JsonTransformer.fromJSON(service, DidDocumentService))
+        try {
+          didDocument.addService(JsonTransformer.fromJSON(service, DidDocumentService))
+        } catch (e) {
+          //If it is didCommv2 the json transform will throw
+          serviceIndex--
+        }
       }
     }
     // Otherwise we can be sure it is a key

packages/indy-vdr/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@credo-ts/indy-vdr",
-  "main": "src/index",
-  "types": "src/index",
-  "version": "0.5.6",
+  "main": "build/index",
+  "types": "build/index",
+  "version": "0.5.6-revocation",
   "files": [
     "build"
   ],
@@ -26,8 +26,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "@credo-ts/anoncreds": "file:./../anoncreds",
-    "@credo-ts/core": "file:./../core"
+    "@credo-ts/anoncreds": "0.5.6-revocation",
+    "@credo-ts/core": "0.5.6-revocation"
   },
   "devDependencies": {
     "@hyperledger/indy-vdr-nodejs": "^0.2.2",

packages/indy-vdr/src/anoncreds/IndyVdrAnonCredsRegistry.ts

@@ -31,7 +31,7 @@ import type {
   RegisterRevocationStatusListOptions,
 } from '@credo-ts/anoncreds'
 import type { AgentContext } from '@credo-ts/core'
-import type { SchemaResponse } from '@hyperledger/indy-vdr-shared'
+import type { GetCredentialDefinitionResponse, SchemaResponse } from '@hyperledger/indy-vdr-shared'
 
 import {
   getUnqualifiedCredentialDefinitionId,
@@ -268,7 +268,7 @@ export class IndyVdrAnonCredsRegistry implements AnonCredsRegistry {
       agentContext.config.logger.trace(
         `Submitting get credential definition request for credential definition '${credentialDefinitionId}' to ledger '${pool.indyNamespace}'`
       )
-      const response = await pool.submitRequest(request)
+      const response: GetCredentialDefinitionResponse = await pool.submitRequest(request)
 
       // We need to fetch the schema to determine the schemaId (we only have the seqNo)
       const schema = await this.fetchIndySchemaWithSeqNo(agentContext, response.result.ref, namespaceIdentifier)
@@ -979,7 +979,7 @@ export class IndyVdrAnonCredsRegistry implements AnonCredsRegistry {
     }
 
     const schema = response.result.data?.txn.data as SchemaType
-    const schemaDid = response.result.data?.txn.metadata.from as string
+    const schemaDid = response.result.data?.txn.metadata['from'] as string
     const schemaId = getUnqualifiedSchemaId(schemaDid, schema.data.name, schema.data.version)
 
     return {