From 7041e2bbb4b3d428b6ba974cab5b13a82fddeb0c Mon Sep 17 00:00:00 2001
From: "paritytech-cmd-bot-polkadot-sdk[bot]"
<179002856+paritytech-cmd-bot-polkadot-sdk[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2024 12:27:02 +0100
Subject: [PATCH] [stable2407] Backport #6645 (#6655)
Backport #6645 into `stable2407` from bkontur.
See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.
<!--
# To be used by other automation, do not modify:
original-pr-number: #${pull_number}
-->
---------
Co-authored-by: Branislav Kontur <bkontur@gmail.com>
---
polkadot/grafana/README.md | 2 +-
polkadot/grafana/parachains/status.json | 2 +-
polkadot/xcm/src/v3/traits.rs | 4 +-
polkadot/xcm/src/v4/traits.rs | 4 +-
.../xcm/xcm-builder/src/universal_exports.rs | 265 +++++++++++++++---
.../xcm/xcm-executor/src/traits/export.rs | 4 +-
prdoc/pr_6645.prdoc | 14 +
.../frame/examples/default-config/src/lib.rs | 4 +-
8 files changed, 246 insertions(+), 53 deletions(-)
create mode 100644 prdoc/pr_6645.prdoc
diff --git a/polkadot/grafana/README.md b/polkadot/grafana/README.md
index e909fdd29a7..0ecb0b70515 100644
--- a/polkadot/grafana/README.md
+++ b/polkadot/grafana/README.md
@@ -90,4 +90,4 @@ and issue statement or initiate dispute.
- **Assignment delay tranches**. Approval voting is designed such that validators assigned to check a specific
candidate are split up into equal delay tranches (0.5 seconds each). All validators checks are ordered by the delay
tranche index. Early tranches of validators have the opportunity to check the candidate first before later tranches
-that act as as backups in case of no shows.
+that act as backups in case of no shows.
diff --git a/polkadot/grafana/parachains/status.json b/polkadot/grafana/parachains/status.json
index 5942cbdf447..22250967848 100644
--- a/polkadot/grafana/parachains/status.json
+++ b/polkadot/grafana/parachains/status.json
@@ -1405,7 +1405,7 @@
"type": "prometheus",
"uid": "$data_source"
},
- "description": "Approval voting requires that validators which are assigned to check a specific \ncandidate are split up into delay tranches (0.5s each). Then, all validators checks are ordered by the delay \ntranche index. Early tranches of validators will check the candidate first and later tranches act as as backups in case of no shows.",
+ "description": "Approval voting requires that validators which are assigned to check a specific \ncandidate are split up into delay tranches (0.5s each). Then, all validators checks are ordered by the delay \ntranche index. Early tranches of validators will check the candidate first and later tranches act as backups in case of no shows.",
"gridPos": {
"h": 9,
"w": 18,
diff --git a/polkadot/xcm/src/v3/traits.rs b/polkadot/xcm/src/v3/traits.rs
index 7fa8824c356..80520b1962e 100644
--- a/polkadot/xcm/src/v3/traits.rs
+++ b/polkadot/xcm/src/v3/traits.rs
@@ -535,13 +535,13 @@ impl SendXcm for Tuple {
}
/// Convenience function for using a `SendXcm` implementation. Just interprets the `dest` and wraps
-/// both in `Some` before passing them as as mutable references into `T::send_xcm`.
+/// both in `Some` before passing them as mutable references into `T::send_xcm`.
pub fn validate_send<T: SendXcm>(dest: MultiLocation, msg: Xcm<()>) -> SendResult<T::Ticket> {
T::validate(&mut Some(dest), &mut Some(msg))
}
/// Convenience function for using a `SendXcm` implementation. Just interprets the `dest` and wraps
-/// both in `Some` before passing them as as mutable references into `T::send_xcm`.
+/// both in `Some` before passing them as mutable references into `T::send_xcm`.
///
/// Returns either `Ok` with the price of the delivery, or `Err` with the reason why the message
/// could not be sent.
diff --git a/polkadot/xcm/src/v4/traits.rs b/polkadot/xcm/src/v4/traits.rs
index 351de92c80e..c4eec522ed0 100644
--- a/polkadot/xcm/src/v4/traits.rs
+++ b/polkadot/xcm/src/v4/traits.rs
@@ -289,13 +289,13 @@ impl SendXcm for Tuple {
}
/// Convenience function for using a `SendXcm` implementation. Just interprets the `dest` and wraps
-/// both in `Some` before passing them as as mutable references into `T::send_xcm`.
+/// both in `Some` before passing them as mutable references into `T::send_xcm`.
pub fn validate_send<T: SendXcm>(dest: Location, msg: Xcm<()>) -> SendResult<T::Ticket> {
T::validate(&mut Some(dest), &mut Some(msg))
}
/// Convenience function for using a `SendXcm` implementation. Just interprets the `dest` and wraps
-/// both in `Some` before passing them as as mutable references into `T::send_xcm`.
+/// both in `Some` before passing them as mutable references into `T::send_xcm`.
///
/// Returns either `Ok` with the price of the delivery, or `Err` with the reason why the message
/// could not be sent.
diff --git a/polkadot/xcm/xcm-builder/src/universal_exports.rs b/polkadot/xcm/xcm-builder/src/universal_exports.rs
index 5c754f01ec0..aae8438c78d 100644
--- a/polkadot/xcm/xcm-builder/src/universal_exports.rs
+++ b/polkadot/xcm/xcm-builder/src/universal_exports.rs
@@ -68,20 +68,28 @@ impl<Exporter: ExportXcm, UniversalLocation: Get<InteriorLocation>> SendXcm
fn validate(
dest: &mut Option<Location>,
- xcm: &mut Option<Xcm<()>>,
+ msg: &mut Option<Xcm<()>>,
) -> SendResult<Exporter::Ticket> {
- let d = dest.take().ok_or(MissingArgument)?;
+ // This `clone` ensures that `dest` is not consumed in any case.
+ let d = dest.clone().take().ok_or(MissingArgument)?;
let universal_source = UniversalLocation::get();
- let devolved = match ensure_is_remote(universal_source.clone(), d) {
- Ok(x) => x,
- Err(d) => {
- *dest = Some(d);
- return Err(NotApplicable)
- },
- };
- let (network, destination) = devolved;
- let xcm = xcm.take().ok_or(SendError::MissingArgument)?;
- validate_export::<Exporter>(network, 0, universal_source, destination, xcm)
+ let devolved = ensure_is_remote(universal_source.clone(), d).map_err(|_| NotApplicable)?;
+ let (remote_network, remote_location) = devolved;
+ let xcm = msg.take().ok_or(MissingArgument)?;
+
+ validate_export::<Exporter>(
+ remote_network,
+ 0,
+ universal_source,
+ remote_location,
+ xcm.clone(),
+ )
+ .inspect_err(|err| {
+ if let NotApplicable = err {
+ // We need to make sure that msg is not consumed in case of `NotApplicable`.
+ *msg = Some(xcm);
+ }
+ })
}
fn deliver(ticket: Exporter::Ticket) -> Result<XcmHash, SendError> {
@@ -95,7 +103,7 @@ pub trait ExporterFor {
///
/// The payment is specified from the local context, not the bridge chain. This is the
/// total amount to withdraw in to Holding and should cover both payment for the execution on
- /// the bridge chain as well as payment for the use of the `ExportMessage` instruction.
+ /// the bridge chain and payment for the use of the `ExportMessage` instruction.
fn exporter_for(
network: &NetworkId,
remote_location: &InteriorLocation,
@@ -205,7 +213,8 @@ impl<Bridges: ExporterFor, Router: SendXcm, UniversalLocation: Get<InteriorLocat
dest: &mut Option<Location>,
msg: &mut Option<Xcm<()>>,
) -> SendResult<Router::Ticket> {
- let d = dest.clone().ok_or(MissingArgument)?;
+ // This `clone` ensures that `dest` is not consumed in any case.
+ let d = dest.clone().take().ok_or(MissingArgument)?;
let devolved = ensure_is_remote(UniversalLocation::get(), d).map_err(|_| NotApplicable)?;
let (remote_network, remote_location) = devolved;
let xcm = msg.take().ok_or(MissingArgument)?;
@@ -216,7 +225,7 @@ impl<Bridges: ExporterFor, Router: SendXcm, UniversalLocation: Get<InteriorLocat
else {
// We need to make sure that msg is not consumed in case of `NotApplicable`.
*msg = Some(xcm);
- return Err(SendError::NotApplicable)
+ return Err(NotApplicable)
};
ensure!(maybe_payment.is_none(), Unroutable);
@@ -232,12 +241,21 @@ impl<Bridges: ExporterFor, Router: SendXcm, UniversalLocation: Get<InteriorLocat
// export for free. Common-good chains will typically be afforded this.
let mut message = Xcm(vec![
UnpaidExecution { weight_limit: Unlimited, check_origin: None },
- ExportMessage { network: remote_network, destination: remote_location, xcm },
+ ExportMessage {
+ network: remote_network,
+ destination: remote_location,
+ xcm: xcm.clone(),
+ },
]);
if let Some(forward_id) = maybe_forward_id {
message.0.push(SetTopic(forward_id));
}
- validate_send::<Router>(bridge, message)
+ validate_send::<Router>(bridge, message).inspect_err(|err| {
+ if let NotApplicable = err {
+ // We need to make sure that msg is not consumed in case of `NotApplicable`.
+ *msg = Some(xcm);
+ }
+ })
}
fn deliver(validation: Self::Ticket) -> Result<XcmHash, SendError> {
@@ -272,9 +290,9 @@ impl<Bridges: ExporterFor, Router: SendXcm, UniversalLocation: Get<InteriorLocat
dest: &mut Option<Location>,
msg: &mut Option<Xcm<()>>,
) -> SendResult<Router::Ticket> {
- let d = dest.as_ref().ok_or(MissingArgument)?;
- let devolved =
- ensure_is_remote(UniversalLocation::get(), d.clone()).map_err(|_| NotApplicable)?;
+ // This `clone` ensures that `dest` is not consumed in any case.
+ let d = dest.clone().take().ok_or(MissingArgument)?;
+ let devolved = ensure_is_remote(UniversalLocation::get(), d).map_err(|_| NotApplicable)?;
let (remote_network, remote_location) = devolved;
let xcm = msg.take().ok_or(MissingArgument)?;
@@ -284,7 +302,7 @@ impl<Bridges: ExporterFor, Router: SendXcm, UniversalLocation: Get<InteriorLocat
else {
// We need to make sure that msg is not consumed in case of `NotApplicable`.
*msg = Some(xcm);
- return Err(SendError::NotApplicable)
+ return Err(NotApplicable)
};
// `xcm` should already end with `SetTopic` - if it does, then extract and derive into
@@ -296,8 +314,11 @@ impl<Bridges: ExporterFor, Router: SendXcm, UniversalLocation: Get<InteriorLocat
let local_from_bridge =
UniversalLocation::get().invert_target(&bridge).map_err(|_| Unroutable)?;
- let export_instruction =
- ExportMessage { network: remote_network, destination: remote_location, xcm };
+ let export_instruction = ExportMessage {
+ network: remote_network,
+ destination: remote_location,
+ xcm: xcm.clone(),
+ };
let mut message = Xcm(if let Some(ref payment) = maybe_payment {
let fees = payment
@@ -325,7 +346,12 @@ impl<Bridges: ExporterFor, Router: SendXcm, UniversalLocation: Get<InteriorLocat
// We then send a normal message to the bridge asking it to export the prepended
// message to the remote chain.
- let (v, mut cost) = validate_send::<Router>(bridge, message)?;
+ let (v, mut cost) = validate_send::<Router>(bridge, message).inspect_err(|err| {
+ if let NotApplicable = err {
+ // We need to make sure that msg is not consumed in case of `NotApplicable`.
+ *msg = Some(xcm);
+ }
+ })?;
if let Some(bridge_payment) = maybe_payment {
cost.push(bridge_payment);
}
@@ -476,10 +502,10 @@ impl<
let Location { parents, interior: mut junctions } = BridgedNetwork::get();
match junctions.take_first() {
Some(GlobalConsensus(network)) => (network, parents),
- _ => return Err(SendError::NotApplicable),
+ _ => return Err(NotApplicable),
}
};
- ensure!(&network == &bridged_network, SendError::NotApplicable);
+ ensure!(&network == &bridged_network, NotApplicable);
// We don't/can't use the `channel` for this adapter.
let dest = destination.take().ok_or(SendError::MissingArgument)?;
@@ -496,7 +522,7 @@ impl<
},
Err((dest, _)) => {
*destination = Some(dest);
- return Err(SendError::NotApplicable)
+ return Err(NotApplicable)
},
};
@@ -540,6 +566,10 @@ impl<
#[cfg(test)]
mod tests {
use super::*;
+ use frame_support::{
+ assert_err, assert_ok,
+ traits::{Contains, Equals},
+ };
#[test]
fn ensure_is_remote_works() {
@@ -564,21 +594,48 @@ mod tests {
assert_eq!(x, Err((Parent, Polkadot, Parachain(1000)).into()));
}
- pub struct OkSender;
- impl SendXcm for OkSender {
+ pub struct OkFor<Filter>(PhantomData<Filter>);
+ impl<Filter: Contains<Location>> SendXcm for OkFor<Filter> {
type Ticket = ();
fn validate(
- _destination: &mut Option<Location>,
+ destination: &mut Option<Location>,
_message: &mut Option<Xcm<()>>,
) -> SendResult<Self::Ticket> {
- Ok(((), Assets::new()))
+ if let Some(d) = destination.as_ref() {
+ if Filter::contains(&d) {
+ return Ok(((), Assets::new()))
+ }
+ }
+ Err(NotApplicable)
}
fn deliver(_ticket: Self::Ticket) -> Result<XcmHash, SendError> {
Ok([0; 32])
}
}
+ impl<Filter: Contains<(NetworkId, InteriorLocation)>> ExportXcm for OkFor<Filter> {
+ type Ticket = ();
+
+ fn validate(
+ network: NetworkId,
+ _: u32,
+ _: &mut Option<InteriorLocation>,
+ destination: &mut Option<InteriorLocation>,
+ _: &mut Option<Xcm<()>>,
+ ) -> SendResult<Self::Ticket> {
+ if let Some(d) = destination.as_ref() {
+ if Filter::contains(&(network, d.clone())) {
+ return Ok(((), Assets::new()))
+ }
+ }
+ Err(NotApplicable)
+ }
+
+ fn deliver(_ticket: Self::Ticket) -> Result<XcmHash, SendError> {
+ Ok([1; 32])
+ }
+ }
/// Generic test case asserting that dest and msg is not consumed by `validate` implementation
/// of `SendXcm` in case of expected result.
@@ -598,46 +655,168 @@ mod tests {
}
#[test]
- fn remote_exporters_does_not_consume_dest_or_msg_on_not_applicable() {
+ fn local_exporters_works() {
frame_support::parameter_types! {
pub Local: NetworkId = ByGenesis([0; 32]);
pub UniversalLocation: InteriorLocation = [GlobalConsensus(Local::get()), Parachain(1234)].into();
pub DifferentRemote: NetworkId = ByGenesis([22; 32]);
- // no routers
- pub BridgeTable: Vec<NetworkExportTableItem> = vec![];
+ pub RemoteDestination: Junction = Parachain(9657);
+ pub RoutableBridgeFilter: (NetworkId, InteriorLocation) = (DifferentRemote::get(), RemoteDestination::get().into());
}
+ type RoutableBridgeExporter = OkFor<Equals<RoutableBridgeFilter>>;
+ type NotApplicableBridgeExporter = OkFor<()>;
+ assert_ok!(validate_export::<RoutableBridgeExporter>(
+ DifferentRemote::get(),
+ 0,
+ UniversalLocation::get(),
+ RemoteDestination::get().into(),
+ Xcm::default()
+ ));
+ assert_err!(
+ validate_export::<NotApplicableBridgeExporter>(
+ DifferentRemote::get(),
+ 0,
+ UniversalLocation::get(),
+ RemoteDestination::get().into(),
+ Xcm::default()
+ ),
+ NotApplicable
+ );
- // check with local destination (should be remote)
+ // 1. check with local destination (should be remote)
let local_dest: Location = (Parent, Parachain(5678)).into();
assert!(ensure_is_remote(UniversalLocation::get(), local_dest.clone()).is_err());
+ // UnpaidLocalExporter
ensure_validate_does_not_consume_dest_or_msg::<
- UnpaidRemoteExporter<NetworkExportTable<BridgeTable>, OkSender, UniversalLocation>,
+ UnpaidLocalExporter<RoutableBridgeExporter, UniversalLocation>,
>(local_dest.clone(), |result| assert_eq!(Err(NotApplicable), result));
+ // 2. check with not applicable from the inner router (using `NotApplicableBridgeSender`)
+ let remote_dest: Location =
+ (Parent, Parent, DifferentRemote::get(), RemoteDestination::get()).into();
+ assert!(ensure_is_remote(UniversalLocation::get(), remote_dest.clone()).is_ok());
+
+ // UnpaidLocalExporter
+ ensure_validate_does_not_consume_dest_or_msg::<
+ UnpaidLocalExporter<NotApplicableBridgeExporter, UniversalLocation>,
+ >(remote_dest.clone(), |result| assert_eq!(Err(NotApplicable), result));
+
+ // 3. Ok - deliver
+ // UnpaidRemoteExporter
+ assert_ok!(send_xcm::<UnpaidLocalExporter<RoutableBridgeExporter, UniversalLocation>>(
+ remote_dest,
+ Xcm::default()
+ ));
+ }
+
+ #[test]
+ fn remote_exporters_works() {
+ frame_support::parameter_types! {
+ pub Local: NetworkId = ByGenesis([0; 32]);
+ pub UniversalLocation: InteriorLocation = [GlobalConsensus(Local::get()), Parachain(1234)].into();
+ pub DifferentRemote: NetworkId = ByGenesis([22; 32]);
+ pub RoutableBridge: Location = Location::new(1, Parachain(9657));
+ // not routable
+ pub NotApplicableBridgeTable: Vec<NetworkExportTableItem> = vec![];
+ // routable
+ pub RoutableBridgeTable: Vec<NetworkExportTableItem> = vec![
+ NetworkExportTableItem::new(
+ DifferentRemote::get(),
+ None,
+ RoutableBridge::get(),
+ None
+ )
+ ];
+ }
+ type RoutableBridgeSender = OkFor<Equals<RoutableBridge>>;
+ type NotApplicableBridgeSender = OkFor<()>;
+ assert_ok!(validate_send::<RoutableBridgeSender>(RoutableBridge::get(), Xcm::default()));
+ assert_err!(
+ validate_send::<NotApplicableBridgeSender>(RoutableBridge::get(), Xcm::default()),
+ NotApplicable
+ );
+
+ // 1. check with local destination (should be remote)
+ let local_dest: Location = (Parent, Parachain(5678)).into();
+ assert!(ensure_is_remote(UniversalLocation::get(), local_dest.clone()).is_err());
+
+ // UnpaidRemoteExporter
+ ensure_validate_does_not_consume_dest_or_msg::<
+ UnpaidRemoteExporter<
+ NetworkExportTable<RoutableBridgeTable>,
+ RoutableBridgeSender,
+ UniversalLocation,
+ >,
+ >(local_dest.clone(), |result| assert_eq!(Err(NotApplicable), result));
+ // SovereignPaidRemoteExporter
ensure_validate_does_not_consume_dest_or_msg::<
SovereignPaidRemoteExporter<
- NetworkExportTable<BridgeTable>,
- OkSender,
+ NetworkExportTable<RoutableBridgeTable>,
+ RoutableBridgeSender,
UniversalLocation,
>,
>(local_dest, |result| assert_eq!(Err(NotApplicable), result));
- // check with not applicable destination
+ // 2. check with not applicable destination (`NotApplicableBridgeTable`)
let remote_dest: Location = (Parent, Parent, DifferentRemote::get()).into();
assert!(ensure_is_remote(UniversalLocation::get(), remote_dest.clone()).is_ok());
+ // UnpaidRemoteExporter
ensure_validate_does_not_consume_dest_or_msg::<
- UnpaidRemoteExporter<NetworkExportTable<BridgeTable>, OkSender, UniversalLocation>,
+ UnpaidRemoteExporter<
+ NetworkExportTable<NotApplicableBridgeTable>,
+ RoutableBridgeSender,
+ UniversalLocation,
+ >,
>(remote_dest.clone(), |result| assert_eq!(Err(NotApplicable), result));
-
+ // SovereignPaidRemoteExporter
ensure_validate_does_not_consume_dest_or_msg::<
SovereignPaidRemoteExporter<
- NetworkExportTable<BridgeTable>,
- OkSender,
+ NetworkExportTable<NotApplicableBridgeTable>,
+ RoutableBridgeSender,
UniversalLocation,
>,
>(remote_dest, |result| assert_eq!(Err(NotApplicable), result));
+
+ // 3. check with not applicable from the inner router (using `NotApplicableBridgeSender`)
+ let remote_dest: Location = (Parent, Parent, DifferentRemote::get()).into();
+ assert!(ensure_is_remote(UniversalLocation::get(), remote_dest.clone()).is_ok());
+
+ // UnpaidRemoteExporter
+ ensure_validate_does_not_consume_dest_or_msg::<
+ UnpaidRemoteExporter<
+ NetworkExportTable<RoutableBridgeTable>,
+ NotApplicableBridgeSender,
+ UniversalLocation,
+ >,
+ >(remote_dest.clone(), |result| assert_eq!(Err(NotApplicable), result));
+ // SovereignPaidRemoteExporter
+ ensure_validate_does_not_consume_dest_or_msg::<
+ SovereignPaidRemoteExporter<
+ NetworkExportTable<RoutableBridgeTable>,
+ NotApplicableBridgeSender,
+ UniversalLocation,
+ >,
+ >(remote_dest.clone(), |result| assert_eq!(Err(NotApplicable), result));
+
+ // 4. Ok - deliver
+ // UnpaidRemoteExporter
+ assert_ok!(send_xcm::<
+ UnpaidRemoteExporter<
+ NetworkExportTable<RoutableBridgeTable>,
+ RoutableBridgeSender,
+ UniversalLocation,
+ >,
+ >(remote_dest.clone(), Xcm::default()));
+ // SovereignPaidRemoteExporter
+ assert_ok!(send_xcm::<
+ SovereignPaidRemoteExporter<
+ NetworkExportTable<RoutableBridgeTable>,
+ RoutableBridgeSender,
+ UniversalLocation,
+ >,
+ >(remote_dest, Xcm::default()));
}
#[test]
diff --git a/polkadot/xcm/xcm-executor/src/traits/export.rs b/polkadot/xcm/xcm-executor/src/traits/export.rs
index 78aa68ce264..a76cb6f87bc 100644
--- a/polkadot/xcm/xcm-executor/src/traits/export.rs
+++ b/polkadot/xcm/xcm-executor/src/traits/export.rs
@@ -108,7 +108,7 @@ impl ExportXcm for Tuple {
}
/// Convenience function for using a `SendXcm` implementation. Just interprets the `dest` and wraps
-/// both in `Some` before passing them as as mutable references into `T::send_xcm`.
+/// both in `Some` before passing them as mutable references into `T::send_xcm`.
pub fn validate_export<T: ExportXcm>(
network: NetworkId,
channel: u32,
@@ -120,7 +120,7 @@ pub fn validate_export<T: ExportXcm>(
}
/// Convenience function for using a `SendXcm` implementation. Just interprets the `dest` and wraps
-/// both in `Some` before passing them as as mutable references into `T::send_xcm`.
+/// both in `Some` before passing them as mutable references into `T::send_xcm`.
///
/// Returns either `Ok` with the price of the delivery, or `Err` with the reason why the message
/// could not be sent.
diff --git a/prdoc/pr_6645.prdoc b/prdoc/pr_6645.prdoc
new file mode 100644
index 00000000000..f033cadc0b6
--- /dev/null
+++ b/prdoc/pr_6645.prdoc
@@ -0,0 +1,14 @@
+title: 'xcm: fix local/remote exports when inner routers return `NotApplicable`'
+doc:
+- audience: Runtime Dev
+ description: |-
+ Resolved a bug in the `local/remote exporters` used for bridging. Previously, they consumed `dest` and `msg` without returning them when inner routers/exporters failed with `NotApplicable`. This PR ensures compliance with the [`SendXcm`](https://github.com/paritytech/polkadot-sdk/blob/master/polkadot/xcm/src/v5/traits.rs#L449-L450) and [`ExportXcm`](https://github.com/paritytech/polkadot-sdk/blob/master/polkadot/xcm/xcm-executor/src/traits/export.rs#L44-L45) traits.
+crates:
+- name: staging-xcm-builder
+ bump: patch
+- name: polkadot
+ bump: none
+- name: staging-xcm
+ bump: none
+- name: staging-xcm-executor
+ bump: none
diff --git a/substrate/frame/examples/default-config/src/lib.rs b/substrate/frame/examples/default-config/src/lib.rs
index ccdcd496859..f690bffe099 100644
--- a/substrate/frame/examples/default-config/src/lib.rs
+++ b/substrate/frame/examples/default-config/src/lib.rs
@@ -62,10 +62,10 @@ pub mod pallet {
type OverwrittenDefaultValue: Get<u32>;
/// An input parameter that relies on `<Self as frame_system::Config>::AccountId`. This can
- /// too have a default, as long as as it is present in `frame_system::DefaultConfig`.
+ /// too have a default, as long as it is present in `frame_system::DefaultConfig`.
type CanDeriveDefaultFromSystem: Get<Self::AccountId>;
- /// We might chose to declare as one that doesn't have a default, for whatever semantical
+ /// We might choose to declare as one that doesn't have a default, for whatever semantical
/// reason.
#[pallet::no_default]
type HasNoDefault: Get<u32>;
--
GitLab