Make genesis modifications same across scripts

scrtlabs · Aug 16, 2024 · 4a8bae2 · 4a8bae2
1 parent e47dd2e
commit 4a8bae2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 24 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
     }
   }
-}
+}