chore: source_client instead of channel_id in IBCv2 (#2450)

* chore: source_client instead of channel_id in IBCv2

* [autofix.ci] apply automated fixes

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

Author: kulikthebird

contracts/ibc2/schema/ibc2.json

@@ -38,22 +38,22 @@
       "type": "object",
       "required": [
         "ibc2_packet_receive_counter",
-        "last_channel_id",
-        "last_packet_seq"
+        "last_packet_seq",
+        "last_source_client"
       ],
       "properties": {
         "ibc2_packet_receive_counter": {
           "type": "integer",
           "format": "uint32",
           "minimum": 0.0
         },
-        "last_channel_id": {
-          "type": "string"
-        },
         "last_packet_seq": {
           "type": "integer",
           "format": "uint64",
           "minimum": 0.0
+        },
+        "last_source_client": {
+          "type": "string"
         }
       },
       "additionalProperties": false

contracts/ibc2/schema/raw/response_to_query_state.json

@@ -4,22 +4,22 @@
   "type": "object",
   "required": [
     "ibc2_packet_receive_counter",
-    "last_channel_id",
-    "last_packet_seq"
+    "last_packet_seq",
+    "last_source_client"
   ],
   "properties": {
     "ibc2_packet_receive_counter": {
       "type": "integer",
       "format": "uint32",
       "minimum": 0.0
     },
-    "last_channel_id": {
-      "type": "string"
-    },
     "last_packet_seq": {
       "type": "integer",
       "format": "uint64",
       "minimum": 0.0
+    },
+    "last_source_client": {
+      "type": "string"
     }
   },
   "additionalProperties": false

contracts/ibc2/src/contract.rs

@@ -18,7 +18,7 @@ pub fn instantiate(
         STATE_KEY,
         &to_json_vec(&State {
             ibc2_packet_receive_counter: 0,
-            last_channel_id: "".to_owned(),
+            last_source_client: "".to_owned(),
             last_packet_seq: 0,
         })?,
     );
@@ -58,7 +58,7 @@ pub fn ibc2_packet_receive(
         STATE_KEY,
         &to_json_vec(&State {
             ibc2_packet_receive_counter: state.ibc2_packet_receive_counter + 1,
-            last_channel_id: msg.source_client.clone(),
+            last_source_client: msg.source_client.clone(),
             last_packet_seq: msg.packet_sequence,
         })?,
     );
@@ -70,7 +70,7 @@ pub fn ibc2_packet_receive(
         msg.payload.value,
     );
     let new_msg = Ibc2Msg::SendPacket {
-        channel_id: msg.source_client,
+        source_client: msg.source_client,
         payloads: vec![new_payload],
         timeout: env.block.time.plus_seconds(60_u64),
     };
@@ -86,7 +86,7 @@ pub fn ibc2_packet_receive(
     if json_payload.send_async_ack_for_prev_msg {
         Ok(
             resp.add_message(cosmwasm_std::Ibc2Msg::WriteAcknowledgement {
-                channel_id: state.last_channel_id,
+                source_client: state.last_source_client,
                 packet_sequence: state.last_packet_seq,
                 ack: IbcAcknowledgement::new([1, 2, 3]),
             }),

contracts/ibc2/src/state.rs

@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Default, Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct State {
     pub ibc2_packet_receive_counter: u32,
-    pub last_channel_id: String,
+    pub last_source_client: String,
     pub last_packet_seq: u64,
 }
 

packages/std/src/ibc2.rs

@@ -47,15 +47,15 @@ impl Ibc2Payload {
 pub enum Ibc2Msg {
     /// Sends an Ibc2 packet with given payloads over the existing channel.
     SendPacket {
-        channel_id: String,
+        source_client: String,
         timeout: Timestamp,
         payloads: Vec<Ibc2Payload>,
     },
     /// Acknowledges a packet that this contract received over IBC.
     /// This allows acknowledging a packet that was not acknowledged yet in the `ibc2_packet_receive` call.
     WriteAcknowledgement {
         /// Existing channel where the packet was received
-        channel_id: String,
+        source_client: String,
         /// Sequence number of the packet that was received
         packet_sequence: u64,
         /// The acknowledgement to send back