feat!: moved OZ governance contract for customization

DuBento · Jul 24, 2023 · 1e16e4a · 1e16e4a
1 parent 9234bdc
commit 1e16e4a
Show file tree

Hide file tree

Showing 23 changed files with 1,744 additions and 20 deletions.
diff --git a/blockchain/contracts/DAO/GovernorContract.sol b/blockchain/contracts/DAO/GovernorContract.sol
@@ -1,18 +1,18 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-import "../OpenZeppelin/governance/Governor.sol";
-import "../OpenZeppelin/governance/extensions/GovernorCountingSimple.sol";
-import "../OpenZeppelin/governance/extensions/GovernorVotes.sol";
-import "../OpenZeppelin/governance/extensions/GovernorVotesQuorumFraction.sol";
-import "../OpenZeppelin/governance/extensions/GovernorSettings.sol";
+import "./governance/extensions/GovernorCountingSimple.sol";
+import "./governance/extensions/GovernorVotes.sol";
+import "./governance/extensions/GovernorVotesQuorumFraction.sol";
+import "./governance/extensions/GovernorSettings.sol";
+import "./governance/Governor.sol";
 
 contract GovernorContract is
     Governor,
     GovernorSettings,
     GovernorCountingSimple,
     GovernorVotes,
-    GovernorVotesQuorumFraction
+    GovernorVotesQuorumFraction,
 {
     constructor(
         IVotes _token,

diff --git a/blockchain/contracts/DAO/Governor.sol → ...ain/contracts/DAO/governance/Governor.sol b/blockchain/contracts/DAO/Governor.sol → ...ain/contracts/DAO/governance/Governor.sol
@@ -1,19 +1,17 @@
-// SPDX-License-Identifier: Apache-2.0
-// Based on Openzeppelin Contracts (last updated v4.9.1)
+// SPDX-License-Identifier: MIT
+// OpenZeppelin Contracts (last updated v4.9.1) (governance/Governor.sol)
 
 pragma solidity ^0.8.19;
 
-import "../OpenZeppelin/token/ERC721/IERC721Receiver.sol";
-import "../OpenZeppelin/token/ERC1155/IERC1155Receiver.sol";
-import "../OpenZeppelin/utils/cryptography/ECDSA.sol";
-import "../OpenZeppelin/utils/cryptography/EIP712.sol";
-import "../OpenZeppelin/utils/introspection/ERC165.sol";
-import "../OpenZeppelin/utils/math/SafeCast.sol";
-import "../OpenZeppelin/utils/structs/DoubleEndedQueue.sol";
-import "../OpenZeppelin/utils/Address.sol";
-import "../OpenZeppelin/utils/Context.sol";
-import "../OpenZeppelin/governance/IGovernor.sol";
-
+import "../../OpenZeppelin/token/ERC721/IERC721Receiver.sol";
+import "../../OpenZeppelin/token/ERC1155/IERC1155Receiver.sol";
+import "../../OpenZeppelin/utils/cryptography/ECDSA.sol";
+import "../../OpenZeppelin/utils/cryptography/EIP712.sol";
+import "../../OpenZeppelin/utils/introspection/ERC165.sol";
+import "../../OpenZeppelin/utils/math/SafeCast.sol";
+import "../../OpenZeppelin/utils/Address.sol";
+import "../../OpenZeppelin/utils/Context.sol";
+import "./IGovernor.sol";
 /**
  * @dev Core of the governance system, designed to be extended though various modules.
  *
@@ -23,7 +21,7 @@ import "../OpenZeppelin/governance/IGovernor.sol";
  * - A voting module must implement {_getVotes}
  * - Additionally, {votingPeriod} must also be implemented
  *
- * Modified version of governance contracts from OpenZeppelin v4.9.1
+ * _Available since v4.3._
  */
 abstract contract Governor is
     Context,