Merge branch 'soares/direct-send-tx' into soares/ics29-fee-middleware

.changelog/unreleased/bug-fixes/ibc-relayer/1971-non-batch-fix.md

@@ -0,0 +1,2 @@
+- Fix a bug where connection and channel handshakes would fail with non-batching transactions
+  ([#1971](https://github.com/informalsystems/ibc-rs/issues/1971))

.changelog/unreleased/improvements/ibc-relayer/1971-max-msg-num-min-bound.md

@@ -0,0 +1,2 @@
+- Ensure `max_msg_num` is between 1 and 100 with a default of 30
+  ([#1971](https://github.com/informalsystems/ibc-rs/issues/1971))

relayer/src/chain/cosmos/batch.rs

@@ -121,7 +121,7 @@ fn batch_messages(
     max_tx_size: MaxTxSize,
     messages: Vec<Any>,
 ) -> Result<Vec<Vec<Any>>, Error> {
-    let max_message_count = max_msg_num.0;
+    let max_message_count = max_msg_num.to_usize();
     let max_tx_size = max_tx_size.into();
 
     let mut batches = vec![];

relayer/src/chain/cosmos/estimate.rs

@@ -121,7 +121,7 @@ async fn estimate_gas_with_tx(
         }
 
         // If there is a chance that the tx will be accepted once actually submitted, we fall
-        // back on the max gas and will attempt to send it anyway.
+        // back on the default gas and will attempt to send it anyway.
         // See `can_recover_from_simulation_failure` for more info.
         Err(e) if can_recover_from_simulation_failure(&e) => {
             warn!(

relayer/src/config/error.rs

@@ -13,6 +13,5 @@ define_error! {
         Encode
             [ TraceError<toml::ser::Error> ]
             |_| { "invalid configuration" },
-
     }
 }