@fhevm/sdk 1.1.0-alpha.6 → 1.1.0-alpha.8

package/_esm/core/host-contracts/getKmsContextSignersAndThresholdFromExtraData-p.js

@@ -1,17 +1,17 @@
 import { getHostContractVersion, isVersionStrictlyBefore } from './HostContractVersion-p.js';
 import { createCachedFetch } from '../base/cachedFetch.js';
-import { assertIsKmsExtraData, fromKmsExtraData } from '../kms/kmsExtraData.js';
 import { assertIsChecksummedAddressArray } from '../base/address.js';
 import { isUint8 } from '../base/uint.js';
 import { getContextSignersAndThresholdFromExtraDataAbi } from './abi-fragments/fragments.js';
 import { getTrustedClient } from '../runtime/CoreFhevm-p.js';
+import { assertIsKmsExtraData } from '../kms/kmsExtraData-p.js';
 ////////////////////////////////////////////////////////////////////////////////
 const cachedGetKmsContextSignersAndThresholdFromExtraData = createCachedFetch({
     executeFn: _getKmsContextSignersAndThresholdFromExtraData,
     cacheKeyFn: (context, params) => {
-        const { kmsContextId } = fromKmsExtraData(params.extraData);
-        const contextIdHex = kmsContextId.toString(16).padStart(64, '0');
-        return `${context.runtime.uid.toLowerCase()}:${params.kmsVerifierAddress.toLowerCase()}:${contextIdHex}`;
+        const kmsContextId = params.extraData.kmsContextId;
+        const kmsContextIdHex = kmsContextId.toString(16).padStart(64, '0');
+        return `${context.runtime.uid.toLowerCase()}:${params.kmsVerifierAddress.toLowerCase()}:${kmsContextIdHex}`;
     },
     // Permanent cache: signers and threshold are immutable per context ID.
 });
@@ -42,10 +42,11 @@ async function _getKmsContextSignersAndThresholdFromExtraData(context, parameter
         throw new Error('getContextSignersAndThresholdFromExtraData requires KMSVerifier >= v0.2.0');
     }
     const trustedClient = getTrustedClient(context);
+    const extraDataBytesHex = parameters.extraData.toBytesHex();
     const res = await context.runtime.ethereum.readContract(trustedClient, {
         address: parameters.kmsVerifierAddress,
         abi: getContextSignersAndThresholdFromExtraDataAbi,
-        args: [parameters.extraData],
+        args: [extraDataBytesHex],
         functionName: getContextSignersAndThresholdFromExtraDataAbi[0].name,
     });
     if (!Array.isArray(res) || res.length < 2) {

package/_esm/core/host-contracts/getKmsContextSignersAndThresholdFromExtraData-p.js.map

@@ -1 +1 @@
-{"version":3,"file":"getKmsContextSignersAndThresholdFromExtraData-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getKmsContextSignersAndThresholdFromExtraData-p.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getKmsContextSignersAndThresholdFromExtraData-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getKmsContextSignersAndThresholdFromExtraData-p.ts"],"names":[],"mappings":"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"}

package/_esm/core/host-contracts/readKmsSignersContext-p.js

@@ -1,32 +1,53 @@
-import { assertIsKmsSignersContext, createKmsSignersContext, kmsSignersContextToExtraData, } from './KmsSignersContext-p.js';
+import { assertIsKmsSignersContext, createKmsSignersContext } from './KmsSignersContext-p.js';
 import { getCurrentKmsContextId } from './getCurrentKmsContextId-p.js';
 import { getCurrentKmsContextAndEpoch } from './getCurrentKmsContextAndEpoch-p.js';
 import { getHostContractVersion, isVersionStrictlyBefore } from './HostContractVersion-p.js';
-import { assertIsKmsExtraData, EXTRA_DATA_V1, EXTRA_DATA_V2, fromKmsExtraData, toKmsExtraData, } from '../kms/kmsExtraData.js';
+import { assertIsKmsExtraData, createKmsExtraData, createKmsExtraDataV1, createKmsExtraDataV2, equalsKmsExtraData, fromKmsExtraDataBytesHex, isKmsExtraDataCompatibleWithKmsVerifier, } from '../kms/kmsExtraData-p.js';
 import { getKmsContextSignersAndThresholdFromExtraData } from './getKmsContextSignersAndThresholdFromExtraData-p.js';
 import { getKmsSignersAndThreshold } from './getKmsContextSignersAndThreshold-p.js';
 ////////////////////////////////////////////////////////////////////////////////
-export async function readKmsSignersContext(context, parameters) {
+export async function readCurrentKmsSignersContext(context, parameters) {
+    return _readKmsSignersContext(context, parameters);
+}
+////////////////////////////////////////////////////////////////////////////////
+/**
+ * Reads the {@link KmsSignersContext} for a caller-provided `extraData`.
+ *
+ * Accepts an `extraData` of any version (v0, v1, v2, …); the underlying resolver
+ * selects the right protocol path and verifies the version is compatible with
+ * the on-chain KMSVerifier, throwing if it is not.
+ */
+export async function readKmsSignersContextFromExtraData(context, parameters) {
+    assertIsKmsExtraData(parameters.extraData, {});
+    return _readKmsSignersContext(context, parameters);
+}
+////////////////////////////////////////////////////////////////////////////////
+async function _readKmsSignersContext(context, parameters) {
     // TTL-cached
     const kmsVerifierVersion = await getHostContractVersion(context, {
         address: parameters.kmsVerifierAddress,
     });
+    if (parameters.extraData !== undefined) {
+        if (!isKmsExtraDataCompatibleWithKmsVerifier(parameters.extraData, kmsVerifierVersion)) {
+            throw new Error(`KmsExtraData ${parameters.extraData.toBytesHex()} is not compatible with ${kmsVerifierVersion.contractName} ${kmsVerifierVersion.version}`);
+        }
+    }
     if (isVersionStrictlyBefore(kmsVerifierVersion, { major: 0, minor: 2 })) {
+        // extraData.version = 0 only
         return _readKmsSignersContext_Protocol_11(context, parameters);
     }
     if (isVersionStrictlyBefore(kmsVerifierVersion, { major: 0, minor: 4 })) {
+        // extraData.version = 0 or 1 only
         return _readKmsSignersContext_Protocol_12_13(context, parameters);
     }
-    return _readKmsSignersContext_Protocol_14(context, parameters);
+    // any extraData.version
+    return _readKmsSignersContext_Protocol_14_or_higher(context, parameters);
 }
 ////////////////////////////////////////////////////////////////////////////////
 // Protocol v0.11.0 (KMSVerifier < v0.2.0) had no context ID support, so the only valid
 // context ID is 0. Any other value is invalid and should throw.
 // eslint-disable-next-line @typescript-eslint/naming-convention
 async function _readKmsSignersContext_Protocol_11(context, parameters) {
-    if (parameters.kmsContextId !== undefined && parameters.kmsContextId !== 0n) {
-        throw new Error('Impossible on protocol v0.11.0');
-    }
     // TTL-Cached
     const c = await getKmsSignersAndThreshold(context, parameters);
     const data = createKmsSignersContext(new WeakRef(context.runtime), {
@@ -42,102 +63,146 @@ async function _readKmsSignersContext_Protocol_11(context, parameters) {
 // Protocol v0.12.0 / v0.13.0 (KMSVerifier = v0.2.0 / v0.3.0)
 // eslint-disable-next-line @typescript-eslint/naming-convention
 async function _readKmsSignersContext_Protocol_12_13(context, parameters) {
-    if (parameters.kmsEpochId !== undefined && parameters.kmsEpochId !== 0n) {
-        throw new Error('kmsEpochId should be 0 on protocol v0.12.0 / v0.13.0');
-    }
-    let kmsContextId;
-    if (parameters.kmsContextId === undefined) {
+    // On protocol v0.12/v0.13, the KMS signers and threshold are looked up by
+    // `extraData` (which encodes the KMS context id). The caller may pass one in;
+    // if not, we derive it from the chain's current KMS context id using the v1
+    // extraData encoding (version byte + context id, no epoch).
+    let extraData;
+    if (parameters.extraData === undefined) {
         // TTL-Cached
-        kmsContextId = await getCurrentKmsContextId(context, parameters);
+        const kmsContextId = await getCurrentKmsContextId(context, parameters);
+        extraData = createKmsExtraDataV1({
+            kmsContextId,
+        });
     }
     else {
-        if (parameters.kmsContextId === 0n) {
-            throw new Error('kmsContextId cannot be 0 on protocol v0.12.0 / v0.13.0');
-        }
-        kmsContextId = parameters.kmsContextId;
+        // v0 or v1
+        extraData = parameters.extraData;
     }
-    const extraData = toKmsExtraData({
-        version: EXTRA_DATA_V1,
-        kmsContextId,
-        kmsEpochId: 0n,
-    });
     // Permanent-Cached
-    const c = await getKmsContextSignersAndThresholdFromExtraData(context, {
+    // On protocol v0.12/v0.13, getKmsContextSignersAndThresholdFromExtraData
+    // supports extraData v0 and v1 only.
+    const { signers: kmsSigners, threshold: kmsSignerThreshold } = await getKmsContextSignersAndThresholdFromExtraData(context, {
         ...parameters,
         extraData,
     });
     return createKmsSignersContext(new WeakRef(context.runtime), {
         ...parameters,
-        kmsContextId,
+        kmsContextId: extraData.kmsContextId,
         kmsEpochId: 0n,
-        kmsSigners: c.signers,
-        kmsSignerThreshold: c.threshold,
+        kmsSigners,
+        kmsSignerThreshold,
     });
 }
 ////////////////////////////////////////////////////////////////////////////////
 // Protocol v0.14.0+ (KMSVerifier = v0.4.0+)
 // eslint-disable-next-line @typescript-eslint/naming-convention
-async function _readKmsSignersContext_Protocol_14(context, parameters) {
+async function _readKmsSignersContext_Protocol_14_or_higher(context, parameters) {
     if (parameters.protocolConfigAddress === undefined) {
         throw new Error('protocolConfigAddress is required on protocol v0.14.0+');
     }
     const protocolConfigAddress = parameters.protocolConfigAddress;
-    let kmsContextId;
-    if (parameters.kmsContextId === undefined) {
-        // TTL-Cached
-        ({ contextId: kmsContextId } = await getCurrentKmsContextAndEpoch(context, { protocolConfigAddress }));
-    }
-    else {
-        if (parameters.kmsContextId === 0n) {
-            throw new Error('kmsContextId cannot be 0 on protocol v0.14.0+');
-        }
-        kmsContextId = parameters.kmsContextId;
-    }
-    let kmsEpochId;
-    if (parameters.kmsEpochId === undefined) {
+    let extraData;
+    if (parameters.extraData === undefined) {
         // TTL-Cached
-        ({ epochId: kmsEpochId } = await getCurrentKmsContextAndEpoch(context, { protocolConfigAddress }));
+        const { contextId, epochId } = await getCurrentKmsContextAndEpoch(context, { protocolConfigAddress });
+        extraData = createKmsExtraDataV2({
+            kmsContextId: contextId,
+            kmsEpochId: epochId,
+        });
     }
     else {
-        if (parameters.kmsEpochId === 0n) {
-            throw new Error('kmsEpochId cannot be 0 on protocol v0.14.0+');
-        }
-        kmsEpochId = parameters.kmsEpochId;
+        // any version: v0, v1, v2, ... vn
+        extraData = parameters.extraData;
     }
-    const extraData = toKmsExtraData({
-        version: EXTRA_DATA_V2,
-        kmsContextId,
-        kmsEpochId,
-    });
     // Permanent-Cached
-    const c = await getKmsContextSignersAndThresholdFromExtraData(context, {
+    // May revert if extraData.version is incompatible (see `getKmsContextSignersAndThresholdFromExtraData` comments)
+    const { signers: kmsSigners, threshold: kmsSignerThreshold } = await getKmsContextSignersAndThresholdFromExtraData(context, {
         ...parameters,
         extraData,
     });
     return createKmsSignersContext(new WeakRef(context.runtime), {
         ...parameters,
-        kmsContextId,
-        kmsEpochId,
-        kmsSigners: c.signers,
-        kmsSignerThreshold: c.threshold,
+        kmsContextId: extraData.kmsContextId,
+        kmsEpochId: extraData.kmsEpochId,
+        kmsSigners,
+        kmsSignerThreshold,
     });
 }
+/**
+ * Reconciles the KMS signers context used by the SDK with the one the relayer
+ * actually used when forwarding the decryption request to KMS nodes.
+ *
+ * The returned {@link KmsSignersContext} provides the signers and threshold
+ * needed to verify the KMS signcrypted shares and reconstruct the decrypted values.
+ *
+ * ### Assumptions
+ *
+ * - The relayer **cannot be trusted**.
+ * - On-chain data is the **source of truth**.
+ *
+ * ### Nomenclature
+ *
+ * - `requestedKmsExtraData` — `createKmsExtraData({ kmsContextId, kmsEpochId })`
+ *   derived from `requestedKmsSignersContext`.
+ * - `relayerKmsExtraData` — `fromKmsExtraDataBytesHex(relayerKmsExtraDataBytesHex)`
+ *   (its `.kmsContextId` / `.kmsEpochId`).
+ *
+ * ### Host-Contract Compatibility
+ *
+ * `extraData` is versioned independently from the host-contract package. The
+ * currently supported combinations are:
+ *
+ * - host-contracts v11 support `extraData` v0.
+ * - host-contracts v12 and v13 support `extraData` v0 and v1.
+ * - host-contracts v14 support `extraData` v0, v1, and v2.
+ *
+ * ### Resolution (checked in order, then by `mode`)
+ *
+ * 1. `relayerKmsExtraData` equals `requestedKmsExtraData` → return
+ *    `requestedKmsSignersContext`. This is the **only** path that trusts cached
+ *    data, and it applies in every mode.
+ * 2. Otherwise, in `'exact'` mode → **throw**. This mode never parses, refreshes,
+ *    or reconciles differing `extraData`.
+ * 3. `extraData` serialization version mismatch → **throw** (`'strict'`/`'loose'`).
+ *    The SDK and relayer must agree on the encoding format, even for the same context ID.
+ * 4. Versions match but context/epoch differ → force a **full on-chain refetch**
+ *    (cached data is never reused, since a mismatch means on-chain state may have
+ *    diverged: rotation, destruction, signer/epoch changes). The accept criterion
+ *    then depends on `mode`:
+ *    - `'strict'` → accept **only** if the relayer's context equals the *current*
+ *      on-chain context (both `kmsContextId` and `kmsEpochId`); otherwise throw.
+ *    - `'loose'` → accept **any** on-chain-valid context (non-destroyed, in range),
+ *      current or not; throw only if destroyed / out of range.
+ *
+ * ### Modes
+ *
+ * - `'exact'` — Accept only step 1 (`extraData` equality). Rejects any
+ *   relayer/context drift without parsing or on-chain recovery.
+ * - `'strict'` — Accept step 1, or a relayer context whose `kmsContextId` **and**
+ *   `kmsEpochId` equal the current on-chain values. Rejects valid-but-not-current
+ *   contexts. The epoch check is required because RFC 005 introduces same-context
+ *   epoch rotations (new shares, same party set) — a stale epoch must be rejected
+ *   even when the context ID matches.
+ * - `'loose'` — Accept any on-chain valid context (non-destroyed, in range),
+ *   regardless of whether it is current. Covers context rotations in either direction.
+ */
 export async function reconcileKmsSignersContext(context, parameters) {
-    const { kmsVerifierAddress, protocolConfigAddress, requestedKmsSignersContext, relayerExtraData, mode } = parameters;
-    assertIsKmsExtraData(relayerExtraData, {});
+    const { kmsVerifierAddress, protocolConfigAddress, requestedKmsSignersContext, relayerKmsExtraDataBytesHex, mode } = parameters;
+    const relayerKmsExtraData = fromKmsExtraDataBytesHex(relayerKmsExtraDataBytesHex);
     assertIsKmsSignersContext(requestedKmsSignersContext, {});
-    const requestedExtraData = kmsSignersContextToExtraData(requestedKmsSignersContext);
+    const requestedKmsExtraData = createKmsExtraData({
+        kmsContextId: requestedKmsSignersContext.id,
+        kmsEpochId: requestedKmsSignersContext.epochId,
+    });
     // 1. Exact match — the relayer used the same context as the SDK.
-    if (relayerExtraData === requestedExtraData) {
+    if (equalsKmsExtraData(relayerKmsExtraData, requestedKmsExtraData)) {
         return requestedKmsSignersContext;
     }
     if (mode === 'exact') {
-        throw new Error(`Exact reconciliation failed: relayer extraData ${relayerExtraData} ` +
-            `does not match requested extraData ${requestedExtraData}.`);
+        throw new Error(`Exact reconciliation failed: relayer extraData ${relayerKmsExtraData.toBytesHex()} ` +
+            `does not match requested extraData ${requestedKmsExtraData.toBytesHex()}.`);
     }
-    // Bytes differ — extract and compare serialization versions.
-    const relayerKmsExtraData = fromKmsExtraData(relayerExtraData);
-    const requestedKmsExtraData = fromKmsExtraData(requestedExtraData);
     // Reject if extraData serialization version differs.
     if (relayerKmsExtraData.version !== requestedKmsExtraData.version) {
         throw new Error(`ExtraData serialization version mismatch: SDK uses v${requestedKmsExtraData.version}, ` +
@@ -151,7 +216,7 @@ export async function reconcileKmsSignersContext(context, parameters) {
     if (mode === 'strict') {
         // `readKmsSignersContext` with `forceRefresh` fetches the current context.
         // If `relayerKmsContextId` matches current, we're good.
-        const currentContext = await readKmsSignersContext(context, {
+        const currentContext = await readCurrentKmsSignersContext(context, {
             kmsVerifierAddress,
             protocolConfigAddress,
             forceRefresh: true,
@@ -165,12 +230,11 @@ export async function reconcileKmsSignersContext(context, parameters) {
     // 3. Loose mode — accept any valid (non-destroyed, in-range) context.
     //    `readKmsSignersContext` with `forceRefresh` + specific `kmsContextId`/`kmsEpochId` will
     //    throw if the context is destroyed or out of range.
-    return readKmsSignersContext(context, {
+    return readKmsSignersContextFromExtraData(context, {
         kmsVerifierAddress,
         protocolConfigAddress,
-        kmsContextId: relayerKmsContextId,
-        kmsEpochId: relayerKmsEpochId,
         forceRefresh: true,
+        extraData: relayerKmsExtraData,
     });
 }
 //# sourceMappingURL=readKmsSignersContext-p.js.map

package/_esm/core/host-contracts/readKmsSignersContext-p.js.map

@@ -1 +1 @@
-{"version":3,"file":"readKmsSignersContext-p.js","sourceRoot":"","sources":["../../../core/host-contracts/readKmsSignersContext-p.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"readKmsSignersContext-p.js","sourceRoot":"","sources":["../../../core/host-contracts/readKmsSignersContext-p.ts"],"names":[],"mappings":"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"}

package/_esm/core/kms/KmsSigncryptedShares-p.js

@@ -12,8 +12,35 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _KmsSigncryptedSharesImpl_metadata, _KmsSigncryptedSharesImpl_shares;
 import { assertIsKmsSignersContext } from '../host-contracts/KmsSignersContext-p.js';
 import { ensure0x } from '../base/string.js';
-import { assertIsKmsExtraData } from './kmsExtraData.js';
 import { reconcileKmsSignersContext } from '../host-contracts/readKmsSignersContext-p.js';
+import { recoverSigners } from '../utils-p/runtime/recoverSigners.js';
+////////////////////////////////////////////////////////////////////////////////
+/**
+ * EIP-712 types for the KMS `UserDecryptResponseVerification` structure that each
+ * KMS node signs per response share (see gateway `Decryption.sol`).
+ *
+ * CRITICAL: field order and types are authoritative — they define the EIP-712
+ * type hash and must match the on-chain struct exactly.
+ *
+ * Note: `ctHandles` is declared `bytes32[]` to match `Decryption.sol` (the tkms
+ * WASM doc comments it as `uint256[]`; both encode the same 32 bytes, but the
+ * type string participates in the type hash — if verification unexpectedly
+ * fails, `uint256[]` is the first thing to try).
+ */
+const kmsUserDecryptResponseEip712Types = {
+    EIP712Domain: [
+        { name: 'name', type: 'string' },
+        { name: 'version', type: 'string' },
+        { name: 'chainId', type: 'uint256' },
+        { name: 'verifyingContract', type: 'address' },
+    ],
+    UserDecryptResponseVerification: [
+        { name: 'publicKey', type: 'bytes' },
+        { name: 'ctHandles', type: 'bytes32[]' },
+        { name: 'userDecryptedShare', type: 'bytes' },
+        { name: 'extraData', type: 'bytes' },
+    ],
+};
 ////////////////////////////////////////////////////////////////////////////////
 const PRIVATE_KMS_SIGNCRYPTED_SHARES_TOKEN = Symbol('KmsSigncryptedShares.token');
 const GET_METADATA_FUNC = Symbol('KmsSigncryptedShares.getMetadata');
@@ -84,6 +111,46 @@ function assertUniformExtraData(shares) {
     }
     return firstExtraData;
 }
+/**
+ * Helper:
+ * Verifies the EIP-712 signature of a single KMS signcrypted share.
+ *
+ * Rebuilds the `UserDecryptResponseVerification` payload the KMS node signed,
+ * recovers the signer, and asserts it belongs to the reconciled KMS signers
+ * context. This is an independent, JS-only check — the same verification is also
+ * performed inside the tkms WASM during reconstruction (`verify=true`), so this
+ * is primarily a test/defense-in-depth pass and is not required for correctness.
+ *
+ * @throws If the signer cannot be recovered, or is not a known KMS signer.
+ */
+export async function verifyKmsSigncryptedShare(context, parameters) {
+    const { share, metadata, transportPublicKey } = parameters;
+    // Rebuild the exact EIP-712 message each KMS node signs per response share
+    // (gateway Decryption.sol `UserDecryptResponseVerification`). `userDecryptedShare`
+    // is the serialized share bytes carried in `share.payload`.
+    const message = {
+        publicKey: transportPublicKey,
+        ctHandles: metadata.handles.map((h) => h.bytes32Hex),
+        userDecryptedShare: ensure0x(share.payload),
+        // v0 extraData is signed as '0x' (never '0x00').
+        extraData: share.extraData === '' || share.extraData === '00' ? '0x' : ensure0x(share.extraData),
+    };
+    // Recover the signer of this share. The KMS EIP-712 domain lives in `metadata`.
+    const [recoveredAddress] = await recoverSigners(context, {
+        domain: metadata.eip712Domain,
+        types: kmsUserDecryptResponseEip712Types,
+        primaryType: 'UserDecryptResponseVerification',
+        signatures: [ensure0x(share.signature)],
+        message,
+    });
+    if (recoveredAddress === undefined) {
+        throw new Error('Failed to recover signer from KMS signcrypted share signature.');
+    }
+    // The recovered signer must be one of the reconciled KMS signers (case-insensitive).
+    if (!metadata.kmsSignersContext.has(recoveredAddress)) {
+        throw new Error(`KMS signcrypted share signature was not signed by a known KMS signer (recovered ${recoveredAddress}).`);
+    }
+}
 /**
  * Creates a validated {@link KmsSigncryptedShares} instance.
  *
@@ -113,13 +180,12 @@ export async function createKmsSigncryptedShares(context, parameters) {
     // Assert context first — extraData comparison depends on a valid KmsSignersContext.
     assertIsKmsSignersContext(metadata.kmsSignersContext, {});
     // Extract the common extraData from all shares and validate its format.
-    const relayerExtraData = ensure0x(assertUniformExtraData(shares));
-    assertIsKmsExtraData(relayerExtraData, {});
+    const relayerKmsExtraDataBytesHex = ensure0x(assertUniformExtraData(shares));
     // Reconcile KMS signer context using 'loose' mode.
     const reconciledKmsSignersContext = await reconcileKmsSignersContext(context, {
         kmsVerifierAddress: context.chain.fhevm.contracts.kmsVerifier.address,
         protocolConfigAddress: context.chain.fhevm.contracts.protocolConfig?.address,
-        relayerExtraData,
+        relayerKmsExtraDataBytesHex,
         requestedKmsSignersContext: metadata.kmsSignersContext,
         mode: 'loose',
     });

package/_esm/core/kms/KmsSigncryptedShares-p.js.map

@@ -1 +1 @@
-{"version":3,"file":"KmsSigncryptedShares-p.js","sourceRoot":"","sources":["../../../core/kms/KmsSigncryptedShares-p.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"KmsSigncryptedShares-p.js","sourceRoot":"","sources":["../../../core/kms/KmsSigncryptedShares-p.ts"],"names":[],"mappings":"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"}

package/_esm/core/kms/PublicDecryptionProof-p.js

@@ -15,6 +15,7 @@ import { abiEncodeClearValues, createClearValueArray } from '../handle/ClearValu
 import { toClearValueType } from '../handle/FheType.js';
 import { kmsSignersContextToExtraData } from '../host-contracts/KmsSignersContext-p.js';
 import { verifyKmsPublicDecryptEip712 } from './verifyKmsPublicDecryptEip712-p.js';
+import { EXTRA_DATA_V0 } from './kmsExtraData-p.js';
 //////////////////////////////////////////////////////////////////////////////
 const PRIVATE_TOKEN = Symbol('PublicDecryptionProof.token');
 //////////////////////////////////////////////////////////////////////////////
@@ -69,7 +70,7 @@ Object.freeze(PublicDecryptionProofImpl.prototype);
 export async function createPublicDecryptionProof(context, parameters) {
     // Always verify KMS signatures
     await verifyKmsPublicDecryptEip712(context, parameters);
-    const { orderedHandles: orderedEncryptedValues, orderedAbiEncodedClearValues, kmsPublicDecryptEIP712Signatures, kmsSignersContext, originToken, } = parameters;
+    const { orderedHandles: orderedEncryptedValues, orderedAbiEncodedClearValues, kmsPublicDecryptEip712Signatures, kmsSignersContext, originToken, } = parameters;
     //////////////////////////////////////////////////////////////////////////////
     // Compute extraData using KmsSignersContext
     //////////////////////////////////////////////////////////////////////////////
@@ -79,19 +80,19 @@ export async function createPublicDecryptionProof(context, parameters) {
     // Warning!!!! Do not use '0x00' here!! Only '0x' is permitted!
     //
     ////////////////////////////////////////////////////////////////////////////
-    const signedExtraData = extraData === '0x00' ? '0x' : extraData;
+    const signedExtraDataBytesHex = extraData.version === EXTRA_DATA_V0 ? '0x' : extraData.toBytesHex();
     //////////////////////////////////////////////////////////////////////////////
     // Compute the proof as numSigners + KMS signatures + extraData
     //////////////////////////////////////////////////////////////////////////////
     const packedNumSigners = context.runtime.ethereum.encodePacked({
         types: ['uint8'],
-        values: [kmsPublicDecryptEIP712Signatures.length],
+        values: [kmsPublicDecryptEip712Signatures.length],
     });
     const packedSignatures = context.runtime.ethereum.encodePacked({
-        types: Array(kmsPublicDecryptEIP712Signatures.length).fill('bytes'),
-        values: kmsPublicDecryptEIP712Signatures,
+        types: Array(kmsPublicDecryptEip712Signatures.length).fill('bytes'),
+        values: kmsPublicDecryptEip712Signatures,
     });
-    const decryptionProof = concatBytesHex([packedNumSigners, packedSignatures, signedExtraData]);
+    const decryptionProof = concatBytesHex([packedNumSigners, packedSignatures, signedExtraDataBytesHex]);
     //////////////////////////////////////////////////////////////////////////////
     // Deserialize ordered decrypted result
     //////////////////////////////////////////////////////////////////////////////
@@ -116,7 +117,7 @@ export async function createPublicDecryptionProof(context, parameters) {
         decryptionProof: decryptionProof,
         orderedClearValues: orderedDecryptedFhevmHandles,
         orderedAbiEncodedClearValues: orderedAbiEncodedDecryptedFhevmHandles.abiEncodedClearValues,
-        extraData: signedExtraData,
+        extraData: signedExtraDataBytesHex,
     });
 }
 //# sourceMappingURL=PublicDecryptionProof-p.js.map

package/_esm/core/kms/PublicDecryptionProof-p.js.map

@@ -1 +1 @@
-{"version":3,"file":"PublicDecryptionProof-p.js","sourceRoot":"","sources":["../../../core/kms/PublicDecryptionProof-p.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PublicDecryptionProof-p.js","sourceRoot":"","sources":["../../../core/kms/PublicDecryptionProof-p.ts"],"names":[],"mappings":"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"}