Add support for Blockscout

contracts/bridging/WormholeBridgeForColony.sol

@@ -19,8 +19,7 @@
 pragma solidity 0.8.27;
 
 import { IWormhole } from "../../lib/wormhole/ethereum/contracts/interfaces/IWormhole.sol";
-import { IColonyNetwork } from "../colonyNetwork/IColonyNetwork.sol";
-import { IColonyBridge } from "./IColonyBridge.sol";
+import { IColonyBridge } from "../interfaces/IColonyBridge.sol";
 import { CallWithGuards } from "../common/CallWithGuards.sol";
 import { DSAuth } from "../../lib/dappsys/auth.sol";
 

contracts/colony/Colony.sol

@@ -21,14 +21,13 @@ pragma experimental ABIEncoderV2;
 
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
 import { Multicall } from "./../common/Multicall.sol";
-import { IEtherRouter } from "./../common/IEtherRouter.sol";
+import { IEtherRouter } from "./../interfaces/IEtherRouter.sol";
 import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
-import { ITokenLocking } from "./../tokenLocking/ITokenLocking.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 import { PatriciaTreeProofs } from "./../patriciaTree/PatriciaTreeProofs.sol";
 import { ColonyStorage } from "./ColonyStorage.sol";
 import { ColonyAuthority } from "./ColonyAuthority.sol";
-import { ColonyExtension } from "./../extensions/ColonyExtension.sol";
 
 contract Colony is BasicMetaTransaction, Multicall, ColonyStorage, PatriciaTreeProofs {
   // This function, exactly as defined, is used in build scripts. Take care when updating.

contracts/colony/ColonyArbitraryTransaction.sol

@@ -20,12 +20,12 @@ pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
-import { IEtherRouter } from "./../common/IEtherRouter.sol";
+import { IEtherRouter } from "./../interfaces/IEtherRouter.sol";
 import { MultiChain } from "./../common/MultiChain.sol";
-import { ITokenLocking } from "./../tokenLocking/ITokenLocking.sol";
+import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
 import { ColonyStorage } from "./ColonyStorage.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
-import { ColonyExtension } from "./../extensions/ColonyExtension.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
+import { IColonyExtension } from "./../interfaces/IColonyExtension.sol";
 
 contract ColonyArbitraryTransaction is ColonyStorage {
   bytes4 constant APPROVE_SIG = bytes4(keccak256("approve(address,uint256)"));
@@ -100,7 +100,7 @@ contract ColonyArbitraryTransaction is ColonyStorage {
     // Prevent transactions to network-managed extensions installed in this colony
     require(isContract(_to), "colony-to-must-be-contract");
     // slither-disable-next-line unused-return
-    try ColonyExtension(_to).identifier() returns (bytes32 extensionId) {
+    try IColonyExtension(_to).identifier() returns (bytes32 extensionId) {
       require(
         IColonyNetwork(colonyNetworkAddress).getExtensionInstallation(extensionId, address(this)) !=
           _to,

contracts/colony/ColonyAuthority.sol

@@ -19,15 +19,15 @@
 pragma solidity 0.8.27;
 
 import { CommonAuthority } from "./../common/CommonAuthority.sol";
-import { ColonyDataTypes } from "./ColonyDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
 
 // prettier-ignore
 contract ColonyAuthority is CommonAuthority {
-  uint8 constant FUNDING_ROLE = uint8(ColonyDataTypes.ColonyRole.Funding);
-  uint8 constant ADMINISTRATION_ROLE = uint8(ColonyDataTypes.ColonyRole.Administration);
-  uint8 constant ARBITRATION_ROLE = uint8(ColonyDataTypes.ColonyRole.Arbitration);
-  uint8 constant ARCHITECTURE_ROLE = uint8(ColonyDataTypes.ColonyRole.Architecture);
-  uint8 constant ROOT_ROLE = uint8(ColonyDataTypes.ColonyRole.Root);
+  uint8 constant FUNDING_ROLE = uint8(CommonDataTypes.ColonyRole.Funding);
+  uint8 constant ADMINISTRATION_ROLE = uint8(CommonDataTypes.ColonyRole.Administration);
+  uint8 constant ARBITRATION_ROLE = uint8(CommonDataTypes.ColonyRole.Arbitration);
+  uint8 constant ARCHITECTURE_ROLE = uint8(CommonDataTypes.ColonyRole.Architecture);
+  uint8 constant ROOT_ROLE = uint8(CommonDataTypes.ColonyRole.Root);
 
   // colony is used in the constructor by calls to addRoleCapability, despite what slither thinks
   // slither-disable-next-line immutable-states

contracts/colony/ColonyDomains.sol

@@ -20,7 +20,7 @@ pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
 import { ColonyStorage } from "./ColonyStorage.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 
 contract ColonyDomains is ColonyStorage {
   // prettier-ignore

contracts/colony/ColonyFunding.sol

@@ -19,10 +19,10 @@
 pragma solidity 0.8.27;
 pragma experimental "ABIEncoderV2";
 
-import { ITokenLocking } from "./../tokenLocking/ITokenLocking.sol";
+import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
 import { ColonyStorage } from "./ColonyStorage.sol";
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 
 contract ColonyFunding is
   ColonyStorage // ignore-swc-123

contracts/colony/ColonyRewards.sol

@@ -19,11 +19,11 @@
 pragma solidity 0.8.27;
 pragma experimental "ABIEncoderV2";
 
-import { ITokenLocking } from "./../tokenLocking/ITokenLocking.sol";
+import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
 import { ColonyStorage } from "./ColonyStorage.sol";
 import { PatriciaTreeProofs } from "./../patriciaTree/PatriciaTreeProofs.sol";
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 
 contract ColonyRewards is
   ColonyStorage,

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 {

contracts/colony/ColonyStorage.sol

@@ -23,12 +23,12 @@ import { DSMath } from "./../../lib/dappsys/math.sol";
 import { CommonStorage } from "./../common/CommonStorage.sol";
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
 import { DomainRoles } from "./../common/DomainRoles.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
-import { ColonyNetworkDataTypes } from "./../colonyNetwork/ColonyNetworkDataTypes.sol";
-import { ColonyExtension } from "./../extensions/ColonyExtension.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
+import { ColonyNetworkDataTypes } from "./../dataTypes/ColonyNetworkDataTypes.sol";
+import { IColonyExtension } from "./../interfaces/IColonyExtension.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
@@ -265,7 +265,7 @@ contract ColonyStorage is ColonyDataTypes, ColonyNetworkDataTypes, DSMath, Commo
     }
 
     // slither-disable-next-line unused-return
-    try ColonyExtension(addr).identifier() returns (bytes32 extensionId) {
+    try IColonyExtension(addr).identifier() returns (bytes32 extensionId) {
       return
         IColonyNetwork(colonyNetworkAddress).getExtensionInstallation(extensionId, address(this)) ==
         addr;
@@ -280,9 +280,9 @@ contract ColonyStorage is ColonyDataTypes, ColonyNetworkDataTypes, DSMath, Commo
     }
 
     // slither-disable-next-line unused-return
-    try ColonyExtension(addr).identifier() returns (bytes32 extensionId) {
+    try IColonyExtension(addr).identifier() returns (bytes32 extensionId) {
       // slither-disable-next-line unused-return
-      try ColonyExtension(addr).getColony() returns (address claimedAssociatedColony) {
+      try IColonyExtension(addr).getColony() returns (address claimedAssociatedColony) {
         return
           IColonyNetwork(colonyNetworkAddress).getExtensionInstallation(
             extensionId,

contracts/colony/IColony.sol.flattened

@@ -0,0 +1 @@
+

contracts/colonyNetwork/ColonyNetwork.sol

@@ -20,7 +20,7 @@ pragma solidity 0.8.27;
 pragma experimental "ABIEncoderV2";
 
 import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
-import { IReputationMiningCycle } from "./../reputationMiningCycle/IReputationMiningCycle.sol";
+import { IReputationMiningCycle } from "./../interfaces/IReputationMiningCycle.sol";
 import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";
 import { Multicall } from "./../common/Multicall.sol";
 

contracts/colonyNetwork/ColonyNetworkAuction.sol

@@ -22,7 +22,7 @@ import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";
 import { MultiChain } from "./../common/MultiChain.sol";
 import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
-import { IMetaColony } from "./../colony/IMetaColony.sol";
+import { IMetaColony } from "./../interfaces/IMetaColony.sol";
 import { DSMath } from "./../../lib/dappsys/math.sol";
 
 contract ColonyNetworkAuction is ColonyNetworkStorage {

contracts/colonyNetwork/ColonyNetworkDeployer.sol

@@ -20,9 +20,9 @@ pragma solidity 0.8.27;
 pragma experimental "ABIEncoderV2";
 import { EtherRouter } from "./../common/EtherRouter.sol";
 import { ColonyAuthority } from "./../colony/ColonyAuthority.sol";
-import { IColony } from "./../colony/IColony.sol";
+import { IColony } from "./../interfaces/IColony.sol";
 import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";
-import { IColonyNetwork } from "./IColonyNetwork.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 import { MetaTxToken } from "./../metaTxToken/MetaTxToken.sol";
 import { DSAuth, DSAuthority } from "./../../lib/dappsys/auth.sol";
 import { ICreateX } from "./../../lib/createx/src/ICreateX.sol";

contracts/colonyNetwork/ColonyNetworkExtensions.sol

@@ -19,9 +19,9 @@
 pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
-import { ColonyDataTypes } from "../colony/ColonyDataTypes.sol";
-import { IColonyNetwork } from "../colonyNetwork/IColonyNetwork.sol";
-import { ColonyExtension } from "../extensions/ColonyExtension.sol";
+import { ColonyDataTypes } from "../dataTypes/ColonyDataTypes.sol";
+import { IColonyNetwork } from "../interfaces/IColonyNetwork.sol";
+import { IColonyExtension } from "../interfaces/IColonyExtension.sol";
 import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";
 import { MetaTxToken } from "./../metaTxToken/MetaTxToken.sol";
 import { TokenAuthority } from "./../common/TokenAuthority.sol";
@@ -68,7 +68,7 @@ contract ColonyNetworkExtensions is ColonyNetworkStorage {
     installations[_extensionId][msgSender()] = payable(address(extension));
 
     extension.setResolver(resolvers[_extensionId][_version]);
-    ColonyExtension(address(extension)).install(msgSender());
+    IColonyExtension(address(extension)).install(msgSender());
 
     emit ExtensionInstalled(_extensionId, msgSender(), _version);
   }
@@ -84,7 +84,7 @@ contract ColonyNetworkExtensions is ColonyNetworkStorage {
 
     address payable extension = installations[_extensionId][msgSender()];
     require(
-      _newVersion == ColonyExtension(extension).version() + 1,
+      _newVersion == IColonyExtension(extension).version() + 1,
       "colony-network-extension-bad-increment"
     );
     require(
@@ -93,8 +93,8 @@ contract ColonyNetworkExtensions is ColonyNetworkStorage {
     );
 
     EtherRouter(extension).setResolver(resolvers[_extensionId][_newVersion]);
-    ColonyExtension(extension).finishUpgrade();
-    assert(ColonyExtension(extension).version() == _newVersion);
+    IColonyExtension(extension).finishUpgrade();
+    assert(IColonyExtension(extension).version() == _newVersion);
 
     emit ExtensionUpgraded(_extensionId, msgSender(), _newVersion);
   }
@@ -103,7 +103,7 @@ contract ColonyNetworkExtensions is ColonyNetworkStorage {
     bytes32 _extensionId,
     bool _deprecated
   ) public stoppable calledByColony {
-    ColonyExtension(installations[_extensionId][msgSender()]).deprecate(_deprecated);
+    IColonyExtension(installations[_extensionId][msgSender()]).deprecate(_deprecated);
 
     emit ExtensionDeprecated(_extensionId, msgSender(), _deprecated);
   }
@@ -114,7 +114,7 @@ contract ColonyNetworkExtensions is ColonyNetworkStorage {
       "colony-network-extension-not-installed"
     );
 
-    ColonyExtension extension = ColonyExtension(installations[_extensionId][msgSender()]);
+    IColonyExtension extension = IColonyExtension(installations[_extensionId][msgSender()]);
     installations[_extensionId][msgSender()] = payable(address(0x0));
     extension.uninstall();
 
@@ -143,14 +143,14 @@ contract ColonyNetworkExtensions is ColonyNetworkStorage {
 
   function getExtensionId(address _resolver) internal returns (bytes32) {
     address extension = Resolver(_resolver).lookup(IDENTIFIER_SIG);
-    return ColonyExtension(extension).identifier();
+    return IColonyExtension(extension).identifier();
   }
 
   bytes4 constant VERSION_SIG = bytes4(keccak256("version()"));
 
   function getResolverVersion(address _resolver) internal returns (uint256) {
     address extension = Resolver(_resolver).lookup(VERSION_SIG);
-    return ColonyExtension(extension).version();
+    return IColonyExtension(extension).version();
   }
 
   function deployTokenViaNetwork(

contracts/colonyNetwork/ColonyNetworkMining.sol

@@ -22,13 +22,13 @@ pragma experimental "ABIEncoderV2";
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
 import { EtherRouter } from "./../common/EtherRouter.sol";
 import { MultiChain } from "./../common/MultiChain.sol";
-import { IReputationMiningCycle } from "./../reputationMiningCycle/IReputationMiningCycle.sol";
-import { ITokenLocking } from "./../tokenLocking/ITokenLocking.sol";
+import { IReputationMiningCycle } from "./../interfaces/IReputationMiningCycle.sol";
+import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
 import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";
-import { IMetaColony } from "./../colony/IMetaColony.sol";
-import { IColonyBridge } from "./../bridging/IColonyBridge.sol";
-import { IColonyNetwork } from "./IColonyNetwork.sol";
-import { ColonyDataTypes } from "./../colony/ColonyDataTypes.sol";
+import { IMetaColony } from "./../interfaces/IMetaColony.sol";
+import { IColonyBridge } from "./../interfaces/IColonyBridge.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.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?

contracts/colonyNetwork/ColonyNetworkSkills.sol

@@ -18,10 +18,10 @@
 pragma solidity 0.8.27;
 pragma experimental "ABIEncoderV2";
 
-import "./../reputationMiningCycle/IReputationMiningCycle.sol";
-import "./../common/Multicall.sol";
-import "./ColonyNetworkStorage.sol";
-import { IColonyBridge } from "./../bridging/IColonyBridge.sol";
+import { IReputationMiningCycle } from "./../interfaces/IReputationMiningCycle.sol";
+import { Multicall } from "./../common/Multicall.sol";
+import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";
+import { IColonyBridge } from "./../interfaces/IColonyBridge.sol";
 import { CallWithGuards } from "../common/CallWithGuards.sol";
 
 contract ColonyNetworkSkills is ColonyNetworkStorage, Multicall, CallWithGuards {

contracts/colonyNetwork/ColonyNetworkStorage.sol

@@ -19,11 +19,11 @@
 pragma solidity 0.8.27;
 
 import { DSMath } from "./../../lib/dappsys/math.sol";
-import { IMetaColony } from "./../colony/IMetaColony.sol";
+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

contracts/common/BasicMetaTransaction.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.27;
 import { DSMath } from "../../lib/dappsys/math.sol";
 import { MetaTransactionMsgSender } from "./MetaTransactionMsgSender.sol";
 import { MultiChain } from "./MultiChain.sol";
-import { IBasicMetaTransaction } from "./IBasicMetaTransaction.sol";
+import { IBasicMetaTransaction } from "./../interfaces/IBasicMetaTransaction.sol";
 
 abstract contract BasicMetaTransaction is
   IBasicMetaTransaction,

contracts/extensions/ColonyExtension.sol → contracts/common/ColonyExtension.sol

@@ -21,17 +21,17 @@ pragma experimental ABIEncoderV2;
 
 import { DSMath } from "./../../lib/dappsys/math.sol";
 import { DSAuth } from "./../../lib/dappsys/auth.sol";
-import { EtherRouter } from "./../common/EtherRouter.sol";
-import { Multicall } from "./../common/Multicall.sol";
-import { IColony } from "./../colony/IColony.sol";
-import { ColonyDataTypes } from "./../colony/ColonyDataTypes.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { EtherRouter } from "./EtherRouter.sol";
+import { Multicall } from "./Multicall.sol";
+import { IColony } from "./../interfaces/IColony.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";
-import { IColonyExtension } from "./IColonyExtension.sol";
+import { MultiChain } from "./MultiChain.sol";
+import { IColonyExtension } from "./../interfaces/IColonyExtension.sol";
 
 // This is a 'dummy' import to ensure that functions implemented from DSAuth get commented
-import { IDSAuth } from "./../common/IDSAuth.sol";
+import { IDSAuth } from "./../interfaces/IDSAuth.sol";
 
 abstract contract ColonyExtension is
   IColonyExtension,

contracts/extensions/ColonyExtensionMeta.sol → contracts/common/ColonyExtensionMeta.sol

@@ -19,8 +19,9 @@
 pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
-import { IBasicMetaTransaction, BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
-import { ColonyExtension } from "./ColonyExtension.sol";
+import { IBasicMetaTransaction } from "./../interfaces/IBasicMetaTransaction.sol";
+import { BasicMetaTransaction } from "./BasicMetaTransaction.sol";
+import { ColonyExtension } from "./../common/ColonyExtension.sol";
 
 abstract contract ColonyExtensionMeta is BasicMetaTransaction, ColonyExtension {
   mapping(address => uint256) metatransactionNonces;

contracts/common/CommonAuthority.sol

@@ -18,11 +18,11 @@
 
 pragma solidity 0.8.27;
 
-import { ColonyDataTypes } from "./../colony/ColonyDataTypes.sol";
+import { CommonDataTypes } from "./../dataTypes/CommonDataTypes.sol";
 import { DomainRoles } from "./DomainRoles.sol";
 
 contract CommonAuthority is DomainRoles {
-  uint8 constant RECOVERY_ROLE = uint8(ColonyDataTypes.ColonyRole.Recovery);
+  uint8 constant RECOVERY_ROLE = uint8(CommonDataTypes.ColonyRole.Recovery);
 
   constructor(address contractAddress) {
     setRecoveryRoleCapability(contractAddress, "enterRecoveryMode()");

contracts/common/ContractRecovery.sol

@@ -18,17 +18,17 @@
 
 pragma solidity 0.8.27;
 
-import { ColonyDataTypes } from "./../colony/ColonyDataTypes.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 "./IRecovery.sol";
+import { IRecovery } from "./../interfaces/IRecovery.sol";
 
 contract ContractRecovery is
   ContractRecoveryDataTypes,
   CommonStorage // ignore-swc-123
 {
-  uint8 constant RECOVERY_ROLE = uint8(ColonyDataTypes.ColonyRole.Recovery);
+  uint8 constant RECOVERY_ROLE = uint8(CommonDataTypes.ColonyRole.Recovery);
 
   function setStorageSlotRecovery(uint256 _slot, bytes32 _value) public recovery auth {
     require(_slot != AUTHORITY_SLOT, "colony-common-protected-variable");