docs(common): updates Gateway to Relayer

Author: PacificYield

docs/introductions/README.md

@@ -50,7 +50,7 @@ like this:
 pragma solidity ^0.8.24;
 
 import { FHE } from "@fhevm/solidity/lib/FHE.sol";
-import { SepoliaZamaFHEVMConfig } from "@fhevm/solidity/config/ZamaFHEVMConfig.sol";
+import { SepoliaConfig } from "@fhevm/solidity/config/ZamaConfig.sol";
 
 contract MyCounter is SepoliaZamaFHEVMConfig {
   euint64 counter;

docs/introductions/architecture_overview.md

@@ -17,7 +17,7 @@ compatibility:
 - **On-chain smart contracts** describe encrypted logic symbolically, managing access control and state via FHE handles.
 - **Off-chain coprocessors** listen to emitted events, reconstruct the compute graph, and perform the actual encrypted
   computation.
-- **The Gateway** acts as the protocol coordinator — verifying proofs, relaying requests, and managing data flow between
+- **The Relayer** acts as the protocol coordinator — verifying proofs, relaying requests, and managing data flow between
   the blockchain, the coprocessors, and the KMS.
 - **The KMS** is a decentralized, threshold-secure network that handles private key operations like decryption and
   signing, without ever reconstructing the full key.

docs/introductions/fhe-on-blockchain.md

@@ -74,9 +74,9 @@ To overcome these challenges, Zama introduced a hybrid architecture for FHEVM th
 - **Off-chain**
   - Coprocessors execute FHE operations using the evaluation key.
   - Results are stored off-chain, and only references (handles) are returned on-chain.
-- **Gateway & KMS**
+- **Relayer & KMS**
 
-  - The Gateway coordinates between the blockchain, users, and the KMS.
+  - The relayer coordinates between the blockchain, users, and the KMS.
   - The Key Management System securely handles decryption via threshold MPC, supporting both smart contract and user
     decryption.
 

docs/introductions/introduction-overview.md

@@ -15,7 +15,7 @@ Otherwise, pick your path:
 integrate the SDK, and run your first confidential app.
 
 ⚙️ Go to [Architecture](./architecture_overview.md) – Explore how the protocol works under the hood: smart contracts,
-coprocessors, the Gateway, and the KMS.
+coprocessors, the relayer, and the KMS.
 
 🧰 Go to [Tooling](../solidity-guides/solidity-overview.md) – Discover how to use the Hardhat plugin and debugging tools
 designed to make FHE development seamless.

docs/solidity-guides/configure.md

@@ -4,12 +4,12 @@ This document explains how to enable encrypted computations in your smart contra
 
 ## Core configuration setup
 
-To utilize encrypted computations in Solidity contracts, you must configure the **FHE library** and **Gateway addresses**. The `fhevm` package simplifies this process with prebuilt configuration contracts, allowing you to focus on developing your contract’s logic without handling the underlying cryptographic setup.
+To utilize encrypted computations in Solidity contracts, you must configure the **FHE library** and **Relayer addresses**. The `fhevm` package simplifies this process with prebuilt configuration contracts, allowing you to focus on developing your contract’s logic without handling the underlying cryptographic setup.
 
 ## Key components configured automatically
 
 1. **FHE library**: Sets up encryption parameters and cryptographic keys.
-2. **Gateway**: Manages secure cryptographic operations, including reencryption and decryption.
+2. **Relayer**: Manages secure cryptographic operations, including reencryption and decryption.
 3. **Network-specific settings**: Adapts to local testing, testnets (Sepolia for example), or mainnet deployment.
 
 By inheriting these configuration contracts, you ensure seamless initialization and functionality across environments.
@@ -22,7 +22,7 @@ This configuration contract initializes the **fhevm environment** with required
 
 ```solidity
 // For Ethereum Sepolia
-import { SepoliaZamaFHEVMConfig } from "fhevm/config/ZamaFHEVMConfig.sol";
+import { SepoliaZamaFHEVMConfig } from "@fhevm/solidity/config/ZamaFHEVMConfig.sol";
 ```
 
 **Purpose:**
@@ -36,7 +36,7 @@ import { SepoliaZamaFHEVMConfig } from "fhevm/config/ZamaFHEVMConfig.sol";
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 pragma solidity ^0.8.24;
 
-import { SepoliaZamaFHEVMConfig } from "fhevm/config/ZamaFHEVMConfig.sol";
+import { SepoliaZamaFHEVMConfig } from "@fhevm/solidity/config/ZamaFHEVMConfig.sol";
 
 contract MyERC20 is SepoliaZamaFHEVMConfig {
   constructor() {
@@ -45,33 +45,31 @@ contract MyERC20 is SepoliaZamaFHEVMConfig {
 }
 ```
 
-## ZamaGatewayConfig.sol
+## ZamaRela.sol
 
-To perform decryption or reencryption, your contract must interact with the **Gateway**, which acts as a secure bridge between the blockchain, coprocessor, and Key Management System (KMS).
+To perform decryption or reencryption, your contract must interact with the **Relayer**, which acts as a secure bridge between the blockchain, coprocessor, and Key Management System (KMS).
 
 **Import based on your environment**
 
 ```solidity
-// For Ethereum Sepolia
-import { SepoliaZamaGatewayConfig } from "fhevm/config/ZamaGatewayConfig.sol";
+// For Sepolia
+import { SepoliaConfig } from "@fhevm/solidity/config/ZamaConfig.sol";
 ```
 
 **Purpose**
 
-- Configures the Gateway for secure cryptographic operations.
+- Configures the relayer for secure cryptographic operations.
 - Facilitates reencryption and decryption requests.
 
-**Example: Configuring the gateway with Sepolia settings**
+**Example: Configuring the relayer with Sepolia settings**
 
 ```solidity
-import "fhevm/lib/FHE.sol";
-import { SepoliaZamaFHEVMConfig } from "fhevm/config/ZamaFHEVMConfig.sol";
-import { SepoliaZamaGatewayConfig } from "fhevm/config/ZamaGatewayConfig.sol";
-import "fhevm/gateway/GatewayCaller.sol";
+import "@fhevm/solidity/lib/FHE.sol";
+import { SepoliaConfig } from "@fhevm/solidity/config/ZamaConfig.sol";
 
-contract Test is SepoliaZamaFHEVMConfig, SepoliaZamaGatewayConfig, GatewayCaller {
+contract Test is SepoliaConfig {
   constructor() {
-    // Gateway and FHEVM environment initialized automatically
+    // Relayer and FHEVM environment initialized automatically
   }
 }
 ```
@@ -99,4 +97,4 @@ require(FHE.isInitialized(counter), "Counter not initialized!");
 
 ## Summary
 
-By leveraging prebuilt configuration contracts like `ZamaFHEVMConfig.sol` and `ZamaGatewayConfig.sol`, you can efficiently set up your smart contract for encrypted computations. These tools abstract the complexity of cryptographic initialization, allowing you to focus on building secure, confidential smart contracts.
+By leveraging prebuilt a configuration contract like `ZamaConfig.sol`, you can efficiently set up your smart contract for encrypted computations. These tools abstract the complexity of cryptographic initialization, allowing you to focus on building secure, confidential smart contracts.

docs/solidity-guides/debug_decrypt.md

@@ -13,7 +13,7 @@ The `debug.decrypt[XX]` functions allow you to decrypt encrypted handles into pl
 ### Key points
 
 - **Environment**: The `debug.decrypt[XX]` functions work **only in mocked environments** (e.g., `hardhat` network).
-- **Production limitation**: In production, decryption is performed asynchronously via the Gateway and requires an authorized onchain request.
+- **Production limitation**: In production, decryption is performed asynchronously via the relayer and requires an authorized onchain request.
 - **Encrypted types**: The `debug.decrypt[XX]` functions supports various encrypted types, including integers, and booleans.
 - **Bypass ACL authorization**: The `debug.decrypt[XX]` functions allow decryption without ACL authorization, useful for verifying encrypted operations during development and testing.
 
@@ -106,4 +106,4 @@ if (network.name !== "hardhat") {
 ## **Best practices**
 
 - **Use only for debugging**: These functions require access to private keys and are meant exclusively for local testing and debugging.
-- **Production decryption**: For production, always use the asynchronous Gateway-based decryption.
+- **Production decryption**: For production, always use the asynchronous relayer-based decryption.

docs/solidity-guides/decryption/decrypt.md

@@ -15,57 +15,49 @@ To learn how decryption works see [Encryption, Decryption, Re-encryption, and Co
 
 ## Overview
 
-Decryption in FHEVM is an asynchronous process that involves the Gateway and Key Management System (KMS). Contracts requiring decryption must extend the GatewayCaller contract, which imports the necessary libraries and provides access to the Gateway.
-
-Here’s an example of how to request decryption in a contract:
+Decryption in FHEVM is an asynchronous process that involves the Relayer and Key Management System (KMS).
+Here’s an example of how to safely request decryption in a contract.
 
 ### Example: asynchronous decryption in a contract
 
 ```solidity
 pragma solidity ^0.8.24;
 
-import "fhevm/lib/FHE.sol";
-import { SepoliaZamaFHEVMConfig } from "fhevm/config/ZamaFHEVMConfig.sol";
-import { SepoliaZamaGatewayConfig } from "fhevm/config/ZamaGatewayConfig.sol";
-import "fhevm/gateway/GatewayCaller.sol";
+import "@fhevm/solidity/lib/FHE.sol";
+import { SepoliaConfig } from "@fhevm/solidity/config/ZamaConfig.sol";
 
-contract TestAsyncDecrypt is SepoliaZamaFHEVMConfig, SepoliaZamaGatewayConfig, GatewayCaller {
+contract TestAsyncDecrypt is SepoliaConfig {
   ebool xBool;
   bool public yBool;
+  bool isDecryptionPending;
+  uint256 latestRequestId;
 
   constructor() {
       xBool = FHE.asEbool(true);
       FHE.allowThis(xBool);
   }
 
   function requestBool() public {
+    require(!isDecryptionPending, "Decryption is in progress");
     uint256[] memory cts = new uint256[](1);
-    cts[0] = Gateway.toUint256(xBool);
-    Gateway.requestDecryption(cts, this.myCustomCallback.selector, 0, block.timestamp + 100, false);
+    cts[0] = FHE.toUint256(xBool);
+    uint256 latestRequestId = FHE.requestDecryption(cts, this.myCustomCallback.selector);
+
+    /// @dev This prevents sending multiple requests before the first callback was sent.
+    isDecryptionPending = true;
   }
 
-  function myCustomCallback(uint256 /*requestID*/, bool decryptedInput) public onlyGateway returns (bool) {
+  function myCustomCallback(uint256 requestId, bool decryptedInput, bytes[] memory signatures) public returns (bool) {
+    /// @dev This check is used to verify that the request id is the expected one.
+    require(requestId == latestRequestId, "Invalid requestId");
+    FHE.checkSignatures(requestId, signatures);
     yBool = decryptedInput;
+    isDecryptionPending = false;
     return yBool;
   }
+}
 ```
 
-#### Key additions to the code
-
-1.  **Configuration imports**: The configuration contracts are imported to set up the FHEVM environment and Gateway.
-
-    ```solidity
-    import { SepoliaZamaFHEVMConfig } from "fhevm/config/ZamaFHEVMConfig.sol";
-    import { SepoliaZamaGatewayConfig } from "fhevm/config/ZamaGatewayConfig.sol";
-    ```
-
-2.  **`GatewayCaller` import**:\
-    The `GatewayCaller` contract is imported to enable decryption requests.
-
-    ```solidity
-    import "fhevm/gateway/GatewayCaller.sol";
-    ```
-
 ### Next steps
 
 Explore advanced decryption techniques and learn more about re-encryption:

docs/solidity-guides/decryption/decrypt_details.md

@@ -4,7 +4,7 @@ This document provides a detailed guide on implementing decryption in your smart
 
 ## `DecryptionOracle` setup
 
-The `DecryptionOracle` is pre-deployed on the FHEVM testnet. It uses a default relayer account specified in the `PRIVATE_KEY_GATEWAY_RELAYER` or `ADDRESS_GATEWAY_RELAYER` environment variable in the `.env` file.
+The `DecryptionOracle` is pre-deployed on the FHEVM testnet. It uses a default relayer account specified in the `.env` file.
 
 Anyone can fulfill decryption requests but it is essential to add signature verification (and to include a logic to invalidate the replay of decryption requests). The role of the `DecryptionOracle` contract is to independently verify the KMS signature during execution. This ensures that the relayers cannot manipulate or send fraudulent decryption results, even if compromised.
 
@@ -15,21 +15,19 @@ There are two functions to consider: `requestDecryption` and `checkSignatures`.
 You can call the function `FHE.requestDecryption` as such:
 
 ```solidity
-    function requestDecryption(uint256 requestID, bytes32[] calldata ctsHandles, bytes4 callbackSelector) external payable;
+    function requestDecryption(bytes32[] calldata ctsHandles, bytes4 callbackSelector) external payable returns (uint256 requestId);
 ```
 
 #### Function arguments
 
-The first argument, `requestID`, is a counter that is incremented at the smart contract level after each decryption request.
-
-The second argument, `ctsHandles`, should be an array of ciphertexts handles which could be of different types, i.e `uint256` values coming from unwrapping handles of type either `ebool`, `euint8`, `euint16`, `euint32`, `euint64` or `eaddress`. 
+The first argument, `ctsHandles`, should be an array of ciphertexts handles which could be of different types, i.e `uint256` values coming from unwrapping handles of type either `ebool`, `euint8`, `euint16`, `euint32`, `euint64` or `eaddress`. 
 
 `ctsHandles` is the array of ciphertexts that are requested to be decrypted. Tthe relayer will send the corresponding ciphertexts to the KMS for decryption before fulfilling the request.
 
 `callbackSelector` is the function selector of the callback function, which will be called once the relayer fulfils the decryption request.
 
 ```solidity
-function [callbackName](uint256 requestID, XXX x_0, XXX x_1, ..., XXX x_N-1) external;
+function [callbackName](uint256 requestID, XXX x_0, XXX x_1, ..., XXX x_N-1, bytes[] memory signatures) external;
 ```
 
 Notice that `XXX` should be the decrypted type, which is a native Solidity type corresponding to the original ciphertext type, following this table of conventions:
@@ -61,8 +59,7 @@ You can call the function `FHE.checkSignatures` as such:
 
 #### Function arguments
 
-The first argument, `requestID`, is the value used as an argument in the `requestDecryption`function.
-
-The second argument, `signatures`, is an array of signatures from the KMS.
+The first argument, `requestID`, is the value that was returned in the `requestDecryption`function.
+The second argument, `signatures`, is an array of signatures from the KMS signers.
 
-If 
+This function reverts if the signatures are invalid.

docs/solidity-guides/decryption/reencryption.md

@@ -18,7 +18,7 @@ The re-encryption process involves retrieving ciphertext from the blockchain and
 
 This ensures that the data remains encrypted under the blockchain’s FHE key but can be securely shared with a user by re-encrypting it under the user’s NaCl public key.
 
-Re-encryption is facilitated by the **Gateway** and the **Key Management System (KMS)**. The workflow consists of the following:
+Re-encryption is facilitated by the **Relayer** and the **Key Management System (KMS)**. The workflow consists of the following:
 
 1. Retrieving the ciphertext from the blockchain using a contract’s view function.
 2. Re-encrypting the ciphertext client-side with the user’s public key, ensuring only the user can decrypt it.
@@ -28,7 +28,7 @@ Re-encryption is facilitated by the **Gateway** and the **Key Management System
 To retrieve the ciphertext that needs to be re-encrypted, you can implement a view function in your smart contract. Below is an example implementation:
 
 ```solidity
-import "fhevm/lib/FHE.sol";
+import "@fhevm/solidity/lib/FHE.sol";
 
 contract ConfidentialERC20 {
   ...
@@ -77,7 +77,7 @@ const signature = await window.ethereum.request({ method: "eth_signTypedData_v4"
 const ConfidentialERC20 = new Contract(CONTRACT_ADDRESS, abi, signer).connect(provider);
 const encryptedBalance = ConfidentialERC20.balanceOf(userAddress);
 
-// This function will call the gateway and decrypt the received value with the provided private key
+// This function will call the relayer and decrypt the received value with the provided private key
 const userBalance = instance.reencrypt(
   encryptedBalance, // the encrypted balance
   privateKey, // the private key generated by the dApp
@@ -96,4 +96,4 @@ This code retrieves the user’s encrypted balance, re-encrypts it with their pu
 
 - **`instance.generateKeypair()`**: Generates a public-private keypair for the user.
 - **`instance.createEIP712(publicKey, CONTRACT_ADDRESS)`**: Creates an EIP712 object for signing the user’s public key.
-- **`instance.reencrypt()`**: Facilitates the re-encryption process by contacting the Gateway and decrypting the data locally with the private key.
+- **`instance.reencrypt()`**: Facilitates the re-encryption process by contacting the relayer and decrypting the data locally with the private key.

docs/solidity-guides/foundry.md

@@ -4,4 +4,4 @@ This guide explains how to use Foundry with FHEVM for developing smart contracts
 
 While a Foundry template is currently in development, we strongly recommend using the [Hardhat template](https://github.com/zama-ai/fhevm-hardhat-template) for now, as it provides a fully tested and supported development environment for FHEVM smart contracts.
 
-However, you could still use Foundry with the mocked version of the fhevm, but please be aware that this approach is **NOT** recommended, since the mocked version is not fully equivalent to the real FHEVM node's implementation (see warning in hardhat). In order to do this, you will need to rename your `FHE.sol` imports from `fhevm/lib/FHE.sol` to `fhevm/mocks/FHE.sol` in your solidity source files.
+However, you could still use Foundry with the mocked version of the fhevm, but please be aware that this approach is **NOT** recommended, since the mocked version is not fully equivalent to the real FHEVM node's implementation (see warning in hardhat). In order to do this, you will need to rename your `FHE.sol` imports from `@fhevm/solidity/lib/FHE.sol` to `fhevm/mocks/FHE.sol` in your solidity source files.