Merge branch 'main' into farhad/interchain-accounts

Author: Farhad-Shabani

.changelog/unreleased/breaking-changes/717-organize-ack-types-under-ics04.md

@@ -0,0 +1,3 @@
+- Organize acknowledgement types under the `ics04_channel` module to get
+  accessible by any applications.
+  ([#717](https://github.com/cosmos/ibc-rs/issues/717))

.changelog/unreleased/breaking-changes/750-sync-ics04-events-namings-with-convention.md

@@ -0,0 +1,2 @@
+- Sync field and method namings of ics04 events with the convention
+  ([#750](https://github.com/cosmos/ibc-rs/issues/750))

.changelog/unreleased/breaking-changes/754-fix-issue-747.md

@@ -0,0 +1,2 @@
+- use ibc_proto::protobuf::Protobuf to replace tendermint_proto::Protobuf
+  ([#754](https://github.com/cosmos/ibc-rs/pull/754))

.changelog/unreleased/bug/747-fix-747-Protobuf-out-of-memory.md

@@ -0,0 +1,2 @@
+- Tendermint ConsensusState -> Any can crash if out of memory
+  ([#747](https://github.com/cosmos/ibc-rs/issues/747))

.changelog/unreleased/bug/752-fix-752.md

@@ -0,0 +1,2 @@
+- Height::from_str accepts invalid heights
+  ([#752](https://github.com/cosmos/ibc-rs/issues/752))

.changelog/unreleased/improvement/745-scale-encoding-for-transfer-packet.md

@@ -0,0 +1,2 @@
+- Scale encoding for ICS-20 transfer message
+  ([#745](https://github.com/cosmos/ibc-rs/issues/745))

ci/no-std-check/Cargo.lock

@@ -35,7 +35,7 @@ pub fn consensus_state_derive_impl(ast: DeriveInput) -> TokenStream {
                 }
             }
 
-            fn encode_vec(&self) -> core::result::Result<Vec<u8>, tendermint_proto::Error> {
+            fn encode_vec(&self) -> Vec<u8> {
                 match self {
                     #(#encode_vec_impl),*
                 }

crates/ibc-derive/src/consensus_state.rs

@@ -53,7 +53,7 @@ interchain-accounts = []
 ibc-proto = { version = "0.32.0", default-features = false }
 cosmrs = "0.14.0"
 ics23 = { version = "0.10.1", default-features = false, features = ["host-functions"] }
-time = { version = ">=0.3.0, <0.3.23", default-features = false }
+time = { version = ">=0.3.0, <0.3.24", default-features = false }
 serde_derive = { version = "1.0.104", default-features = false, optional = true }
 serde = { version = "1.0", default-features = false, optional = true }
 serde_json = { version = "1", default-features = false, optional = true }
@@ -98,7 +98,7 @@ default-features = false
 
 [dev-dependencies]
 env_logger = "0.10.0"
-rstest = "0.16.0"
+rstest = "0.18.1"
 tracing-subscriber = { version = "0.3.14", features = ["fmt", "env-filter", "json"]}
 test-log = { version = "0.2.10", features = ["trace"] }
 tendermint-rpc = { version = "0.32", features = ["http-client", "websocket-client"] }

crates/ibc/Cargo.toml

@@ -1,6 +1,6 @@
 //! Contains the `Amount` type, which represents amounts of tokens transferred.
 
-use core::str::FromStr;
+use core::{ops::Deref, str::FromStr};
 use derive_more::{Display, From, Into};
 
 use super::error::TokenTransferError;
@@ -11,6 +11,28 @@ use primitive_types::U256;
 #[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Display, From, Into)]
 pub struct Amount(U256);
 
+#[cfg(feature = "parity-scale-codec")]
+impl parity_scale_codec::WrapperTypeDecode for Amount {
+    type Wrapped = [u64; 4];
+}
+
+#[cfg(feature = "parity-scale-codec")]
+impl parity_scale_codec::WrapperTypeEncode for Amount {}
+
+impl Deref for Amount {
+    type Target = [u64; 4];
+
+    fn deref(&self) -> &Self::Target {
+        &self.0 .0
+    }
+}
+
+impl From<[u64; 4]> for Amount {
+    fn from(value: [u64; 4]) -> Self {
+        Self(U256(value))
+    }
+}
+
 impl Amount {
     pub fn checked_add(self, rhs: Self) -> Option<Self> {
         self.0.checked_add(rhs.0).map(Self)