Use solc 0.8.21 + upgrade token-tests

makerdao · Apr 25, 2024 · 05b37bf · 05b37bf
1 parent 5c7c55c
commit 05b37bf
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/certora.yml b/.github/workflows/certora.yml
@@ -31,8 +31,8 @@ jobs:
       - name: Install solc-select
         run: pip3 install solc-select
 
-      - name: Solc Select 0.8.16
-        run: solc-select install 0.8.16
+      - name: Solc Select 0.8.21
+        run: solc-select install 0.8.21
 
       - name: Install Certora
         run: pip3 install certora-cli

diff --git a/Makefile b/Makefile
@@ -1,3 +1,3 @@
-PATH := ~/.solc-select/artifacts/solc-0.8.16:~/.solc-select/artifacts:$(PATH)
+PATH := ~/.solc-select/artifacts/solc-0.8.21:~/.solc-select/artifacts:$(PATH)
 certora-ngt     :; PATH=${PATH} certoraRun certora/Ngt.conf$(if $(rule), --rule $(rule),)
 certora-mkr-ngt :; PATH=${PATH} certoraRun certora/MkrNgt.conf$(if $(rule), --rule $(rule),)
diff --git a/certora/Auxiliar.sol b/certora/Auxiliar.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.8.16;
+pragma solidity 0.8.21;
 
 interface IERC1271 {
     function isValidSignature(

diff --git a/certora/MkrMock.sol b/certora/MkrMock.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.21;
 
 import "../src/Ngt.sol";
 

diff --git a/certora/MkrNgt.conf b/certora/MkrNgt.conf
@@ -9,7 +9,7 @@
         "MkrNgt:mkr=MkrMock"
     ],
     "rule_sanity": "basic",
-    "solc": "solc-0.8.16",
+    "solc": "solc-0.8.21",
     "solc_optimize_map": {
         "MkrNgt": "200",
         "Ngt": "200",

diff --git a/certora/Ngt.conf b/certora/Ngt.conf
@@ -5,7 +5,7 @@
         "certora/SignerMock.sol"
     ],
     "rule_sanity": "basic",
-    "solc": "solc-0.8.16",
+    "solc": "solc-0.8.21",
     "solc_optimize_map": {
         "Ngt": "200",
         "Auxiliar": "0",

diff --git a/certora/SignerMock.sol b/certora/SignerMock.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.21;
 
 contract SignerMock {
     bytes32 sig;

diff --git a/deploy/NgtDeploy.sol b/deploy/NgtDeploy.sol
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.21;
 
 import { ScriptTools } from "dss-test/ScriptTools.sol";
 

diff --git a/foundry.toml b/foundry.toml
@@ -2,7 +2,7 @@
 src = "src"
 out = "out"
 libs = ["lib"]
-solc = "0.8.16"
+solc = "0.8.21"
 optimizer = true
 optimizer_runs = 200
 verbosity = 3

diff --git a/lib/token-tests b/lib/token-tests
diff --git a/src/MkrNgt.sol b/src/MkrNgt.sol
@@ -17,7 +17,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.21;
 
 interface GemLike {
     function burn(address, uint256) external;

diff --git a/src/Ngt.sol b/src/Ngt.sol
@@ -18,7 +18,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.21;
 
 interface IERC1271 {
     function isValidSignature(

diff --git a/test/MkrNgt.t.sol b/test/MkrNgt.t.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.21;
 
 import "dss-test/DssTest.sol";
 

diff --git a/test/Ngt.t.sol b/test/Ngt.t.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.21;
 
 import "token-tests/TokenFuzzTests.sol";
 
@@ -20,7 +20,7 @@ contract NgtTest is TokenFuzzTests {
         _symbol_ = "NGT";
     }
 
-    function invariantMetadata() public {
+    function invariantMetadata() public view {
         assertEq(ngt.name(), "NstDAO Governance Token");
         assertEq(ngt.symbol(), "NGT");
         assertEq(ngt.version(), "1");

diff --git a/test/integration/Deployment.t.sol b/test/integration/Deployment.t.sol
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.21;
 
 import "dss-test/DssTest.sol";
+1 −1		lib/dss-test
+12 −1		src/TokenChecks.sol
+45 −20		src/TokenFuzzChecks.sol
+16 −5		src/TokenFuzzTests.sol
+4 −1		src/TokenTests.sol
+4 −2		src/tests/TokenTests.t.sol