allow for reannouncement in tx ext

Author: l0r1s

pallets/subtensor/src/macros/dispatches.rs

@@ -2381,6 +2381,7 @@ mod dispatches {
                 let new_when = when.saturating_add(reannouncement_delay);
                 ensure!(now >= new_when, Error::<T>::ColdkeySwapReannouncedTooEarly);
             } else {
+                // Only charge the swap cost on the first announcement
                 let swap_cost = Self::get_key_swap_cost();
                 Self::charge_swap_cost(&who, swap_cost)?;
             }

pallets/subtensor/src/tests/swap_coldkey.rs

@@ -1272,12 +1272,15 @@ fn test_remove_coldkey_swap_announcement_with_bad_origin_fails() {
 }
 
 #[test]
-fn test_subtensor_extension_rejects_any_call_that_is_not_swap_coldkey_announced() {
+fn test_subtensor_extension_rejects_any_call_that_is_not_announce_or_swap() {
     new_test_ext(0).execute_with(|| {
         let netuid = NetUid::from(1);
         let who = U256::from(0);
         let new_coldkey = U256::from(1);
+        let another_coldkey = U256::from(3);
         let new_coldkey_hash = <Test as frame_system::Config>::Hashing::hash_of(&new_coldkey);
+        let another_coldkey_hash =
+            <Test as frame_system::Config>::Hashing::hash_of(&another_coldkey);
         let hotkey = U256::from(2);
         let stake = DefaultMinStake::<Test>::get().to_u64();
         assert_ne!(hotkey, who);
@@ -1380,6 +1383,14 @@ fn test_subtensor_extension_rejects_any_call_that_is_not_swap_coldkey_announced(
             );
         }
 
+        // Reannounce coldkey swap should succeed
+        let call = RuntimeCall::SubtensorModule(SubtensorCall::announce_coldkey_swap {
+            new_coldkey_hash: another_coldkey_hash,
+        });
+        let info = call.get_dispatch_info();
+        let ext = SubtensorTransactionExtension::<Test>::new();
+        assert_ok!(ext.dispatch_transaction(RuntimeOrigin::signed(who).into(), call, &info, 0, 0));
+
         // Swap coldkey announced should succeed
         let call =
             RuntimeCall::SubtensorModule(SubtensorCall::swap_coldkey_announced { new_coldkey });

pallets/subtensor/src/transaction_extension.rs

@@ -119,7 +119,8 @@ where
         if ColdkeySwapAnnouncements::<T>::contains_key(who)
             && !matches!(
                 call.is_sub_type(),
-                Some(Call::swap_coldkey_announced { .. })
+                Some(Call::announce_coldkey_swap { .. })
+                    | Some(Call::swap_coldkey_announced { .. })
             )
         {
             return Err(CustomTransactionError::ColdkeySwapAnnounced.into());