feat: updated tasks and script for staging (#381)

Author: jatZama

contracts/hardhat.config.ts

@@ -1,6 +1,7 @@
 import '@nomicfoundation/hardhat-toolbox';
 import '@openzeppelin/hardhat-upgrades';
 import dotenv from 'dotenv';
+import fs from 'fs';
 import 'hardhat-deploy';
 import 'hardhat-ignore-warnings';
 import type { HardhatUserConfig, extendProvider } from 'hardhat/config';
@@ -50,6 +51,10 @@ task('test', async (taskArgs, hre, runSuper) => {
   if (hre.network.name === 'hardhat') {
     const privKeyFhevmDeployer = process.env.PRIVATE_KEY_FHEVM_DEPLOYER;
     const privKeyFhevmRelayer = process.env.PRIVATE_KEY_DECRYPTION_ORACLE_RELAYER;
+    const parsedEnv2 = dotenv.parse(fs.readFileSync('addressesL2/.env.decryptionmanager'));
+    const decryptionManagerAddress = parsedEnv2.DECRYPTION_MANAGER_ADDRESS;
+    const parsedEnv3 = dotenv.parse(fs.readFileSync('addressesL2/.env.zkpokmanager'));
+    const zkpokManagerAddress = parsedEnv3.ZKPOK_MANAGER_ADDRESS;
     await hre.run('task:faucetToPrivate', { privateKey: privKeyFhevmDeployer });
     await hre.run('task:faucetToPrivate', { privateKey: privKeyFhevmRelayer });
 
@@ -62,8 +67,14 @@ task('test', async (taskArgs, hre, runSuper) => {
 
     await hre.run('task:deployACL', { privateKey: privKeyFhevmDeployer });
     await hre.run('task:deployTFHEExecutor', { privateKey: privKeyFhevmDeployer });
-    await hre.run('task:deployKMSVerifier', { privateKey: privKeyFhevmDeployer });
-    await hre.run('task:deployInputVerifier', { privateKey: privKeyFhevmDeployer });
+    await hre.run('task:deployKMSVerifier', {
+      privateKey: privKeyFhevmDeployer,
+      decryptionManagerAddress: decryptionManagerAddress,
+    });
+    await hre.run('task:deployInputVerifier', {
+      privateKey: privKeyFhevmDeployer,
+      zkpokManagerAddress: zkpokManagerAddress,
+    });
     await hre.run('task:deployFHEGasLimit', { privateKey: privKeyFhevmDeployer });
     await hre.run('task:deployDecryptionOracle', { privateKey: privKeyFhevmDeployer });
 

contracts/launch-fhevm-staging.sh

@@ -6,6 +6,9 @@ mkdir -p addresses
 
 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)
+NUM_COPROCESSOR_SIGNERS=$(grep NUM_COPROCESSOR_SIGNERS .env | cut -d '"' -f 2)
+DECRYPTION_MANAGER_ADDRESS=$(grep DECRYPTION_MANAGER_ADDRESS .env | cut -d '"' -f 2)
+ZKPOK_MANAGER_ADDRESS=$(grep ZKPOK_MANAGER_ADDRESS .env | cut -d '"' -f 2)
 
 npx hardhat task:deployEmptyUUPSProxies --use-coprocessor-address true --private-key "$PRIVATE_KEY_FHEVM_DEPLOYER" --network staging
 
@@ -14,9 +17,10 @@ npx hardhat compile:specific --contract decryptionOracle
 
 npx hardhat task:deployACL --private-key "$PRIVATE_KEY_FHEVM_DEPLOYER" --network staging
 npx hardhat task:deployTFHEExecutor --private-key "$PRIVATE_KEY_FHEVM_DEPLOYER" --network staging
-npx hardhat task:deployKMSVerifier --private-key "$PRIVATE_KEY_FHEVM_DEPLOYER" --network staging
-npx hardhat task:deployInputVerifier --private-key "$PRIVATE_KEY_FHEVM_DEPLOYER" --network staging
+npx hardhat task:deployKMSVerifier --private-key "$PRIVATE_KEY_FHEVM_DEPLOYER" --decryption-manager-address "$DECRYPTION_MANAGER_ADDRESS" --network staging
+npx hardhat task:deployInputVerifier --private-key "$PRIVATE_KEY_FHEVM_DEPLOYER" --zkpok-manager-address "$ZKPOK_MANAGER_ADDRESS"  --network staging
 npx hardhat task:deployFHEGasLimit --private-key "$PRIVATE_KEY_FHEVM_DEPLOYER" --network staging
 npx hardhat task:deployDecryptionOracle --private-key "$PRIVATE_KEY_FHEVM_DEPLOYER" --network staging
 
 npx hardhat task:addSigners --num-signers "$NUM_KMS_SIGNERS" --private-key "$PRIVATE_KEY_FHEVM_DEPLOYER" --use-address true --network staging
+npx hardhat task:addInputSigners --num-signers "$NUM_COPROCESSOR_SIGNERS" --private-key "$PRIVATE_KEY_FHEVM_DEPLOYER" --use-address true --network staging

contracts/tasks/taskDeploy.ts

@@ -104,17 +104,17 @@ task('task:deployTFHEExecutor')
 
 task('task:deployKMSVerifier')
   .addParam('privateKey', 'The deployer private key')
+  .addParam('decryptionManagerAddress', 'The decryption manager contract address from the Gateway chain')
   .setAction(async function (taskArguments: TaskArguments, { ethers, upgrades }) {
     const deployer = new ethers.Wallet(taskArguments.privateKey).connect(ethers.provider);
     const currentImplementation = await ethers.getContractFactory('EmptyUUPSProxy', deployer);
     const newImplem = await ethers.getContractFactory('KMSVerifier', deployer);
     const parsedEnv = dotenv.parse(fs.readFileSync('addresses/.env.kmsverifier'));
     const proxyAddress = parsedEnv.KMS_VERIFIER_CONTRACT_ADDRESS;
     const proxy = await upgrades.forceImport(proxyAddress, currentImplementation);
-    const parsedEnv2 = dotenv.parse(fs.readFileSync('addressesL2/.env.decryptionmanager'));
-    const verifyingContractSource = parsedEnv2.DECRYPTION_MANAGER_ADDRESS;
-    const parsedEnv3 = dotenv.parse(fs.readFileSync('.env'));
-    const chainIDSource = +parsedEnv3.CHAIN_ID_GATEWAY;
+    const verifyingContractSource = taskArguments.decryptionManagerAddress;
+    const parsedEnv2 = dotenv.parse(fs.readFileSync('.env'));
+    const chainIDSource = +parsedEnv2.CHAIN_ID_GATEWAY;
     await upgrades.upgradeProxy(proxy, newImplem, {
       call: { fn: 'reinitialize', args: [verifyingContractSource, chainIDSource] },
     });
@@ -123,17 +123,17 @@ task('task:deployKMSVerifier')
 
 task('task:deployInputVerifier')
   .addParam('privateKey', 'The deployer private key')
+  .addParam('zkpokManagerAddress', 'The ZKPOK manager contract address from the Gateway chain')
   .setAction(async function (taskArguments: TaskArguments, { ethers, upgrades }) {
     const deployer = new ethers.Wallet(taskArguments.privateKey).connect(ethers.provider);
     const currentImplementation = await ethers.getContractFactory('EmptyUUPSProxy', deployer);
     const newImplem = await ethers.getContractFactory('./contracts/InputVerifier.sol:InputVerifier', deployer);
     const parsedEnv = dotenv.parse(fs.readFileSync('addresses/.env.inputverifier'));
     const proxyAddress = parsedEnv.INPUT_VERIFIER_CONTRACT_ADDRESS;
     const proxy = await upgrades.forceImport(proxyAddress, currentImplementation);
-    const parsedEnv2 = dotenv.parse(fs.readFileSync('addressesL2/.env.zkpokmanager'));
-    const verifyingContractSource = parsedEnv2.ZKPOK_MANAGER_ADDRESS;
-    const parsedEnv3 = dotenv.parse(fs.readFileSync('.env'));
-    const chainIDSource = +parsedEnv3.CHAIN_ID_GATEWAY;
+    const verifyingContractSource = taskArguments.zkpokManagerAddress;
+    const parsedEnv2 = dotenv.parse(fs.readFileSync('.env'));
+    const chainIDSource = +parsedEnv2.CHAIN_ID_GATEWAY;
     await upgrades.upgradeProxy(proxy, newImplem, {
       call: { fn: 'reinitialize', args: [verifyingContractSource, chainIDSource] },
     });