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.

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

Fix errors at boot time #1934

Merged
merged 3 commits into from
Feb 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
- [\#961](https://github.com/cosmos/voyager/issues/961) Mock timezone and keep moment as it is @sabau
- [\#961](https://github.com/cosmos/voyager/issues/961) Mock only the `now` function from Date module @sabau

Expand Down
2 changes: 1 addition & 1 deletion Caddyfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ localhost:8080 {
Access-Control-Allow-Headers "*"
}

proxy / https://localhost:9070/ {
proxy / http://localhost:9070/ {
insecure_skip_verify
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions tasks/gaia.js
Original file line number Diff line number Diff line change
Expand Up @@ -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`
}
Expand All @@ -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}`
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤑

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

richness is gooood, but this change happened because of an error in the creation under 100000000stake

)

await makeExecWithInputs(
Expand Down
6 changes: 3 additions & 3 deletions tasks/testnet.js
Original file line number Diff line number Diff line change
Expand Up @@ -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`)
Expand All @@ -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)
Expand Down