fix merge commit

Author: camfairchild

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

@@ -45,7 +45,7 @@ sp_api::decl_runtime_apis! {
     pub trait StakeInfoRuntimeApi {
         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_vec: Vec<u8>, coldkey_account_vec: Vec<u8>, netuid: u16 ) -> Vec<u8>;
+        fn get_stake_info_for_hotkey_coldkey_netuid( hotkey_account: AccountId32, coldkey_account: AccountId32, netuid: u16 ) -> Option<StakeInfo<AccountId32>>;
     }
 
     pub trait SubnetRegistrationRuntimeApi {

pallets/subtensor/src/rpc_info/dynamic_info.rs

@@ -4,7 +4,7 @@ use codec::Compact;
 use frame_support::pallet_prelude::{Decode, Encode};
 use subtensor_macros::freeze_struct;
 
-#[freeze_struct("a5cdc80d655398e9")]
+#[freeze_struct("70be0b07db585696")]
 #[derive(Decode, Encode, PartialEq, Eq, Clone, Debug, TypeInfo)]
 pub struct DynamicInfo<AccountId: TypeInfo + Encode + Decode> {
     netuid: Compact<u16>,

pallets/subtensor/src/rpc_info/metagraph.rs

@@ -6,7 +6,7 @@ use frame_support::pallet_prelude::{Decode, Encode};
 use substrate_fixed::types::I64F64;
 use subtensor_macros::freeze_struct;
 
-#[freeze_struct("7c5fe907490c5d5e")]
+#[freeze_struct("a92e51d2046f4be8")]
 #[derive(Decode, Encode, PartialEq, Eq, Clone, Debug, TypeInfo)]
 pub struct Metagraph<AccountId: TypeInfo + Encode + Decode> {
     // Subnet index

pallets/subtensor/src/rpc_info/stake_info.rs

@@ -84,34 +84,21 @@ impl<T: Config> Pallet<T> {
     }
 
     pub fn get_stake_info_for_hotkey_coldkey_netuid(
-        hotkey_account_vec: Vec<u8>,
-        coldkey_account_vec: Vec<u8>,
+        hotkey_account: T::AccountId,
+        coldkey_account: T::AccountId,
         netuid: u16,
-    ) -> Option<StakeInfo<T>> {
-        if coldkey_account_vec.len() != 32 {
-            return None; // Invalid coldkey
-        }
-
-        let Ok(coldkey) = T::AccountId::decode(&mut coldkey_account_vec.as_bytes_ref()) else {
-            return None;
-        };
-
-        if hotkey_account_vec.len() != 32 {
-            return None; // Invalid hotkey
-        }
-
-        let Ok(hotkey) = T::AccountId::decode(&mut hotkey_account_vec.as_bytes_ref()) else {
-            return None;
-        };
-
-        let alpha: u64 =
-            Self::get_stake_for_hotkey_and_coldkey_on_subnet(&hotkey, &coldkey, netuid);
-        let emission: u64 = AlphaDividendsPerSubnet::<T>::get(netuid, &hotkey);
-        let is_registered: bool = Self::is_hotkey_registered_on_network(netuid, &hotkey);
+    ) -> Option<StakeInfo<T::AccountId>> {
+        let alpha: u64 = Self::get_stake_for_hotkey_and_coldkey_on_subnet(
+            &hotkey_account,
+            &coldkey_account,
+            netuid,
+        );
+        let emission: u64 = AlphaDividendsPerSubnet::<T>::get(netuid, &hotkey_account);
+        let is_registered: bool = Self::is_hotkey_registered_on_network(netuid, &hotkey_account);
 
         Some(StakeInfo {
-            hotkey: hotkey.clone(),
-            coldkey: coldkey.clone(),
+            hotkey: hotkey_account,
+            coldkey: coldkey_account,
             netuid: (netuid).into(),
             stake: alpha.into(),
             locked: 0.into(),

runtime/src/lib.rs

@@ -2103,9 +2103,8 @@ impl_runtime_apis! {
             SubtensorModule::get_stake_info_for_coldkeys( coldkey_accounts )
         }
 
-        fn get_stake_info_for_hotkey_coldkey_netuid( hotkey_account_vec: Vec<u8>, coldkey_account_vec: Vec<u8>, netuid: u16 ) -> Vec<u8> {
-            let result = SubtensorModule::get_stake_info_for_hotkey_coldkey_netuid( hotkey_account_vec, coldkey_account_vec, netuid );
-            result.encode()
+        fn get_stake_info_for_hotkey_coldkey_netuid( hotkey_account: AccountId32, coldkey_account: AccountId32, netuid: u16 ) -> Option<StakeInfo<AccountId32>> {
+            SubtensorModule::get_stake_info_for_hotkey_coldkey_netuid( hotkey_account, coldkey_account, netuid )
         }
     }