Root Reborn

pallets/subtensor/rpc/src/lib.rs

@@ -14,8 +14,8 @@ use subtensor_runtime_common::{MechId, NetUid, TaoBalance};
 use sp_api::ProvideRuntimeApi;
 
 pub use subtensor_custom_rpc_runtime_api::{
-    DelegateInfoRuntimeApi, NeuronInfoRuntimeApi, StakeInfoRuntimeApi, SubnetInfoRuntimeApi,
-    SubnetRegistrationRuntimeApi,
+    BetaBasketRuntimeApi, DelegateInfoRuntimeApi, NeuronInfoRuntimeApi, StakeInfoRuntimeApi,
+    SubnetInfoRuntimeApi, SubnetRegistrationRuntimeApi,
 };
 
 #[rpc(client, server)]
@@ -118,6 +118,31 @@ pub trait SubtensorCustomApi<BlockHash> {
         netuid: NetUid,
         at: Option<BlockHash>,
     ) -> RpcResult<Vec<u8>>;
+
+    /// Total TAO a staker (coldkey) would realize by redeeming all its root beta baskets.
+    #[method(name = "betaBasket_getStakerOwed")]
+    fn get_root_basket_owed(
+        &self,
+        coldkey: AccountId32,
+        at: Option<BlockHash>,
+    ) -> RpcResult<TaoBalance>;
+    /// A validator's beta basket net asset value, in TAO.
+    #[method(name = "betaBasket_getValidatorNav")]
+    fn get_validator_basket_nav(
+        &self,
+        hotkey: AccountId32,
+        at: Option<BlockHash>,
+    ) -> RpcResult<TaoBalance>;
+    /// A validator's full basket breakdown: SCALE-encoded `Vec<(NetUid, AlphaBalance, TaoBalance)>`.
+    #[method(name = "betaBasket_getValidatorBasket")]
+    fn get_validator_basket(
+        &self,
+        hotkey: AccountId32,
+        at: Option<BlockHash>,
+    ) -> RpcResult<Vec<u8>>;
+    /// Network-wide total beta basket NAV across all validators, in TAO.
+    #[method(name = "betaBasket_getTotalNav")]
+    fn get_root_basket_total_nav(&self, at: Option<BlockHash>) -> RpcResult<TaoBalance>;
 }
 
 pub struct SubtensorCustom<C, P> {
@@ -167,6 +192,7 @@ where
     C::Api: SubnetInfoRuntimeApi<Block>,
     C::Api: StakeInfoRuntimeApi<Block>,
     C::Api: SubnetRegistrationRuntimeApi<Block>,
+    C::Api: BetaBasketRuntimeApi<Block>,
 {
     fn get_delegates(&self, at: Option<<Block as BlockT>::Hash>) -> RpcResult<Vec<u8>> {
         let api = self.client.runtime_api();
@@ -572,4 +598,68 @@ where
             Err(e) => Err(Error::RuntimeError(format!("Unable to get coldkey lock: {e:?}")).into()),
         }
     }
+
+    fn get_root_basket_owed(
+        &self,
+        coldkey: AccountId32,
+        at: Option<<Block as BlockT>::Hash>,
+    ) -> RpcResult<TaoBalance> {
+        let api = self.client.runtime_api();
+        let at = at.unwrap_or_else(|| self.client.info().best_hash);
+
+        match api.get_root_basket_owed(at, coldkey) {
+            Ok(result) => Ok(result),
+            Err(e) => {
+                Err(Error::RuntimeError(format!("Unable to get root basket owed: {e:?}")).into())
+            }
+        }
+    }
+
+    fn get_validator_basket_nav(
+        &self,
+        hotkey: AccountId32,
+        at: Option<<Block as BlockT>::Hash>,
+    ) -> RpcResult<TaoBalance> {
+        let api = self.client.runtime_api();
+        let at = at.unwrap_or_else(|| self.client.info().best_hash);
+
+        match api.get_validator_basket_nav(at, hotkey) {
+            Ok(result) => Ok(result),
+            Err(e) => Err(Error::RuntimeError(format!(
+                "Unable to get validator basket NAV: {e:?}"
+            ))
+            .into()),
+        }
+    }
+
+    fn get_validator_basket(
+        &self,
+        hotkey: AccountId32,
+        at: Option<<Block as BlockT>::Hash>,
+    ) -> RpcResult<Vec<u8>> {
+        let api = self.client.runtime_api();
+        let at = at.unwrap_or_else(|| self.client.info().best_hash);
+
+        match api.get_validator_basket(at, hotkey) {
+            Ok(result) => Ok(result.encode()),
+            Err(e) => {
+                Err(Error::RuntimeError(format!("Unable to get validator basket: {e:?}")).into())
+            }
+        }
+    }
+
+    fn get_root_basket_total_nav(
+        &self,
+        at: Option<<Block as BlockT>::Hash>,
+    ) -> RpcResult<TaoBalance> {
+        let api = self.client.runtime_api();
+        let at = at.unwrap_or_else(|| self.client.info().best_hash);
+
+        match api.get_root_basket_total_nav(at) {
+            Ok(result) => Ok(result),
+            Err(e) => {
+                Err(Error::RuntimeError(format!("Unable to get total basket NAV: {e:?}")).into())
+            }
+        }
+    }
 }

pallets/subtensor/runtime-api/src/lib.rs

@@ -81,4 +81,15 @@ sp_api::decl_runtime_apis! {
         fn get_proxy_types() -> Vec<ProxyTypeInfo>;
         fn get_proxy_filter(proxy_type: Option<u8>) -> Vec<ProxyFilterInfo>;
     }
+
+    pub trait BetaBasketRuntimeApi {
+        /// Total TAO a coldkey would realize by redeeming all its root beta baskets (marked).
+        fn get_root_basket_owed(coldkey: AccountId32) -> TaoBalance;
+        /// A validator's beta basket net asset value, in TAO (marked).
+        fn get_validator_basket_nav(hotkey: AccountId32) -> TaoBalance;
+        /// A validator's basket breakdown: (subnet, alpha held, TAO value) per subnet.
+        fn get_validator_basket(hotkey: AccountId32) -> Vec<(NetUid, AlphaBalance, TaoBalance)>;
+        /// Network-wide total beta basket NAV across all validators, in TAO (marked).
+        fn get_root_basket_total_nav() -> TaoBalance;
+    }
 }

pallets/subtensor/src/coinbase/block_step.rs

@@ -6,7 +6,6 @@ impl<T: Config + pallet_drand::Config> Pallet<T> {
     /// Executes the necessary operations for each block.
     pub fn block_step() -> Result<(), &'static str> {
         let block_number: u64 = Self::get_current_block_as_u64();
-        let last_block_hash: T::Hash = <frame_system::Pallet<T>>::parent_hash();
 
         // --- 1. Update registration burn prices.
         Self::update_registration_prices_for_networks();
@@ -25,8 +24,7 @@ impl<T: Config + pallet_drand::Config> Pallet<T> {
         Self::update_root_prop();
         // --- 7. Set pending children on the epoch; but only after the coinbase has been run.
         Self::try_set_pending_children(block_number);
-        // --- 8. Run auto-claim root divs.
-        Self::run_auto_claim_root_divs(last_block_hash);
+        // --- 8. Beta baskets are redeemed on-demand by stakers via `claim_root`; no auto-swap.
         // --- 9. Populate root coldkey maps.
         Self::populate_root_coldkey_staking_maps();
         Self::populate_root_coldkey_staking_maps_v2();

pallets/subtensor/src/coinbase/run_coinbase.rs

@@ -705,11 +705,11 @@ impl<T: Config> Pallet<T> {
                 tou64!(alpha_take).into(),
             );
 
-            Self::increase_root_claimable_for_hotkey_and_subnet(
-                &hotkey,
-                netuid,
-                tou64!(root_alpha).into(),
-            );
+            // Distribute the validator's root dividend into its beta basket across subnets
+            // per the validator's root weight vector (set on subnet 0). The bought basket
+            // alpha is staked to the validator under the global escrow coldkey, so it counts
+            // toward the validator's stake and compounds; stakers accrue a claimable rate.
+            Self::distribute_root_alpha_to_basket(&hotkey, netuid, tou64!(root_alpha).into());
 
             // Record root alpha dividends for this validator on this subnet.
             RootAlphaDividendsPerSubnet::<T>::mutate(netuid, &hotkey, |divs| {

pallets/subtensor/src/lib.rs

@@ -2488,6 +2488,29 @@ pub mod pallet {
         u128,
         ValueQuery,
     >;
+
+    /// --- DMAP ( validator_hotkey, netuid ) --> outstanding basket principal *shares*.
+    ///
+    /// Total un-claimed principal shares root stakers hold in this validator's beta basket on
+    /// `netuid`. The actual basket alpha is staked to the validator under the global beta escrow
+    /// coldkey (value `E`) and grows with dividends; the per-staker payout at claim time is
+    /// `owed_shares * (E / BasketPrincipal)`, which captures that compounding. Deposits mint
+    /// shares at the live NAV (`E/P`), not at par, so a deposit into an already-compounded basket
+    /// leaves `E/P` unchanged — existing holders are not diluted and late stakers cannot skim
+    /// past compounding. At a flat NAV (`E == P`, e.g. right after the seed migration) one share
+    /// equals one alpha, so this also migrates cleanly by value on hotkey swap.
+    #[pallet::storage]
+    pub type BasketPrincipal<T: Config> = StorageDoubleMap<
+        _,
+        Blake2_128Concat,
+        T::AccountId,
+        Identity,
+        NetUid,
+        AlphaBalance,
+        ValueQuery,
+        DefaultZeroAlpha<T>,
+    >;
+
     #[pallet::storage] // -- MAP ( cold ) --> root_claim_type enum
     pub type RootClaimType<T: Config> = StorageMap<
         _,

pallets/subtensor/src/macros/dispatches.rs

@@ -97,6 +97,26 @@ mod dispatches {
             }
         }
 
+        /// --- Sets a root validator's beta-basket distribution vector `w` on the root subnet
+        /// (netuid 0). `dests` are subnet netuids and `weights` are the proportions of the
+        /// validator's root dividends to deploy into each subnet's alpha basket.
+        ///
+        /// # Args:
+        /// * `origin`: the root validator hotkey.
+        /// * `dests` (Vec<u16>): destination subnet netuids.
+        /// * `weights` (Vec<u16>): per-subnet weights (normalized on use).
+        /// * `version_key` (u64): the network version key.
+        #[pallet::call_index(139)]
+        #[pallet::weight((<T as crate::pallet::Config>::WeightInfo::set_weights(), DispatchClass::Normal, Pays::No))]
+        pub fn set_root_weights(
+            origin: OriginFor<T>,
+            dests: Vec<u16>,
+            weights: Vec<u16>,
+            version_key: u64,
+        ) -> DispatchResult {
+            Self::do_set_root_weights(origin, dests, weights, version_key)
+        }
+
         /// --- Sets the caller weights for the incentive mechanism for mechanisms. The call
         /// can be made from the hotkey account so is potentially insecure, however, the damage
         /// of changing weights is minimal if caught early. This function includes all the

pallets/subtensor/src/macros/events.rs

@@ -42,6 +42,8 @@ mod events {
         ),
         /// a caller successfully sets their weights on a subnetwork.
         WeightsSet(NetUidStorageIndex, u16),
+        /// a root validator set its beta-basket distribution vector (uid on the root subnet).
+        RootWeightsSet(u16),
         /// a new neuron account has been registered to the chain.
         NeuronRegistered(NetUid, u16, T::AccountId),
         /// multiple uids have been concurrently registered.

pallets/subtensor/src/macros/hooks.rs

@@ -175,7 +175,9 @@ mod hooks {
                 // Capture the runtime-upgrade block for TAO-in refund cutover.
                 .saturating_add(migrations::migrate_tao_in_refund_deployment_block::migrate_tao_in_refund_deployment_block::<T>())
                 // Fix lock state left behind by subnet-scoped hotkey swaps.
-                .saturating_add(migrations::migrate_fix_subnet_hotkey_lock_swaps::migrate_fix_subnet_hotkey_lock_swaps::<T>());
+                .saturating_add(migrations::migrate_fix_subnet_hotkey_lock_swaps::migrate_fix_subnet_hotkey_lock_swaps::<T>())
+                // Seed the beta-basket escrow model from legacy RootClaimable state.
+                .saturating_add(migrations::migrate_seed_beta_basket::migrate_seed_beta_basket::<T>());
             weight
         }
 

pallets/subtensor/src/migrations/migrate_seed_beta_basket.rs

@@ -0,0 +1,114 @@
+use super::*;
+use frame_support::pallet_prelude::Weight;
+use scale_info::prelude::string::String;
+use substrate_fixed::types::I96F32;
+use subtensor_runtime_common::{AlphaBalance, NetUid};
+
+/// Seeds the beta-basket escrow model from pre-existing legacy `RootClaimable` state.
+///
+/// Before this feature, a validator's root dividends accrued as a per-subnet *rate*
+/// (`RootClaimable[hotkey][netuid]`, alpha-per-root-stake) backed by unattributed
+/// outstanding alpha in `SubnetAlphaOut`. The beta basket instead backs each slot with a
+/// real escrow stake position `(hotkey, escrow, netuid)` and an outstanding-principal
+/// counter `BasketPrincipal`, paying out `owed * (escrow_value / principal)`.
+///
+/// If legacy slots were left unseeded, two problems arise:
+/// 1. Claims compute `payout = owed * E/P` with `P = 0` → payout `0` → legacy dividends strand.
+/// 2. If a legacy slot later receives new accrual, the shared rate mixes legacy + new while
+///    `E/P` only tracks the new portion, breaking the `SubnetAlphaOut` ↔ stake invariant.
+///
+/// This migration converts every legacy slot to the escrow model with `E = P = remaining`,
+/// where `remaining = rate * total_root_stake - Σ already-claimed`. It stakes that remaining
+/// (previously unattributed) outstanding alpha to the validator under the escrow coldkey and
+/// records it as basket principal, leaving the rate and per-coldkey `RootClaimed` watermarks
+/// intact so existing per-staker owed amounts pay out unchanged (`E/P = 1`), then compound.
+///
+/// NOTE: this scans `RootClaimed` per `(netuid, hotkey)` to total already-claimed amounts.
+/// On a large state this is heavy; if it cannot fit a single block it should be converted to a
+/// multi-block migration before mainnet deployment.
+pub fn migrate_seed_beta_basket<T: Config>() -> Weight {
+    let migration_name = b"migrate_seed_beta_basket".to_vec();
+    let mut weight = T::DbWeight::get().reads(1);
+
+    if HasMigrationRun::<T>::get(&migration_name) {
+        log::info!(
+            "Migration '{:?}' has already run. Skipping.",
+            String::from_utf8_lossy(&migration_name)
+        );
+        return weight;
+    }
+
+    log::info!(
+        "Running migration '{}'",
+        String::from_utf8_lossy(&migration_name)
+    );
+
+    let escrow = Pallet::<T>::get_beta_escrow_account_id();
+    weight.saturating_accrue(T::DbWeight::get().reads(1));
+
+    let hotkeys: Vec<T::AccountId> = RootClaimable::<T>::iter_keys().collect();
+    weight.saturating_accrue(T::DbWeight::get().reads(hotkeys.len() as u64));
+
+    let mut seeded_slots: u64 = 0;
+
+    for hotkey in hotkeys.iter() {
+        let total_root: I96F32 = I96F32::saturating_from_num(
+            Pallet::<T>::get_stake_for_hotkey_on_subnet(hotkey, NetUid::ROOT),
+        );
+        weight.saturating_accrue(T::DbWeight::get().reads(1));
+
+        if total_root <= I96F32::saturating_from_num(0) {
+            continue;
+        }
+
+        let claimable = RootClaimable::<T>::get(hotkey);
+        weight.saturating_accrue(T::DbWeight::get().reads(1));
+
+        for (netuid, rate) in claimable.iter() {
+            if netuid.is_root() {
+                continue;
+            }
+
+            // Gross credited principal = rate * total_root_stake.
+            let gross: I96F32 = rate.saturating_mul(total_root);
+
+            // Total already claimed by all coldkeys on this (netuid, hotkey).
+            let mut claimed_sum: I96F32 = I96F32::saturating_from_num(0);
+            for (_coldkey, claimed) in RootClaimed::<T>::iter_prefix((*netuid, hotkey)) {
+                claimed_sum = claimed_sum.saturating_add(I96F32::saturating_from_num(claimed));
+                weight.saturating_accrue(T::DbWeight::get().reads(1));
+            }
+
+            // Remaining unclaimed (still-outstanding) principal.
+            let remaining_f: I96F32 = gross.saturating_sub(claimed_sum);
+            let remaining: u64 = if remaining_f.is_negative() {
+                0
+            } else {
+                remaining_f.saturating_to_num::<u64>()
+            };
+            if remaining == 0 {
+                continue;
+            }
+            let remaining_alpha = AlphaBalance::from(remaining);
+
+            // Attribute the previously-unattributed outstanding alpha to the validator under the
+            // escrow coldkey (this becomes the basket), and record it as basket principal.
+            Pallet::<T>::increase_stake_for_hotkey_and_coldkey_on_subnet(
+                hotkey,
+                &escrow,
+                *netuid,
+                remaining_alpha,
+            );
+            BasketPrincipal::<T>::insert(hotkey, *netuid, remaining_alpha);
+            weight.saturating_accrue(T::DbWeight::get().writes(2));
+            seeded_slots = seeded_slots.saturating_add(1);
+        }
+    }
+
+    HasMigrationRun::<T>::insert(&migration_name, true);
+    weight.saturating_accrue(T::DbWeight::get().writes(1));
+
+    log::info!("Migration 'migrate_seed_beta_basket' completed. Seeded {seeded_slots} slots.");
+
+    weight
+}

pallets/subtensor/src/migrations/mod.rs

@@ -54,6 +54,7 @@ pub mod migrate_reset_bonds_moving_average;
 pub mod migrate_reset_max_burn;
 pub mod migrate_reset_tnet_conviction_locks;
 pub mod migrate_reset_unactive_sn;
+pub mod migrate_seed_beta_basket;
 pub mod migrate_set_first_emission_block_number;
 pub mod migrate_set_min_burn;
 pub mod migrate_set_min_difficulty;