Merge branch 'master' into luca_joss/add-pagination-to-queries

.changelog/unreleased/improvements/ibc-integration-test/4114-update-gaia-to-v18.md

@@ -0,0 +1,2 @@
+- Update the version of Gaia running the integration tests in the CI from `v17.2.1`
+  to `v18.1.0` ([\#4114](https://github.com/informalsystems/hermes/issues/4114))

.changelog/unreleased/improvements/ibc-integration-test/4116-update-osmosis-to-v25-2-0.md

@@ -0,0 +1,2 @@
+- Update the version of Osmosis running the integration tests in the CI from `v25.0.0`
+  to `v25.2.0` ([\#4116](https://github.com/informalsystems/hermes/issues/4116))

.changelog/unreleased/improvements/ibc-integration-test/4117-update-juno-to-v23.md

@@ -0,0 +1,2 @@
+- Update the version of Juno running the integration tests in the CI from `v22.0.0`
+  to `v23.0.0` ([\#4117](https://github.com/informalsystems/hermes/issues/4117))

.changelog/unreleased/improvements/ibc-integration-test/4118-update-migaloo-to-v4-2-0.md

@@ -0,0 +1,2 @@
+- Update the version of Migaloo Chain running the integration tests in the CI from `v4.1.3`
+  to `v4.2.0` ([\#4118](https://github.com/informalsystems/hermes/issues/4118))

.changelog/unreleased/improvements/ibc-integration-test/4120-update-wasmd-to-v0-52.md

@@ -0,0 +1,2 @@
+- Update the version of `wasmd` running the integration tests in the CI from `v0.51.0`
+  to `v0.52.0` ([\#4120](https://github.com/informalsystems/hermes/issues/4120))

.changelog/unreleased/improvements/ibc-integration-test/4121-update-stride-to-v23.md

@@ -0,0 +1,2 @@
+- Update the version of Stride running the integration tests in the CI from `v21.0.0`
+  to `v23.0.1` ([\#4121](https://github.com/informalsystems/hermes/issues/4121))

.changelog/unreleased/improvements/ibc-integration-test/4122-update-neutron-to-v4.md

@@ -0,0 +1,2 @@
+- Update the version of Neutron running the integration tests in the CI from `v3.0.5`
+  to `v4.1.0` ([\#4122](https://github.com/informalsystems/hermes/issues/4122))

.changelog/unreleased/improvements/ibc-relayer/4071-split-packet-clear-scheduling.md

@@ -0,0 +1,4 @@
+- Add a new configuration `clear_limit` to specify the maximum number
+  of packets cleared every time packet clearing is triggered.
+  Defaults to 50.
+  ([\#4071](https://github.com/informalsystems/hermes/issues/4071))

.github/workflows/integration.yaml

@@ -45,7 +45,7 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: gaia17
+          - package: gaia18
             command: gaiad
             account_prefix: cosmos
             native_token: stake
@@ -84,12 +84,12 @@ jobs:
             command: provenanced
             account_prefix: pb
             native_token: nhash
-            features: fee-grant,async-icq,authz
+            features: fee-grant,authz
           - package: migaloo
             command: migalood
             account_prefix: migaloo
             native_token: stake
-            features: ics29-fee
+            features: ics29-fee,ica,forward-packet
           - package: injective
             command: injectived
             account_prefix: inj
@@ -171,10 +171,10 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: .#gaia17 .#stride
+          - package: .#gaia18 .#stride
             command: gaiad,strided
             account_prefix: cosmos,stride
-          - package: .#gaia17 .#neutron
+          - package: .#gaia18 .#neutron
             command: gaiad,neutrond
             account_prefix: cosmos,neutron
     steps:
@@ -216,7 +216,7 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: .#gaia17 .#stride-no-admin
+          - package: .#gaia18 .#stride-no-admin
             command: gaiad,strided
             account_prefix: cosmos,stride
     steps:
@@ -257,7 +257,7 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: .#celestia .#gaia17
+          - package: .#celestia .#gaia18
             command: celestia-appd,gaiad
             account_prefix: celestia,cosmos
             native_token: utia,stake

.github/workflows/misbehaviour.yml

@@ -43,7 +43,7 @@ jobs:
       fail-fast: false
       matrix:
         chain:
-          - package: gaia17
+          - package: gaia18
             command: gaiad
             account_prefix: cosmos
     steps:

.github/workflows/multi-chains.yaml

@@ -58,7 +58,7 @@ jobs:
       fail-fast: false
       matrix:
         first-package:
-          - package: gaia17
+          - package: gaia18
             command: gaiad
             account_prefix: cosmos
           - package: ibc-go-v7-simapp

Cargo.toml

@@ -62,7 +62,7 @@ dirs-next                = "2.0.0"
 ed25519                  = "2.2.2"
 ed25519-dalek            = "2.0.0"
 ed25519-dalek-bip32      = "0.3.0"
-env_logger               = "0.11.1"
+env_logger               = "0.11.5"
 eyre                     = "0.6.12"
 flex-error               = { version = "0.4.4", default-features = false }
 futures                  = "0.3.27"
@@ -94,7 +94,7 @@ secp256k1                = "0.28.2"
 semver                   = "1.0.21"
 serde                    = "1.0.204"
 serde_derive             = "1.0.104"
-serde_json               = "1.0.121"
+serde_json               = "1.0.122"
 serde_yaml               = "0.9.34"
 serial_test              = "3.1.1"
 sha2                     = "0.10.6"
@@ -110,7 +110,7 @@ tiny-bip39               = "1.0.0"
 tiny-keccak              = { version = "2.0.2", default-features = false }
 tokio                    = "1.26.0"
 tokio-stream             = "0.1.14"
-toml                     = "0.8.15"
+toml                     = "0.8.19"
 tonic                    = "0.12"
 tracing                  = { version = "0.1.36", default-features = false }
 tracing-subscriber       = "0.3.14"

ci/misbehaviour/config.toml

@@ -211,6 +211,19 @@ gas_price = { price = 0.001, denom = 'stake' }
 # Minimum value: 1.0
 gas_multiplier = 1.3
 
+# Query the current gas price from the chain instead of using the static `gas_price` from the config.
+# Useful for chains which have [EIP-1559][eip]-like dynamic gas price. 
+#
+# At the moment, only chains which support the `osmosis.txfees.v1beta1.Query/GetEipBaseFee`
+# query or have enabled Skip's `x/feemarket` module https://github.com/skip-mev/feemarket
+# can be used with dynamic gas price enabled.
+#
+# See this page in the Hermes guide for more information:
+# https://hermes.informal.systems/documentation/configuration/dynamic-gas-fees.html
+# 
+# Default: { enabled = false, multiplier = 1.1, max = 0.6 }
+dynamic_gas_price = { enabled = true, multiplier = 1.3, max = 5.0 }
+
 # Specify how many IBC messages at most to include in a single transaction.
 # Default: 30
 max_msg_num = 30
@@ -314,6 +327,7 @@ default_gas = 100000
 max_gas = 400000
 gas_price = { price = 0.001, denom = 'stake' }
 gas_multiplier = 1.3
+dynamic_gas_price = { enabled = true, multiplier = 1.3, max = 5.0 }
 max_msg_num = 30
 max_tx_size = 2097152
 clock_drift = '5s'

ci/misbehaviour/config_fork.toml

@@ -208,7 +208,20 @@ gas_price = { price = 0.001, denom = 'stake' }
 #
 # Default: 1.1, ie. the gas is increased by 10%
 # Minimum value: 1.0
-gas_multiplier = 1.1
+gas_multiplier = 1.3
+
+# Query the current gas price from the chain instead of using the static `gas_price` from the config.
+# Useful for chains which have [EIP-1559][eip]-like dynamic gas price. 
+#
+# At the moment, only chains which support the `osmosis.txfees.v1beta1.Query/GetEipBaseFee`
+# query or have enabled Skip's `x/feemarket` module https://github.com/skip-mev/feemarket
+# can be used with dynamic gas price enabled.
+#
+# See this page in the Hermes guide for more information:
+# https://hermes.informal.systems/documentation/configuration/dynamic-gas-fees.html
+# 
+# Default: { enabled = false, multiplier = 1.1, max = 0.6 }
+dynamic_gas_price = { enabled = true, multiplier = 1.3, max = 5.0 }
 
 # Specify how many IBC messages at most to include in a single transaction.
 # Default: 30
@@ -312,7 +325,8 @@ store_prefix = 'ibc'
 default_gas = 100000
 max_gas = 400000
 gas_price = { price = 0.001, denom = 'stake' }
-gas_multiplier = 1.1
+gas_multiplier = 1.3
+dynamic_gas_price = { enabled = true, multiplier = 1.3, max = 5.0 }
 max_msg_num = 30
 max_tx_size = 2097152
 clock_drift = '5s'

config.toml

@@ -59,6 +59,10 @@ clear_interval = 100
 # Whether or not to clear packets on start. [Default: true]
 clear_on_start = true
 
+# Set the maximum number of packets to clear each time packet clearing is triggered.
+# [Default: 50]
+#clear_limit = 50
+
 # Toggle the transaction confirmation mechanism.
 # The tx confirmation mechanism periodically queries the `/tx_search` RPC
 # endpoint to check that previously-submitted transactions

crates/relayer-cli/src/commands.rs

@@ -100,7 +100,7 @@ pub enum CliCmd {
     /// The `version` subcommand, retained for backward compatibility.
     Version(VersionCmd),
 
-    /// Performs a health check of all chains in the the config
+    /// Performs a health check of all chains in the config
     HealthCheck(HealthCheckCmd),
 
     /// Generate auto-complete scripts for different shells.

crates/relayer-cli/src/commands/query/transfer/denom_trace.rs

@@ -14,7 +14,7 @@ use crate::conclude::{exit_with_unrecoverable_error, json, Output};
 ///
 /// `query transfer denom-trace --chain <CHAIN_ID> --hash <HASH>`
 ///
-/// If successful the the base denomination and the path will be displayed.
+/// If successful the base denomination and the path will be displayed.
 #[derive(Clone, Command, Debug, Parser, PartialEq, Eq)]
 pub struct DenomTraceCmd {
     #[clap(

crates/relayer/src/channel/version.rs

@@ -8,7 +8,7 @@ use ibc_relayer_types::{applications::transfer, core::ics24_host::identifier::Po
 
 pub use ibc_relayer_types::core::ics04_channel::version::Version;
 
-/// Returns the default channel version, depending on the the given [`PortId`].
+/// Returns the default channel version, depending on the given [`PortId`].
 pub fn default_by_port(port_id: &PortId) -> Option<Version> {
     if port_id.as_str() == transfer::PORT_ID_STR {
         // https://github.com/cosmos/ibc/tree/master/spec/app/ics-020-fungible-token-transfer#forwards-compatibility

crates/relayer/src/config.rs

@@ -250,6 +250,10 @@ pub mod default {
     pub fn allow_ccq() -> bool {
         true
     }
+
+    pub fn clear_limit() -> usize {
+        50
+    }
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
@@ -424,6 +428,8 @@ pub struct Packets {
     pub ics20_max_memo_size: Ics20FieldSizeLimit,
     #[serde(default = "default::ics20_max_receiver_size")]
     pub ics20_max_receiver_size: Ics20FieldSizeLimit,
+    #[serde(default = "default::clear_limit")]
+    pub clear_limit: usize,
 
     #[serde(skip)]
     pub force_disable_clear_on_start: bool,
@@ -439,6 +445,7 @@ impl Default for Packets {
             auto_register_counterparty_payee: default::auto_register_counterparty_payee(),
             ics20_max_memo_size: default::ics20_max_memo_size(),
             ics20_max_receiver_size: default::ics20_max_receiver_size(),
+            clear_limit: default::clear_limit(),
             force_disable_clear_on_start: false,
         }
     }