Merge remote-tracking branch 'origin/master' into gav-xcm-v3

This commit is contained in:
Gav Wood
2022-03-11 18:28:04 +01:00
11 changed files with 168 additions and 160 deletions
+2
View File
@@ -57,6 +57,7 @@ sp-version = { git = "https://github.com/paritytech/substrate", default-features
# Polkadot
pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
polkadot-runtime = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
@@ -109,6 +110,7 @@ std = [
"pallet-xcm/std",
"parachain-info/std",
"polkadot-parachain/std",
"polkadot-runtime/std",
"polkadot-runtime-common/std",
"sp-api/std",
"sp-block-builder/std",
+1 -1
View File
@@ -45,7 +45,7 @@ use xcm_config::{XcmConfig, XcmOriginToTransactDispatchOrigin};
pub use sp_runtime::BuildStorage;
// Polkadot Imports
use polkadot_runtime_common::{BlockHashCount, RocksDbWeight, SlowAdjustingFeeUpdate};
use polkadot_runtime::{BlockHashCount, RocksDbWeight, SlowAdjustingFeeUpdate};
// XCM Imports
use xcm::latest::prelude::BodyId;