feat: use astroport v5 as default for api

apollodao · Aug 22, 2024 · 35efd39 · 35efd39
1 parent 9db5a1f
commit 35efd39
Show file tree

Hide file tree

Showing 12 changed files with 118 additions and 108 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,19 +26,19 @@ serde = { version = "1.0.145", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.31" }
 apollo-cw-asset = "0.1.1"
 osmosis-std = "0.22.0"
-cw-it = { version = "0.4.0-rc.6", features = ["multi-test"]}
+cw-it = { version = "0.4.0-rc.8", features = ["multi-test"]}
 apollo-utils = "0.1.0"
-astroport = "2.9.0"
-astroport_v5 = { package = "astroport", version = "5.2.0" }
+astroport_v2 = { package = "astroport", version = "2.9.0" }
+astroport = { package = "astroport", version = "5.2.0" }
 test-case = "3.0.0"
 proptest = "1.0.0"
 cw-multi-test = "=1.2.0"
 apollo-cw-multi-test = { version = "0.19.0-rc.1" ,features = ["stargate"] }
 
 # Workspace packages
 cw-dex = { path = "cw-dex", version = "0.5.4-rc.1" }
-cw-dex-astroport = { path = "cw-dex-astroport", version = "0.2.0-rc.2" }
-cw-dex-osmosis = { path = "cw-dex-osmosis", version = "0.1.0" }
+cw-dex-astroport = { path = "cw-dex-astroport", version = "0.2.0-rc.3" }
+cw-dex-osmosis = { path = "cw-dex-osmosis", version = "0.1.1-rc.1" }
 cw-dex-test-contract = { path = "test-contracts/package" }
 astroport-test-contract = { path = "test-contracts/astroport-test-contract" }
 cw-dex-test-helpers = { path = "test-helpers" }

diff --git a/cw-dex-astroport/CHANGELOG.md b/cw-dex-astroport/CHANGELOG.md
@@ -5,12 +5,12 @@ 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.2.0-rc.2] - 2024-05-01
+# [0.2.0-rc.3] - 2024-08-22
 
 ### Changed
 
 - Added support for Astroport native LP tokens.
-- Bumped `astroport_v3` dependency alias of `astroport` package to `5.0.0-rc.1-tokenfactory` and renamed it to `astroport_v5`.
+- Bumped `astroport_v3` dependency alias of `astroport` package to `5.0.0-rc.1-tokenfactory` and renamed it to `astroport`. Renamed `astroport` to `astroport_v2`.
 - Changed `AstroportStaking` field `lp_token_addr: Addr` to `lp_token: AssetInfo`.
 - Changed `AstroportPool` field `lp_token_addr: Addr` to `lp_token: AssetInfo`.
 - Changed `AstroportPool` field `liquidity_manager: Addr` to `liquidity_manager: Option<Addr>`.

diff --git a/cw-dex-astroport/Cargo.toml b/cw-dex-astroport/Cargo.toml
@@ -5,7 +5,7 @@ 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.2.0-rc.2"
+version = "0.2.0-rc.3"
 readme = "README.md"
 
 [features]
@@ -28,7 +28,7 @@ apollo-utils = { workspace = true }
 
 # Astroport
 astroport = { workspace = true }
-astroport_v5 = { workspace = true }
+astroport_v2 = { workspace = true }
 cw2  = { workspace = true }
 
 [dev-dependencies]

diff --git a/cw-dex-astroport/src/lib.rs b/cw-dex-astroport/src/lib.rs
@@ -6,7 +6,7 @@ mod staking;
 pub use pool::AstroportPool;
 pub use staking::AstroportStaking;
 
-pub use {astroport, astroport_v5};
+pub use {astroport, astroport_v2};
 
 /// Re-export `cw-dex` for convenience
 pub use cw_dex;