Merge remote-tracking branch 'origin/main' into release-0.25

Author: Buckram123

framework/.cargo/config.toml

@@ -1,3 +1,3 @@
 [alias]
 schema = "run --example schema"
-wasm = "build --release --target wasm32-unknown-unknown"
+wasm   = "build --release --target wasm32-unknown-unknown"

framework/.config/hakari.toml

@@ -15,14 +15,14 @@ resolver = "2"
 # Add triples corresponding to platforms commonly used by developers here.
 # https://doc.rust-lang.org/rustc/platform-support.html
 platforms = [
-    "x86_64-unknown-linux-gnu",
-    # "x86_64-apple-darwin",
-    "aarch64-apple-darwin",
-    # "x86_64-pc-windows-msvc",
+  "x86_64-unknown-linux-gnu",
+  # "x86_64-apple-darwin",
+  "aarch64-apple-darwin",
+  # "x86_64-pc-windows-msvc",
 ]
 
 # Write out exact versions rather than a semver range. (Defaults to false.)
 # exact-versions = true
 
 [final-excludes]
-workspace-members = ["abstract-macros"]
+workspace-members = ["abstract-macros"]

framework/Cargo.toml

@@ -17,93 +17,91 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.24.1"
 authors = [
   "CyberHoward <cyberhoward@protonmail.com>",
   "Riada <riada@abstract.money>",
   "Abstract Money <contact@abstract.money>",
 ]
+documentation = "https://docs.abstract.money/"
 edition = "2021"
 homepage = "https://abstract.money"
-documentation = "https://docs.abstract.money/"
-repository = "https://github.com/AbstractSDK/abstract"
-license = "LGPL-3.0"
 keywords = ["cosmos", "cosmwasm", "framework"]
+license = "LGPL-3.0"
+repository = "https://github.com/AbstractSDK/abstract"
+version = "0.24.1"
 
 [workspace.dependencies]
-cosmwasm-std = { version = "2.0.0", features = ["cosmwasm_1_2"] }
 cosmwasm-schema = { version = "2.0" }
-cw-controllers = { version = "2.0" }
-cw-utils = { version = "2.0" }
+cosmwasm-std    = { version = "2.0.0", features = ["cosmwasm_1_2"] }
+cw-controllers  = { version = "2.0" }
 cw-storage-plus = "2.0.0"
-cw2 = { version = "2.0" }
-cw20 = { version = "2.0" }
-cw20-base = { version = "2.0", features = ["library"] }
+cw-utils        = { version = "2.0" }
+cw2             = { version = "2.0" }
+cw20            = { version = "2.0" }
+cw20-base       = { version = "2.0", features = ["library"] }
 
-cw-asset = { version = "4.0" }
-cw-ownable = { version = "2.0" }
 cw-address-like = { version = "2.0" }
-cw-clearable = { version = "0.2.0" }
-serde-cw-value = "0.7.0"
-
-schemars = "0.8"
-serde = { version = "1.0", default-features = false, features = ["derive"] }
+cw-asset        = { version = "4.0" }
+cw-clearable    = { version = "0.2.0" }
+cw-ownable      = { version = "2.0" }
+serde-cw-value  = "0.7.0"
+
+anybuf    = { version = "0.5.0" }
+protobuf  = { version = "2", features = ["with-bytes"] }
+schemars  = "0.8"
+serde     = { version = "1.0", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.50" }
-protobuf = { version = "2", features = ["with-bytes"] }
-anybuf = { version = "0.5.0" }
 
-clap = { version = "4.0.32", features = ["derive"] }
-semver = "1.0"
-cw-orch = { version = "0.27.0" }
+clap               = { version = "4.0.32", features = ["derive"] }
+cw-orch            = { version = "0.27.0" }
 cw-orch-interchain = { version = "0.8.1" }
-tokio = { version = "1.4", features = ["full"] }
+semver             = "1.0"
+tokio              = { version = "1.4", features = ["full"] }
 
-polytone = { package = "abstract-polytone", version = "2.0.0" }
-polytone-note = { package = "abstract-polytone-note", version = "5.0.0" }
 cw-orch-polytone = { package = "abstract-cw-orch-polytone", version = "6.0.0" }
+polytone         = { package = "abstract-polytone", version = "2.0.0" }
+polytone-note    = { package = "abstract-polytone-note", version = "5.0.0" }
 
 
 ## crates in order of publishing ## see docs/Publishing.md
 
-abstract-adapter = { path = "packages/abstract-adapter" }
-abstract-app = { path = "packages/abstract-app" }
+abstract-adapter    = { path = "packages/abstract-adapter" }
+abstract-app        = { path = "packages/abstract-app" }
 abstract-standalone = { path = "packages/abstract-standalone" }
 
 # 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" }
-ans-host = { package = "abstract-ans-host", path = "contracts/native/ans-host" }
-registry = { package = "abstract-registry", path = "contracts/native/registry" }
+ans-host           = { package = "abstract-ans-host", path = "contracts/native/ans-host" }
+module-factory     = { package = "abstract-module-factory", path = "contracts/native/module-factory" }
+registry           = { package = "abstract-registry", path = "contracts/native/registry" }
 
 # Ibc
 ibc-client = { package = "abstract-ibc-client", path = "contracts/native/ibc-client" }
-ibc-host = { package = "abstract-ibc-host", path = "contracts/native/ibc-host" }
+ibc-host   = { package = "abstract-ibc-host", path = "contracts/native/ibc-host" }
 
 abstract-account = { path = "contracts/account", default-features = false }
 
-abstract-ica = { version = "0.24.1", path = "packages/abstract-ica" }
-abstract-sdk = { version = "0.24.1", path = "packages/abstract-sdk" }
+abstract-ica     = { version = "0.24.1", path = "packages/abstract-ica" }
+abstract-sdk     = { version = "0.24.1", path = "packages/abstract-sdk" }
+abstract-std     = { version = "0.24.1", path = "packages/abstract-std" }
 abstract-testing = { version = "0.24.1", path = "packages/abstract-testing" }
-abstract-std = { version = "0.24.1", path = "packages/abstract-std" }
-abstract-xion = { package = "account", version = "0.1.0", git = "https://github.com/abstractsdk/xion-contracts", features = [
-  "library",
-], branch = "fix-for-abstract" }
+abstract-xion    = { package = "account", version = "0.1.0", git = "https://github.com/abstractsdk/xion-contracts", features = ["library"], branch = "fix-for-abstract" }
 
 
 # These should remain fixed and don't need to be re-published (unless changes are made)
 abstract-macros = { version = "0.24.1", path = "packages/abstract-macros" }
 
-abstract-adapter-utils = { version = "0.24.1", path = "packages/standards/utils" }
-abstract-dex-standard = { path = "packages/standards/dex" }
+abstract-adapter-utils    = { version = "0.24.1", path = "packages/standards/utils" }
+abstract-dex-standard     = { path = "packages/standards/dex" }
 abstract-staking-standard = { path = "packages/standards/staking" }
 
 abstract-integration-tests = { path = "packages/abstract-integration-tests" }
 
 ## Testing
-rstest = "0.17.0"
-anyhow = "1"
+anyhow          = "1"
 coverage-helper = { version = "0.2.2" }
+rstest          = "0.17.0"
 
 # Predictable abstract addresses
 cw-blob = { version = "=0.2.0", features = ["library"] }
@@ -115,15 +113,15 @@ opt-level = 3
 
 # Backup release profile, will result in warnings during optimization
 [profile.release]
-rpath = false
-lto = true
-overflow-checks = true
-opt-level = 's'
-debug = false
+codegen-units    = 1
+debug            = false
 debug-assertions = false
-codegen-units = 1
-panic = 'abort'
-incremental = false
+incremental      = false
+lto              = true
+opt-level        = 's'
+overflow-checks  = true
+panic            = 'abort'
+rpath            = false
 
 [patch.crates-io]
 
@@ -134,10 +132,8 @@ incremental = false
 
 [workspace.metadata.cargo-udeps.ignore]
 # ensures CI doens't flag workspace-hack as unused dep
-normal = ["workspace-hack"]
 development = ["workspace-hack"]
+normal      = ["workspace-hack"]
 
 [workspace.lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = [
-  'cfg(coverage,coverage_nightly)',
-] }
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage,coverage_nightly)'] }

framework/contracts/account/.cargo/config.toml

@@ -2,4 +2,4 @@
 # Tracking issue: https://github.com/rust-lang/cargo/issues/4663
 [alias]
 schema = "run --features xion --example schema"
-wasm = "build --release --target wasm32-unknown-unknown"
+wasm   = "build --release --target wasm32-unknown-unknown"

framework/contracts/account/Cargo.toml

@@ -1,49 +1,49 @@
 [package]
-name = "abstract-account"
-version = "0.24.2"
-authors = { workspace = true }
-edition = { workspace = true }
+authors     = { workspace = true }
 description = "Abstract Account Contract"
-license = { workspace = true }
-readme = "README.md"
-repository = "https://github.com/AbstractSDK/abstract"
+edition     = { workspace = true }
+license     = { workspace = true }
+name        = "abstract-account"
+readme      = "README.md"
+repository  = "https://github.com/AbstractSDK/abstract"
+version     = "0.24.2"
 
 exclude = ["contract.wasm", "hash.txt"]
 
 [lints]
 workspace = true
 
 [[example]]
-name = "schema"
+name              = "schema"
 required-features = ["xion"]
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
 [features]
 default = ["export"]
-export = []
-xion = ["abstract-xion"]
+export  = []
+xion    = ["abstract-xion"]
 
 [package.metadata.optimizer]
+builds         = [{ name = "xion", features = ["xion"] }]
 standard-build = true
-builds = [{ name = "xion", features = ["xion"] }]
 
 [dependencies]
-cosmwasm-std = { workspace = true }
+abstract-macros = { workspace = true }
+abstract-sdk    = { workspace = true }
+abstract-std    = { workspace = true }
 cosmwasm-schema = { workspace = true }
-cw-controllers = { 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 }
-cw-asset = { workspace = true }
-schemars = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-abstract-sdk = { workspace = true }
-abstract-std = { workspace = true }
-semver = { workspace = true }
-abstract-macros = { workspace = true }
+cw2             = { workspace = true }
+cw20            = { workspace = true }
+schemars        = { workspace = true }
+semver          = { workspace = true }
+serde           = { workspace = true }
+thiserror       = { workspace = true }
 
 abstract-ica = { workspace = true }
 
@@ -56,21 +56,21 @@ workspace-hack = { version = "0.1", path = "../../workspace-hack" }
 cw20 = { workspace = true }
 # cw721-base = { version = "0.18.0", features = ["library"] }
 # cw721 = { version = "0.18.0" }
-abstract-interface = { workspace = true }
-cw-orch = { workspace = true, features = ["snapshot-testing"] }
-anyhow = { workspace = true }
-ans-host = { workspace = true }
-registry = { workspace = true }
-module-factory = { workspace = true }
-rstest = { workspace = true }
-abstract-sdk = { workspace = true, features = ["test-utils"] }
-abstract-adapter = { workspace = true, features = ["test-utils"] }
-abstract-app = { workspace = true, features = ["test-utils"] }
-abstract-standalone = { workspace = true, features = ["test-utils"] }
-abstract-testing = { workspace = true }
-abstract-macros = { workspace = true }
+abstract-adapter           = { workspace = true, features = ["test-utils"] }
+abstract-app               = { workspace = true, features = ["test-utils"] }
 abstract-integration-tests = { workspace = true }
-coverage-helper = { workspace = true }
+abstract-interface         = { workspace = true }
+abstract-macros            = { workspace = true }
+abstract-sdk               = { workspace = true, features = ["test-utils"] }
+abstract-standalone        = { workspace = true, features = ["test-utils"] }
+abstract-testing           = { workspace = true }
+ans-host                   = { workspace = true }
+anyhow                     = { workspace = true }
+coverage-helper            = { workspace = true }
+cw-orch                    = { workspace = true, features = ["snapshot-testing"] }
+module-factory             = { workspace = true }
+registry                   = { workspace = true }
+rstest                     = { workspace = true }
 
 base64 = { version = "0.22.1", default-features = false }
 

framework/contracts/native/ans-host/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "abstract-ans-host"
-version = "0.24.2"
-authors = { workspace = true }
-edition = { workspace = true }
+authors     = { workspace = true }
 description = "Abstract Name Service Contract"
-license = { workspace = true }
-readme = "README.md"
-repository = "https://github.com/AbstractSDK/abstract"
+edition     = { workspace = true }
+license     = { workspace = true }
+name        = "abstract-ans-host"
+readme      = "README.md"
+repository  = "https://github.com/AbstractSDK/abstract"
+version     = "0.24.2"
 
 exclude = ["contract.wasm", "hash.txt"]
 
@@ -18,31 +18,31 @@ crate-type = ["cdylib", "rlib"]
 
 [features]
 default = ["export"]
-export = []
+export  = []
 
 [dependencies]
-cosmwasm-std = { workspace = true }
-cw-controllers = { workspace = true }
-cw-storage-plus = { workspace = true }
-cw2 = { workspace = true }
-serde = { workspace = true }
-semver = { workspace = true }
-thiserror = { workspace = true }
-abstract-std = { workspace = true }
-cw-asset = { workspace = true }
 abstract-macros = { workspace = true }
-abstract-sdk = { workspace = true }
-cw-ownable = { workspace = true }
+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]
 workspace-hack = { version = "0.1", path = "../../../workspace-hack" }
 
 [dev-dependencies]
-cw20 = { workspace = true }
-cosmwasm-schema = { workspace = true }
-rstest = { workspace = true }
 abstract-testing = { workspace = true }
-coverage-helper = { workspace = true }
+cosmwasm-schema  = { workspace = true }
+coverage-helper  = { workspace = true }
+cw20             = { workspace = true }
+rstest           = { workspace = true }
 
 [profile.release]
 overflow-checks = true