fix: hex string encoding (#314)

* fix: hex string encoding

* fix: mark commitments

* chore: cargo fmt

* feat: add hex string support

* chore: fmt

* fix: unit test

* chore: refactor signer

---------

Co-authored-by: sabinchitrakar <immortal.infidel@gmail.com>

Author: ibrizsabin

contracts/cosmwasm-vm/cw-common/Cargo.toml

@@ -14,6 +14,9 @@ cosmwasm-std = { version = "1.2.1", features = ["iterator", "ibc3"] }
 ibc = { version = "0.32.0", default-features = false, features = ["parity-scale-codec", "mocks-no-std", "serde", "borsh"]}
 serde = { version = "1.0.154", default-features = false, features = ["derive"] }
 cw-storage-plus = "1.0.1"
+serde_json = "*"
+hex-buffer-serde = "0.4.0"
+schemars = "0.8.12"
 hex = { version = "0.4.3", default-features = false}
 common = { path="../../../libraries/rust/common" }
 ibc-proto = { version = "0.26.0", default-features = false, features = ["parity-scale-codec", "borsh"] }

contracts/cosmwasm-vm/cw-common/src/client_msg.rs

@@ -182,6 +182,7 @@ pub enum ExecuteMsg {
         message_info: MessageInfo,
         endpoint: IbcEndpoint,
         verify_channel_state: VerifyChannelState,
+        // add all props that we need on response
     },
     Misbehaviour {
         client_id: String,
@@ -191,6 +192,7 @@ pub enum ExecuteMsg {
         expected_response: OpenConfirmResponse,
         client_id: String,
         verify_connection_state: VerifyConnectionState,
+        // add all props that we need on response
     },
     TimeoutOnCLose {
         client_id: String,

contracts/cosmwasm-vm/cw-common/src/core_msg.rs

@@ -1,6 +1,8 @@
 use cosmwasm_schema::QueryResponses;
 use cosmwasm_std::Addr;
 
+use crate::hex_string::HexString;
+
 use super::*;
 
 #[cw_serde]
@@ -14,14 +16,14 @@ pub enum ExecuteMsg {
         client_address: Addr,
     },
     CreateClient {
-        client_state: Vec<u8>,
-        consensus_state: Vec<u8>,
-        signer: Vec<u8>,
+        client_state: HexString,
+        consensus_state: HexString,
+        signer: HexString,
     },
     UpdateClient {
         client_id: String,
-        header: Vec<u8>,
-        signer: Vec<u8>,
+        header: HexString,
+        signer: HexString,
     },
     // Not included in this version of ibc core
     UpgradeClient {},
@@ -32,82 +34,82 @@ pub enum ExecuteMsg {
     ConnectionOpenInit {
         //raw message bytes:
         //ibc_proto::ibc::core::connection::v1::MsgConnectionOpenInit,
-        msg: Vec<u8>,
+        msg: HexString,
     },
     ConnectionOpenTry {
         //raw message bytes:
         //ibc_proto::ibc::core::connection::v1::MsgConnectionOpenTry
-        msg: Vec<u8>,
+        msg: HexString,
     },
     ConnectionOpenAck {
         //raw message bytes:
         //ibc_proto::ibc::core::connection::v1::MsgConnectionOpenAck
-        msg: Vec<u8>,
+        msg: HexString,
     },
     ConnectionOpenConfirm {
         //raw message bytes:
         //ibc_proto::ibc::core::connection::v1::MsgConnectionOpenConfirm
-        msg: Vec<u8>,
+        msg: HexString,
     },
 
     // Channel Messages
     ChannelOpenInit {
         // raw message bytes:
         //ibc_proto::ibc::core::channel::v1::MsgChannelOpenInit
-        msg: Vec<u8>,
+        msg: HexString,
     },
     ChannelOpenTry {
         //raw message bytes:
         //ibc_proto::ibc::core::channel::v1::MsgChannelOpenTry
-        msg: Vec<u8>,
+        msg: HexString,
     },
     ChannelOpenAck {
         //raw message bytes:
         //ibc_proto::ibc::core::channel::v1::MsgChannelOpenAck
-        msg: Vec<u8>,
+        msg: HexString,
     },
     ChannelOpenConfirm {
         //raw message bytes:
         //ibc_proto::ibc::core::channel::v1::MsgChannelOpenConfirm
-        msg: Vec<u8>,
+        msg: HexString,
     },
     ChannelCloseInit {
         port_id_on_a: String,
         chan_id_on_a: String,
-        signer: Vec<u8>,
+        signer: HexString,
     },
     ChannelCloseConfirm {
         //raw message bytes:
         //ibc_proto::ibc::core::channel::v1::MsgChannelCloseConfirm
-        msg: Vec<u8>,
+        msg: HexString,
     },
 
     // Packet Messages
     SendPacket {
         //raw message bytes:
         //ibc_proto::ibc::core::channel::v1::Packet
-        packet: Vec<u8>,
+        packet: HexString,
     },
     ReceivePacket {
         //raw message bytes:
         //ibc_proto::ibc::core::channel::v1::MsgRecvPacket
-        msg: Vec<u8>,
+        msg: HexString,
     },
     AcknowledgementPacket {
         //raw message bytes:
         //ibc_proto::ibc::core::channel::v1::MsgAcknowledgement
-        msg: Vec<u8>,
+        msg: HexString,
     },
     RequestTimeout {},
     Timeout {
         //raw message bytes:
         //ibc_proto::ibc::core::channel::v1::MsgTimeout
-        msg: Vec<u8>,
+        msg: HexString,
     },
     TimeoutOnClose {
         //raw message bytes:
         //ibc_proto::ibc::core::channel::v1::MsgTimeoutOnClose
-        msg: Vec<u8>,
+        msg: HexString,
     },
 
     // Storage Messages

contracts/cosmwasm-vm/cw-common/src/hex_string.rs

@@ -0,0 +1,56 @@
+use std::borrow::Cow;
+
+use cosmwasm_schema::cw_serde;
+use hex_buffer_serde::Hex;
+use schemars::JsonSchema;
+
+#[derive(JsonSchema)]
+struct FromHexString(());
+
+impl Hex<Vec<u8>> for FromHexString {
+    type Error = hex::FromHexError;
+
+    fn create_bytes(value: &Vec<u8>) -> Cow<'_, [u8]> {
+        Cow::Borrowed(&value[..])
+    }
+
+    fn from_bytes(bytes: &[u8]) -> Result<Vec<u8>, Self::Error> {
+        Ok(bytes.to_vec())
+    }
+}
+
+#[cw_serde]
+pub struct HexString(String);
+
+impl HexString {
+    pub fn to_bytes(&self) -> Result<Vec<u8>, hex::FromHexError> {
+        let str = self.0.replace("0x", "");
+        hex::decode(str)
+    }
+
+    pub fn from_bytes(bytes: &[u8]) -> HexString {
+        HexString(hex::encode(bytes))
+    }
+}
+
+#[cw_serde]
+pub struct TestHex {
+    #[serde(with = "FromHexString")]
+    pub bytes: Vec<u8>,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::TestHex;
+
+    #[test]
+    fn test_hex_serialize_deserialize() {
+        let test = TestHex {
+            bytes: hex::decode("deadbeef").unwrap(),
+        };
+        let serialized = serde_json::to_value(&test).unwrap();
+        assert_eq!("{\"bytes\":\"deadbeef\"}", serialized.to_string());
+        let deserialized = serde_json::from_str::<TestHex>("{\"bytes\":\"deadbeef\"}").unwrap();
+        assert_eq!(test, deserialized);
+    }
+}

contracts/cosmwasm-vm/cw-common/src/lib.rs

@@ -2,6 +2,7 @@ pub mod client_msg;
 pub mod client_response;
 pub mod commitment;
 pub mod errors;
+pub mod hex_string;
 pub mod types;
 pub mod xcall_msg;
 use cosmwasm_std::IbcPacket;
@@ -44,6 +45,7 @@ use crate::types::{ClientId, ClientType};
 use common::rlp::Encodable;
 use common::rlp::{self, Decodable};
 use cosmwasm_schema::cw_serde;
+use cosmwasm_schema::serde::{Deserialize, Serialize};
 use cosmwasm_std::Binary;
 use cosmwasm_std::IbcEndpoint;
 use cosmwasm_std::{
@@ -59,7 +61,6 @@ use ibc::{
     signer::Signer,
 };
 pub use ibc_proto::ibc::core::channel::v1::Packet as RawPacket;
-use serde::{Deserialize, Serialize};
 pub mod core_msg;
 use core_msg::*;
 pub use ibc::core::ics04_channel::packet::Packet;

contracts/cosmwasm-vm/cw-common/src/types.rs

@@ -1,3 +1,5 @@
+use std::borrow::Cow;
+
 use super::*;
 use cosmwasm_std::{Addr, Coin};
 #[cw_serde]
@@ -6,7 +8,9 @@ pub struct VerifyChannelState {
     pub counterparty_prefix: Vec<u8>,
     pub proof: Vec<u8>,
     pub root: Vec<u8>,
+    // commitment key
     pub counterparty_chan_end_path: Vec<u8>,
+    // commitment bytes
     pub expected_counterparty_channel_end: Vec<u8>,
 }
 
@@ -16,7 +20,9 @@ pub struct VerifyPacketData {
     pub prefix: Vec<u8>,
     pub proof: Vec<u8>,
     pub root: Vec<u8>,
+    // commitment key
     pub commitment_path: Vec<u8>,
+    // commitment bytes
     pub commitment: Vec<u8>,
 }
 #[derive(Debug, Serialize, Deserialize)]
@@ -49,7 +55,9 @@ pub struct VerifyPacketAcknowledgement {
     pub prefix: Vec<u8>,
     pub proof: Vec<u8>,
     pub root: Vec<u8>,
+    // commitment key
     pub ack_path: Vec<u8>,
+    // commitment byte
     pub ack: Vec<u8>,
 }