From 4a8bae2ecdec89ba31e55a977859626111e12d20 Mon Sep 17 00:00:00 2001 From: Ilya Raykker Date: Fri, 16 Aug 2024 21:08:23 +0400 Subject: [PATCH] Make genesis modifications same across scripts --- .../localsecret/bootstrap_init_no_stop.sh | 17 ++++------------- deployment/docker/localsecret/node_init.sh | 6 ++++-- scripts/start-node.sh | 4 ++-- scripts/start_bootstrap_node.sh | 4 ++-- scripts/start_full_node.sh | 4 ++-- x/compute/internal/keeper/testdata/genesis.json | 5 ++--- 6 files changed, 16 insertions(+), 24 deletions(-) diff --git a/deployment/docker/localsecret/bootstrap_init_no_stop.sh b/deployment/docker/localsecret/bootstrap_init_no_stop.sh index 1964d755e..360aa9624 100644 --- a/deployment/docker/localsecret/bootstrap_init_no_stop.sh +++ b/deployment/docker/localsecret/bootstrap_init_no_stop.sh @@ -26,24 +26,15 @@ if [ ! -e "$file" ]; then secretd init banana --chain-id "$chain_id" cp ~/node_key.json ~/.secretd/config/node_key.json - # jq ' - # .consensus_params.block.time_iota_ms = "10" | - # .app_state.staking.params.unbonding_time = "90s" | - # .app_state.gov.voting_params.voting_period = "90s" | - # .app_state.gov.voting_params.expedited_voting_period = "15s" | - # .app_state.crisis.constant_fee.denom = "uscrt" | - # .app_state.gov.deposit_params.min_deposit[0].denom = "uscrt" | - # .app_state.gov.deposit_params.min_expedited_deposit[0].denom = "uscrt" | - # .app_state.mint.params.mint_denom = "uscrt" | - # .app_state.staking.params.bond_denom = "uscrt" - # ' ~/.secretd/config/genesis.json > ~/.secretd/config/genesis.json.tmp && mv ~/.secretd/config/genesis.json{.tmp,} jq ' - .consensus_params.block.time_iota_ms = "10" | .app_state.staking.params.unbonding_time = "90s" | - .app_state.gov.voting_params.voting_period = "90s" | + .app_state.gov.params.voting_period = "90s" | + .app_state.gov.params.expedited_voting_period = "15s" | .app_state.crisis.constant_fee.denom = "uscrt" | .app_state.gov.deposit_params.min_deposit[0].denom = "uscrt" | + .app_state.gov.params.min_deposit[0].denom = "uscrt" | + .app_state.gov.params.expedited_min_deposit[0].denom = "uscrt" | .app_state.mint.params.mint_denom = "uscrt" | .app_state.staking.params.bond_denom = "uscrt" ' ~/.secretd/config/genesis.json >~/.secretd/config/genesis.json.tmp && mv ~/.secretd/config/genesis.json{.tmp,} diff --git a/deployment/docker/localsecret/node_init.sh b/deployment/docker/localsecret/node_init.sh index aaad4a820..4070cdd56 100755 --- a/deployment/docker/localsecret/node_init.sh +++ b/deployment/docker/localsecret/node_init.sh @@ -47,11 +47,13 @@ if [ ! -e $GENESIS_file ]; then cp ~/node_key.json ${SCRT_HOME}/config/node_key.json jq ' - .consensus_params.block.time_iota_ms = "10" | .app_state.staking.params.unbonding_time = "90s" | - .app_state.gov.voting_params.voting_period = "90s" | + .app_state.gov.params.voting_period = "90s" | + .app_state.gov.params.expedited_voting_period = "15s" | .app_state.crisis.constant_fee.denom = "uscrt" | .app_state.gov.deposit_params.min_deposit[0].denom = "uscrt" | + .app_state.gov.params.min_deposit[0].denom = "uscrt" | + .app_state.gov.params.expedited_min_deposit[0].denom = "uscrt" | .app_state.mint.params.mint_denom = "uscrt" | .app_state.staking.params.bond_denom = "uscrt" ' ${SCRT_HOME}/config/genesis.json > ${SCRT_HOME}/config/genesis.json.tmp diff --git a/scripts/start-node.sh b/scripts/start-node.sh index 36692b90d..9782db426 100755 --- a/scripts/start-node.sh +++ b/scripts/start-node.sh @@ -50,9 +50,9 @@ if [ $retVal -ne 0 ]; then fi cat ${SECRETD_HOME}/config/genesis.json | jq ' - .consensus_params.block.time_iota_ms = "10" | .app_state.staking.params.unbonding_time = "90s" | - .app_state.gov.voting_params.voting_period = "90s" | + .app_state.gov.params.voting_period = "90s" | + .app_state.gov.params.expedited_voting_period = "15s" | .app_state.crisis.constant_fee.denom = "uscrt" | .app_state.gov.deposit_params.min_deposit[0].denom = "uscrt" | .app_state.gov.params.min_deposit[0].denom = "uscrt" | diff --git a/scripts/start_bootstrap_node.sh b/scripts/start_bootstrap_node.sh index 6a7cf13cc..2593da47b 100755 --- a/scripts/start_bootstrap_node.sh +++ b/scripts/start_bootstrap_node.sh @@ -45,9 +45,9 @@ if [ ! -e $GENESIS_file ]; then cat ${SCRT_HOME}/config/genesis.json | sha256sum cat ${SCRT_HOME}/config/genesis.json | jq ' - .consensus_params.block.time_iota_ms = "10" | .app_state.staking.params.unbonding_time = "90s" | - .app_state.gov.voting_params.voting_period = "90s" | + .app_state.gov.params.voting_period = "90s" | + .app_state.gov.params.expedited_voting_period = "15s" | .app_state.crisis.constant_fee.denom = "uscrt" | .app_state.gov.deposit_params.min_deposit[0].denom = "uscrt" | .app_state.gov.params.min_deposit[0].denom = "uscrt" | diff --git a/scripts/start_full_node.sh b/scripts/start_full_node.sh index 0a33704c8..cb3a1fd75 100755 --- a/scripts/start_full_node.sh +++ b/scripts/start_full_node.sh @@ -94,9 +94,9 @@ echo "^^^^^^^^^^^ GENESIS ^^^^^^^^^^" sleep 5s cat ${SCRT_HOME}/config/genesis.json | jq ' - .consensus_params.block.time_iota_ms = "10" | .app_state.staking.params.unbonding_time = "90s" | - .app_state.gov.voting_params.voting_period = "90s" | + .app_state.gov.params.voting_period = "90s" | + .app_state.gov.params.expedited_voting_period = "15s" | .app_state.crisis.constant_fee.denom = "uscrt" | .app_state.gov.deposit_params.min_deposit[0].denom = "uscrt" | .app_state.gov.params.min_deposit[0].denom = "uscrt" | diff --git a/x/compute/internal/keeper/testdata/genesis.json b/x/compute/internal/keeper/testdata/genesis.json index 08969c7dd..396fa3e3b 100644 --- a/x/compute/internal/keeper/testdata/genesis.json +++ b/x/compute/internal/keeper/testdata/genesis.json @@ -4,8 +4,7 @@ "consensus_params": { "block": { "max_bytes": "22020096", - "max_gas": "-1", - "time_iota_ms": "1000" + "max_gas": "-1" }, "evidence": { "max_age_num_blocks": "100000", @@ -216,4 +215,4 @@ "exported": false } } -} \ No newline at end of file +}