use option for hotkeys

Author: camfairchild

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

@@ -46,7 +46,7 @@ sp_api::decl_runtime_apis! {
         fn get_stake_info_for_coldkey( coldkey_account: AccountId32 ) -> Vec<StakeInfo<AccountId32>>;
         fn get_stake_info_for_coldkeys( coldkey_accounts: Vec<AccountId32> ) -> Vec<(AccountId32, Vec<StakeInfo<AccountId32>>)>;
         fn get_stake_info_for_hotkey_coldkey_netuid( hotkey_account: AccountId32, coldkey_account: AccountId32, netuid: u16 ) -> Option<StakeInfo<AccountId32>>;
-        fn get_stake_fee( origin_hotkey_account: AccountId32, origin_coldkey_account: AccountId32, destination_hotkey_account: AccountId32, destination_coldkey_account: AccountId32, origin_netuid: Option<u16>, destination_netuid: Option<u16>, amount: i64 ) -> u64;
+        fn get_stake_fee( origin_hotkey_account: Option<AccountId32>, origin_coldkey_account: AccountId32, destination_hotkey_account: Option<AccountId32>, destination_coldkey_account: AccountId32, origin_netuid: Option<u16>, destination_netuid: Option<u16>, amount: i64 ) -> u64;
     }
 
     pub trait SubnetRegistrationRuntimeApi {

pallets/subtensor/src/rpc_info/stake_info.rs

@@ -116,9 +116,9 @@ impl<T: Config> Pallet<T> {
     }
 
     pub fn get_stake_fee(
-        origin_hotkey_account: T::AccountId,
+        origin_hotkey_account: Option<T::AccountId>,
         _origin_coldkey_account: T::AccountId,
-        _destination_hotkey_account: T::AccountId,
+        _destination_hotkey_account: Option<T::AccountId>,
         _destination_coldkey_account: T::AccountId,
         origin_netuid: Option<u16>,
         _destination_netuid: Option<u16>,
@@ -128,12 +128,17 @@ impl<T: Config> Pallet<T> {
             // Adding stake
             DefaultStakingFee::<T>::get()
         } else {
-            // Calculate fee for unstake (negative amount)
-            Self::calculate_staking_fee(
-                origin_netuid.unwrap_or(Self::get_root_netuid()),
-                &origin_hotkey_account,
-                I96F32::saturating_from_num(amount.neg()),
-            )
+            match (origin_netuid, origin_hotkey_account) {
+                (Some(origin_netuid), Some(origin_hotkey_account)) => {
+                    // Calculate fee for unstake (negative amount)
+                    Self::calculate_staking_fee(
+                        origin_netuid,
+                        &origin_hotkey_account,
+                        I96F32::saturating_from_num(amount.neg()),
+                    )
+                }
+                _ => DefaultStakingFee::<T>::get(),
+            }
         }
     }
 }

runtime/src/lib.rs

@@ -2067,7 +2067,7 @@ impl_runtime_apis! {
             SubtensorModule::get_stake_info_for_hotkey_coldkey_netuid( hotkey_account, coldkey_account, netuid )
         }
 
-        fn get_stake_fee( origin_hotkey_account: AccountId32, origin_coldkey_account: AccountId32, destination_hotkey_account: AccountId32, destination_coldkey_account: AccountId32, origin_netuid: Option<u16>, destination_netuid: Option<u16>, amount: i64 ) -> u64 {
+        fn get_stake_fee( origin_hotkey_account: Option<AccountId32>, origin_coldkey_account: AccountId32, destination_hotkey_account: Option<AccountId32>, destination_coldkey_account: AccountId32, origin_netuid: Option<u16>, destination_netuid: Option<u16>, amount: i64 ) -> u64 {
             SubtensorModule::get_stake_fee( origin_hotkey_account, origin_coldkey_account, destination_hotkey_account, destination_coldkey_account, origin_netuid, destination_netuid, amount )
         }
     }