Merge develop into release branch

CODEOWNERS

@@ -8,7 +8,6 @@
 # Ignore everything but mod.rs in /runtime/common/src/weights/
 /runtime/common/src/weights/*
 /runtime/common/src/weights/mod.rs @sea212
-/zrml/asset-router/ @sea212
 /zrml/authorized/ @Chralt98
 /zrml/court/ @Chralt98
 /zrml/global-disputes/ @Chralt98

Cargo.toml

@@ -14,7 +14,6 @@ default-members = [
     "runtime/battery-station",
     "runtime/zeitgeist",
     "zrml/authorized",
-    "zrml/asset-router",
     "zrml/court",
     "zrml/hybrid-router",
     "zrml/global-disputes",
@@ -40,7 +39,6 @@ members = [
     "runtime/battery-station",
     "runtime/zeitgeist",
     "zrml/authorized",
-    "zrml/asset-router",
     "zrml/court",
     "zrml/hybrid-router",
     "zrml/global-disputes",
@@ -254,7 +252,6 @@ zrml-swaps-rpc = { path = "zrml/swaps/rpc" }
 common-runtime = { path = "runtime/common", default-features = false }
 zeitgeist-macros = { path = "macros", default-features = false }
 zeitgeist-primitives = { path = "primitives", default-features = false }
-zrml-asset-router = { path = "zrml/asset-router", default-features = false }
 zrml-authorized = { path = "zrml/authorized", default-features = false }
 zrml-court = { path = "zrml/court", default-features = false }
 zrml-global-disputes = { path = "zrml/global-disputes", default-features = false }
@@ -287,7 +284,6 @@ arbitrary = { version = "1.3.2", default-features = false }
 arrayvec = { version = "0.7.4", default-features = false }
 cfg-if = { version = "1.0.0" }
 fixed = { version = "=1.15.0", default-features = false, features = ["num-traits"] }
-impl-trait-for-tuples = { version = "0.2.2" }
 # Hashbrown works in no_std by default and default features are used in Rikiddo
 hashbrown = { version = "0.14.3", default-features = true }
 hex-literal = { version = "0.4.1", default-features = false }
@@ -354,14 +350,11 @@ opt-level = 3
 # Zeitgeist runtime requires unwinding.
 panic = "unwind"
 
-[patch."https://github.com/paritytech/polkadot-sdk"]
-# pallet-asset adjustments (managed asset destruction)
-# Commits:
-#  - cb803be8cdc52d020890308a2076d752a8c4ce5c
-pallet-assets = { git = "https://github.com/zeitgeistpm/polkadot-sdk", branch = "zeitgeist-polkadot-v1.1.0" }
+
 # xcm-emulator incompatible block number type fixed
 # Commits:
 # - 
+[patch."https://github.com/paritytech/polkadot-sdk"]
 xcm-emulator = { git = "https://github.com/zeitgeistpm/polkadot-sdk", branch = "release-polkadot-v1.1.0-xcm-emulator-type-fix" }
 
 [patch."https://github.com/galacticcouncil/HydraDX-node"]

README.md

@@ -18,8 +18,6 @@ decentralized court.
 
 ## Modules
 
-- [asset-router](./zrml/asset-router) - Routes all asset classes to the
-  respective pallets and provides a garbage collection for destructible assets.
 - [authorized](./zrml/authorized) - Offers authorized resolution of disputes.
 - [court](./zrml/court) - An implementation of a court mechanism used to resolve
   disputes in a decentralized fashion.

docs/changelog_for_devs.md

@@ -128,28 +128,22 @@ if ztg_supply / campaign_asset_supply >= 100 {
 [#1197]: https://github.com/zeitgeistpm/zeitgeist/pull/1197
 [#1178]: https://github.com/zeitgeistpm/zeitgeist/pull/1178
 
-### Changed
+### Changes
 
-- ⚠️ Move the `zeitgeist_primitives::Pool` struct to `zrml_swaps::types::Pool`
-  and change the following fields ([#1197]):
-  - Remove `market_id`
-  - Make `swap_fee` non-optional
-  - Remove `total_subsidy`
-  - Make `total_weight` non-optional
-  - Make `weights` non-optional
-- ⚠️ Change the type of `liquidity_shares_manager` in
-  `zrml_neo_swaps::types::Pool` from `zrml_neo_swaps::types::SoloLp` to
-  `zrml_neo_swaps::types::LiquidityTree`. Details on the liquidity tree can be
-  found in the `README.md` of zrml-neo-swaps and the documentation of the
-  `LiquidityTree` object ([#1179]).
+- ⚠️ Move the `zeitgeist_primitives::Pool` struct to `zrml_swaps::types::Pool` and change the following fields ([#1197]):
+    - Remove `market_id`
+    - Make `swap_fee` non-optional
+    - Remove `total_subsidy`
+    - Make `total_weight` non-optional
+    - Make `weights` non-optional
+- ⚠️ Change the type of `liquidity_shares_manager` in `zrml_neo_swaps::types::Pool` from `zrml_neo_swaps::types::SoloLp` to `zrml_neo_swaps::types::LiquidityTree`. Details on the liquidity tree can be found in the `README.md` of zrml-neo-swaps and the documentation of the `LiquidityTree` object ([#1179]).
 
 ### Migrations
 
 - Closed all CPMM pools. Withdrawals are still allowed. Creating new pools will
   be impossible until further updates are deployed. ([#1197])
 - Remove all Rikiddo storage elements. ([#1197])
-- Migrate neo-swaps `Pools` storage. The market creator's liquidity position is
-  translated into a position in the liquidity tree of the same value ([#1178]).
+- Migrate neo-swaps `Pools` storage. The market creator's liquidity position is translated into a position in the liquidity tree of the same value ([#1178]).
 
 ### Removed
 

macros/src/lib.rs

@@ -50,7 +50,7 @@ macro_rules! create_b_tree_map {
 #[macro_export]
 macro_rules! unreachable_non_terminating {
     ($condition: expr, $message: literal, $($message_args: tt)*) => {
-        let message = alloc::format!($message, $($message_args)*);
+        let message = format!($message, $($message_args)*);
 
         #[cfg(test)]
         assert!($condition, "{}", message);
@@ -60,7 +60,7 @@ macro_rules! unreachable_non_terminating {
         }
     };
     ($condition: expr, $log_target: ident, $message: literal, $($message_args: tt)*) => {
-        let message = alloc::format!($message, $($message_args)*);
+        let message = format!($message, $($message_args)*);
 
         #[cfg(test)]
         assert!($condition, "{}", message);
@@ -70,7 +70,7 @@ macro_rules! unreachable_non_terminating {
         }
     };
     ($condition: expr, $extra_code: expr, $message: literal, $($message_args: tt)*) => {
-        let message = alloc::format!($message, $($message_args)*);
+        let message = format!($message, $($message_args)*);
 
         #[cfg(test)]
         assert!($condition, "{}", message);
@@ -81,7 +81,7 @@ macro_rules! unreachable_non_terminating {
         }
     };
     ($condition: expr, $log_target: ident, $extra_code: expr, $message: literal, $($message_args: tt)*) => {
-        let message = alloc::format!($message, $($message_args)*);
+        let message = format!($message, $($message_args)*);
 
         #[cfg(test)]
         assert!($condition, "{}", message);

primitives/Cargo.toml

@@ -3,7 +3,6 @@ arbitrary = { workspace = true, optional = true }
 fixed = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-impl-trait-for-tuples = { workspace = true }
 num-traits = { workspace = true }
 orml-currencies = { workspace = true }
 orml-tokens = { workspace = true }