From 5626582a7952a8853323b20868ae84e26453a51a Mon Sep 17 00:00:00 2001 From: willclarktech Date: Tue, 4 Aug 2020 17:53:48 +0200 Subject: [PATCH 1/5] cosmwasm: Add missing pendingWithoutWasmd() to test --- packages/cosmwasm/src/lcdapi/wasm.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cosmwasm/src/lcdapi/wasm.spec.ts b/packages/cosmwasm/src/lcdapi/wasm.spec.ts index c8e8fa64..0614d990 100644 --- a/packages/cosmwasm/src/lcdapi/wasm.spec.ts +++ b/packages/cosmwasm/src/lcdapi/wasm.spec.ts @@ -295,6 +295,7 @@ describe("WasmExtension", () => { }); it("is empty for non-existent address", async () => { + pendingWithoutWasmd(); const client = makeWasmClient(wasmd.endpoint); const nonExistentAddress = makeRandomAddress(); const state = await client.wasm.getAllContractState(nonExistentAddress); From 45e830a6ac92027fdda5371d3b45d08584ad4586 Mon Sep 17 00:00:00 2001 From: willclarktech Date: Tue, 4 Aug 2020 17:54:12 +0200 Subject: [PATCH 2/5] scripts: Update simapp to nightly-2020-08-05 --- scripts/simapp/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/simapp/env b/scripts/simapp/env index 487d4444..ac728b87 100644 --- a/scripts/simapp/env +++ b/scripts/simapp/env @@ -1,4 +1,4 @@ # Choose from https://hub.docker.com/r/interchainio/simapp/tags REPOSITORY="interchainio/simapp" -VERSION="nightly-2020-07-29" +VERSION="nightly-2020-08-05" CONTAINER_NAME="simapp" From e312c0006211685501d485110d304a98c7aadeb4 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Wed, 5 Aug 2020 09:20:11 +0200 Subject: [PATCH 3/5] Break && lists into separate commands Because of https://unix.stackexchange.com/a/490177 --- scripts/simapp/generate_template.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/simapp/generate_template.sh b/scripts/simapp/generate_template.sh index 26dee504..4bdba346 100755 --- a/scripts/simapp/generate_template.sh +++ b/scripts/simapp/generate_template.sh @@ -9,8 +9,10 @@ source "$SCRIPT_DIR"/env rm -rf "$SCRIPT_DIR/template" mkdir "$SCRIPT_DIR/template" -cp setup.sh "$SCRIPT_DIR/template/" && chmod +x "$SCRIPT_DIR/template/setup.sh" -cp run_simd.sh "$SCRIPT_DIR/template/" && chmod +x "$SCRIPT_DIR/template/run_simd.sh" +cp setup.sh "$SCRIPT_DIR/template/" +chmod +x "$SCRIPT_DIR/template/setup.sh" +cp run_simd.sh "$SCRIPT_DIR/template/" +chmod +x "$SCRIPT_DIR/template/run_simd.sh" # The usage of the accounts below is documented in README.md of this directory docker run --rm \ From df27143bc3be1982c85b4da65a73269a7c1d6bed Mon Sep 17 00:00:00 2001 From: willclarktech Date: Wed, 5 Aug 2020 12:19:02 +0200 Subject: [PATCH 4/5] scripts: Update simapp setup.sh --- scripts/simapp/setup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/simapp/setup.sh b/scripts/simapp/setup.sh index 6d61efb0..1f88f8d7 100644 --- a/scripts/simapp/setup.sh +++ b/scripts/simapp/setup.sh @@ -1,5 +1,5 @@ #!/bin/sh -set -o errexit -o nounset -o pipefail +set -o errexit -o nounset command -v shellcheck > /dev/null && shellcheck "$0" PASSWORD=${PASSWORD:-1234567890} @@ -13,7 +13,7 @@ simd init --chain-id "$CHAIN_ID" "$MONIKER" sed -i "s/\"stake\"/\"$STAKE\"/" "$HOME"/.simapp/config/genesis.json # staking/governance token is hardcoded in config, change this echo "Setting up validator ..." -if ! simd keys show validator; then +if ! simd keys show validator 2> /dev/null; then echo "Validator does not yet exist. Creating it ..." (echo "$PASSWORD"; echo "$PASSWORD") | simd keys add validator fi @@ -23,10 +23,10 @@ echo "$PASSWORD" | simd add-genesis-account validator "1000000000$STAKE,10000000 echo "Setting up accounts ..." # (optionally) add a few more genesis accounts for addr in "$@"; do - echo $addr + echo "$addr" simd add-genesis-account "$addr" "1000000000$STAKE,1000000000$FEE" done echo "Creating genesis tx ..." -(echo "$PASSWORD"; echo "$PASSWORD"; echo "$PASSWORD") | simd gentx validator --amount "250000000$STAKE" --chain-id "$CHAIN_ID" +(echo "$PASSWORD"; echo "$PASSWORD"; echo "$PASSWORD") | simd gentx validator --offline --amount "250000000$STAKE" --chain-id "$CHAIN_ID" --moniker="$MONIKER" simd collect-gentxs From 178214330ca754fcd5e6f18c552861ff20e6bf4c Mon Sep 17 00:00:00 2001 From: willclarktech Date: Wed, 5 Aug 2020 12:21:33 +0200 Subject: [PATCH 5/5] scripts: Update simapp template --- ...837c243073b389d7263684695becc03617.address | 1 + ...0cca1189f1074bffb9efc176c6fd7e2e38.address | 1 - .../template/.simapp/config/genesis.json | 769 +++++++++--------- ...cbfaca8ecb898784bacca9facf262b796e201.json | 1 - ...44239a7cbbf5cdde8bbde243fcd9a4195eb70.json | 1 + .../template/.simapp/config/node_key.json | 2 +- .../.simapp/config/priv_validator_key.json | 6 +- scripts/simapp/template/.simapp/keyhash | 2 +- .../simapp/template/.simapp/validator.info | 2 +- scripts/simapp/template/setup.sh | 8 +- 10 files changed, 399 insertions(+), 394 deletions(-) create mode 100644 scripts/simapp/template/.simapp/8a9fdd837c243073b389d7263684695becc03617.address delete mode 100644 scripts/simapp/template/.simapp/be69af0cca1189f1074bffb9efc176c6fd7e2e38.address delete mode 100644 scripts/simapp/template/.simapp/config/gentx/gentx-6dbcbfaca8ecb898784bacca9facf262b796e201.json create mode 100644 scripts/simapp/template/.simapp/config/gentx/gentx-dc544239a7cbbf5cdde8bbde243fcd9a4195eb70.json diff --git a/scripts/simapp/template/.simapp/8a9fdd837c243073b389d7263684695becc03617.address b/scripts/simapp/template/.simapp/8a9fdd837c243073b389d7263684695becc03617.address new file mode 100644 index 00000000..f6def662 --- /dev/null +++ b/scripts/simapp/template/.simapp/8a9fdd837c243073b389d7263684695becc03617.address @@ -0,0 +1 @@ +eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wOC0wNSAxMDoxOTo0Ni42NTgyNTg5ICswMDAwIFVUQyBtPSswLjE3NDU1MDUwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6IlNXQmdBYzlDVkw2YVdFNloifQ.1WcD0GRVorQbC7411RbZwvZdtSG9ZcipAXCgXzMCORWq4tE4ke8lJA.UHmYdum53TSPA169.HW0l0KFZS4GQ9_ss_4tSt7d_cv3qjixehXxAtXEVUEUhAV8JViouQYD1-VELy1mtd7r5Ld1L9q6l0X6B2OGmc6I9bQZSB1G3KSH9WCvTvigiTnYeOrGwtTy8ZxkrC5vWj0rkaADqd3Hmc3hZsovxhlUqMcLxP7ZXET0NjNWu9auNVEevt_jgKyqttqc2zMEER3wYXVTVSm0vHo723vhFIRJNF6hp1p0u1KmyaZ7q1Di_2wb1fUrubxzU.dr7x1R5fIfDzjGgU-w7PAg \ No newline at end of file diff --git a/scripts/simapp/template/.simapp/be69af0cca1189f1074bffb9efc176c6fd7e2e38.address b/scripts/simapp/template/.simapp/be69af0cca1189f1074bffb9efc176c6fd7e2e38.address deleted file mode 100644 index f841893e..00000000 --- a/scripts/simapp/template/.simapp/be69af0cca1189f1074bffb9efc176c6fd7e2e38.address +++ /dev/null @@ -1 +0,0 @@ -eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wNy0yOSAxMjozMzo0My4yNzMwNzc0ICswMDAwIFVUQyBtPSswLjQyMDc1MDIwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6Ik1QUEpoYXdfUE9CTk84ckcifQ.1qbmeelJhpCbCgKFx3RUYchhFtsZhl8HpVe2TIk_ioOt4LE9zJ1a5A.rYvjRK55ePe7O9JU.-RTRUDq1_79yOeZoXXUyyiVlanfHFjlmxQ8ZdtDCfLg8OcIgEvQYWpQG0NXFVQSaV3yYc8m1sWuXQqnMH5pm9kgxFWq7jahobz9a70d9WibfAUNBqdcvC7AyvM1L8eWIo1a_HJV_C1-CkZDjUuAK4MDj8KReC4NFbOKW_A1rNkJxCrVX7m1v2SQF9fEAEepnEZzYtH0LFDTZYNhpwt8o-ofk-47lPYr0KJB6CXaMv2CJ2clRTg12V_a0.Xv8QuXyJcO_9ZLK6LBhBkg \ No newline at end of file diff --git a/scripts/simapp/template/.simapp/config/genesis.json b/scripts/simapp/template/.simapp/config/genesis.json index e5a6e25e..a65cb8d2 100644 --- a/scripts/simapp/template/.simapp/config/genesis.json +++ b/scripts/simapp/template/.simapp/config/genesis.json @@ -1,5 +1,5 @@ { - "genesis_time": "2020-07-29T12:33:42.4598863Z", + "genesis_time": "2020-08-05T10:19:46.2922652Z", "chain_id": "simd-testing", "consensus_params": { "block": { @@ -19,31 +19,118 @@ }, "app_hash": "", "app_state": { - "mint": { - "minter": { - "inflation": "0.130000000000000000", - "annual_provisions": "0.000000000000000000" - }, + "transfer": { + "port_id": "transfer" + }, + "genutil": { + "gentxs": [ + { + "body": { + "messages": [ + { + "@type": "/cosmos.staking.MsgCreateValidator", + "description": { + "moniker": "simd-moniker" + }, + "commission": { + "rate": "0.100000000000000000", + "max_rate": "0.200000000000000000", + "max_change_rate": "0.010000000000000000" + }, + "min_self_delegation": "1", + "delegator_address": "cosmos1320amqmuysc88vuf6unrdprft0kvqdshapg46s", + "validator_address": "cosmosvaloper1320amqmuysc88vuf6unrdprft0kvqdshc4uqkr", + "pubkey": "cosmosvalconspub1zcjduepqeg7s6rcwmnsquupys6a8cd4402drnvzyv84nfakvyzdgzz6qzumqkavfer", + "value": { + "denom": "ustake", + "amount": "250000000" + } + } + ], + "memo": "dc544239a7cbbf5cdde8bbde243fcd9a4195eb70@172.17.0.2:26656" + }, + "auth_info": { + "signer_infos": [ + { + "public_key": { + "secp256k1": "AmT77hhRkycGp9kUxEwOhlHsNl6owW7X7g+nJtrFTlQO" + }, + "mode_info": { + "single": { + "mode": "SIGN_MODE_DIRECT" + } + } + } + ], + "fee": { + "gas_limit": "200000" + } + }, + "signatures": [ + "yqsTm7NZStlzxEUnVQCFxZErdba2r5Slf2/Gf/DTpSNUg+EzhUqWD75c9ynAXPgDz4XSP9ys7PCATegvACkxEQ==" + ] + } + ] + }, + "distribution": { "params": { - "mint_denom": "ustake", - "inflation_rate_change": "0.130000000000000000", - "inflation_max": "0.200000000000000000", - "inflation_min": "0.070000000000000000", - "goal_bonded": "0.670000000000000000", - "blocks_per_year": "6311520" + "community_tax": "0.020000000000000000", + "base_proposer_reward": "0.010000000000000000", + "bonus_proposer_reward": "0.040000000000000000", + "withdraw_addr_enabled": true + }, + "fee_pool": { + "community_pool": [] + }, + "delegator_withdraw_infos": [], + "outstanding_rewards": [], + "validator_accumulated_commissions": [], + "validator_historical_rewards": [], + "validator_current_rewards": [], + "delegator_starting_infos": [], + "validator_slash_events": [] + }, + "gov": { + "starting_proposal_id": "1", + "deposits": null, + "votes": null, + "proposals": null, + "deposit_params": { + "min_deposit": [ + { + "denom": "ustake", + "amount": "10000000" + } + ], + "max_deposit_period": "172800000000000" + }, + "voting_params": { + "voting_period": "172800000000000" + }, + "tally_params": { + "quorum": "0.334000000000000000", + "threshold": "0.500000000000000000", + "veto": "0.334000000000000000" } }, - "params": null, - "slashing": { - "params": { - "signed_blocks_window": "100", - "min_signed_per_window": "0.500000000000000000", - "downtime_jail_duration": "600000000000", - "slash_fraction_double_sign": "0.050000000000000000", - "slash_fraction_downtime": "0.010000000000000000" + "ibc": { + "client_genesis": { + "clients": [], + "clients_consensus": [], + "create_localhost": true }, - "signing_infos": {}, - "missed_blocks": {} + "connection_genesis": { + "connections": [], + "client_connection_paths": [] + }, + "channel_genesis": { + "channels": [], + "acknowledgements": [], + "commitments": [], + "send_sequences": [], + "recv_sequences": [], + "ack_sequences": [] + } }, "staking": { "params": { @@ -60,8 +147,275 @@ "unbonding_delegations": null, "redelegations": null }, - "transfer": { - "port_id": "transfer" + "upgrade": {}, + "evidence": {}, + "params": null, + "mint": { + "minter": { + "inflation": "0.130000000000000000", + "annual_provisions": "0.000000000000000000" + }, + "params": { + "mint_denom": "ustake", + "inflation_rate_change": "0.130000000000000000", + "inflation_max": "0.200000000000000000", + "inflation_min": "0.070000000000000000", + "goal_bonded": "0.670000000000000000", + "blocks_per_year": "6311520" + } + }, + "bank": { + "params": { + "default_send_enabled": true + }, + "balances": [ + { + "address": "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos1xy4yqngt0nlkdcenxymg8tenrghmek4nmqm28k", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos1xv9tklw7d82sezh9haa573wufgy59vmwe6xxe5", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos1f7j7ryulwjfe9ljplvhtcaxa6wqgula3etktce", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos1vkv9sfwaak76weyamqx0flmng2vuquxqcuqukh", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos10dyr9899g6t0pelew4nvf4j5c3jcgv0r73qga5", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos106jwym4s9aujcmes26myzzwqsccw09sdm0v5au", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos1320amqmuysc88vuf6unrdprft0kvqdshapg46s", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos14qemq0vw6y3gc3u3e0aty2e764u4gs5le3hada", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos142u9fgcjdlycfcez3lw8x6x5h7rfjlnfhpw2lx", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos1hsm76p4ahyhl5yh3ve9ur49r5kemhp2r0dcjvx", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos1hhg2rlu9jscacku2wwckws7932qqqu8x3gfgw0", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos1cjsxept9rkggzxztslae9ndgpdyt2408lk850u", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos1c7wpeen2uv8thayf7g8q2rgpm29clj0dgrdtzw", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos1mjxpv9ft30wer7ma7kwfxhm42l379xutplrdk6", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos17yg9mssjenmc3jkqth6ulcwj9cxujrxxzezwta", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos17d0jcz59jf68g52vq38tuuncmwwjk42u6mcxej", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, + { + "address": "cosmos1lvrwcvrqlc5ktzp2c4t22xgkx29q3y83lktgzl", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + } + ], + "supply": [], + "denom_metadata": null + }, + "crisis": { + "constant_fee": { + "denom": "ustake", + "amount": "1000" + } + }, + "capability": { + "index": "1", + "owners": [] }, "auth": { "params": { @@ -75,7 +429,7 @@ { "type": "cosmos-sdk/BaseAccount", "value": { - "address": "cosmos1he567rx2zxylzp6tl7u7lstkcm7hut3cfv966s" + "address": "cosmos1320amqmuysc88vuf6unrdprft0kvqdshapg46s" } }, { @@ -182,365 +536,16 @@ } ] }, - "upgrade": {}, - "ibc": { - "client_genesis": { - "clients": [], - "clients_consensus": [], - "create_localhost": true - }, - "connection_genesis": { - "connections": [], - "client_connection_paths": [] - }, - "channel_genesis": { - "channels": [], - "acknowledgements": [], - "commitments": [], - "send_sequences": [], - "recv_sequences": [], - "ack_sequences": [] - } - }, - "gov": { - "starting_proposal_id": "1", - "deposits": null, - "votes": null, - "proposals": null, - "deposit_params": { - "min_deposit": [ - { - "denom": "ustake", - "amount": "10000000" - } - ], - "max_deposit_period": "172800000000000" - }, - "voting_params": { - "voting_period": "172800000000000" - }, - "tally_params": { - "quorum": "0.334000000000000000", - "threshold": "0.500000000000000000", - "veto": "0.334000000000000000" - } - }, - "distribution": { + "slashing": { "params": { - "community_tax": "0.020000000000000000", - "base_proposer_reward": "0.010000000000000000", - "bonus_proposer_reward": "0.040000000000000000", - "withdraw_addr_enabled": true + "signed_blocks_window": "100", + "min_signed_per_window": "0.500000000000000000", + "downtime_jail_duration": "600000000000", + "slash_fraction_double_sign": "0.050000000000000000", + "slash_fraction_downtime": "0.010000000000000000" }, - "fee_pool": { - "community_pool": [] - }, - "delegator_withdraw_infos": [], - "outstanding_rewards": [], - "validator_accumulated_commissions": [], - "validator_historical_rewards": [], - "validator_current_rewards": [], - "delegator_starting_infos": [], - "validator_slash_events": [] - }, - "crisis": { - "constant_fee": { - "denom": "ustake", - "amount": "1000" - } - }, - "genutil": { - "gentxs": [ - { - "type": "cosmos-sdk/StdTx", - "value": { - "msg": [ - { - "type": "cosmos-sdk/MsgCreateValidator", - "value": { - "description": { - "moniker": "simd-moniker" - }, - "commission": { - "rate": "0.100000000000000000", - "max_rate": "0.200000000000000000", - "max_change_rate": "0.010000000000000000" - }, - "min_self_delegation": "1", - "delegator_address": "cosmos1he567rx2zxylzp6tl7u7lstkcm7hut3cfv966s", - "validator_address": "cosmosvaloper1he567rx2zxylzp6tl7u7lstkcm7hut3cvc30kr", - "pubkey": "cosmosvalconspub1zcjduepq2r9g6vm7ss5m6ae34xpp33w87glwnrf0480pwlt5tf445scc3dkqxmewyp", - "value": { - "denom": "ustake", - "amount": "250000000" - } - } - } - ], - "fee": { - "amount": [], - "gas": "200000" - }, - "signatures": [ - { - "pub_key": "61rphyEDiRqk1Quo95zzOYnlLvQcUI09YZBXaxrst6RlfQuTyUI=", - "signature": "nA7GOLRiwa0XeVru59l4GuAxVgJEEYO1pFdszC9H1qxXn/5Lk0Pwq7SyMS7IsZcBReijt3MCkjzfBezTwEr6Ww==" - } - ], - "memo": "6dbcbfaca8ecb898784bacca9facf262b796e201@172.17.0.2:26656" - } - } - ] - }, - "bank": { - "params": { - "default_send_enabled": true - }, - "balances": [ - { - "address": "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos1xy4yqngt0nlkdcenxymg8tenrghmek4nmqm28k", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos1xv9tklw7d82sezh9haa573wufgy59vmwe6xxe5", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos1f7j7ryulwjfe9ljplvhtcaxa6wqgula3etktce", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos1vkv9sfwaak76weyamqx0flmng2vuquxqcuqukh", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos10dyr9899g6t0pelew4nvf4j5c3jcgv0r73qga5", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos106jwym4s9aujcmes26myzzwqsccw09sdm0v5au", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos14qemq0vw6y3gc3u3e0aty2e764u4gs5le3hada", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos142u9fgcjdlycfcez3lw8x6x5h7rfjlnfhpw2lx", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos1hsm76p4ahyhl5yh3ve9ur49r5kemhp2r0dcjvx", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos1hhg2rlu9jscacku2wwckws7932qqqu8x3gfgw0", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos1he567rx2zxylzp6tl7u7lstkcm7hut3cfv966s", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos1cjsxept9rkggzxztslae9ndgpdyt2408lk850u", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos1c7wpeen2uv8thayf7g8q2rgpm29clj0dgrdtzw", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos1mjxpv9ft30wer7ma7kwfxhm42l379xutplrdk6", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos17yg9mssjenmc3jkqth6ulcwj9cxujrxxzezwta", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos17d0jcz59jf68g52vq38tuuncmwwjk42u6mcxej", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, - { - "address": "cosmos1lvrwcvrqlc5ktzp2c4t22xgkx29q3y83lktgzl", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - } - ], - "supply": [], - "denom_metadata": null - }, - "capability": { - "index": "1", - "owners": [] - }, - "evidence": { - "evidence": [] + "signing_infos": [], + "missed_blocks": [] } } } \ No newline at end of file diff --git a/scripts/simapp/template/.simapp/config/gentx/gentx-6dbcbfaca8ecb898784bacca9facf262b796e201.json b/scripts/simapp/template/.simapp/config/gentx/gentx-6dbcbfaca8ecb898784bacca9facf262b796e201.json deleted file mode 100644 index 0891ec2f..00000000 --- a/scripts/simapp/template/.simapp/config/gentx/gentx-6dbcbfaca8ecb898784bacca9facf262b796e201.json +++ /dev/null @@ -1 +0,0 @@ -{"type":"cosmos-sdk/StdTx","value":{"msg":[{"type":"cosmos-sdk/MsgCreateValidator","value":{"description":{"moniker":"simd-moniker"},"commission":{"rate":"0.100000000000000000","max_rate":"0.200000000000000000","max_change_rate":"0.010000000000000000"},"min_self_delegation":"1","delegator_address":"cosmos1he567rx2zxylzp6tl7u7lstkcm7hut3cfv966s","validator_address":"cosmosvaloper1he567rx2zxylzp6tl7u7lstkcm7hut3cvc30kr","pubkey":"cosmosvalconspub1zcjduepq2r9g6vm7ss5m6ae34xpp33w87glwnrf0480pwlt5tf445scc3dkqxmewyp","value":{"denom":"ustake","amount":"250000000"}}}],"fee":{"amount":[],"gas":"200000"},"signatures":[{"pub_key":"61rphyEDiRqk1Quo95zzOYnlLvQcUI09YZBXaxrst6RlfQuTyUI=","signature":"nA7GOLRiwa0XeVru59l4GuAxVgJEEYO1pFdszC9H1qxXn/5Lk0Pwq7SyMS7IsZcBReijt3MCkjzfBezTwEr6Ww=="}],"memo":"6dbcbfaca8ecb898784bacca9facf262b796e201@172.17.0.2:26656"}} diff --git a/scripts/simapp/template/.simapp/config/gentx/gentx-dc544239a7cbbf5cdde8bbde243fcd9a4195eb70.json b/scripts/simapp/template/.simapp/config/gentx/gentx-dc544239a7cbbf5cdde8bbde243fcd9a4195eb70.json new file mode 100644 index 00000000..2c69445a --- /dev/null +++ b/scripts/simapp/template/.simapp/config/gentx/gentx-dc544239a7cbbf5cdde8bbde243fcd9a4195eb70.json @@ -0,0 +1 @@ +{"body":{"messages":[{"@type":"/cosmos.staking.MsgCreateValidator","description":{"moniker":"simd-moniker"},"commission":{"rate":"0.100000000000000000","max_rate":"0.200000000000000000","max_change_rate":"0.010000000000000000"},"min_self_delegation":"1","delegator_address":"cosmos1320amqmuysc88vuf6unrdprft0kvqdshapg46s","validator_address":"cosmosvaloper1320amqmuysc88vuf6unrdprft0kvqdshc4uqkr","pubkey":"cosmosvalconspub1zcjduepqeg7s6rcwmnsquupys6a8cd4402drnvzyv84nfakvyzdgzz6qzumqkavfer","value":{"denom":"ustake","amount":"250000000"}}],"memo":"dc544239a7cbbf5cdde8bbde243fcd9a4195eb70@172.17.0.2:26656"},"auth_info":{"signer_infos":[{"public_key":{"secp256k1":"AmT77hhRkycGp9kUxEwOhlHsNl6owW7X7g+nJtrFTlQO"},"mode_info":{"single":{"mode":"SIGN_MODE_DIRECT"}}}],"fee":{"gas_limit":"200000"}},"signatures":["yqsTm7NZStlzxEUnVQCFxZErdba2r5Slf2/Gf/DTpSNUg+EzhUqWD75c9ynAXPgDz4XSP9ys7PCATegvACkxEQ=="]} diff --git a/scripts/simapp/template/.simapp/config/node_key.json b/scripts/simapp/template/.simapp/config/node_key.json index 3e68a2f2..7d925c88 100644 --- a/scripts/simapp/template/.simapp/config/node_key.json +++ b/scripts/simapp/template/.simapp/config/node_key.json @@ -1 +1 @@ -{"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"WG36bpfjSh8gy3HBWU4buv4sA6b8SrRa4Jj5sjo2CXyPRlP2d8Br7UNztMkUSomavPEZoUo2WzlzZ2XnyPi0rQ=="}} \ No newline at end of file +{"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"R89SQVGfuYzV/14lfUPXYCIMkNJW+EtnuHOCurizEFtu6xO3ooXongYxM4C6qYqBu9NnIDefYhOqWu6Yfm1/CA=="}} \ No newline at end of file diff --git a/scripts/simapp/template/.simapp/config/priv_validator_key.json b/scripts/simapp/template/.simapp/config/priv_validator_key.json index a28b53e4..803b3cab 100644 --- a/scripts/simapp/template/.simapp/config/priv_validator_key.json +++ b/scripts/simapp/template/.simapp/config/priv_validator_key.json @@ -1,11 +1,11 @@ { - "address": "69EA0594C2B1320ABFC6EEE8B9BF421DA9FD9195", + "address": "B1CF8F1750F16AC21D47A6B601B60366C72D6453", "pub_key": { "type": "tendermint/PubKeyEd25519", - "value": "UMqNM36EKb13MamCGMXH8j7pjS+p3hd9dFprWkMYi2w=" + "value": "yj0NDw7c4A5wJIa6fDa1epo5sERh6zT2zCCagQtAFzY=" }, "priv_key": { "type": "tendermint/PrivKeyEd25519", - "value": "n8wH/j0kqdFfGVfvEbR1JVJeXps84BU+gNJ0kz+KJmFQyo0zfoQpvXcxqYIYxcfyPumNL6neF310WmtaQxiLbA==" + "value": "uOMarp66JsGXM7ZjNStlghSvEQ1ZIWyPif9c9OCTguvKPQ0PDtzgDnAkhrp8NrV6mjmwRGHrNPbMIJqBC0AXNg==" } } \ No newline at end of file diff --git a/scripts/simapp/template/.simapp/keyhash b/scripts/simapp/template/.simapp/keyhash index 977be397..1e58f4e4 100755 --- a/scripts/simapp/template/.simapp/keyhash +++ b/scripts/simapp/template/.simapp/keyhash @@ -1 +1 @@ -$2a$10$0haA89aJOZcjF4Vqcx99jeXOoDDnYym3wvGNHxxBdfoDOhvXdjumu \ No newline at end of file +$2a$10$ErqhOjVIXPK3JrM8uP0sNeaknxSAfD4pfcjJx3IITELAHeWcU06b. \ No newline at end of file diff --git a/scripts/simapp/template/.simapp/validator.info b/scripts/simapp/template/.simapp/validator.info index 92d91fb4..e0ac9e43 100644 --- a/scripts/simapp/template/.simapp/validator.info +++ b/scripts/simapp/template/.simapp/validator.info @@ -1 +1 @@ -eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wNy0yOSAxMjozMzo0My4yNTA3MTQxICswMDAwIFVUQyBtPSswLjM5ODMzOTYwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6ImJUWEFGbmd6dlpGU0xIdUgifQ.OblR71PYvd-hM-i-umBX-8Rufz8oDYhC0YBf_NS8VjM8r_D0Dkg2Mg.ll8r6qH1V9srND3w.skQG_BTTBvr6lbxD5qQAqumjRk0Hpp160lCLaIhf0vJ0rmd93p66HmfxQd3ZLCODuPz_XRUefmrIlw6k5b0jYjvcb9qEKJxb2emDNd_8lRp4v5Z6SpeLNMpGRjP0_cDtaCUlYb-yuJ-aebAK_ftwr6kWgB8fJkdMhVRrTdsNjPxk-o9q9IWT_7aWvlnbjdXBi-IwKqZE-mqLxR3HnF2m5K4NnnW9EMzLZM3B_LoLjEGnnSl5IYVaGy-LC1EbINPbj2DDetxUj7atXwY3GJOsIU0VX26NdNHKvv29UWkGdg8vgJlvhKX0-_GFIKP3L_a6S6klnAngowlQPvYIXOq8AX8chk47yUmGeREmFcrZKFfyfF5Z.gu6X671jqogyqHOoHiKnxQ \ No newline at end of file +eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wOC0wNSAxMDoxOTo0Ni42NDYyNDUyICswMDAwIFVUQyBtPSswLjE2MjUzNTgwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6IlB3X1RBYkRxR2tXZWZHU0kifQ.HtxQbkSoUXhddjkf94sYO3CmLbPXn2FonMQZrsLJJqKgZb_4Ghm5kg.ky6uwdJhGhAhBMDD.6FCMDj06Lk6xVT1Lpz2ls-gpWDT_F5kOAB_KNeef6zhXbjDEa0VGWY97R_Yy-_NXOFkxz4juQKrPm2IDsFucmhWrtk4A2DzKQ81FP5Ev8K9_a2vDoS5eL28EWm0h5eIoPhVbbDx5mw04lKwD_8mBX5KqvacWCJo0GrD3B1W2ts_n_osHI_Pts6FolMRM5Hp3X3BEJiN1qshE39-0q2MWkh3b2VP4Wn2UE5sFR2UA0ChBRLzVl4Ie5YuPOJMSDL7xFsRFhVNVp5BNn6bv03gHyz2fX2qwOC1xMUu9memlc_Auj818WrLNWxVUqIfKvVuwtNVTpLTBoK7Lqo17dNy44WDt_Wn-eA6wtkP7j2bu2Dq2iwZu.QoGCOja4LFZ90nZJUcUNzA \ No newline at end of file diff --git a/scripts/simapp/template/setup.sh b/scripts/simapp/template/setup.sh index 6d61efb0..1f88f8d7 100755 --- a/scripts/simapp/template/setup.sh +++ b/scripts/simapp/template/setup.sh @@ -1,5 +1,5 @@ #!/bin/sh -set -o errexit -o nounset -o pipefail +set -o errexit -o nounset command -v shellcheck > /dev/null && shellcheck "$0" PASSWORD=${PASSWORD:-1234567890} @@ -13,7 +13,7 @@ simd init --chain-id "$CHAIN_ID" "$MONIKER" sed -i "s/\"stake\"/\"$STAKE\"/" "$HOME"/.simapp/config/genesis.json # staking/governance token is hardcoded in config, change this echo "Setting up validator ..." -if ! simd keys show validator; then +if ! simd keys show validator 2> /dev/null; then echo "Validator does not yet exist. Creating it ..." (echo "$PASSWORD"; echo "$PASSWORD") | simd keys add validator fi @@ -23,10 +23,10 @@ echo "$PASSWORD" | simd add-genesis-account validator "1000000000$STAKE,10000000 echo "Setting up accounts ..." # (optionally) add a few more genesis accounts for addr in "$@"; do - echo $addr + echo "$addr" simd add-genesis-account "$addr" "1000000000$STAKE,1000000000$FEE" done echo "Creating genesis tx ..." -(echo "$PASSWORD"; echo "$PASSWORD"; echo "$PASSWORD") | simd gentx validator --amount "250000000$STAKE" --chain-id "$CHAIN_ID" +(echo "$PASSWORD"; echo "$PASSWORD"; echo "$PASSWORD") | simd gentx validator --offline --amount "250000000$STAKE" --chain-id "$CHAIN_ID" --moniker="$MONIKER" simd collect-gentxs