Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extended kickout collator period #748

Merged
merged 3 commits into from
Nov 13, 2022
Merged

Extended kickout collator period #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e66eab7
Extended kickout collator period
akru Nov 9, 2022
a861dc6
Merge branch 'master'
akru Nov 11, 2022
4177983
Compilation fixes
akru Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
217 changes: 128 additions & 89 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bin/collator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion runtime/astar/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
9 changes: 5 additions & 4 deletions runtime/astar/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 {
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion runtime/shibuya/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
9 changes: 5 additions & 4 deletions runtime/shibuya/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 {
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion runtime/shiden/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
9 changes: 5 additions & 4 deletions runtime/shiden/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 {
Expand All @@ -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;
Expand Down