Fix Block Producer Selection (#818)

* Fix block producer selection Signed-off-by: Adam Reif <Garandor@manta.network> * remove pre-v3.4.0 migration code Signed-off-by: Adam Reif <Garandor@manta.network> * fmt Signed-off-by: Adam Reif <Garandor@manta.network> * remove CanAuthor implementation from parachain-staking Signed-off-by: Adam Reif <Garandor@manta.network> * fix mantapay clippy Signed-off-by: Adam Reif <Garandor@manta.network> * Use manta-v3.4.1 with benchmark fix for aura_author_style_filter Signed-off-by: Adam Reif <Garandor@manta.network> * update nimbus to correctly export the `runtime-benchmarks` feature on `pallet_aura_style_filter` Signed-off-by: Adam Reif <Garandor@manta.network> Signed-off-by: Adam Reif <Garandor@manta.network> Co-authored-by: Shumo Chu <stechu@users.noreply.github.com>
Manta-Network · Oct 8, 2022 · eb05c40 · eb05c40
1 parent 378c4a9
commit eb05c40
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 50 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -86,9 +86,9 @@ cumulus-relay-chain-interface = { git = 'https://github.com/paritytech/cumulus.g
 cumulus-relay-chain-rpc-interface = { git = 'https://github.com/paritytech/cumulus.git', branch = "polkadot-v0.9.26" }
 
 # Nimbus dependencies
-nimbus-consensus = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.3.0" }
-nimbus-primitives = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.3.0" }
-pallet-author-inherent = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.3.0" }
+nimbus-consensus = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.4.1" }
+nimbus-primitives = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.4.1" }
+pallet-author-inherent = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.4.1" }
 
 # Polkadot dependencies
 polkadot-cli = { git = 'https://github.com/paritytech/polkadot.git', branch = "release-v0.9.26" }

diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml
@@ -22,7 +22,7 @@ serde = { version = "1.0.140", default-features = false }
 frame-benchmarking = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26", optional = true }
 frame-support = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" }
 frame-system = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" }
-nimbus-primitives = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.3.0", default-features = false }
+nimbus-primitives = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.4.1", default-features = false }
 pallet-authorship = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" }
 pallet-session = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" }
 sp-arithmetic = { git = 'https://github.com/paritytech/substrate.git', default-features = false, branch = "polkadot-v0.9.26" }

diff --git a/pallets/parachain-staking/Cargo.toml b/pallets/parachain-staking/Cargo.toml
@@ -23,9 +23,6 @@ sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "po
 sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false }
 substrate-fixed = { git = "https://github.com/Manta-Network/substrate-fixed.git", tag = "v0.5.9", default-features = false }
 
-# Nimbus
-nimbus-primitives = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.3.0", default-features = false }
-
 # Manta
 manta-primitives = { path = '../../primitives/manta', default-features = false }
 # TODO: remove after whitelist period
@@ -54,7 +51,6 @@ std = [
   "log/std",
   "manta-primitives/std",
   "manta-collator-selection/std",
-  "nimbus-primitives/std",
   'pallet-session/std',
   "parity-scale-codec/std",
   "scale-info/std",

diff --git a/pallets/parachain-staking/src/lib.rs b/pallets/parachain-staking/src/lib.rs
@@ -1830,38 +1830,13 @@ pub mod pallet {
         }
     }
 
-    impl<T> nimbus_primitives::CanAuthor<T::AccountId> for Pallet<T>
-    where
-        T: Config + manta_collator_selection::Config,
-        manta_collator_selection::Pallet<T>:
-            nimbus_primitives::CanAuthor<T::AccountId> + Get<Vec<T::AccountId>>,
-    {
-        fn can_author(account: &T::AccountId, _slot: &u32) -> bool {
-            // Migration specifics: If we have no eligible block producers yet, use the old selection method
-            if Self::selected_candidates().is_empty() {
-                manta_collator_selection::Pallet::<T>::can_author(account, _slot)
-            } else {
-                Self::is_selected_candidate(account)
-            }
-        }
-        #[cfg(feature = "runtime-benchmarks")]
-        fn get_authors(_slot: &u32) -> Vec<T::AccountId> {
-            Self::get()
-        }
-    }
-
     impl<T> Get<Vec<T::AccountId>> for Pallet<T>
     where
         T: Config + manta_collator_selection::Config,
         manta_collator_selection::Pallet<T>: Get<Vec<T::AccountId>>,
     {
         fn get() -> Vec<T::AccountId> {
-            // Migration specifics: If we have no eligible block producers yet, use the old selection method
-            if Self::selected_candidates().is_empty() {
-                manta_collator_selection::Pallet::<T>::get()
-            } else {
-                Self::selected_candidates()
-            }
+            Self::selected_candidates()
         }
     }
 }
diff --git a/primitives/session-keys/Cargo.toml b/primitives/session-keys/Cargo.toml
@@ -8,8 +8,8 @@ version = "3.4.0"
 
 [dependencies]
 manta-primitives = { path = "../manta", default-features = false }
-# `manta-v3.3.0` is a temporary branch until the official v0.9.26 Nimbus release.
-nimbus-primitives = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.3.0", default-features = false }
+# `manta-v3.4.1` is a temporary branch until the official v0.9.26 Nimbus release.
+nimbus-primitives = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.4.1", default-features = false }
 parity-scale-codec = { version = "3.1.2", default-features = false, features = ["derive"] }
 scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.26", default-features = false }

diff --git a/runtime/calamari/Cargo.toml b/runtime/calamari/Cargo.toml
@@ -71,10 +71,10 @@ cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git'
 parachain-info = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" }
 
 # Nimbus Dependencies
-# `manta-v3.3.0` is a temporary branch until the official v0.9.26 Nimbus release.
-nimbus-primitives = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.3.0", default-features = false }
-pallet-aura-style-filter = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.3.0", default-features = false }
-pallet-author-inherent = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.3.0", default-features = false }
+# `manta-v3.4.1` is a temporary branch until the official v0.9.26 Nimbus release.
+nimbus-primitives = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.4.1", default-features = false }
+pallet-aura-style-filter = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.4.1", default-features = false }
+pallet-author-inherent = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.4.1", default-features = false }
 
 # Polkadot dependencies
 pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" }
@@ -122,6 +122,7 @@ runtime-benchmarks = [
   'frame-system/runtime-benchmarks',
   'manta-collator-selection/runtime-benchmarks',
   'nimbus-primitives/runtime-benchmarks',
+  'pallet-aura-style-filter/runtime-benchmarks',
   'pallet-author-inherent/runtime-benchmarks',
   'pallet-balances/runtime-benchmarks',
   'pallet-multisig/runtime-benchmarks',

diff --git a/runtime/calamari/src/lib.rs b/runtime/calamari/src/lib.rs
@@ -625,7 +625,7 @@ impl pallet_author_inherent::Config for Runtime {
     type WeightInfo = weights::pallet_author_inherent::SubstrateWeight<Runtime>;
     /// Nimbus filter pipeline step 1:
     /// Filters out NimbusIds not registered as SessionKeys of some AccountId
-    type CanAuthor = ParachainStaking;
+    type CanAuthor = AuraAuthorFilter;
 }
 
 parameter_types! {

diff --git a/runtime/dolphin/Cargo.toml b/runtime/dolphin/Cargo.toml
@@ -71,10 +71,10 @@ cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus.git'
 parachain-info = { git = 'https://github.com/paritytech/cumulus.git', default-features = false, branch = "polkadot-v0.9.26" }
 
 # Nimbus Dependencies
-# `manta-v3.3.0` is a temporary branch until the official v0.9.26 Nimbus release.
-nimbus-primitives = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.3.0", default-features = false }
-pallet-aura-style-filter = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.3.0", default-features = false }
-pallet-author-inherent = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.3.0", default-features = false }
+# `manta-v3.4.1` is a temporary branch until the official v0.9.26 Nimbus release.
+nimbus-primitives = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.4.1", default-features = false }
+pallet-aura-style-filter = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.4.1", default-features = false }
+pallet-author-inherent = { git = "https://github.com/manta-network/nimbus.git", branch = "manta-v3.4.1", default-features = false }
 
 # Polkadot dependencies
 pallet-xcm = { git = 'https://github.com/paritytech/polkadot.git', default-features = false, branch = "release-v0.9.26" }