From f9d2daece3509b06ae528d9ac6c3b7d1ffcf0ec7 Mon Sep 17 00:00:00 2001 From: ytqaljn <2716693942@qq.com> Date: Wed, 12 Feb 2025 10:21:09 +0800 Subject: [PATCH] feat: restarting miner rewards --- pallets/sminer/src/lib.rs | 34 ++++++++++++++--------------- standalone/chain/runtime/src/lib.rs | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pallets/sminer/src/lib.rs b/pallets/sminer/src/lib.rs index 7be5499c..399217f6 100644 --- a/pallets/sminer/src/lib.rs +++ b/pallets/sminer/src/lib.rs @@ -1299,29 +1299,29 @@ impl MinerControl<::AccountId, BlockNumber } fn record_snap_shot(miner: &AccountOf, miner_idle_space: u128, miner_service_space: u128) -> DispatchResult { - // let now = frame_system::Pallet::::block_number(); - // let era = T::Staking::current_era(); - // let power = Self::calculate_power(miner_idle_space, miner_service_space); + let now = frame_system::Pallet::::block_number(); + let era = T::Staking::current_era(); + let power = Self::calculate_power(miner_idle_space, miner_service_space); - // >::mutate(miner, |miner_info_list| -> DispatchResult { - // let snap_shot = - // MinerCompleteInfo::> { era_index: era, issued: false, finsh_block: now, power }; + >::mutate(miner, |miner_info_list| -> DispatchResult { + let snap_shot = + MinerCompleteInfo::> { era_index: era, issued: false, finsh_block: now, power }; - // if miner_info_list.len() == RELEASE_NUMBER as usize { - // return Ok(()) - // } + if miner_info_list.len() == RELEASE_NUMBER as usize { + return Ok(()) + } - // >::mutate(&era, |complete_info| -> DispatchResult { - // complete_info.miner_count = complete_info.miner_count.checked_add(1).ok_or(Error::::Overflow)?; - // complete_info.total_power = complete_info.total_power.checked_add(power).ok_or(Error::::Overflow)?; + >::mutate(&era, |complete_info| -> DispatchResult { + complete_info.miner_count = complete_info.miner_count.checked_add(1).ok_or(Error::::Overflow)?; + complete_info.total_power = complete_info.total_power.checked_add(power).ok_or(Error::::Overflow)?; - // Ok(()) - // })?; + Ok(()) + })?; - // miner_info_list.try_push(snap_shot).map_err(|_| Error::::Overflow)?; + miner_info_list.try_push(snap_shot).map_err(|_| Error::::Overflow)?; - // Ok(()) - // })?; + Ok(()) + })?; Ok(()) } diff --git a/standalone/chain/runtime/src/lib.rs b/standalone/chain/runtime/src/lib.rs index 50a3ef3a..078319db 100644 --- a/standalone/chain/runtime/src/lib.rs +++ b/standalone/chain/runtime/src/lib.rs @@ -154,7 +154,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // and set impl_version to 0. If only runtime // implementation changes and behavior does not, then leave spec_version as // is and increment impl_version. - spec_version: 128, + spec_version: 129, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1,