Upgrade solidity version

.solhint.json

@@ -43,7 +43,7 @@
         "visibility-modifier-order": "error",
         "compiler-version": [
             "warn",
-            "0.8.21"
+            "0.8.23"
         ],
         "func-visibility": [
             "warn",

foundry.toml

@@ -9,7 +9,7 @@ cache_path = "cache"
 broadcast = "broadcast"
 gas_reports = ["MToken", "Protocol", "ProtocolHarness"]
 gas_reports_ignore = []
-solc-version = "0.8.21"
+solc-version = "0.8.23"
 optimizer = false
 verbosity = 3
 ignored_error_codes = []

script/Deploy.s.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { DeployBase } from "./DeployBase.s.sol";
 

script/DeployBase.s.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { Script, console } from "../lib/forge-std/src/Script.sol";
 import { ContractHelper } from "../lib/common/src/ContractHelper.sol";

src/ContinuousIndexing.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { IContinuousIndexing } from "./interfaces/IContinuousIndexing.sol";
 

src/EarnerRateModel.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { SPOGRegistrarReader } from "./libs/SPOGRegistrarReader.sol";
 

src/MToken.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { IERC20 } from "../lib/common/src/interfaces/IERC20.sol";
 
@@ -99,7 +99,7 @@ contract MToken is IMToken, ContinuousIndexing, ERC20Permit {
     |                                       External/Public View/Pure Functions                                        |
     \******************************************************************************************************************/
 
-    function balanceOf(address account_) external view override(ERC20Permit, IERC20) returns (uint256 balance_) {
+    function balanceOf(address account_) external view returns (uint256 balance_) {
         return _isEarning[account_] ? _getPresentAmount(_balances[account_], currentIndex()) : _balances[account_];
     }
 
@@ -127,7 +127,7 @@ contract MToken is IMToken, ContinuousIndexing, ERC20Permit {
         return _totalNonEarningSupply;
     }
 
-    function totalSupply() external view override(ERC20Permit, IERC20) returns (uint256 totalSupply_) {
+    function totalSupply() external view returns (uint256 totalSupply_) {
         return _totalNonEarningSupply + totalEarningSupply();
     }
 

src/MinterRateModel.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { SPOGRegistrarReader } from "./libs/SPOGRegistrarReader.sol";
 

src/Protocol.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { SignatureChecker } from "../lib/common/src/SignatureChecker.sol";
-import { StatelessERC712 } from "../lib/common/src/StatelessERC712.sol";
+import { ERC712 } from "../lib/common/src/ERC712.sol";
 
 import { SPOGRegistrarReader } from "./libs/SPOGRegistrarReader.sol";
 
@@ -19,7 +19,7 @@ import { ContinuousIndexing } from "./ContinuousIndexing.sol";
  * @author M^ZERO LABS_
  * @notice Core protocol of M^ZERO ecosystem. TODO Add description.
  */
-contract Protocol is IProtocol, ContinuousIndexing, StatelessERC712 {
+contract Protocol is IProtocol, ContinuousIndexing, ERC712 {
     // TODO: bit-packing
     struct MintProposal {
         uint256 id; // TODO: uint96 or uint48 if 2 additional fields
@@ -96,7 +96,7 @@ contract Protocol is IProtocol, ContinuousIndexing, StatelessERC712 {
      * @param spogRegistrar_ The address of the SPOG Registrar contract.
      * @param mToken_ The address of the M Token.
      */
-    constructor(address spogRegistrar_, address mToken_) ContinuousIndexing() StatelessERC712("Protocol") {
+    constructor(address spogRegistrar_, address mToken_) ContinuousIndexing() ERC712("Protocol") {
         if ((spogRegistrar = spogRegistrar_) == address(0)) revert ZeroSpogRegistrar();
         if ((spogVault = SPOGRegistrarReader.getVault(spogRegistrar_)) == address(0)) revert ZeroSpogVault();
         if ((mToken = mToken_) == address(0)) revert ZeroMToken();

src/interfaces/IContinuousIndexing.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 interface IContinuousIndexing {
     event IndexUpdated(uint256 indexed index, uint256 indexed rate);

src/interfaces/IEarnerRateModel.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { IRateModel } from "./IRateModel.sol";
 

src/interfaces/IMToken.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { IERC20Permit } from "../../lib/common/src/interfaces/IERC20Permit.sol";
 

src/interfaces/IMinterRateModel.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { IRateModel } from "./IRateModel.sol";
 

src/interfaces/IProtocol.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { IContinuousIndexing } from "./IContinuousIndexing.sol";
 

src/interfaces/IRateModel.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 interface IRateModel {
     /**

src/interfaces/ISPOGRegistrar.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 interface ISPOGRegistrar {
     function get(bytes32 key) external view returns (bytes32 value);

src/libs/ContinuousIndexingMath.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 // TODO: Can optimize with base-2 scales instead of base-10 (so we can shift instead of divide)
 

src/libs/SPOGRegistrarReader.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { ISPOGRegistrar } from "../interfaces/ISPOGRegistrar.sol";
 

test/Integrations.t.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { console2, stdError, Test } from "../lib/forge-std/src/Test.sol";
 

test/InterestMath.t.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { console2, Test } from "../lib/forge-std/src/Test.sol";
 

test/MToken.t.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { console2, stdError, Test } from "../lib/forge-std/src/Test.sol";
 

test/Protocol.t.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { console2, stdError, Test } from "../lib/forge-std/src/Test.sol";
 

test/utils/DigestHelper.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: UNLICENSED
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
-import { IStatelessERC712 } from "../../lib/common/src/interfaces/IStatelessERC712.sol";
+import { IERC712 } from "../../lib/common/src/interfaces/IERC712.sol";
 
 import { IProtocol } from "../../src/interfaces/IProtocol.sol";
 
@@ -23,7 +23,7 @@ library DigestHelper {
     }
 
     function getUpdateCollateralDigest(address protocol, bytes32 internalDigest) public view returns (bytes32 digest_) {
-        return keccak256(abi.encodePacked("\x19\x01", IStatelessERC712(protocol).DOMAIN_SEPARATOR(), internalDigest));
+        return keccak256(abi.encodePacked("\x19\x01", IERC712(protocol).DOMAIN_SEPARATOR(), internalDigest));
     }
 
     function getUpdateCollateralInternalDigest(

test/utils/MTokenHarness.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { MToken } from "../../src/MToken.sol";
 

test/utils/Mocks.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import "../../src/interfaces/ISPOGRegistrar.sol";
 

test/utils/ProtocolHarness.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 
-pragma solidity 0.8.21;
+pragma solidity 0.8.23;
 
 import { Protocol } from "../../src/Protocol.sol";