polkadot-sdk v1.13.0 uplift

pallets/xc-asset-config/src/lib.rs

@@ -49,6 +49,7 @@
 //! `ExecutionPaymentRate` interface for fetching `units per second` if asset is supported payment asset
 //! - `get_units_per_second`
 //!
+//! - `weight_to_fee` method is used to convert weight to fee based on units per second and weight.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -72,7 +73,9 @@ pub use weights::WeightInfo;
 pub mod pallet {
 
     use crate::weights::WeightInfo;
-    use frame_support::{pallet_prelude::*, traits::EnsureOrigin};
+    use frame_support::{
+        pallet_prelude::*, traits::EnsureOrigin, weights::constants::WEIGHT_REF_TIME_PER_SECOND,
+    };
     use frame_system::pallet_prelude::*;
     use parity_scale_codec::HasCompact;
     use sp_std::boxed::Box;
@@ -116,6 +119,14 @@ pub mod pallet {
         }
     }
 
+    impl<T: Config> Pallet<T> {
+        /// Convert weight to fee based on units per second and weight.
+        pub fn weight_to_fee(weight: Weight, units_per_second: u128) -> u128 {
+            units_per_second.saturating_mul(weight.ref_time() as u128)
+                / (WEIGHT_REF_TIME_PER_SECOND as u128)
+        }
+    }
+
     #[pallet::config]
     pub trait Config: frame_system::Config {
         type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;

primitives/src/xcm/mod.rs

@@ -26,7 +26,6 @@
 //! - `FixedRateOfForeignAsset` - weight trader for execution payment in foreign asset
 //! - `ReserveAssetFilter` - used to check whether asset/origin are a valid reserve location
 //! - `XcmFungibleFeeHandler` - used to handle XCM fee execution fees
-//! - `WeightToForeignAssetFee` - used to convert weight to fee based on units per second and weight.
 //!
 //! Please refer to implementation below for more info.
 //!
@@ -356,12 +355,3 @@ impl<T: Contains<Location>> ShouldExecute for AllowTopLevelPaidExecutionFrom<T>
         Ok(())
     }
 }
-
-pub struct WeightToForeignAssetFee;
-impl WeightToForeignAssetFee {
-    /// Convert weight to fee based on units per second and weight.
-    pub fn weight_to_fee(weight: Weight, units_per_second: u128) -> u128 {
-        units_per_second.saturating_mul(weight.ref_time() as u128)
-            / (WEIGHT_REF_TIME_PER_SECOND as u128)
-    }
-}

runtime/astar/src/lib.rs

@@ -69,7 +69,7 @@ use sp_runtime::{
 use sp_std::{collections::btree_map::BTreeMap, prelude::*};
 use xcm::{
     v4::{AssetId as XcmAssetId, Location as XcmLocation},
-    VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm,
+    IntoVersion, VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm,
 };
 use xcm_fee_payment_runtime_api::{
     dry_run::{CallDryRunEffects, Error as XcmDryRunApiError, XcmDryRunEffects},
@@ -83,7 +83,7 @@ use astar_primitives::{
     },
     evm::EvmRevertCodeHandler,
     oracle::{CurrencyAmount, CurrencyId, DummyCombineData, Price},
-    xcm::{AssetLocationIdConverter, WeightToForeignAssetFee},
+    xcm::AssetLocationIdConverter,
     Address, AssetId, BlockNumber, Hash, Header, Nonce, UnfreezeChainOnFailedMigration,
 };
 pub use astar_primitives::{governance::OracleMembershipInst, AccountId, Balance, Signature};
@@ -1933,22 +1933,23 @@ impl_runtime_apis! {
         }
 
         fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result<u128, XcmPaymentApiError> {
-            match asset.try_as::<XcmAssetId>() {
-                // for native token
-                Ok(asset_id) if asset_id.0 == xcm_config::AstarLocation::get() => {
-                    Ok(WeightToFee::weight_to_fee(&weight))
-                }
-                // for foreign assets that have 'units per second' configured
-                Ok(asset_id) => {
-                    let versioned_location = VersionedLocation::V4(asset_id.0.clone());
+            let asset = asset.into_version(xcm::v4::VERSION).map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?;
+            let asset_id: XcmAssetId = asset.try_into().map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?;
+
+            // for native token
+            if asset_id.0 == xcm_config::AstarLocation::get() {
+                Ok(WeightToFee::weight_to_fee(&weight))
+            }
+            // for foreign assets that have 'units per second' configures
+            else {
+                let versioned_location = VersionedLocation::V4(asset_id.0);
 
-                    match pallet_xc_asset_config::AssetLocationUnitsPerSecond::<Runtime>::get(versioned_location) {
-                        Some(units_per_sec) => Ok(WeightToForeignAssetFee::weight_to_fee(weight, units_per_sec)),
-                        None => Err(XcmPaymentApiError::AssetNotFound),
+                match pallet_xc_asset_config::AssetLocationUnitsPerSecond::<Runtime>::get(versioned_location) {
+                    Some(units_per_sec) => {
+                        Ok(pallet_xc_asset_config::Pallet::<Runtime>::weight_to_fee(weight, units_per_sec))
                     }
-                },
-                // for failed asset conversion
-                Err(_) => Err(XcmPaymentApiError::VersionedConversionFailed)
+                    None => Err(XcmPaymentApiError::AssetNotFound),
+                }
             }
         }
 

runtime/astar/src/xcm_config.rs

@@ -279,7 +279,7 @@ impl xcm_executor::Config for XcmConfig {
     type HrmpNewChannelOpenRequestHandler = ();
     type HrmpChannelAcceptedHandler = ();
     type HrmpChannelClosingHandler = ();
-    type XcmRecorder = ();
+    type XcmRecorder = PolkadotXcm;
 }
 
 /// Local origins on this chain are allowed to dispatch XCM sends/executions.

runtime/shibuya/src/lib.rs

@@ -71,7 +71,7 @@ use sp_runtime::{
 use sp_std::{collections::btree_map::BTreeMap, prelude::*};
 use xcm::{
     v4::{AssetId as XcmAssetId, Location as XcmLocation},
-    VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm,
+    IntoVersion, VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm,
 };
 use xcm_fee_payment_runtime_api::{
     dry_run::{CallDryRunEffects, Error as XcmDryRunApiError, XcmDryRunEffects},
@@ -93,7 +93,7 @@ use astar_primitives::{
         TechnicalCommitteeMembershipInst,
     },
     oracle::{CurrencyAmount, CurrencyId, DummyCombineData, Price},
-    xcm::{AssetLocationIdConverter, WeightToForeignAssetFee},
+    xcm::AssetLocationIdConverter,
     Address, AssetId, BlockNumber, Hash, Header, Nonce, UnfreezeChainOnFailedMigration,
 };
 pub use astar_primitives::{AccountId, Balance, Signature};
@@ -2264,22 +2264,23 @@ impl_runtime_apis! {
         }
 
         fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result<u128, XcmPaymentApiError> {
-            match asset.try_as::<XcmAssetId>() {
-                // for native token
-                Ok(asset_id) if asset_id.0 == xcm_config::ShibuyaLocation::get() => {
-                    Ok(WeightToFee::weight_to_fee(&weight))
-                }
-                // for foreign assets that have 'units per second' configured
-                Ok(asset_id) => {
-                    let versioned_location = VersionedLocation::V4(asset_id.0.clone());
+            let asset = asset.into_version(xcm::v4::VERSION).map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?;
+            let asset_id: XcmAssetId = asset.try_into().map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?;
+
+            // for native token
+            if asset_id.0 == xcm_config::ShibuyaLocation::get() {
+                Ok(WeightToFee::weight_to_fee(&weight))
+            }
+            // for foreign assets that have 'units per second' configures
+            else {
+                let versioned_location = VersionedLocation::V4(asset_id.0);
 
-                    match pallet_xc_asset_config::AssetLocationUnitsPerSecond::<Runtime>::get(versioned_location) {
-                        Some(units_per_sec) => Ok(WeightToForeignAssetFee::weight_to_fee(weight, units_per_sec)),
-                        None => Err(XcmPaymentApiError::AssetNotFound),
+                match pallet_xc_asset_config::AssetLocationUnitsPerSecond::<Runtime>::get(versioned_location) {
+                    Some(units_per_sec) => {
+                        Ok(pallet_xc_asset_config::Pallet::<Runtime>::weight_to_fee(weight, units_per_sec))
                     }
-                },
-                // for failed asset conversion
-                Err(_) => Err(XcmPaymentApiError::VersionedConversionFailed)
+                    None => Err(XcmPaymentApiError::AssetNotFound),
+                }
             }
         }
 

runtime/shibuya/src/xcm_config.rs

@@ -212,7 +212,7 @@ impl xcm_executor::Config for XcmConfig {
     type HrmpNewChannelOpenRequestHandler = ();
     type HrmpChannelAcceptedHandler = ();
     type HrmpChannelClosingHandler = ();
-    type XcmRecorder = ();
+    type XcmRecorder = PolkadotXcm;
 }
 
 /// Local origins on this chain are allowed to dispatch XCM sends/executions.