diff --git a/pallets/ddc-accounts/src/lib.rs b/pallets/ddc-accounts/src/lib.rs index d7e6e2560..ebc877c81 100644 --- a/pallets/ddc-accounts/src/lib.rs +++ b/pallets/ddc-accounts/src/lib.rs @@ -12,6 +12,7 @@ use scale_info::TypeInfo; use sp_runtime::{ traits::{AccountIdConversion, AtLeast32BitUnsigned, Saturating, Zero}, RuntimeDebug, + SaturatedConversion, }; use sp_staking::EraIndex; @@ -566,13 +567,14 @@ pub mod pallet { // Charge payments from content owners pub fn charge_payments_new( paying_accounts: Vec>>, + pricing: u128, ) -> DispatchResult { let mut total_charged = BalanceOf::::zero(); for bucket_details in paying_accounts.iter() { let bucket: Bucket = Self::buckets(bucket_details.bucket_id).unwrap(); let content_owner = bucket.owner_id; - let amount = bucket_details.amount; + let amount = bucket_details.amount * pricing.saturated_into::>(); let mut ledger = Self::ledger(&content_owner).ok_or(Error::::NotController)?; if ledger.active >= amount { diff --git a/pallets/ddc-validator/src/lib.rs b/pallets/ddc-validator/src/lib.rs index baef8543f..75eb21ee1 100644 --- a/pallets/ddc-validator/src/lib.rs +++ b/pallets/ddc-validator/src/lib.rs @@ -456,7 +456,8 @@ pub mod pallet { Error::::ContentOwnersDoubleSpend ); - >::charge_payments_new(paying_accounts); + let pricing: u128 = >::pricing().unwrap(); + >::charge_payments_new(paying_accounts, pricing); EraContentOwnersCharged::::insert(era, controller, true);