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

Runtime: Polkadot Fellowship promotion/demotion periods, members activity and salaries#2607

Merged
gavofyork merged 32 commits into
masterfrom
muharem-core-fellowship
Jun 6, 2023
Merged

Runtime: Polkadot Fellowship promotion/demotion periods, members activity and salaries#2607
gavofyork merged 32 commits into
masterfrom
muharem-core-fellowship

Conversation

@muharem
Copy link
Copy Markdown
Contributor

@muharem muharem commented May 20, 2023 •
edited by gavofyork
Loading

Additional logic for the Polkadot Technical Fellowship:

  • promotion period - the minimum period for a member before they can be promoted to the next rank;
  • demotion periods - the period following which a member may be a subject to demotion if no evidence supporting the re-approval of their rank is presented;
  • members activity/passivity;
  • members salaries.

Every existing ranked member needs to be manually imported into the core fellowship pallet for the new logic to be applied. New members who are inducted through the core fellowship pallet have the new logic from the start.

For more information on the continuation rules, members' activity/passivity, and the promotion period, refer to the Polkadot Fellowship Manifesto (4.3 Continuation, 4.6 Notes).

The additional settings are set and serviced via fellowship core pallet, for more information refer to the pallet's documentation. Periodical payouts managed via salary pallet.

fixes #2577

TODO

  • discuss and agree on the following parameters - RegistrationPeriod, PayoutPeriod, Budget.
  • Determine the SovereignAccountId for (Parent, Parachain(1001), PalletInstance(64)) on Statemint

Later

  • Fund 13w7NdvSR1Af8xsQTArDtZmVvjE8XhWNdL4yed3iFHrUNCnS with USDT.

muharem
muharem commented May 20, 2023
View reviewed changes
Comment thread parachains/runtimes/collectives/collectives-polkadot/src/constants.rs Outdated
@muharem muharem marked this pull request as ready for review May 20, 2023 14:15
@paritytech-ci paritytech-ci requested review from a team May 20, 2023 14:16
@muharem muharem added A0-please_review Pull request needs code review. B1-note_worthy Changes should be noted in the release notes C1-low PR touches the given topic and has a low impact on builders. T1-runtime This PR/Issue is related to the topic “runtime”. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit labels May 20, 2023
@muharem muharem changed the title Core Fellowship Polkadot Fellowship promotion/demotion periods, members activity and salaries May 20, 2023
ggwpez
ggwpez reviewed May 20, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@ggwpez ggwpez left a comment

Choose a reason for hiding this comment

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

Nice.
IIUC the salary at al can be set after deployment by an extrinsic.

Comment thread parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs
Comment thread parachains/runtimes/collectives/collectives-polkadot/src/constants.rs Outdated
Comment thread parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs
ggwpez
ggwpez approved these changes May 20, 2023
View reviewed changes
Comment thread parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs Outdated
gavofyork
gavofyork reviewed May 22, 2023
View reviewed changes
Comment thread parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs Outdated
@muharem muharem added A3-in_progress Pull request is in progress. No review needed at this stage. and removed A0-please_review Pull request needs code review. labels May 23, 2023
muharem
muharem commented May 25, 2023
View reviewed changes
Comment thread parachains/runtimes/collectives/collectives-polkadot/src/fellowship/tracks.rs Outdated
@gavofyork gavofyork changed the title Polkadot Fellowship promotion/demotion periods, members activity and salaries Runtime: Polkadot Fellowship promotion/demotion periods, members activity and salaries May 25, 2023
@paritytech-ci paritytech-ci requested a review from a team May 29, 2023 12:54
joepetrowski
joepetrowski reviewed Jun 2, 2023
View reviewed changes
Comment thread parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs Outdated
@paritytech-ci paritytech-ci requested a review from a team June 2, 2023 17:03
@gavofyork gavofyork mentioned this pull request Jun 4, 2023
Merged
@muharem
Copy link
Copy Markdown
Contributor Author

muharem commented Jun 4, 2023

requires this change for PayOverXcm type paritytech/polkadot#7327

gavofyork
gavofyork reviewed Jun 5, 2023
View reviewed changes
Comment thread parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs
@muharem
Copy link
Copy Markdown
Contributor Author

muharem commented Jun 5, 2023

working on a test for PayOverXcm setup, the test based on xcm-emulator

@gavofyork
Copy link
Copy Markdown
Member

gavofyork commented Jun 5, 2023

@bkchr @joepetrowski going to need a cumulus locks review here...

@gavofyork
Copy link
Copy Markdown
Member

gavofyork commented Jun 5, 2023

@muharem @joepetrowski @bkontur final review/approval?

@muharem
Copy link
Copy Markdown
Contributor Author

muharem commented Jun 5, 2023

@gavofyork I cannot approve since I am a creator of the PR. But all the changes look good to me.

@ggwpez
Copy link
Copy Markdown
Member

ggwpez commented Jun 5, 2023

@joepetrowski is offline on vacation afaik.

bkchr
bkchr approved these changes Jun 5, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@bkchr bkchr left a comment

Choose a reason for hiding this comment

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

Did not go into every detail, but the overall configuration looks good to me. 👍

Comment thread parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs Outdated
@gavofyork gavofyork merged commit f2d66a2 into master Jun 6, 2023
@gavofyork gavofyork deleted the muharem-core-fellowship branch June 6, 2023 10:48
@louismerlin louismerlin added D1-audited 👍 PR contains changes to fund-managing logic that has been properly reviewed and externally audited. and removed D9-needsaudit 👮 PR contains changes to fund-managing logic that should be properly reviewed and externally audited labels Jun 7, 2023
@crystalin crystalin mentioned this pull request Oct 20, 2023
Closed
@rzadp rzadp mentioned this pull request Feb 2, 2024
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@bkontur bkontur Awaiting requested review from bkontur

5 more reviewers

@gavofyork gavofyork gavofyork approved these changes

@ggwpez ggwpez ggwpez approved these changes

@joepetrowski joepetrowski joepetrowski left review comments

@kianenigma kianenigma kianenigma approved these changes

@bkchr bkchr bkchr approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

A0-please_review Pull request needs code review. B1-note_worthy Changes should be noted in the release notes C1-low PR touches the given topic and has a low impact on builders. D1-audited 👍 PR contains changes to fund-managing logic that has been properly reviewed and externally audited. T1-runtime This PR/Issue is related to the topic “runtime”.

Projects

Runtime / FRAME
Status: Done
Security Audit (PRs) - SRLabs
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Integrate Core Fellowship logic into Collectives chain

8 participants

@muharem @gavofyork @ggwpez @kianenigma @bkchr @bkontur @joepetrowski @louismerlin