add useful queries

contracts/cw20_reflection_token/src/contract.rs

@@ -21,8 +21,8 @@ use cw20_base::contract::{
 use cw20_base::enumerable::{query_all_accounts, query_owner_allowances};
 
 use crate::msg::{
-    ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg, QueryTaxResponse, TreasuryExecuteMsg,
-    TreasuryInstantiateMsg,
+    ExecuteMsg, GetTreasuryResponse, InstantiateMsg, MigrateMsg, QueryMsg, QueryTaxResponse,
+    TreasuryExecuteMsg, TreasuryInstantiateMsg,
 };
 use cw20_base::state::{MinterData, TokenInfo, BALANCES, LOGO, MARKETING_INFO, TOKEN_INFO};
 use cw20_base::ContractError;
@@ -555,9 +555,17 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
         QueryMsg::GetWhitelist { address } => {
             to_json_binary(&query_whitelist(deps.storage, address)?)
         }
+        QueryMsg::GetTreasury {} => to_json_binary(&query_treasury(deps.storage)?),
     }
 }
 
+pub fn query_treasury(storage: &dyn Storage) -> Result<GetTreasuryResponse, StdError> {
+    let treasury_addr = TREASURY.load(storage)?;
+    Ok(GetTreasuryResponse {
+        address: treasury_addr,
+    })
+}
+
 /// Used to calculate the amount of taxes to be paid, to be used in all transfer functions
 pub fn query_tax(storage: &dyn Storage, amount: Uint128) -> Result<QueryTaxResponse, StdError> {
     let reflection_rate = REFLECTION_RATE.may_load(storage)?.unwrap();

contracts/cw20_reflection_token/src/msg.rs

@@ -225,6 +225,7 @@ pub enum QueryMsg {
     GetWhitelist {
         address: String,
     },
+    GetTreasury {},
 }
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug, Default)]
@@ -245,3 +246,8 @@ pub struct MigrateMsg {
 pub enum TreasuryExecuteMsg {
     Liquify {},
 }
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+pub struct GetTreasuryResponse {
+    pub address: String,
+}

contracts/cw20_reflection_treasury/src/contract.rs

@@ -13,7 +13,8 @@ use cw20::{BalanceResponse, Cw20ExecuteMsg};
 use cw2::set_contract_version;
 
 use crate::msg::{
-    Cw20HookMsg, Cw20ReceiveMsg, ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg, TokenQueryMsg,
+    Cw20HookMsg, Cw20ReceiveMsg, ExecuteMsg, GetTokenResponse, InstantiateMsg, MigrateMsg,
+    QueryMsg, TokenQueryMsg,
 };
 use choice::asset::{Asset, AssetInfo, PairInfo};
 use choice::pair::QueryMsg as PairQueryMsg;
@@ -76,7 +77,6 @@ pub fn execute(
         ExecuteMsg::SetMinLiquify { min_liquify_amt } => {
             set_min_liquify_amt(deps, env, info, min_liquify_amt)
         }
-        // ExecuteMsg::SetToken { address } => set_token(deps, env, info, address),
         ExecuteMsg::Liquify {} => liquify_treasury(&deps.querier, env, deps.storage),
         ExecuteMsg::WithdrawToken { asset } => withdraw_token(deps, env, info, asset),
     }
@@ -89,9 +89,17 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
             let token: Addr = TOKEN.load(deps.storage)?;
             to_json_binary(&query_balance(&deps.querier, token, env.contract.address)?)
         }
+        QueryMsg::GetToken {} => to_json_binary(&query_token(deps.storage)?),
     }
 }
 
+pub fn query_token(storage: &dyn Storage) -> StdResult<GetTokenResponse> {
+    let token_addr = TOKEN.load(storage)?;
+    Ok(GetTokenResponse {
+        address: token_addr.to_string(),
+    })
+}
+
 pub fn receive_cw20(
     querier: &QuerierWrapper,
     storage: &mut dyn Storage,

contracts/cw20_reflection_treasury/src/msg.rs

@@ -37,6 +37,7 @@ pub enum ExecuteMsg {
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
     Balance {},
+    GetToken {},
 }
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug, Default)]
@@ -47,6 +48,11 @@ pub struct QueryTaxResponse {
     pub liquidity_amount: Uint128,
 }
 
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+pub struct GetTokenResponse {
+    pub address: String,
+}
+
 #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug, Default)]
 pub struct MigrateMsg {
     pub msg: String,