ucs01-relay: more coverage on both solidity and rust

cosmwasm/ucs01-relay/src/error.rs

@@ -53,6 +53,13 @@ pub enum ContractError {
         protocol_version: String,
     },
 
+    #[error("Channel {channel_id} protocol version {protocol_version} mismatch counterparty protocol version {counterparty_protocol_version}")]
+    ProtocolMismatch {
+        channel_id: String,
+        protocol_version: String,
+        counterparty_protocol_version: String,
+    },
+
     #[error("Only myself is able to trigger this message")]
     Unauthorized,
 }

cosmwasm/ucs01-relay/src/ibc.rs

@@ -92,6 +92,13 @@ pub(crate) fn enforce_order_and_version(
                 protocol_version: version.to_string(),
             });
         }
+        if version != channel.version {
+            return Err(ContractError::ProtocolMismatch {
+                channel_id: channel.endpoint.channel_id.clone(),
+                protocol_version: channel.version.to_string(),
+                counterparty_protocol_version: version.to_string(),
+            });
+        }
     }
     if channel.order != channel_ordering {
         return Err(ContractError::InvalidChannelOrdering {
@@ -108,8 +115,7 @@ pub fn ibc_channel_close(
     _env: Env,
     _channel: IbcChannelCloseMsg,
 ) -> Result<IbcBasicResponse, ContractError> {
-    // Not allowed.
-    unimplemented!();
+    Err(ContractError::Unauthorized)
 }
 
 #[cfg_attr(not(feature = "library"), entry_point)]
@@ -232,3 +238,172 @@ pub fn ibc_packet_timeout(
         }),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use cosmwasm_std::{IbcChannel, IbcEndpoint};
+    use ucs01_relay_api::protocol::TransferProtocol;
+
+    use super::enforce_order_and_version;
+    use crate::{
+        error::ContractError,
+        protocol::{Ics20Protocol, Ucs01Protocol},
+    };
+
+    #[test]
+    fn enforce_channel_version_ucs01() {
+        let port_id = "port-1";
+        let channel_id = "channel-1";
+        let connection_id = "connection-1";
+        let protocol_version = Ucs01Protocol::VERSION;
+        let counterparty_port_id = "port-2";
+        let counterparty_channel_id = "channel-2";
+        assert_eq!(
+            enforce_order_and_version(
+                &IbcChannel::new(
+                    IbcEndpoint {
+                        port_id: port_id.into(),
+                        channel_id: channel_id.into()
+                    },
+                    IbcEndpoint {
+                        port_id: counterparty_port_id.into(),
+                        channel_id: counterparty_channel_id.into()
+                    },
+                    cosmwasm_std::IbcOrder::Unordered,
+                    protocol_version,
+                    connection_id
+                ),
+                None
+            ),
+            Ok(())
+        );
+    }
+
+    #[test]
+    fn enforce_channel_version_ics20() {
+        let port_id = "port-1";
+        let channel_id = "channel-1";
+        let connection_id = "connection-1";
+        let protocol_version = Ics20Protocol::VERSION;
+        let counterparty_port_id = "port-2";
+        let counterparty_channel_id = "channel-2";
+        assert_eq!(
+            enforce_order_and_version(
+                &IbcChannel::new(
+                    IbcEndpoint {
+                        port_id: port_id.into(),
+                        channel_id: channel_id.into()
+                    },
+                    IbcEndpoint {
+                        port_id: counterparty_port_id.into(),
+                        channel_id: counterparty_channel_id.into()
+                    },
+                    cosmwasm_std::IbcOrder::Unordered,
+                    protocol_version,
+                    connection_id
+                ),
+                None
+            ),
+            Ok(())
+        );
+    }
+
+    #[test]
+    fn enforce_channel_wrong_version() {
+        let port_id = "port-1";
+        let channel_id = "channel-1";
+        let connection_id = "connection-1";
+        let protocol_version = "ucs01-0999";
+        let counterparty_port_id = "port-2";
+        let counterparty_channel_id = "channel-2";
+        assert_eq!(
+            enforce_order_and_version(
+                &IbcChannel::new(
+                    IbcEndpoint {
+                        port_id: port_id.into(),
+                        channel_id: channel_id.into()
+                    },
+                    IbcEndpoint {
+                        port_id: counterparty_port_id.into(),
+                        channel_id: counterparty_channel_id.into()
+                    },
+                    cosmwasm_std::IbcOrder::Unordered,
+                    protocol_version,
+                    connection_id
+                ),
+                None
+            ),
+            Err(ContractError::UnknownProtocol {
+                channel_id: channel_id.into(),
+                protocol_version: protocol_version.into()
+            })
+        );
+    }
+
+    #[test]
+    fn enforce_channel_counterparty_wrong_version() {
+        let port_id = "port-1";
+        let channel_id = "channel-1";
+        let connection_id = "connection-1";
+        let protocol_version = Ucs01Protocol::VERSION;
+        let counterparty_port_id = "port-2";
+        let counterparty_channel_id = "channel-2";
+        let counterparty_protocol_version = "ucs01-0999";
+        assert_eq!(
+            enforce_order_and_version(
+                &IbcChannel::new(
+                    IbcEndpoint {
+                        port_id: port_id.into(),
+                        channel_id: channel_id.into()
+                    },
+                    IbcEndpoint {
+                        port_id: counterparty_port_id.into(),
+                        channel_id: counterparty_channel_id.into()
+                    },
+                    cosmwasm_std::IbcOrder::Unordered,
+                    protocol_version,
+                    connection_id
+                ),
+                Some(counterparty_protocol_version)
+            ),
+            Err(ContractError::UnknownProtocol {
+                channel_id: channel_id.into(),
+                protocol_version: counterparty_protocol_version.into()
+            })
+        );
+    }
+
+    #[test]
+    fn enforce_channel_protocol_mismatch() {
+        let port_id = "port-1";
+        let channel_id = "channel-1";
+        let connection_id = "connection-1";
+        let protocol_version = Ucs01Protocol::VERSION;
+        let counterparty_port_id = "port-2";
+        let counterparty_channel_id = "channel-2";
+        let counterparty_protocol_version = Ics20Protocol::VERSION;
+        assert_eq!(
+            enforce_order_and_version(
+                &IbcChannel::new(
+                    IbcEndpoint {
+                        port_id: port_id.into(),
+                        channel_id: channel_id.into()
+                    },
+                    IbcEndpoint {
+                        port_id: counterparty_port_id.into(),
+                        channel_id: counterparty_channel_id.into()
+                    },
+                    cosmwasm_std::IbcOrder::Unordered,
+                    protocol_version,
+                    connection_id
+                ),
+                Some(counterparty_protocol_version)
+            ),
+            Err(ContractError::ProtocolMismatch {
+                channel_id: channel_id.into(),
+                protocol_version: protocol_version.into(),
+                counterparty_protocol_version: counterparty_protocol_version.into()
+            })
+        );
+    }
+}

dictionary.txt

@@ -280,9 +280,11 @@ feegrant
 feegrantkeeper
 feegrantmodule
 fetchurl
+fetchzip
 fkey
 fksmg
 floorlog
+fmtlib
 foldl
 frunk
 fubar
@@ -385,6 +387,7 @@ jemalloc
 jemallocator
 jetbrains
 journalctl
+jsoncpp
 jsonschema
 jwtsecret
 karel

evm/contracts/Glue.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.8.21;
+pragma solidity ^0.8.23;
 
 import "./core/02-client/ILightClient.sol";
 import "./core/02-client/IBCHeight.sol";

evm/contracts/apps/Base.sol

@@ -26,7 +26,7 @@ abstract contract IBCAppBase is Context, IIBCModule {
     function _checkIBC() internal view virtual {
         require(
             ibcAddress() == _msgSender(),
-            "_checkIBC: caller is not the IBC contract"
+            "IBCAppBase: caller is not the IBC contract"
         );
     }
 
@@ -127,4 +127,9 @@ abstract contract IBCAppBase is Context, IIBCModule {
         bytes calldata acknowledgement,
         address relayer
     ) external virtual override onlyIBC {}
+
+    function onTimeoutPacket(
+        IbcCoreChannelV1Packet.Data calldata packet,
+        address relayer
+    ) external virtual override onlyIBC {}
 }

evm/contracts/apps/ucs/00-pingpong/PingPong.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.8.21;
+pragma solidity ^0.8.23;
 
 import "../../Base.sol";
 import "../../../core/25-handler/IBCHandler.sol";

evm/contracts/apps/ucs/01-relay/ERC20Denom.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.8.21;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "./IERC20Denom.sol";
@@ -11,12 +11,12 @@ contract ERC20Denom is ERC20, IERC20Denom {
     }
 
     function mint(address to, uint256 amount) external {
-        require(msg.sender == admin, "only admin");
+        require(msg.sender == admin, "ERC20Denom: only admin");
         _mint(to, amount);
     }
 
     function burn(address from, uint256 amount) external {
-        require(msg.sender == admin, "only admin");
+        require(msg.sender == admin, "ERC20Denom: only admin");
         _burn(from, amount);
     }
 }

evm/contracts/apps/ucs/01-relay/IERC20Denom.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.8.21;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";