Luxor/reduce council budget by dobertRowneySr · Pull Request #5062 · Joystream/joystream

dobertRowneySr · 2024-01-26T15:01:45Z

addresses: #3494

Budget is simply reduced by the amount (there is no token minting until workers/councilors gets paid)
I have also added a proposal, with the same parameters as the freeze_pallet proposal

kdembler · 2024-02-16T14:56:55Z

@ignazio-bovo please change target branch to luxor

kdembler

Look good to me, will approve once we finalize the params for proposal, waiting for council feedback

runtime-modules/proposals/codex/src/lib.rs

runtime-modules/proposals/codex/src/weights.rs

kdembler · 2024-02-16T15:05:26Z

runtime/src/proposals_configuration/defaults.rs

+        voting_period: days!(3),
+        grace_period: 0,
+        approval_quorum_percentage: TWO_OUT_OF_THREE,
+        approval_threshold_percentage: TWO_OUT_OF_THREE,
+        slashing_quorum_percentage: ALL,
+        slashing_threshold_percentage: ALL,
+        required_stake: Some(dollars!(50)),
+        constitutionality: 1,


We need to adjust those, will get back to you

Council has approved a signal to make this 3/3 approval, 1 constitutionality: https://pioneer.joyutils.org/#/proposals/preview/797

Let me know if also the quorum percentage is correct

freakstatic

LGTM!

textureAtlas.png

… metadatat" This reverts commit 4041f80.

mnaamani

Runtime implementation looks good.
I think you ran the query-node build before the runtime spec was updated, that is why the query-node/chain-metadata/2002.json file is modified. Please revert it to one from master.
The integration test fails because the mappings do not handle case of the new proposal, so the processor fails to handle the event. Do you want to add the mapping and schema update for QN in this PR or a separately?

dobertRowneySr · 2024-03-19T09:07:10Z

The QN part is handled separately

mnaamani

Just need to add a weight function for the decrease_council_budget dispatch call.

mnaamani · 2024-03-21T16:43:01Z

runtime-modules/council/src/lib.rs

+        /// - db:
+        ///    - `O(1)` doesn't depend on the state or parameters
+        /// # </weight>
+        #[weight = 10_000_000] // TODO: adjust


Should we add a weight function for this dispatch

This was part of a bigger issue that there are no benchmarks.
I have added that for the reduce_council_budget, thanks for pointing it out

mnaamani · 2024-03-21T16:50:18Z

runtime-modules/proposals/codex/src/tests/mock.rs

        OperationsWorkingGroupBeta: working_group::<Instance7>::{Pallet, Call, Storage, Event<T>},
        OperationsWorkingGroupGamma: working_group::<Instance8>::{Pallet, Call, Storage, Event<T>},
        DistributionWorkingGroup: working_group::<Instance9>::{Pallet, Call, Storage, Event<T>},
+        Council: council::{Pallet, Call, Storage, Event<T>},


Why did you find it necessary to move the Council pallet down here.

error[E0277]: the trait bound `RuntimeEvent: From<pallet_council::RawEvent<u64, u64, u64, u64>>` is not satisfied --> runtime-modules/proposals/codex/src/tests/mock.rs:696:25 | 696 | type RuntimeEvent = RuntimeEvent; | ^^^^^^^^^^^^ the trait `From<pallet_council::RawEvent<u64, u64, u64, u64>>` is not implemented for `RuntimeEvent`

without that

Is is something about the way this particular mock is implemented with respect to types. We do not seem to need to do the same for the main runtime/lib.rs

[QN] Luxor: Reduce council budget mappings

Fix decrease council budget proposal amount value

mnaamani

I think this is good to merge, just left some general comments.

mnaamani · 2024-03-25T18:55:47Z

query-node/mappings/src/proposals.ts

  event: SubstrateEvent,
  store: DatabaseManager,
-  proposalDetails: RuntimeProposalDetails_V1001 | RuntimeProposalDetails_V2002
+  proposalDetails: RuntimeProposalDetails_V2003


I think this change is okay, although we probably should implement this function in future to account for any removed proposals between runtimes. To date we have only been adding new proposals.

mnaamani · 2024-03-25T18:58:00Z

runtime-modules/council/src/lib.rs

+        ///    - `O(1)` doesn't depend on the state or parameters
+        /// # </weight>
+        #[weight = CouncilWeightInfo::<T>::decrease_council_budget()]
+        pub fn decrease_council_budget(origin, reduction_amount: Balance<T>) -> Result<(), Error<T>> {


when adding a new dispatch that is invoked by a proposal, it is best to try to add it at the end so that the method index of existing dispatches doesn't change, so we can have the option to not remove all pending proposals on runtime upgrades.

mnaamani · 2024-03-25T18:59:34Z

runtime-modules/proposals/codex/src/tests/mock.rs

        OperationsWorkingGroupBeta: working_group::<Instance7>::{Pallet, Call, Storage, Event<T>},
        OperationsWorkingGroupGamma: working_group::<Instance8>::{Pallet, Call, Storage, Event<T>},
        DistributionWorkingGroup: working_group::<Instance9>::{Pallet, Call, Storage, Event<T>},
+        Council: council::{Pallet, Call, Storage, Event<T>},


Is is something about the way this particular mock is implemented with respect to types. We do not seem to need to do the same for the main runtime/lib.rs

dobertRowneySr added runtime luxor-network labels Jan 26, 2024

dobertRowneySr requested review from freakstatic and mnaamani and removed request for freakstatic January 31, 2024 13:25

dobertRowneySr mentioned this pull request Feb 5, 2024

Luxor/vested wg spending #5072

Merged

kdembler reviewed Feb 16, 2024

View reviewed changes

freakstatic approved these changes Feb 18, 2024

View reviewed changes

kdembler reviewed Feb 22, 2024

View reviewed changes

textureAtlas.png Outdated Show resolved Hide resolved

kdembler changed the base branch from nara to luxor March 1, 2024 13:10

Ignazio Bovo added 14 commits March 1, 2024 15:24

feat: 🎨 add extrinsic for decreasing budgetj

0faab6d

test: 🧪 add tests for new extrinsic

b797a10

feat: 🎨 add proposal and tests to proposal pallet

86a254c

feat: 🎨 add proposal config to runtime

b7f9bc7

fix: ⚡ rearrange checks

192a773

test: ⚡ add proposal to integration test and update types and metadatat

28e6fb1

feat: 🎨 metadata 2003

ddc9a39

Revert "test: ⚡ add proposal to integration test and update types and…

f3a8c3e

… metadatat" This reverts commit 4041f80.

feat: ⚡ fix error on integration tests code

ccc7490

fix: 💚 fix CI errors & warning

ba85a32

feat: 🎨 address PR comment

a88003d

style: 🚨 linter

1f823ff

fix: ⚡ generate types and metadata

82b039d

fix: 🎨 rebase and regenerate metadata

c2acd1e

dobertRowneySr force-pushed the luxor/reduce-council-budget branch from bf8cf0c to c2acd1e Compare March 1, 2024 15:41

fix: 🐛 metadata 2002 should be the same as nara

cb13cf6

mnaamani requested changes Mar 16, 2024

View reviewed changes

Ignazio Bovo and others added 3 commits March 20, 2024 09:17

fix: ⚡ revert query-node/chain-metadata/2002.json to the master version

86d862f

Add the decrease council budget proposal mappings

84a3456

Add CouncilBudgetDecreasedEvent mappings

35e7175

thesan mentioned this pull request Mar 20, 2024

[QN] Luxor: Reduce council budget mappings dobertRowneySr/joystream#11

Merged

Add DecreaseCouncilBudgetProposalDetails to the ProposalDetails union

d44b700

dobertRowneySr requested a review from mnaamani March 21, 2024 10:43

mnaamani requested changes Mar 21, 2024

View reviewed changes

mrBovo and others added 5 commits March 22, 2024 10:12

Merge pull request #11 from thesan/luxor/reduce-council-budget-qn

4195007

[QN] Luxor: Reduce council budget mappings

Merge branch 'luxor' into pr/ignazio-bovo/5062

e0076f9

Fix decrease council budget proposal amount value

3a4804a

Merge pull request #12 from thesan/luxor/reduce-council-budget-qn

9b820c8

Fix decrease council budget proposal amount value

feat: ⚡ add benchmark fordecrease_council_budget

61f0c66

kdembler mentioned this pull request Mar 25, 2024

Luxor network upgrade #5114

Open

mnaamani self-requested a review March 25, 2024 19:13

mnaamani approved these changes Mar 25, 2024

View reviewed changes

mnaamani merged commit fff9f89 into Joystream:luxor Mar 25, 2024

Conversation

dobertRowneySr commented Jan 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kdembler commented Feb 16, 2024

Uh oh!

kdembler left a comment

Choose a reason for hiding this comment

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!

freakstatic left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mnaamani left a comment

Choose a reason for hiding this comment

Uh oh!

dobertRowneySr commented Mar 19, 2024

Uh oh!

mnaamani left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dobertRowneySr Mar 25, 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!

mnaamani left a comment

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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

dobertRowneySr commented Jan 26, 2024 •

edited

Loading

dobertRowneySr Mar 25, 2024 •

edited

Loading