From 49ddbc168f5bb51ef070ac3aa92adf021a9ee1e3 Mon Sep 17 00:00:00 2001 From: Karoly Albert Szabo Date: Wed, 6 Feb 2019 12:36:51 +0000 Subject: [PATCH 1/2] errors at boot time Signed-off-by: Karoly Albert Szabo --- Caddyfile | 2 +- tasks/gaia.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Caddyfile b/Caddyfile index 30fdf8cf6a..7c28924dd0 100644 --- a/Caddyfile +++ b/Caddyfile @@ -7,7 +7,7 @@ localhost:8080 { Access-Control-Allow-Headers "*" } - proxy / https://localhost:9070/ { + proxy / http://localhost:9070/ { insecure_skip_verify } } \ No newline at end of file diff --git a/tasks/gaia.js b/tasks/gaia.js index 9059de99a9..379925a072 100644 --- a/tasks/gaia.js +++ b/tasks/gaia.js @@ -27,7 +27,7 @@ async function initNode( password = `1234567890`, overwrite = false ) { - let command = `${nodeBinary} init --home ${homeDir} --moniker ${moniker} --chain-id ${chainId}` + let command = `${nodeBinary} init ${moniker} --home ${homeDir} --chain-id ${chainId}` if (overwrite) { command += ` -o` } @@ -53,7 +53,7 @@ async function initGenesis( nodeHomeDir ) { await makeExec( - `${nodeBinary} add-genesis-account ${address} 150stake,1000photino --home ${nodeHomeDir}` + `${nodeBinary} add-genesis-account ${address} 200000000stake,1000photino --home ${nodeHomeDir}` ) await makeExecWithInputs( From 017d89589498af8b97c1e6e9eb7e39a3f976a872 Mon Sep 17 00:00:00 2001 From: Karoly Albert Szabo Date: Wed, 6 Feb 2019 15:49:07 +0000 Subject: [PATCH 2/2] changelog, switch order to help debugging by adding && to make it sequential, remove unnecessary renaming Signed-off-by: Karoly Albert Szabo --- CHANGELOG.md | 1 + package.json | 2 +- tasks/testnet.js | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c0c7b792f..f8a33a1c01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -183,6 +183,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed signing issues related to https://github.com/cosmos/cosmos-sdk/issues/3336 @faboweb - [\#1896](https://github.com/cosmos/voyager/issues/1896) Correctly update balances if account is empty @faboweb - Fix actionmodal validation @faboweb +- [\#1934](https://github.com/cosmos/voyager/pull/1934) Fix boot process @sabau ## [0.10.7] - 2018-10-10 diff --git a/package.json b/package.json index 2ed5b305cd..d8c5cefcdf 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "stargate": "./builds/Gaia/darwin_amd64/gaiacli rest-server --laddr 'tcp://localhost:9070' --home './builds/testnets/local-testnet/cli_home' --node 'http://localhost:26657' --chain-id 'local-testnet' --trust-node true", "frontend": "webpack-dev-server --hot --colors --config webpack.renderer.config.js --port 9080 --content-base app/dist --https --mode=development", "frontend:fixed-https": "yarn frontend --cert 'server_dev.crt' --key 'server_dev.key'", - "backend": "yarn proxy & yarn stargate & yarn nodes 2", + "backend": "yarn nodes 2 & yarn stargate & yarn proxy", "backend:fixed-https": "yarn nodes 2 skip-rebuild & yarn stargate --ssl-certfile 'server_dev.crt' --ssl-keyfile 'server_dev.key'" }, "devDependencies": { diff --git a/tasks/testnet.js b/tasks/testnet.js index ea8bb86db2..d371ddff31 100644 --- a/tasks/testnet.js +++ b/tasks/testnet.js @@ -2,7 +2,7 @@ const fs = require(`fs-extra`) const { join, resolve } = require(`path`) -const { startNodes: makeTestnet, buildNodes } = require(`./build/local/helper`) +const { startNodes, buildNodes } = require(`./build/local/helper`) const { getNodeId, startLocalNode } = require(`./gaia`) const appDir = resolve(`${__dirname}/../`) const buildTestnetPath = join(appDir, `builds`, `testnets`) @@ -27,13 +27,13 @@ async function main() { { chainId: network, password: `1234567890`, - overwrite: false, + overwrite: true, moniker: `local`, keyName: `account-with-funds` }, numberNodes ) - await makeTestnet(nodes, mainAccountSignInfo, network) + await startNodes(nodes, mainAccountSignInfo, network) fs.copySync(join(nodes[1].home, `config`), cliHomePrefix) const { version } = require(`../package.json`) fs.writeFileSync(`${cliHomePrefix}/app_version`, version)