Skip to content

Change estimate calc to use tempo #49

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
shibshib merged 3 commits into from
Mar 18, 2023
+13 −9
Merged

Change estimate calc to use tempo #49

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29c3809
Change estimate calc to use tempo
camfairchild Mar 17, 2023
01a5dcb
remove delegate take
camfairchild Mar 17, 2023
369f492
use safe-math
camfairchild Mar 17, 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
22 changes: 13 additions & 9 deletions pallets/subtensor/src/delegate_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use super::*;
use substrate_fixed::types::{U64F64};
use frame_support::IterableStorageDoubleMap;
use frame_support::storage::IterableStorageMap;
use frame_support::pallet_prelude::{Decode, Encode};
Expand All @@ -16,7 +17,8 @@ pub struct DelegateInfo<T: Config> {
owner_ss58: T::AccountId,
registrations: Vec<Compact<u16>>, // Vec of netuid this delegate is registered on
validator_permits: Vec<Compact<u16>>, // Vec of netuid this delegate has validator permit on
return_per_1000: Compact<u64>, // Delegators current daily return per 1000 TAO staked
return_per_1000: Compact<u64>, // Delegators current daily return per 1000 TAO staked minus take fee
total_daily_return: Compact<u64>, // Delegators current daily return
}

impl<T: Config> Pallet<T> {
Expand All @@ -29,7 +31,7 @@ impl<T: Config> Pallet<T> {

let registrations = Self::get_registered_networks_for_hotkey( &delegate.clone() );
let mut validator_permits = Vec::<Compact<u16>>::new();
let mut emissions: u128 = 0;
let mut emissions_per_day: U64F64 = U64F64::from_num(0);

for netuid in registrations.iter() {
let _uid = Self::get_uid_for_net_and_hotkey( *netuid, &delegate.clone());
Expand All @@ -42,27 +44,29 @@ impl<T: Config> Pallet<T> {
validator_permits.push( (*netuid).into() );
}

let emission = Self::get_emission_for_uid( *netuid, uid) as u128;
emissions += emission;
let emission: U64F64 = Self::get_emission_for_uid( *netuid, uid).into();
let tempo: U64F64 = Self::get_tempo( *netuid ).into();
let epochs_per_day: U64F64 = U64F64::from_num(7200) / tempo;
emissions_per_day += emission * epochs_per_day;
}
}

let owner = Self::get_owning_coldkey_for_hotkey( &delegate.clone() );
let take: Compact<u16> = <Delegates<T>>::get( delegate.clone() ).into();

let total_stake = Self::get_total_stake_for_hotkey( &delegate.clone() );
let total_stake: U64F64 = Self::get_total_stake_for_hotkey( &delegate.clone() ).into();

let return_per_1000: U64F64 = ( emissions_per_day * U64F64::from_num(0.82)) / (total_stake / U64F64::from_num(1000));

let emissions_per_day = emissions * 72;
let return_per_1000 = emissions_per_day / (total_stake as u128 / 1000);

return DelegateInfo {
delegate_ss58: delegate.clone(),
take,
nominators,
owner_ss58: owner.clone(),
registrations: registrations.iter().map(|x| x.into()).collect(),
validator_permits,
return_per_1000: (return_per_1000 as u64).into(),
return_per_1000: U64F64::to_num::<u64>(return_per_1000).into(),
total_daily_return: U64F64::to_num::<u64>(emissions_per_day).into(),
};
}

Expand Down