refactor: add ownable interface

packages/contracts/contracts/Dependencies/IOwnable.sol

@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.17;
+
+interface IOwnable {
+    function transferOwnership(address newOwner) external;
+}

packages/contracts/contracts/Dependencies/Ownable.sol

@@ -2,6 +2,8 @@
 
 pragma solidity ^0.8.17;
 
+import "./IOwnable.sol";
+
 /**
  * Based on OpenZeppelin's Ownable contract:
  * https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/access/Ownable.sol
@@ -14,7 +16,7 @@ pragma solidity ^0.8.17;
  * `onlyOwner`, which can be applied to your functions to restrict their use to
  * the owner.
  */
-contract Ownable {
+contract Ownable is IOwnable {
     address private _owner;
 
     event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);

packages/contracts/contracts/Interfaces/ITHUSDToken.sol

@@ -4,8 +4,9 @@ pragma solidity ^0.8.17;
 
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import "../Dependencies/IERC2612.sol";
+import "../Dependencies/IOwnable.sol";
 
-interface ITHUSDToken is IERC20Metadata, IERC2612 {
+interface ITHUSDToken is IERC20Metadata, IOwnable, IERC2612 {
 
     // --- Events ---
 
@@ -30,5 +31,4 @@ interface ITHUSDToken is IERC20Metadata, IERC2612 {
     // --- Governance functions ---
     function startRevokeMintList(address _account) external;
     function finalizeRevokeMintList() external;
-    function transferOwnership(address newOwner) external;
 }

packages/contracts/contracts/UpgradeableContracts/THUSDOwner.sol → packages/contracts/contracts/THUSDOwner.sol

@@ -2,9 +2,9 @@
 
 pragma solidity ^0.8.17;
 
-import "../Interfaces/ITHUSDToken.sol";
-import "../Dependencies/CheckContract.sol";
-import "../Dependencies/Ownable.sol";
+import "./Interfaces/ITHUSDToken.sol";
+import "./Dependencies/CheckContract.sol";
+import "./Dependencies/Ownable.sol";
 
 contract THUSDOwner is Ownable, CheckContract {
     ITHUSDToken private thusdToken;

yarn.lock

@@ -4385,11 +4385,6 @@
     find-up "^4.1.0"
     fs-extra "^8.1.0"
 
-"@openzeppelin/[email protected]":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.0.tgz#70aaef469c8ac5bb0ff781480f3d321cbf7be3a8"
-  integrity sha512-+6i2j6vr2fdudTqkBvG+UOosankukxYzg3WN1nqU7ijjQ5A4osWaD3ip6CEz6YvDoSdZgcFVZoiGr7zRlUUoZw==
-
 "@openzeppelin/[email protected]":
   version "4.9.2"
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.2.tgz#1cb2d5e4d3360141a17dbc45094a8cad6aac16c1"