fix xcm barrier to allow SetTopic

eq-lab · Nov 13, 2023 · 1859169 · 1859169
1 parent b6abd38
commit 1859169
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/eq-xcm/src/barrier.rs b/eq-xcm/src/barrier.rs
@@ -27,10 +27,11 @@ use xcm_executor::traits::ShouldExecute;
 pub struct AllowReserveAssetDepositedFrom<EqAssets, AllowedOrigins>(
     PhantomData<(EqAssets, AllowedOrigins)>,
 );
-impl<EqAssets: AssetXcmGetter, AllowedOrigins: Contains<MultiLocation>> ShouldExecute
-    for AllowReserveAssetDepositedFrom<EqAssets, AllowedOrigins>
+
+impl<EqAssets: AssetXcmGetter, AllowedOrigins: Contains<MultiLocation>>
+    AllowReserveAssetDepositedFrom<EqAssets, AllowedOrigins>
 {
-    fn should_execute<RuntimeCall>(
+    fn check<RuntimeCall>(
         origin: &MultiLocation,
         instructions: &mut [Instruction<RuntimeCall>],
         max_weight: Weight,
@@ -88,6 +89,23 @@ impl<EqAssets: AssetXcmGetter, AllowedOrigins: Contains<MultiLocation>> ShouldEx
     }
 }
 
+impl<EqAssets: AssetXcmGetter, AllowedOrigins: Contains<MultiLocation>> ShouldExecute
+    for AllowReserveAssetDepositedFrom<EqAssets, AllowedOrigins>
+{
+    fn should_execute<RuntimeCall>(
+        origin: &MultiLocation,
+        instructions: &mut [Instruction<RuntimeCall>],
+        max_weight: Weight,
+        _weight_credit: &mut Weight,
+    ) -> Result<(), ProcessMessageError> {
+        if let Some((SetTopic(_), rest)) = instructions.split_last_mut() {
+            Self::check(origin, rest, max_weight, _weight_credit)
+        } else {
+            Self::check(origin, instructions, max_weight, _weight_credit)
+        }
+    }
+}
+
 pub struct AllowReserveTransferAssetsFromAccountId;
 
 impl ShouldExecute for AllowReserveTransferAssetsFromAccountId {