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

Update ibc go commit to v9.0.0-beta.1 #228

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
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 @@
a4ef5360b49ad2118e1d68f25f13935162660e0b
66ebf864d7bfe2193a96c972a9e74196b2ddf104
5 changes: 5 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,11 @@ pub mod ibc {
#[cfg(feature = "serde")]
include_proto!("ibc.core.commitment.v1.serde.rs");
}
pub mod v2 {
include_proto!("ibc.core.commitment.v2.rs");
#[cfg(feature = "serde")]
include_proto!("ibc.core.commitment.v2.serde.rs");
}
}
pub mod connection {
pub mod v1 {
Expand Down
57 changes: 29 additions & 28 deletions src/prost/google.protobuf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -455,12 +455,12 @@ pub struct FieldDescriptorProto {
/// If true, this is a proto3 "optional". When a proto3 field is optional, it
/// tracks presence regardless of field type.
///
/// When proto3_optional is true, this field must belong to a oneof to signal
/// to old proto3 clients that presence is tracked for this field. This oneof
/// is known as a "synthetic" oneof, and this field must be its sole member
/// (each proto3 optional field gets its own synthetic oneof). Synthetic oneofs
/// exist in the descriptor only, and do not generate any API. Synthetic oneofs
/// must be ordered after all "real" oneofs.
/// When proto3_optional is true, this field must be belong to a oneof to
/// signal to old proto3 clients that presence is tracked for this field. This
/// oneof is known as a "synthetic" oneof, and this field must be its sole
/// member (each proto3 optional field gets its own synthetic oneof). Synthetic
/// oneofs exist in the descriptor only, and do not generate any API. Synthetic
/// oneofs must be ordered after all "real" oneofs.
///
/// For message fields, proto3_optional doesn't create any semantic change,
/// since non-repeated message fields always track presence. However it still
Expand Down Expand Up @@ -854,6 +854,8 @@ pub struct FileOptions {
pub java_generic_services: ::core::option::Option<bool>,
#[prost(bool, optional, tag = "18", default = "false")]
pub py_generic_services: ::core::option::Option<bool>,
#[prost(bool, optional, tag = "42", default = "false")]
pub php_generic_services: ::core::option::Option<bool>,
/// Is this file deprecated?
/// Depending on the target platform, this can emit Deprecated annotations
/// for everything in the file, or it will be completely ignored; in the very
Expand Down Expand Up @@ -996,6 +998,10 @@ pub struct MessageOptions {
/// this is a formalization for deprecating messages.
#[prost(bool, optional, tag = "3", default = "false")]
pub deprecated: ::core::option::Option<bool>,
/// NOTE: Do not set the option in .proto files. Always use the maps syntax
/// instead. The option should only be implicitly set by the proto compiler
/// parser.
///
/// Whether the message is an automatically generated map entry type for the
/// maps field.
///
Expand All @@ -1013,10 +1019,6 @@ pub struct MessageOptions {
/// use a native map in the target language to hold the keys and values.
/// The reflection APIs in such implementations still need to work as
/// if the field is a repeated message field.
///
/// NOTE: Do not set the option in .proto files. Always use the maps syntax
/// instead. The option should only be implicitly set by the proto compiler
/// parser.
#[prost(bool, optional, tag = "7")]
pub map_entry: ::core::option::Option<bool>,
/// Enable the legacy handling of JSON field name conflicts. This lowercases
Expand Down Expand Up @@ -1109,11 +1111,19 @@ pub struct FieldOptions {
/// call from multiple threads concurrently, while non-const methods continue
/// to require exclusive access.
///
/// Note that lazy message fields are still eagerly verified to check
/// ill-formed wireformat or missing required fields. Calling IsInitialized()
/// on the outer message would fail if the inner message has missing required
/// fields. Failed verification would result in parsing failure (except when
/// uninitialized messages are acceptable).
/// Note that implementations may choose not to check required fields within
/// a lazy sub-message. That is, calling IsInitialized() on the outer message
/// may return true even if the inner message has missing required fields.
/// This is necessary because otherwise the inner message would have to be
/// parsed in order to perform the check, defeating the purpose of lazy
/// parsing. An implementation which chooses not to check required fields
/// must be consistent about it. That is, for any particular sub-message, the
/// implementation must either *always* check its required fields, or *never*
/// check its required fields, regardless of whether or not the message has
/// been parsed.
///
/// As of May 2022, lazy verifies the contents of the byte stream during
/// parsing. An invalid byte stream will cause the overall parsing to fail.
#[prost(bool, optional, tag = "5", default = "false")]
pub lazy: ::core::option::Option<bool>,
/// unverified_lazy does no correctness checks on the byte stream. This should
Expand Down Expand Up @@ -1834,8 +1844,8 @@ pub mod feature_set {
#[repr(i32)]
pub enum Utf8Validation {
Unknown = 0,
None = 1,
Verify = 2,
None = 3,
}
impl Utf8Validation {
/// String value of the enum field names used in the ProtoBuf definition.
Expand All @@ -1845,16 +1855,16 @@ pub mod feature_set {
pub fn as_str_name(&self) -> &'static str {
match self {
Utf8Validation::Unknown => "UTF8_VALIDATION_UNKNOWN",
Utf8Validation::Verify => "VERIFY",
Utf8Validation::None => "NONE",
Utf8Validation::Verify => "VERIFY",
}
}
/// Creates an enum from field names used in the ProtoBuf definition.
pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
match value {
"UTF8_VALIDATION_UNKNOWN" => Some(Self::Unknown),
"VERIFY" => Some(Self::Verify),
"NONE" => Some(Self::None),
"VERIFY" => Some(Self::Verify),
_ => None,
}
}
Expand Down Expand Up @@ -2067,7 +2077,7 @@ pub mod source_code_info {
/// location.
///
/// Each element is a field number or an index. They form a path from
/// the root FileDescriptorProto to the place where the definition appears.
/// the root FileDescriptorProto to the place where the definition occurs.
/// For example, this path:
/// \[ 4, 3, 2, 7, 1 \]
/// refers to:
Expand Down Expand Up @@ -2294,18 +2304,13 @@ pub enum Edition {
/// should not be depended on, but they will always be time-ordered for easy
/// comparison.
Edition2023 = 1000,
Edition2024 = 1001,
/// Placeholder editions for testing feature resolution. These should not be
/// used or relyed on outside of tests.
Edition1TestOnly = 1,
Edition2TestOnly = 2,
Edition99997TestOnly = 99997,
Edition99998TestOnly = 99998,
Edition99999TestOnly = 99999,
/// Placeholder for specifying unbounded edition support. This should only
/// ever be used by plugins that can expect to never require any changes to
/// support a new edition.
Max = 2147483647,
}
impl Edition {
/// String value of the enum field names used in the ProtoBuf definition.
Expand All @@ -2319,13 +2324,11 @@ impl Edition {
Edition::Proto2 => "EDITION_PROTO2",
Edition::Proto3 => "EDITION_PROTO3",
Edition::Edition2023 => "EDITION_2023",
Edition::Edition2024 => "EDITION_2024",
Edition::Edition1TestOnly => "EDITION_1_TEST_ONLY",
Edition::Edition2TestOnly => "EDITION_2_TEST_ONLY",
Edition::Edition99997TestOnly => "EDITION_99997_TEST_ONLY",
Edition::Edition99998TestOnly => "EDITION_99998_TEST_ONLY",
Edition::Edition99999TestOnly => "EDITION_99999_TEST_ONLY",
Edition::Max => "EDITION_MAX",
}
}
/// Creates an enum from field names used in the ProtoBuf definition.
Expand All @@ -2336,13 +2339,11 @@ impl Edition {
"EDITION_PROTO2" => Some(Self::Proto2),
"EDITION_PROTO3" => Some(Self::Proto3),
"EDITION_2023" => Some(Self::Edition2023),
"EDITION_2024" => Some(Self::Edition2024),
"EDITION_1_TEST_ONLY" => Some(Self::Edition1TestOnly),
"EDITION_2_TEST_ONLY" => Some(Self::Edition2TestOnly),
"EDITION_99997_TEST_ONLY" => Some(Self::Edition99997TestOnly),
"EDITION_99998_TEST_ONLY" => Some(Self::Edition99998TestOnly),
"EDITION_99999_TEST_ONLY" => Some(Self::Edition99999TestOnly),
"EDITION_MAX" => Some(Self::Max),
_ => None,
}
}
Expand Down
30 changes: 21 additions & 9 deletions src/prost/google.protobuf.serde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -726,13 +726,11 @@ impl serde::Serialize for Edition {
Self::Proto2 => "EDITION_PROTO2",
Self::Proto3 => "EDITION_PROTO3",
Self::Edition2023 => "EDITION_2023",
Self::Edition2024 => "EDITION_2024",
Self::Edition1TestOnly => "EDITION_1_TEST_ONLY",
Self::Edition2TestOnly => "EDITION_2_TEST_ONLY",
Self::Edition99997TestOnly => "EDITION_99997_TEST_ONLY",
Self::Edition99998TestOnly => "EDITION_99998_TEST_ONLY",
Self::Edition99999TestOnly => "EDITION_99999_TEST_ONLY",
Self::Max => "EDITION_MAX",
};
serializer.serialize_str(variant)
}
Expand All @@ -749,13 +747,11 @@ impl<'de> serde::Deserialize<'de> for Edition {
"EDITION_PROTO2",
"EDITION_PROTO3",
"EDITION_2023",
"EDITION_2024",
"EDITION_1_TEST_ONLY",
"EDITION_2_TEST_ONLY",
"EDITION_99997_TEST_ONLY",
"EDITION_99998_TEST_ONLY",
"EDITION_99999_TEST_ONLY",
"EDITION_MAX",
];

struct GeneratedVisitor;
Expand Down Expand Up @@ -801,13 +797,11 @@ impl<'de> serde::Deserialize<'de> for Edition {
"EDITION_PROTO2" => Ok(Edition::Proto2),
"EDITION_PROTO3" => Ok(Edition::Proto3),
"EDITION_2023" => Ok(Edition::Edition2023),
"EDITION_2024" => Ok(Edition::Edition2024),
"EDITION_1_TEST_ONLY" => Ok(Edition::Edition1TestOnly),
"EDITION_2_TEST_ONLY" => Ok(Edition::Edition2TestOnly),
"EDITION_99997_TEST_ONLY" => Ok(Edition::Edition99997TestOnly),
"EDITION_99998_TEST_ONLY" => Ok(Edition::Edition99998TestOnly),
"EDITION_99999_TEST_ONLY" => Ok(Edition::Edition99999TestOnly),
"EDITION_MAX" => Ok(Edition::Max),
_ => Err(serde::de::Error::unknown_variant(value, FIELDS)),
}
}
Expand Down Expand Up @@ -2492,8 +2486,8 @@ impl serde::Serialize for feature_set::Utf8Validation {
{
let variant = match self {
Self::Unknown => "UTF8_VALIDATION_UNKNOWN",
Self::Verify => "VERIFY",
Self::None => "NONE",
Self::Verify => "VERIFY",
};
serializer.serialize_str(variant)
}
Expand All @@ -2506,8 +2500,8 @@ impl<'de> serde::Deserialize<'de> for feature_set::Utf8Validation {
{
const FIELDS: &[&str] = &[
"UTF8_VALIDATION_UNKNOWN",
"VERIFY",
"NONE",
"VERIFY",
];

struct GeneratedVisitor;
Expand Down Expand Up @@ -2549,8 +2543,8 @@ impl<'de> serde::Deserialize<'de> for feature_set::Utf8Validation {
{
match value {
"UTF8_VALIDATION_UNKNOWN" => Ok(feature_set::Utf8Validation::Unknown),
"VERIFY" => Ok(feature_set::Utf8Validation::Verify),
"NONE" => Ok(feature_set::Utf8Validation::None),
"VERIFY" => Ok(feature_set::Utf8Validation::Verify),
_ => Err(serde::de::Error::unknown_variant(value, FIELDS)),
}
}
Expand Down Expand Up @@ -4661,6 +4655,9 @@ impl serde::Serialize for FileOptions {
if true {
len += 1;
}
if true {
len += 1;
}
let mut struct_ser = serializer.serialize_struct("google.protobuf.FileOptions", len)?;
if let Some(v) = self.java_package.as_ref() {
struct_ser.serialize_field("javaPackage", v)?;
Expand Down Expand Up @@ -4694,6 +4691,9 @@ impl serde::Serialize for FileOptions {
if let Some(v) = self.py_generic_services.as_ref() {
struct_ser.serialize_field("pyGenericServices", v)?;
}
if let Some(v) = self.php_generic_services.as_ref() {
struct_ser.serialize_field("phpGenericServices", v)?;
}
if let Some(v) = self.deprecated.as_ref() {
struct_ser.serialize_field("deprecated", v)?;
}
Expand Down Expand Up @@ -4757,6 +4757,8 @@ impl<'de> serde::Deserialize<'de> for FileOptions {
"javaGenericServices",
"py_generic_services",
"pyGenericServices",
"php_generic_services",
"phpGenericServices",
"deprecated",
"cc_enable_arenas",
"ccEnableArenas",
Expand Down Expand Up @@ -4791,6 +4793,7 @@ impl<'de> serde::Deserialize<'de> for FileOptions {
CcGenericServices,
JavaGenericServices,
PyGenericServices,
PhpGenericServices,
Deprecated,
CcEnableArenas,
ObjcClassPrefix,
Expand Down Expand Up @@ -4833,6 +4836,7 @@ impl<'de> serde::Deserialize<'de> for FileOptions {
"ccGenericServices" | "cc_generic_services" => Ok(GeneratedField::CcGenericServices),
"javaGenericServices" | "java_generic_services" => Ok(GeneratedField::JavaGenericServices),
"pyGenericServices" | "py_generic_services" => Ok(GeneratedField::PyGenericServices),
"phpGenericServices" | "php_generic_services" => Ok(GeneratedField::PhpGenericServices),
"deprecated" => Ok(GeneratedField::Deprecated),
"ccEnableArenas" | "cc_enable_arenas" => Ok(GeneratedField::CcEnableArenas),
"objcClassPrefix" | "objc_class_prefix" => Ok(GeneratedField::ObjcClassPrefix),
Expand Down Expand Up @@ -4873,6 +4877,7 @@ impl<'de> serde::Deserialize<'de> for FileOptions {
let mut cc_generic_services__ = None;
let mut java_generic_services__ = None;
let mut py_generic_services__ = None;
let mut php_generic_services__ = None;
let mut deprecated__ = None;
let mut cc_enable_arenas__ = None;
let mut objc_class_prefix__ = None;
Expand Down Expand Up @@ -4946,6 +4951,12 @@ impl<'de> serde::Deserialize<'de> for FileOptions {
}
py_generic_services__ = map_.next_value()?;
}
GeneratedField::PhpGenericServices => {
if php_generic_services__.is_some() {
return Err(serde::de::Error::duplicate_field("phpGenericServices"));
}
php_generic_services__ = map_.next_value()?;
}
GeneratedField::Deprecated => {
if deprecated__.is_some() {
return Err(serde::de::Error::duplicate_field("deprecated"));
Expand Down Expand Up @@ -5025,6 +5036,7 @@ impl<'de> serde::Deserialize<'de> for FileOptions {
cc_generic_services: cc_generic_services__,
java_generic_services: java_generic_services__,
py_generic_services: py_generic_services__,
php_generic_services: php_generic_services__,
deprecated: deprecated__,
cc_enable_arenas: cc_enable_arenas__,
objc_class_prefix: objc_class_prefix__,
Expand Down
9 changes: 5 additions & 4 deletions src/prost/ibc.applications.fee.v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,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 @@ -948,7 +948,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 Expand Up @@ -1033,7 +1033,7 @@ impl ::prost::Name for QueryIncentivizedPacketRequest {
"/ibc.applications.fee.v1.QueryIncentivizedPacketRequest".into()
}
}
/// QueryIncentivizedPacketsResponse defines the response type for the IncentivizedPacket rpc
/// QueryIncentivizedPacketResponse defines the response type for the IncentivizedPacket rpc
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct QueryIncentivizedPacketResponse {
Expand Down Expand Up @@ -1079,7 +1079,8 @@ impl ::prost::Name for QueryIncentivizedPacketsForChannelRequest {
"/ibc.applications.fee.v1.QueryIncentivizedPacketsForChannelRequest".into()
}
}
/// QueryIncentivizedPacketsResponse defines the response type for the incentivized packets RPC
/// QueryIncentivizedPacketsForChannelResponse defines the response type for querying for all incentivized packets
/// for a specific channel
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct QueryIncentivizedPacketsForChannelResponse {
Expand Down
Loading
Loading