4.2.1 (#539)

.github/auto_assign.yml

@@ -0,0 +1,16 @@
+# Configuration for https://probot.github.io/apps/auto-assign
+
+addReviewers: true
+addAssignees: false
+
+reviewers: 
+  - sohkai
+  - facuspagnuolo
+  - izqui
+
+skipKeywords:
+  - wip
+  - draft
+
+# Set 0 to add all the reviewers (default: 0)
+numberOfReviewers: 0

.github/config.yml

@@ -0,0 +1,12 @@
+# Configuration for https://probot.github.io/apps/welcome
+
+newIssueWelcomeComment: >
+  Thanks for opening your first issue in aragonOS! Someone will circle back soon ⚡
+
+newPRWelcomeComment: >
+  Thanks for opening this pull request! Someone will review it soon 🔍
+
+firstPRMergeComment: >
+  Congrats on merging your first pull request! Aragon is proud of you 🦅
+  
+  ![Eagle gif](https://media.giphy.com/media/SLD8eKFPuUDuw/200w_d.gif)

.github/release-drafter.yml

@@ -0,0 +1,6 @@
+# Configuration for https://probot.github.io/apps/release-drafter
+
+template: |
+  ## What’s changed in aragonOS
+
+  $CHANGES

contracts/common/IForwarderFee.sol

@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identitifer:    MIT
+ */
+
+pragma solidity ^0.4.24;
+
+
+interface IForwarderFee {
+    function forwardFee() external view returns (address, uint256);
+}

contracts/test/mocks/APMNamehashMock.sol → contracts/test/mocks/apm/APMNamehashMock.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../apm/APMNamehash.sol";
+import "../../../apm/APMNamehash.sol";
 
 
 contract APMNamehashMock is APMNamehash {

contracts/test/mocks/UnsafeRepo.sol → contracts/test/mocks/apm/UnsafeRepo.sol

@@ -1,7 +1,7 @@
 pragma solidity 0.4.24;
 
-import "../../apm/Repo.sol";
-import "../../apps/UnsafeAragonApp.sol";
+import "../../../apm/Repo.sol";
+import "../../../apps/UnsafeAragonApp.sol";
 
 
 // Allows Repo to be used without a proxy or access controls

contracts/test/mocks/AppProxyPinnedStorageMock.sol → contracts/test/mocks/apps/AppProxyPinnedStorageMock.sol

@@ -1,8 +1,8 @@
 pragma solidity 0.4.24;
 
-import "../../apps/AppProxyPinned.sol";
-import "../../kernel/IKernel.sol";
-import "../../kernel/Kernel.sol";
+import "../../../apps/AppProxyPinned.sol";
+import "../../../kernel/IKernel.sol";
+import "../../../kernel/Kernel.sol";
 
 
 contract FakeAppConstants {

contracts/test/mocks/AppStorageMock.sol → contracts/test/mocks/apps/AppStorageMock.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../apps/AppStorage.sol";
+import "../../../apps/AppStorage.sol";
 
 
 contract AppStorageMock is AppStorage {

contracts/test/mocks/AppStub.sol → contracts/test/mocks/apps/AppStub.sol

@@ -1,8 +1,8 @@
 pragma solidity 0.4.24;
 
-import "../../apps/AragonApp.sol";
-import "../../apps/UnsafeAragonApp.sol";
-import "../../kernel/IKernel.sol";
+import "../../../apps/AragonApp.sol";
+import "../../../apps/UnsafeAragonApp.sol";
+import "../../../kernel/IKernel.sol";
 
 
 contract AppStubStorage {

contracts/test/mocks/AppStubConditionalRecovery.sol → contracts/test/mocks/apps/AppStubConditionalRecovery.sol

@@ -1,7 +1,7 @@
 pragma solidity 0.4.24;
 
-import "../../apps/AragonApp.sol";
-import "../../common/DepositableStorage.sol";
+import "../../../apps/AragonApp.sol";
+import "../../../common/DepositableStorage.sol";
 
 
 contract AppStubConditionalRecovery is AragonApp, DepositableStorage {

contracts/test/mocks/AppStubDepositable.sol → contracts/test/mocks/apps/AppStubDepositable.sol

@@ -1,8 +1,8 @@
 pragma solidity 0.4.24;
 
-import "../../apps/AragonApp.sol";
-import "../../apps/UnsafeAragonApp.sol";
-import "../../common/DepositableStorage.sol";
+import "../../../apps/AragonApp.sol";
+import "../../../apps/UnsafeAragonApp.sol";
+import "../../../common/DepositableStorage.sol";
 
 
 contract AppStubDepositable is AragonApp, DepositableStorage {

contracts/test/mocks/AppStubScriptRunner.sol → contracts/test/mocks/apps/AppStubScriptRunner.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../apps/AragonApp.sol";
+import "../../../apps/AragonApp.sol";
 
 
 contract AppStubScriptRunner is AragonApp {

contracts/test/mocks/UnsafeAragonAppMock.sol → contracts/test/mocks/apps/UnsafeAragonAppMock.sol

@@ -1,7 +1,7 @@
 pragma solidity 0.4.24;
 
-import "../../apps/UnsafeAragonApp.sol";
-import "../../kernel/IKernel.sol";
+import "../../../apps/UnsafeAragonApp.sol";
+import "../../../kernel/IKernel.sol";
 
 
 contract UnsafeAragonAppMock is UnsafeAragonApp {

contracts/test/mocks/VaultMock.sol → contracts/test/mocks/apps/VaultMock.sol

@@ -1,7 +1,7 @@
 pragma solidity 0.4.24;
 
-import "../../apps/UnsafeAragonApp.sol";
-import "../../common/DepositableStorage.sol";
+import "../../../apps/UnsafeAragonApp.sol";
+import "../../../common/DepositableStorage.sol";
 
 
 contract VaultMock is UnsafeAragonApp, DepositableStorage {

contracts/test/mocks/DepositableStorageMock.sol → contracts/test/mocks/common/DepositableStorageMock.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../common/DepositableStorage.sol";
+import "../../../common/DepositableStorage.sol";
 
 
 contract DepositableStorageMock is DepositableStorage {

contracts/test/mocks/EtherTokenConstantMock.sol → contracts/test/mocks/common/EtherTokenConstantMock.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../common/EtherTokenConstant.sol";
+import "../../../common/EtherTokenConstant.sol";
 
 
 contract EtherTokenConstantMock is EtherTokenConstant {

contracts/test/mocks/InitializableStorageMock.sol → contracts/test/mocks/common/InitializableStorageMock.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../common/Initializable.sol";
+import "../../../common/Initializable.sol";
 
 
 contract InitializableStorageMock is Initializable {

contracts/test/mocks/LifecycleMock.sol → contracts/test/mocks/common/LifecycleMock.sol

@@ -1,7 +1,7 @@
 pragma solidity 0.4.24;
 
-import "../../common/Initializable.sol";
-import "../../common/Petrifiable.sol";
+import "../../../common/Initializable.sol";
+import "../../../common/Petrifiable.sol";
 
 
 contract LifecycleMock is Initializable, Petrifiable {

contracts/test/mocks/ReentrancyGuardMock.sol → contracts/test/mocks/common/ReentrancyGuardMock.sol

@@ -1,7 +1,7 @@
 pragma solidity 0.4.24;
 
-import "../../common/ReentrancyGuard.sol";
-import "../../common/UnstructuredStorage.sol";
+import "../../../common/ReentrancyGuard.sol";
+import "../../../common/UnstructuredStorage.sol";
 
 
 contract ReentrantActor {

contracts/test/mocks/TimeHelpersMock.sol → contracts/test/mocks/common/TimeHelpersMock.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../common/TimeHelpers.sol";
+import "../../../common/TimeHelpers.sol";
 
 
 contract TimeHelpersMock is TimeHelpers {

contracts/test/mocks/Uint256Mock.sol → contracts/test/mocks/common/Uint256Mock.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../common/Uint256Helpers.sol";
+import "../../../common/Uint256Helpers.sol";
 
 
 contract Uint256Mock {

contracts/test/mocks/ENSConstantsMock.sol → contracts/test/mocks/ens/ENSConstantsMock.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../ens/ENSConstants.sol";
+import "../../../ens/ENSConstants.sol";
 
 
 contract ENSConstantsMock is ENSConstants {

contracts/test/mocks/EVMScriptExecutorMock.sol → contracts/test/mocks/evmscript/EVMScriptExecutorMock.sol

@@ -1,7 +1,7 @@
 pragma solidity 0.4.24;
 
 
-import "../../evmscript/executors/BaseEVMScriptExecutor.sol";
+import "../../../evmscript/executors/BaseEVMScriptExecutor.sol";
 
 contract EVMScriptExecutorMock is BaseEVMScriptExecutor {
     bytes32 internal constant EXECUTOR_TYPE = keccak256("MOCK_SCRIPT");

contracts/test/mocks/EVMScriptExecutorNoReturnMock.sol → contracts/test/mocks/evmscript/EVMScriptExecutorNoReturnMock.sol

@@ -1,7 +1,7 @@
 pragma solidity 0.4.24;
 
 
-import "../../evmscript/executors/BaseEVMScriptExecutor.sol";
+import "../../../evmscript/executors/BaseEVMScriptExecutor.sol";
 
 contract EVMScriptExecutorNoReturnMock is BaseEVMScriptExecutor {
     bytes32 internal constant EXECUTOR_TYPE = keccak256("NO_RETURN_SCRIPT");

contracts/test/mocks/EVMScriptExecutorRevertMock.sol → contracts/test/mocks/evmscript/EVMScriptExecutorRevertMock.sol

@@ -1,7 +1,7 @@
 pragma solidity 0.4.24;
 
 
-import "../../evmscript/executors/BaseEVMScriptExecutor.sol";
+import "../../../evmscript/executors/BaseEVMScriptExecutor.sol";
 
 contract EVMScriptExecutorRevertMock is BaseEVMScriptExecutor {
     string public constant ERROR_MOCK_REVERT = "MOCK_REVERT";

contracts/test/mocks/EVMScriptRegistryConstantsMock.sol → contracts/test/mocks/evmscript/EVMScriptRegistryConstantsMock.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../evmscript/IEVMScriptRegistry.sol";
+import "../../../evmscript/IEVMScriptRegistry.sol";
 
 
 contract EVMScriptRegistryConstantsMock is EVMScriptRegistryConstants {

contracts/test/mocks/APMRegistryFactoryMock.sol → contracts/test/mocks/factory/APMRegistryFactoryMock.sol

@@ -1,11 +1,11 @@
 pragma solidity 0.4.24;
 
-import "../../apm/APMRegistry.sol";
-import "../../apm/Repo.sol";
-import "../../ens/ENSSubdomainRegistrar.sol";
+import "../../../apm/APMRegistry.sol";
+import "../../../apm/Repo.sol";
+import "../../../ens/ENSSubdomainRegistrar.sol";
 
-import "../../factory/DAOFactory.sol";
-import "../../factory/ENSFactory.sol";
+import "../../../factory/DAOFactory.sol";
+import "../../../factory/ENSFactory.sol";
 
 // Mock that doesn't grant enough permissions
 // Only usable with new ENS instance

contracts/test/mocks/KernelConstantsMock.sol → contracts/test/mocks/kernel/KernelConstantsMock.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../kernel/Kernel.sol";
+import "../../../kernel/Kernel.sol";
 
 
 contract KernelConstantsMock is Kernel {

contracts/test/mocks/KernelDepositableMock.sol → contracts/test/mocks/kernel/KernelDepositableMock.sol

@@ -1,7 +1,7 @@
 pragma solidity 0.4.24;
 
-import "../../common/DepositableStorage.sol";
-import "../../kernel/Kernel.sol";
+import "../../../common/DepositableStorage.sol";
+import "../../../kernel/Kernel.sol";
 
 contract KernelDepositableMock is Kernel, DepositableStorage {
     constructor(bool _shouldPetrify) Kernel(_shouldPetrify) public {

contracts/test/mocks/KernelOverloadMock.sol → contracts/test/mocks/kernel/KernelOverloadMock.sol

@@ -1,7 +1,7 @@
 pragma solidity 0.4.24;
 
-import "../../kernel/Kernel.sol";
-import "../../lib/misc/ERCProxy.sol";
+import "../../../kernel/Kernel.sol";
+import "../../../lib/misc/ERCProxy.sol";
 
 
 /** Ugly hack to work around this issue:

contracts/test/mocks/KernelSetAppMock.sol → contracts/test/mocks/kernel/KernelSetAppMock.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../kernel/Kernel.sol";
+import "../../../kernel/Kernel.sol";
 
 contract KernelSetAppMock is Kernel {
     constructor() Kernel(false) public {

contracts/test/mocks/UpgradedKernel.sol → contracts/test/mocks/kernel/UpgradedKernel.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../kernel/Kernel.sol";
+import "../../../kernel/Kernel.sol";
 
 
 contract UpgradedKernel is Kernel {

contracts/test/mocks/SafeMath64Mock.sol → contracts/test/mocks/lib/math/SafeMath64Mock.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../lib/math/SafeMath64.sol";
+import "../../../../lib/math/SafeMath64.sol";
 
 
 contract SafeMath64Mock {

contracts/test/mocks/SafeMath8Mock.sol → contracts/test/mocks/lib/math/SafeMath8Mock.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../lib/math/SafeMath8.sol";
+import "../../../../lib/math/SafeMath8.sol";
 
 
 contract SafeMath8Mock {

contracts/test/mocks/ERCProxyMock.sol → contracts/test/mocks/lib/misc/ERCProxyMock.sol

@@ -1,6 +1,6 @@
 pragma solidity 0.4.24;
 
-import "../../lib/misc/ERCProxy.sol";
+import "../../../../lib/misc/ERCProxy.sol";
 
 
 contract ERCProxyMock is ERCProxy {

contracts/test/mocks/SafeERC20Mock.sol → contracts/test/mocks/lib/token/SafeERC20Mock.sol

@@ -1,7 +1,7 @@
 pragma solidity 0.4.24;
 
-import "../../common/SafeERC20.sol";
-import "../../lib/token/ERC20.sol";
+import "../../../../common/SafeERC20.sol";
+import "../../../../lib/token/ERC20.sol";
 
 
 contract SafeERC20Mock {

contracts/test/mocks/TokenMock.sol → contracts/test/mocks/lib/token/TokenMock.sol

@@ -2,7 +2,7 @@
 
 pragma solidity 0.4.24;
 
-import "../../lib/math/SafeMath.sol";
+import "../../../../lib/math/SafeMath.sol";
 
 
 contract TokenMock {

contracts/test/mocks/TokenReturnMissingMock.sol → contracts/test/mocks/lib/token/TokenReturnMissingMock.sol

@@ -4,7 +4,7 @@
 
 pragma solidity 0.4.24;
 
-import "../../lib/math/SafeMath.sol";
+import "../../../../lib/math/SafeMath.sol";
 
 
 contract TokenReturnMissingMock {

contracts/test/TestACLInterpreter.sol → contracts/test/tests/TestACLInterpreter.sol

@@ -1,8 +1,8 @@
 pragma solidity 0.4.24;
 
-import "../acl/ACL.sol";
-import "./helpers/Assert.sol";
-import "./helpers/ACLHelper.sol";
+import "../../acl/ACL.sol";
+import "../helpers/Assert.sol";
+import "../helpers/ACLHelper.sol";
 
 
 contract TestACLInterpreter is ACL, ACLHelper {

contracts/test/TestConversionHelpers.sol → contracts/test/tests/TestConversionHelpers.sol

@@ -1,9 +1,9 @@
 pragma solidity 0.4.24;
 
-import "./helpers/Assert.sol";
-import "./helpers/ThrowProxy.sol";
+import "../helpers/Assert.sol";
+import "../helpers/ThrowProxy.sol";
 
-import "../common/ConversionHelpers.sol";
+import "../../common/ConversionHelpers.sol";
 
 
 contract InvalidBytesLengthConversionThrows {