feat(ibc-union): alpha omega (#4043)

- simplify commitment for packets/acks (we no longer branch on 1 vs N
packets, 1 packet is considered as a single element list of packets)
  - remove channel_id prefix
  - batch_send/batch_acks ensures packets are batched for same channel
- fix forward ack/timeout incorrectly checking packet hash instead of
salt
- prefix cosmwasm store and forbids direct call to deps.storage.get,
prefer read_commit
- refactor voyager for the new interface
- index important fields in evm
- only yield packet hash on subsequent events after send

Author: hussein-aitlahcen

cosmwasm/ibc-union/app/ucs03-zkgm/src/contract.rs

@@ -269,18 +269,12 @@ fn timeout_packet(
     packet: Packet,
     relayer: Addr,
 ) -> Result<Response, ContractError> {
+    let zkgm_packet = ZkgmPacket::abi_decode_params(&packet.data, true)?;
     // Check if this is an in-flight packet (forwarded packet)
-    let packet_hash = keccak256(packet.abi_encode());
-    let is_forward_tinted = is_salt_forward_tinted(packet_hash);
-
-    if is_forward_tinted {
+    if is_forwarded_packet(zkgm_packet.salt.0.into()) {
         // This is a forwarded packet timeout
         // Find the parent packet that initiated the forward
-        let commitment_key = BatchPacketsPath {
-            channel_id: packet.source_channel_id,
-            batch_hash: packet_hash,
-        }
-        .key();
+        let commitment_key = BatchPacketsPath::from_packets(&[packet.clone()]).key();
 
         if IN_FLIGHT_PACKET
             .may_load(deps.storage, commitment_key.into_bytes().into())?
@@ -293,9 +287,6 @@ fn timeout_packet(
             return Ok(Response::new());
         }
     }
-
-    // Normal packet timeout
-    let zkgm_packet = ZkgmPacket::abi_decode_params(&packet.data, true)?;
     timeout_internal(
         deps,
         env,
@@ -427,18 +418,12 @@ fn acknowledge_packet(
     relayer: Addr,
     ack: Bytes,
 ) -> Result<Response, ContractError> {
+    let zkgm_packet = ZkgmPacket::abi_decode_params(&packet.data, true)?;
     // Check if this is an in-flight packet (forwarded packet)
-    let packet_hash = keccak256(packet.abi_encode());
-    let is_forward_tinted = is_salt_forward_tinted(packet_hash);
-
-    if is_forward_tinted {
+    if is_forwarded_packet(zkgm_packet.salt.0.into()) {
         // This is a forwarded packet acknowledgement
         // Find the parent packet that initiated the forward
-        let commitment_key = BatchPacketsPath {
-            channel_id: packet.source_channel_id,
-            batch_hash: packet_hash,
-        }
-        .key();
+        let commitment_key = BatchPacketsPath::from_packets(&[packet.clone()]).key();
 
         if let Some(parent_packet) =
             IN_FLIGHT_PACKET.may_load(deps.storage, commitment_key.into_bytes().into())?
@@ -458,9 +443,6 @@ fn acknowledge_packet(
             )?));
         }
     }
-
-    // Normal packet acknowledgement
-    let zkgm_packet = ZkgmPacket::abi_decode_params(&packet.data, true)?;
     let ack = Ack::abi_decode_params(&ack, true)?;
     acknowledge_internal(
         deps,
@@ -1382,11 +1364,7 @@ pub fn reply(deps: DepsMut, env: Env, reply: Reply) -> Result<Response, Contract
                     #[allow(deprecated)]
                     sent_packet_data: Vec::from(reply_data.data.unwrap_or_default()).into(),
                 })?;
-                let commitment_key = BatchPacketsPath {
-                    channel_id: sent_packet.source_channel_id,
-                    batch_hash: keccak256(sent_packet.abi_encode()),
-                }
-                .key();
+                let commitment_key = BatchPacketsPath::from_packets(&[sent_packet.clone()]).key();
                 IN_FLIGHT_PACKET.save(
                     deps.storage,
                     commitment_key.into_bytes().into(),
@@ -2030,7 +2008,7 @@ pub fn tint_forward_salt(salt: H256) -> H256 {
         .into()
 }
 
-pub fn is_salt_forward_tinted(salt: H256) -> bool {
+pub fn is_forwarded_packet(salt: H256) -> bool {
     (U256::from_be_bytes(*salt.get()) & FORWARD_SALT_MAGIC) == FORWARD_SALT_MAGIC
 }
 

cosmwasm/ibc-union/app/ucs03-zkgm/src/tests.rs

@@ -10,7 +10,7 @@ mod tests {
     use crate::{
         com::{Instruction, Multiplex, FORWARD_SALT_MAGIC, INSTR_VERSION_0, OP_MULTIPLEX},
         contract::{
-            dequeue_channel_from_path, is_salt_forward_tinted, pop_channel_from_path,
+            dequeue_channel_from_path, is_forwarded_packet, pop_channel_from_path,
             reverse_channel_path, tint_forward_salt, update_channel_path, verify_internal,
             verify_multiplex,
         },
@@ -338,8 +338,8 @@ mod tests {
             0xCD, 0xEF, 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF, 0x12, 0x34, 0x56, 0x78,
             0x90, 0xAB, 0xCD, 0xEF,
         ]);
-        assert!(!is_salt_forward_tinted(salt));
-        assert!(is_salt_forward_tinted(tint_forward_salt(salt)));
+        assert!(!is_forwarded_packet(salt));
+        assert!(is_forwarded_packet(tint_forward_salt(salt)));
     }
 
     #[test]

cosmwasm/ibc-union/core/msg/src/msg.rs

@@ -202,14 +202,12 @@ pub struct MsgIntentPacketRecv {
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct MsgBatchSend {
-    pub source_channel: u32,
     pub packets: Vec<Packet>,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct MsgBatchAcks {
-    pub source_channel: u32,
     pub packets: Vec<Packet>,
     pub acks: Vec<Bytes>,
 }

cosmwasm/ibc-union/core/msg/src/query.rs

@@ -12,8 +12,8 @@ pub enum QueryMsg {
     GetConnection { connection_id: u32 },
     GetChannel { channel_id: u32 },
     GetChannels { contract: String },
-    GetBatchPackets { channel_id: u32, batch_hash: H256 },
-    GetBatchReceipts { channel_id: u32, batch_hash: H256 },
+    GetBatchPackets { batch_hash: H256 },
+    GetBatchReceipts { batch_hash: H256 },
     GetClientImpl { client_id: u32 },
     GetRegisteredClientType { client_type: String },
 }