Merge pull request #590 from zama-ai/fhevm-core-contracts

feat: refactor importing fhevm-core-contracts
zama-ai · Oct 25, 2024 · b9a0860 · b9a0860
2 parents 662abe1 + 552fa63
commit b9a0860
Show file tree

Hide file tree

Showing 44 changed files with 156 additions and 3,581 deletions.
diff --git a/.gitignore b/.gitignore
@@ -137,3 +137,4 @@ typechain
 typechain-types
 .openzeppelin/unknown*
 .openzeppelin/sepolia.json
+fhevmTemp/
diff --git a/CustomProvider.ts b/CustomProvider.ts
@@ -26,7 +26,9 @@ class CustomProvider extends ProviderWrapper {
       const blockNumberHex = await this._wrappedProvider.request({ method: 'eth_blockNumber' });
       this.lastBlockSnapshot = parseInt(blockNumberHex);
       this.lastBlockSnapshotForDecrypt = parseInt(blockNumberHex);
-      const parsedEnvCoprocessor = dotenv.parse(fs.readFileSync('lib/.env.exec'));
+      const parsedEnvCoprocessor = dotenv.parse(
+        fs.readFileSync('node_modules/fhevm-core-contracts/addresses/.env.exec'),
+      );
       const coprocAdd = parsedEnvCoprocessor.TFHE_EXECUTOR_CONTRACT_ADDRESS;
       this.lastCounterRand = await this._wrappedProvider.request({
         method: 'eth_getStorageAt',

diff --git a/examples/ACLUpgradedExample.sol b/examples/ACLUpgradedExample.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.24;
 
-import "../lib/ACL.sol";
+import "fhevm-core-contracts/contracts/ACL.sol";
 
 contract ACLUpgradedExample is ACL {
     /// @notice Name of the contract

diff --git a/examples/ACLUpgradedExample2.sol b/examples/ACLUpgradedExample2.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.24;
 
-import "../lib/ACL.sol";
+import "fhevm-core-contracts/contracts/ACL.sol";
 
 contract ACLUpgradedExample2 is ACL {
     /// @notice Name of the contract

diff --git a/examples/FHEPaymentUpgradedExample.sol b/examples/FHEPaymentUpgradedExample.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.24;
 
-import "../lib/FHEPayment.sol";
+import "fhevm-core-contracts/contracts/FHEPayment.sol";
 
 contract FHEPaymentUpgradedExample is FHEPayment {
     /// @notice Name of the contract

diff --git a/examples/KMSUpgradedExample.sol b/examples/KMSUpgradedExample.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.24;
 
-import "../lib/KMSVerifier.sol";
+import "fhevm-core-contracts/contracts/KMSVerifier.sol";
 
 contract KMSVerifierUpgradedExample is KMSVerifier {
     /// @notice Name of the contract

diff --git a/examples/TFHEExecutorUpgradedExample.sol b/examples/TFHEExecutorUpgradedExample.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.24;
 
-import "../lib/TFHEExecutor.sol";
+import "fhevm-core-contracts/contracts/TFHEExecutor.sol";
 
 /// @title TFHEExecutorUpgradedExample
 /// @dev Contract that extends TFHEExecutor with version information

diff --git a/gateway/GatewayContract.sol b/gateway/GatewayContract.sol
@@ -6,8 +6,8 @@ import "../lib/TFHE.sol";
 import "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import "@openzeppelin/contracts/utils/Strings.sol";
-import "../lib/KMSVerifierAddress.sol";
-import "../lib/ACLAddress.sol";
+import "fhevm-core-contracts/addresses/KMSVerifierAddress.sol";
+import "fhevm-core-contracts/addresses/ACLAddress.sol";
 import "./IKMSVerifier.sol";
 
 contract GatewayContract is UUPSUpgradeable, Ownable2StepUpgradeable {

diff --git a/gateway/lib/Gateway.sol b/gateway/lib/Gateway.sol
@@ -5,7 +5,7 @@ pragma solidity ^0.8.24;
 import "./GatewayContractAddress.sol";
 import "../IKMSVerifier.sol";
 import "../../lib/Impl.sol";
-import "../../lib/ACLAddress.sol";
+import "fhevm-core-contracts/addresses/ACLAddress.sol";
 
 interface IGatewayContract {
     function requestDecryption(

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -1,12 +1,14 @@
 import '@nomicfoundation/hardhat-toolbox';
 import '@openzeppelin/hardhat-upgrades';
 import dotenv from 'dotenv';
+import * as fs from 'fs-extra';
 import 'hardhat-deploy';
 import 'hardhat-ignore-warnings';
 import type { HardhatUserConfig, extendProvider } from 'hardhat/config';
 import { task } from 'hardhat/config';
 import type { NetworkUserConfig } from 'hardhat/types';
 import { resolve } from 'path';
+import * as path from 'path';
 
 import CustomProvider from './CustomProvider';
 // Adjust the import path as needed
@@ -102,6 +104,10 @@ task('test', async (taskArgs, hre, runSuper) => {
     await hre.run('task:computeKMSVerifierAddress', { privateKey: privKeyFhevmDeployer });
     await hre.run('task:computeInputVerifierAddress', { privateKey: privKeyFhevmDeployer, useAddress: false });
     await hre.run('task:computeFHEPaymentAddress', { privateKey: privKeyFhevmDeployer });
+    const sourceDir = path.resolve(__dirname, 'node_modules/fhevm-core-contracts/');
+    const destinationDir = path.resolve(__dirname, 'fhevmTemp/');
+    fs.copySync(sourceDir, destinationDir, { dereference: true });
+    await hre.run('compile:specific', { contract: 'fhevmTemp' });
     await hre.run('compile:specific', { contract: 'lib' });
     await hre.run('compile:specific', { contract: 'gateway' });
     await hre.run('compile:specific', { contract: 'payment' });

diff --git a/launch-fhevm-sepolia.sh b/launch-fhevm-sepolia.sh
@@ -5,6 +5,9 @@ npx hardhat clean
 PRIVATE_KEY_FHEVM_DEPLOYER=$(grep PRIVATE_KEY_FHEVM_DEPLOYER .env | cut -d '"' -f 2)
 NUM_KMS_SIGNERS=$(grep NUM_KMS_SIGNERS .env | cut -d '"' -f 2)
 
+mkdir -p fhevmTemp
+cp -L -r node_modules/fhevm-core-contracts fhevmTemp/
+npx hardhat compile:specific --contract fhevmTemp
 npx hardhat compile:specific --contract lib
 npx hardhat compile:specific --contract gateway
 

diff --git a/lib/.env.acl b/lib/.env.acl
diff --git a/lib/.env.coprocessor b/lib/.env.coprocessor
diff --git a/lib/.env.exec b/lib/.env.exec
diff --git a/lib/.env.fhepayment b/lib/.env.fhepayment
diff --git a/lib/.env.inputverifier b/lib/.env.inputverifier
diff --git a/lib/.env.kmsverifier b/lib/.env.kmsverifier
diff --git a/lib/ACL.sol b/lib/ACL.sol
diff --git a/lib/ACLAddress.sol b/lib/ACLAddress.sol
diff --git a/lib/CoprocessorAddress.sol b/lib/CoprocessorAddress.sol