failing on buy execution

Author: alistair-singh

cumulus/parachains/integration-tests/emulated/networks/rococo-wococo-system/src/lib.rs

@@ -93,5 +93,6 @@ decl_test_sender_receiver_accounts_parameter_types! {
 	BridgeHubRococoPara { sender: ALICE, receiver: BOB },
 	WococoRelay { sender: ALICE, receiver: BOB },
 	AssetHubWococoPara { sender: ALICE, receiver: BOB },
-	BridgeHubWococoPara { sender: ALICE, receiver: BOB }
+	BridgeHubWococoPara { sender: ALICE, receiver: BOB },
+	PenpalAPara { sender: ALICE, receiver: BOB }
 }

cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/lib.rs

@@ -43,13 +43,14 @@ pub use rococo_wococo_system_emulated_network::{
 	bridge_hub_rococo_emulated_chain::{
 		genesis::ED as BRIDGE_HUB_ROCOCO_ED, BridgeHubRococoParaPallet as BridgeHubRococoPallet,
 	},
+	penpal_emulated_chain::PenpalAParaPallet as PenpalAPallet,
 	rococo_emulated_chain::{genesis::ED as ROCOCO_ED, RococoRelayPallet as RococoPallet},
 	AssetHubRococoPara as AssetHubRococo, AssetHubRococoParaReceiver as AssetHubRococoReceiver,
 	AssetHubRococoParaSender as AssetHubRococoSender, AssetHubWococoPara as AssetHubWococo,
 	BridgeHubRococoPara as BridgeHubRococo, BridgeHubRococoParaReceiver as BridgeHubRococoReceiver,
 	BridgeHubRococoParaSender as BridgeHubRococoSender, BridgeHubWococoPara as BridgeHubWococo,
-	PenpalAPara as PenpalARococo, RococoRelay as Rococo, RococoRelayReceiver as RococoReceiver,
-	RococoRelaySender as RococoSender,
+	PenpalAPara as PenpalA, PenpalAParaSender as PenpalASender, PenpalAParaReceiver as PenpalAReceiver,
+	RococoRelay as Rococo, RococoRelayReceiver as RococoReceiver, RococoRelaySender as RococoSender,
 };
 
 pub const ASSET_ID: u32 = 1;

cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/snowbridge.rs

@@ -226,11 +226,14 @@ fn register_token() {
 
 #[test]
 fn send_token_to_penpal() {
-	BridgeHubRococo::fund_accounts(vec![(
-		BridgeHubRococo::sovereign_account_id_of(MultiLocation {
+	let asset_hub_sovereign = BridgeHubRococo::sovereign_account_id_of(
+		MultiLocation {
 			parents: 1,
 			interior: X1(Parachain(ASSETHUB_PARA_ID)),
-		}),
+		}
+	);
+	BridgeHubRococo::fund_accounts(vec![(
+		asset_hub_sovereign.clone(),
 		INITIAL_FUND,
 	)]);
 
@@ -239,6 +242,30 @@ fn send_token_to_penpal() {
 		(AssetHubRococoReceiver::get(), INITIAL_FUND),
 	]);
 
+	PenpalA::fund_accounts(vec![
+		(PenpalAReceiver::get(), INITIAL_FUND),
+		(PenpalASender::get(), INITIAL_FUND),
+	]);
+
+	let weth_asset_id: MultiLocation = (
+		Parent,
+		Parent,
+		Ethereum { chain_id: 15 },
+		AccountKey20 { network: None, key: WETH }
+	).into();
+
+	// Create asset on penpal.
+	PenpalA::execute_with(|| {
+		assert_ok!(<PenpalA as PenpalAPallet>::ForeignAssets::create(
+			<PenpalA as Chain>::RuntimeOrigin::signed(PenpalASender::get()),
+			weth_asset_id,
+			asset_hub_sovereign.into(),
+			1000,
+		));
+
+		//assert!(<PenpalA as PenpalAPallet>::Assets::asset_exists(weth_asset_id));
+	});
+
 	let message_id_: H256 = [1; 32].into();
 
 	BridgeHubRococo::execute_with(|| {
@@ -255,7 +282,7 @@ fn send_token_to_penpal() {
 			chain_id: CHAIN_ID,
 			command: Command::SendToken {
 				token: WETH.into(),
-				destination: Destination::AccountId32 { id: AssetHubRococoReceiver::get().into() },
+				destination: Destination::ForeignAccountId32 { para_id: 2000, id: AssetHubRococoReceiver::get().into() },
 				amount: 1_000_000_000,
 			},
 		});
@@ -282,11 +309,11 @@ fn send_token_to_penpal() {
 		);
 	});
 
-	PenpalARococo::execute_with(|| {
-		type RuntimeEvent = <PenpalARococo as Chain>::RuntimeEvent;
+	PenpalA::execute_with(|| {
+		type RuntimeEvent = <PenpalA as Chain>::RuntimeEvent;
 
 		assert_expected_events!(
-			PenpalARococo,
+			PenpalA,
 			vec![
 				RuntimeEvent::ForeignAssets(pallet_assets::Event::Issued { .. }) => {},
 			]

cumulus/parachains/runtimes/testing/penpal/src/lib.rs

@@ -32,11 +32,7 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 mod weights;
 pub mod xcm_config;
 
-use assets_common::{
-	foreign_creators::ForeignCreators,
-	matching::FromSiblingParachain,
-	MultiLocationForAssetId,
-};
+use assets_common::MultiLocationForAssetId;
 use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
 use cumulus_primitives_core::{AggregateMessageOrigin, ParaId};
 use frame_support::{
@@ -75,7 +71,7 @@ use sp_std::prelude::*;
 #[cfg(feature = "std")]
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
-use xcm_config::{AssetsToBlockAuthor, ForeignCreatorsSovereignAccountOf, XcmOriginToTransactDispatchOrigin};
+use xcm_config::{AssetsToBlockAuthor, XcmOriginToTransactDispatchOrigin};
 
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
@@ -473,9 +469,6 @@ parameter_types! {
 	pub const ForeignAssetsMetadataDepositPerByte: Balance = MetadataDepositPerByte::get();
 }
 
-/// We allow root to execute privileged asset operations.
-pub type AssetsForceOrigin = EnsureRoot<AccountId>;
-
 /// Another pallet assets instance to store foreign assets from bridgehub.
 pub type ForeignAssetsInstance = pallet_assets::Instance2;
 impl pallet_assets::Config<ForeignAssetsInstance> for Runtime {
@@ -484,12 +477,8 @@ impl pallet_assets::Config<ForeignAssetsInstance> for Runtime {
 	type AssetId = MultiLocationForAssetId;
 	type AssetIdParameter = MultiLocationForAssetId;
 	type Currency = Balances;
-	type CreateOrigin = ForeignCreators<
-		(FromSiblingParachain<parachain_info::Pallet<Runtime>>,),
-		ForeignCreatorsSovereignAccountOf,
-		AccountId,
-	>;
-	type ForceOrigin = AssetsForceOrigin;
+	type CreateOrigin = AsEnsureOriginWithArg<EnsureSigned<AccountId>>;
+	type ForceOrigin = EnsureRoot<AccountId>;
 	type AssetDeposit = ForeignAssetsAssetDeposit;
 	type MetadataDepositBase = ForeignAssetsMetadataDepositBase;
 	type MetadataDepositPerByte = ForeignAssetsMetadataDepositPerByte;

cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs

@@ -188,16 +188,22 @@ pub type Barrier = TrailingSetTopicAsId<
 pub type AccountIdOf<R> = <R as frame_system::Config>::AccountId;
 
 /// Asset filter that allows all assets from a certain location matching asset id.
-pub struct AssetsFrom<T>(PhantomData<T>);
-impl<T: Get<MultiLocation>> ContainsPair<MultiAsset, MultiLocation> for AssetsFrom<T> {
+pub struct AssetPrefixFrom<Prefix, Origin>(PhantomData<(Prefix, Origin)>);
+impl<Prefix, Origin> ContainsPair<MultiAsset, MultiLocation> for AssetPrefixFrom<Prefix, Origin> 
+where 
+	Prefix: Get<MultiLocation>,
+	Origin: Get<MultiLocation>,
+{
 	fn contains(asset: &MultiAsset, origin: &MultiLocation) -> bool {
-		let loc = T::get();
+		let loc = Origin::get();
 		&loc == origin &&
 			matches!(asset, MultiAsset { id: AssetId::Concrete(asset_loc), fun: Fungible(_a) }
-			if asset_loc.starts_with(&loc))
+			if asset_loc.starts_with(&Prefix::get()))
 	}
 }
 
+type AssetsFrom<T> = AssetPrefixFrom<T, T>;
+
 /// Asset filter that allows native/relay asset if coming from a certain location.
 pub struct NativeAssetFrom<T>(PhantomData<T>);
 impl<T: Get<MultiLocation>> ContainsPair<MultiAsset, MultiLocation> for NativeAssetFrom<T> {
@@ -245,10 +251,15 @@ parameter_types! {
 	pub SystemAssetHubAssetsPalletLocation: MultiLocation =
 		MultiLocation::new(1, X2(Parachain(1000), PalletInstance(50)));
 	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
+	pub EthereumLocation: MultiLocation = MultiLocation::new(2, X1(GlobalConsensus(Ethereum { chain_id: 15 })));
 }
 
-pub type Reserves =
-	(NativeAsset, AssetsFrom<SystemAssetHubLocation>, NativeAssetFrom<SystemAssetHubLocation>);
+pub type Reserves = (
+	NativeAsset,
+	AssetsFrom<SystemAssetHubLocation>,
+	NativeAssetFrom<SystemAssetHubLocation>,
+	AssetPrefixFrom<EthereumLocation, SystemAssetHubLocation>,
+);
 
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
@@ -293,13 +304,6 @@ pub type XcmRouter = WithUniqueTopic<(
 	XcmpQueue,
 )>;
 
-// TODO(alistair): Only assethub should be able to create.
-pub type ForeignCreatorsSovereignAccountOf = (
-	SiblingParachainConvertsVia<Sibling, AccountId>,
-	AccountId32Aliases<RelayNetwork, AccountId>,
-	ParentIsPreset<AccountId>,
-);
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;