Skip to content

Commit 7e1491c

Browse files
bkonturbkontur
committed
Relax force_default_xcm_version for system parachains according to the paritytech/polkadot-sdk#2385 
1 parent cc59731 commit 7e1491c

7 files changed

Lines changed: 42 additions & 32 deletions

File tree

‎system-parachains/asset-hubs/asset-hub-kusama/src/xcm_config.rs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -251,13 +251,15 @@ impl Contains<RuntimeCall> for SafeCallFilter {
251251

252252
matches!(
253253
call,
254-
RuntimeCall::PolkadotXcm(pallet_xcm::Call::force_xcm_version { .. }) |
255-
RuntimeCall::System(
256-
frame_system::Call::set_heap_pages { .. } |
257-
frame_system::Call::set_code { .. } |
258-
frame_system::Call::set_code_without_checks { .. } |
259-
frame_system::Call::kill_prefix { .. },
260-
) | RuntimeCall::ParachainSystem(..) |
254+
RuntimeCall::PolkadotXcm(
255+
pallet_xcm::Call::force_xcm_version { .. } |
256+
pallet_xcm::Call::force_default_xcm_version { .. }
257+
) | RuntimeCall::System(
258+
frame_system::Call::set_heap_pages { .. } |
259+
frame_system::Call::set_code { .. } |
260+
frame_system::Call::set_code_without_checks { .. } |
261+
frame_system::Call::kill_prefix { .. },
262+
) | RuntimeCall::ParachainSystem(..) |
261263
RuntimeCall::Timestamp(..) |
262264
RuntimeCall::Balances(..) |
263265
RuntimeCall::CollatorSelection(

‎system-parachains/asset-hubs/asset-hub-polkadot/src/xcm_config.rs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,15 @@ impl Contains<RuntimeCall> for SafeCallFilter {
207207

208208
matches!(
209209
call,
210-
RuntimeCall::PolkadotXcm(pallet_xcm::Call::force_xcm_version { .. }) |
211-
RuntimeCall::System(
212-
frame_system::Call::set_heap_pages { .. } |
213-
frame_system::Call::set_code { .. } |
214-
frame_system::Call::set_code_without_checks { .. } |
215-
frame_system::Call::kill_prefix { .. },
216-
) | RuntimeCall::ParachainSystem(..) |
210+
RuntimeCall::PolkadotXcm(
211+
pallet_xcm::Call::force_xcm_version { .. } |
212+
pallet_xcm::Call::force_default_xcm_version { .. }
213+
) | RuntimeCall::System(
214+
frame_system::Call::set_heap_pages { .. } |
215+
frame_system::Call::set_code { .. } |
216+
frame_system::Call::set_code_without_checks { .. } |
217+
frame_system::Call::kill_prefix { .. },
218+
) | RuntimeCall::ParachainSystem(..) |
217219
RuntimeCall::Timestamp(..) |
218220
RuntimeCall::Balances(..) |
219221
RuntimeCall::CollatorSelection(

‎system-parachains/bridge-hubs/bridge-hub-kusama/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ construct_runtime!(
451451

452452
// XCM helpers.
453453
XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
454-
PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin, Config<T>} = 31,
454+
PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 31,
455455
CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
456456
DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,
457457

‎system-parachains/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,15 @@ impl Contains<RuntimeCall> for SafeCallFilter {
128128

129129
matches!(
130130
call,
131-
RuntimeCall::PolkadotXcm(pallet_xcm::Call::force_xcm_version { .. }) |
132-
RuntimeCall::System(
133-
frame_system::Call::set_heap_pages { .. } |
134-
frame_system::Call::set_code { .. } |
135-
frame_system::Call::set_code_without_checks { .. } |
136-
frame_system::Call::kill_prefix { .. },
137-
) | RuntimeCall::ParachainSystem(..) |
131+
RuntimeCall::PolkadotXcm(
132+
pallet_xcm::Call::force_xcm_version { .. } |
133+
pallet_xcm::Call::force_default_xcm_version { .. }
134+
) | RuntimeCall::System(
135+
frame_system::Call::set_heap_pages { .. } |
136+
frame_system::Call::set_code { .. } |
137+
frame_system::Call::set_code_without_checks { .. } |
138+
frame_system::Call::kill_prefix { .. },
139+
) | RuntimeCall::ParachainSystem(..) |
138140
RuntimeCall::Timestamp(..) |
139141
RuntimeCall::Balances(..) |
140142
RuntimeCall::CollatorSelection(

‎system-parachains/bridge-hubs/bridge-hub-polkadot/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ construct_runtime!(
426426

427427
// XCM helpers.
428428
XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
429-
PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin, Config<T>} = 31,
429+
PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 31,
430430
CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
431431
DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,
432432

‎system-parachains/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,15 @@ impl Contains<RuntimeCall> for SafeCallFilter {
131131

132132
matches!(
133133
call,
134-
RuntimeCall::PolkadotXcm(pallet_xcm::Call::force_xcm_version { .. }) |
135-
RuntimeCall::System(
136-
frame_system::Call::set_heap_pages { .. } |
137-
frame_system::Call::set_code { .. } |
138-
frame_system::Call::set_code_without_checks { .. } |
139-
frame_system::Call::kill_prefix { .. },
140-
) | RuntimeCall::ParachainSystem(..) |
134+
RuntimeCall::PolkadotXcm(
135+
pallet_xcm::Call::force_xcm_version { .. } |
136+
pallet_xcm::Call::force_default_xcm_version { .. }
137+
) | RuntimeCall::System(
138+
frame_system::Call::set_heap_pages { .. } |
139+
frame_system::Call::set_code { .. } |
140+
frame_system::Call::set_code_without_checks { .. } |
141+
frame_system::Call::kill_prefix { .. },
142+
) | RuntimeCall::ParachainSystem(..) |
141143
RuntimeCall::Timestamp(..) |
142144
RuntimeCall::Balances(..) |
143145
RuntimeCall::CollatorSelection(

‎system-parachains/collectives/collectives-polkadot/src/xcm_config.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,10 @@ impl Contains<RuntimeCall> for SafeCallFilter {
157157
pallet_collator_selection::Call::add_invulnerable { .. } |
158158
pallet_collator_selection::Call::remove_invulnerable { .. },
159159
) | RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
160-
RuntimeCall::PolkadotXcm(pallet_xcm::Call::force_xcm_version { .. }) |
161-
RuntimeCall::XcmpQueue(..) |
160+
RuntimeCall::PolkadotXcm(
161+
pallet_xcm::Call::force_xcm_version { .. } |
162+
pallet_xcm::Call::force_default_xcm_version { .. }
163+
) | RuntimeCall::XcmpQueue(..) |
162164
RuntimeCall::DmpQueue(..) |
163165
RuntimeCall::Alliance(
164166
// `init_members` accepts unbounded vecs as arguments,

0 commit comments

Comments
 (0)