@0xpolygonid/js-sdk 1.24.1 → 1.26.0

package/dist/node/esm/iden3comm/handlers/payment.js

@@ -5,8 +5,8 @@ import * as uuid from 'uuid';
 import { proving } from '@iden3/js-jwz';
 import { byteEncoder } from '../../utils';
 import { AbstractMessageHandler } from './message-handler';
-import { PaymentFeatures, PaymentRequestDataType, PaymentType, SupportedCurrencies, SupportedPaymentProofType } from '../../verifiable';
-import { ethers, parseEther, parseUnits } from 'ethers';
+import { PaymentFeatures, PaymentRequestDataType, PaymentType, SupportedPaymentProofType } from '../../verifiable';
+import { ethers } from 'ethers';
 import { verifyExpiresTime } from './common';
 /**
  * @beta
@@ -36,11 +36,10 @@ export function createPaymentRequest(sender, receiver, agent, payments, opts) {
     return request;
 }
 export async function verifyEIP712TypedData(data, resolver) {
-    const convertedAmount = await convertPaymentAmount(data.amount, data.currency);
     const paymentData = data.type === PaymentRequestDataType.Iden3PaymentRailsRequestV1
         ? {
             recipient: data.recipient,
-            amount: convertedAmount,
+            amount: data.amount,
             expirationDate: getUnixTimestamp(new Date(data.expirationDate)),
             nonce: data.nonce,
             metadata: '0x'
@@ -48,7 +47,7 @@ export async function verifyEIP712TypedData(data, resolver) {
         : {
             tokenAddress: data.tokenAddress,
             recipient: data.recipient,
-            amount: convertedAmount,
+            amount: data.amount,
             expirationDate: getUnixTimestamp(new Date(data.expirationDate)),
             nonce: data.nonce,
             metadata: '0x'
@@ -72,30 +71,6 @@ export async function verifyEIP712TypedData(data, resolver) {
     }
     throw new Error(`failed request. no matching verificationMethod`);
 }
-export async function convertPaymentAmount(amount, currency) {
-    let convertedAmount = 0n;
-    switch (currency) {
-        case SupportedCurrencies.ETH:
-        case SupportedCurrencies.POL:
-        case SupportedCurrencies.MATIC:
-            convertedAmount = parseEther(amount.toString());
-            break;
-        case SupportedCurrencies.ETH_WEI:
-            convertedAmount = parseUnits(amount.toString(), 'wei');
-            break;
-        case SupportedCurrencies.ETH_GWEI:
-            convertedAmount = parseUnits(amount.toString(), 'gwei');
-            break;
-        case SupportedCurrencies.USDC:
-        case SupportedCurrencies.USDT: {
-            convertedAmount = parseUnits(amount.toString(), 6);
-            break;
-        }
-        default:
-            throw new Error(`failed request. unsupported currency ${currency}`);
-    }
-    return convertedAmount;
-}
 /**
  * @beta
  * createPayment is a function to create protocol payment message
@@ -282,35 +257,38 @@ export class PaymentHandler extends AbstractMessageHandler {
         for (let i = 0; i < payments.length; i++) {
             const { credentials, description } = payments[i];
             const dataArr = [];
-            for (let j = 0; j < payments[i].chains.length; j++) {
-                const { features, nonce, amount, currency, chainId, expirationDate, type } = payments[i].chains[j];
+            for (let j = 0; j < payments[i].options.length; j++) {
+                const { nonce, amount, chainId, optionId, expirationDate } = payments[i].options[j];
                 const multiChainConfig = this._params.multiChainPaymentConfig?.find((c) => c.chainId === chainId);
                 if (!multiChainConfig) {
                     throw new Error(`failed request. no config for chain ${chainId}`);
                 }
-                const { recipient, paymentContract, erc20TokenAddressArr } = multiChainConfig;
-                const tokenAddress = erc20TokenAddressArr.find((t) => t.symbol === currency)?.address;
-                if (type === PaymentRequestDataType.Iden3PaymentRailsERC20RequestV1 && !tokenAddress) {
-                    throw new Error(`failed request. no token address for currency ${currency}`);
+                const { recipient, paymentRails, options } = multiChainConfig;
+                const option = options.find((t) => t.id === optionId);
+                if (!option) {
+                    throw new Error(`failed request. no option for id ${optionId}`);
+                }
+                if (option.type === PaymentRequestDataType.Iden3PaymentRailsERC20RequestV1 &&
+                    !option.contractAddress) {
+                    throw new Error(`failed request. no token address for option id ${optionId}`);
                 }
                 const expirationDateRequired = expirationDate ?? new Date(new Date().setHours(new Date().getHours() + 1));
-                const typeUrl = `https://schema.iden3.io/core/json/${type}.json`;
+                const typeUrl = `https://schema.iden3.io/core/json/${option.type}.json`;
                 const typesFetchResult = await fetch(typeUrl);
                 const types = await typesFetchResult.json();
                 delete types.EIP712Domain;
-                const convertedAmount = await convertPaymentAmount(amount, currency);
-                const paymentData = type === PaymentRequestDataType.Iden3PaymentRailsRequestV1
+                const paymentData = option.type === PaymentRequestDataType.Iden3PaymentRailsRequestV1
                     ? {
                         recipient,
-                        amount: convertedAmount,
+                        amount: amount,
                         expirationDate: getUnixTimestamp(expirationDateRequired),
                         nonce,
                         metadata: '0x'
                     }
                     : {
-                        tokenAddress,
+                        tokenAddress: option.contractAddress,
                         recipient,
-                        amount: convertedAmount,
+                        amount: amount,
                         expirationDate: getUnixTimestamp(expirationDateRequired),
                         nonce,
                         metadata: '0x'
@@ -319,7 +297,7 @@ export class PaymentHandler extends AbstractMessageHandler {
                     name: 'MCPayment',
                     version: '1.0.0',
                     chainId,
-                    verifyingContract: paymentContract
+                    verifyingContract: paymentRails
                 };
                 const signature = await signer.signTypedData(domain, types, paymentData);
                 const proof = [
@@ -339,20 +317,24 @@ export class PaymentHandler extends AbstractMessageHandler {
                 const d = {
                     type: PaymentRequestDataType.Iden3PaymentRailsRequestV1,
                     '@context': [
-                        `https://schema.iden3.io/core/jsonld/payment.jsonld#${type}`,
+                        `https://schema.iden3.io/core/jsonld/payment.jsonld#${option.type}`,
                         'https://w3id.org/security/suites/eip712sig-2021/v1'
                     ],
                     recipient,
                     amount: amount.toString(),
-                    currency,
                     expirationDate: expirationDateRequired.toISOString(),
                     nonce: nonce.toString(),
                     metadata: '0x',
                     proof
                 };
-                dataArr.push(type === PaymentRequestDataType.Iden3PaymentRailsRequestV1
+                dataArr.push(option.type === PaymentRequestDataType.Iden3PaymentRailsRequestV1
                     ? d
-                    : { ...d, type, tokenAddress: tokenAddress || '', features: features || [] });
+                    : {
+                        ...d,
+                        type: option.type,
+                        tokenAddress: option.contractAddress || '',
+                        features: option.features || []
+                    });
             }
             paymentRequestInfo.push({
                 data: dataArr,

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

@@ -15,6 +15,18 @@ export class PackageManager {
     constructor() {
         this.packers = new Map();
     }
+    /** {@inheritDoc IPackageManager.getSupportedProfiles} */
+    getSupportedProfiles() {
+        const acceptProfiles = [];
+        const mediaTypes = this.getSupportedMediaTypes();
+        for (const mediaType of mediaTypes) {
+            const p = this.packers.get(mediaType);
+            if (p) {
+                acceptProfiles.push(...p.getSupportedProfiles());
+            }
+        }
+        return [...new Set(acceptProfiles)];
+    }
     /** {@inheritDoc IPackageManager.isProfileSupported} */
     isProfileSupported(mediaType, profile) {
         const p = this.packers.get(mediaType);

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

@@ -1,4 +1,4 @@
-import { AcceptJwsAlgorithms, MediaType, SUPPORTED_PUBLIC_KEY_TYPES } from '../constants';
+import { AcceptJwsAlgorithms, MediaType, ProtocolVersion, SUPPORTED_PUBLIC_KEY_TYPES } from '../constants';
 import { extractPublicKeyBytes, resolveVerificationMethods } from '../utils/did';
 import { keyPath } from '../../kms/';
 import { verifyJWS } from 'did-jwt';
@@ -24,6 +24,8 @@ export class JWSPacker {
     constructor(_kms, _documentResolver) {
         this._kms = _kms;
         this._documentResolver = _documentResolver;
+        this.supportedAlgorithms = [AcceptJwsAlgorithms.ES256K, AcceptJwsAlgorithms.ES256KR];
+        this.supportedProtocolVersions = [ProtocolVersion.V1];
     }
     /**
      * Packs the given payload and returns a promise that resolves to the packed data.
@@ -86,24 +88,23 @@ export class JWSPacker {
     }
     /** {@inheritDoc IPacker.getSupportedProfiles} */
     getSupportedProfiles() {
-        return [`env=${this.mediaType()}&alg=${this.getSupportedAlgorithms().join(',')}`];
+        return this.supportedProtocolVersions.map((v) => `${v};env=${this.mediaType()};alg=${this.supportedAlgorithms.join(',')}`);
     }
     /** {@inheritDoc IPacker.isProfileSupported} */
     isProfileSupported(profile) {
-        const { env, circuits, alg } = parseAcceptProfile(profile);
+        const { protocolVersion, env, circuits, alg } = parseAcceptProfile(profile);
+        if (!this.supportedProtocolVersions.includes(protocolVersion)) {
+            return false;
+        }
         if (env !== this.mediaType()) {
             return false;
         }
         if (circuits) {
             throw new Error(`Circuits are not supported for ${env} media type`);
         }
-        const supportedAlgArr = this.getSupportedAlgorithms();
-        const algSupported = !alg?.length || alg.some((a) => supportedAlgArr.includes(a));
+        const algSupported = !alg?.length || alg.some((a) => this.supportedAlgorithms.includes(a));
         return algSupported;
     }
-    getSupportedAlgorithms() {
-        return [AcceptJwsAlgorithms.ES256K, AcceptJwsAlgorithms.ES256KR];
-    }
     async resolveDidDoc(from) {
         let didDocument;
         try {

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

@@ -1,4 +1,4 @@
-import { MediaType } from '../constants';
+import { MediaType, ProtocolVersion } from '../constants';
 import { byteDecoder, byteEncoder } from '../../utils';
 import { parseAcceptProfile } from '../utils';
 /**
@@ -9,6 +9,9 @@ import { parseAcceptProfile } from '../utils';
  * @implements implements IPacker interface
  */
 export class PlainPacker {
+    constructor() {
+        this.supportedProtocolVersions = [ProtocolVersion.V1];
+    }
     /**
      * Packs a basic message using the specified parameters.
      *
@@ -52,11 +55,14 @@ export class PlainPacker {
     }
     /** {@inheritDoc IPacker.getSupportedProfiles} */
     getSupportedProfiles() {
-        return [`env=${this.mediaType()}`];
+        return this.supportedProtocolVersions.map((v) => `${v};env=${this.mediaType()}`);
     }
     /** {@inheritDoc IPacker.isProfileSupported} */
     isProfileSupported(profile) {
-        const { env, circuits, alg } = parseAcceptProfile(profile);
+        const { protocolVersion, env, circuits, alg } = parseAcceptProfile(profile);
+        if (!this.supportedProtocolVersions.includes(protocolVersion)) {
+            return false;
+        }
         if (env !== this.mediaType()) {
             return false;
         }

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

@@ -3,7 +3,7 @@ import { AuthV2PubSignals, CircuitId } from '../../circuits/index';
 import { BytesHelper, DID } from '@iden3/js-iden3-core';
 import { bytesToProtocolMessage } from '../utils/envelope';
 import { ErrNoProvingMethodAlg, ErrPackedWithUnsupportedCircuit, ErrProofIsInvalid, ErrSenderNotUsedTokenCreation, ErrStateVerificationFailed, ErrUnknownCircuitID } from '../errors';
-import { AcceptAuthCircuits, AcceptJwzAlgorithms, MediaType } from '../constants';
+import { AcceptAuthCircuits, AcceptJwzAlgorithms, MediaType, ProtocolVersion } from '../constants';
 import { byteDecoder, byteEncoder } from '../../utils';
 import { DEFAULT_AUTH_VERIFY_DELAY } from '../constants';
 import { parseAcceptProfile } from '../utils';
@@ -78,6 +78,9 @@ export class ZKPPacker {
         this.provingParamsMap = provingParamsMap;
         this.verificationParamsMap = verificationParamsMap;
         this._opts = _opts;
+        this.supportedProtocolVersions = [ProtocolVersion.V1];
+        this.supportedAlgorithms = [AcceptJwzAlgorithms.Groth16];
+        this.supportedCircuitIds = [AcceptAuthCircuits.AuthV2];
     }
     /**
      * Packs a basic message using the specified parameters.
@@ -139,28 +142,23 @@ export class ZKPPacker {
     }
     /** {@inheritDoc IPacker.getSupportedProfiles} */
     getSupportedProfiles() {
-        return [
-            `env=${this.mediaType()}&alg=${this.getSupportedAlgorithms().join(',')}&circuitIds=${this.getSupportedCircuitIds().join(',')}`
-        ];
+        return this.supportedProtocolVersions.map((v) => `${v};env=${this.mediaType()};alg=${this.supportedAlgorithms.join(',')};circuitIds=${this.supportedCircuitIds.join(',')}`);
     }
     /** {@inheritDoc IPacker.isProfileSupported} */
     isProfileSupported(profile) {
-        const { env, circuits, alg } = parseAcceptProfile(profile);
+        const { protocolVersion, env, circuits, alg } = parseAcceptProfile(profile);
+        if (!this.supportedProtocolVersions.includes(protocolVersion)) {
+            return false;
+        }
         if (env !== this.mediaType()) {
             return false;
         }
-        const supportedCircuitIds = this.getSupportedCircuitIds();
+        const supportedCircuitIds = this.supportedCircuitIds;
         const circuitIdSupported = !circuits?.length || circuits.some((c) => supportedCircuitIds.includes(c));
-        const supportedAlgArr = this.getSupportedAlgorithms();
+        const supportedAlgArr = this.supportedAlgorithms;
         const algSupported = !alg?.length || alg.some((a) => supportedAlgArr.includes(a));
         return algSupported && circuitIdSupported;
     }
-    getSupportedAlgorithms() {
-        return [AcceptJwzAlgorithms.Groth16];
-    }
-    getSupportedCircuitIds() {
-        return [AcceptAuthCircuits.AuthV2];
-    }
 }
 const verifySender = async (token, msg) => {
     switch (token.circuitId) {

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

@@ -7,6 +7,7 @@ export * from './protocol/contract-request';
 export * from './protocol/proposal-request';
 export * from './protocol/payment';
 export * from './protocol/accept-profile';
+export * from './protocol/discovery-protocol';
 export * from './packer';
 export * from './models';
 export * from './packageManager';

package/dist/node/esm/iden3comm/types/protocol/discovery-protocol.js

@@ -0,0 +1,13 @@
+/** @beta DiscoverFeatureQueryType is enum for query type fields */
+export var DiscoverFeatureQueryType;
+(function (DiscoverFeatureQueryType) {
+    DiscoverFeatureQueryType["FeatureType"] = "feature-type";
+})(DiscoverFeatureQueryType || (DiscoverFeatureQueryType = {}));
+/** @beta DiscoveryProtocolFeatureType is enum for supported feature-types */
+export var DiscoveryProtocolFeatureType;
+(function (DiscoveryProtocolFeatureType) {
+    DiscoveryProtocolFeatureType["Accept"] = "accept";
+    DiscoveryProtocolFeatureType["Protocol"] = "protocol";
+    DiscoveryProtocolFeatureType["GoalCode"] = "goal-code";
+    DiscoveryProtocolFeatureType["Header"] = "header";
+})(DiscoveryProtocolFeatureType || (DiscoveryProtocolFeatureType = {}));

package/dist/node/esm/iden3comm/utils/contract-request.utils.js

@@ -0,0 +1,54 @@
+import { keccak256 } from 'ethers';
+import { byteEncoder, hexToBytes, isEthereumIdentity } from '../../utils';
+import { CircuitId } from '../../circuits';
+import { Hex } from '@iden3/js-crypto';
+/**
+ * @beta
+ * Retrieves the request ID from circuit string.
+ * CircuitId.AuthV2 - 940499666
+ * @returns The request ID.
+ */
+export function calculateRequestIdForCircuit(circuitId) {
+    const circuitHash = keccak256(byteEncoder.encode(circuitId));
+    const dataView = new DataView(Hex.decodeString(circuitHash.replace('0x', '')).buffer);
+    const id = dataView.getUint32(0);
+    return id;
+}
+/**
+ * Prepares the zero-knowledge proof response for the AuthV2 circuit.
+ * @beta
+ * @param address - The address associated with the request.
+ * @param senderDid - The sender's decentralized identifier (DID).
+ * @param proofService - The proof service used to generate the proof.
+ * @returns A promise that resolves to an array of ZeroKnowledgeProofResponse objects.
+ */
+export async function prepareAuthV2ZeroKnowledgeResponse(address, senderDid, proofService) {
+    const circuitId = CircuitId.AuthV2;
+    //  this is now hardcoded calculated value for 'authV2' that can be changed in the future.
+    const id = 940499666;
+    if (isEthereumIdentity(senderDid)) {
+        return [
+            {
+                circuitId,
+                id,
+                pub_signals: [],
+                proof: {
+                    pi_a: [],
+                    pi_b: [],
+                    pi_c: [],
+                    protocol: 'groth16'
+                }
+            }
+        ];
+    }
+    const hash = Uint8Array.from([...hexToBytes(address), ...new Uint8Array(12)]).reverse();
+    const { proof, pub_signals } = await proofService.generateAuthV2Proof(hash, senderDid);
+    return [
+        {
+            circuitId,
+            id,
+            pub_signals,
+            proof
+        }
+    ];
+}

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

@@ -1,4 +1,5 @@
 export * from './envelope';
 export * from './message';
 export * from './did';
+export * from './contract-request.utils';
 export * from './accept-profile';

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

@@ -213,6 +213,12 @@ export class ProofService {
         authInputs.gistProof = gistProof;
         return authInputs.inputsMarshal();
     }
+    /** {@inheritdoc IProofService.generateAuthV2Proof} */
+    async generateAuthV2Proof(challenge, did) {
+        const authInputs = await this.generateAuthV2Inputs(challenge, did, CircuitId.AuthV2);
+        const zkProof = await this._prover.generate(authInputs, CircuitId.AuthV2);
+        return zkProof;
+    }
     async verifyState(circuitId, pubSignals, opts = {
         acceptedStateTransitionDelay: PROTOCOL_CONSTANTS.DEFAULT_AUTH_VERIFY_DELAY
     }) {

package/dist/node/esm/storage/blockchain/onchain-zkp-verifier.js

@@ -1,10 +1,11 @@
 import { JsonRpcProvider, Contract, ethers } from 'ethers';
 import abi from './abi/ZkpVerifier.json';
 import { TransactionService } from '../../blockchain';
-import { DID } from '@iden3/js-iden3-core';
-import { AtomicQueryMTPV2OnChainPubSignals, AtomicQuerySigV2OnChainPubSignals, AtomicQueryV3OnChainPubSignals, CircuitId } from '../../circuits';
+import { chainIDfromDID, DID, Id } from '@iden3/js-iden3-core';
+import { AtomicQueryMTPV2OnChainPubSignals, AtomicQuerySigV2OnChainPubSignals, AtomicQueryV3OnChainPubSignals, AuthV2PubSignals, CircuitId } from '../../circuits';
 import { byteEncoder, DIDDocumentSignature, resolveDidDocument } from '../../utils';
 import { poseidon } from '@iden3/js-crypto';
+import { Hash } from '@iden3/js-merkletree';
 const maxGasLimit = 10000000n;
 /**
  * Supported function signature for SubmitZKPResponse
@@ -151,54 +152,60 @@ export class OnChainZKPVerifier {
         const { txnHash } = await transactionService.sendTransactionRequest(ethSigner, request);
         return new Map().set(txnHash, zkProofResponses);
     }
+    static getCrossChainResolvers(source, txDataChainId, type, didResolverUrl) {
+        return [
+            ...new Set(source.map((info) => JSON.stringify({
+                id: info.id.string(),
+                [type]: type === 'gist' ? info.root?.string() : info.state?.string()
+            })))
+        ].reduce((acc, s) => {
+            const info = JSON.parse(s);
+            const id = Id.fromString(info.id);
+            const chainId = chainIDfromDID(DID.parseFromId(id));
+            if (txDataChainId === chainId) {
+                return acc;
+            }
+            const promise = this.resolveDidDocumentEip712MessageAndSignature(DID.parseFromId(Id.fromString(info.id)), didResolverUrl, {
+                [type]: Hash.fromString(info[type])
+            });
+            return [...acc, promise];
+        }, []);
+    }
     static async prepareTxArgsSubmitV2(resolverUrl, txData, zkProofResponses) {
         if (txData.method_id.replace('0x', '') !== FunctionSignatures.SubmitZKPResponseV2) {
             throw new Error(`submit cross chain doesn't implement requested method id. Only '0x${FunctionSignatures.SubmitZKPResponseV2}' is supported.`);
         }
-        const gistUpdateArr = [];
-        const stateUpdateArr = [];
+        const gistUpdates = [];
+        const stateUpdates = [];
         const payload = [];
-        // Resolved gists and states to avoid duplicate requests
-        const gistUpdateResolutionsPending = [];
-        const stateUpdateResolutionsPending = [];
+        const emptyBytes = '0x';
         for (const zkProof of zkProofResponses) {
-            const requestID = zkProof.id;
-            const inputs = zkProof.pub_signals;
-            if (!this._supportedCircuits.includes(zkProof.circuitId)) {
+            const { id: requestId, pub_signals: inputs } = zkProof;
+            const proofCircuitId = zkProof.circuitId;
+            if (!this._supportedCircuits.includes(proofCircuitId)) {
                 throw new Error(`Circuit ${zkProof.circuitId} not supported by OnChainZKPVerifier`);
             }
+            if (inputs.length === 0) {
+                payload.push({
+                    requestId: requestId,
+                    zkProof: emptyBytes,
+                    data: emptyBytes
+                });
+                continue;
+            }
             const zkProofEncoded = this.packZkpProof(inputs, zkProof.proof.pi_a.slice(0, 2), [
                 [zkProof.proof.pi_b[0][1], zkProof.proof.pi_b[0][0]],
                 [zkProof.proof.pi_b[1][1], zkProof.proof.pi_b[1][0]]
             ], zkProof.proof.pi_c.slice(0, 2));
-            const stateInfo = this.getOnChainGistRootStatePubSignals(zkProof.circuitId, zkProof.pub_signals);
-            const gistUpdateResolutions = [];
-            for (const gist of stateInfo.gists) {
-                const gistResolutionPending = gistUpdateResolutionsPending.find((g) => g == JSON.stringify(gist));
-                if (gistResolutionPending) {
-                    continue;
-                }
-                gistUpdateResolutionsPending.push(JSON.stringify(gist));
-                gistUpdateResolutions.push(this.resolveDidDocumentEip712MessageAndSignature(DID.parseFromId(gist.id), resolverUrl, {
-                    gist: gist.root
-                }));
-            }
-            const stateUpdateResolutions = [];
-            for (const state of stateInfo.states) {
-                const stateResolutionPending = stateUpdateResolutionsPending.find((s) => s == JSON.stringify(state));
-                if (stateResolutionPending) {
-                    continue;
-                }
-                stateUpdateResolutionsPending.push(JSON.stringify(state));
-                stateUpdateResolutions.push(this.resolveDidDocumentEip712MessageAndSignature(DID.parseFromId(state.id), resolverUrl, {
-                    state: state.state
-                }));
-            }
+            const stateInfo = this.getOnChainGistRootStatePubSignals(proofCircuitId, inputs);
+            const chainId = txData.chain_id;
+            const gistUpdateResolutions = this.getCrossChainResolvers(stateInfo.gists, chainId, 'gist', resolverUrl);
+            const stateUpdateResolutions = this.getCrossChainResolvers(stateInfo.states, chainId, 'state', resolverUrl);
             if (gistUpdateResolutions.length > 0) {
-                gistUpdateArr.push(...(await Promise.all(gistUpdateResolutions)));
+                gistUpdates.push(...(await Promise.all(gistUpdateResolutions)));
             }
             if (stateUpdateResolutions.length > 0) {
-                stateUpdateArr.push(...(await Promise.all(stateUpdateResolutions)));
+                stateUpdates.push(...(await Promise.all(stateUpdateResolutions)));
             }
             const metadataArr = [];
             if (zkProof.vp) {
@@ -214,14 +221,16 @@ export class OnChainZKPVerifier {
                     });
                 }
             }
-            const metadata = metadataArr.length ? this.packMetadatas(metadataArr) : '0x';
+            const metadata = metadataArr.length ? this.packMetadatas(metadataArr) : emptyBytes;
             payload.push({
-                requestId: requestID,
+                requestId: requestId,
                 zkProof: zkProofEncoded,
                 data: metadata
             });
         }
-        const crossChainProofs = this.packCrossChainProofs(gistUpdateArr, stateUpdateArr);
+        const crossChainProofs = gistUpdates.length || stateUpdates.length
+            ? this.packCrossChainProofs(gistUpdates, stateUpdates)
+            : emptyBytes;
         return [payload, crossChainProofs];
     }
     async prepareTxArgsSubmitV2(txData, zkProofResponses) {
@@ -279,18 +288,11 @@ export class OnChainZKPVerifier {
         return new ethers.AbiCoder().encode(['tuple(' + 'string key,' + 'bytes value' + ')[]'], [metas]);
     }
     static getOnChainGistRootStatePubSignals(onChainCircuitId, inputs) {
-        let atomicQueryPubSignals;
-        switch (onChainCircuitId) {
-            case CircuitId.AtomicQueryMTPV2OnChain:
-                atomicQueryPubSignals = new AtomicQueryMTPV2OnChainPubSignals();
-                break;
-            case CircuitId.AtomicQuerySigV2OnChain:
-                atomicQueryPubSignals = new AtomicQuerySigV2OnChainPubSignals();
-                break;
-            case CircuitId.AtomicQueryV3OnChain:
-                atomicQueryPubSignals = new AtomicQueryV3OnChainPubSignals();
-                break;
+        const PubSignals = this._supportedCircuitsPubSignalsMap[onChainCircuitId];
+        if (!PubSignals) {
+            throw new Error(`Circuit ${onChainCircuitId} not supported by OnChainZKPVerifier`);
         }
+        const atomicQueryPubSignals = new PubSignals();
         const encodedInputs = byteEncoder.encode(JSON.stringify(inputs));
         atomicQueryPubSignals.pubSignalsUnmarshal(encodedInputs);
         return atomicQueryPubSignals.getStatesInfo();
@@ -332,7 +334,14 @@ export class OnChainZKPVerifier {
  * supported circuits
  */
 OnChainZKPVerifier._supportedCircuits = [
+    CircuitId.AuthV2,
     CircuitId.AtomicQueryMTPV2OnChain,
     CircuitId.AtomicQuerySigV2OnChain,
     CircuitId.AtomicQueryV3OnChain
 ];
+OnChainZKPVerifier._supportedCircuitsPubSignalsMap = {
+    [CircuitId.AtomicQueryMTPV2OnChain]: AtomicQueryMTPV2OnChainPubSignals,
+    [CircuitId.AtomicQuerySigV2OnChain]: AtomicQuerySigV2OnChainPubSignals,
+    [CircuitId.AtomicQueryV3OnChain]: AtomicQueryV3OnChainPubSignals,
+    [CircuitId.AuthV2]: AuthV2PubSignals
+};

package/dist/node/esm/utils/did-helper.js

@@ -97,9 +97,14 @@ export const resolveDidDocument = async (did, resolverUrl, opts) => {
     if (opts?.gist) {
         url += `${url.includes('?') ? '&' : '?'}gist=${opts.gist.hex()}`;
     }
-    const resp = await fetch(url);
-    const data = await resp.json();
-    return data;
+    try {
+        const resp = await fetch(url);
+        const data = await resp.json();
+        return data;
+    }
+    catch (e) {
+        throw new Error(`Failed to resolve DID document for ${did} ${e}`);
+    }
 };
 export const buildDIDFromEthPubKey = (didType, pubKeyEth) => {
     // Use Keccak-256 hash function to get public key hash

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

@@ -146,6 +146,7 @@ export var SupportedPaymentProofType;
 /**
  * Media types for Payment supported currencies
  * @beta
+ * @deprecated
  * @enum {string}
  */
 export var SupportedCurrencies;
@@ -155,8 +156,6 @@ export var SupportedCurrencies;
     SupportedCurrencies["ETH_GWEI"] = "ETHGWEI";
     SupportedCurrencies["MATIC"] = "MATIC";
     SupportedCurrencies["POL"] = "POL";
-    SupportedCurrencies["USDT"] = "USDT";
-    SupportedCurrencies["USDC"] = "USDC";
 })(SupportedCurrencies || (SupportedCurrencies = {}));
 /**
  * Supported features for payment-request

package/dist/types/circuits/auth-v2.d.ts

@@ -1,7 +1,7 @@
 import { Hash, Proof } from '@iden3/js-merkletree';
 import { Claim, Id } from '@iden3/js-iden3-core';
 import { GISTProof, TreeState } from './models';
-import { BaseConfig } from './common';
+import { BaseConfig, IStateInfoPubSignals, StatesInfo } from './common';
 import { Signature } from '@iden3/js-crypto';
 /**
  * Auth v2 circuit representation
@@ -30,7 +30,7 @@ export declare class AuthV2Inputs extends BaseConfig {
  * @public
  * @class AuthV2PubSignals
  */
-export declare class AuthV2PubSignals {
+export declare class AuthV2PubSignals implements IStateInfoPubSignals {
     userID: Id;
     challenge: bigint;
     GISTRoot: Hash;
@@ -41,4 +41,5 @@ export declare class AuthV2PubSignals {
      * @returns AuthV2PubSignals
      */
     pubSignalsUnmarshal(data: Uint8Array): AuthV2PubSignals;
+    getStatesInfo(): StatesInfo;
 }

package/dist/types/iden3comm/constants.d.ts

@@ -23,6 +23,8 @@ export declare const PROTOCOL_MESSAGE_TYPE: Readonly<{
     PROPOSAL_MESSAGE_TYPE: "https://iden3-communication.io/credentials/0.1/proposal";
     PAYMENT_REQUEST_MESSAGE_TYPE: "https://iden3-communication.io/credentials/0.1/payment-request";
     PAYMENT_MESSAGE_TYPE: "https://iden3-communication.io/credentials/0.1/payment";
+    DISCOVERY_PROTOCOL_QUERIES_MESSAGE_TYPE: "https://didcomm.org/discover-features/2.0/queries";
+    DISCOVERY_PROTOCOL_DISCLOSE_MESSAGE_TYPE: "https://didcomm.org/discover-features/2.0/disclose";
 }>;
 /**
  * Media types for iden3 comm communication protocol