chore: Solidity Pragma Downgrade (#80)

* Deploy and Release v2.2.3 * chore: Add estimate minting gas task * ci: Add ci steps to push * fix: Remove estimate minting typechain dep * Downgrade Solidity to 0.8.7 * ci: Add solhint and linter CI * Fix solhint errors * Change pragma to ^0.8.4, compiler to 0.8.14
Geo-Web-Project · Sep 1, 2022 · ec22edc · ec22edc
1 parent a74c83f
commit ec22edc
Show file tree

Hide file tree

Showing 45 changed files with 950 additions and 314 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,5 +1,9 @@
 name: "CI"
-on: ["pull_request"]
+on:
+  push:
+    branches: [main, develop]
+  pull_request:
+    branches: [main, develop]
 jobs:
   tests:
     name: "Tests"

diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml
@@ -1,5 +1,9 @@
-on: ["pull_request"]
 name: Test Coveralls
+on:
+  push:
+    branches: [main, develop]
+  pull_request:
+    branches: [main, develop]
 jobs:
   build:
     name: Build

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -0,0 +1,25 @@
+name: "CI"
+on:
+  push:
+    branches: [main, develop]
+  pull_request:
+    branches: [main, develop]
+jobs:
+  tests:
+    name: "Tests"
+    runs-on: ubuntu-latest
+    needs: []
+    steps:
+      - name: "Checkout Repo"
+        uses: actions/checkout@master
+      - name: "Install Node"
+        uses: actions/setup-node@v2
+        with:
+          node-version: "14"
+          cache: "yarn"
+      - name: "Install JS Dependencies"
+        run: "yarn install --frozen-lockfile --dev"
+      - name: "Build"
+        run: "yarn build"
+      - name: "Lint"
+        run: "yarn lint"
diff --git a/.solhint.json b/.solhint.json
@@ -0,0 +1,8 @@
+{
+  "plugins": ["prettier"],
+  "extends": "solhint:recommended",
+  "rules": {
+    "prettier/prettier": "error",
+    "compiler-version": ["error", "^0.8.4"]
+  }
+}
diff --git a/contracts/beacon-diamond/BeaconDiamond.sol b/contracts/beacon-diamond/BeaconDiamond.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 /******************************************************************************\
 * EIP-2535 Diamonds implementation that uses an external IDiamondLoupe to store facet addresses.

diff --git a/contracts/beacon-diamond/libraries/LibBeaconDiamond.sol b/contracts/beacon-diamond/libraries/LibBeaconDiamond.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 import {IDiamondLoupe} from "hardhat-deploy/solc_0.8/diamond/interfaces/IDiamondLoupe.sol";
 

diff --git a/contracts/pco-license/facets/CFABasePCOFacet.sol b/contracts/pco-license/facets/CFABasePCOFacet.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 import "../libraries/LibCFABasePCO.sol";
 import "../interfaces/IBasePCO.sol";
@@ -125,7 +125,7 @@ contract CFABasePCOFacet is IBasePCO, CFABasePCOFacetModifiers {
     /**
      * @notice Current payer of license
      */
-    function payer() external view returns (address) {
+    function payer() external view override returns (address) {
         LibCFABasePCO.Bid storage _currentBid = LibCFABasePCO._currentBid();
         return _currentBid.bidder;
     }
@@ -140,7 +140,7 @@ contract CFABasePCOFacet is IBasePCO, CFABasePCOFacetModifiers {
     /**
      * @notice Current price needed to purchase license
      */
-    function forSalePrice() external view returns (uint256) {
+    function forSalePrice() external view override returns (uint256) {
         if (LibCFABasePCO._isPayerBidActive()) {
             LibCFABasePCO.Bid storage _currentBid = LibCFABasePCO._currentBid();
             return _currentBid.forSalePrice;
@@ -152,7 +152,7 @@ contract CFABasePCOFacet is IBasePCO, CFABasePCOFacetModifiers {
     /**
      * @notice License Id
      */
-    function licenseId() external view returns (uint256) {
+    function licenseId() external view override returns (uint256) {
         LibCFABasePCO.DiamondStorage storage ds = LibCFABasePCO
             .diamondStorage();
         return ds.licenseId;
@@ -161,7 +161,7 @@ contract CFABasePCOFacet is IBasePCO, CFABasePCOFacetModifiers {
     /**
      * @notice License
      */
-    function license() external view returns (IERC721) {
+    function license() external view override returns (IERC721) {
         LibCFABasePCO.DiamondStorage storage ds = LibCFABasePCO
             .diamondStorage();
         return ds.license;

diff --git a/contracts/pco-license/facets/CFAPenaltyBidFacet.sol b/contracts/pco-license/facets/CFAPenaltyBidFacet.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 import "../libraries/LibCFABasePCO.sol";
 import {CFABasePCOFacetModifiers} from "./CFABasePCOFacet.sol";
@@ -131,6 +131,7 @@ contract CFAPenaltyBidFacet is ICFABiddable, CFABasePCOFacetModifiers {
      */
     function editBid(int96 newContributionRate, uint256 newForSalePrice)
         external
+        override
         onlyPayer
         onlyIfNotPendingBid
     {
@@ -147,6 +148,7 @@ contract CFAPenaltyBidFacet is ICFABiddable, CFABasePCOFacetModifiers {
      */
     function placeBid(int96 newContributionRate, uint256 newForSalePrice)
         external
+        override
         onlyIfPayerBidActive
     {
         LibCFAPenaltyBid.Bid storage _pendingBid = LibCFAPenaltyBid

diff --git a/contracts/pco-license/facets/CFAReclaimerFacet.sol b/contracts/pco-license/facets/CFAReclaimerFacet.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 import {CFABasePCOFacetModifiers} from "./CFABasePCOFacet.sol";
 import {CFAv1Library} from "@superfluid-finance/ethereum-contracts/contracts/apps/CFAv1Library.sol";

diff --git a/contracts/pco-license/facets/Reclaimer.sol b/contracts/pco-license/facets/Reclaimer.sol
diff --git a/contracts/pco-license/interfaces/IBasePCO.sol b/contracts/pco-license/interfaces/IBasePCO.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 
 interface IBasePCO {

diff --git a/contracts/pco-license/interfaces/ICFABiddable.sol b/contracts/pco-license/interfaces/ICFABiddable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 import "../libraries/LibCFAPenaltyBid.sol";
 

diff --git a/contracts/pco-license/libraries/LibCFABasePCO.sol b/contracts/pco-license/libraries/LibCFABasePCO.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 import "../../registry/interfaces/IPCOLicenseParamsStore.sol";
 import {CFAv1Library} from "@superfluid-finance/ethereum-contracts/contracts/apps/CFAv1Library.sol";

diff --git a/contracts/pco-license/libraries/LibCFAPenaltyBid.sol b/contracts/pco-license/libraries/LibCFAPenaltyBid.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 import "../../registry/interfaces/IPCOLicenseParamsStore.sol";
 import {CFAv1Library} from "@superfluid-finance/ethereum-contracts/contracts/apps/CFAv1Library.sol";

diff --git a/contracts/pco-license/libraries/LibCFAReclaimer.sol b/contracts/pco-license/libraries/LibCFAReclaimer.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 import "../../registry/interfaces/IPCOLicenseParamsStore.sol";
 import {CFAv1Library} from "@superfluid-finance/ethereum-contracts/contracts/apps/CFAv1Library.sol";

diff --git a/contracts/registry/facets/ERC721Facet.sol b/contracts/registry/facets/ERC721Facet.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 import "../libraries/LibERC721.sol";
 import "hardhat-deploy/solc_0.8/diamond/libraries/LibDiamond.sol";

diff --git a/contracts/registry/facets/GeoWebParcelFacet.sol b/contracts/registry/facets/GeoWebParcelFacet.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 import "../libraries/LibGeoWebParcel.sol";
 

diff --git a/contracts/registry/facets/GeoWebParcelFacet.test.sol b/contracts/registry/facets/GeoWebParcelFacet.test.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 import "../libraries/LibGeoWebParcel.sol";
 import "./GeoWebParcelFacet.sol";

diff --git a/contracts/registry/facets/PCOLicenseClaimerFacet.sol b/contracts/registry/facets/PCOLicenseClaimerFacet.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 import "../libraries/LibPCOLicenseClaimer.sol";
 import "../libraries/LibPCOLicenseParams.sol";

diff --git a/contracts/registry/facets/PCOLicenseParamsFacet.sol b/contracts/registry/facets/PCOLicenseParamsFacet.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 import "../libraries/LibPCOLicenseParams.sol";
 import "../interfaces/IPCOLicenseParamsStore.sol";
@@ -147,7 +147,7 @@ contract PCOLicenseParamsFacet is IPCOLicenseParamsStore {
     }
 
     /// @notice The numerator of the penalty rate.
-    function getPenaltyNumerator() external view returns (uint256) {
+    function getPenaltyNumerator() external view override returns (uint256) {
         LibPCOLicenseParams.DiamondStorage storage ds = LibPCOLicenseParams
             .diamondStorage();
 
@@ -164,7 +164,7 @@ contract PCOLicenseParamsFacet is IPCOLicenseParamsStore {
     }
 
     /// @notice The denominator of the penalty rate.
-    function getPenaltyDenominator() external view returns (uint256) {
+    function getPenaltyDenominator() external view override returns (uint256) {
         LibPCOLicenseParams.DiamondStorage storage ds = LibPCOLicenseParams
             .diamondStorage();
 

diff --git a/contracts/registry/interfaces/IPCOLicenseParamsStore.sol b/contracts/registry/interfaces/IPCOLicenseParamsStore.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.4;
 
 import {ISuperfluid} from "@superfluid-finance/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluid.sol";
 import {ISuperToken} from "@superfluid-finance/ethereum-contracts/contracts/interfaces/superfluid/ISuperToken.sol";

diff --git a/contracts/registry/libraries/LibERC721.sol b/contracts/registry/libraries/LibERC721.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 import "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import "@openzeppelin/contracts/utils/Address.sol";

diff --git a/contracts/registry/libraries/LibGeoWebCoordinate.sol b/contracts/registry/libraries/LibGeoWebCoordinate.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.14;
+pragma solidity ^0.8.4;
 
 /// @title LibGeoWebCoordinate is an unsigned 64-bit integer that contains x and y coordinates in the upper and lower 32 bits, respectively
 library LibGeoWebCoordinate {