Merge pull request #85 from 0xPolygonID/feature/use-latest-jsonld-mer…

…klizer

Use latest JSON-LD merklizer

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xpolygonid/js-sdk",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-beta.10",
   "description": "SDK to work with Polygon ID",
   "main": "dist/cjs/index.js",
   "module": "dist/esm_esbuild/index.js",
@@ -67,7 +67,7 @@
   "dependencies": {
     "@iden3/js-crypto": "1.0.0-beta.1",
     "@iden3/js-iden3-core": "1.0.0-beta.2",
-    "@iden3/js-jsonld-merklization": "1.0.0-beta.8",
+    "@iden3/js-jsonld-merklization": "1.0.0-beta.15",
     "@iden3/js-jwz": "1.0.0-beta.2",
     "@iden3/js-merkletree": "1.0.0-beta.4",
     "@lumeweb/js-sha3-browser": "^0.8.1",

src/circuits/common.ts

@@ -68,7 +68,6 @@ export class BaseConfig {
   getMTLevelOnChain(): number {
     return this.mtLevelOnChain ? this.mtLevelOnChain : defaultMTLevelsOnChain;
   }
-
 }
 
 /**

src/circuits/models.ts

@@ -70,7 +70,7 @@ export enum CircuitId {
   // AtomicQuerySig is a type for credentialAttrQuerySig.circom
   AtomicQuerySigV2 = 'credentialAtomicQuerySigV2',
   // AtomicQuerySigOnChain is a type for credentialAtomicQuerySigOnChain.circom
-  AtomicQuerySigV2OnChain = 'credentialAtomicQuerySigV2OnChain',
+  AtomicQuerySigV2OnChain = 'credentialAtomicQuerySigV2OnChain'
 }
 
 /**

src/credentials/status/on-chain-revocation.ts

@@ -21,9 +21,12 @@ export class OnChainResolver implements CredentialStatusResolver {
    */
   constructor(private readonly _configs: EthConnectionConfig[]) {}
 
-  async resolve(credentialStatus: CredentialStatus, opts: {
-    issuer: DID;
-  }): Promise<RevocationStatus> {
+  async resolve(
+    credentialStatus: CredentialStatus,
+    opts: {
+      issuer: DID;
+    }
+  ): Promise<RevocationStatus> {
     return this.getRevocationOnChain(credentialStatus, opts.issuer);
   }
 
@@ -34,10 +37,11 @@ export class OnChainResolver implements CredentialStatusResolver {
    * @param {DID} issuerDid - issuer did
    * @returns Promise<RevocationStatus>
    */
-  async getRevocationOnChain(credentialStatus: CredentialStatus, issuer: DID): Promise<RevocationStatus> {
-    const { contractAddress, chainId, revocationNonce } = this.parseOnChainId(
-      credentialStatus.id
-    );
+  async getRevocationOnChain(
+    credentialStatus: CredentialStatus,
+    issuer: DID
+  ): Promise<RevocationStatus> {
+    const { contractAddress, chainId, revocationNonce } = this.parseOnChainId(credentialStatus.id);
     if (revocationNonce !== credentialStatus.revocationNonce) {
       throw new Error('revocationNonce does not match');
     }

src/iden3comm/handlers/auth.ts

@@ -250,7 +250,7 @@ export class AuthHandler implements IAuthHandler {
         {
           authProfileNonce: authProfileNonce,
           credentialSubjectProfileNonce: r.credentialSubjectProfileNonce,
-          skipRevocation: false,
+          skipRevocation: false
         }
       );
 

src/identity/identity-wallet.ts

@@ -21,7 +21,6 @@ import { JSONSchema, Parser, CoreClaimOptions } from '../schema-processor';
 import { IDataStorage } from '../storage/interfaces/data-storage';
 import { MerkleTreeType } from '../storage/entities/mt';
 import { getRandomBytes, keyPath } from '../kms/provider-helpers';
-import { UniversalSchemaLoader } from '../loaders';
 import {
   VerifiableConstants,
   BJJSignatureProof2021,
@@ -37,7 +36,8 @@ import {
 import { CredentialRequest, ICredentialWallet } from '../credentials';
 import { pushHashesToRHS, TreesModel } from '../credentials/rhs';
 import { TreeState } from '../circuits';
-import { byteDecoder } from '../utils';
+import { byteEncoder } from '../utils';
+import { Options, Path, getDocumentLoader } from '@iden3/js-jsonld-merklization';
 
 /**
  * DID creation options
@@ -539,13 +539,22 @@ export class IdentityWallet implements IIdentityWallet {
   }
 
   /** {@inheritDoc IIdentityWallet.issueCredential} */
-  async issueCredential(issuerDID: DID, req: CredentialRequest): Promise<W3CCredential> {
+  async issueCredential(
+    issuerDID: DID,
+    req: CredentialRequest,
+    opts?: Options
+  ): Promise<W3CCredential> {
     req.revocationOpts.id = req.revocationOpts.id.replace(/\/$/, '');
 
-    const schema = await new UniversalSchemaLoader('ipfs.io').load(req.credentialSchema);
-
-    const jsonSchema: JSONSchema = JSON.parse(byteDecoder.decode(schema));
+    let schema: object;
+    const loader = getDocumentLoader(opts);
+    try {
+      schema = (await loader(req.credentialSchema)).document;
+    } catch (e) {
+      throw new Error(`can't load credential schema ${req.credentialSchema}`);
+    }
 
+    const jsonSchema = schema as JSONSchema;
     let credential: W3CCredential = new W3CCredential();
 
     req.revocationOpts.nonce =
@@ -568,13 +577,29 @@ export class IdentityWallet implements IIdentityWallet {
       subjectPosition: req.subjectPosition,
       merklizedRootPosition: this.defineMTRootPosition(jsonSchema, req.merklizedRootPosition),
       updatable: false,
-      version: 0
+      version: 0,
+      merklizeOpts: opts
     };
 
+    let jsonLDCtx: object;
+    try {
+      jsonLDCtx = (await loader(jsonSchema.$metadata.uris.jsonLdContext)).document;
+    } catch (e) {
+      throw new Error(`can't load json-ld schema ${jsonSchema.$metadata.uris.jsonLdContext}`);
+    }
+
+    const schemaBytes = byteEncoder.encode(JSON.stringify(jsonSchema));
+
+    const credentialType = await Path.getTypeIDFromContext(
+      JSON.stringify(jsonLDCtx),
+      req.type,
+      opts
+    );
+
     const coreClaim = await new Parser().parseClaim(
       credential,
-      `${jsonSchema.$metadata.uris['jsonLdContext']}#${req.type}`,
-      schema,
+      credentialType,
+      schemaBytes,
       coreClaimOpts
     );
 

src/index.ts

@@ -11,4 +11,6 @@ export * from './loaders';
 export * from './iden3comm/handlers';
 export * from './utils';
 import * as core from '@iden3/js-iden3-core';
+import * as jsonLDMerklizer from '@iden3/js-jsonld-merklization';
 export { core };
+export { jsonLDMerklizer };

src/loaders/index.ts

@@ -1,2 +1 @@
 export * from './key';
-export * from './schema';