feat: updated to new fhevm-core-contracts prerelease

chore: remove obsolete variable
zama-ai · Jan 22, 2025 · a36d231 · a36d231
1 parent 2675d24
commit a36d231
Show file tree

Hide file tree

Showing 7 changed files with 233 additions and 1,110 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,7 +16,7 @@ jobs:
           node-version: 20.x
       - run: cp .env.example .env
       - run: npm ci --include=optional
-      - run: HARDHAT_TFHEEXECUTOR_EVENTS=1 npx hardhat test test/encryptedERC20/EncryptedERC20.ts --network hardhat
+      - run: npx hardhat test test/encryptedERC20/EncryptedERC20.ts --network hardhat
       - run: npm run compile
       - uses: JS-DevTools/npm-publish@19c28f1ef146469e409470805ea4279d47c3d35c # v3.1.1
         with:

diff --git a/.github/workflows/publishprerelease.yml b/.github/workflows/publishprerelease.yml
@@ -16,7 +16,7 @@ jobs:
           node-version: 20.x
       - run: cp .env.example .env
       - run: npm ci --include=optional
-      - run: HARDHAT_TFHEEXECUTOR_EVENTS=1 npx hardhat test test/encryptedERC20/EncryptedERC20.ts --network hardhat
+      - run: npx hardhat test test/encryptedERC20/EncryptedERC20.ts --network hardhat
       - run: npm run compile
       - uses: JS-DevTools/npm-publish@19c28f1ef146469e409470805ea4279d47c3d35c # v3.1.1
         with:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,10 +21,8 @@
     "prettier": "prettier --write \"**/*.{js,json,md,sol,ts,yml}\"",
     "test:inband": "hardhat test",
     "test": "HARDHAT_PARALLEL=1 hardhat test --parallel",
-    "test:mock": "HARDHAT_TFHEEXECUTOR_EVENTS=1 hardhat test --network hardhat",
-    "test:mock:original": "hardhat test --network hardhat",
-    "coverage:mock": "HARDHAT_TFHEEXECUTOR_EVENTS=1 hardhat coverage",
-    "coverage:mock:original": "hardhat coverage",
+    "test:mock": "hardhat test --network hardhat",
+    "coverage:mock": "hardhat coverage",
     "typechain": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat typechain",
     "codegen": "npx ts-node codegen/main.ts && npm run prettier",
     "codegen:overloads": "npx ts-node codegen/generateOverloads.ts",
@@ -72,7 +70,7 @@
     "eslint": "^8.28.0",
     "eslint-config-prettier": "^8.5.0",
     "ethers": "^6.8.0",
-    "fhevm-core-contracts": "0.7.0-3",
+    "fhevm-core-contracts": "^0.7.0-4",
     "fhevmjs": "^0.6.0-8",
     "hardhat": "^2.22.10",
     "hardhat-deploy": "^0.11.29",

diff --git a/tasks/taskDeploy.ts b/tasks/taskDeploy.ts
@@ -106,15 +106,7 @@ task('task:deployTFHEExecutor')
       'fhevmTemp/contracts/emptyProxy/EmptyUUPSProxy.sol:EmptyUUPSProxy',
       deployer,
     );
-    let newImplem;
-    if (process.env.HARDHAT_TFHEEXECUTOR_EVENTS !== '1') {
-      newImplem = await ethers.getContractFactory('fhevmTemp/contracts/TFHEExecutor.sol:TFHEExecutor', deployer);
-    } else {
-      newImplem = await ethers.getContractFactory(
-        'fhevmTemp/contracts/TFHEExecutorWithEvents.sol:TFHEExecutorWithEvents',
-        deployer,
-      );
-    }
+    const newImplem = await ethers.getContractFactory('fhevmTemp/contracts/TFHEExecutor.sol:TFHEExecutor', deployer);
     const parsedEnv = dotenv.parse(fs.readFileSync('fhevmTemp/addresses/.env.exec'));
     const proxyAddress = parsedEnv.TFHE_EXECUTOR_CONTRACT_ADDRESS;
     const proxy = await upgrades.forceImport(proxyAddress, currentImplementation);