fix: refactor unnecessary replies (#647)

* fix: make reply on success

* fix: clear callback data

* fix: chan open init remove reply

* fix: remove reply chan open try

* fix: remove reply from open confirm

* fix: remove close init reply

* fix: fix tests

* fix: add unit tests

* fix: add unit tests

* fix: unit tests

* fix: remove reply on ack

* fix: fix format

* fix: remove receive packet callback

* chore: pass buils

* fix: add tests

* fix: refactor test setup

* fix: cleanup test

* fix: receive test

* fix: refactor test

* chore: pass build

* fix: fix close init test

* fix: add test for send packet

* fix: test for close confirm

* chore: pass build

* fix: cargo fmt

* fix: timeout packet reply never

* fix: fix lint

---------

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

Author: ibrizsabin

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

@@ -53,7 +53,7 @@ pub use ibc_proto::protobuf::Protobuf;
 use self::channel::RawPacket;
 use crate::cw_types::CwPacket;
 
-pub fn to_raw_packet(packet: CwPacket) -> RawPacket {
+pub fn to_raw_packet(packet: &CwPacket) -> RawPacket {
     let timestamp = packet.timeout.timestamp().map(|t| t.nanos()).unwrap_or(0);
 
     let timeout_height = packet.timeout.block().map(|b| RawHeight {
@@ -62,11 +62,11 @@ pub fn to_raw_packet(packet: CwPacket) -> RawPacket {
     });
     RawPacket {
         sequence: packet.sequence,
-        source_port: packet.src.port_id,
-        source_channel: packet.src.channel_id,
-        destination_port: packet.dest.port_id,
-        destination_channel: packet.dest.channel_id,
-        data: packet.data.0,
+        source_port: packet.src.port_id.to_string(),
+        source_channel: packet.src.channel_id.to_string(),
+        destination_port: packet.dest.port_id.to_string(),
+        destination_channel: packet.dest.channel_id.to_string(),
+        data: packet.data.0.clone(),
         timeout_height,
         timeout_timestamp: timestamp,
     }

contracts/cosmwasm-vm/cw-ibc-core/src/constants.rs

@@ -15,6 +15,7 @@ pub const EXECUTE_ON_CHANNEL_OPEN_TRY: u64 = 422;
 pub const EXECUTE_ON_CHANNEL_OPEN_ACK_ON_MODULE: u64 = 432;
 
 pub const EXECUTE_ON_CHANNEL_OPEN_CONFIRM_ON_MODULE: u64 = 442;
+
 pub const EXECUTE_ON_CHANNEL_CLOSE_INIT: u64 = 45;
 
 pub const EXECUTE_ON_CHANNEL_CLOSE_CONFIRM_ON_MODULE: u64 = 462;

contracts/cosmwasm-vm/cw-ibc-core/src/context.rs

@@ -75,8 +75,12 @@ impl<'a> CwIbcCoreContext<'a> {
         data: &T,
     ) -> Result<(), ContractError>
     where
-        T: Serialize + ?Sized,
+        T: DeserializeOwned + Serialize + ?Sized,
     {
+        if self.has_callback_data(store, id) {
+            return Err(ContractError::CallAlreadyInProgress);
+        }
+
         let bytes = to_vec(data).map_err(ContractError::Std)?;
         return self
             .cw_ibc_store
@@ -85,6 +89,14 @@ impl<'a> CwIbcCoreContext<'a> {
             .map_err(ContractError::Std);
     }
 
+    pub fn has_callback_data(&self, store: &dyn Storage, id: u64) -> bool {
+        return self.ibc_store().callback_data().load(store, id).is_ok();
+    }
+
+    pub fn clear_callback_data(&self, store: &mut dyn Storage, id: u64) {
+        return self.ibc_store().callback_data().remove(store, id);
+    }
+
     pub fn get_callback_data<T: DeserializeOwned>(
         &self,
         store: &dyn Storage,

contracts/cosmwasm-vm/cw-ibc-core/src/contract.rs

@@ -525,21 +525,7 @@ impl<'a> CwIbcCoreContext<'a> {
             EXECUTE_UPDATE_CLIENT => self.execute_update_client_reply(deps, env, message),
             EXECUTE_UPGRADE_CLIENT => self.execute_upgrade_client_reply(deps, env, message),
             MISBEHAVIOUR => self.execute_misbehaviour_reply(deps, env, message),
-            EXECUTE_ON_CHANNEL_OPEN_INIT => self.execute_channel_open_init(deps, message),
-            EXECUTE_ON_CHANNEL_OPEN_TRY => self.execute_channel_open_try(deps, message),
-            EXECUTE_ON_CHANNEL_OPEN_ACK_ON_MODULE => self.execute_channel_open_ack(deps, message),
-            EXECUTE_ON_CHANNEL_OPEN_CONFIRM_ON_MODULE => {
-                self.execute_channel_open_confirm(deps, message)
-            }
-            EXECUTE_ON_CHANNEL_CLOSE_INIT => self.execute_channel_close_init(deps, message),
-            EXECUTE_ON_CHANNEL_CLOSE_CONFIRM_ON_MODULE => {
-                self.execute_channel_close_confirm(deps, message)
-            }
-            VALIDATE_ON_PACKET_TIMEOUT_ON_MODULE => self.execute_timeout_packet(deps, message),
             VALIDATE_ON_PACKET_RECEIVE_ON_MODULE => self.execute_receive_packet(deps, message),
-            VALIDATE_ON_PACKET_ACKNOWLEDGEMENT_ON_MODULE => {
-                self.acknowledgement_packet_execute(deps, message)
-            }
 
             _ => Err(ContractError::ReplyError {
                 code: message.id,

contracts/cosmwasm-vm/cw-ibc-core/src/error.rs

@@ -77,6 +77,9 @@ pub enum ContractError {
 
     #[error("InvalidHeight")]
     InvalidHeight,
+
+    #[error("CallAlreadyInProgress")]
+    CallAlreadyInProgress,
 }
 
 impl From<FromHexError> for ContractError {

contracts/cosmwasm-vm/cw-ibc-core/src/ics02_client/handler.rs

@@ -72,7 +72,8 @@ impl<'a> IbcClient for CwIbcCoreContext<'a> {
             funds: info.funds,
         });
 
-        let sub_msg: SubMsg = SubMsg::reply_always(create_client_message, EXECUTE_CREATE_CLIENT);
+        let sub_msg: SubMsg =
+            SubMsg::reply_on_success(create_client_message, EXECUTE_CREATE_CLIENT);
 
         Ok(Response::new()
             .add_submessage(sub_msg)
@@ -214,7 +215,7 @@ impl<'a> IbcClient for CwIbcCoreContext<'a> {
             funds: info.funds,
         });
 
-        let sub_message = SubMsg::reply_always(wasm_msg, EXECUTE_UPGRADE_CLIENT);
+        let sub_message = SubMsg::reply_on_success(wasm_msg, EXECUTE_UPGRADE_CLIENT);
 
         Ok(Response::new()
             .add_submessage(sub_message)
@@ -532,7 +533,7 @@ impl<'a> IbcClient for CwIbcCoreContext<'a> {
             funds: info.funds,
         });
 
-        let sub_message = SubMsg::reply_always(wasm_exec_message, MISBEHAVIOUR);
+        let sub_message = SubMsg::reply_on_success(wasm_exec_message, MISBEHAVIOUR);
 
         Ok(Response::new()
             .add_submessage(sub_message)

contracts/cosmwasm-vm/cw-ibc-core/src/ics04_channel/events.rs

@@ -79,13 +79,14 @@ pub fn create_channel_id_generated_event(channel_id: ChannelId) -> Event {
 
 pub fn create_packet_event(
     event_type: IbcEventType,
-    packet: RawPacket,
+    packet: &RawPacket,
     channel_order: &Order,
     connection_id: &IbcConnectionId,
     ack: Option<Vec<u8>>,
 ) -> Result<Event, ContractError> {
     let timeout_height = packet
         .timeout_height
+        .as_ref()
         .map(|h| format!("{}-{}", h.revision_number, h.revision_height))
         .unwrap_or("0-0".to_string());
     let hex_data = hex::encode(&packet.data);