Extended kickout collator period (#748)

* Extended kickout collator period * Compilation fixes
AstarNetwork · Nov 13, 2022 · 62e9445 · 62e9445
1 parent 76b35f8
commit 62e9445
Show file tree

Hide file tree

Showing 8 changed files with 147 additions and 105 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "astar-collator"
-version = "4.31.0"
+version = "4.32.0"
 authors = ["Stake Technologies <devops@stake.co.jp>"]
 description = "Astar collator implementation in Rust."
 build = "build.rs"

diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "astar-runtime"
-version = "4.31.0"
+version = "4.32.0"
 authors = ["Stake Technologies <devops@stake.co.jp>"]
 edition = "2021"
 build = "build.rs"

diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs
@@ -97,7 +97,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("astar"),
     impl_name: create_runtime_str!("astar"),
     authoring_version: 1,
-    spec_version: 41,
+    spec_version: 42,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,
@@ -395,10 +395,11 @@ impl pallet_session::Config for Runtime {
 
 parameter_types! {
     pub const PotId: PalletId = PalletId(*b"PotStake");
-    pub const MaxCandidates: u32 = 200;
+    pub const MaxCandidates: u32 = 148;
     pub const MinCandidates: u32 = 5;
-    pub const MaxInvulnerables: u32 = 20;
+    pub const MaxInvulnerables: u32 = 48;
     pub const SlashRatio: Perbill = Perbill::from_percent(1);
+    pub const KickThreshold: BlockNumber = 2 * HOURS; // 2 SessionPeriod
 }
 
 impl pallet_collator_selection::Config for Runtime {
@@ -410,7 +411,7 @@ impl pallet_collator_selection::Config for Runtime {
     type MinCandidates = MinCandidates;
     type MaxInvulnerables = MaxInvulnerables;
     // should be a multiple of session or things will get inconsistent
-    type KickThreshold = SessionPeriod;
+    type KickThreshold = KickThreshold;
     type ValidatorId = <Self as frame_system::Config>::AccountId;
     type ValidatorIdOf = pallet_collator_selection::IdentityCollator;
     type ValidatorRegistration = Session;

diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shibuya-runtime"
-version = "4.31.0"
+version = "4.32.0"
 authors = ["Stake Technologies <devops@stake.co.jp>"]
 edition = "2021"
 build = "build.rs"

diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs
@@ -133,7 +133,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("shibuya"),
     impl_name: create_runtime_str!("shibuya"),
     authoring_version: 1,
-    spec_version: 76,
+    spec_version: 77,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,
@@ -464,10 +464,11 @@ impl pallet_session::Config for Runtime {
 
 parameter_types! {
     pub const PotId: PalletId = PalletId(*b"PotStake");
-    pub const MaxCandidates: u32 = 200;
+    pub const MaxCandidates: u32 = 148;
     pub const MinCandidates: u32 = 5;
-    pub const MaxInvulnerables: u32 = 20;
+    pub const MaxInvulnerables: u32 = 48;
     pub const SlashRatio: Perbill = Perbill::from_percent(1);
+    pub const KickThreshold: BlockNumber = 2 * HOURS; // 2 SessionPeriod
 }
 
 impl pallet_collator_selection::Config for Runtime {
@@ -479,7 +480,7 @@ impl pallet_collator_selection::Config for Runtime {
     type MinCandidates = MinCandidates;
     type MaxInvulnerables = MaxInvulnerables;
     // should be a multiple of session or things will get inconsistent
-    type KickThreshold = SessionPeriod;
+    type KickThreshold = KickThreshold;
     type ValidatorId = <Self as frame_system::Config>::AccountId;
     type ValidatorIdOf = pallet_collator_selection::IdentityCollator;
     type ValidatorRegistration = Session;

diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shiden-runtime"
-version = "4.31.0"
+version = "4.32.0"
 authors = ["Stake Technologies <devops@stake.co.jp>"]
 edition = "2021"
 build = "build.rs"

diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs
@@ -100,7 +100,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("shiden"),
     impl_name: create_runtime_str!("shiden"),
     authoring_version: 1,
-    spec_version: 77,
+    spec_version: 78,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,
@@ -400,10 +400,11 @@ impl pallet_session::Config for Runtime {
 
 parameter_types! {
     pub const PotId: PalletId = PalletId(*b"PotStake");
-    pub const MaxCandidates: u32 = 200;
+    pub const MaxCandidates: u32 = 148;
     pub const MinCandidates: u32 = 5;
-    pub const MaxInvulnerables: u32 = 20;
+    pub const MaxInvulnerables: u32 = 48;
     pub const SlashRatio: Perbill = Perbill::from_percent(1);
+    pub const KickThreshold: BlockNumber = 2 * HOURS; // 2 SessionPeriod
 }
 
 impl pallet_collator_selection::Config for Runtime {
@@ -415,7 +416,7 @@ impl pallet_collator_selection::Config for Runtime {
     type MinCandidates = MinCandidates;
     type MaxInvulnerables = MaxInvulnerables;
     // should be a multiple of session or things will get inconsistent
-    type KickThreshold = SessionPeriod;
+    type KickThreshold = KickThreshold;
     type ValidatorId = <Self as frame_system::Config>::AccountId;
     type ValidatorIdOf = pallet_collator_selection::IdentityCollator;
     type ValidatorRegistration = Session;