Merge pull request #514 from zama-ai/hh-update

Updated upgrades plugin and made mocked mode working when changing .env
zama-ai · Sep 25, 2024 · a91ab1c · a91ab1c
2 parents e51ef78 + 02aa2d3
commit a91ab1c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 28 deletions.
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -86,15 +86,16 @@ task('test', async (taskArgs, hre, runSuper) => {
   // Run modified test task
   if (hre.network.name === 'hardhat') {
     // in fhevm mode all this block is done when launching the node via `pnmp fhevm:start`
-    await hre.run('compile:specific', { contract: 'lib' });
-    await hre.run('compile:specific', { contract: 'gateway' });
     const privKeyDeployer = process.env.PRIVATE_KEY_GATEWAY_DEPLOYER;
     await hre.run('task:computePredeployAddress', { privateKey: privKeyDeployer });
     await hre.run('task:computeACLAddress');
     await hre.run('task:computeTFHEExecutorAddress');
     await hre.run('task:computeKMSVerifierAddress');
     await hre.run('task:computeInputVerifierAddress');
     await hre.run('task:computeFHEPaymentAddress');
+    await hre.run('compile:specific', { contract: 'lib' });
+    await hre.run('compile:specific', { contract: 'gateway' });
+    await hre.run('compile:specific', { contract: 'payment' });
     await hre.run('task:deployACL');
     await hre.run('task:deployTFHEExecutor');
     await hre.run('task:deployKMSVerifier');

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "@nomicfoundation/hardhat-toolbox": "^5.0.0",
     "@nomicfoundation/hardhat-verify": "^2.0.10",
     "@openzeppelin/contracts-upgradeable": "^5.0.2",
-    "@openzeppelin/hardhat-upgrades": "^3.2.1",
+    "@openzeppelin/hardhat-upgrades": "^3.3.0",
     "@trivago/prettier-plugin-sort-imports": "^4.0.0",
     "@typechain/ethers-v6": "^0.5.0",
     "@typechain/hardhat": "^9.1.0",