Update solidity, hardhat, slither CI (#632)

* Update solidity, hardhat, slither CI * Update solhint * Fix coverage
bosonprotocol · May 30, 2023 · 13eea7a · 13eea7a
1 parent da7d3b9
commit 13eea7a
Show file tree

Hide file tree

Showing 132 changed files with 14,907 additions and 31,043 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -186,13 +186,12 @@ jobs:
         run: |
           cp .env.example .env
       - name: Slither analyzer
-        uses: crytic/slither-action@v0.2.0
+        uses: crytic/slither-action@v0.3.0
         id: slither
         with:
           node-version: 16
           sarif: results.sarif
           fail-on: none
-          slither-version: dev-workaround-action-48
       - name: Upload SARIF file
         uses: github/codeql-action/upload-sarif@v2
         with:

diff --git a/.solhint.json b/.solhint.json
@@ -4,7 +4,7 @@
     "max-line-length": "off",
     "compiler-version": [
       "error",
-      "0.8.9"
+      "0.8.18"
     ],
     "func-name-mixedcase": "off",
     "not-rely-on-time": "off",

diff --git a/contracts/access/AccessControl.sol b/contracts/access/AccessControl.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.7.0) (access/AccessControl.sol)
 
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import "../interfaces/IAccessControl.sol";
 import "../ext_libs/Strings.sol";

diff --git a/contracts/access/AccessController.sol b/contracts/access/AccessController.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import "../domain/BosonConstants.sol";
 import "./AccessControl.sol";

diff --git a/contracts/diamond/DiamondLib.sol b/contracts/diamond/DiamondLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { IAccessControl } from "../interfaces/IAccessControl.sol";
 import { IDiamondCut } from "../interfaces/diamond/IDiamondCut.sol";

diff --git a/contracts/diamond/JewelerLib.sol b/contracts/diamond/JewelerLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { DiamondLib } from "./DiamondLib.sol";
 import { IDiamondCut } from "../interfaces/diamond/IDiamondCut.sol";
@@ -284,7 +284,9 @@ library JewelerLib {
             if (!success) {
                 if (error.length > 0) {
                     // bubble up the error
-                    revert(string(error));
+                    assembly {
+                        revert(add(32, error), mload(error))
+                    }
                 } else {
                     revert("LibDiamondCut: _init function reverted");
                 }

diff --git a/contracts/diamond/ProtocolDiamond.sol b/contracts/diamond/ProtocolDiamond.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import "../domain/BosonConstants.sol";
 import { IAccessControl } from "../interfaces/IAccessControl.sol";

diff --git a/contracts/diamond/facets/DiamondCutFacet.sol b/contracts/diamond/facets/DiamondCutFacet.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import "../../domain/BosonConstants.sol";
 import { IDiamondCut } from "../../interfaces/diamond/IDiamondCut.sol";

diff --git a/contracts/diamond/facets/DiamondLoupeFacet.sol b/contracts/diamond/facets/DiamondLoupeFacet.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { IDiamondLoupe } from "../../interfaces/diamond/IDiamondLoupe.sol";
 import { DiamondLib } from "../DiamondLib.sol";

diff --git a/contracts/diamond/facets/ERC165Facet.sol b/contracts/diamond/facets/ERC165Facet.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import "../../domain/BosonConstants.sol";
 import { DiamondLib } from "../DiamondLib.sol";

diff --git a/contracts/domain/BosonConstants.sol b/contracts/domain/BosonConstants.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 // Access Control Roles
 bytes32 constant ADMIN = keccak256("ADMIN"); // Role Admin

diff --git a/contracts/domain/BosonTypes.sol b/contracts/domain/BosonTypes.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 /**
  * @title BosonTypes

diff --git a/contracts/example/SnapshotGate/SnapshotGate.sol b/contracts/example/SnapshotGate/SnapshotGate.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity ^0.8.9;
+pragma solidity 0.8.18;
 
 import { IBosonExchangeHandler } from "../../interfaces/handlers/IBosonExchangeHandler.sol";
 import { IBosonOfferHandler } from "../../interfaces/handlers/IBosonOfferHandler.sol";

diff --git a/contracts/example/SnapshotGate/support/ERC721.sol b/contracts/example/SnapshotGate/support/ERC721.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.7.0) (token/ERC721/ERC721.sol)
 
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import "../../../interfaces/IERC721.sol";
 import "../../../ext_libs/Address.sol";

diff --git a/contracts/example/SnapshotGate/support/IERC721Metadata.sol b/contracts/example/SnapshotGate/support/IERC721Metadata.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts v4.4.1 (token/ERC721/extensions/IERC721Metadata.sol)
 
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import "../../../interfaces/IERC721.sol";
 

diff --git a/contracts/example/SnapshotGate/support/IERC721Receiver.sol b/contracts/example/SnapshotGate/support/IERC721Receiver.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.6.0) (token/ERC721/IERC721Receiver.sol)
 
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 /**
  * @title ERC721 token receiver interface

diff --git a/contracts/ext_libs/Address.sol b/contracts/ext_libs/Address.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 /**
  * @dev Collection of functions related to the address type

diff --git a/contracts/ext_libs/Math.sol b/contracts/ext_libs/Math.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.7.0) (utils/math/Math.sol)
 
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 /**
  * @dev Standard math utilities missing in the Solidity language.

diff --git a/contracts/ext_libs/SafeERC20.sol b/contracts/ext_libs/SafeERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import "../interfaces/IERC20.sol";
 import "./Address.sol";

diff --git a/contracts/ext_libs/Strings.sol b/contracts/ext_libs/Strings.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.7.0) (utils/Strings.sol)
 
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import "./Math.sol";
 

diff --git a/contracts/interfaces/DAIAliases.sol b/contracts/interfaces/DAIAliases.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 /**
  * @dev DAI specific aliases for ERC20 functions

diff --git a/contracts/interfaces/IAccessControl.sol b/contracts/interfaces/IAccessControl.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts v4.4.1 (access/IAccessControl.sol)
 
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 /**
  * @dev External interface of AccessControl declared to support ERC165 detection.

diff --git a/contracts/interfaces/IERC1155.sol b/contracts/interfaces/IERC1155.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.7.0) (token/ERC1155/IERC1155.sol)
 
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import "./IERC165.sol";
 

diff --git a/contracts/interfaces/IERC165.sol b/contracts/interfaces/IERC165.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts v4.4.1 (utils/introspection/IERC165.sol)
 
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 /**
  * @dev Interface of the ERC165 standard, as defined in the

diff --git a/contracts/interfaces/IERC20.sol b/contracts/interfaces/IERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 /**
  * @dev Interface of the ERC20 standard as defined in the EIP.

diff --git a/contracts/interfaces/IERC20Metadata.sol b/contracts/interfaces/IERC20Metadata.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import "./IERC20.sol";
 

diff --git a/contracts/interfaces/IERC2981.sol b/contracts/interfaces/IERC2981.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v4.6.0) (interfaces/IERC2981.sol)
 
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import "./IERC165.sol";
 

diff --git a/contracts/interfaces/IERC721.sol b/contracts/interfaces/IERC721.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts v4.4.1 (token/ERC721/IERC721.sol)
 
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import "./IERC165.sol";
 

diff --git a/contracts/interfaces/IInitializableVoucherClone.sol b/contracts/interfaces/IInitializableVoucherClone.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import "../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/ITwinToken.sol b/contracts/interfaces/ITwinToken.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts v4.4.1 (token/ERC721/IERC721.sol)
 
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import "./IERC165.sol";
 

diff --git a/contracts/interfaces/clients/IBosonVoucher.sol b/contracts/interfaces/clients/IBosonVoucher.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { IERC721Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721Upgradeable.sol";
 import { IERC721MetadataUpgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/IERC721MetadataUpgradeable.sol";

diff --git a/contracts/interfaces/clients/IClientExternalAddresses.sol b/contracts/interfaces/clients/IClientExternalAddresses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { IAccessControl } from "../IAccessControl.sol";
 import { IClientExternalAddressesEvents } from "../events/IClientExternalAddressesEvents.sol";

diff --git a/contracts/interfaces/diamond/IDiamondCut.sol b/contracts/interfaces/diamond/IDiamondCut.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 /**
  * @title IDiamondCut

diff --git a/contracts/interfaces/diamond/IDiamondLoupe.sol b/contracts/interfaces/diamond/IDiamondLoupe.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 /**
  * @title IDiamondLoupe

diff --git a/contracts/interfaces/diamond/IERC165Extended.sol b/contracts/interfaces/diamond/IERC165Extended.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 /**
  * @title IDiamondCut

diff --git a/contracts/interfaces/events/IBosonAccountEvents.sol b/contracts/interfaces/events/IBosonAccountEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonBundleEvents.sol b/contracts/interfaces/events/IBosonBundleEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonConfigEvents.sol b/contracts/interfaces/events/IBosonConfigEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonDisputeEvents.sol b/contracts/interfaces/events/IBosonDisputeEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonExchangeEvents.sol b/contracts/interfaces/events/IBosonExchangeEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonFundsEvents.sol b/contracts/interfaces/events/IBosonFundsEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonGroupEvents.sol b/contracts/interfaces/events/IBosonGroupEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonMetaTransactionsEvents.sol b/contracts/interfaces/events/IBosonMetaTransactionsEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 /**
  * @title IBosonMetaTransactionsEvents

diff --git a/contracts/interfaces/events/IBosonOfferEvents.sol b/contracts/interfaces/events/IBosonOfferEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonPauseEvents.sol b/contracts/interfaces/events/IBosonPauseEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IBosonProtocolInitializationEvents.sol b/contracts/interfaces/events/IBosonProtocolInitializationEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 /**
  * @title IBosonInitializationEvents

diff --git a/contracts/interfaces/events/IBosonTwinEvents.sol b/contracts/interfaces/events/IBosonTwinEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 

diff --git a/contracts/interfaces/events/IClientExternalAddressesEvents.sol b/contracts/interfaces/events/IClientExternalAddressesEvents.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 /**
  * @title IClientExternalAddressesEvents

diff --git a/contracts/interfaces/handlers/IBosonAccountHandler.sol b/contracts/interfaces/handlers/IBosonAccountHandler.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 import { IBosonAccountEvents } from "../events/IBosonAccountEvents.sol";

diff --git a/contracts/interfaces/handlers/IBosonBundleHandler.sol b/contracts/interfaces/handlers/IBosonBundleHandler.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.9;
+pragma solidity 0.8.18;
 
 import { BosonTypes } from "../../domain/BosonTypes.sol";
 import { IBosonBundleEvents } from "../events/IBosonBundleEvents.sol";