chore: touch ups

Cargo.toml

@@ -50,15 +50,12 @@ authors      = ["Informal Systems <[email protected]>"]
 borsh               = { version = "0.10", default-features = false }
 displaydoc          = { version = "0.2", default-features = false }
 derive_more         = { version = "0.99.17", default-features = false, features = ["from", "into", "display", "try_into"] }
-num-traits          = { version = "0.2.17", default-features = false }
-primitive-types     = { version = "0.12.2", default-features = false, features = ["serde_no_std"] }
 rstest              = "0.18.2"
 schemars            = { version = "0.8.15" }
 sha2                = { version = "0.10.8", default-features = false }
 serde               = { version = "1.0", default-features = false }
 serde_json          = { package = "serde-json-wasm", version = "1.0.0" , default-features = false }
 subtle-encoding     = { version = "0.5", default-features = false }
-time                = { version = ">=0.3.0, <0.3.31", default-features = false }
 
 # ibc dependencies
 ibc                 = { version = "0.48.1", path = "./ibc", default-features = false }
@@ -90,7 +87,6 @@ ibc-client-tendermint-types = { version = "0.48.1", path = "./ibc-clients/ics07-
 ibc-app-transfer-types      = { version = "0.48.1", path = "./ibc-apps/ics20-transfer/types", default-features = false }
 
 ibc-proto = { version = "0.39.1", default-features = false }
-ics23     = { version = "0.11", default-features = false }
 
 # cosmos dependencies
 tendermint                       = { version = "0.34.0", default-features = false }

ibc-apps/ics20-transfer/types/Cargo.toml

@@ -22,7 +22,7 @@ all-features = true
 borsh           = { workspace = true, optional = true }
 derive_more     = { workspace = true }
 displaydoc      = { workspace = true }
-primitive-types = { workspace = true }
+primitive-types = { version = "0.12.2", default-features = false, features = ["serde_no_std"] }
 schemars        = { workspace = true, optional = true }
 serde           = { workspace = true, optional = true }
 uint            = { version = "0.9", default-features = false }
@@ -51,15 +51,15 @@ std = [
     "ibc-proto/std",
 ]
 serde = [
-    "dep:serde", 
+    "dep:serde",
     "ibc-core/serde",
-    "ibc-proto/serde", 
+    "ibc-proto/serde",
 ]
 schema = [
-    "dep:schemars", 
-    "ibc-core/schema", 
+    "dep:schemars",
+    "ibc-core/schema",
     "ibc-proto/json-schema", 
-    "serde", 
+    "serde",
     "std"
 ]
 borsh = [
@@ -68,8 +68,8 @@ borsh = [
     "ibc-proto/borsh"
 ]
 parity-scale-codec = [
-    "dep:parity-scale-codec", 
-    "dep:scale-info", 
+    "dep:parity-scale-codec",
+    "dep:scale-info",
     "ibc-core/parity-scale-codec",
     "ibc-proto/parity-scale-codec"
 ]

ibc-apps/ics20-transfer/types/src/lib.rs

@@ -40,9 +40,10 @@ pub(crate) mod serializers;
 pub mod error;
 mod memo;
 pub use memo::*;
+/// Re-exports `U256` from `primitive-types` crate for convenience.
+pub use primitive_types::U256;
 
-/// Re-exports ICS-20 token transfer proto types from the `ibc-proto` crate
-/// for added convenience
+/// Re-exports ICS-20 token transfer proto types from the `ibc-proto` crate.
 pub mod proto {
     pub use ibc_proto::ibc::apps::transfer;
 }

ibc-clients/ics07-tendermint/types/src/client_state.rs

@@ -346,11 +346,10 @@ impl TryFrom<Any> for ClientState {
 
     fn try_from(raw: Any) -> Result<Self, Self::Error> {
         fn decode_client_state(value: &[u8]) -> Result<ClientState, ClientError> {
-            let client_state = Protobuf::<RawTmClientState>::decode_vec(value).map_err(|e| {
-                ClientError::Other {
+            let client_state =
+                Protobuf::<RawTmClientState>::decode(value).map_err(|e| ClientError::Other {
                     description: e.to_string(),
-                }
-            })?;
+                })?;
             Ok(client_state)
         }
 

ibc-clients/ics07-tendermint/types/src/consensus_state.rs

@@ -107,11 +107,10 @@ impl TryFrom<Any> for ConsensusState {
 
     fn try_from(raw: Any) -> Result<Self, Self::Error> {
         fn decode_consensus_state(value: &[u8]) -> Result<ConsensusState, ClientError> {
-            let client_state = Protobuf::<RawConsensusState>::decode_vec(value).map_err(|e| {
-                ClientError::Other {
+            let client_state =
+                Protobuf::<RawConsensusState>::decode(value).map_err(|e| ClientError::Other {
                     description: e.to_string(),
-                }
-            })?;
+                })?;
             Ok(client_state)
         }
 

ibc-clients/ics07-tendermint/types/src/header.rs

@@ -188,10 +188,9 @@ impl TryFrom<Any> for Header {
 
     fn try_from(raw: Any) -> Result<Self, Self::Error> {
         fn decode_header(value: &[u8]) -> Result<Header, ClientError> {
-            let header =
-                Protobuf::<RawHeader>::decode_vec(value).map_err(|e| ClientError::Other {
-                    description: e.to_string(),
-                })?;
+            let header = Protobuf::<RawHeader>::decode(value).map_err(|e| ClientError::Other {
+                description: e.to_string(),
+            })?;
             Ok(header)
         }
         match raw.type_url.as_str() {

ibc-clients/ics07-tendermint/types/src/misbehaviour.rs

@@ -112,7 +112,7 @@ impl TryFrom<Any> for Misbehaviour {
     fn try_from(raw: Any) -> Result<Self, ClientError> {
         fn decode_misbehaviour(value: &[u8]) -> Result<Misbehaviour, ClientError> {
             let misbehaviour =
-                Protobuf::<RawMisbehaviour>::decode_vec(value).map_err(|e| ClientError::Other {
+                Protobuf::<RawMisbehaviour>::decode(value).map_err(|e| ClientError::Other {
                     description: e.to_string(),
                 })?;
             Ok(misbehaviour)

ibc-core/ics23-commitment/types/Cargo.toml

@@ -28,8 +28,8 @@ subtle-encoding = { workspace = true }
 
 # ibc dependencies
 ibc-proto       = { workspace = true }
-ibc-primitives  = {workspace = true }
-ics23           = { workspace = true, features = ["host-functions"] }
+ibc-primitives  = { workspace = true }
+ics23           = { version = "0.11", default-features = false, features = ["host-functions"] }
 
 # parity dependencies
 parity-scale-codec  = { workspace = true, optional = true }

ibc-core/ics23-commitment/types/src/commitment.rs

@@ -128,7 +128,7 @@ impl TryFrom<CommitmentProofBytes> for MerkleProof {
 
     fn try_from(value: CommitmentProofBytes) -> Result<Self, Self::Error> {
         let value: Vec<u8> = value.into();
-        let merkle_proof = Protobuf::<RawMerkleProof>::decode_vec(value.as_ref())
+        let merkle_proof = Protobuf::<RawMerkleProof>::decode(value.as_ref())
             .map_err(|e| CommitmentError::DecodingFailure(e.to_string()))?;
         Ok(merkle_proof)
     }

ibc-core/ics23-commitment/types/src/error.rs

@@ -23,7 +23,7 @@ pub enum CommitmentError {
     VerificationFailure,
     /// encoded commitment prefix is not a valid hex string: `{0}`
     EncodingFailure(String),
-    /// decoding failure: `{0}`
+    /// decoding commitment proof bytes failed: `{0}`
     DecodingFailure(String),
 }
 

ibc-core/ics23-commitment/types/src/merkle.rs

@@ -34,9 +34,6 @@ pub struct MerkleProof {
 
 impl Protobuf<RawMerkleProof> for MerkleProof {}
 
-/// Convert to ics23::CommitmentProof
-/// The encoding and decoding shouldn't fail since ics23::CommitmentProof and ibc_proto::ics23::CommitmentProof should be the same
-/// Ref. <https://github.com/informalsystems/ibc-rs/issues/853>
 impl TryFrom<RawMerkleProof> for MerkleProof {
     type Error = CommitmentError;
 

ibc-core/ics26-routing/types/Cargo.toml

@@ -30,7 +30,6 @@ subtle-encoding = { workspace = true }
 ibc-core-host-types    = { workspace = true }
 ibc-primitives         = { workspace = true }
 ibc-proto              = {workspace = true }
-ics23                  = { workspace = true }
 
 # cosmos dependencies
 tendermint = { workspace = true }
@@ -48,7 +47,6 @@ std = [
     "ibc-primitives/std",
     "ibc-core-host-types/std",
     "ibc-proto/std",
-    "ics23/std",
     "tendermint/std",
 ]
 serde = [
@@ -57,7 +55,6 @@ serde = [
     "ibc-core-host-types/serde",
     "ibc-primitives/serde",
     "ibc-proto/serde",
-    "ics23/serde",
 ]
 borsh = [
     "dep:borsh",

ibc-primitives/Cargo.toml

@@ -25,7 +25,7 @@ displaydoc  = { workspace = true }
 prost       = { version = "0.12", default-features = false }
 schemars    = { workspace = true, optional = true }
 serde       = { workspace = true, optional = true }
-time        = { workspace = true }
+time        = { version = ">=0.3.0, <0.3.31", default-features = false }
 
 # ibc dependencies
 ibc-proto = { workspace = true }

ibc-testkit/Cargo.toml

@@ -21,7 +21,6 @@ borsh             = { workspace = true, optional = true }
 derive_more       = { workspace = true }
 displaydoc        = { workspace = true }
 parking_lot       = { version = "0.12.1", default-features = false }
-primitive-types   = { workspace = true }
 schemars          = { workspace = true, optional = true }
 serde             = { workspace = true, optional = true }
 serde_json        = { workspace = true, optional = true }

ibc-testkit/src/testapp/ibc/clients/mock/client_state.rs

@@ -102,11 +102,10 @@ impl TryFrom<Any> for MockClientState {
 
     fn try_from(raw: Any) -> Result<Self, Self::Error> {
         fn decode_client_state(value: &[u8]) -> Result<MockClientState, ClientError> {
-            let client_state = Protobuf::<RawMockClientState>::decode_vec(value).map_err(|e| {
-                ClientError::Other {
+            let client_state =
+                Protobuf::<RawMockClientState>::decode(value).map_err(|e| ClientError::Other {
                     description: e.to_string(),
-                }
-            })?;
+                })?;
             Ok(client_state)
         }
         match raw.type_url.as_str() {

ibc-testkit/src/testapp/ibc/clients/mock/consensus_state.rs

@@ -64,9 +64,11 @@ impl TryFrom<Any> for MockConsensusState {
 
     fn try_from(raw: Any) -> Result<Self, Self::Error> {
         fn decode_consensus_state(value: &[u8]) -> Result<MockConsensusState, ClientError> {
-            let mock_consensus_state = Protobuf::<RawMockConsensusState>::decode_vec(value)
-                .map_err(|e| ClientError::Other {
-                    description: e.to_string(),
+            let mock_consensus_state =
+                Protobuf::<RawMockConsensusState>::decode(value).map_err(|e| {
+                    ClientError::Other {
+                        description: e.to_string(),
+                    }
                 })?;
             Ok(mock_consensus_state)
         }

ibc-testkit/src/testapp/ibc/clients/mock/misbehaviour.rs

@@ -54,7 +54,7 @@ impl TryFrom<Any> for Misbehaviour {
     fn try_from(raw: Any) -> Result<Self, ClientError> {
         fn decode_misbehaviour(value: &[u8]) -> Result<Misbehaviour, ClientError> {
             let raw_misbehaviour =
-                Protobuf::<RawMisbehaviour>::decode_vec(value).map_err(|e| ClientError::Other {
+                Protobuf::<RawMisbehaviour>::decode(value).map_err(|e| ClientError::Other {
                     description: e.to_string(),
                 })?;
             Ok(raw_misbehaviour)

ibc-testkit/tests/core/router.rs

@@ -1,7 +1,7 @@
 use ibc::apps::transfer::handler::send_transfer;
 use ibc::apps::transfer::types::error::TokenTransferError;
 use ibc::apps::transfer::types::msgs::transfer::MsgTransfer;
-use ibc::apps::transfer::types::BaseCoin;
+use ibc::apps::transfer::types::{BaseCoin, U256};
 use ibc::core::channel::types::error::ChannelError;
 use ibc::core::channel::types::msgs::{
     ChannelMsg, MsgAcknowledgement, MsgChannelCloseConfirm, MsgChannelCloseInit, MsgChannelOpenAck,
@@ -40,7 +40,6 @@ use ibc_testkit::testapp::ibc::clients::mock::consensus_state::MockConsensusStat
 use ibc_testkit::testapp::ibc::clients::mock::header::MockHeader;
 use ibc_testkit::testapp::ibc::core::router::MockRouter;
 use ibc_testkit::testapp::ibc::core::types::MockContext;
-use primitive_types::U256;
 use test_log::test;
 
 #[test]