Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync with ibc-go 04-channel-upgrades-hermes-integration.1 #184

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/IBC_GO_COMMIT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7a89e5d5b5ebb7643ce3992c34008c35373ecf34
4e3d164e4f9a5986bbe6595138feb49160e27215
4 changes: 2 additions & 2 deletions src/prost/ibc.applications.fee.v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ pub struct MsgPayPacketFee {
/// the source port unique identifier
#[prost(string, tag = "2")]
pub source_port_id: ::prost::alloc::string::String,
/// the source channel unique identifer
/// the source channel unique identifier
#[prost(string, tag = "3")]
pub source_channel_id: ::prost::alloc::string::String,
/// account address to refund fee if necessary
Expand Down Expand Up @@ -791,7 +791,7 @@ pub struct ForwardRelayerAddress {
/// the forward relayer address
#[prost(string, tag = "1")]
pub address: ::prost::alloc::string::String,
/// unique packet identifer comprised of the channel ID, port ID and sequence
/// unique packet identifier comprised of the channel ID, port ID and sequence
#[prost(message, optional, tag = "2")]
pub packet_id: ::core::option::Option<
super::super::super::core::channel::v1::PacketId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ pub struct MsgRegisterInterchainAccount {
pub connection_id: ::prost::alloc::string::String,
#[prost(string, tag = "3")]
pub version: ::prost::alloc::string::String,
#[prost(
enumeration = "super::super::super::super::core::channel::v1::Order",
tag = "4"
)]
pub order: i32,
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This field has been added to MsgRegisterInterchainAccount.

}
/// MsgRegisterInterchainAccountResponse defines the response for Msg/RegisterAccount
#[cfg_attr(feature = "serde", derive(::serde::Serialize, ::serde::Deserialize))]
Expand Down
4 changes: 4 additions & 0 deletions src/prost/ibc.applications.transfer.v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1328,6 +1328,10 @@ pub struct Allocation {
/// allow list of receivers, an empty allow list permits any receiver address
#[prost(string, repeated, tag = "4")]
pub allow_list: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
/// allow list of packet data keys, an empty list prohibits all packet data keys;
/// a list only with "*" permits any packet data key
#[prost(string, repeated, tag = "5")]
pub allowed_packet_data: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
}
/// TransferAuthorization allows the grantee to spend up to spend_limit coins from
/// the granter's account for ibc transfer on a specific channel
Expand Down
15 changes: 11 additions & 4 deletions src/prost/ibc.core.channel.v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ pub struct PacketState {
#[prost(bytes = "vec", tag = "4")]
pub data: ::prost::alloc::vec::Vec<u8>,
}
/// PacketId is an identifer for a unique Packet
/// PacketId is an identifier for a unique Packet
/// Source chains refer to packets by source port/channel
/// Destination chains refer to packets by destination port/channel
#[cfg_attr(feature = "serde", derive(::serde::Serialize, ::serde::Deserialize))]
Expand Down Expand Up @@ -429,6 +429,9 @@ pub struct MsgChannelOpenTryResponse {
}
/// MsgChannelOpenAck defines a msg sent by a Relayer to Chain A to acknowledge
/// the change of channel state to TRYOPEN on Chain B.
/// WARNING: a channel upgrade MUST NOT initialize an upgrade for this channel
/// in the same block as executing this message otherwise the counterparty will
/// be incapable of opening.
#[cfg_attr(feature = "serde", derive(::serde::Serialize, ::serde::Deserialize))]
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
Expand Down Expand Up @@ -618,6 +621,8 @@ pub struct MsgAcknowledgementResponse {
pub result: i32,
}
/// MsgChannelUpgradeInit defines the request type for the ChannelUpgradeInit rpc
/// WARNING: Initializing a channel upgrade in the same block as opening the channel
/// may result in the counterparty being incapable of opening.
#[cfg_attr(feature = "serde", derive(::serde::Serialize, ::serde::Deserialize))]
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
Expand Down Expand Up @@ -748,11 +753,13 @@ pub struct MsgChannelUpgradeOpen {
pub channel_id: ::prost::alloc::string::String,
#[prost(enumeration = "State", tag = "3")]
pub counterparty_channel_state: i32,
#[prost(bytes = "vec", tag = "4")]
#[prost(uint64, tag = "4")]
pub counterparty_upgrade_sequence: u64,
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This field has been added to MsgChannelUpgradeOpen.

#[prost(bytes = "vec", tag = "5")]
pub proof_channel: ::prost::alloc::vec::Vec<u8>,
#[prost(message, optional, tag = "5")]
#[prost(message, optional, tag = "6")]
pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
#[prost(string, tag = "6")]
#[prost(string, tag = "7")]
pub signer: ::prost::alloc::string::String,
}
/// MsgChannelUpgradeOpenResponse defines the MsgChannelUpgradeOpen response type
Expand Down
2 changes: 1 addition & 1 deletion src/prost/ibc.core.client.v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1199,7 +1199,7 @@ pub struct QueryConsensusStateRequest {
/// consensus state revision height
#[prost(uint64, tag = "3")]
pub revision_height: u64,
/// latest_height overrrides the height field and queries the latest stored
/// latest_height overrides the height field and queries the latest stored
/// ConsensusState
#[prost(bool, tag = "4")]
pub latest_height: bool,
Expand Down
6 changes: 3 additions & 3 deletions src/prost/ibc.core.connection.v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ pub struct ConnectionPaths {
#[prost(string, repeated, tag = "2")]
pub paths: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
}
/// Version defines the versioning scheme used to negotiate the IBC verison in
/// Version defines the versioning scheme used to negotiate the IBC version in
/// the connection handshake.
#[cfg_attr(feature = "serde", derive(::serde::Serialize, ::serde::Deserialize))]
#[cfg_attr(
Expand Down Expand Up @@ -227,7 +227,7 @@ pub struct MsgConnectionOpenTry {
pub counterparty_versions: ::prost::alloc::vec::Vec<Version>,
#[prost(message, optional, tag = "7")]
pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
/// proof of the initialization the connection on Chain A: `UNITIALIZED ->
/// proof of the initialization the connection on Chain A: `UNINITIALIZED ->
/// INIT`
#[prost(bytes = "vec", tag = "8")]
pub proof_init: ::prost::alloc::vec::Vec<u8>,
Expand Down Expand Up @@ -268,7 +268,7 @@ pub struct MsgConnectionOpenAck {
>,
#[prost(message, optional, tag = "5")]
pub proof_height: ::core::option::Option<super::super::client::v1::Height>,
/// proof of the initialization the connection on Chain B: `UNITIALIZED ->
/// proof of the initialization the connection on Chain B: `UNINITIALIZED ->
/// TRYOPEN`
#[prost(bytes = "vec", tag = "6")]
pub proof_try: ::prost::alloc::vec::Vec<u8>,
Expand Down
2 changes: 1 addition & 1 deletion src/prost/ibc.lightclients.tendermint.v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub struct ClientState {
pub chain_id: ::prost::alloc::string::String,
#[prost(message, optional, tag = "2")]
pub trust_level: ::core::option::Option<Fraction>,
/// duration of the period since the LastestTimestamp during which the
/// duration of the period since the LatestTimestamp during which the
/// submitted headers are valid for upgrade
#[prost(message, optional, tag = "3")]
pub trusting_period: ::core::option::Option<
Expand Down
Binary file modified src/prost/proto_descriptor.bin
Binary file not shown.
Loading