@cofhe/abi 0.6.0 → 0.7.0

package/src/fhenixMap.ts

@@ -1,11 +1,11 @@
 import type {
-  EncryptedAddressInput,
-  EncryptedBoolInput,
-  EncryptedUint128Input,
-  EncryptedUint16Input,
-  EncryptedUint32Input,
-  EncryptedUint64Input,
-  EncryptedUint8Input,
+  ExternalAddressHash,
+  ExternalBoolHash,
+  ExternalUint128Hash,
+  ExternalUint16Hash,
+  ExternalUint32Hash,
+  ExternalUint64Hash,
+  ExternalUint8Hash,
   FheTypes,
 } from '@cofhe/sdk';
 import type {
@@ -57,14 +57,15 @@ export type EncryptedReturnType = EBool | EUint8 | EUint16 | EUint32 | EUint64 |
 export type EncryptedReturnTypeByUtype<U extends FheTypes> = Extract<EncryptedReturnType, { utype: U }>;
 
 export type FhenixInternalTypeMap = {
-  // Input Structs
-  'struct InEbool': EncryptedBoolInput;
-  'struct InEuint8': EncryptedUint8Input;
-  'struct InEuint16': EncryptedUint16Input;
-  'struct InEuint32': EncryptedUint32Input;
-  'struct InEuint64': EncryptedUint64Input;
-  'struct InEuint128': EncryptedUint128Input;
-  'struct InEaddress': EncryptedAddressInput;
+  // Encrypted input handles (Solidity: externalEbool, externalEuint*, externalEaddress -
+  // plain bytes32-based value types, not structs)
+  externalEbool: ExternalBoolHash;
+  externalEuint8: ExternalUint8Hash;
+  externalEuint16: ExternalUint16Hash;
+  externalEuint32: ExternalUint32Hash;
+  externalEuint64: ExternalUint64Hash;
+  externalEuint128: ExternalUint128Hash;
+  externalEaddress: ExternalAddressHash;
 
   // Exposed encrypted primitives
   ebool: EBool;

package/src/mockEncrypt.ts

@@ -1,4 +1,4 @@
-import { type EncryptableItem, type EncryptedItemInputs } from '@cofhe/sdk';
+import { type EncryptableItem, type EncryptableToExternalHashMap, type HashPlusProofResult } from '@cofhe/sdk';
 
 /**
  * Generates a mock ctHash from the encryptable data.
@@ -36,39 +36,37 @@ export function generateMockCtHash(data: unknown): bigint {
 }
 
 /**
- * Generates a mock signature for testing purposes.
+ * Generates a mock batch signature for testing purposes.
  * Returns a hex string that looks like a valid signature.
  */
 function generateMockSignature(): `0x${string}` {
   return '0xMockSignature';
 }
 
-export function mockEncryptEncryptable<T extends EncryptableItem>(encryptable: T): EncryptedItemInputs<T> {
+/**
+ * Converts an EncryptableItem to its mock external hash, without any real encryption or signing.
+ *
+ * @param encryptable - The EncryptableItem to convert
+ * @returns A mock hash (branded by utype), deterministically derived from the encryptable's data
+ */
+export function mockEncryptEncryptable<T extends EncryptableItem>(encryptable: T): EncryptableToExternalHashMap<T> {
   const ctHash = generateMockCtHash(encryptable.data);
-  const signature = generateMockSignature();
-
-  return {
-    ctHash,
-    securityZone: 0,
-    utype: encryptable.utype,
-    signature,
-  } as EncryptedItemInputs<T>;
+  return ('0x' + ctHash.toString(16).padStart(64, '0')) as EncryptableToExternalHashMap<T>;
 }
 
 /**
- * Converts an EncryptableItem to a mock EncryptedItemInput.
- * This is useful for testing and development when you don't need actual encryption.
- *
- * @param encryptable - The EncryptableItem to convert
- * @returns A mock EncryptedItemInput with the same utype and securityZone, but with mock ctHash and signature
+ * Converts an array of EncryptableItems into a mock batch-verified result: per-item hashes
+ * followed by a single mock batch signature - the same shape `EncryptInputsBuilder.execute()`
+ * returns. Useful for testing and development when you don't need actual encryption.
  *
  * @example
- * const encryptable = Encryptable.uint32(100n);
- * const mockEncrypted = mockEncryptedInput(encryptable);
- * // Returns: { ctHash: 100n, securityZone: 0, utype: FheTypes.Uint32, signature: "0x..." }
+ * const mockEncrypted = mockEncrypt([Encryptable.uint32(100n)]);
+ * // Returns: [hash, "0xMockSignature"]
  */
 export function mockEncrypt<T extends EncryptableItem[]>(
   encryptables: [...T] | readonly [...T]
-): [...EncryptedItemInputs<T>] {
-  return encryptables.map(mockEncryptEncryptable) as [...EncryptedItemInputs<[...T]>];
+): HashPlusProofResult<T> {
+  const hashes = encryptables.map(mockEncryptEncryptable);
+  const signature = generateMockSignature();
+  return [...hashes, signature] as unknown as HashPlusProofResult<T>;
 }