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

Introduce Fellowship into Collectives #2186

Merged
merged 26 commits into from
Mar 21, 2023
Merged

Introduce Fellowship into Collectives #2186

merged 26 commits into from
Mar 21, 2023

Conversation

muharem
Copy link
Contributor

@muharem muharem commented Feb 15, 2023 •
edited
Loading

Introducing the Polkadot Fellowship into Collectives Parachain.

The Fellowship setup is same as in the initial version of paritytech/polkadot#6701, with additional aliases and constants for the readability.
Includes XCM configurations to send Fellows Origin over XCM and accept the FellowshipAdmin Origin from the Relay Chain.
Slashed Assets teleported to the Treasury.

Companion for paritytech/polkadot#6701

@muharem muharem added the A3-in_progress Pull request is in progress. No review needed at this stage. label Feb 15, 2023
@muharem muharem mentioned this pull request Feb 15, 2023
Merged
@paritytech-ci paritytech-ci requested review from a team February 15, 2023 08:59
@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. D9-needsaudit 👮 PR contains changes to fund-managing logic that should be properly reviewed and externally audited T1-runtime This PR/Issue is related to the topic “runtime”. and removed A3-in_progress Pull request is in progress. No review needed at this stage. labels Feb 16, 2023
@muharem muharem mentioned this pull request Feb 16, 2023
Merged
@muharem muharem changed the title Fellowship into Collectives Introduce Fellowship into Collectives Feb 20, 2023
joepetrowski
joepetrowski reviewed Feb 24, 2023
View reviewed changes
Copy link
Contributor

@joepetrowski joepetrowski left a comment

Choose a reason for hiding this comment

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

The code looks sane. I think it'd be good to add some integration tests (either/both with Zombienet and XCM Simulator) to make sure this interacts with the Relay Chain in the way we want it to.

parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs Outdated Show resolved Hide resolved
parachains/runtimes/collectives/collectives-polkadot/src/fellowship/mod.rs Outdated Show resolved Hide resolved
parachains/runtimes/collectives/collectives-polkadot/src/lib.rs Outdated Show resolved Hide resolved
parachains/runtimes/collectives/collectives-polkadot/src/lib.rs Outdated Show resolved Hide resolved
@muharem
Copy link
Contributor Author

muharem commented Feb 25, 2023

The code looks sane. I think it'd be good to add some integration tests (either/both with Zombienet and XCM Simulator) to make sure this interacts with the Relay Chain in the way we want it to.

Yes, I am working on it (Zombienet option).

@muharem @joepetrowski
Apply suggestions from code review
7213d57 
Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
@paritytech-ci paritytech-ci requested a review from a team February 26, 2023 06:29
@paritytech-ci paritytech-ci requested a review from a team February 26, 2023 06:32
@paritytech-ci paritytech-ci requested a review from a team February 26, 2023 06:41
@gavofyork
Copy link
Member

A few grumbles but looks ok otherwise.

@muharem muharem requested a review from bkontur February 27, 2023 01:39
@muharem
Copy link
Contributor Author

muharem commented Feb 27, 2023

@bkontur this PR touches bridges' runtimes as well, please have a look.

joepetrowski
joepetrowski approved these changes Mar 6, 2023
View reviewed changes
parachains/runtimes/assets/statemint/src/lib.rs Outdated Show resolved Hide resolved
parachains/runtimes/assets/statemint/src/lib.rs Outdated Show resolved Hide resolved
parachains/runtimes/collectives/collectives-polkadot/src/constants.rs Outdated Show resolved Hide resolved
parachains/runtimes/collectives/collectives-polkadot/src/lib.rs Outdated Show resolved Hide resolved
parachains/runtimes/collectives/collectives-polkadot/src/lib.rs Outdated Show resolved Hide resolved
parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs
Comment on lines +268 to +269
// We only allow the Fellows to send messages.
type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, FellowsToPlurality>;
Copy link
Contributor

Choose a reason for hiding this comment

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

This will still allow Root to send messages though, right? Eventually we will need to relax this to allow the Alliance and other collectives to send certain messages.

@muharem muharem mentioned this pull request Mar 10, 2023
Merged
@muharem
XCM tweaks for OpenGov (#2305)
63796bd 
* updated xcm configs for collectives and statemint

* remove xcm send from safe filter

* remove prod_or_fast

* remove empty line

* drop redundant aggregation
@redzsina redzsina 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 Mar 17, 2023
@gavofyork gavofyork mentioned this pull request Mar 19, 2023
Open
14 tasks
@muharem
Copy link
Contributor Author

muharem commented Mar 21, 2023

bot merge

@paritytech-processbot paritytech-processbot bot merged commit 7623aba into master Mar 21, 2023
@paritytech-processbot paritytech-processbot bot deleted the muharem-collectives-fellowship branch March 21, 2023 13:10
ordian added a commit that referenced this pull request Mar 21, 2023
@ordian
Merge branch 'master' into ao-past-session-slashing-companion
29be66e 
* master:
  Companion for #13624 (#2354)
  Introduce Fellowship into Collectives (#2186)
  NFTs 2.0 on Statemine (#2314)
  Bump assert_cmd from 2.0.8 to 2.0.10 (#2341)
  Bump clap from 4.1.8 to 4.1.11 (#2352)
  Companion for substrate #13312: Rename `Deterministic` to `Enforce` (#2350)
  [Companion #13634] keystore overhaul (iter) (#2345)
  Revert #2304 (#2349)
  Deprecate Currency: Companion for #12951 (#2334)
  Bump ci-linux image for rust 1.68
  Always pass port to jsonrpsee WebSocket client (#2339)
  bump zombienet to v1.3.40 (#2348)
  Improve build times by disabling wasm-builder in `no_std` (#2308)
  Bump toml from 0.7.2 to 0.7.3 (#2340)
  Bump serde from 1.0.152 to 1.0.156 (#2329)
  Parachains should charge for proof size weight (#2326)
  dmp-queue: Store messages if already processed more than the maximum (#2343)
  [Companion  #13615] Keystore overhaul (#2336)
  Bump quote from 1.0.23 to 1.0.26 (#2331)
@Polkadot-Forum
Copy link

This pull request has been mentioned on Polkadot Forum. There might be relevant details there:

https://forum.polkadot.network/t/polkadot-release-analysis-v0-9-41-v0-9-42/2828/1

@github-actions github-actions bot mentioned this pull request Jun 15, 2023
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@gavofyork gavofyork gavofyork approved these changes

@joepetrowski joepetrowski joepetrowski approved these changes

@rphmeier rphmeier Awaiting requested review from rphmeier

@kianenigma kianenigma Awaiting requested review from kianenigma

@Ank4n Ank4n Awaiting requested review from Ank4n

@bkontur bkontur Awaiting requested review from bkontur

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
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@muharem @gavofyork @Polkadot-Forum @joepetrowski @redzsina