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

package/core/modules/relayer/module/fetchUserDecrypt.ts

@@ -1,10 +1,14 @@
-import type { KmsSigncryptedShare } from '../../../types/kms-p.js';
-import type { FetchUserDecryptPayload } from '../../../types/relayer-p.js';
-import type { FetchUserDecryptResult } from '../../../types/relayer.js';
-import type { FetchUserDecryptParameters, FetchUserDecryptReturnType, RelayerClientWithRuntime } from '../types.js';
-import { remove0x } from '../../../base/string.js';
-import { RelayerAsyncRequest } from './RelayerAsyncRequest.js';
-import { buildRelayerUrlString, validateRelayerBaseUrl } from './relayerUrl.js';
+import type {
+  FetchUserDecryptParameters,
+  FetchUserDecryptParametersV1,
+  FetchUserDecryptParametersV2,
+  FetchUserDecryptReturnType,
+  RelayerClientWithRuntime,
+} from '../types.js';
+import { getResolvedProtocolVersion } from '../../../runtime/CoreFhevm-p.js';
+import { isSemverStrictlyBefore } from '../../../base/semver.js';
+import { fetchUserDecryptV1 } from './fetchUserDecryptV1.js';
+import { fetchUserDecryptV2 } from './fetchUserDecryptV2.js';
 
 //////////////////////////////////////////////////////////////////////////////
 // fetchUserDecrypt
@@ -14,56 +18,16 @@ export async function fetchUserDecrypt(
   relayerClient: RelayerClientWithRuntime,
   parameters: FetchUserDecryptParameters,
 ): Promise<FetchUserDecryptReturnType> {
-  const { options, payload } = parameters;
-
-  const firstHandleContractPair = payload.handleContractPairs[0];
-  if (firstHandleContractPair === undefined) {
-    throw new Error('Empty handle contract pairs');
+  const protocolVersion = getResolvedProtocolVersion(relayerClient);
+  if (protocolVersion === undefined) {
+    throw new Error(
+      'Unable to resolve protocol version from context, ensure proper initialization of the FhevmRuntime and FhevmChain.',
+    );
   }
 
-  // retrieve chainId using handles
-  const contractsChainId = firstHandleContractPair.handle.chainId.toString();
-
-  const relayerPayload: FetchUserDecryptPayload = {
-    handleContractPairs: payload.handleContractPairs.map((pair) => {
-      return {
-        handle: pair.handle.bytes32Hex,
-        contractAddress: pair.contractAddress,
-      };
-    }),
-    requestValidity: {
-      startTimestamp: payload.kmsDecryptEip712Message.startTimestamp,
-      durationDays: payload.kmsDecryptEip712Message.durationDays,
-    },
-    contractsChainId,
-    contractAddresses: payload.kmsDecryptEip712Message.contractAddresses,
-    userAddress: payload.kmsDecryptEip712Signer,
-    signature: remove0x(payload.kmsDecryptEip712Signature),
-    extraData: payload.kmsDecryptEip712Message.extraData,
-    publicKey: remove0x(payload.kmsDecryptEip712Message.publicKey),
-  };
-
-  const hasAuth: boolean = options?.auth !== undefined;
-  const relayerBaseUrl: URL = validateRelayerBaseUrl(relayerClient.chain.fhevm.relayerUrl, hasAuth);
-  const url = buildRelayerUrlString(relayerBaseUrl, 'v2/user-decrypt');
-
-  const request = new RelayerAsyncRequest({
-    relayerOperation: 'USER_DECRYPT',
-    url,
-    payload: relayerPayload,
-    options,
-  });
-
-  const result = (await request.run()) as FetchUserDecryptResult;
-
-  const shares: KmsSigncryptedShare[] = result.map((r) => {
-    const share: KmsSigncryptedShare = {
-      signature: r.signature,
-      payload: r.payload,
-      extraData: remove0x(r.extraData),
-    };
-    return share;
-  });
+  if (isSemverStrictlyBefore(protocolVersion.version, '0.14.0')) {
+    return await fetchUserDecryptV1(relayerClient, parameters as FetchUserDecryptParametersV1);
+  }
 
-  return shares;
+  return await fetchUserDecryptV2(relayerClient, parameters as FetchUserDecryptParametersV2);
 }

package/core/modules/relayer/module/fetchUserDecryptV1.ts

@@ -0,0 +1,69 @@
+import type { KmsSigncryptedShare } from '../../../types/kms-p.js';
+import type { FetchUserDecryptPayload as FetchUserDecryptPayloadV1 } from '../../../types/relayer-p.js';
+import type { FetchUserDecryptResult } from '../../../types/relayer.js';
+import type { FetchUserDecryptParametersV1, FetchUserDecryptReturnType, RelayerClientWithRuntime } from '../types.js';
+import { remove0x } from '../../../base/string.js';
+import { RelayerAsyncRequest } from './RelayerAsyncRequest.js';
+import { buildRelayerUrlString, validateRelayerBaseUrl } from './relayerUrl.js';
+
+//////////////////////////////////////////////////////////////////////////////
+// fetchUserDecryptV1 (protocol version < 0.14.0)
+//////////////////////////////////////////////////////////////////////////////
+
+export async function fetchUserDecryptV1(
+  relayerClient: RelayerClientWithRuntime,
+  parameters: FetchUserDecryptParametersV1,
+): Promise<FetchUserDecryptReturnType> {
+  const { options, payload } = parameters;
+
+  const firstHandleContractPair = payload.handleContractPairs[0];
+  if (firstHandleContractPair === undefined) {
+    throw new Error('Empty handle contract pairs');
+  }
+
+  // retrieve chainId using handles
+  const contractsChainId = firstHandleContractPair.handle.chainId.toString();
+
+  const relayerPayload: FetchUserDecryptPayloadV1 = {
+    handleContractPairs: payload.handleContractPairs.map((pair) => {
+      return {
+        handle: pair.handle.bytes32Hex,
+        contractAddress: pair.contractAddress,
+      };
+    }),
+    requestValidity: {
+      startTimestamp: payload.kmsDecryptEip712Message.startTimestamp,
+      durationDays: payload.kmsDecryptEip712Message.durationDays,
+    },
+    contractsChainId,
+    contractAddresses: payload.kmsDecryptEip712Message.contractAddresses,
+    userAddress: payload.kmsDecryptEip712Signer,
+    signature: remove0x(payload.kmsDecryptEip712Signature),
+    extraData: payload.kmsDecryptEip712Message.extraData,
+    publicKey: remove0x(payload.kmsDecryptEip712Message.publicKey),
+  };
+
+  const hasAuth: boolean = options?.auth !== undefined;
+  const relayerBaseUrl: URL = validateRelayerBaseUrl(relayerClient.chain.fhevm.relayerUrl, hasAuth);
+  const url = buildRelayerUrlString(relayerBaseUrl, 'v2/user-decrypt');
+
+  const request = new RelayerAsyncRequest({
+    relayerOperation: 'USER_DECRYPT',
+    url,
+    payload: relayerPayload,
+    options,
+  });
+
+  const result = (await request.run()) as FetchUserDecryptResult;
+
+  const shares: KmsSigncryptedShare[] = result.map((r) => {
+    const share: KmsSigncryptedShare = {
+      signature: r.signature,
+      payload: r.payload,
+      extraData: remove0x(r.extraData),
+    };
+    return share;
+  });
+
+  return shares;
+}

package/core/modules/relayer/module/fetchUserDecryptV2.ts

@@ -0,0 +1,71 @@
+import type { KmsSigncryptedShare } from '../../../types/kms-p.js';
+import type { FetchUserDecryptPayloadV2 } from '../../../types/relayer-p.js';
+import type { FetchUserDecryptResult } from '../../../types/relayer.js';
+import type { FetchUserDecryptParametersV2, FetchUserDecryptReturnType, RelayerClientWithRuntime } from '../types.js';
+import { remove0x } from '../../../base/string.js';
+import { RelayerAsyncRequest } from './RelayerAsyncRequest.js';
+import { buildRelayerUrlString, validateRelayerBaseUrl } from './relayerUrl.js';
+
+//////////////////////////////////////////////////////////////////////////////
+// fetchUserDecryptV2 (protocol version >= 0.14.0)
+//////////////////////////////////////////////////////////////////////////////
+
+export async function fetchUserDecryptV2(
+  relayerClient: RelayerClientWithRuntime,
+  parameters: FetchUserDecryptParametersV2,
+): Promise<FetchUserDecryptReturnType> {
+  const { options, payload } = parameters;
+
+  const firstHandleContractPair = payload.handleContractPairs[0];
+  if (firstHandleContractPair === undefined) {
+    throw new Error('Empty handle contract pairs');
+  }
+
+  // V3 envelope: AttestedUserDecryptRequestJson
+  // publicKey and signature keep their 0x prefix (unlike the V1/V2 flat payload)
+  const relayerPayload: FetchUserDecryptPayloadV2 = {
+    attestationType: 'eip712-unified-user-decrypt-v1',
+    attestedPayload: {
+      version: '2.0',
+      type: 'user_decryption',
+      handles: payload.handleContractPairs.map((pair) => ({
+        ctHandle: pair.handle.bytes32Hex,
+        contractAddress: pair.contractAddress,
+        ownerAddress: pair.ownerAddress,
+      })),
+      userAddress: payload.kmsDecryptEip712Message.userAddress,
+      allowedContracts: payload.kmsDecryptEip712Message.allowedContracts,
+      requestValidity: {
+        startTimestamp: payload.kmsDecryptEip712Message.startTimestamp,
+        durationSeconds: payload.kmsDecryptEip712Message.durationSeconds,
+      },
+      publicKey: payload.kmsDecryptEip712Message.publicKey,
+      extraData: payload.kmsDecryptEip712Message.extraData,
+    },
+    signature: payload.kmsDecryptEip712Signature,
+  };
+
+  const hasAuth: boolean = options?.auth !== undefined;
+  const relayerBaseUrl: URL = validateRelayerBaseUrl(relayerClient.chain.fhevm.relayerUrl, hasAuth);
+  const url = buildRelayerUrlString(relayerBaseUrl, 'v3/user-decrypt');
+
+  const request = new RelayerAsyncRequest({
+    relayerOperation: 'USER_DECRYPT',
+    url,
+    payload: relayerPayload,
+    options,
+  });
+
+  const result = (await request.run()) as FetchUserDecryptResult;
+
+  const shares: KmsSigncryptedShare[] = result.map((r) => {
+    const share: KmsSigncryptedShare = {
+      signature: r.signature,
+      payload: r.payload,
+      extraData: remove0x(r.extraData),
+    };
+    return share;
+  });
+
+  return shares;
+}

package/core/modules/relayer/module/guards/RelayerResponseFailed.ts

@@ -63,7 +63,8 @@ export function assertIsRelayerApiError(
   if (
     value.label === ('malformed_json' satisfies RelayerApiError400NoDetails['label']) ||
     value.label === ('request_error' satisfies RelayerApiError400NoDetails['label']) ||
-    value.label === ('not_ready_for_decryption' satisfies RelayerApiError400NoDetails['label'])
+    value.label === ('not_ready_for_decryption' satisfies RelayerApiError400NoDetails['label']) ||
+    value.label === ('not_allowed_on_host_acl' satisfies RelayerApiError400NoDetails['label'])
   ) {
     assertIsRelayerApiError400NoDetails(value, name, options);
   }
@@ -94,6 +95,8 @@ export function assertIsRelayerApiError(
     value.label === ('readiness_check_timed_out' satisfies RelayerApiError503['label']) ||
     value.label === ('response_timed_out' satisfies RelayerApiError503['label']) ||
     value.label === ('protocol_paused' satisfies RelayerApiError503['label']) ||
+    value.label === ('insufficient_balance' satisfies RelayerApiError503['label']) ||
+    value.label === ('insufficient_allowance' satisfies RelayerApiError503['label']) ||
     value.label === ('gateway_not_reachable' satisfies RelayerApiError503['label'])
   ) {
     assertIsRelayerApiError503(value, name, options);
@@ -109,11 +112,14 @@ export function assertIsRelayerApiError(
           'malformed_json',
           'request_error',
           'not_ready_for_decryption',
+          'not_allowed_on_host_acl',
           'missing_fields',
           'validation_failed',
           'rate_limited',
           'internal_server_error',
           'protocol_paused',
+          'insufficient_balance',
+          'insufficient_allowance',
           'protocol_overload',
           'gateway_not_reachable',
           'readiness_check_timed_out',
@@ -150,7 +156,8 @@ export function assertIsRelayerResponseFailedWithError400(
   if (
     value.error.label === ('malformed_json' satisfies RelayerApiError400NoDetails['label']) ||
     value.error.label === ('request_error' satisfies RelayerApiError400NoDetails['label']) ||
-    value.error.label === ('not_ready_for_decryption' satisfies RelayerApiError400NoDetails['label'])
+    value.error.label === ('not_ready_for_decryption' satisfies RelayerApiError400NoDetails['label']) ||
+    value.error.label === ('not_allowed_on_host_acl' satisfies RelayerApiError400NoDetails['label'])
   ) {
     assertIsRelayerApiError400NoDetails(value.error, `${name}.error`, options);
   } else if (
@@ -168,6 +175,7 @@ export function assertIsRelayerResponseFailedWithError400(
           'malformed_json',
           'request_error',
           'not_ready_for_decryption',
+          'not_allowed_on_host_acl',
           'missing_fields',
           'validation_failed',
         ],

package/core/modules/relayer/module/guards/api-errors/RelayerApiError400NoDetails.ts

@@ -14,7 +14,8 @@ export function isRelayerApiError400NoDetails(error: unknown): error is RelayerA
     !(
       error.label === ('malformed_json' satisfies T['label']) ||
       error.label === ('request_error' satisfies T['label']) ||
-      error.label === ('not_ready_for_decryption' satisfies T['label'])
+      error.label === ('not_ready_for_decryption' satisfies T['label']) ||
+      error.label === ('not_allowed_on_host_acl' satisfies T['label'])
     )
   ) {
     return false;
@@ -26,7 +27,7 @@ export function isRelayerApiError400NoDetails(error: unknown): error is RelayerA
  * Asserts that a value matches the {@link RelayerApiError400NoDetails} schema:
  * ```json
  * {
- *   "label": "malformed_json" | "request_error" | "not_ready_for_decryption",
+ *   "label": "malformed_json" | "request_error" | "not_ready_for_decryption" | "not_allowed_on_host_acl",
  *   "message": "string"
  * }
  * ```
@@ -42,7 +43,8 @@ export function assertIsRelayerApiError400NoDetails(
     !(
       value.label === ('malformed_json' satisfies T['label']) ||
       value.label === ('request_error' satisfies T['label']) ||
-      value.label === ('not_ready_for_decryption' satisfies T['label'])
+      value.label === ('not_ready_for_decryption' satisfies T['label']) ||
+      value.label === ('not_allowed_on_host_acl' satisfies T['label'])
     )
   ) {
     throw new InvalidPropertyError(
@@ -54,6 +56,7 @@ export function assertIsRelayerApiError400NoDetails(
           'malformed_json' satisfies T['label'],
           'request_error' satisfies T['label'],
           'not_ready_for_decryption' satisfies T['label'],
+          'not_allowed_on_host_acl' satisfies T['label'],
         ],
         type: typeof value.label, // === "string"
         value: value.label,

package/core/modules/relayer/module/guards/api-errors/RelayerApiError503.ts

@@ -20,6 +20,8 @@ export function assertIsRelayerApiError503(
   assertRecordStringProperty(value, 'label' satisfies keyof T, name, {
     expectedValue: [
       'protocol_paused' satisfies T['label'],
+      'insufficient_balance' satisfies T['label'],
+      'insufficient_allowance' satisfies T['label'],
       'gateway_not_reachable' satisfies T['label'],
       'readiness_check_timed_out' satisfies T['label'],
       'response_timed_out' satisfies T['label'],

package/core/modules/relayer/module/index.ts

@@ -1,6 +1,6 @@
 import type { RelayerModuleFactory } from '../types.js';
 import { fetchCoprocessorSignatures } from './fetchCoprocessorSignatures.js';
-import { fetchDelegatedUserDecrypt } from './fetchDelegatedUserDecrypt.js';
+import { fetchDelegatedUserDecrypt } from './fetchDelegatedUserDecryptV1.js';
 import { fetchPublicDecrypt } from './fetchPublicDecrypt.js';
 import { fetchFheEncryptionKeyBytes } from './fetchFheEncryptionKeyBytes.js';
 import { fetchFheEncryptionKeySource } from './fetchFheEncryptionKeySource.js';

package/core/modules/relayer/types.ts

@@ -7,7 +7,11 @@ import type {
 } from '../../types/relayer.js';
 import type { FheEncryptionKeyBytes, FheEncryptionKeySource } from '../../types/fheEncryptionKey.js';
 import type { KmsSigncryptedShare } from '../../types/kms-p.js';
-import type { KmsDelegatedUserDecryptEip712Message, KmsUserDecryptEip712Message } from '../../types/kms.js';
+import type {
+  KmsDelegatedUserDecryptEip712V1Message,
+  KmsUserDecryptEip712V1Message,
+  KmsUserDecryptEip712V2Message,
+} from '../../types/kms.js';
 import type { Bytes65Hex, BytesHex, ChecksummedAddress } from '../../types/primitives.js';
 import type { Prettify } from '../../types/utils.js';
 import type { ZkProof } from '../../types/zkProof-p.js';
@@ -105,7 +109,7 @@ export type FetchPublicDecryptParameters = {
 
 export type FetchPublicDecryptReturnType = {
   readonly orderedAbiEncodedClearValues: BytesHex;
-  readonly kmsPublicDecryptEIP712Signatures: Bytes65Hex[];
+  readonly kmsPublicDecryptEip712Signatures: Bytes65Hex[];
   readonly extraData: BytesHex;
 };
 
@@ -120,19 +124,34 @@ export type FetchPublicDecryptModuleFunction = {
 // 4. fetchUserDecrypt
 ////////////////////////////////////////////////////////////////////////////////
 
-export type FetchUserDecryptParameters = {
+export type FetchUserDecryptParametersV1 = {
   readonly payload: {
     readonly handleContractPairs: ReadonlyArray<{
       readonly handle: Handle;
       readonly contractAddress: ChecksummedAddress;
     }>;
     readonly kmsDecryptEip712Signer: ChecksummedAddress;
-    readonly kmsDecryptEip712Message: KmsUserDecryptEip712Message;
+    readonly kmsDecryptEip712Message: KmsUserDecryptEip712V1Message;
+    readonly kmsDecryptEip712Signature: Bytes65Hex;
+  };
+  readonly options?: RelayerUserDecryptOptions | undefined;
+};
+
+export type FetchUserDecryptParametersV2 = {
+  readonly payload: {
+    readonly handleContractPairs: ReadonlyArray<{
+      readonly handle: Handle;
+      readonly contractAddress: ChecksummedAddress;
+      readonly ownerAddress: ChecksummedAddress;
+    }>;
+    readonly kmsDecryptEip712Message: KmsUserDecryptEip712V2Message;
     readonly kmsDecryptEip712Signature: Bytes65Hex;
   };
   readonly options?: RelayerUserDecryptOptions | undefined;
 };
 
+export type FetchUserDecryptParameters = FetchUserDecryptParametersV1 | FetchUserDecryptParametersV2;
+
 export type FetchUserDecryptReturnType = readonly KmsSigncryptedShare[];
 
 export type FetchUserDecryptModuleFunction = {
@@ -153,7 +172,7 @@ export type FetchDelegatedUserDecryptParameters = {
       readonly contractAddress: ChecksummedAddress;
     }>;
     readonly kmsDecryptEip712Signer: ChecksummedAddress;
-    readonly kmsDecryptEip712Message: KmsDelegatedUserDecryptEip712Message;
+    readonly kmsDecryptEip712Message: KmsDelegatedUserDecryptEip712V1Message;
     readonly kmsDecryptEip712Signature: Bytes65Hex;
   };
   readonly options?: RelayerDelegatedUserDecryptOptions | undefined;

package/core/runtime/HyperWasmSolver-p.ts

@@ -87,8 +87,8 @@ const HYPER_WASM_SOLVER_CONFIG = {
       // pubKeyCrs.version <= 1.5.x (ex: mainnet 1.4.0-alpha.3)
       pubKeyCrs: { version: '1.6.0', comparator: 'lt' },
       tfhe: {
-        canonical: '1.6.1',
-        compatible: ['1.5.3', '1.6.1'],
+        canonical: '1.6.2',
+        compatible: ['1.5.3', '1.6.2'],
       },
       kms: {
         canonical: '0.13.20-0',
@@ -101,8 +101,8 @@ const HYPER_WASM_SOLVER_CONFIG = {
       // pubKeyCrs.version >= 1.6.0 (ex: localstack_v13)
       pubKeyCrs: { version: '1.6.0', comparator: 'ge' },
       tfhe: {
-        canonical: '1.6.1',
-        compatible: ['1.6.1'],
+        canonical: '1.6.2',
+        compatible: ['1.6.2'],
       },
       kms: {
         canonical: '0.13.20-0',
@@ -350,11 +350,7 @@ function _handleModuleVersionCompatibilityPolicy(
     case 'throw':
       throw new Error(message);
     case 'warn':
-      if (logger?.warn !== undefined) {
-        logger.warn(message);
-      } else {
-        console.warn(message);
-      }
+      logger?.warn?.(message);
       return;
     case 'off':
       return;

package/core/runtime/initFhevmEncryptRuntime-p.ts

@@ -5,5 +5,5 @@ import { verifyFhevmRuntime } from './CoreFhevmRuntime-p.js';
 export async function initFhevmEncryptRuntime(runtime: FhevmRuntime, ownerToken: symbol): Promise<void> {
   verifyFhevmRuntime(runtime, ownerToken);
   const encryptRuntime = runtime.extend(encryptModule);
-  await encryptRuntime.encrypt.initTfheModule({ tfheVersion: '1.6.1' });
+  await encryptRuntime.encrypt.initTfheModule({ tfheVersion: '1.6.2' });
 }

package/core/runtime/initFhevmRuntime-p.ts

@@ -8,6 +8,6 @@ export async function initFhevmRuntime(runtime: FhevmRuntime, ownerToken: symbol
   const fullRuntime = runtime.extend(decryptModule).extend(encryptModule);
   await Promise.all([
     fullRuntime.decrypt.initTkmsModule({ tkmsVersion: '0.13.20-0' }),
-    fullRuntime.encrypt.initTfheModule({ tfheVersion: '1.6.1' }),
+    fullRuntime.encrypt.initTfheModule({ tfheVersion: '1.6.2' }),
   ]);
 }

package/core/types/kms.ts

@@ -31,7 +31,7 @@ export type KmsEip712Domain = Readonly<{
   verifyingContract: ChecksummedAddress;
 }>;
 
-export type KmsUserDecryptEip712Types = {
+export type KmsUserDecryptEip712V1Types = {
   readonly EIP712Domain: readonly [
     { readonly name: 'name'; readonly type: 'string' },
     { readonly name: 'version'; readonly type: 'string' },
@@ -48,7 +48,7 @@ export type KmsUserDecryptEip712Types = {
   ];
 };
 
-export type KmsDelegateUserDecryptEip712Types = {
+export type KmsDelegatedUserDecryptEip712V1Types = {
   readonly EIP712Domain: readonly [
     { readonly name: 'name'; readonly type: 'string' },
     { readonly name: 'version'; readonly type: 'string' },
@@ -98,7 +98,7 @@ export type KmsPublicDecryptEip712Types = {
   ];
 };
 
-export type KmsUserDecryptEip712Message = Readonly<{
+export type KmsUserDecryptEip712V1Message = Readonly<{
   publicKey: BytesHex;
   contractAddresses: readonly ChecksummedAddress[];
   startTimestamp: string;
@@ -106,8 +106,9 @@ export type KmsUserDecryptEip712Message = Readonly<{
   extraData: BytesHex;
 }>;
 
-export type KmsDelegatedUserDecryptEip712Message = Prettify<
-  KmsUserDecryptEip712Message & {
+// Protocol <= v0.13
+export type KmsDelegatedUserDecryptEip712V1Message = Prettify<
+  KmsUserDecryptEip712V1Message & {
     readonly delegatorAddress: ChecksummedAddress;
   }
 >;
@@ -127,33 +128,44 @@ export type KmsUserDecryptEip712V2Message = Readonly<{
   extraData: BytesHex;
 }>;
 
-export type KmsUserDecryptEip712 = Prettify<{
+export type KmsUserDecryptEip712Base = {
   readonly domain: KmsEip712Domain;
-  readonly types: KmsUserDecryptEip712Types;
-  readonly primaryType: 'UserDecryptRequestVerification';
-  readonly message: KmsUserDecryptEip712Message;
-}>;
+};
 
-export type KmsDelegatedUserDecryptEip712 = Prettify<{
-  readonly domain: KmsEip712Domain;
-  readonly types: KmsDelegateUserDecryptEip712Types;
-  readonly primaryType: 'DelegatedUserDecryptRequestVerification';
-  readonly message: KmsDelegatedUserDecryptEip712Message;
-}>;
+// Protocol <= v0.13
+export type KmsUserDecryptEip712V1 = Prettify<
+  KmsUserDecryptEip712Base & {
+    readonly types: KmsUserDecryptEip712V1Types;
+    readonly primaryType: 'UserDecryptRequestVerification';
+    readonly message: KmsUserDecryptEip712V1Message;
+  }
+>;
 
-export type KmsPublicDecryptEip712 = Prettify<{
-  readonly domain: KmsEip712Domain;
-  readonly types: KmsPublicDecryptEip712Types;
-  readonly primaryType: 'PublicDecryptVerification';
-  readonly message: KmsPublicDecryptEip712Message;
-}>;
+// Protocol <= v0.13
+export type KmsDelegatedUserDecryptEip712V1 = Prettify<
+  KmsUserDecryptEip712Base & {
+    readonly types: KmsDelegatedUserDecryptEip712V1Types;
+    readonly primaryType: 'DelegatedUserDecryptRequestVerification';
+    readonly message: KmsDelegatedUserDecryptEip712V1Message;
+  }
+>;
 
-export type KmsUserDecryptEip712V2 = Prettify<{
-  readonly domain: KmsEip712Domain;
-  readonly types: KmsUserDecryptEip712V2Types;
-  readonly primaryType: 'UserDecryptRequestVerification';
-  readonly message: KmsUserDecryptEip712V2Message;
-}>;
+// Protocol >= v0.14
+export type KmsUserDecryptEip712V2 = Prettify<
+  KmsUserDecryptEip712Base & {
+    readonly types: KmsUserDecryptEip712V2Types;
+    readonly primaryType: 'UserDecryptRequestVerification';
+    readonly message: KmsUserDecryptEip712V2Message;
+  }
+>;
+
+export type KmsPublicDecryptEip712 = Prettify<
+  KmsUserDecryptEip712Base & {
+    readonly types: KmsPublicDecryptEip712Types;
+    readonly primaryType: 'PublicDecryptVerification';
+    readonly message: KmsPublicDecryptEip712Message;
+  }
+>;
 
 ////////////////////////////////////////////////////////////////////////////////
 //

package/core/types/logger.ts

@@ -1,5 +1,5 @@
 export type Logger = {
-  readonly debug: (message: string) => void;
-  readonly warn?: ((message: string) => void) | undefined;
-  readonly error: (message: string, cause: unknown) => void;
+  readonly debug: ((message: string) => void) | undefined;
+  readonly warn: ((message: string) => void) | undefined;
+  readonly error: ((message: string, cause: unknown) => void) | undefined;
 };

package/core/types/record-p.ts

@@ -1,4 +1,4 @@
-import type { Uint, ChecksummedAddress, Uint256, Address } from './primitives.js';
+import type { Uint, ChecksummedAddress, Uint256, Address, UintNumber } from './primitives.js';
 
 /**
  * Generic helper type that creates a record with a specific property of type T.
@@ -17,6 +17,7 @@ export type RecordBooleanPropertyType<K extends string> = RecordWithPropertyType
 
 export type RecordUintPropertyType<K extends string> = RecordWithPropertyType<K, Uint>;
 export type RecordUint256PropertyType<K extends string> = RecordWithPropertyType<K, Uint256>;
+export type RecordUintNumberPropertyType<K extends string> = RecordWithPropertyType<K, UintNumber>;
 
 export type RecordUint8ArrayPropertyType<K extends string> = RecordWithPropertyType<K, Uint8Array>;