Merge pull request #27 from oraichain/feat/schema-for-missed-wasm-1.5

Feat/schema for missed wasm 1.5

contracts/plus/auction_nft/src/bin/schema.rs

@@ -0,0 +1,12 @@
+use cosmwasm_schema::write_api;
+
+use auction_nft::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        execute: ExecuteMsg,
+        query: QueryMsg,
+        migrate: MigrateMsg
+    }
+}

contracts/plus/auction_nft/src/msg.rs

@@ -1,8 +1,11 @@
+use cosmwasm_schema::QueryResponses;
 use cosmwasm_std::{Addr, Coin, Uint128};
 use cw721::Cw721ReceiveMsg;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
+use crate::state::{Auction, ContractInfo};
+
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct InstantiateMsg {
     pub name: String,
@@ -71,32 +74,29 @@ pub struct PagingOptions {
     pub order: Option<u8>,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema, QueryResponses)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
     // GetOfferings returns a list of all offerings
-    GetAuctions {
-        options: PagingOptions,
-    },
-    GetAuctionsByAsker {
-        asker: Addr,
-        options: PagingOptions,
-    },
+    #[returns(AuctionsResponse)]
+    GetAuctions { options: PagingOptions },
+    #[returns(AuctionsResponse)]
+    GetAuctionsByAsker { asker: Addr, options: PagingOptions },
+    #[returns(AuctionsResponse)]
     GetAuctionsByBidder {
         bidder: Option<Addr>,
         options: PagingOptions,
     },
+    #[returns(AuctionsResponse)]
     GetAuctionsByContract {
         contract: Addr,
         options: PagingOptions,
     },
-    GetAuction {
-        auction_id: u64,
-    },
-    GetAuctionByContractTokenId {
-        contract: Addr,
-        token_id: String,
-    },
+    #[returns(Auction)]
+    GetAuction { auction_id: u64 },
+    #[returns(QueryAuctionsResult)]
+    GetAuctionByContractTokenId { contract: Addr, token_id: String },
+    #[returns(ContractInfo)]
     GetContractInfo {},
 }
 

contracts/plus/locked_ow721/src/bin/schema.rs

@@ -0,0 +1,12 @@
+use cosmwasm_schema::write_api;
+
+use locked_ow721::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        execute: ExecuteMsg,
+        query: QueryMsg,
+        migrate: MigrateMsg
+    }
+}

contracts/plus/locked_ow721/src/msg.rs

@@ -1,3 +1,4 @@
+use cosmwasm_schema::QueryResponses;
 use cosmwasm_std::{Addr, Binary};
 use cw721::Cw721ReceiveMsg;
 use schemars::JsonSchema;
@@ -67,24 +68,24 @@ pub struct LockNft {
     pub nft_addr: String,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema, QueryResponses)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
     // GetCount returns the current count as a json-encoded number
-    CheckLock {
-        token_id: String,
-        nft_addr: String,
-    },
+    #[returns(Binary)]
+    CheckLock { token_id: String, nft_addr: String },
+    #[returns(PubKeyResponse)]
     QueryPubKeys {
         offset: Option<u64>,
         limit: Option<u8>,
         order: Option<u8>,
     },
+    #[returns(Binary)]
     Owner {},
+    #[returns(Binary)]
     LatestNonce {},
-    NonceVal {
-        nonce: u64,
-    },
+    #[returns(Binary)]
+    NonceVal { nonce: u64 },
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]

contracts/plus/market_nft_staking/src/bin/schema.rs

@@ -0,0 +1,11 @@
+use cosmwasm_schema::write_api;
+
+use market_nft_staking::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        execute: ExecuteMsg,
+        query: QueryMsg,
+    }
+}

contracts/plus/market_nft_staking/src/contract.rs

@@ -16,8 +16,8 @@ use cw_storage_plus::Bound;
 use crate::{
     error::ContractError,
     msg::{
-        CreateCollectionPoolMsg, DepositeMsg, ExecuteMsg, InstantiateMsg, QueryMsg, StakeMsgDetail,
-        UpdateCollectionPoolMsg, UpdateContractInfoMsg,
+        CreateCollectionPoolMsg, DepositeMsg, ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg,
+        StakeMsgDetail, UpdateCollectionPoolMsg, UpdateContractInfoMsg,
     },
     state::{
         collection_staker_infos, get_unique_collection_staker, increment_collection_stakers,
@@ -27,6 +27,8 @@ use crate::{
     utils::verify_stake_msg_signature,
 };
 
+const CONTRACT_NAME: &str = "crates.io:nft_staking";
+const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
 // settings for pagination
 const MAX_LIMIT: u8 = 100;
 const DEFAULT_LIMIT: u8 = 20;
@@ -908,10 +910,10 @@ pub fn handle_reset_earned_rewards(
 
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn migrate(
-    _deps: DepsMut,
+    deps: DepsMut,
     _env: Env,
     // new_contract_addr: Addr,
-    _msg: Empty,
+    _msg: MigrateMsg,
 ) -> Result<Response, ContractError> {
     // check_admin_permission(deps.as_ref(), &info.sender)?;
 

contracts/plus/market_nft_staking/src/msg.rs

@@ -1,10 +1,13 @@
+use cosmwasm_schema::QueryResponses;
 use cosmwasm_std::{Addr, Uint128};
 use cw1155::Cw1155ReceiveMsg;
 use cw721::Cw721ReceiveMsg;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use crate::state::CollectionStakedTokenInfo;
+use crate::state::{
+    CollectionPoolInfo, CollectionStakedTokenInfo, CollectionStakerInfo, ContractInfo,
+};
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
 pub struct InstantiateMsg {
@@ -36,6 +39,9 @@ pub enum ExecuteMsg {
     },
 }
 
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+pub struct MigrateMsg {}
+
 #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
 #[serde(rename_all = "snake_case")]
 pub struct UpdateContractInfoMsg {
@@ -76,28 +82,32 @@ pub struct StakeMsgDetail {
     pub nft: CollectionStakedTokenInfo,
 }
 
-#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
+#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug, QueryResponses)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
+    #[returns(ContractInfo)]
     GetContractInfo {},
-    GetCollectionPoolInfo {
-        collection_id: String,
-    },
+    #[returns(Option<CollectionPoolInfo>)]
+    GetCollectionPoolInfo { collection_id: String },
+    #[returns(Vec<CollectionPoolInfo>)]
     GetCollectionPoolInfos {
         limit: Option<u8>,
         offset: Option<u64>,
         order: Option<u8>,
     },
+    #[returns(Option<CollectionStakerInfo>)]
     GetUniqueCollectionStakerInfo {
         collection_id: String,
         staker_addr: Addr,
     },
+    #[returns(Vec<CollectionStakerInfo>)]
     GetCollectionStakerInfoByCollection {
         collection_id: String,
         limit: Option<u8>,
         offset: Option<u64>,
         order: Option<u8>,
     },
+    #[returns(Vec<CollectionStakerInfo>)]
     GetCollectionStakerInfoByStaker {
         staker_addr: Addr,
         limit: Option<u8>,

contracts/plus/market_payment_storage/src/bin/schema.rs

@@ -0,0 +1,12 @@
+use cosmwasm_schema::write_api;
+
+use market_payment_storage::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        execute: ExecuteMsg,
+        query: QueryMsg,
+        migrate: MigrateMsg,
+    }
+}

contracts/plus/market_payment_storage/src/contract.rs

@@ -71,7 +71,7 @@ pub fn execute(
 }
 
 #[cfg_attr(not(feature = "library"), entry_point)]
-pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> StdResult<Response> {
+pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> StdResult<Response> {
     Ok(Response::default())
 }
 
@@ -309,12 +309,7 @@ fn _get_range_params(
     limit: Option<u8>,
     offset: Option<Binary>,
     order: Option<u8>,
-) -> StdResult<(
-    usize,
-    Option<Bound>,
-    Option<Bound>,
-    Order,
-)> {
+) -> StdResult<(usize, Option<Bound>, Option<Bound>, Order)> {
     let limit = limit.unwrap_or(DEFAULT_LIMIT).min(MAX_LIMIT) as usize;
     let mut min = None;
     let max = None;

contracts/plus/market_payment_storage/src/msg.rs

@@ -1,8 +1,11 @@
-use cosmwasm_std::Addr;
+use cosmwasm_schema::QueryResponses;
+use cosmwasm_std::{Addr, Binary};
 use market_payment::{PaymentExecuteMsg, PaymentQueryMsg};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
+use crate::state::ContractInfo;
+
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct InstantiateMsg {
     pub governance: Addr,
@@ -26,10 +29,12 @@ pub struct UpdateContractMsg {
     pub default_denom: Option<String>,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema, QueryResponses)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
     // GetOfferings returns a list of all offerings
+    #[returns(Binary)]
     Msg(PaymentQueryMsg),
+    #[returns(ContractInfo)]
     GetContractInfo {},
 }

contracts/plus/market_whitelist_storage/src/contract.rs

@@ -2,7 +2,7 @@
 use cosmwasm_std::entry_point;
 
 use crate::error::ContractError;
-use crate::msg::{ExecuteMsg, InstantiateMsg, QueryMsg, UpdateContractMsg};
+use crate::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg, UpdateContractMsg};
 use crate::state::{ContractInfo, APPROVES, CONTRACT_INFO};
 use market_whitelist::{
     ApproveAllEvent, Approved, ApprovedForAllResponse, Event, Expiration, IsApprovedForAllResponse,
@@ -218,3 +218,8 @@ fn parse_approved(item: StdResult<Record<Expiration>>) -> StdResult<Approved> {
 pub fn query_contract_info(deps: Deps) -> StdResult<ContractInfo> {
     CONTRACT_INFO.load(deps.storage)
 }
+
+#[cfg_attr(not(feature = "library"), entry_point)]
+pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> StdResult<Response> {
+    Ok(Response::default())
+}

contracts/plus/market_whitelist_storage/src/msg.rs

@@ -30,3 +30,7 @@ pub enum QueryMsg {
     Msg(MarketWhiteListdQueryMsg),
     GetContractInfo {},
 }
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+
+pub struct MigrateMsg {}

contracts/plus/marketplace/src/bin/schema.rs

@@ -0,0 +1,12 @@
+use cosmwasm_schema::write_api;
+
+use marketplace::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        execute: ExecuteMsg,
+        query: QueryMsg,
+        migrate: MigrateMsg
+    }
+}

contracts/plus/marketplace/src/contract.rs

@@ -675,5 +675,15 @@ fn parse_offering<'a>(
 
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> StdResult<Response> {
+    CONTRACT_INFO.save(
+        _deps.storage,
+        &ContractInfo {
+            name: "marketplace".to_string(),
+            creator: "".to_string(),
+            denom: "orai".to_string(),
+            fee: 0,
+            max_royalty: 0,
+        },
+    )?;
     Ok(Response::default())
 }