@0xpolygonid/js-sdk 1.14.1 → 1.15.2

package/dist/node/cjs/iden3comm/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SUPPORTED_PUBLIC_KEY_TYPES = exports.MediaType = exports.PROTOCOL_MESSAGE_TYPE = void 0;
+exports.DEFAULT_AUTH_VERIFY_DELAY = exports.DEFAULT_PROOF_VERIFY_DELAY = exports.SUPPORTED_PUBLIC_KEY_TYPES = exports.MediaType = exports.PROTOCOL_MESSAGE_TYPE = void 0;
 const IDEN3_PROTOCOL = 'https://iden3-communication.io/';
 /**
  * Constants for Iden3 protocol
@@ -74,3 +74,5 @@ exports.SUPPORTED_PUBLIC_KEY_TYPES = {
         'JsonWebKey2020'
     ]
 };
+exports.DEFAULT_PROOF_VERIFY_DELAY = 1 * 60 * 60 * 1000; // 1 hour
+exports.DEFAULT_AUTH_VERIFY_DELAY = 5 * 60 * 1000; // 5 minutes

package/dist/node/cjs/iden3comm/handlers/credential-proposal.js

@@ -25,7 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CredentialProposalHandler = exports.createProposal = exports.createProposalRequest = void 0;
 const constants_1 = require("../constants");
-const constants_2 = require("../constants");
 const js_iden3_core_1 = require("@iden3/js-iden3-core");
 const uuid = __importStar(require("uuid"));
 const js_jwz_1 = require("@iden3/js-jwz");
@@ -46,7 +45,7 @@ function createProposalRequest(sender, receiver, opts) {
         thid: uuidv4,
         from: sender.string(),
         to: receiver.string(),
-        typ: constants_2.MediaType.PlainMessage,
+        typ: constants_1.MediaType.PlainMessage,
         type: constants_1.PROTOCOL_MESSAGE_TYPE.PROPOSAL_REQUEST_MESSAGE_TYPE,
         body: opts
     };
@@ -68,7 +67,7 @@ function createProposal(sender, receiver, proposals) {
         thid: uuidv4,
         from: sender.string(),
         to: receiver.string(),
-        typ: constants_2.MediaType.PlainMessage,
+        typ: constants_1.MediaType.PlainMessage,
         type: constants_1.PROTOCOL_MESSAGE_TYPE.PROPOSAL_MESSAGE_TYPE,
         body: {
             proposals: proposals || []
@@ -129,7 +128,6 @@ class CredentialProposalHandler extends message_handler_1.AbstractMessageHandler
         if (!proposalRequest.body?.credentials?.length) {
             throw new Error(`failed request. no 'credentials' in body`);
         }
-        const senderDID = js_iden3_core_1.DID.parse(proposalRequest.from);
         let credOfferMessage = undefined;
         let proposalMessage = undefined;
         for (let i = 0; i < proposalRequest.body.credentials.length; i++) {
@@ -137,7 +135,12 @@ class CredentialProposalHandler extends message_handler_1.AbstractMessageHandler
             // check if there is credentials in the wallet
             let credsFromWallet = [];
             try {
-                credsFromWallet = await this._identityWallet.findOwnedCredentialsByDID(senderDID, {
+                credsFromWallet = await this._identityWallet.credentialWallet.findByQuery({
+                    credentialSubject: {
+                        id: {
+                            $eq: proposalRequest.from
+                        }
+                    },
                     type: cred.type,
                     context: cred.context
                 });
@@ -198,9 +201,9 @@ class CredentialProposalHandler extends message_handler_1.AbstractMessageHandler
     async handleProposalRequest(request, 
     //eslint-disable-next-line @typescript-eslint/no-unused-vars
     opts) {
-        if (this._params.packerParams.mediaType === constants_2.MediaType.SignedMessage &&
+        if (this._params.packerParams.mediaType === constants_1.MediaType.SignedMessage &&
             !this._params.packerParams.packerOptions) {
-            throw new Error(`jws packer options are required for ${constants_2.MediaType.SignedMessage}`);
+            throw new Error(`jws packer options are required for ${constants_1.MediaType.SignedMessage}`);
         }
         const proposalRequest = await this.parseProposalRequest(request);
         if (!proposalRequest.from) {
@@ -209,7 +212,7 @@ class CredentialProposalHandler extends message_handler_1.AbstractMessageHandler
         const senderDID = js_iden3_core_1.DID.parse(proposalRequest.from);
         const message = await this.handleProposalRequestMessage(proposalRequest);
         const response = utils_1.byteEncoder.encode(JSON.stringify(message));
-        const packerOpts = this._params.packerParams.mediaType === constants_2.MediaType.SignedMessage
+        const packerOpts = this._params.packerParams.mediaType === constants_1.MediaType.SignedMessage
             ? this._params.packerParams.packerOptions
             : {
                 provingMethodAlg: js_jwz_1.proving.provingMethodGroth16AuthV2Instance.methodAlg

package/dist/node/cjs/iden3comm/handlers/message-handler.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageHandler = exports.AbstractMessageHandler = void 0;
+const constants_1 = require("../constants");
+const js_jwz_1 = require("@iden3/js-jwz");
 /**
  * Base implementation of protocol message handler
  *
@@ -87,10 +89,19 @@ class MessageHandler {
             return Promise.reject(new Error('Message handler not provided'));
         }
         const response = await this.messageHandler.handle(message, context);
-        if (response) {
-            return this._params.packageManager.packMessage(unpackedMediaType, response, {});
+        if (!response) {
+            return null;
         }
-        return null;
+        let packerParams = {};
+        const senderDID = context?.senderDID;
+        if (unpackedMediaType === constants_1.MediaType.ZKPMessage && senderDID) {
+            packerParams = {
+                senderDID,
+                provingMethodAlg: js_jwz_1.proving.provingMethodGroth16AuthV2Instance.methodAlg
+            };
+            return this._params.packageManager.packMessage(unpackedMediaType, response, packerParams);
+        }
+        return this._params.packageManager.packMessage(constants_1.MediaType.PlainMessage, response, packerParams);
     }
 }
 exports.MessageHandler = MessageHandler;

package/dist/node/cjs/iden3comm/packers/zkp.js

@@ -8,6 +8,7 @@ const envelope_1 = require("../utils/envelope");
 const errors_1 = require("../errors");
 const constants_1 = require("../constants");
 const utils_1 = require("../../utils");
+const constants_2 = require("../constants");
 const { getProvingMethod } = js_jwz_1.proving;
 /**
  * Handler to
@@ -57,8 +58,8 @@ class VerificationHandlerFunc {
      * @param {Array<string>} pubSignals - signals that must contain user id and state
      * @returns `Promise<boolean>`
      */
-    verify(id, pubSignals) {
-        return this.stateVerificationFunc(id, pubSignals);
+    verify(id, pubSignals, opts) {
+        return this.stateVerificationFunc(id, pubSignals, opts);
     }
 }
 exports.VerificationHandlerFunc = VerificationHandlerFunc;
@@ -75,9 +76,12 @@ class ZKPPacker {
      * @param {Map<string, ProvingParams>} provingParamsMap - string is derived by JSON.parse(ProvingMethodAlg)
      * @param {Map<string, VerificationParams>} verificationParamsMap - string is derived by JSON.parse(ProvingMethodAlg)
      */
-    constructor(provingParamsMap, verificationParamsMap) {
+    constructor(provingParamsMap, verificationParamsMap, _opts = {
+        acceptedStateTransitionDelay: constants_2.DEFAULT_AUTH_VERIFY_DELAY
+    }) {
         this.provingParamsMap = provingParamsMap;
         this.verificationParamsMap = verificationParamsMap;
+        this._opts = _opts;
     }
     /**
      * Packs a basic message using the specified parameters.
@@ -125,7 +129,7 @@ class ZKPPacker {
         if (!isValid) {
             throw new Error(errors_1.ErrProofIsInvalid);
         }
-        const verificationResult = await verificationParams?.verificationFn?.verify(token.circuitId, token.zkProof.pub_signals);
+        const verificationResult = await verificationParams?.verificationFn?.verify(token.circuitId, token.zkProof.pub_signals, this._opts);
         if (!verificationResult) {
             throw new Error(errors_1.ErrStateVerificationFailed);
         }
@@ -139,23 +143,26 @@ class ZKPPacker {
     }
 }
 exports.ZKPPacker = ZKPPacker;
-const verifySender = (token, msg) => {
+const verifySender = async (token, msg) => {
     switch (token.circuitId) {
         case index_1.CircuitId.AuthV2:
-            if (!msg.from || !verifyAuthV2Sender(msg.from, token.zkProof.pub_signals)) {
-                throw new Error(errors_1.ErrSenderNotUsedTokenCreation);
+            {
+                if (!msg.from) {
+                    throw new Error(errors_1.ErrSenderNotUsedTokenCreation);
+                }
+                const authSignals = new index_1.AuthV2PubSignals().pubSignalsUnmarshal(utils_1.byteEncoder.encode(JSON.stringify(token.zkProof.pub_signals)));
+                const did = js_iden3_core_1.DID.parseFromId(authSignals.userID);
+                const msgHash = await token.getMessageHash();
+                const challenge = js_iden3_core_1.BytesHelper.bytesToInt(msgHash.reverse());
+                if (challenge !== authSignals.challenge) {
+                    throw new Error(errors_1.ErrSenderNotUsedTokenCreation);
+                }
+                if (msg.from !== did.string()) {
+                    throw new Error(errors_1.ErrSenderNotUsedTokenCreation);
+                }
             }
             break;
         default:
             throw new Error(errors_1.ErrUnknownCircuitID);
     }
 };
-const verifyAuthV2Sender = (from, pubSignals) => {
-    const authSignals = new index_1.AuthV2PubSignals();
-    const pubSig = authSignals.pubSignalsUnmarshal(utils_1.byteEncoder.encode(JSON.stringify(pubSignals)));
-    return pubSig.userID ? checkSender(from, pubSig.userID) : false;
-};
-const checkSender = (from, id) => {
-    const did = js_iden3_core_1.DID.parseFromId(id);
-    return from === did.string();
-};

package/dist/node/cjs/iden3comm/types/index.js

@@ -23,4 +23,5 @@ __exportStar(require("./protocol/contract-request"), exports);
 __exportStar(require("./protocol/proposal-request"), exports);
 __exportStar(require("./protocol/payment"), exports);
 __exportStar(require("./packer"), exports);
+__exportStar(require("./models"), exports);
 __exportStar(require("./packageManager"), exports);

package/dist/node/cjs/iden3comm/types/models.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/node/cjs/iden3comm/types/protocol/credentials.js

@@ -1,2 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CredentialOfferStatus = void 0;
+/** CredentialOfferStatus is list of possible statuses for credential offer message */
+var CredentialOfferStatus;
+(function (CredentialOfferStatus) {
+    CredentialOfferStatus["Pending"] = "pending";
+    CredentialOfferStatus["Completed"] = "completed";
+    CredentialOfferStatus["Rejected"] = "rejected";
+})(CredentialOfferStatus = exports.CredentialOfferStatus || (exports.CredentialOfferStatus = {}));

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

@@ -68,6 +68,9 @@ class IdentityWallet {
         this._inputsGenerator = new proof_1.InputGenerator(this, _credentialWallet, _storage.states);
         this._transactionService = new blockchain_1.TransactionService(_storage.states.getRpcProvider());
     }
+    get credentialWallet() {
+        return this._credentialWallet;
+    }
     getCredentialStatusPublisherRegistry(_opts) {
         if (!_opts?.credentialStatusPublisherRegistry) {
             const registry = new credential_status_publisher_1.CredentialStatusPublisherRegistry();
@@ -387,7 +390,7 @@ class IdentityWallet {
         req.revocationOpts.nonce =
             typeof req.revocationOpts.nonce === 'number'
                 ? req.revocationOpts.nonce
-                : Math.round(Math.random() * 10000);
+                : new DataView((0, js_crypto_1.getRandomBytes)(16).buffer).getUint32(0, false);
         req.subjectPosition = req.subjectPosition ?? verifiable_1.SubjectPosition.Index;
         try {
             credential = this._credentialWallet.createCredential(issuerDID, req, jsonSchema);

package/dist/node/cjs/proof/proof-service.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProofService = void 0;
 const js_iden3_core_1 = require("@iden3/js-iden3-core");
-const js_merkletree_1 = require("@iden3/js-merkletree");
 const circuits_1 = require("../circuits");
 const verifiable_1 = require("../verifiable");
 const common_1 = require("./common");
 const prover_1 = require("./provers/prover");
 const js_jsonld_merklization_1 = require("@iden3/js-jsonld-merklization");
+const iden3comm_1 = require("../iden3comm");
 const schema_processor_1 = require("../schema-processor");
 const encoding_1 = require("../utils/encoding");
 const inputs_generator_1 = require("./provers/inputs-generator");
@@ -200,10 +200,6 @@ class ProofService {
         const { nonce: authProfileNonce, genesisDID } = await this._identityWallet.getGenesisDIDMetadata(did);
         const challenge = js_iden3_core_1.BytesHelper.bytesToInt(hash.reverse());
         const authPrepared = await this._inputsGenerator.prepareAuthBJJCredential(genesisDID);
-        const authClaimData = await this._inputsGenerator.newCircuitClaimData({
-            credential: authPrepared.credential,
-            credentialCoreClaim: authPrepared.coreClaim
-        });
         const signature = await this._identityWallet.signChallenge(challenge, authPrepared.credential);
         const id = js_iden3_core_1.DID.idFromDID(genesisDID);
         const stateProof = await this._stateStorage.getGISTProof(id.bigInt());
@@ -211,25 +207,25 @@ class ProofService {
         const authInputs = new circuits_1.AuthV2Inputs();
         authInputs.genesisID = id;
         authInputs.profileNonce = BigInt(authProfileNonce);
-        authInputs.authClaim = authClaimData.claim;
-        authInputs.authClaimIncMtp = authClaimData.proof;
+        authInputs.authClaim = authPrepared.coreClaim;
+        authInputs.authClaimIncMtp = authPrepared.incProof.proof;
         authInputs.authClaimNonRevMtp = authPrepared.nonRevProof.proof;
-        authInputs.treeState = authClaimData.treeState;
+        authInputs.treeState = authPrepared.incProof.treeState;
         authInputs.signature = signature;
         authInputs.challenge = challenge;
         authInputs.gistProof = gistProof;
         return authInputs.inputsMarshal();
     }
-    async verifyState(circuitId, pubSignals) {
+    async verifyState(circuitId, pubSignals, opts = {
+        acceptedStateTransitionDelay: iden3comm_1.PROTOCOL_CONSTANTS.DEFAULT_AUTH_VERIFY_DELAY
+    }) {
         if (circuitId !== circuits_1.CircuitId.AuthV2) {
             throw new Error(`CircuitId is not supported ${circuitId}`);
         }
-        const gistRoot = js_merkletree_1.Hash.fromString(pubSignals[2]).bigInt();
-        const userId = BigInt(pubSignals[0]);
+        const authV2PubSignals = new circuits_1.AuthV2PubSignals().pubSignalsUnmarshal(encoding_1.byteEncoder.encode(JSON.stringify(pubSignals)));
+        const gistRoot = authV2PubSignals.GISTRoot.bigInt();
+        const userId = authV2PubSignals.userID.bigInt();
         const globalStateInfo = await this._stateStorage.getGISTRootInfo(gistRoot, userId);
-        if (globalStateInfo.createdAtTimestamp === 0n) {
-            throw new Error(`gist state doesn't exists in contract`);
-        }
         if (globalStateInfo.root !== gistRoot) {
             throw new Error(`gist info contains invalid state`);
         }
@@ -237,7 +233,12 @@ class ProofService {
             if (globalStateInfo.replacedAtTimestamp === 0n) {
                 throw new Error(`state was replaced, but replaced time unknown`);
             }
-            return false;
+            const timeDiff = Date.now() -
+                (0, js_iden3_core_1.getDateFromUnixTimestamp)(Number(globalStateInfo.replacedAtTimestamp)).getTime();
+            if (timeDiff >
+                (opts?.acceptedStateTransitionDelay ?? iden3comm_1.PROTOCOL_CONSTANTS.DEFAULT_AUTH_VERIFY_DELAY)) {
+                throw new Error('global state is outdated');
+            }
         }
         return true;
     }

package/dist/node/cjs/proof/verifiers/pub-signals-verifier.js

@@ -16,10 +16,9 @@ const query_1 = require("./query");
 const common_2 = require("../common");
 const circuits_1 = require("../../circuits");
 const query_hash_1 = require("./query-hash");
+const iden3comm_1 = require("../../iden3comm");
 exports.userStateError = new Error(`user state is not valid`);
 const zeroInt = 0n;
-const defaultProofVerifyOpts = 1 * 60 * 60 * 1000; // 1 hour
-const defaultAuthVerifyOpts = 5 * 60 * 1000; // 5 minutes
 /**
  * PubSignalsVerifier provides verify method
  * @public
@@ -221,7 +220,7 @@ class PubSignalsVerifier {
             // no query verification
             // verify state
             const gist = await this.checkGlobalState(authV2PubSignals.GISTRoot, this.userId);
-            let acceptedStateTransitionDelay = defaultAuthVerifyOpts;
+            let acceptedStateTransitionDelay = iden3comm_1.PROTOCOL_CONSTANTS.DEFAULT_AUTH_VERIFY_DELAY;
             if (opts?.acceptedStateTransitionDelay) {
                 acceptedStateTransitionDelay = opts.acceptedStateTransitionDelay;
             }
@@ -308,7 +307,7 @@ class PubSignalsVerifier {
         };
         this.checkRevocationState = async (issuerID, issuerClaimNonRevState, opts) => {
             const issuerNonRevStateResolved = await this.checkRevocationStateForId(issuerID, issuerClaimNonRevState);
-            const acceptedStateTransitionDelay = opts?.acceptedStateTransitionDelay ?? defaultProofVerifyOpts;
+            const acceptedStateTransitionDelay = opts?.acceptedStateTransitionDelay ?? iden3comm_1.PROTOCOL_CONSTANTS.DEFAULT_PROOF_VERIFY_DELAY;
             if (!issuerNonRevStateResolved.latest) {
                 const timeDiff = Date.now() -
                     (0, js_iden3_core_1.getDateFromUnixTimestamp)(Number(issuerNonRevStateResolved.transitionTimestamp)).getTime();
@@ -392,7 +391,7 @@ class PubSignalsVerifier {
         catch (e) {
             const stateNotExistErr = (e?.errorArgs ?? [])[0];
             const errMsg = stateNotExistErr || e.message;
-            if (errMsg === 'State does not exist') {
+            if (errMsg.includes('State does not exist')) {
                 if (isGenesis) {
                     return {
                         latest: true,

package/dist/node/esm/iden3comm/constants.js

@@ -71,3 +71,5 @@ export const SUPPORTED_PUBLIC_KEY_TYPES = {
         'JsonWebKey2020'
     ]
 };
+export const DEFAULT_PROOF_VERIFY_DELAY = 1 * 60 * 60 * 1000; // 1 hour
+export const DEFAULT_AUTH_VERIFY_DELAY = 5 * 60 * 1000; // 5 minutes

package/dist/node/esm/iden3comm/handlers/credential-proposal.js

@@ -1,5 +1,4 @@
-import { PROTOCOL_MESSAGE_TYPE } from '../constants';
-import { MediaType } from '../constants';
+import { PROTOCOL_MESSAGE_TYPE, MediaType } from '../constants';
 import { DID } from '@iden3/js-iden3-core';
 import * as uuid from 'uuid';
 import { proving } from '@iden3/js-jwz';
@@ -101,7 +100,6 @@ export class CredentialProposalHandler extends AbstractMessageHandler {
         if (!proposalRequest.body?.credentials?.length) {
             throw new Error(`failed request. no 'credentials' in body`);
         }
-        const senderDID = DID.parse(proposalRequest.from);
         let credOfferMessage = undefined;
         let proposalMessage = undefined;
         for (let i = 0; i < proposalRequest.body.credentials.length; i++) {
@@ -109,7 +107,12 @@ export class CredentialProposalHandler extends AbstractMessageHandler {
             // check if there is credentials in the wallet
             let credsFromWallet = [];
             try {
-                credsFromWallet = await this._identityWallet.findOwnedCredentialsByDID(senderDID, {
+                credsFromWallet = await this._identityWallet.credentialWallet.findByQuery({
+                    credentialSubject: {
+                        id: {
+                            $eq: proposalRequest.from
+                        }
+                    },
                     type: cred.type,
                     context: cred.context
                 });

package/dist/node/esm/iden3comm/handlers/message-handler.js

@@ -1,3 +1,5 @@
+import { MediaType } from '../constants';
+import { proving } from '@iden3/js-jwz';
 /**
  * Base implementation of protocol message handler
  *
@@ -83,9 +85,18 @@ export class MessageHandler {
             return Promise.reject(new Error('Message handler not provided'));
         }
         const response = await this.messageHandler.handle(message, context);
-        if (response) {
-            return this._params.packageManager.packMessage(unpackedMediaType, response, {});
+        if (!response) {
+            return null;
         }
-        return null;
+        let packerParams = {};
+        const senderDID = context?.senderDID;
+        if (unpackedMediaType === MediaType.ZKPMessage && senderDID) {
+            packerParams = {
+                senderDID,
+                provingMethodAlg: proving.provingMethodGroth16AuthV2Instance.methodAlg
+            };
+            return this._params.packageManager.packMessage(unpackedMediaType, response, packerParams);
+        }
+        return this._params.packageManager.packMessage(MediaType.PlainMessage, response, packerParams);
     }
 }

package/dist/node/esm/iden3comm/packers/zkp.js

@@ -1,10 +1,11 @@
 import { Token, Header, ProvingMethodAlg, proving } from '@iden3/js-jwz';
 import { AuthV2PubSignals, CircuitId } from '../../circuits/index';
-import { DID } from '@iden3/js-iden3-core';
+import { BytesHelper, DID } from '@iden3/js-iden3-core';
 import { bytesToProtocolMessage } from '../utils/envelope';
 import { ErrNoProvingMethodAlg, ErrPackedWithUnsupportedCircuit, ErrProofIsInvalid, ErrSenderNotUsedTokenCreation, ErrStateVerificationFailed, ErrUnknownCircuitID } from '../errors';
 import { MediaType } from '../constants';
 import { byteDecoder, byteEncoder } from '../../utils';
+import { DEFAULT_AUTH_VERIFY_DELAY } from '../constants';
 const { getProvingMethod } = proving;
 /**
  * Handler to
@@ -53,8 +54,8 @@ export class VerificationHandlerFunc {
      * @param {Array<string>} pubSignals - signals that must contain user id and state
      * @returns `Promise<boolean>`
      */
-    verify(id, pubSignals) {
-        return this.stateVerificationFunc(id, pubSignals);
+    verify(id, pubSignals, opts) {
+        return this.stateVerificationFunc(id, pubSignals, opts);
     }
 }
 /**
@@ -70,9 +71,12 @@ export class ZKPPacker {
      * @param {Map<string, ProvingParams>} provingParamsMap - string is derived by JSON.parse(ProvingMethodAlg)
      * @param {Map<string, VerificationParams>} verificationParamsMap - string is derived by JSON.parse(ProvingMethodAlg)
      */
-    constructor(provingParamsMap, verificationParamsMap) {
+    constructor(provingParamsMap, verificationParamsMap, _opts = {
+        acceptedStateTransitionDelay: DEFAULT_AUTH_VERIFY_DELAY
+    }) {
         this.provingParamsMap = provingParamsMap;
         this.verificationParamsMap = verificationParamsMap;
+        this._opts = _opts;
     }
     /**
      * Packs a basic message using the specified parameters.
@@ -120,7 +124,7 @@ export class ZKPPacker {
         if (!isValid) {
             throw new Error(ErrProofIsInvalid);
         }
-        const verificationResult = await verificationParams?.verificationFn?.verify(token.circuitId, token.zkProof.pub_signals);
+        const verificationResult = await verificationParams?.verificationFn?.verify(token.circuitId, token.zkProof.pub_signals, this._opts);
         if (!verificationResult) {
             throw new Error(ErrStateVerificationFailed);
         }
@@ -133,23 +137,26 @@ export class ZKPPacker {
         return MediaType.ZKPMessage;
     }
 }
-const verifySender = (token, msg) => {
+const verifySender = async (token, msg) => {
     switch (token.circuitId) {
         case CircuitId.AuthV2:
-            if (!msg.from || !verifyAuthV2Sender(msg.from, token.zkProof.pub_signals)) {
-                throw new Error(ErrSenderNotUsedTokenCreation);
+            {
+                if (!msg.from) {
+                    throw new Error(ErrSenderNotUsedTokenCreation);
+                }
+                const authSignals = new AuthV2PubSignals().pubSignalsUnmarshal(byteEncoder.encode(JSON.stringify(token.zkProof.pub_signals)));
+                const did = DID.parseFromId(authSignals.userID);
+                const msgHash = await token.getMessageHash();
+                const challenge = BytesHelper.bytesToInt(msgHash.reverse());
+                if (challenge !== authSignals.challenge) {
+                    throw new Error(ErrSenderNotUsedTokenCreation);
+                }
+                if (msg.from !== did.string()) {
+                    throw new Error(ErrSenderNotUsedTokenCreation);
+                }
             }
             break;
         default:
             throw new Error(ErrUnknownCircuitID);
     }
 };
-const verifyAuthV2Sender = (from, pubSignals) => {
-    const authSignals = new AuthV2PubSignals();
-    const pubSig = authSignals.pubSignalsUnmarshal(byteEncoder.encode(JSON.stringify(pubSignals)));
-    return pubSig.userID ? checkSender(from, pubSig.userID) : false;
-};
-const checkSender = (from, id) => {
-    const did = DID.parseFromId(id);
-    return from === did.string();
-};

package/dist/node/esm/iden3comm/types/index.js

@@ -7,4 +7,5 @@ export * from './protocol/contract-request';
 export * from './protocol/proposal-request';
 export * from './protocol/payment';
 export * from './packer';
+export * from './models';
 export * from './packageManager';

package/dist/node/esm/iden3comm/types/models.js

@@ -0,0 +1 @@
+export {};

package/dist/node/esm/iden3comm/types/protocol/credentials.js

@@ -1 +1,7 @@
-export {};
+/** CredentialOfferStatus is list of possible statuses for credential offer message */
+export var CredentialOfferStatus;
+(function (CredentialOfferStatus) {
+    CredentialOfferStatus["Pending"] = "pending";
+    CredentialOfferStatus["Completed"] = "completed";
+    CredentialOfferStatus["Rejected"] = "rejected";
+})(CredentialOfferStatus || (CredentialOfferStatus = {}));

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

@@ -42,6 +42,9 @@ export class IdentityWallet {
         this._inputsGenerator = new InputGenerator(this, _credentialWallet, _storage.states);
         this._transactionService = new TransactionService(_storage.states.getRpcProvider());
     }
+    get credentialWallet() {
+        return this._credentialWallet;
+    }
     getCredentialStatusPublisherRegistry(_opts) {
         if (!_opts?.credentialStatusPublisherRegistry) {
             const registry = new CredentialStatusPublisherRegistry();
@@ -361,7 +364,7 @@ export class IdentityWallet {
         req.revocationOpts.nonce =
             typeof req.revocationOpts.nonce === 'number'
                 ? req.revocationOpts.nonce
-                : Math.round(Math.random() * 10000);
+                : new DataView(getRandomBytes(16).buffer).getUint32(0, false);
         req.subjectPosition = req.subjectPosition ?? SubjectPosition.Index;
         try {
             credential = this._credentialWallet.createCredential(issuerDID, req, jsonSchema);

package/dist/node/esm/proof/proof-service.js

@@ -1,10 +1,10 @@
-import { BytesHelper, DID, MerklizedRootPosition } from '@iden3/js-iden3-core';
-import { Hash } from '@iden3/js-merkletree';
-import { AuthV2Inputs, CircuitId, Operators, Query, ValueProof } from '../circuits';
+import { BytesHelper, DID, MerklizedRootPosition, getDateFromUnixTimestamp } from '@iden3/js-iden3-core';
+import { AuthV2Inputs, AuthV2PubSignals, CircuitId, Operators, Query, ValueProof } from '../circuits';
 import { createVerifiablePresentation } from '../verifiable';
 import { parseCredentialSubject, parseQueryMetadata, toGISTProof, transformQueryValueToBigInts } from './common';
 import { NativeProver } from './provers/prover';
 import { getDocumentLoader } from '@iden3/js-jsonld-merklization';
+import { PROTOCOL_CONSTANTS } from '../iden3comm';
 import { cacheLoader } from '../schema-processor';
 import { byteDecoder, byteEncoder } from '../utils/encoding';
 import { InputGenerator } from './provers/inputs-generator';
@@ -197,10 +197,6 @@ export class ProofService {
         const { nonce: authProfileNonce, genesisDID } = await this._identityWallet.getGenesisDIDMetadata(did);
         const challenge = BytesHelper.bytesToInt(hash.reverse());
         const authPrepared = await this._inputsGenerator.prepareAuthBJJCredential(genesisDID);
-        const authClaimData = await this._inputsGenerator.newCircuitClaimData({
-            credential: authPrepared.credential,
-            credentialCoreClaim: authPrepared.coreClaim
-        });
         const signature = await this._identityWallet.signChallenge(challenge, authPrepared.credential);
         const id = DID.idFromDID(genesisDID);
         const stateProof = await this._stateStorage.getGISTProof(id.bigInt());
@@ -208,25 +204,25 @@ export class ProofService {
         const authInputs = new AuthV2Inputs();
         authInputs.genesisID = id;
         authInputs.profileNonce = BigInt(authProfileNonce);
-        authInputs.authClaim = authClaimData.claim;
-        authInputs.authClaimIncMtp = authClaimData.proof;
+        authInputs.authClaim = authPrepared.coreClaim;
+        authInputs.authClaimIncMtp = authPrepared.incProof.proof;
         authInputs.authClaimNonRevMtp = authPrepared.nonRevProof.proof;
-        authInputs.treeState = authClaimData.treeState;
+        authInputs.treeState = authPrepared.incProof.treeState;
         authInputs.signature = signature;
         authInputs.challenge = challenge;
         authInputs.gistProof = gistProof;
         return authInputs.inputsMarshal();
     }
-    async verifyState(circuitId, pubSignals) {
+    async verifyState(circuitId, pubSignals, opts = {
+        acceptedStateTransitionDelay: PROTOCOL_CONSTANTS.DEFAULT_AUTH_VERIFY_DELAY
+    }) {
         if (circuitId !== CircuitId.AuthV2) {
             throw new Error(`CircuitId is not supported ${circuitId}`);
         }
-        const gistRoot = Hash.fromString(pubSignals[2]).bigInt();
-        const userId = BigInt(pubSignals[0]);
+        const authV2PubSignals = new AuthV2PubSignals().pubSignalsUnmarshal(byteEncoder.encode(JSON.stringify(pubSignals)));
+        const gistRoot = authV2PubSignals.GISTRoot.bigInt();
+        const userId = authV2PubSignals.userID.bigInt();
         const globalStateInfo = await this._stateStorage.getGISTRootInfo(gistRoot, userId);
-        if (globalStateInfo.createdAtTimestamp === 0n) {
-            throw new Error(`gist state doesn't exists in contract`);
-        }
         if (globalStateInfo.root !== gistRoot) {
             throw new Error(`gist info contains invalid state`);
         }
@@ -234,7 +230,12 @@ export class ProofService {
             if (globalStateInfo.replacedAtTimestamp === 0n) {
                 throw new Error(`state was replaced, but replaced time unknown`);
             }
-            return false;
+            const timeDiff = Date.now() -
+                getDateFromUnixTimestamp(Number(globalStateInfo.replacedAtTimestamp)).getTime();
+            if (timeDiff >
+                (opts?.acceptedStateTransitionDelay ?? PROTOCOL_CONSTANTS.DEFAULT_AUTH_VERIFY_DELAY)) {
+                throw new Error('global state is outdated');
+            }
         }
         return true;
     }