Add contracts/dataTypes

JoinColony · Jan 31, 2025 · 062b714 · 062b714
1 parent 8aa6cd6
commit 062b714
Show file tree

Hide file tree

Showing 34 changed files with 36 additions and 36 deletions.
diff --git a/contracts/colony/ColonyAuthority.sol b/contracts/colony/ColonyAuthority.sol
@@ -19,7 +19,7 @@
 pragma solidity 0.8.27;
 
 import { CommonAuthority } from "./../common/CommonAuthority.sol";
-import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
 
 // prettier-ignore
 contract ColonyAuthority is CommonAuthority {

diff --git a/contracts/colony/ColonyRoles.sol b/contracts/colony/ColonyRoles.sol
@@ -20,7 +20,7 @@ pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
 import { ColonyStorage } from "./ColonyStorage.sol";
-import { ContractRecoveryDataTypes } from "./../common/ContractRecoveryDataTypes.sol";
+import { ContractRecoveryDataTypes } from "./../dataTypes/ContractRecoveryDataTypes.sol";
 import { ColonyAuthority } from "./../colony/ColonyAuthority.sol";
 
 contract ColonyRoles is ColonyStorage, ContractRecoveryDataTypes {

diff --git a/contracts/colony/ColonyStorage.sol b/contracts/colony/ColonyStorage.sol
@@ -24,11 +24,11 @@ import { CommonStorage } from "./../common/CommonStorage.sol";
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
 import { DomainRoles } from "./../common/DomainRoles.sol";
 import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
-import { ColonyNetworkDataTypes } from "./../colonyNetwork/ColonyNetworkDataTypes.sol";
+import { ColonyNetworkDataTypes } from "./../dataTypes/ColonyNetworkDataTypes.sol";
 import { ColonyExtension } from "./../extensions/ColonyExtension.sol";
 import { PatriciaTreeProofs } from "./../patriciaTree/PatriciaTreeProofs.sol";
 import { ColonyAuthority } from "./ColonyAuthority.sol";
-import { ColonyDataTypes } from "./ColonyDataTypes.sol";
+import { ColonyDataTypes } from "./../dataTypes/ColonyDataTypes.sol";
 
 // ignore-file-swc-131
 // ignore-file-swc-108

diff --git a/contracts/colonyNetwork/ColonyNetworkExtensions.sol b/contracts/colonyNetwork/ColonyNetworkExtensions.sol
@@ -19,7 +19,7 @@
 pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
-import { ColonyDataTypes } from "../colony/ColonyDataTypes.sol";
+import { ColonyDataTypes } from "../dataTypes/ColonyDataTypes.sol";
 import { IColonyNetwork } from "../interfaces/IColonyNetwork.sol";
 import { ColonyExtension } from "../extensions/ColonyExtension.sol";
 import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";

diff --git a/contracts/colonyNetwork/ColonyNetworkMining.sol b/contracts/colonyNetwork/ColonyNetworkMining.sol
@@ -28,7 +28,7 @@ import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";
 import { IMetaColony } from "./../interfaces/IMetaColony.sol";
 import { IColonyBridge } from "./../interfaces/IColonyBridge.sol";
 import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
-import { ColonyDataTypes } from "./../colony/ColonyDataTypes.sol";
+import { ColonyDataTypes } from "./../dataTypes/ColonyDataTypes.sol";
 
 contract ColonyNetworkMining is ColonyNetworkStorage {
   // TODO: Can we handle a dispute regarding the very first hash that should be set?

diff --git a/contracts/colonyNetwork/ColonyNetworkStorage.sol b/contracts/colonyNetwork/ColonyNetworkStorage.sol
@@ -23,7 +23,7 @@ import { IMetaColony } from "./../interfaces/IMetaColony.sol";
 import { CommonStorage } from "./../common/CommonStorage.sol";
 import { MultiChain } from "./../common/MultiChain.sol";
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
-import { ColonyNetworkDataTypes } from "./ColonyNetworkDataTypes.sol";
+import { ColonyNetworkDataTypes } from "./../dataTypes/ColonyNetworkDataTypes.sol";
 
 // ignore-file-swc-131
 // ignore-file-swc-108

diff --git a/contracts/common/CommonAuthority.sol b/contracts/common/CommonAuthority.sol
@@ -18,7 +18,7 @@
 
 pragma solidity 0.8.27;
 
-import { CommonDataTypes } from "./CommonDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
 import { DomainRoles } from "./DomainRoles.sol";
 
 contract CommonAuthority is DomainRoles {

diff --git a/contracts/common/ContractRecovery.sol b/contracts/common/ContractRecovery.sol
@@ -18,8 +18,8 @@
 
 pragma solidity 0.8.27;
 
-import { CommonDataTypes } from "./CommonDataTypes.sol";
-import { ContractRecoveryDataTypes } from "./ContractRecoveryDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
+import { ContractRecoveryDataTypes } from "./../dataTypes/ContractRecoveryDataTypes.sol";
 import { CommonAuthority } from "./CommonAuthority.sol";
 import { CommonStorage } from "./CommonStorage.sol";
 import { IRecovery } from "./../interfaces/IRecovery.sol";

diff --git a/contracts/common/GetActionSummary.sol b/contracts/common/GetActionSummary.sol
@@ -18,7 +18,7 @@
 import { IColony } from "./../interfaces/IColony.sol";
 import { ExtractCallData } from "./ExtractCallData.sol";
 import { GetActionDomainSkillId } from "./GetActionDomainSkillId.sol";
-import { CommonDataTypes } from "./CommonDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
 import { ColonyRoles } from "./../colony/ColonyRoles.sol";
 import { Bytes4Includes } from "./Bytes4Includes.sol";
 

diff --git a/contracts/colony/ColonyDataTypes.sol → contracts/dataTypes/ColonyDataTypes.sol b/contracts/colony/ColonyDataTypes.sol → contracts/dataTypes/ColonyDataTypes.sol
@@ -18,7 +18,7 @@
 
 pragma solidity 0.8.27;
 
-import { CommonDataTypes } from "../common/CommonDataTypes.sol";
+import { CommonDataTypes } from "./CommonDataTypes.sol";
 
 // prettier-ignore
 interface ColonyDataTypes is CommonDataTypes {

diff --git a/.../colonyNetwork/ColonyNetworkDataTypes.sol → ...acts/dataTypes/ColonyNetworkDataTypes.sol b/.../colonyNetwork/ColonyNetworkDataTypes.sol → ...acts/dataTypes/ColonyNetworkDataTypes.sol
diff --git a/contracts/common/CommonDataTypes.sol → contracts/dataTypes/CommonDataTypes.sol b/contracts/common/CommonDataTypes.sol → contracts/dataTypes/CommonDataTypes.sol
diff --git a/...acts/common/ContractRecoveryDataTypes.sol → ...s/dataTypes/ContractRecoveryDataTypes.sol b/...acts/common/ContractRecoveryDataTypes.sol → ...s/dataTypes/ContractRecoveryDataTypes.sol
diff --git a/...gCycle/ReputationMiningCycleDataTypes.sol → ...aTypes/ReputationMiningCycleDataTypes.sol b/...gCycle/ReputationMiningCycleDataTypes.sol → ...aTypes/ReputationMiningCycleDataTypes.sol
diff --git a/contracts/extensions/CoinMachine.sol b/contracts/extensions/CoinMachine.sol
@@ -24,7 +24,7 @@ import { IBasicMetaTransaction } from "./../interfaces/IBasicMetaTransaction.sol
 import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
 import { ColonyExtension } from "./ColonyExtension.sol";
 import { Whitelist } from "./Whitelist.sol";
-import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
 
 // ignore-file-swc-108
 

diff --git a/contracts/extensions/ColonyExtension.sol b/contracts/extensions/ColonyExtension.sol
@@ -24,7 +24,7 @@ import { DSAuth } from "./../../lib/dappsys/auth.sol";
 import { EtherRouter } from "./../common/EtherRouter.sol";
 import { Multicall } from "./../common/Multicall.sol";
 import { IColony } from "./../interfaces/IColony.sol";
-import { ColonyDataTypes } from "./../colony/ColonyDataTypes.sol";
+import { ColonyDataTypes } from "./../dataTypes/ColonyDataTypes.sol";
 import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 import { PatriciaTreeProofs } from "./../patriciaTree/PatriciaTreeProofs.sol";
 import { MultiChain } from "./../common/MultiChain.sol";

diff --git a/contracts/extensions/FundingQueue.sol b/contracts/extensions/FundingQueue.sol
@@ -19,7 +19,7 @@
 pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
-import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
 import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 import { IBasicMetaTransaction } from "./../interfaces/IBasicMetaTransaction.sol";
 import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";

diff --git a/contracts/extensions/MultisigPermissions.sol b/contracts/extensions/MultisigPermissions.sol
@@ -19,13 +19,13 @@ pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
 import { IColony } from "./../interfaces/IColony.sol";
-import { ColonyDataTypes } from "./../colony/ColonyDataTypes.sol";
+import { ColonyDataTypes } from "./../dataTypes/ColonyDataTypes.sol";
 import { ColonyRoles } from "./../colony/ColonyRoles.sol";
 import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
-import { ColonyNetworkDataTypes } from "./../colonyNetwork/ColonyNetworkDataTypes.sol";
+import { ColonyNetworkDataTypes } from "./../dataTypes/ColonyNetworkDataTypes.sol";
 import { ColonyExtensionMeta } from "./ColonyExtensionMeta.sol";
 import { GetActionSummary, ActionSummary } from "./../common/GetActionSummary.sol";
-import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
 import { Bytes4Includes } from "./../common/Bytes4Includes.sol";
 
 // ignore-file-swc-108

diff --git a/contracts/extensions/OneTxPayment.sol b/contracts/extensions/OneTxPayment.sol
@@ -19,7 +19,7 @@
 pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
-import { CommonDataTypes } from "../common/CommonDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
 import { ColonyExtension } from "./ColonyExtension.sol";
 import { IBasicMetaTransaction } from "./../interfaces/IBasicMetaTransaction.sol";
 import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";

diff --git a/contracts/extensions/ReputationBootstrapper.sol b/contracts/extensions/ReputationBootstrapper.sol
@@ -23,7 +23,7 @@ import { ERC20 } from "./../../lib/dappsys/erc20.sol";
 import { IReputationMiningCycle } from "./../interfaces/IReputationMiningCycle.sol";
 import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 import { ColonyExtensionMeta } from "./ColonyExtensionMeta.sol";
-import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
 
 // ignore-file-swc-108
 

diff --git a/contracts/extensions/StagedExpenditure.sol b/contracts/extensions/StagedExpenditure.sol
@@ -20,8 +20,8 @@ pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
 import { IColony } from "./../interfaces/IColony.sol";
-import { ColonyDataTypes } from "./../colony/ColonyDataTypes.sol";
-import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
+import { ColonyDataTypes } from "./../dataTypes/ColonyDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
 import { ColonyExtensionMeta } from "./ColonyExtensionMeta.sol";
 
 // ignore-file-swc-108

diff --git a/contracts/extensions/StakedExpenditure.sol b/contracts/extensions/StakedExpenditure.sol
@@ -19,8 +19,8 @@
 pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
-import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
-import { ColonyDataTypes } from "./../colony/ColonyDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
+import { ColonyDataTypes } from "./../dataTypes/ColonyDataTypes.sol";
 import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 import { ColonyExtensionMeta } from "./ColonyExtensionMeta.sol";
 

diff --git a/contracts/extensions/StreamingPayments.sol b/contracts/extensions/StreamingPayments.sol
@@ -20,7 +20,7 @@ pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
 import { ColonyExtensionMeta } from "./ColonyExtensionMeta.sol";
-import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
 
 // ignore-file-swc-108
 

diff --git a/contracts/extensions/TokenSupplier.sol b/contracts/extensions/TokenSupplier.sol
@@ -24,7 +24,7 @@ import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
 import { ColonyExtension } from "./ColonyExtension.sol";
 import { IColony } from "./../interfaces/IColony.sol";
-import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
 contract TokenSupplier is ColonyExtension, BasicMetaTransaction {
   uint256 constant ISSUANCE_PERIOD = 1 days;
 

diff --git a/contracts/extensions/Whitelist.sol b/contracts/extensions/Whitelist.sol
@@ -23,7 +23,7 @@ import { IBasicMetaTransaction } from "./../interfaces/IBasicMetaTransaction.sol
 import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
 import { ColonyExtension } from "./ColonyExtension.sol";
 import { IColony } from "./../interfaces/IColony.sol";
-import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
 import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 
 // ignore-file-swc-108

diff --git a/contracts/extensions/votingReputation/VotingReputation.sol b/contracts/extensions/votingReputation/VotingReputation.sol
@@ -21,7 +21,7 @@ pragma experimental ABIEncoderV2;
 
 import { VotingReputationStorage } from "./VotingReputationStorage.sol";
 import { IColony } from "./../../interfaces/IColony.sol";
-import { ColonyDataTypes } from "./../../colony/ColonyDataTypes.sol";
+import { ColonyDataTypes } from "./../../dataTypes/ColonyDataTypes.sol";
 import { ActionSummary } from "./../../common/GetActionSummary.sol";
 
 contract VotingReputation is VotingReputationStorage {

diff --git a/contracts/extensions/votingReputation/VotingReputationDataTypes.sol b/contracts/extensions/votingReputation/VotingReputationDataTypes.sol
@@ -18,7 +18,7 @@
 
 pragma solidity 0.8.27;
 
-import { ColonyDataTypes } from "./../../colony/ColonyDataTypes.sol";
+import { ColonyDataTypes } from "./../../dataTypes/ColonyDataTypes.sol";
 
 // prettier-ignore
 interface VotingReputationDataTypes {

diff --git a/contracts/extensions/votingReputation/VotingReputationStorage.sol b/contracts/extensions/votingReputation/VotingReputationStorage.sol
@@ -21,7 +21,7 @@ pragma experimental ABIEncoderV2;
 
 import { IColonyNetwork } from "./../../interfaces/IColonyNetwork.sol";
 import { IColony } from "./../../interfaces/IColony.sol";
-import { CommonDataTypes } from "./../../common/CommonDataTypes.sol";
+import { CommonDataTypes } from "./../../dataTypes/CommonDataTypes.sol";
 import { IBasicMetaTransaction } from "./../../interfaces/IBasicMetaTransaction.sol";
 import { BasicMetaTransaction } from "./../../common/BasicMetaTransaction.sol";
 import { ActionSummary, GetActionSummary } from "./../../common/GetActionSummary.sol";

diff --git a/contracts/interfaces/IColony.sol b/contracts/interfaces/IColony.sol
@@ -22,7 +22,7 @@ pragma experimental ABIEncoderV2;
 import { IRecovery } from "./IRecovery.sol";
 import { IBasicMetaTransaction } from "./IBasicMetaTransaction.sol";
 import { IMulticall } from "./IMulticall.sol";
-import { ColonyDataTypes } from "./../colony/ColonyDataTypes.sol";
+import { ColonyDataTypes } from "./../dataTypes/ColonyDataTypes.sol";
 import { IDSAuth } from "./IDSAuth.sol";
 
 interface IColony is IDSAuth, ColonyDataTypes, IRecovery, IBasicMetaTransaction, IMulticall {

diff --git a/contracts/interfaces/IColonyNetwork.sol b/contracts/interfaces/IColonyNetwork.sol
@@ -22,7 +22,7 @@ pragma experimental "ABIEncoderV2";
 import { IRecovery } from "./IRecovery.sol";
 import { IBasicMetaTransaction } from "./IBasicMetaTransaction.sol";
 import { IMulticall } from "./IMulticall.sol";
-import { ColonyNetworkDataTypes } from "./../colonyNetwork/ColonyNetworkDataTypes.sol";
+import { ColonyNetworkDataTypes } from "./../dataTypes/ColonyNetworkDataTypes.sol";
 
 interface IColonyNetwork is ColonyNetworkDataTypes, IRecovery, IBasicMetaTransaction, IMulticall {
   /// @notice Query if a contract implements an interface

diff --git a/contracts/interfaces/IRecovery.sol b/contracts/interfaces/IRecovery.sol
@@ -19,7 +19,7 @@
 pragma solidity >=0.8.27; // ignore-swc-103
 pragma experimental "ABIEncoderV2";
 
-import { ContractRecoveryDataTypes } from "./../common/ContractRecoveryDataTypes.sol";
+import { ContractRecoveryDataTypes } from "./../dataTypes/ContractRecoveryDataTypes.sol";
 
 interface IRecovery is ContractRecoveryDataTypes {
   /// @notice Put colony network mining into recovery mode.

diff --git a/contracts/interfaces/IReputationMiningCycle.sol b/contracts/interfaces/IReputationMiningCycle.sol
@@ -19,7 +19,7 @@
 pragma solidity >=0.8.27; // ignore-swc-103
 pragma experimental "ABIEncoderV2";
 
-import { ReputationMiningCycleDataTypes } from "./../reputationMiningCycle/ReputationMiningCycleDataTypes.sol";
+import { ReputationMiningCycleDataTypes } from "./../dataTypes/ReputationMiningCycleDataTypes.sol";
 
 interface IReputationMiningCycle is ReputationMiningCycleDataTypes {
   /// @notice The getter for the disputeRounds mapping.

diff --git a/contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol b/contracts/reputationMiningCycle/ReputationMiningCycleStorage.sol
@@ -19,7 +19,7 @@
 pragma solidity 0.8.27;
 
 import { DSAuth } from "./../../lib/dappsys/auth.sol";
-import { ReputationMiningCycleDataTypes } from "./../reputationMiningCycle/ReputationMiningCycleDataTypes.sol";
+import { ReputationMiningCycleDataTypes } from "./../dataTypes/ReputationMiningCycleDataTypes.sol";
 
 // ignore-file-swc-131
 // ignore-file-swc-108

diff --git a/contracts/testHelpers/VotingReputationMisaligned.sol b/contracts/testHelpers/VotingReputationMisaligned.sol
@@ -27,7 +27,7 @@ import { ERC20Extended } from "./../common/ERC20Extended.sol";
 import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
 import { ColonyExtension } from "./../extensions/ColonyExtension.sol";
 import { IColony } from "./../interfaces/IColony.sol";
-import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
 contract VotingReputationMisaligned is ColonyExtension, BasicMetaTransaction {
   // Events
   event MotionCreated(uint256 indexed motionId, address creator, uint256 indexed domainId);