IAragonApp interface: move it up to AragonApp (out of AppStorage)

aragon · Jul 23, 2020 · 79389f2 · 79389f2
1 parent cc88e41
commit 79389f2
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 19 deletions.
diff --git a/contracts/apps/AppProxyBase.sol b/contracts/apps/AppProxyBase.sol
@@ -32,18 +32,6 @@ contract AppProxyBase is AppStorage, DepositableDelegateProxy, KernelNamespaceCo
         }
     }
 
-    /**
-    * @dev Query if a contract implements a certain interface
-    *      We implement it here to break the bridge to IAragonApp (through AppStorage)
-    *      in the inheritance graph.
-    * @param _interfaceId The interface identifier being queried, as specified in ERC-165
-    * @return True if the contract implements the requested interface and if its not 0xffffffff, false otherwise
-    */
-    function supportsInterface(bytes4 _interfaceId) public view returns (bool) {
-        address target = implementation();
-        return IAragonApp(target).supportsInterface(_interfaceId);
-    }
-
     function getAppBase(bytes32 _appId) internal view returns (address) {
         return kernel().getApp(KERNEL_APP_BASES_NAMESPACE, _appId);
     }

diff --git a/contracts/apps/AppStorage.sol b/contracts/apps/AppStorage.sol
@@ -6,10 +6,9 @@ pragma solidity ^0.4.24;
 
 import "../common/UnstructuredStorage.sol";
 import "../kernel/IKernel.sol";
-import "./IAragonApp.sol";
 
 
-contract AppStorage is IAragonApp {
+contract AppStorage {
     using UnstructuredStorage for bytes32;
 
     /* Hardcoded constants to save gas

diff --git a/contracts/apps/AragonApp.sol b/contracts/apps/AragonApp.sol
@@ -5,6 +5,7 @@
 pragma solidity ^0.4.24;
 
 import "./AppStorage.sol";
+import "./IAragonApp.sol";
 import "../acl/ACLSyntaxSugar.sol";
 import "../common/Autopetrified.sol";
 import "../common/ConversionHelpers.sol";
@@ -18,7 +19,7 @@ import "../evmscript/EVMScriptRunner.sol";
 // Unless overriden, this behaviour enforces those contracts to be usable only behind an AppProxy.
 // ReentrancyGuard, EVMScriptRunner, and ACLSyntaxSugar are not directly used by this contract, but
 // are included so that they are automatically usable by subclassing contracts
-contract AragonApp is AppStorage, Autopetrified, VaultRecoverable, ReentrancyGuard, EVMScriptRunner, ACLSyntaxSugar {
+contract AragonApp is IAragonApp, AppStorage, Autopetrified, VaultRecoverable, ReentrancyGuard, EVMScriptRunner, ACLSyntaxSugar {
     string private constant ERROR_AUTH_FAILED = "APP_AUTH_FAILED";
 
     modifier auth(bytes32 _role) {

diff --git a/contracts/apps/IAragonApp.sol b/contracts/apps/IAragonApp.sol
@@ -19,7 +19,7 @@ contract IAragonApp is ERC165 {
     * @param _interfaceId The interface identifier being queried, as specified in ERC-165
     * @return True if the contract implements the requested interface and if its not 0xffffffff, false otherwise
     */
-    function supportsInterface(bytes4 _interfaceId) public view returns (bool) {
+    function supportsInterface(bytes4 _interfaceId) public pure returns (bool) {
         return super.supportsInterface(_interfaceId) || _interfaceId == ARAGON_APP_INTERFACE_ID;
     }
 }
diff --git a/contracts/apps/disputable/IDisputable.sol b/contracts/apps/disputable/IDisputable.sol
@@ -35,7 +35,7 @@ contract IDisputable is ERC165 {
     * @param _interfaceId The interface identifier being queried, as specified in ERC-165
     * @return True if the contract implements the requested interface and if its not 0xffffffff, false otherwise
     */
-    function supportsInterface(bytes4 _interfaceId) public view returns (bool) {
+    function supportsInterface(bytes4 _interfaceId) public pure returns (bool) {
         return super.supportsInterface(_interfaceId) || _interfaceId == DISPUTABLE_INTERFACE_ID;
     }
 }
diff --git a/contracts/lib/arbitration/IArbitrable.sol b/contracts/lib/arbitration/IArbitrable.sol
@@ -56,7 +56,7 @@ contract IArbitrable is ERC165 {
     * @param _interfaceId The interface identifier being queried, as specified in ERC-165
     * @return True if this contract supports the given interface, false otherwise
     */
-    function supportsInterface(bytes4 _interfaceId) public view returns (bool) {
+    function supportsInterface(bytes4 _interfaceId) public pure returns (bool) {
         return _interfaceId == ARBITRABLE_INTERFACE_ID || _interfaceId == ERC165_INTERFACE_ID;
     }
 }
diff --git a/contracts/lib/standards/ERC165.sol b/contracts/lib/standards/ERC165.sol
@@ -13,7 +13,7 @@ contract ERC165 {
     * @param _interfaceId The interface identifier being queried, as specified in ERC-165
     * @return True if the contract implements the requested interface and if its not 0xffffffff, false otherwise
     */
-    function supportsInterface(bytes4 _interfaceId) public view returns (bool) {
+    function supportsInterface(bytes4 _interfaceId) public pure returns (bool) {
         return _interfaceId == ERC165_INTERFACE_ID;
     }
 }