Luxor/reduce council budget

runtime-modules/council/src/lib.rs

@@ -423,6 +423,11 @@ decl_event! {
         /// Councilor reward has been updated.
         CouncilorRewardUpdated(Balance),
 
+        /// Councilor budget has been decreased
+        /// Params:
+        /// - Reduction amount
+        CouncilBudgetDecreased(Balance),
+
         /// Request has been funded
         RequestFunded(AccountId, Balance),
 
@@ -518,6 +523,9 @@ decl_error! {
 
         /// Cannot withdraw: insufficient budget balance.
         InsufficientBalanceForTransfer,
+
+        /// Cannot reduce the budget by the given amount.
+        ReductionAmountTooLarge
     }
 }
 
@@ -843,6 +851,38 @@ decl_module! {
             Ok(())
         }
 
+        /// Decrease the council total budget
+        ///
+        /// # <weight>
+        ///
+        /// ## weight
+        /// `O (1)`
+        /// - db:
+        ///    - `O(1)` doesn't depend on the state or parameters
+        /// # </weight>
+        #[weight = 10_000_000] // TODO: adjust
+        pub fn decrease_council_budget(origin, reduction_amount: Balance<T>) -> Result<(), Error<T>> {
+            // ensure action can be started
+            EnsureChecks::<T>::can_decrease_council_budget(origin)?;
+
+            // ensure reduction amount is not too large
+            ensure!(
+                reduction_amount <= Self::budget(),
+                Error::<T>::ReductionAmountTooLarge
+            );
+
+            //
+            // == MUTATION SAFE ==
+            //
+
+            // update state
+            Mutations::<T>::decrease_budget(reduction_amount);
+
+            // emit event
+            Self::deposit_event(RawEvent::CouncilBudgetDecreased(reduction_amount));
+
+            Ok(())
+        }
 
         /// Transfers funds from council budget to account
         ///
@@ -1788,6 +1828,13 @@ impl<T: Config> EnsureChecks<T> {
 
         Ok(())
     }
+
+    // Ensures there is no problem in decreasing the council budget
+    fn can_decrease_council_budget(origin: T::RuntimeOrigin) -> Result<(), Error<T>> {
+        ensure_root(origin)?;
+
+        Ok(())
+    }
 }
 
 impl<T: Config + common::membership::MembershipTypes>

runtime-modules/council/src/tests.rs

@@ -10,7 +10,7 @@ use common::council::CouncilOriginValidator;
 use frame_support::dispatch::DispatchError;
 use frame_support::traits::Currency;
 use frame_support::WeakBoundedVec;
-use frame_support::{assert_err, assert_ok, StorageValue};
+use frame_support::{assert_err, assert_noop, assert_ok, StorageValue};
 use frame_system::RawOrigin;
 use staking_handler::StakingHandler;
 
@@ -2097,3 +2097,83 @@ fn candidate_remark_unsuccessful_with_invalid_origin() {
         );
     });
 }
+
+#[test]
+fn decrease_council_budget_fails_with_non_root_origin() {
+    let config = default_genesis_config();
+    let initial_budget = 1_000u64;
+    let reduction_amount = 100u64;
+    let account_id = 0;
+    let root_origin = OriginType::Root;
+
+    build_test_externalities(config).execute_with(|| {
+        Mocks::set_budget(root_origin, initial_budget, Ok(()));
+
+        assert_noop!(
+            Council::decrease_council_budget(
+                RawOrigin::Signed(account_id).into(),
+                reduction_amount
+            ),
+            Error::<Runtime>::BadOrigin,
+        );
+    });
+}
+
+#[test]
+fn decrease_council_budget_fails_with_reduction_amount_too_large() {
+    let config = default_genesis_config();
+    let initial_budget = 100u64;
+    let reduction_amount = initial_budget.saturating_mul(10);
+
+    build_test_externalities(config).execute_with(|| {
+        Mocks::set_budget(OriginType::Root, initial_budget, Ok(()));
+
+        assert_noop!(
+            Council::decrease_council_budget(RawOrigin::Root.into(), reduction_amount),
+            Error::<Runtime>::ReductionAmountTooLarge,
+        );
+    });
+}
+
+#[test]
+fn decrease_council_budget_ok_with_reduction_accounted() {
+    let config = default_genesis_config();
+    let initial_budget = 100u64;
+    let reduction_amount = 10u64;
+    let root_origin = OriginType::Root;
+
+    build_test_externalities(config).execute_with(|| {
+        Mocks::set_budget(root_origin, initial_budget, Ok(()));
+
+        assert_ok!(Council::decrease_council_budget(
+            RawOrigin::Root.into(),
+            reduction_amount
+        ));
+
+        assert_eq!(
+            Budget::<Runtime>::get(),
+            initial_budget.saturating_sub(reduction_amount)
+        );
+    });
+}
+
+#[test]
+fn decrease_council_budget_ok_with_event_deposited() {
+    let config = default_genesis_config();
+    let initial_budget = 100u64;
+    let reduction_amount = 10u64;
+    let root_origin = OriginType::Root;
+
+    build_test_externalities(config).execute_with(|| {
+        Mocks::set_budget(root_origin, initial_budget, Ok(()));
+
+        assert_ok!(Council::decrease_council_budget(
+            RawOrigin::Root.into(),
+            reduction_amount
+        ));
+
+        EventFixture::assert_last_crate_event(crate::RawEvent::CouncilBudgetDecreased(
+            reduction_amount,
+        ));
+    });
+}

runtime-modules/proposals/codex/Cargo.toml

@@ -6,43 +6,46 @@ edition = '2018'
 
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
-codec = { package = 'parity-scale-codec', version = '3.1.2', default-features = false, features = ['derive'] }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
-sp-core = { package = 'sp-core', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
-frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
-sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
-sp-runtime = { package = 'sp-runtime', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
-frame-system = { package = 'frame-system', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
-staking = { package = 'pallet-staking', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
-pallet-timestamp = { package = 'pallet-timestamp', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
-working-group = { package = 'pallet-working-group', default-features = false, path = '../../working-group'}
-common = { package = 'pallet-common', default-features = false, path = '../../common'}
-proposals-engine = { package = 'pallet-proposals-engine', default-features = false, path = '../engine'}
-proposals-discussion = { package = 'pallet-proposals-discussion', default-features = false, path = '../discussion'}
-constitution = { package = 'pallet-constitution', default-features = false, path = '../../constitution'}
-membership = { package = 'pallet-membership', default-features = false, path = '../../membership'}
-content = { package = 'pallet-content', default-features = false, path = '../../content'}
-balances = { package = 'pallet-balances', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9', optional = true}
+codec = { package = 'parity-scale-codec', version = '3.1.2', default-features = false, features = [
+    'derive',
+] }
+scale-info = { version = "2.1.1", default-features = false, features = [
+    "derive",
+] }
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
+sp-core = { package = 'sp-core', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
+frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
+sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
+sp-runtime = { package = 'sp-runtime', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
+frame-system = { package = 'frame-system', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
+staking = { package = 'pallet-staking', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
+pallet-timestamp = { package = 'pallet-timestamp', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
+working-group = { package = 'pallet-working-group', default-features = false, path = '../../working-group' }
+common = { package = 'pallet-common', default-features = false, path = '../../common' }
+proposals-engine = { package = 'pallet-proposals-engine', default-features = false, path = '../engine' }
+proposals-discussion = { package = 'pallet-proposals-discussion', default-features = false, path = '../discussion' }
+constitution = { package = 'pallet-constitution', default-features = false, path = '../../constitution' }
+membership = { package = 'pallet-membership', default-features = false, path = '../../membership' }
+content = { package = 'pallet-content', default-features = false, path = '../../content' }
+balances = { package = 'pallet-balances', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9', optional = true }
+council = { package = 'pallet-council', default-features = false, path = '../../council' }
 token = { package = 'pallet-project-token', default-features = false, path = '../../project-token' }
 
 # Benchmarking dependencies
-frame-benchmarking = { package = 'frame-benchmarking', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9', optional = true}
-council = { package = 'pallet-council', default-features = false, path = '../../council', optional = true}
+frame-benchmarking = { package = 'frame-benchmarking', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9', optional = true }
 
 [dev-dependencies]
-sp-io = { package = 'sp-io', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
-sp-core = { package = 'sp-core', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
-sp-staking = { package = 'sp-staking', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
-pallet-staking-reward-curve = { package = 'pallet-staking-reward-curve', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
-strum = {version = "0.19", default-features = false}
-staking-handler = { package = 'pallet-staking-handler', default-features = false, path = '../../staking-handler'}
-referendum = { package = 'pallet-referendum', default-features = false, path = '../../referendum'}
-council = { package = 'pallet-council', default-features = false, path = '../../council'}
-balances = { package = 'pallet-balances', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
-frame-election-provider-support = { package = 'frame-election-provider-support', git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
-pallet-bags-list = { package = 'pallet-bags-list', git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
-sp-npos-elections = { package = 'sp-npos-elections', git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9'}
+sp-io = { package = 'sp-io', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
+sp-core = { package = 'sp-core', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
+sp-staking = { package = 'sp-staking', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
+pallet-staking-reward-curve = { package = 'pallet-staking-reward-curve', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
+strum = { version = "0.19", default-features = false }
+staking-handler = { package = 'pallet-staking-handler', default-features = false, path = '../../staking-handler' }
+referendum = { package = 'pallet-referendum', default-features = false, path = '../../referendum' }
+balances = { package = 'pallet-balances', default-features = false, git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
+frame-election-provider-support = { package = 'frame-election-provider-support', git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
+pallet-bags-list = { package = 'pallet-bags-list', git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
+sp-npos-elections = { package = 'sp-npos-elections', git = 'https://github.com/joystream/substrate.git', rev = '1d0eefca86ef31b9e7727df01a6ed23ad65491e9' }
 
 [features]
 default = ['std']

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

@@ -138,6 +138,7 @@ pub trait Config:
     + working_group::Config<OperationsWorkingGroupInstanceBeta>
     + working_group::Config<OperationsWorkingGroupInstanceGamma>
     + working_group::Config<DistributionWorkingGroupInstance>
+    + council::Config
 {
     /// Proposal Codex module event type.
     type RuntimeEvent: From<Event<Self>> + Into<<Self as frame_system::Config>::RuntimeEvent>;
@@ -279,6 +280,11 @@ pub trait Config:
     type SetPalletFozenStatusProposalParameters: Get<
         ProposalParameters<Self::BlockNumber, BalanceOf<Self>>,
     >;
+
+    /// `Decrease Council Budget` proposal parameters
+    type DecreaseCouncilBudgetProposalParameters: Get<
+        ProposalParameters<Self::BlockNumber, BalanceOf<Self>>,
+    >;
 }
 
 /// Specialized alias of GeneralProposalParams
@@ -385,6 +391,9 @@ decl_error! {
 
         /// Arithmeic Error
         ArithmeticError,
+
+        /// Reduction Amount Zero
+        ReductionAmountZero,
     }
 }
 
@@ -503,6 +512,11 @@ decl_module! {
         const SetMaxValidatorCountProposalMaxValidators: u32 =
             T::SetMaxValidatorCountProposalMaxValidators::get();
 
+        /// Decrease Council budget parameters
+        const DecreaseCouncilBudgetProposalParameters:
+            ProposalParameters<T::BlockNumber, BalanceOf<T>> = T::DecreaseCouncilBudgetProposalParameters::get();
+
+        /// Set Pallet Frozen status
         const SetPalletFozenStatusProposalParameters:
             ProposalParameters<T::BlockNumber, BalanceOf<T>> = T::SetPalletFozenStatusProposalParameters::get();
 
@@ -877,6 +891,12 @@ impl<T: Config> Module<T> {
             ProposalDetails::SetPalletFozenStatus(..) => {
                 // Note: No checks for this proposal for now
             }
+            ProposalDetails::DecreaseCouncilBudget(reduction_amount) => {
+                ensure!(
+                    !(*reduction_amount).is_zero(),
+                    Error::<T>::ReductionAmountZero
+                );
+            }
         }
 
         Ok(())
@@ -947,6 +967,9 @@ impl<T: Config> Module<T> {
             ProposalDetails::SetPalletFozenStatus(..) => {
                 T::SetPalletFozenStatusProposalParameters::get()
             }
+            ProposalDetails::DecreaseCouncilBudget(..) => {
+                T::DecreaseCouncilBudgetProposalParameters::get()
+            }
         }
     }
 
@@ -1114,6 +1137,12 @@ impl<T: Config> Module<T> {
                     to_kb(description_length.saturated_into()),
                 )
             }
+            ProposalDetails::DecreaseCouncilBudget(..) => {
+                WeightInfoCodex::<T>::create_proposal_decrease_council_budget(
+                    to_kb(title_length.saturated_into()),
+                    to_kb(description_length.saturated_into()),
+                )
+            }
         }
     }
 }

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

@@ -93,7 +93,6 @@ frame_support::construct_runtime!(
         Membership: membership::{Pallet, Call, Storage, Event<T>},
         ProposalsCodex: proposals_codex::{Pallet, Call, Storage, Event<T>},
         ProposalsEngine: proposals_engine::{Pallet, Call, Storage, Event<T>},
-        Council: council::{Pallet, Call, Storage, Event<T>},
         Referendum: referendum::<Instance1>::{Pallet, Call, Storage, Event<T>},
         ProposalsDiscussion: proposals_discussion::{Pallet, Call, Storage, Event<T>},
         ForumWorkingGroup: working_group::<Instance1>::{Pallet, Call, Storage, Event<T>},
@@ -105,6 +104,7 @@ frame_support::construct_runtime!(
         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>},
     }
 );
 
@@ -670,6 +670,7 @@ impl crate::Config for Test {
     type FundingRequestProposalMaxAccounts = FundingRequestProposalMaxAccounts;
     type SetMaxValidatorCountProposalMaxValidators = SetMaxValidatorCountProposalMaxValidators;
     type SetPalletFozenStatusProposalParameters = DefaultProposalParameters;
+    type DecreaseCouncilBudgetProposalParameters = DefaultProposalParameters;
 }
 
 parameter_types! {

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

@@ -1,6 +1,7 @@
 mod mock;
 
 use content::NftLimitPeriod;
+use frame_support::assert_noop;
 use frame_support::dispatch::{DispatchError, DispatchResult};
 use frame_support::storage::StorageMap;
 use frame_support::traits::Currency;
@@ -1696,6 +1697,28 @@ fn create_terminate_working_group_leader_role_proposal_common_checks_succeed() {
     }
 }
 
+#[test]
+fn create_decrease_working_group_budget_fails_with_zero_reduction_amount() {
+    let general_proposal_parameters = GeneralProposalParameters::<Test> {
+        member_id: 1,
+        title: b"title".to_vec(),
+        description: b"body".to_vec(),
+        staking_account_id: Some(1),
+        exact_execution_block: None,
+    };
+    initial_test_ext().execute_with(|| {
+        increase_total_balance_issuance_using_account_id(1, 500000);
+        assert_noop!(
+            ProposalsCodex::create_proposal(
+                RawOrigin::Signed(1).into(),
+                general_proposal_parameters,
+                ProposalDetails::DecreaseCouncilBudget(0u64)
+            ),
+            Error::<Test>::ReductionAmountZero
+        );
+    })
+}
+
 fn run_create_terminate_working_group_leader_role_proposal_common_checks_succeed(
     group: WorkingGroup,
 ) {

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

@@ -122,6 +122,9 @@ pub enum ProposalDetails<
 
     /// `SetPalletFozenStatus` proposal
     SetPalletFozenStatus(bool, FreezablePallet),
+
+    /// `DecreaseCouncilBudget` proposal
+    DecreaseCouncilBudget(Balance),
 }
 
 impl<