pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-30 04:57:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump polkadot + fix parachain unnamed field (#412)

Browse Source 
* parachain unnamed field

* bump polkadot: cargo udpate -p xcm

* Update lock

* Fixes

* Fixes

Co-authored-by: Gav Wood <gavin@parity.io>
This commit is contained in:
Guillaume Thiolliere
2021-04-27 18:56:08 +02:00
committed by GitHub
parent 53faf368c6
commit b03d11b8e0
5 changed files with 230 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cumulus/Cargo.lock
Generated
+218 -206
View File
File diff suppressed because it is too large Load Diff
cumulus/pallets/xcmp-queue/src/lib.rs
+2 -2
View File
@@ -314,7 +314,7 @@ impl<T: Config> Module<T> {
Ok(xcm) => {
let location = (
Junction::Parent,
Junction::Parachain { id: sender.into() },
Junction::Parachain(sender.into()),
);
match T::XcmExecutor::execute_xcm(
location.into(),
@@ -716,7 +716,7 @@ impl<T: Config> SendXcm for Module<T> {
fn send_xcm(dest: MultiLocation, msg: Xcm<()>) -> Result<(), XcmError> {
match &dest {
// An HRMP message for a sibling parachain.
MultiLocation::X2(Junction::Parent, Junction::Parachain { id }) => {
MultiLocation::X2(Junction::Parent, Junction::Parachain(id)) => {
let msg = VersionedXcm::<()>::from(msg);
let hash = T::Hashing::hash_of(&msg);
Self::send_fragment((*id).into(), XcmpMessageFormat::ConcatenatedVersionedXcm, msg)
cumulus/rococo-parachains/pallets/ping/src/lib.rs
+2 -2
View File
@@ -101,7 +101,7 @@ pub mod pallet {
for (para, payload) in Targets::<T>::get().into_iter() {
let seq = PingCount::<T>::mutate(|seq| { *seq += 1; *seq });
match T::XcmSender::send_xcm(
MultiLocation::X2(Junction::Parent, Junction::Parachain { id: para.into() }),
MultiLocation::X2(Junction::Parent, Junction::Parachain(para.into())),
Xcm::Transact {
origin_type: OriginKind::Native,
require_weight_at_most: 1_000,
@@ -163,7 +163,7 @@ pub mod pallet {
Self::deposit_event(Event::Pinged(para, seq, payload.clone()));
match T::XcmSender::send_xcm(
MultiLocation::X2(Junction::Parent, Junction::Parachain { id: para.into() }),
MultiLocation::X2(Junction::Parent, Junction::Parachain(para.into())),
Xcm::Transact {
origin_type: OriginKind::Native,
require_weight_at_most: 1_000,
cumulus/rococo-parachains/runtime/src/lib.rs
+4 -4
View File
@@ -253,9 +253,9 @@ parameter_types! {
pub const RococoLocation: MultiLocation = MultiLocation::X1(Junction::Parent);
pub const RococoNetwork: NetworkId = NetworkId::Polkadot;
pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();
pub Ancestry: MultiLocation = Junction::Parachain {
id: ParachainInfo::parachain_id().into()
}.into();
pub Ancestry: MultiLocation = Junction::Parachain(
ParachainInfo::parachain_id().into()
).into();
}
/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
@@ -333,7 +333,7 @@ impl Config for XcmConfig {
type LocationInverter = LocationInverter<Ancestry>;
type Barrier = Barrier;
type Weigher = FixedWeightBounds<UnitWeightCost, Call>;
type Trader = FixedRateOfConcreteFungible<WeightPrice>;
type Trader = FixedRateOfConcreteFungible<WeightPrice, ()>;
type ResponseHandler = (); // Don't handle responses for now.
}
cumulus/rococo-parachains/shell-runtime/src/lib.rs
+4 -4
View File
@@ -248,9 +248,9 @@ parameter_types! {
pub const RococoLocation: MultiLocation = MultiLocation::X1(Junction::Parent);
pub const RococoNetwork: NetworkId = NetworkId::Polkadot;
pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();
pub Ancestry: MultiLocation = Junction::Parachain {
id: ParachainInfo::parachain_id().into()
}.into();
pub Ancestry: MultiLocation = Junction::Parachain(
ParachainInfo::parachain_id().into()
).into();
}
/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
@@ -328,7 +328,7 @@ impl Config for XcmConfig {
type LocationInverter = LocationInverter<Ancestry>;
type Barrier = Barrier;
type Weigher = FixedWeightBounds<UnitWeightCost, Call>;
type Trader = FixedRateOfConcreteFungible<WeightPrice>;
type Trader = FixedRateOfConcreteFungible<WeightPrice, ()>;
type ResponseHandler = (); // Don't handle responses for now.
}