Add Cw721RecieveMsg

packages/cw721/examples/schema.rs

@@ -5,7 +5,8 @@ use cosmwasm_schema::{export_schema, remove_schemas, schema_for};
 
 use cw721::{
     AllNftInfoResponse, ApprovedForAllResponse, ContractInfoResponse, Cw721HandleMsg,
-    Cw721QueryMsg, NftInfoResponse, NumTokensResponse, OwnerOfResponse, TokensResponse,
+    Cw721QueryMsg, Cw721ReceiveMsg, NftInfoResponse, NumTokensResponse, OwnerOfResponse,
+    TokensResponse,
 };
 
 fn main() {
@@ -16,7 +17,7 @@ fn main() {
 
     export_schema(&schema_for!(Cw721HandleMsg), &out_dir);
     export_schema(&schema_for!(Cw721QueryMsg), &out_dir);
-    // export_schema(&schema_for!(Cw20ReceiveMsg), &out_dir);
+    export_schema(&schema_for!(Cw721ReceiveMsg), &out_dir);
     export_schema(&schema_for!(AllNftInfoResponse), &out_dir);
     export_schema(&schema_for!(ApprovedForAllResponse), &out_dir);
     export_schema(&schema_for!(ContractInfoResponse), &out_dir);

packages/cw721/schema/all_nft_info_response.json

@@ -99,7 +99,7 @@
           }
         },
         {
-          "description": "Never will never expire. Used to distinguish None from Some(Expiration::Never)",
+          "description": "Never will never expire. Used to express the empty variant",
           "type": "object",
           "required": [
             "never"

packages/cw721/schema/cw721_handle_msg.json

@@ -205,7 +205,7 @@
           }
         },
         {
-          "description": "Never will never expire. Used to distinguish None from Some(Expiration::Never)",
+          "description": "Never will never expire. Used to express the empty variant",
           "type": "object",
           "required": [
             "never"

packages/cw721/schema/cw721_receive_msg.json

@@ -0,0 +1,40 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Cw721ReceiveMsg",
+  "description": "Cw721ReceiveMsg should be de/serialized under `Receive()` variant in a HandleMsg",
+  "type": "object",
+  "required": [
+    "amount",
+    "sender"
+  ],
+  "properties": {
+    "amount": {
+      "$ref": "#/definitions/Uint128"
+    },
+    "msg": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Binary"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
+    "sender": {
+      "$ref": "#/definitions/HumanAddr"
+    }
+  },
+  "definitions": {
+    "Binary": {
+      "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>",
+      "type": "string"
+    },
+    "HumanAddr": {
+      "type": "string"
+    },
+    "Uint128": {
+      "type": "string"
+    }
+  }
+}

packages/cw721/schema/owner_of_response.json

@@ -83,7 +83,7 @@
           }
         },
         {
-          "description": "Never will never expire. Used to distinguish None from Some(Expiration::Never)",
+          "description": "Never will never expire. Used to express the empty variant",
           "type": "object",
           "required": [
             "never"

packages/cw721/src/lib.rs

@@ -1,13 +1,14 @@
 mod msg;
 mod query;
+mod receiver;
 
 // pub use crate::helpers::{Cw20CanonicalContract, Cw20Contract};
 pub use crate::msg::{Cw721HandleMsg, Expiration};
 pub use crate::query::{
     AllNftInfoResponse, ApprovedForAllResponse, ContractInfoResponse, Cw721QueryMsg,
     NftInfoResponse, NumTokensResponse, OwnerOfResponse, TokensResponse,
 };
-// pub use crate::receiver::Cw20ReceiveMsg;
+pub use crate::receiver::Cw721ReceiveMsg;
 
 #[cfg(test)]
 mod tests {

packages/cw721/src/msg.rs

@@ -47,7 +47,7 @@ pub enum Expiration {
     AtHeight(u64),
     /// AtTime will expire when `env.block.time` >= time
     AtTime(u64),
-    /// Never will never expire. Used to distinguish None from Some(Expiration::Never)
+    /// Never will never expire. Used to express the empty variant
     Never {},
 }
 

packages/cw721/src/receiver.rs

@@ -0,0 +1,40 @@
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+use cosmwasm_std::{to_binary, Binary, CosmosMsg, HumanAddr, StdResult, Uint128, WasmMsg};
+
+/// Cw721ReceiveMsg should be de/serialized under `Receive()` variant in a HandleMsg
+#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
+#[serde(rename_all = "snake_case")]
+pub struct Cw721ReceiveMsg {
+    pub sender: HumanAddr,
+    pub amount: Uint128,
+    pub msg: Option<Binary>,
+}
+
+impl Cw721ReceiveMsg {
+    /// serializes the message
+    pub fn into_binary(self) -> StdResult<Binary> {
+        let msg = ReceiverHandleMsg::ReceiveNft(self);
+        to_binary(&msg)
+    }
+
+    /// creates a cosmos_msg sending this struct to the named contract
+    pub fn into_cosmos_msg(self, contract_addr: HumanAddr) -> StdResult<CosmosMsg> {
+        let msg = self.into_binary()?;
+        let execute = WasmMsg::Execute {
+            contract_addr,
+            msg,
+            send: vec![],
+        };
+        Ok(execute.into())
+    }
+}
+
+/// This is just a helper to properly serialize the above message.
+/// The actual receiver should include this variant in the larger HandleMsg enum
+#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
+#[serde(rename_all = "snake_case")]
+enum ReceiverHandleMsg {
+    ReceiveNft(Cw721ReceiveMsg),
+}