Skip to content

Commit 94b0954

Browse files
constconst
const
authored and
const
committed
adds tests fixes remove hotkey
1 parent a0fa527 commit 94b0954

File tree

5 files changed

+72
-78
lines changed

5 files changed

+72
-78
lines changed

‎pallets/subtensor/src/events.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,6 @@ mod events {
145145
current_coldkey: T::AccountId,
146146
/// The account ID of the new coldkey
147147
new_coldkey: T::AccountId,
148-
/// The account ID of the hotkey
149-
hotkey: T::AccountId,
150-
/// The current stake of the hotkey
151-
current_stake: u64,
152148
/// The total balance of the hotkey
153149
total_balance: <<T as Config>::Currency as fungible::Inspect<
154150
<T as frame_system::Config>::AccountId,

‎pallets/subtensor/src/lib.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2030,11 +2030,10 @@ pub mod pallet {
20302030
.saturating_add(T::DbWeight::get().writes(527)), DispatchClass::Operational, Pays::No))]
20312031
pub fn unstake_all_and_transfer_to_new_coldkey(
20322032
origin: OriginFor<T>,
2033-
hotkey: T::AccountId,
20342033
new_coldkey: T::AccountId,
20352034
) -> DispatchResult {
20362035
let current_coldkey = ensure_signed(origin)?;
2037-
Self::do_unstake_all_and_transfer_to_new_coldkey(current_coldkey, hotkey, new_coldkey)
2036+
Self::do_unstake_all_and_transfer_to_new_coldkey(current_coldkey, new_coldkey)
20382037
}
20392038

20402039
// ---- SUDO ONLY FUNCTIONS ------------------------------------------------------------

‎pallets/subtensor/src/staking.rs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,6 @@ impl<T: Config> Pallet<T> {
842842
/// # Arguments
843843
///
844844
/// * `current_coldkey` - The AccountId of the current coldkey.
845-
/// * `hotkey` - The AccountId of the hotkey whose balance is being unstaked and transferred.
846845
/// * `new_coldkey` - The AccountId of the new coldkey to receive the unstaked tokens.
847846
///
848847
/// # Returns
@@ -865,36 +864,39 @@ impl<T: Config> Pallet<T> {
865864
///
866865
pub fn do_unstake_all_and_transfer_to_new_coldkey(
867866
current_coldkey: T::AccountId,
868-
hotkey: T::AccountId,
869867
new_coldkey: T::AccountId,
870868
) -> DispatchResult {
871-
// Ensure the hotkey exists and is owned by the current coldkey
872-
ensure!(
873-
Self::hotkey_account_exists(&hotkey),
874-
Error::<T>::HotKeyAccountNotExists
875-
);
876-
ensure!(
877-
Self::coldkey_owns_hotkey(&current_coldkey, &hotkey),
878-
Error::<T>::NonAssociatedColdKey
879-
);
880-
869+
881870
// Ensure the new coldkey is different from the current one
882871
ensure!(current_coldkey != new_coldkey, Error::<T>::SameColdkey);
883872

884-
// Get the current stake
885-
let current_stake: u64 = Self::get_stake_for_coldkey_and_hotkey(&current_coldkey, &hotkey);
873+
// Get all the hotkeys associated with this coldkey
874+
let hotkeys: Vec<T::AccountId> = OwnedHotkeys::<T>::get(&current_coldkey);
886875

887-
// Unstake all balance if there's any stake
888-
if current_stake > 0 {
889-
Self::do_remove_stake(
890-
RawOrigin::Signed(current_coldkey.clone()).into(),
891-
hotkey.clone(),
892-
current_stake,
893-
)?;
894-
}
876+
// iterate over all hotkeys.
877+
for next_hotkey in hotkeys {
878+
ensure!(
879+
Self::hotkey_account_exists(&next_hotkey),
880+
Error::<T>::HotKeyAccountNotExists
881+
);
882+
ensure!(
883+
Self::coldkey_owns_hotkey(&current_coldkey, &next_hotkey),
884+
Error::<T>::NonAssociatedColdKey
885+
);
895886

896-
// Get the total balance of the current coldkey account
897-
// let total_balance: <<T as Config>::Currency as fungible::Inspect<<T as system::Config>::AccountId>>::Balance = T::Currency::total_balance(&current_coldkey);
887+
// Get the current stake
888+
let current_stake: u64 = Self::get_stake_for_coldkey_and_hotkey(&current_coldkey, &next_hotkey);
889+
890+
// Unstake all balance if there's any stake
891+
if current_stake > 0 {
892+
Self::do_remove_stake(
893+
RawOrigin::Signed(current_coldkey.clone()).into(),
894+
next_hotkey.clone(),
895+
current_stake,
896+
)?;
897+
}
898+
899+
}
898900

899901
let total_balance = Self::get_coldkey_balance(&current_coldkey);
900902
log::info!("Total Bank Balance: {:?}", total_balance);
@@ -914,8 +916,6 @@ impl<T: Config> Pallet<T> {
914916
Self::deposit_event(Event::AllBalanceUnstakedAndTransferredToNewColdkey {
915917
current_coldkey: current_coldkey.clone(),
916918
new_coldkey: new_coldkey.clone(),
917-
hotkey: hotkey.clone(),
918-
current_stake,
919919
total_balance,
920920
});
921921

‎pallets/subtensor/tests/staking.rs‎

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3160,7 +3160,6 @@ fn test_do_unstake_all_and_transfer_to_new_coldkey_success() {
31603160

31613161
assert_ok!(SubtensorModule::do_unstake_all_and_transfer_to_new_coldkey(
31623162
current_coldkey,
3163-
hotkey,
31643163
new_coldkey
31653164
));
31663165

@@ -3175,49 +3174,13 @@ fn test_do_unstake_all_and_transfer_to_new_coldkey_success() {
31753174
Event::AllBalanceUnstakedAndTransferredToNewColdkey {
31763175
current_coldkey,
31773176
new_coldkey,
3178-
hotkey,
3179-
current_stake: 500,
31803177
total_balance: 1000,
31813178
}
31823179
.into(),
31833180
);
31843181
});
31853182
}
31863183

3187-
#[test]
3188-
fn test_do_unstake_all_and_transfer_to_new_coldkey_hotkey_not_exists() {
3189-
new_test_ext(1).execute_with(|| {
3190-
let current_coldkey = U256::from(1);
3191-
let hotkey = U256::from(2);
3192-
let new_coldkey = U256::from(3);
3193-
3194-
assert_err!(
3195-
SubtensorModule::do_unstake_all_and_transfer_to_new_coldkey(
3196-
current_coldkey,
3197-
hotkey,
3198-
new_coldkey
3199-
),
3200-
Error::<Test>::HotKeyAccountNotExists
3201-
);
3202-
});
3203-
}
3204-
3205-
#[test]
3206-
fn test_do_unstake_all_and_transfer_to_new_coldkey_non_associated_coldkey() {
3207-
new_test_ext(1).execute_with(|| {
3208-
let (_, hotkey, new_coldkey) = setup_test_environment();
3209-
let wrong_coldkey = U256::from(4);
3210-
3211-
assert_noop!(
3212-
SubtensorModule::do_unstake_all_and_transfer_to_new_coldkey(
3213-
wrong_coldkey,
3214-
hotkey,
3215-
new_coldkey
3216-
),
3217-
Error::<Test>::NonAssociatedColdKey
3218-
);
3219-
});
3220-
}
32213184

32223185
#[test]
32233186
fn test_do_unstake_all_and_transfer_to_new_coldkey_same_coldkey() {
@@ -3227,7 +3190,6 @@ fn test_do_unstake_all_and_transfer_to_new_coldkey_same_coldkey() {
32273190
assert_noop!(
32283191
SubtensorModule::do_unstake_all_and_transfer_to_new_coldkey(
32293192
current_coldkey,
3230-
hotkey,
32313193
current_coldkey
32323194
),
32333195
Error::<Test>::SameColdkey
@@ -3270,7 +3232,6 @@ fn test_do_unstake_all_and_transfer_to_new_coldkey_no_balance() {
32703232
// Try to unstake and transfer
32713233
let result = SubtensorModule::do_unstake_all_and_transfer_to_new_coldkey(
32723234
current_coldkey,
3273-
hotkey,
32743235
new_coldkey,
32753236
);
32763237

@@ -3343,7 +3304,6 @@ fn test_do_unstake_all_and_transfer_to_new_coldkey_with_no_stake() {
33433304
// Perform unstake and transfer
33443305
assert_ok!(SubtensorModule::do_unstake_all_and_transfer_to_new_coldkey(
33453306
current_coldkey,
3346-
hotkey,
33473307
new_coldkey
33483308
));
33493309

@@ -3370,8 +3330,6 @@ fn test_do_unstake_all_and_transfer_to_new_coldkey_with_no_stake() {
33703330
Event::AllBalanceUnstakedAndTransferredToNewColdkey {
33713331
current_coldkey,
33723332
new_coldkey,
3373-
hotkey,
3374-
current_stake: 0,
33753333
total_balance: initial_balance,
33763334
}
33773335
.into(),
@@ -3394,7 +3352,6 @@ fn test_do_unstake_all_and_transfer_to_new_coldkey_with_multiple_stakes() {
33943352

33953353
assert_ok!(SubtensorModule::do_unstake_all_and_transfer_to_new_coldkey(
33963354
current_coldkey,
3397-
hotkey,
33983355
new_coldkey
33993356
));
34003357

@@ -3409,11 +3366,53 @@ fn test_do_unstake_all_and_transfer_to_new_coldkey_with_multiple_stakes() {
34093366
Event::AllBalanceUnstakedAndTransferredToNewColdkey {
34103367
current_coldkey,
34113368
new_coldkey,
3412-
hotkey,
3413-
current_stake: 800,
34143369
total_balance: 1000,
34153370
}
34163371
.into(),
34173372
);
34183373
});
34193374
}
3375+
3376+
3377+
#[test]
3378+
fn test_do_unstake_all_and_transfer_to_new_coldkey_with_multiple_stakes_multiple() {
3379+
new_test_ext(1).execute_with(|| {
3380+
3381+
// Register the neuron to a new network
3382+
let netuid = 1;
3383+
let hotkey0 = U256::from(1);
3384+
let hotkey2 = U256::from(2);
3385+
let current_coldkey = U256::from(3);
3386+
let new_coldkey = U256::from(4);
3387+
add_network(netuid, 0, 0);
3388+
register_ok_neuron(1, hotkey0, current_coldkey, 0);
3389+
register_ok_neuron(1, hotkey2, current_coldkey, 0);
3390+
SubtensorModule::set_target_stakes_per_interval(10);
3391+
SubtensorModule::add_balance_to_coldkey_account(&current_coldkey, 1000);
3392+
assert_ok!(SubtensorModule::add_stake(
3393+
RuntimeOrigin::signed(current_coldkey),
3394+
hotkey0,
3395+
500
3396+
));
3397+
assert_ok!(SubtensorModule::add_stake(
3398+
RuntimeOrigin::signed(current_coldkey),
3399+
hotkey2,
3400+
300
3401+
));
3402+
assert_ok!(SubtensorModule::do_unstake_all_and_transfer_to_new_coldkey(
3403+
current_coldkey,
3404+
new_coldkey
3405+
));
3406+
assert_eq!(SubtensorModule::get_total_stake_for_hotkey(&hotkey0), 0);
3407+
assert_eq!(SubtensorModule::get_total_stake_for_hotkey(&hotkey2), 0);
3408+
assert_eq!(SubtensorModule::get_coldkey_balance(&new_coldkey), 1000);
3409+
System::assert_last_event(
3410+
Event::AllBalanceUnstakedAndTransferredToNewColdkey {
3411+
current_coldkey,
3412+
new_coldkey,
3413+
total_balance: 1000,
3414+
}
3415+
.into(),
3416+
);
3417+
});
3418+
}

‎runtime/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
139139
// `spec_version`, and `authoring_version` are the same between Wasm and native.
140140
// This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
141141
// the compatible custom types.
142-
spec_version: 156,
142+
spec_version: 158,
143143
impl_version: 1,
144144
apis: RUNTIME_API_VERSIONS,
145145
transaction_version: 1,

0 commit comments

Comments
 (0)