Merge pull request #244 from zama-ai/updated-solidity-and-oz-versions

Updated Solidity version to ^0.8.20 and OpenZeppelin Contracts to ^5.0.1
zama-ai · Jan 9, 2024 · 96de5da · 96de5da
2 parents bd6eb1c + 535b055
commit 96de5da
Show file tree

Hide file tree

Showing 33 changed files with 251 additions and 283 deletions.
diff --git a/abstracts/EIP712WithModifier.sol b/abstracts/EIP712WithModifier.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import "@openzeppelin/contracts/utils/cryptography/EIP712.sol";

diff --git a/abstracts/Reencrypt.sol b/abstracts/Reencrypt.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import "@openzeppelin/contracts/utils/cryptography/EIP712.sol";

diff --git a/codegen/templates.ts b/codegen/templates.ts
@@ -50,7 +50,7 @@ export function implSol(ctx: CodegenContext, operators: Operator[]): string {
   res.push(`
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 ${fheLibInterface}
 
@@ -148,7 +148,7 @@ export function tfheSol(
 
   res.push(`// SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 ${commonSolLib()}
 
@@ -790,7 +790,7 @@ export function implSolMock(ctx: CodegenContext, operators: Operator[]): string
   res.push(`
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 library Impl {
   function add(uint256 lhs, uint256 rhs, bool scalar) internal pure returns (uint256 result) {

diff --git a/codegen/testgen.ts b/codegen/testgen.ts
@@ -189,7 +189,7 @@ export function generateSmartContract(os: OverloadShard): string {
 
   res.push(`
         // SPDX-License-Identifier: BSD-3-Clause-Clear
-        pragma solidity 0.8.19;
+        pragma solidity ^0.8.20;
 
         import "../../lib/TFHE.sol";
         contract TFHETestSuite${os.shardNumber} {

diff --git a/docs/howto/operations.md b/docs/howto/operations.md
@@ -32,7 +32,7 @@ The `TFHE` library defines the following operations with FHE ciphertexts:
 > **_NOTE 1:_** Random encrypted integers that are generated fully on-chain. Currently, implemented as a mockup by using a PRNG in the plain.
 > Not for use in production!
 
-Overloaded operators `+`, `-`, `*`, `&`, ... on encrypted integers are supported ([using for](https://docs.soliditylang.org/en/v0.8.19/contracts.html#using-for)). As of now, overloaded operators will call the versions without an overflow check.
+Overloaded operators `+`, `-`, `*`, `&`, ... on encrypted integers are supported ([using for](https://docs.soliditylang.org/en/v0.8.22/contracts.html#using-for)). As of now, overloaded operators will call the versions without an overflow check.
 
 More information about the supported operations can be found in the [function specifications](../api/functions.md) page or in the [TFHE-rs docs](https://docs.zama.ai/tfhe-rs/getting-started/operations#arithmetic-operations.).
 

diff --git a/docs/howto/write_contract/hardhat.md b/docs/howto/write_contract/hardhat.md
@@ -1,7 +1,5 @@
 # Using Hardhat
 
-> Our library TFHE requires Solidity version **0.8.19** specifically, as we rely on features exclusive to this version and do not currently provide support for versions beyond it.
-
 The best way to start writing smart contracts with fhEVM is to use our [Hardhat template](https://github.com/zama-ai/fhevm-hardhat-template).
 
 It allows you to start a fhEVM docker image and run your smart contract on it. Read the [README](https://github.com/zama-ai/fhevm-hardhat-template/blob/main/README.md) for more information.

diff --git a/docs/howto/write_contract/remix.md b/docs/howto/write_contract/remix.md
@@ -1,7 +1,5 @@
 # Using Remix
 
-> Our library TFHE requires Solidity version **0.8.19** specifically, as we rely on features exclusive to this version and do not currently provide support for versions beyond it.
-
 You can use Remix to interact with a blockchain using fhEVM. If you want to send an encrypted input, you need to encrypt it with [fhevmjs CLI tool](https://docs.zama.ai/fhevm/client/getting_started/cli) for example. It becomes more complex if you want to reencrypt a value directly in Remix.
 
 To avoid this problem, we developed a [version of Remix IDE](https://github.com/zama-ai/remix-project) with these two missing features:

diff --git a/examples/BlindAuction.sol b/examples/BlindAuction.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../lib/TFHE.sol";
 

diff --git a/examples/CMUX.sol b/examples/CMUX.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../abstracts/Reencrypt.sol";
 import "../lib/TFHE.sol";

diff --git a/examples/Counter.sol b/examples/Counter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 // dummy contract for dummy transactions just to advance blocks
 contract Counter {

diff --git a/examples/EIP712.sol b/examples/EIP712.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../abstracts/EIP712WithModifier.sol";
 

diff --git a/examples/EncryptedERC20.sol b/examples/EncryptedERC20.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../abstracts/Reencrypt.sol";
 

diff --git a/examples/GasEstimation.sol b/examples/GasEstimation.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../lib/TFHE.sol";
 

diff --git a/examples/Governor/Comp.sol b/examples/Governor/Comp.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../../abstracts/Reencrypt.sol";
 

diff --git a/examples/Governor/GovernorZama.sol b/examples/Governor/GovernorZama.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../../lib/TFHE.sol";
 

diff --git a/examples/Identity/AbstractCompliantERC20.sol b/examples/Identity/AbstractCompliantERC20.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../../abstracts/Reencrypt.sol";
 import "./ERC20Rules.sol";

diff --git a/examples/Identity/CompliantERC20.sol b/examples/Identity/CompliantERC20.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../../lib/TFHE.sol";
 import "./AbstractCompliantERC20.sol";

diff --git a/examples/Identity/ERC20Rules.sol b/examples/Identity/ERC20Rules.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../../lib/TFHE.sol";
 import "./IdentityRegistry.sol";

diff --git a/examples/Identity/IdentityRegistry.sol b/examples/Identity/IdentityRegistry.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
@@ -28,9 +28,7 @@ contract IdentityRegistry is Reencrypt, Ownable {
     event NewDid(address wallet);
     event RemoveDid(address wallet);
 
-    constructor() Ownable() {
-        _transferOwnership(msg.sender);
-    }
+    constructor() Ownable(msg.sender) {}
 
     function addRegistrar(address wallet, uint registrarId) public onlyOwner {
         require(registrarId > 0, "registrarId needs to be > 0");

diff --git a/examples/OptimisticRequire.sol b/examples/OptimisticRequire.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../lib/TFHE.sol";
 

diff --git a/examples/Rand.sol b/examples/Rand.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../lib/TFHE.sol";
 

diff --git a/examples/tests/TFHEManualTestSuite.sol b/examples/tests/TFHEManualTestSuite.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../../lib/TFHE.sol";
 

diff --git a/examples/tests/TFHETestSuite1.sol b/examples/tests/TFHETestSuite1.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../../lib/TFHE.sol";
 

diff --git a/examples/tests/TFHETestSuite2.sol b/examples/tests/TFHETestSuite2.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../../lib/TFHE.sol";
 

diff --git a/examples/tests/TFHETestSuite3.sol b/examples/tests/TFHETestSuite3.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 import "../../lib/TFHE.sol";
 

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -149,7 +149,7 @@ const config: HardhatUserConfig = {
     tests: './test',
   },
   solidity: {
-    version: '0.8.19',
+    version: '0.8.22',
     settings: {
       metadata: {
         // Not including the metadata hash
@@ -162,6 +162,7 @@ const config: HardhatUserConfig = {
         enabled: true,
         runs: 800,
       },
+      evmVersion: 'paris',
     },
   },
   typechain: {

diff --git a/lib/Impl.sol b/lib/Impl.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 interface FhevmLib {
     function fheAdd(uint256 lhs, uint256 rhs, bytes1 scalarByte) external pure returns (uint256 result);

diff --git a/lib/TFHE.sol b/lib/TFHE.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 type ebool is uint256;
 type euint8 is uint256;

diff --git a/mocks/Impl.sol b/mocks/Impl.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 library Impl {
     function add(uint256 lhs, uint256 rhs, bool scalar) internal pure returns (uint256 result) {

diff --git a/mocks/TFHE.sol b/mocks/TFHE.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-pragma solidity 0.8.19;
+pragma solidity ^0.8.20;
 
 type ebool is uint256;
 type euint8 is uint256;