Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make xcm config index friendly #3113

Merged
merged 4 commits into from
Jan 6, 2025
+35 −35
Merged

Make xcm config index friendly #3113

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b802062
Barrier with TrailingSetTopic
yrong Dec 19, 2024
f5b7996
Wrap XcmRouter with WithUniqueTopic
yrong Dec 20, 2024
c9ce8fb
Merge branch 'master' into BarrierWithTrailingSetTopicId
yrong Dec 28, 2024
77ede99
Fix tests
yrong Dec 28, 2024
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
6 changes: 3 additions & 3 deletions runtime/moonbase/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ use xcm_builder::{
EnsureXcmOrigin, FungibleAdapter as XcmCurrencyAdapter, FungiblesAdapter, HashedDescription,
NoChecking, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation,
TakeWeightCredit, WeightInfoBounds, WithComputedOrigin,
TakeWeightCredit, TrailingSetTopicAsId, WeightInfoBounds, WithComputedOrigin,
};

use parachains_common::message_queue::{NarrowOriginToSibling, ParaIdToSibling};
Expand Down Expand Up @@ -207,7 +207,7 @@ pub type XcmWeigher = WeightInfoBounds<
MaxInstructions,
>;

pub type XcmBarrier = (
pub type XcmBarrier = TrailingSetTopicAsId<(
// Weight that is paid for may be consumed.
TakeWeightCredit,
// Expected responses are OK.
Expand All @@ -222,7 +222,7 @@ pub type XcmBarrier = (
UniversalLocation,
ConstU32<8>,
>,
);
)>;

parameter_types! {
/// Xcm fees will go to the treasury account
Expand Down
6 changes: 3 additions & 3 deletions runtime/moonbeam/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ use xcm_builder::{
EnsureXcmOrigin, FungibleAdapter as XcmCurrencyAdapter, FungiblesAdapter, HashedDescription,
NoChecking, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation,
TakeWeightCredit, WeightInfoBounds, WithComputedOrigin,
TakeWeightCredit, TrailingSetTopicAsId, WeightInfoBounds, WithComputedOrigin,
};

use parachains_common::message_queue::{NarrowOriginToSibling, ParaIdToSibling};
Expand Down Expand Up @@ -197,7 +197,7 @@ pub type XcmWeigher = WeightInfoBounds<
MaxInstructions,
>;

pub type XcmBarrier = (
pub type XcmBarrier = TrailingSetTopicAsId<(
// Weight that is paid for may be consumed.
TakeWeightCredit,
// Expected responses are OK.
Expand All @@ -212,7 +212,7 @@ pub type XcmBarrier = (
UniversalLocation,
ConstU32<8>,
>,
);
)>;

parameter_types! {
/// Xcm fees will go to the treasury account
Expand Down
6 changes: 3 additions & 3 deletions runtime/moonriver/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ use xcm_builder::{
EnsureXcmOrigin, FungibleAdapter as XcmCurrencyAdapter, FungiblesAdapter, HashedDescription,
NoChecking, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation,
TakeWeightCredit, WeightInfoBounds, WithComputedOrigin,
TakeWeightCredit, TrailingSetTopicAsId, WeightInfoBounds, WithComputedOrigin,
};

use parachains_common::message_queue::{NarrowOriginToSibling, ParaIdToSibling};
Expand Down Expand Up @@ -205,7 +205,7 @@ pub type XcmWeigher = WeightInfoBounds<
MaxInstructions,
>;

pub type XcmBarrier = (
pub type XcmBarrier = TrailingSetTopicAsId<(
// Weight that is paid for may be consumed.
TakeWeightCredit,
// Expected responses are OK.
Expand All @@ -220,7 +220,7 @@ pub type XcmBarrier = (
UniversalLocation,
ConstU32<8>,
>,
);
)>;

parameter_types! {
/// Xcm fees will go to the treasury account
Expand Down
Loading