Merge remote-tracking branch 'origin/master' into feature/approve_mul…

…tiple_candidates_polkadot_sdk_v4

Cargo.toml

@@ -66,6 +66,7 @@ members = [
 	"cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend",
 	"cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo",
 	"cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend",
+	"cumulus/parachains/integration-tests/emulated/chains/parachains/collectives/collectives-westend",
 	"cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal",
 	"cumulus/parachains/integration-tests/emulated/chains/relays/rococo",
 	"cumulus/parachains/integration-tests/emulated/chains/relays/westend",

cumulus/pallets/parachain-system/proc-macro/Cargo.toml

@@ -13,7 +13,7 @@ proc-macro = true
 syn = "2.0.39"
 proc-macro2 = "1.0.64"
 quote = "1.0.33"
-proc-macro-crate = "2.0.0"
+proc-macro-crate = "2.0.1"
 
 [features]
 default = ["std"]

cumulus/parachains/common/src/polkadot.rs

@@ -31,6 +31,8 @@ pub mod account {
 	/// It is used as a temporarily place to deposit a slashed imbalance
 	/// before the teleport to the Treasury.
 	pub const AMBASSADOR_REFERENDA_PALLET_ID: PalletId = PalletId(*b"py/amref");
+	/// Fellowship treasury pallet ID
+	pub const FELLOWSHIP_TREASURY_PALLET_ID: PalletId = PalletId(*b"py/feltr");
 }
 
 /// Consensus-related.

cumulus/parachains/common/src/westend.rs

@@ -29,6 +29,8 @@ pub mod account {
 	/// Ambassador Referenda pallet ID - used as a temporary place to deposit a slashed imbalance
 	/// before the teleport to the Treasury.
 	pub const AMBASSADOR_REFERENDA_PALLET_ID: PalletId = PalletId(*b"py/amref");
+	/// Fellowship treasury pallet ID.
+	pub const FELLOWSHIP_TREASURY_PALLET_ID: PalletId = PalletId(*b"py/feltr");
 }
 
 pub mod currency {

cumulus/parachains/integration-tests/emulated/chains/parachains/collectives/collectives-westend/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "collectives-westend-emulated-chain"
+version = "0.0.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+description = "Collectives Westend emulated chain"
+publish = false
+
+[dependencies]
+serde_json = "1.0.104"
+
+# Substrate
+sp-core = { path = "../../../../../../../../substrate/primitives/core", default-features = false }
+sp-runtime = { path = "../../../../../../../../substrate/primitives/runtime", default-features = false }
+frame-support = { path = "../../../../../../../../substrate/frame/support", default-features = false }
+
+# Polakadot
+parachains-common = { path = "../../../../../../../parachains/common" }
+
+# Cumulus
+cumulus-primitives-core = { path = "../../../../../../../primitives/core", default-features = false }
+emulated-integration-tests-common = { path = "../../../../common", default-features = false }
+collectives-westend-runtime = { path = "../../../../../../runtimes/collectives/collectives-westend" }
+westend-emulated-chain = { path = "../../../relays/westend" }