Feat/xcm v3 expect transact status

pallets/evm-signatures/src/tests.rs

@@ -127,7 +127,6 @@ impl pallet_assets::Config for Runtime {
     type WeightInfo = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
     type CallbackHandle = ();
-    #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }
 

pallets/liquid-staking/src/benchmarking.rs

@@ -289,7 +289,7 @@ benchmarks! {
         Response::ExecutionResult(None)
     )
     verify {
-        assert_last_event::<T>(Event::<T>::NotificationReceived(Box::new(MultiLocation::parent()), 0u64, None).into());
+        assert_last_event::<T>(Event::<T>::NotificationReceived(Box::new(MultiLocation::parent()), 0u64, MaybeErrorCode::Success).into());
     }
 
     claim_for {

pallets/liquid-staking/src/lib.rs

@@ -266,7 +266,7 @@ pub mod pallet {
         ExchangeRateUpdated(Rate),
         /// Notification received
         /// [multi_location, query_id, res]
-        NotificationReceived(Box<MultiLocation>, QueryId, Option<(u32, XcmError)>),
+        NotificationReceived(Box<MultiLocation>, QueryId, MaybeErrorCode),
         /// Claim user's unbonded staking assets
         /// [account_id, amount]
         ClaimedFor(T::AccountId, BalanceOf<T>),
@@ -771,9 +771,9 @@ pub mod pallet {
                 .or_else(|_| {
                     T::UpdateOrigin::ensure_origin(origin).map(|_| MultiLocation::here())
                 })?;
-            if let Response::ExecutionResult(res) = response {
+            if let Response::DispatchResult(res) = response {
                 if let Some(request) = Self::xcm_request(query_id) {
-                    Self::do_notification_received(query_id, request, res)?;
+                    Self::do_notification_received(query_id, request, res.clone())?;
                 }
 
                 Self::deposit_event(Event::<T>::NotificationReceived(
@@ -1708,7 +1708,7 @@ pub mod pallet {
         fn do_notification_received(
             query_id: QueryId,
             req: XcmRequest<T>,
-            res: Option<(u32, XcmError)>,
+            res: MaybeErrorCode,
         ) -> DispatchResult {
             use XcmRequest::*;
 
@@ -1719,8 +1719,9 @@ pub mod pallet {
                 &res
             );
 
-            let executed = res.is_none();
-            if !executed {
+            XcmRequests::<T>::remove(query_id);
+
+            if !matches!(res, MaybeErrorCode::Success) {
                 return Ok(());
             }
 
@@ -1798,7 +1799,7 @@ pub mod pallet {
                 }
                 Nominate { targets: _, .. } => {}
             }
-            XcmRequests::<T>::remove(query_id);
+
             Ok(())
         }
 

pallets/prices/src/mock.rs

@@ -235,7 +235,6 @@ impl pallet_assets::Config for Test {
     type WeightInfo = ();
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
     type CallbackHandle = ();
-    #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }
 

pallets/xcm-helper/src/lib.rs

@@ -268,7 +268,7 @@ impl<T: Config> Pallet<T> {
         let notify: <T as pallet_xcm::Config>::RuntimeCall = notify.into();
         let max_weight = notify.get_dispatch_info().weight;
         let query_id = pallet_xcm::Pallet::<T>::new_notify_query(responder, notify, timeout, Here);
-        let report_error = Xcm(vec![ReportError(QueryResponseInfo {
+        let report_error = Xcm(vec![ReportTransactStatus(QueryResponseInfo {
             destination,
             query_id,
             max_weight,

precompiles/assets-erc20/src/mock.rs

@@ -255,7 +255,6 @@ impl pallet_assets::Config for Runtime {
     type WeightInfo = pallet_assets::weights::SubstrateWeight<Runtime>;
     type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
     type CallbackHandle = ();
-    #[cfg(feature = "runtime-benchmarks")]
     type BenchmarkHelper = ();
 }
 

runtime/heiko/src/lib.rs

@@ -183,7 +183,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_version: 204,
     impl_version: 33,
     apis: RUNTIME_API_VERSIONS,
-    transaction_version: 17,
+    transaction_version: 18,
     state_version: 0,
 };
 

runtime/kerria/src/lib.rs

@@ -183,7 +183,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_version: 204,
     impl_version: 33,
     apis: RUNTIME_API_VERSIONS,
-    transaction_version: 17,
+    transaction_version: 18,
     state_version: 0,
 };
 

runtime/parallel/src/lib.rs

@@ -187,7 +187,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_version: 204,
     impl_version: 33,
     apis: RUNTIME_API_VERSIONS,
-    transaction_version: 17,
+    transaction_version: 18,
     state_version: 0,
 };
 

runtime/vanilla/src/lib.rs

@@ -183,7 +183,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_version: 204,
     impl_version: 33,
     apis: RUNTIME_API_VERSIONS,
-    transaction_version: 17,
+    transaction_version: 18,
     state_version: 0,
 };