feat: pass a contract address to verifyCiphertext

Will be needed in the future to verify the input ZKPoK.
zama-ai · Jun 21, 2024 · 16fbbec · 16fbbec
1 parent bfc1dab
commit 16fbbec
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -116,18 +116,14 @@ import "fhevm/lib/TFHE.sol";
 contract Counter {
   euint32 counter;
 
-  function add(bytes calldata encryptedValue) public {
-    euint32 value = TFHE.asEuint32(encryptedValue);
-    counter = counter + value;
-  }
-
-  function getCounter(bytes32 publicKey) returns (bytes memory) {
-    return TFHE.reencrypt(counter, publicKey);
+  function add(einput valueInput, bytes calldata inputProof) public {
+    euint32 value = TFHE.asEuint32(valueInput, inputProof);
+    counter = TFHE.add(counter, value);
   }
 }
 ```
 
-_This example is explained in more detail in [here](https://github.com/zama-ai/fhevm/tree/main/examples)._
+_More examples are available [here](https://github.com/zama-ai/fhevm/tree/main/examples)._
 
 <p align="right">
   <a href="#about" > ↑ Back to top </a>
@@ -149,7 +145,7 @@ _This example is explained in more detail in [here](https://github.com/zama-ai/f
 
 #### Games:
 
-- [Ciperbomb](https://github.com/immortal-tofu/cipherbomb): A Hardhat-based template for developing Solidity smart contracts, with sensible defaults. - by Clément Danjou
+- [Cipherbomb](https://github.com/immortal-tofu/cipherbomb): A Hardhat-based template for developing Solidity smart contracts, with sensible defaults. - by Clément Danjou
 - [Battleship](https://github.com/battleship-fhevm/battleship-hardhat): A smart contract that replicates the classic Battleship game on a blockchain in a transparent manner. - by [Owen Murovec](https://github.com/omurovec)
 
 #### Others

diff --git a/codegen/templates.ts b/codegen/templates.ts
@@ -253,7 +253,7 @@ function generateImplCoprocessorInterface(operators: Operator[]): string {
 function fheLibCustomInterfaceFunctions(): string {
   return `
     function fhePubKey(bytes1 fromLib) external view returns (bytes memory result);
-    function verifyCiphertext(bytes32 inputHandle, address callerAddress, bytes memory inputProof, bytes1 inputType) external pure returns (uint256 result);
+    function verifyCiphertext(bytes32 inputHandle, address callerAddress, address contractAddress, bytes memory inputProof, bytes1 inputType) external pure returns (uint256 result);
     function cast(uint256 ct, bytes1 toType) external pure returns (uint256 result);
     function trivialEncrypt(uint256 ct, bytes1 toType) external pure returns (uint256 result);
     function fheIfThenElse(uint256 control, uint256 ifTrue, uint256 ifFalse) external pure returns (uint256 result);
@@ -289,7 +289,7 @@ function generateACLInterface(): string {
 function tfheExecutorCustomFunctions(): string {
   return `
     function verifyCiphertext(bytes32 inputHandle, address callerAddress, bytes memory inputProof, bytes1 inputType) external returns (uint256 result) {
-      result = FhevmLib(address(EXT_TFHE_LIBRARY)).verifyCiphertext(inputHandle, callerAddress, inputProof, inputType);
+      result = FhevmLib(address(EXT_TFHE_LIBRARY)).verifyCiphertext(inputHandle, callerAddress, msg.sender, inputProof, inputType);
       acl.allowTransient(result, msg.sender);
     }
     function cast(uint256 ct, bytes1 toType) external returns (uint256 result) {

diff --git a/lib/FhevmLib.sol b/lib/FhevmLib.sol
@@ -52,6 +52,7 @@ interface FhevmLib {
     function verifyCiphertext(
         bytes32 inputHandle,
         address callerAddress,
+        address contractAddress,
         bytes memory inputProof,
         bytes1 inputType
     ) external pure returns (uint256 result);

diff --git a/lib/TFHEExecutor.sol b/lib/TFHEExecutor.sol
@@ -232,6 +232,7 @@ contract TFHEExecutor {
         result = FhevmLib(address(EXT_TFHE_LIBRARY)).verifyCiphertext(
             inputHandle,
             callerAddress,
+            msg.sender,
             inputProof,
             inputType
         );