chore: add in query impl into asset-base contract

Author: Peartes

contracts/asset/src/contracts/asset_base.rs

@@ -1,3 +1,5 @@
+#[cfg(feature = "asset_base")]
+use crate::msg::AssetExtensionQueryMsg;
 // Default implementation of the xion asset standard showing how to set up a contract
 // to use the default trait XionAssetExecuteExtension
 use crate::plugin::PluggableAsset;
@@ -58,13 +60,19 @@ pub fn execute(
 #[cfg_attr(not(feature = "library"), cosmwasm_std::entry_point)]
 #[cfg(feature = "asset_base")]
 pub fn query(
-    _deps: Deps,
-    _env: Env,
-    _msg: cw721::msg::Cw721QueryMsg<
+    deps: Deps,
+    env: Env,
+    msg: cw721::msg::Cw721QueryMsg<
         DefaultOptionalNftExtension,
         DefaultOptionalCollectionExtension,
-        cosmwasm_std::Empty,
+        AssetExtensionQueryMsg,
     >,
 ) -> StdResult<Binary> {
-    unimplemented!("asset query entry point is not implemented yet")
+    use cw721::traits::Cw721Query;
+
+    use crate::error::ContractError;
+
+     let contract: AssetBaseContract<'static> = AssetContract::default();
+
+    contract.query(deps, &env, msg).map_err(|err| ContractError::from(err).into())
 }

contracts/asset/src/msg.rs

@@ -1,6 +1,6 @@
 use crate::{plugin::Plugin, state::Reserve};
 use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{Coin, CustomQuery};
+use cosmwasm_std::{Coin};
 use cw721::traits::Cw721CustomMsg;
 
 pub type InstantiateMsg<CollectionExtension> = cw721::msg::Cw721InstantiateMsg<CollectionExtension>;

contracts/asset/src/plugin.rs

@@ -1,9 +1,9 @@
-use std::{default, fmt::Display, time::Duration};
+use std::{fmt::Display, time::Duration};
 
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{
     Addr, BankMsg, Binary, Coin, CosmosMsg, CustomMsg, Deps, DepsMut, Empty, Env, MessageInfo,
-    Response, StdResult, SubMsg, Timestamp, coin,
+    Response, StdResult, SubMsg, coin,
 };
 use cw721::{
     Expiration,
@@ -18,9 +18,8 @@ use cw721::{
 use crate::{
     error::ContractError,
     msg::AssetExtensionExecuteMsg,
-    plugin,
     state::{AssetConfig, Reserve},
-    traits::{AssetContract, DefaultAssetContract, SellableAsset},
+    traits::{DefaultAssetContract, SellableAsset},
 };
 
 /// Shared context passed through the pipeline, mutated by plugins.
@@ -464,15 +463,21 @@ where
             plugin_ctx_deductions = plugin_ctx.deductions.clone();
         };
         let mut response = match &msg {
-            Cw721ExecuteMsg::UpdateExtension { msg: extension_msg } => {
-                match extension_msg {
-                    AssetExtensionExecuteMsg::Buy { token_id, recipient } => {
-                        self.buy(deps, env, info, (*token_id).clone(), (*recipient).clone(), plugin_ctx_deductions)?
-                    },
-                    _ => self.execute(deps, env, info, msg)?,
-                }
+            Cw721ExecuteMsg::UpdateExtension { msg: extension_msg } => match extension_msg {
+                AssetExtensionExecuteMsg::Buy {
+                    token_id,
+                    recipient,
+                } => self.buy(
+                    deps,
+                    env,
+                    info,
+                    (*token_id).clone(),
+                    (*recipient).clone(),
+                    plugin_ctx_deductions,
+                )?,
+                _ => self.execute(deps, env, info, msg)?,
             },
-             _ => self.execute(deps, env, info, msg)?,
+            _ => self.execute(deps, env, info, msg)?,
         };
 
         response.messages.extend(plugin_response.messages);

contracts/asset/src/state.rs

@@ -1,10 +1,10 @@
 use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{Addr, Coin, from_json, to_json_binary};
+use cosmwasm_std::{Addr, Coin};
 use cw_storage_plus::{IndexList, IndexedMap, Item, Map, MultiIndex};
 use cw721::{
     Expiration,
     state::{Cw721Config, NftInfo},
-    traits::{Cw721State, FromAttributesState, ToAttributesState},
+    traits::{Cw721State},
 };
 
 use crate::plugin::Plugin;

contracts/asset/src/test.rs

@@ -1174,7 +1174,7 @@ mod asset_pluggable_sellable_test {
     #[test]
     fn buy_deducts_marketplace_and_royalty_fees() {
         let mut deps = mock_dependencies();
-        let mut contract: DefaultAssetContract<'static, Empty, Empty, Empty, Empty> =
+        let contract: DefaultAssetContract<'static, Empty, Empty, Empty, Empty> =
             Default::default();
 
         let seller = deps.api.addr_make("seller");

contracts/asset/src/traits.rs

@@ -7,7 +7,7 @@ use crate::{
     plugin::PluggableAsset,
     state::{AssetConfig, Reserve},
 };
-use cosmwasm_std::{to_json_binary, Addr, Coin, CustomMsg, DepsMut, Empty, Env, MessageInfo, Response};
+use cosmwasm_std::{to_json_binary, Coin, CustomMsg, DepsMut, Empty, Env, MessageInfo, Response};
 use cw_storage_plus::Bound;
 use cw721::traits::{
     Contains, Cw721CustomMsg, Cw721Execute, Cw721Query, Cw721State, FromAttributesState,