fix commitment prefix

Author: rnbguy

ibc-eureka-core/ics04-channel/src/handler/acknowledgement.rs

@@ -36,7 +36,7 @@ where
     let payload = &packet.payloads[0];
 
     let (_, port_id_on_a) = &payload.header.source_port;
-    let channel_id_on_a = &packet.header.source_client;
+    let channel_id_on_a = &packet.header.target_client_on_source;
     let seq_on_a = &packet.header.seq_on_a;
 
     // In all cases, this event is emitted
@@ -93,9 +93,9 @@ where
     let payload = &packet.payloads[0];
 
     let (prefix_on_a, port_id_on_a) = &payload.header.source_port;
-    let channel_id_on_a = &packet.header.source_client;
+    let channel_id_on_a = &packet.header.target_client_on_source;
     let (_, port_id_on_b) = &payload.header.target_port;
-    let channel_id_on_b = &packet.header.target_client;
+    let channel_id_on_b = &packet.header.source_client_on_target;
     let seq_on_a = &packet.header.seq_on_a;
     let data = &payload.data;
 

ibc-eureka-core/ics04-channel/src/handler/recv_packet.rs

@@ -35,15 +35,16 @@ where
     let packet = &msg.packet;
     let payload = &packet.payloads[0];
 
-    let (_, port_id_on_b) = &payload.header.target_port;
-    let channel_id_on_b = &packet.header.target_client;
+    let (_, target_port) = &payload.header.target_port;
+    let channel_source_client_on_target = &packet.header.source_client_on_target;
     let seq_on_a = &packet.header.seq_on_a;
 
     // Check if another relayer already relayed the packet.
     // We don't want to fail the transaction in this case.
     {
         let packet_already_received = {
-            let receipt_path_on_b = ReceiptPath::new(port_id_on_b, channel_id_on_b, *seq_on_a);
+            let receipt_path_on_b =
+                ReceiptPath::new(target_port, channel_source_client_on_target, *seq_on_a);
             ctx_b.get_packet_receipt(&receipt_path_on_b)?.is_ok()
         };
 
@@ -58,11 +59,11 @@ where
     {
         // `recvPacket` core handler state changes
         {
-            let seq_recv_path_on_b = SeqRecvPath::new(port_id_on_b, channel_id_on_b);
+            let seq_recv_path_on_b = SeqRecvPath::new(target_port, channel_source_client_on_target);
             let next_seq_recv = ctx_b.get_next_sequence_recv(&seq_recv_path_on_b)?;
             ctx_b.store_next_sequence_recv(&seq_recv_path_on_b, next_seq_recv.increment())?;
         }
-        let ack_path_on_b = AckPath::new(port_id_on_b, channel_id_on_b, *seq_on_a);
+        let ack_path_on_b = AckPath::new(target_port, channel_source_client_on_target, *seq_on_a);
         // `writeAcknowledgement` handler state changes
         ctx_b.store_packet_acknowledgement(
             &ack_path_on_b,
@@ -104,10 +105,9 @@ where
     let packet = &msg.packet;
     let payload = &packet.payloads[0];
 
-    let (_, port_id_on_a) = &payload.header.source_port;
-    let channel_id_on_a = &packet.header.source_client;
-    let (prefix_on_b, _) = &payload.header.target_port;
-    let _ = &packet.header.target_client;
+    let (prefix_source, source_port) = &payload.header.source_port;
+    let channel_target_client_on_source = &packet.header.target_client_on_source;
+    let channel_source_client_on_target = &packet.header.source_client_on_target;
     let seq_on_a = &packet.header.seq_on_a;
     let data = &payload.data;
 
@@ -130,18 +130,21 @@ where
 
     // Verify proofs
     {
-        let client_id_on_b = channel_id_on_a.as_ref();
+        let id_source_client_on_target = channel_source_client_on_target.as_ref();
         let client_val_ctx_b = ctx_b.get_client_validation_context();
-        let client_state_of_a_on_b = client_val_ctx_b.client_state(client_id_on_b)?;
+        let source_client_on_target = client_val_ctx_b.client_state(id_source_client_on_target)?;
 
-        client_state_of_a_on_b
-            .status(ctx_b.get_client_validation_context(), client_id_on_b)?
+        source_client_on_target
+            .status(
+                ctx_b.get_client_validation_context(),
+                id_source_client_on_target,
+            )?
             .verify_is_active()?;
 
-        client_state_of_a_on_b.validate_proof_height(msg.proof_height_on_a)?;
+        source_client_on_target.validate_proof_height(msg.proof_height_on_a)?;
 
         let client_cons_state_path_on_b = ClientConsensusStatePath::new(
-            client_id_on_b.clone(),
+            id_source_client_on_target.clone(),
             msg.proof_height_on_a.revision_number(),
             msg.proof_height_on_a.revision_height(),
         );
@@ -154,11 +157,12 @@ where
             &packet.header.timeout_height_on_b,
             &packet.header.timeout_timestamp_on_b,
         );
-        let commitment_path_on_a = CommitmentPath::new(port_id_on_a, channel_id_on_a, *seq_on_a);
+        let commitment_path_on_a =
+            CommitmentPath::new(source_port, channel_target_client_on_source, *seq_on_a);
 
         // Verify the proof for the packet against the chain store.
-        client_state_of_a_on_b.verify_membership(
-            prefix_on_b,
+        source_client_on_target.verify_membership(
+            prefix_source,
             &msg.proof_commitment_on_a,
             consensus_state_of_a_on_b.root(),
             Path::Commitment(commitment_path_on_a),
@@ -187,11 +191,11 @@ where
     let packet = &msg.packet;
     let payload = &packet.payloads[0];
 
-    let (_, port_id_on_b) = &payload.header.target_port;
-    let channel_id_on_b = &packet.header.target_client;
+    let (_, target_port) = &payload.header.target_port;
+    let channel_source_client_on_target = &packet.header.source_client_on_target;
     let seq_on_a = &packet.header.seq_on_a;
 
-    let ack_path_on_b = AckPath::new(port_id_on_b, channel_id_on_b, *seq_on_a);
+    let ack_path_on_b = AckPath::new(target_port, channel_source_client_on_target, *seq_on_a);
     if ctx_b.get_packet_acknowledgement(&ack_path_on_b).is_ok() {
         return Err(ChannelError::DuplicateAcknowledgment(*seq_on_a));
     }

ibc-eureka-core/ics04-channel/src/handler/send_packet.rs

@@ -32,48 +32,50 @@ pub fn send_packet_validate(
 
     let payload = &packet.payloads[0];
 
-    let (_, port_id_on_a) = &payload.header.source_port;
-    let channel_id_on_a = &packet.header.source_client;
-    let channel_id_on_b = &packet.header.target_client;
+    let (_, source_port) = &payload.header.source_port;
+    let channel_target_client_on_source = &packet.header.target_client_on_source;
     let seq_on_a = &packet.header.seq_on_a;
 
-    let client_id_on_a = channel_id_on_b.as_ref();
+    let id_target_client_on_source = channel_target_client_on_source.as_ref();
 
     let client_val_ctx_a = ctx_a.get_client_validation_context();
 
-    let client_state_of_b_on_a = client_val_ctx_a.client_state(client_id_on_a)?;
+    let target_client_on_source = client_val_ctx_a.client_state(id_target_client_on_source)?;
 
-    client_state_of_b_on_a
-        .status(ctx_a.get_client_validation_context(), client_id_on_a)?
+    target_client_on_source
+        .status(
+            ctx_a.get_client_validation_context(),
+            id_target_client_on_source,
+        )?
         .verify_is_active()?;
 
-    let latest_height_on_a = client_state_of_b_on_a.latest_height();
+    let latest_height_on_target = target_client_on_source.latest_height();
 
     if packet
         .header
         .timeout_height_on_b
-        .has_expired(latest_height_on_a)
+        .has_expired(latest_height_on_target)
     {
         return Err(ChannelError::InsufficientPacketHeight {
-            chain_height: latest_height_on_a,
+            chain_height: latest_height_on_target,
             timeout_height: packet.header.timeout_height_on_b,
         });
     }
 
     let client_cons_state_path_on_a = ClientConsensusStatePath::new(
-        client_id_on_a.clone(),
-        latest_height_on_a.revision_number(),
-        latest_height_on_a.revision_height(),
+        id_target_client_on_source.clone(),
+        latest_height_on_target.revision_number(),
+        latest_height_on_target.revision_height(),
     );
-    let consensus_state_of_b_on_a =
-        client_val_ctx_a.consensus_state(&client_cons_state_path_on_a)?;
-    let latest_timestamp = consensus_state_of_b_on_a.timestamp()?;
+    let target_consensus_state = client_val_ctx_a.consensus_state(&client_cons_state_path_on_a)?;
+    let latest_timestamp = target_consensus_state.timestamp()?;
     let packet_timestamp = packet.header.timeout_timestamp_on_b;
     if packet_timestamp.has_expired(&latest_timestamp) {
         return Err(ChannelError::ExpiredPacketTimestamp);
     }
 
-    let seq_send_path_on_a = SeqSendPath::new(port_id_on_a, channel_id_on_a);
+    // TODO(rano): include full channel identifier in the path
+    let seq_send_path_on_a = SeqSendPath::new(source_port, channel_target_client_on_source);
     let next_seq_send_on_a = ctx_a.get_next_sequence_send(&seq_send_path_on_a)?;
 
     if seq_on_a != &next_seq_send_on_a {
@@ -95,20 +97,20 @@ pub fn send_packet_execute(
 ) -> Result<(), ChannelError> {
     let payload = &packet.payloads[0];
 
-    let (_, port_id_on_a) = &payload.header.source_port;
-    let channel_id_on_a = &packet.header.source_client;
+    let (_, source_port) = &payload.header.source_port;
+    let channel_target_client_on_source = &packet.header.target_client_on_source;
     let seq_on_a = &packet.header.seq_on_a;
     let data = &payload.data;
 
     {
-        let seq_send_path_on_a = SeqSendPath::new(port_id_on_a, channel_id_on_a);
+        let seq_send_path_on_a = SeqSendPath::new(source_port, channel_target_client_on_source);
         let next_seq_send_on_a = ctx_a.get_next_sequence_send(&seq_send_path_on_a)?;
 
         ctx_a.store_next_sequence_send(&seq_send_path_on_a, next_seq_send_on_a.increment())?;
     }
 
     ctx_a.store_packet_commitment(
-        &CommitmentPath::new(port_id_on_a, channel_id_on_a, *seq_on_a),
+        &CommitmentPath::new(source_port, channel_target_client_on_source, *seq_on_a),
         compute_packet_commitment(
             data,
             &packet.header.timeout_height_on_b,

ibc-eureka-core/ics04-channel/src/handler/timeout.rs

@@ -54,16 +54,17 @@ where
 
     let payload = &packet.payloads[0];
 
-    let (_, port_id_on_a) = &payload.header.source_port;
-    let channel_id_on_a = &packet.header.source_client;
+    let (_, source_port) = &payload.header.source_port;
+    let channel_target_client_on_source = &packet.header.target_client_on_source;
     let seq_on_a = &packet.header.seq_on_a;
 
     // In all cases, this event is emitted
     let event = IbcEvent::TimeoutPacket(TimeoutPacket::new(packet.clone()));
     ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel))?;
     ctx_a.emit_ibc_event(event)?;
 
-    let commitment_path_on_a = CommitmentPath::new(port_id_on_a, channel_id_on_a, *seq_on_a);
+    let commitment_path_on_a =
+        CommitmentPath::new(source_port, channel_target_client_on_source, *seq_on_a);
 
     // check if we're in the NO-OP case
     if ctx_a.get_packet_commitment(&commitment_path_on_a).is_err() {
@@ -103,15 +104,16 @@ where
     let packet = &msg.packet;
     let payload = &packet.payloads[0];
 
-    let (_, port_id_on_a) = &payload.header.source_port;
-    let channel_id_on_a = &packet.header.source_client;
-    let (prefix_on_a, port_id_on_b) = &payload.header.target_port;
-    let channel_id_on_b = &packet.header.target_client;
+    let (_, source_port) = &payload.header.source_port;
+    let channel_target_client_on_source = &packet.header.target_client_on_source;
+    let (target_prefix, target_port) = &payload.header.target_port;
+    let channel_source_client_on_target = &packet.header.source_client_on_target;
     let seq_on_a = &packet.header.seq_on_a;
     let data = &payload.data;
 
     //verify packet commitment
-    let commitment_path_on_a = CommitmentPath::new(port_id_on_a, channel_id_on_a, *seq_on_a);
+    let commitment_path_on_a =
+        CommitmentPath::new(source_port, channel_target_client_on_source, *seq_on_a);
     let Ok(commitment_on_a) = ctx_a.get_packet_commitment(&commitment_path_on_a) else {
         // This error indicates that the timeout has already been relayed
         // or there is a misconfigured relayer attempting to prove a timeout
@@ -135,19 +137,22 @@ where
 
     // Verify proofs
     {
-        let client_id_on_a = channel_id_on_b.as_ref();
+        let id_target_client_on_source = channel_target_client_on_source.as_ref();
         let client_val_ctx_a = ctx_a.get_client_validation_context();
-        let client_state_of_b_on_a = client_val_ctx_a.client_state(client_id_on_a)?;
+        let target_client_on_source = client_val_ctx_a.client_state(id_target_client_on_source)?;
 
-        client_state_of_b_on_a
-            .status(ctx_a.get_client_validation_context(), client_id_on_a)?
+        target_client_on_source
+            .status(
+                ctx_a.get_client_validation_context(),
+                id_target_client_on_source,
+            )?
             .verify_is_active()?;
 
-        client_state_of_b_on_a.validate_proof_height(msg.proof_height_on_b)?;
+        target_client_on_source.validate_proof_height(msg.proof_height_on_b)?;
 
         // check that timeout height or timeout timestamp has passed on the other end
         let client_cons_state_path_on_a = ClientConsensusStatePath::new(
-            client_id_on_a.clone(),
+            id_target_client_on_source.clone(),
             msg.proof_height_on_b.revision_number(),
             msg.proof_height_on_b.revision_height(),
         );
@@ -165,10 +170,11 @@ where
         }
 
         let next_seq_recv_verification_result = {
-            let receipt_path_on_b = ReceiptPath::new(port_id_on_b, channel_id_on_b, *seq_on_a);
+            let receipt_path_on_b =
+                ReceiptPath::new(target_port, channel_source_client_on_target, *seq_on_a);
 
-            client_state_of_b_on_a.verify_non_membership(
-                prefix_on_a,
+            target_client_on_source.verify_non_membership(
+                target_prefix,
                 &msg.proof_unreceived_on_b,
                 consensus_state_of_b_on_a.root(),
                 Path::Receipt(receipt_path_on_b),

ibc-eureka-core/ics04-channel/src/handler/timeout_on_close.rs

@@ -17,14 +17,15 @@ where
     let packet = &msg.packet;
     let payload = &packet.payloads[0];
 
-    let (prefix_on_a, port_id_on_a) = &payload.header.source_port;
-    let channel_id_on_a = &packet.header.source_client;
-    let (_, port_id_on_b) = &payload.header.target_port;
-    let channel_id_on_b = &packet.header.target_client;
+    let (_, source_port) = &payload.header.source_port;
+    let channel_target_client_on_source = &packet.header.target_client_on_source;
+    let (target_prefix, target_port) = &payload.header.target_port;
+    let channel_source_client_on_target = &packet.header.source_client_on_target;
     let seq_on_a = &packet.header.seq_on_a;
     let data = &payload.data;
 
-    let commitment_path_on_a = CommitmentPath::new(port_id_on_a, channel_id_on_a, *seq_on_a);
+    let commitment_path_on_a =
+        CommitmentPath::new(source_port, channel_target_client_on_source, *seq_on_a);
 
     //verify the packet was sent, check the store
     let Ok(commitment_on_a) = ctx_a.get_packet_commitment(&commitment_path_on_a) else {
@@ -49,29 +50,33 @@ where
 
     // Verify proofs
     {
-        let client_id_on_a = channel_id_on_b.as_ref();
+        let id_target_client_on_source = channel_target_client_on_source.as_ref();
         let client_val_ctx_a = ctx_a.get_client_validation_context();
-        let client_state_of_b_on_a = client_val_ctx_a.client_state(client_id_on_a)?;
+        let target_client_on_source = client_val_ctx_a.client_state(id_target_client_on_source)?;
 
-        client_state_of_b_on_a
-            .status(ctx_a.get_client_validation_context(), client_id_on_a)?
+        target_client_on_source
+            .status(
+                ctx_a.get_client_validation_context(),
+                id_target_client_on_source,
+            )?
             .verify_is_active()?;
 
-        client_state_of_b_on_a.validate_proof_height(msg.proof_height_on_b)?;
+        target_client_on_source.validate_proof_height(msg.proof_height_on_b)?;
 
         let client_cons_state_path_on_a = ClientConsensusStatePath::new(
-            client_id_on_a.clone(),
+            id_target_client_on_source.clone(),
             msg.proof_height_on_b.revision_number(),
             msg.proof_height_on_b.revision_height(),
         );
         let consensus_state_of_b_on_a =
             client_val_ctx_a.consensus_state(&client_cons_state_path_on_a)?;
 
         let next_seq_recv_verification_result = {
-            let receipt_path_on_b = ReceiptPath::new(port_id_on_b, channel_id_on_b, *seq_on_a);
+            let receipt_path_on_b =
+                ReceiptPath::new(target_port, channel_source_client_on_target, *seq_on_a);
 
-            client_state_of_b_on_a.verify_non_membership(
-                prefix_on_a,
+            target_client_on_source.verify_non_membership(
+                target_prefix,
                 &msg.proof_unreceived_on_b,
                 consensus_state_of_b_on_a.root(),
                 Path::Receipt(receipt_path_on_b),