Merge develop-v0.5.4 into main

CODEOWNERS

@@ -16,8 +16,6 @@
 /zrml/orderbook/ @Chralt98
 /zrml/parimutuel/ @Chralt98
 /zrml/prediction-markets/ @maltekliemann
-/zrml/rikiddo/ @sea212
-/zrml/simple-disputes/ @Chralt98
 /zrml/styx/ @yornaath
 /zrml/swaps/ @maltekliemann
 

Cargo.toml

@@ -17,15 +17,12 @@ default-members = [
     "zrml/court",
     "zrml/hybrid-router",
     "zrml/global-disputes",
-    "zrml/liquidity-mining",
     "zrml/market-commons",
     "zrml/neo-swaps",
     "zrml/orderbook",
     "zrml/parimutuel",
     "zrml/prediction-markets",
     "zrml/prediction-markets/runtime-api",
-    "zrml/rikiddo",
-    "zrml/simple-disputes",
     "zrml/swaps",
     "zrml/swaps/rpc",
     "zrml/swaps/runtime-api",
@@ -42,7 +39,6 @@ members = [
     "zrml/court",
     "zrml/hybrid-router",
     "zrml/global-disputes",
-    "zrml/liquidity-mining",
     "zrml/market-commons",
     "zrml/neo-swaps",
     "zrml/orderbook",
@@ -51,9 +47,6 @@ members = [
     "zrml/prediction-markets",
     "zrml/prediction-markets/fuzz",
     "zrml/prediction-markets/runtime-api",
-    "zrml/rikiddo",
-    "zrml/rikiddo/fuzz",
-    "zrml/simple-disputes",
     "zrml/swaps",
     "zrml/swaps/fuzz",
     "zrml/swaps/rpc",
@@ -219,7 +212,6 @@ sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "rel
 sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-substrate-fixed = { git = "https://github.com/encointer/substrate-fixed", default-features = false }
 
 # Polkadot / XCM (client)
 polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
@@ -244,7 +236,6 @@ xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/par
 battery-station-runtime = { path = "runtime/battery-station" }
 zeitgeist-runtime = { path = "runtime/zeitgeist" }
 zrml-prediction-markets-fuzz = { path = "zrml/prediction-markets/fuzz" }
-zrml-rikiddo-fuzz = { path = "zrml/rikkido/fuzz" }
 zrml-swaps-fuzz = { path = "zrml/swaps/fuzz" }
 zrml-swaps-rpc = { path = "zrml/swaps/rpc" }
 
@@ -256,15 +247,12 @@ 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 }
 zrml-hybrid-router = { path = "zrml/hybrid-router", default-features = false }
-zrml-liquidity-mining = { path = "zrml/liquidity-mining", default-features = false }
 zrml-market-commons = { path = "zrml/market-commons", default-features = false }
 zrml-neo-swaps = { path = "zrml/neo-swaps", default-features = false }
 zrml-orderbook = { path = "zrml/orderbook", default-features = false }
 zrml-parimutuel = { path = "zrml/parimutuel", default-features = false }
 zrml-prediction-markets = { path = "zrml/prediction-markets", default-features = false }
 zrml-prediction-markets-runtime-api = { path = "zrml/prediction-markets/runtime-api", default-features = false }
-zrml-rikiddo = { path = "zrml/rikiddo", default-features = false }
-zrml-simple-disputes = { path = "zrml/simple-disputes", default-features = false }
 zrml-styx = { path = "zrml/styx", default-features = false }
 zrml-swaps = { path = "zrml/swaps", default-features = false }
 zrml-swaps-runtime-api = { path = "zrml/swaps/runtime-api", default-features = false }

README.md

@@ -39,10 +39,6 @@ decentralized court.
   user to create pools, provide liquidity or swap assets.
 - [primitives](./zrml/primitives) - Contains custom and common types, traits and
   constants.
-- [rikiddo](./zrml/rikiddo) - The module contains a completely modular
-  implementation of our novel market maker [Rikiddo][rikiddo]. It also offers a
-  pallet that other pallets can use to utilize the Rikiddo market maker. Rikiddo
-  can be used by the automated market maker to determine swap prices.
 
 ## How to Build and Run a Zeitgeist Node
 

docs/STYLE_GUIDE.md

@@ -138,10 +138,11 @@ duplicating documentation.
 
 - Merges require one review. Additional reviews may be requested.
 - Every merge into a feature branch requires a review.
+- Feature branches are merged into `develop`, which is merged into
+  `release-vX.Y.Z` branches when we're publishing a release.
 - Aim for at most 500 LOC added per PR. Only exceed 1,000 LOC lines added in a
   PR in exceptional circumstances. Plan ahead and break a large PR into smaller
-  PRs targeting a feature branch. Feature branches are exempt from this rule.
-- Reviews take priority over most other tasks.
+  PRs.
 - Reviewing a PR should not take longer than two business days. Aim for shorter
   PRs if the changes are complex.
 - A PR should not be in flight (going from first `s:ready-for-review` to
@@ -163,7 +164,7 @@ duplicating documentation.
   // In code logic
   zeitgeist_macros::unreachable_non_terminating!(condition, log_target, message)
   ```
-  
+
   ```rust
   // In test
   #[test]

docs/changelog_for_devs.md

@@ -12,6 +12,11 @@ As of 0.3.9, the changelog's format is based on
 components which query the chain's storage, the extrinsics or the runtime
 APIs/RPC interface.
 
+## v0.5.4
+
+- ⚠️  Remove zrml-liquidity-mining from code base.
+- ⚠️  Remove zrml-rikiddo from the code base.
+
 ## v0.5.2
 
 [#1310]: https://github.com/zeitgeistpm/zeitgeist/pull/1310

node/Cargo.toml

@@ -114,7 +114,6 @@ url = { workspace = true }
 battery-station-runtime = { workspace = true, optional = true }
 zeitgeist-primitives = { workspace = true, features = ["default"] }
 zeitgeist-runtime = { workspace = true, optional = true }
-zrml-liquidity-mining = { workspace = true, features = ["default"] }
 zrml-swaps-rpc = { workspace = true }
 
 [features]

node/src/chain_spec/battery_station.rs

@@ -24,13 +24,7 @@ use battery_station_runtime::parameters::SS58Prefix;
 use hex_literal::hex;
 use sc_service::ChainType;
 use sp_core::crypto::UncheckedInto;
-use zeitgeist_primitives::{
-    constants::{
-        ztg::{LIQUIDITY_MINING, LIQUIDITY_MINING_PTD},
-        BASE,
-    },
-    types::AccountId,
-};
+use zeitgeist_primitives::{constants::BASE, types::AccountId};
 
 #[cfg(feature = "parachain")]
 use {

node/src/chain_spec/dev.rs

@@ -30,10 +30,7 @@ use battery_station_runtime::{
 };
 use sc_service::ChainType;
 use sp_core::sr25519;
-use zeitgeist_primitives::{
-    constants::ztg::{LIQUIDITY_MINING, LIQUIDITY_MINING_PTD},
-    types::Balance,
-};
+use zeitgeist_primitives::types::Balance;
 #[cfg(feature = "parachain")]
 use {
     super::battery_station::inflation_config,

node/src/chain_spec/mod.rs

@@ -150,10 +150,6 @@ macro_rules! generate_generic_genesis_function {
                     authorities: acs.initial_authorities.iter().map(|x| (x.1.clone(), 1)).collect(),
                     ..Default::default()
                 },
-                liquidity_mining: $runtime::LiquidityMiningConfig {
-                    initial_balance: LIQUIDITY_MINING,
-                    per_block_distribution: LIQUIDITY_MINING_PTD.mul_ceil(LIQUIDITY_MINING),
-                },
                 #[cfg(feature = "parachain")]
                 parachain_info: $runtime::ParachainInfoConfig {
                     parachain_id: acs.parachain_id,

node/src/chain_spec/zeitgeist.rs

@@ -27,8 +27,6 @@ use sc_service::ChainType;
 use sp_core::crypto::UncheckedInto;
 use zeitgeist_runtime::parameters::SS58Prefix;
 
-use zeitgeist_primitives::constants::ztg::{LIQUIDITY_MINING, LIQUIDITY_MINING_PTD};
-
 #[cfg(feature = "parachain")]
 use {
     super::{generate_inflation_config_function, Extensions},

primitives/src/constants.rs

@@ -51,8 +51,8 @@ pub const fn deposit(items: u32, bytes: u32) -> Balance {
     items as Balance * 150 * CENT + (bytes as Balance) * 75 * MICRO
 }
 
-// Rikiddo and TokensConfig
 parameter_types! {
+    // Returns the number of decimals used on chain.
     pub const BalanceFractionalDecimals: u8 = {
         let mut base = BASE;
         let mut counter: u8 = 0;
@@ -114,9 +114,6 @@ pub const MAX_ORACLE_DURATION: BlockNumber = 14 * BLOCKS_PER_DAY;
 /// Pallet identifier, mainly used for named balance reserves.
 pub const PM_PALLET_ID: PalletId = PalletId(*b"zge/pred");
 
-// Simple Disputes
-pub const SD_PALLET_ID: PalletId = PalletId(*b"zge/sedp");
-
 // Swaps
 /// Max. assets in a swap pool.
 pub const MAX_ASSETS: u16 = MAX_CATEGORIES + 1;