update the compiler version to 0.8.28

OriginProtocol · Jan 13, 2025 · a823daf · a823daf
1 parent 01d4cc2
commit a823daf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/contracts/contracts/token/WOETH.sol b/contracts/contracts/token/WOETH.sol
@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 import { ERC4626 } from "../../lib/openzeppelin/contracts/token/ERC20/extensions/ERC4626.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import { Governable } from "../governance/Governable.sol";
@@ -31,11 +32,11 @@ contract WOETH is ERC4626, Governable, Initializable {
         OETH(address(asset())).rebaseOptIn();
     }
 
-    function name() public view virtual override returns (string memory) {
+    function name() public view virtual override(ERC20, IERC20Metadata) returns (string memory) {
         return "Wrapped OETH";
     }
 
-    function symbol() public view virtual override returns (string memory) {
+    function symbol() public view virtual override(ERC20, IERC20Metadata) returns (string memory) {
         return "wOETH";
     }
 

diff --git a/contracts/contracts/token/WOSonic.sol b/contracts/contracts/token/WOSonic.sol
@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 import { ERC4626 } from "../../lib/openzeppelin/contracts/token/ERC20/extensions/ERC4626.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import { Governable } from "../governance/Governable.sol";
@@ -30,11 +31,11 @@ contract WOSonic is ERC4626, Governable, Initializable {
         OSonic(address(asset())).rebaseOptIn();
     }
 
-    function name() public view virtual override returns (string memory) {
+    function name() public view virtual override(ERC20, IERC20Metadata) returns (string memory) {
         return "Wrapped Origin Sonic";
     }
 
-    function symbol() public view virtual override returns (string memory) {
+    function symbol() public view virtual override(ERC20, IERC20Metadata) returns (string memory) {
         return "wOS";
     }
 

diff --git a/contracts/contracts/token/WrappedOusd.sol b/contracts/contracts/token/WrappedOusd.sol
@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 import { ERC4626 } from "../../lib/openzeppelin/contracts/token/ERC20/extensions/ERC4626.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import { Governable } from "../governance/Governable.sol";
@@ -26,11 +27,11 @@ contract WrappedOusd is ERC4626, Governable, Initializable {
         OUSD(address(asset())).rebaseOptIn();
     }
 
-    function name() public view override returns (string memory) {
+    function name() public view override(ERC20, IERC20Metadata) returns (string memory) {
         return "Wrapped OUSD";
     }
 
-    function symbol() public view override returns (string memory) {
+    function symbol() public view override(ERC20, IERC20Metadata) returns (string memory) {
         return "WOUSD";
     }
 

diff --git a/contracts/hardhat.config.js b/contracts/hardhat.config.js
@@ -97,7 +97,7 @@ const { provider, chainId } = getHardhatNetworkProperties();
 
 module.exports = {
   solidity: {
-    version: "0.8.10",
+    version: "0.8.28",
     settings: {
       optimizer: {
         enabled: true,