fix(ucs01): batch sub-messages (closes #840)

cosmwasm/ucs01-relay/src/contract.rs

@@ -79,11 +79,18 @@ pub fn execute(
                 Err(ContractError::Unauthorized)
             } else {
                 let normalized_hash = hash.0.try_into().expect("impossible");
-                FOREIGN_DENOM_TO_HASH.save(deps.storage, denom.clone().into(), &normalized_hash)?;
+                FOREIGN_DENOM_TO_HASH.save(deps.storage, denom.clone(), &normalized_hash)?;
                 HASH_TO_FOREIGN_DENOM.save(deps.storage, normalized_hash, &denom.to_string())?;
                 Ok(Response::default())
             }
         }
+        ExecuteMsg::BatchExecute { msgs } => {
+            if info.sender != env.contract.address {
+                Err(ContractError::Unauthorized)
+            } else {
+                Ok(Response::default().add_messages(msgs))
+            }
+        }
     }
 }
 

cosmwasm/ucs01-relay/src/msg.rs

@@ -1,5 +1,6 @@
 use cosmwasm_schema::{cw_serde, QueryResponses};
-use cosmwasm_std::{Binary, IbcChannel, Uint512};
+use cosmwasm_std::{Binary, CosmosMsg, IbcChannel, Uint512};
+use token_factory_api::TokenFactoryMsg;
 
 use crate::state::ChannelInfo;
 
@@ -24,6 +25,9 @@ pub enum ExecuteMsg {
     RegisterDenom { denom: String, hash: Binary },
     /// Change the admin (must be called by current admin)
     UpdateAdmin { admin: String },
+    BatchExecute {
+        msgs: Vec<CosmosMsg<TokenFactoryMsg>>,
+    },
 }
 
 /// This is the message we accept via Receive

cosmwasm/ucs01-relay/src/protocol.rs

@@ -451,7 +451,7 @@ impl<'a> TransferProtocol for Ics20Protocol<'a> {
         receiver: &str,
         tokens: Vec<TransferToken>,
     ) -> Result<Vec<CosmosMsg<Self::CustomMsg>>, ContractError> {
-        StatefulOnReceive {
+        let msgs = StatefulOnReceive {
             deps: self.common.deps.branch(),
         }
         .receive_phase1_transfer(
@@ -460,7 +460,14 @@ impl<'a> TransferProtocol for Ics20Protocol<'a> {
             &self.common.channel.counterparty_endpoint,
             receiver,
             tokens,
-        )
+        )?;
+
+        Ok(vec![wasm_execute(
+            self.self_addr(),
+            &ExecuteMsg::BatchExecute { msgs },
+            vec![],
+        )?
+        .into()])
     }
 
     fn normalize_for_ibc_transfer(