feat: partial upgrade of contracts to CosmWasm 2.0 (#1876)

In an attempt to mitigate updating external libraries to CosmWasm 2.0,
this PR only updates the minimal amount of crates to CosmWasm 2.0:

- token-factory-api
- ucs01-relay-api
- ucs01-realy
- zerg

**Reviewers**: If you're familiar with any of the crates above, please
make sure nothing was missed from the [CosmWasm 1.5.x -> 2.0.0 Migration
Guide](https://github.com/CosmWasm/cosmwasm/blob/v2.0.2/MIGRATING.md)

cosmwasm/token-factory-api/Cargo.toml

@@ -7,5 +7,5 @@ version = "0.1.0"
 workspace = true
 
 [dependencies]
-cosmwasm-schema = { workspace = true }
-cosmwasm-std    = { workspace = true }
+cosmwasm-schema = { version = "2.0.0" }
+cosmwasm-std    = { version = "2.0.0" }

cosmwasm/ucs01-relay-api/Cargo.toml

@@ -7,8 +7,8 @@ version = "0.1.0"
 workspace = true
 
 [dependencies]
-cosmwasm-schema   = { workspace = true }
-cosmwasm-std      = { workspace = true, features = ["stargate"] }
+cosmwasm-schema   = { version = "2.0.0" }
+cosmwasm-std      = { version = "2.0.0", features = ["stargate"] }
 ethabi            = { workspace = true }
 thiserror         = { workspace = true }
 token-factory-api = { workspace = true }

cosmwasm/ucs01-relay-api/src/protocol.rs

@@ -258,8 +258,7 @@ pub trait TransferProtocol {
                 Event::new(PACKET_EVENT).add_attribute("memo", &memo)
             };
 
-            Ok(IbcReceiveResponse::new()
-                .set_ack(Self::ack_success().try_into()?)
+            Ok(IbcReceiveResponse::new(Self::ack_success().try_into()?)
                 .add_event(
                     packet_event
                         .add_attributes([
@@ -284,16 +283,15 @@ pub trait TransferProtocol {
 
     fn receive_error(error: impl Debug) -> IbcReceiveResponse<Self::CustomMsg> {
         let error = format!("{:?}", error);
-        IbcReceiveResponse::new()
-            .set_ack(
-                Self::ack_failure(error.clone())
-                    .try_into()
-                    .expect("impossible"),
-            )
-            .add_event(Event::new(PACKET_EVENT).add_attributes([
-                ("module", MODULE_NAME),
-                ("success", "false"),
-                ("error", &error),
-            ]))
+        IbcReceiveResponse::new(
+            Self::ack_failure(error.clone())
+                .try_into()
+                .expect("impossible"),
+        )
+        .add_event(Event::new(PACKET_EVENT).add_attributes([
+            ("module", MODULE_NAME),
+            ("success", "false"),
+            ("error", &error),
+        ]))
     }
 }

cosmwasm/ucs01-relay/Cargo.toml

@@ -17,11 +17,11 @@ crate-type = ["cdylib", "rlib"]
 library = []
 
 [dependencies]
-cosmwasm-schema   = { workspace = true }
-cosmwasm-std      = { workspace = true, features = ["stargate", "ibc3", "cosmwasm_1_3"] }
-cw-controllers    = { version = "1.1" }
-cw-storage-plus   = { workspace = true }
-cw2               = { version = "1.1" }
+cosmwasm-schema   = { version = "2.0.0" }
+cosmwasm-std      = { version = "2.0.0", features = ["stargate", "cosmwasm_2_0"] }
+cw-controllers    = { version = "2.0.0" }
+cw-storage-plus   = { version = "2.0.0" }
+cw2               = { version = "2.0.0" }
 dlmalloc          = { workspace = true, features = ["global"] }
 ethabi            = { workspace = true }
 hex               = { workspace = true }

cosmwasm/ucs01-relay/src/contract.rs

@@ -82,7 +82,7 @@ pub fn execute(
             if info.sender != env.contract.address {
                 Err(ContractError::Unauthorized)
             } else {
-                let normalized_hash = hash.0.try_into().expect("impossible");
+                let normalized_hash = hash.as_slice().try_into().expect("impossible");
                 FOREIGN_DENOM_TO_HASH.save(
                     deps.storage,
                     (local_endpoint.clone().into(), denom.clone()),
@@ -180,7 +180,7 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
 
 fn query_port(deps: Deps) -> StdResult<PortResponse> {
     let query = IbcQuery::PortId {}.into();
-    let PortIdResponse { port_id } = deps.querier.query(&query)?;
+    let PortIdResponse { port_id, .. } = deps.querier.query(&query)?;
     Ok(PortResponse { port_id })
 }
 

cosmwasm/ucs01-relay/src/ibc.rs

@@ -23,11 +23,16 @@ fn to_response<T>(
         ..
     }: IbcReceiveResponse<T>,
 ) -> Response<T> {
-    Response::<T>::new()
+    let response = Response::<T>::new()
         .add_submessages(messages)
         .add_attributes(attributes)
-        .add_events(events)
-        .set_data(acknowledgement)
+        .add_events(events);
+
+    if let Some(ack) = acknowledgement {
+        response.set_data(ack)
+    } else {
+        response
+    }
 }
 
 #[cfg_attr(not(feature = "library"), entry_point)]

cosmwasm/ucs01-relay/src/state.rs

@@ -43,6 +43,9 @@ impl KeyDeserialize for IbcEndpointKey {
     fn from_vec(value: Vec<u8>) -> cosmwasm_std::StdResult<Self::Output> {
         <(String, String) as KeyDeserialize>::from_vec(value)
     }
+
+    // PrimaryKey is made up of 2 elements
+    const KEY_ELEMS: u16 = 2;
 }
 
 impl<'a> PrimaryKey<'a> for IbcEndpointKey {

tools/tidy/src/main.rs

@@ -47,6 +47,16 @@ fn main() -> ExitCode {
         for (dep_name, dep) in deps {
             match dep {
                 InheritableDependency::Value(_) => {
+                    if dep_name.as_ref() == "cosmwasm-schema"
+                        || dep_name.as_ref() == "cosmwasm-std"
+                        || dep_name.as_ref() == "cw-storage-plus"
+                    {
+                        tracing::warn!(
+                            member = %member.name,
+                            "{dep_name} is being ignored for deduplication checks as we gradually migrate to cosmwasm 2.0"
+                        );
+                        continue;
+                    }
                     if workspace_dependencies.contains_key(dep_name) {
                         is_err = true;
 

zerg/Cargo.toml

@@ -14,7 +14,7 @@ block-message      = { workspace = true }
 chain-utils        = { workspace = true }
 clap               = { workspace = true, features = ["default", "derive", "env", "error-context"] }
 contracts          = { workspace = true }
-cosmwasm-std       = { workspace = true, features = ["stargate", "ibc3", "cosmwasm_1_3"] }
+cosmwasm-std       = { version = "2.0.0", features = ["stargate", "cosmwasm_1_3"] }
 csv                = "1.3.0"
 ethers             = { workspace = true, features = ["rustls", "ws"] }
 futures            = { workspace = true }

zerg/src/context.rs

@@ -243,7 +243,8 @@ impl Context {
 
     async fn send_from_eth(self, e: unionlabs::events::RecvPacket) {
         let transfer =
-            Ucs01TransferPacket::try_from(cosmwasm_std::Binary(e.packet_data_hex.clone())).unwrap();
+            Ucs01TransferPacket::try_from(cosmwasm_std::Binary::new(e.packet_data_hex.clone()))
+                .unwrap();
 
         let wallet = if let Some(wallet) = self
             .ethereum_accounts

zerg/src/events.rs

@@ -71,7 +71,8 @@ impl Event {
         finalization_timestamp: Option<u64>,
     ) -> Event {
         let transfer =
-            Ucs01TransferPacket::try_from(cosmwasm_std::Binary(e.packet_data_hex.clone())).unwrap();
+            Ucs01TransferPacket::try_from(cosmwasm_std::Binary::new(e.packet_data_hex.clone()))
+                .unwrap();
 
         let timed_event = TimedEvent::new(chain_id, execution_timestamp, finalization_timestamp);