Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Allow explicit unpaid executions from the relay chains for system parachains #2060

Merged
merged 6 commits into from
Jan 7, 2023
Merged

Allow explicit unpaid executions from the relay chains for system parachains #2060

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c3d2059
Allow explicit unpaid executions from the relay chains for system par…
KiChjang Jan 5, 2023
1677b0d
Put origin-filtering barriers into WithComputedOrigin
KiChjang Jan 6, 2023
f388cd0
Use ConstU32<8>
KiChjang Jan 6, 2023
f8926e3
Small nits
KiChjang Jan 7, 2023
254e3f6
formatting
KiChjang Jan 7, 2023
fd3f156
cargo fmt
KiChjang Jan 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use ConstU32<8>
  • Loading branch information
@KiChjang
KiChjang committed Jan 6, 2023
commit f388cd0cd1371e8af0d0a3a27f5d75b2fb075092
3 changes: 1 addition & 2 deletions parachain-template/runtime/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ parameter_types! {
pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 64 * 1024);
pub const MaxInstructions: u32 = 100;
pub const MaxAssetsIntoHolding: u32 = 64;
pub const MaxPrefixes: u32 = 8;
}

match_types! {
Expand Down Expand Up @@ -165,7 +164,7 @@ pub type Barrier = DenyThenTry<
// ^^^ Parent and its exec plurality get free execution
),
UniversalLocation,
MaxPrefixes,
ConstU32<8>,
>,
),
>;
Expand Down
3 changes: 1 addition & 2 deletions parachains/runtimes/assets/statemine/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ pub type XcmOriginToTransactDispatchOrigin = (
parameter_types! {
pub const MaxInstructions: u32 = 100;
pub const MaxAssetsIntoHolding: u32 = 64;
pub const MaxPrefixes: u32 = 8;
pub XcmAssetFeesReceiver: Option<AccountId> = Authorship::author();
}

Expand Down Expand Up @@ -264,7 +263,7 @@ pub type Barrier = DenyThenTry<
AllowSubscriptionsFrom<ParentOrSiblings>,
),
UniversalLocation,
MaxPrefixes,
ConstU32<8>,
>,
),
>;
Expand Down
2 changes: 1 addition & 1 deletion parachains/runtimes/assets/statemint/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ pub type Barrier = DenyThenTry<
AllowSubscriptionsFrom<ParentOrSiblings>,
),
UniversalLocation,
MaxPrefixes,
ConstU32<8>,
>,
),
>;
Expand Down
3 changes: 1 addition & 2 deletions parachains/runtimes/assets/westmint/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ pub type XcmOriginToTransactDispatchOrigin = (
parameter_types! {
pub const MaxInstructions: u32 = 100;
pub const MaxAssetsIntoHolding: u32 = 64;
pub const MaxPrefixes: u32 = 8;
pub XcmAssetFeesReceiver: Option<AccountId> = Authorship::author();
}

Expand Down Expand Up @@ -259,7 +258,7 @@ pub type Barrier = DenyThenTry<
AllowSubscriptionsFrom<Everything>,
),
UniversalLocation,
MaxPrefixes,
ConstU32<8>,
>,
),
>;
Expand Down
3 changes: 1 addition & 2 deletions parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ parameter_types! {
X2(GlobalConsensus(RelayNetwork::get().unwrap()), Parachain(ParachainInfo::parachain_id().into()));
pub const MaxInstructions: u32 = 100;
pub const MaxAssetsIntoHolding: u32 = 64;
pub const MaxPrefixes: u32 = 8;
}

/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
Expand Down Expand Up @@ -170,7 +169,7 @@ pub type Barrier = DenyThenTry<
AllowSubscriptionsFrom<ParentOrSiblings>,
),
UniversalLocation,
MaxPrefixes,
ConstU32<8>,
>,
),
>;
Expand Down
3 changes: 1 addition & 2 deletions parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ parameter_types! {
X2(GlobalConsensus(RelayNetwork::get().unwrap()), Parachain(ParachainInfo::parachain_id().into()));
pub const MaxInstructions: u32 = 100;
pub const MaxAssetsIntoHolding: u32 = 64;
pub const MaxPrefixes: u32 = 8;
}

/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
Expand Down Expand Up @@ -170,7 +169,7 @@ pub type Barrier = DenyThenTry<
AllowSubscriptionsFrom<ParentOrSiblings>,
),
UniversalLocation,
MaxPrefixes,
ConstU32<8>,
>,
),
>;
Expand Down
3 changes: 1 addition & 2 deletions parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ parameter_types! {
pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 64 * 1024);
pub const MaxInstructions: u32 = 100;
pub const MaxAssetsIntoHolding: u32 = 64;
pub const MaxPrefixes: u32 = 8;
}

match_types! {
Expand Down Expand Up @@ -200,7 +199,7 @@ pub type Barrier = DenyThenTry<
AllowSubscriptionsFrom<ParentOrSiblings>,
),
UniversalLocation,
MaxPrefixes,
ConstU32<8>,
>,
),
>;
Expand Down
3 changes: 1 addition & 2 deletions parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ parameter_types! {
// One XCM operation is 1_000_000_000 weight - almost certainly a conservative estimate.
pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 64 * 1024);
pub const MaxInstructions: u32 = 100;
pub const MaxPrefixes: u32 = 8;
}

match_types! {
Expand Down Expand Up @@ -136,7 +135,7 @@ pub type Barrier = DenyThenTry<
AllowSubscriptionsFrom<ParentOrSiblings>,
),
UniversalLocation,
MaxPrefixes,
ConstU32<8>,
>,
),
>;
Expand Down
3 changes: 1 addition & 2 deletions parachains/runtimes/testing/penpal/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ parameter_types! {
pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 64 * 1024);
pub const MaxInstructions: u32 = 100;
pub const MaxAssetsIntoHolding: u32 = 64;
pub const MaxPrefixes: u32 = 8;
}

match_types! {
Expand Down Expand Up @@ -169,7 +168,7 @@ pub type Barrier = DenyThenTry<
AllowSubscriptionsFrom<Everything>,
),
UniversalLocation,
MaxPrefixes,
ConstU32<8>,
>,
),
>;
Expand Down