diff --git a/scripts/simapp/env b/scripts/simapp/env index 403fec6b..cf08ed75 100644 --- a/scripts/simapp/env +++ b/scripts/simapp/env @@ -1,4 +1,4 @@ -# Choose from https://hub.docker.com/r/interchainio/cosmos-sdk/tags -REPOSITORY="interchainio/cosmos-sdk" -VERSION="july-2-2020" +# Choose from https://hub.docker.com/r/marbar3778/simapp/tags +REPOSITORY="marbar3778/simapp" +VERSION="nightly-2020-07-29" CONTAINER_NAME="simapp" diff --git a/scripts/simapp/setup.sh b/scripts/simapp/setup.sh index d274693c..d5e7b79f 100755 --- a/scripts/simapp/setup.sh +++ b/scripts/simapp/setup.sh @@ -5,21 +5,26 @@ command -v shellcheck > /dev/null && shellcheck "$0" PASSWORD=${PASSWORD:-1234567890} STAKE=${STAKE_TOKEN:-ustake} FEE=${FEE_TOKEN:-ucosm} -CHAIN_ID=${CHAIN_ID:-testing} +CHAIN_ID=${CHAIN_ID:-simd-testing} -simd init --chain-id="$CHAIN_ID" "$CHAIN_ID" -# staking/governance token is hardcoded in config, change this -sed -i "s/\"stake\"/\"$STAKE\"/" "$HOME"/.simapp/config/genesis.json -if ! simcli keys show validator; then - (echo "$PASSWORD"; echo "$PASSWORD") | simcli keys add validator +echo "Creating genesis ..." +simd init --chain-id "$CHAIN_ID" "$CHAIN_ID" +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 + (echo "$PASSWORD"; echo "$PASSWORD") | simd keys add validator fi # hardcode the validator account for this instance echo "$PASSWORD" | simd add-genesis-account validator "1000000000$STAKE,1000000000$FEE" + +echo "Setting up accounts ..." # (optionally) add a few more genesis accounts for addr in "$@"; do echo $addr simd add-genesis-account "$addr" "1000000000$STAKE,1000000000$FEE" done -# submit a genesis validator tx -(echo "$PASSWORD"; echo "$PASSWORD"; echo "$PASSWORD") | simd gentx --name validator --amount "250000000$STAKE" + +echo "Creating genesis tx ..." +(echo "$PASSWORD"; echo "$PASSWORD"; echo "$PASSWORD") | simd gentx validator --amount "250000000$STAKE" --chain-id "$CHAIN_ID" simd collect-gentxs diff --git a/scripts/simapp/template/.simapp/2bb7a14fe96a5d63899b4a1c6971d5da08e56ff5.address b/scripts/simapp/template/.simapp/2bb7a14fe96a5d63899b4a1c6971d5da08e56ff5.address deleted file mode 100644 index 9592fdd2..00000000 --- a/scripts/simapp/template/.simapp/2bb7a14fe96a5d63899b4a1c6971d5da08e56ff5.address +++ /dev/null @@ -1 +0,0 @@ -eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wNy0wMiAxMjowNzoyMy4xODYzNzMyMjMgKzAwMDAgVVRDIG09KzAuMTg4NzI3NzY0IiwiZW5jIjoiQTI1NkdDTSIsInAyYyI6ODE5MiwicDJzIjoiNGdMcVVEdlcyRGRaWk1NXyJ9.B-AuI5w3Sx51GG0g-VzBciHaWu8VpOvGfPJsWEMWZ3XpnOQib-6BeQ.ZrDU9r8QGYayFR1E.YtowOLcWfNA8bZmDvoJhVB_zrE1AWa-E5P2ShZV4hIAHBusrkyR-RwxEG4y7Kc4FHIXw5UCIuJvZaJy39z670xIhL6ktgTgZUmC4BTmHAnlC1oRDj_Ih0_J-oAsjTir8-Y0VXb1vyky1E4yo9jq-E3vTvqfxn3QCqHIBpnQ7dqoM8Zi3hCy9YxQoBGptEf9z5fimIszZMM1sXjqS7sEZPWoJO6jYmRUp9D5NvaY6zyTgOrEEWXF7JpqC.CTb3ibPIGwVtVIkziDg7GA \ No newline at end of file diff --git a/scripts/simapp/template/.simapp/config/addrbook.json b/scripts/simapp/template/.simapp/config/addrbook.json new file mode 100644 index 00000000..edd624ad --- /dev/null +++ b/scripts/simapp/template/.simapp/config/addrbook.json @@ -0,0 +1,4 @@ +{ + "key": "86da05cfcdca4b52c778c78a", + "addrs": [] +} \ 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 8b9a1e7a..97da4b3b 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-02T12:07:22.868761784Z", + "genesis_time": "2020-07-29T09:46:30.433319Z", "chain_id": "testing", "consensus_params": { "block": { @@ -19,130 +19,29 @@ }, "app_hash": "", "app_state": { - "auth": { - "params": { - "max_memo_characters": "256", - "tx_sig_limit": "7", - "tx_size_cost_per_byte": "10", - "sig_verify_cost_ed25519": "590", - "sig_verify_cost_secp256k1": "1000" + "gov": { + "starting_proposal_id": "1", + "deposits": null, + "votes": null, + "proposals": null, + "deposit_params": { + "min_deposit": [ + { + "denom": "ustake", + "amount": "10000000" + } + ], + "max_deposit_period": "172800000000000" }, - "accounts": [ - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos19wm6znlfdfwk8zvmfgwxjuw4mgyw2ml4lxx9p7" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos10dyr9899g6t0pelew4nvf4j5c3jcgv0r73qga5" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos1xy4yqngt0nlkdcenxymg8tenrghmek4nmqm28k" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos142u9fgcjdlycfcez3lw8x6x5h7rfjlnfhpw2lx" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos1hsm76p4ahyhl5yh3ve9ur49r5kemhp2r0dcjvx" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos14qemq0vw6y3gc3u3e0aty2e764u4gs5le3hada" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos1hhg2rlu9jscacku2wwckws7932qqqu8x3gfgw0" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos1xv9tklw7d82sezh9haa573wufgy59vmwe6xxe5" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos17yg9mssjenmc3jkqth6ulcwj9cxujrxxzezwta" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos1f7j7ryulwjfe9ljplvhtcaxa6wqgula3etktce" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos1lvrwcvrqlc5ktzp2c4t22xgkx29q3y83lktgzl" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos1vkv9sfwaak76weyamqx0flmng2vuquxqcuqukh" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos106jwym4s9aujcmes26myzzwqsccw09sdm0v5au" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos1c7wpeen2uv8thayf7g8q2rgpm29clj0dgrdtzw" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos1mjxpv9ft30wer7ma7kwfxhm42l379xutplrdk6" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos1cjsxept9rkggzxztslae9ndgpdyt2408lk850u" - } - }, - { - "type": "cosmos-sdk/BaseAccount", - "value": { - "address": "cosmos17d0jcz59jf68g52vq38tuuncmwwjk42u6mcxej" - } - } - ] + "voting_params": { + "voting_period": "172800000000000" + }, + "tally_params": { + "quorum": "0.334000000000000000", + "threshold": "0.500000000000000000", + "veto": "0.334000000000000000" + } }, - "evidence": { - "evidence": [] - }, - "params": null, - "upgrade": {}, "slashing": { "params": { "signed_blocks_window": "100", @@ -154,88 +53,16 @@ "signing_infos": {}, "missed_blocks": {} }, - "capability": { - "index": "1", - "owners": [] - }, - "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" + "crisis": { + "constant_fee": { + "denom": "ustake", + "amount": "1000" } }, - "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": [] - } - }, - "genutil": { - "gentxs": [ - { - "type": "cosmos-sdk/StdTx", - "value": { - "msg": [ - { - "type": "cosmos-sdk/MsgCreateValidator", - "value": { - "description": { - "moniker": "testing" - }, - "commission": { - "rate": "0.100000000000000000", - "max_rate": "0.200000000000000000", - "max_change_rate": "0.010000000000000000" - }, - "min_self_delegation": "1", - "delegator_address": "cosmos19wm6znlfdfwk8zvmfgwxjuw4mgyw2ml4lxx9p7", - "validator_address": "cosmosvaloper19wm6znlfdfwk8zvmfgwxjuw4mgyw2ml46jjsdd", - "pubkey": "cosmosvalconspub1zcjduepq97t76hzwgxnd6cj6tx6wuyv0d3llh8qr9uhdhdzjrurl5uvxjmcqhul8gk", - "value": { - "denom": "ustake", - "amount": "250000000" - } - } - } - ], - "fee": { - "amount": [], - "gas": "200000" - }, - "signatures": [ - { - "pub_key": "61rphyEDo5veugup1kp9T3NLAQiIk/eI21R0m82zpPRtj1y8GNQ=", - "signature": "QYjIsOmKs2aQAiEMFLd6X7viwHALp/lMonQi4wweMGU1lQGqztfV9xZncNXSJDljAqdj1BGjVxT9slAAaeMJgQ==" - } - ], - "memo": "666829b87c30fe2c35ec3ad9d955fd4acabdda8f@172.17.0.2:26656" - } - } - ] - }, "bank": { - "send_enabled": true, + "params": { + "default_send_enabled": true + }, "balances": [ { "address": "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6", @@ -250,19 +77,6 @@ } ] }, - { - "address": "cosmos19wm6znlfdfwk8zvmfgwxjuw4mgyw2ml4lxx9p7", - "coins": [ - { - "denom": "ucosm", - "amount": "1000000000" - }, - { - "denom": "ustake", - "amount": "1000000000" - } - ] - }, { "address": "cosmos1xy4yqngt0nlkdcenxymg8tenrghmek4nmqm28k", "coins": [ @@ -419,6 +233,19 @@ } ] }, + { + "address": "cosmos160hxhtgyy2tesa6y5uzec99epjekuyfh76w23d", + "coins": [ + { + "denom": "ucosm", + "amount": "1000000000" + }, + { + "denom": "ustake", + "amount": "1000000000" + } + ] + }, { "address": "cosmos1mjxpv9ft30wer7ma7kwfxhm42l379xutplrdk6", "coins": [ @@ -472,59 +299,10 @@ ] } ], - "supply": [] - }, - "transfer": { - "port_id": "transfer" - }, - "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": { - "params": { - "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": [], - "previous_proposer": "", - "outstanding_rewards": [], - "validator_accumulated_commissions": [], - "validator_historical_rewards": [], - "validator_current_rewards": [], - "delegator_starting_infos": [], - "validator_slash_events": [] - }, - "crisis": { - "constant_fee": { - "denom": "ustake", - "amount": "1000" - } + "supply": [], + "denom_metadata": null }, + "params": null, "staking": { "params": { "unbonding_time": "1814400000000000", @@ -538,8 +316,231 @@ "validators": null, "delegations": null, "unbonding_delegations": null, - "redelegations": null, - "exported": false + "redelegations": null + }, + "capability": { + "index": "1", + "owners": [] + }, + "auth": { + "params": { + "max_memo_characters": "256", + "tx_sig_limit": "7", + "tx_size_cost_per_byte": "10", + "sig_verify_cost_ed25519": "590", + "sig_verify_cost_secp256k1": "1000" + }, + "accounts": [ + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos160hxhtgyy2tesa6y5uzec99epjekuyfh76w23d" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos10dyr9899g6t0pelew4nvf4j5c3jcgv0r73qga5" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos1xy4yqngt0nlkdcenxymg8tenrghmek4nmqm28k" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos142u9fgcjdlycfcez3lw8x6x5h7rfjlnfhpw2lx" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos1hsm76p4ahyhl5yh3ve9ur49r5kemhp2r0dcjvx" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos14qemq0vw6y3gc3u3e0aty2e764u4gs5le3hada" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos1hhg2rlu9jscacku2wwckws7932qqqu8x3gfgw0" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos1xv9tklw7d82sezh9haa573wufgy59vmwe6xxe5" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos17yg9mssjenmc3jkqth6ulcwj9cxujrxxzezwta" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos1f7j7ryulwjfe9ljplvhtcaxa6wqgula3etktce" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos1lvrwcvrqlc5ktzp2c4t22xgkx29q3y83lktgzl" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos1vkv9sfwaak76weyamqx0flmng2vuquxqcuqukh" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos106jwym4s9aujcmes26myzzwqsccw09sdm0v5au" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos1c7wpeen2uv8thayf7g8q2rgpm29clj0dgrdtzw" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos1mjxpv9ft30wer7ma7kwfxhm42l379xutplrdk6" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos1cjsxept9rkggzxztslae9ndgpdyt2408lk850u" + } + }, + { + "type": "cosmos-sdk/BaseAccount", + "value": { + "address": "cosmos17d0jcz59jf68g52vq38tuuncmwwjk42u6mcxej" + } + } + ] + }, + "genutil": { + "gentxs": [ + { + "type": "cosmos-sdk/StdTx", + "value": { + "msg": [ + { + "type": "cosmos-sdk/MsgCreateValidator", + "value": { + "description": { + "moniker": "testing" + }, + "commission": { + "rate": "0.100000000000000000", + "max_rate": "0.200000000000000000", + "max_change_rate": "0.010000000000000000" + }, + "min_self_delegation": "1", + "delegator_address": "cosmos160hxhtgyy2tesa6y5uzec99epjekuyfh76w23d", + "validator_address": "cosmosvaloper160hxhtgyy2tesa6y5uzec99epjekuyfhmw6la7", + "pubkey": "cosmosvalconspub1zcjduepq5upt3p9eqm39ct8ccey6ys4nv4wmyrez838wekf2lfr8akvcve8qdr0g6a", + "value": { + "denom": "ustake", + "amount": "250000000" + } + } + } + ], + "fee": { + "amount": [], + "gas": "200000" + }, + "signatures": [ + { + "pub_key": "61rphyECJdjIz9unAUVohSFF7oDhGRMXlboKVaJ9sQUdbtdDeAY=", + "signature": "H6nbUSkjshfKvpwsVh3EICtQ0PxTCSO5iMwe0LwN5MUAZztWMmEiI+QNO6iSDNe/NlfxRpENZVLL2FCBvo3omw==" + } + ], + "memo": "e268e0e1b22a7ac8c012fc7e0eee4fa7e116fb53@172.17.0.2:26656" + } + } + ] + }, + "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": [] + } + }, + "evidence": { + "evidence": [] + }, + "transfer": { + "port_id": "transfer" + }, + "distribution": { + "params": { + "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": [] + }, + "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" + } } } } \ No newline at end of file diff --git a/scripts/simapp/template/.simapp/config/gentx/gentx-666829b87c30fe2c35ec3ad9d955fd4acabdda8f.json b/scripts/simapp/template/.simapp/config/gentx/gentx-666829b87c30fe2c35ec3ad9d955fd4acabdda8f.json deleted file mode 100644 index 53347d31..00000000 --- a/scripts/simapp/template/.simapp/config/gentx/gentx-666829b87c30fe2c35ec3ad9d955fd4acabdda8f.json +++ /dev/null @@ -1 +0,0 @@ -{"type":"cosmos-sdk/StdTx","value":{"msg":[{"type":"cosmos-sdk/MsgCreateValidator","value":{"description":{"moniker":"testing"},"commission":{"rate":"0.100000000000000000","max_rate":"0.200000000000000000","max_change_rate":"0.010000000000000000"},"min_self_delegation":"1","delegator_address":"cosmos19wm6znlfdfwk8zvmfgwxjuw4mgyw2ml4lxx9p7","validator_address":"cosmosvaloper19wm6znlfdfwk8zvmfgwxjuw4mgyw2ml46jjsdd","pubkey":"cosmosvalconspub1zcjduepq97t76hzwgxnd6cj6tx6wuyv0d3llh8qr9uhdhdzjrurl5uvxjmcqhul8gk","value":{"denom":"ustake","amount":"250000000"}}}],"fee":{"amount":[],"gas":"200000"},"signatures":[{"pub_key":"61rphyEDo5veugup1kp9T3NLAQiIk/eI21R0m82zpPRtj1y8GNQ=","signature":"QYjIsOmKs2aQAiEMFLd6X7viwHALp/lMonQi4wweMGU1lQGqztfV9xZncNXSJDljAqdj1BGjVxT9slAAaeMJgQ=="}],"memo":"666829b87c30fe2c35ec3ad9d955fd4acabdda8f@172.17.0.2:26656"}} diff --git a/scripts/simapp/template/.simapp/config/gentx/gentx-e268e0e1b22a7ac8c012fc7e0eee4fa7e116fb53.json b/scripts/simapp/template/.simapp/config/gentx/gentx-e268e0e1b22a7ac8c012fc7e0eee4fa7e116fb53.json new file mode 100644 index 00000000..5d8bdbca --- /dev/null +++ b/scripts/simapp/template/.simapp/config/gentx/gentx-e268e0e1b22a7ac8c012fc7e0eee4fa7e116fb53.json @@ -0,0 +1 @@ +{"type":"cosmos-sdk/StdTx","value":{"msg":[{"type":"cosmos-sdk/MsgCreateValidator","value":{"description":{"moniker":"testing"},"commission":{"rate":"0.100000000000000000","max_rate":"0.200000000000000000","max_change_rate":"0.010000000000000000"},"min_self_delegation":"1","delegator_address":"cosmos160hxhtgyy2tesa6y5uzec99epjekuyfh76w23d","validator_address":"cosmosvaloper160hxhtgyy2tesa6y5uzec99epjekuyfhmw6la7","pubkey":"cosmosvalconspub1zcjduepq5upt3p9eqm39ct8ccey6ys4nv4wmyrez838wekf2lfr8akvcve8qdr0g6a","value":{"denom":"ustake","amount":"250000000"}}}],"fee":{"amount":[],"gas":"200000"},"signatures":[{"pub_key":"61rphyECJdjIz9unAUVohSFF7oDhGRMXlboKVaJ9sQUdbtdDeAY=","signature":"H6nbUSkjshfKvpwsVh3EICtQ0PxTCSO5iMwe0LwN5MUAZztWMmEiI+QNO6iSDNe/NlfxRpENZVLL2FCBvo3omw=="}],"memo":"e268e0e1b22a7ac8c012fc7e0eee4fa7e116fb53@172.17.0.2:26656"}} diff --git a/scripts/simapp/template/.simapp/config/node_key.json b/scripts/simapp/template/.simapp/config/node_key.json index 59b1f8eb..c9ce579d 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":"4nAO7LSVDv3A7aRFdKReCGFPG5bbn7N+HmOvD+yy5bD3n3CY+jsnSjhdzhp+Ei7XNS0AXNz6z/hjqq3gkPjbgQ=="}} \ No newline at end of file +{"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"YJEoJGuUb+8uNgbuZuSbv5ZG+Bgwc510zkTfuA3yQL73uDitQWG7NBUJO2JTmy9TifMsBrHClQSpyE+QvJQxtA=="}} \ 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 5dec82c2..00cd7d73 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": "440C0F8873E50FDB8DDEA8F836FBA828ACF221D6", + "address": "02606461C2E26116F283E39774869ED8DC0AD668", "pub_key": { "type": "tendermint/PubKeyEd25519", - "value": "L5ftXE5Bpt1iWlm07hGPbH/7nAMvLtu0Uh8H+nGGlvA=" + "value": "pwK4hLkG4lws+MZJokKzZV2yDyI8TuzZKvpGftmYZk4=" }, "priv_key": { "type": "tendermint/PrivKeyEd25519", - "value": "RAznCBLeFaH1/OlbKzkB20pxTH+pv3LmC6mP6Pt2hM4vl+1cTkGm3WJaWbTuEY9sf/ucAy8u27RSHwf6cYaW8A==" + "value": "2XSAqOHzvsPKrynhorWNzLiNOscBiGWfhwvNkq5U5rWnAriEuQbiXCz4xkmiQrNlXbIPIjxO7Nkq+kZ+2ZhmTg==" } } \ No newline at end of file diff --git a/scripts/simapp/template/.simapp/d3ee6bad042297987744a7059c14b90cb36e1137.address b/scripts/simapp/template/.simapp/d3ee6bad042297987744a7059c14b90cb36e1137.address new file mode 100644 index 00000000..e33d5f20 --- /dev/null +++ b/scripts/simapp/template/.simapp/d3ee6bad042297987744a7059c14b90cb36e1137.address @@ -0,0 +1 @@ +eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wNy0yOSAwOTo0NjozMS4wMjgzMjI5ICswMDAwIFVUQyBtPSswLjM0NjA3NTEwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6Ik1WcjFiS0VmOUhfank4aFcifQ.rGcqp2J5R76xnCFm9bArZZX5Tg_60KrsPfix_yUX_6TVrScmhNWzwQ.4wRP52dlfcRosPeH.iPvij7W6B9aWpoVgijAjkD3O_gLanjrmooKXdbZvn9bKea283jS3s3nPlWTo_hcS-K7px9YzULdMmFqFgRdJ-U4vIu_3HZKFk8vpO_XkREDkSPrc4atKmCNr-JQQnHERfmRQMtSE81YAr4s9uMah9ap6MYpbLt1uyltEuq8m7T3o_Yxts4ct9rBBGffFxQ6nDUntXmidwTM7kRLIJ5pXvwMOSpdHv_qpakGZOnwzdr3sZygQ2QDp0Zpk.I1d_bvC5ToHIei8I0DtTJw \ No newline at end of file diff --git a/scripts/simapp/template/.simapp/data/.gitkeep b/scripts/simapp/template/.simapp/data/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/scripts/simapp/template/.simapp/keyhash b/scripts/simapp/template/.simapp/keyhash index 0dcb5b5c..44917d73 100755 --- a/scripts/simapp/template/.simapp/keyhash +++ b/scripts/simapp/template/.simapp/keyhash @@ -1 +1 @@ -$2a$10$2AeLq0go9NVRoA5qsAyTUuBOfVILtn2ZqqYcwx8uuummZAMPa2wt. \ No newline at end of file +$2a$10$Tl6lBvDSTtPHDnZly2mOSueorXC5VIrutGqORJvH83vSXG21guWnm \ No newline at end of file diff --git a/scripts/simapp/template/.simapp/validator.info b/scripts/simapp/template/.simapp/validator.info index 34b4f3ad..df51731a 100644 --- a/scripts/simapp/template/.simapp/validator.info +++ b/scripts/simapp/template/.simapp/validator.info @@ -1 +1 @@ -eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wNy0wMiAxMjowNzoyMy4xNzQ5Nzc4NjMgKzAwMDAgVVRDIG09KzAuMTc3MzMyNDA0IiwiZW5jIjoiQTI1NkdDTSIsInAyYyI6ODE5MiwicDJzIjoicFBxLVd0emZtTGFISHRLNCJ9.hcGBhR2s8TUx0gx_4nkafYHdpp4dTNyIFq9Yuncd_wRE6jY01EcxmA.GA-GnezDkH3vxfGe.Qf1TGdR-mJkct-MLbjPTekI9xzIBpuetY81gx7ifVT5NxptOHDoT4y8lUi96rbOH6wkgI3xYzBg9ieIKFz4-mpSqSOrdwbM4wSy_mOZLLqVE05x2ld3ggSRqFhOVlq2WLydqxEgZQIlXjXRuYq5iEvB1N977bZa8QW6Rs2-8-ZjApboNxp0hkZVyanAXMF70yc0kt3HW_vFfLBbI4xKe9ENAzDhDZvNkK8bpqBJtPIL-HMoD71UYa8z58XN7HKvtozmuqYhU9iRlU6pRTov0HzvepWEFuQaVPo1yXHpmNwwF-8fP03H1wMJ_wTVuLOEjIC-PnvZuEk9KOIm9QFnIXQmw_kaTLSVb1qXfq83F-Hf-Mt4w.pmuxyqelY9tPbPDErVEjAg \ No newline at end of file +eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyMC0wNy0yOSAwOTo0NjozMS4wMTM2OTY1ICswMDAwIFVUQyBtPSswLjMzMTQ1MTAwMSIsImVuYyI6IkEyNTZHQ00iLCJwMmMiOjgxOTIsInAycyI6Ik0wNU9Ibk56c1YwTE91c3gifQ.084o7E12X7Bl9oLufz_PRd5y2fkgEoHREyhsszKd8hYZmXDILE8TOA.VdGZuoDa0Dcs5zhd.2PRQRbRqUx2sKyXRlhw2iW8CFQcSTKWlBpfCDtDCqeRVuOI6q2xDM3FxQjGpJJq9-dVg2Lwd7nAUjsRa9m4s5PI9SHPFklAXL5j7d2NackEKeoJ_5yATKcDSc6FOZe1pgXGtunukLLyMIfeGFp_2O9rQEHKy02-qNdY_McKjpLN0sIrg0GVV3X-VImJXUJHwhwSKZJutNBoVg6Uoi0YB1-jbD_C60LuelZ4SZtDTUir2UCrtascK1qV1f3wvuqqn4kV7TrntaC7dEAIaTEyFqRrrotdXHzDo5mex3nWRW5ILT-0kLY7aSmZ9BPz4MkX1u4uotV9nnN3jqrlA2j_yCmlNG4Nv1mQ60lD9hPUcX1wMT8Ff.ufqSBrtF-wWpmZMPKRv7hQ \ No newline at end of file diff --git a/scripts/simapp/template/setup.sh b/scripts/simapp/template/setup.sh index d274693c..f7b1e4a8 100755 --- a/scripts/simapp/template/setup.sh +++ b/scripts/simapp/template/setup.sh @@ -7,19 +7,24 @@ STAKE=${STAKE_TOKEN:-ustake} FEE=${FEE_TOKEN:-ucosm} CHAIN_ID=${CHAIN_ID:-testing} -simd init --chain-id="$CHAIN_ID" "$CHAIN_ID" -# staking/governance token is hardcoded in config, change this -sed -i "s/\"stake\"/\"$STAKE\"/" "$HOME"/.simapp/config/genesis.json -if ! simcli keys show validator; then - (echo "$PASSWORD"; echo "$PASSWORD") | simcli keys add validator +echo "Creating genesis ..." +simd init --chain-id "$CHAIN_ID" "$CHAIN_ID" +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 + (echo "$PASSWORD"; echo "$PASSWORD") | simd keys add validator fi # hardcode the validator account for this instance echo "$PASSWORD" | simd add-genesis-account validator "1000000000$STAKE,1000000000$FEE" + +echo "Setting up accounts ..." # (optionally) add a few more genesis accounts for addr in "$@"; do echo $addr simd add-genesis-account "$addr" "1000000000$STAKE,1000000000$FEE" done -# submit a genesis validator tx -(echo "$PASSWORD"; echo "$PASSWORD"; echo "$PASSWORD") | simd gentx --name validator --amount "250000000$STAKE" + +echo "Creating genesis tx ..." +(echo "$PASSWORD"; echo "$PASSWORD"; echo "$PASSWORD") | simd gentx validator --amount "250000000$STAKE" --chain-id "$CHAIN_ID" simd collect-gentxs