Skip to content

feat: restarting miner rewards #439

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

Merged
ytqaljn merged 1 commit into from
Feb 12, 2025
Merged

feat: restarting miner rewards #439

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
34 changes: 17 additions & 17 deletions pallets/sminer/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,29 +1299,29 @@ impl<T: Config> MinerControl<<T as frame_system::Config>::AccountId, BlockNumber
}

fn record_snap_shot(miner: &AccountOf<T>, miner_idle_space: u128, miner_service_space: u128) -> DispatchResult {
// let now = frame_system::Pallet::<T>::block_number();
// let era = T::Staking::current_era();
// let power = Self::calculate_power(miner_idle_space, miner_service_space);
let now = frame_system::Pallet::<T>::block_number();
let era = T::Staking::current_era();
let power = Self::calculate_power(miner_idle_space, miner_service_space);

// <CompleteMinerSnapShot<T>>::mutate(miner, |miner_info_list| -> DispatchResult {
// let snap_shot =
// MinerCompleteInfo::<BlockNumberFor<T>> { era_index: era, issued: false, finsh_block: now, power };
<CompleteMinerSnapShot<T>>::mutate(miner, |miner_info_list| -> DispatchResult {
let snap_shot =
MinerCompleteInfo::<BlockNumberFor<T>> { 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(())
}

// <CompleteSnapShot<T>>::mutate(&era, |complete_info| -> DispatchResult {
// complete_info.miner_count = complete_info.miner_count.checked_add(1).ok_or(Error::<T>::Overflow)?;
// complete_info.total_power = complete_info.total_power.checked_add(power).ok_or(Error::<T>::Overflow)?;
<CompleteSnapShot<T>>::mutate(&era, |complete_info| -> DispatchResult {
complete_info.miner_count = complete_info.miner_count.checked_add(1).ok_or(Error::<T>::Overflow)?;
complete_info.total_power = complete_info.total_power.checked_add(power).ok_or(Error::<T>::Overflow)?;

// Ok(())
// })?;
Ok(())
})?;

// miner_info_list.try_push(snap_shot).map_err(|_| Error::<T>::Overflow)?;
miner_info_list.try_push(snap_shot).map_err(|_| Error::<T>::Overflow)?;

// Ok(())
// })?;
Ok(())
})?;

Ok(())
}
Expand Down
2 changes: 1 addition & 1 deletion standalone/chain/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down