Implement approval query; fix helper queries

contracts/cw721-base/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cw721-base"
-version = "0.10.0"
+version = "0.10.1"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
 edition = "2018"
 description = "Basic implementation cw721 NFTs"
@@ -27,7 +27,7 @@ library = []
 [dependencies]
 cw0 = { version = "0.10.2" }
 cw2 = { version = "0.10.2" }
-cw721 = { path = "../../packages/cw721", version = "0.10.0" }
+cw721 = { path = "../../packages/cw721", version = "0.10.1" }
 cw-storage-plus = { version = "0.10.2" }
 cosmwasm-std = { version = "1.0.0-beta2" }
 schemars = "0.8.6"

contracts/cw721-base/src/contract_tests.rs

@@ -3,8 +3,8 @@ use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
 use cosmwasm_std::{from_binary, to_binary, CosmosMsg, DepsMut, Empty, Response, WasmMsg};
 
 use cw721::{
-    ApprovedForAllResponse, ContractInfoResponse, Cw721Query, Cw721ReceiveMsg, Expiration,
-    NftInfoResponse, OwnerOfResponse,
+    Approval, ApprovalResponse, ApprovedForAllResponse, ContractInfoResponse, Cw721Query,
+    Cw721ReceiveMsg, Expiration, NftInfoResponse, OwnerOfResponse,
 };
 
 use crate::{
@@ -470,7 +470,7 @@ fn approving_all_revoking_all() {
     };
     let owner = mock_info("demeter", &[]);
     let res = contract
-        .execute(deps.as_mut(), mock_env(), owner, approve_all_msg)
+        .execute(deps.as_mut(), mock_env(), owner.clone(), approve_all_msg)
         .unwrap();
     assert_eq!(
         res,
@@ -480,6 +480,25 @@ fn approving_all_revoking_all() {
             .add_attribute("operator", "random")
     );
 
+    // test approval query
+    let res = contract
+        .approval(
+            deps.as_ref(),
+            mock_env(),
+            owner.sender.into_string(),
+            String::from("random"),
+        )
+        .unwrap();
+    assert_eq!(
+        res,
+        ApprovalResponse {
+            approval: Approval {
+                spender: String::from("random"),
+                expires: Expiration::Never {}
+            }
+        }
+    );
+
     // random can now transfer
     let random = mock_info("random", &[]);
     let transfer_msg = ExecuteMsg::TransferNft {

contracts/cw721-base/src/msg.rs

@@ -81,6 +81,14 @@ pub enum QueryMsg {
         /// unset or false will filter out expired approvals, you must set to true to see them
         include_expired: Option<bool>,
     },
+
+    /// Return operator that can access all of the owner's tokens.
+    /// Return type: `ApprovedResponse`
+    Approved {
+        owner: String,
+        operator: String,
+    },
+
     /// List all operators that can access all of the owner's tokens
     /// Return type: `ApprovedForAllResponse`
     ApprovedForAll {

contracts/cw721-base/src/query.rs

@@ -5,8 +5,8 @@ use cosmwasm_std::{to_binary, Binary, BlockInfo, Deps, Env, Order, Record, StdEr
 
 use cw0::maybe_addr;
 use cw721::{
-    AllNftInfoResponse, ApprovedForAllResponse, ContractInfoResponse, CustomMsg, Cw721Query,
-    Expiration, NftInfoResponse, NumTokensResponse, OwnerOfResponse, TokensResponse,
+    AllNftInfoResponse, ApprovalResponse, ApprovedForAllResponse, ContractInfoResponse, CustomMsg,
+    Cw721Query, Expiration, NftInfoResponse, NumTokensResponse, OwnerOfResponse, TokensResponse,
 };
 use cw_storage_plus::Bound;
 
@@ -79,6 +79,29 @@ where
         Ok(ApprovedForAllResponse { operators: res? })
     }
 
+    fn approval(
+        &self,
+        deps: Deps,
+        _env: Env,
+        owner: String,
+        operator: String,
+    ) -> StdResult<ApprovalResponse> {
+        let owner_addr = deps.api.addr_validate(&owner)?;
+        let operator_addr = deps.api.addr_validate(&operator)?;
+
+        let expires = self
+            .operators
+            .key((&owner_addr, &operator_addr))
+            .load(deps.storage)?;
+
+        Ok(ApprovalResponse {
+            approval: cw721::Approval {
+                spender: operator,
+                expires,
+            },
+        })
+    }
+
     fn tokens(
         &self,
         deps: Deps,
@@ -197,6 +220,9 @@ where
             QueryMsg::AllTokens { start_after, limit } => {
                 to_binary(&self.all_tokens(deps, start_after, limit)?)
             }
+            QueryMsg::Approved { owner, operator } => {
+                to_binary(&self.approval(deps, env, owner, operator)?)
+            }
         }
     }
 }

packages/cw721/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cw721"
-version = "0.10.0"
+version = "0.10.1"
 authors = ["Ethan Frey <ethanfrey@users.noreply.github.com>"]
 edition = "2018"
 description = "Definition and types for the CosmWasm-721 NFT interface"

packages/cw721/src/lib.rs

@@ -9,8 +9,8 @@ pub use cw0::Expiration;
 pub use crate::helpers::Cw721Contract;
 pub use crate::msg::Cw721ExecuteMsg;
 pub use crate::query::{
-    AllNftInfoResponse, Approval, ApprovedForAllResponse, ContractInfoResponse, Cw721QueryMsg,
-    NftInfoResponse, NumTokensResponse, OwnerOfResponse, TokensResponse,
+    AllNftInfoResponse, Approval, ApprovalResponse, ApprovedForAllResponse, ContractInfoResponse,
+    Cw721QueryMsg, NftInfoResponse, NumTokensResponse, OwnerOfResponse, TokensResponse,
 };
 pub use crate::receiver::Cw721ReceiveMsg;
 pub use crate::traits::{CustomMsg, Cw721, Cw721Execute, Cw721Query};

packages/cw721/src/query.rs

@@ -13,6 +13,11 @@ pub enum Cw721QueryMsg {
         /// unset or false will filter out expired approvals, you must set to true to see them
         include_expired: Option<bool>,
     },
+
+    /// Return operator that can access all of the owner's tokens.
+    /// Return type: `ApprovedResponse`
+    Approved { owner: String, operator: String },
+
     /// List all operators that can access all of the owner's tokens.
     /// Return type: `ApprovedForAllResponse`
     ApprovedForAll {
@@ -74,6 +79,11 @@ pub struct Approval {
     pub expires: Expiration,
 }
 
+#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
+pub struct ApprovalResponse {
+    pub approval: Approval,
+}
+
 #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
 pub struct ApprovedForAllResponse {
     pub operators: Vec<Approval>,

packages/cw721/src/traits.rs

@@ -2,6 +2,7 @@ use schemars::JsonSchema;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 
+use crate::query::ApprovalResponse;
 use crate::{
     AllNftInfoResponse, ApprovedForAllResponse, ContractInfoResponse, NftInfoResponse,
     NumTokensResponse, OwnerOfResponse, TokensResponse,
@@ -123,6 +124,14 @@ where
         limit: Option<u32>,
     ) -> StdResult<ApprovedForAllResponse>;
 
+    fn approval(
+        &self,
+        deps: Deps,
+        env: Env,
+        owner: String,
+        spender: String,
+    ) -> StdResult<ApprovalResponse>;
+
     fn tokens(
         &self,
         deps: Deps,