Merge pull request #700 from opentensor/custom-errors-signed-extension

custom errors signed extension

Author: unconst

pallets/subtensor/src/lib.rs

@@ -1285,7 +1285,7 @@ where
                         ..Default::default()
                     })
                 } else {
-                    Err(InvalidTransaction::Call.into())
+                    Err(InvalidTransaction::Custom(1).into())
                 }
             }
             Some(Call::reveal_weights { netuid, .. }) => {
@@ -1297,7 +1297,7 @@ where
                         ..Default::default()
                     })
                 } else {
-                    Err(InvalidTransaction::Call.into())
+                    Err(InvalidTransaction::Custom(2).into())
                 }
             }
             Some(Call::set_weights { netuid, .. }) => {
@@ -1309,7 +1309,7 @@ where
                         ..Default::default()
                     })
                 } else {
-                    Err(InvalidTransaction::Call.into())
+                    Err(InvalidTransaction::Custom(3).into())
                 }
             }
             Some(Call::set_root_weights { netuid, hotkey, .. }) => {
@@ -1321,7 +1321,7 @@ where
                         ..Default::default()
                     })
                 } else {
-                    Err(InvalidTransaction::Call.into())
+                    Err(InvalidTransaction::Custom(4).into())
                 }
             }
             Some(Call::add_stake { .. }) => Ok(ValidTransaction {
@@ -1340,7 +1340,7 @@ where
                 if registrations_this_interval >= (max_registrations_per_interval.saturating_mul(3))
                 {
                     // If the registration limit for the interval is exceeded, reject the transaction
-                    return InvalidTransaction::ExhaustsResources.into();
+                    return Err(InvalidTransaction::Custom(5).into());
                 }
                 Ok(ValidTransaction {
                     priority: Self::get_priority_vanilla(),

pallets/subtensor/tests/registration.rs

@@ -276,7 +276,7 @@ fn test_registration_rate_limit_exceeded() {
         let result = extension.validate(&who, &call.into(), &info, 10);
 
         // Expectation: The transaction should be rejected
-        assert_err!(result, InvalidTransaction::ExhaustsResources);
+        assert_err!(result, InvalidTransaction::Custom(5));
 
         let current_registrants = SubtensorModule::get_registrations_this_interval(netuid);
         assert!(current_registrants <= max_registrants);
@@ -360,10 +360,7 @@ fn test_burned_registration_rate_limit_exceeded() {
             extension.validate(&who, &call_burned_register.into(), &info, 10);
 
         // Expectation: The transaction should be rejected
-        assert_err!(
-            burned_register_result,
-            InvalidTransaction::ExhaustsResources
-        );
+        assert_err!(burned_register_result, InvalidTransaction::Custom(5));
 
         let current_registrants = SubtensorModule::get_registrations_this_interval(netuid);
         assert!(current_registrants <= max_registrants);

pallets/subtensor/tests/weights.rs

@@ -107,7 +107,7 @@ fn test_set_rootweights_validate() {
         assert_err!(
             // Should get an invalid transaction error
             result_no_stake,
-            TransactionValidityError::Invalid(InvalidTransaction::Call,)
+            TransactionValidityError::Invalid(InvalidTransaction::Custom(4))
         );
 
         // Increase the stake to be equal to the minimum
@@ -207,7 +207,7 @@ fn test_commit_weights_validate() {
         assert_err!(
             // Should get an invalid transaction error
             result_no_stake,
-            TransactionValidityError::Invalid(InvalidTransaction::Call,)
+            TransactionValidityError::Invalid(InvalidTransaction::Custom(1))
         );
 
         // Increase the stake to be equal to the minimum
@@ -259,6 +259,66 @@ fn test_reveal_weights_dispatch_info_ok() {
     });
 }
 
+#[test]
+fn test_set_weights_validate() {
+    // Testing the signed extension validate function
+    // correctly filters the `set_weights` transaction.
+
+    new_test_ext(0).execute_with(|| {
+        let netuid: u16 = 1;
+        let coldkey = U256::from(0);
+        let hotkey: U256 = U256::from(1);
+        assert_ne!(hotkey, coldkey);
+
+        let who = hotkey; // The hotkey signs this transaction
+
+        let call = RuntimeCall::SubtensorModule(SubtensorCall::set_weights {
+            netuid,
+            dests: vec![1, 1],
+            weights: vec![1, 1],
+            version_key: 0,
+        });
+
+        // Create netuid
+        add_network(netuid, 0, 0);
+        // Register the hotkey
+        SubtensorModule::append_neuron(netuid, &hotkey, 0);
+        Owner::<Test>::insert(hotkey, coldkey);
+
+        let min_stake = 500_000_000_000;
+        // Set the minimum stake
+        SubtensorModule::set_weights_min_stake(min_stake);
+
+        // Verify stake is less than minimum
+        assert!(SubtensorModule::get_total_stake_for_hotkey(&hotkey) < min_stake);
+        let info: DispatchInfo =
+            DispatchInfoOf::<<Test as frame_system::Config>::RuntimeCall>::default();
+
+        let extension = pallet_subtensor::SubtensorSignedExtension::<Test>::new();
+        // Submit to the signed extension validate function
+        let result_no_stake = extension.validate(&who, &call.clone(), &info, 10);
+        // Should fail due to insufficient stake
+        assert_err!(
+            result_no_stake,
+            TransactionValidityError::Invalid(InvalidTransaction::Custom(3))
+        );
+
+        // Increase the stake to be equal to the minimum
+        SubtensorModule::increase_stake_on_hotkey_account(&hotkey, min_stake);
+
+        // Verify stake is equal to minimum
+        assert_eq!(
+            SubtensorModule::get_total_stake_for_hotkey(&hotkey),
+            min_stake
+        );
+
+        // Submit to the signed extension validate function
+        let result_min_stake = extension.validate(&who, &call.clone(), &info, 10);
+        // Now the call should pass
+        assert_ok!(result_min_stake);
+    });
+}
+
 #[test]
 fn test_reveal_weights_validate() {
     // Testing the signed extension validate function
@@ -306,7 +366,7 @@ fn test_reveal_weights_validate() {
         assert_err!(
             // Should get an invalid transaction error
             result_no_stake,
-            TransactionValidityError::Invalid(InvalidTransaction::Call,)
+            TransactionValidityError::Invalid(InvalidTransaction::Custom(2))
         );
 
         // Increase the stake to be equal to the minimum