Use share pool primitive in staking utils

opentensor · Jan 7, 2025 · d2e2b5c · d2e2b5c
1 parent e460cbe
commit d2e2b5c
Show file tree

Hide file tree

Showing 10 changed files with 243 additions and 116 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pallets/subtensor/Cargo.toml b/pallets/subtensor/Cargo.toml
@@ -40,6 +40,7 @@ pallet-transaction-payment = { workspace = true }
 pallet-utility = { workspace = true }
 ndarray = { workspace = true }
 hex = { workspace = true }
+share-pool = { default-features = false, path = "../../primitives/share-pool" }
 
 pallet-collective = { version = "4.0.0-dev", default-features = false, path = "../collective" }
 pallet-drand = { path = "../drand", default-features = false }

diff --git a/pallets/subtensor/src/lib.rs b/pallets/subtensor/src/lib.rs
@@ -81,6 +81,7 @@ pub mod pallet {
     use sp_std::collections::vec_deque::VecDeque;
     use sp_std::vec;
     use sp_std::vec::Vec;
+    use substrate_fixed::types::I64F64;
     use subtensor_macros::freeze_struct;
 
     #[cfg(not(feature = "std"))]
@@ -712,6 +713,12 @@ pub mod pallet {
         T::InitialDissolveNetworkScheduleDuration::get()
     }
 
+    #[pallet::type_value]
+    /// Default value for Share Pool variables
+    pub fn DefaultSharePoolZero<T: Config>() -> I64F64 {
+        I64F64::from_num(0)
+    }
+
     #[pallet::storage]
     pub type ColdkeySwapScheduleDuration<T: Config> =
         StorageValue<_, BlockNumberFor<T>, ValueQuery, DefaultColdkeySwapScheduleDuration<T>>;
@@ -934,9 +941,9 @@ pub mod pallet {
         T::AccountId,
         Identity,
         u16,
-        u64,
+        I64F64,
         ValueQuery,
-        DefaultZeroU64<T>,
+        DefaultSharePoolZero<T>,
     >;
     #[pallet::storage] // --- NMAP ( hot, cold, netuid ) --> alpha | Returns the alpha shares for a hotkey, coldkey, netuid triplet.
     pub type Alpha<T: Config> = StorageNMap<
@@ -946,7 +953,7 @@ pub mod pallet {
             NMapKey<Blake2_128Concat, T::AccountId>, // cold
             NMapKey<Identity, u16>,                  // subnet
         ),
-        u64, // Shares
+        I64F64, // Shares
         ValueQuery,
     >;
     #[pallet::storage] // --- DMAP ( netuid ) --> token_symbol | Returns the token symbol for a subnet.

diff --git a/pallets/subtensor/src/macros/genesis.rs b/pallets/subtensor/src/macros/genesis.rs
@@ -66,9 +66,10 @@ mod genesis {
                 Alpha::<T>::insert(
                     // Lock the initial funds making this key the owner.
                     (hotkey.clone(), hotkey.clone(), netuid),
-                    1_000_000_000,
+                    I64F64::from_num(1_000_000_000),
                 );
                 TotalHotkeyAlpha::<T>::insert(hotkey.clone(), netuid, 1_000_000_000);
+                TotalHotkeyShares::<T>::insert(hotkey.clone(), netuid, I64F64::from_num(1_000_000_000));
                 // TotalColdkeyAlpha::<T>::insert(hotkey.clone(), netuid, 1_000_000_000);
                 SubnetAlphaOut::<T>::insert(netuid, 1_000_000_000);
                 let mut staking_hotkeys = StakingHotkeys::<T>::get(hotkey.clone());

diff --git a/pallets/subtensor/src/migrations/migrate_rao.rs b/pallets/subtensor/src/migrations/migrate_rao.rs
@@ -4,6 +4,7 @@ use frame_support::IterableStorageMap;
 use frame_support::{traits::Get, weights::Weight};
 use log;
 use sp_runtime::format;
+use substrate_fixed::types::I64F64;
 
 pub fn migrate_rao<T: Config>() -> Weight {
     let migration_name = b"migrate_rao".to_vec();
@@ -41,10 +42,10 @@ pub fn migrate_rao<T: Config>() -> Weight {
         });
         // Set all the stake on root 0 subnet.
         Alpha::<T>::mutate((hotkey.clone(), coldkey.clone(), 0), |total| {
-            *total = total.saturating_add(stake)
+            *total = total.saturating_add(I64F64::from_num(stake))
         });
         TotalHotkeyShares::<T>::mutate(hotkey.clone(), 0, |total| {
-            *total = total.saturating_add(stake)
+            *total = total.saturating_add(I64F64::from_num(stake))
         });
         // Set the total stake on the hotkey
         TotalHotkeyAlpha::<T>::mutate(hotkey.clone(), 0, |total| {