Merge branch 'master' into anca/conn_open_rest_tx

CHANGELOG.md

@@ -8,7 +8,9 @@ Special thanks to external contributors for this release: @CharlyCst ([#347]).
 
 - [changelog] Added "unreleased" section in `CHANGELOG.MD` to help streamline releases ([#274])
 - [relayer] Integrate relayer spike into relayer crate ([#335])
-- [modules] Implement flexible connection id selection ([#332])
+- [modules]
+    - Implement flexible connection id selection ([#332])
+    - ICS 4 Domain Types for channel handshakes ([#315])
 - [relayer] Implement `query_header_at_height` via plain RPC queries (no light client verification) ([#336])
 - [relayer-cli]
     - Merge light clients config in relayer config and add commands to add/remove light clients ([#348])
@@ -19,6 +21,7 @@ Special thanks to external contributors for this release: @CharlyCst ([#347]).
 - [ibc-proto] Refactor and allow specifying a commit at which the Cosmos SDK should be checked out ([#366])
 
 [#274]: https://github.com/informalsystems/ibc-rs/issues/274
+[#315]: https://github.com/informalsystems/ibc-rs/issues/315
 [#332]: https://github.com/informalsystems/ibc-rs/issues/332
 [#335]: https://github.com/informalsystems/ibc-rs/pulls/335
 [#336]: https://github.com/informalsystems/ibc-rs/issues/336
@@ -28,7 +31,9 @@ Special thanks to external contributors for this release: @CharlyCst ([#347]).
 
 ### IMPROVEMENTS
 
-- [relayer-cli] Split tasks spawned by CLI commands into their own modules ([#331])
+- [relayer-cli]
+    - Split tasks spawned by CLI commands into their own modules ([#331])
+    - V0 command implementation ([#346])
 - [modules]
     - Homogenize ConnectionReader trait so that all functions return owned objects ([#347])
     - Align with tendermint-rs in the domain type definition of `block::Id` ([#338])
@@ -41,6 +46,7 @@ Special thanks to external contributors for this release: @CharlyCst ([#347]).
 [#336]: https://github.com/informalsystems/ibc-rs/issues/336
 [#338]: https://github.com/informalsystems/ibc-rs/issues/338
 [#347]: https://github.com/informalsystems/ibc-rs/issues/347
+[#346]: https://github.com/informalsystems/ibc-rs/issues/346
 [#348]: https://github.com/informalsystems/ibc-rs/pulls/348
 [changelog]: https://github.com/informalsystems/ibc-rs/tree/master/CHANGELOG.md
 

modules/src/ics03_connection/msgs.rs

@@ -11,6 +11,7 @@
 //!
 //! Another difference to ICS3 specs is that each message comprises an additional field called
 //! `signer` which is specific to Cosmos-SDK.
+
 use crate::ics03_connection::msgs::conn_open_ack::MsgConnectionOpenAck;
 use crate::ics03_connection::msgs::conn_open_confirm::MsgConnectionOpenConfirm;
 use crate::ics03_connection::msgs::conn_open_init::MsgConnectionOpenInit;

modules/src/ics04_channel/channel.rs

@@ -2,11 +2,11 @@ use crate::ics04_channel::error::{self, Error, Kind};
 use crate::ics24_host::identifier::{ChannelId, ConnectionId, PortId};
 
 use ibc_proto::ibc::core::channel::v1::Channel as RawChannel;
+use tendermint_proto::DomainType;
 
 use anomaly::fail;
 use std::convert::TryFrom;
 use std::str::FromStr;
-use tendermint_proto::DomainType;
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct ChannelEnd {
@@ -50,9 +50,7 @@ impl TryFrom<RawChannel> for ChannelEnd {
             .collect::<Result<Vec<_>, _>>()
             .map_err(|e| Kind::IdentifierError.context(e))?;
 
-        // This field is supposed to be opaque to the core IBC protocol. Empty
-        // version is allowed by the specification (cf. ICS 004). No explicit validation necessary.
-        let version = value.version;
+        let version = validate_version(value.version)?;
 
         let mut channel_end = ChannelEnd::new(chan_ordering, remote, connection_hops, version);
         channel_end.set_state(chan_state);
@@ -241,37 +239,55 @@ impl State {
     }
 }
 
+/// Version validation, specific for channel (ICS4) opening handshake protocol.
+/// This field is supposed to be opaque to the core IBC protocol. No explicit validation necessary,
+/// and empty version is currently allowed by the specification (cf. ICS 004, v1).
+pub fn validate_version(version: String) -> Result<String, Error> {
+    Ok(version)
+}
+
+#[cfg(test)]
+pub mod test_util {
+    use ibc_proto::ibc::core::channel::v1::Channel as RawChannel;
+    use ibc_proto::ibc::core::channel::v1::Counterparty as RawCounterparty;
+
+    /// Returns a dummy `RawCounterparty`, for testing only!
+    pub fn get_dummy_raw_counterparty() -> RawCounterparty {
+        RawCounterparty {
+            port_id: "0123456789".into(),
+            channel_id: "0987654321".into(),
+        }
+    }
+
+    /// Returns a dummy `RawChannel`, for testing only!
+    pub fn get_dummy_raw_channel_end() -> RawChannel {
+        RawChannel {
+            state: 0,
+            ordering: 0,
+            counterparty: Some(get_dummy_raw_counterparty()),
+            connection_hops: vec![],
+            version: "".to_string(), // The version is not validated.
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::str::FromStr;
 
+    use crate::ics04_channel::channel::test_util::get_dummy_raw_channel_end;
     use crate::ics04_channel::channel::ChannelEnd;
 
     use ibc_proto::ibc::core::channel::v1::Channel as RawChannel;
-    use ibc_proto::ibc::core::channel::v1::Counterparty as RawCounterparty;
     use std::convert::TryFrom;
 
     #[test]
     fn channel_end_try_from_raw() {
+        let raw_channel_end = get_dummy_raw_channel_end();
+
         let empty_raw_channel_end = RawChannel {
-            state: 0,
-            ordering: 0,
             counterparty: None,
-            connection_hops: vec![],
-            version: "".to_string(),
-        };
-
-        let cparty = RawCounterparty {
-            port_id: "0123456789".into(),
-            channel_id: "0987654321".into(),
-        };
-
-        let raw_channel_end = RawChannel {
-            state: 0,
-            ordering: 0,
-            counterparty: Some(cparty),
-            connection_hops: vec![],
-            version: "".to_string(), // The version is not validated.
+            ..raw_channel_end.clone()
         };
 
         struct Test {

modules/src/ics04_channel/error.rs

@@ -20,9 +20,15 @@ pub enum Kind {
     #[error("invalid version")]
     InvalidVersion,
 
+    #[error("invalid signer address")]
+    InvalidSigner,
+
     #[error("invalid proof")]
     InvalidProof,
 
+    #[error("invalid proof: missing height")]
+    MissingHeight,
+
     #[error("invalid packet")]
     InvalidPacket,
 
@@ -31,6 +37,9 @@ pub enum Kind {
 
     #[error("missing counterparty")]
     MissingCounterparty,
+
+    #[error("missing channel end")]
+    MissingChannel,
 }
 
 impl Kind {