Bump solc version to 0.8.23, update nix flake and update dependencies (…

…#1783) * bump solc version * solc 0.8.23 * another bump * [WORKFLOW] update nix flake inputs && ghc94 * [ETHEREUM-CONTRACTS] fix SuperfluidPoolPlaceholder pragma version * fix for new eslint * [WORKFLOW] HARDHAT_RUN_PARALLEL is 0 or 1 * [WORKFLOW] HARDHAT_RUN_PARALLEL fix * changelog update --------- Co-authored-by: Miao ZhiCheng <miao@superfluid.finance> Co-authored-by: Miao, ZhiCheng <zhicheng.miao@gmail.com>
superfluid-finance · Feb 8, 2024 · 6d74a1c · 6d74a1c
1 parent 80099ac
commit 6d74a1c
Show file tree

Hide file tree

Showing 152 changed files with 747 additions and 712 deletions.
diff --git a/.github/workflows/call.test-ethereum-contracts.yml b/.github/workflows/call.test-ethereum-contracts.yml
@@ -83,7 +83,7 @@ jobs:
         working-directory: ./packages/ethereum-contracts
         env:
           HARDHAT_TEST_JOBS: 4
-          HARDHAT_RUN_PARALLEL: true
+          HARDHAT_RUN_PARALLEL: 1
 
       ########################################
       ## Coverage Test
@@ -104,7 +104,7 @@ jobs:
           NODE_OPTIONS: --max_old_space_size=4096
           IS_COVERAGE_TEST: true
           HARDHAT_TEST_JOBS: 2
-          HARDHAT_RUN_PARALLEL: false
+          HARDHAT_RUN_PARALLEL: 0
 
       - name: Clean up and merge coverage artifacts
         if: inputs.run-coverage-tests == true

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -20,9 +20,9 @@
   flake-utils.lib.eachDefaultSystem (system:
   let
     minDevSolcVer = "solc_0_8_11"; # minimum solidity version used for external development
-    solcVer = "solc_0_8_19";
+    solcVer = "solc_0_8_23";
     ghcVer92 = "ghc928";
-    ghcVer94 = "ghc945";
+    ghcVer94 = "ghc948";
 
     pkgs = import nixpkgs {
       inherit system;
@@ -85,7 +85,7 @@
       hlint
       stylish-haskell
       # sage math
-      # sage # TODO: https://github.com/NixOS/nixpkgs/issues/282383#issuecomment-1902660815
+      sage
       # testing tooling
       gnuplot
       # yellowpaper pipeline tooling

diff --git a/package.json b/package.json
@@ -45,34 +45,34 @@
         "@typechain/hardhat": "^8.0.3",
         "@types/lodash": "^4.14.202",
         "@types/mocha": "^10.0.6",
-        "@typescript-eslint/eslint-plugin": "^6.18.1",
-        "@typescript-eslint/parser": "^6.18.1",
+        "@typescript-eslint/eslint-plugin": "^6.21.0",
+        "@typescript-eslint/parser": "^6.21.0",
         "cloc": "^2.11.0",
         "copyfiles": "^2.4.1",
-        "dotenv": "^16.3.1",
+        "dotenv": "^16.4.1",
         "eslint": "^8.56.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-eslint-comments": "^3.2.0",
         "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-prettier": "^5.1.2",
-        "hardhat": "^2.19.4",
-        "hardhat-deploy": "^0.11.37",
+        "eslint-plugin-prettier": "^5.1.3",
+        "hardhat": "^2.19.5",
+        "hardhat-deploy": "^0.11.45",
         "husky": "^8.0.3",
-        "lerna": "^7.3.0",
-        "node-jq": "^4.2.2",
-        "nodemon": "^3.0.2",
+        "lerna": "^7.4.2",
+        "node-jq": "^4.3.0",
+        "nodemon": "^3.0.3",
         "npm-run-all": "^4.1.5",
         "nyc": "^15.1.0",
-        "prettier": "^3.1.1",
+        "prettier": "^3.2.5",
         "prettier-eslint": "^15.0.1",
         "solhint": "3.6.2",
         "syncpack": "^10.9.3",
         "truffle": "^5.11.5",
         "ts-node": "^10.9.2",
         "typechain": "^8.3.2",
-        "typedoc": "^0.25.6",
+        "typedoc": "^0.25.7",
         "typescript": "^5.3.3",
-        "web3": "^1.10.2"
+        "web3": "^1.10.4"
     },
     "resolutions": {
         "mocha": "^10.2.0"

diff --git a/packages/automation-contracts/autowrap/foundry.toml b/packages/automation-contracts/autowrap/foundry.toml
@@ -2,7 +2,7 @@
 root = '../../../'
 libs = ['lib']
 src = 'packages/automation-contracts/autowrap'
-solc_version = "0.8.19"
+solc_version = "0.8.23"
 remappings = [
     '@superfluid-finance/solidity-semantic-money/src/=packages/solidity-semantic-money/src/',
     '@superfluid-finance/ethereum-contracts/=packages/ethereum-contracts/',

diff --git a/packages/automation-contracts/autowrap/hardhat.config.js b/packages/automation-contracts/autowrap/hardhat.config.js
@@ -13,7 +13,7 @@ require("./script/addStrategy");
  */
 module.exports = {
     solidity: {
-        version: "0.8.19",
+        version: "0.8.23",
         settings: {
             optimizer: {
                 enabled: true,

diff --git a/packages/automation-contracts/autowrap/package.json b/packages/automation-contracts/autowrap/package.json
@@ -13,7 +13,7 @@
         "check-updates": "ncu --target minor"
     },
     "dependencies": {
-        "@openzeppelin/contracts": "4.9.3",
+        "@openzeppelin/contracts": "4.9.5",
         "@superfluid-finance/ethereum-contracts": "1.9.0",
         "@superfluid-finance/metadata": "1.1.27"
     }

diff --git a/packages/automation-contracts/scheduler/foundry.toml b/packages/automation-contracts/scheduler/foundry.toml
@@ -2,7 +2,7 @@
 root = '../../../'
 libs = ['lib']
 src = 'packages/automation-contracts/scheduler'
-solc_version = "0.8.19"
+solc_version = "0.8.23"
 remappings = [
     '@superfluid-finance/solidity-semantic-money/src/=packages/solidity-semantic-money/src/',
     '@superfluid-finance/ethereum-contracts/=packages/ethereum-contracts/',

diff --git a/packages/automation-contracts/scheduler/hardhat.config.js b/packages/automation-contracts/scheduler/hardhat.config.js
@@ -12,7 +12,7 @@ require("hardhat/config");
  */
 module.exports = {
     solidity: {
-        version: "0.8.19",
+        version: "0.8.23",
         settings: {
             optimizer: {
                 enabled: true,

diff --git a/packages/automation-contracts/scheduler/package.json b/packages/automation-contracts/scheduler/package.json
@@ -13,7 +13,7 @@
         "check-updates": "ncu --target minor"
     },
     "dependencies": {
-        "@openzeppelin/contracts": "4.9.3",
+        "@openzeppelin/contracts": "4.9.5",
         "@superfluid-finance/ethereum-contracts": "1.9.0",
         "@superfluid-finance/metadata": "1.1.27"
     }

diff --git a/packages/ethereum-contracts/CHANGELOG.md b/packages/ethereum-contracts/CHANGELOG.md
@@ -5,6 +5,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## Unreleased
 
+### Added
+- bump solc to 0.8.23
+
 ## [v1.9.0] - 2024-01-09
 
 ### Breaking

diff --git a/packages/ethereum-contracts/contracts/agreements/AgreementBase.sol b/packages/ethereum-contracts/contracts/agreements/AgreementBase.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import { UUPSProxiable } from "../upgradability/UUPSProxiable.sol";
 import { ISuperAgreement } from "../interfaces/superfluid/ISuperAgreement.sol";

diff --git a/packages/ethereum-contracts/contracts/agreements/AgreementLibrary.sol b/packages/ethereum-contracts/contracts/agreements/AgreementLibrary.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import {
     ISuperfluid,

diff --git a/packages/ethereum-contracts/contracts/agreements/ConstantFlowAgreementV1.sol b/packages/ethereum-contracts/contracts/agreements/ConstantFlowAgreementV1.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import {
     ISuperfluid,

diff --git a/packages/ethereum-contracts/contracts/agreements/InstantDistributionAgreementV1.sol b/packages/ethereum-contracts/contracts/agreements/InstantDistributionAgreementV1.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";
 

diff --git a/packages/ethereum-contracts/contracts/agreements/gdav1/GeneralDistributionAgreementV1.sol b/packages/ethereum-contracts/contracts/agreements/gdav1/GeneralDistributionAgreementV1.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: AGPLv3
 // solhint-disable not-rely-on-time
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";
 

diff --git a/packages/ethereum-contracts/contracts/agreements/gdav1/PoolAdminNFT.sol b/packages/ethereum-contracts/contracts/agreements/gdav1/PoolAdminNFT.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import { IERC721Metadata } from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol";
 import { IPoolAdminNFT } from "../../interfaces/agreements/gdav1/IPoolAdminNFT.sol";

diff --git a/packages/ethereum-contracts/contracts/agreements/gdav1/PoolMemberNFT.sol b/packages/ethereum-contracts/contracts/agreements/gdav1/PoolMemberNFT.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import { IERC721Metadata } from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol";
 import { IPoolMemberNFT } from "../../interfaces/agreements/gdav1/IPoolMemberNFT.sol";

diff --git a/packages/ethereum-contracts/contracts/agreements/gdav1/PoolNFTBase.sol b/packages/ethereum-contracts/contracts/agreements/gdav1/PoolNFTBase.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 // Notes: We use reserved slots for upgradable contracts.
 // solhint-disable max-states-count

diff --git a/packages/ethereum-contracts/contracts/agreements/gdav1/SuperfluidPool.sol b/packages/ethereum-contracts/contracts/agreements/gdav1/SuperfluidPool.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: AGPLv3
 // solhint-disable not-rely-on-time
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 // Notes: We use these interfaces in natspec documentation below, grep @inheritdoc
 // solhint-disable-next-line no-unused-import

diff --git a/packages/ethereum-contracts/contracts/agreements/gdav1/SuperfluidPoolDeployerLibrary.sol b/packages/ethereum-contracts/contracts/agreements/gdav1/SuperfluidPoolDeployerLibrary.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import { BeaconProxy } from "@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol";
 import { ISuperfluidToken } from "../../interfaces/superfluid/ISuperfluidToken.sol";

diff --git a/packages/ethereum-contracts/contracts/agreements/gdav1/SuperfluidPoolPlaceholder.sol b/packages/ethereum-contracts/contracts/agreements/gdav1/SuperfluidPoolPlaceholder.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: AGPLv3
 // solhint-disable not-rely-on-time
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import { BeaconProxiable } from "../../upgradability/BeaconProxiable.sol";
 

diff --git a/packages/ethereum-contracts/contracts/gov/SuperfluidGovernanceBase.sol b/packages/ethereum-contracts/contracts/gov/SuperfluidGovernanceBase.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import {
     ISuperfluid,

diff --git a/packages/ethereum-contracts/contracts/gov/SuperfluidGovernanceII.sol b/packages/ethereum-contracts/contracts/gov/SuperfluidGovernanceII.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import { UUPSProxy } from "../upgradability/UUPSProxy.sol";
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";

diff --git a/packages/ethereum-contracts/contracts/libs/BaseRelayRecipient.sol b/packages/ethereum-contracts/contracts/libs/BaseRelayRecipient.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import { IRelayRecipient } from "../interfaces/utils/IRelayRecipient.sol";
 

diff --git a/packages/ethereum-contracts/contracts/libs/CallUtils.sol b/packages/ethereum-contracts/contracts/libs/CallUtils.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 /**
  * @title Call utilities library that is absent from the OpenZeppelin

diff --git a/packages/ethereum-contracts/contracts/libs/ERC1820RegistryCompiled.sol b/packages/ethereum-contracts/contracts/libs/ERC1820RegistryCompiled.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPLv3
 // solhint-disable const-name-snakecase
 // solhint-disable max-line-length
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 /// @dev This is meant to be used by test framework to get the raw bytecode without compiling the origin contract
 library ERC1820RegistryCompiled {

diff --git a/packages/ethereum-contracts/contracts/libs/ERC777Helper.sol b/packages/ethereum-contracts/contracts/libs/ERC777Helper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import { IERC1820Registry } from "@openzeppelin/contracts/utils/introspection/IERC1820Registry.sol";
 

diff --git a/packages/ethereum-contracts/contracts/libs/EventsEmitter.sol b/packages/ethereum-contracts/contracts/libs/EventsEmitter.sol
diff --git a/packages/ethereum-contracts/contracts/libs/FixedSizeData.sol b/packages/ethereum-contracts/contracts/libs/FixedSizeData.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 /**
  * @title Utilities for fixed size data in storage

diff --git a/packages/ethereum-contracts/contracts/libs/SafeGasLibrary.sol b/packages/ethereum-contracts/contracts/libs/SafeGasLibrary.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 /// @title SafeGasLibrary
 /// @author Superfluid

diff --git a/packages/ethereum-contracts/contracts/libs/SlotsBitmapLibrary.sol b/packages/ethereum-contracts/contracts/libs/SlotsBitmapLibrary.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import {ISuperfluidToken} from "../interfaces/superfluid/ISuperfluidToken.sol";
 

diff --git a/packages/ethereum-contracts/contracts/libs/SolvencyHelperLibrary.sol b/packages/ethereum-contracts/contracts/libs/SolvencyHelperLibrary.sol
@@ -7,7 +7,7 @@ import {
     SuperfluidGovernanceConfigs
 } from "../interfaces/superfluid/ISuperfluid.sol";
 
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 library SolvencyHelperLibrary {
     function decode3PsData(ISuperfluid host, ISuperfluidToken token)

diff --git a/packages/ethereum-contracts/contracts/mocks/AgreementMock.sol b/packages/ethereum-contracts/contracts/mocks/AgreementMock.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";
 

diff --git a/packages/ethereum-contracts/contracts/mocks/CFAAppMocks.sol b/packages/ethereum-contracts/contracts/mocks/CFAAppMocks.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPLv3
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import {
     ISuperfluid,

diff --git a/packages/ethereum-contracts/contracts/mocks/CFALibraryMock.sol b/packages/ethereum-contracts/contracts/mocks/CFALibraryMock.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import {
     ISuperfluid, ISuperfluidToken, ISuperToken, IConstantFlowAgreementV1

diff --git a/packages/ethereum-contracts/contracts/mocks/CFAv1NFTMock.sol b/packages/ethereum-contracts/contracts/mocks/CFAv1NFTMock.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPLv3
 // solhint-disable reason-string
 // solhint-disable not-rely-on-time
-pragma solidity 0.8.19;
+pragma solidity 0.8.23;
 
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 import {