Stable branch fixes (#1739)

* Add eth-json-rpc-filters dependency * Client hotfix (#1737) * Temporarily use Gabi's client hotfix * Increase devchain timeout to 5m * Add missing gasPrice parameter (#1708) * Add missing gas-price parameter to act, exec and new commands * Bump @aragon/cli to v7.0.5
aragon · Jul 2, 2020 · de81925 · de81925
1 parent 8191d84
commit de81925
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 6 deletions.
diff --git a/packages/cli/npm-shrinkwrap.json b/packages/cli/npm-shrinkwrap.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aragon/cli",
-  "version": "7.0.3",
+  "version": "7.0.5",
   "description": "Aragon command-line tools",
   "main": "./dist/toolkit.js",
   "bin": {
@@ -59,6 +59,7 @@
     "dev-null": "^0.1.1",
     "engine-check": "^1.0.1",
     "eth-ens-namehash": "^2.0.8",
+    "eth-json-rpc-filters": "^4.1.1",
     "execa": "^3.0.0",
     "figures": "^3.0.0",
     "find-process": "^1.4.2",
@@ -128,8 +129,8 @@
     "node": ">=10.0.0"
   },
   "aragon": {
-    "clientRepo": "https://github.com/aragon/aragon",
-    "clientVersion": "775edd606333a111eb2693df53900039722a95dc",
+    "clientRepo": "https://github.com/0xGabi/aragon",
+    "clientVersion": "456815dbc991a6d08904e8ff462bdb1f4d42dc6c",
     "clientPort": "3000",
     "defaultGasPrice": "2",
     "defaultIpfsTimeout": "300000"

diff --git a/packages/cli/src/commands/dao_cmds/act.js b/packages/cli/src/commands/dao_cmds/act.js
@@ -55,6 +55,7 @@ export const handler = async function({
   callArgs,
   callData,
   ethValue,
+  gasPrice,
   wsProvider,
 }) {
   const web3 = await ensureWeb3(network)
@@ -74,6 +75,7 @@ export const handler = async function({
     reporter,
     apm,
     network,
+    gasPrice,
     wsProvider,
     web3,
   })

diff --git a/packages/cli/src/commands/dao_cmds/exec.js b/packages/cli/src/commands/dao_cmds/exec.js
@@ -29,6 +29,7 @@ export const handler = async function({
   dao,
   apm,
   network,
+  gasPrice,
   proxyAddress,
   fn,
   fnArgs,
@@ -40,6 +41,7 @@ export const handler = async function({
     method: fn,
     params: fnArgs.map(parseArgumentStringIfPossible),
     reporter,
+    gasPrice,
     apm,
     network,
     wsProvider,

diff --git a/packages/cli/src/commands/dao_cmds/new.js b/packages/cli/src/commands/dao_cmds/new.js
@@ -115,6 +115,7 @@ export const handler = async function({
   deployEvent,
   apm: apmOptions,
   aragonId,
+  gasPrice,
   silent,
   debug,
 }) {
@@ -131,6 +132,7 @@ export const handler = async function({
     fnArgs,
     deployEvent,
     aragonId,
+    gasPrice,
     silent,
     debug,
   })

diff --git a/packages/cli/src/commands/devchain_cmds/utils/constants.js b/packages/cli/src/commands/devchain_cmds/utils/constants.js
@@ -1,4 +1,4 @@
-export const DEVCHAIN_START_TIMEOUT = 40000 // 40s
+export const DEVCHAIN_START_TIMEOUT = 300000 // 5m
 export const DEVCHAIN_ENS = '0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1'
 export const BLOCK_GAS_LIMIT = 50e6
 export const MNEMONIC =