From b480bbb90821663cc7189a69bcc0e123cdbbc040 Mon Sep 17 00:00:00 2001 From: Anca Zamfir Date: Thu, 19 Aug 2021 15:26:36 +0200 Subject: [PATCH] Compatibility with Cosmos SDK v0.43+ (#948) * Adapted proto compiler. Regenerated Rust files * Adapt to newer namespace for apps. * Manual fix for Staking erroneous compilation * Workaround: disabled chain upgrade * Added specific GRPC-web port to prevent conflict on 9091. * Upgrade protos * Add support for new message action strings * Improved output for one-chain script * CLI for chain upgrade proposal adapted to gaia v5. * Re-generated proto files with updated proto-compiler (fmt enabled). * Manual fix for staking::Validators erroneous compilation; added the .applications.transfer generated file * Quick feature for parametrizing upgraded chain * Clippy fix. Meta for params for better display. * Adapted query_upgraded_client_state * Adapted query_upgraded_consensus_state to ibc-go-v1 * Moved from gRPC to ABCI * Adapted send_tx_simulate to new def of SimulateRequest * Added parametrizable upgrade plan name * Fix unwraps. Retain unbonding period if none specified. * Missing post-merge bracket * Removed register and send match arms for rpc events * Support for new message.actions strings of ICS27 Based on discussion from https://github.com/cosmos/cosmos-sdk/pull/9139#discussion_r628159208 This is not yet tested! * Update protos sdk(v0.43.0-rc2) & ibc-go(v1.0.0-rc3) * Revert "Added specific GRPC-web port to prevent conflict on 9091." This reverts commit abf6dba19f8eb5fcc370fcb33edc9bf5a1c4c21a. * Add missing fields in upgrade Plan * Fix clippy warnings * Added another action field to match intertx MsgSend * Update protos sdk(v0.43.0) & ibc-go(v1.0.0) * Update cosmos SDK module version requirement in compatibility.rs * Add legacy upgrade support (#1289) * Add legacy upgrade support * Fix check for legacy * Update .changelog * Add TODO * Apply suggestion Co-authored-by: Adi Seredinschi Co-authored-by: Adi Seredinschi * Apply suggestions * Update .changelog * Fix .changelog entry Co-authored-by: Adi Seredinschi Co-authored-by: Shoaib Ahmed --- modules/src/application/mod.rs | 5 +++++ modules/src/ics02_client/msgs/create_client.rs | 2 +- modules/src/ics02_client/msgs/update_client.rs | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/src/application/mod.rs b/modules/src/application/mod.rs index bff5c4c1d..c3eb98a34 100644 --- a/modules/src/application/mod.rs +++ b/modules/src/application/mod.rs @@ -1 +1,6 @@ pub mod ics20_fungible_token_transfer; + +// TODO: These consts should move into the ICS27 namespace +pub const ICS27_BANK_SEND_TYPE_URL: &str = "/cosmos.bank.v1beta1.MsgSend"; +pub const ICS27_SEND_TYPE_URL: &str = "/intertx.MsgSend"; +pub const ICS27_REGISTER_TYPE_URL: &str = "/intertx.MsgRegister"; diff --git a/modules/src/ics02_client/msgs/create_client.rs b/modules/src/ics02_client/msgs/create_client.rs index a01266d68..6c3e62bfc 100644 --- a/modules/src/ics02_client/msgs/create_client.rs +++ b/modules/src/ics02_client/msgs/create_client.rs @@ -12,7 +12,7 @@ use crate::ics02_client::error::Error; use crate::signer::Signer; use crate::tx_msg::Msg; -pub(crate) const TYPE_URL: &str = "/ibc.core.client.v1.MsgCreateClient"; +pub const TYPE_URL: &str = "/ibc.core.client.v1.MsgCreateClient"; /// A type of message that triggers the creation of a new on-chain (IBC) client. #[derive(Clone, Debug, PartialEq, Eq)] diff --git a/modules/src/ics02_client/msgs/update_client.rs b/modules/src/ics02_client/msgs/update_client.rs index 9062f203a..f38406850 100644 --- a/modules/src/ics02_client/msgs/update_client.rs +++ b/modules/src/ics02_client/msgs/update_client.rs @@ -13,7 +13,7 @@ use crate::ics24_host::identifier::ClientId; use crate::signer::Signer; use crate::tx_msg::Msg; -pub(crate) const TYPE_URL: &str = "/ibc.core.client.v1.MsgUpdateClient"; +pub const TYPE_URL: &str = "/ibc.core.client.v1.MsgUpdateClient"; /// A type of message that triggers the update of an on-chain (IBC) client with new headers. #[derive(Clone, Debug, PartialEq)] // TODO: Add Eq bound when possible