[westend] Remove pallet_treasury from RC and clean up system parachains matchers by sigurpol · Pull Request #11763 · paritytech/polkadot-sdk

sigurpol · 2026-04-14T20:05:29Z

Remove pallet_treasury entirely from Westend relay chain.
Drain residual balances from the legacy py/trsry-derived account into the local DAP satellite buffer on the relay and on each Westend system parachain (bridge-hub, collectives, coretime, people).
Remove RelayTreasuryLocation matchers from all Westend system parachains.

NOTE: a followup PR will remove also all remaining OpenGov related pallets from RC (issue #11775, stacked PR: #11796).

…ers (#11705) Remove pallet_treasury entirely from Westend relay chain. Drain residual treasury funds to relay-local DAP satellite via migration. Relay only since other system parachains have zero funds on their local treasury accounts. Remove RelayTreasuryLocation matchers from all Westend system parachains. Closes #11705.

sigurpol · 2026-04-14T20:05:44Z

/cmd prdoc --audience runtime_dev --bump major

…time_dev --bump major'

sigurpol · 2026-04-15T08:22:23Z

@acatangiu , this should address your comment here (on top of the changes already landed in #11700) and should close #11705. Note that a similar issue has been opened also in the fellowship runtime (polkadot-fellows/runtimes#1144).

sigurpol · 2026-04-15T08:51:05Z

 use xcm_executor::traits::ConvertLocation;

-// Fund Fellowship Treasury from Westend Treasury and spend from Fellowship Treasury.
+/// Fellowship treasury can spend funds on Asset Hub to a beneficiary.


This test was made by two parts:

Fund fellowship treasury from relay treasury (but relay treasury is now gone!)

Fellowship treasury spends to Alice via FellowshipTreasury::spend from Fellows origin => still valid, independent of relay treasury

I have replaced 1. with a force_set_balance for the fellowship treasury account on AH, and kept Part 2 as-is.

This largely overlaps with the AH test create_and_claim_treasury_spend here so it might be fine to just remove this test (and related file). The main differences is that here we are using Fellows origin (enum variant) vs root , and WND vs USDT. Added value is somehow small but not null. I am fine with both approaches (keeping or 🪓 )

Worth keeping this, imo! Using a different asset/origin combination is indeed added value, however small; I don't think the second or two it takes to run this negatively offsets that value 👍

…stend-treasury-accounts

acatangiu · 2026-04-15T11:09:34Z

@@ -189,6 +189,8 @@ pub type Migrations = (
 	// permanent
 	pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
 	cumulus_pallet_aura_ext::migration::MigrateV0ToV1<Runtime>,


(unrelated to this PR) move this above the // permanent in the list of migrations since it should not be permanent - actually I think this already ran a long time ago and should just be removed (same for most/all above)

I would prefer to do a cleanup of all non permanent migrations we can remove in an ad-hoc PR since, as you have mentioned, it's not in the scope of this one (but I agree that it should be tackled as part of our spring cleaning tasks 😃 ). I have created #11771 as umbrella issue to do cleanup of all these migrations.

acatangiu · 2026-04-15T11:11:38Z

+	// #11705: drain residual relay-treasury XCM payouts into DAP satellite.
+	pallet_dap_satellite::migrations::DrainLegacyTreasuryToDapSatellite<Runtime>,


this is intended as a "permanent" migration, right? aka keep it around until we see there is no more activity on the legacy treasury account?

it's idempotent so doesn't hurt but it is meant to be one-shot only and then can be removed since there should be no activity on this account - so should live above permanent. Moved.

acatangiu · 2026-04-15T11:12:18Z

 		PalletInstance(<Uniques as PalletInfoAccess>::index() as u8).into();
 	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
 	pub StakingPot: AccountId = CollatorSelection::account_id();
-	pub RelayTreasuryLocation: Location = (Parent, PalletInstance(westend_runtime_constants::TREASURY_PALLET_ID)).into();


does this need a migration too? or is it empty on AH?

it's empty on AH post AHM so this is just code cleanup and AFAIU no post-AHM flow needs that Location to have execution/fee privileges and no further migration is needed.

acatangiu · 2026-04-15T11:41:59Z

-	// StakingAdmin pluralistic body.
-	pub const StakingAdminBodyId: BodyId = BodyId::Defense;
-	// FellowshipAdmin pluralistic body.
-	pub const FellowshipAdminBodyId: BodyId = BodyId::Index(FELLOWSHIP_ADMIN_INDEX);


why are these not used anymore? I guess it was using the RC ones and those no longer exist, but they still exist on AH/Collectives, no? confused 🙈

My understanding - to be double-checked: this was and is dead / unused code.

The aliases being removed (*ToPlurality, *BodyId, LocalPalletOriginToLocation) were defined but never referenced.
SendXcmOrigin uses LocalOriginToLocation

impl pallet_xcm::Config for Runtime { type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>; // <--- HERE

LocalPalletOriginToLocation was not used.

github-actions · 2026-04-15T13:26:34Z

Review required! Latest push from author must always be reviewed

Removed pallet_conviction_voting, pallet_referenda, pallet_custom_origins, and pallet_whitelist from the Westend relay chain runtime. Governance now lives on AssetHub. - Re-rooted all EitherOf<EnsureRoot, GovernanceOrigin> to plain EnsureRoot - Added RemovePallet migrations for ConvictionVoting, Referenda, Origins, and Whitelist - Replaced ParentOrParentsPlurality with IsParentsOnly<ConstU8<1>> on all 5 Westend system parachains (dead code post-governance removal) - Removed relay governance integration tests (open_gov_on_relay, fellows_whitelist_call) Closes #11775.

This reverts commit afbfb30.

sigurpol requested a review from a team as a code owner April 14, 2026 20:05

sigurpol added the T2-pallets This PR/Issue is related to a particular pallet. label Apr 14, 2026

Update from github-actions[bot] running command 'prdoc --audience run…

3a39079

…time_dev --bump major'

bkchr reviewed Apr 14, 2026

View reviewed changes

Comment thread cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/mod.rs

Comment thread ...parachains/integration-tests/emulated/tests/collectives/collectives-westend/src/tests/mod.rs

sigurpol added 3 commits April 14, 2026 22:31

WAH: reintroduce reward pool test

a1eb5a1

WAH: remove treasury tests

d3feae8

[westend collective] reintroduce fellowship treasury integration tests

6970ddb

sigurpol changed the title ~~[westend] Remove pallet_treasury from RC and clean up satellite matchers~~ [westend] Remove pallet_treasury from RC and clean up system parachains matchers Apr 14, 2026

sigurpol requested review from Ank4n, acatangiu, andreitrand, ggwpez, kianenigma and muharem April 14, 2026 21:43

sigurpol commented Apr 15, 2026

View reviewed changes

Comment thread ...arachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/reward_pool.rs Outdated

sigurpol commented Apr 15, 2026

View reviewed changes

Comment thread polkadot/runtime/westend/src/lib.rs Outdated

sigurpol added 4 commits April 15, 2026 12:11

add migrations for all system chains

418a59a

Merge remote-tracking branch 'origin/master' into sigurpol-cleanup-we…

942ab92

…stend-treasury-accounts

WAH: remove emulated test against reward pool and replace with unit test

5c17949

WAH: Remove dead pluralistic-origin wiring from xcm_config

72de466

acatangiu reviewed Apr 15, 2026

View reviewed changes

sigurpol mentioned this pull request Apr 15, 2026

Westend system chains: clean-up non permanent migrations we don't need anymore #11771

Open

fix review comments

af5b102

acatangiu approved these changes Apr 15, 2026

View reviewed changes

sigurpol mentioned this pull request Apr 15, 2026

Westend RC: remove governance post AHM #11775

Open

sigurpol added 5 commits April 15, 2026 16:01

dap-satellite migration: Preservation::Expendable -> Preserve

11c774a

Merge branch 'master' into sigurpol-cleanup-westend-treasury-accounts

23ca7f4

Merge branch 'master' into sigurpol-cleanup-westend-treasury-accounts

232d248

fix governance_authorize_upgrade_works

be49d09

fix governance_authorize_upgrade_works for bridge-hub and collective too

139e344

This was referenced Apr 16, 2026

Remove RC and local treasury accounts polkadot-fellows/runtimes#1144

Open

Remove old OpenGov configuration from the polkadot relay polkadot-fellows/runtimes#1102

Open

sigurpol added 2 commits April 16, 2026 14:29

Revert "Removed OpenGov pallets from Westend relay chain post-AHM"

a965dd0

This reverts commit afbfb30.

sigurpol requested a review from dhirajs0 April 16, 2026 12:47

sigurpol mentioned this pull request Apr 16, 2026

Removed OpenGov pallets from Westend relay chain post-AHM #11796

Open

kianenigma reviewed Apr 16, 2026

View reviewed changes

Comment thread cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs

kianenigma approved these changes Apr 16, 2026

View reviewed changes

sigurpol added this pull request to the merge queue Apr 16, 2026

Merged via the queue into master with commit cd3eb6d Apr 16, 2026
359 of 368 checks passed

sigurpol deleted the sigurpol-cleanup-westend-treasury-accounts branch April 16, 2026 16:51

		// #11705: drain residual relay-treasury XCM payouts into DAP satellite.
		pallet_dap_satellite::migrations::DrainLegacyTreasuryToDapSatellite<Runtime>,

Conversation

sigurpol commented Apr 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sigurpol commented Apr 14, 2026

Uh oh!

Uh oh!

Uh oh!

sigurpol commented Apr 15, 2026

Uh oh!

Uh oh!

sigurpol Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Apr 15, 2026

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

sigurpol commented Apr 14, 2026 •

edited

Loading

sigurpol Apr 15, 2026 •

edited

Loading