commit Cargo.lock

Author: open-junius

common/src/lib.rs

@@ -184,34 +184,33 @@ impl TryFrom<u8> for ProxyType {
             14 => Ok(Self::SudoUncheckedSetCode),
             15 => Ok(Self::SwapHotkey),
             16 => Ok(Self::SubnetLeaseBeneficiary),
+            17 => Ok(Self::RootClaim),
             _ => Err(()),
         }
     }
 }
 
-impl TryInto<u8> for ProxyType {
-    type Error = ();
-
-    fn try_into(self) -> Result<u8, Self::Error> {
-        match self {
-            Self::Any => Ok(0),
-            Self::Owner => Ok(1),
-            Self::NonCritical => Ok(2),
-            Self::NonTransfer => Ok(3),
-            Self::Senate => Ok(4),
-            Self::NonFungible => Ok(5),
-            Self::Triumvirate => Ok(6),
-            Self::Governance => Ok(7),
-            Self::Staking => Ok(8),
-            Self::Registration => Ok(9),
-            Self::Transfer => Ok(10),
-            Self::SmallTransfer => Ok(11),
-            Self::RootWeights => Ok(12),
-            Self::ChildKeys => Ok(13),
-            Self::SudoUncheckedSetCode => Ok(14),
-            Self::SwapHotkey => Ok(15),
-            Self::SubnetLeaseBeneficiary => Ok(16),
-            Self::RootClaim => Err(()),
+impl From<ProxyType> for u8 {
+    fn from(proxy_type: ProxyType) -> Self {
+        match proxy_type {
+            ProxyType::Any => 0,
+            ProxyType::Owner => 1,
+            ProxyType::NonCritical => 2,
+            ProxyType::NonTransfer => 3,
+            ProxyType::Senate => 4,
+            ProxyType::NonFungible => 5,
+            ProxyType::Triumvirate => 6,
+            ProxyType::Governance => 7,
+            ProxyType::Staking => 8,
+            ProxyType::Registration => 9,
+            ProxyType::Transfer => 10,
+            ProxyType::SmallTransfer => 11,
+            ProxyType::RootWeights => 12,
+            ProxyType::ChildKeys => 13,
+            ProxyType::SudoUncheckedSetCode => 14,
+            ProxyType::SwapHotkey => 15,
+            ProxyType::SubnetLeaseBeneficiary => 16,
+            ProxyType::RootClaim => 17,
         }
     }
 }

pallets/proxy/src/lib.rs

@@ -145,7 +145,8 @@ pub mod pallet {
             + PartialOrd
             + frame::traits::InstanceFilter<<Self as Config>::RuntimeCall>
             + Default
-            + MaxEncodedLen;
+            + MaxEncodedLen
+            + TryFrom<u8>;
 
         /// The base amount of currency needed to reserve for creating a proxy.
         ///

precompiles/src/proxy.rs

@@ -15,6 +15,7 @@ use sp_runtime::{
     traits::{Dispatchable, StaticLookup},
 };
 use sp_std::boxed::Box;
+use sp_std::convert::{TryFrom, TryInto};
 use sp_std::vec;
 use sp_std::vec::Vec;
 use subtensor_runtime_common::ProxyType;
@@ -253,9 +254,11 @@ where
         let mut result: Vec<(H256, U256, U256)> = vec![];
         for proxy in proxies.0 {
             let delegate: [u8; 32] = proxy.delegate.into();
-            let proxy_type: u8 =
-                proxy
-                    .proxy_type
+
+            let proxy_type: ProxyType = proxy.proxy_type;
+
+            let proxy_type_u8: u8 =
+                proxy_type
                     .try_into()
                     .map_err(|_| PrecompileFailure::Error {
                         exit_status: ExitError::Other("Invalid proxy type".into()),
@@ -266,7 +269,7 @@ where
                 .map_err(|_| PrecompileFailure::Error {
                     exit_status: ExitError::Other("Invalid delay".into()),
                 })?;
-            result.push((delegate.into(), proxy_type.into(), delay.into()));
+            result.push((delegate.into(), proxy_type_u8.into(), delay.into()));
         }
 
         Ok(result)