feat(ibc-union): add newtypes for ids (#4054)

Author: cor

Cargo.lock

@@ -17,6 +17,7 @@ cosmwasm-std                = { workspace = true, features = ["cosmwasm_1_3"] }
 cw-storage-plus             = { workspace = true }
 cw20                        = { version = "2.0" }
 cw20-base                   = { version = "2.0", features = ["library"] }
+ibc-union-spec              = { workspace = true }
 serde                       = { workspace = true, features = ["derive"] }
 thiserror                   = { workspace = true }
 token-factory-api           = { workspace = true }

cosmwasm/cw20-token-minter/Cargo.toml

@@ -6,6 +6,7 @@ use cosmwasm_std::{
     QueryRequest, Response, StdResult, WasmMsg,
 };
 use cw20::{Cw20QueryMsg, TokenInfoResponse};
+use ibc_union_spec::ChannelId;
 use ucs03_zkgm_token_minter_api::{
     ExecuteMsg, LocalTokenMsg, MetadataResponse, PredictWrappedTokenResponse, QueryMsg,
     WrappedTokenMsg, DISPATCH_EVENT, DISPATCH_EVENT_ATTR,
@@ -73,7 +74,7 @@ pub fn execute(
                 metadata,
                 subdenom: denom,
                 path,
-                channel,
+                channel_id,
                 token,
             } => {
                 let token_name = if metadata.name.is_empty() {
@@ -99,7 +100,7 @@ pub fn execute(
                                 U256::from_be_bytes::<{ U256::BYTES }>(
                                     path.as_slice().try_into().expect("correctly encoded; qed"),
                                 ),
-                                channel,
+                                channel_id,
                                 token.to_vec(),
                             )),
                         },
@@ -247,7 +248,7 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<Binary, Error> {
     match msg {
         QueryMsg::PredictWrappedToken {
             path,
-            channel,
+            channel_id,
             token,
         } => {
             let Config { dummy_code_id, .. } = CONFIG.load(deps.storage)?;
@@ -257,7 +258,7 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<Binary, Error> {
                 &deps.api.addr_canonicalize(env.contract.address.as_str())?,
                 &calculate_salt(
                     path.parse::<U256>().map_err(Error::U256Parse)?,
-                    channel,
+                    channel_id,
                     token.to_vec(),
                 ),
             )?;
@@ -325,8 +326,8 @@ fn query_token_info(deps: Deps, addr: &str) -> StdResult<TokenInfoResponse> {
         }))
 }
 
-fn calculate_salt(path: U256, channel: u32, token: Vec<u8>) -> Vec<u8> {
-    keccak256((path, channel, token.to_vec()).abi_encode_params())
+fn calculate_salt(path: U256, channel_id: ChannelId, token: Vec<u8>) -> Vec<u8> {
+    keccak256((path, channel_id.raw(), token.to_vec()).abi_encode_params())
         .into_bytes()
         .to_vec()
 }

cosmwasm/cw20-token-minter/src/contract.rs

@@ -23,6 +23,7 @@ cosmwasm-std    = { workspace = true, features = ["stargate"] }
 cw-storage-plus = { workspace = true }
 ethabi          = { workspace = true }
 ibc-union-msg   = { workspace = true }
+ibc-union-spec  = { workspace = true }
 serde           = { workspace = true, features = ["derive"] }
 thiserror       = { workspace = true }
 

cosmwasm/ibc-union/app/ucs00-pingpong/Cargo.toml

@@ -1,6 +1,7 @@
 use cosmwasm_schema::cw_serde;
 use ethabi::{ParamType, Token};
 use ibc_union_msg::msg::MsgSendPacket;
+use ibc_union_spec::ChannelId;
 
 use crate::{state::Config, ContractError};
 
@@ -37,14 +38,14 @@ impl UCS00PingPong {
         &self,
         config: &Config,
         current_timestamp: u64,
-        source_channel: u32,
+        source_channel: ChannelId,
     ) -> ibc_union_msg::msg::ExecuteMsg {
         let counterparty_packet = UCS00PingPong {
             ping: !self.ping,
             // counterparty_timeout: config.seconds_before_timeout * 1_000_000_000 + current_timestamp,
         };
         ibc_union_msg::msg::ExecuteMsg::PacketSend(MsgSendPacket {
-            source_channel,
+            source_channel_id: source_channel,
             timeout_height: 0,
             timeout_timestamp: current_timestamp + config.seconds_before_timeout * 1_000_000_000,
             data: counterparty_packet.encode().into(),
@@ -61,7 +62,7 @@ pub struct InitMsg {
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
     Initiate {
-        channel_id: u32,
+        channel_id: ChannelId,
         packet: UCS00PingPong,
     },
     IbcUnionMsg(ibc_union_msg::module::IbcUnionMsg),