Merge release 0.19 changes (#105)

* Changed account id structure * Corrected tests * formatting * Cleanup and test * Changelog * Corrected imports * Fixed tests * improve ChainName construction strictness * fix tests * Cleanup and storage key shortening * fix test * clippy fix * remove osmosis remenant * bump cw-orch * Hot fix for cw-orch 0.16.0 * Moved from_str to trait * bump cw-orch * fix tests * formatting * bump version to 0.19 * formatting * Update deploy_all bin (#75) * ping url, write json log * clippy * Changed account id structure (#58) * Changed account id structure * Corrected tests * formatting * Cleanup and test * Changelog * Corrected imports * Fixed tests * improve ChainName construction strictness * fix tests * Cleanup and storage key shortening * fix test * clippy fix * remove osmosis remenant * bump cw-orch * Hot fix for cw-orch 0.16.0 * Moved from_str to trait * bump cw-orch * fix tests * formatting * rm unused import --------- Co-authored-by: cyberhoward <[email protected]> Co-authored-by: CyberHoward <[email protected]> * Update WASM artifacts [skip ci] --------- Co-authored-by: Kayanski <[email protected]> Co-authored-by: cyberhoward <[email protected]> Co-authored-by: CyberHoward <[email protected]> Co-authored-by: CircleCI <[email protected]> * add release * update yml * add job * add new release action * updates circleci * update config * add when, add deploy circle ci req * edit ci config * remove graph png * test release branch match * update deploy branch match * poll circleci api status * Update WASM artifacts [skip ci] * fetch workflow_id * check endpoint get workflow id for status * force wasm diff commit with comment * fix parse response bug * check for null values on parse, log if any * add more logs for parse * add wait incase of propogation delay * update config ci * handle all status cases from ci api res * Revert "update config ci" This reverts commit 72e777e. * update status handle * update config ci after revert * add logs * change item to check on response * use pipeline id for prev pipeline qry * will update checksum, force rebuild wasm * update bin to force wasm write * force wasm commit * add arbitary to force wasm diff * add post on success * remove syntax bash error * Revert "force wasm commit" This reverts commit 8f9990a. * remove polling logic * edit release run command * update config ci * add new release workflow * change metadata req * update req * typo config * testing ci * curl * log response * fetch branch name * remove binaries * remove binaries * Update WASM artifacts [skip ci] * add artifcats dir * remove bins (#84) * Update WASM artifacts [skip ci] * merge main * update gitignore * Update WASM artifacts [skip ci] * skip build, add path * update config * update config * add requries back * update param namespace * Update WASM artifacts [skip ci] * add artifacts folder inside framework/ * remove binaries * skip build step * set log level * will trigger build * Update WASM artifacts [skip ci] * set env var for container * skip build * add log var * echo container vars * log env * set var in docker * fix typo in set command * echo env var * remove override * decode base64 env var * decode base64 * combine commands to persist env state * log * remove log * add commit deploy file step * Update deploy deploy file [skip ci] * streamline publishing process * formatting * commit push cw-orch state file * remove binaries for commit * add build step back * Update WASM artifacts [skip ci] * Revert "formatting" This reverts commit 2cabfc1. * add check for wasms, skip if no diff * skip build for now * format yml * remove first deploy * remove check * add manual wasm build action * remove redundant comment * formatting * update changelog * use branch parameter for build * update manual build * formatting * use branch env var * Update WASM binaries [skip ci] * deploy abstract * formatting * harpoon-4 deploy * 0.19.1 abstract-interface bump * fix clippy * fix and publish standards * update publish * formatting * Corrected cw-plus * formatting * fix thiserror * bump thiserror * bump abstract-app and abstract-adapter * bump all versions to 0.19.2 * remove thiserror version constraint * Update WASM binaries [skip ci] * formatting * remove path deps from integrations * formatting * formatting * fix merge * formatting * try fix * fix modules tests * fix cw-multi-test imports * formatting * don't remove wasms on ci build * fix module cw-multi-test imports * move tests and scripts * formatting * fix changelog * re-enable wasm assertion * remove osmosis adapter path dep on abstract-sdk * Update WASM binaries [skip ci] * fix state symlink * Update modules/Cargo.toml Co-authored-by: Mykhailo Donchenko <[email protected]> * Update app-template/Cargo.toml Co-authored-by: Mykhailo Donchenko <[email protected]> * Update framework/Cargo.toml Co-authored-by: Mykhailo Donchenko <[email protected]> * update framework codecov token * copy artifacts to correct folder * Update WASM binaries [skip ci] * remove nested binaries * rm scripts mount * formatting * update ci wasm script * bump framework optimizer * allow dynamic linking of abstract-adapter and abstract-app * remove symlink and build.rs on ci wasm build * Update WASM binaries [skip ci] --------- Co-authored-by: Kayanski <[email protected]> Co-authored-by: 0xmovses <[email protected]> Co-authored-by: Kayanski <[email protected]> Co-authored-by: CircleCI <[email protected]> Co-authored-by: 0xmovses <[email protected]> Co-authored-by: Buckram <[email protected]> Co-authored-by: Mykhailo Donchenko <[email protected]>
AbstractSDK · Oct 24, 2023 · 005d2eb · 005d2eb
1 parent cc9ffb4
commit 005d2eb
Show file tree

Hide file tree

Showing 106 changed files with 316 additions and 161 deletions.
diff --git 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
@@ -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
diff --git a/app-template/artifacts/checksums_intermediate.txt b/app-template/artifacts/checksums_intermediate.txt
diff --git 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://[email protected]/abstract-money/crate-index.git"
diff --git 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 <[email protected]>",
   "Riada <[email protected]>",
@@ -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
diff --git a/framework/artifacts/abstract_ans_host.wasm b/framework/artifacts/abstract_ans_host.wasm
diff --git a/framework/artifacts/abstract_ibc_client.wasm b/framework/artifacts/abstract_ibc_client.wasm
diff --git a/framework/artifacts/abstract_ibc_host.wasm b/framework/artifacts/abstract_ibc_host.wasm
diff --git a/framework/artifacts/abstract_manager.wasm b/framework/artifacts/abstract_manager.wasm
diff --git a/framework/artifacts/abstract_module_factory.wasm b/framework/artifacts/abstract_module_factory.wasm
diff --git a/framework/artifacts/abstract_proxy.wasm b/framework/artifacts/abstract_proxy.wasm
diff --git a/framework/artifacts/abstract_version_control.wasm b/framework/artifacts/abstract_version_control.wasm
diff --git a/framework/artifacts/checksums.txt 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
@@ -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
@@ -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
+  ${image}:0.14.0
diff --git 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
@@ -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
@@ -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
@@ -17,8 +17,8 @@ impl<Chain: CwEnv> Uploadable for IbcClient<Chain> {
     fn wrapper(&self) -> <Mock as TxHandler>::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
@@ -1 +1 @@
-../../scripts/state.json
+../../../interchain/scripts/state.json
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -27,7 +27,7 @@ pub fn wasm_raw_query<C>(
 #[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
@@ -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;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../../scripts/state.json
		../../../interchain/scripts/state.json