Merge pull request #2428 from CosmWasm/jawoznia/test/ibc2-send-packet-contract

Send `Ibc2Msg::SendPacket` in ibc2 contract (#2418)

Author: jawoznia

contracts/ibc2/schema/raw/execute.json

@@ -0,0 +1,31 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "ExecuteMsg",
+  "oneOf": [
+    {
+      "type": "object",
+      "required": [
+        "increment"
+      ],
+      "properties": {
+        "increment": {
+          "type": "object",
+          "required": [
+            "channel_id",
+            "destination_port"
+          ],
+          "properties": {
+            "channel_id": {
+              "type": "string"
+            },
+            "destination_port": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    }
+  ]
+}

contracts/ibc2/src/bin/schema.rs

@@ -1,6 +1,6 @@
 use cosmwasm_schema::write_api;
 use cosmwasm_std::Empty;
-use ibc2::contract::QueryMsg;
+use ibc2::msg::QueryMsg;
 
 fn main() {
     write_api! {

contracts/ibc2/src/contract.rs

@@ -1,24 +1,11 @@
-use cosmwasm_schema::{cw_serde, QueryResponses};
 use cosmwasm_std::{
-    entry_point, from_json, to_json_vec, Binary, Deps, DepsMut, Empty, Env, Ibc2PacketReceiveMsg,
-    IbcReceiveResponse, MessageInfo, QueryResponse, Response, StdError, StdResult,
+    entry_point, from_json, to_json_vec, Binary, Deps, DepsMut, Empty, Env, Ibc2Msg,
+    Ibc2PacketReceiveMsg, Ibc2Payload, IbcReceiveResponse, MessageInfo, QueryResponse, Response,
+    StdAck, StdError, StdResult, Timestamp,
 };
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 
-#[derive(Default, Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
-pub struct State {
-    ibc2_packet_receive_counter: u32,
-}
-
-#[cw_serde]
-#[derive(QueryResponses)]
-pub enum QueryMsg {
-    #[returns(State)]
-    QueryState {},
-}
-
-const STATE_KEY: &[u8] = b"state";
+use crate::msg::QueryMsg;
+use crate::state::{State, STATE_KEY};
 
 #[entry_point]
 pub fn instantiate(
@@ -27,8 +14,12 @@ pub fn instantiate(
     _info: MessageInfo,
     _msg: Empty,
 ) -> StdResult<Response> {
-    deps.storage
-        .set(STATE_KEY, &to_json_vec(&State::default())?);
+    deps.storage.set(
+        STATE_KEY,
+        &to_json_vec(&State {
+            ibc2_packet_receive_counter: 0,
+        })?,
+    );
 
     Ok(Response::new())
 }
@@ -50,7 +41,7 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<QueryResponse> {
 pub fn ibc2_packet_receive(
     deps: DepsMut,
     _env: Env,
-    _msg: Ibc2PacketReceiveMsg,
+    msg: Ibc2PacketReceiveMsg,
 ) -> StdResult<IbcReceiveResponse> {
     let data = deps
         .storage
@@ -63,6 +54,24 @@ pub fn ibc2_packet_receive(
             ibc2_packet_receive_counter: state.ibc2_packet_receive_counter + 1,
         })?,
     );
+    // Workaround for now.
+    let ts = Timestamp::from_nanos(1_577_933_900);
+    let new_payload = Ibc2Payload::new(
+        msg.payload.destination_port,
+        msg.payload.source_port,
+        msg.payload.version,
+        msg.payload.encoding,
+        msg.payload.value,
+    );
+    let new_msg = Ibc2Msg::SendPacket {
+        channel_id: msg.source_client,
+        payloads: vec![new_payload],
+        timeout: ts,
+        // This causes "timeout exceeds the maximum expected value" error returned from the ibc-go.
+        // timeout: _env.block.time.plus_seconds(5_u64),
+    };
 
-    Ok(IbcReceiveResponse::new([1, 2, 3]))
+    Ok(IbcReceiveResponse::new(StdAck::success(b"\x01"))
+        .add_message(new_msg)
+        .add_attribute("action", "handle_increment"))
 }

contracts/ibc2/src/lib.rs

@@ -1 +1,3 @@
 pub mod contract;
+pub mod msg;
+pub mod state;

contracts/ibc2/src/msg.rs

@@ -0,0 +1,8 @@
+use cosmwasm_schema::{cw_serde, QueryResponses};
+
+#[cw_serde]
+#[derive(QueryResponses)]
+pub enum QueryMsg {
+    #[returns(crate::state::State)]
+    QueryState {},
+}

contracts/ibc2/src/state.rs

@@ -0,0 +1,9 @@
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+#[derive(Default, Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+pub struct State {
+    pub ibc2_packet_receive_counter: u32,
+}
+
+pub const STATE_KEY: &[u8] = b"state";

packages/std/src/ibc2.rs

@@ -21,6 +21,24 @@ pub struct Ibc2Payload {
     pub value: Binary,
 }
 
+impl Ibc2Payload {
+    pub fn new(
+        source_port: String,
+        destination_port: String,
+        version: String,
+        encoding: String,
+        value: Binary,
+    ) -> Self {
+        Self {
+            source_port,
+            destination_port,
+            version,
+            encoding,
+            value,
+        }
+    }
+}
+
 /// These are messages in the IBC lifecycle using the new Ibc2 approach.
 /// Only usable by Ibc2-enabled contracts
 #[non_exhaustive]