Tracks ibc-rs PR #939, #941, #949 (#143)

* chore: track ibc-rs pr939

* chore: tracks ibc-rs changes in pr941

* chore: update Hermes version to v1.7.0

* update rev

* deps: update ibc rev + bump ibc-proto-rs to v0380

* deps: bump ibc rev

---------

Co-authored-by: Ranadeep Biswas <[email protected]>

Author: Farhad-Shabani

Cargo.lock

@@ -14,7 +14,7 @@ derive_more = { version = "0.99.17", default-features = false, features = ["from
 ed25519 = { version = "2.1.0", default-features = false }
 ibc = "0.47.0"
 ibc-query = "0.47.0"
-ibc-proto = { version = "0.37.1", default-features = false }
+ibc-proto = { version = "0.38.0", default-features = false }
 ics23 = { version = "0.11", default-features = false }
 prost = { version = "0.12", default-features = false }
 serde = "1.0"
@@ -25,3 +25,7 @@ tendermint-abci = "0.34"
 tendermint-proto = "0.34"
 tendermint-rpc = "0.34"
 tracing = "0.1.26"
+
+[patch.crates-io]
+ibc = { git = "https://github.com/cosmos/ibc-rs" , rev = "527bb14" }
+ibc-query = { git = "https://github.com/cosmos/ibc-rs" , rev = "527bb14" }

Cargo.toml

@@ -1,6 +1,6 @@
 ARG COMETBFT_VERSION=0.37.1
 ARG GAIA_VERSION=6.0.0
-ARG HERMES_VERSION=1.4.0
+ARG HERMES_VERSION=1.7.0
 ARG RUST_VERSION=1.65
 
 FROM cometbft/cometbft:v${COMETBFT_VERSION} AS cometbft

ci/Dockerfile

@@ -55,7 +55,7 @@ impl Account for AuthAccount {
     }
 }
 
-impl ibc_proto::protobuf::Protobuf<BaseAccount> for AuthAccount {}
+impl ibc_proto::Protobuf<BaseAccount> for AuthAccount {}
 
 impl TryFrom<BaseAccount> for AuthAccount {
     type Error = String;

crates/app/src/modules/auth/account.rs

@@ -1,7 +1,7 @@
 use crate::types::error::Error;
 
 use basecoin_store::types::Path;
-use ibc_proto::{cosmos::base::v1beta1::Coin as ProtoCoin, protobuf::Protobuf};
+use ibc_proto::{cosmos::base::v1beta1::Coin as ProtoCoin, Protobuf};
 
 use cosmrs::{AccountId, Coin as MsgCoin};
 use primitive_types::U256;

crates/app/src/modules/bank/util.rs

@@ -16,7 +16,7 @@ use ibc::hosts::tendermint::upgrade_proposal::upgrade_client_proposal_handler;
 use ibc::hosts::tendermint::upgrade_proposal::UpgradeProposal;
 use ibc_proto::cosmos::gov::v1beta1::query_server::QueryServer;
 use ibc_proto::google::protobuf::Any;
-use ibc_proto::protobuf::Protobuf;
+use ibc_proto::Protobuf;
 
 use cosmrs::AccountId;
 use std::fmt::Debug;

crates/app/src/modules/gov/impls.rs

@@ -3,7 +3,7 @@ use displaydoc::Display;
 use ibc_proto::cosmos::gov::v1beta1::MsgSubmitProposal as RawMsgSubmitProposal;
 use ibc_proto::cosmos::gov::v1beta1::ProposalStatus;
 use ibc_proto::google::protobuf::Any;
-use ibc_proto::protobuf::Protobuf;
+use ibc_proto::Protobuf;
 
 use crate::modules::bank::util::Coin;
 use crate::types::error::Error;

crates/app/src/modules/gov/msg.rs

@@ -4,7 +4,7 @@ use ibc_proto::cosmos::gov::v1beta1::Proposal as RawProposal;
 use ibc_proto::cosmos::gov::v1beta1::ProposalStatus;
 use ibc_proto::cosmos::gov::v1beta1::TallyResult;
 use ibc_proto::google::protobuf::{Any, Timestamp};
-use ibc_proto::protobuf::Protobuf;
+use ibc_proto::Protobuf;
 
 use super::error::Error;
 use crate::modules::bank::util::Coin;
@@ -107,7 +107,7 @@ impl From<Proposal> for Any {
     fn from(value: Proposal) -> Self {
         Self {
             type_url: TYPE_URL.to_string(),
-            value: Protobuf::<RawProposal>::encode_vec(&value),
+            value: Protobuf::<RawProposal>::encode_vec(value),
         }
     }
 }

crates/app/src/modules/gov/proposal.rs

@@ -1,6 +1,6 @@
 use ibc::hosts::tendermint::upgrade_proposal::Plan;
 use ibc_proto::cosmos::upgrade::v1beta1::Plan as RawPlan;
-use ibc_proto::protobuf::Protobuf;
+use ibc_proto::Protobuf;
 use tendermint_rpc::{Client, HttpClient};
 
 use super::path::UpgradePlanPath;