fix(ucs01): forward correct denoms

Signed-off-by: aeryz <abdullaheryz@protonmail.com>
unionlabs · Jun 7, 2024 · dfbd17e · dfbd17e
1 parent beededc
commit dfbd17e
Show file tree

Hide file tree

Showing 2 changed files with 154 additions and 123 deletions.
diff --git a/cosmwasm/ucs01-relay-api/src/protocol.rs b/cosmwasm/ucs01-relay-api/src/protocol.rs
@@ -242,6 +242,7 @@ pub trait TransferProtocol {
             .add_event(
                 packet_event
                     .add_attributes([
+                        ("this_module_version", Self::VERSION),
                         (ATTR_MODULE, TRANSFER_MODULE),
                         (ATTR_SENDER, packet.sender().to_string().as_str()),
                         (ATTR_RECEIVER, packet.receiver().to_string().as_str()),
@@ -295,7 +296,7 @@ pub trait TransferProtocol {
         &mut self,
         receiver: &<Self::Packet as TransferPacket>::Addr,
         tokens: Vec<TransferToken>,
-    ) -> Result<Vec<CosmosMsg<Self::CustomMsg>>, Self::Error>;
+    ) -> Result<(Vec<TransferToken>, Vec<CosmosMsg<Self::CustomMsg>>), Self::Error>;
 
     fn receive(&mut self, original_packet: IbcPacket) -> IbcReceiveResponse<Self::CustomMsg> {
         let handle = || -> Result<IbcReceiveResponse<Self::CustomMsg>, Self::Error> {
@@ -308,6 +309,7 @@ pub trait TransferProtocol {
             // to be overwritten.
             let transfer_msgs = self
                 .receive_transfer(packet.receiver(), packet.tokens())?
+                .1
                 .into_iter()
                 .map(|msg| SubMsg::reply_on_error(msg, Self::RECEIVE_REPLY_ID));
 
@@ -316,13 +318,7 @@ pub trait TransferProtocol {
             if let Ok(memo) = serde_json_wasm::from_str::<Memo>(&memo) {
                 match memo {
                     Memo::Forward { forward } => {
-                        return Ok(Self::packet_forward(
-                            self,
-                            packet,
-                            original_packet,
-                            forward,
-                            false,
-                        ))
+                        return Ok(self.packet_forward(packet, original_packet, forward, false))
                     }
                     Memo::None { .. } => {}
                 };
@@ -402,11 +398,11 @@ pub trait TransferProtocol {
         sequence: u64,
     ) -> Result<Option<(Vec<CosmosMsg<Self::CustomMsg>>, Vec<(&str, String)>)>, Self::Error>;
 
-    fn convert_foreign_protocol_ack(
+    fn convert_ack_to_foreign_protocol(
         &self,
         foreign_protocol: &str,
-        ack: Binary,
-    ) -> Result<Binary, Self::Error>;
+        ack: GenericAck,
+    ) -> Result<GenericAck, Self::Error>;
 }
 
 #[cfg(test)]