Nest errors in pallet-xcm

bridges/snowbridge/primitives/core/src/reward.rs

@@ -194,8 +194,8 @@ mod tests {
 	pub struct MockXcmExecutor;
 	impl<C> ExecuteXcm<C> for MockXcmExecutor {
 		type Prepared = Weightless;
-		fn prepare(message: Xcm<C>) -> Result<Self::Prepared, Xcm<C>> {
-			Err(message)
+		fn prepare(_: Xcm<C>, _: Weight) -> Result<Self::Prepared, InstructionError> {
+			Err(InstructionError { index: 0, error: XcmError::Unimplemented })
 		}
 		fn execute(
 			_: impl Into<Location>,
@@ -313,8 +313,8 @@ mod tests {
 		struct FailingXcmExecutor;
 		impl<C> ExecuteXcm<C> for FailingXcmExecutor {
 			type Prepared = Weightless;
-			fn prepare(message: Xcm<C>) -> Result<Self::Prepared, Xcm<C>> {
-				Err(message)
+			fn prepare(_: Xcm<C>, _: Weight) -> Result<Self::Prepared, InstructionError> {
+				Err(InstructionError { index: 0, error: XcmError::Unimplemented })
 			}
 			fn execute(
 				_: impl Into<Location>,

bridges/snowbridge/runtime/test-common/src/lib.rs

@@ -420,7 +420,10 @@ pub fn send_transfer_token_message_failure<Runtime, XcmConfig>(
 				destination_address,
 				fee_amount,
 			);
-			assert_err!(outcome.ensure_complete(), expected_error);
+			assert_err!(
+				outcome.ensure_complete(),
+				InstructionError { index: 0, error: expected_error }
+			);
 		});
 }
 

bridges/snowbridge/test-utils/src/mock_xcm.rs

@@ -130,7 +130,7 @@ impl PreparedMessage for Weightless {
 pub struct MockXcmExecutor;
 impl<C> ExecuteXcm<C> for MockXcmExecutor {
 	type Prepared = Weightless;
-	fn prepare(_: Xcm<C>) -> Result<Self::Prepared, Xcm<C>> {
+	fn prepare(_: Xcm<C>, _: Weight) -> Result<Self::Prepared, InstructionError> {
 		unreachable!()
 	}
 	fn execute(_: impl Into<Location>, _: Self::Prepared, _: &mut XcmHash, _: Weight) -> Outcome {

cumulus/parachains/integration-tests/emulated/common/src/impls.rs

@@ -31,6 +31,7 @@ pub use frame_support::{
 pub use pallet_assets;
 pub use pallet_message_queue;
 pub use pallet_xcm;
+pub use xcm;
 
 // Polkadot
 pub use polkadot_runtime_parachains::{
@@ -233,7 +234,7 @@ macro_rules! impl_assert_events_helpers_for_relay_chain {
 						vec![
 							// Dispatchable is properly executed and XCM message sent
 							[<$chain RuntimeEvent>]::<N>::XcmPallet(
-								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Incomplete { used: weight, error } }
+								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Incomplete { used: weight, error: $crate::impls::xcm::prelude::InstructionError { error, .. } } }
 							) => {
 								weight: $crate::impls::weight_within_threshold(
 									($crate::impls::REF_TIME_THRESHOLD, $crate::impls::PROOF_SIZE_THRESHOLD),
@@ -471,7 +472,7 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 						vec![
 							// Dispatchable is properly executed and XCM message sent
 							[<$chain RuntimeEvent>]::<N>::PolkadotXcm(
-								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Incomplete { used: weight, error } }
+								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Incomplete { used: weight, error: $crate::impls::xcm::prelude::InstructionError { error, .. } } }
 							) => {
 								weight: $crate::impls::weight_within_threshold(
 									($crate::impls::REF_TIME_THRESHOLD, $crate::impls::PROOF_SIZE_THRESHOLD),
@@ -491,7 +492,7 @@ macro_rules! impl_assert_events_helpers_for_parachain {
 						vec![
 							// Execution fails in the origin with `Barrier`
 							[<$chain RuntimeEvent>]::<N>::PolkadotXcm(
-								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Error { error } }
+								$crate::impls::pallet_xcm::Event::Attempted { outcome: $crate::impls::Outcome::Error($crate::impls::xcm::prelude::InstructionError { error, .. }) }
 							) => {
 								error: *error == expected_error.unwrap_or((*error).into()).into(),
 							},

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

@@ -31,41 +31,56 @@ use frame_support::{
 use parachains_common::{AccountId, Balance};
 use sp_tracing::capture_test_logs;
 use std::convert::Into;
-use xcm::latest::{Assets, Location, Xcm};
+use xcm::latest::{Assets, Error as XcmError, Location, Xcm};
 
 const UNITS: Balance = 1_000_000_000;
 
 #[test]
 fn exchange_asset_success() {
-	test_exchange_asset(true, 500 * UNITS, 665 * UNITS, true);
+	test_exchange_asset(true, 500 * UNITS, 665 * UNITS, None);
 }
 
 #[test]
 fn exchange_asset_insufficient_liquidity() {
 	let log_capture = capture_test_logs!({
-		test_exchange_asset(true, 1_000 * UNITS, 2_000 * UNITS, false);
+		test_exchange_asset(
+			true,
+			1_000 * UNITS,
+			2_000 * UNITS,
+			Some(InstructionError { index: 1, error: XcmError::NoDeal }),
+		);
 	});
 	assert!(log_capture.contains("NoDeal"));
 }
 
 #[test]
 fn exchange_asset_insufficient_balance() {
 	let log_capture = capture_test_logs!({
-		test_exchange_asset(true, 5_000 * UNITS, 1_665 * UNITS, false);
+		test_exchange_asset(
+			true,
+			5_000 * UNITS,
+			1_665 * UNITS,
+			Some(InstructionError { index: 0, error: XcmError::FailedToTransactAsset("") }),
+		);
 	});
 	assert!(log_capture.contains("Funds are unavailable"));
 }
 
 #[test]
 fn exchange_asset_pool_not_created() {
-	test_exchange_asset(false, 500 * UNITS, 665 * UNITS, false);
+	test_exchange_asset(
+		false,
+		500 * UNITS,
+		665 * UNITS,
+		Some(InstructionError { index: 1, error: XcmError::NoDeal }),
+	);
 }
 
 fn test_exchange_asset(
 	create_pool: bool,
 	give_amount: Balance,
 	want_amount: Balance,
-	should_succeed: bool,
+	expected_error: Option<InstructionError>,
 ) {
 	let alice: AccountId = Westend::account_id_of(ALICE);
 	let native_asset_location = WestendLocation::get();
@@ -112,20 +127,13 @@ fn test_exchange_asset(
 		let foreign_balance_after = ForeignAssets::balance(asset_location, &alice);
 		let wnd_balance_after = Balances::total_balance(&alice);
 
-		if should_succeed {
-			assert_ok!(result);
-			assert!(
-				foreign_balance_after >= foreign_balance_before + want_amount,
-				"Expected foreign balance to increase by at least {want_amount} units, got {foreign_balance_after} from {foreign_balance_before}"
-			);
-			assert_eq!(
-				wnd_balance_after, wnd_balance_before - give_amount,
-				"Expected WND balance to decrease by {give_amount} units, got {wnd_balance_after} from {wnd_balance_before}"
-			);
-		} else {
+		if let Some(InstructionError { index, error }) = expected_error {
 			assert_err_ignore_postinfo!(
 				result,
-				pallet_xcm::Error::<Runtime>::LocalExecutionIncomplete
+				pallet_xcm::Error::<Runtime>::LocalExecutionIncompleteWithError {
+					index,
+					error: error.into()
+				}
 			);
 			assert_eq!(
 				foreign_balance_after, foreign_balance_before,
@@ -135,6 +143,16 @@ fn test_exchange_asset(
 				wnd_balance_after, wnd_balance_before,
 				"WND balance changed unexpectedly: got {wnd_balance_after}, expected {wnd_balance_before}"
 			);
+		} else {
+			assert_ok!(result);
+			assert!(
+				foreign_balance_after >= foreign_balance_before + want_amount,
+				"Expected foreign balance to increase by at least {want_amount} units, got {foreign_balance_after} from {foreign_balance_before}"
+			);
+			assert_eq!(
+				wnd_balance_after, wnd_balance_before - give_amount,
+				"Expected WND balance to decrease by {give_amount} units, got {wnd_balance_after} from {wnd_balance_before}"
+			);
 		}
 	});
 }

cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/snowbridge_v2_outbound.rs

@@ -1008,7 +1008,10 @@ fn export_message_from_asset_hub_to_ethereum_is_banned_when_set_operating_mode()
 				bx!(xcm),
 				Weight::from(EXECUTION_WEIGHT),
 			),
-			pallet_xcm::Error::<Runtime>::LocalExecutionIncomplete
+			pallet_xcm::Error::<Runtime>::LocalExecutionIncompleteWithError {
+				error: XcmError::Unroutable.into(),
+				index: 2
+			}
 		);
 	});
 }

cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs

@@ -1417,23 +1417,23 @@ fn governance_authorize_upgrade_works() {
 			Runtime,
 			RuntimeOrigin,
 		>(GovernanceOrigin::Location(Location::new(1, Parachain(12334)))),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 	// no - AssetHub
 	assert_err!(
 		parachains_runtimes_test_utils::test_cases::can_governance_authorize_upgrade::<
 			Runtime,
 			RuntimeOrigin,
 		>(GovernanceOrigin::Location(Location::new(1, Parachain(ASSET_HUB_ID)))),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 	// no - Collectives
 	assert_err!(
 		parachains_runtimes_test_utils::test_cases::can_governance_authorize_upgrade::<
 			Runtime,
 			RuntimeOrigin,
 		>(GovernanceOrigin::Location(Location::new(1, Parachain(COLLECTIVES_ID)))),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 	// no - Collectives Voice of Fellows plurality
 	assert_err!(
@@ -1444,7 +1444,7 @@ fn governance_authorize_upgrade_works() {
 			Location::new(1, Parachain(COLLECTIVES_ID)),
 			Plurality { id: BodyId::Technical, part: BodyPart::Voice }.into()
 		)),
-		Either::Right(XcmError::BadOrigin)
+		Either::Right(InstructionError { index: 2, error: XcmError::BadOrigin })
 	);
 
 	// ok - relaychain

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/tests/tests.rs

@@ -781,23 +781,23 @@ fn governance_authorize_upgrade_works() {
 			Runtime,
 			RuntimeOrigin,
 		>(GovernanceOrigin::Location(Location::new(1, Parachain(12334)))),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 	// no - AssetHub
 	assert_err!(
 		parachains_runtimes_test_utils::test_cases::can_governance_authorize_upgrade::<
 			Runtime,
 			RuntimeOrigin,
 		>(GovernanceOrigin::Location(Location::new(1, Parachain(ASSET_HUB_ID)))),
-		Either::Right(XcmError::BadOrigin)
+		Either::Right(InstructionError { index: 1, error: XcmError::BadOrigin })
 	);
 	// no - Collectives
 	assert_err!(
 		parachains_runtimes_test_utils::test_cases::can_governance_authorize_upgrade::<
 			Runtime,
 			RuntimeOrigin,
 		>(GovernanceOrigin::Location(Location::new(1, Parachain(COLLECTIVES_ID)))),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 	// no - Collectives Voice of Fellows plurality
 	assert_err!(
@@ -808,7 +808,7 @@ fn governance_authorize_upgrade_works() {
 			Location::new(1, Parachain(COLLECTIVES_ID)),
 			Plurality { id: BodyId::Technical, part: BodyPart::Voice }.into()
 		)),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 
 	// ok - relaychain

cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases/mod.rs

@@ -640,7 +640,7 @@ where
 	]);
 
 	// get weight
-	let weight = XcmConfig::Weigher::weight(&mut xcm);
+	let weight = XcmConfig::Weigher::weight(&mut xcm, Weight::MAX);
 	assert_ok!(weight);
 	let weight = weight.unwrap();
 	// check if sane

cumulus/parachains/runtimes/collectives/collectives-westend/tests/tests.rs

@@ -161,23 +161,23 @@ fn governance_authorize_upgrade_works() {
 			Runtime,
 			RuntimeOrigin,
 		>(GovernanceOrigin::Location(Location::new(1, Parachain(12334)))),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 	// no - AssetHub
 	assert_err!(
 		parachains_runtimes_test_utils::test_cases::can_governance_authorize_upgrade::<
 			Runtime,
 			RuntimeOrigin,
 		>(GovernanceOrigin::Location(Location::new(1, Parachain(ASSET_HUB_ID)))),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 	// no - Collectives
 	assert_err!(
 		parachains_runtimes_test_utils::test_cases::can_governance_authorize_upgrade::<
 			Runtime,
 			RuntimeOrigin,
 		>(GovernanceOrigin::Location(Location::new(1, Parachain(COLLECTIVES_ID)))),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 	// no - Collectives Voice of Fellows plurality
 	assert_err!(
@@ -188,7 +188,7 @@ fn governance_authorize_upgrade_works() {
 			Location::new(1, Parachain(COLLECTIVES_ID)),
 			Plurality { id: BodyId::Technical, part: BodyPart::Voice }.into()
 		)),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 
 	// ok - relaychain

cumulus/parachains/runtimes/coretime/coretime-westend/tests/tests.rs

@@ -161,23 +161,23 @@ fn governance_authorize_upgrade_works() {
 			Runtime,
 			RuntimeOrigin,
 		>(GovernanceOrigin::Location(Location::new(1, Parachain(12334)))),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 	// no - AssetHub
 	assert_err!(
 		parachains_runtimes_test_utils::test_cases::can_governance_authorize_upgrade::<
 			Runtime,
 			RuntimeOrigin,
 		>(GovernanceOrigin::Location(Location::new(1, Parachain(ASSET_HUB_ID)))),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 	// no - Collectives
 	assert_err!(
 		parachains_runtimes_test_utils::test_cases::can_governance_authorize_upgrade::<
 			Runtime,
 			RuntimeOrigin,
 		>(GovernanceOrigin::Location(Location::new(1, Parachain(COLLECTIVES_ID)))),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 	// no - Collectives Voice of Fellows plurality
 	assert_err!(
@@ -188,7 +188,7 @@ fn governance_authorize_upgrade_works() {
 			Location::new(1, Parachain(COLLECTIVES_ID)),
 			Plurality { id: BodyId::Technical, part: BodyPart::Voice }.into()
 		)),
-		Either::Right(XcmError::BadOrigin)
+		Either::Right(InstructionError { index: 2, error: XcmError::BadOrigin })
 	);
 
 	// ok - relaychain

cumulus/parachains/runtimes/people/people-westend/tests/tests.rs

@@ -161,23 +161,23 @@ fn governance_authorize_upgrade_works() {
 			Runtime,
 			RuntimeOrigin,
 		>(GovernanceOrigin::Location(Location::new(1, Parachain(12334)))),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 	// no - AssetHub
 	assert_err!(
 		parachains_runtimes_test_utils::test_cases::can_governance_authorize_upgrade::<
 			Runtime,
 			RuntimeOrigin,
 		>(GovernanceOrigin::Location(Location::new(1, Parachain(ASSET_HUB_ID)))),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 	// no - Collectives
 	assert_err!(
 		parachains_runtimes_test_utils::test_cases::can_governance_authorize_upgrade::<
 			Runtime,
 			RuntimeOrigin,
 		>(GovernanceOrigin::Location(Location::new(1, Parachain(COLLECTIVES_ID)))),
-		Either::Right(XcmError::Barrier)
+		Either::Right(InstructionError { index: 0, error: XcmError::Barrier })
 	);
 	// no - Collectives Voice of Fellows plurality
 	assert_err!(
@@ -188,7 +188,7 @@ fn governance_authorize_upgrade_works() {
 			Location::new(1, Parachain(COLLECTIVES_ID)),
 			Plurality { id: BodyId::Technical, part: BodyPart::Voice }.into()
 		)),
-		Either::Right(XcmError::BadOrigin)
+		Either::Right(InstructionError { index: 2, error: XcmError::BadOrigin })
 	);
 
 	// ok - relaychain

cumulus/parachains/runtimes/test-utils/src/lib.rs

@@ -476,7 +476,7 @@ impl<
 	pub fn execute_as_governance_call<Call: Dispatchable + Encode>(
 		call: Call,
 		governance_origin: GovernanceOrigin<Call::RuntimeOrigin>,
-	) -> Result<(), Either<DispatchError, XcmError>> {
+	) -> Result<(), Either<DispatchError, InstructionError>> {
 		// execute xcm as governance would send
 		let execute_xcm = |call: Call, governance_location, descend_origin| {
 			// prepare xcm