Fellowship Treasury by muharem · Pull Request #109 · polkadot-fellows/runtimes

muharem · 2023-11-30T15:54:18Z

Treasury Pallet Instance for the Fellowship in Polkadot Collectives.

In this update, we present a Treasury Pallet Instance that is under the control of the Fellowship body, with oversight from the Root and Treasurer origins. Here's how it is governed:

the Root origin have the authority to reject or approve spend proposals, with no amount limit for approvals.
the Treasurer origin have the authority to reject or approve spend proposals, with approval limits of up to 10,000,000 DOT.
Voice of all Fellows ranked at 3 or above can reject or approve spend proposals, with a maximum approval limit of 10,000 DOT.
Voice of Fellows ranked at 4 or above can also reject or approve spend proposals, with a maximum approval limit of 10,000,000 DOT.

Additionally, we introduce the Asset Rate Pallet Instance to establish conversion rates from asset A to B. This is used to determine if a proposed spend amount involving a non-native asset is permissible by the commanding origin. The rates can be set up by the Root, Treasurer origins, or Voice of all Fellows.

test with xcm-emulator for the same setup in Westend - paritytech/polkadot-sdk#2532
more details on new treasury features and asset rate pallet - paritytech/polkadot-sdk#1333

system-parachains/collectives/collectives-polkadot/src/fellowship/mod.rs

…llecitves-treasury

system-parachains/collectives/collectives-polkadot/src/fellowship/mod.rs

xlc · 2023-12-08T00:15:15Z

system-parachains/collectives/collectives-polkadot/src/fellowship/mod.rs

+	pub const MaxBalance: Balance = Balance::max_value();
+	// The asset's interior location for the paying account. This is the Fellowship Treasury
+	// pallet instance (which sits at index 65).
+	pub FellowshipTreasuryInteriorLocation: InteriorMultiLocation = PalletInstance(65).into();


I won't block on this but it will be great if there is a way to not having hardcoded number here

Without pulling in the entire runtime enum, it will have to be declared somewhere, right? Of course if more parachains need this value then it could be pulled up to some common area that they import from.

maybe we could have a test somewhere to assert the value matches

This location is not actually the problem, can just read it directly (which I have changed it to do). The problem is more here. I had added two tests and a link to an issue to pull these important pallet indices into a common area.

system-parachains/collectives/collectives-polkadot/src/fellowship/mod.rs

xlc · 2023-12-08T00:19:32Z

system-parachains/collectives/collectives-polkadot/src/fellowship/mod.rs

+	type OnSlash = ();
+	type ProposalBond = HundredPercent;
+	type ProposalBondMinimum = MaxBalance;
+	type ProposalBondMaximum = MaxBalance;


again, out of scope of this PR, but this means the treasury pallet needs some serious refactoring

related calls were deprecated half year ago, with a note that they will be removed in Feb

xlc · 2023-12-08T00:21:17Z

system-parachains/collectives/collectives-polkadot/src/lib.rs

+	type RuntimeEvent = RuntimeEvent;
+	type CreateOrigin = EitherOfDiverse<
+		EnsureRoot<AccountId>,
+		EitherOfDiverse<EnsureXcm<IsVoiceOfBody<GovernanceLocation, TreasurerBodyId>>, Fellows>,


just to confirm, we are happy with this origin configuration?

Seems reasonable to me.

xlc · 2023-12-08T00:22:32Z

system-parachains/collectives/collectives-polkadot/src/lib.rs

 		Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 42,
 		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>, HoldReason} = 43,
 		Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 44,
+		AssetRate: pallet_asset_rate::{Pallet, Call, Storage, Event<T>} = 45,


nit: I will prefer to use the default syntax to not explicitly listing things here but it maybe good to keep consistent in this PR and do the change later in one go

Yeah. We really need to switch this.

relay/polkadot/constants/src/lib.rs

system-parachains/collectives/collectives-polkadot/src/fellowship/mod.rs

ggwpez · 2023-12-08T15:20:42Z

system-parachains/collectives/collectives-polkadot/src/weights/pallet_treasury.rs

+// pallet
+// --chain=collectives-westend-dev
+// --steps=2
+// --repeat=2


Sure need to be re-generated before the next release.

system-parachains/collectives/collectives-polkadot/src/fellowship/mod.rs

Co-authored-by: Oliver Tale-Yazdi <[email protected]>

bkchr · 2023-12-08T16:52:02Z

Ser @xlc, maybe another pass?

bkchr · 2023-12-08T21:26:38Z

/merge

fellowship-merge-bot · 2023-12-08T21:27:19Z

Enabled auto-merge in Pull Request

Available commands

/merge: Enables auto-merge for Pull Request
/merge cancel: Cancels auto-merge for Pull Request
/merge help: Shows this menu

For more information see the documentation

…oded numbers usage for indexes (#182) This PR solves older TODO + addresses #109 (comment).   - [X] Does not require a CHANGELOG entry --------- Co-authored-by: Bastian Köcher <[email protected]>

fellowship treasury

8f2ed70

muharem mentioned this pull request Nov 30, 2023

1.1.0 Release #68

Closed

xlc reviewed Nov 30, 2023

View reviewed changes

system-parachains/collectives/collectives-polkadot/src/fellowship/mod.rs Outdated Show resolved Hide resolved

system-parachains/collectives/collectives-polkadot/src/fellowship/mod.rs Show resolved Hide resolved

root approves spends with no amount limit

f822d73

joepetrowski approved these changes Dec 1, 2023

View reviewed changes

disable proposal creation via treasury pallet

467b9da

bkchr approved these changes Dec 7, 2023

View reviewed changes

bkchr added 2 commits December 8, 2023 00:07

Merge remote-tracking branch 'origin/main' into muharem-fellowship-co…

c5aee46

…llecitves-treasury

Changelog

cddf65f

xlc reviewed Dec 8, 2023

View reviewed changes

joepetrowski mentioned this pull request Dec 8, 2023

Convert Some Treasury Configs to NeverEnsure Once v1.5.0 is Released #113

Closed

comments

59fb73a

ggwpez approved these changes Dec 8, 2023

View reviewed changes

Merge branch 'main' into muharem-fellowship-collecitves-treasury

8b847fc

bkchr reviewed Dec 8, 2023

View reviewed changes

system-parachains/collectives/collectives-polkadot/src/fellowship/mod.rs Outdated Show resolved Hide resolved

Apply suggestions from code review

c205369

Co-authored-by: Oliver Tale-Yazdi <[email protected]>

bkchr mentioned this pull request Dec 8, 2023

Investigate passing pallet index as const value paritytech/polkadot-sdk#2665

Open

add test for pallet indices

90f334b

joepetrowski mentioned this pull request Dec 8, 2023

Move/copy runtime-common to fellowship repo #59

Open

xlc approved these changes Dec 8, 2023

View reviewed changes

fellowship-merge-bot bot merged commit 49a04e5 into polkadot-fellows:main Dec 8, 2023

joepetrowski deleted the muharem-fellowship-collecitves-treasury branch December 8, 2023 21:50

joepetrowski mentioned this pull request Jan 30, 2024

Multi Asset (Sub-)Treasuries paritytech/roadmap#38

Open

5 tasks

bkontur mentioned this pull request Feb 13, 2024

Introduce collectives_polkadot_runtime_constants and removed hard-coded numbers usage for indexes #182

Merged

1 task

xlc mentioned this pull request Mar 2, 2024

Support fellowshipTreasury polkadot-js/apps#10323

Open

Conversation

muharem commented Nov 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

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!

muharem Feb 14, 2024 • 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!

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!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

bkchr commented Dec 8, 2023

Uh oh!

bkchr commented Dec 8, 2023

Uh oh!

fellowship-merge-bot bot commented Dec 8, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

muharem commented Nov 30, 2023 •

edited

Loading

muharem Feb 14, 2024 •

edited

Loading