fix error handling

cumulus/parachains/runtimes/contracts/contracts-rococo/src/contracts.rs

@@ -24,7 +24,7 @@ use frame_support::{
 use pallet_contracts::{
 	migration::{v12, v13, v14, v15},
 	weights::SubstrateWeight,
-	xcm::PalletXCMAdapter,
+	xcm::XCMAdapter,
 	Config, DebugInfo, DefaultAddressGenerator, Frame, Schedule,
 };
 use sp_runtime::Perbill;
@@ -80,5 +80,5 @@ impl Config for Runtime {
 	type RuntimeHoldReason = RuntimeHoldReason;
 	type Debug = ();
 	type Environment = ();
-	type Xcm = PalletXCMAdapter<Self>;
+	type Xcm = XCMAdapter<Self>;
 }

substrate/frame/contracts/src/lib.rs

@@ -407,7 +407,7 @@ pub mod pallet {
 		/// A type that exposes XCM APIs, allowing contracts to interact with other parachains, and
 		/// execute XCM messages.
 		///
-		/// Use [`xcm::PalletXCMAdapter`] to enable or `()` to disable.
+		/// Use [`xcm::XCMAdapter`] to enable or `()` to disable.
 		type Xcm: XCM<Self>;
 	}
 

substrate/frame/contracts/src/tests/mock_network/parachain/contracts_config.rs

@@ -20,7 +20,7 @@ use crate::{
 		parachain::RuntimeHoldReason,
 		primitives::{Balance, CENTS},
 	},
-	xcm::PalletXCMAdapter,
+	xcm::XCMAdapter,
 	Config,
 };
 use frame_support::{
@@ -85,5 +85,5 @@ impl Config for Runtime {
 	type WeightPrice = Self;
 	type Debug = ();
 	type Environment = ();
-	type Xcm = PalletXCMAdapter<Self>;
+	type Xcm = XCMAdapter<Self>;
 }

substrate/frame/contracts/src/tests/test_xcm.rs

@@ -33,6 +33,7 @@ use crate::{
 };
 use codec::{Decode, Encode};
 use frame_support::{
+	assert_err,
 	pallet_prelude::Weight,
 	traits::{fungibles::Mutate, Currency},
 };
@@ -153,11 +154,17 @@ fn test_xcm_execute_filtered_call() {
 			DebugInfo::UnsafeDebug,
 			CollectEvents::UnsafeCollect,
 			Determinism::Enforced,
-		)
-		.result
-		.unwrap();
+		);
+
+		// The debug message should say that the call was filtered.
+		assert_eq!(
+			std::str::from_utf8(&result.debug_message).unwrap(),
+			"call failed with: CallFiltered"
+		);
 
-		assert_return_code!(result, RuntimeReturnCode::CallRuntimeFailed);
+		// The call should fail, with an `OutOfGas` error, as the failed xcm::execute will not
+		// refund the max_weight gas passed to it.
+		assert_err!(result.result, crate::Error::<parachain::Runtime>::OutOfGas);
 	});
 }
 

substrate/frame/contracts/src/xcm.rs

 	} 
 		/// A type that exposes XCM APIs, allowing contracts to interact with other parachains, and 
 		/// execute XCM programs. 
 		/// 
 		/// Use [`xcm::XCMAdapter`] to enable or `()` to disable. 
 		type Xcm: Xcm<Self>; 
 	/// Execute an XCM program locally, using the contract's address as the origin. 
 	/// This is equivalent to dispatching `pallet_xcm::execute` through call_runtime, except that 
 	/// the function is called directly instead of being dispatched. 
 	/// 
 	/// # Parameters 
 	/// 
 	/// - `msg_ptr`: the pointer into the linear memory where the message is placed. 
 	/// - `msg_len`: the length of the message in bytes. 
 	/// 
 	/// # Return Value 
 	/// 
 	/// Returns `ReturnCode::Success` when the XCM was successfully executed. When the XCM 
 	/// execution fails, `ReturnCode::CallRuntimeFailed` is returned. 
 	#[unstable] 
 	fn xcm_execute( 
 		ctx: _, 
 		memory: _, 
 		msg_ptr: u32, 
 		msg_len: u32, 
 	) -> Result<ReturnCode, TrapReason> { 
 		use crate::xcm::{CallOf, WeightInfo, Xcm}; 
 		use frame_support::dispatch::DispatchInfo; 
 		use xcm::VersionedXcm; 
 		ctx.charge_gas(RuntimeCosts::CopyFromContract(msg_len))?; 
 		let message: VersionedXcm<CallOf<E::T>> = 
 			ctx.read_sandbox_memory_as_unbounded(memory, msg_ptr, msg_len)?; 
 		let execute_weight = <<E::T as Config>::Xcm as Xcm<E::T>>::WeightInfo::execute(); 
 		let weight = ctx.ext.gas_meter().gas_left().max(execute_weight); 
 		let dispatch_info = DispatchInfo { weight, ..Default::default() }; 
 		ctx.call_dispatchable(dispatch_info, |ext| { 
 			<<E::T as Config>::Xcm as Xcm<E::T>>::execute( 
 				ext.address(), 
 				message, 
 				weight.saturating_sub(execute_weight), 
 			) 
 		}) 
 	} 
@@ -23,9 +23,9 @@ use sp_runtime::{DispatchError, DispatchResult};
 use xcm::{VersionedMultiLocation, VersionedXcm};
 use xcm_executor::traits::QueryResponseStatus;
 
-pub mod pallet_xcm_adapter;
+pub mod adapter;
 
-pub use pallet_xcm_adapter::PalletXCMAdapter;
+pub use adapter::XCMAdapter;
 pub type CallOf<T> = <T as frame_system::Config>::RuntimeCall;
 
 pub trait XCM<T: Config> {

substrate/frame/contracts/src/xcm/pallet_xcm_adapter.rs → substrate/frame/contracts/src/xcm/adapter.rs

@@ -19,19 +19,17 @@ use crate::{
 	xcm::{CallOf, WeightInfo, XCM},
 	AccountIdOf, Box, Config, RawOrigin,
 };
-use frame_support::{
-	dispatch::PostDispatchInfo, pallet_prelude::DispatchResultWithPostInfo, weights::Weight,
-};
+use frame_support::{pallet_prelude::DispatchResultWithPostInfo, weights::Weight};
 use frame_system::pallet_prelude::BlockNumberFor;
 use pallet_xcm::WeightInfo as XcmWeightInfo;
-use sp_runtime::{DispatchError, DispatchErrorWithPostInfo, DispatchResult};
+use sp_runtime::{DispatchError, DispatchResult};
 use xcm::{v3::MultiLocation, VersionedMultiLocation, VersionedXcm};
 use xcm_executor::traits::{QueryHandler, QueryResponseStatus};
 
 /// A pallet-xcm adapter for the XCM trait.
-pub struct PalletXCMAdapter<T: pallet_xcm::Config>(sp_std::marker::PhantomData<T>);
+pub struct XCMAdapter<T: pallet_xcm::Config>(sp_std::marker::PhantomData<T>);
 
-impl<T> WeightInfo for PalletXCMAdapter<T>
+impl<T> WeightInfo for XCMAdapter<T>
 where
 	T: pallet_xcm::Config,
 {
@@ -49,8 +47,8 @@ where
 	}
 }
 
-impl<T: Config + pallet_xcm::Config> PalletXCMAdapter<T> {
-	/// Ensure that the message is executable, by checking that it does not contain any Transact
+impl<T: Config + pallet_xcm::Config> XCMAdapter<T> {
+	/// Ensure that the message is executable, by checking that it does not contain any [`Transact`]
 	/// instruction with a call that is not allowed by the CallFilter.
 	fn ensure_executable(
 		message: VersionedXcm<CallOf<T>>,
@@ -76,7 +74,7 @@ impl<T: Config + pallet_xcm::Config> PalletXCMAdapter<T> {
 	}
 }
 
-impl<T: Config + pallet_xcm::Config> XCM<T> for PalletXCMAdapter<T> {
+impl<T: Config + pallet_xcm::Config> XCM<T> for XCMAdapter<T> {
 	type QueryId = <pallet_xcm::Pallet<T> as QueryHandler>::QueryId;
 	type WeightInfo = Self;
 
@@ -85,16 +83,7 @@ impl<T: Config + pallet_xcm::Config> XCM<T> for PalletXCMAdapter<T> {
 		message: VersionedXcm<CallOf<T>>,
 		max_weight: Weight,
 	) -> DispatchResultWithPostInfo {
-		// TODO since we are doing more than just calling pallet_xcm::Pallet::<T>::execute, we
-		// should benchmark this ensure_executable
-		let msg = Self::ensure_executable(message).map_err(|err| DispatchErrorWithPostInfo {
-			post_info: PostDispatchInfo {
-				actual_weight: Some(Weight::zero()),
-				pays_fee: Default::default(),
-			},
-			error: err.into(),
-		})?;
-
+		let msg = Self::ensure_executable(message)?;
 		let origin = RawOrigin::Signed(origin.clone()).into();
 		pallet_xcm::Pallet::<T>::execute(origin, msg, max_weight)
 	}