@fhevm/sdk 1.1.0-alpha.7 → 1.1.0-alpha.9

package/_types/core/modules/relayer/cleartext/forgeFhevmV1.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"forgeFhevmV1.d.ts","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/forgeFhevmV1.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,QAAQ,EAAsB,MAAM,8BAA8B,CAAC;AAC1F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAoC5D,wBAAsB,cAAc,CAAC,aAAa,EAAE,wBAAwB,GAAG,OAAO,CAAC,OAAO,CAAC,CAQ9F;AAqCD;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,aAAa,EAAE,wBAAwB,EACvC,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,SAAS,MAAM,EAAE,GACzB,OAAO,CAAC,MAAM,EAAE,CAAC,CAcnB;AA+BD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAOjG;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,uBAAuB,EACvC,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,UAAU,EAAE,SAAS,MAAM,EAAE,GAC5B,QAAQ,CAkBV"}

package/_types/core/modules/relayer/cleartext/signers.d.ts

@@ -1,5 +1,6 @@
 import type { BytesHex, ChecksummedAddress } from '../../../types/primitives.js';
 import type { RelayerClientWithRuntime } from '../types.js';
+export declare function isForgeFhevmV1KmsSigner(signerAddress: string | undefined): boolean;
 type PrivateKeyMap = Map<ChecksummedAddress, BytesHex>;
 export declare function getCoprocessorSignersPrivateKeyMap(relayerClient: RelayerClientWithRuntime): PrivateKeyMap;
 export declare function getKmsSignersPrivateKeyMap(relayerClient: RelayerClientWithRuntime): PrivateKeyMap;

package/_types/core/modules/relayer/cleartext/signers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signers.d.ts","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/signers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAEjF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAQ5D,KAAK,aAAa,GAAG,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;AASvD,wBAAgB,kCAAkC,CAAC,aAAa,EAAE,wBAAwB,GAAG,aAAa,CAKzG;AAID,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,wBAAwB,GAAG,aAAa,CAKjG"}
+{"version":3,"file":"signers.d.ts","sourceRoot":"","sources":["../../../../../core/modules/relayer/cleartext/signers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAEjF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAgC5D,wBAAgB,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAElF;AAID,KAAK,aAAa,GAAG,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;AASvD,wBAAgB,kCAAkC,CAAC,aAAa,EAAE,wBAAwB,GAAG,aAAa,CASzG;AAID,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,wBAAwB,GAAG,aAAa,CAMjG"}

package/_types/core/types/kms-p.d.ts

@@ -2,7 +2,7 @@ import type { TkmsVersion } from '../../wasm/tkms/KmsLibApi.js';
 import type { Handle } from './encryptedTypes-p.js';
 import type { KmsEip712Domain } from './kms.js';
 import type { KmsSignersContext } from './kmsSignersContext.js';
-import type { Bytes65Hex, Bytes65HexNo0x, BytesHexNo0x, ChecksummedAddress } from './primitives.js';
+import type { Bytes65Hex, Bytes65HexNo0x, BytesHex, BytesHexNo0x, ChecksummedAddress, Uint256BigInt, Uint8Number } from './primitives.js';
 export interface KmsSigncryptedSharesMetadata {
     readonly kmsSignersContext: KmsSignersContext;
     readonly eip712Domain: KmsEip712Domain;
@@ -16,4 +16,10 @@ export interface KmsSigncryptedShare {
     readonly signature: Bytes65HexNo0x;
     readonly extraData: BytesHexNo0x;
 }
+export interface KmsExtraData {
+    readonly version: Uint8Number;
+    readonly kmsContextId: Uint256BigInt;
+    readonly kmsEpochId: Uint256BigInt;
+    toBytesHex(): BytesHex;
+}
 //# sourceMappingURL=kms-p.d.ts.map

package/_types/core/types/kms-p.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kms-p.d.ts","sourceRoot":"","sources":["../../../core/types/kms-p.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAEpG,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC;IACvC,QAAQ,CAAC,eAAe,EAAE,UAAU,CAAC;IACrC,QAAQ,CAAC,mBAAmB,EAAE,kBAAkB,CAAC;IACjD,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IACnC,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC;CAClC"}
+{"version":3,"file":"kms-p.d.ts","sourceRoot":"","sources":["../../../core/types/kms-p.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACb,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC;IACvC,QAAQ,CAAC,eAAe,EAAE,UAAU,CAAC;IACrC,QAAQ,CAAC,mBAAmB,EAAE,kBAAkB,CAAC;IACjD,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IACnC,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC;CAClC;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,aAAa,CAAC;IACrC,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC;IACnC,UAAU,IAAI,QAAQ,CAAC;CACxB"}

package/_types/ethers/internal/ethereum-ct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ethereum-ct.d.ts","sourceRoot":"","sources":["../../../ethers/internal/ethereum-ct.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,8BAA8B,EAU/B,MAAM,yCAAyC,CAAC;AAgBjD,eAAO,MAAM,uBAAuB,EAAE,8BAiCrC,CAAC"}
+{"version":3,"file":"ethereum-ct.d.ts","sourceRoot":"","sources":["../../../ethers/internal/ethereum-ct.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,8BAA8B,EAY/B,MAAM,yCAAyC,CAAC;AAkBjD,eAAO,MAAM,uBAAuB,EAAE,8BA2CrC,CAAC"}

package/_types/ethers/internal/runtime-ct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-ct.d.ts","sourceRoot":"","sources":["../../../ethers/internal/runtime-ct.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAYzE,wBAAgB,yBAAyB,IAAI,YAAY,CAexD"}
+{"version":3,"file":"runtime-ct.d.ts","sourceRoot":"","sources":["../../../ethers/internal/runtime-ct.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAYzE,wBAAgB,yBAAyB,IAAI,YAAY,CAiBxD"}

package/_types/viem/internal/ethereum-ct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ethereum-ct.d.ts","sourceRoot":"","sources":["../../../viem/internal/ethereum-ct.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,8BAA8B,EAU/B,MAAM,yCAAyC,CAAC;AAiBjD,eAAO,MAAM,uBAAuB,EAAE,8BAgCrC,CAAC"}
+{"version":3,"file":"ethereum-ct.d.ts","sourceRoot":"","sources":["../../../viem/internal/ethereum-ct.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,8BAA8B,EAY/B,MAAM,yCAAyC,CAAC;AAiBjD,eAAO,MAAM,uBAAuB,EAAE,8BA0CrC,CAAC"}

package/_types/viem/internal/runtime-ct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-ct.d.ts","sourceRoot":"","sources":["../../../viem/internal/runtime-ct.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAYzE,wBAAgB,uBAAuB,IAAI,YAAY,CAetD"}
+{"version":3,"file":"runtime-ct.d.ts","sourceRoot":"","sources":["../../../viem/internal/runtime-ct.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAYzE,wBAAgB,uBAAuB,IAAI,YAAY,CAiBtD"}

package/core/_version.ts

@@ -1,3 +1,3 @@
 // This file is auto-generated
-export const version: string = '1.1.0-alpha.7';
+export const version: string = '1.1.0-alpha.9';
 export const sdkName: string = '@fhevm/sdk';

package/core/actions/encrypt/encryptValue.ts

@@ -8,6 +8,7 @@ import { addressToChecksummedAddress, assertIsAddress } from '../../base/address
 import { toArray } from '../../base/object.js';
 import { createTypedValue } from '../../base/typedValue.js';
 import { encrypt as encrypt_ } from '../../coprocessor/encrypt.js';
+import { resolveRawValueTypeName } from '../../handle/FheType.js';
 import { asFhevmWithTfheVersion } from '../../runtime/CoreFhevm-p.js';
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -33,7 +34,9 @@ export async function encryptValue(
   const { contractAddress, userAddress, options } = parameters;
 
   // Validates `value`
-  const values = toArray(parameters.value).map(createTypedValue);
+  const values = toArray(parameters.value).map((v) =>
+    createTypedValue({ type: resolveRawValueTypeName(v.type), value: v.value }),
+  );
 
   assertIsAddress(contractAddress, {});
   assertIsAddress(userAddress, {});

package/core/actions/encrypt/encryptValues.ts

@@ -7,6 +7,7 @@ import type { EncryptedValue } from '../../types/encryptedTypes.js';
 import { addressToChecksummedAddress, assertIsAddress } from '../../base/address.js';
 import { createTypedValue } from '../../base/typedValue.js';
 import { encrypt as encrypt_ } from '../../coprocessor/encrypt.js';
+import { resolveRawValueTypeName } from '../../handle/FheType.js';
 import { asFhevmWithTfheVersion } from '../../runtime/CoreFhevm-p.js';
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -30,8 +31,11 @@ export async function encryptValues(
   parameters: EncryptValuesParameters,
 ): Promise<EncryptValuesReturnType> {
   const { contractAddress, userAddress, options } = parameters;
+
   // Validates `values`
-  const values = parameters.values.map(createTypedValue);
+  const values = parameters.values.map((v) =>
+    createTypedValue({ type: resolveRawValueTypeName(v.type), value: v.value }),
+  );
 
   assertIsAddress(contractAddress, {});
   assertIsAddress(userAddress, {});

package/core/actions/encrypt/generateZkProof.ts

@@ -5,6 +5,7 @@ import type { ZkProof } from '../../types/zkProof-p.js';
 import type { BytesHex } from '../../types/primitives.js';
 import { createTypedValue } from '../../base/typedValue.js';
 import { createZkProofBuilder } from '../../coprocessor/ZkProofBuilder-p.js';
+import { resolveRawValueTypeName } from '../../handle/FheType.js';
 import { asFhevmWithTfheVersion } from '../../runtime/CoreFhevm-p.js';
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -28,7 +29,7 @@ export async function generateZkProof(
 
   const builder = createZkProofBuilder();
   for (const value of values) {
-    builder.addTypedValue(createTypedValue(value));
+    builder.addTypedValue(createTypedValue({ type: resolveRawValueTypeName(value.type), value: value.value }));
   }
 
   const f = asFhevmWithTfheVersion(fhevm);

package/core/actions/host/readKmsVerifierContractData.ts

@@ -10,7 +10,7 @@ import { assertIsKmsEip712Domain } from '../../kms/createKmsEip712Domain.js';
 import { eip712Domain } from '../../host-contracts/eip712Domain-p.js';
 import { assertIsHostContractVersionOf } from '../../host-contracts/HostContractVersion-p.js';
 import { getHostContractVersion } from '../../host-contracts/HostContractVersion-p.js';
-import { readKmsSignersContext } from '../../host-contracts/readKmsSignersContext-p.js';
+import { readCurrentKmsSignersContext } from '../../host-contracts/readKmsSignersContext-p.js';
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -44,7 +44,7 @@ export async function readKmsVerifierContractData(
   const rpcCalls = [
     () => getHostContractVersion(fhevm, parameters),
     () => eip712Domain(fhevm, parameters),
-    () => readKmsSignersContext(fhevm, { kmsVerifierAddress, protocolConfigAddress }),
+    () => readCurrentKmsSignersContext(fhevm, { kmsVerifierAddress, protocolConfigAddress }),
   ];
 
   const res = await executeWithBatching<unknown>(rpcCalls, fhevm.options.batchRpcCalls);

package/core/base/cachedFetch.ts

@@ -23,7 +23,7 @@ type CachedFetchOptions<TContext, TParams, TResult> = {
 };
 
 export const CACHE_TTL_24H = 24 * 60 * 60 * 1000; // 24 hours
-export const CACHE_TTL_15MIN = 15 * 1000; // 15 min
+export const CACHE_TTL_15MIN = 15 * 60 * 1000; // 15 min
 
 /**
  * Creates a cached, deduplicating wrapper around an async fetch function.

package/core/handle/FheType.ts

@@ -354,6 +354,17 @@ export function typeNameFromFheTypeName(fheType: FheType): ValueTypeName {
   return fheType.substring(1) as ValueTypeName;
 }
 
+/**
+ * Resolves a raw type name to its clear `ValueTypeName`, accepting FHE type
+ * aliases ("ebool", "euint8", ...) in addition to clear-value names
+ * ("bool", "uint8", ...). Non-FHE type names are returned unchanged.
+ * @example resolveRawValueTypeName('euint8') // 'uint8'
+ * @example resolveRawValueTypeName('uint8') // 'uint8' (unchanged)
+ */
+export function resolveRawValueTypeName(type: string): string {
+  return isFheType(type) ? typeNameFromFheTypeName(type) : type;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Solidity primitive type names
 ////////////////////////////////////////////////////////////////////////////////

package/core/host-contracts/HostContractVersion-p.ts

@@ -196,6 +196,18 @@ export function isVersionStrictlyBefore(
   return false;
 }
 
+/**
+ * Returns `true` if the version equals `major.minor.patch` exactly.
+ */
+export function isVersionEqual(
+  version: HostContractVersion,
+  otherVersion: { readonly major: number; readonly minor: number; readonly patch: number },
+): boolean {
+  return (
+    version.major === otherVersion.major && version.minor === otherVersion.minor && version.patch === otherVersion.patch
+  );
+}
+
 /**
  * Asserts that a {@link HostContractVersion} belongs to a specific contract.
  * Narrows the type to `HostContractVersion<name>` on success.

package/core/host-contracts/KmsSignersContext-p.ts

@@ -1,20 +1,22 @@
-import type { BytesHex, ChecksummedAddress, Uint256BigInt, Uint8Number } from '../types/primitives.js';
+import type { ChecksummedAddress, Uint256BigInt, Uint8Number } from '../types/primitives.js';
 import type { kmsBrand } from '../types/kms.js';
 import type { KmsSignersContext } from '../types/kmsSignersContext.js';
 import type { ErrorMetadataParams } from '../base/errors/ErrorBase.js';
 import type { FhevmRuntime } from '../types/coreFhevmRuntime.js';
+import type { KmsExtraData } from '../types/kms-p.js';
 import { InvalidTypeError } from '../base/errors/InvalidTypeError.js';
 import { addressToChecksummedAddress } from '../base/address.js';
 import { DuplicateSignerError, ThresholdSignerError, UnknownSignerError } from '../errors/SignersError.js';
 import { assertOwnedBy } from '../runtime/CoreFhevmRuntime-p.js';
-import {
-  assertIsKmsExtraData,
-  EXTRA_DATA_V0,
-  EXTRA_DATA_V1,
-  EXTRA_DATA_V2,
-  toKmsExtraData,
-} from '../kms/kmsExtraData.js';
 import { assertIsNonEmptyString, ensure0x } from '../base/string.js';
+import {
+  assertIsKmsExtraDataBytesHex,
+  createKmsExtraData,
+  equalsKmsExtraData,
+  fromKmsExtraDataBytesHex,
+  isKmsExtraData,
+  validateKmsExtraDataParams,
+} from '../kms/kmsExtraData-p.js';
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -124,6 +126,8 @@ export function createKmsSignersContext(
 ): KmsSignersContext {
   const { kmsVerifierAddress: address, kmsContextId, kmsEpochId, kmsSigners, kmsSignerThreshold } = parameters;
 
+  validateKmsExtraDataParams({ kmsContextId: parameters.kmsContextId, kmsEpochId: parameters.kmsEpochId });
+
   return new KmsSignersContextImpl(PRIVATE_TOKEN, owner, {
     address: addressToChecksummedAddress(address),
     kmsContextId,
@@ -135,32 +139,13 @@ export function createKmsSignersContext(
 
 ////////////////////////////////////////////////////////////////////////////////
 
-export function kmsSignersContextToExtraData(kmsSignersContext: KmsSignersContext): BytesHex {
+export function kmsSignersContextToExtraData(kmsSignersContext: KmsSignersContext): KmsExtraData {
   assertIsKmsSignersContext(kmsSignersContext, {});
-
-  if (kmsSignersContext.id === 0n) {
-    return toKmsExtraData({
-      version: EXTRA_DATA_V0,
-      kmsContextId: 0n as Uint256BigInt,
-      kmsEpochId: 0n as Uint256BigInt,
-    });
-  }
-
-  if (kmsSignersContext.epochId === 0n) {
-    return toKmsExtraData({
-      version: EXTRA_DATA_V1,
-      kmsContextId: kmsSignersContext.id,
-      kmsEpochId: 0n as Uint256BigInt,
-    });
-  }
-
-  return toKmsExtraData({
-    version: EXTRA_DATA_V2,
-    kmsContextId: kmsSignersContext.id,
-    kmsEpochId: kmsSignersContext.epochId,
-  });
+  return createKmsExtraData({ kmsContextId: kmsSignersContext.id, kmsEpochId: kmsSignersContext.epochId });
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 /**
  * Asserts that the given `extraData` is a valid KMS extra data string and
  * matches the `extraData` derived from the provided {@link KmsSignersContext}.
@@ -176,15 +161,23 @@ export function assertExtraDataMatchesKmsSingersContext(
   options: { subject?: string } & ErrorMetadataParams,
 ): void {
   const { extraData, kmsSignersContext } = parameters;
-  assertIsNonEmptyString(extraData);
 
-  const sanitizedExtraData = ensure0x(extraData);
-  assertIsKmsExtraData(sanitizedExtraData, options);
+  let sanitizedExtraData: KmsExtraData;
+  if (isKmsExtraData(extraData)) {
+    sanitizedExtraData = extraData;
+  } else {
+    assertIsNonEmptyString(extraData);
+    const sanitizedExtraDataBytesHex = ensure0x(extraData);
+    assertIsKmsExtraDataBytesHex(sanitizedExtraDataBytesHex, options);
+    sanitizedExtraData = fromKmsExtraDataBytesHex(sanitizedExtraDataBytesHex);
+  }
 
   const expectedExtraData = kmsSignersContextToExtraData(kmsSignersContext);
 
-  if (sanitizedExtraData !== expectedExtraData) {
-    throw new Error(`extraData "${extraData}" does not match KmsSignersContext extraData "${expectedExtraData}".`);
+  if (!equalsKmsExtraData(sanitizedExtraData, expectedExtraData)) {
+    throw new Error(
+      `extraData "${sanitizedExtraData.toBytesHex()}" does not match KmsSignersContext extraData "${expectedExtraData.toBytesHex()}".`,
+    );
   }
 }
 

package/core/host-contracts/getKmsContextSignersAndThreshold-p.ts

@@ -68,6 +68,7 @@ async function _getKmsContextSignersAndThreshold(context: Context, parameters: P
   if (!isVersionStrictlyBefore(kmsVerifierVersion, { major: 0, minor: 2 })) {
     throw new Error('getContextSignersAndThreshold requires KMSVerifier < v0.2.0');
   }
+
   ////////////////////////////////////////////////////////////////////////////
   //
   // Important remark:

package/core/host-contracts/getKmsContextSignersAndThresholdFromExtraData-p.ts

@@ -1,12 +1,13 @@
-import type { BytesHex, ChecksummedAddress, Uint8Number } from '../types/primitives.js';
+import type { ChecksummedAddress, Uint8Number } from '../types/primitives.js';
 import type { FhevmRuntime } from '../types/coreFhevmRuntime.js';
+import type { KmsExtraData } from '../types/kms-p.js';
 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';
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -17,7 +18,7 @@ type Context = {
 
 type Parameters = {
   readonly kmsVerifierAddress: ChecksummedAddress;
-  readonly extraData: BytesHex;
+  readonly extraData: KmsExtraData;
 };
 
 type ReturnType = {
@@ -30,9 +31,9 @@ type ReturnType = {
 const cachedGetKmsContextSignersAndThresholdFromExtraData = createCachedFetch<Context, Parameters, ReturnType>({
   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.
 });
@@ -76,10 +77,12 @@ async function _getKmsContextSignersAndThresholdFromExtraData(
 
   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,
   });