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

Update polkadot inflation to take into account auctions #5872

Merged
merged 12 commits into from
Nov 8, 2022
Merged

Update polkadot inflation to take into account auctions #5872

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e9f8178
Update polkadot inflation to take into account auctions
kianenigma Aug 11, 2022
a7526dd
Master.into()
kianenigma Sep 29, 2022
3794aa8
Merge branch 'master' of github.com:paritytech/polkadot into kiz-fix-…
kianenigma Oct 6, 2022
5bd849c
a possible solution -- but needs a rather untrivial data seeding
kianenigma Oct 6, 2022
10d3984
some additional comments
kianenigma Oct 6, 2022
e1a3dee
Use LOWEST_PUBLIC_ID as a guide to filter out system/common good para…
KiChjang Oct 13, 2022
b522abe
Fixes
KiChjang Oct 13, 2022
383d1c0
Merge remote-tracking branch 'origin/master' into kiz-fix-polkadot-in…
KiChjang Oct 13, 2022
ea26e4c
Merge branch 'master' into kiz-fix-polkadot-inflation
shawntabrizi Oct 24, 2022
5de49f5
move tests
shawntabrizi Oct 24, 2022
8469476
Merge branch 'master' of github.com:paritytech/polkadot into kiz-fix-…
kianenigma Nov 6, 2022
14f3abc
fix
kianenigma Nov 6, 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
Prev Previous commit
Next Next commit
Fixes
  • Loading branch information
@KiChjang
KiChjang committed Oct 13, 2022
commit b522abe119af873afddb05de2c5e68c5ef67c255
2 changes: 1 addition & 1 deletion runtime/kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ impl pallet_staking::EraPayout<Balance> for EraPayout {
.into_iter()
// all active para-ids that do not belong to a system or common good chain is the number
// of parachains that we should take into account for inflation.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this true? what about parathreads which did not secure an auction slot?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the ::parachains() api only returns the list of paras which have upgraded to a parachain. It does not include parathreads.

.filter(|i| i >= LOWEST_PUBLIC_ID)
.filter(|i| *i >= LOWEST_PUBLIC_ID)
.count() as u64;

const MAX_ANNUAL_INFLATION: Perquintill = Perquintill::from_percent(10);
Expand Down
2 changes: 1 addition & 1 deletion runtime/polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ impl pallet_staking::EraPayout<Balance> for EraPayout {
.into_iter()
// all active para-ids that do not belong to a system or common good chain is the number
kianenigma marked this conversation as resolved.
Show resolved Hide resolved
// of parachains that we should take into account for inflation.
.filter(|i| i >= LOWEST_PUBLIC_ID)
.filter(|i| *i >= LOWEST_PUBLIC_ID)
.count() as u64;

const MAX_ANNUAL_INFLATION: Perquintill = Perquintill::from_percent(10);
Expand Down