Merge remote-tracking branch 'origin/master' into rb-update-payee-wei…

…ghts
paritytech · Aug 20, 2023 · 2a63ea2 · 2a63ea2
2 parents ccc0a75 + 47e58ac
commit 2a63ea2
Show file tree

Hide file tree

Showing 190 changed files with 41,782 additions and 6,775 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -96,6 +96,7 @@ members = [
 	"node/core/chain-selection",
 	"node/core/dispute-coordinator",
 	"node/core/parachains-inherent",
+	"node/core/prospective-parachains",
 	"node/core/provisioner",
 	"node/core/pvf",
 	"node/core/pvf/common",
@@ -226,6 +227,8 @@ fast-runtime = [ "polkadot-cli/fast-runtime" ]
 runtime-metrics = [ "polkadot-cli/runtime-metrics" ]
 pyroscope = ["polkadot-cli/pyroscope"]
 jemalloc-allocator = ["polkadot-node-core-pvf-prepare-worker/jemalloc-allocator", "polkadot-overseer/jemalloc-allocator"]
+network-protocol-staging = ["polkadot-cli/network-protocol-staging"]
+
 # Enables timeout-based tests supposed to be run only in CI environment as they may be flaky
 # when run locally depending on system load
 ci-only-tests = ["polkadot-node-core-pvf/ci-only-tests"]

diff --git a/README.md b/README.md
@@ -79,7 +79,7 @@ rustup update
 Once done, finish installing the support software:
 
 ```bash
-sudo apt install build-essential git clang libclang-dev pkg-config libssl-dev
+sudo apt install build-essential git clang libclang-dev pkg-config libssl-dev protobuf-compiler
 ```
 
 Build the client by cloning this repository and running the following commands from the root

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -75,3 +75,4 @@ rococo-native = ["service/rococo-native"]
 
 malus = ["full-node", "service/malus"]
 runtime-metrics = ["service/runtime-metrics", "polkadot-node-metrics/runtime-metrics"]
+network-protocol-staging = ["service/network-protocol-staging"]
diff --git a/node/collation-generation/Cargo.toml b/node/collation-generation/Cargo.toml
@@ -21,3 +21,5 @@ parity-scale-codec = { version = "3.6.1", default-features = false, features = [
 [dev-dependencies]
 polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
 test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../primitives/test-helpers" }
+assert_matches = "1.4.0"
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }