@0xpolygonid/js-sdk 1.24.1 → 1.25.1

package/dist/node/cjs/circuits/auth-v2.js

@@ -92,5 +92,11 @@ class AuthV2PubSignals {
         this.GISTRoot = js_merkletree_1.Hash.fromString(sVals[2]);
         return this;
     }
+    getStatesInfo() {
+        return {
+            states: [],
+            gists: [{ id: this.userID, root: this.GISTRoot }]
+        };
+    }
 }
 exports.AuthV2PubSignals = AuthV2PubSignals;

package/dist/node/cjs/iden3comm/handlers/contract-request.js

@@ -30,6 +30,7 @@ class ContractRequestHandler extends message_handler_1.AbstractMessageHandler {
         this._proofService = _proofService;
         this._zkpVerifier = _zkpVerifier;
         this._supportedCircuits = [
+            models_1.CircuitId.AuthV2,
             models_1.CircuitId.AtomicQueryMTPV2OnChain,
             models_1.CircuitId.AtomicQuerySigV2OnChain,
             models_1.CircuitId.AtomicQueryV3OnChain
@@ -60,7 +61,12 @@ class ContractRequestHandler extends message_handler_1.AbstractMessageHandler {
             throw new Error(`Invalid chain id ${chain_id}`);
         }
         const verifierDid = message.from ? js_iden3_core_1.DID.parse(message.from) : undefined;
-        const zkpResponses = await (0, common_1.processZeroKnowledgeProofRequests)(did, message?.body?.scope, verifierDid, this._proofService, { ethSigner, challenge, supportedCircuits: this._supportedCircuits });
+        const { scope = [] } = message.body;
+        const zkpResponses = await (0, common_1.processZeroKnowledgeProofRequests)(did, scope, verifierDid, this._proofService, {
+            ethSigner,
+            challenge,
+            supportedCircuits: this._supportedCircuits
+        });
         const methodId = message.body.transaction_data.method_id.replace('0x', '');
         switch (methodId) {
             case storage_1.FunctionSignatures.SubmitZKPResponseV2:

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

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PaymentHandler = exports.createPayment = exports.convertPaymentAmount = exports.verifyEIP712TypedData = exports.createPaymentRequest = void 0;
+exports.PaymentHandler = exports.createPayment = exports.verifyEIP712TypedData = exports.createPaymentRequest = void 0;
 const constants_1 = require("../constants");
 const constants_2 = require("../constants");
 const js_iden3_core_1 = require("@iden3/js-iden3-core");
@@ -63,11 +63,10 @@ function createPaymentRequest(sender, receiver, agent, payments, opts) {
 }
 exports.createPaymentRequest = createPaymentRequest;
 async function verifyEIP712TypedData(data, resolver) {
-    const convertedAmount = await convertPaymentAmount(data.amount, data.currency);
     const paymentData = data.type === verifiable_1.PaymentRequestDataType.Iden3PaymentRailsRequestV1
         ? {
             recipient: data.recipient,
-            amount: convertedAmount,
+            amount: data.amount,
             expirationDate: (0, js_iden3_core_1.getUnixTimestamp)(new Date(data.expirationDate)),
             nonce: data.nonce,
             metadata: '0x'
@@ -75,7 +74,7 @@ async function verifyEIP712TypedData(data, resolver) {
         : {
             tokenAddress: data.tokenAddress,
             recipient: data.recipient,
-            amount: convertedAmount,
+            amount: data.amount,
             expirationDate: (0, js_iden3_core_1.getUnixTimestamp)(new Date(data.expirationDate)),
             nonce: data.nonce,
             metadata: '0x'
@@ -100,31 +99,6 @@ async function verifyEIP712TypedData(data, resolver) {
     throw new Error(`failed request. no matching verificationMethod`);
 }
 exports.verifyEIP712TypedData = verifyEIP712TypedData;
-async function convertPaymentAmount(amount, currency) {
-    let convertedAmount = 0n;
-    switch (currency) {
-        case verifiable_1.SupportedCurrencies.ETH:
-        case verifiable_1.SupportedCurrencies.POL:
-        case verifiable_1.SupportedCurrencies.MATIC:
-            convertedAmount = (0, ethers_1.parseEther)(amount.toString());
-            break;
-        case verifiable_1.SupportedCurrencies.ETH_WEI:
-            convertedAmount = (0, ethers_1.parseUnits)(amount.toString(), 'wei');
-            break;
-        case verifiable_1.SupportedCurrencies.ETH_GWEI:
-            convertedAmount = (0, ethers_1.parseUnits)(amount.toString(), 'gwei');
-            break;
-        case verifiable_1.SupportedCurrencies.USDC:
-        case verifiable_1.SupportedCurrencies.USDT: {
-            convertedAmount = (0, ethers_1.parseUnits)(amount.toString(), 6);
-            break;
-        }
-        default:
-            throw new Error(`failed request. unsupported currency ${currency}`);
-    }
-    return convertedAmount;
-}
-exports.convertPaymentAmount = convertPaymentAmount;
 /**
  * @beta
  * createPayment is a function to create protocol payment message
@@ -312,35 +286,38 @@ class PaymentHandler extends message_handler_1.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 === verifiable_1.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 === verifiable_1.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 === verifiable_1.PaymentRequestDataType.Iden3PaymentRailsRequestV1
+                const paymentData = option.type === verifiable_1.PaymentRequestDataType.Iden3PaymentRailsRequestV1
                     ? {
                         recipient,
-                        amount: convertedAmount,
+                        amount: amount,
                         expirationDate: (0, js_iden3_core_1.getUnixTimestamp)(expirationDateRequired),
                         nonce,
                         metadata: '0x'
                     }
                     : {
-                        tokenAddress,
+                        tokenAddress: option.contractAddress,
                         recipient,
-                        amount: convertedAmount,
+                        amount: amount,
                         expirationDate: (0, js_iden3_core_1.getUnixTimestamp)(expirationDateRequired),
                         nonce,
                         metadata: '0x'
@@ -349,7 +326,7 @@ class PaymentHandler extends message_handler_1.AbstractMessageHandler {
                     name: 'MCPayment',
                     version: '1.0.0',
                     chainId,
-                    verifyingContract: paymentContract
+                    verifyingContract: paymentRails
                 };
                 const signature = await signer.signTypedData(domain, types, paymentData);
                 const proof = [
@@ -369,20 +346,24 @@ class PaymentHandler extends message_handler_1.AbstractMessageHandler {
                 const d = {
                     type: verifiable_1.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 === verifiable_1.PaymentRequestDataType.Iden3PaymentRailsRequestV1
+                dataArr.push(option.type === verifiable_1.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/cjs/iden3comm/utils/contract-request.utils.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareAuthV2ZeroKnowledgeResponse = exports.calculateRequestIdForCircuit = void 0;
+const ethers_1 = require("ethers");
+const utils_1 = require("../../utils");
+const circuits_1 = require("../../circuits");
+const js_crypto_1 = require("@iden3/js-crypto");
+/**
+ * @beta
+ * Retrieves the request ID from circuit string.
+ * CircuitId.AuthV2 - 940499666
+ * @returns The request ID.
+ */
+function calculateRequestIdForCircuit(circuitId) {
+    const circuitHash = (0, ethers_1.keccak256)(utils_1.byteEncoder.encode(circuitId));
+    const dataView = new DataView(js_crypto_1.Hex.decodeString(circuitHash.replace('0x', '')).buffer);
+    const id = dataView.getUint32(0);
+    return id;
+}
+exports.calculateRequestIdForCircuit = calculateRequestIdForCircuit;
+/**
+ * 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.
+ */
+async function prepareAuthV2ZeroKnowledgeResponse(address, senderDid, proofService) {
+    const circuitId = circuits_1.CircuitId.AuthV2;
+    //  this is now hardcoded calculated value for 'authV2' that can be changed in the future.
+    const id = 940499666;
+    if ((0, utils_1.isEthereumIdentity)(senderDid)) {
+        return [
+            {
+                circuitId,
+                id,
+                pub_signals: [],
+                proof: {
+                    pi_a: [],
+                    pi_b: [],
+                    pi_c: [],
+                    protocol: 'groth16'
+                }
+            }
+        ];
+    }
+    const hash = Uint8Array.from([...(0, utils_1.hexToBytes)(address), ...new Uint8Array(12)]).reverse();
+    const { proof, pub_signals } = await proofService.generateAuthV2Proof(hash, senderDid);
+    return [
+        {
+            circuitId,
+            id,
+            pub_signals,
+            proof
+        }
+    ];
+}
+exports.prepareAuthV2ZeroKnowledgeResponse = prepareAuthV2ZeroKnowledgeResponse;

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

@@ -17,4 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./envelope"), exports);
 __exportStar(require("./message"), exports);
 __exportStar(require("./did"), exports);
+__exportStar(require("./contract-request.utils"), exports);
 __exportStar(require("./accept-profile"), exports);

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

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

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

@@ -11,6 +11,7 @@ const js_iden3_core_1 = require("@iden3/js-iden3-core");
 const circuits_1 = require("../../circuits");
 const utils_1 = require("../../utils");
 const js_crypto_1 = require("@iden3/js-crypto");
+const js_merkletree_1 = require("@iden3/js-merkletree");
 const maxGasLimit = 10000000n;
 /**
  * Supported function signature for SubmitZKPResponse
@@ -157,54 +158,60 @@ 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 = js_iden3_core_1.Id.fromString(info.id);
+            const chainId = (0, js_iden3_core_1.chainIDfromDID)(js_iden3_core_1.DID.parseFromId(id));
+            if (txDataChainId === chainId) {
+                return acc;
+            }
+            const promise = this.resolveDidDocumentEip712MessageAndSignature(js_iden3_core_1.DID.parseFromId(js_iden3_core_1.Id.fromString(info.id)), didResolverUrl, {
+                [type]: js_merkletree_1.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(js_iden3_core_1.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(js_iden3_core_1.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) {
@@ -220,14 +227,16 @@ 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) {
@@ -285,18 +294,11 @@ class OnChainZKPVerifier {
         return new ethers_1.ethers.AbiCoder().encode(['tuple(' + 'string key,' + 'bytes value' + ')[]'], [metas]);
     }
     static getOnChainGistRootStatePubSignals(onChainCircuitId, inputs) {
-        let atomicQueryPubSignals;
-        switch (onChainCircuitId) {
-            case circuits_1.CircuitId.AtomicQueryMTPV2OnChain:
-                atomicQueryPubSignals = new circuits_1.AtomicQueryMTPV2OnChainPubSignals();
-                break;
-            case circuits_1.CircuitId.AtomicQuerySigV2OnChain:
-                atomicQueryPubSignals = new circuits_1.AtomicQuerySigV2OnChainPubSignals();
-                break;
-            case circuits_1.CircuitId.AtomicQueryV3OnChain:
-                atomicQueryPubSignals = new circuits_1.AtomicQueryV3OnChainPubSignals();
-                break;
+        const PubSignals = this._supportedCircuitsPubSignalsMap[onChainCircuitId];
+        if (!PubSignals) {
+            throw new Error(`Circuit ${onChainCircuitId} not supported by OnChainZKPVerifier`);
         }
+        const atomicQueryPubSignals = new PubSignals();
         const encodedInputs = utils_1.byteEncoder.encode(JSON.stringify(inputs));
         atomicQueryPubSignals.pubSignalsUnmarshal(encodedInputs);
         return atomicQueryPubSignals.getStatesInfo();
@@ -339,7 +341,14 @@ exports.OnChainZKPVerifier = OnChainZKPVerifier;
  * supported circuits
  */
 OnChainZKPVerifier._supportedCircuits = [
+    circuits_1.CircuitId.AuthV2,
     circuits_1.CircuitId.AtomicQueryMTPV2OnChain,
     circuits_1.CircuitId.AtomicQuerySigV2OnChain,
     circuits_1.CircuitId.AtomicQueryV3OnChain
 ];
+OnChainZKPVerifier._supportedCircuitsPubSignalsMap = {
+    [circuits_1.CircuitId.AtomicQueryMTPV2OnChain]: circuits_1.AtomicQueryMTPV2OnChainPubSignals,
+    [circuits_1.CircuitId.AtomicQuerySigV2OnChain]: circuits_1.AtomicQuerySigV2OnChainPubSignals,
+    [circuits_1.CircuitId.AtomicQueryV3OnChain]: circuits_1.AtomicQueryV3OnChainPubSignals,
+    [circuits_1.CircuitId.AuthV2]: circuits_1.AuthV2PubSignals
+};

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

@@ -105,9 +105,14 @@ 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}`);
+    }
 };
 exports.resolveDidDocument = resolveDidDocument;
 const buildDIDFromEthPubKey = (didType, pubKeyEth) => {

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

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

package/dist/node/esm/circuits/auth-v2.js

@@ -88,4 +88,10 @@ export class AuthV2PubSignals {
         this.GISTRoot = Hash.fromString(sVals[2]);
         return this;
     }
+    getStatesInfo() {
+        return {
+            states: [],
+            gists: [{ id: this.userID, root: this.GISTRoot }]
+        };
+    }
 }

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

@@ -27,6 +27,7 @@ export class ContractRequestHandler extends AbstractMessageHandler {
         this._proofService = _proofService;
         this._zkpVerifier = _zkpVerifier;
         this._supportedCircuits = [
+            CircuitId.AuthV2,
             CircuitId.AtomicQueryMTPV2OnChain,
             CircuitId.AtomicQuerySigV2OnChain,
             CircuitId.AtomicQueryV3OnChain
@@ -57,7 +58,12 @@ export class ContractRequestHandler extends AbstractMessageHandler {
             throw new Error(`Invalid chain id ${chain_id}`);
         }
         const verifierDid = message.from ? DID.parse(message.from) : undefined;
-        const zkpResponses = await processZeroKnowledgeProofRequests(did, message?.body?.scope, verifierDid, this._proofService, { ethSigner, challenge, supportedCircuits: this._supportedCircuits });
+        const { scope = [] } = message.body;
+        const zkpResponses = await processZeroKnowledgeProofRequests(did, scope, verifierDid, this._proofService, {
+            ethSigner,
+            challenge,
+            supportedCircuits: this._supportedCircuits
+        });
         const methodId = message.body.transaction_data.method_id.replace('0x', '');
         switch (methodId) {
             case FunctionSignatures.SubmitZKPResponseV2:

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,