Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase default IPFS timeout #481

Merged
merged 4 commits into from
May 23, 2019
Merged

Increase default IPFS timeout #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b133918
Include IPFS timeout and aragon node for environments
0xGabi May 22, 2019
a5816fa
Include package.json changes
0xGabi May 22, 2019
b151b57
Remove ipfs aragon node
0xGabi May 23, 2019
4069c2a
fix typo
0xGabi May 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/aragon-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"dependencies": {
"@aragon/apm": "^3.1.0",
"@aragon/apps-shared-minime": "^1.0.1",
"@aragon/aragen": "^4.0.0",
"@aragon/aragen": "^4.1.0",
"@aragon/os": "^4.0.0",
"@aragon/wrapper": "^5.0.0-rc.3",
"@babel/polyfill": "^7.0.0",
Expand Down Expand Up @@ -132,7 +132,8 @@
"aragon": {
"clientVersion": "e08deb62080e17fe652fa83f60dc81a02c455c41",
"clientPort": "3000",
"defaultGasPrice": "10000000000"
"defaultGasPrice": "10000000000",
"defaultIpfsTimeout": "300000"
},
"husky": {
"hooks": {
Expand Down
6 changes: 5 additions & 1 deletion packages/aragon-cli/src/commands/dao.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ exports.command = 'dao <command>'
exports.describe = 'Manage your Aragon DAO'

exports.builder = function(yargs) {
if (process.argv[3] !== 'new' && process.argv[3] !== 'act') {
if (
process.argv[3] !== 'new' &&
process.argv[3] !== 'act' &&
process.argv[3] !== 'token'
) {
yargs = daoArg(yargs)
}
return yargs
Expand Down
10 changes: 8 additions & 2 deletions packages/aragon-cli/src/commands/dao_cmds/utils/getRepoTask.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
const pkg = require('../../../../package.json')
const LATEST_VERSION = 'latest'
const DEFAULT_IPFS_TIMEOUT = pkg.aragon.defaultIpfsTimeout

module.exports = {
args: yargs => {
Expand All @@ -19,9 +21,13 @@ module.exports = {
}) => {
return async ctx => {
if (apmRepoVersion === LATEST_VERSION) {
ctx.repo = await apm.getLatestVersion(apmRepo)
ctx.repo = await apm.getLatestVersion(apmRepo, DEFAULT_IPFS_TIMEOUT)
} else {
ctx.repo = await apm.getVersion(apmRepo, apmRepoVersion.split('.'))
ctx.repo = await apm.getVersion(
apmRepo,
apmRepoVersion.split('.'),
DEFAULT_IPFS_TIMEOUT
)
}

// appId is loaded from artifact.json in IPFS
Expand Down