Skip to content

Commit

Permalink
Hot fix (#173)
Browse files Browse the repository at this point in the history
* Hot fix client instalation

* Update buidler dependencies
  • Loading branch information
0xGabi authored Jun 12, 2020
1 parent 2ce78fe commit 944a150
Show file tree
Hide file tree
Showing 7 changed files with 1,020 additions and 661 deletions.
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
},
"devDependencies": {
"@aragon/abis": "^1.1.0",
"@nomiclabs/buidler": "^1.3.1",
"@nomiclabs/buidler-etherscan": "^1.3.1",
"@nomiclabs/buidler-truffle5": "^1.3.1",
"@nomiclabs/buidler-web3": "^1.3.1",
"@nomiclabs/buidler": "^1.3.0",
"@nomiclabs/buidler-etherscan": "^1.3.0",
"@nomiclabs/buidler-truffle5": "^1.3.0",
"@nomiclabs/buidler-web3": "^1.3.0",
"@types/chai": "^4.2.5",
"@types/fs-extra": "^8.1.0",
"@types/lodash": "^4.14.149",
Expand Down Expand Up @@ -84,13 +84,13 @@
"typechain": "^1.0.3",
"typechain-target-truffle": "^1.0.2",
"typescript": "^3.7.4",
"web3": "^1.2.7"
"web3": "^1.2.0"
},
"peerDependencies": {
"@nomiclabs/buidler": "^1.3.2",
"@nomiclabs/buidler-etherscan": "^1.3.2",
"@nomiclabs/buidler-truffle5": "^1.3.2",
"@nomiclabs/buidler-web3": "^1.3.2",
"web3": "^1.2.7"
"@nomiclabs/buidler": "^1.3.0",
"@nomiclabs/buidler-etherscan": "^1.3.0",
"@nomiclabs/buidler-truffle5": "^1.3.0",
"@nomiclabs/buidler-web3": "^1.3.0",
"web3": "^1.2.0"
}
}
2 changes: 1 addition & 1 deletion src/tasks/start-task.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ ${accountsStr}`)
async function _checkPorts(config: AragonConfig): Promise<void> {
if (await tcpPortUsed.check(config.clientServePort)) {
throw new BuidlerPluginError(
`Cannot start client. Port ${config.clientServePort} is in use.`
`Cannot start client. Port ${config.clientServePort} is in use. If you have an instance of the client already running use the command with the flag --no-browser.`
)
}

Expand Down
4 changes: 2 additions & 2 deletions src/tasks/start/client/aragon-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { BuidlerPluginError } from '@nomiclabs/buidler/plugins'
import { logFront } from '~/src/ui/logger'
import { ensureDir, writeJson, pathExists, remove } from '~/src/utils/fsUtils'

const defaultRepo = 'https://github.com/aragon/aragon'
const defaultVersion = '775edd606333a111eb2693df53900039722a95dc'
const defaultRepo = 'https://github.com/0xGabi/aragon'
const defaultVersion = '456815dbc991a6d08904e8ff462bdb1f4d42dc6c'
const aragonBaseDir: string = path.join(os.homedir(), '.aragon')

export async function installAragonClientIfNeeded(
Expand Down
8 changes: 4 additions & 4 deletions test/projects/counter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
},
"dependencies": {
"@aragon/abis": "^1.1.0",
"@nomiclabs/buidler": "^1.3.2",
"@nomiclabs/buidler-truffle5": "^1.3.2",
"@nomiclabs/buidler-web3": "^1.3.2",
"@nomiclabs/buidler": "^1.3.0",
"@nomiclabs/buidler-truffle5": "^1.3.0",
"@nomiclabs/buidler-web3": "^1.3.0",
"@types/chai": "^4.2.5",
"@types/mocha": "^5.2.7",
"@types/node": "12.7.5",
Expand All @@ -24,7 +24,7 @@
"typechain": "^1.0.3",
"typechain-target-truffle": "^1.0.2",
"typescript": "^3.7.4",
"web3": "^1.2.7"
"web3": "^1.2.0"
},
"keywords": [],
"author": "",
Expand Down
6 changes: 3 additions & 3 deletions test/projects/test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"@aragon/abis": "^1.1.0"
},
"devDependencies": {
"@nomiclabs/buidler": "^1.3.2",
"@nomiclabs/buidler-truffle5": "^1.3.2",
"@nomiclabs/buidler-web3": "^1.3.2",
"@nomiclabs/buidler": "^1.3.0",
"@nomiclabs/buidler-truffle5": "^1.3.0",
"@nomiclabs/buidler-web3": "^1.3.0",
"typescript": "^3.7.4"
}
}
8 changes: 4 additions & 4 deletions test/projects/token-wrapper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
"devDependencies": {
"@aragon/abis": "^1.1.0",
"@aragon/test-helpers": "^2.1.0",
"@nomiclabs/buidler": "^1.3.2",
"@nomiclabs/buidler-truffle5": "^1.3.2",
"@nomiclabs/buidler-web3": "^1.3.2",
"@nomiclabs/buidler": "^1.3.0",
"@nomiclabs/buidler-truffle5": "^1.3.0",
"@nomiclabs/buidler-web3": "^1.3.0",
"ethereumjs-abi": "^0.6.4",
"ethereumjs-testrpc-sc": "^6.5.1-sc.1",
"ganache-cli": "^6.4.3",
"solidity-coverage": "^0.6.7",
"solium": "^1.2.3",
"web3": "^1.2.7"
"web3": "^1.2.0"
}
}
Loading

0 comments on commit 944a150

Please sign in to comment.