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

Off-the-table staking preference #656

Merged
merged 1 commit into from
Sep 4, 2018
Merged

Conversation

gavofyork
Copy link
Member

@gavofyork gavofyork commented Sep 4, 2018

Validators can now specify an amount of reward that they take at minimum, before the rest of the spoils get split with their nominators.

@gavofyork gavofyork added the A0-please_review Pull request needs code review. label Sep 4, 2018
/// Preference of what happens on a slash event.
#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
#[derive(Encode, Decode, Eq, PartialEq, Clone, Copy)]
pub struct SlashPreference {
pub struct ValidatorPrefs<Balance: Parameter + Codec + MaybeSerializeDebug + MaybeDeserialize> {
Copy link
Contributor

Choose a reason for hiding this comment

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

For the reference: Why is this commented?

Copy link
Member Author

Choose a reason for hiding this comment

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

I want to bring this in soon, but right now i can't make it work.

@pepyakin pepyakin added A8-looksgood and removed A0-please_review Pull request needs code review. labels Sep 4, 2018
@gavofyork gavofyork merged commit 4a80847 into master Sep 4, 2018
@gavofyork gavofyork deleted the gav-staking-off-the-table branch September 4, 2018 15:28

System::set_block_number(2);
assert_ok!(Staking::register_preferences(&1, Staking::intentions().into_iter().position(|i| i == 1).unwrap() as u32, 3, 4));
Session::check_rotate_session();
Copy link
Contributor

Choose a reason for hiding this comment

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

Oh wait, I'd expect that it should not build since #646 introduced an argument here

dvdplm added a commit that referenced this pull request Sep 4, 2018
* master: (22 commits)
  Introduce treasury and document (#646)
  Off-the-table staking preference (#656)
  Implement function `json_metadata` in `decl_module!` (#654)
  Fix warnings in networking (#652)
  Add a reputation system (#645)
  Check for pruned block state (#648)
  Contract runtime polishing (#601)
  WIP on chain heap (#639)
  Events to track extrinsic success (#640)
  Install llvm-tools-preview component (#643)
  fix wasm executor compile error (#631)
  random fixes (#638)
  Empty becomes (), reflecting convention (#637)
  Allow to build_upon skipped entries, but don't walk back (#635)
  Separate out staking module into balances and payment (#629)
  Update .gitlab-ci.yml (#633)
  Do not attempt to rustup if in CI. This is taken care of by the base (#621)
  Avoid need for ident strings in storage (#624)
  rename to panic_handler as panic_implementation is deprecated in nightly (#626)
  5 random fixes (#2) (#623)
  ...
@gavofyork
Copy link
Member Author

ahh - unidentified conflicts with a merge that went in at the same time.

@gavofyork
Copy link
Member Author

fix pushed, rather unceremoniously.

dvdplm added a commit that referenced this pull request Sep 5, 2018
…and-rlpcodec

* master:
  Upgrade to libp2p master (#660)
  Include function comments into modules `json_metadata` (#657)
  Replace old headers with CHT in light clients (#512)
  Fix build
  Introduce treasury and document (#646)
  Off-the-table staking preference (#656)
  Implement function `json_metadata` in `decl_module!` (#654)
  Fix warnings in networking (#652)
  Add a reputation system (#645)
  Check for pruned block state (#648)
helin6 pushed a commit to boolnetwork/substrate that referenced this pull request Jul 25, 2023
* Export EventFieldMetadata

* Fix up comments for public api
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants