diff --git a/.github/workflows/framework-test.yml b/.github/workflows/framework-test.yml index 4f5b86244a..3322e1f698 100644 --- a/.github/workflows/framework-test.yml +++ b/.github/workflows/framework-test.yml @@ -11,7 +11,7 @@ on: - framework/** env: - CODECOV_TOKEN: 7f09ca79-34d7-4a5a-b6fd-b3b477a7b2e9 + CODECOV_TOKEN: 34d23f19-66bf-40e6-a2c9-f222c9e9f614 SCCACHE_GHA_ENABLED: "true" RUSTC_WRAPPER: "sccache" diff --git a/app-template/Cargo.toml b/app-template/Cargo.toml index e4db57df9d..bce416e654 100644 --- a/app-template/Cargo.toml +++ b/app-template/Cargo.toml @@ -37,23 +37,23 @@ cosmwasm-std = { version = "1.2" } cosmwasm-schema = { version = "1.2" } cw-controllers = { version = "1.0.1" } cw-storage-plus = "1.1.0" -thiserror = { version = "<=1.0.48" } +thiserror = { version = "1.0.50" } schemars = "0.8" cw-asset = { version = "3.0" } -abstract-core = { version = "0.19.0" } -abstract-app = { version = "0.19.0" } -abstract-sdk = { version = "0.19.0" } +abstract-core = { version = "0.19.2" } +abstract-app = { version = "0.19.2" } +abstract-sdk = { version = "0.19.2" } # Dependencies for interface -abstract-interface = { version = "0.19.0", optional = true } +abstract-interface = { version = "0.19.2", optional = true } cw-orch = { version = "0.16.4", optional = true } [dev-dependencies] app = { path = ".", features = ["interface"] } -abstract-interface = { version = "0.19.0", features = ["daemon"] } -abstract-testing = { version = "0.19.0" } -abstract-sdk = { version = "0.19.0", features = ["test-utils"] } +abstract-interface = { version = "0.19.2", features = ["daemon"] } +abstract-testing = { version = "0.19.2" } +abstract-sdk = { version = "0.19.2", features = ["test-utils"] } speculoos = "0.11.0" semver = "1.0" dotenv = "0.15.0" diff --git a/app-template/artifacts/app.wasm b/app-template/artifacts/app.wasm deleted file mode 100644 index 0fe77a0aa2..0000000000 Binary files a/app-template/artifacts/app.wasm and /dev/null differ diff --git a/app-template/artifacts/checksums_intermediate.txt b/app-template/artifacts/checksums_intermediate.txt deleted file mode 100644 index 92fbcbe83b..0000000000 --- a/app-template/artifacts/checksums_intermediate.txt +++ /dev/null @@ -1 +0,0 @@ -8a5d026af836bdaeea0bff0166ce06889e4d1e536d5f55ddfb80fe2816cf88c2 /target/wasm32-unknown-unknown/release/app.wasm diff --git a/framework/.cargo/config.toml b/framework/.cargo/config.toml index 4cef570fbe..e652e331f4 100644 --- a/framework/.cargo/config.toml +++ b/framework/.cargo/config.toml @@ -9,8 +9,5 @@ store = "run-script store" instantiate = "run-script instantiate" migrate = "run-script migrate" -[net] -git-fetch-with-cli = true - [registries.abstract-money] index = "ssh://git@ssh.shipyard.rs/abstract-money/crate-index.git" diff --git a/framework/Cargo.toml b/framework/Cargo.toml index 833705efc9..cbefa052b8 100644 --- a/framework/Cargo.toml +++ b/framework/Cargo.toml @@ -4,8 +4,6 @@ members = [ "packages/standards/*", "contracts/native/*", "contracts/account/*", - "scripts", - "tests", ] # Enable the version 2 feature resolver, which avoids unifying features for targets that are not being built @@ -19,7 +17,7 @@ members = [ resolver = "2" [workspace.package] -version = "0.19.0" +version = "0.19.2" authors = [ "CyberHoward ", "Riada ", @@ -48,7 +46,7 @@ cw-address-like = { version = "1.0" } schemars = "0.8" serde = { version = "1.0", default-features = false, features = ["derive"] } -thiserror = { version = "<=1.0.48" } +thiserror = { version = "1.0.50" } protobuf = { version = "2", features = ["with-bytes"] } clap = { version = "4.0.32", features = ["derive"] } @@ -81,14 +79,15 @@ ibc-host = { package = "abstract-ibc-host", path = "contracts/native/ibc-host" } proxy = { package = "abstract-proxy", path = "contracts/account/proxy" } manager = { package = "abstract-manager", path = "contracts/account/manager" } -abstract-sdk = { version = "0.19.0", path = "packages/abstract-sdk" } -abstract-testing = { version = "0.19.0", path = "packages/abstract-testing" } -abstract-core = { version = "0.19.0", path = "packages/abstract-core" } +abstract-sdk = { version = "0.19.2", path = "packages/abstract-sdk" } +abstract-testing = { version = "0.19.2", path = "packages/abstract-testing" } +abstract-core = { version = "0.19.2", path = "packages/abstract-core" } # These should remain fixed and don't need to be re-published (unless changes are made) -abstract-macros = { version = "0.19.0", path = "packages/abstract-macros" } +abstract-macros = { version = "0.19.2", path = "packages/abstract-macros" } +abstract-ica = { version = "0.19.2", path = "packages/abstract-ica" } -abstract-adapter-utils = { version = "0.19.0", path = "packages/standards/utils" } +abstract-adapter-utils = { version = "0.19.2", path = "packages/standards/utils" } abstract-dex-standard = { path = "packages/standards/dex" } abstract-staking-standard = { path = "packages/standards/staking" } diff --git a/framework/artifacts/abstract_account_factory.wasm b/framework/artifacts/abstract_account_factory.wasm new file mode 100644 index 0000000000..2a18bd9786 Binary files /dev/null and b/framework/artifacts/abstract_account_factory.wasm differ diff --git a/framework/artifacts/abstract_ans_host.wasm b/framework/artifacts/abstract_ans_host.wasm new file mode 100644 index 0000000000..8e6b8e069e Binary files /dev/null and b/framework/artifacts/abstract_ans_host.wasm differ diff --git a/framework/artifacts/abstract_ibc_client.wasm b/framework/artifacts/abstract_ibc_client.wasm new file mode 100644 index 0000000000..ccbb702a8a Binary files /dev/null and b/framework/artifacts/abstract_ibc_client.wasm differ diff --git a/framework/artifacts/abstract_ibc_host.wasm b/framework/artifacts/abstract_ibc_host.wasm new file mode 100644 index 0000000000..b20bf8322c Binary files /dev/null and b/framework/artifacts/abstract_ibc_host.wasm differ diff --git a/framework/artifacts/abstract_manager.wasm b/framework/artifacts/abstract_manager.wasm new file mode 100644 index 0000000000..03f20e82df Binary files /dev/null and b/framework/artifacts/abstract_manager.wasm differ diff --git a/framework/artifacts/abstract_module_factory.wasm b/framework/artifacts/abstract_module_factory.wasm new file mode 100644 index 0000000000..f52078002e Binary files /dev/null and b/framework/artifacts/abstract_module_factory.wasm differ diff --git a/framework/artifacts/abstract_proxy.wasm b/framework/artifacts/abstract_proxy.wasm new file mode 100644 index 0000000000..4aab72bf29 Binary files /dev/null and b/framework/artifacts/abstract_proxy.wasm differ diff --git a/framework/artifacts/abstract_version_control.wasm b/framework/artifacts/abstract_version_control.wasm new file mode 100644 index 0000000000..347b7bc177 Binary files /dev/null and b/framework/artifacts/abstract_version_control.wasm differ diff --git a/framework/artifacts/checksums.txt b/framework/artifacts/checksums.txt new file mode 100644 index 0000000000..47df83b1c3 --- /dev/null +++ b/framework/artifacts/checksums.txt @@ -0,0 +1,8 @@ +800ae9540542b8070ef6573202c6ed355b6a9d8f8fd14a271a9de0871ce9c629 abstract_account_factory.wasm +3e989e48b70a5ccb37d680e62de4e39a8733978c672c5e2d754143e1fe1afcb1 abstract_ans_host.wasm +d3982ef85487d3c1023c247c80be8ff4c4f8a6178d3d740e1bb79d99a200dd55 abstract_ibc_client.wasm +2bfa58fc54daefa0635fe64d950554263f8935d92da2068d7198b980d2bd9328 abstract_ibc_host.wasm +44be4b01a001bb6505809d9c23dea868e228b361718bc608a14ca4279cb753d2 abstract_manager.wasm +c9c8acb87ca20703556d29f5a7d5234d0230bdde5b9f19858514fb0acd07fe27 abstract_module_factory.wasm +0bb239dba46ee4c4d2b7772ed11479aa74dee818c7b48546ca12dc2b848c161e abstract_proxy.wasm +39325ba879b7ac014e82adaf5fcb8117b60b3a89025f248a9e825e4ca9119184 abstract_version_control.wasm diff --git a/framework/artifacts/checksums_intermediate.txt b/framework/artifacts/checksums_intermediate.txt new file mode 100644 index 0000000000..ff1662a8c4 --- /dev/null +++ b/framework/artifacts/checksums_intermediate.txt @@ -0,0 +1,8 @@ +75f911aecc317ef10362036030a7cd80d62b9e1eb471adcb0e305895c0704cf4 target/wasm32-unknown-unknown/release/abstract_account_factory.wasm +5ff48c4e3e4e363a4f6f8ca49ebc81a23503895b7ac27da903226470c865b86f target/wasm32-unknown-unknown/release/abstract_ans_host.wasm +8f271f94906b61a34d779577c09efa54166acb0067a3fd114d10ddec096c38c7 target/wasm32-unknown-unknown/release/abstract_ibc_client.wasm +46cbc178e4d671490cc3a825bda94e97e43bc37ac608d0c96adf02b6647ca9b0 target/wasm32-unknown-unknown/release/abstract_ibc_host.wasm +136c87fcd7c870336fd75a0062910ac8011221e13df073f44829a221dc3dca5a target/wasm32-unknown-unknown/release/abstract_manager.wasm +ccdd079177a138f68236bd51bdcc9117878148ffb8e26564a0032352c73fce61 target/wasm32-unknown-unknown/release/abstract_module_factory.wasm +8049e2674b01132fffad1ff8bf90eef19594f003594543107d4b8493280c9fe4 target/wasm32-unknown-unknown/release/abstract_proxy.wasm +73c2e447923dfa99d3fbede67aee868c0cdba1a0b0707c035de4f8dd5c1f74db target/wasm32-unknown-unknown/release/abstract_version_control.wasm diff --git a/framework/build_release.sh b/framework/build_release.sh index 4c28750e2b..f9838e0810 100755 --- a/framework/build_release.sh +++ b/framework/build_release.sh @@ -13,4 +13,4 @@ fi docker run --rm -v "$(pwd)":/code \ --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \ --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \ - ${image}:0.12.13 \ No newline at end of file + ${image}:0.14.0 \ No newline at end of file diff --git a/framework/packages/abstract-adapter/Cargo.toml b/framework/packages/abstract-adapter/Cargo.toml index 8e070d8688..57979e2051 100644 --- a/framework/packages/abstract-adapter/Cargo.toml +++ b/framework/packages/abstract-adapter/Cargo.toml @@ -1,16 +1,14 @@ [package] name = "abstract-adapter" -version = "0.19.0" +version = "0.19.2" authors = { workspace = true } edition = { workspace = true } license = { workspace = true } description = "base adapter contract implementation" resolver = "2" - -# [lib] -# crate-type = ["cdylib", "rlib"] - +[lib] +crate-type = ["cdylib", "rlib"] [features] test-utils = ["dep:abstract-testing", "dep:abstract-interface", "dep:cw-orch"] @@ -30,7 +28,7 @@ abstract-core = { workspace = true } abstract-testing = { workspace = true, optional = true } cw-orch = { workspace = true, optional = true } # Keep this as a version and update when publishing new versions -abstract-interface = { path = "../../packages/abstract-interface", version = "0.19.0", optional = true } +abstract-interface = { path = "../../packages/abstract-interface", version = "0.19.2", optional = true } [dev-dependencies] speculoos = { workspace = true } diff --git a/framework/packages/abstract-app/Cargo.toml b/framework/packages/abstract-app/Cargo.toml index ee3d5d9e5c..ffbe378283 100644 --- a/framework/packages/abstract-app/Cargo.toml +++ b/framework/packages/abstract-app/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "abstract-app" -version = "0.19.0" +version = "0.19.2" edition = { workspace = true } license = { workspace = true } description = "base app contract implementation" resolver = "2" -# [lib] -# crate-type = ["cdylib", "rlib"] +[lib] +crate-type = ["cdylib", "rlib"] [features] @@ -30,7 +30,7 @@ abstract-core = { workspace = true } abstract-testing = { workspace = true, optional = true } cw-orch = { workspace = true, optional = true } # Keep this as a version and update when publishing new versions -abstract-interface = { path = "../../packages/abstract-interface", version = "0.19.0", optional = true } +abstract-interface = { path = "../../packages/abstract-interface", version = "0.19.2", optional = true } [dev-dependencies] cosmwasm-schema = { workspace = true } diff --git a/framework/packages/abstract-interface/Cargo.toml b/framework/packages/abstract-interface/Cargo.toml index e0daa05267..e43860d98d 100644 --- a/framework/packages/abstract-interface/Cargo.toml +++ b/framework/packages/abstract-interface/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "abstract-interface" -version = "0.19.0" +version = "0.19.2" edition = { workspace = true } license = { workspace = true } description = "Abstract deployment helpers with cw-orchestrator" @@ -28,18 +28,17 @@ tokio = { workspace = true } log = "0.4.14" serde_json = "1.0.79" speculoos = { workspace = true } -cosmrs = "0.14.0" polytone = { workspace = true } # Keep these here -module-factory = { package = "abstract-module-factory", path = "../../contracts/native/module-factory", default-features = false, version = "0.19.0" } -account-factory = { package = "abstract-account-factory", path = "../../contracts/native/account-factory", default-features = false, version = "0.19.0" } -ans-host = { package = "abstract-ans-host", path = "../../contracts/native/ans-host", default-features = false, version = "0.19.0" } -version-control = { package = "abstract-version-control", path = "../../contracts/native/version-control", default-features = false, version = "0.19.0" } -proxy = { package = "abstract-proxy", path = "../../contracts/account/proxy", default-features = false, version = "0.19.0" } -manager = { package = "abstract-manager", path = "../../contracts/account/manager", default-features = false, version = "0.19.0" } -ibc-client = { package = "abstract-ibc-client", path = "../../contracts/native/ibc-client", default-features = false, version = "0.19.0" } -ibc-host = { package = "abstract-ibc-host", path = "../../contracts/native/ibc-host", default-features = false, version = "0.19.0" } +module-factory = { package = "abstract-module-factory", path = "../../contracts/native/module-factory", default-features = false, version = "0.19.2" } +ibc-client = { package = "abstract-ibc-client", path = "../../contracts/native/ibc-client", default-features = false, version = "0.19.2" } +ibc-host = { package = "abstract-ibc-host", path = "../../contracts/native/ibc-host", default-features = false, version = "0.19.2" } +account-factory = { package = "abstract-account-factory", path = "../../contracts/native/account-factory", default-features = false, version = "0.19.2" } +ans-host = { package = "abstract-ans-host", path = "../../contracts/native/ans-host", default-features = false, version = "0.19.2" } +version-control = { package = "abstract-version-control", path = "../../contracts/native/version-control", default-features = false, version = "0.19.2" } +proxy = { package = "abstract-proxy", path = "../../contracts/account/proxy", default-features = false, version = "0.19.2" } +manager = { package = "abstract-manager", path = "../../contracts/account/manager", default-features = false, version = "0.19.2" } [build-dependencies] serde_json = "1.0.79" diff --git a/framework/packages/abstract-interface/src/native/ibc_client.rs b/framework/packages/abstract-interface/src/native/ibc_client.rs index 188955e3ed..232b49f0af 100644 --- a/framework/packages/abstract-interface/src/native/ibc_client.rs +++ b/framework/packages/abstract-interface/src/native/ibc_client.rs @@ -17,8 +17,8 @@ impl Uploadable for IbcClient { fn wrapper(&self) -> ::ContractSource { Box::new( ContractWrapper::new_with_empty( - ibc_client::contract::execute, - ibc_client::contract::instantiate, + ::ibc_client::contract::execute, + ::ibc_client::contract::instantiate, ::ibc_client::contract::query, ) .with_migrate(::ibc_client::contract::migrate), diff --git a/framework/packages/abstract-interface/state.json b/framework/packages/abstract-interface/state.json index 0dba6b4c0e..5739851f9b 120000 --- a/framework/packages/abstract-interface/state.json +++ b/framework/packages/abstract-interface/state.json @@ -1 +1 @@ -../../scripts/state.json \ No newline at end of file +../../../interchain/scripts/state.json \ No newline at end of file diff --git a/framework/packages/abstract-sdk/src/ans_resolve.rs b/framework/packages/abstract-sdk/src/ans_resolve.rs index 72380abfe0..45afa5b546 100644 --- a/framework/packages/abstract-sdk/src/ans_resolve.rs +++ b/framework/packages/abstract-sdk/src/ans_resolve.rs @@ -1,12 +1,12 @@ //! # AnsHost Entry //! An entry (value) in the ans_host key-value store. -use crate::AbstractSdkResult; -use abstract_core::objects::AnsEntryConvertor; -use core::objects::{ +use crate::core::objects::{ ans_host::AnsHost, pool_metadata::ResolvedPoolMetadata, AnsAsset, AssetEntry, ChannelEntry, ContractEntry, DexAssetPairing, LpToken, PoolMetadata, PoolReference, UniquePoolId, }; +use crate::AbstractSdkResult; +use abstract_core::objects::AnsEntryConvertor; use cosmwasm_std::{Addr, QuerierWrapper}; use cw_asset::{Asset, AssetInfo}; @@ -369,7 +369,7 @@ mod tests { mod pool_metadata { use super::*; - use core::objects::PoolType; + use crate::core::objects::PoolType; #[test] fn exists() { @@ -425,8 +425,8 @@ mod tests { mod pools { use super::*; + use crate::core::objects::{PoolAddress, PoolType}; use abstract_core::ans_host::state::{ASSET_PAIRINGS, POOL_METADATA}; - use core::objects::{PoolAddress, PoolType}; #[test] fn exists() { @@ -474,7 +474,7 @@ mod tests { mod contract_entry { use super::*; - use core::ans_host::state::CONTRACT_ADDRESSES; + use crate::core::ans_host::state::CONTRACT_ADDRESSES; #[test] fn exists() { @@ -549,7 +549,7 @@ mod tests { use abstract_core::objects::chain_name::ChainName; use super::*; - use core::ans_host::state::CHANNELS; + use crate::core::ans_host::state::CHANNELS; use std::str::FromStr; #[test] @@ -586,7 +586,7 @@ mod tests { mod asset_info_and_asset { use super::*; - use core::ans_host::state::REV_ASSET_ADDRESSES; + use crate::core::ans_host::state::REV_ASSET_ADDRESSES; #[test] fn exists() { diff --git a/framework/packages/abstract-sdk/src/apis/adapter.rs b/framework/packages/abstract-sdk/src/apis/adapter.rs index 89ee3a42e9..a2f94719c9 100644 --- a/framework/packages/abstract-sdk/src/apis/adapter.rs +++ b/framework/packages/abstract-sdk/src/apis/adapter.rs @@ -110,7 +110,7 @@ mod tests { } mod adapter_request { use super::*; - use core::adapter::{self, AdapterRequestMsg}; + use crate::core::adapter::{self, AdapterRequestMsg}; #[test] fn should_return_err_if_not_dependency() { diff --git a/framework/packages/abstract-sdk/src/apis/app.rs b/framework/packages/abstract-sdk/src/apis/app.rs index ca501de471..c145f503bb 100644 --- a/framework/packages/abstract-sdk/src/apis/app.rs +++ b/framework/packages/abstract-sdk/src/apis/app.rs @@ -118,8 +118,8 @@ mod tests { } mod app_request { + use crate::core::app; use crate::mock_module::MockModuleExecuteMsg; - use core::app; use super::*; @@ -158,7 +158,7 @@ mod tests { } mod app_configure { - use core::app; + use crate::core::app; use super::*; diff --git a/framework/packages/abstract-sdk/src/apis/bank.rs b/framework/packages/abstract-sdk/src/apis/bank.rs index 0b4c58fb1e..e76aff5201 100644 --- a/framework/packages/abstract-sdk/src/apis/bank.rs +++ b/framework/packages/abstract-sdk/src/apis/bank.rs @@ -1,10 +1,10 @@ //! # Bank //! The Bank object handles asset transfers to and from the Account. +use crate::core::objects::{AnsAsset, AssetEntry}; use crate::features::AccountIdentification; use crate::AccountAction; use crate::{ans_resolve::Resolve, features::AbstractNameService, AbstractSdkResult}; -use core::objects::{AnsAsset, AssetEntry}; use cosmwasm_std::to_binary; use cosmwasm_std::{Addr, Coin, CosmosMsg, Deps, Env}; use cw_asset::Asset; diff --git a/framework/packages/abstract-sdk/src/apis/modules.rs b/framework/packages/abstract-sdk/src/apis/modules.rs index 2f02893b38..d06439064b 100644 --- a/framework/packages/abstract-sdk/src/apis/modules.rs +++ b/framework/packages/abstract-sdk/src/apis/modules.rs @@ -1,12 +1,12 @@ //! # Module //! The Module interface provides helper functions to execute functions on other modules installed on the Account. +use crate::core::objects::module::ModuleId; use crate::{ features::{AccountIdentification, Dependencies}, AbstractSdkResult, }; use abstract_core::manager::state::ACCOUNT_MODULES; -use core::objects::module::ModuleId; use cosmwasm_std::{Addr, Deps, QueryRequest, WasmQuery}; use cw2::{ContractVersion, CONTRACT}; diff --git a/framework/packages/abstract-sdk/src/base/contract_base.rs b/framework/packages/abstract-sdk/src/base/contract_base.rs index 80a24dfc16..c0a90cf2b9 100644 --- a/framework/packages/abstract-sdk/src/base/contract_base.rs +++ b/framework/packages/abstract-sdk/src/base/contract_base.rs @@ -1,6 +1,6 @@ use super::handler::Handler; +use crate::core::objects::dependency::StaticDependency; use crate::{AbstractSdkError, AbstractSdkResult}; -use core::objects::dependency::StaticDependency; use cosmwasm_std::{Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, Storage}; use cw2::{ContractVersion, CONTRACT}; use cw_storage_plus::Item; diff --git a/framework/packages/abstract-sdk/src/base/features/dependencies.rs b/framework/packages/abstract-sdk/src/base/features/dependencies.rs index b6b1f72f5f..afe66e1f31 100644 --- a/framework/packages/abstract-sdk/src/base/features/dependencies.rs +++ b/framework/packages/abstract-sdk/src/base/features/dependencies.rs @@ -1,5 +1,5 @@ use crate::base::Handler; -use core::objects::dependency::StaticDependency; +use crate::core::objects::dependency::StaticDependency; /// Retrieve the dependencies of a module. pub trait Dependencies: Sized { diff --git a/framework/packages/abstract-sdk/src/base/features/identification.rs b/framework/packages/abstract-sdk/src/base/features/identification.rs index 3654faeba9..687cfad901 100644 --- a/framework/packages/abstract-sdk/src/base/features/identification.rs +++ b/framework/packages/abstract-sdk/src/base/features/identification.rs @@ -1,8 +1,8 @@ +use crate::core::objects::AccountId; use abstract_core::{ objects::common_namespace::ADMIN_NAMESPACE, proxy::state::ACCOUNT_ID, version_control::AccountBase, }; -use core::objects::AccountId; use cosmwasm_std::{Addr, Deps}; use cw_storage_plus::Item; diff --git a/framework/packages/abstract-sdk/src/base/features/module_identification.rs b/framework/packages/abstract-sdk/src/base/features/module_identification.rs index eb46d4fb04..5866edf759 100644 --- a/framework/packages/abstract-sdk/src/base/features/module_identification.rs +++ b/framework/packages/abstract-sdk/src/base/features/module_identification.rs @@ -1,4 +1,4 @@ -use core::objects::module::ModuleId; +use crate::core::objects::module::ModuleId; use crate::base::Handler; diff --git a/framework/packages/abstract-sdk/src/cw_helpers/cosmwasm_std/wasm_query.rs b/framework/packages/abstract-sdk/src/cw_helpers/cosmwasm_std/wasm_query.rs index ee91b1d02b..0a86679197 100644 --- a/framework/packages/abstract-sdk/src/cw_helpers/cosmwasm_std/wasm_query.rs +++ b/framework/packages/abstract-sdk/src/cw_helpers/cosmwasm_std/wasm_query.rs @@ -27,7 +27,7 @@ pub fn wasm_raw_query( #[cfg(test)] mod test { use super::*; - use core::{app, app::BaseQueryMsg}; + use crate::core::{app, app::BaseQueryMsg}; use cosmwasm_std::Empty; #[test] diff --git a/framework/packages/abstract-sdk/src/cw_helpers/fees.rs b/framework/packages/abstract-sdk/src/cw_helpers/fees.rs index 4c1b51a22e..50bca52cfc 100644 --- a/framework/packages/abstract-sdk/src/cw_helpers/fees.rs +++ b/framework/packages/abstract-sdk/src/cw_helpers/fees.rs @@ -1,7 +1,7 @@ //! # Fee helpers //! Helper trait that lets you easily charge fees on assets -use core::objects::fee::{Fee, UsageFee}; +use crate::core::objects::fee::{Fee, UsageFee}; use cosmwasm_std::{CosmosMsg, Uint128}; use cw_asset::Asset; diff --git a/framework/packages/abstract-sdk/src/error.rs b/framework/packages/abstract-sdk/src/error.rs index a535a7dfa2..cb4a592698 100644 --- a/framework/packages/abstract-sdk/src/error.rs +++ b/framework/packages/abstract-sdk/src/error.rs @@ -1,6 +1,6 @@ #![allow(missing_docs)] +use crate::core::{objects::AssetEntry, AbstractError}; use abstract_core::objects::AccountId; -use core::{objects::AssetEntry, AbstractError}; use cosmwasm_std::Addr; use cw_asset::AssetError; use std::fmt::{Display, Formatter}; diff --git a/framework/packages/abstract-sdk/src/feature_objects.rs b/framework/packages/abstract-sdk/src/feature_objects.rs index f9821cdd5f..c85bdb160a 100644 --- a/framework/packages/abstract-sdk/src/feature_objects.rs +++ b/framework/packages/abstract-sdk/src/feature_objects.rs @@ -4,13 +4,13 @@ //! These objects are mostly used internally to easy re-use application code without //! requiring the usage of a base contract. +use crate::core::PROXY; use crate::{ features::{AccountIdentification, ModuleIdentification}, AbstractSdkResult, }; pub use abstract_core::objects::{ans_host::AnsHost, version_control::VersionControlContract}; use abstract_core::version_control::AccountBase; -use core::PROXY; use cosmwasm_std::{Addr, Deps}; /// Store a proxy contract address. diff --git a/framework/packages/abstract-sdk/src/lib.rs b/framework/packages/abstract-sdk/src/lib.rs index 2beb636a8f..018fd5e9a5 100644 --- a/framework/packages/abstract-sdk/src/lib.rs +++ b/framework/packages/abstract-sdk/src/lib.rs @@ -7,7 +7,7 @@ pub type AbstractSdkResult = Result; /// The Abstract Core crate which contains the state and message objects for the native contracts. Also contains helper objects. -pub extern crate abstract_core as core; +pub use abstract_core as core; mod account_action; mod ans_resolve; diff --git a/framework/packages/abstract-sdk/src/mock_module.rs b/framework/packages/abstract-sdk/src/mock_module.rs index b332be475b..fdbe867e44 100644 --- a/framework/packages/abstract-sdk/src/mock_module.rs +++ b/framework/packages/abstract-sdk/src/mock_module.rs @@ -4,6 +4,7 @@ use abstract_core::objects::dependency::StaticDependency; use abstract_testing::prelude::{TEST_MODULE_ID, TEST_PROXY}; use cosmwasm_std::{Addr, Deps}; +use crate::core::objects::module::ModuleId; use crate::features::{ AbstractNameService, AbstractRegistryAccess, AccountIdentification, Dependencies, ModuleIdentification, @@ -11,7 +12,6 @@ use crate::features::{ use crate::AbstractSdkResult; use abstract_core::objects::ans_host::AnsHost; use abstract_core::objects::version_control::VersionControlContract; -use core::objects::module::ModuleId; // We implement the following traits here for the mock module (in this package) to avoid a circular dependency impl AccountIdentification for MockModule { diff --git a/framework/packages/standards/dex/Cargo.toml b/framework/packages/standards/dex/Cargo.toml index 0f4622d31c..771050c2a6 100644 --- a/framework/packages/standards/dex/Cargo.toml +++ b/framework/packages/standards/dex/Cargo.toml @@ -34,10 +34,10 @@ cw-storage-plus = { workspace = true } abstract-core = { workspace = true } abstract-sdk = { workspace = true } -abstract-adapter = { workspace = true } abstract-adapter-utils = { workspace = true } cw-orch = { workspace = true, optional = true, features = ["daemon"] } -abstract-interface = { workspace = true, optional = true } +abstract-adapter = { path = "../../abstract-adapter", version = "0.19" } +abstract-interface = { path = "../../abstract-interface", version = "0.19", optional = true } ibc-chain-registry = { version = "0.25.0", optional = true } diff --git a/framework/packages/standards/staking/Cargo.toml b/framework/packages/standards/staking/Cargo.toml index 76f6fa8165..bdaf1729b3 100644 --- a/framework/packages/standards/staking/Cargo.toml +++ b/framework/packages/standards/staking/Cargo.toml @@ -32,10 +32,10 @@ cw-utils = "1.0.1" abstract-core = { workspace = true } abstract-sdk = { workspace = true } -abstract-adapter = { workspace = true } abstract-adapter-utils = { workspace = true } cw-orch = { workspace = true, optional = true } -abstract-interface = { workspace = true, optional = true } +abstract-interface = { path = "../../abstract-interface", version = "0.19", optional = true } +abstract-adapter = { path = "../../abstract-adapter", version = "0.19" } [dev-dependencies] abstract-interface = { workspace = true, features = ["daemon"] } diff --git a/framework/publish/publish.sh b/framework/publish/publish.sh index 0647b08385..239a5ddb07 100755 --- a/framework/publish/publish.sh +++ b/framework/publish/publish.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# shellcheck disable=all set -o errexit -o nounset -o pipefail command -v shellcheck >/dev/null && shellcheck "$0" @@ -76,6 +77,7 @@ echo "All the contracts are published!" # Now all the packages and standards PACKAGES="abstract-interface abstract-adapter abstract-app abstract-ibc-host" +STANDARDS="utils staking dex" for pack in $PACKAGES; do ( @@ -85,6 +87,14 @@ for pack in $PACKAGES; do ) done +for pack in $STANDARDS; do + ( + cd "packages/standards/$pack" + echo "Publishing $pack" + publish_crate + ) +done + VERSION=$(grep -A1 "\[workspace.package\]" Cargo.toml | awk -F'"' '/version/ {print $2}'); git tag v"$VERSION" git push origin v"$VERSION" diff --git a/framework/tests/src/contracts.rs b/framework/tests/src/contracts.rs deleted file mode 100644 index 7dc90d572a..0000000000 --- a/framework/tests/src/contracts.rs +++ /dev/null @@ -1,32 +0,0 @@ -use cw_orch::prelude::*; - -use cosmwasm_std::Empty; -use cw_orch::interface; - -#[interface( - abstract_etf::msg::InstantiateMsg, - abstract_etf::msg::ExecuteMsg, - abstract_etf::msg::QueryMsg, - Empty -)] -pub struct AbstractETF; - -impl Uploadable for AbstractETF { - fn wasm(&self) -> WasmPath { - WasmPath::new("artifacts/abstract_etf.wasm").unwrap() - } -} - -#[interface( - cw20_base::msg::InstantiateMsg, - cw20_base::msg::ExecuteMsg, - cw20_base::msg::QueryMsg, - Empty -)] -pub struct Cw20Base; - -impl Uploadable for Cw20Base { - fn wasm(&self) -> WasmPath { - WasmPath::new("artifacts/cw20_base.wasm").unwrap() - } -} diff --git a/integrations/astroport/packages/abstract-adapter/Cargo.toml b/integrations/astroport/packages/abstract-adapter/Cargo.toml index 12ea1150a4..606a48c60c 100644 --- a/integrations/astroport/packages/abstract-adapter/Cargo.toml +++ b/integrations/astroport/packages/abstract-adapter/Cargo.toml @@ -20,9 +20,9 @@ full_integration = [ [dependencies] cosmwasm-std = { version = "1.1" } -abstract-staking-standard = { version = "0.19.0", path = "../../../../framework/packages/standards/staking" } -abstract-dex-standard = { version = "0.19.0", path = "../../../../framework/packages/standards/dex" } -abstract-sdk = { version = "0.19.0", path = "../../../../framework/packages/abstract-sdk" } +abstract-staking-standard = { version = "0.19.2" } +abstract-dex-standard = { version = "0.19.2" } +abstract-sdk = { version = "0.19.2" } cw20 = { version = "0.15", optional = true } @@ -34,7 +34,5 @@ astroport = { path = "../astroport/", optional = true } lazy_static = "1.4.0" [dev-dependencies] -abstract-dex-standard = { version = "0.19.0", features = [ - "testing", -], path = "../../../../framework/packages/standards/dex" } +abstract-dex-standard = { version = "0.19.2", features = ["testing"] } cw-orch = { version = "0.16.4", features = ["daemon"] } diff --git a/integrations/kujira/packages/abstract-adapter/Cargo.toml b/integrations/kujira/packages/abstract-adapter/Cargo.toml index 0b1fd060de..96c69a23d2 100644 --- a/integrations/kujira/packages/abstract-adapter/Cargo.toml +++ b/integrations/kujira/packages/abstract-adapter/Cargo.toml @@ -13,20 +13,18 @@ full_integration = ["dep:kujira", "dep:cw20", "dep:cw-asset", "dep:cw-utils"] [dependencies] cosmwasm-std = { version = "1.1.2", features = ["stargate"] } -abstract-core = { version = "0.19.0", path = "../../../../framework/packages/abstract-core" } -abstract-staking-standard = { version = "0.19.0", path = "../../../../framework/packages/standards/staking" } -abstract-dex-standard = { version = "0.19.0", path = "../../../../framework/packages/standards/dex" } +abstract-core = { version = "0.19.2" } +abstract-staking-standard = { version = "0.19.2" } +abstract-dex-standard = { version = "0.19.2" } kujira = { version = "0.8.2", optional = true } #Abstract dependencies cw20 = { version = "0.15", optional = true } -abstract-sdk = { version = "0.19.0", path = "../../../../framework/packages/abstract-sdk" } +abstract-sdk = { version = "0.19.2" } cw-asset = { version = "3.0.0", optional = true } cw-utils = { version = "1.0.1", optional = true } [dev-dependencies] -abstract-dex-standard = { version = "0.19.0", path = "../../../../framework/packages/standards/dex", features = [ - "testing", -] } +abstract-dex-standard = { version = "0.19.2", features = ["testing"] } cw-orch = { version = "0.16.4", features = ["daemon"] } cosmwasm-schema = "1.3.1" diff --git a/integrations/osmosis-adapter/Cargo.toml b/integrations/osmosis-adapter/Cargo.toml index 97ecf1df60..69a2749bc6 100644 --- a/integrations/osmosis-adapter/Cargo.toml +++ b/integrations/osmosis-adapter/Cargo.toml @@ -18,13 +18,13 @@ full_integration = [ [dependencies] cosmwasm-std = { version = "1.1.2", features = ["stargate"] } -abstract-core = { version = "0.19.0", path = "../../framework/packages/abstract-core" } -abstract-staking-standard = { version = "0.19.0", path = "../../framework/packages/standards/staking" } -abstract-dex-standard = { version = "0.19.0", path = "../../framework/packages/standards/dex" } +abstract-core = { version = "0.19.2" } +abstract-staking-standard = { version = "0.19.2" } +abstract-dex-standard = { version = "0.19.2" } #Abstract dependencies cw20 = { version = "0.15", optional = true } -abstract-sdk = { version = "0.19.0", optional = true, path = "../../framework/packages/abstract-sdk" } +abstract-sdk = { version = "0.19.2", optional = true } cw-asset = { version = "3.0.0", optional = true } cw-utils = { version = "1.0.1", optional = true } osmosis-std = { version = "=0.19.1", optional = true } diff --git a/integrations/wyndex/packages/wyndex-adapter/Cargo.toml b/integrations/wyndex/packages/wyndex-adapter/Cargo.toml index ce5f9b2101..1589f17d92 100644 --- a/integrations/wyndex/packages/wyndex-adapter/Cargo.toml +++ b/integrations/wyndex/packages/wyndex-adapter/Cargo.toml @@ -23,9 +23,9 @@ full_integration = [ [dependencies] cosmwasm-std = { workspace = true } -abstract-sdk = { version = "0.19.0", path = "../../../../framework/packages/abstract-sdk" } -abstract-staking-standard = { version = "0.19.0", path = "../../../../framework/packages/standards/staking" } -abstract-dex-standard = { version = "0.19.0", path = "../../../../framework/packages/standards/dex" } +abstract-sdk = { version = "0.19.2" } +abstract-staking-standard = { version = "0.19.2" } +abstract-dex-standard = { version = "0.19.2" } # Optional wyndex = { path = "../wyndex/", optional = true } diff --git a/interchain/Cargo.toml b/interchain/Cargo.toml new file mode 100644 index 0000000000..cd3b0e058b --- /dev/null +++ b/interchain/Cargo.toml @@ -0,0 +1,105 @@ +[workspace] +members = ["scripts", "tests"] + +# Enable the version 2 feature resolver, which avoids unifying features for targets that are not being built +# +# Critically this prevents dev-dependencies from enabling features even when not building a target that +# uses dev-dependencies, e.g. the library crate. This in turn ensures that we can catch invalid feature +# flag combinations that would otherwise only surface in dependent crates +# +# Reference - https://doc.rust-lang.org/nightly/cargo/reference/features.html#feature-resolver-version-2 +# See - https://github.com/apache/arrow-rs/pull/1822/files +resolver = "2" + +[workspace.package] +version = "0.19.2" +authors = [ + "CyberHoward ", + "Riada ", + "Abstract Money ", +] +edition = "2021" +homepage = "https://abstract.money" +documentation = "https://docs.abstract.money/" +repository = "https://github.com/AbstractSDK/contracts" +license = "GPL-3.0-or-later" +keywords = ["cosmos", "cosmwasm", "framework"] + +[workspace.dependencies] +cosmwasm-std = { version = "1.2" } +cosmwasm-schema = { version = "1.2" } +cw-controllers = { version = "1.0" } +cw-utils = { version = "1.0" } +cw-storage-plus = "~1.1" +cw2 = { version = "1.0" } +cw20 = { version = "1.0" } +cw20-base = { version = "1.0", features = ["library"] } + +cw-asset = { version = "3.0" } +cw-ownable = { version = "0.5" } +cw-address-like = { version = "1.0" } + +schemars = "0.8" +serde = { version = "1.0", default-features = false, features = ["derive"] } +thiserror = { version = "1.0.49" } +protobuf = { version = "2", features = ["with-bytes"] } + +clap = { version = "4.0.32", features = ["derive"] } +semver = "1.0" +cw-semver = { version = "1.0" } +# cw-orch = { version = "0.16.1" } +cw-orch = { version = "0.16.3" } +tokio = { version = "1.4", features = ["full"] } +polytone = { git = "https://github.com/AbstractSDK/polytone", tag = "v1.0.0" } +polytone-note = { git = "https://github.com/AbstractSDK/polytone", tag = "v1.0.0" } + + +## crates in order of publishing ## see docs/Publishing.md + +abstract-adapter = { path = "packages/abstract-adapter" } +abstract-app = { path = "packages/abstract-app" } + +# Keep these as path, creates cirular dependency otherwise +# Only need to re-publish all contracts if a re-publish of abstract-interface is required +abstract-interface = { path = "packages/abstract-interface" } +module-factory = { package = "abstract-module-factory", path = "contracts/native/module-factory" } +account-factory = { package = "abstract-account-factory", path = "contracts/native/account-factory" } +ans-host = { package = "abstract-ans-host", path = "contracts/native/ans-host" } +version-control = { package = "abstract-version-control", path = "contracts/native/version-control" } + +# Ibc +ibc-client = { package = "abstract-ibc-client", path = "contracts/native/ibc-client" } +ibc-host = { package = "abstract-ibc-host", path = "contracts/native/ibc-host" } + +proxy = { package = "abstract-proxy", path = "contracts/account/proxy" } +manager = { package = "abstract-manager", path = "contracts/account/manager" } + +abstract-sdk = { version = "0.19.2", path = "packages/abstract-sdk" } +abstract-testing = { version = "0.19.2", path = "packages/abstract-testing" } +abstract-core = { version = "0.19.2", path = "packages/abstract-core" } + +# These should remain fixed and don't need to be re-published (unless changes are made) +abstract-macros = { version = "0.19.2", path = "packages/abstract-macros" } +abstract-ica = { version = "0.19.2", path = "packages/abstract-ica" } + +abstract-adapter-utils = { version = "0.19.2", path = "packages/standards/utils" } +abstract-dex-standard = { path = "packages/standards/dex" } +abstract-staking-standard = { path = "packages/standards/staking" } + +## Testing +cw-multi-test = { version = "0.16.2" } +rstest = "0.17.0" +speculoos = "0.11.0" +anyhow = "1" + +# Backup release profile, will result in warnings during optimization +[profile.release] +rpath = false +lto = true +overflow-checks = true +opt-level = 3 +debug = false +debug-assertions = false +codegen-units = 1 +panic = 'abort' +incremental = false diff --git a/framework/scripts/.gitignore b/interchain/scripts/.gitignore similarity index 100% rename from framework/scripts/.gitignore rename to interchain/scripts/.gitignore diff --git a/framework/scripts/Cargo.toml b/interchain/scripts/Cargo.toml similarity index 100% rename from framework/scripts/Cargo.toml rename to interchain/scripts/Cargo.toml index 8347c05239..33b72cd0f3 100644 --- a/framework/scripts/Cargo.toml +++ b/interchain/scripts/Cargo.toml @@ -18,6 +18,7 @@ cw20-base = { workspace = true } cw-orch = { package = "cw-orch-interchain", git = "ssh://git@github.com/AbstractSDK/cw-orch-interchain.git", features = [ "daemon", ], tag = "v0.16.4" } +cw-orch-polytone = { git = "https://github.com/AbstractSDK/polytone", tag = "v1.0.0" } abstract-core = { workspace = true, features = ["interface"] } abstract-interface = { workspace = true, features = ["daemon"] } @@ -28,7 +29,6 @@ serde_json = "1.0.79" reqwest = { version = "0.11.9" } dotenv = "0.15.0" env_logger = "0.10.0" -cw-orch-polytone = { git = "https://github.com/AbstractSDK/polytone", tag = "v1.0.0" } url = "2.4.1" cosmos-sdk-proto = { version = "0.19.0", features = [ diff --git a/framework/scripts/deployments.json b/interchain/scripts/deployments.json similarity index 100% rename from framework/scripts/deployments.json rename to interchain/scripts/deployments.json diff --git a/framework/scripts/src/abstract_ibc.rs b/interchain/scripts/src/abstract_ibc.rs similarity index 100% rename from framework/scripts/src/abstract_ibc.rs rename to interchain/scripts/src/abstract_ibc.rs diff --git a/framework/scripts/src/bin/full_deploy.rs b/interchain/scripts/src/bin/full_deploy.rs similarity index 100% rename from framework/scripts/src/bin/full_deploy.rs rename to interchain/scripts/src/bin/full_deploy.rs diff --git a/framework/scripts/src/bin/migrate.rs b/interchain/scripts/src/bin/migrate.rs similarity index 100% rename from framework/scripts/src/bin/migrate.rs rename to interchain/scripts/src/bin/migrate.rs diff --git a/framework/scripts/src/bin/update_ans.rs b/interchain/scripts/src/bin/update_ans.rs similarity index 100% rename from framework/scripts/src/bin/update_ans.rs rename to interchain/scripts/src/bin/update_ans.rs diff --git a/framework/scripts/src/lib.rs b/interchain/scripts/src/lib.rs similarity index 100% rename from framework/scripts/src/lib.rs rename to interchain/scripts/src/lib.rs diff --git a/framework/scripts/state.json b/interchain/scripts/state.json similarity index 78% rename from framework/scripts/state.json rename to interchain/scripts/state.json index 1c391f6067..9b853f91d4 100644 --- a/framework/scripts/state.json +++ b/interchain/scripts/state.json @@ -94,5 +94,31 @@ "abstract:version-control": "terra1d87wpuvjgqe8a5qytneyd8puc7y2uan6tcr6mwq873trjm8v2pzs7t593t" } } + }, + "kujira": { + "harpoon-4": { + "code_ids": { + "abstract:account-factory": 2470, + "abstract:ans-host": 2468, + "abstract:cw-staking": 2474, + "abstract:dca": 2477, + "abstract:dex": 2475, + "abstract:etf": 2476, + "abstract:manager": 2472, + "abstract:module-factory": 2471, + "abstract:proxy": 2473, + "abstract:version-control": 2469 + }, + "default": { + "abstract:account-factory": "kujira1yyk4vy08rl9gzcseugvj5cznue609a59z90mqy37kktu42dkdjcstvtamq", + "abstract:ans-host": "kujira1lh5rjqpxzped0m03755dhksgdt43gqxqa5ua583hvcuwz57gc80qlvdmcy", + "abstract:cw-staking": "kujira1w5hemku24gsj8x47hu5apg8q4533646yg3pyjkhgk9ddl22q3zyqjqdh82", + "abstract:dex": "kujira19pjk0nnjz3zmlqved9x2lt5hkgutmes0a6uj6fqtfge23dw42fusgmguse", + "abstract:manager": "kujira15pycld6cw6wuzl5ny349uvuv95ulehwgdqm43xt3s7vwj86nqr6sc7wlkq", + "abstract:module-factory": "kujira1e0ut55qwzq2pdq0a2gsr6vua38u436dqpxnpxqa5nhxna3smlu6qddmla8", + "abstract:proxy": "kujira1q060eew952esm98300k09nmp83g06rrwymzwkgq67ky6x302wnyqqu3hpa", + "abstract:version-control": "kujira1yapmxjmj9fpaqa6vmkq2mlang4jqa8fymzj34erzfkwu90gevl2q66lmnu" + } + } } } \ No newline at end of file diff --git a/framework/tests/.gitignore b/interchain/tests/.gitignore similarity index 100% rename from framework/tests/.gitignore rename to interchain/tests/.gitignore diff --git a/framework/tests/Cargo.toml b/interchain/tests/Cargo.toml similarity index 95% rename from framework/tests/Cargo.toml rename to interchain/tests/Cargo.toml index 08a7bdd8cc..4e82921cc7 100644 --- a/framework/tests/Cargo.toml +++ b/interchain/tests/Cargo.toml @@ -48,7 +48,6 @@ futures = "0.3.28" ibc-chain-registry = "0.24.1" ibc-relayer-types = "0.24.1" -abstract-etf = { git = "https://github.com/AbstractSDK/apps/" } osmosis-std = "0.16.1" cosmrs = "0.14.0" prost = "0.11.9" diff --git a/framework/tests/README.md b/interchain/tests/README.md similarity index 100% rename from framework/tests/README.md rename to interchain/tests/README.md diff --git a/framework/tests/src/bin/setup_funds.rs b/interchain/tests/src/bin/setup_funds.rs similarity index 100% rename from framework/tests/src/bin/setup_funds.rs rename to interchain/tests/src/bin/setup_funds.rs diff --git a/framework/tests/src/bin/token_bridge.rs b/interchain/tests/src/bin/token_bridge.rs similarity index 100% rename from framework/tests/src/bin/token_bridge.rs rename to interchain/tests/src/bin/token_bridge.rs diff --git a/framework/tests/src/interchain_accounts.rs b/interchain/tests/src/interchain_accounts.rs similarity index 100% rename from framework/tests/src/interchain_accounts.rs rename to interchain/tests/src/interchain_accounts.rs diff --git a/framework/tests/src/lib.rs b/interchain/tests/src/lib.rs similarity index 85% rename from framework/tests/src/lib.rs rename to interchain/tests/src/lib.rs index 2914feaa2f..4a6aa39a9b 100644 --- a/framework/tests/src/lib.rs +++ b/interchain/tests/src/lib.rs @@ -1,5 +1,3 @@ -pub mod contracts; - pub const JUNO: &str = "juno-1"; pub const STARGAZE: &str = "stargaze-1"; pub mod interchain_accounts; diff --git a/framework/tests/src/setup.rs b/interchain/tests/src/setup.rs similarity index 100% rename from framework/tests/src/setup.rs rename to interchain/tests/src/setup.rs diff --git a/modules/.cargo/config.toml b/modules/.cargo/config.toml deleted file mode 100644 index c91c3f38b7..0000000000 --- a/modules/.cargo/config.toml +++ /dev/null @@ -1,2 +0,0 @@ -[net] -git-fetch-with-cli = true diff --git a/modules/Cargo.toml b/modules/Cargo.toml index 250f09af9c..25d257a08b 100644 --- a/modules/Cargo.toml +++ b/modules/Cargo.toml @@ -9,7 +9,7 @@ members = [ resolver = "2" [workspace.package] -version = "0.19.0" +version = "0.19.2" authors = [ "CyberHoward ", "Riada ", @@ -31,8 +31,10 @@ cw-storage-plus = "~1.1" cw2 = { version = "1.0" } cw20-base = { git = "https://github.com/AbstractSDK/cw-plus.git", version = "1.0.1", features = [ "library", -], tag = "v0.17.0" } -cw20 = { git = "https://github.com/AbstractSDK/cw-plus.git", version = "1.0.1", tag = "v0.17.0" } +], tag = "v1.1.1" } +cw-plus-interface = { git = "https://github.com/AbstractSDK/cw-plus.git", version = "0.1.0", tag = "v1.1.1" } + +cw20 = { git = "https://github.com/AbstractSDK/cw-plus.git", version = "1.0.1", tag = "v1.1.1" } cw-asset = { version = "3.0" } cw-ownable = { version = "0.5" } @@ -40,29 +42,30 @@ cw-address-like = { version = "1.0" } schemars = "0.8" serde = { version = "1.0", default-features = false, features = ["derive"] } -thiserror = { version = "<=1.0.48" } +thiserror = { version = "1.0.50" } protobuf = { version = "2", features = ["with-bytes"] } chrono = { version = "0.4.31", default-features = false } clap = { version = "4.0.32", features = ["derive"] } semver = "1.0" cw-semver = { version = "1.0" } -cw-orch = { version = "0.16.3" } +cw-orch = { version = "0.16.4" } tokio = { version = "1.4", features = ["full"] } ## crates in order of publishing ## see docs/Publishing.md -abstract-interface = { version = "0.19.0" } -abstract-adapter = { version = "0.19.0" } -abstract-app = { version = "0.19.0" } -abstract-sdk = { version = "0.19.0" } -abstract-testing = { version = "0.19.0" } -abstract-core = { version = "0.19.0" } -abstract-macros = { version = "0.19.0" } - -abstract-adapter-utils = { version = "0.19.0" } -abstract-dex-standard = { version = "0.19.0" } -abstract-staking-standard = { version = "0.19.0" } +abstract-interface = { version = "0.19.2" } +abstract-adapter = { version = "0.19.2" } +abstract-app = { version = "0.19.2" } +abstract-sdk = { version = "0.19.2" } +abstract-testing = { version = "0.19.2" } +abstract-core = { version = "0.19.2" } +abstract-macros = { version = "0.19.2" } +abstract-ica = { version = "0.19.2" } + +abstract-adapter-utils = { version = "0.19.2" } +abstract-dex-standard = { version = "0.19.2" } +abstract-staking-standard = { version = "0.19.2" } # Juno dexes # abstract-wyndex-adapter = { path = "../integrations/wyndex/packages/wyndex-adapter", default-features = false } diff --git a/modules/artifacts/abstract_cw_staking-aarch64.wasm b/modules/artifacts/abstract_cw_staking-aarch64.wasm new file mode 100644 index 0000000000..38191a80f9 Binary files /dev/null and b/modules/artifacts/abstract_cw_staking-aarch64.wasm differ diff --git a/modules/artifacts/abstract_cw_staking-injective.wasm b/modules/artifacts/abstract_cw_staking-injective.wasm new file mode 100644 index 0000000000..de6bbbd667 Binary files /dev/null and b/modules/artifacts/abstract_cw_staking-injective.wasm differ diff --git a/modules/artifacts/abstract_cw_staking-juno.wasm b/modules/artifacts/abstract_cw_staking-juno.wasm new file mode 100644 index 0000000000..14b55ab519 Binary files /dev/null and b/modules/artifacts/abstract_cw_staking-juno.wasm differ diff --git a/modules/artifacts/abstract_cw_staking-kujira.wasm b/modules/artifacts/abstract_cw_staking-kujira.wasm new file mode 100644 index 0000000000..0f11c83aa7 Binary files /dev/null and b/modules/artifacts/abstract_cw_staking-kujira.wasm differ diff --git a/modules/artifacts/abstract_cw_staking-neutron.wasm b/modules/artifacts/abstract_cw_staking-neutron.wasm new file mode 100644 index 0000000000..de6bbbd667 Binary files /dev/null and b/modules/artifacts/abstract_cw_staking-neutron.wasm differ diff --git a/modules/artifacts/abstract_cw_staking-osmosis.wasm b/modules/artifacts/abstract_cw_staking-osmosis.wasm new file mode 100644 index 0000000000..59885958b8 Binary files /dev/null and b/modules/artifacts/abstract_cw_staking-osmosis.wasm differ diff --git a/modules/artifacts/abstract_cw_staking-sei.wasm b/modules/artifacts/abstract_cw_staking-sei.wasm new file mode 100644 index 0000000000..de6bbbd667 Binary files /dev/null and b/modules/artifacts/abstract_cw_staking-sei.wasm differ diff --git a/modules/artifacts/abstract_cw_staking-terra.wasm b/modules/artifacts/abstract_cw_staking-terra.wasm new file mode 100644 index 0000000000..de6bbbd667 Binary files /dev/null and b/modules/artifacts/abstract_cw_staking-terra.wasm differ diff --git a/modules/artifacts/abstract_cw_staking.wasm b/modules/artifacts/abstract_cw_staking.wasm new file mode 100644 index 0000000000..096497dea1 Binary files /dev/null and b/modules/artifacts/abstract_cw_staking.wasm differ diff --git a/modules/artifacts/abstract_dex_adapter-aarch64.wasm b/modules/artifacts/abstract_dex_adapter-aarch64.wasm new file mode 100644 index 0000000000..c9a4a7612b Binary files /dev/null and b/modules/artifacts/abstract_dex_adapter-aarch64.wasm differ diff --git a/modules/artifacts/abstract_dex_adapter-injective.wasm b/modules/artifacts/abstract_dex_adapter-injective.wasm new file mode 100644 index 0000000000..221feb3076 Binary files /dev/null and b/modules/artifacts/abstract_dex_adapter-injective.wasm differ diff --git a/modules/artifacts/abstract_dex_adapter-juno.wasm b/modules/artifacts/abstract_dex_adapter-juno.wasm new file mode 100644 index 0000000000..e682e5f527 Binary files /dev/null and b/modules/artifacts/abstract_dex_adapter-juno.wasm differ diff --git a/modules/artifacts/abstract_dex_adapter-kujira.wasm b/modules/artifacts/abstract_dex_adapter-kujira.wasm new file mode 100644 index 0000000000..43e4a50005 Binary files /dev/null and b/modules/artifacts/abstract_dex_adapter-kujira.wasm differ diff --git a/modules/artifacts/abstract_dex_adapter-neutron.wasm b/modules/artifacts/abstract_dex_adapter-neutron.wasm new file mode 100644 index 0000000000..221feb3076 Binary files /dev/null and b/modules/artifacts/abstract_dex_adapter-neutron.wasm differ diff --git a/modules/artifacts/abstract_dex_adapter-osmosis.wasm b/modules/artifacts/abstract_dex_adapter-osmosis.wasm new file mode 100644 index 0000000000..3f6a6a670f Binary files /dev/null and b/modules/artifacts/abstract_dex_adapter-osmosis.wasm differ diff --git a/modules/artifacts/abstract_dex_adapter-sei.wasm b/modules/artifacts/abstract_dex_adapter-sei.wasm new file mode 100644 index 0000000000..221feb3076 Binary files /dev/null and b/modules/artifacts/abstract_dex_adapter-sei.wasm differ diff --git a/modules/artifacts/abstract_dex_adapter-terra.wasm b/modules/artifacts/abstract_dex_adapter-terra.wasm new file mode 100644 index 0000000000..274a732471 Binary files /dev/null and b/modules/artifacts/abstract_dex_adapter-terra.wasm differ diff --git a/modules/artifacts/abstract_dex_adapter.wasm b/modules/artifacts/abstract_dex_adapter.wasm new file mode 100644 index 0000000000..294aef4ece Binary files /dev/null and b/modules/artifacts/abstract_dex_adapter.wasm differ diff --git a/modules/artifacts/abstract_tendermint_staking_adapter-aarch64.wasm b/modules/artifacts/abstract_tendermint_staking_adapter-aarch64.wasm new file mode 100644 index 0000000000..250d262fec Binary files /dev/null and b/modules/artifacts/abstract_tendermint_staking_adapter-aarch64.wasm differ diff --git a/modules/artifacts/abstract_tendermint_staking_adapter.wasm b/modules/artifacts/abstract_tendermint_staking_adapter.wasm new file mode 100644 index 0000000000..680fa8368d Binary files /dev/null and b/modules/artifacts/abstract_tendermint_staking_adapter.wasm differ diff --git a/modules/artifacts/calendar_app-aarch64.wasm b/modules/artifacts/calendar_app-aarch64.wasm new file mode 100644 index 0000000000..d377239b7f Binary files /dev/null and b/modules/artifacts/calendar_app-aarch64.wasm differ diff --git a/modules/artifacts/calendar_app.wasm b/modules/artifacts/calendar_app.wasm new file mode 100644 index 0000000000..3f6279659c Binary files /dev/null and b/modules/artifacts/calendar_app.wasm differ diff --git a/modules/artifacts/challenge_app-aarch64.wasm b/modules/artifacts/challenge_app-aarch64.wasm new file mode 100644 index 0000000000..54fdc4b838 Binary files /dev/null and b/modules/artifacts/challenge_app-aarch64.wasm differ diff --git a/modules/artifacts/challenge_app.wasm b/modules/artifacts/challenge_app.wasm new file mode 100644 index 0000000000..2b541e8c46 Binary files /dev/null and b/modules/artifacts/challenge_app.wasm differ diff --git a/modules/artifacts/checksums.txt b/modules/artifacts/checksums.txt new file mode 100644 index 0000000000..9a34a54a69 --- /dev/null +++ b/modules/artifacts/checksums.txt @@ -0,0 +1,22 @@ +e2b31e9a4e5891667234d90a082ce1b36d741426dd86d4f5d975b935c7c2cedc abstract_cw_staking-injective.wasm +e7d75adc1bd7a11616ef86ecb04def1a585673b2bd565e7fe5daf401c1a4c0b1 abstract_cw_staking-juno.wasm +9e6613b0eda02122a02683b605ac0bc0ab595687424e68f374f4db0ec888e214 abstract_cw_staking-kujira.wasm +e2b31e9a4e5891667234d90a082ce1b36d741426dd86d4f5d975b935c7c2cedc abstract_cw_staking-neutron.wasm +272c9f1dafda9d1fe23f246efd7a5ec0b6792b050a4bf71efe32840841a1addd abstract_cw_staking-osmosis.wasm +e2b31e9a4e5891667234d90a082ce1b36d741426dd86d4f5d975b935c7c2cedc abstract_cw_staking-sei.wasm +e2b31e9a4e5891667234d90a082ce1b36d741426dd86d4f5d975b935c7c2cedc abstract_cw_staking-terra.wasm +3fcc292d71b990f73f5e9a019b1e33883962595725b17c4afd4cee8ec44d68b3 abstract_cw_staking.wasm +bed329747dca0ab34814f2f4275701d9ed2d4e2c8b3ac6c4d07c60c40aba30bb abstract_dex_adapter-injective.wasm +27049619fb37a63993b9946f67bb1f9671b90c931230dff62858057be1c18ad6 abstract_dex_adapter-juno.wasm +edb734ec0c80c798b03990f6792e4a18536ff78c8b6cfe4d034e1e0461812e51 abstract_dex_adapter-kujira.wasm +bed329747dca0ab34814f2f4275701d9ed2d4e2c8b3ac6c4d07c60c40aba30bb abstract_dex_adapter-neutron.wasm +aa95184a6b31628e2651b2ed3b007e86f79342f1c5fd1cc103668944bf4f5a02 abstract_dex_adapter-osmosis.wasm +bed329747dca0ab34814f2f4275701d9ed2d4e2c8b3ac6c4d07c60c40aba30bb abstract_dex_adapter-sei.wasm +10df29deb51aac997b57129ffccce2e1471c09530d23c1b853439fdd057b6b39 abstract_dex_adapter-terra.wasm +b9dd4864bd2d37f53ad77c6e53d9766c6037c94c2a132cd85b71144cbdab045d abstract_dex_adapter.wasm +484b457058630c9d0428b500f42250ed8edfdb91778ce65a20fdaa2c80d6f744 abstract_tendermint_staking_adapter.wasm +07288c9b83f33cd7786eb7dd480927e41578dce1c67f0f0809f3475012ea8e00 calendar_app.wasm +ae0201e671df367305b41a322dd3062db597cf3c7ee8175480ad1e95520c38f2 challenge_app.wasm +76df07eefb225e2d2a7f41ffbafdfda030b3ac217d0f28effaf13b26bdeaf5c9 croncat_app.wasm +82c02e4f29ea5d15bb827df2f643acdbbd552a4d5bd87068d190ef446c02de30 dca_app.wasm +33ef252a5e66cfd1382d30388c4c0ba29335cbac609716d3848df31a3d114578 etf_app.wasm diff --git a/modules/artifacts/checksums_intermediate.txt b/modules/artifacts/checksums_intermediate.txt new file mode 100644 index 0000000000..3c28d09726 --- /dev/null +++ b/modules/artifacts/checksums_intermediate.txt @@ -0,0 +1,8 @@ +7ea2771c45374de8678d7c82476261536a7a4fbaeeb7977a651def42dd9b2656 target/wasm32-unknown-unknown/release/abstract_cw_staking.wasm +cd33a871c6ed7aef3ddbe76dc5d32d0dbba6545463af93d413d493674a71aefd target/wasm32-unknown-unknown/release/abstract_dex_adapter.wasm +3d831ebd5440ae91b9e56b1cfe2d15bd20a9af2998978db92d84d902bf505448 target/wasm32-unknown-unknown/release/abstract_tendermint_staking_adapter.wasm +41bb55368a727f0d53b5b32b0bd7b8f36a64baf3cfda7515318515aa09a6cfad target/wasm32-unknown-unknown/release/calendar_app.wasm +77bed25c2b2863f1b058be034f3fdf1c0217b69cd77c87bb62590c85c18d2849 target/wasm32-unknown-unknown/release/challenge_app.wasm +da2554922189fce0c580cca46253550a65e89da1adb9657f0b561fbdb3a92064 target/wasm32-unknown-unknown/release/croncat_app.wasm +086833e7f0359136830a7767e82b7603f19e4a36280cfe0f6c00f3effc05ad7b target/wasm32-unknown-unknown/release/dca_app.wasm +b04a7641490e05cc9940bfa81d01b542ce4ead2f0d85f8c74e496b2215384880 target/wasm32-unknown-unknown/release/etf_app.wasm diff --git a/modules/artifacts/croncat_app-aarch64.wasm b/modules/artifacts/croncat_app-aarch64.wasm new file mode 100644 index 0000000000..3cc9a41bba Binary files /dev/null and b/modules/artifacts/croncat_app-aarch64.wasm differ diff --git a/modules/artifacts/croncat_app.wasm b/modules/artifacts/croncat_app.wasm new file mode 100644 index 0000000000..58366d8a8e Binary files /dev/null and b/modules/artifacts/croncat_app.wasm differ diff --git a/modules/artifacts/dca_app-aarch64.wasm b/modules/artifacts/dca_app-aarch64.wasm new file mode 100644 index 0000000000..f4d8e190c9 Binary files /dev/null and b/modules/artifacts/dca_app-aarch64.wasm differ diff --git a/modules/artifacts/dca_app.wasm b/modules/artifacts/dca_app.wasm new file mode 100644 index 0000000000..e6aa6fe512 Binary files /dev/null and b/modules/artifacts/dca_app.wasm differ diff --git a/modules/artifacts/etf_app-aarch64.wasm b/modules/artifacts/etf_app-aarch64.wasm new file mode 100644 index 0000000000..daadcf1a28 Binary files /dev/null and b/modules/artifacts/etf_app-aarch64.wasm differ diff --git a/modules/artifacts/etf_app.wasm b/modules/artifacts/etf_app.wasm new file mode 100644 index 0000000000..7614df40c2 Binary files /dev/null and b/modules/artifacts/etf_app.wasm differ diff --git a/modules/contracts/adapters/cw-staking/tests/stake.rs b/modules/contracts/adapters/cw-staking/tests/stake.rs index 27a5cdbdef..332134d58f 100644 --- a/modules/contracts/adapters/cw-staking/tests/stake.rs +++ b/modules/contracts/adapters/cw-staking/tests/stake.rs @@ -9,7 +9,7 @@ use abstract_interface::AbstractAccount; use abstract_interface::AdapterDeployer; use abstract_interface::DeployStrategy; use abstract_staking_standard::msg::StakingInfo; -use cw20::Cw20ExecuteMsgFns; +use cw20::msg::Cw20ExecuteMsgFns; use cw20_base::msg::QueryMsgFns; use abstract_core::objects::{AnsAsset, AssetEntry}; diff --git a/modules/contracts/adapters/dex/tests/swap.rs b/modules/contracts/adapters/dex/tests/swap.rs index 4dbccc9097..e916687909 100644 --- a/modules/contracts/adapters/dex/tests/swap.rs +++ b/modules/contracts/adapters/dex/tests/swap.rs @@ -5,7 +5,8 @@ use abstract_dex_adapter::msg::DexInstantiateMsg; use abstract_dex_adapter::DEX_ADAPTER_ID; use abstract_interface::AdapterDeployer; use abstract_interface::DeployStrategy; -use cw20::Cw20ExecuteMsgFns; +use cw20::msg::Cw20ExecuteMsgFns; + use cw20_base::msg::QueryMsgFns; use cw_orch::deploy::Deploy; mod common; diff --git a/modules/contracts/apps/croncat/Cargo.toml b/modules/contracts/apps/croncat/Cargo.toml index 7d9d465bbc..4848654107 100644 --- a/modules/contracts/apps/croncat/Cargo.toml +++ b/modules/contracts/apps/croncat/Cargo.toml @@ -92,5 +92,7 @@ croncat-integration-testing = { version = "1.1.1" } cw20-base = "0.16.0" # TODO: remove when we update cw-orch to 0.17 -cw-multi-test = { version = "0.16.5", features = ["stargate", "cosmwasm_1_3"],package = "abstract-cw-multi-test"} - +cw-multi-test = { version = "0.16.5", features = [ + "stargate", + "cosmwasm_1_3", +], package = "abstract-cw-multi-test" } diff --git a/modules/contracts/apps/dca/Cargo.toml b/modules/contracts/apps/dca/Cargo.toml index 7c243e5304..2ca28ff445 100644 --- a/modules/contracts/apps/dca/Cargo.toml +++ b/modules/contracts/apps/dca/Cargo.toml @@ -88,4 +88,7 @@ cw20-base = "0.16.0" cw20 = "0.16.0" # TODO: remove when we update cw-orch to 0.17 -cw-multi-test = { version = "0.16.5", features = ["stargate", "cosmwasm_1_3"],package = "abstract-cw-multi-test"} +cw-multi-test = { version = "0.16.5", features = [ + "stargate", + "cosmwasm_1_3", +], package = "abstract-cw-multi-test" } diff --git a/modules/contracts/apps/etf/Cargo.toml b/modules/contracts/apps/etf/Cargo.toml index 32c78ebd69..50f3ee56af 100644 --- a/modules/contracts/apps/etf/Cargo.toml +++ b/modules/contracts/apps/etf/Cargo.toml @@ -38,8 +38,8 @@ cw-asset = { workspace = true } abstract-core = { workspace = true } abstract-app = { workspace = true } abstract-sdk = { workspace = true } -cw-orch = { workspace = true, optional = true } +cw-orch = { workspace = true, optional = true } abstract-interface = { workspace = true, optional = true } [dev-dependencies] @@ -56,3 +56,4 @@ dotenv = "0.15.0" clap = { workspace = true } cw-orch = { workspace = true, features = ["daemon"] } etf-app = { path = ".", features = ["interface"] } +cw-plus-interface.workspace = true diff --git a/modules/contracts/apps/etf/tests/integration.rs b/modules/contracts/apps/etf/tests/integration.rs index 392230e4b1..5570d85243 100644 --- a/modules/contracts/apps/etf/tests/integration.rs +++ b/modules/contracts/apps/etf/tests/integration.rs @@ -11,9 +11,9 @@ use abstract_sdk::core as abstract_core; use abstract_testing::prelude::TEST_ADMIN; use cosmwasm_std::{coin, Addr, Decimal, Empty}; -use cw20::Cw20ExecuteMsgFns; -use cw20_base::contract::Cw20Base as AbstractCw20Base; +use cw20::msg::Cw20ExecuteMsgFns; use cw_orch::prelude::*; +use cw_plus_interface::cw20_base::Cw20Base as AbstractCw20Base; use cw20_base::msg::QueryMsgFns; use cw_asset::{AssetInfo, AssetUnchecked}; diff --git a/modules/packages/bundles/wyndex/Cargo.toml b/modules/packages/bundles/wyndex/Cargo.toml index ba28c7952f..d79c5f8cb0 100644 --- a/modules/packages/bundles/wyndex/Cargo.toml +++ b/modules/packages/bundles/wyndex/Cargo.toml @@ -25,5 +25,9 @@ cosmwasm-schema = { workspace = true } cw-asset = { workspace = true } anyhow = { workspace = true } cw-controllers = "1.0.1" +cw-plus-interface.workspace = true # TODO: remove when we update cw-orch to 0.17 -cw-multi-test = { version = "0.16.5", features = ["stargate", "cosmwasm_1_3"],package = "abstract-cw-multi-test"} +cw-multi-test = { version = "0.16.5", features = [ + "stargate", + "cosmwasm_1_3", +], package = "abstract-cw-multi-test" } diff --git a/modules/packages/bundles/wyndex/src/lib.rs b/modules/packages/bundles/wyndex/src/lib.rs index a1f07210f9..84e792af6c 100644 --- a/modules/packages/bundles/wyndex/src/lib.rs +++ b/modules/packages/bundles/wyndex/src/lib.rs @@ -1,4 +1,4 @@ -use cw20::Cw20ExecuteMsgFns; +use cw20::msg::Cw20ExecuteMsgFns; pub mod suite; use abstract_interface::AbstractInterfaceError; @@ -21,7 +21,7 @@ use wyndex::{ factory::{DefaultStakeConfig, PartialStakeConfig}, }; -use cw20_base::contract::Cw20Base as AbstractCw20Base; +use cw_plus_interface::cw20_base::Cw20Base as AbstractCw20Base; pub const STAKING: &str = "wyndex:staking"; pub const FACTORY: &str = "wyndex:factory"; diff --git a/scripts/wasm-all-ci.sh b/scripts/wasm-all-ci.sh index cf747b5841..9a9ca8fe6a 100755 --- a/scripts/wasm-all-ci.sh +++ b/scripts/wasm-all-ci.sh @@ -17,6 +17,10 @@ starting_dir=$(pwd) echo "Wasming framework" cd ./framework +# Remove for docker to successfuly copy +rm packages/abstract-interface/state.json +rm packages/abstract-interface/build.rs + # Delete the current artifacts folder. # rm -rf ./artifacts @@ -33,11 +37,10 @@ docker cp Cargo.lock with_code:/code # copy code into this volume docker cp ./contracts with_code:/code docker cp ./packages with_code:/code -docker cp ./scripts with_code:/code # Run the build docker run --volumes-from with_code ${abstract_image}:0.15.0 # Copy the artifacts back out -docker cp with_code:/code/artifacts ./artifacts +docker cp with_code:/code/artifacts/ . ls artifacts cd $starting_dir @@ -73,6 +76,6 @@ docker cp ./scripts modules_with_code:/code # Run the build docker run --volumes-from modules_with_code ${abstract_image}:0.15.0 # Copy the artifacts back out -docker cp modules_with_code:/code/artifacts ./artifacts +docker cp modules_with_code:/code/artifacts/ . ls artifacts cd $starting_dir \ No newline at end of file