Skip to content

V2 update/ans #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kayanski wants to merge 3 commits into
base: v2
Choose a base branch
from
Open

V2 update/ans #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6a009c
Added ans assets in assetshares
Kayanski Apr 11, 2024
0c6fe8e
Transformed everything to ans asset
Kayanski Apr 17, 2024
e8558ca
Merge with main
Kayanski Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contracts/carrot-app/examples/install_savings_app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![allow(unused)]
use abstract_app::objects::{AccountId, AssetEntry};
use abstract_app::objects::{AccountId, AnsAsset, AssetEntry};
use abstract_client::AbstractClient;
use cosmwasm_std::{coins, Coin, Uint128, Uint256, Uint64};
use cw_orch::{
Expand Down Expand Up @@ -77,7 +77,7 @@ fn main() -> anyhow::Result<()> {
dex: OSMOSIS.to_string(),
},
strategy: StrategyBase(vec![]),
deposit: Some(coins(100, "usdc")),
deposit: Some(vec![AnsAsset::new("usdc", 100u128)]),
};
let create_sub_account_message = utils::create_account_message(&client, init_msg)?;

Expand Down
4 changes: 2 additions & 2 deletions contracts/carrot-app/examples/localnet_install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ fn one_element(upper_tick: i64, lower_tick: i64, share: Decimal) -> StrategyElem
yield_source: YieldSourceBase {
asset_distribution: vec![
AssetShare {
denom: ION.to_string(),
asset: AssetEntry::from(ION),
share: Decimal::percent(50),
},
AssetShare {
denom: OSMO.to_string(),
asset: AssetEntry::from(OSMO),
share: Decimal::percent(50),
},
],
Expand Down
17 changes: 12 additions & 5 deletions contracts/carrot-app/examples/localnet_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
use abstract_client::Application;
use cosmwasm_std::coins;
use abstract_app::objects::{
module::ModuleInfo, namespace::ABSTRACT_NAMESPACE, AccountId, AnsAsset, AssetEntry,
};
use abstract_client::{Application, Namespace};
use abstract_dex_adapter::{interface::DexAdapter, DEX_ADAPTER_ID};
use abstract_interface::{Abstract, VCQueryFns};
use abstract_sdk::core::ans_host::QueryMsgFns;
use cosmwasm_std::{coins, Decimal, Uint128, Uint64};
use cw_orch::{
anyhow,
daemon::{networks::LOCAL_OSMO, Daemon, DaemonBuilder},
Expand Down Expand Up @@ -43,11 +49,12 @@ fn main() -> anyhow::Result<()> {
.bank_send(account.proxy()?.as_str(), coins(10_000, "uosmo")),
)?;

carrot.deposit(coins(10_000, "uosmo"), None)?;
// carrot.deposit(coins(10_000, "uosmo"), None)?;
carrot.deposit(vec![AnsAsset::new("uosmo", 10_000u128)], None)?;

carrot.update_strategy(coins(10_000, "uosmo"), five_strategy())?;
carrot.update_strategy(vec![AnsAsset::new("uosmo", 10_000u128)], five_strategy())?;
carrot.withdraw(None)?;
carrot.deposit(coins(10_000, "uosmo"), None)?;
carrot.deposit(vec![AnsAsset::new("uosmo", 10_000u128)], None)?;

Ok(())
}
Loading