Cosmos gas price config

rust/chains/hyperlane-cosmos/src/error.rs

@@ -34,6 +34,9 @@ pub enum HyperlaneCosmosError {
     /// protobuf error
     #[error("{0}")]
     Protobuf(#[from] prost::DecodeError),
+    /// The string is not a valid number
+    #[error("Failed to parse number from string")]
+    NumStrParse,
 }
 
 impl From<HyperlaneCosmosError> for ChainCommunicationError {

rust/chains/hyperlane-cosmos/src/mailbox.rs

@@ -215,7 +215,7 @@ impl Mailbox for CosmosMailbox {
 
         let result = TxCostEstimate {
             gas_limit: gas_limit.into(),
-            gas_price: U256::from(2500),
+            gas_price: self.provider.gas_price(),
             l2_gas_limit: None,
         };
 

rust/chains/hyperlane-cosmos/src/providers/mod.rs

@@ -5,7 +5,7 @@ use hyperlane_core::{
 };
 use tendermint_rpc::{client::CompatMode, HttpClient};
 
-use crate::{ConnectionConf, HyperlaneCosmosError, Signer};
+use crate::{ConnectionConf, CosmosAmount, HyperlaneCosmosError, Signer};
 
 use self::grpc::WasmGrpcProvider;
 
@@ -21,6 +21,7 @@ pub struct CosmosProvider {
     canonical_asset: String,
     grpc_client: WasmGrpcProvider,
     rpc_client: HttpClient,
+    gas_price: CosmosAmount,
 }
 
 impl CosmosProvider {
@@ -41,12 +42,14 @@ impl CosmosProvider {
         .compat_mode(CompatMode::latest())
         .build()
         .map_err(Into::<HyperlaneCosmosError>::into)?;
+        let gas_price = CosmosAmount::try_from(conf.get_minimum_gas_price().clone())?;
 
         Ok(Self {
             domain,
             rpc_client,
             grpc_client,
             canonical_asset: conf.get_canonical_asset(),
+            gas_price,
         })
     }
 
@@ -59,6 +62,11 @@ impl CosmosProvider {
     pub fn rpc(&self) -> &HttpClient {
         &self.rpc_client
     }
+
+    /// Get the gas price
+    pub fn gas_price(&self) -> U256 {
+        self.gas_price.amount
+    }
 }
 
 impl HyperlaneChain for CosmosProvider {

rust/chains/hyperlane-cosmos/src/trait_builder.rs

@@ -1,3 +1,8 @@
+use derive_new::new;
+use hyperlane_core::{ChainCommunicationError, U256};
+
+use crate::HyperlaneCosmosError;
+
 /// Cosmos connection configuration
 #[derive(Debug, Clone)]
 pub struct ConnectionConf {
@@ -11,6 +16,46 @@ pub struct ConnectionConf {
     prefix: String,
     /// Canoncial Assets Denom
     canonical_asset: String,
+    /// The minimum gas price set by the cosmos-sdk validator
+    minimum_gas_price: RawCosmosAmount,
+}
+
+/// Untyped cosmos amount
+#[derive(serde::Serialize, serde::Deserialize, new, Clone, Debug)]
+pub struct RawCosmosAmount {
+    /// Coin denom (e.g. `untrn`)
+    pub denom: String,
+    /// Amount in the given denom
+    pub amount: String,
+}
+
+/// Typed cosmos amount
+#[derive(Clone, Debug)]
+pub struct CosmosAmount {
+    /// Coin denom (e.g. `untrn`)
+    pub denom: String,
+    /// Amount in the given denom
+    pub amount: U256,
+}
+
+impl TryFrom<RawCosmosAmount> for CosmosAmount {
+    type Error = ChainCommunicationError;
+    fn try_from(raw: RawCosmosAmount) -> Result<Self, ChainCommunicationError> {
+        // Converts to U256 by always rounding up.
+
+        // Remove the decimal part
+        let integer = raw
+            .amount
+            .split('.')
+            .next()
+            .ok_or(HyperlaneCosmosError::NumStrParse)?;
+        let amount = U256::from_dec_str(integer)?;
+        Ok(Self {
+            denom: raw.denom,
+            // Add one to conservatively estimate the gas cost in case there was a decimal part
+            amount: amount + 1,
+        })
+    }
 }
 
 /// An error type when parsing a connection configuration.
@@ -59,20 +104,27 @@ impl ConnectionConf {
         self.canonical_asset.clone()
     }
 
+    /// Get the minimum gas price
+    pub fn get_minimum_gas_price(&self) -> RawCosmosAmount {
+        self.minimum_gas_price.clone()
+    }
+
     /// Create a new connection configuration
     pub fn new(
         grpc_url: String,
         rpc_url: String,
         chain_id: String,
         prefix: String,
         canonical_asset: String,
+        minimum_gas_price: RawCosmosAmount,
     ) -> Self {
         Self {
             grpc_url,
             rpc_url,
             chain_id,
             prefix,
             canonical_asset,
+            minimum_gas_price,
         }
     }
 }

rust/config/mainnet3_config.json

@@ -432,6 +432,10 @@
       "grpcUrl": "https://grpc-kralum.neutron-1.neutron.org:80",
       "canonicalAsset": "untrn",
       "prefix": "neutron",
+      "minimumGasPrice": {
+        "amount": "1",
+        "denom": "untrn"
+      },
       "index": {
         "from": 4000000,
         "chunk": 100000

rust/config/testnet4_config.json

@@ -1026,6 +1026,10 @@
       "grpcUrl": "http://52.43.22.152:9090",
       "canonicalAsset": "token",
       "prefix": "dual",
+      "minimumGasPrice": {
+        "amount": "1",
+        "denom": "udual"
+      },
       "index": {
         "from": 1,
         "chunk": 100000

rust/hyperlane-base/src/settings/parser/connection_parser.rs

@@ -6,7 +6,7 @@ use url::Url;
 use crate::settings::envs::*;
 use crate::settings::ChainConnectionConf;
 
-use super::ValueParser;
+use super::{parse_cosmos_gas_price, ValueParser};
 
 pub fn build_ethereum_connection_conf(
     rpcs: &[Url],
@@ -94,6 +94,12 @@ pub fn build_cosmos_connection_conf(
         None
     };
 
+    let minimum_gas_price = chain
+        .chain(err)
+        .get_opt_key("minimumGasPrice")
+        .and_then(parse_cosmos_gas_price)
+        .end();
+
     if !local_err.is_ok() {
         err.merge(local_err);
         None
@@ -104,6 +110,7 @@ pub fn build_cosmos_connection_conf(
             chain_id.unwrap().to_string(),
             prefix.unwrap().to_string(),
             canonical_asset.unwrap(),
+            minimum_gas_price.unwrap(),
         )))
     }
 }

rust/hyperlane-base/src/settings/parser/mod.rs

@@ -11,6 +11,7 @@ use std::{
 
 use convert_case::{Case, Casing};
 use eyre::{eyre, Context};
+use h_cosmos::RawCosmosAmount;
 use hyperlane_core::{
     cfg_unwrap_all, config::*, HyperlaneDomain, HyperlaneDomainProtocol, IndexMode,
 };
@@ -398,3 +399,22 @@ pub fn recase_json_value(mut val: Value, case: Case) -> Value {
     }
     val
 }
+
+/// Expects AgentSigner.
+fn parse_cosmos_gas_price(gas_price: ValueParser) -> ConfigResult<RawCosmosAmount> {
+    let mut err = ConfigParsingError::default();
+
+    let amount = gas_price
+        .chain(&mut err)
+        .get_opt_key("amount")
+        .parse_string()
+        .end();
+
+    let denom = gas_price
+        .chain(&mut err)
+        .get_opt_key("denom")
+        .parse_string()
+        .end();
+    cfg_unwrap_all!(&gas_price.cwp, err: [denom, amount]);
+    err.into_result(RawCosmosAmount::new(denom.to_owned(), amount.to_owned()))
+}

rust/utils/run-locally/Cargo.toml

@@ -11,6 +11,7 @@ version.workspace = true
 
 [dependencies]
 hyperlane-core = { path = "../../hyperlane-core", features = ["float"]}
+hyperlane-cosmos = { path = "../../chains/hyperlane-cosmos"}
 toml_edit.workspace = true
 k256.workspace = true
 ripemd.workspace = true

rust/utils/run-locally/src/cosmos/cli.rs

@@ -1,5 +1,6 @@
 use std::{collections::BTreeMap, io::Write, path::PathBuf, process::Stdio};
 
+use hyperlane_cosmos::RawCosmosAmount;
 use k256::ecdsa::SigningKey;
 
 use crate::{
@@ -9,7 +10,7 @@ use crate::{
 
 use super::{
     crypto::KeyPair, default_keys, modify_toml, sed, types::BalanceResponse, wait_for_node, Codes,
-    Coin, TxResponse,
+    TxResponse,
 };
 
 const GENESIS_FUND: u128 = 1000000000000;
@@ -253,7 +254,7 @@ impl OsmosisCLI {
         sender: &str,
         contract: &str,
         execute_msg: T,
-        funds: Vec<Coin>,
+        funds: Vec<RawCosmosAmount>,
     ) -> TxResponse {
         let mut cmd = self
             .cli()

rust/utils/run-locally/src/cosmos/crypto.rs

@@ -1,6 +1,4 @@
-// TODO: this file can be removed if `CosmosAddress` can be imported from `hyperlane-cosmos`.
-// However, adding a hyperlane-cosmos dep creates a dep cycle.
-// Look into how this can be fixed.
+// TODO: this file can be removed by replacing `KeyPair` uses with `CosmosAddress`
 
 use k256::ecdsa::{SigningKey, VerifyingKey};
 use ripemd::Ripemd160;

rust/utils/run-locally/src/cosmos/mod.rs

@@ -6,6 +6,7 @@ use std::{env, fs};
 
 use cosmwasm_schema::cw_serde;
 use hpl_interface::types::bech32_decode;
+use hyperlane_cosmos::RawCosmosAmount;
 use macro_rules_attribute::apply;
 use maplit::hashmap;
 use tempfile::tempdir;
@@ -506,7 +507,7 @@ fn run_locally() {
                         metadata: "".to_string(),
                     },
                 },
-                vec![Coin {
+                vec![RawCosmosAmount {
                     denom: "uosmo".to_string(),
                     amount: 25_000_000.to_string(),
                 }],

rust/utils/run-locally/src/cosmos/types.rs

@@ -1,6 +1,7 @@
 use std::{collections::BTreeMap, path::PathBuf};
 
 use hpl_interface::types::bech32_decode;
+use hyperlane_cosmos::RawCosmosAmount;
 
 use super::{cli::OsmosisCLI, CosmosNetwork};
 
@@ -35,12 +36,6 @@ pub struct TxResponse {
     pub logs: Vec<TxLog>,
 }
 
-#[derive(serde::Serialize, serde::Deserialize)]
-pub struct Coin {
-    pub denom: String,
-    pub amount: String,
-}
-
 #[derive(serde::Serialize, serde::Deserialize, Clone)]
 pub struct Codes {
     pub hpl_hook_merkle: u64,
@@ -73,7 +68,7 @@ pub struct Deployments {
 
 #[derive(serde::Serialize, serde::Deserialize)]
 pub struct BalanceResponse {
-    pub balances: Vec<Coin>,
+    pub balances: Vec<RawCosmosAmount>,
 }
 
 #[derive(serde::Serialize, serde::Deserialize)]
@@ -125,6 +120,7 @@ pub struct AgentConfig {
     pub prefix: String,
     pub signer: AgentConfigSigner,
     pub index: AgentConfigIndex,
+    pub minimum_gas_price: RawCosmosAmount,
 }
 
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
@@ -164,6 +160,10 @@ impl AgentConfig {
                 key: format!("0x{}", hex::encode(validator.priv_key.to_bytes())),
                 prefix: "osmo".to_string(),
             },
+            minimum_gas_price: RawCosmosAmount {
+                denom: "uosmo".to_string(),
+                amount: "0.02".to_string(),
+            },
             index: AgentConfigIndex {
                 from: 1,
                 chunk: 100,