Switched to quasar app

AbstractSDK · Jan 17, 2024 · c5098fd · c5098fd
1 parent 7b4412b
commit c5098fd
Show file tree

Hide file tree

Showing 23 changed files with 33 additions and 82 deletions.
diff --git a/contracts/savings-app/Cargo.toml → contracts/savings-app-quasar/Cargo.toml b/contracts/savings-app/Cargo.toml → contracts/savings-app-quasar/Cargo.toml
@@ -55,7 +55,17 @@ abstract-dex-adapter = { git = "https://github.com/abstractsdk/abstract", branch
 
 abstract-interface = { git = "https://github.com/abstractsdk/abstract", branch = "cw-orch-authz/patch", optional = true }
 cw-orch = { version = "0.19.1", optional = true }
+# cl-vault = { git = "https://github.com/abstractsdk/quasar", version = "0.1.0", features = [
+#   "library",
+# ] }
+cl-vault = { path = "../../../quasar/smart-contracts/contracts/cl-vault", features = [
+  "library",
+] }
 
+cw-vault-multi-standard = { git = "https://github.com/quasar-finance/cw-vault-standard", features = [
+  "lockup",
+  "force-unlock",
+] }
 [dev-dependencies]
 app = { path = ".", features = ["interface"] }
 abstract-interface = { git = "https://github.com/abstractsdk/abstract", branch = "cw-orch-authz/patch", features = [

diff --git a/contracts/savings-app/artifacts/app.wasm → ...cts/savings-app-quasar/artifacts/app.wasm b/contracts/savings-app/artifacts/app.wasm → ...cts/savings-app-quasar/artifacts/app.wasm
diff --git a/...racts/savings-app/artifacts/checksums.txt → ...avings-app-quasar/artifacts/checksums.txt b/...racts/savings-app/artifacts/checksums.txt → ...avings-app-quasar/artifacts/checksums.txt
diff --git a/...-app/artifacts/checksums_intermediate.txt → ...asar/artifacts/checksums_intermediate.txt b/...-app/artifacts/checksums_intermediate.txt → ...asar/artifacts/checksums_intermediate.txt
diff --git a/contracts/savings-app/examples/deploy.rs → ...cts/savings-app-quasar/examples/deploy.rs b/contracts/savings-app/examples/deploy.rs → ...cts/savings-app-quasar/examples/deploy.rs
diff --git a/contracts/savings-app/examples/schema.rs → ...cts/savings-app-quasar/examples/schema.rs b/contracts/savings-app/examples/schema.rs → ...cts/savings-app-quasar/examples/schema.rs
diff --git a/contracts/savings-app/examples/test-local.rs → ...savings-app-quasar/examples/test-local.rs b/contracts/savings-app/examples/test-local.rs → ...savings-app-quasar/examples/test-local.rs
diff --git a/contracts/savings-app/metadata.json → contracts/savings-app-quasar/metadata.json b/contracts/savings-app/metadata.json → contracts/savings-app-quasar/metadata.json
diff --git a/contracts/savings-app/src/contract.rs → contracts/savings-app-quasar/src/contract.rs b/contracts/savings-app/src/contract.rs → contracts/savings-app-quasar/src/contract.rs
diff --git a/contracts/savings-app/src/error.rs → contracts/savings-app-quasar/src/error.rs b/contracts/savings-app/src/error.rs → contracts/savings-app-quasar/src/error.rs
diff --git a/...racts/savings-app/src/handlers/execute.rs → ...avings-app-quasar/src/handlers/execute.rs b/...racts/savings-app/src/handlers/execute.rs → ...avings-app-quasar/src/handlers/execute.rs
@@ -1,8 +1,5 @@
 use std::collections::HashSet;
 
-use crate::cl_vault::{
-    self, BalancesQuery, TotalAssetsResponse, UserSharesBalanceResponse, VaultMessage, VaultQuery,
-};
 use crate::contract::{App, AppResult};
 use crate::error::AppError;
 use crate::msg::{AppExecuteMsg, ExecuteMsg};
@@ -19,6 +16,11 @@ use cosmwasm_std::{
 };
 use cw_asset::AssetList;
 
+use crate::cl_vault::msg::ExtensionExecuteMsg;
+use crate::cl_vault::msg::ExtensionQueryMsg;
+use crate::cl_vault::query::{TotalAssetsResponse, UserSharesBalanceResponse};
+use crate::cl_vault::{self, msg::UserBalanceQueryMsg};
+
 use super::query::{query_balances, ContractBalances};
 const MAX_SPREAD_PERCENT: u64 = 20;
 
@@ -90,8 +92,8 @@ fn autocompound(deps: DepsMut, env: Env, info: MessageInfo, app: App) -> AppResu
 
     let msg_claim = CosmosMsg::Wasm(WasmMsg::Execute {
         contract_addr: config.quasar_pool.to_string(),
-        msg: to_json_binary(&cl_vault::ExecuteMsg::VaultExtension(
-            VaultMessage::ClaimRewards {},
+        msg: to_json_binary(&cl_vault::msg::ExecuteMsg::VaultExtension(
+            ExtensionExecuteMsg::ClaimRewards {},
         ))?,
         funds: vec![],
     });
@@ -125,7 +127,7 @@ fn internal_deposit_all(deps: Deps, env: Env, info: MessageInfo, app: App) -> Ap
     let all_quasar_assets: TotalAssetsResponse =
         deps.querier.query(&QueryRequest::Wasm(WasmQuery::Smart {
             contract_addr: config.quasar_pool.to_string(),
-            msg: to_json_binary(&crate::cl_vault::QueryMsg::TotalAssets {})?,
+            msg: to_json_binary(&crate::cl_vault::msg::QueryMsg::TotalAssets {})?,
         }))?;
 
     // After the swap we can deposit the exact amount of tokens inside the quasar pool
@@ -138,7 +140,7 @@ fn internal_deposit_all(deps: Deps, env: Env, info: MessageInfo, app: App) -> Ap
 
     let msg = CosmosMsg::Wasm(WasmMsg::Execute {
         contract_addr: config.quasar_pool.to_string(),
-        msg: to_json_binary(&crate::cl_vault::ExecuteMsg::ExactDeposit { recipient: None })?,
+        msg: to_json_binary(&crate::cl_vault::msg::ExecuteMsg::ExactDeposit { recipient: None })?,
         funds: vec![
             Coin {
                 denom: all_quasar_assets.token0.denom,
@@ -165,7 +167,7 @@ fn internal_swap_correct_amount(deps: DepsMut, env: Env, info: MessageInfo, app:
     let all_quasar_assets: TotalAssetsResponse =
         deps.querier.query(&QueryRequest::Wasm(WasmQuery::Smart {
             contract_addr: config.quasar_pool.to_string(),
-            msg: to_json_binary(&crate::cl_vault::QueryMsg::TotalAssets {})?,
+            msg: to_json_binary(&crate::cl_vault::msg::QueryMsg::TotalAssets {})?,
         }))?;
 
     let token0 = all_quasar_assets.token0;
@@ -244,8 +246,8 @@ fn _inner_withdraw(
     } else {
         let user_shares: UserSharesBalanceResponse = deps.querier.query_wasm_smart(
             config.quasar_pool.to_string(),
-            &cl_vault::QueryMsg::VaultExtension(VaultQuery::Balances(
-                BalancesQuery::UserSharesBalance {
+            &cl_vault::msg::QueryMsg::VaultExtension(ExtensionQueryMsg::Balances(
+                UserBalanceQueryMsg::UserSharesBalance {
                     user: env.contract.address.to_string(),
                 },
             )),
@@ -256,7 +258,7 @@ fn _inner_withdraw(
 
     let msg = CosmosMsg::Wasm(WasmMsg::Execute {
         contract_addr: config.quasar_pool.to_string(),
-        msg: to_json_binary(&cl_vault::ExecuteMsg::Redeem {
+        msg: to_json_binary(&cl_vault::msg::ExecuteMsg::Redeem {
             recipient: Some(app.account_base(deps.as_ref())?.proxy.to_string()),
             amount: liquidity_amount,
         })?,

diff --git a/...s/savings-app/src/handlers/instantiate.rs → ...gs-app-quasar/src/handlers/instantiate.rs b/...s/savings-app/src/handlers/instantiate.rs → ...gs-app-quasar/src/handlers/instantiate.rs
diff --git a/...racts/savings-app/src/handlers/migrate.rs → ...avings-app-quasar/src/handlers/migrate.rs b/...racts/savings-app/src/handlers/migrate.rs → ...avings-app-quasar/src/handlers/migrate.rs
diff --git a/contracts/savings-app/src/handlers/mod.rs → ...ts/savings-app-quasar/src/handlers/mod.rs b/contracts/savings-app/src/handlers/mod.rs → ...ts/savings-app-quasar/src/handlers/mod.rs
diff --git a/contracts/savings-app/src/handlers/query.rs → .../savings-app-quasar/src/handlers/query.rs b/contracts/savings-app/src/handlers/query.rs → .../savings-app-quasar/src/handlers/query.rs
@@ -1,7 +1,9 @@
-use crate::cl_vault::{self, BalancesQuery, UserRewardsResponse};
+use crate::cl_vault::{self};
 use crate::contract::{App, AppResult};
 use crate::msg::{AppQueryMsg, AssetsBalanceResponse, AvailableRewardsResponse, StateResponse};
 use crate::state::CONFIG;
+use cl_vault::msg::{ExtensionQueryMsg, QueryMsg, UserBalanceQueryMsg};
+use cl_vault::query::UserRewardsResponse;
 use cosmwasm_std::{to_json_binary, Binary, Deps, Env, StdResult, Uint128};
 
 pub fn query_handler(deps: Deps, env: Env, _app: &App, msg: AppQueryMsg) -> AppResult<Binary> {
@@ -27,8 +29,8 @@ fn query_balance(deps: Deps, env: Env) -> StdResult<AssetsBalanceResponse> {
 
     deps.querier.query_wasm_smart(
         config.quasar_pool.to_string(),
-        &cl_vault::QueryMsg::VaultExtension(cl_vault::VaultQuery::Balances(
-            BalancesQuery::UserAssetsBalance {
+        &QueryMsg::VaultExtension(ExtensionQueryMsg::Balances(
+            UserBalanceQueryMsg::UserAssetsBalance {
                 user: env.contract.address.to_string(),
             },
         )),
@@ -39,8 +41,8 @@ fn query_rewards(deps: Deps, env: Env) -> StdResult<AvailableRewardsResponse> {
 
     let response: UserRewardsResponse = deps.querier.query_wasm_smart(
         config.quasar_pool.to_string(),
-        &cl_vault::QueryMsg::VaultExtension(cl_vault::VaultQuery::Balances(
-            BalancesQuery::UserRewards {
+        &QueryMsg::VaultExtension(ExtensionQueryMsg::Balances(
+            UserBalanceQueryMsg::UserRewards {
                 user: env.contract.address.to_string(),
             },
         )),

diff --git a/contracts/savings-app/src/lib.rs → contracts/savings-app-quasar/src/lib.rs b/contracts/savings-app/src/lib.rs → contracts/savings-app-quasar/src/lib.rs
@@ -1,4 +1,5 @@
-pub mod cl_vault;
+// pub mod cl_vault;
+pub use cl_vault;
 pub mod contract;
 pub mod error;
 mod handlers;

diff --git a/contracts/savings-app/src/msg.rs → contracts/savings-app-quasar/src/msg.rs b/contracts/savings-app/src/msg.rs → contracts/savings-app-quasar/src/msg.rs
diff --git a/contracts/savings-app/src/replies/mod.rs → ...cts/savings-app-quasar/src/replies/mod.rs b/contracts/savings-app/src/replies/mod.rs → ...cts/savings-app-quasar/src/replies/mod.rs
diff --git a/contracts/savings-app/src/state.rs → contracts/savings-app-quasar/src/state.rs b/contracts/savings-app/src/state.rs → contracts/savings-app-quasar/src/state.rs
diff --git a/contracts/savings-app/tests/integration.rs → ...s/savings-app-quasar/tests/integration.rs b/contracts/savings-app/tests/integration.rs → ...s/savings-app-quasar/tests/integration.rs
diff --git a/contracts/savings-app/tests/wasm.rs → contracts/savings-app-quasar/tests/wasm.rs b/contracts/savings-app/tests/wasm.rs → contracts/savings-app-quasar/tests/wasm.rs
diff --git a/contracts/savings-app/src/cl_vault.rs b/contracts/savings-app/src/cl_vault.rs
diff --git a/savings-bot/Cargo.toml b/savings-bot/Cargo.toml
@@ -14,4 +14,4 @@ dotenv = "0.15.0"
 env_logger = "0.10.0"
 log = "0.4.20"
 tonic = "0.10.0"
-app = { path = "../contracts/savings-app" }
+app = { path = "../contracts/savings-app-quasar" }