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

Enable council election with WPHA #1324

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Enable council election with WPHA #1324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e717c4d
wpha: base impl of council election
h4x3rotab Jun 25, 2023
0b82403
simplify pallet deps
h4x3rotab Jun 25, 2023
3be8fd8
remove unused deps
h4x3rotab Jun 25, 2023
17f23cd
remove unused bounds
h4x3rotab Jun 25, 2023
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
2 changes: 1 addition & 1 deletion pallets/phala/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ std = [
"pallet-preimage/std",
]
runtime-benchmarks = [
"frame-benchmarking/runtime-benchmarks"
"frame-benchmarking/runtime-benchmarks",
]
try-runtime = ["frame-support/try-runtime"]
native = [
Expand Down
10 changes: 5 additions & 5 deletions pallets/phala/src/compute/base_pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ pub mod pallet {
BalanceOf<T>:
sp_runtime::traits::AtLeast32BitUnsigned + Copy + FixedPointConvert + Display,
T: pallet_assets::Config<AssetId = u32, Balance = BalanceOf<T>>,
T: Config + wrapped_balances::Config + vault::Config,
T: wrapped_balances::Config + vault::Config,
{
Pallet::<T>::set_nft_attr(self.cid, self.nftid, &self.attr)?;
Ok(())
Expand Down Expand Up @@ -336,7 +336,7 @@ pub mod pallet {
where
T: pallet_assets::Config<AssetId = u32, Balance = Balance>,
T: Config<AccountId = AccountId>,
T: Config + wrapped_balances::Config + vault::Config,
T: wrapped_balances::Config + vault::Config,
{
pallet_assets::Pallet::<T>::balance(
<T as wrapped_balances::Config>::WPhaAssetId::get(),
Expand All @@ -359,7 +359,7 @@ pub mod pallet {
sp_runtime::traits::AtLeast32BitUnsigned + Copy + FixedPointConvert + Display,
T: pallet_assets::Config<AssetId = u32, Balance = BalanceOf<T>>,
T: Config<AccountId = AccountId>,
T: Config + wrapped_balances::Config + vault::Config,
T: wrapped_balances::Config + vault::Config,
{
self.total_value += rewards;
for vault_staker in &self.value_subscribers {
Expand Down Expand Up @@ -422,7 +422,7 @@ pub mod pallet {
BalanceOf<T>: sp_runtime::traits::AtLeast32BitUnsigned + Copy + FixedPointConvert + Display,
T: pallet_uniques::Config<CollectionId = CollectionId, ItemId = NftId>,
T: pallet_assets::Config<AssetId = u32, Balance = BalanceOf<T>>,
T: Config + vault::Config,
T: vault::Config,
{
/// Adds a staker accountid to contribution whitelist.
///
Expand Down Expand Up @@ -588,7 +588,7 @@ pub mod pallet {
BalanceOf<T>: sp_runtime::traits::AtLeast32BitUnsigned + Copy + FixedPointConvert + Display,
T: pallet_uniques::Config<CollectionId = CollectionId, ItemId = NftId>,
T: pallet_assets::Config<AssetId = u32, Balance = BalanceOf<T>>,
T: Config + wrapped_balances::Config + vault::Config,
T: wrapped_balances::Config + vault::Config,
{
/// Returns a [`NftGuard`] object that can read or write to the nft attributes
///
Expand Down
10 changes: 5 additions & 5 deletions pallets/phala/src/compute/stake_pool_v2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ pub mod pallet {
BalanceOf<T>: sp_runtime::traits::AtLeast32BitUnsigned + Copy + FixedPointConvert + Display,
T: pallet_uniques::Config<CollectionId = CollectionId, ItemId = NftId>,
T: pallet_assets::Config<AssetId = u32, Balance = BalanceOf<T>>,
T: Config + vault::Config,
T: vault::Config,
{
/// Creates a new stake pool
#[pallet::call_index(0)]
Expand Down Expand Up @@ -994,7 +994,7 @@ pub mod pallet {
BalanceOf<T>: FixedPointConvert + Display,
T: pallet_uniques::Config<CollectionId = CollectionId, ItemId = NftId>,
T: pallet_assets::Config<AssetId = u32, Balance = BalanceOf<T>>,
T: Config + vault::Config,
T: vault::Config,
{
pub fn do_start_computing(
owner: &T::AccountId,
Expand Down Expand Up @@ -1206,7 +1206,7 @@ pub mod pallet {
BalanceOf<T>: FixedPointConvert + Display,
T: pallet_uniques::Config<CollectionId = CollectionId, ItemId = NftId>,
T: pallet_assets::Config<AssetId = u32, Balance = BalanceOf<T>>,
T: Config + vault::Config,
T: vault::Config,
{
/// Called when gk send new payout information.
/// Append specific worker's reward balance of current round,
Expand Down Expand Up @@ -1239,7 +1239,7 @@ pub mod pallet {
BalanceOf<T>: FixedPointConvert + Display,
T: pallet_uniques::Config<CollectionId = CollectionId, ItemId = NftId>,
T: pallet_assets::Config<AssetId = u32, Balance = BalanceOf<T>>,
T: Config + vault::Config,
T: vault::Config,
{
fn on_unbound(worker: &WorkerPublicKey, _force: bool) {
// Usually called on worker force unbinding (force == true), but it's also possible
Expand All @@ -1261,7 +1261,7 @@ pub mod pallet {
BalanceOf<T>: FixedPointConvert + Display,
T: pallet_uniques::Config<CollectionId = CollectionId, ItemId = NftId>,
T: pallet_assets::Config<AssetId = u32, Balance = BalanceOf<T>>,
T: Config + vault::Config,
T: vault::Config,
{
fn on_stopped(
_worker: &WorkerPublicKey,
Expand Down
Loading