Merge pull request #396 from astroport-fi/merge/features_221223

Release v3.8.0
astroport-fi · Dec 22, 2023 · 80595f1 · 80595f1
2 parents d9e00f4 + 04fe9c9
commit 80595f1
Show file tree

Hide file tree

Showing 4 changed files with 104 additions and 115 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/pair_concentrated/Cargo.toml b/contracts/pair_concentrated/Cargo.toml
@@ -38,6 +38,7 @@ thiserror = "1.0"
 cosmwasm-schema = "1.1"
 itertools = "0.10"
 cw-utils = "0.15"
+astroport-pair-concentrated_v1 = { package = "astroport-pair-concentrated", version = "1.2.13", features = ["library"] }
 
 [dev-dependencies]
 astroport-token = { path = "../token" }

diff --git a/contracts/pair_concentrated/src/contract.rs b/contracts/pair_concentrated/src/contract.rs
@@ -958,11 +958,10 @@ pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, C
 
     match contract_version.contract.as_ref() {
         "astroport-pair-concentrated" => match contract_version.version.as_ref() {
-            "1.1.0" => migrate_config(deps.storage)?,
-            "1.2.4" => {
+            "1.2.13" | "1.2.14" => {
+                migrate_config(deps.storage)?;
                 BufferManager::init(deps.storage, OBSERVATIONS, OBSERVATIONS_SIZE)?;
             }
-            "2.0.3" | "2.0.4" => {}
             _ => return Err(ContractError::MigrationError {}),
         },
         _ => return Err(ContractError::MigrationError {}),