4.3.0 (#571)

contracts/acl/ACL.sol

@@ -42,8 +42,6 @@ contract ACL is IACL, TimeHelpers, AragonApp, ACLHelpers {
     address public constant ANY_ENTITY = address(-1);
     address public constant BURN_ENTITY = address(1); // address(0) is already used as "no permission manager"
 
-    uint256 internal constant ORACLE_CHECK_GAS = 30000;
-
     string private constant ERROR_AUTH_INIT_KERNEL = "ACL_AUTH_INIT_KERNEL";
     string private constant ERROR_AUTH_NO_MANAGER = "ACL_AUTH_NO_MANAGER";
     string private constant ERROR_EXISTENT_MANAGER = "ACL_EXISTENT_MANAGER";
@@ -421,11 +419,13 @@ contract ACL is IACL, TimeHelpers, AragonApp, ACLHelpers {
 
         // a raw call is required so we can return false if the call reverts, rather than reverting
         bytes memory checkCalldata = abi.encodeWithSelector(sig, _who, _where, _what, _how);
-        uint256 oracleCheckGas = ORACLE_CHECK_GAS;
 
         bool ok;
         assembly {
-            ok := staticcall(oracleCheckGas, _oracleAddr, add(checkCalldata, 0x20), mload(checkCalldata), 0, 0)
+            // send all available gas; if the oracle eats up all the gas, we will eventually revert
+            // note that we are currently guaranteed to still have some gas after the call from
+            // EIP-150's 63/64 gas forward rule
+            ok := staticcall(gas, _oracleAddr, add(checkCalldata, 0x20), mload(checkCalldata), 0, 0)
         }
 
         if (!ok) {

contracts/acl/ACLSyntaxSugar.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/acl/IACL.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/acl/IACLOracle.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/apm/APMNamehash.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/apps/AppStorage.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/apps/AragonApp.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/apps/UnsafeAragonApp.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/common/Autopetrified.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/common/EtherTokenConstant.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/common/IForwarder.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/common/IForwarderFee.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/common/IVaultRecoverable.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/common/Initializable.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/common/IsContract.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/common/Petrifiable.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/common/ReentrancyGuard.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/common/TimeHelpers.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/common/UnstructuredStorage.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/common/VaultRecoverable.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/ens/ENSConstants.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/evmscript/EVMScriptRunner.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/evmscript/IEVMScriptExecutor.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/evmscript/IEVMScriptRegistry.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/evmscript/ScriptHelpers.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/evmscript/executors/BaseEVMScriptExecutor.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/kernel/IKernel.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/kernel/KernelConstants.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/lib/misc/ERCProxy.sol

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identitifer:    MIT
+ * SPDX-License-Identifier:    MIT
  */
 
 pragma solidity ^0.4.24;

contracts/test/helpers/ACLHelper.sol

@@ -34,6 +34,12 @@ contract RevertOracle is IACLOracle {
     }
 }
 
+contract AssertOracle is IACLOracle {
+    function canPerform(address, address, bytes32, uint256[]) external view returns (bool) {
+        assert(false);
+    }
+}
+
 // Can't implement from IACLOracle as its canPerform() is marked as view-only
 contract StateModifyingOracle /* is IACLOracle */ {
     bool modifyState;
@@ -57,3 +63,14 @@ contract ConditionalOracle is IACLOracle {
         return how[0] > 0;
     }
 }
+
+contract OverGasLimitOracle is IACLOracle {
+    function canPerform(address, address, bytes32, uint256[]) external view returns (bool) {
+        while (true) {
+            // Do an SLOAD to increase the per-loop gas costs
+            uint256 loadFromStorage;
+            assembly { loadFromStorage := sload(0) }
+        }
+        return true;
+    }
+}

contracts/test/tests/TestACLInterpreter.sol

@@ -82,8 +82,6 @@ contract TestACLInterpreter is ACL, ACLHelper {
 
         // doesn't revert even if oracle reverts
         assertEval(arr(), ORACLE_PARAM_ID, Op.EQ, uint256(new RevertOracle()), false);
-        // the staticcall will error as the oracle tries to modify state, so a no is returned
-        assertEval(arr(), ORACLE_PARAM_ID, Op.EQ, uint256(new StateModifyingOracle()), false);
         // if returned data size is not correct, returns false
         assertEval(arr(), ORACLE_PARAM_ID, Op.EQ, uint256(new EmptyDataReturnOracle()), false);
 

package.json

@@ -35,25 +35,24 @@
   "license": "(GPL-3.0-or-later OR MIT)",
   "devDependencies": {
     "@codechecks/client": "^0.1.5",
-    "coveralls": "^2.13.3",
+    "coveralls": "^3.0.9",
     "eth-ens-namehash": "^2.0.8",
-    "eth-gas-reporter": "^0.2.9",
+    "eth-gas-reporter": "^0.2.14",
     "ethereumjs-abi": "^0.6.5",
-    "ganache-cli": "^6.4.2",
+    "ganache-cli": "^6.9.0",
     "mocha-lcov-reporter": "^1.3.0",
     "solidity-coverage": "0.6.2",
     "solium": "^1.2.3",
     "truffle": "4.1.14",
     "truffle-bytecode-manager": "^1.1.1",
     "truffle-extract": "^1.2.1",
-    "web3-eth-abi": "1.0.0-beta.33",
-    "web3-utils": "1.0.0-beta.33"
+    "web3-eth-abi": "1.2.5",
+    "web3-utils": "1.2.5"
   },
   "dependencies": {
+    "@aragon/truffle-config-v4": "^1.0.1",
     "mkdirp": "^0.5.1",
     "truffle-flattener": "^1.2.9",
-    "homedir": "^0.6.0",
-    "truffle-hdwallet-provider": "0.0.3",
-    "truffle-hdwallet-provider-privkey": "0.3.0"
+    "homedir": "^0.6.0"
   }
 }

scripts/deploy-daofactory.js

@@ -6,13 +6,15 @@ const ZERO_ADDR = '0x0000000000000000000000000000000000000000'
 
 const defaultKernelBase = process.env.KERNEL_BASE
 const defaultAclBaseAddress = process.env.ACL_BASE
+const defaultEvmScriptRegistryFactoryAddress = process.env.EVM_REG_FACTORY
 
 module.exports = async (
   truffleExecCallback,
   {
     artifacts = globalArtifacts,
     kernelBaseAddress = defaultKernelBase,
     aclBaseAddress = defaultAclBaseAddress,
+    evmScriptRegistryFactoryAddress = defaultEvmScriptRegistryFactoryAddress,
     withEvmScriptRegistryFactory = true,
     verbose = true
   } = {}
@@ -47,8 +49,14 @@ module.exports = async (
   let evmScriptRegistryFactory
   if (withEvmScriptRegistryFactory) {
     const EVMScriptRegistryFactory = artifacts.require('EVMScriptRegistryFactory')
-    evmScriptRegistryFactory = await EVMScriptRegistryFactory.new()
-    await logDeploy(evmScriptRegistryFactory, { verbose })
+
+    if (evmScriptRegistryFactoryAddress) {
+      evmScriptRegistryFactory = EVMScriptRegistryFactory.at(evmScriptRegistryFactoryAddress)
+      log(`Skipping deploying new EVMScriptRegistryFactory, using provided address: ${evmScriptRegistryFactoryAddress}`)
+    } else {
+      evmScriptRegistryFactory = await EVMScriptRegistryFactory.new()
+      await logDeploy(evmScriptRegistryFactory, { verbose })
+    }
   }
   const daoFactory = await DAOFactory.new(
     kernelBase.address,