feat: transfer fees to treasury (#78)

Closes CHAIN-60

Author: devwckd

pallets/governance/src/application.rs

@@ -4,7 +4,6 @@ use codec::{Decode, Encode, MaxEncodedLen};
 use polkadot_sdk::frame_election_provider_support::Get;
 use polkadot_sdk::frame_support::dispatch::DispatchResult;
 use polkadot_sdk::frame_support::traits::Currency;
-use polkadot_sdk::frame_support::traits::WithdrawReasons;
 use polkadot_sdk::frame_support::DebugNoBound;
 use polkadot_sdk::sp_runtime::BoundedVec;
 use polkadot_sdk::sp_std::vec::Vec;
@@ -69,10 +68,10 @@ pub fn submit_application<T: crate::Config>(
     let config = crate::GlobalGovernanceConfig::<T>::get();
     let cost = config.agent_application_cost;
 
-    let _ = <T as crate::Config>::Currency::withdraw(
+    <T as crate::Config>::Currency::transfer(
         &payer,
+        &crate::DaoTreasuryAddress::<T>::get(),
         cost,
-        WithdrawReasons::except(WithdrawReasons::TIP),
         ExistenceRequirement::AllowDeath,
     )
     .map_err(|_| crate::Error::<T>::NotEnoughBalanceToApply)?;
@@ -145,10 +144,12 @@ pub fn accept_application<T: crate::Config>(application_id: u32) -> DispatchResu
         }
     });
 
-    // Pay the application cost back to the applicant
-    // TODO: should this value be used?
-    let _ =
-        <T as crate::Config>::Currency::deposit_creating(&application.payer_key, application.cost);
+    let _ = <T as crate::Config>::Currency::transfer(
+        &crate::DaoTreasuryAddress::<T>::get(),
+        &application.payer_key,
+        application.cost,
+        ExistenceRequirement::AllowDeath,
+    );
 
     crate::Pallet::<T>::deposit_event(crate::Event::<T>::ApplicationAccepted(application.id));
 
@@ -169,8 +170,6 @@ pub fn deny_application<T: crate::Config>(application_id: u32) -> DispatchResult
         }
     });
 
-    // Application cost is discarded
-
     crate::Pallet::<T>::deposit_event(crate::Event::<T>::ApplicationDenied(application.id));
 
     Ok(())

pallets/governance/src/proposal.rs

@@ -11,7 +11,6 @@ use crate::{GovernanceConfiguration, NotDelegatingVotingPower};
 use codec::{Decode, Encode, MaxEncodedLen};
 use polkadot_sdk::frame_election_provider_support::Get;
 use polkadot_sdk::frame_support::traits::Currency;
-use polkadot_sdk::frame_support::traits::WithdrawReasons;
 use polkadot_sdk::polkadot_sdk_frame::traits::CheckedAdd;
 use polkadot_sdk::sp_runtime::SaturatedConversion;
 use polkadot_sdk::sp_std::{collections::btree_set::BTreeSet, vec::Vec};
@@ -76,8 +75,12 @@ impl<T: crate::Config> Proposal<T> {
     }
 
     fn execute_proposal(self) -> DispatchResult {
-        let _ =
-            <T as crate::Config>::Currency::deposit_creating(&self.proposer, self.proposal_cost);
+        let _ = <T as crate::Config>::Currency::transfer(
+            &crate::DaoTreasuryAddress::<T>::get(),
+            &self.proposer,
+            self.proposal_cost,
+            ExistenceRequirement::AllowDeath,
+        );
 
         match self.data {
             ProposalData::GlobalParams(data) => {
@@ -378,13 +381,13 @@ fn add_proposal<T: crate::Config>(
     let config = GlobalGovernanceConfig::<T>::get();
 
     let cost = config.proposal_cost;
-    let _ = <T as crate::Config>::Currency::withdraw(
+    <T as crate::Config>::Currency::transfer(
         &proposer,
+        &crate::DaoTreasuryAddress::<T>::get(),
         cost,
-        WithdrawReasons::except(WithdrawReasons::TIP),
         ExistenceRequirement::AllowDeath,
     )
-    .map_err(|_| crate::Error::<T>::NotEnoughBalanceToPropose)?;
+    .map_err(|_| crate::Error::<T>::NotEnoughBalanceToApply)?;
 
     let proposal_id: u64 = crate::Proposals::<T>::iter()
         .count()

pallets/governance/tests/application.rs

@@ -1,7 +1,12 @@
+use pallet_emission0::PendingEmission;
 use pallet_governance::application::ApplicationStatus;
 use pallet_governance::AgentApplications;
+use pallet_governance::DaoTreasuryAddress;
 use pallet_governance::GlobalGovernanceConfig;
+use pallet_governance::TreasuryEmissionFee;
+use pallet_governance_api::GovernanceApi;
 use polkadot_sdk::frame_support::assert_err;
+use polkadot_sdk::sp_runtime::Percent;
 use test_utils::*;
 
 #[test]
@@ -203,6 +208,10 @@ fn error_is_thrown_on_multiple_applications_same_key() {
 #[test]
 fn application_denied_doesnt_add_to_whitelist() {
     new_test_ext().execute_with(|| {
+        PendingEmission::<Test>::set(0);
+        TreasuryEmissionFee::<Test>::set(Percent::zero());
+        let balance = get_balance(DaoTreasuryAddress::<Test>::get());
+
         let key = 0;
         let adding_key = 1;
         pallet_governance::Curators::<Test>::insert(key, ());
@@ -249,12 +258,20 @@ fn application_denied_doesnt_add_to_whitelist() {
             application.status,
             ApplicationStatus::Resolved { accepted: false }
         );
+        assert_eq!(
+            get_balance(Test::dao_treasury_address()),
+            balance + crate::GlobalGovernanceConfig::<Test>::get().agent_application_cost
+        );
     });
 }
 
 #[test]
 fn application_expires() {
     new_test_ext().execute_with(|| {
+        PendingEmission::<Test>::set(0);
+        TreasuryEmissionFee::<Test>::set(Percent::zero());
+        let balance = get_balance(DaoTreasuryAddress::<Test>::get());
+
         let key = 0;
         let adding_key = 1;
         pallet_governance::Curators::<Test>::insert(key, ());
@@ -285,6 +302,10 @@ fn application_expires() {
         let application =
             pallet_governance::AgentApplications::<Test>::get(application_id).unwrap();
         assert_eq!(application.status, ApplicationStatus::Expired);
+        assert_eq!(
+            get_balance(Test::dao_treasury_address()),
+            balance + crate::GlobalGovernanceConfig::<Test>::get().agent_application_cost
+        );
     });
 }
 

pallets/governance/tests/voting.rs

@@ -1,8 +1,10 @@
+use pallet_emission0::PendingEmission;
 use pallet_governance::{
     config::GovernanceConfiguration,
     proposal::{GlobalParamsData, ProposalStatus},
-    DaoTreasuryAddress, Error, GlobalGovernanceConfig, Proposals,
+    DaoTreasuryAddress, Error, GlobalGovernanceConfig, Proposals, TreasuryEmissionFee,
 };
+use pallet_governance_api::GovernanceApi;
 use polkadot_sdk::frame_support::traits::Get;
 use polkadot_sdk::{frame_support::assert_err, sp_runtime::BoundedBTreeSet};
 use polkadot_sdk::{frame_support::assert_ok, sp_runtime::Percent};
@@ -203,6 +205,10 @@ fn global_custom_proposal_is_accepted_correctly() {
 #[test]
 fn global_proposal_is_refused_correctly() {
     new_test_ext().execute_with(|| {
+        PendingEmission::<Test>::set(0);
+        TreasuryEmissionFee::<Test>::set(Percent::zero());
+        let balance = get_balance(DaoTreasuryAddress::<Test>::get());
+
         zero_min_burn();
         const FOR: u32 = 0;
         const AGAINST: u32 = 1;
@@ -235,6 +241,10 @@ fn global_proposal_is_refused_correctly() {
                 stake_against: 10_000_000_000_000_000_000,
             }
         );
+        assert_eq!(
+            get_balance(Test::dao_treasury_address()),
+            balance + crate::GlobalGovernanceConfig::<Test>::get().proposal_cost
+        );
     });
 }
 
@@ -454,6 +464,10 @@ fn creates_emission_proposal_and_it_expires() {
     new_test_ext().execute_with(|| {
         zero_min_burn();
 
+        PendingEmission::<Test>::set(0);
+        TreasuryEmissionFee::<Test>::set(Percent::zero());
+        let balance = get_balance(DaoTreasuryAddress::<Test>::get());
+
         let default_proposal_expiration: u64 =
             <Test as pallet_governance::Config>::DefaultProposalExpiration::get();
 
@@ -483,6 +497,10 @@ fn creates_emission_proposal_and_it_expires() {
             Proposals::<Test>::get(0).unwrap().status,
             ProposalStatus::Expired
         );
+        assert_eq!(
+            get_balance(Test::dao_treasury_address()),
+            balance + crate::GlobalGovernanceConfig::<Test>::get().proposal_cost
+        );
     });
 }
 

pallets/torus0/src/agent.rs

@@ -3,7 +3,7 @@ use codec::{Decode, Encode, MaxEncodedLen};
 use pallet_emission0_api::Emission0Api;
 use pallet_governance_api::GovernanceApi;
 use polkadot_sdk::frame_election_provider_support::Get;
-use polkadot_sdk::frame_support::traits::{Currency, ExistenceRequirement, WithdrawReasons};
+use polkadot_sdk::frame_support::traits::{Currency, ExistenceRequirement};
 use polkadot_sdk::frame_support::DebugNoBound;
 use polkadot_sdk::polkadot_sdk_frame::prelude::BlockNumberFor;
 use polkadot_sdk::sp_runtime::DispatchError;
@@ -92,10 +92,11 @@ pub fn register<T: crate::Config>(
 
     let burn = crate::Burn::<T>::get();
 
-    let _ = <T as crate::Config>::Currency::withdraw(
+    // Registration cost is sent to treasury
+    <T as crate::Config>::Currency::transfer(
         &payer,
+        &<T as crate::Config>::Governance::dao_treasury_address(),
         burn,
-        WithdrawReasons::except(WithdrawReasons::TIP),
         ExistenceRequirement::AllowDeath,
     )
     .map_err(|_| crate::Error::<T>::NotEnoughBalanceToRegisterAgent)?;

pallets/torus0/tests/agent.rs

@@ -1,10 +1,20 @@
+use pallet_governance_api::GovernanceApi;
 use pallet_torus0::{Burn, Error};
 use polkadot_sdk::{frame_support::assert_err, sp_core::Get, sp_runtime::Percent};
-use test_utils::{assert_ok, pallet_governance, Test};
+use test_utils::{
+    assert_ok, get_balance,
+    pallet_emission0::PendingEmission,
+    pallet_governance::{self, DaoTreasuryAddress, TreasuryEmissionFee},
+    Test,
+};
 
 #[test]
 fn register_correctly() {
     test_utils::new_test_ext().execute_with(|| {
+        PendingEmission::<Test>::set(0);
+        TreasuryEmissionFee::<Test>::set(Percent::zero());
+        let balance = get_balance(DaoTreasuryAddress::<Test>::get());
+
         let agent = 0;
         let name = "agent".as_bytes().to_vec();
         let url = "idk://agent".as_bytes().to_vec();
@@ -27,6 +37,11 @@ fn register_correctly() {
         assert_eq!(agent.name.to_vec(), name);
         assert_eq!(agent.url.to_vec(), url);
         assert_eq!(agent.metadata.to_vec(), metadata);
+
+        assert_eq!(
+            get_balance(Test::dao_treasury_address()),
+            balance + Burn::<Test>::get()
+        );
     });
 }
 

xtask/src/build_spec.rs

@@ -91,7 +91,6 @@ fn grandpa(genesis: &mut Value) {
     )];
 
     let key = key_name(b"Grandpa", b"Authorities");
-    dbg!(&key);
 
     let mut buf = Cursor::new(vec![0; grandpa.size_hint()]);
     grandpa.encode_to(&mut buf);