Skip to content

Improve origin check for token registrations #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yrong merged 1 commit into from
Mar 13, 2025
Merged

Improve origin check for token registrations #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions cumulus/parachains/runtimes/assets/asset-hub-westend/src/bridge_to_ethereum_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use frame_support::{
use frame_system::{ensure_signed, EnsureRootWithSuccess};
use pallet_xcm::{EnsureXcm, Origin as XcmOrigin};
use parachains_common::AssetIdForTrustBackedAssets;
use sp_runtime::traits::{MaybeEquivalence, TryConvert};
use sp_runtime::traits::{MaybeEquivalence};
use testnet_parachains_constants::westend::snowbridge::EthereumNetwork;
use xcm::prelude::{Asset, InteriorLocation, Location, PalletInstance, Parachain};
use xcm_executor::XcmExecutor;
Expand Down Expand Up @@ -94,7 +94,6 @@ impl snowbridge_pallet_system_frontend::Config for Runtime {
Assets,
AccountId,
AssetIdForTrustBackedAssets,
xcm_builder::AliasesIntoAccountId32<xcm_config::RelayNetwork, AccountId>,
Location,
>,
ForeignAssetCreatorAsOwner<
Expand Down Expand Up @@ -162,7 +161,7 @@ where
let owner = AssetInspect::owner(asset_location.into());
let location: Location = origin_location.clone().into();
let from = LocationToAccountId::convert_location(&location);
if !owner.eq(&from) {
if from != owner {
return Err(origin)
}
let latest_location: Location =
Expand All @@ -186,28 +185,25 @@ pub struct LocalAssetCreatorAsOwner<
AssetInspect,
AccountId,
AssetId,
AccountToLocation,
L = Location,
>(
core::marker::PhantomData<(
MatchAssetId,
AssetInspect,
AccountId,
AssetId,
AccountToLocation,
L,
)>,
);
impl<
MatchAssetId: MaybeEquivalence<L, AssetId>,
AssetInspect: frame_support::traits::fungibles::roles::Inspect<AccountId>,
AccountId: Eq + Clone,
AccountId: Eq + Clone + Into<L>,
AssetId: Eq + Clone,
AccountToLocation: for<'a> TryConvert<&'a AccountId, Location>,
RuntimeOrigin: OriginTrait + Clone,
L: From<Location> + Into<Location> + Clone,
> EnsureOriginWithArg<RuntimeOrigin, L>
for LocalAssetCreatorAsOwner<MatchAssetId, AssetInspect, AccountId, AssetId, AccountToLocation, L>
for LocalAssetCreatorAsOwner<MatchAssetId, AssetInspect, AccountId, AssetId, L>
where
RuntimeOrigin: Into<Result<RawOrigin<AccountId>, RuntimeOrigin>> + From<RawOrigin<AccountId>>,
<AssetInspect as frame_support::traits::fungibles::Inspect<AccountId>>::AssetId: From<AssetId>,
Expand All @@ -221,12 +217,10 @@ where
let who = ensure_signed(origin.clone()).map_err(|_| origin.clone())?;
let asset_id = MatchAssetId::convert(asset_location).ok_or(origin.clone())?;
let owner = AssetInspect::owner(asset_id.into()).ok_or(origin.clone())?;
if !owner.eq(&who) {
if who != owner {
return Err(origin)
}
let latest_location: Location =
AccountToLocation::try_convert(&who).map_err(|_| origin.clone())?;
Ok(latest_location.into())
Ok(who.into())
}

#[cfg(feature = "runtime-benchmarks")]
Expand Down