fix linter

Author: open-junius

precompiles/src/proxy.rs

@@ -2,6 +2,7 @@ use core::marker::PhantomData;
 
 use crate::{PrecompileExt, PrecompileHandleExt};
 
+use alloc::format;
 use fp_evm::{ExitError, PrecompileFailure};
 use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo};
 use frame_system::RawOrigin;
@@ -23,11 +24,11 @@ where
     R: frame_system::Config
         + pallet_evm::Config
         + pallet_subtensor::Config
-        + pallet_proxy::Config<ProxyType = ProxyType>,
+        + pallet_subtensor_proxy::Config<ProxyType = ProxyType>,
     R::AccountId: From<[u8; 32]> + Into<[u8; 32]>,
     <R as pallet_evm::Config>::AddressMapping: AddressMapping<R::AccountId>,
     <R as frame_system::Config>::RuntimeCall: From<pallet_subtensor::Call<R>>
-        + From<pallet_proxy::Call<R>>
+        + From<pallet_subtensor_proxy::Call<R>>
         + GetDispatchInfo
         + Dispatchable<PostInfo = PostDispatchInfo>,
     <R as pallet_evm::Config>::AddressMapping: AddressMapping<R::AccountId>,
@@ -42,11 +43,11 @@ where
     R: frame_system::Config
         + pallet_evm::Config
         + pallet_subtensor::Config
-        + pallet_proxy::Config<ProxyType = ProxyType>,
+        + pallet_subtensor_proxy::Config<ProxyType = ProxyType>,
     R::AccountId: From<[u8; 32]> + Into<[u8; 32]>,
     <R as pallet_evm::Config>::AddressMapping: AddressMapping<R::AccountId>,
     <R as frame_system::Config>::RuntimeCall: From<pallet_subtensor::Call<R>>
-        + From<pallet_proxy::Call<R>>
+        + From<pallet_subtensor_proxy::Call<R>>
         + GetDispatchInfo
         + Dispatchable<PostInfo = PostDispatchInfo>,
     <<R as frame_system::Config>::Lookup as StaticLookup>::Source: From<R::AccountId>,
@@ -64,7 +65,7 @@ where
                 exit_status: ExitError::Other("Invalid proxy type".into()),
             })?;
 
-        let call = pallet_proxy::Call::<R>::create_pure {
+        let call = pallet_subtensor_proxy::Call::<R>::create_pure {
             proxy_type,
             delay: delay.into(),
             index,
@@ -74,12 +75,19 @@ where
 
         // Success!
         // Try to get proxy address
-        let proxy_address: [u8; 32] =
-            pallet_proxy::pallet::Pallet::<R>::pure_account(&account_id, &proxy_type, index, None)
-                .into();
+        let proxy_address: [u8; 32] = pallet_subtensor_proxy::pallet::Pallet::<R>::pure_account(
+            &account_id,
+            &proxy_type,
+            index,
+            None,
+        )
+        .map_err(|_| PrecompileFailure::Error {
+            exit_status: ExitError::Other("Proxy not found".into()),
+        })?
+        .into();
 
         // Check if in the proxies map
-        let proxy_entry = pallet_proxy::pallet::Pallet::<R>::proxies(account_id.clone());
+        let proxy_entry = pallet_subtensor_proxy::pallet::Pallet::<R>::proxies(account_id.clone());
         if proxy_entry
             .0
             .iter()
@@ -107,7 +115,7 @@ where
             exit_status: ExitError::Other("Invalid proxy type".into()),
         })?;
 
-        let call = pallet_proxy::Call::<R>::kill_pure {
+        let call = pallet_subtensor_proxy::Call::<R>::kill_pure {
             spawner: <<R as frame_system::Config>::Lookup as StaticLookup>::Source::from(
                 spawner.0.into(),
             ),
@@ -129,7 +137,7 @@ where
     ) -> EvmResult<()> {
         let account_id = handle.caller_account_id::<R>();
 
-        let call = <R as pallet_proxy::Config>::RuntimeCall::decode_with_depth_limit(
+        let call = <R as pallet_subtensor_proxy::Config>::RuntimeCall::decode_with_depth_limit(
             MAX_DECODE_DEPTH,
             &mut &call[..],
         )
@@ -145,7 +153,7 @@ where
             proxy_type = Some(proxy_type_);
         };
 
-        let call = pallet_proxy::Call::<R>::proxy {
+        let call = pallet_subtensor_proxy::Call::<R>::proxy {
             real: <<R as frame_system::Config>::Lookup as StaticLookup>::Source::from(
                 real.0.into(),
             ),
@@ -155,15 +163,17 @@ where
 
         handle.try_dispatch_runtime_call::<R, _>(call, RawOrigin::Signed(account_id))?;
 
-        let last_call_result = pallet_proxy::pallet::Pallet::<R>::LastCallResult::get(real);
+        let real_account_id = R::AccountId::from(real.0.into());
+
+        let last_call_result = pallet_subtensor_proxy::LastCallResult::<R>::get(real_account_id);
         match last_call_result {
             Some(last_call_result) => match last_call_result {
                 Ok(()) => {
                     return Ok(());
                 }
                 Err(e) => {
                     return Err(PrecompileFailure::Error {
-                        exit_status: ExitError::Other(e.to_string()),
+                        exit_status: ExitError::Other(format!("{:?}", e).into()),
                     });
                 }
             },
@@ -187,7 +197,7 @@ where
             exit_status: ExitError::Other("Invalid proxy type".into()),
         })?;
 
-        let call = pallet_proxy::Call::<R>::add_proxy {
+        let call = pallet_subtensor_proxy::Call::<R>::add_proxy {
             delegate: <<R as frame_system::Config>::Lookup as StaticLookup>::Source::from(
                 delegate.0.into(),
             ),
@@ -210,7 +220,7 @@ where
             exit_status: ExitError::Other("Invalid proxy type".into()),
         })?;
 
-        let call = pallet_proxy::Call::<R>::remove_proxy {
+        let call = pallet_subtensor_proxy::Call::<R>::remove_proxy {
             delegate: <<R as frame_system::Config>::Lookup as StaticLookup>::Source::from(
                 delegate.0.into(),
             ),
@@ -225,7 +235,7 @@ where
     pub fn remove_proxies(handle: &mut impl PrecompileHandle) -> EvmResult<()> {
         let account_id = handle.caller_account_id::<R>();
 
-        let call = pallet_proxy::Call::<R>::remove_proxies {};
+        let call = pallet_subtensor_proxy::Call::<R>::remove_proxies {};
 
         handle.try_dispatch_runtime_call::<R, _>(call, RawOrigin::Signed(account_id))
     }
@@ -234,7 +244,7 @@ where
     pub fn poke_deposit(handle: &mut impl PrecompileHandle) -> EvmResult<()> {
         let account_id = handle.caller_account_id::<R>();
 
-        let call = pallet_proxy::Call::<R>::poke_deposit {};
+        let call = pallet_subtensor_proxy::Call::<R>::poke_deposit {};
 
         handle.try_dispatch_runtime_call::<R, _>(call, RawOrigin::Signed(account_id))
     }