Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the Tooling Collective #474

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Add the Tooling Collective #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70ed886
Add PoToC
ggwpez Oct 7, 2024
1ed29d4
Cleanup
ggwpez Oct 10, 2024
017b53f
Fixes
ggwpez Oct 10, 2024
27f353f
fmt
ggwpez Oct 10, 2024
ccbab14
add seed migration
ggwpez Oct 10, 2024
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
1 change: 1 addition & 0 deletions system-parachains/collectives/collectives-polkadot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ substrate-wasm-builder = { optional = true, workspace = true }

[features]
default = ["std"]
fast-runtime = []
runtime-benchmarks = [
"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-pallet-session-benchmarking/runtime-benchmarks",
Expand Down
18 changes: 9 additions & 9 deletions system-parachains/collectives/collectives-polkadot/src/ambassador/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
//!
//! The module defines the following on-chain functionality of the Ambassador Program:
//!
//! - Managed set of program members, where every member has a [rank](ranks)
//! (via [AmbassadorCollective](pallet_ranked_collective)).
//! - Referendum functionality for the program members to propose, vote on, and execute
//! proposals on behalf of the members of a certain [rank](Origin)
//! (via [AmbassadorReferenda](pallet_referenda)).
//! - Promotion and demotion periods, register of members' activity, and rank based salaries
//! (via [AmbassadorCore](pallet_core_fellowship)).
//! - Members' salaries (via [AmbassadorSalary](pallet_salary), requiring a member to be
//! imported or inducted into [AmbassadorCore](pallet_core_fellowship)).
//! - Managed set of program members, where every member has a [rank](ranks) (via
//! [AmbassadorCollective](pallet_ranked_collective)).
//! - Referendum functionality for the program members to propose, vote on, and execute proposals on
//! behalf of the members of a certain [rank](Origin) (via
//! [AmbassadorReferenda](pallet_referenda)).
//! - Promotion and demotion periods, register of members' activity, and rank based salaries (via
//! [AmbassadorCore](pallet_core_fellowship)).
//! - Members' salaries (via [AmbassadorSalary](pallet_salary), requiring a member to be imported or
//! inducted into [AmbassadorCore](pallet_core_fellowship)).
//! - Ambassador Program Sub-Treasury (via [AmbassadorTreasury](pallet_treasury)).

pub mod migrations;
Expand Down
18 changes: 12 additions & 6 deletions system-parachains/collectives/collectives-polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ mod weights;
pub mod xcm_config;
// Fellowship configurations.
pub mod fellowship;
pub mod potoc;
Copy link

Choose a reason for hiding this comment

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

Let's think it we really want potoc... Maybe tooling is a better idea.

pub use ambassador::pallet_ambassador_origins;

use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
Expand All @@ -53,6 +54,7 @@ use impls::{AllianceProposalProvider, EqualOrGreatestRootCmp, ToParentTreasury};
use polkadot_runtime_common::impls::{
ContainsParts as ContainsLocationParts, VersionedLocatableAsset,
};
use potoc::pallet_potoc_origins;
use sp_api::impl_runtime_apis;
use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
use sp_runtime::{
Expand Down Expand Up @@ -723,16 +725,11 @@ construct_runtime!(
AllianceMotion: pallet_collective::<Instance1> = 51,

// The Fellowship.
// pub type FellowshipCollectiveInstance = pallet_ranked_collective::Instance1;
FellowshipCollective: pallet_ranked_collective::<Instance1> = 60,
// pub type FellowshipReferendaInstance = pallet_referenda::Instance1;
FellowshipReferenda: pallet_referenda::<Instance1> = 61,
FellowshipOrigins: pallet_fellowship_origins = 62,
// pub type FellowshipCoreInstance = pallet_core_fellowship::Instance1;
FellowshipCore: pallet_core_fellowship::<Instance1> = 63,
// pub type FellowshipSalaryInstance = pallet_salary::Instance1;
FellowshipSalary: pallet_salary::<Instance1> = 64,
// pub type FellowshipTreasuryInstance = pallet_treasury::Instance1;
FellowshipTreasury: pallet_treasury::<Instance1> = 65,

// Ambassador Program.
Expand All @@ -742,6 +739,14 @@ construct_runtime!(
AmbassadorCore: pallet_core_fellowship::<Instance2> = 73,
AmbassadorSalary: pallet_salary::<Instance2> = 74,
AmbassadorTreasury: pallet_treasury::<Instance2> = 75,

// Tooling Collective
PotocCollective: pallet_ranked_collective::<Instance3> = 80,
PotocReferenda: pallet_referenda::<Instance3> = 81,
PotocOrigins: pallet_potoc_origins = 82,
PotocCore: pallet_core_fellowship::<Instance3> = 83,
PotocSalary: pallet_salary::<Instance3> = 84,
PotocTreasury: pallet_treasury::<Instance3> = 85
}
);

Expand Down Expand Up @@ -777,6 +782,7 @@ type Migrations = (
pallet_core_fellowship::migration::MigrateV0ToV1<Runtime, fellowship::FellowshipCoreInstance>,
pallet_core_fellowship::migration::MigrateV0ToV1<Runtime, ambassador::AmbassadorCoreInstance>,
ambassador::migrations::TruncateHeadAmbassadors,
potoc::InsertSeedMembers,
// permanent
pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
);
Expand Down Expand Up @@ -1131,7 +1137,7 @@ impl_runtime_apis! {
Asset {
fun: Fungible(ExistentialDeposit::get()),
id: AssetId(Parent.into())
}.into(),
},
Parent.into(),
))
}
Expand Down
Loading
Loading