From 01e04ab6c93ca2405f7b77d483ae299f9a2e7a41 Mon Sep 17 00:00:00 2001 From: Romain Ruetschi <106849+romac@users.noreply.github.com> Date: Thu, 28 Sep 2023 11:29:16 +0200 Subject: [PATCH 1/8] Update `prost` to v0.12 and `tonic` to v0.10 --- Cargo.toml | 4 ++-- tools/proto-compiler/Cargo.toml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index fb0c2b9a..e5b49c56 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,9 +28,9 @@ doctest = false all-features = true [dependencies] -prost = { version = "0.11", default-features = false } +prost = { version = "0.12", default-features = false } bytes = { version = "1.2", default-features = false } -tonic = { version = "0.9", default-features = false, optional = true } +tonic = { version = "0.10", default-features = false, optional = true } serde = { version = "1.0", default-features = false } schemars = { version = "0.8", optional = true } subtle-encoding = { version = "0.5", default-features = false } diff --git a/tools/proto-compiler/Cargo.toml b/tools/proto-compiler/Cargo.toml index dce658c2..7e50bbe4 100644 --- a/tools/proto-compiler/Cargo.toml +++ b/tools/proto-compiler/Cargo.toml @@ -7,10 +7,10 @@ publish = false rust-version = "1.60" [dependencies] -git2 = "0.17" -prost-build = "0.11" +git2 = "0.18" +prost-build = "0.12" walkdir = "2.3" argh = "0.1" -tonic = "0.9" -tonic-build = "0.9" +tonic = "0.10" +tonic-build = "0.10" similar = "2.2" From 9e2170b6ab4e4bab5f90967e1c245e8bcd3fbaf7 Mon Sep 17 00:00:00 2001 From: Romain Ruetschi <106849+romac@users.noreply.github.com> Date: Thu, 28 Sep 2023 11:30:09 +0200 Subject: [PATCH 2/8] Re-generate protos --- src/prost/cosmos.auth.v1beta1.rs | 28 ++++---- src/prost/cosmos.bank.v1beta1.rs | 41 +++++++----- src/prost/cosmos.base.node.v1beta1.rs | 4 +- src/prost/cosmos.base.reflection.v1beta1.rs | 12 +++- src/prost/cosmos.base.reflection.v2alpha1.rs | 33 ++++++++-- src/prost/cosmos.base.tendermint.v1beta1.rs | 20 ++++-- src/prost/cosmos.gov.v1.rs | 46 +++++++++---- src/prost/cosmos.gov.v1beta1.rs | 42 ++++++++---- src/prost/cosmos.staking.v1beta1.rs | 65 +++++++++++++------ src/prost/cosmos.tx.v1beta1.rs | 26 +++++--- src/prost/cosmos.upgrade.v1beta1.rs | 17 +++-- src/prost/google.api.rs | 16 ++--- src/prost/google.protobuf.rs | 26 ++++---- src/prost/ibc.applications.fee.v1.rs | 35 ++++++---- ...tions.interchain_accounts.controller.v1.rs | 13 ++-- ...pplications.interchain_accounts.host.v1.rs | 4 +- src/prost/ibc.applications.transfer.v1.rs | 24 ++++--- src/prost/ibc.core.channel.v1.rs | 54 ++++++++------- src/prost/ibc.core.client.v1.rs | 27 ++++---- src/prost/ibc.core.connection.v1.rs | 25 ++++--- src/prost/ibc.lightclients.tendermint.v1.rs | 2 +- .../interchain_security.ccv.consumer.v1.rs | 5 +- .../interchain_security.ccv.provider.v1.rs | 35 ++++++---- src/prost/stride.interchainquery.v1.rs | 2 +- 24 files changed, 387 insertions(+), 215 deletions(-) diff --git a/src/prost/cosmos.auth.v1beta1.rs b/src/prost/cosmos.auth.v1beta1.rs index 5ec8078f..900cad3a 100644 --- a/src/prost/cosmos.auth.v1beta1.rs +++ b/src/prost/cosmos.auth.v1beta1.rs @@ -315,7 +315,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_params(request).await + ::update_params(&inner, request).await }; Box::pin(fut) } @@ -1165,7 +1165,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).accounts(request).await }; + let fut = async move { + ::accounts(&inner, request).await + }; Box::pin(fut) } } @@ -1209,7 +1211,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).account(request).await }; + let fut = async move { + ::account(&inner, request).await + }; Box::pin(fut) } } @@ -1256,7 +1260,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).account_address_by_id(request).await + ::account_address_by_id(&inner, request).await }; Box::pin(fut) } @@ -1299,7 +1303,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).params(request).await }; + let fut = async move { + ::params(&inner, request).await + }; Box::pin(fut) } } @@ -1344,7 +1350,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).module_accounts(request).await + ::module_accounts(&inner, request).await }; Box::pin(fut) } @@ -1392,7 +1398,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).module_account_by_name(request).await + ::module_account_by_name(&inner, request).await }; Box::pin(fut) } @@ -1438,7 +1444,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).bech32_prefix(request).await + ::bech32_prefix(&inner, request).await }; Box::pin(fut) } @@ -1484,7 +1490,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).address_bytes_to_string(request).await + ::address_bytes_to_string(&inner, request).await }; Box::pin(fut) } @@ -1530,7 +1536,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).address_string_to_bytes(request).await + ::address_string_to_bytes(&inner, request).await }; Box::pin(fut) } @@ -1576,7 +1582,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).account_info(request).await + ::account_info(&inner, request).await }; Box::pin(fut) } diff --git a/src/prost/cosmos.bank.v1beta1.rs b/src/prost/cosmos.bank.v1beta1.rs index 53aac5a5..dfbb996b 100644 --- a/src/prost/cosmos.bank.v1beta1.rs +++ b/src/prost/cosmos.bank.v1beta1.rs @@ -546,7 +546,9 @@ pub mod msg_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).send(request).await }; + let fut = async move { + ::send(&inner, request).await + }; Box::pin(fut) } } @@ -588,7 +590,9 @@ pub mod msg_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).multi_send(request).await }; + let fut = async move { + ::multi_send(&inner, request).await + }; Box::pin(fut) } } @@ -631,7 +635,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_params(request).await + ::update_params(&inner, request).await }; Box::pin(fut) } @@ -675,7 +679,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).set_send_enabled(request).await + ::set_send_enabled(&inner, request).await }; Box::pin(fut) } @@ -1686,7 +1690,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).balance(request).await }; + let fut = async move { + ::balance(&inner, request).await + }; Box::pin(fut) } } @@ -1731,7 +1737,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).all_balances(request).await + ::all_balances(&inner, request).await }; Box::pin(fut) } @@ -1777,7 +1783,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).spendable_balances(request).await + ::spendable_balances(&inner, request).await }; Box::pin(fut) } @@ -1826,7 +1832,8 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).spendable_balance_by_denom(request).await + ::spendable_balance_by_denom(&inner, request) + .await }; Box::pin(fut) } @@ -1872,7 +1879,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).total_supply(request).await + ::total_supply(&inner, request).await }; Box::pin(fut) } @@ -1917,7 +1924,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).supply_of(request).await }; + let fut = async move { + ::supply_of(&inner, request).await + }; Box::pin(fut) } } @@ -1959,7 +1968,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).params(request).await }; + let fut = async move { + ::params(&inner, request).await + }; Box::pin(fut) } } @@ -2004,7 +2015,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).denom_metadata(request).await + ::denom_metadata(&inner, request).await }; Box::pin(fut) } @@ -2050,7 +2061,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).denoms_metadata(request).await + ::denoms_metadata(&inner, request).await }; Box::pin(fut) } @@ -2096,7 +2107,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).denom_owners(request).await + ::denom_owners(&inner, request).await }; Box::pin(fut) } @@ -2142,7 +2153,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).send_enabled(request).await + ::send_enabled(&inner, request).await }; Box::pin(fut) } diff --git a/src/prost/cosmos.base.node.v1beta1.rs b/src/prost/cosmos.base.node.v1beta1.rs index bb478e7e..a3c81017 100644 --- a/src/prost/cosmos.base.node.v1beta1.rs +++ b/src/prost/cosmos.base.node.v1beta1.rs @@ -230,7 +230,9 @@ pub mod service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).config(request).await }; + let fut = async move { + ::config(&inner, request).await + }; Box::pin(fut) } } diff --git a/src/prost/cosmos.base.reflection.v1beta1.rs b/src/prost/cosmos.base.reflection.v1beta1.rs index ef24a74c..59d25f91 100644 --- a/src/prost/cosmos.base.reflection.v1beta1.rs +++ b/src/prost/cosmos.base.reflection.v1beta1.rs @@ -307,7 +307,11 @@ pub mod reflection_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_all_interfaces(request).await + ::list_all_interfaces( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -353,7 +357,11 @@ pub mod reflection_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_implementations(request).await + ::list_implementations( + &inner, + request, + ) + .await }; Box::pin(fut) } diff --git a/src/prost/cosmos.base.reflection.v2alpha1.rs b/src/prost/cosmos.base.reflection.v2alpha1.rs index f25b4f12..702862b8 100644 --- a/src/prost/cosmos.base.reflection.v2alpha1.rs +++ b/src/prost/cosmos.base.reflection.v2alpha1.rs @@ -682,7 +682,11 @@ pub mod reflection_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_authn_descriptor(request).await + ::get_authn_descriptor( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -728,7 +732,11 @@ pub mod reflection_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_chain_descriptor(request).await + ::get_chain_descriptor( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -774,7 +782,11 @@ pub mod reflection_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_codec_descriptor(request).await + ::get_codec_descriptor( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -825,7 +837,11 @@ pub mod reflection_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_configuration_descriptor(request).await + ::get_configuration_descriptor( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -876,7 +892,11 @@ pub mod reflection_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_query_services_descriptor(request).await + ::get_query_services_descriptor( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -922,7 +942,8 @@ pub mod reflection_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_tx_descriptor(request).await + ::get_tx_descriptor(&inner, request) + .await }; Box::pin(fut) } diff --git a/src/prost/cosmos.base.tendermint.v1beta1.rs b/src/prost/cosmos.base.tendermint.v1beta1.rs index 0e9b9a3f..24af374f 100644 --- a/src/prost/cosmos.base.tendermint.v1beta1.rs +++ b/src/prost/cosmos.base.tendermint.v1beta1.rs @@ -766,7 +766,7 @@ pub mod service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_node_info(request).await + ::get_node_info(&inner, request).await }; Box::pin(fut) } @@ -811,7 +811,9 @@ pub mod service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).get_syncing(request).await }; + let fut = async move { + ::get_syncing(&inner, request).await + }; Box::pin(fut) } } @@ -856,7 +858,7 @@ pub mod service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_latest_block(request).await + ::get_latest_block(&inner, request).await }; Box::pin(fut) } @@ -902,7 +904,7 @@ pub mod service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_block_by_height(request).await + ::get_block_by_height(&inner, request).await }; Box::pin(fut) } @@ -948,7 +950,8 @@ pub mod service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_latest_validator_set(request).await + ::get_latest_validator_set(&inner, request) + .await }; Box::pin(fut) } @@ -996,7 +999,8 @@ pub mod service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_validator_set_by_height(request).await + ::get_validator_set_by_height(&inner, request) + .await }; Box::pin(fut) } @@ -1039,7 +1043,9 @@ pub mod service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).abci_query(request).await }; + let fut = async move { + ::abci_query(&inner, request).await + }; Box::pin(fut) } } diff --git a/src/prost/cosmos.gov.v1.rs b/src/prost/cosmos.gov.v1.rs index 84f215b5..f8377353 100644 --- a/src/prost/cosmos.gov.v1.rs +++ b/src/prost/cosmos.gov.v1.rs @@ -827,7 +827,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).submit_proposal(request).await + ::submit_proposal(&inner, request).await }; Box::pin(fut) } @@ -871,7 +871,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).exec_legacy_content(request).await + ::exec_legacy_content(&inner, request).await }; Box::pin(fut) } @@ -914,7 +914,9 @@ pub mod msg_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).vote(request).await }; + let fut = async move { + ::vote(&inner, request).await + }; Box::pin(fut) } } @@ -957,7 +959,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).vote_weighted(request).await + ::vote_weighted(&inner, request).await }; Box::pin(fut) } @@ -1000,7 +1002,9 @@ pub mod msg_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).deposit(request).await }; + let fut = async move { + ::deposit(&inner, request).await + }; Box::pin(fut) } } @@ -1043,7 +1047,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_params(request).await + ::update_params(&inner, request).await }; Box::pin(fut) } @@ -1764,7 +1768,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).proposal(request).await }; + let fut = async move { + ::proposal(&inner, request).await + }; Box::pin(fut) } } @@ -1808,7 +1814,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).proposals(request).await }; + let fut = async move { + ::proposals(&inner, request).await + }; Box::pin(fut) } } @@ -1850,7 +1858,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).vote(request).await }; + let fut = async move { + ::vote(&inner, request).await + }; Box::pin(fut) } } @@ -1892,7 +1902,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).votes(request).await }; + let fut = async move { + ::votes(&inner, request).await + }; Box::pin(fut) } } @@ -1934,7 +1946,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).params(request).await }; + let fut = async move { + ::params(&inner, request).await + }; Box::pin(fut) } } @@ -1978,7 +1992,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).deposit(request).await }; + let fut = async move { + ::deposit(&inner, request).await + }; Box::pin(fut) } } @@ -2022,7 +2038,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).deposits(request).await }; + let fut = async move { + ::deposits(&inner, request).await + }; Box::pin(fut) } } @@ -2067,7 +2085,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).tally_result(request).await + ::tally_result(&inner, request).await }; Box::pin(fut) } diff --git a/src/prost/cosmos.gov.v1beta1.rs b/src/prost/cosmos.gov.v1beta1.rs index 970c7ea3..ad4845e0 100644 --- a/src/prost/cosmos.gov.v1beta1.rs +++ b/src/prost/cosmos.gov.v1beta1.rs @@ -663,7 +663,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).submit_proposal(request).await + ::submit_proposal(&inner, request).await }; Box::pin(fut) } @@ -706,7 +706,9 @@ pub mod msg_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).vote(request).await }; + let fut = async move { + ::vote(&inner, request).await + }; Box::pin(fut) } } @@ -749,7 +751,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).vote_weighted(request).await + ::vote_weighted(&inner, request).await }; Box::pin(fut) } @@ -792,7 +794,9 @@ pub mod msg_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).deposit(request).await }; + let fut = async move { + ::deposit(&inner, request).await + }; Box::pin(fut) } } @@ -1504,7 +1508,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).proposal(request).await }; + let fut = async move { + ::proposal(&inner, request).await + }; Box::pin(fut) } } @@ -1548,7 +1554,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).proposals(request).await }; + let fut = async move { + ::proposals(&inner, request).await + }; Box::pin(fut) } } @@ -1590,7 +1598,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).vote(request).await }; + let fut = async move { + ::vote(&inner, request).await + }; Box::pin(fut) } } @@ -1632,7 +1642,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).votes(request).await }; + let fut = async move { + ::votes(&inner, request).await + }; Box::pin(fut) } } @@ -1674,7 +1686,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).params(request).await }; + let fut = async move { + ::params(&inner, request).await + }; Box::pin(fut) } } @@ -1718,7 +1732,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).deposit(request).await }; + let fut = async move { + ::deposit(&inner, request).await + }; Box::pin(fut) } } @@ -1762,7 +1778,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).deposits(request).await }; + let fut = async move { + ::deposits(&inner, request).await + }; Box::pin(fut) } } @@ -1807,7 +1825,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).tally_result(request).await + ::tally_result(&inner, request).await }; Box::pin(fut) } diff --git a/src/prost/cosmos.staking.v1beta1.rs b/src/prost/cosmos.staking.v1beta1.rs index 42486e13..f5943f04 100644 --- a/src/prost/cosmos.staking.v1beta1.rs +++ b/src/prost/cosmos.staking.v1beta1.rs @@ -1048,7 +1048,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).create_validator(request).await + ::create_validator(&inner, request).await }; Box::pin(fut) } @@ -1092,7 +1092,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).edit_validator(request).await + ::edit_validator(&inner, request).await }; Box::pin(fut) } @@ -1135,7 +1135,9 @@ pub mod msg_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).delegate(request).await }; + let fut = async move { + ::delegate(&inner, request).await + }; Box::pin(fut) } } @@ -1178,7 +1180,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).begin_redelegate(request).await + ::begin_redelegate(&inner, request).await }; Box::pin(fut) } @@ -1221,7 +1223,9 @@ pub mod msg_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).undelegate(request).await }; + let fut = async move { + ::undelegate(&inner, request).await + }; Box::pin(fut) } } @@ -1266,7 +1270,8 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).cancel_unbonding_delegation(request).await + ::cancel_unbonding_delegation(&inner, request) + .await }; Box::pin(fut) } @@ -1310,7 +1315,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_params(request).await + ::update_params(&inner, request).await }; Box::pin(fut) } @@ -2455,7 +2460,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).validators(request).await }; + let fut = async move { + ::validators(&inner, request).await + }; Box::pin(fut) } } @@ -2499,7 +2506,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).validator(request).await }; + let fut = async move { + ::validator(&inner, request).await + }; Box::pin(fut) } } @@ -2547,7 +2556,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).validator_delegations(request).await + ::validator_delegations(&inner, request).await }; Box::pin(fut) } @@ -2596,7 +2605,11 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).validator_unbonding_delegations(request).await + ::validator_unbonding_delegations( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -2641,7 +2654,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).delegation(request).await }; + let fut = async move { + ::delegation(&inner, request).await + }; Box::pin(fut) } } @@ -2688,7 +2703,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).unbonding_delegation(request).await + ::unbonding_delegation(&inner, request).await }; Box::pin(fut) } @@ -2737,7 +2752,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).delegator_delegations(request).await + ::delegator_delegations(&inner, request).await }; Box::pin(fut) } @@ -2786,7 +2801,11 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).delegator_unbonding_delegations(request).await + ::delegator_unbonding_delegations( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -2832,7 +2851,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).redelegations(request).await + ::redelegations(&inner, request).await }; Box::pin(fut) } @@ -2880,7 +2899,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).delegator_validators(request).await + ::delegator_validators(&inner, request).await }; Box::pin(fut) } @@ -2928,7 +2947,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).delegator_validator(request).await + ::delegator_validator(&inner, request).await }; Box::pin(fut) } @@ -2974,7 +2993,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).historical_info(request).await + ::historical_info(&inner, request).await }; Box::pin(fut) } @@ -3017,7 +3036,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).pool(request).await }; + let fut = async move { + ::pool(&inner, request).await + }; Box::pin(fut) } } @@ -3059,7 +3080,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).params(request).await }; + let fut = async move { + ::params(&inner, request).await + }; Box::pin(fut) } } diff --git a/src/prost/cosmos.tx.v1beta1.rs b/src/prost/cosmos.tx.v1beta1.rs index 7ba50c28..db0d4c17 100644 --- a/src/prost/cosmos.tx.v1beta1.rs +++ b/src/prost/cosmos.tx.v1beta1.rs @@ -1112,7 +1112,9 @@ pub mod service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).simulate(request).await }; + let fut = async move { + ::simulate(&inner, request).await + }; Box::pin(fut) } } @@ -1154,7 +1156,9 @@ pub mod service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).get_tx(request).await }; + let fut = async move { + ::get_tx(&inner, request).await + }; Box::pin(fut) } } @@ -1199,7 +1203,7 @@ pub mod service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).broadcast_tx(request).await + ::broadcast_tx(&inner, request).await }; Box::pin(fut) } @@ -1245,7 +1249,7 @@ pub mod service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_txs_event(request).await + ::get_txs_event(&inner, request).await }; Box::pin(fut) } @@ -1291,7 +1295,7 @@ pub mod service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_block_with_txs(request).await + ::get_block_with_txs(&inner, request).await }; Box::pin(fut) } @@ -1334,7 +1338,9 @@ pub mod service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).tx_decode(request).await }; + let fut = async move { + ::tx_decode(&inner, request).await + }; Box::pin(fut) } } @@ -1376,7 +1382,9 @@ pub mod service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).tx_encode(request).await }; + let fut = async move { + ::tx_encode(&inner, request).await + }; Box::pin(fut) } } @@ -1421,7 +1429,7 @@ pub mod service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).tx_encode_amino(request).await + ::tx_encode_amino(&inner, request).await }; Box::pin(fut) } @@ -1467,7 +1475,7 @@ pub mod service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).tx_decode_amino(request).await + ::tx_decode_amino(&inner, request).await }; Box::pin(fut) } diff --git a/src/prost/cosmos.upgrade.v1beta1.rs b/src/prost/cosmos.upgrade.v1beta1.rs index 01a12467..fa445d90 100644 --- a/src/prost/cosmos.upgrade.v1beta1.rs +++ b/src/prost/cosmos.upgrade.v1beta1.rs @@ -394,7 +394,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).software_upgrade(request).await + ::software_upgrade(&inner, request).await }; Box::pin(fut) } @@ -438,7 +438,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).cancel_upgrade(request).await + ::cancel_upgrade(&inner, request).await }; Box::pin(fut) } @@ -998,7 +998,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).current_plan(request).await + ::current_plan(&inner, request).await }; Box::pin(fut) } @@ -1044,7 +1044,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).applied_plan(request).await + ::applied_plan(&inner, request).await }; Box::pin(fut) } @@ -1093,7 +1093,8 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).upgraded_consensus_state(request).await + ::upgraded_consensus_state(&inner, request) + .await }; Box::pin(fut) } @@ -1139,7 +1140,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).module_versions(request).await + ::module_versions(&inner, request).await }; Box::pin(fut) } @@ -1184,7 +1185,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).authority(request).await }; + let fut = async move { + ::authority(&inner, request).await + }; Box::pin(fut) } } diff --git a/src/prost/google.api.rs b/src/prost/google.api.rs index 90a257c6..0817d31c 100644 --- a/src/prost/google.api.rs +++ b/src/prost/google.api.rs @@ -1,5 +1,5 @@ /// Defines the HTTP configuration for an API service. It contains a list of -/// \[HttpRule][google.api.HttpRule\], each specifying the mapping of an RPC method +/// [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method /// to one or more HTTP REST API methods. #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -26,7 +26,7 @@ pub struct Http { /// APIs](), /// [Cloud Endpoints](), [gRPC /// Gateway](), -/// and \[Envoy\]() proxy support this feature +/// and [Envoy]() proxy support this feature /// and use it for large scale production services. /// /// `HttpRule` defines the schema of the gRPC/REST mapping. The mapping specifies @@ -187,26 +187,26 @@ pub struct Http { /// 1. Leaf request fields (recursive expansion nested messages in the request /// message) are classified into three categories: /// - Fields referred by the path template. They are passed via the URL path. -/// - Fields referred by the \[HttpRule.body][google.api.HttpRule.body\]. They +/// - Fields referred by the [HttpRule.body][google.api.HttpRule.body]. They /// are passed via the HTTP /// request body. /// - All other fields are passed via the URL query parameters, and the /// parameter name is the field path in the request message. A repeated /// field can be represented as multiple query parameters under the same /// name. -/// 2. If \[HttpRule.body][google.api.HttpRule.body\] is "*", there is no URL +/// 2. If [HttpRule.body][google.api.HttpRule.body] is "*", there is no URL /// query parameter, all fields /// are passed via URL path and HTTP request body. -/// 3. If \[HttpRule.body][google.api.HttpRule.body\] is omitted, there is no HTTP +/// 3. If [HttpRule.body][google.api.HttpRule.body] is omitted, there is no HTTP /// request body, all /// fields are passed via URL path and URL query parameters. /// /// ### Path template syntax /// -/// Template = "/" Segments [ Verb ] ; +/// Template = "/" Segments \[ Verb \] ; /// Segments = Segment { "/" Segment } ; /// Segment = "*" | "**" | LITERAL | Variable ; -/// Variable = "{" FieldPath [ "=" Segments ] "}" ; +/// Variable = "{" FieldPath \[ "=" Segments \] "}" ; /// FieldPath = IDENT { "." IDENT } ; /// Verb = ":" LITERAL ; /// @@ -295,7 +295,7 @@ pub struct Http { pub struct HttpRule { /// Selects a method to which this rule applies. /// - /// Refer to \[selector][google.api.DocumentationRule.selector\] for syntax + /// Refer to [selector][google.api.DocumentationRule.selector] for syntax /// details. #[prost(string, tag = "1")] pub selector: ::prost::alloc::string::String, diff --git a/src/prost/google.protobuf.rs b/src/prost/google.protobuf.rs index 08851a34..dfa54b4a 100644 --- a/src/prost/google.protobuf.rs +++ b/src/prost/google.protobuf.rs @@ -1237,7 +1237,7 @@ pub mod uninterpreted_option { /// The name of the uninterpreted option. Each string represents a segment in /// a dot-separated name. is_extension is true iff a segment represents an /// extension (denoted with parentheses in options specs in .proto files). - /// E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents + /// E.g.,{ \["foo", false\], \["bar.baz", true\], \["moo", false\] } represents /// "foo.(bar.baz).moo". #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -1535,11 +1535,11 @@ pub struct SourceCodeInfo { /// a bc de f ghi /// We have the following locations: /// span path represents - /// [a,i) [ 4, 0, 2, 0 ] The whole field definition. - /// [a,b) [ 4, 0, 2, 0, 4 ] The label (optional). - /// [c,d) [ 4, 0, 2, 0, 5 ] The type (string). - /// [e,f) [ 4, 0, 2, 0, 1 ] The name (foo). - /// [g,h) [ 4, 0, 2, 0, 3 ] The number (1). + /// \[a,i) [ 4, 0, 2, 0 \] The whole field definition. + /// \[a,b) [ 4, 0, 2, 0, 4 \] The label (optional). + /// \[c,d) [ 4, 0, 2, 0, 5 \] The type (string). + /// \[e,f) [ 4, 0, 2, 0, 1 \] The name (foo). + /// \[g,h) [ 4, 0, 2, 0, 3 \] The number (1). /// /// Notes: /// - A location may refer to a repeated field itself (i.e. not to any @@ -1577,7 +1577,7 @@ pub mod source_code_info { /// Each element is a field number or an index. They form a path from /// the root FileDescriptorProto to the place where the definition occurs. /// For example, this path: - /// [ 4, 3, 2, 7, 1 ] + /// \[ 4, 3, 2, 7, 1 \] /// refers to: /// file.message_type(3) // 4, 3 /// .field(7) // 2, 7 @@ -1591,7 +1591,7 @@ pub mod source_code_info { /// /// Thus, the above path gives the location of a field name. If we removed /// the last element: - /// [ 4, 3, 2, 7 ] + /// \[ 4, 3, 2, 7 \] /// this path refers to the whole field declaration (from the beginning /// of the label to the terminating semicolon). #[prost(int32, repeated, tag = "1")] @@ -1822,7 +1822,7 @@ pub mod generated_code_info { /// If the embedded message type is well-known and has a custom JSON /// representation, that representation will be embedded adding a field /// `value` which holds the custom JSON in addition to the `@type` -/// field. Example (for message \[google.protobuf.Duration][\]): +/// field. Example (for message [google.protobuf.Duration][]): /// /// { /// "@type": "type.googleapis.com/google.protobuf.Duration", @@ -1847,7 +1847,7 @@ pub struct Any { /// server that maps type URLs to message definitions as follows: /// /// * If no scheme is provided, `https` is assumed. - /// * An HTTP GET on the URL must yield a \[google.protobuf.Type][\] + /// * An HTTP GET on the URL must yield a [google.protobuf.Type][] /// value in binary format, or produce an error. /// * Applications are allowed to cache lookup results based on the /// URL, or have them precompiled into a binary to avoid any @@ -1950,12 +1950,12 @@ pub struct Any { /// /// In JavaScript, one can convert a Date object to this format using the /// standard -/// \[toISOString()\]() +/// [toISOString()]() /// method. In Python, a standard `datetime.datetime` object can be converted /// to this format using -/// \[`strftime`\]() with +/// [`strftime`]() with /// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use -/// the Joda Time's \[`ISODateTimeFormat.dateTime()`\]( +/// the Joda Time's [`ISODateTimeFormat.dateTime()`]( /// ) /// ) to obtain a formatter capable of generating timestamps in this format. /// diff --git a/src/prost/ibc.applications.fee.v1.rs b/src/prost/ibc.applications.fee.v1.rs index 2ec27051..019791ae 100644 --- a/src/prost/ibc.applications.fee.v1.rs +++ b/src/prost/ibc.applications.fee.v1.rs @@ -504,7 +504,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).register_payee(request).await + ::register_payee(&inner, request).await }; Box::pin(fut) } @@ -550,7 +550,8 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).register_counterparty_payee(request).await + ::register_counterparty_payee(&inner, request) + .await }; Box::pin(fut) } @@ -594,7 +595,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).pay_packet_fee(request).await + ::pay_packet_fee(&inner, request).await }; Box::pin(fut) } @@ -638,7 +639,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).pay_packet_fee_async(request).await + ::pay_packet_fee_async(&inner, request).await }; Box::pin(fut) } @@ -1572,7 +1573,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).incentivized_packets(request).await + ::incentivized_packets(&inner, request).await }; Box::pin(fut) } @@ -1620,7 +1621,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).incentivized_packet(request).await + ::incentivized_packet(&inner, request).await }; Box::pin(fut) } @@ -1669,7 +1670,11 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).incentivized_packets_for_channel(request).await + ::incentivized_packets_for_channel( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -1715,7 +1720,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).total_recv_fees(request).await + ::total_recv_fees(&inner, request).await }; Box::pin(fut) } @@ -1761,7 +1766,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).total_ack_fees(request).await + ::total_ack_fees(&inner, request).await }; Box::pin(fut) } @@ -1807,7 +1812,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).total_timeout_fees(request).await + ::total_timeout_fees(&inner, request).await }; Box::pin(fut) } @@ -1850,7 +1855,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).payee(request).await }; + let fut = async move { + ::payee(&inner, request).await + }; Box::pin(fut) } } @@ -1895,7 +1902,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).counterparty_payee(request).await + ::counterparty_payee(&inner, request).await }; Box::pin(fut) } @@ -1943,7 +1950,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).fee_enabled_channels(request).await + ::fee_enabled_channels(&inner, request).await }; Box::pin(fut) } @@ -1989,7 +1996,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).fee_enabled_channel(request).await + ::fee_enabled_channel(&inner, request).await }; Box::pin(fut) } diff --git a/src/prost/ibc.applications.interchain_accounts.controller.v1.rs b/src/prost/ibc.applications.interchain_accounts.controller.v1.rs index 22098d47..bf17588d 100644 --- a/src/prost/ibc.applications.interchain_accounts.controller.v1.rs +++ b/src/prost/ibc.applications.interchain_accounts.controller.v1.rs @@ -320,7 +320,8 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).register_interchain_account(request).await + ::register_interchain_account(&inner, request) + .await }; Box::pin(fut) } @@ -363,7 +364,9 @@ pub mod msg_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).send_tx(request).await }; + let fut = async move { + ::send_tx(&inner, request).await + }; Box::pin(fut) } } @@ -747,7 +750,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).interchain_account(request).await + ::interchain_account(&inner, request).await }; Box::pin(fut) } @@ -790,7 +793,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).params(request).await }; + let fut = async move { + ::params(&inner, request).await + }; Box::pin(fut) } } diff --git a/src/prost/ibc.applications.interchain_accounts.host.v1.rs b/src/prost/ibc.applications.interchain_accounts.host.v1.rs index f5f51ff1..3a16bdb6 100644 --- a/src/prost/ibc.applications.interchain_accounts.host.v1.rs +++ b/src/prost/ibc.applications.interchain_accounts.host.v1.rs @@ -257,7 +257,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).params(request).await }; + let fut = async move { + ::params(&inner, request).await + }; Box::pin(fut) } } diff --git a/src/prost/ibc.applications.transfer.v1.rs b/src/prost/ibc.applications.transfer.v1.rs index 350106c8..72353dcb 100644 --- a/src/prost/ibc.applications.transfer.v1.rs +++ b/src/prost/ibc.applications.transfer.v1.rs @@ -273,7 +273,9 @@ pub mod msg_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).transfer(request).await }; + let fut = async move { + ::transfer(&inner, request).await + }; Box::pin(fut) } } @@ -439,7 +441,7 @@ pub struct QueryParamsResponse { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct QueryDenomHashRequest { - /// The denomination trace `(\[port_id]/[channel_id])+/[denom\]` + /// The denomination trace (\[port_id\]/[channel_id])+/\[denom\] #[prost(string, tag = "1")] pub trace: ::prost::alloc::string::String, } @@ -907,7 +909,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).denom_trace(request).await }; + let fut = async move { + ::denom_trace(&inner, request).await + }; Box::pin(fut) } } @@ -952,7 +956,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).denom_traces(request).await + ::denom_traces(&inner, request).await }; Box::pin(fut) } @@ -995,7 +999,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).params(request).await }; + let fut = async move { + ::params(&inner, request).await + }; Box::pin(fut) } } @@ -1039,7 +1045,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).denom_hash(request).await }; + let fut = async move { + ::denom_hash(&inner, request).await + }; Box::pin(fut) } } @@ -1084,7 +1092,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).escrow_address(request).await + ::escrow_address(&inner, request).await }; Box::pin(fut) } @@ -1132,7 +1140,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).total_escrow_for_denom(request).await + ::total_escrow_for_denom(&inner, request).await }; Box::pin(fut) } diff --git a/src/prost/ibc.core.channel.v1.rs b/src/prost/ibc.core.channel.v1.rs index 07b06b94..d741e62c 100644 --- a/src/prost/ibc.core.channel.v1.rs +++ b/src/prost/ibc.core.channel.v1.rs @@ -1103,7 +1103,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).channel_open_init(request).await + ::channel_open_init(&inner, request).await }; Box::pin(fut) } @@ -1147,7 +1147,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).channel_open_try(request).await + ::channel_open_try(&inner, request).await }; Box::pin(fut) } @@ -1191,7 +1191,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).channel_open_ack(request).await + ::channel_open_ack(&inner, request).await }; Box::pin(fut) } @@ -1237,7 +1237,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).channel_open_confirm(request).await + ::channel_open_confirm(&inner, request).await }; Box::pin(fut) } @@ -1281,7 +1281,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).channel_close_init(request).await + ::channel_close_init(&inner, request).await }; Box::pin(fut) } @@ -1327,7 +1327,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).channel_close_confirm(request).await + ::channel_close_confirm(&inner, request).await }; Box::pin(fut) } @@ -1370,7 +1370,9 @@ pub mod msg_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).recv_packet(request).await }; + let fut = async move { + ::recv_packet(&inner, request).await + }; Box::pin(fut) } } @@ -1412,7 +1414,9 @@ pub mod msg_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).timeout(request).await }; + let fut = async move { + ::timeout(&inner, request).await + }; Box::pin(fut) } } @@ -1455,7 +1459,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).timeout_on_close(request).await + ::timeout_on_close(&inner, request).await }; Box::pin(fut) } @@ -1499,7 +1503,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).acknowledgement(request).await + ::acknowledgement(&inner, request).await }; Box::pin(fut) } @@ -2662,7 +2666,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).channel(request).await }; + let fut = async move { + ::channel(&inner, request).await + }; Box::pin(fut) } } @@ -2706,7 +2712,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).channels(request).await }; + let fut = async move { + ::channels(&inner, request).await + }; Box::pin(fut) } } @@ -2753,7 +2761,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).connection_channels(request).await + ::connection_channels(&inner, request).await }; Box::pin(fut) } @@ -2801,7 +2809,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).channel_client_state(request).await + ::channel_client_state(&inner, request).await }; Box::pin(fut) } @@ -2850,7 +2858,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).channel_consensus_state(request).await + ::channel_consensus_state(&inner, request).await }; Box::pin(fut) } @@ -2896,7 +2904,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).packet_commitment(request).await + ::packet_commitment(&inner, request).await }; Box::pin(fut) } @@ -2942,7 +2950,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).packet_commitments(request).await + ::packet_commitments(&inner, request).await }; Box::pin(fut) } @@ -2988,7 +2996,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).packet_receipt(request).await + ::packet_receipt(&inner, request).await }; Box::pin(fut) } @@ -3037,7 +3045,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).packet_acknowledgement(request).await + ::packet_acknowledgement(&inner, request).await }; Box::pin(fut) } @@ -3086,7 +3094,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).packet_acknowledgements(request).await + ::packet_acknowledgements(&inner, request).await }; Box::pin(fut) } @@ -3132,7 +3140,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).unreceived_packets(request).await + ::unreceived_packets(&inner, request).await }; Box::pin(fut) } @@ -3178,7 +3186,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).unreceived_acks(request).await + ::unreceived_acks(&inner, request).await }; Box::pin(fut) } @@ -3226,7 +3234,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).next_sequence_receive(request).await + ::next_sequence_receive(&inner, request).await }; Box::pin(fut) } diff --git a/src/prost/ibc.core.client.v1.rs b/src/prost/ibc.core.client.v1.rs index 5407a7ea..6dff7eb4 100644 --- a/src/prost/ibc.core.client.v1.rs +++ b/src/prost/ibc.core.client.v1.rs @@ -615,7 +615,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).create_client(request).await + ::create_client(&inner, request).await }; Box::pin(fut) } @@ -659,7 +659,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_client(request).await + ::update_client(&inner, request).await }; Box::pin(fut) } @@ -703,7 +703,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).upgrade_client(request).await + ::upgrade_client(&inner, request).await }; Box::pin(fut) } @@ -749,7 +749,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).submit_misbehaviour(request).await + ::submit_misbehaviour(&inner, request).await }; Box::pin(fut) } @@ -1556,7 +1556,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).client_state(request).await + ::client_state(&inner, request).await }; Box::pin(fut) } @@ -1602,7 +1602,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).client_states(request).await + ::client_states(&inner, request).await }; Box::pin(fut) } @@ -1648,7 +1648,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).consensus_state(request).await + ::consensus_state(&inner, request).await }; Box::pin(fut) } @@ -1694,7 +1694,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).consensus_states(request).await + ::consensus_states(&inner, request).await }; Box::pin(fut) } @@ -1743,7 +1743,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).consensus_state_heights(request).await + ::consensus_state_heights(&inner, request).await }; Box::pin(fut) } @@ -1789,7 +1789,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).client_status(request).await + ::client_status(&inner, request).await }; Box::pin(fut) } @@ -1835,7 +1835,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).client_params(request).await + ::client_params(&inner, request).await }; Box::pin(fut) } @@ -1883,7 +1883,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).upgraded_client_state(request).await + ::upgraded_client_state(&inner, request).await }; Box::pin(fut) } @@ -1932,7 +1932,8 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).upgraded_consensus_state(request).await + ::upgraded_consensus_state(&inner, request) + .await }; Box::pin(fut) } diff --git a/src/prost/ibc.core.connection.v1.rs b/src/prost/ibc.core.connection.v1.rs index 184d65f5..a9b00b4b 100644 --- a/src/prost/ibc.core.connection.v1.rs +++ b/src/prost/ibc.core.connection.v1.rs @@ -658,7 +658,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).connection_open_init(request).await + ::connection_open_init(&inner, request).await }; Box::pin(fut) } @@ -702,7 +702,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).connection_open_try(request).await + ::connection_open_try(&inner, request).await }; Box::pin(fut) } @@ -746,7 +746,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).connection_open_ack(request).await + ::connection_open_ack(&inner, request).await }; Box::pin(fut) } @@ -792,7 +792,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).connection_open_confirm(request).await + ::connection_open_confirm(&inner, request).await }; Box::pin(fut) } @@ -1439,7 +1439,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).connection(request).await }; + let fut = async move { + ::connection(&inner, request).await + }; Box::pin(fut) } } @@ -1483,7 +1485,9 @@ pub mod query_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).connections(request).await }; + let fut = async move { + ::connections(&inner, request).await + }; Box::pin(fut) } } @@ -1528,7 +1532,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).client_connections(request).await + ::client_connections(&inner, request).await }; Box::pin(fut) } @@ -1577,7 +1581,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).connection_client_state(request).await + ::connection_client_state(&inner, request).await }; Box::pin(fut) } @@ -1626,7 +1630,8 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).connection_consensus_state(request).await + ::connection_consensus_state(&inner, request) + .await }; Box::pin(fut) } @@ -1672,7 +1677,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).connection_params(request).await + ::connection_params(&inner, request).await }; Box::pin(fut) } diff --git a/src/prost/ibc.lightclients.tendermint.v1.rs b/src/prost/ibc.lightclients.tendermint.v1.rs index f9a457ee..8849c261 100644 --- a/src/prost/ibc.lightclients.tendermint.v1.rs +++ b/src/prost/ibc.lightclients.tendermint.v1.rs @@ -44,7 +44,7 @@ pub struct ClientState { /// chained proof. NOTE: ClientState must stored under /// `{upgradePath}/{upgradeHeight}/clientState` ConsensusState must be stored /// under `{upgradepath}/{upgradeHeight}/consensusState` For SDK chains using - /// the default upgrade module, upgrade_path should be []string{"upgrade", + /// the default upgrade module, upgrade_path should be \[\]string{"upgrade", /// "upgradedIBCState"}` #[prost(string, repeated, tag = "9")] pub upgrade_path: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, diff --git a/src/prost/interchain_security.ccv.consumer.v1.rs b/src/prost/interchain_security.ccv.consumer.v1.rs index f9189e2a..beae55bc 100644 --- a/src/prost/interchain_security.ccv.consumer.v1.rs +++ b/src/prost/interchain_security.ccv.consumer.v1.rs @@ -491,7 +491,8 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).query_next_fee_distribution(request).await + ::query_next_fee_distribution(&inner, request) + .await }; Box::pin(fut) } @@ -535,7 +536,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).query_params(request).await + ::query_params(&inner, request).await }; Box::pin(fut) } diff --git a/src/prost/interchain_security.ccv.provider.v1.rs b/src/prost/interchain_security.ccv.provider.v1.rs index b21d482a..97c2ed77 100644 --- a/src/prost/interchain_security.ccv.provider.v1.rs +++ b/src/prost/interchain_security.ccv.provider.v1.rs @@ -300,7 +300,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).assign_consumer_key(request).await + ::assign_consumer_key(&inner, request).await }; Box::pin(fut) } @@ -348,7 +348,8 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).register_consumer_reward_denom(request).await + ::register_consumer_reward_denom(&inner, request) + .await }; Box::pin(fut) } @@ -1479,7 +1480,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).query_consumer_genesis(request).await + ::query_consumer_genesis(&inner, request).await }; Box::pin(fut) } @@ -1525,7 +1526,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).query_consumer_chains(request).await + ::query_consumer_chains(&inner, request).await }; Box::pin(fut) } @@ -1574,7 +1575,8 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).query_consumer_chain_starts(request).await + ::query_consumer_chain_starts(&inner, request) + .await }; Box::pin(fut) } @@ -1623,7 +1625,8 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).query_consumer_chain_stops(request).await + ::query_consumer_chain_stops(&inner, request) + .await }; Box::pin(fut) } @@ -1672,7 +1675,8 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).query_validator_consumer_addr(request).await + ::query_validator_consumer_addr(&inner, request) + .await }; Box::pin(fut) } @@ -1721,7 +1725,8 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).query_validator_provider_addr(request).await + ::query_validator_provider_addr(&inner, request) + .await }; Box::pin(fut) } @@ -1767,7 +1772,7 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).query_throttle_state(request).await + ::query_throttle_state(&inner, request).await }; Box::pin(fut) } @@ -1816,7 +1821,11 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).query_throttled_consumer_packet_data(request).await + ::query_throttled_consumer_packet_data( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -1865,8 +1874,10 @@ pub mod query_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner) - .query_registered_consumer_reward_denoms(request) + ::query_registered_consumer_reward_denoms( + &inner, + request, + ) .await }; Box::pin(fut) diff --git a/src/prost/stride.interchainquery.v1.rs b/src/prost/stride.interchainquery.v1.rs index ea4614d8..97ad0555 100644 --- a/src/prost/stride.interchainquery.v1.rs +++ b/src/prost/stride.interchainquery.v1.rs @@ -255,7 +255,7 @@ pub mod msg_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).submit_query_response(request).await + ::submit_query_response(&inner, request).await }; Box::pin(fut) } From acafd831cb689016d97d5b19597d4c1e98a0a3f0 Mon Sep 17 00:00:00 2001 From: Romain Ruetschi <106849+romac@users.noreply.github.com> Date: Thu, 28 Sep 2023 11:31:08 +0200 Subject: [PATCH 3/8] Add changelog entry --- .changelog/unreleased/features/145-prost-0.12.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changelog/unreleased/features/145-prost-0.12.md diff --git a/.changelog/unreleased/features/145-prost-0.12.md b/.changelog/unreleased/features/145-prost-0.12.md new file mode 100644 index 00000000..29855d37 --- /dev/null +++ b/.changelog/unreleased/features/145-prost-0.12.md @@ -0,0 +1,2 @@ +- Update `prost` to v0.12 and `tonic` to v0.10 + ([\#145](https://github.com/cosmos/ibc-proto-rs/issues/145)) \ No newline at end of file From a363bb5b48e7a83ad2027720d0d9c098fcf1b06f Mon Sep 17 00:00:00 2001 From: Romain Ruetschi <106849+romac@users.noreply.github.com> Date: Thu, 28 Sep 2023 11:55:52 +0200 Subject: [PATCH 4/8] Add temporary crates.io patch for `tendermint-proto` and `ics23` --- Cargo.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e5b49c56..074ab83c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ doctest = false all-features = true [dependencies] -prost = { version = "0.12", default-features = false } +prost = { version = "0.12", default-features = false, features = ["prost-derive"] } bytes = { version = "1.2", default-features = false } tonic = { version = "0.10", default-features = false, optional = true } serde = { version = "1.0", default-features = false } @@ -61,3 +61,7 @@ server = ["std", "tonic", "tonic/codegen", "tonic/transport", "tonic parity-scale-codec = ["dep:parity-scale-codec", "dep:scale-info"] borsh = ["dep:borsh"] proto-descriptor = [] + +[patch.crates-io] +tendermint-proto = { git = "https://github.com/informalsystems/tendermint-rs", branch = "main" } +ics23 = { git = "https://github.com/cosmos/ics23", branch = "romac/prost-0.12" } From a30e373d6cbc1fc7f8b29d4bcc431edfe1736dee Mon Sep 17 00:00:00 2001 From: Romain Ruetschi <106849+romac@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:31:12 +0200 Subject: [PATCH 5/8] Patch malformed doc comment in generated Rust code --- src/prost/ibc.applications.transfer.v1.rs | 2 +- tools/proto-compiler/src/cmd/compile.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/prost/ibc.applications.transfer.v1.rs b/src/prost/ibc.applications.transfer.v1.rs index 72353dcb..42a9cbb7 100644 --- a/src/prost/ibc.applications.transfer.v1.rs +++ b/src/prost/ibc.applications.transfer.v1.rs @@ -441,7 +441,7 @@ pub struct QueryParamsResponse { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct QueryDenomHashRequest { - /// The denomination trace (\[port_id\]/[channel_id])+/\[denom\] + /// The denomination trace `([port_id]/[channel_id])+/[denom]` #[prost(string, tag = "1")] pub trace: ::prost::alloc::string::String, } diff --git a/tools/proto-compiler/src/cmd/compile.rs b/tools/proto-compiler/src/cmd/compile.rs index e6d31526..32091489 100644 --- a/tools/proto-compiler/src/cmd/compile.rs +++ b/tools/proto-compiler/src/cmd/compile.rs @@ -228,8 +228,8 @@ impl CompileCmd { ( "ibc.applications.transfer.v1.rs", &[( - "The denomination trace (\\[port_id]/[channel_id])+/[denom\\]", - "The denomination trace `(\\[port_id]/[channel_id])+/[denom\\]`", + "The denomination trace (\\[port_id\\]/[channel_id])+/\\[denom\\]", + "The denomination trace `([port_id]/[channel_id])+/[denom]`", )], ), ]; From debcc2dac687f1da9ac68d78a9d1dcf4392e46d6 Mon Sep 17 00:00:00 2001 From: Romain Ruetschi <106849+romac@users.noreply.github.com> Date: Tue, 3 Oct 2023 08:30:56 +0200 Subject: [PATCH 6/8] Update tendermint-proto to latest released version (0.34.0) --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 074ab83c..9765810f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,7 @@ borsh = { version = "0.10", default-features = false, optional = true } ics23 = { version = "0.10.2" , default-features = false } [dependencies.tendermint-proto] -version = "0.33" +version = "0.34" default-features = false [features] @@ -63,5 +63,5 @@ borsh = ["dep:borsh"] proto-descriptor = [] [patch.crates-io] -tendermint-proto = { git = "https://github.com/informalsystems/tendermint-rs", branch = "main" } +# tendermint-proto = { git = "https://github.com/informalsystems/tendermint-rs", branch = "main" } ics23 = { git = "https://github.com/cosmos/ics23", branch = "romac/prost-0.12" } From d09586bcced6913b2f6a9dd78cba867105de2929 Mon Sep 17 00:00:00 2001 From: Romain Ruetschi <106849+romac@users.noreply.github.com> Date: Tue, 3 Oct 2023 14:21:22 +0200 Subject: [PATCH 7/8] Update to `ics23` v0.10.3 --- Cargo.toml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9765810f..25fa15db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,7 +45,7 @@ scale-info = { version = "2.1.2", default-features = false, features = [ ## need tracking anchor-lang and near-sdk-rs borsh version borsh = { version = "0.10", default-features = false, optional = true } -ics23 = { version = "0.10.2" , default-features = false } +ics23 = { version = "0.10.3" , default-features = false } [dependencies.tendermint-proto] version = "0.34" @@ -61,7 +61,3 @@ server = ["std", "tonic", "tonic/codegen", "tonic/transport", "tonic parity-scale-codec = ["dep:parity-scale-codec", "dep:scale-info"] borsh = ["dep:borsh"] proto-descriptor = [] - -[patch.crates-io] -# tendermint-proto = { git = "https://github.com/informalsystems/tendermint-rs", branch = "main" } -ics23 = { git = "https://github.com/cosmos/ics23", branch = "romac/prost-0.12" } From a1eeb0c93089bd8b30c15aa90b1bece15e18e497 Mon Sep 17 00:00:00 2001 From: Romain Ruetschi <106849+romac@users.noreply.github.com> Date: Wed, 4 Oct 2023 17:15:40 +0200 Subject: [PATCH 8/8] Update `ics23` to v0.11.0 --- Cargo.toml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 25fa15db..86da7f92 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,17 +36,16 @@ schemars = { version = "0.8", optional = true } subtle-encoding = { version = "0.5", default-features = false } base64 = { version = "0.21", default-features = false, features = ["alloc"] } flex-error = { version = "0.4", default-features = false } +ics23 = { version = "0.11.0" , default-features = false } -## for codec encode or decode +## Optional: enabled by the `parity-scale-codec` feature parity-scale-codec = { version = "3.0.0", default-features = false, features = ["full"], optional = true } scale-info = { version = "2.1.2", default-features = false, features = ["derive"], optional = true } -## for borsh encode or decode -## need tracking anchor-lang and near-sdk-rs borsh version +## Optional: enabled by the `borsh` feature +## For borsh encode or decode, needs to track `anchor-lang` and `near-sdk-rs` borsh version borsh = { version = "0.10", default-features = false, optional = true } -ics23 = { version = "0.10.3" , default-features = false } - [dependencies.tendermint-proto] version = "0.34" default-features = false