From 2d1177a0f4680a5c46a1d18906459bc5c62d3c7d Mon Sep 17 00:00:00 2001
From: Vladimir Stepanenko <vovac12@gmail.com>
Date: Mon, 12 Aug 2024 23:12:24 +0700
Subject: [PATCH] Prepare release 3.5.2 (#1167)

---
 Cargo.lock                 |  6 +++---
 node/Cargo.toml            |  2 +-
 node/chain_spec/Cargo.toml |  2 +-
 runtime/Cargo.toml         |  4 ++--
 runtime/src/lib.rs         | 23 +++++++++++++++++++----
 runtime/src/migrations.rs  |  6 ++----
 6 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 61561cbb52..162cbec17d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3597,7 +3597,7 @@ dependencies = [
 
 [[package]]
 name = "framenode"
-version = "3.5.1"
+version = "3.5.2"
 dependencies = [
  "ahash 0.8.5",
  "assert_cmd",
@@ -3680,7 +3680,7 @@ dependencies = [
 
 [[package]]
 name = "framenode-chain-spec"
-version = "3.5.1"
+version = "3.5.2"
 dependencies = [
  "common",
  "faucet",
@@ -3706,7 +3706,7 @@ dependencies = [
 
 [[package]]
 name = "framenode-runtime"
-version = "3.5.1"
+version = "3.5.2"
 dependencies = [
  "apollo-platform",
  "assets",
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 98a7560925..6815c9498e 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "framenode"
-version = "3.5.1"
+version = "3.5.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 edition = "2021"
diff --git a/node/chain_spec/Cargo.toml b/node/chain_spec/Cargo.toml
index 3cc4754e1c..e0d7e31642 100644
--- a/node/chain_spec/Cargo.toml
+++ b/node/chain_spec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "framenode-chain-spec"
-version = "3.5.1"
+version = "3.5.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 0f5f280ba8..ac6087ad4d 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -5,7 +5,7 @@ license = "BSD-4-Clause"
 homepage = "https://sora.org"
 repository = "https://github.com/sora-xor/sora2-network"
 name = "framenode-runtime"
-version = "3.5.1"
+version = "3.5.2"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -93,7 +93,7 @@ pswap-distribution-benchmarking = { path = "../pallets/pswap-distribution/benchm
 pswap-distribution-runtime-api = { path = "../pallets/pswap-distribution/runtime-api", default-features = false }
 qa-tools = { path = "../pallets/qa-tools", default-features = false, optional = true }
 referrals = { path = "../pallets/referrals", default-features = false }
-extended-assets = { path = "../pallets/extended-assets", default-features = false}
+extended-assets = { path = "../pallets/extended-assets", default-features = false }
 rewards = { path = "../pallets/rewards", default-features = false }
 rewards-runtime-api = { path = "../pallets/rewards/runtime-api", default-features = false }
 soratopia = { path = "../pallets/soratopia", default-features = false, optional = true }
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 02b3bbf1cc..e5b4ea3b51 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -37,8 +37,11 @@
 extern crate alloc;
 use alloc::string::String;
 use bridge_types::traits::Verifier;
+#[cfg(feature = "wip")]
 use bridge_types::types::GenericAdditionalInboundData;
-use bridge_types::{GenericNetworkId, SubNetworkId, H256};
+#[cfg(feature = "wip")]
+use bridge_types::GenericNetworkId;
+use bridge_types::{SubNetworkId, H256};
 use sp_runtime::traits::Keccak256;
 
 mod bags_thresholds;
@@ -256,10 +259,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("sora-substrate"),
     impl_name: create_runtime_str!("sora-substrate"),
     authoring_version: 1,
-    spec_version: 91,
+    spec_version: 92,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
-    transaction_version: 91,
+    transaction_version: 92,
     state_version: 0,
 };
 
@@ -1025,10 +1028,22 @@ parameter_type_with_key! {
     };
 }
 
+#[cfg(not(feature = "wip"))] // Chameleon pools
+parameter_type_with_key! {
+    pub GetChameleonPools: |base: AssetId| -> Option<(AssetId, sp_std::collections::btree_set::BTreeSet<AssetId>)> {
+        if *base == common::XOR {
+            Some((common::KXOR, [common::ETH].into_iter().collect()))
+        } else {
+            None
+        }
+    };
+}
+
+#[cfg(feature = "wip")] // Chameleon pools
 parameter_type_with_key! {
     pub GetChameleonPools: |base: AssetId| -> Option<(AssetId, sp_std::collections::btree_set::BTreeSet<AssetId>)> {
         if *base == common::XOR {
-            Some((common::KXOR, [common::ETH, common::VAL, common::PSWAP].into_iter().collect()))
+            Some((common::KXOR, [common::ETH, common::PSWAP, common::VAL].into_iter().collect()))
         } else {
             None
         }
diff --git a/runtime/src/migrations.rs b/runtime/src/migrations.rs
index 05246c2e14..78d0548aaf 100644
--- a/runtime/src/migrations.rs
+++ b/runtime/src/migrations.rs
@@ -28,12 +28,10 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#[cfg(feature = "wip")]
 use crate::*;
 
-pub type Migrations = (
-    assets::migration::asset_infos_v2::AssetInfosUpdate<Runtime>,
-    WipMigrations,
-);
+pub type Migrations = (WipMigrations,);
 
 #[cfg(feature = "wip")] // dex-kusd
 pub type WipMigrations = (dex_manager::migrations::kusd_dex::AddKusdBasedDex<Runtime>,);