contracts compiling

Author: arr00

.gitignore

@@ -62,3 +62,4 @@ contracts-exposed
 /cache_forge
 
 yarn.lock
+fhevmTemp

contracts/interfaces/IConfidentialFungibleToken.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import { einput, euint64 } from "fhevm/lib/TFHE.sol";
+import { euint64, externalEuint64 } from "@fhevm/solidity/lib/FHE.sol";
 
 /// @dev Draft interface for a confidential fungible token standard utilizing the Zama TFHE library.
 interface IConfidentialFungibleToken {
@@ -57,12 +57,12 @@ interface IConfidentialFungibleToken {
      */
     function confidentialTransfer(
         address to,
-        einput encryptedAmount,
+        externalEuint64 encryptedAmount,
         bytes calldata inputProof
     ) external returns (euint64);
 
     /**
-     * @dev Similar to {confidentialTransfer-address-einput-bytes} but without an input proof. The caller
+     * @dev Similar to {confidentialTransfer-address-externalEuint64-bytes} but without an input proof. The caller
      * *must* already be allowed by ACL for the given `amount`.
      */
     function confidentialTransfer(address to, euint64 amount) external returns (euint64 transferred);
@@ -76,26 +76,27 @@ interface IConfidentialFungibleToken {
     function confidentialTransferFrom(
         address from,
         address to,
-        einput encryptedAmount,
+        externalEuint64 encryptedAmount,
         bytes calldata inputProof
     ) external returns (euint64);
 
     /**
-     * @dev Similar to {confidentialTransferFrom-address-address-einput-bytes} but without an input proof. The caller
-     * *must* be already allowed by ACL for the given `amount`.
+     * @dev Similar to {confidentialTransferFrom-address-address-externalEuint64-bytes} but without an input proof.
+     * The caller *must* be already allowed by ACL for the given `amount`.
      */
     function confidentialTransferFrom(address from, address to, euint64 amount) external returns (euint64 transferred);
 
     /**
-     * @dev Similar to {confidentialTransfer-address-einput-bytes} but with a callback to `to` after the transfer.
+     * @dev Similar to {confidentialTransfer-address-externalEuint64-bytes} but with a callback to `to` after
+     * the transfer.
      *
      * The callback is made to the {IConfidentialFungibleTokenReceiver-onConfidentialTransferReceived} function on the
      * to address with the actual transferred amount (may differ from the given `encryptedAmount`) and the given
      * data `data`.
      */
     function confidentialTransferAndCall(
         address to,
-        einput encryptedAmount,
+        externalEuint64 encryptedAmount,
         bytes calldata inputProof,
         bytes calldata data
     ) external returns (euint64 transferred);
@@ -108,13 +109,13 @@ interface IConfidentialFungibleToken {
     ) external returns (euint64 transferred);
 
     /**
-     * @dev Similar to {confidentialTransferFrom-address-address-einput-bytes} but with a callback to `to` after
-     * the transfer.
+     * @dev Similar to {confidentialTransferFrom-address-address-externalEuint64-bytes} but with a callback to `to`
+     * after the transfer.
      */
     function confidentialTransferFromAndCall(
         address from,
         address to,
-        einput encryptedAmount,
+        externalEuint64 encryptedAmount,
         bytes calldata inputProof,
         bytes calldata data
     ) external returns (euint64 transferred);

contracts/interfaces/IConfidentialFungibleTokenReceiver.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import { ebool, euint64 } from "fhevm/lib/TFHE.sol";
+import { ebool, euint64 } from "@fhevm/solidity/lib/FHE.sol";
 
 /// @dev Interface for contracts that can receive confidential token transfers with a callback.
 interface IConfidentialFungibleTokenReceiver {

contracts/mocks/ConfidentialFungibleTokenERC20WrapperMock.sol

@@ -1,19 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import { SepoliaZamaFHEVMConfig } from "fhevm/config/ZamaFHEVMConfig.sol";
-import { SepoliaZamaGatewayConfig } from "fhevm/config/ZamaGatewayConfig.sol";
+import { SepoliaConfig } from "@fhevm/solidity/config/ZamaConfig.sol";
 import {
     ConfidentialFungibleTokenERC20Wrapper,
     ConfidentialFungibleToken
 } from "../token/extensions/ConfidentialFungibleTokenERC20Wrapper.sol";
 import { IERC20 } from "@openzeppelin/contracts/interfaces/IERC20.sol";
 
-contract ConfidentialFungibleTokenERC20WrapperMock is
-    SepoliaZamaFHEVMConfig,
-    SepoliaZamaGatewayConfig,
-    ConfidentialFungibleTokenERC20Wrapper
-{
+contract ConfidentialFungibleTokenERC20WrapperMock is SepoliaConfig, ConfidentialFungibleTokenERC20Wrapper {
     constructor(
         IERC20 token,
         string memory name,

contracts/mocks/ConfidentialFungibleTokenMock.sol

@@ -2,12 +2,11 @@
 
 pragma solidity ^0.8.24;
 
-import { TFHE, euint64, einput } from "fhevm/lib/TFHE.sol";
+import { FHE, euint64, externalEuint64 } from "@fhevm/solidity/lib/FHE.sol";
 import { ConfidentialFungibleToken } from "../token/ConfidentialFungibleToken.sol";
-import { SepoliaZamaGatewayConfig } from "fhevm/config/ZamaGatewayConfig.sol";
-import { SepoliaZamaFHEVMConfig } from "fhevm/config/ZamaFHEVMConfig.sol";
+import { SepoliaConfig } from "@fhevm/solidity/config/ZamaConfig.sol";
 
-contract ConfidentialFungibleTokenMock is ConfidentialFungibleToken, SepoliaZamaFHEVMConfig, SepoliaZamaGatewayConfig {
+contract ConfidentialFungibleTokenMock is ConfidentialFungibleToken, SepoliaConfig {
     address private immutable _OWNER;
 
     constructor(
@@ -20,50 +19,50 @@ contract ConfidentialFungibleTokenMock is ConfidentialFungibleToken, SepoliaZama
 
     function _update(address from, address to, euint64 amount) internal virtual override returns (euint64 transferred) {
         transferred = super._update(from, to, amount);
-        TFHE.allow(totalSupply(), _OWNER);
+        FHE.allow(totalSupply(), _OWNER);
     }
 
     function $_mint(
         address to,
-        einput encryptedAmount,
+        externalEuint64 encryptedAmount,
         bytes calldata inputProof
     ) public returns (euint64 transferred) {
-        return _mint(to, TFHE.asEuint64(encryptedAmount, inputProof));
+        return _mint(to, FHE.fromExternal(encryptedAmount, inputProof));
     }
 
     function $_transfer(
         address from,
         address to,
-        einput encryptedAmount,
+        externalEuint64 encryptedAmount,
         bytes calldata inputProof
     ) public returns (euint64 transferred) {
-        return _transfer(from, to, TFHE.asEuint64(encryptedAmount, inputProof));
+        return _transfer(from, to, FHE.fromExternal(encryptedAmount, inputProof));
     }
 
     function $_transferAndCall(
         address from,
         address to,
-        einput encryptedAmount,
+        externalEuint64 encryptedAmount,
         bytes calldata inputProof,
         bytes calldata data
     ) public returns (euint64 transferred) {
-        return _transferAndCall(from, to, TFHE.asEuint64(encryptedAmount, inputProof), data);
+        return _transferAndCall(from, to, FHE.fromExternal(encryptedAmount, inputProof), data);
     }
 
     function $_burn(
         address from,
-        einput encryptedAmount,
+        externalEuint64 encryptedAmount,
         bytes calldata inputProof
     ) public returns (euint64 transferred) {
-        return _burn(from, TFHE.asEuint64(encryptedAmount, inputProof));
+        return _burn(from, FHE.fromExternal(encryptedAmount, inputProof));
     }
 
     function $_update(
         address from,
         address to,
-        einput encryptedAmount,
+        externalEuint64 encryptedAmount,
         bytes calldata inputProof
     ) public virtual returns (euint64 transferred) {
-        return _update(from, to, TFHE.asEuint64(encryptedAmount, inputProof));
+        return _update(from, to, FHE.fromExternal(encryptedAmount, inputProof));
     }
 }

contracts/mocks/ConfidentialFungibleTokenReceiverMock.sol

@@ -1,13 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import { TFHE, ebool, euint64 } from "fhevm/lib/TFHE.sol";
-import { SepoliaZamaFHEVMConfig } from "fhevm/config/ZamaFHEVMConfig.sol";
+import { FHE, ebool, euint64 } from "@fhevm/solidity/lib/FHE.sol";
+import { SepoliaConfig } from "@fhevm/solidity/config/ZamaConfig.sol";
 import { IConfidentialFungibleTokenReceiver } from "../interfaces/IConfidentialFungibleTokenReceiver.sol";
 
-contract ConfidentialFungibleTokenReceiverMock is IConfidentialFungibleTokenReceiver, SepoliaZamaFHEVMConfig {
-    using TFHE for *;
-
+contract ConfidentialFungibleTokenReceiverMock is IConfidentialFungibleTokenReceiver, SepoliaConfig {
     event ConfidentialTransferCallback(bool success);
 
     error InvalidInput(uint8 input);
@@ -21,8 +19,8 @@ contract ConfidentialFungibleTokenReceiverMock is IConfidentialFungibleTokenRece
         bool success = input == 1;
         emit ConfidentialTransferCallback(success);
 
-        ebool returnVal = TFHE.asEbool(success);
-        returnVal.allowTransient(msg.sender);
+        ebool returnVal = FHE.asEbool(success);
+        FHE.allowTransient(returnVal, msg.sender);
 
         return returnVal;
     }

contracts/mocks/docs/ConfidentialFungibleTokenMintableBurnable.sol

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import { TFHE, einput, ebool, euint64 } from "fhevm/lib/TFHE.sol";
+import { FHE, externalEuint64, ebool, euint64 } from "@fhevm/solidity/lib/FHE.sol";
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
 import { ConfidentialFungibleToken } from "../../token/ConfidentialFungibleToken.sol";
 
 contract ConfidentialFungibleTokenMintableBurnable is ConfidentialFungibleToken, Ownable {
-    using TFHE for *;
+    using FHE for *;
 
     constructor(
         address owner,
@@ -15,11 +15,11 @@ contract ConfidentialFungibleTokenMintableBurnable is ConfidentialFungibleToken,
         string memory uri
     ) ConfidentialFungibleToken(name, symbol, uri) Ownable(owner) {}
 
-    function mint(address to, einput amount, bytes memory inputProof) public onlyOwner {
-        _mint(to, amount.asEuint64(inputProof));
+    function mint(address to, externalEuint64 amount, bytes memory inputProof) public onlyOwner {
+        _mint(to, amount.fromExternal(inputProof));
     }
 
-    function burn(address from, einput amount, bytes memory inputProof) public onlyOwner {
-        _burn(from, amount.asEuint64(inputProof));
+    function burn(address from, externalEuint64 amount, bytes memory inputProof) public onlyOwner {
+        _burn(from, amount.fromExternal(inputProof));
     }
 }

contracts/mocks/docs/SwapConfidentialFungibleTokenToConfidentialFungibleToken.sol

@@ -1,25 +1,25 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import { einput, euint64, TFHE } from "fhevm/lib/TFHE.sol";
+import { FHE, externalEuint64, euint64 } from "@fhevm/solidity/lib/FHE.sol";
 import { IConfidentialFungibleToken } from "../../interfaces/IConfidentialFungibleToken.sol";
 
 contract SwapConfidentialFungibleTokenToConfidentialFungibleToken {
     function swapConfidentialForConfidential(
         IConfidentialFungibleToken fromToken,
         IConfidentialFungibleToken toToken,
         address from,
-        einput amountInput,
+        externalEuint64 amountInput,
         bytes calldata inputProof
     ) public virtual {
         require(fromToken.isOperator(address(this), msg.sender));
 
-        euint64 amount = TFHE.asEuint64(amountInput, inputProof);
+        euint64 amount = FHE.fromExternal(amountInput, inputProof);
 
-        TFHE.allowTransient(amount, address(fromToken));
+        FHE.allowTransient(amount, address(fromToken));
         euint64 amountTransferred = fromToken.confidentialTransferFrom(msg.sender, address(this), amount);
 
-        TFHE.allowTransient(amountTransferred, address(toToken));
+        FHE.allowTransient(amountTransferred, address(toToken));
         toToken.confidentialTransfer(msg.sender, amountTransferred);
     }
 }

contracts/mocks/docs/SwapConfidentialToERC20.sol

@@ -1,16 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import { TFHE, einput, euint64 } from "fhevm/lib/TFHE.sol";
-import { Gateway } from "fhevm/gateway/lib/Gateway.sol";
-import { GatewayCaller } from "fhevm/gateway/GatewayCaller.sol";
+import { FHE, externalEuint64, euint64 } from "@fhevm/solidity/lib/FHE.sol";
 import { IERC20 } from "@openzeppelin/contracts/interfaces/IERC20.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import { IConfidentialFungibleToken } from "../../interfaces/IConfidentialFungibleToken.sol";
 
-contract SwapConfidentialToERC20 is GatewayCaller {
-    using TFHE for *;
+contract SwapConfidentialToERC20 {
+    using FHE for *;
 
     error SwapConfidentialToERC20InvalidGatewayRequest(uint256 requestId);
 
@@ -23,26 +21,21 @@ contract SwapConfidentialToERC20 is GatewayCaller {
         _toToken = toToken;
     }
 
-    function swapConfidentialToERC20(einput encryptedInput, bytes memory inputProof) public {
-        euint64 amount = encryptedInput.asEuint64(inputProof);
+    function swapConfidentialToERC20(externalEuint64 encryptedInput, bytes memory inputProof) public {
+        euint64 amount = encryptedInput.fromExternal(inputProof);
         amount.allowTransient(address(_fromToken));
         euint64 amountTransferred = _fromToken.confidentialTransferFrom(msg.sender, address(this), amount);
 
-        uint256[] memory cts = new uint256[](1);
+        bytes32[] memory cts = new bytes32[](1);
         cts[0] = euint64.unwrap(amountTransferred);
-        uint256 requestID = Gateway.requestDecryption(
-            cts,
-            this.finalizeSwap.selector,
-            0,
-            block.timestamp + 1 days, // Max delay is 1 day
-            false
-        );
+        uint256 requestID = FHE.requestDecryption(cts, this.finalizeSwap.selector);
 
         // register who is getting the tokens
         _receivers[requestID] = msg.sender;
     }
 
-    function finalizeSwap(uint256 requestID, uint64 amount) public virtual onlyGateway {
+    function finalizeSwap(uint256 requestID, uint64 amount, bytes[] memory signatures) public virtual {
+        FHE.checkSignatures(requestID, signatures);
         address to = _receivers[requestID];
         require(to != address(0), SwapConfidentialToERC20InvalidGatewayRequest(requestID));
         delete _receivers[requestID];