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

staking: Flexible generation of reward curve and associated tweaks #8327

Merged
26 commits merged into from
Mar 16, 2021
Merged

staking: Flexible generation of reward curve and associated tweaks #8327

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d461b25
Initial abstraction
gavofyork Mar 11, 2021
f77dfcd
Alter rest of APIs
gavofyork Mar 11, 2021
090688b
Fixes
gavofyork Mar 11, 2021
38e9831
Some extra getters in Gilt pallet.
gavofyork Mar 12, 2021
5f947be
Merge remote-tracking branch 'origin/master' into gav-abstract-payout…
gavofyork Mar 12, 2021
e6170a5
Refactor Gilt to avoid u128 conversions
gavofyork Mar 12, 2021
b15debb
Simplify and improve pow in per_things
gavofyork Mar 12, 2021
42a0be1
Add scalar division to per_things
gavofyork Mar 12, 2021
bfae307
Renaming from_fraction -> from_float, drop _approximation
gavofyork Mar 12, 2021
7d5e4d1
Fixes
gavofyork Mar 12, 2021
26c02e7
Merge remote-tracking branch 'origin/master' into gav-abstract-payout…
gavofyork Mar 12, 2021
d4ad9ef
Fixes
gavofyork Mar 12, 2021
5f7e5cb
Fixes
gavofyork Mar 12, 2021
b9e0e20
Fixes
gavofyork Mar 12, 2021
1acce8e
Make stuff build
gavofyork Mar 13, 2021
096c1bd
Fixes
gavofyork Mar 13, 2021
43baaf2
Fixes
gavofyork Mar 13, 2021
af3e62a
Fixes
gavofyork Mar 13, 2021
2c24543
Fixes
gavofyork Mar 13, 2021
1ee20de
Update .gitignore
shawntabrizi Mar 15, 2021
e4fecea
Update frame/gilt/src/lib.rs
gavofyork Mar 15, 2021
72f4b11
Update frame/gilt/src/mock.rs
gavofyork Mar 15, 2021
011eb05
Fixes
gavofyork Mar 15, 2021
2fcc109
Merge branch 'gav-abstract-payout-curve' of github.com:paritytech/sub…
gavofyork Mar 15, 2021
06b2e55
Fixes
gavofyork Mar 15, 2021
95efd59
Fixes
gavofyork Mar 15, 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
Prev Previous commit
Next Next commit
Alter rest of APIs
  • Loading branch information
@gavofyork
gavofyork committed Mar 11, 2021
commit f77dfcd2ceae25d13b3c6b33836056582e2c6a88
2 changes: 1 addition & 1 deletion bin/node/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ impl pallet_staking::Config for Runtime {
pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, CouncilCollective>
>;
type SessionInterface = Self;
type RewardCurve = RewardCurve;
type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
type NextNewSession = Session;
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
type ElectionLookahead = ElectionLookahead;
Expand Down
2 changes: 1 addition & 1 deletion frame/babe/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ impl pallet_staking::Config for Test {
type SlashCancelOrigin = frame_system::EnsureRoot<Self::AccountId>;
type SessionInterface = Self;
type UnixTime = pallet_timestamp::Module<Test>;
type RewardCurve = RewardCurve;
type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
type NextNewSession = Session;
type ElectionLookahead = ElectionLookahead;
Expand Down
2 changes: 1 addition & 1 deletion frame/grandpa/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ impl pallet_staking::Config for Test {
type SlashCancelOrigin = frame_system::EnsureRoot<Self::AccountId>;
type SessionInterface = Self;
type UnixTime = pallet_timestamp::Module<Test>;
type RewardCurve = RewardCurve;
type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
type NextNewSession = Session;
type ElectionLookahead = ElectionLookahead;
Expand Down
2 changes: 1 addition & 1 deletion frame/offences/benchmarking/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ impl pallet_staking::Config for Test {
type SlashCancelOrigin = frame_system::EnsureRoot<Self::AccountId>;
type BondingDuration = ();
type SessionInterface = Self;
type RewardCurve = RewardCurve;
type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
type NextNewSession = Session;
type ElectionLookahead = ();
type Call = Call;
Expand Down
2 changes: 1 addition & 1 deletion frame/session/benchmarking/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ impl pallet_staking::Config for Test {
type SlashCancelOrigin = frame_system::EnsureRoot<Self::AccountId>;
type BondingDuration = ();
type SessionInterface = Self;
type RewardCurve = RewardCurve;
type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
type NextNewSession = Session;
type ElectionLookahead = ();
type Call = Call;
Expand Down
2 changes: 1 addition & 1 deletion frame/staking/fuzzer/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ impl pallet_staking::Config for Test {
type SlashCancelOrigin = frame_system::EnsureRoot<Self::AccountId>;
type BondingDuration = ();
type SessionInterface = Self;
type RewardCurve = RewardCurve;
type EraPayout = crate::ConvertCurve<RewardCurve>;
type NextNewSession = Session;
type ElectionLookahead = ();
type Call = Call;
Expand Down