relayer: move cosmos config to chain::cosmos::config

crates/relayer/src/chain/cosmos.rs

@@ -63,6 +63,7 @@ use tendermint_rpc::endpoint::broadcast::tx_sync::Response;
 use tendermint_rpc::endpoint::status;
 use tendermint_rpc::{Client, HttpClient, Order};
 
+use crate::account::Balance;
 use crate::chain::cosmos::batch::{
     send_batched_messages_and_wait_check_tx, send_batched_messages_and_wait_commit,
     sequential_send_batched_messages_and_wait_commit,
@@ -104,14 +105,14 @@ use crate::misbehaviour::MisbehaviourEvidence;
 use crate::util::pretty::{
     PrettyIdentifiedChannel, PrettyIdentifiedClientState, PrettyIdentifiedConnection,
 };
-use crate::{account::Balance, config::CosmosSdkConfig};
 use crate::{chain::client::ClientSettings, config::Error as ConfigError};
 
 use self::types::app_state::GenesisAppState;
 
 pub mod batch;
 pub mod client;
 pub mod compatibility;
+pub mod config;
 pub mod encode;
 pub mod estimate;
 pub mod fee;
@@ -140,7 +141,7 @@ pub mod wait;
 /// [tm-37-max]: https://github.com/tendermint/tendermint/blob/v0.37.0-rc1/types/params.go#L79
 pub const BLOCK_MAX_BYTES_MAX_FRACTION: f64 = 0.9;
 pub struct CosmosSdkChain {
-    config: CosmosSdkConfig,
+    config: config::CosmosSdkConfig,
     tx_config: TxConfig,
     rpc_client: HttpClient,
     compat_mode: CompatMode,
@@ -157,7 +158,7 @@ pub struct CosmosSdkChain {
 
 impl CosmosSdkChain {
     /// Get a reference to the configuration for this chain.
-    pub fn config(&self) -> &CosmosSdkConfig {
+    pub fn config(&self) -> &config::CosmosSdkConfig {
         &self.config
     }
 
@@ -2287,7 +2288,7 @@ fn sort_events_by_sequence(events: &mut [IbcEventWithHeight]) {
 
 async fn fetch_node_info(
     rpc_client: &HttpClient,
-    config: &CosmosSdkConfig,
+    config: &config::CosmosSdkConfig,
 ) -> Result<node::Info, Error> {
     crate::time!("fetch_node_info",
     {

crates/relayer/src/chain/cosmos/client.rs

@@ -6,8 +6,9 @@ use tracing::warn;
 
 use ibc_relayer_types::core::ics02_client::trust_threshold::TrustThreshold;
 
-use crate::config::CosmosSdkConfig;
+use crate::chain::cosmos::config::CosmosSdkConfig;
 use crate::foreign_client::CreateOptions;
+
 use crate::util::pretty::PrettyDuration;
 
 /// Cosmos-specific client parameters for the `build_client_state` operation.

crates/relayer/src/chain/cosmos/types/config.rs

@@ -5,9 +5,10 @@ use ibc_proto::google::protobuf::Any;
 use ibc_relayer_types::core::ics24_host::identifier::ChainId;
 use tendermint_rpc::Url;
 
+use crate::chain::cosmos::config::CosmosSdkConfig;
 use crate::chain::cosmos::types::gas::GasConfig;
 use crate::config::types::{MaxMsgNum, MaxTxSize};
-use crate::config::{AddressType, CosmosSdkConfig};
+use crate::config::AddressType;
 use crate::error::Error;
 
 #[derive(Debug, Clone)]

crates/relayer/src/chain/cosmos/types/gas.rs

@@ -1,7 +1,8 @@
 use ibc_proto::cosmos::tx::v1beta1::Fee;
 
 use crate::chain::cosmos::calculate_fee;
-use crate::config::{CosmosSdkConfig, GasPrice};
+use crate::chain::cosmos::config::CosmosSdkConfig;
+use crate::config::GasPrice;
 
 /// Default gas limit when submitting a transaction.
 const DEFAULT_MAX_GAS: u64 = 400_000;

crates/relayer/src/config.rs

@@ -15,33 +15,21 @@ use core::{
     time::Duration,
 };
 use serde_derive::{Deserialize, Serialize};
-use std::{
-    fs,
-    fs::File,
-    io::Write,
-    ops::Range,
-    path::{Path, PathBuf},
-};
+use std::{fs, fs::File, io::Write, ops::Range, path::Path};
 use tendermint::block::Height as BlockHeight;
 use tendermint_light_client::verifier::types::TrustThreshold;
 use tendermint_rpc::{Url, WebSocketClientUrl};
 
 use ibc_proto::google::protobuf::Any;
-use ibc_relayer_types::core::ics23_commitment::specs::ProofSpecs;
 use ibc_relayer_types::core::ics24_host::identifier::{ChainId, ChannelId, PortId};
 use ibc_relayer_types::timestamp::ZERO_DURATION;
 
-use crate::error::Error as RelayerError;
 use crate::extension_options::ExtensionOptionDynamicFeeTx;
 use crate::keyring::Store;
-use crate::{
-    config::gas_multiplier::GasMultiplier,
-    keyring::{AnySigningKeyPair, KeyRing},
-};
-use crate::{
-    config::types::{MaxMsgNum, MaxTxSize, Memo},
-    keyring,
-};
+use crate::keyring::{AnySigningKeyPair, KeyRing};
+use crate::{chain::cosmos::config::CosmosSdkConfig, error::Error as RelayerError};
+
+use crate::keyring;
 
 pub use crate::config::Error as ConfigError;
 pub use error::Error;
@@ -665,6 +653,7 @@ pub enum Diagnostic<E> {
     Error(E),
 }
 
+/* tm/cosmos sdk specific config validation */
 /// Check that the trust threshold is:
 ///
 /// a) non-zero
@@ -718,113 +707,6 @@ fn validate_gas_settings(id: &ChainId, config: &CosmosSdkConfig) -> Result<(), D
 
 /* cosmos sdk */
 
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
-#[serde(deny_unknown_fields)]
-pub struct CosmosSdkConfig {
-    /// The chain's network identifier
-    pub id: ChainId,
-
-    /// The RPC URL to connect to
-    pub rpc_addr: Url,
-
-    /// The gRPC URL to connect to
-    pub grpc_addr: Url,
-
-    /// The type of event source and associated settings
-    pub event_source: EventSourceMode,
-
-    /// Timeout used when issuing RPC queries
-    #[serde(default = "default::rpc_timeout", with = "humantime_serde")]
-    pub rpc_timeout: Duration,
-
-    /// Whether or not the full node Hermes connects to is trusted
-    #[serde(default = "default::trusted_node")]
-    pub trusted_node: bool,
-
-    pub account_prefix: String,
-    pub key_name: String,
-    #[serde(default)]
-    pub key_store_type: Store,
-    pub key_store_folder: Option<PathBuf>,
-    pub store_prefix: String,
-    pub default_gas: Option<u64>,
-    pub max_gas: Option<u64>,
-
-    // This field is only meant to be set via the `update client` command,
-    // for when we need to ugprade a client across a genesis restart and
-    // therefore need and archive node to fetch blocks from.
-    pub genesis_restart: Option<GenesisRestart>,
-
-    // This field is deprecated, use `gas_multiplier` instead
-    pub gas_adjustment: Option<f64>,
-    pub gas_multiplier: Option<GasMultiplier>,
-
-    pub fee_granter: Option<String>,
-    #[serde(default)]
-    pub max_msg_num: MaxMsgNum,
-    #[serde(default)]
-    pub max_tx_size: MaxTxSize,
-    #[serde(default = "default::max_grpc_decoding_size")]
-    pub max_grpc_decoding_size: Byte,
-
-    /// A correction parameter that helps deal with clocks that are only approximately synchronized
-    /// between the source and destination chains for a client.
-    /// This parameter is used when deciding to accept or reject a new header
-    /// (originating from the source chain) for any client with the destination chain
-    /// that uses this configuration, unless it is overridden by the client-specific
-    /// clock drift option.
-    #[serde(default = "default::clock_drift", with = "humantime_serde")]
-    pub clock_drift: Duration,
-
-    #[serde(default = "default::max_block_time", with = "humantime_serde")]
-    pub max_block_time: Duration,
-
-    /// The trusting period specifies how long a validator set is trusted for
-    /// (must be shorter than the chain's unbonding period).
-    #[serde(default, with = "humantime_serde")]
-    pub trusting_period: Option<Duration>,
-
-    /// CCV consumer chain
-    #[serde(default = "default::ccv_consumer_chain")]
-    pub ccv_consumer_chain: bool,
-
-    #[serde(default)]
-    pub memo_prefix: Memo,
-
-    // This is an undocumented and hidden config to make the relayer wait for
-    // DeliverTX before sending the next transaction when sending messages in
-    // multiple batches. We will instruct relayer operators to turn this on
-    // in case relaying failed in a chain with priority mempool enabled.
-    // Warning: turning this on may cause degradation in performance.
-    #[serde(default)]
-    pub sequential_batch_tx: bool,
-
-    // Note: These last few need to be last otherwise we run into `ValueAfterTable` error when serializing to TOML.
-    //       That's because these are all tables and have to come last when serializing.
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        with = "self::proof_specs"
-    )]
-    pub proof_specs: Option<ProofSpecs>,
-
-    // These last few need to be last otherwise we run into `ValueAfterTable` error when serializing to TOML
-    /// The trust threshold defines what fraction of the total voting power of a known
-    /// and trusted validator set is sufficient for a commit to be accepted going forward.
-    #[serde(default)]
-    pub trust_threshold: TrustThreshold,
-
-    pub gas_price: GasPrice,
-
-    #[serde(default)]
-    pub packet_filter: PacketFilter,
-
-    #[serde(default)]
-    pub address_type: AddressType,
-    #[serde(default = "Vec::new", skip_serializing_if = "Vec::is_empty")]
-    pub extension_options: Vec<ExtensionOption>,
-}
-
 /* general config handling code */
 
 /// Attempt to load and parse the TOML config file as a `Config`.

crates/relayer/src/light_client/tendermint.rs

@@ -32,9 +32,9 @@ use ibc_relayer_types::{
 };
 
 use crate::{
+    chain::cosmos::config::CosmosSdkConfig,
     chain::cosmos::CosmosSdkChain,
     client_state::AnyClientState,
-    config::CosmosSdkConfig,
     error::Error,
     light_client::AnyHeader,
     misbehaviour::{AnyMisbehaviour, MisbehaviourEvidence},