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

Add new channel upgrade proto messages #85

Closed
wants to merge 21 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e64f2bb
Add new channel upgrade proto messages
romac Apr 13, 2023
d9450a5
Update ibc-go commit to latest of the branch 04-channel-upgrade
ljoss17 Apr 20, 2023
8d85932
Update with TryUpgrade changes
ljoss17 May 2, 2023
0c5afca
Update channel upgradability proto definition to latest commit
ljoss17 Jun 20, 2023
ccabec3
Merge branch 'main' into romac/channel-upgrade-only
ljoss17 Jun 20, 2023
9e0ecb6
Fix post merge
ljoss17 Jun 20, 2023
b3d0320
Update channel-upgradability commit
ljoss17 Aug 8, 2023
2a32821
Merge tag 'v0.33.0' into romac/channel-upgrade-only
ljoss17 Aug 23, 2023
a3cad91
Update channel upgrade protos with latest commit
ljoss17 Aug 23, 2023
2c8cf0e
Merge tag 'v0.37.0' into romac/channel-upgrade-only
ljoss17 Oct 10, 2023
f274583
Update channel upgrade protos only with alpha tagged ibc-go
ljoss17 Oct 10, 2023
874dff8
Merge tag 'v0.38.0' into romac/channel-upgrade-only
ljoss17 Oct 19, 2023
588a7a2
Merge tag 'v0.39.0' into romac/channel-upgrade-only
ljoss17 Dec 1, 2023
364e997
sync ibc-go with tag `04-channel-upgrades-rc.0` (#179)
crodriguezvega Jan 9, 2024
b0fa2eb
sync ibc-go with tag 04-channel-upgrades-hermes.integration.1 (#184)
crodriguezvega Jan 22, 2024
8cdd310
Sync ibc-go with v8.1.0-rc.0 (#185)
crodriguezvega Jan 24, 2024
db7e5c8
Merge tag 'v0.41.0' into romac/channel-upgrade-only
ljoss17 Feb 7, 2024
d264397
Fix channel protos
ljoss17 Feb 7, 2024
c380c9c
Add changes related to v8.1.0
ljoss17 Feb 7, 2024
6642cfb
Add only channel upgrade changes
ljoss17 Feb 7, 2024
0d28c00
Add changes related to ICA from v8.1.0
ljoss17 Feb 7, 2024
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 @@
57fcdb9a9a9db9b206f7df2f955866dc4e10fef4
7e01c9149149b9d4b1d871e58eb88a22f15bdb3c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,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 ordering: i32,
}
impl ::prost::Name for MsgRegisterInterchainAccount {
const NAME: &'static str = "MsgRegisterInterchainAccount";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ impl serde::Serialize for MsgRegisterInterchainAccount {
if true {
len += 1;
}
if true {
len += 1;
}
let mut struct_ser = serializer.serialize_struct("ibc.applications.interchain_accounts.controller.v1.MsgRegisterInterchainAccount", len)?;
if true {
struct_ser.serialize_field("owner", &self.owner)?;
Expand All @@ -25,6 +28,11 @@ impl serde::Serialize for MsgRegisterInterchainAccount {
if true {
struct_ser.serialize_field("version", &self.version)?;
}
if true {
let v = super::super::super::super::core::channel::v1::Order::try_from(self.ordering)
.map_err(|_| serde::ser::Error::custom(::alloc::format!("Invalid variant {}", self.ordering)))?;
struct_ser.serialize_field("ordering", &v)?;
}
struct_ser.end()
}
}
Expand All @@ -39,13 +47,15 @@ impl<'de> serde::Deserialize<'de> for MsgRegisterInterchainAccount {
"connection_id",
"connectionId",
"version",
"ordering",
];

#[allow(clippy::enum_variant_names)]
enum GeneratedField {
Owner,
ConnectionId,
Version,
Ordering,
}
impl<'de> serde::Deserialize<'de> for GeneratedField {
fn deserialize<D>(deserializer: D) -> core::result::Result<GeneratedField, D::Error>
Expand All @@ -70,6 +80,7 @@ impl<'de> serde::Deserialize<'de> for MsgRegisterInterchainAccount {
"owner" => Ok(GeneratedField::Owner),
"connectionId" | "connection_id" => Ok(GeneratedField::ConnectionId),
"version" => Ok(GeneratedField::Version),
"ordering" => Ok(GeneratedField::Ordering),
_ => Err(serde::de::Error::unknown_field(value, FIELDS)),
}
}
Expand All @@ -92,6 +103,7 @@ impl<'de> serde::Deserialize<'de> for MsgRegisterInterchainAccount {
let mut owner__ = None;
let mut connection_id__ = None;
let mut version__ = None;
let mut ordering__ = None;
while let Some(k) = map_.next_key()? {
match k {
GeneratedField::Owner => {
Expand All @@ -112,12 +124,19 @@ impl<'de> serde::Deserialize<'de> for MsgRegisterInterchainAccount {
}
version__ = Some(map_.next_value()?);
}
GeneratedField::Ordering => {
if ordering__.is_some() {
return Err(serde::de::Error::duplicate_field("ordering"));
}
ordering__ = Some(map_.next_value::<super::super::super::super::core::channel::v1::Order>()? as i32);
}
}
}
Ok(MsgRegisterInterchainAccount {
owner: owner__.unwrap_or_default(),
connection_id: connection_id__.unwrap_or_default(),
version: version__.unwrap_or_default(),
ordering: ordering__.unwrap_or_default(),
})
}
}
Expand Down
Loading