@0xpolygonid/js-sdk 1.8.1 → 1.8.2

package/dist/node/cjs/credentials/credential-wallet.js

@@ -115,6 +115,16 @@ class CredentialWallet {
         }
         throw new Error('all auth bjj credentials are revoked');
     }
+    /**
+     * {@inheritDoc ICredentialWallet.getAllAuthBJJCredentials}
+     */
+    async getAllAuthBJJCredentials(did) {
+        return this._storage.credential.findCredentialsByQuery({
+            context: verifiable_1.VerifiableConstants.AUTH.AUTH_BJJ_CREDENTIAL_SCHEMA_JSONLD_URL,
+            type: verifiable_1.VerifiableConstants.AUTH.AUTH_BJJ_CREDENTIAL_TYPE,
+            allowedIssuers: [did.string()]
+        });
+    }
     /**
      * {@inheritDoc ICredentialWallet.getRevocationStatusFromCredential}
      */

package/dist/node/cjs/identity/identity-wallet.js

@@ -61,13 +61,19 @@ class IdentityWallet {
         this._storage = _storage;
         this._credentialWallet = _credentialWallet;
         this._opts = _opts;
+        this._credentialStatusPublisherRegistry = this.getCredentialStatusPublisherRegistry(_opts);
+    }
+    getCredentialStatusPublisherRegistry(_opts) {
         if (!_opts?.credentialStatusPublisherRegistry) {
-            this._credentialStatusPublisherRegistry = new credential_status_publisher_1.CredentialStatusPublisherRegistry();
-            this._credentialStatusPublisherRegistry.register(verifiable_1.CredentialStatusType.Iden3ReverseSparseMerkleTreeProof, new credential_status_publisher_1.Iden3SmtRhsCredentialStatusPublisher());
+            const registry = new credential_status_publisher_1.CredentialStatusPublisherRegistry();
+            const emptyPublisher = { publish: () => Promise.resolve() };
+            registry.register(verifiable_1.CredentialStatusType.Iden3ReverseSparseMerkleTreeProof, new credential_status_publisher_1.Iden3SmtRhsCredentialStatusPublisher());
+            registry.register(verifiable_1.CredentialStatusType.SparseMerkleTreeProof, emptyPublisher);
+            registry.register(verifiable_1.CredentialStatusType.Iden3commRevocationStatusV1, emptyPublisher);
+            return registry;
         }
         else {
-            this._credentialStatusPublisherRegistry = this._opts
-                ?.credentialStatusPublisherRegistry;
+            return this._opts?.credentialStatusPublisherRegistry;
         }
     }
     /**
@@ -305,7 +311,7 @@ class IdentityWallet {
         catch (e) {
             throw new Error(`Error create w3c credential ${e.message}`);
         }
-        const issuerAuthBJJCredential = await this._credentialWallet.getAuthBJJCredential(issuerDID);
+        const { authCredential: issuerAuthBJJCredential } = await this.getActualAuthCredential(issuerDID);
         const coreClaimOpts = {
             revNonce: req.revocationOpts.nonce,
             subjectPosition: req.subjectPosition,
@@ -314,7 +320,7 @@ class IdentityWallet {
             version: 0,
             merklizeOpts: { ...opts, documentLoader: loader }
         };
-        const coreClaim = await schema_processor_1.Parser.parseClaim(credential, coreClaimOpts);
+        const coreClaim = await credential.toCoreClaim(coreClaimOpts);
         const { hi, hv } = coreClaim.hiHv();
         const coreClaimHash = js_crypto_1.poseidon.hash([hi, hv]);
         const signature = await this.signChallenge(coreClaimHash, issuerAuthBJJCredential);
@@ -339,6 +345,25 @@ class IdentityWallet {
         credential.proof = [sigProof];
         return credential;
     }
+    /** {@inheritDoc IIdentityWallet.getActualAuthCredential} */
+    async getActualAuthCredential(did, treeStateInfo) {
+        const authCredentials = await this._credentialWallet.getAllAuthBJJCredentials(did);
+        for (let i = 0; i < authCredentials.length; i++) {
+            const incProof = await this.generateCredentialMtp(did, authCredentials[i], treeStateInfo);
+            if (!incProof.proof.existence) {
+                continue;
+            }
+            const nonRevProof = await this.generateNonRevocationMtp(did, authCredentials[i], treeStateInfo);
+            if (!nonRevProof.proof.existence) {
+                return {
+                    authCredential: authCredentials[i],
+                    incProof,
+                    nonRevProof
+                };
+            }
+        }
+        throw new Error('no auth credentials found');
+    }
     /** {@inheritDoc IIdentityWallet.revokeCredential} */
     async revokeCredential(issuerDID, credential) {
         const issuerTree = await this.getDIDTreeModel(issuerDID);

package/dist/node/cjs/proof/provers/inputs-generator.js

@@ -265,8 +265,8 @@ class InputGenerator {
             circuitInputs.proofType = proofType;
             circuitInputs.linkNonce = params.linkNonce ?? BigInt(0);
             circuitInputs.verifierID = params.verifierDid ? js_iden3_core_1.DID.idFromDID(params.verifierDid) : undefined;
-            circuitInputs.nullifierSessionID = proofReq.params?.nullifierSessionID
-                ? BigInt(proofReq.params?.nullifierSessionID?.toString())
+            circuitInputs.nullifierSessionID = proofReq.params?.nullifierSessionId
+                ? BigInt(proofReq.params?.nullifierSessionId?.toString())
                 : BigInt(0);
             let isEthIdentity = true;
             try {
@@ -375,9 +375,7 @@ class InputGenerator {
         return circuitClaim;
     }
     async prepareAuthBJJCredential(did, treeStateInfo) {
-        const authCredential = await this._credentialWallet.getAuthBJJCredential(did);
-        const incProof = await this._identityWallet.generateCredentialMtp(did, authCredential, treeStateInfo);
-        const nonRevProof = await this._identityWallet.generateNonRevocationMtp(did, authCredential, treeStateInfo);
+        const { authCredential, incProof, nonRevProof } = await this._identityWallet.getActualAuthCredential(did, treeStateInfo);
         const authCoreClaim = authCredential.getCoreClaimFromProof(verifiable_1.ProofType.Iden3SparseMerkleTreeProof);
         if (!authCoreClaim) {
             throw new Error('auth core claim is not defined for auth bjj credential');

package/dist/node/esm/credentials/credential-wallet.js

@@ -89,6 +89,16 @@ export class CredentialWallet {
         }
         throw new Error('all auth bjj credentials are revoked');
     }
+    /**
+     * {@inheritDoc ICredentialWallet.getAllAuthBJJCredentials}
+     */
+    async getAllAuthBJJCredentials(did) {
+        return this._storage.credential.findCredentialsByQuery({
+            context: VerifiableConstants.AUTH.AUTH_BJJ_CREDENTIAL_SCHEMA_JSONLD_URL,
+            type: VerifiableConstants.AUTH.AUTH_BJJ_CREDENTIAL_TYPE,
+            allowedIssuers: [did.string()]
+        });
+    }
     /**
      * {@inheritDoc ICredentialWallet.getRevocationStatusFromCredential}
      */

package/dist/node/esm/identity/identity-wallet.js

@@ -4,7 +4,7 @@ import { poseidon, PublicKey, sha256, Signature, Hex, getRandomBytes } from '@id
 import { hashElems, ZERO_HASH } from '@iden3/js-merkletree';
 import { generateProfileDID, subjectPositionIndex } from './common';
 import * as uuid from 'uuid';
-import { Parser, JsonSchemaValidator, cacheLoader } from '../schema-processor';
+import { JsonSchemaValidator, cacheLoader } from '../schema-processor';
 import { MerkleTreeType } from '../storage';
 import { VerifiableConstants, BJJSignatureProof2021, MerklizedRootPosition, SubjectPosition, W3CCredential, Iden3SparseMerkleTreeProof, ProofType, CredentialStatusType } from '../verifiable';
 import { getKMSIdByAuthCredential, getNodesRepresentation, pushHashesToRHS } from '../credentials';
@@ -35,13 +35,19 @@ export class IdentityWallet {
         this._storage = _storage;
         this._credentialWallet = _credentialWallet;
         this._opts = _opts;
+        this._credentialStatusPublisherRegistry = this.getCredentialStatusPublisherRegistry(_opts);
+    }
+    getCredentialStatusPublisherRegistry(_opts) {
         if (!_opts?.credentialStatusPublisherRegistry) {
-            this._credentialStatusPublisherRegistry = new CredentialStatusPublisherRegistry();
-            this._credentialStatusPublisherRegistry.register(CredentialStatusType.Iden3ReverseSparseMerkleTreeProof, new Iden3SmtRhsCredentialStatusPublisher());
+            const registry = new CredentialStatusPublisherRegistry();
+            const emptyPublisher = { publish: () => Promise.resolve() };
+            registry.register(CredentialStatusType.Iden3ReverseSparseMerkleTreeProof, new Iden3SmtRhsCredentialStatusPublisher());
+            registry.register(CredentialStatusType.SparseMerkleTreeProof, emptyPublisher);
+            registry.register(CredentialStatusType.Iden3commRevocationStatusV1, emptyPublisher);
+            return registry;
         }
         else {
-            this._credentialStatusPublisherRegistry = this._opts
-                ?.credentialStatusPublisherRegistry;
+            return this._opts?.credentialStatusPublisherRegistry;
         }
     }
     /**
@@ -279,7 +285,7 @@ export class IdentityWallet {
         catch (e) {
             throw new Error(`Error create w3c credential ${e.message}`);
         }
-        const issuerAuthBJJCredential = await this._credentialWallet.getAuthBJJCredential(issuerDID);
+        const { authCredential: issuerAuthBJJCredential } = await this.getActualAuthCredential(issuerDID);
         const coreClaimOpts = {
             revNonce: req.revocationOpts.nonce,
             subjectPosition: req.subjectPosition,
@@ -288,7 +294,7 @@ export class IdentityWallet {
             version: 0,
             merklizeOpts: { ...opts, documentLoader: loader }
         };
-        const coreClaim = await Parser.parseClaim(credential, coreClaimOpts);
+        const coreClaim = await credential.toCoreClaim(coreClaimOpts);
         const { hi, hv } = coreClaim.hiHv();
         const coreClaimHash = poseidon.hash([hi, hv]);
         const signature = await this.signChallenge(coreClaimHash, issuerAuthBJJCredential);
@@ -313,6 +319,25 @@ export class IdentityWallet {
         credential.proof = [sigProof];
         return credential;
     }
+    /** {@inheritDoc IIdentityWallet.getActualAuthCredential} */
+    async getActualAuthCredential(did, treeStateInfo) {
+        const authCredentials = await this._credentialWallet.getAllAuthBJJCredentials(did);
+        for (let i = 0; i < authCredentials.length; i++) {
+            const incProof = await this.generateCredentialMtp(did, authCredentials[i], treeStateInfo);
+            if (!incProof.proof.existence) {
+                continue;
+            }
+            const nonRevProof = await this.generateNonRevocationMtp(did, authCredentials[i], treeStateInfo);
+            if (!nonRevProof.proof.existence) {
+                return {
+                    authCredential: authCredentials[i],
+                    incProof,
+                    nonRevProof
+                };
+            }
+        }
+        throw new Error('no auth credentials found');
+    }
     /** {@inheritDoc IIdentityWallet.revokeCredential} */
     async revokeCredential(issuerDID, credential) {
         const issuerTree = await this.getDIDTreeModel(issuerDID);

package/dist/node/esm/proof/provers/inputs-generator.js

@@ -262,8 +262,8 @@ export class InputGenerator {
             circuitInputs.proofType = proofType;
             circuitInputs.linkNonce = params.linkNonce ?? BigInt(0);
             circuitInputs.verifierID = params.verifierDid ? DID.idFromDID(params.verifierDid) : undefined;
-            circuitInputs.nullifierSessionID = proofReq.params?.nullifierSessionID
-                ? BigInt(proofReq.params?.nullifierSessionID?.toString())
+            circuitInputs.nullifierSessionID = proofReq.params?.nullifierSessionId
+                ? BigInt(proofReq.params?.nullifierSessionId?.toString())
                 : BigInt(0);
             let isEthIdentity = true;
             try {
@@ -372,9 +372,7 @@ export class InputGenerator {
         return circuitClaim;
     }
     async prepareAuthBJJCredential(did, treeStateInfo) {
-        const authCredential = await this._credentialWallet.getAuthBJJCredential(did);
-        const incProof = await this._identityWallet.generateCredentialMtp(did, authCredential, treeStateInfo);
-        const nonRevProof = await this._identityWallet.generateNonRevocationMtp(did, authCredential, treeStateInfo);
+        const { authCredential, incProof, nonRevProof } = await this._identityWallet.getActualAuthCredential(did, treeStateInfo);
         const authCoreClaim = authCredential.getCoreClaimFromProof(ProofType.Iden3SparseMerkleTreeProof);
         if (!authCoreClaim) {
             throw new Error('auth core claim is not defined for auth bjj credential');

package/dist/types/credentials/credential-wallet.d.ts

@@ -68,12 +68,19 @@ export interface ICredentialWallet {
      */
     filterByCredentialSubject(credentials: W3CCredential[], subject: DID): Promise<W3CCredential[]>;
     /**
-     * Finds Auth BJJ credential for given user
+     * Finds first non-revoked Auth BJJ credential for given user
      *
      * @param {DID} did - the issuer of Auth BJJ credential
      * @returns `Promise<W3CCredential>` W3CCredential with AuthBJJCredential type
      */
     getAuthBJJCredential(did: DID): Promise<W3CCredential>;
+    /**
+     * Finds all Auth BJJ credentials for given user
+     *
+     * @param {DID} did - the issuer of Auth BJJ credential
+     * @returns `Promise<W3CCredential[]>` W3CCredentials with AuthBJJCredential type
+     */
+    getAllAuthBJJCredentials(did: DID): Promise<W3CCredential[]>;
     /**
      * Fetches or Builds a revocation status for a given credential
      * Supported types for credentialStatus field: SparseMerkleTreeProof, Iden3ReverseSparseMerkleTreeProof
@@ -137,6 +144,10 @@ export declare class CredentialWallet implements ICredentialWallet {
      * {@inheritDoc ICredentialWallet.getAuthBJJCredential}
      */
     getAuthBJJCredential(did: DID): Promise<W3CCredential>;
+    /**
+     * {@inheritDoc ICredentialWallet.getAllAuthBJJCredentials}
+     */
+    getAllAuthBJJCredentials(did: DID): Promise<W3CCredential[]>;
     /**
      * {@inheritDoc ICredentialWallet.getRevocationStatusFromCredential}
      */

package/dist/types/iden3comm/types/protocol/auth.d.ts

@@ -1,6 +1,7 @@
 import { ZKProof } from '@iden3/js-jwz';
 import { MediaType } from '../../constants';
 import { JSONObject, ProtocolMessage } from '../packer';
+import { DID } from '@iden3/js-iden3-core';
 /** AuthorizationResponseMessage is struct the represents iden3message authorization response */
 export type AuthorizationResponseMessage = {
     id: string;
@@ -41,7 +42,10 @@ export type ZeroKnowledgeProofRequest = {
     circuitId: string;
     optional?: boolean;
     query: JSONObject;
-    params?: JSONObject;
+    params?: {
+        nullifierSessionId?: string | number;
+        verifierDid?: DID;
+    };
 };
 /** ZeroKnowledgeProofResponse represents structure of zkp response */
 export type ZeroKnowledgeProofResponse = {

package/dist/types/identity/identity-wallet.d.ts

@@ -247,6 +247,23 @@ export interface IIdentityWallet {
      * @returns `{Promise<void>}`
      */
     updateIdentityState(issuerDID: DID, published: boolean, treeState?: TreeState): Promise<void>;
+    /**
+     *
+     * gets actual auth credential with proofs for provided tree state or latest from the trees.
+     *
+     * @param {DID} issuerDID -  identifier of the issuer
+     * @param {TreeState} treeStateInfo -  optional, state for retrieval
+     * @returns `{Promise<{
+        authCredential: W3CCredential;
+        incProof: MerkleTreeProofWithTreeState;
+        nonRevProof: MerkleTreeProofWithTreeState;
+      }>}`
+     */
+    getActualAuthCredential(did: DID, treeStateInfo?: TreeState): Promise<{
+        authCredential: W3CCredential;
+        incProof: MerkleTreeProofWithTreeState;
+        nonRevProof: MerkleTreeProofWithTreeState;
+    }>;
 }
 /**
  * @public
@@ -276,6 +293,7 @@ export declare class IdentityWallet implements IIdentityWallet {
     constructor(_kms: KMS, _storage: IDataStorage, _credentialWallet: ICredentialWallet, _opts?: {
         credentialStatusPublisherRegistry?: CredentialStatusPublisherRegistry | undefined;
     } | undefined);
+    private getCredentialStatusPublisherRegistry;
     /**
      * {@inheritDoc IIdentityWallet.createIdentity}
      */
@@ -313,6 +331,12 @@ export declare class IdentityWallet implements IIdentityWallet {
     signChallenge(challenge: bigint, credential: W3CCredential): Promise<Signature>;
     /** {@inheritDoc IIdentityWallet.issueCredential} */
     issueCredential(issuerDID: DID, req: CredentialRequest, opts?: Options): Promise<W3CCredential>;
+    /** {@inheritDoc IIdentityWallet.getActualAuthCredential} */
+    getActualAuthCredential(did: DID, treeStateInfo?: TreeState): Promise<{
+        authCredential: W3CCredential;
+        incProof: MerkleTreeProofWithTreeState;
+        nonRevProof: MerkleTreeProofWithTreeState;
+    }>;
     /** {@inheritDoc IIdentityWallet.revokeCredential} */
     revokeCredential(issuerDID: DID, credential: W3CCredential): Promise<number>;
     /** {@inheritDoc IIdentityWallet.addCredentialsToMerkleTree} */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xpolygonid/js-sdk",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "SDK to work with Polygon ID",
   "main": "dist/node/cjs/index.js",
   "module": "dist/node/esm/index.js",