feat: Updates to fhevm 0.6

.env.example

@@ -1,13 +1,11 @@
-export INFURA_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
-export MNEMONIC="adapt mosquito move limb mobile illegal tree voyage juice mosquito burger raise father hope layer"
-export PRIVATE_KEY_ORACLE_DEPLOYER="717fd99986df414889fd8b51069d4f90a50af72e542c58ee065f5883779099c6"
-export PRIVATE_KEY_ORACLE_OWNER="717fd99986df414889fd8b51069d4f90a50af72e542c58ee065f5883779099c6"
-export PRIVATE_KEY_ORACLE_RELAYER="7ec931411ad75a7c201469a385d6f18a325d4923f9f213bd882bbea87e160b67"
+export MNEMONIC="exchange vintage ocean narrow danger return culture ignore trim solve clock hidden buddy wise emotion"
+export PRIVATE_KEY_FHEVM_DEPLOYER="f2caf1b49a8f33e5a95fc55b0903daddd261d5a874ff154dc5d809a5f1c90449"
+export PRIVATE_KEY_GATEWAY_DEPLOYER="e956ca0c96995551256523af64ac2f134c6b65d3e9d5c7b24ac4cd0a12f07bfd"
+export PRIVATE_KEY_GATEWAY_RELAYER="049bdaae72bcc269f5edf17be5a01d61374e139b425984431242a3a74f73e92a"
+export NUM_KMS_SIGNERS="1"
+export PRIVATE_KEY_KMS_SIGNER_0="d5b160a52fe6015861d0a1bea9523aaab3699d52af8f3cede5fcdbdfdd4c77cc"
+export PRIVATE_KEY_COPROCESSOR_ACCOUNT="83e0173b9d07abd53958da9f417df515b0957c4f8afd7171b518d192b52ae313"
+export IS_COPROCESSOR="true"
 
-# Block explorer API keys
-export ARBISCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
-export BSCSCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
-export ETHERSCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
-export OPTIMISM_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
-export POLYGONSCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
-export SNOWTRACE_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
+export SEPOLIA_RPC_URL="https://sepolia.infura.io/v3/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+export ETHERSCAN_API_KEY="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"

.github/workflows/test.yml

@@ -1,11 +1,11 @@
 name: Pull request tests
 on:
-  pull_request:
+  push:
     branches:
       - main
 jobs:
   build:
-    runs-on: large_ubuntu_16
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version:

.github/workflows/testmock.yml

@@ -5,7 +5,7 @@ on:
       - main
 jobs:
   build:
-    runs-on: large_ubuntu_16
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version:

.gitignore

@@ -10,6 +10,10 @@ dist
 node_modules
 types
 deployments
+kms-fhe-keys/
+network-fhe-keys/
+fhevmTemp/
+abi/
 
 # files
 *.env
@@ -18,4 +22,9 @@ deployments
 .pnp.*
 coverage.json
 package-lock.json
-yarn.lock
+yarn.lock
+
+res/
+running_node/
+
+docker-compose/docker-compose-full.yml

.npmignore

@@ -1,5 +1,4 @@
 *
-!contracts/**
 !package.json
 !README.md
 !LICENSE

.prettierrc.yml

@@ -11,7 +11,7 @@ trailingComma: "all"
 overrides:
   - files: "*.sol"
     options:
-      compiler: "0.8.22"
+      compiler: "0.8.24"
       parser: "solidity-parse"
       tabWidth: 4
   - files: "*.ts"

.solcover.js

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

.solhint.json

@@ -3,11 +3,17 @@
   "plugins": ["prettier"],
   "rules": {
     "code-complexity": ["error", 8],
-    "compiler-version": ["error", ">=0.8.4"],
-    "func-visibility": ["error", { "ignoreConstructors": true }],
+    "compiler-version": ["error", ">=0.8.24"],
+    "func-visibility": [
+      "error",
+      {
+        "ignoreConstructors": true
+      }
+    ],
     "max-line-length": ["error", 120],
     "named-parameters-mapping": "warn",
     "no-console": "off",
+    "no-global-import": "off",
     "not-rely-on-time": "off",
     "prettier/prettier": [
       "error",

CustomProvider.ts

@@ -0,0 +1,62 @@
+import { ethers } from "ethers";
+import { ProviderWrapper } from "hardhat/plugins";
+import type { EIP1193Provider, RequestArguments } from "hardhat/types";
+
+interface Test {
+  request: EIP1193Provider["request"];
+}
+
+class CustomProvider extends ProviderWrapper implements Test {
+  public lastBlockSnapshot: number;
+  public lastCounterRand: number;
+  public lastBlockSnapshotForDecrypt: number;
+
+  constructor(protected readonly _wrappedProvider: EIP1193Provider) {
+    super(_wrappedProvider);
+    this.lastBlockSnapshot = 0; // Initialize the variable
+    this.lastCounterRand = 0;
+    this.lastBlockSnapshotForDecrypt = 0;
+  }
+
+  async request(args: RequestArguments): ReturnType<EIP1193Provider["request"]> {
+    if (args.method === "eth_estimateGas") {
+      const estimatedGasLimit = BigInt((await this._wrappedProvider.request(args)) as bigint);
+      const increasedGasLimit = ethers.toBeHex((estimatedGasLimit * 120n) / 100n); // override estimated gasLimit by 120%, to avoid some edge case with ethermint gas estimation
+      return increasedGasLimit;
+    }
+    if (args.method === "evm_revert") {
+      const result = await this._wrappedProvider.request(args);
+      const blockNumberHex = (await this._wrappedProvider.request({ method: "eth_blockNumber" })) as string;
+      this.lastBlockSnapshot = parseInt(blockNumberHex);
+      this.lastBlockSnapshotForDecrypt = parseInt(blockNumberHex);
+
+      const callData = {
+        to: "0x000000000000000000000000000000000000005d",
+        data: "0x1f20d85c",
+      };
+      this.lastCounterRand = (await this._wrappedProvider.request({
+        method: "eth_call",
+        params: [callData, "latest"],
+      })) as number;
+      return result;
+    }
+    if (args.method === "get_lastBlockSnapshot") {
+      return [this.lastBlockSnapshot, this.lastCounterRand];
+    }
+    if (args.method === "get_lastBlockSnapshotForDecrypt") {
+      return this.lastBlockSnapshotForDecrypt;
+    }
+    if (args.method === "set_lastBlockSnapshot") {
+      this.lastBlockSnapshot = Array.isArray(args.params!) && args.params[0];
+      return this.lastBlockSnapshot;
+    }
+    if (args.method === "set_lastBlockSnapshotForDecrypt") {
+      this.lastBlockSnapshotForDecrypt = Array.isArray(args.params!) && args.params[0];
+      return this.lastBlockSnapshotForDecrypt;
+    }
+    const result = this._wrappedProvider.request(args);
+    return result;
+  }
+}
+
+export default CustomProvider;

README.md

@@ -32,7 +32,7 @@ pnpm add fhevm-contracts
 ```solidity
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import "fhevm/lib/TFHE.sol";
 import "fhevm-contracts/contracts/token/ERC20/EncryptedERC20.sol";