Merge pull request #13 from apollo-sturdy/dev/split-implementation-cr…

…ates

feat: split out implementations to separate crates

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# [0.5.2] - 2024-02-13
+
+### Changed
+
+- Deprecated `implemenations` module in favor of new crates `cw-dex-astroport` and `cw-dex-osmosis`.
+  - This is to avoid breaking changes in `cw-dex` when one of the implementations change.
+
 # [0.5.1] - 2024-02-06
 
 ### Changed

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["cw-dex", "test-contracts/*", "test-helpers"]
+members = ["cw-dex", "cw-dex-astroport", "cw-dex-osmosis", "test-contracts/*", "test-helpers"]
 resolver = "2"
 
 [workspace.package]
@@ -25,15 +25,21 @@ schemars = "0.8.10"
 serde = { version = "1.0.145", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.31" }
 apollo-cw-asset = "0.1.1"
-osmosis-std = "0.19.2"
+osmosis-std = "0.22.0"
 cw-it = "0.3.0-rc.4"
-cw-dex = { path = "cw-dex" }
+apollo-utils = "0.1.0"
+astroport = "2.9.0"
+astroport_v3 = { package = "astroport", version = "3.11.1" }
+test-case = "3.0.0"
+proptest = "1.0.0"
+
+# Workspace packages
+cw-dex = { path = "cw-dex", version = "0.5.2" }
+cw-dex-astroport = { path = "cw-dex-astroport", version = "0.1.0" }
+cw-dex-osmosis = { path = "cw-dex-osmosis", version = "0.1.0" }
 cw-dex-test-contract = { path = "test-contracts/package" }
 astroport-test-contract = { path = "test-contracts/astroport-test-contract" }
 cw-dex-test-helpers = { path = "test-helpers" }
-apollo-utils = "0.1.0"
-astroport = "=2.9.0"
-astroport_v3 = { package = "astroport", version = "=3.11.1" }
 
 [profile.release]
 codegen-units    = 1

Makefile.toml

@@ -54,7 +54,7 @@ args = ["fmt", "--all", "--","--verbose", "--check"]
 
 [tasks.deny]
 command = "cargo"
-args = ["deny", "check"]
+args = ["deny", "--all-features", "check"]
 
 [tasks.check]
 toolchain = "${RUST_VERSION}"

cw-dex-astroport/Cargo.toml

@@ -0,0 +1,41 @@
+[package]
+name = "cw-dex-astroport"
+authors = ["Apollo Devs"]
+description = "Implementation of the cw-dex API for the Astroport AMM"
+edition = "2021"
+license = "MPL-2.0"
+repository = "https://github.com/apollodao/cw-dex"
+version = "0.1.0"
+readme = "README.md"
+
+[features]
+default = []
+osmosis-test-tube = ["cw-it/osmosis-test-tube", "cw-dex-test-helpers/osmosis-test-tube"]
+# backtraces = ["cosmwasm-std/backtraces", "osmosis-std/backtraces"]
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
+[dependencies]
+cw-dex = { workspace = true }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true }
+apollo-cw-asset = { workspace = true, features = ["astroport"] }
+cw-utils = { workspace = true }
+cw20 = { workspace = true }
+apollo-utils = { workspace = true }
+
+# Astroport
+astroport = { workspace = true }
+astroport_v3 = { workspace = true }
+cw2  = { workspace = true }
+
+[dev-dependencies]
+cw-it = { workspace = true, features = ["astroport", "multi-test", "astroport-multi-test"] }
+test-case = { workspace = true }
+cw-dex-test-contract = { workspace = true }
+cw-dex-test-helpers = { workspace = true, features = ["astroport"] }
+proptest = { workspace = true }
+cw20-base = { workspace = true }
+cw20 = { workspace = true }

cw-dex-astroport/src/lib.rs

@@ -0,0 +1,9 @@
+//! Pool and Staking implementations for Astroport
+
+mod pool;
+mod staking;
+
+pub use pool::AstroportPool;
+pub use staking::AstroportStaking;
+
+pub use {astroport, astroport_v3};