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

package/core/kms/SignedDecryptionPermitV1-p.ts

@@ -1,17 +1,10 @@
 import type { SignedDecryptionPermit, SignedDecryptionPermitV1 } from '../types/signedDecryptionPermit.js';
 import type { KmsDelegatedUserDecryptEip712V1, KmsUserDecryptEip712V1 } from '../types/kms.js';
-import type {
-  Bytes65Hex,
-  BytesHex,
-  ChecksummedAddress,
-  Uint256BigInt,
-  Uint8Number,
-  UintNumber,
-} from '../types/primitives.js';
+import type { Bytes65Hex, BytesHex, ChecksummedAddress, Uint8Number, UintNumber } from '../types/primitives.js';
 import type { FhevmChain } from '../types/fhevmChain.js';
 import type { FhevmRuntime } from '../types/coreFhevmRuntime.js';
-import type { KmsSignersContext } from '../types/kmsSignersContext.js';
 import type { SignDecryptionPermitContext, SignDecryptionPermitParameters } from './SignedDecryptionPermit-p.js';
+import type { KmsExtraData } from '../types/kms-p.js';
 import { verifyKmsUserDecryptEip712V1 } from '../utils-p/decrypt/verifyKmsUserDecryptEip712V1.js';
 import { verifyKmsDelegatedUserDecryptEip712V1 } from '../utils-p/decrypt/verifyKmsDelegatedUserDecryptEip712V1.js';
 import { assertRecordNonNullableProperty } from '../base/record.js';
@@ -24,9 +17,8 @@ import {
 } from './createKmsDelegatedUserDecryptEip712V1.js';
 import { assertRecordStringProperty } from '../base/string.js';
 import { assertIsTransportKeyPair, type TransportKeyPair } from './TransportKeyPair-p.js';
-import { readKmsSignersContext } from '../host-contracts/readKmsSignersContext-p.js';
+import { readCurrentKmsSignersContext } from '../host-contracts/readKmsSignersContext-p.js';
 import { kmsSignersContextToExtraData } from '../host-contracts/KmsSignersContext-p.js';
-import { fromKmsExtraData } from './kmsExtraData.js';
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -123,44 +115,10 @@ class SignedDecryptionPermitV1Impl implements SignedDecryptionPermitV1 {
     assertKmsEip712V1DeadlineValidity(this.#eip712.message, MAX_USER_DECRYPT_DURATION_DAYS);
   }
 
-  /**
-   * Asserts that this permit was signed against the given {@link KmsSignersContext}.
-   *
-   * Compares the `extraData` embedded in the permit's EIP-712 message with the
-   * `extraData` derived from the provided context. A mismatch indicates the permit
-   * was created for a different KMS context (e.g. different context ID or version)
-   * and must not be used for decryption.
-   *
-   * @todo The current check is a strict byte-level comparison. A permit signed
-   *   with the correct `kmsContextId` but a different `extraData` encoding format
-   *   (e.g. a version change in the serialization scheme) will be rejected even
-   *   though the context ID matches. Consider comparing the decoded `kmsContextId`
-   *   instead of the raw `extraData` bytes.
-   *
-   * @param kmsSignersContext - The current KMS signers context to validate against.
-   * @throws If the permit's `extraData` does not match the context's `extraData`.
-   */
-  public assertMatchesKmsContext(kmsSignersContext: KmsSignersContext): void {
-    const expectedExtraData = kmsSignersContextToExtraData(kmsSignersContext);
-    if (expectedExtraData !== this.#eip712.message.extraData) {
-      throw new Error(
-        `Invalid permit: extraData "${this.#eip712.message.extraData}" does not match expected "${expectedExtraData}" from KmsSignersContext.`,
-      );
-    }
-  }
-
   public get transportPublicKey(): BytesHex {
     return this.#eip712.message.publicKey;
   }
 
-  public get kmsContextId(): Uint256BigInt {
-    return fromKmsExtraData(this.#eip712.message.extraData).kmsContextId;
-  }
-
-  public get kmsEpochId(): Uint256BigInt {
-    return fromKmsExtraData(this.#eip712.message.extraData).kmsEpochId;
-  }
-
   public get encryptedDataOwnerAddress(): ChecksummedAddress {
     if (this.eip712.primaryType === 'DelegatedUserDecryptRequestVerification') {
       return this.eip712.message.delegatorAddress;
@@ -235,12 +193,12 @@ export async function signDecryptionPermitV1(
   context: SignDecryptionPermitContext,
   parameters: SignDecryptionPermitParameters,
 ): Promise<SignedDecryptionPermit> {
-  const kmsSignersContext = await readKmsSignersContext(context, {
+  const kmsSignersContext = await readCurrentKmsSignersContext(context, {
     kmsVerifierAddress: context.chain.fhevm.contracts.kmsVerifier.address as ChecksummedAddress,
     protocolConfigAddress: context.chain.fhevm.contracts.protocolConfig?.address as ChecksummedAddress | undefined,
   });
 
-  const extraData: BytesHex = kmsSignersContextToExtraData(kmsSignersContext);
+  const extraData: KmsExtraData = kmsSignersContextToExtraData(kmsSignersContext);
 
   const {
     contractAddresses,

package/core/kms/SignedDecryptionPermitV2-p.ts

@@ -1,21 +1,21 @@
 import type { SignedDecryptionPermit, SignedDecryptionPermitV2 } from '../types/signedDecryptionPermit.js';
 import type { KmsUserDecryptEip712V2 } from '../types/kms.js';
-import type { Bytes65Hex, BytesHex, ChecksummedAddress, Uint256BigInt, Uint8Number } from '../types/primitives.js';
+import type { Bytes65Hex, BytesHex, ChecksummedAddress, Uint8Number } from '../types/primitives.js';
 import type { FhevmChain } from '../types/fhevmChain.js';
 import type { FhevmRuntime } from '../types/coreFhevmRuntime.js';
-import type { KmsSignersContext } from '../types/kmsSignersContext.js';
 import type { SignDecryptionPermitContext, SignDecryptionPermitParameters } from './SignedDecryptionPermit-p.js';
+import type { KmsExtraData } from '../types/kms-p.js';
 import { assertRecordNonNullableProperty } from '../base/record.js';
 import { assertRecordBytes65HexProperty } from '../base/bytes.js';
 import { addressToChecksummedAddress, assertIsAddress, assertRecordAddressProperty } from '../base/address.js';
 import { assertRecordStringProperty } from '../base/string.js';
 import { assertIsTransportKeyPair, type TransportKeyPair } from './TransportKeyPair-p.js';
-import { readKmsSignersContext } from '../host-contracts/readKmsSignersContext-p.js';
+import { readCurrentKmsSignersContext } from '../host-contracts/readKmsSignersContext-p.js';
 import { kmsSignersContextToExtraData } from '../host-contracts/KmsSignersContext-p.js';
-import { EXTRA_DATA_V2, fromKmsExtraData } from './kmsExtraData.js';
 import { assertIsKmsUserDecryptEip712V2, createKmsUserDecryptEip712V2 } from './createKmsUserDecryptEip712V2.js';
 import { verifyKmsUserDecryptEip712V2 } from '../utils-p/decrypt/verifyKmsUserDecryptEip712V2.js';
 import { assert } from '../base/errors/InternalError.js';
+import { EXTRA_DATA_V2 } from './kmsExtraData-p.js';
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -106,23 +106,6 @@ class SignedDecryptionPermitV2Impl implements SignedDecryptionPermitV2 {
     const { startTimestamp, durationSeconds } = this.#eip712.message;
     assertKmsEip712V2DeadlineValidity({ startTimestamp, durationSeconds });
   }
-
-  public assertMatchesKmsContext(kmsSignersContext: KmsSignersContext): void {
-    const expectedExtraData = kmsSignersContextToExtraData(kmsSignersContext);
-    if (expectedExtraData !== this.#eip712.message.extraData) {
-      throw new Error(
-        `Invalid permit: extraData "${this.#eip712.message.extraData}" does not match expected "${expectedExtraData}" from KmsSignersContext.`,
-      );
-    }
-  }
-
-  public get kmsContextId(): Uint256BigInt {
-    return fromKmsExtraData(this.#eip712.message.extraData).kmsContextId;
-  }
-
-  public get kmsEpochId(): Uint256BigInt {
-    return fromKmsExtraData(this.#eip712.message.extraData).kmsEpochId;
-  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -168,20 +151,20 @@ export async function signDecryptionPermitV2(
   context: SignDecryptionPermitContext,
   parameters: SignDecryptionPermitParameters,
 ): Promise<SignedDecryptionPermit> {
-  const kmsSignersContext = await readKmsSignersContext(context, {
+  const kmsSignersContext = await readCurrentKmsSignersContext(context, {
     kmsVerifierAddress: context.chain.fhevm.contracts.kmsVerifier.address as ChecksummedAddress,
     protocolConfigAddress: context.chain.fhevm.contracts.protocolConfig?.address as ChecksummedAddress | undefined,
   });
 
-  const extraData: BytesHex = kmsSignersContextToExtraData(kmsSignersContext);
+  const extraData: KmsExtraData = kmsSignersContextToExtraData(kmsSignersContext);
 
   // For debug purpose only:
   // -----------------------
   // In theory, it should not be possible to produce a unified eip712 (protocol v14+)
   // with an extraData coming from an old protocol v11/12/13
   assert(
-    fromKmsExtraData(extraData).version >= EXTRA_DATA_V2,
-    `signDecryptionPermitV2 error: Invalid extraData version extraData=${extraData}`,
+    extraData.version >= EXTRA_DATA_V2,
+    `signDecryptionPermitV2 error: Invalid extraData version extraData=${extraData.toBytesHex()}`,
   );
 
   const {

package/core/kms/createKmsDelegatedUserDecryptEip712V1.ts

@@ -1,19 +1,20 @@
 import type { KmsDelegatedUserDecryptEip712V1 } from '../types/kms.js';
 import type { BytesHex } from '../types/primitives.js';
 import type { ErrorMetadataParams } from '../base/errors/ErrorBase.js';
+import type { KmsExtraData } from '../types/kms-p.js';
 import {
   addressToChecksummedAddress,
   assertIsAddress,
   assertIsAddressArray,
   assertRecordChecksummedAddressProperty,
 } from '../base/address.js';
-import { asBytesHex, assertIsBytesHex, bytesToHexLarge } from '../base/bytes.js';
+import { asBytesHex, bytesToHexLarge } from '../base/bytes.js';
 import { ensure0x } from '../base/string.js';
 import { assertIsUintNumber } from '../base/uint.js';
 import { createKmsEip712Domain } from './createKmsEip712Domain.js';
 import { _assertIsKmsUserDecryptEip712V1Base } from './createKmsUserDecryptEip712V1.js';
 import { kmsDelegatedUserDecryptEip712V1Types } from './kmsDelegatedUserDecryptEip712V1Types.js';
-import { assertIsKmsExtraData } from './kmsExtraData.js';
+import { assertIsKmsExtraData } from './kmsExtraData-p.js';
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -24,7 +25,7 @@ export type CreateKmsDelegatedUserDecryptEip712V1Parameters = {
   readonly contractAddresses: readonly string[];
   readonly startTimestamp: number;
   readonly durationDays: number;
-  readonly extraData: string;
+  readonly extraData: KmsExtraData;
   readonly delegatorAddress: string;
 };
 
@@ -50,7 +51,6 @@ export function createKmsDelegatedUserDecryptEip712V1(
   assertIsAddressArray(contractAddresses, {});
   assertIsUintNumber(startTimestamp, {});
   assertIsUintNumber(durationDays, {});
-  assertIsBytesHex(extraData, {});
   assertIsAddress(delegatorAddress, {});
   assertIsKmsExtraData(extraData, {});
 
@@ -75,7 +75,7 @@ export function createKmsDelegatedUserDecryptEip712V1(
       delegatorAddress: checksummedDelegatorAddress,
       startTimestamp: startTimestamp.toString(),
       durationDays: durationDays.toString(),
-      extraData,
+      extraData: extraData.toBytesHex(),
     },
   };
 

package/core/kms/createKmsUserDecryptEip712V1.ts

@@ -2,6 +2,7 @@ import type { ErrorMetadataParams } from '../base/errors/ErrorBase.js';
 import type { KmsEip712Domain, KmsUserDecryptEip712V1 } from '../types/kms.js';
 import type { BytesHex } from '../types/primitives.js';
 import type { KmsUserDecryptEip712V1Message } from '../types/kms.js';
+import type { KmsExtraData } from '../types/kms-p.js';
 import {
   addressToChecksummedAddress,
   assertIsAddress,
@@ -9,14 +10,14 @@ import {
   assertRecordChecksummedAddressArrayProperty,
 } from '../base/address.js';
 import { assertIsKmsEip712Domain, createKmsEip712Domain } from './createKmsEip712Domain.js';
-import { asBytesHex, assertIsBytesHex, assertRecordBytesHexProperty, bytesToHexLarge } from '../base/bytes.js';
+import { asBytesHex, assertRecordBytesHexProperty, bytesToHexLarge } from '../base/bytes.js';
 import { assertRecordNonNullableProperty } from '../base/record.js';
 import { assertRecordStringProperty, ensure0x } from '../base/string.js';
-import { assertIsUint64, assertIsUintNumber } from '../base/uint.js';
-import { assertIsKmsExtraData } from './kmsExtraData.js';
+import { assertIsUint64, assertIsUintNumber, assertIsUintString, MAX_UINT256 } from '../base/uint.js';
 import { kmsUserDecryptEip712V1Types } from './kmsUserDecryptEip712V1Types.js';
 import { kmsDelegatedUserDecryptEip712V1Types } from './kmsDelegatedUserDecryptEip712V1Types.js';
 import { isDeepEqual } from '../base/object.js';
+import { assertIsKmsExtraData, assertIsKmsExtraDataBytesHex } from './kmsExtraData-p.js';
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -27,7 +28,7 @@ export type CreateKmsUserDecryptEip712V1Parameters = {
   readonly contractAddresses: readonly string[];
   readonly startTimestamp: number;
   readonly durationDays: number;
-  readonly extraData: string;
+  readonly extraData: KmsExtraData;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -53,7 +54,6 @@ export function createKmsUserDecryptEip712V1(
   assertIsAddressArray(contractAddresses, {});
   assertIsUintNumber(startTimestamp, {});
   assertIsUintNumber(durationDays, {});
-  assertIsBytesHex(extraData, {});
   assertIsKmsExtraData(extraData, {});
 
   const checksummedContractAddresses = contractAddresses.map(addressToChecksummedAddress);
@@ -74,7 +74,7 @@ export function createKmsUserDecryptEip712V1(
       contractAddresses: checksummedContractAddresses,
       startTimestamp: startTimestamp.toString(),
       durationDays: durationDays.toString(),
-      extraData,
+      extraData: extraData.toBytesHex(),
     },
   };
 
@@ -159,7 +159,9 @@ function _assertIsKmsUserDecryptEip712V1Message(
   assertRecordStringProperty(msg, 'startTimestamp' satisfies keyof MessageType, msgName, options);
   assertRecordStringProperty(msg, 'durationDays' satisfies keyof MessageType, msgName, options);
   assertRecordBytesHexProperty(msg, 'extraData' satisfies keyof MessageType, msgName, options);
-  assertIsKmsExtraData(msg.extraData, options);
+  assertIsKmsExtraDataBytesHex(msg.extraData, options);
+  assertIsUintString(msg.startTimestamp, { max: MAX_UINT256 });
+  assertIsUintString(msg.durationDays, { max: MAX_UINT256 });
 }
 
 ////////////////////////////////////////////////////////////////////////////////

package/core/kms/createKmsUserDecryptEip712V2.ts

@@ -2,6 +2,7 @@ import type { ErrorMetadataParams } from '../base/errors/ErrorBase.js';
 import type { KmsUserDecryptEip712V2 } from '../types/kms.js';
 import type { BytesHex } from '../types/primitives.js';
 import type { KmsUserDecryptEip712V2Message } from '../types/kms.js';
+import type { KmsExtraData } from '../types/kms-p.js';
 import {
   addressToChecksummedAddress,
   assertIsAddress,
@@ -10,13 +11,13 @@ import {
   assertRecordChecksummedAddressArrayProperty,
 } from '../base/address.js';
 import { assertIsKmsEip712Domain, createKmsEip712Domain } from './createKmsEip712Domain.js';
-import { asBytesHex, assertIsBytesHex, assertRecordBytesHexProperty, bytesToHexLarge } from '../base/bytes.js';
+import { asBytesHex, assertRecordBytesHexProperty, bytesToHexLarge } from '../base/bytes.js';
 import { isDeepEqual } from '../base/object.js';
 import { assertRecordNonNullableProperty } from '../base/record.js';
 import { assertRecordStringProperty, ensure0x } from '../base/string.js';
 import { assertIsUint256, assertIsUint64, assertIsUintString, MAX_UINT256 } from '../base/uint.js';
-import { assertIsKmsExtraData } from './kmsExtraData.js';
 import { kmsUserDecryptEip712V2Types } from './kmsUserDecryptEip712V2Types.js';
+import { assertIsKmsExtraData, assertIsKmsExtraDataBytesHex } from './kmsExtraData-p.js';
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -28,7 +29,7 @@ export type CreateKmsUserDecryptEip712V2Parameters = {
   readonly allowedContracts: readonly string[];
   readonly startTimestamp: number | bigint;
   readonly durationSeconds: bigint;
-  readonly extraData: string;
+  readonly extraData: KmsExtraData;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -56,7 +57,6 @@ export function createKmsUserDecryptEip712V2(
   assertIsAddressArray(allowedContracts, {});
   assertIsUint256(startTimestamp, {});
   assertIsUint256(durationSeconds, {});
-  assertIsBytesHex(extraData, {});
   assertIsKmsExtraData(extraData, {});
 
   const checksummedUserAddress = addressToChecksummedAddress(userAddress);
@@ -79,7 +79,7 @@ export function createKmsUserDecryptEip712V2(
       allowedContracts: checksummedContractAddresses,
       startTimestamp: startTimestamp.toString(),
       durationSeconds: durationSeconds.toString(),
-      extraData,
+      extraData: extraData.toBytesHex(),
     } satisfies KmsUserDecryptEip712V2Message,
   };
 
@@ -131,7 +131,7 @@ function _assertIsKmsUserDecryptEip712V2Message(
   assertRecordStringProperty(msg, 'startTimestamp' satisfies keyof MessageType, msgName, options);
   assertRecordStringProperty(msg, 'durationSeconds' satisfies keyof MessageType, msgName, options);
   assertRecordBytesHexProperty(msg, 'extraData' satisfies keyof MessageType, msgName, options);
-  assertIsKmsExtraData(msg.extraData, options);
+  assertIsKmsExtraDataBytesHex(msg.extraData, options);
   assertIsUintString(msg.startTimestamp, { max: MAX_UINT256 });
   assertIsUintString(msg.durationSeconds, { max: MAX_UINT256 });
 }

package/core/kms/fetchKmsSigncryptedSharesV1-p.ts

@@ -9,7 +9,7 @@ import type { SignedDecryptionPermit, SignedDecryptionPermitV1 } from '../types/
 import type { Handle } from '../types/encryptedTypes-p.js';
 import { assertHandlesBelongToSameChainId } from '../handle/FhevmHandle.js';
 import { createKmsSigncryptedShares } from './KmsSigncryptedShares-p.js';
-import { readKmsSignersContext } from '../host-contracts/readKmsSignersContext-p.js';
+import { readCurrentKmsSignersContext } from '../host-contracts/readKmsSignersContext-p.js';
 import { assertIsSignedDecryptionPermit } from './SignedDecryptionPermit-p.js';
 import { assertKmsDecryptionBitLimit } from './utils.js';
 import { checkPersistAllowed } from '../host-contracts/checkPersistAllowed.js';
@@ -18,19 +18,6 @@ import { createKmsEip712Domain } from './createKmsEip712Domain.js';
 import { checkDelegation } from '../host-contracts/checkDelegation.js';
 import { resolveFhevmTkmsVersion } from '../runtime/resolveFhevmVersions-p.js';
 
-/*
-    See: in KMS (eip712Domain)
-    json.response[i].signature is an eip712 sig potentially on this message:
-
-    struct UserDecryptResponseVerification {
-        bytes publicKey;
-        bytes32[] ctHandles;
-        bytes userDecryptedShare;
-        bytes extraData;
-    }
-}    
-*/
-
 ////////////////////////////////////////////////////////////////////////////////
 
 type Context = {
@@ -164,7 +151,7 @@ export async function fetchKmsSigncryptedSharesV1(context: Context, parameters:
   // (e.g. a version change in the serialization scheme) will be rejected even
   // though the context ID matches. Consider comparing the decoded `kmsContextId`
   // instead of the raw `extraData` bytes.
-  const requestedKmsSignersContext: KmsSignersContext = await readKmsSignersContext(context, {
+  const requestedKmsSignersContext: KmsSignersContext = await readCurrentKmsSignersContext(context, {
     kmsVerifierAddress: context.chain.fhevm.contracts.kmsVerifier.address as ChecksummedAddress,
     protocolConfigAddress: context.chain.fhevm.contracts.protocolConfig?.address as ChecksummedAddress | undefined,
   });
@@ -215,6 +202,31 @@ export async function fetchKmsSigncryptedSharesV1(context: Context, parameters:
     tkmsVersion,
   };
 
+  /*
+
+    ----------------------------------------------------------------------------
+    KMS response-signature verification.
+
+    Each share's signature is an EIP-712 signature over the
+    `UserDecryptResponseVerification` struct (see `verifyKmsSigncryptedShare` and
+    gateway `Decryption.sol`). This check is already performed inside the tkms WASM
+    during reconstruction (verify=true); the call below is an equivalent JS-only
+    pass, kept for testing / debugging. To fully check, loop over every share.
+    ----------------------------------------------------------------------------
+
+    for (const share of shares) {
+      await verifyKmsSigncryptedShare(
+        context, 
+        {
+          metadata: sharesMetadata,
+          share,
+          transportPublicKey: signedPermit.transportPublicKey,
+        }
+      );
+    }
+
+  */
+
   // 12. The returned KmsSigncryptedShares is guaranteed to be fully verified:
   // uniform extraData across shares, valid extraData format, and consistency
   // with the KmsSignersContext (see KmsSigncryptedSharesImpl invariants).

package/core/kms/fetchKmsSigncryptedSharesV2-p.ts

@@ -9,7 +9,7 @@ import type { SignedDecryptionPermit, SignedDecryptionPermitV2 } from '../types/
 import type { Handle } from '../types/encryptedTypes-p.js';
 import { assertHandlesBelongToSameChainId } from '../handle/FhevmHandle.js';
 import { createKmsSigncryptedShares } from './KmsSigncryptedShares-p.js';
-import { readKmsSignersContext } from '../host-contracts/readKmsSignersContext-p.js';
+import { readCurrentKmsSignersContext } from '../host-contracts/readKmsSignersContext-p.js';
 import { assertIsSignedDecryptionPermit } from './SignedDecryptionPermit-p.js';
 import { assertKmsDecryptionBitLimit } from './utils.js';
 import { checkPersistAllowed } from '../host-contracts/checkPersistAllowed.js';
@@ -130,7 +130,7 @@ export async function fetchKmsSigncryptedSharesV2(context: Context, parameters:
   // (e.g. a version change in the serialization scheme) will be rejected even
   // though the context ID matches. Consider comparing the decoded `kmsContextId`
   // instead of the raw `extraData` bytes.
-  const requestedKmsSignersContext: KmsSignersContext = await readKmsSignersContext(context, {
+  const requestedKmsSignersContext: KmsSignersContext = await readCurrentKmsSignersContext(context, {
     kmsVerifierAddress: context.chain.fhevm.contracts.kmsVerifier.address as ChecksummedAddress,
     protocolConfigAddress: context.chain.fhevm.contracts.protocolConfig?.address as ChecksummedAddress | undefined,
   });