Lending-market v2: Implement authenticating viewing key

Author: ueco-jb

contracts/lending/market_v2/Cargo.toml

@@ -20,6 +20,7 @@ shade-protocol = { version = "0.1.0", path = "../../../packages/shade_protocol",
 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = "1"
+query_auth = { path = "../../query_auth" }
 
 [dev-dependencies]
 anyhow = "1"

contracts/lending/market_v2/src/contract.rs

@@ -5,14 +5,14 @@ use shade_protocol::{
         from_binary, to_binary, Addr, Binary, Coin as StdCoin, Decimal, Deps, DepsMut, Env,
         MessageInfo, Reply, Response, StdError, StdResult, SubMsg, Timestamp, Uint128, WasmMsg,
     },
-    contract_interfaces::snip20::Snip20ReceiveMsg,
+    contract_interfaces::{query_auth::helpers::authenticate_vk, snip20::Snip20ReceiveMsg},
     query_authentication::viewing_keys,
     utils::{asset::Contract, Query},
 };
 
 use crate::{
     error::ContractError,
-    msg::{AuthQueryMsg, ExecuteMsg, InstantiateMsg, QueryMsg, ReceiveMsg, TotalDebtResponse},
+    msg::{ExecuteMsg, InstantiateMsg, QueryMsg, ReceiveMsg, TotalDebtResponse},
     state::{debt, Config, CONFIG, VIEWING_KEY},
 };
 
@@ -737,11 +737,53 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<Binary, ContractErro
         QueryMsg::TokensBalance {
             account,
             viewing_key,
-        } => to_binary(&query::tokens_balance(deps, env, account)?)?,
-        QueryMsg::Withdrawable { account } => to_binary(&query::withdrawable(deps, env, account)?)?,
-        QueryMsg::Borrowable { account } => to_binary(&query::borrowable(deps, env, account)?)?,
-        QueryMsg::CreditLine { account } => {
-            let account = deps.api.addr_validate(&account)?;
+        } => {
+            let config = CONFIG.load(deps.storage)?;
+            authenticate_vk(
+                account.clone(),
+                viewing_key,
+                &deps.querier,
+                &config.query_auth,
+            )?;
+            to_binary(&query::tokens_balance(deps, env, account.to_string())?)?
+        }
+        QueryMsg::Withdrawable {
+            account,
+            viewing_key,
+        } => {
+            let config = CONFIG.load(deps.storage)?;
+            authenticate_vk(
+                account.clone(),
+                viewing_key,
+                &deps.querier,
+                &config.query_auth,
+            )?;
+            to_binary(&query::withdrawable(deps, env, account.to_string())?)?
+        }
+        QueryMsg::Borrowable {
+            account,
+            viewing_key,
+        } => {
+            let config = CONFIG.load(deps.storage)?;
+            authenticate_vk(
+                account.clone(),
+                viewing_key,
+                &deps.querier,
+                &config.query_auth,
+            )?;
+            to_binary(&query::borrowable(deps, env, account.to_string())?)?
+        }
+        QueryMsg::CreditLine {
+            account,
+            viewing_key,
+        } => {
+            let config = CONFIG.load(deps.storage)?;
+            authenticate_vk(
+                account.clone(),
+                viewing_key,
+                &deps.querier,
+                &config.query_auth,
+            )?;
             to_binary(&query::credit_line(deps, env, account)?)?
         }
         QueryMsg::Configuration {} => to_binary(&query::config(deps, env)?)?,

contracts/lending/market_v2/src/msg.rs

@@ -123,28 +123,16 @@ pub enum QueryMsg {
     TotalDebt {},
     /// Returns TokensBalanceResponse
     #[returns(TokensBalanceResponse)]
-    TokensBalance {
-        account: String,
-        viewing_key: String,
-    },
+    TokensBalance { account: Addr, viewing_key: String },
     /// Returns the amount that the given account can withdraw
     #[returns(Coin)]
-    Withdrawable {
-        account: String,
-        viewing_key: String,
-    },
+    Withdrawable { account: Addr, viewing_key: String },
     /// Returns the amount that the given account can borrow
     #[returns(Coin)]
-    Borrowable {
-        account: String,
-        viewing_key: String,
-    },
+    Borrowable { account: Addr, viewing_key: String },
     /// Returns CreditLineResponse
     #[returns(lending_utils::credit_line::CreditLineResponse)]
-    CreditLine {
-        account: String,
-        viewing_key: String,
-    },
+    CreditLine { account: Addr, viewing_key: String },
 }
 
 impl Query for QueryMsg {

contracts/lending/market_v2/src/state.rs

@@ -2,8 +2,9 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 use shade_protocol::{
-    c_std::{Addr, ContractInfo, Decimal, Uint128},
+    c_std::{Addr, Decimal, Uint128},
     secret_storage_plus::Item,
+    utils::asset::Contract,
 };
 
 use lending_utils::{interest::ValidatedInterest, token::Token};
@@ -38,11 +39,11 @@ pub struct Config {
     /// Address of Oracle's contract
     pub price_oracle: String,
     /// Address of Credit Agency
-    pub credit_agency: ContractInfo,
+    pub credit_agency: Contract,
     /// Address of oracle
-    pub oracle: ContractInfo,
+    pub oracle: Contract,
     /// Address of auth query contract
-    pub query_auth: ContractInfo,
+    pub query_auth: Contract,
     pub reserve_factor: Decimal,
 }