diff --git a/Cargo.lock b/Cargo.lock index c9368de2..37ab19eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1065,8 +1065,7 @@ dependencies = [ [[package]] name = "ibc" version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "184eb22140cb4143bbcf7ddc8fdfeb9cc058ef73a6066f8ea78162e69d3565d1" +source = "git+https://github.com/cosmos/ibc-rs?rev=527bb14#527bb141383129db804b0b9d49793c4a900deede" dependencies = [ "bytes", "derive_more", @@ -1093,8 +1092,7 @@ dependencies = [ [[package]] name = "ibc-derive" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92f1528535e9ca495badb76c143bdd4763c1c9d987f59d1f8b47963ba0c11674" +source = "git+https://github.com/cosmos/ibc-rs?rev=527bb14#527bb141383129db804b0b9d49793c4a900deede" dependencies = [ "darling", "proc-macro2", @@ -1104,9 +1102,9 @@ dependencies = [ [[package]] name = "ibc-proto" -version = "0.37.1" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63042806bb2f662ca1c68026231900cfe13361136ddfd0dd09bcb315056a22b8" +checksum = "93cbf4cbe9e5113cc7c70f3208a7029b2205c629502cbb2ae7ea0a09a97d3005" dependencies = [ "base64 0.21.4", "bytes", @@ -1122,8 +1120,7 @@ dependencies = [ [[package]] name = "ibc-query" version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa60a47e38063a89bd9a5789b6e18e695dcf90e037c17c51d3c6142f840ae9ad" +source = "git+https://github.com/cosmos/ibc-rs?rev=527bb14#527bb141383129db804b0b9d49793c4a900deede" dependencies = [ "displaydoc", "ibc", diff --git a/Cargo.toml b/Cargo.toml index 91c927ac..07f77544 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" } diff --git a/ci/Dockerfile b/ci/Dockerfile index 7f0d1f89..210c48ab 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -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 diff --git a/crates/app/src/modules/auth/account.rs b/crates/app/src/modules/auth/account.rs index 4efffc63..fe278c03 100644 --- a/crates/app/src/modules/auth/account.rs +++ b/crates/app/src/modules/auth/account.rs @@ -55,7 +55,7 @@ impl Account for AuthAccount { } } -impl ibc_proto::protobuf::Protobuf for AuthAccount {} +impl ibc_proto::Protobuf for AuthAccount {} impl TryFrom for AuthAccount { type Error = String; diff --git a/crates/app/src/modules/bank/util.rs b/crates/app/src/modules/bank/util.rs index 203d9f12..785f3898 100644 --- a/crates/app/src/modules/bank/util.rs +++ b/crates/app/src/modules/bank/util.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; diff --git a/crates/app/src/modules/gov/impls.rs b/crates/app/src/modules/gov/impls.rs index e2e4be8f..60440551 100644 --- a/crates/app/src/modules/gov/impls.rs +++ b/crates/app/src/modules/gov/impls.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; diff --git a/crates/app/src/modules/gov/msg.rs b/crates/app/src/modules/gov/msg.rs index 69f85cd5..720b59d9 100644 --- a/crates/app/src/modules/gov/msg.rs +++ b/crates/app/src/modules/gov/msg.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; diff --git a/crates/app/src/modules/gov/proposal.rs b/crates/app/src/modules/gov/proposal.rs index 5f9d6452..7aee816d 100644 --- a/crates/app/src/modules/gov/proposal.rs +++ b/crates/app/src/modules/gov/proposal.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 for Any { fn from(value: Proposal) -> Self { Self { type_url: TYPE_URL.to_string(), - value: Protobuf::::encode_vec(&value), + value: Protobuf::::encode_vec(value), } } } diff --git a/crates/app/src/modules/upgrade/query.rs b/crates/app/src/modules/upgrade/query.rs index 4ecb50bb..3a6ec6db 100644 --- a/crates/app/src/modules/upgrade/query.rs +++ b/crates/app/src/modules/upgrade/query.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;