Migrate swapper to new version. (#387)

* Migrate swapper to new version.

* Handle different CosmWasm pool deserialization.

contracts/swapper/osmosis/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name          = "mars-swapper-osmosis"
-version       = "2.0.2"
+version       = "2.0.3"
 authors       = { workspace = true }
 license       = { workspace = true }
 edition       = { workspace = true }

contracts/swapper/osmosis/src/contract.rs

@@ -41,6 +41,6 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> ContractResult<Binary> {
 pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> Result<Response, ContractError> {
     match msg {
         MigrateMsg::V1_0_0ToV2_0_0 {} => migrations::v2_0_0::migrate(deps),
-        MigrateMsg::V2_0_1ToV2_0_2 {} => migrations::v2_0_2::migrate(deps),
+        MigrateMsg::V2_0_2ToV2_0_3 {} => migrations::v2_0_3::migrate(deps),
     }
 }

contracts/swapper/osmosis/src/migrations/mod.rs

@@ -1,2 +1,2 @@
 pub mod v2_0_0;
-pub mod v2_0_2;
+pub mod v2_0_3;

contracts/swapper/osmosis/src/migrations/v2_0_2.rs → contracts/swapper/osmosis/src/migrations/v2_0_3.rs

@@ -4,7 +4,7 @@ use mars_swapper_base::ContractError;
 
 use crate::contract::{CONTRACT_NAME, CONTRACT_VERSION};
 
-const FROM_VERSION: &str = "2.0.1";
+const FROM_VERSION: &str = "2.0.2";
 
 pub fn migrate(deps: DepsMut) -> Result<Response, ContractError> {
     // make sure we're migrating the correct contract and from the correct version

contracts/swapper/osmosis/tests/tests/test_migration_v2.rs

@@ -64,12 +64,12 @@ fn successful_migration() {
     assert!(res.data.is_none());
     assert_eq!(
         res.attributes,
-        vec![attr("action", "migrate"), attr("from_version", "1.0.0"), attr("to_version", "2.0.2")] // to_version should be 2.0.0 but because of global current version in Cargo.toml is different
+        vec![attr("action", "migrate"), attr("from_version", "1.0.0"), attr("to_version", "2.0.3")] // to_version should be 2.0.0 but because of global current version in Cargo.toml is different
     );
 
     let new_contract_version = ContractVersion {
         contract: "crates.io:mars-swapper-osmosis".to_string(),
-        version: "2.0.2".to_string(), // should be 2.0.0 but global current version in Cargo.toml is different
+        version: "2.0.3".to_string(), // should be 2.0.0 but global current version in Cargo.toml is different
     };
     assert_eq!(cw2::get_contract_version(deps.as_ref().storage).unwrap(), new_contract_version);
 
@@ -85,22 +85,22 @@ fn successful_migration() {
 #[test]
 fn successful_migration_to_v2_0_2() {
     let mut deps = mock_dependencies(&[]);
-    cw2::set_contract_version(deps.as_mut().storage, "crates.io:mars-swapper-osmosis", "2.0.1")
+    cw2::set_contract_version(deps.as_mut().storage, "crates.io:mars-swapper-osmosis", "2.0.2")
         .unwrap();
 
-    let res = migrate(deps.as_mut(), mock_env(), MigrateMsg::V2_0_1ToV2_0_2 {}).unwrap();
+    let res = migrate(deps.as_mut(), mock_env(), MigrateMsg::V2_0_2ToV2_0_3 {}).unwrap();
 
     assert_eq!(res.messages, vec![]);
     assert_eq!(res.events, vec![] as Vec<Event>);
     assert!(res.data.is_none());
     assert_eq!(
         res.attributes,
-        vec![attr("action", "migrate"), attr("from_version", "2.0.1"), attr("to_version", "2.0.2")]
+        vec![attr("action", "migrate"), attr("from_version", "2.0.2"), attr("to_version", "2.0.3")]
     );
 
     let new_contract_version = ContractVersion {
         contract: "crates.io:mars-swapper-osmosis".to_string(),
-        version: "2.0.2".to_string(),
+        version: "2.0.3".to_string(),
     };
     assert_eq!(cw2::get_contract_version(deps.as_ref().storage).unwrap(), new_contract_version);
 }

packages/chains/osmosis/src/helpers.rs

@@ -170,10 +170,14 @@ impl TryFrom<osmosis_std::shim::Any> for Pool {
                 }));
             }
 
-            return Err(StdError::parse_err(
-                "Pool",
-                "Failed to parse CosmWasm pool instantiate message.",
-            ));
+            // There could be many versions of the CosmWasm pool. Every time a new version is released,
+            // we need to add a new `if` block here to handle the new version. Instead of doing that,
+            // we can just return only CosmWasm pool with pool id and let the caller handle it.
+            // The caller can then query the pool contract to get the pool asset configs (if needed).
+            return Ok(Pool::CosmWasm(CosmWasmPool {
+                id: pool.pool_id,
+                pool_asset_configs: vec![],
+            }));
         }
 
         Err(StdError::parse_err(
@@ -553,7 +557,7 @@ mod tests {
     }
 
     #[test]
-    fn cosmwasm_pool_error_handled() {
+    fn unknown_cosmwasm_pool_handled() {
         let msg = InstantiateMsg {
             pool_asset_denoms: vec![
                 "ibc/D189335C6E4A68B513C10AB227BF1C1D38C746766278BA3EEB4FB14124F1D858".to_string(),
@@ -568,11 +572,9 @@ mod tests {
         };
 
         let any_pool = cosmwasm_pool.to_any();
-        let pool: Result<Pool, StdError> = any_pool.try_into();
+        let pool: Pool = any_pool.try_into().unwrap();
 
-        assert_eq!(
-            pool.unwrap_err(),
-            StdError::parse_err("Pool", "Failed to parse CosmWasm pool instantiate message.",)
-        );
+        assert_eq!(cosmwasm_pool.pool_id, pool.get_pool_id());
+        assert_eq!(Vec::<String>::new(), pool.get_pool_denoms());
     }
 }

packages/types/src/swapper.rs

@@ -122,5 +122,5 @@ pub struct EstimateExactInSwapResponse {
 #[cw_serde]
 pub enum MigrateMsg {
     V1_0_0ToV2_0_0 {},
-    V2_0_1ToV2_0_2 {},
+    V2_0_2ToV2_0_3 {},
 }

schemas/mars-swapper-osmosis/mars-swapper-osmosis.json

@@ -1,6 +1,6 @@
 {
   "contract_name": "mars-swapper-osmosis",
-  "contract_version": "2.0.2",
+  "contract_version": "2.0.3",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",