feat: add UnifiedAddressMapper trait impl bechmarks

chain-extensions/unified-accounts/src/lib.rs

@@ -25,17 +25,20 @@ use astar_primitives::{
 use core::marker::PhantomData;
 use sp_runtime::DispatchError;
 
-use frame_support::{traits::Get, DefaultNoBound};
+use frame_support::DefaultNoBound;
 use pallet_contracts::chain_extension::{
     ChainExtension, Environment, Ext, InitState, Result as DispatchResult, RetVal,
 };
 use pallet_evm::AddressMapping;
+use pallet_unified_accounts::WeightInfo;
 use parity_scale_codec::Encode;
 pub use unified_accounts_chain_extension_types::{
     Command::{self, *},
     UnifiedAddress,
 };
 
+type UAWeight<T> = <T as pallet_unified_accounts::Config>::WeightInfo;
+
 #[derive(DefaultNoBound)]
 pub struct UnifiedAccountsExtension<T, UA>(PhantomData<(T, UA)>);
 
@@ -54,17 +57,15 @@ where
         })? {
             GetEvmAddress => {
                 let account_id: T::AccountId = env.read_as()?;
-
-                let base_weight = <T as frame_system::Config>::DbWeight::get().reads(1);
-                env.charge_weight(base_weight)?;
+                // charge weight
+                env.charge_weight(UAWeight::<T>::uam_to_h160())?;
                 // write to buffer
                 UA::to_h160(&account_id).using_encoded(|r| env.write(r, false, None))?;
             }
             GetEvmAddressOrDefault => {
                 let account_id: T::AccountId = env.read_as()?;
-
-                let base_weight = <T as frame_system::Config>::DbWeight::get().reads(1);
-                env.charge_weight(base_weight)?;
+                // charge weight
+                env.charge_weight(UAWeight::<T>::uam_to_h160_or_default())?;
 
                 let evm_address = if let Some(h160) = UA::to_h160(&account_id) {
                     UnifiedAddress::Mapped(h160)
@@ -76,17 +77,15 @@ where
             }
             GetNativeAddress => {
                 let evm_address: EvmAddress = env.read_as()?;
-
-                let base_weight = <T as frame_system::Config>::DbWeight::get().reads(1);
-                env.charge_weight(base_weight)?;
+                // charge weight
+                env.charge_weight(UAWeight::<T>::uam_to_account_id())?;
                 // write to buffer
                 UA::to_account_id(&evm_address).using_encoded(|r| env.write(r, false, None))?;
             }
             GetNativeAddressOrDefault => {
                 let evm_address: EvmAddress = env.read_as()?;
-
-                let base_weight = <T as frame_system::Config>::DbWeight::get().reads(1);
-                env.charge_weight(base_weight)?;
+                // charge weight
+                env.charge_weight(UAWeight::<T>::uam_to_account_id_or_default())?;
 
                 // read the storage item
                 let native_address = if let Some(native) = UA::to_account_id(&evm_address) {

chain-extensions/xvm/src/lib.rs

@@ -25,7 +25,7 @@ use astar_primitives::{
     evm::UnifiedAddressMapper,
     xvm::{Context, VmId, XvmCall},
 };
-use frame_support::{dispatch::Encode, traits::Get, weights::Weight};
+use frame_support::{dispatch::Encode, weights::Weight};
 use frame_system::RawOrigin;
 use pallet_contracts::chain_extension::{
     ChainExtension, Environment, Ext, InitState, RetVal, ReturnFlags,
@@ -98,8 +98,10 @@ where
                 // Claim the default evm address if needed.
                 let mut actual_weight = Weight::zero();
                 if value > 0 {
-                    // `UA::to_h160` 1 DB read.
-                    actual_weight.saturating_accrue(T::DbWeight::get().reads(1));
+                    // `UA::to_h160`.
+                    actual_weight.saturating_accrue(
+                        <T as pallet_unified_accounts::Config>::WeightInfo::uam_to_h160(),
+                    );
 
                     if UA::to_h160(&source).is_none() {
                         let weight_of_claim = <T as pallet_unified_accounts::Config>::WeightInfo::claim_default_evm_address();

pallets/unified-accounts/src/benchmarking.rs

@@ -83,4 +83,64 @@ mod benchmarks {
             .into(),
         );
     }
+
+    #[benchmark]
+    fn uam_to_account_id() {
+        let caller: T::AccountId = whitelisted_caller();
+        let evm_address = T::DefaultNativeToEvm::into_h160(caller.clone());
+        // claim mapping
+        assert_ok!(Pallet::<T>::claim_default_evm_address(
+            RawOrigin::Signed(caller.clone()).into()
+        ));
+
+        #[block]
+        {
+            let _ = <Pallet<T> as UnifiedAddressMapper<T::AccountId>>::to_account_id(&evm_address);
+        }
+    }
+
+    #[benchmark]
+    fn uam_to_account_id_or_default() {
+        let caller: T::AccountId = whitelisted_caller();
+        let evm_address = T::DefaultNativeToEvm::into_h160(caller.clone());
+        // claim mapping
+        assert_ok!(Pallet::<T>::claim_default_evm_address(
+            RawOrigin::Signed(caller.clone()).into()
+        ));
+
+        #[block]
+        {
+            let _ = <Pallet<T> as UnifiedAddressMapper<T::AccountId>>::to_account_id_or_default(
+                &evm_address,
+            );
+        }
+    }
+
+    #[benchmark]
+    fn uam_to_h160() {
+        let caller: T::AccountId = whitelisted_caller();
+        // claim mapping
+        assert_ok!(Pallet::<T>::claim_default_evm_address(
+            RawOrigin::Signed(caller.clone()).into()
+        ));
+
+        #[block]
+        {
+            let _ = <Pallet<T> as UnifiedAddressMapper<T::AccountId>>::to_h160(&caller);
+        }
+    }
+
+    #[benchmark]
+    fn uam_to_h160_or_default() {
+        let caller: T::AccountId = whitelisted_caller();
+        // claim mapping
+        assert_ok!(Pallet::<T>::claim_default_evm_address(
+            RawOrigin::Signed(caller.clone()).into()
+        ));
+
+        #[block]
+        {
+            let _ = <Pallet<T> as UnifiedAddressMapper<T::AccountId>>::to_h160_or_default(&caller);
+        }
+    }
 }

pallets/unified-accounts/src/weights.rs

@@ -51,6 +51,10 @@ use core::marker::PhantomData;
 pub trait WeightInfo {
 	fn claim_evm_address() -> Weight;
 	fn claim_default_evm_address() -> Weight;
+	fn uam_to_account_id() -> Weight;
+	fn uam_to_account_id_or_default() -> Weight;
+	fn uam_to_h160() -> Weight;
+	fn uam_to_h160_or_default() -> Weight;
 }
 
 /// Weights for pallet_unified_accounts using the Substrate node and recommended hardware.
@@ -88,6 +92,46 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
+	/// Storage: UnifiedAccounts EvmToNative (r:1 w:0)
+	/// Proof: UnifiedAccounts EvmToNative (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
+	fn uam_to_account_id() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `170`
+		//  Estimated: `3533`
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 3533)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+	}
+	/// Storage: UnifiedAccounts EvmToNative (r:1 w:0)
+	/// Proof: UnifiedAccounts EvmToNative (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
+	fn uam_to_account_id_or_default() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `170`
+		//  Estimated: `3533`
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 3533)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+	}
+	/// Storage: UnifiedAccounts NativeToEvm (r:1 w:0)
+	/// Proof: UnifiedAccounts NativeToEvm (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
+	fn uam_to_h160() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `170`
+		//  Estimated: `3533`
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 3533)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+	}
+	/// Storage: UnifiedAccounts NativeToEvm (r:1 w:0)
+	/// Proof: UnifiedAccounts NativeToEvm (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
+	fn uam_to_h160_or_default() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `170`
+		//  Estimated: `3533`
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 3533)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+	}
 }
 
 // For backwards compatibility and tests
@@ -124,4 +168,44 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
+	/// Storage: UnifiedAccounts EvmToNative (r:1 w:0)
+	/// Proof: UnifiedAccounts EvmToNative (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
+	fn uam_to_account_id() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `170`
+		//  Estimated: `3533`
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 3533)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+	}
+	/// Storage: UnifiedAccounts EvmToNative (r:1 w:0)
+	/// Proof: UnifiedAccounts EvmToNative (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
+	fn uam_to_account_id_or_default() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `170`
+		//  Estimated: `3533`
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 3533)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+	}
+	/// Storage: UnifiedAccounts NativeToEvm (r:1 w:0)
+	/// Proof: UnifiedAccounts NativeToEvm (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
+	fn uam_to_h160() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `170`
+		//  Estimated: `3533`
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 3533)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+	}
+	/// Storage: UnifiedAccounts NativeToEvm (r:1 w:0)
+	/// Proof: UnifiedAccounts NativeToEvm (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen)
+	fn uam_to_h160_or_default() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `170`
+		//  Estimated: `3533`
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 3533)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+	}
 }