Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remap protocol fees to DaoTreasury #766

Merged
merged 1 commit into from
Aug 1, 2023
Merged

remap protocol fees to DaoTreasury #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions runtimes/eden/src/implementations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

//! Auxillary struct/enums for polkadot runtime.

use crate::{Balances, CollatorSelection, CompanyReserve};
use crate::{Balances, CollatorSelection, DaoReserve};
use frame_support::traits::{Currency, Imbalance, OnUnbalanced};
use primitives::{AccountId, BlockNumber};
use sp_runtime::traits::BlockNumberProvider;
Expand All @@ -45,7 +45,7 @@ impl OnUnbalanced<NegativeImbalance> for DealWithFees {
// for tips, if any, 20% to treasury, 80% to author (though this can be anything)
tips.ration_merge_into(20, 80, &mut split);
}
CompanyReserve::on_unbalanced(split.0);
DaoReserve::on_unbalanced(split.0);
ToStakingPot::on_unbalanced(split.1);
}
}
Expand Down
4 changes: 2 additions & 2 deletions runtimes/eden/src/pallets_nodle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
use crate::{
constants, implementations::RelayChainBlockNumberProvider, pallets_governance::MoreThanHalfOfTechComm,
AllocationsOracles, Balances, CompanyReserve, Runtime, RuntimeEvent,
AllocationsOracles, Balances, DaoReserve, Runtime, RuntimeEvent,
};
use frame_support::{parameter_types, PalletId};
use lazy_static::lazy_static;
Expand Down Expand Up @@ -91,7 +91,7 @@ impl pallet_allocations::Config for Runtime {
type Currency = Balances;
type PalletId = AllocPalletId;
type ProtocolFee = ProtocolFee;
type ProtocolFeeReceiver = CompanyReserve;
type ProtocolFeeReceiver = DaoReserve;
type MintCurve = EdenMintCurve;
type ExistentialDeposit = <Runtime as pallet_balances::Config>::ExistentialDeposit;
type MaxAllocs = MaxAllocs;
Expand Down