Merge branch 'stable2412' into ib-remove-pallet-revive-from-sdk

Author: iulianbarbu

cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/claim_assets.rs

@@ -17,9 +17,7 @@
 
 use crate::imports::*;
 
-use assets_common::runtime_api::runtime_decl_for_fungibles_api::FungiblesApiV2;
 use emulated_integration_tests_common::test_chain_can_claim_assets;
-use frame_support::traits::fungible::Mutate;
 use xcm_executor::traits::DropAssets;
 
 #[test]
@@ -35,83 +33,3 @@ fn assets_can_be_claimed() {
 		amount
 	);
 }
-
-#[test]
-fn chain_can_claim_assets_for_its_users() {
-	// Many Penpal users have assets trapped in AssetHubWestend.
-	let beneficiaries: Vec<(Location, Assets)> = vec![
-		// Some WND.
-		(
-			Location::new(1, [Parachain(2000), AccountId32 { id: [0u8; 32], network: None }]),
-			(Parent, 10_000_000_000_000u128).into(),
-		),
-		// Some USDT.
-		(
-			Location::new(1, [Parachain(2000), AccountId32 { id: [1u8; 32], network: None }]),
-			([PalletInstance(ASSETS_PALLET_ID), GeneralIndex(USDT_ID.into())], 100_000_000u128)
-				.into(),
-		),
-	];
-
-	// Start with those assets trapped.
-	AssetHubWestend::execute_with(|| {
-		for (location, assets) in &beneficiaries {
-			<AssetHubWestend as AssetHubWestendPallet>::PolkadotXcm::drop_assets(
-				location,
-				assets.clone().into(),
-				&XcmContext { origin: None, message_id: [0u8; 32], topic: None },
-			);
-		}
-	});
-
-	let penpal_to_asset_hub = PenpalA::sibling_location_of(AssetHubWestend::para_id());
-	let mut builder = Xcm::<()>::builder()
-		.withdraw_asset((Parent, 1_000_000_000_000u128))
-		.pay_fees((Parent, 100_000_000_000u128));
-
-	// Loop through all beneficiaries.
-	for (location, assets) in &beneficiaries {
-		builder = builder.execute_with_origin(
-			// We take only the last part, the `AccountId32` junction.
-			Some((*location.interior().last().unwrap()).into()),
-			Xcm::<()>::builder_unsafe()
-				.claim_asset(assets.clone(), Location::new(0, [GeneralIndex(5)])) // Means lost assets were version 5.
-				.deposit_asset(assets.clone(), location.clone())
-				.build(),
-		)
-	}
-
-	// Finish assembling the message.
-	let message = builder.build();
-
-	// Fund PenpalA's sovereign account on AssetHubWestend so it can pay for fees.
-	AssetHubWestend::execute_with(|| {
-		let penpal_as_seen_by_asset_hub = AssetHubWestend::sibling_location_of(PenpalA::para_id());
-		let penpal_sov_account_on_asset_hub =
-			AssetHubWestend::sovereign_account_id_of(penpal_as_seen_by_asset_hub);
-		type Balances = <AssetHubWestend as AssetHubWestendPallet>::Balances;
-		assert_ok!(<Balances as Mutate<_>>::mint_into(
-			&penpal_sov_account_on_asset_hub,
-			2_000_000_000_000u128,
-		));
-	});
-
-	// We can send a message from Penpal root that claims all those assets for each beneficiary.
-	PenpalA::execute_with(|| {
-		assert_ok!(<PenpalA as PenpalAPallet>::PolkadotXcm::send(
-			<PenpalA as Chain>::RuntimeOrigin::root(),
-			bx!(penpal_to_asset_hub.into()),
-			bx!(VersionedXcm::from(message)),
-		));
-	});
-
-	// We assert beneficiaries have received their funds.
-	AssetHubWestend::execute_with(|| {
-		for (location, expected_assets) in &beneficiaries {
-			let sov_account = AssetHubWestend::sovereign_account_id_of(location.clone());
-			let actual_assets =
-				<AssetHubWestend as Chain>::Runtime::query_account_balances(sov_account).unwrap();
-			assert_eq!(VersionedAssets::from(expected_assets.clone()), actual_assets);
-		}
-	});
-}

polkadot/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs

@@ -240,7 +240,9 @@ benchmarks! {
 		let instruction = Instruction::ExecuteWithOrigin { descendant_origin: Some(who.clone()), xcm: Xcm(vec![]) };
 		let xcm = Xcm(vec![instruction]);
 	}: {
-		executor.bench_process(xcm)?;
+		executor
+			.bench_process(xcm)
+			.map_err(|_| BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))?;
 	} verify {
 		assert_eq!(
 			executor.origin(),

polkadot/xcm/xcm-executor/src/lib.rs

@@ -1049,24 +1049,7 @@ impl<Config: config::Config> XcmExecutor<Config> {
 			},
 			DescendOrigin(who) => self.do_descend_origin(who),
 			ClearOrigin => self.do_clear_origin(),
-			ExecuteWithOrigin { descendant_origin, xcm } => {
-				let previous_origin = self.context.origin.clone();
-
-				// Set new temporary origin.
-				if let Some(who) = descendant_origin {
-					self.do_descend_origin(who)?;
-				} else {
-					self.do_clear_origin()?;
-				}
-				// Process instructions.
-				let result = self.process(xcm).map_err(|error| {
-					tracing::error!(target: "xcm::execute", ?error, actual_origin = ?self.context.origin, original_origin = ?previous_origin, "ExecuteWithOrigin inner xcm failure");
-					error.xcm_error
-				});
-				// Reset origin to previous one.
-				self.context.origin = previous_origin;
-				result
-			},
+			ExecuteWithOrigin { .. } => Err(XcmError::Unimplemented),
 			ReportError(response_info) => {
 				// Report the given result by sending a QueryResponse XCM to a previously given
 				// outcome destination if one was registered.

polkadot/xcm/xcm-executor/src/tests/execute_with_origin.rs

@@ -20,7 +20,6 @@
 //! `xcm-emulator` based tests in the cumulus folder.
 //! These tests deal with internal state changes of the XCVM.
 
-mod execute_with_origin;
 mod initiate_transfer;
 mod mock;
 mod pay_fees;

polkadot/xcm/xcm-executor/src/tests/mod.rs

@@ -0,0 +1,11 @@
+title: Remove execute_with_origin implementation in the XCM executor
+doc:
+- audience: Runtime Dev
+  description: |
+    The XCM executor will not support the `ExecuteWithOrigin` instruction from the start.
+    It might be added later when more time can be spent on it.
+crates:
+- name: pallet-xcm-benchmarks
+  bump: patch
+- name: staging-xcm-executor
+  bump: patch