@zkproofport-app/sdk 0.5.0-beta.3 → 0.5.0-beta.4

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { checkProofIssuer, parseProofForOnChain, verifyProofOnChain, getPinnedVerifier, extractScopeFromPublicInputs, extractNullifierFromPublicInputs, extractDomainFromPublicInputs } from '@zkproofport-app/core';
-export { COINBASE_ATTESTATION_PUBLIC_INPUT_LAYOUT, COINBASE_COUNTRY_PUBLIC_INPUT_LAYOUT, MDL_KR_PUBLIC_INPUT_LAYOUT, OIDC_ALLOWED_AUDIENCES, OIDC_DOMAIN_ATTESTATION_PUBLIC_INPUT_LAYOUT, OIDC_NONCE_DOMAIN, OIDC_NOW_MAX_AGE_SECONDS, OIDC_NOW_MAX_FUTURE_SECONDS, OIDC_V1_PUBLIC_INPUT_COUNT, OIDC_V2_PUBLIC_INPUT_COUNT, PINNED_VERIFIERS, checkOidcPolicy, deriveOidcNonceBinding, extractDomainFromPublicInputs, extractNullifierFromPublicInputs, extractScopeFromPublicInputs, getPinnedVerifier, oidcAudienceHash } from '@zkproofport-app/core';
-import { isCircuitId, ALL_CIRCUIT_IDS, circuitActionBinding, CIRCUIT_VK_PATHS, CIRCUIT_NEEDS_WALLET_SIGNATURE } from '@zkproofport-app/core/circuits';
-export { ALL_CIRCUIT_IDS, CIRCUIT_ACTION_BINDING, CIRCUIT_IDS, CIRCUIT_SUPPORT_STATUS, CIRCUIT_VK_PATHS, EXPERIMENTAL_CIRCUIT_IDS, PLANNED_CIRCUIT_IDS, SUPPORTED_CIRCUIT_IDS, circuitActionBinding, getCircuitSupportStatus, isCircuitId, isSupportedCircuitId } from '@zkproofport-app/core/circuits';
+export { COINBASE_ATTESTATION_PUBLIC_INPUT_LAYOUT, COINBASE_COUNTRY_PUBLIC_INPUT_LAYOUT, OIDC_ALLOWED_AUDIENCES, OIDC_DOMAIN_ATTESTATION_PUBLIC_INPUT_LAYOUT, OIDC_NONCE_DOMAIN, OIDC_NOW_MAX_AGE_SECONDS, OIDC_NOW_MAX_FUTURE_SECONDS, OIDC_V1_PUBLIC_INPUT_COUNT, OIDC_V2_PUBLIC_INPUT_COUNT, PINNED_VARIANT_VERIFIERS, PINNED_VERIFIERS, checkOidcPolicy, deriveOidcNonceBinding, extractDomainFromPublicInputs, extractNullifierFromPublicInputs, extractScopeFromPublicInputs, getPinnedVariantVerifier, getPinnedVerifier, oidcAudienceHash } from '@zkproofport-app/core';
+import { isCircuitId, ALL_CIRCUIT_IDS, circuitActionBinding, resolveSignerVariant, getCircuitPackage, CIRCUIT_NEEDS_WALLET_SIGNATURE } from '@zkproofport-app/core/circuits';
+export { ALL_CIRCUIT_IDS, CIRCUIT_ACTION_BINDING, CIRCUIT_IDS, CIRCUIT_PACKAGES, CIRCUIT_SUPPORT_STATUS, CIRCUIT_VK_PATHS, EXPERIMENTAL_CIRCUIT_IDS, PLANNED_CIRCUIT_IDS, SIGNER_VARIANTS, SUPPORTED_CIRCUIT_IDS, circuitActionBinding, evmProofByteLength, getCircuitPackage, getCircuitSupportStatus, isCircuitId, isSignerVariant, isSupportedCircuitId, resolveSignerVariant, signerVariantsOf } from '@zkproofport-app/core/circuits';
 import { validateTypedAction } from '@zkproofport-app/core/typedAction';
 export { parseTypedAction, validateTypedAction } from '@zkproofport-app/core/typedAction';
 
@@ -30,7 +30,7 @@ const RELAY_URLS = {
  * Mirrors the mobile app's `CIRCUIT_NETWORKS` (proofport-app
  * src/config/contracts.ts), because a proof is checked where the app said its
  * verifier is: Base for the Coinbase and OIDC circuits, GIWA Sepolia for GIWA
- * and Dojang (testnet-only), Base Sepolia for Korea Mobile ID (testnet-only).
+ * and Dojang (testnet-only).
  * The ADDRESS on that chain always comes from core's pinned table, never from
  * a proof response.
  */
@@ -41,9 +41,6 @@ const VERIFICATION_CHAINS = {
         oidc_domain_attestation: 8453,
         giwa_attestation: 91342,
         dojang_playground: 91342,
-        mdl_kr_ownership: 84532,
-        mdl_kr_age: 84532,
-        mdl_kr_region: 84532,
     },
     staging: {
         coinbase_attestation: 84532,
@@ -51,9 +48,6 @@ const VERIFICATION_CHAINS = {
         oidc_domain_attestation: 84532,
         giwa_attestation: 91342,
         dojang_playground: 91342,
-        mdl_kr_ownership: 84532,
-        mdl_kr_age: 84532,
-        mdl_kr_region: 84532,
     },
     local: {
         coinbase_attestation: 84532,
@@ -61,9 +55,6 @@ const VERIFICATION_CHAINS = {
         oidc_domain_attestation: 84532,
         giwa_attestation: 91342,
         dojang_playground: 91342,
-        mdl_kr_ownership: 84532,
-        mdl_kr_age: 84532,
-        mdl_kr_region: 84532,
     },
 };
 /**
@@ -160,27 +151,6 @@ const CIRCUIT_METADATA = {
         publicInputsCount: 160,
         publicInputNames: ['signal_hash', 'domain_separator', 'action_hash', 'scope', 'nullifier'],
     },
-    // Korea Mobile ID (mDL) circuits. Planned — not officially supported yet.
-    // Counts are byte-flattened field totals from the compiled circuit ABIs:
-    // [u8; 32] arrays contribute 32 inputs each.
-    mdl_kr_ownership: {
-        name: 'Korea Mobile ID — Ownership',
-        description: "Prove valid Korean mobile driver's license ownership with selective disclosure",
-        publicInputsCount: 97,
-        publicInputNames: ['scope', 'nullifier_value', 'disclose_flags', 'owner_commit'],
-    },
-    mdl_kr_age: {
-        name: 'Korea Mobile ID — Age',
-        description: "Prove minimum age from Korean mobile driver's license without revealing birth date",
-        publicInputsCount: 66,
-        publicInputNames: ['scope', 'nullifier_value', 'age_threshold', 'current_year'],
-    },
-    mdl_kr_region: {
-        name: 'Korea Mobile ID — Region',
-        description: "Prove si/do residency from Korean mobile driver's license without revealing address",
-        publicInputsCount: 96,
-        publicInputNames: ['scope', 'nullifier_value', 'region_code'],
-    },
 };
 /**
  * Default proof request expiration time in milliseconds.
@@ -424,6 +394,12 @@ function parseProofResponseUrl(url) {
             if (timestamp) {
                 response.timestamp = parseInt(timestamp, 10);
             }
+            // Kept as sent, even when unknown: verification refuses it by name,
+            // which says more than a callback that fails to parse.
+            const signerVariant = urlObj.searchParams.get('signerVariant');
+            if (signerVariant !== null) {
+                response.signerVariant = signerVariant;
+            }
         }
         else if (status === 'error') {
             response.error = urlObj.searchParams.get('error') || undefined;
@@ -455,94 +431,6 @@ function parseProofResponseUrl(url) {
 function isProofportDeepLink(url, scheme = DEFAULT_SCHEME) {
     return url.toLowerCase().startsWith(`${scheme.toLowerCase()}://`);
 }
-/**
- * @internal
- * Validates a proof request for completeness and correctness.
- *
- * Performs comprehensive validation including:
- * - Required fields (requestId, circuit, callbackUrl)
- * - Circuit type validity (must be a supported circuit)
- * - Circuit-specific input validation (e.g., userAddress format, countryList structure)
- * - Expiration check (if expiresAt is provided)
- *
- * Note: userAddress is optional for both circuits - the mobile app will prompt
- * for wallet connection if not provided.
- *
- * @param request - Proof request to validate
- * @returns Validation result with `valid` flag and optional `error` message
- */
-/**
- * Validates a free-text mDL input (scope / targetRegion).
- * Rejects empty or whitespace-only values, control characters (which break
- * deep-link query encoding and downstream logging), and values over 256 chars
- * (server-side length cap mirror). UTF-8 text such as Korean region names is
- * allowed.
- *
- * @returns Error message string, or null when valid.
- */
-function validateMdlTextInput(value, fieldName) {
-    if (typeof value !== 'string' || value.trim() === '') {
-        return `${fieldName} is required and must be a non-empty string`;
-    }
-    if (value.length > 256) {
-        return `${fieldName} must be 256 characters or fewer`;
-    }
-    // eslint-disable-next-line no-control-regex
-    if (/[\u0000-\u001F\u007F]/.test(value)) {
-        return `${fieldName} must not contain control characters`;
-    }
-    return null;
-}
-/**
- * Validates dapp-supplied inputs for the Korea Mobile ID (mDL) circuits.
- * Shared by deep-link request validation and relay request creation so the
- * same guards apply on every request path.
- *
- * Rules:
- * - `scope` — required non-empty string, ≤256 chars, no control characters
- * - `mdl_kr_ownership.discloseFlags` — optional integer 0–15 (0x0F bitmask)
- * - `mdl_kr_age.ageThreshold` — required integer 1–150
- * - `mdl_kr_region.targetRegion` — required non-empty string (Korean si/do),
- *   ≤256 chars, no control characters
- *
- * @param circuit - One of the three mDL circuit identifiers
- * @param inputs - Dapp-supplied circuit inputs
- * @returns Error message string, or null when the inputs are valid
- */
-function validateMdlInputs(circuit, inputs) {
-    const scopeError = validateMdlTextInput(inputs.scope, 'scope');
-    if (scopeError) {
-        return scopeError;
-    }
-    if (circuit === 'mdl_kr_ownership') {
-        const { discloseFlags } = inputs;
-        if (discloseFlags !== undefined) {
-            if (typeof discloseFlags !== 'number' ||
-                !Number.isInteger(discloseFlags) ||
-                discloseFlags < 0 ||
-                discloseFlags > 0x0f) {
-                return 'discloseFlags must be an integer between 0 and 15';
-            }
-        }
-    }
-    else if (circuit === 'mdl_kr_age') {
-        const { ageThreshold } = inputs;
-        if (typeof ageThreshold !== 'number' ||
-            !Number.isInteger(ageThreshold) ||
-            ageThreshold < 1 ||
-            ageThreshold > 150) {
-            return 'ageThreshold is required and must be an integer between 1 and 150';
-        }
-    }
-    else {
-        const { targetRegion } = inputs;
-        const regionError = validateMdlTextInput(targetRegion, 'targetRegion');
-        if (regionError) {
-            return regionError;
-        }
-    }
-    return null;
-}
 /**
  * Longest accepted `returnScheme` value.
  * Kept in sync with proofport-relay `src/returnScheme.ts`.
@@ -702,6 +590,22 @@ function detectReturnScheme(userAgent) {
     }
     return undefined;
 }
+/**
+ * @internal
+ * Validates a proof request for completeness and correctness.
+ *
+ * Performs comprehensive validation including:
+ * - Required fields (requestId, circuit, callbackUrl)
+ * - Circuit type validity (must be a supported circuit)
+ * - Circuit-specific input validation (e.g., userAddress format, countryList structure)
+ * - Expiration check (if expiresAt is provided)
+ *
+ * Note: userAddress is optional for both circuits - the mobile app will prompt
+ * for wallet connection if not provided.
+ *
+ * @param request - Proof request to validate
+ * @returns Validation result with `valid` flag and optional `error` message
+ */
 function validateProofRequest(request) {
     if (!request.requestId) {
         return { valid: false, error: 'Missing requestId' };
@@ -757,14 +661,6 @@ function validateProofRequest(request) {
             return { valid: false, error: 'provider must be a non-empty string when specified' };
         }
     }
-    else if (request.circuit === 'mdl_kr_ownership' ||
-        request.circuit === 'mdl_kr_age' ||
-        request.circuit === 'mdl_kr_region') {
-        const mdlError = validateMdlInputs(request.circuit, request.inputs);
-        if (mdlError) {
-            return { valid: false, error: mdlError };
-        }
-    }
     // The action, decided by the circuit's own entry rather than by naming a
     // circuit here, so every action-capable circuit is checked the same way.
     {
@@ -3868,7 +3764,7 @@ function estimateQRDataSize(requestOrUrl, scheme = DEFAULT_SCHEME) {
  *   The version. `@aztec/bb.js` must be the WASM build of the same bb the
  *   circuits are compiled with -- `BB_VERSION` in circuits/toolchain.env,
  *   4.2.0-aztecnr-rc.2 since the beta.19 toolchain. Versions are not
- *   interchangeable: on the Korea Mobile ID age circuit the 2025 nightly wrote
+ *   interchangeable: on one of our circuits the 2025 nightly wrote
  *   a 16256-byte proof where bb 1.2.0 wrote 16224 for the identical circuit and
  *   witness, with the SAME verification key, so the key cannot warn you. A
  *   mismatch shows up only as verification failing.
@@ -3970,15 +3866,12 @@ function normalisePublicInputs(publicInputs) {
  *
  * @internal
  */
-async function fetchVerificationKey(circuit, timeoutMs) {
-    const cached = vkCache.get(circuit);
+async function fetchVerificationKey(circuit, variant, timeoutMs) {
+    const cacheKey = `${circuit}/${variant}`;
+    const cached = vkCache.get(cacheKey);
     if (cached && Date.now() - cached.at < VK_CACHE_TTL_MS)
         return cached.vk;
-    const vkPath = CIRCUIT_VK_PATHS[circuit];
-    if (!vkPath) {
-        throw new Error(`No verification key path for circuit '${circuit}'. ` +
-            `Add it to CIRCUIT_VK_PATHS, or pass verificationKey directly.`);
-    }
+    const vkPath = getCircuitPackage(circuit, variant).vkPath;
     const url = `${CIRCUITS_VK_BASE}/${vkPath}`;
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), timeoutMs);
@@ -3995,7 +3888,7 @@ async function fetchVerificationKey(circuit, timeoutMs) {
             throw new Error(`The verification key at ${url} is ${vk.length} bytes, far too small to be one. ` +
                 `The path is probably wrong and something else was served.`);
         }
-        vkCache.set(circuit, { vk, at: Date.now() });
+        vkCache.set(cacheKey, { vk, at: Date.now() });
         return vk;
     }
     finally {
@@ -4035,6 +3928,10 @@ async function verifyProofOffChain(circuit, proof, publicInputs, options = {}) {
     if (!isCircuitId(circuit)) {
         return { valid: false, error: `Unknown circuit '${circuit}'. Known: ${ALL_CIRCUIT_IDS.join(', ')}.` };
     }
+    const signer = resolveSignerVariant(circuit, options.signerVariant, proof);
+    if ('error' in signer) {
+        return { valid: false, error: signer.error };
+    }
     // Before Barretenberg, and for the same reason as on-chain: a proof can be
     // mathematically valid and still mean nothing, because some circuits take
     // their trust anchor as a public input the prover chooses. For OIDC that is
@@ -4081,7 +3978,7 @@ async function verifyProofOffChain(circuit, proof, publicInputs, options = {}) {
         // relay can deliver a short value (`0x01`), and the check below must see
         // exactly what the circuit committed to.
         const fields = normalisePublicInputs(publicInputs);
-        const vk = options.verificationKey ?? (await fetchVerificationKey(circuit, timeoutMs));
+        const vk = options.verificationKey ?? (await fetchVerificationKey(circuit, signer.variant, timeoutMs));
         const barretenberg = await bb.Barretenberg.new({ threads: 1 });
         api = barretenberg;
         const verifier = new bb.UltraHonkVerifierBackend(barretenberg);
@@ -4115,6 +4012,17 @@ const RELAY_TERMINAL_STATUSES = ['completed', 'error', 'failed', 'cancelled', 'e
 function isTerminalRelayStatus(status) {
     return RELAY_TERMINAL_STATUSES.includes(status);
 }
+/**
+ * How long `waitForProof()` / `waitForResult()` wait when the caller passes no
+ * `timeoutMs`: 600 000 ms (10 min).
+ *
+ * The relay answers `expired` itself at 540 s, so with this default a dApp
+ * always gets a terminal status to branch on rather than its own timeout. A
+ * heavy proof on an older phone takes a few minutes after the user confirms;
+ * the earlier 300 000 ms default could fire while such a proof was still being
+ * made.
+ */
+const DEFAULT_RELAY_WAIT_MS = 600000;
 
 /**
  * Proofport SDK - Main class
@@ -4265,7 +4173,7 @@ class ProofportSDK {
         const request = {
             requestId: generateRequestId(),
             // The circuit asked for, always. This used to be the literal
-            // 'coinbase_attestation', and every circuit that was not country or mDL
+            // 'coinbase_attestation', and every circuit that was not country
             // was routed here -- a GIWA, Dojang or OIDC request silently became a
             // Coinbase KYC request.
             circuit,
@@ -4372,45 +4280,10 @@ class ProofportSDK {
         switch (builder) {
             case 'country':
                 return this.createCoinbaseCountryRequest(inputs, options);
-            case 'mdl':
-                return this.createMdlKrRequest(circuit, inputs, options);
             case 'scoped':
                 return this.createScopedRequest(circuit, inputs, options);
         }
     }
-    /**
-     * @internal
-     * Creates a Korea Mobile ID (mDL) proof request for any of the three
-     * mDL predicate circuits (ownership / age / region).
-     *
-     * The mobile app collects the license data on-device; the dapp only
-     * supplies the predicate parameters validated here. No wallet signature
-     * is required for mDL circuits.
-     *
-     * @param circuit - 'mdl_kr_ownership' | 'mdl_kr_age' | 'mdl_kr_region'
-     * @param inputs - Predicate inputs (see MdlKr*Inputs types)
-     * @param options - Request configuration options
-     *
-     * @throws Error if the predicate inputs fail validation
-     */
-    createMdlKrRequest(circuit, inputs, options = {}) {
-        const mdlError = validateMdlInputs(circuit, inputs);
-        if (mdlError) {
-            throw new Error(`${mdlError} (circuit: ${circuit})`);
-        }
-        const request = {
-            requestId: generateRequestId(),
-            circuit,
-            inputs,
-            message: options.message,
-            dappName: options.dappName,
-            dappIcon: options.dappIcon,
-            createdAt: Date.now(),
-            expiresAt: Date.now() + (options.expiresInMs || DEFAULT_REQUEST_EXPIRY_MS),
-        };
-        this.pendingRequests.set(request.requestId, request);
-        return request;
-    }
     // ============ Deep Link Generation ============
     /**
      * @internal
@@ -4754,6 +4627,7 @@ class ProofportSDK {
         const parsedProof = parseProofForOnChain(proof, publicInputs, publicInputs.length);
         return verifyProofOnChain(circuit, parsedProof, providerOrSigner, this.verifierTarget(circuit), undefined, {
             request: options.request,
+            signerVariant: options.signerVariant,
         });
     }
     /**
@@ -4867,7 +4741,7 @@ class ProofportSDK {
         return verifyProofOnChain(response.circuit, parsedProof, providerOrSigner, this.verifierTarget(response.circuit), {
             verifierAddress: response.verifierAddress,
             chainId: response.chainId,
-        }, { request });
+        }, { request, signerVariant: response.signerVariant });
     }
     /**
      * Verifies a proof response off-chain, against the circuit's verification key.
@@ -4904,7 +4778,7 @@ class ProofportSDK {
                 return { valid: false, error: found.error };
             request = found.request;
         }
-        return verifyProofOffChain(response.circuit, response.proof, response.publicInputs, { ...options, request });
+        return verifyProofOffChain(response.circuit, response.proof, response.publicInputs, { ...options, request, signerVariant: response.signerVariant });
     }
     // ============ Utility Methods ============
     /**
@@ -5262,14 +5136,6 @@ class ProofportSDK {
         if (needsSignature && !this.signer) {
             throw new Error('Signer not set. Call setSigner() first. Wallet signature is required for this circuit.');
         }
-        // mDL circuits: validate predicate inputs client-side before hitting the
-        // relay, so a bad ageThreshold / targetRegion fails fast with a clear error.
-        if (circuit === 'mdl_kr_ownership' || circuit === 'mdl_kr_age' || circuit === 'mdl_kr_region') {
-            const mdlError = validateMdlInputs(circuit, inputs);
-            if (mdlError) {
-                throw new Error(`${mdlError} (circuit: ${circuit})`);
-            }
-        }
         // The action, per the circuit's entry in CIRCUIT_ACTION_BINDING. Checked
         // here, before a challenge is burned, because the alternative is a refusal
         // from inside the mobile app -- a screen the dapp developer never sees,
@@ -5385,14 +5251,14 @@ class ProofportSDK {
      * @param requestId - The relay-issued request ID
      * @param options - Polling options
      * @param options.intervalMs - Polling interval in milliseconds (default: 2000)
-     * @param options.timeoutMs - Maximum polling time in milliseconds (default: 300000 = 5 min)
+     * @param options.timeoutMs - Maximum polling time in milliseconds (default: 600000 = 10 min, `DEFAULT_RELAY_WAIT_MS`)
      * @param options.onStatusChange - Callback when status changes
      * @returns Promise resolving to final RelayProofResult
      * @throws Error if timeout or relay error
      */
     async waitForResult(requestId, options = {}) {
         const interval = options.intervalMs || 2000;
-        const timeout = options.timeoutMs || 300000;
+        const timeout = options.timeoutMs || DEFAULT_RELAY_WAIT_MS;
         const startTime = Date.now();
         let lastStatus = '';
         while (Date.now() - startTime < timeout) {
@@ -5504,12 +5370,12 @@ class ProofportSDK {
      *
      * @param requestId - The relay-issued request ID
      * @param options - Configuration options
-     * @param options.timeoutMs - Maximum wait time in ms (default: 300000 = 5 min)
+     * @param options.timeoutMs - Maximum wait time in ms (default: 600000 = 10 min, `DEFAULT_RELAY_WAIT_MS`)
      * @param options.onStatusChange - Callback for status updates
      * @returns Promise resolving to final RelayProofResult
      */
     async waitForProof(requestId, options = {}) {
-        const timeout = options.timeoutMs || 300000;
+        const timeout = options.timeoutMs || DEFAULT_RELAY_WAIT_MS;
         // Try Socket.IO first
         if (this.relayUrl) {
             try {
@@ -5641,10 +5507,7 @@ ProofportSDK.REQUEST_BUILDERS = {
     oidc_domain_attestation: 'scoped',
     giwa_attestation: 'scoped',
     dojang_playground: 'scoped',
-    mdl_kr_ownership: 'mdl',
-    mdl_kr_age: 'mdl',
-    mdl_kr_region: 'mdl',
 };
 
-export { ProofportSDK, RELAY_TERMINAL_STATUSES, ProofportSDK as default, isTerminalRelayStatus, verifyProofOffChain };
+export { DEFAULT_RELAY_WAIT_MS, ProofportSDK, RELAY_TERMINAL_STATUSES, ProofportSDK as default, isTerminalRelayStatus, verifyProofOffChain };
 //# sourceMappingURL=index.mjs.map