informalsystems
diff --git a/‎.changelog/unreleased/features/ibc-relayer/3738-dynamic-gas-fees.md
+12 b/‎.changelog/unreleased/features/ibc-relayer/3738-dynamic-gas-fees.md
+12
diff --git a/‎.changelog/unreleased/features/ibc-telemetry/3738-dynamic-gas-fees-metrics.md
+8 b/‎.changelog/unreleased/features/ibc-telemetry/3738-dynamic-gas-fees-metrics.md
+8
diff --git a/‎.github/workflows/integration.yaml
+1-1 b/‎.github/workflows/integration.yaml
+1-1
diff --git a/‎Cargo.lock
+1-7 b/‎Cargo.lock
+1-7
diff --git a/‎config.toml
+12 b/‎config.toml
+12
diff --git a/‎crates/chain-registry/Cargo.toml
+1-1 b/‎crates/chain-registry/Cargo.toml
+1-1
diff --git a/‎crates/relayer-cli/src/chain_registry.rs
+9 b/‎crates/relayer-cli/src/chain_registry.rs
+9
diff --git a/‎crates/relayer-cli/src/commands/config/auto.rs
+21-18 b/‎crates/relayer-cli/src/commands/config/auto.rs
+21-18
diff --git a/‎crates/relayer/Cargo.toml
+1 b/‎crates/relayer/Cargo.toml
+1
diff --git a/‎crates/relayer/src/chain/cosmos.rs
+13 b/‎crates/relayer/src/chain/cosmos.rs
+13
@@ -0,0 +1,12 @@
+- Add a new per-chain configuration table `dynamic_gas_price` which enables
+  querying the current gas price from the chain instead of the static `gas_price`, 
+  when the chain has [EIP-1559][eip]-like dynamic gas price. 
+  The new configuration setting can be configured per-chain as follows:
+  ```toml
+  dynamic_gas_price = { enabled = true, multiplier = 1.1, max = 0.6 }
+  ```
+  At the moment, only chains which support the `osmosis.txfees.v1beta1.Query/GetEipBaseFee`
+  query can be used with dynamic gas price enabled.
+  ([\#3738](https://github.com/informalsystems/hermes/issues/3738))
+
+[eip]: https://metamask.io/1559/
@@ -0,0 +1,8 @@
+- Add three metrics related to EIP gas price:
+    - `dynamic_gas_queried_fees` contains data on the queried values
+      before applying any filter
+    - `dynamic_gas_queried_success_fees` contains data on the queried
+      values if the query was successful and before applying any filter
+    - `dynamic_gas_paid_fees` contains data on the queried values after
+      applying the `max` filter
+  ([\#3738](https://github.com/informalsystems/hermes/issues/3738))
@@ -79,7 +79,7 @@ jobs:
             command: osmosisd
             account_prefix: osmo
             native_token: stake
-            features: ''
+            features: dynamic-gas-fee
           - package: juno
             command: junod
             account_prefix: juno
 
@@ -303,6 +303,18 @@ gas_price = { price = 0.025, denom = 'stake' }
 # Minimum value: 1.0
 gas_multiplier = 1.1
 
+# 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 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 = false, multiplier = 1.1, max = 0.6 }
+
 # Specify how many IBC messages at most to include in a single transaction.
 # Default: 30
 max_msg_num = 30
 
@@ -21,7 +21,7 @@ flex-error  = { version = "0.4.4", default-features = false }
 futures     = { version = "0.3.27", features = ["executor"] }
 http        = "0.2"
 itertools   = "0.10.5"
-reqwest     = { version = "0.11.13", features = ["rustls-tls", "json"], default-features = false }
+reqwest     = { version = "0.11.13", features = ["rustls-tls-native-roots", "json"], default-features = false }
 serde       = "1.0.195"
 serde_json  = "1"
 tokio       = "1.17.0"
 
@@ -6,6 +6,7 @@ use std::marker::Send;
 
 use futures::future::join_all;
 use http::Uri;
+use ibc_relayer::config::dynamic_gas::DynamicGasPrice;
 use tokio::task::{JoinError, JoinHandle};
 use tracing::trace;
 
@@ -120,6 +121,13 @@ where
         0.1
     };
 
+    // Use EIP-1559 dynamic gas price for Osmosis
+    let dynamic_gas_price = if chain_data.chain_id.as_str() == "osmosis-1" {
+        DynamicGasPrice::unsafe_new(true, 1.1, 0.6)
+    } else {
+        DynamicGasPrice::disabled()
+    };
+
     Ok(ChainConfig::CosmosSdk(CosmosSdkConfig {
         id: chain_data.chain_id,
         rpc_addr: rpc_data.rpc_address,
@@ -140,6 +148,7 @@ where
         max_gas: Some(400000),
         gas_adjustment: None,
         gas_multiplier: Some(GasMultiplier::new(1.1).unwrap()),
+        dynamic_gas_price,
         fee_granter: None,
         max_msg_num: MaxMsgNum::default(),
         max_tx_size: MaxTxSize::default(),
 
@@ -1,6 +1,7 @@
 use crate::chain_registry::get_configs;
 use abscissa_core::clap::Parser;
 use abscissa_core::{Command, Runnable};
+use itertools::Itertools;
 
 use crate::conclude::Output;
 
@@ -25,7 +26,7 @@ fn find_key(chain_config: &ChainConfig) -> Option<String> {
 /// If a is specified then it will be used without verifying that it exists.
 #[derive(Clone, Command, Debug, Parser, PartialEq, Eq)]
 #[clap(
-    override_usage = "hermes config auto [OPTIONS] --output <PATH> --chains <CHAIN_NAME:OPTIONAL_KEY_NAME>"
+    override_usage = "hermes config auto [OPTIONS] --output <PATH> --chain <CHAIN1_NAME:OPTIONAL_KEY_NAME> --chain <CHAIN2_NAME:OPTIONAL_KEY_NAME>"
 )]
 pub struct AutoCmd {
     #[clap(
@@ -39,11 +40,14 @@ pub struct AutoCmd {
 
     #[clap(
         long = "chains",
+        alias = "chain",
         required = true,
         multiple = true,
         value_name = "CHAIN_NAME:OPTIONAL_KEY_NAME",
         help_heading = "REQUIRED",
-        help = "Names of the chains to include in the config. Every chain must be in the chain registry."
+        help = "Names of the chains to include in the configuration, together with an optional key name. \
+                Either repeat this argument for every chain or pass a space-separated list of chains. \
+                Every chain must be found in the chain registry."
     )]
     chain_names: Vec<String>,
 
@@ -149,23 +153,22 @@ impl Runnable for AutoCmd {
         };
 
         match store(&config, &self.path) {
+            Ok(_) if missing_chains_set.is_empty() => {
+                Output::success_msg(format!(
+                    "Config file written successfully at '{}'",
+                    self.path.display()
+                ))
+                .exit()
+            },
             Ok(_) => {
-                if missing_chains_set.is_empty() {
-                    Output::success_msg(format!(
-                        "Config file written successfully at '{}'",
-                        self.path.display()
-                    ))
-                    .exit()
-                } else {
-                    Output::success_msg(format!(
-                        "Config file written successfully at '{}'.
-                        However, configurations for the following chains were not able to be generated: {:?}",
-                        self.path.display(),
-                        missing_chains_set,
-                    ))
-                    .exit()
-                }
-            }
+                Output::success_msg(format!(
+                    "Config file written successfully at '{}'. \
+                    However, configurations for the following chains were not able to be generated: {}",
+                    self.path.display(),
+                    missing_chains_set.iter().join(", "),
+                ))
+                .exit()
+            },
             Err(e) => Output::error(format!(
                 "An error occurred while attempting to write the config file: {}",
                 e
 
@@ -51,6 +51,7 @@ dirs-next = "2.0.0"
 retry = { version = "2.0.0", default-features = false }
 async-stream = "0.3.5"
 http = "0.2.9"
+reqwest = { version = "0.11", features = ["rustls-tls-native-roots", "json"], default-features = false }
 flex-error = { version = "0.4.4", default-features = false }
 signature = "2.1.0"
 anyhow = "1.0"
 
@@ -105,13 +105,16 @@ use crate::util::pretty::{
 };
 use crate::{chain::client::ClientSettings, config::Error as ConfigError};
 
+use self::gas::dynamic_gas_price;
 use self::types::app_state::GenesisAppState;
+use self::types::gas::GasConfig;
 use self::version::Specs;
 
 pub mod batch;
 pub mod client;
 pub mod compatibility;
 pub mod config;
+pub mod eip_base_fee;
 pub mod encode;
 pub mod estimate;
 pub mod fee;
@@ -490,6 +493,16 @@ impl CosmosSdkChain {
         Ok(min_gas_price)
     }
 
+    pub fn dynamic_gas_price(&self) -> GasPrice {
+        let gas_config = GasConfig::from(self.config());
+
+        self.rt.block_on(dynamic_gas_price(
+            &gas_config,
+            &self.config.id,
+            &self.config.rpc_addr,
+        ))
+    }
+
     /// The unbonding period of this chain
     pub fn unbonding_period(&self) -> Result<Duration, Error> {
         crate::time!(