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

This commit is contained in:
Branislav Kontur
2022-10-03 15:47:20 +02:00
104 changed files with 1380 additions and 1331 deletions
-4
View File
@@ -8,10 +8,8 @@ description = "AURA consensus extension pallet for parachains"
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.144", optional = true, features = ["derive"] }
# Substrate
frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
@@ -30,8 +28,6 @@ default = [ "std" ]
std = [
"codec/std",
"scale-info/std",
"serde",
"frame-executive/std",
"frame-support/std",
"frame-system/std",
"pallet-aura/std",
-1
View File
@@ -17,7 +17,6 @@ log = { version = "0.4.17", default-features = false }
codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.0.0" }
rand = { version = "0.8.5", features = ["std_rng"], default-features = false }
scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.144", default-features = false }
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -147,7 +147,7 @@ benchmarks! {
// worse case is when we have all the max-candidate slots filled except one, and we fill that
// one.
register_as_candidate {
let c in 1 .. T::MaxCandidates::get();
let c in 1 .. T::MaxCandidates::get() - 1;
<CandidacyBond<T>>::put(T::Currency::minimum_balance());
<DesiredCandidates<T>>::put(c + 1);
-4
View File
@@ -6,7 +6,6 @@ edition = "2021"
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ], default-features = false }
log = { version = "0.4.17", default-features = false }
scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
# Substrate
@@ -18,7 +17,6 @@ sp-std = { git = "https://github.com/paritytech/substrate", default-features = f
# Polkadot
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
# Cumulus
cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
@@ -34,11 +32,9 @@ std = [
"scale-info/std",
"frame-support/std",
"frame-system/std",
"log/std",
"sp-io/std",
"sp-runtime/std",
"sp-std/std",
"xcm-executor/std",
"xcm/std",
"cumulus-primitives-core/std",
]
-6
View File
@@ -12,12 +12,10 @@ environmental = { version = "1.1.2", default-features = false }
impl-trait-for-tuples = "0.2.1"
log = { version = "0.4.17", default-features = false }
scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.144", optional = true, features = ["derive"] }
# Substrate
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
@@ -30,7 +28,6 @@ sp-version = { git = "https://github.com/paritytech/substrate", default-features
# Polkadot
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, features = [ "wasm-api" ], branch = "master" }
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
# Cumulus
cumulus-pallet-parachain-system-proc-macro = { path = "proc-macro", default-features = false }
@@ -58,13 +55,11 @@ std = [
"environmental/std",
"log/std",
"scale-info/std",
"serde",
"cumulus-pallet-parachain-system-proc-macro/std",
"cumulus-primitives-core/std",
"cumulus-primitives-parachain-inherent/std",
"frame-support/std",
"frame-system/std",
"pallet-balances/std",
"sp-core/std",
"sp-externalities/std",
"sp-io/std",
@@ -72,7 +67,6 @@ std = [
"sp-state-machine/std",
"sp-std/std",
"sp-trie/std",
"xcm/std"
]
runtime-benchmarks = [
@@ -9,8 +9,8 @@ description = "Proc macros provided by the parachain-system pallet"
proc-macro = true
[dependencies]
syn = "1.0.100"
proc-macro2 = "1.0.43"
syn = "1.0.101"
proc-macro2 = "1.0.46"
quote = "1.0.21"
proc-macro-crate = "1.2.1"
+1 -3
View File
@@ -7,7 +7,7 @@ description = "Adds functionality to migrate from a Solo to a Parachain"
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
# Substrate
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
@@ -21,7 +21,6 @@ polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-
# Cumulus
cumulus-pallet-parachain-system = { default-features = false, path = "../parachain-system" }
cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
[features]
default = [ "std" ]
@@ -29,7 +28,6 @@ std = [
"codec/std",
"scale-info/std",
"cumulus-pallet-parachain-system/std",
"cumulus-primitives-core/std",
"frame-support/std",
"frame-system/std",
"pallet-sudo/std",
-2
View File
@@ -7,7 +7,6 @@ version = "0.1.0"
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.144", optional = true, features = ["derive"] }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
@@ -24,7 +23,6 @@ default = ["std"]
std = [
"codec/std",
"scale-info/std",
"serde",
"cumulus-primitives-core/std",
"sp-std/std",
"sp-runtime/std",