From e995782aa94898b513801c4ee48a3a3f77bef477 Mon Sep 17 00:00:00 2001 From: Gabriel Garcia Date: Tue, 21 Jan 2020 02:34:39 -0300 Subject: [PATCH] v5.4.3 (#96) --- .travis.yml | 50 ++++++++++++++++++------------------- index.js | 6 +++++ package.json | 6 ++--- readme.md | 18 +++++++------ scripts/publish/fundraising | 2 +- 5 files changed, 46 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index 70328a9..fe25b31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,25 @@ -language: node_js -notifications: - email: true -node_js: - - '8' -install: - - travis_wait 60 npm install - - travis_wait 60 npm run get-client - - travis_wait 60 npm run get-core-apps - - travis_wait 60 npm run get-dao-templates - - travis_wait 60 npm run get-fundraising - - travis_wait 60 npm run get-open-enterprise - - npm run start -before_script: - - npm prune -before_deploy: echo 'Starting publish to NPM' -deploy: - skip_cleanup: true - provider: npm - email: jorge+npmci@aragon.one - api_key: - secure: UO/9KUzMStVfgR+pOjURKK+mCrjVsP2a9GhrbpclL9yCGyylHe0uyGX5/pF+crMHoSjgYoew00UZgKEfzSIdYiR7h2hs5J+wcTOnSjapevL4/NA0C608fQOilb7Fj5vmxSuYTjZHCUvEcmTVmGU+zpw+YHYtyl5rmONwWZXHKQzKSPflzl0rJL+HMTgJYjbOB3RqxwK7kcW58wWkJl+x1aFxK1KMTnqUHS8FOITo1c7Gn0wPEPSPogzkXh8RVOpA4xkNbOP2gqqfpfuzBuDhULK1MBxvnSnuvaXBHAFaF1a++wj65+f3mo8zpHOIm6n/rcAbQC5siRHZph83K4oszdPf+oxRXneuezFogdoHlUdKUFy7Kdmca/HYYZDlstH3ERrC/apKyh4+5MG7ElCf1V8xItG1XySbLpMnCs0EYsxnoo1XtLeIBJop2nPbsrpBQULkq6Z7zn+tIU8SSAd5hqnfsa+pkvMKbPirzhy7xdyhK2iV97P+y0EkEEI4MOhjGRbyHOyS5ATeXbKb+l3ZcooJ6+rJz9YvjVsF4Ivy0RDfdADKKR1RLQ3Pw1/MBooTGBAUuw4/RopO5h4h2ivyNpfxkWikS86fn8nyZrGZGQe1lJOIgZ8GEtUppYhmd70jilaY5VGRelXQGYrFt+eBAiDcqYGeMDmOa8ZaTjFSS9k= - on: - branch: master - repo: aragon/aragen +# language: node_js +# notifications: +# email: true +# node_js: +# - '8' +# install: +# - travis_wait 60 npm install +# - travis_wait 60 npm run get-client +# - travis_wait 60 npm run get-core-apps +# - travis_wait 60 npm run get-dao-templates +# - travis_wait 60 npm run get-fundraising +# - travis_wait 60 npm run get-open-enterprise +# - npm run start +# before_script: +# - npm prune +# before_deploy: echo 'Starting publish to NPM' +# deploy: +# skip_cleanup: true +# provider: npm +# email: jorge+npmci@aragon.one +# api_key: +# secure: UO/9KUzMStVfgR+pOjURKK+mCrjVsP2a9GhrbpclL9yCGyylHe0uyGX5/pF+crMHoSjgYoew00UZgKEfzSIdYiR7h2hs5J+wcTOnSjapevL4/NA0C608fQOilb7Fj5vmxSuYTjZHCUvEcmTVmGU+zpw+YHYtyl5rmONwWZXHKQzKSPflzl0rJL+HMTgJYjbOB3RqxwK7kcW58wWkJl+x1aFxK1KMTnqUHS8FOITo1c7Gn0wPEPSPogzkXh8RVOpA4xkNbOP2gqqfpfuzBuDhULK1MBxvnSnuvaXBHAFaF1a++wj65+f3mo8zpHOIm6n/rcAbQC5siRHZph83K4oszdPf+oxRXneuezFogdoHlUdKUFy7Kdmca/HYYZDlstH3ERrC/apKyh4+5MG7ElCf1V8xItG1XySbLpMnCs0EYsxnoo1XtLeIBJop2nPbsrpBQULkq6Z7zn+tIU8SSAd5hqnfsa+pkvMKbPirzhy7xdyhK2iV97P+y0EkEEI4MOhjGRbyHOyS5ATeXbKb+l3ZcooJ6+rJz9YvjVsF4Ivy0RDfdADKKR1RLQ3Pw1/MBooTGBAUuw4/RopO5h4h2ivyNpfxkWikS86fn8nyZrGZGQe1lJOIgZ8GEtUppYhmd70jilaY5VGRelXQGYrFt+eBAiDcqYGeMDmOa8ZaTjFSS9k= +# on: +# branch: master +# repo: aragon/aragen diff --git a/index.js b/index.js index 11585be..edd1133 100644 --- a/index.js +++ b/index.js @@ -5,4 +5,10 @@ module.exports = { start: require('./src/commands/start'), status: require('./src/commands/status'), }, + daoFacotry: '0x5d94e3e7aec542ab0f9129b9a7badeb5b3ca0f77', + minimeFactory: '0xd526b7aba39cccf76422835e7fd5327b98ad73c9', + fifsResolvingRegistrar: '0xf1f8aac64036cdd399886b1c157b7e3b361093f3', + apmRegistry: '0x32296d9f8fed89658668875dc73cacf87e8888b2', + openRegistry: '0x983f1d68a781abbc3a49676a6399dd173de25105', + hatchRegistry: '0xd4592f8b2116d00fc4ce183773eb24c584060cfc', } diff --git a/package.json b/package.json index c18dbc8..28f3cce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@aragon/aragen", - "version": "5.4.2", + "version": "5.4.3", "description": "Generate Aragon local dev environment snapshots", "main": "index.js", "bin": { @@ -59,11 +59,11 @@ "mkdirp": "^0.5.1", "ncp": "^2.0.0", "rimraf": "^2.6.2", - "source-map-support": "0.5.12", + "web3": "^1.2.4", "yargs": "^13.2.4" }, "devDependencies": { - "@aragon/cli": "^6.0.0", + "@aragon/cli": "^7.0.0", "@aragon/id": "^2.0.0", "@aragon/os": "^4.2.0", "@aragon/apps-shared-minime": "^1.0.0", diff --git a/readme.md b/readme.md index 48f0ed1..cf22f02 100644 --- a/readme.md +++ b/readme.md @@ -29,10 +29,14 @@ The Aragen package published to NPM contains a ganache snapshot that can be used By default it has set up: - ENS: `0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1` -- APM: `ens.addr('aragonpm.eth')` -- AragonID: `ens.owner('aragonid.eth')` -- Aragon apps: As APM repos, e.g. `apm.getLatest('voting.aragonpm.eth')` -- Beta templates: As APM repos, e.g. `apm.getLatest('democracy-template.aragonpm.eth')` +- DAO_FACTORY: `0x5d94e3e7aec542ab0f9129b9a7badeb5b3ca0f77` +- MINIME_FACTORY: `0xd526b7aba39cccf76422835e7fd5327b98ad73c9` +- FIFResolvingRegistrar: `0xf1f8aac64036cdd399886b1c157b7e3b361093f3` + +* APM: `ens.addr('aragonpm.eth')` +* AragonID: `ens.owner('aragonid.eth')` +* Aragon apps: As APM repos, e.g. `apm.getLatest('voting.aragonpm.eth')` +* Templates: As APM repos, e.g. `apm.getLatest('democracy-template.aragonpm.eth')` To use directly with ganache-cli: @@ -45,9 +49,9 @@ If you wish to access from code, for example to run ganache-core directly: ```js const aragonSnapshot = path.resolve( - require.resolve('@aragon/aragen'), - '../aragon-ganache' -) + require.resolve("@aragon/aragen"), + "../aragon-ganache" +); ``` ### CI diff --git a/scripts/publish/fundraising b/scripts/publish/fundraising index fbbf63b..a7b3e37 100755 --- a/scripts/publish/fundraising +++ b/scripts/publish/fundraising @@ -11,4 +11,4 @@ LERNA_EXEC_APPS="npx lerna exec --scope=@ablack/fundraising-aragon-fundraising - LERNA_EXEC_APPS_WITHOUT_UI="npx lerna exec --scope=@ablack/fundraising-bancor-formula --scope=@ablack/fundraising-batched-bancor-market-maker --scope=@ablack/fundraising-tap --concurrency=1 --stream" $LERNA_EXEC_APPS -- "aragon apm publish 1.0.0 --files app/build --publish-dir $IPFS_CACHE/\$LERNA_PACKAGE_NAME --skip-confirmation --no-propagate-content" -$LERNA_EXEC_APPS_WITHOUT_UI -- "aragon apm publish 1.0.0 --publish-dir $IPFS_CACHE/\$LERNA_PACKAGE_NAME --skip-confirmation --no-propagate-content" \ No newline at end of file +$LERNA_EXEC_APPS_WITHOUT_UI -- "aragon apm publish 1.0.0 --files manifest.json --publish-dir $IPFS_CACHE/\$LERNA_PACKAGE_NAME --skip-confirmation --no-propagate-content"