diff --git a/package.json b/package.json index 10c9ed9..fab835f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@aragon/aragen", - "version": "5.2.0", + "version": "5.3.0", "description": "Generate Aragon local dev environment snapshots", "main": "index.js", "bin": { @@ -46,7 +46,7 @@ "chalk": "^2.1.0", "execa": "^2.0.3", "find-process": "^1.4.2", - "ganache-core": "2.5.3", + "ganache-core": "^2.8.0", "listr": "^0.14.3", "ncp": "^2.0.0", "rimraf": "^2.6.2", @@ -59,7 +59,7 @@ "@aragon/os": "^4.2.0", "@aragon/apps-shared-minime": "^1.0.0", "eth-ens-namehash": "^2.0.8", - "ganache-cli": "~6.2.0", + "ganache-cli": "^6.7.0", "truffle": "4.1.14" }, "publishConfig": { diff --git a/scripts/get-repos b/scripts/get-repos index 3f6b5db..eb85381 100755 --- a/scripts/get-repos +++ b/scripts/get-repos @@ -14,8 +14,8 @@ INSTALL_FRONTEND=true npm i; cd ..; echo "Fetching planning-suite and installing dependencies (this may take a while 😉)" -git clone https://github.com/AutarkLabs/planning-suite.git -b dev; -cd planning-suite; +git clone https://github.com/AutarkLabs/open-enterprise.git -b dev; +cd open-enterprise; npm i; cd ..; diff --git a/scripts/link-repos b/scripts/link-repos index db8e443..c2e794b 100755 --- a/scripts/link-repos +++ b/scripts/link-repos @@ -9,7 +9,7 @@ cd repos echo "Linking to local repos" ln -s ../../aragon-apps aragon-apps -ln -s ../../planning-suite planning-suite +ln -s ../../open-enterprise open-enterprise ln -s ../../fundraising fundraising ln -s ../../dao-templates dao-templates ln -s ../../aragon aragon diff --git a/scripts/publish-open-enterprise b/scripts/publish-open-enterprise index 998b9e4..c31e59c 100755 --- a/scripts/publish-open-enterprise +++ b/scripts/publish-open-enterprise @@ -5,8 +5,8 @@ IPFS_CACHE=$DIR/ipfs-cache set -e; -cd repos/planning-suite; +cd repos/open-enterprise; LERNA_EXEC_APPS="npx lerna exec --scope=@tps/apps-address-book --scope=@tps/apps-allocations --scope=@tps/apps-dot-voting --scope=@tps/apps-projects --scope=@tps/apps-rewards --concurrency=1 --stream" -$LERNA_EXEC_APPS -- "aragon apm publish 1.0.0 --files dist --publish-dir $IPFS_CACHE/\$LERNA_PACKAGE_NAME --skip-confirmation --no-propagate-content" +$LERNA_EXEC_APPS -- "aragon apm publish 1.0.0 --files dist --publish-dir $IPFS_CACHE/\$LERNA_PACKAGE_NAME --skip-confirmation --no-propagate-content" \ No newline at end of file diff --git a/scripts/start-ganache b/scripts/start-ganache index 8c98d43..1048729 100755 --- a/scripts/start-ganache +++ b/scripts/start-ganache @@ -7,4 +7,4 @@ mnemonic=$(node -p "require(require('path').join(\"${BASEPATH}\", 'src/helpers/g rm -rf aragon-ganache mkdir aragon-ganache set -e; -npx ganache-cli -m "${mnemonic}" -i 15 -l 100000000 --db aragon-ganache +npx ganache-cli -m "${mnemonic}" -i 15 -l 100000000 --db aragon-ganache --e 10000 diff --git a/src/commands/start.js b/src/commands/start.js index 20a0178..c02fb02 100644 --- a/src/commands/start.js +++ b/src/commands/start.js @@ -35,20 +35,9 @@ exports.builder = yargs => { description: 'Specify blockTime in seconds for automatic mining', alias: 'b', }) - .option('default-balance-ether', { - description: 'The default account balance, specified in ether', - default: 100, - alias: 'e', - }) - .option('mnemonic', { - type: 'string', - default: MNEMONIC, - description: 'Mnemonic phrase', - alias: 'm', - }) .option('gas-limit', { default: BLOCK_GAS_LIMIT, - description: 'Block gas limit', + description: 'Block gas limit. Must be specified as a hex string', alias: 'l', }) .option('reset', { @@ -66,16 +55,14 @@ exports.builder = yargs => { default: false, type: 'boolean', description: 'Enable verbose devchain output', - alias: 'v', + alias: 'd', }) } exports.task = async function({ port = 8545, networkId, - defaultBalanceEther = 100, blockTime, - mnemonic = MNEMONIC, gasLimit = BLOCK_GAS_LIMIT, verbose = false, reset = false, @@ -129,14 +116,13 @@ exports.task = async function({ { title: 'Starting a local chain from snapshot', task: async (ctx, task) => { - ctx.id = networkId || parseInt(1e8 * Math.random()) + ctx.id = parseInt(networkId) || parseInt(1e8 * Math.random()) const options = { network_id: ctx.id, - default_balance_ether: defaultBalanceEther, blockTime, gasLimit, - mnemonic, + mnemonic: MNEMONIC, db_path: snapshotPath, logger: verbose ? { log: reporter.info.bind(reporter) } : undefined, debug, @@ -221,9 +207,7 @@ exports.handler = async ({ reporter, port, networkId, - defaultBalanceEther, blockTime, - mnemonic, gasLimit, reset, verbose, @@ -234,9 +218,7 @@ exports.handler = async ({ const task = await exports.task({ port, networkId, - defaultBalanceEther, blockTime, - mnemonic, gasLimit, reset, verbose, @@ -245,7 +227,7 @@ exports.handler = async ({ silent, debug, }) - const { privateKeys, id } = await task.run() + const { privateKeys, id, mnemonic } = await task.run() exports.printAccounts(reporter, privateKeys) exports.printMnemonic(reporter, mnemonic) exports.printResetNotice(reporter, reset)