Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Companion for sub/7040 #1719

Merged
29 commits merged into from
Jan 20, 2021
Merged

Companion for sub/7040 #1719

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
47b67bf
Companion for sub/7040
kianenigma Sep 14, 2020
4b2f464
Fix duplicate type.
kianenigma Sep 14, 2020
9a623a8
Fix syntax
kianenigma Sep 14, 2020
a310f48
Sync with latest changes.
kianenigma Sep 17, 2020
58a4801
Add weight info.
kianenigma Sep 17, 2020
eabe4a9
Master.into()
kianenigma Sep 17, 2020
fd60383
Fix build
kianenigma Sep 17, 2020
8ce1e95
Fix some tests
kianenigma Sep 21, 2020
54ae9d0
Merge branch 'master' of github.com:paritytech/polkadot into kiz-comp…
kianenigma Sep 21, 2020
441bf41
Merge branch 'master' of github.com:paritytech/polkadot into kiz-comp…
kianenigma Sep 21, 2020
36b0f9f
Master.into()
kianenigma Sep 23, 2020
fc10647
Fix build again.
kianenigma Sep 23, 2020
86d7912
Master.into()
kianenigma Oct 12, 2020
e78729e
fix migration amounts.
kianenigma Oct 12, 2020
cba3e3b
Merge branch 'master' of github.com:paritytech/polkadot into kiz-comp…
kianenigma Oct 13, 2020
dd7c049
Merge branch 'master' of github.com:paritytech/polkadot into kiz-comp…
kianenigma Nov 26, 2020
bb59195
new migration
kianenigma Nov 26, 2020
45cbc3d
Builds fine with dummy weights.
kianenigma Nov 26, 2020
9a85fd8
Merge branch 'master' of github.com:paritytech/polkadot into kiz-comp…
kianenigma Nov 30, 2020
a4e30f5
fix build
kianenigma Nov 30, 2020
8e15337
Add correct weight files.
kianenigma Nov 30, 2020
fed7943
Master.into()
kianenigma Dec 2, 2020
7e7b979
Fix to latest version
kianenigma Dec 2, 2020
f9b291e
Master.into()
kianenigma Dec 17, 2020
e71b815
remove unneeded upgrade.
kianenigma Dec 17, 2020
ac842d8
Update to latest again.
kianenigma Dec 17, 2020
4f8e3fe
Merge branch 'master' of github.com:paritytech/polkadot into kiz-comp…
kianenigma Jan 20, 2021
a2081ad
Merge branch 'master' of github.com:paritytech/polkadot into kiz-comp…
kianenigma Jan 20, 2021
ba6c04b
"Update Substrate"
Jan 20, 2021
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
Next Next commit
Companion for sub/7040
  • Loading branch information
@kianenigma
kianenigma committed Sep 14, 2020
commit 47b67bfebe9ea4af481bc297bb7307a04cb7aa59
9 changes: 7 additions & 2 deletions runtime/kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,10 @@ impl pallet_collective::Trait<CouncilCollective> for Runtime {

parameter_types! {
pub const CandidacyBond: Balance = 1 * DOLLARS;
pub const VotingBond: Balance = 5 * CENTS;
// needed just for migration.
pub const LegacyVotingBond: Balance = 5 * DOLLARS;
pub const VotingBondBase: Balance = 5 * DOLLARS;
pub const VotingBondFactor: Balance = deposit(0, 32);
/// Daily council elections.
pub const TermDuration: BlockNumber = 24 * HOURS;
pub const DesiredMembers: u32 = 19;
Expand All @@ -440,7 +443,9 @@ impl pallet_elections_phragmen::Trait for Runtime {
type InitializeMembers = Council;
type CurrencyToVote = CurrencyToVoteHandler<Self>;
type CandidacyBond = CandidacyBond;
type VotingBond = VotingBond;
type CandidacyBond = CandidacyBond;
type LegacyVotingBond = LegacyVotingBond;
type VotingBondBase = VotingBondBase;
type LoserCandidate = Treasury;
type BadReport = Treasury;
type KickedMember = Treasury;
Expand Down
9 changes: 7 additions & 2 deletions runtime/polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,10 @@ impl pallet_collective::Trait<CouncilCollective> for Runtime {

parameter_types! {
pub const CandidacyBond: Balance = 100 * DOLLARS;
pub const VotingBond: Balance = 5 * DOLLARS;
// needed just for migration.
pub const LegacyVotingBond: Balance = 5 * DOLLARS;
pub const VotingBondBase: Balance = 5 * DOLLARS;
pub const VotingBondFactor: Balance = deposit(0, 32);
/// Weekly council elections; scaling up to monthly eventually.
pub const TermDuration: BlockNumber = 7 * DAYS;
/// 13 members initially, to be increased to 23 eventually.
Expand All @@ -494,7 +497,9 @@ impl pallet_elections_phragmen::Trait for Runtime {
type InitializeMembers = Council;
type CurrencyToVote = CurrencyToVoteHandler<Self>;
type CandidacyBond = CandidacyBond;
type VotingBond = VotingBond;
type LegacyVotingBond = LegacyVotingBond;
type VotingBondBase = VotingBondBase;
type VotingBondFactor = VotingBondFactor;
type LoserCandidate = Treasury;
type BadReport = Treasury;
type KickedMember = Treasury;
Expand Down