feat: use latest core contracts, updated lib API, renamed to fhevm an… (#745)

* feat: use latest core contracts, updated lib API, renamed to fhevm and fhe

chore: add dummy addresses for CI

test: add tests for makePubliclyDecryptable method

* chore: update package-lock.json for linux

* chore: update package-lock.json

* fix: solidity comments (#746)

* chore: update oracle version

* chore: update fhevm core-contracts version

* feat: update fhevm sdk and mocked userDecrypt

* chore: fix coverage

Author: jatZama

.github/workflows/test.yml

@@ -2,8 +2,6 @@ name: Pull request tests
 
 on:
   pull_request:
-    branches:
-      - main
 
 jobs:
   build:

.gitignore

@@ -137,4 +137,4 @@ typechain
 typechain-types
 .openzeppelin/unknown*
 .openzeppelin/sepolia.json
-httpzTemp/
+fhevmTemp/

.solcover.js

@@ -1,9 +1,11 @@
-export const istanbulReporter = ["html", "lcov"];
-export const providerOptions = {
-  mnemonic: process.env.MNEMONIC,
-};
-export const skipFiles = ["test"];
-export const mocha = {
-  fgrep: "[skip-on-coverage]",
-  invert: true,
+module.exports = {
+  istanbulReporter: ["html", "lcov"],
+  providerOptions: {
+    mnemonic: process.env.MNEMONIC,
+  },
+  skipFiles: ["test"],
+  mocha: {
+    fgrep: "[skip-on-coverage]",
+    invert: true,
+  },
 };

CustomProvider.ts

@@ -27,8 +27,8 @@ class CustomProvider extends ProviderWrapper {
       this.lastBlockSnapshot = parseInt(blockNumberHex);
       this.lastBlockSnapshotForDecrypt = parseInt(blockNumberHex);
       const coprocAdd = dotenv.parse(
-        fs.readFileSync(require.resolve('./httpzTemp/addresses/.env.exec')),
-      ).TFHE_EXECUTOR_CONTRACT_ADDRESS;
+        fs.readFileSync(require.resolve('./fhevmTemp/addresses/.env.exec')),
+      ).FHEVM_EXECUTOR_CONTRACT_ADDRESS;
       this.lastCounterRand = await this._wrappedProvider.request({
         method: 'eth_getStorageAt',
         params: [coprocAdd, '0xa436a06f0efce5ea38c956a21e24202a59b3b746d48a23fb52b4a5bc33fe3e00', 'latest'],

codegen/main.ts

@@ -4,7 +4,7 @@ import path from 'path';
 import { validateFHETypes, validateOperators } from './common';
 import { generateOverloads } from './generateOverloads';
 import { ALL_OPERATORS } from './operators';
-import { generateSolidityFheType, generateSolidityHTTPZLib, generateSolidityImplLib } from './templates';
+import { generateSolidityFHELib, generateSolidityFheType, generateSolidityImplLib } from './templates';
 import {
   generateSolidityOverloadTestFiles,
   generateSolidityUnitTestContracts,
@@ -19,7 +19,7 @@ import { ALL_FHE_TYPES } from './types';
  * This function performs the following steps:
  * 1. Generates FHE types from a JSON file.
  * 2. Validates and processes the list of operators.
- * 3. Generates Solidity source code for HTTPZ and implementation contracts.
+ * 3. Generates Solidity source code for FHE and implementation contracts.
  * 4. Splits the generated overloads into multiple shards to avoid exceeding Solidity's contract size limit.
  * 5. Writes the generated Solidity contracts and test files to the appropriate directories.
  * 6. Generates TypeScript test code for the split overloads and writes them to the test directory.
@@ -36,7 +36,7 @@ function generateAllFiles() {
   /// Generate core Solidity contract files.
   writeFileSync('lib/FheType.sol', generateSolidityFheType(ALL_FHE_TYPES));
   writeFileSync('lib/Impl.sol', generateSolidityImplLib(ALL_OPERATORS));
-  writeFileSync('lib/HTTPZ.sol', generateSolidityHTTPZLib(ALL_OPERATORS, ALL_FHE_TYPES));
+  writeFileSync('lib/FHE.sol', generateSolidityFHELib(ALL_OPERATORS, ALL_FHE_TYPES));
 
   // TODO: For now, the testgen only supports automatically generated tests for euintXX.
   /// Generate overloads, split them into shards, and generate Solidity contracts to be used for TypeScript unit test files.
@@ -49,11 +49,11 @@ function generateAllFiles() {
   const overloadShards = splitOverloadsToShards(generateSolidityOverloadTestFiles(ALL_OPERATORS, ALL_FHE_TYPES));
   mkdirSync('contracts/tests', { recursive: true });
   overloadShards.forEach((os) => {
-    writeFileSync(`examples/tests/HTTPZTestSuite${os.shardNumber}.sol`, generateSolidityUnitTestContracts(os));
+    writeFileSync(`examples/tests/FHEVMTestSuite${os.shardNumber}.sol`, generateSolidityUnitTestContracts(os));
   });
 
   const tsSplits: string[] = generateTypeScriptTestCode(overloadShards, numberOfTestSplits);
-  tsSplits.forEach((split, splitIdx) => writeFileSync(`test/httpzOperations/httpzOperations${splitIdx + 1}.ts`, split));
+  tsSplits.forEach((split, splitIdx) => writeFileSync(`test/fhevmOperations/fhevmOperations${splitIdx + 1}.ts`, split));
 }
 
 generateAllFiles();