From 00f8e7121da02d86c068389eb72383d419fd66e6 Mon Sep 17 00:00:00 2001
From: Kayanski <kowalski.kowalskin@gmail.com>
Date: Wed, 27 Nov 2024 16:33:39 +0000
Subject: [PATCH] Some more corrections and remove deps

---
 .github/workflows/framework-check.yml         | 30 +++-------
 framework/Cargo.lock                          | 59 -------------------
 framework/contracts/account/Cargo.toml        |  4 --
 .../contracts/native/ans-host/Cargo.toml      |  2 -
 .../contracts/native/ibc-client/Cargo.toml    |  4 +-
 .../contracts/native/ibc-host/Cargo.toml      | 51 ++++++++--------
 .../contracts/native/ica-client/Cargo.toml    | 42 +++++++------
 .../native/module-factory/Cargo.toml          | 45 +++++++-------
 .../contracts/native/registry/Cargo.toml      | 41 +++++++------
 .../packages/abstract-adapter/Cargo.toml      |  1 -
 framework/packages/abstract-app/Cargo.toml    |  2 -
 framework/packages/abstract-client/Cargo.toml |  2 -
 framework/packages/abstract-ica/Cargo.toml    |  8 +--
 .../abstract-integration-tests/Cargo.toml     |  3 -
 framework/packages/abstract-macros/Cargo.toml |  3 +-
 framework/packages/abstract-sdk/Cargo.toml    |  6 +-
 .../packages/abstract-standalone/Cargo.toml   |  3 -
 framework/packages/abstract-std/Cargo.toml    | 51 ++++++++--------
 .../packages/abstract-testing/Cargo.toml      |  3 -
 framework/packages/standards/dex/Cargo.toml   |  4 --
 .../standards/money-market/Cargo.toml         |  4 --
 .../packages/standards/staking/Cargo.toml     |  4 --
 framework/workspace-hack/Cargo.toml           | 12 ++--
 23 files changed, 128 insertions(+), 256 deletions(-)

diff --git a/.github/workflows/framework-check.yml b/.github/workflows/framework-check.yml
index 11434dd8f..d1fae0d2a 100644
--- a/.github/workflows/framework-check.yml
+++ b/.github/workflows/framework-check.yml
@@ -7,10 +7,10 @@ on:
     paths:
       - "framework/**"
   pull_request:
-    paths: 
+    paths:
       - "framework/**"
 
-env: 
+env:
   SCCACHE_GHA_ENABLED: "true"
   RUSTC_WRAPPER: "sccache"
 
@@ -63,7 +63,7 @@ jobs:
           toolchain: ${{ matrix.toolchain }}
           components: clippy
       - uses: Swatinem/rust-cache@v2
-        with: 
+        with:
           workspaces: "framework -> target"
       - name: cargo clippy
         working-directory: ./framework
@@ -112,8 +112,8 @@ jobs:
       - name: cargo install cargo-hack
         uses: taiki-e/install-action@cargo-hack
       - uses: Swatinem/rust-cache@v2
-        with: 
-            workspaces: "framework -> target"
+        with:
+          workspaces: "framework -> target"
       - name: cargo hack
         working-directory: ./framework
         run: cargo hack --feature-powerset check --lib --tests
@@ -125,24 +125,12 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: webfactory/ssh-agent@v0.8.0
-        with:
-          ssh-private-key: |
-            ${{ secrets.SSH_PRIVATE_KEY_MULTI_TEST }}
-            ${{ secrets.SSH_PRIVATE_KEY_CW_ORCH_INTERCHAIN }}
       - name: Setup sccache
         uses: mozilla-actions/sccache-action@v0.0.5
         with:
           version: "v0.8.1"
-      - name: Install nightly
-        uses: dtolnay/rust-toolchain@nightly
-      - name: cargo install cargo-udeps
-        uses: taiki-e/install-action@cargo-udeps
-      - name: cargo install cargo-workspaces
-        run: cargo +stable install cargo-workspaces
       - uses: Swatinem/rust-cache@v2
-        with: 
-            workspaces: "framework -> target"
-      - name: cargo udeps framework
-        working-directory: ./framework
-        run: cargo workspaces exec cargo +nightly udeps --workspace --exclude "workspace-hack"
\ No newline at end of file
+        with:
+          workspaces: "framework -> target"
+      - name: Machete
+        uses: bnjbvr/cargo-machete@main
diff --git a/framework/Cargo.lock b/framework/Cargo.lock
index d1e251d49..7ffa1c710 100644
--- a/framework/Cargo.lock
+++ b/framework/Cargo.lock
@@ -36,16 +36,13 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "coverage-helper",
- "cw-asset",
  "cw-controllers",
  "cw-orch 0.27.0",
  "cw-storage-plus",
  "cw2",
  "cw20",
  "rstest",
- "schemars",
  "semver",
- "serde",
  "thiserror",
  "workspace-hack",
 ]
@@ -64,7 +61,6 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "coverage-helper",
- "cw-controllers",
  "cw-orch 0.27.0",
  "cw-storage-plus",
  "cw2",
@@ -96,14 +92,12 @@ dependencies = [
  "cosmwasm-std",
  "coverage-helper",
  "cw-asset",
- "cw-controllers",
  "cw-ownable",
  "cw-storage-plus",
  "cw2",
  "cw20",
  "rstest",
  "semver",
- "serde",
  "thiserror",
  "workspace-hack",
 ]
@@ -123,13 +117,11 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "coverage-helper",
- "cw-asset",
  "cw-controllers",
  "cw-orch 0.27.0",
  "cw-storage-plus",
  "cw2",
  "schemars",
- "semver",
  "serde",
  "thiserror",
  "workspace-hack",
@@ -143,7 +135,6 @@ dependencies = [
  "abstract-adapter",
  "abstract-app",
  "abstract-client",
- "abstract-cw-orch-polytone",
  "abstract-interface",
  "abstract-registry",
  "abstract-std",
@@ -225,13 +216,9 @@ dependencies = [
  "cw-address-like",
  "cw-asset",
  "cw-orch 0.27.0",
- "cw-storage-plus",
- "cw20",
  "dotenv",
  "env_logger",
- "schemars",
  "semver",
- "serde",
  "thiserror",
  "workspace-hack",
 ]
@@ -259,7 +246,6 @@ dependencies = [
  "ibc-proto",
  "prost",
  "semver",
- "serde",
  "thiserror",
  "workspace-hack",
 ]
@@ -278,16 +264,13 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "coverage-helper",
- "cw-controllers",
  "cw-orch 0.27.0",
  "cw-ownable",
  "cw-paginate",
  "cw-storage-plus",
  "cw-utils",
  "cw2",
- "schemars",
  "semver",
- "serde",
  "thiserror",
  "workspace-hack",
 ]
@@ -298,22 +281,16 @@ version = "0.25.0"
 dependencies = [
  "abstract-sdk",
  "abstract-testing",
- "alloy",
- "alloy-sol-types",
  "anyhow",
  "cosmwasm-schema",
  "cosmwasm-std",
  "coverage-helper",
  "cw-orch 0.27.0",
  "cw-ownable",
- "cw-storage-plus",
  "cw20-base",
  "map-macro",
  "polytone-evm",
  "rstest",
- "schemars",
- "serde",
- "thiserror",
  "workspace-hack",
 ]
 
@@ -330,12 +307,10 @@ dependencies = [
  "cosmwasm-std",
  "coverage-helper",
  "cw-ownable",
- "cw-storage-plus",
  "cw2",
  "evm-note",
  "polytone-evm",
  "semver",
- "serde",
  "thiserror",
  "workspace-hack",
 ]
@@ -354,11 +329,8 @@ dependencies = [
  "anyhow",
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-asset",
  "cw-orch 0.27.0",
- "cw-ownable",
  "cw2",
- "log",
  "semver",
  "workspace-hack",
 ]
@@ -409,7 +381,6 @@ name = "abstract-macros"
 version = "0.25.0"
 dependencies = [
  "cosmwasm-std",
- "coverage-helper",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -429,11 +400,8 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "coverage-helper",
- "cw-asset",
- "cw-controllers",
  "cw-orch 0.27.0",
  "cw-ownable",
- "cw-storage-plus",
  "cw2",
  "semver",
  "serde-cw-value",
@@ -453,10 +421,6 @@ dependencies = [
  "cosmwasm-std",
  "cw-asset",
  "cw-orch 0.27.0",
- "cw-storage-plus",
- "cw20",
- "schemars",
- "serde",
  "thiserror",
  "workspace-hack",
 ]
@@ -541,7 +505,6 @@ dependencies = [
  "cw-storage-plus",
  "cw2",
  "semver",
- "serde",
  "thiserror",
  "workspace-hack",
 ]
@@ -560,16 +523,12 @@ dependencies = [
  "coverage-helper",
  "cw-asset",
  "cw-clearable",
- "cw-controllers",
  "cw-ownable",
  "cw-storage-plus",
  "cw2",
  "cw20",
- "doc-comment",
  "ibc-proto",
- "prost-types",
  "schemars",
- "semver",
  "serde",
  "serde-cw-value",
  "serde_json",
@@ -593,14 +552,10 @@ dependencies = [
  "cosmwasm-std",
  "cw-asset",
  "cw-orch 0.27.0",
- "cw-storage-plus",
  "cw-utils",
- "cw20",
  "dotenv",
  "env_logger",
- "schemars",
  "semver",
- "serde",
  "thiserror",
  "workspace-hack",
 ]
@@ -618,14 +573,11 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "coverage-helper",
- "cw-asset",
  "cw-controllers",
  "cw-orch 0.27.0",
  "cw-storage-plus",
  "cw2",
- "schemars",
  "semver",
- "serde",
  "thiserror",
  "workspace-hack",
 ]
@@ -649,7 +601,6 @@ dependencies = [
  "cw-storage-plus",
  "cw-utils",
  "cw2",
- "cw20",
  "cw20-base",
  "function_name",
  "rstest",
@@ -667,14 +618,11 @@ version = "0.25.0"
 dependencies = [
  "abstract-sdk",
  "abstract-std",
- "cosmwasm-schema",
  "cosmwasm-std",
  "cw-asset",
  "cw-storage-plus",
  "cw2",
  "derive_builder 0.12.0",
- "schemars",
- "semver",
  "serde",
  "serde_json",
  "workspace-hack",
@@ -3020,12 +2968,6 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "doc-comment"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
-
 [[package]]
 name = "dotenv"
 version = "0.15.0"
@@ -7968,7 +7910,6 @@ dependencies = [
  "ppv-lite86",
  "primeorder",
  "prost",
- "prost-types",
  "rand",
  "rand_chacha",
  "rand_core",
diff --git a/framework/contracts/account/Cargo.toml b/framework/contracts/account/Cargo.toml
index 5b08f9c09..28ed24116 100644
--- a/framework/contracts/account/Cargo.toml
+++ b/framework/contracts/account/Cargo.toml
@@ -35,14 +35,10 @@ abstract-sdk    = { workspace = true }
 abstract-std    = { workspace = true }
 cosmwasm-schema = { workspace = true }
 cosmwasm-std    = { workspace = true }
-cw-asset        = { workspace = true }
 cw-controllers  = { workspace = true }
 cw-storage-plus = { workspace = true }
 cw2             = { workspace = true }
-cw20            = { workspace = true }
-schemars        = { workspace = true }
 semver          = { workspace = true }
-serde           = { workspace = true }
 thiserror       = { workspace = true }
 
 abstract-ica = { workspace = true }
diff --git a/framework/contracts/native/ans-host/Cargo.toml b/framework/contracts/native/ans-host/Cargo.toml
index 707f690e8..bff37acc4 100644
--- a/framework/contracts/native/ans-host/Cargo.toml
+++ b/framework/contracts/native/ans-host/Cargo.toml
@@ -26,12 +26,10 @@ abstract-sdk    = { workspace = true }
 abstract-std    = { workspace = true }
 cosmwasm-std    = { workspace = true }
 cw-asset        = { workspace = true }
-cw-controllers  = { workspace = true }
 cw-ownable      = { workspace = true }
 cw-storage-plus = { workspace = true }
 cw2             = { workspace = true }
 semver          = { workspace = true }
-serde           = { workspace = true }
 thiserror       = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
diff --git a/framework/contracts/native/ibc-client/Cargo.toml b/framework/contracts/native/ibc-client/Cargo.toml
index 3b8367cb1..510d336f2 100644
--- a/framework/contracts/native/ibc-client/Cargo.toml
+++ b/framework/contracts/native/ibc-client/Cargo.toml
@@ -30,8 +30,8 @@ cw-storage-plus = { workspace = true }
 cw-utils        = { workspace = true }
 cw2             = { workspace = true }
 semver          = { workspace = true }
-serde           = { workspace = true }
-thiserror       = { workspace = true }
+
+thiserror = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 workspace-hack = { version = "0.1", path = "../../../workspace-hack" }
diff --git a/framework/contracts/native/ibc-host/Cargo.toml b/framework/contracts/native/ibc-host/Cargo.toml
index 12fb9df7f..b2abdaf84 100644
--- a/framework/contracts/native/ibc-host/Cargo.toml
+++ b/framework/contracts/native/ibc-host/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 description = "Abstract IBC Host Contract"
-edition     = { workspace = true }
-license     = { workspace = true }
-name        = "abstract-ibc-host"
-readme      = "README.md"
-repository  = "https://github.com/AbstractSDK/abstract"
-version     = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+name = "abstract-ibc-host"
+readme = "README.md"
+repository = "https://github.com/AbstractSDK/abstract"
+version = { workspace = true }
 
 [lints]
 workspace = true
@@ -17,35 +17,32 @@ crate-type = ["cdylib", "rlib"]
 
 # # use library feature to disable all instantiate/execute/query exports
 default = ["export"]
-export  = []
-schema  = []
+export = []
+schema = []
 
 [dependencies]
 abstract-macros = { workspace = true }
-abstract-sdk    = { workspace = true }
-abstract-std    = { workspace = true }
+abstract-sdk = { workspace = true }
+abstract-std = { workspace = true }
 cosmwasm-schema = { workspace = true }
-cosmwasm-std    = { workspace = true, features = ["stargate"] }
-cw-controllers  = { workspace = true }
-cw-orch         = { workspace = true }
-cw-ownable      = { workspace = true }
-cw-paginate     = "2.0.0"
+cosmwasm-std = { workspace = true, features = ["stargate"] }
+cw-orch = { workspace = true }
+cw-ownable = { workspace = true }
+cw-paginate = "2.0.0"
 cw-storage-plus = { workspace = true }
-cw-utils        = { workspace = true }
-cw2             = { workspace = true }
-schemars        = { workspace = true }
-semver          = { workspace = true }
-serde           = { workspace = true }
-thiserror       = { workspace = true }
+cw-utils = { workspace = true }
+cw2 = { workspace = true }
+semver = { workspace = true }
+thiserror = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 workspace-hack = { version = "0.1", path = "../../../workspace-hack" }
 
 [dev-dependencies]
-abstract-adapter   = { workspace = true, features = ["test-utils"] }
+abstract-adapter = { workspace = true, features = ["test-utils"] }
 abstract-interface = { workspace = true }
-abstract-std       = { workspace = true }
-abstract-testing   = { workspace = true }
-anyhow.workspace   = true
-coverage-helper    = { workspace = true }
-cw-orch            = { workspace = true }
+abstract-std = { workspace = true }
+abstract-testing = { workspace = true }
+anyhow.workspace = true
+coverage-helper = { workspace = true }
+cw-orch = { workspace = true }
diff --git a/framework/contracts/native/ica-client/Cargo.toml b/framework/contracts/native/ica-client/Cargo.toml
index 1e995b4d6..5744490cd 100644
--- a/framework/contracts/native/ica-client/Cargo.toml
+++ b/framework/contracts/native/ica-client/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-authors     = { workspace = true }
+authors = { workspace = true }
 description = "Abstract ICA Client Contract"
-edition     = { workspace = true }
-license     = { workspace = true }
-name        = "abstract-ica-client"
-readme      = "README.md"
-repository  = "https://github.com/AbstractSDK/abstract"
-version     = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+name = "abstract-ica-client"
+readme = "README.md"
+repository = "https://github.com/AbstractSDK/abstract"
+version = { workspace = true }
 
 [lints]
 workspace = true
@@ -16,23 +16,21 @@ crate-type = ["cdylib", "rlib"]
 
 [features]
 default = ["export"]
-export  = []
+export = []
 
 [dependencies]
-abstract-ica    = { workspace = true }
+abstract-ica = { workspace = true }
 abstract-macros = { workspace = true }
-abstract-sdk    = { workspace = true }
-abstract-std    = { workspace = true }
+abstract-sdk = { workspace = true }
+abstract-std = { workspace = true }
 cosmwasm-schema = { workspace = true }
-cosmwasm-std    = { workspace = true, features = ["stargate", "staking"] }
-cw-ownable      = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2             = { workspace = true }
-semver          = { workspace = true }
-serde           = { workspace = true }
-thiserror       = { workspace = true }
-
-evm-note     = { version = "0.1.0", features = ["library"] }
+cosmwasm-std = { workspace = true, features = ["stargate", "staking"] }
+cw-ownable = { workspace = true }
+cw2 = { workspace = true }
+semver = { workspace = true }
+thiserror = { workspace = true }
+
+evm-note = { version = "0.1.0", features = ["library"] }
 polytone-evm = "0.1.0"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
@@ -40,8 +38,8 @@ workspace-hack = { version = "0.1", path = "../../../workspace-hack" }
 
 [dev-dependencies]
 abstract-testing = { workspace = true }
-cosmwasm-schema  = { workspace = true }
-coverage-helper  = { workspace = true }
+cosmwasm-schema = { workspace = true }
+coverage-helper = { workspace = true }
 
 [profile.release]
 overflow-checks = true
diff --git a/framework/contracts/native/module-factory/Cargo.toml b/framework/contracts/native/module-factory/Cargo.toml
index 53bbd23be..c66bc523a 100644
--- a/framework/contracts/native/module-factory/Cargo.toml
+++ b/framework/contracts/native/module-factory/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-authors     = { workspace = true }
+authors = { workspace = true }
 description = "Abstract Module Factory Contract"
-edition     = { workspace = true }
-license     = { workspace = true }
-name        = "abstract-module-factory"
-readme      = "README.md"
-repository  = "https://github.com/AbstractSDK/abstract"
-version     = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+name = "abstract-module-factory"
+readme = "README.md"
+repository = "https://github.com/AbstractSDK/abstract"
+version = { workspace = true }
 
 exclude = ["contract.wasm", "hash.txt"]
 
@@ -18,34 +18,31 @@ crate-type = ["cdylib", "rlib"]
 
 [features]
 default = ["export"]
-export  = []
+export = []
 # for quicker tests, cargo test --lib
 
 [dependencies]
 abstract-macros = { workspace = true }
-abstract-sdk    = { workspace = true }
-abstract-std    = { workspace = true }
+abstract-sdk = { workspace = true }
+abstract-std = { workspace = true }
 cosmwasm-schema = { workspace = true }
-cosmwasm-std    = { workspace = true }
-cw-asset        = { workspace = true }
-cw-controllers  = { workspace = true }
-cw-ownable      = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2             = { workspace = true }
-semver          = { workspace = true }
-serde-cw-value  = { workspace = true }
-thiserror       = { workspace = true }
+cosmwasm-std = { workspace = true }
+cw-ownable = { workspace = true }
+cw2 = { workspace = true }
+semver = { workspace = true }
+serde-cw-value = { workspace = true }
+thiserror = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 workspace-hack = { version = "0.1", path = "../../../workspace-hack" }
 
 [dev-dependencies]
 abstract-integration-tests = { workspace = true }
-abstract-interface         = { workspace = true }
-abstract-testing           = { workspace = true }
-anyhow                     = { workspace = true }
-coverage-helper            = { workspace = true }
-cw-orch                    = { workspace = true }
+abstract-interface = { workspace = true }
+abstract-testing = { workspace = true }
+anyhow = { workspace = true }
+coverage-helper = { workspace = true }
+cw-orch = { workspace = true }
 
 [profile.release]
 overflow-checks = true
diff --git a/framework/contracts/native/registry/Cargo.toml b/framework/contracts/native/registry/Cargo.toml
index f318f28c3..d269a585e 100644
--- a/framework/contracts/native/registry/Cargo.toml
+++ b/framework/contracts/native/registry/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-authors     = { workspace = true }
+authors = { workspace = true }
 description = "Abstract Registry Contract"
-edition     = { workspace = true }
-license     = { workspace = true }
-name        = "abstract-registry"
-readme      = "README.md"
-repository  = "https://github.com/AbstractSDK/abstract"
-version     = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+name = "abstract-registry"
+readme = "README.md"
+repository = "https://github.com/AbstractSDK/abstract"
+version = { workspace = true }
 
 exclude = ["contract.wasm", "hash.txt"]
 
@@ -18,31 +18,30 @@ crate-type = ["cdylib", "rlib"]
 
 [features]
 default = ["export"]
-export  = []
+export = []
 
 [dependencies]
 abstract-macros = { workspace = true }
-abstract-sdk    = { workspace = true }
-abstract-std    = { workspace = true }
+abstract-sdk = { workspace = true }
+abstract-std = { workspace = true }
 cosmwasm-schema = { workspace = true }
-cosmwasm-std    = { workspace = true }
-cw-ownable      = { workspace = true }
+cosmwasm-std = { workspace = true }
+cw-ownable = { workspace = true }
 cw-storage-plus = { workspace = true }
-cw2             = { workspace = true }
-semver          = { workspace = true }
-serde           = { workspace = true }
-thiserror       = { workspace = true }
+cw2 = { workspace = true }
+semver = { workspace = true }
+thiserror = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 workspace-hack = { version = "0.1", path = "../../../workspace-hack" }
 
 [dev-dependencies]
 abstract-interface = { workspace = true }
-abstract-testing   = { workspace = true }
-anyhow             = { workspace = true }
-cosmwasm-schema    = { workspace = true }
-coverage-helper    = { workspace = true }
-cw-orch            = { workspace = true }
+abstract-testing = { workspace = true }
+anyhow = { workspace = true }
+cosmwasm-schema = { workspace = true }
+coverage-helper = { workspace = true }
+cw-orch = { workspace = true }
 
 [profile.release]
 overflow-checks = true
diff --git a/framework/packages/abstract-adapter/Cargo.toml b/framework/packages/abstract-adapter/Cargo.toml
index b0dadcb0e..a5345f9d2 100644
--- a/framework/packages/abstract-adapter/Cargo.toml
+++ b/framework/packages/abstract-adapter/Cargo.toml
@@ -24,7 +24,6 @@ abstract-std     = { workspace = true }
 abstract-testing = { workspace = true, optional = true }
 cosmwasm-schema  = { workspace = true }
 cosmwasm-std     = { workspace = true }
-cw-controllers   = { workspace = true }
 cw-orch          = { workspace = true }
 cw-storage-plus  = { workspace = true }
 cw2              = { workspace = true }
diff --git a/framework/packages/abstract-app/Cargo.toml b/framework/packages/abstract-app/Cargo.toml
index cb5e15287..42cd34f67 100644
--- a/framework/packages/abstract-app/Cargo.toml
+++ b/framework/packages/abstract-app/Cargo.toml
@@ -24,13 +24,11 @@ abstract-std     = { workspace = true }
 abstract-testing = { workspace = true, optional = true }
 cosmwasm-schema  = { workspace = true }
 cosmwasm-std     = { workspace = true }
-cw-asset         = { workspace = true }
 cw-controllers   = { workspace = true }
 cw-orch          = { workspace = true }
 cw-storage-plus  = { workspace = true }
 cw2              = { workspace = true }
 schemars         = { workspace = true }
-semver           = { workspace = true }
 serde            = { workspace = true }
 thiserror        = { workspace = true }
 
diff --git a/framework/packages/abstract-client/Cargo.toml b/framework/packages/abstract-client/Cargo.toml
index 761062ca4..cba4dc19c 100644
--- a/framework/packages/abstract-client/Cargo.toml
+++ b/framework/packages/abstract-client/Cargo.toml
@@ -20,7 +20,6 @@ workspace = true
 default = ["test-utils"]
 interchain = [
   "dep:cw-orch-interchain",
-  "dep:cw-orch-polytone",
   "abstract-interface/interchain",
   "abstract-interface/testing",
 ]
@@ -32,7 +31,6 @@ abstract-std.workspace = true
 cosmwasm-std.workspace = true
 cw-orch.workspace      = true
 cw-orch-interchain     = { workspace = true, optional = true }
-cw-orch-polytone       = { workspace = true, optional = true }
 semver.workspace       = true
 serde.workspace        = true
 thiserror.workspace    = true
diff --git a/framework/packages/abstract-ica/Cargo.toml b/framework/packages/abstract-ica/Cargo.toml
index 8ca6988e3..c22e123e0 100644
--- a/framework/packages/abstract-ica/Cargo.toml
+++ b/framework/packages/abstract-ica/Cargo.toml
@@ -16,19 +16,13 @@ version     = { workspace = true }
 cosmwasm-schema = { workspace = true }
 cosmwasm-std    = { workspace = true, features = ["iterator"] }
 cw-ownable      = { workspace = true }
-cw-storage-plus = { workspace = true }
 map-macro       = "0.3.0"
-schemars        = { workspace = true }
-serde           = { workspace = true }
-thiserror       = { workspace = true }
 
 abstract-sdk = { workspace = true }
 cw-orch      = { workspace = true }
 
 # EVM
-alloy           = { version = "0.2.1", default-features = false }
-alloy-sol-types = { version = "0.7.7", default-features = false }
-polytone-evm    = { version = "0.1.0" }
+polytone-evm = { version = "0.1.0" }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 workspace-hack = { version = "0.1", path = "../../workspace-hack" }
diff --git a/framework/packages/abstract-integration-tests/Cargo.toml b/framework/packages/abstract-integration-tests/Cargo.toml
index 722db193e..96f13a0d7 100644
--- a/framework/packages/abstract-integration-tests/Cargo.toml
+++ b/framework/packages/abstract-integration-tests/Cargo.toml
@@ -18,11 +18,8 @@ abstract-std.workspace     = true
 abstract-testing.workspace = true
 anyhow.workspace           = true
 cosmwasm-schema            = { workspace = true }
-cw-asset                   = { workspace = true }
 cw-orch                    = { workspace = true }
-cw-ownable                 = { workspace = true }
 cw2                        = { workspace = true }
-log                        = "0.4.14"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 workspace-hack = { version = "0.1", path = "../../workspace-hack" }
diff --git a/framework/packages/abstract-macros/Cargo.toml b/framework/packages/abstract-macros/Cargo.toml
index d6a30b194..87d24f2e2 100644
--- a/framework/packages/abstract-macros/Cargo.toml
+++ b/framework/packages/abstract-macros/Cargo.toml
@@ -19,5 +19,4 @@ quote       = { version = "1" }
 syn         = { version = "1", features = ["full", "extra-traits"] }
 
 [dev-dependencies]
-cosmwasm-std    = { workspace = true }
-coverage-helper = { workspace = true }
+cosmwasm-std = { workspace = true }
diff --git a/framework/packages/abstract-sdk/Cargo.toml b/framework/packages/abstract-sdk/Cargo.toml
index 53dfbe470..fb212188b 100644
--- a/framework/packages/abstract-sdk/Cargo.toml
+++ b/framework/packages/abstract-sdk/Cargo.toml
@@ -15,7 +15,7 @@ workspace = true
 # for quicker tests, cargo test --lib
 [features]
 default  = []
-stargate = ["dep:cosmos-sdk-proto", "dep:prost-types", "dep:ibc-proto"]
+stargate = ["dep:cosmos-sdk-proto", "dep:ibc-proto"]
 
 # Expose MockModule for testing with other Adapters
 test-utils = ["dep:abstract-testing", "dep:cosmwasm-schema"]
@@ -27,14 +27,11 @@ cosmos-sdk-proto = { version = "0.24", optional = true, default-features = false
 cosmwasm-std     = { workspace = true, features = ["iterator", "staking"] }
 cw-asset         = { workspace = true }
 cw-clearable     = { workspace = true }
-cw-controllers   = { workspace = true }
 cw-storage-plus  = { workspace = true }
 cw2              = { workspace = true }
 cw20             = { workspace = true }
 ibc-proto        = { version = "0.47.0", optional = true, default-features = false }
-prost-types      = { version = "0.13.1", optional = true }
 schemars         = { workspace = true }
-semver           = { workspace = true }
 serde            = { workspace = true }
 serde-cw-value   = { workspace = true }
 thiserror        = { workspace = true }
@@ -49,7 +46,6 @@ workspace-hack = { version = "0.1", path = "../../workspace-hack" }
 
 [dev-dependencies]
 cosmwasm-schema = { workspace = true }
-doc-comment     = "0.3.3"
 # Set our own feature when running tests!
 abstract-sdk = { path = ".", features = ["test-utils"] }
 cw-ownable   = { workspace = true }
diff --git a/framework/packages/abstract-standalone/Cargo.toml b/framework/packages/abstract-standalone/Cargo.toml
index 8b1b46cdf..01458de3b 100644
--- a/framework/packages/abstract-standalone/Cargo.toml
+++ b/framework/packages/abstract-standalone/Cargo.toml
@@ -21,13 +21,10 @@ abstract-sdk    = { workspace = true }
 abstract-std    = { workspace = true }
 cosmwasm-schema = { workspace = true }
 cosmwasm-std    = { workspace = true }
-cw-asset        = { workspace = true }
 cw-controllers  = { workspace = true }
 cw-storage-plus = { workspace = true }
 cw2             = { workspace = true }
-schemars        = { workspace = true }
 semver          = { workspace = true }
-serde           = { workspace = true }
 thiserror       = { workspace = true }
 
 # Interface
diff --git a/framework/packages/abstract-std/Cargo.toml b/framework/packages/abstract-std/Cargo.toml
index 62f15b48a..3ea3279a2 100644
--- a/framework/packages/abstract-std/Cargo.toml
+++ b/framework/packages/abstract-std/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-authors = { workspace = true }
+authors     = { workspace = true }
 description = "Abstract contract interfaces and storage layouts"
-edition = { workspace = true }
-license = { workspace = true }
-name = "abstract-std"
-readme = "README.md"
-repository = "https://github.com/AbstractSDK/abstract"
-version = { workspace = true }
+edition     = { workspace = true }
+license     = { workspace = true }
+name        = "abstract-std"
+readme      = "README.md"
+repository  = "https://github.com/AbstractSDK/abstract"
+version     = { workspace = true }
 
 [lints]
 workspace = true
@@ -16,23 +16,22 @@ workspace = true
 
 [dependencies]
 cosmwasm-schema = { workspace = true }
-cosmwasm-std = { workspace = true, features = ["iterator"] }
+cosmwasm-std    = { workspace = true, features = ["iterator"] }
 cw-address-like = { workspace = true }
-cw-asset = { workspace = true }
-cw-blob = { workspace = true }
-cw-clearable = { workspace = true }
-cw-controllers = { workspace = true }
-cw-orch = { workspace = true }
-cw-ownable = { workspace = true }
+cw-asset        = { workspace = true }
+cw-blob         = { workspace = true }
+cw-clearable    = { workspace = true }
+cw-controllers  = { workspace = true }
+cw-orch         = { workspace = true }
+cw-ownable      = { workspace = true }
 cw-storage-plus = { workspace = true }
-cw-utils = { workspace = true }
-cw2 = { workspace = true }
-cw20 = { workspace = true }
-schemars = { workspace = true }
-semver = { workspace = true, features = ["serde"] }
-serde = { workspace = true }
-sha2 = { version = "0.10.8", default-features = false }
-thiserror = { workspace = true }
+cw-utils        = { workspace = true }
+cw2             = { workspace = true }
+schemars        = { workspace = true }
+semver          = { workspace = true, features = ["serde"] }
+serde           = { workspace = true }
+sha2            = { version = "0.10.8", default-features = false }
+thiserror       = { workspace = true }
 
 ## Stringify function names
 function_name = { version = "0.3.0" }
@@ -42,7 +41,7 @@ workspace-hack = { version = "0.1", path = "../../workspace-hack" }
 
 [dev-dependencies]
 abstract-testing = { path = "../abstract-testing" }
-anyhow = { workspace = true }
-coverage-helper = { workspace = true }
-cw20-base = { workspace = true }
-rstest = { workspace = true }
+anyhow           = { workspace = true }
+coverage-helper  = { workspace = true }
+cw20-base        = { workspace = true }
+rstest           = { workspace = true }
diff --git a/framework/packages/abstract-testing/Cargo.toml b/framework/packages/abstract-testing/Cargo.toml
index 475d758d6..cfdc57213 100644
--- a/framework/packages/abstract-testing/Cargo.toml
+++ b/framework/packages/abstract-testing/Cargo.toml
@@ -11,14 +11,11 @@ version     = { workspace = true }
 
 [dependencies]
 abstract-std    = { workspace = true }
-cosmwasm-schema = { workspace = true }
 cosmwasm-std    = { workspace = true, features = ["iterator"] }
 cw-asset        = { workspace = true }
 cw-storage-plus = { workspace = true }
 cw2             = { workspace = true }
 derive_builder  = "0.12.0"
-schemars        = { workspace = true }
-semver          = { workspace = true }
 serde           = { workspace = true }
 serde_json      = "1.0.79"
 
diff --git a/framework/packages/standards/dex/Cargo.toml b/framework/packages/standards/dex/Cargo.toml
index 0b9923391..8483b59c6 100644
--- a/framework/packages/standards/dex/Cargo.toml
+++ b/framework/packages/standards/dex/Cargo.toml
@@ -25,10 +25,6 @@ cosmwasm-schema = { workspace = true }
 cosmwasm-std    = { workspace = true }
 cw-address-like = { workspace = true }
 cw-asset        = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw20            = { workspace = true }
-schemars        = { workspace = true }
-serde           = { workspace = true }
 thiserror       = { workspace = true }
 
 abstract-adapter       = { version = "0.25.0", path = "../../abstract-adapter" }
diff --git a/framework/packages/standards/money-market/Cargo.toml b/framework/packages/standards/money-market/Cargo.toml
index 8ddaa09a0..d96394456 100644
--- a/framework/packages/standards/money-market/Cargo.toml
+++ b/framework/packages/standards/money-market/Cargo.toml
@@ -23,10 +23,6 @@ testing = ["cw-orch/daemon"]
 cosmwasm-schema = { workspace = true }
 cosmwasm-std    = { workspace = true }
 cw-asset        = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw20            = { workspace = true }
-schemars        = { workspace = true }
-serde           = { workspace = true }
 thiserror       = { workspace = true }
 
 abstract-adapter       = { version = "0.25.0", path = "../../abstract-adapter" }
diff --git a/framework/packages/standards/staking/Cargo.toml b/framework/packages/standards/staking/Cargo.toml
index ac843eab9..b65ba757f 100644
--- a/framework/packages/standards/staking/Cargo.toml
+++ b/framework/packages/standards/staking/Cargo.toml
@@ -21,11 +21,7 @@ export  = []
 cosmwasm-schema = { workspace = true }
 cosmwasm-std    = { workspace = true }
 cw-asset        = { workspace = true }
-cw-storage-plus = { workspace = true }
 cw-utils        = { workspace = true }
-cw20            = { workspace = true }
-schemars        = { workspace = true }
-serde           = { workspace = true }
 thiserror       = { workspace = true }
 
 abstract-adapter       = { version = "0.25.0", path = "../../abstract-adapter" }
diff --git a/framework/workspace-hack/Cargo.toml b/framework/workspace-hack/Cargo.toml
index fb4c97f27..868f3260a 100644
--- a/framework/workspace-hack/Cargo.toml
+++ b/framework/workspace-hack/Cargo.toml
@@ -24,12 +24,10 @@ cw20-base = { version = "2", default-features = false, features = ["library"] }
 digest = { version = "0.10", features = ["mac", "oid", "std"] }
 generic-array = { version = "0.14", default-features = false, features = ["more_lengths", "zeroize"] }
 getrandom = { version = "0.2", default-features = false, features = ["custom", "std"] }
-log = { version = "0.4", default-features = false, features = ["std"] }
 memchr = { version = "2" }
 phf_shared = { version = "0.11", default-features = false, features = ["std"] }
 ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] }
 prost = { version = "0.13", features = ["prost-derive"] }
-prost-types = { version = "0.13" }
 rand = { version = "0.8", features = ["small_rng"] }
 rand_chacha = { version = "0.3", default-features = false, features = ["std"] }
 rand_core = { version = "0.6", default-features = false, features = ["std"] }
@@ -52,12 +50,10 @@ cw20-base = { version = "2", default-features = false, features = ["library"] }
 digest = { version = "0.10", features = ["mac", "oid", "std"] }
 generic-array = { version = "0.14", default-features = false, features = ["more_lengths", "zeroize"] }
 getrandom = { version = "0.2", default-features = false, features = ["custom", "std"] }
-log = { version = "0.4", default-features = false, features = ["std"] }
 memchr = { version = "2" }
 phf_shared = { version = "0.11", default-features = false, features = ["std"] }
 ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] }
 prost = { version = "0.13", features = ["prost-derive"] }
-prost-types = { version = "0.13" }
 rand = { version = "0.8", features = ["small_rng"] }
 rand_chacha = { version = "0.3", default-features = false, features = ["std"] }
 rand_core = { version = "0.6", default-features = false, features = ["std"] }
@@ -117,7 +113,7 @@ informalsystems-pbjson = { version = "0.7" }
 k256 = { version = "0.13", default-features = false, features = ["alloc", "ecdsa"] }
 lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] }
 libc = { version = "0.2" }
-log = { version = "0.4", default-features = false, features = ["serde"] }
+log = { version = "0.4", default-features = false, features = ["serde", "std"] }
 num-bigint = { version = "0.4", features = ["serde"] }
 num-integer = { version = "0.1", default-features = false, features = ["i128", "std"] }
 num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] }
@@ -195,7 +191,7 @@ informalsystems-pbjson = { version = "0.7" }
 k256 = { version = "0.13", default-features = false, features = ["alloc", "ecdsa"] }
 lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] }
 libc = { version = "0.2" }
-log = { version = "0.4", default-features = false, features = ["serde"] }
+log = { version = "0.4", default-features = false, features = ["serde", "std"] }
 num-bigint = { version = "0.4", features = ["serde"] }
 num-integer = { version = "0.1", default-features = false, features = ["i128", "std"] }
 num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] }
@@ -272,7 +268,7 @@ informalsystems-pbjson = { version = "0.7" }
 k256 = { version = "0.13", default-features = false, features = ["alloc", "ecdsa"] }
 lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] }
 libc = { version = "0.2", features = ["extra_traits"] }
-log = { version = "0.4", default-features = false, features = ["serde"] }
+log = { version = "0.4", default-features = false, features = ["serde", "std"] }
 num-bigint = { version = "0.4", features = ["serde"] }
 num-integer = { version = "0.1", default-features = false, features = ["i128", "std"] }
 num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] }
@@ -349,7 +345,7 @@ informalsystems-pbjson = { version = "0.7" }
 k256 = { version = "0.13", default-features = false, features = ["alloc", "ecdsa"] }
 lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] }
 libc = { version = "0.2", features = ["extra_traits"] }
-log = { version = "0.4", default-features = false, features = ["serde"] }
+log = { version = "0.4", default-features = false, features = ["serde", "std"] }
 num-bigint = { version = "0.4", features = ["serde"] }
 num-integer = { version = "0.1", default-features = false, features = ["i128", "std"] }
 num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] }