@openzeppelin/confidential-contracts 0.2.0-rc.1 → 0.2.0

package/build/contracts/Checkpoints.json

@@ -9,8 +9,8 @@
       "type": "error"
     }
   ],
-  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea26469706673582212202badf2b27d3126f95b223aabf2129c5cd7d4ec2067b5ad4b9865cdad9fad273b64736f6c634300081d0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea26469706673582212202badf2b27d3126f95b223aabf2129c5cd7d4ec2067b5ad4b9865cdad9fad273b64736f6c634300081d0033",
+  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220a82f4123dc620a523cf32b417d00b9472eafbc138490892aba0950faef876e5f64736f6c634300081d0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220a82f4123dc620a523cf32b417d00b9472eafbc138490892aba0950faef876e5f64736f6c634300081d0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/contracts/CheckpointsConfidential.json

@@ -2,15 +2,9 @@
   "_format": "hh-sol-artifact-1",
   "contractName": "CheckpointsConfidential",
   "sourceName": "contracts/utils/structs/CheckpointsConfidential.sol",
-  "abi": [
-    {
-      "inputs": [],
-      "name": "CheckpointUnorderedInsertion",
-      "type": "error"
-    }
-  ],
-  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220364ffbf1ba7183f1c16596a69be847e39b8e467761b3ce24b8ce5f16c879b66764736f6c634300081d0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220364ffbf1ba7183f1c16596a69be847e39b8e467761b3ce24b8ce5f16c879b66764736f6c634300081d0033",
+  "abi": [],
+  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea264697066735822122057a94665aa47e1eee66c46039103adce039864c0979c586fd3fca3eb7ee1340764736f6c634300081d0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea264697066735822122057a94665aa47e1eee66c46039103adce039864c0979c586fd3fca3eb7ee1340764736f6c634300081d0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/contracts/ConfidentialFungibleTokenUtils.json

@@ -3,8 +3,8 @@
   "contractName": "ConfidentialFungibleTokenUtils",
   "sourceName": "contracts/token/utils/ConfidentialFungibleTokenUtils.sol",
   "abi": [],
-  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea26469706673582212207957906c4b97065019cfc26811aadbd7c68fb750b8aaa6a2dcaaedd1c6fd049d64736f6c634300081d0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea26469706673582212207957906c4b97065019cfc26811aadbd7c68fb750b8aaa6a2dcaaedd1c6fd049d64736f6c634300081d0033",
+  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220b16578e84785381452ea9c7ec4dfc058f69cc926edb04fddadfe0ed26ee6f7d264736f6c634300081d0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220b16578e84785381452ea9c7ec4dfc058f69cc926edb04fddadfe0ed26ee6f7d264736f6c634300081d0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/contracts/ConfidentialFungibleTokenVotes.json

@@ -832,6 +832,29 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes32",
+          "name": "handle",
+          "type": "bytes32"
+        },
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        },
+        {
+          "internalType": "bool",
+          "name": "persistent",
+          "type": "bool"
+        }
+      ],
+      "name": "getHandleAllowance",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {

package/build/contracts/{TFHESafeMath.json → FHESafeMath.json}

@@ -1,10 +1,10 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "TFHESafeMath",
-  "sourceName": "contracts/utils/TFHESafeMath.sol",
+  "contractName": "FHESafeMath",
+  "sourceName": "contracts/utils/FHESafeMath.sol",
   "abi": [],
-  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220a360bdfb9ce166b60c4797a3050030012f08a59e6faec120f3896650e4d97ecc64736f6c634300081d0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220a360bdfb9ce166b60c4797a3050030012f08a59e6faec120f3896650e4d97ecc64736f6c634300081d0033",
+  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220169c9cbdfb2791e1d96b54361ac4446969846b7a58a8da1f7dba5af4fa757c7564736f6c634300081d0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220169c9cbdfb2791e1d96b54361ac4446969846b7a58a8da1f7dba5af4fa757c7564736f6c634300081d0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/contracts/HandleAccessManager.json

@@ -0,0 +1,34 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "HandleAccessManager",
+  "sourceName": "contracts/utils/HandleAccessManager.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "bytes32",
+          "name": "handle",
+          "type": "bytes32"
+        },
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        },
+        {
+          "internalType": "bool",
+          "name": "persistent",
+          "type": "bool"
+        }
+      ],
+      "name": "getHandleAllowance",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x",
+  "deployedBytecode": "0x",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/build/contracts/VestingWalletCliffConfidential.json

@@ -202,7 +202,7 @@
       "name": "released",
       "outputs": [
         {
-          "internalType": "euint64",
+          "internalType": "euint128",
           "name": "",
           "type": "bytes32"
         }
@@ -251,9 +251,9 @@
           "type": "address"
         },
         {
-          "internalType": "uint64",
+          "internalType": "uint48",
           "name": "timestamp",
-          "type": "uint64"
+          "type": "uint48"
         }
       ],
       "name": "vestedAmount",

package/build/contracts/VestingWalletConfidential.json

@@ -173,7 +173,7 @@
       "name": "released",
       "outputs": [
         {
-          "internalType": "euint64",
+          "internalType": "euint128",
           "name": "",
           "type": "bytes32"
         }
@@ -222,9 +222,9 @@
           "type": "address"
         },
         {
-          "internalType": "uint64",
+          "internalType": "uint48",
           "name": "timestamp",
-          "type": "uint64"
+          "type": "uint48"
         }
       ],
       "name": "vestedAmount",

package/build/contracts/VestingWalletConfidentialFactory.json

@@ -0,0 +1,155 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "VestingWalletConfidentialFactory",
+  "sourceName": "contracts/finance/VestingWalletConfidentialFactory.sol",
+  "abi": [
+    {
+      "inputs": [],
+      "name": "FailedDeployment",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "balance",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "needed",
+          "type": "uint256"
+        }
+      ],
+      "name": "InsufficientBalance",
+      "type": "error"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "vestingWalletConfidential",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "bytes",
+          "name": "initArgs",
+          "type": "bytes"
+        }
+      ],
+      "name": "VestingWalletConfidentialCreated",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "vestingWalletConfidential",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "confidentialFungibleToken",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "euint64",
+          "name": "transferredAmount",
+          "type": "bytes32"
+        },
+        {
+          "indexed": false,
+          "internalType": "bytes",
+          "name": "initArgs",
+          "type": "bytes"
+        }
+      ],
+      "name": "VestingWalletConfidentialFunded",
+      "type": "event"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "confidentialFungibleToken",
+          "type": "address"
+        },
+        {
+          "components": [
+            {
+              "internalType": "externalEuint64",
+              "name": "encryptedAmount",
+              "type": "bytes32"
+            },
+            {
+              "internalType": "bytes",
+              "name": "initArgs",
+              "type": "bytes"
+            }
+          ],
+          "internalType": "struct VestingWalletConfidentialFactory.VestingPlan[]",
+          "name": "vestingPlans",
+          "type": "tuple[]"
+        },
+        {
+          "internalType": "bytes",
+          "name": "inputProof",
+          "type": "bytes"
+        }
+      ],
+      "name": "batchFundVestingWalletConfidential",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes",
+          "name": "initArgs",
+          "type": "bytes"
+        }
+      ],
+      "name": "createVestingWalletConfidential",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes",
+          "name": "initArgs",
+          "type": "bytes"
+        }
+      ],
+      "name": "predictVestingWalletConfidential",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x",
+  "deployedBytecode": "0x",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/build/contracts/VotesConfidential.json

@@ -323,6 +323,29 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes32",
+          "name": "handle",
+          "type": "bytes32"
+        },
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        },
+        {
+          "internalType": "bool",
+          "name": "persistent",
+          "type": "bool"
+        }
+      ],
+      "name": "getHandleAllowance",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {

package/finance/ERC7821WithExecutor.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Confidential Contracts (last updated v0.2.0-rc.1) (finance/ERC7821WithExecutor.sol)
+// OpenZeppelin Confidential Contracts (last updated v0.2.0) (finance/ERC7821WithExecutor.sol)
 pragma solidity ^0.8.20;
 
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
@@ -39,7 +39,7 @@ abstract contract ERC7821WithExecutor is Initializable, ERC7821 {
     }
 
     function _getERC7821WithExecutorStorage() private pure returns (ERC7821WithExecutorStorage storage $) {
-        assembly {
+        assembly ("memory-safe") {
             $.slot := ERC7821WithExecutorStorageLocation
         }
     }

package/finance/VestingWalletCliffConfidential.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Confidential Contracts (last updated v0.2.0-rc.1) (finance/VestingWalletCliffConfidential.sol)
+// OpenZeppelin Confidential Contracts (last updated v0.2.0) (finance/VestingWalletCliffConfidential.sol)
 pragma solidity ^0.8.27;
 
 import {euint128} from "@fhevm/solidity/lib/FHE.sol";
@@ -33,7 +33,18 @@ abstract contract VestingWalletCliffConfidential is VestingWalletConfidential {
      * start timestamp (see {VestingWalletConfidential-start}) and ends `cliffSeconds` later.
      */
     // solhint-disable-next-line func-name-mixedcase
-    function __VestingWalletCliffConfidential_init(uint48 cliffSeconds) internal onlyInitializing {
+    function __VestingWalletCliffConfidential_init(
+        address beneficiary,
+        uint48 startTimestamp,
+        uint48 durationSeconds,
+        uint48 cliffSeconds
+    ) internal onlyInitializing {
+        __VestingWalletConfidential_init(beneficiary, startTimestamp, durationSeconds);
+        __VestingWalletCliffConfidential_init_unchained(cliffSeconds);
+    }
+
+    // solhint-disable-next-line func-name-mixedcase
+    function __VestingWalletCliffConfidential_init_unchained(uint48 cliffSeconds) internal onlyInitializing {
         require(
             cliffSeconds <= duration(),
             VestingWalletCliffConfidentialInvalidCliffDuration(cliffSeconds, duration())
@@ -50,12 +61,12 @@ abstract contract VestingWalletCliffConfidential is VestingWalletConfidential {
      * effect from calling the inherited implementation (i.e. `super._vestingSchedule`). Carefully consider
      * this caveat if the overridden implementation of this function has any (e.g. writing to memory or reverting).
      */
-    function _vestingSchedule(euint128 totalAllocation, uint64 timestamp) internal virtual override returns (euint128) {
+    function _vestingSchedule(euint128 totalAllocation, uint48 timestamp) internal virtual override returns (euint128) {
         return timestamp < cliff() ? euint128.wrap(0) : super._vestingSchedule(totalAllocation, timestamp);
     }
 
     function _getVestingWalletCliffStorage() private pure returns (VestingWalletCliffStorage storage $) {
-        assembly {
+        assembly ("memory-safe") {
             $.slot := VestingWalletCliffStorageLocation
         }
     }

package/finance/VestingWalletConfidential.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Confidential Contracts (last updated v0.2.0-rc.1) (finance/VestingWalletConfidential.sol)
+// OpenZeppelin Confidential Contracts (last updated v0.2.0) (finance/VestingWalletConfidential.sol)
 pragma solidity ^0.8.24;
 
 import {FHE, ebool, euint64, euint128} from "@fhevm/solidity/lib/FHE.sol";
@@ -22,11 +22,13 @@ import {IConfidentialFungibleToken} from "./../interfaces/IConfidentialFungibleT
  *
  * NOTE: When using this contract with any token whose balance is adjusted automatically (i.e. a rebase token), make
  * sure to account the supply/balance adjustment in the vesting schedule to ensure the vested amount is as intended.
+ *
+ * Confidential vesting wallet contracts can be deployed (as clones) using the {VestingWalletConfidentialFactory}.
  */
 abstract contract VestingWalletConfidential is OwnableUpgradeable, ReentrancyGuardTransient {
     /// @custom:storage-location erc7201:openzeppelin.storage.VestingWalletConfidential
     struct VestingWalletStorage {
-        mapping(address token => euint64) _tokenReleased;
+        mapping(address token => euint128) _tokenReleased;
         uint64 _start;
         uint64 _duration;
     }
@@ -36,6 +38,7 @@ abstract contract VestingWalletConfidential is OwnableUpgradeable, ReentrancyGua
     bytes32 private constant VestingWalletStorageLocation =
         0x78ce9ee9eb65fa0cf5bf10e861c3a95cb7c3c713c96ab1e5323a21e846796800;
 
+    /// @dev Emitted when releasable vested tokens are released.
     event VestingWalletConfidentialTokenReleased(address indexed token, euint64 amount);
 
     /// @dev Timestamp at which the vesting starts.
@@ -54,7 +57,7 @@ abstract contract VestingWalletConfidential is OwnableUpgradeable, ReentrancyGua
     }
 
     /// @dev Amount of token already released
-    function released(address token) public view virtual returns (euint64) {
+    function released(address token) public view virtual returns (euint128) {
         return _getVestingWalletStorage()._tokenReleased[token];
     }
 
@@ -63,7 +66,10 @@ abstract contract VestingWalletConfidential is OwnableUpgradeable, ReentrancyGua
      * {IConfidentialFungibleToken} contract.
      */
     function releasable(address token) public virtual returns (euint64) {
-        return FHE.asEuint64(FHE.sub(vestedAmount(token, uint64(block.timestamp)), released(token)));
+        euint128 vestedAmount_ = vestedAmount(token, uint48(block.timestamp));
+        euint128 releasedAmount = released(token);
+        ebool success = FHE.ge(vestedAmount_, releasedAmount);
+        return FHE.select(success, FHE.asEuint64(FHE.sub(vestedAmount_, releasedAmount)), FHE.asEuint64(0));
     }
 
     /**
@@ -76,21 +82,22 @@ abstract contract VestingWalletConfidential is OwnableUpgradeable, ReentrancyGua
         FHE.allowTransient(amount, token);
         euint64 amountSent = IConfidentialFungibleToken(token).confidentialTransfer(owner(), amount);
 
-        euint64 newReleasedAmount = FHE.add(released(token), amountSent);
+        // This could overflow if the total supply is resent `type(uint128).max/type(uint64).max` times. This is an accepted risk.
+        euint128 newReleasedAmount = FHE.add(released(token), amountSent);
         FHE.allow(newReleasedAmount, owner());
         FHE.allowThis(newReleasedAmount);
         _getVestingWalletStorage()._tokenReleased[token] = newReleasedAmount;
         emit VestingWalletConfidentialTokenReleased(token, amountSent);
     }
 
-    /// @dev Calculates the amount of tokens that has already vested. Default implementation is a linear vesting curve.
-    function vestedAmount(address token, uint64 timestamp) public virtual returns (euint128) {
+    /**
+     * @dev Calculates the amount of tokens that have been vested at the given timestamp.
+     * Default implementation is a linear vesting curve.
+     */
+    function vestedAmount(address token, uint48 timestamp) public virtual returns (euint128) {
         return
             _vestingSchedule(
-                FHE.add(
-                    FHE.asEuint128(IConfidentialFungibleToken(token).confidentialBalanceOf(address(this))),
-                    released(token)
-                ),
+                FHE.add(released(token), IConfidentialFungibleToken(token).confidentialBalanceOf(address(this))),
                 timestamp
             );
     }
@@ -106,13 +113,21 @@ abstract contract VestingWalletConfidential is OwnableUpgradeable, ReentrancyGua
         uint48 durationSeconds
     ) internal onlyInitializing {
         __Ownable_init(beneficiary);
+        __VestingWalletConfidential_init_unchained(startTimestamp, durationSeconds);
+    }
+
+    // solhint-disable-next-line func-name-mixedcase
+    function __VestingWalletConfidential_init_unchained(
+        uint48 startTimestamp,
+        uint48 durationSeconds
+    ) internal onlyInitializing {
         VestingWalletStorage storage $ = _getVestingWalletStorage();
         $._start = startTimestamp;
         $._duration = durationSeconds;
     }
 
     /// @dev This returns the amount vested, as a function of time, for an asset given its total historical allocation.
-    function _vestingSchedule(euint128 totalAllocation, uint64 timestamp) internal virtual returns (euint128) {
+    function _vestingSchedule(euint128 totalAllocation, uint48 timestamp) internal virtual returns (euint128) {
         if (timestamp < start()) {
             return euint128.wrap(0);
         } else if (timestamp >= end()) {
@@ -123,7 +138,7 @@ abstract contract VestingWalletConfidential is OwnableUpgradeable, ReentrancyGua
     }
 
     function _getVestingWalletStorage() private pure returns (VestingWalletStorage storage $) {
-        assembly {
+        assembly ("memory-safe") {
             $.slot := VestingWalletStorageLocation
         }
     }

package/finance/VestingWalletConfidentialFactory.sol

@@ -0,0 +1,120 @@
+// SPDX-License-Identifier: MIT
+// OpenZeppelin Confidential Contracts (last updated v0.2.0) (finance/VestingWalletConfidentialFactory.sol)
+pragma solidity ^0.8.27;
+
+import {FHE, euint64, externalEuint64} from "@fhevm/solidity/lib/FHE.sol";
+import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
+import {IConfidentialFungibleToken} from "./../interfaces/IConfidentialFungibleToken.sol";
+
+/**
+ * @dev A factory which enables batch funding of vesting wallets.
+ *
+ * The {_deployVestingWalletImplementation}, {_initializeVestingWallet}, and {_validateVestingWalletInitArgs}
+ * functions remain unimplemented to allow for custom implementations of the vesting wallet to be used.
+ */
+abstract contract VestingWalletConfidentialFactory {
+    struct VestingPlan {
+        externalEuint64 encryptedAmount;
+        bytes initArgs;
+    }
+
+    address private immutable _vestingImplementation;
+
+    /// @dev Emitted for each vesting wallet funded within a batch.
+    event VestingWalletConfidentialFunded(
+        address indexed vestingWalletConfidential,
+        address indexed confidentialFungibleToken,
+        euint64 transferredAmount,
+        bytes initArgs
+    );
+    /// @dev Emitted when a vesting wallet is deployed.
+    event VestingWalletConfidentialCreated(address indexed vestingWalletConfidential, bytes initArgs);
+
+    constructor() {
+        _vestingImplementation = _deployVestingWalletImplementation();
+    }
+
+    /**
+     * @dev Batches the funding of multiple confidential vesting wallets.
+     *
+     * Funds are sent to deterministic wallet addresses. Wallets can be created either
+     * before or after this operation.
+     *
+     * Emits a {VestingWalletConfidentialFunded} event for each funded vesting plan.
+     */
+    function batchFundVestingWalletConfidential(
+        address confidentialFungibleToken,
+        VestingPlan[] calldata vestingPlans,
+        bytes calldata inputProof
+    ) public virtual {
+        uint256 vestingPlansLength = vestingPlans.length;
+        for (uint256 i = 0; i < vestingPlansLength; i++) {
+            VestingPlan memory vestingPlan = vestingPlans[i];
+            _validateVestingWalletInitArgs(vestingPlan.initArgs);
+
+            address vestingWalletAddress = predictVestingWalletConfidential(vestingPlan.initArgs);
+
+            euint64 encryptedAmount = FHE.fromExternal(vestingPlan.encryptedAmount, inputProof);
+            FHE.allowTransient(encryptedAmount, confidentialFungibleToken);
+            euint64 transferredAmount = IConfidentialFungibleToken(confidentialFungibleToken).confidentialTransferFrom(
+                msg.sender,
+                vestingWalletAddress,
+                encryptedAmount
+            );
+
+            emit VestingWalletConfidentialFunded(
+                vestingWalletAddress,
+                confidentialFungibleToken,
+                transferredAmount,
+                vestingPlan.initArgs
+            );
+        }
+    }
+
+    /**
+     * @dev Creates a confidential vesting wallet.
+     *
+     * Emits a {VestingWalletConfidentialCreated}.
+     */
+    function createVestingWalletConfidential(bytes calldata initArgs) public virtual returns (address) {
+        // Will revert if clone already created
+        address vestingWalletConfidentialAddress = Clones.cloneDeterministic(
+            _vestingImplementation,
+            _getCreate2VestingWalletConfidentialSalt(initArgs)
+        );
+        _initializeVestingWallet(vestingWalletConfidentialAddress, initArgs);
+        emit VestingWalletConfidentialCreated(vestingWalletConfidentialAddress, initArgs);
+        return vestingWalletConfidentialAddress;
+    }
+
+    /**
+     * @dev Predicts the deterministic address for a confidential vesting wallet.
+     */
+    function predictVestingWalletConfidential(bytes memory initArgs) public view virtual returns (address) {
+        return
+            Clones.predictDeterministicAddress(
+                _vestingImplementation,
+                _getCreate2VestingWalletConfidentialSalt(initArgs)
+            );
+    }
+
+    /// @dev Virtual function that must be implemented to validate the initArgs bytes.
+    function _validateVestingWalletInitArgs(bytes memory initArgs) internal virtual;
+
+    /// @dev Virtual function that must be implemented to initialize the vesting wallet at `vestingWalletAddress`.
+    function _initializeVestingWallet(address vestingWalletAddress, bytes calldata initArgs) internal virtual;
+
+    /**
+     * @dev Internal function that is called once to deploy the vesting wallet implementation.
+     *
+     * Vesting wallet clones will be initialized by calls to the {_initializeVestingWallet} function.
+     */
+    function _deployVestingWalletImplementation() internal virtual returns (address);
+
+    /**
+     * @dev Gets create2 salt for a confidential vesting wallet.
+     */
+    function _getCreate2VestingWalletConfidentialSalt(bytes memory initArgs) internal pure virtual returns (bytes32) {
+        return keccak256(initArgs);
+    }
+}