Merge branch 'releases/v4.x' into fix/add-admin-signer

neutron-org · Aug 20, 2024 · 0f07b04 · 0f07b04
2 parents dcd6596 + 50e3259
commit 0f07b04
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	cosmossdk.io/x/upgrade v0.1.3
 	github.com/CosmWasm/wasmd v0.51.0
 	github.com/CosmWasm/wasmvm/v2 v2.0.2
-	github.com/cometbft/cometbft v0.38.10
+	github.com/cometbft/cometbft v0.38.11
 	github.com/cosmos/admin-module/v2 v2.0.0-20240430142959-8b3328d1b1a2
 	github.com/cosmos/cosmos-db v1.0.2
 	github.com/cosmos/cosmos-proto v1.0.0-beta.5

diff --git a/go.sum b/go.sum
@@ -365,8 +365,8 @@ github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ
 github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
 github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/cometbft/cometbft v0.38.10 h1:2ePuglchT+j0Iao+cfmt/nw5U7K2lnGDzXSUPGVdXaU=
-github.com/cometbft/cometbft v0.38.10/go.mod h1:jHPx9vQpWzPHEAiYI/7EDKaB1NXhK6o3SArrrY8ExKc=
+github.com/cometbft/cometbft v0.38.11 h1:6bNDUB8/xq4uYonYwIfGc9OqK1ZH4NkdaMmR1LZIJqk=
+github.com/cometbft/cometbft v0.38.11/go.mod h1:jHPx9vQpWzPHEAiYI/7EDKaB1NXhK6o3SArrrY8ExKc=
 github.com/cometbft/cometbft-db v0.11.0 h1:M3Lscmpogx5NTbb1EGyGDaFRdsoLWrUWimFEyf7jej8=
 github.com/cometbft/cometbft-db v0.11.0/go.mod h1:GDPJAC/iFHNjmZZPN8V8C1yr/eyityhi2W1hz2MGKSc=
 github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ=

diff --git a/network/hermes/config.toml b/network/hermes/config.toml
@@ -130,4 +130,5 @@ clock_drift = '5s'
 max_block_time = '10s'
 trusting_period = '14days'
 trust_threshold = { numerator = '1', denominator = '3' }
-address_type = { derivation = 'cosmos' }
+address_type = { derivation = 'cosmos' }
+dynamic_gas_price = { enabled = false, multiplier = 1.1, max = 0.6 }
diff --git a/network/init-gaiad.sh b/network/init-gaiad.sh
@@ -8,8 +8,21 @@ CHAIN_DIR="$BASE_DIR/$CHAINID"
 
 STAKEDENOM=${STAKEDENOM:-stake}
 
+function set_genesis_param_jq() {
+  param_path=$1
+  param_value=$2
+  jq "${param_path} = ${param_value}" > tmp_genesis_file.json < "$CHAIN_DIR/config/genesis.json" && mv tmp_genesis_file.json "$CHAIN_DIR/config/genesis.json"
+}
+
 echo "Creating and collecting gentx..."
 $BINARY genesis gentx val1 "7000000000$STAKEDENOM" --home "$CHAIN_DIR" --chain-id "$CHAINID" --keyring-backend test
 $BINARY genesis collect-gentxs --home "$CHAIN_DIR"
 
 sed -i -e 's/\*/\/cosmos.bank.v1beta1.MsgSend\", \"\/cosmos.staking.v1beta1.MsgDelegate\", \"\/cosmos.staking.v1beta1.MsgUndelegate/g' "$CHAIN_DIR/config/genesis.json"
+
+set_genesis_param_jq ".app_state.feemarket.params.enabled" "false"                      # feemarket
+set_genesis_param_jq ".app_state.feemarket.params.fee_denom"       "\"uatom\""          # feemarket
+set_genesis_param_jq ".app_state.feemarket.state.base_gas_price" "\"0.0025\""           # feemarket
+set_genesis_param_jq ".app_state.feemarket.params.min_base_gas_price"    "\"0.0025\""   # feemarket
+
+set_genesis_param_jq ".app_state.ibc.client_genesis.params.allowed_clients" "[\"*\"]"         # ibc