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

Polkadot: add Council to SpendOrigin #6877

Merged
merged 1 commit into from
Mar 15, 2023

Conversation

muharem
Copy link
Contributor

@muharem muharem commented Mar 14, 2023

The bounties are supposed to be approved by Council. But this was broken when new SpendOrigin, defined as Root, was introduced paritytech/substrate#12808, and replaced the ApproveOrigin.

In the PR we extending the SpendOrigin with 3/5 of Council.

Note: SpendOrigin is shared type between treasury and bounties pallets, and used to guard, treasury.spend, bounties. approve_bounty, and bounties. propose_curator calls.

@muharem muharem added A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit. labels Mar 14, 2023
@paritytech-ci paritytech-ci requested review from a team March 14, 2023 17:28
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.

It works to get Bounties functioning again, but the introduction of OpenGov #6701 we should remove Council.

@muharem
Copy link
Contributor Author

muharem commented Mar 14, 2023

It works to get Bounties functioning again, but the introduction of OpenGov #6701 we should remove Council.

yes, with OpenGov, its going to be only TreasurySpender https://github.com/paritytech/polkadot/pull/6701/files#diff-e5e76e02c0d16e79c70b024cbe3c6ea56f3249382a0f987ba203c34fcb40ed66R677

but probably, this we can get with the next release.

Copy link
Contributor

@sam0x17 sam0x17 left a comment

Choose a reason for hiding this comment

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

looks good to me!

@paritytech-ci paritytech-ci requested a review from a team March 14, 2023 20:19
@muharem
Copy link
Contributor Author

muharem commented Mar 15, 2023

bot merge

@paritytech-processbot paritytech-processbot bot merged commit 0ff5ee8 into master Mar 15, 2023
@paritytech-processbot paritytech-processbot bot deleted the muharem-polkadot-council-spend-origin branch March 15, 2023 09:39
ordian added a commit that referenced this pull request Mar 16, 2023
* master: (50 commits)
  Issue 4393: Correcting Unnecessary Use of Arc (#6882)
  Companion for #13287  (#6655)
  timestamp ci job logs (#6890)
  Release parachain host API v4 (#6885)
  polkadot companion: #13128 (Pools commission) (#6264)
  companion for #13555 (#6842)
  Bump libgit2-sys from 0.14.1+1.5.0 to 0.14.2+1.5.1 (#6600)
  Bump bumpalo from 3.8.0 to 3.12.0 (#6599)
  Bump git2 from 0.16.0 to 0.16.1 (#6601)
  Council as SpendOrigin (#6877)
  PVF: Document that preparation cannot lead to disputes (#6873)
  Sync versions with current release (0.9.39) (#6875)
  Companion for paritytech/substrate#13592 (#6869)
  Update orchestra to the recent version (#6854)
  Delete unused Cargo.lock (#6870)
  Remove use of Store trait (#6835)
  Companion for Substrate #13564 (#6845)
  Adding Dispute Participation Metrics (#6838)
  Update `substrate` to 48e7cb1 (#6851)
  Move PVF timeouts to executor environment parameters (#6823)
  ...
ordian added a commit that referenced this pull request Mar 21, 2023
…slashing-client

* ao-past-session-slashing-runtime: (23 commits)
  Issue 4393: Correcting Unnecessary Use of Arc (#6882)
  Companion for #13287  (#6655)
  timestamp ci job logs (#6890)
  Release parachain host API v4 (#6885)
  polkadot companion: #13128 (Pools commission) (#6264)
  companion for #13555 (#6842)
  Bump libgit2-sys from 0.14.1+1.5.0 to 0.14.2+1.5.1 (#6600)
  Bump bumpalo from 3.8.0 to 3.12.0 (#6599)
  Bump git2 from 0.16.0 to 0.16.1 (#6601)
  Council as SpendOrigin (#6877)
  PVF: Document that preparation cannot lead to disputes (#6873)
  Sync versions with current release (0.9.39) (#6875)
  Companion for paritytech/substrate#13592 (#6869)
  Update orchestra to the recent version (#6854)
  Delete unused Cargo.lock (#6870)
  Remove use of Store trait (#6835)
  Companion for Substrate #13564 (#6845)
  Adding Dispute Participation Metrics (#6838)
  Update `substrate` to 48e7cb1 (#6851)
  Move PVF timeouts to executor environment parameters (#6823)
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants