Merge branch 'master' into tsv-disabling

Author: tdimitrov

.gitlab/pipeline/zombienet/polkadot.yml

@@ -105,6 +105,14 @@ zombienet-polkadot-functional-0005-parachains-disputes-past-session:
       --local-dir="${LOCAL_DIR}/functional"
       --test="0005-parachains-disputes-past-session.zndsl"
 
+zombienet-polkadot-functional-0006-parachains-max-tranche0:
+  extends:
+    - .zombienet-polkadot-common
+  script:
+    - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+      --local-dir="${LOCAL_DIR}/functional"
+      --test="0006-parachains-max-tranche0.zndsl"
+
 zombienet-polkadot-smoke-0001-parachains-smoke-test:
   extends:
     - .zombienet-polkadot-common

Cargo.lock

@@ -33,7 +33,7 @@ jsonrpsee = { version = "0.16.2", features = ["ws-client"] }
 tracing = "0.1.37"
 async-trait = "0.1.73"
 url = "2.4.0"
-serde_json = "1.0.107"
+serde_json = "1.0.108"
 serde = "1.0.188"
 schnellru = "0.2.1"
 smoldot = { version = "0.11.0",  default_features = false, features = ["std"]}

cumulus/client/relay-chain-rpc-interface/Cargo.toml

@@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0" }
 serde = { version = "1.0.188", features = ["derive"] }
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 futures = "0.3.28"
-serde_json = "1.0.104"
+serde_json = "1.0.108"
 
 # Local
 parachain-template-runtime = { path = "../runtime" }

cumulus/parachain-template/node/Cargo.toml

@@ -10,7 +10,7 @@ publish = false
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
 paste = "1.0.14"
-serde_json = "1.0.104"
+serde_json = "1.0.108"
 
 # Substrate
 grandpa = { package = "sc-consensus-grandpa", path = "../../../../../substrate/client/consensus/grandpa" }

cumulus/parachains/integration-tests/emulated/common/Cargo.toml

@@ -19,7 +19,7 @@ futures = "0.3.28"
 hex-literal = "0.4.1"
 log = "0.4.20"
 serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.107"
+serde_json = "1.0.108"
 
 # Local
 rococo-parachain-runtime = { path = "../parachains/runtimes/testing/rococo-parachain" }

cumulus/polkadot-parachain/Cargo.toml

@@ -17,7 +17,7 @@ criterion = { version = "0.5.1", features = [ "async_tokio" ] }
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 rand = "0.8.5"
 serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.107"
+serde_json = "1.0.108"
 tokio = { version = "1.32.0", features = ["macros"] }
 tracing = "0.1.37"
 url = "2.4.0"

cumulus/test/service/Cargo.toml

@@ -64,6 +64,8 @@ jemalloc-allocator = [
 	"polkadot-node-core-pvf/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

polkadot/Cargo.toml

@@ -74,3 +74,5 @@ runtime-metrics = [
 	"polkadot-node-metrics/runtime-metrics",
 	"service/runtime-metrics",
 ]
+
+network-protocol-staging = [ "service/network-protocol-staging" ]

polkadot/cli/Cargo.toml

@@ -17,6 +17,7 @@ schnorrkel = "0.9.1"
 kvdb = "0.13.0"
 derive_more = "0.99.17"
 thiserror = "1.0.48"
+itertools = "0.10.5"
 
 polkadot-node-subsystem = { path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
@@ -30,6 +31,9 @@ sp-consensus = { path = "../../../../substrate/primitives/consensus/common", def
 sp-consensus-slots = { path = "../../../../substrate/primitives/consensus/slots", default-features = false }
 sp-application-crypto = { path = "../../../../substrate/primitives/application-crypto", default-features = false, features = ["full_crypto"] }
 sp-runtime = { path = "../../../../substrate/primitives/runtime", default-features = false }
+rand_core = "0.5.1"
+rand_chacha = { version = "0.3.1" }
+rand = "0.8.5"
 
 [dev-dependencies]
 async-trait = "0.1.57"
@@ -43,3 +47,5 @@ polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
 assert_matches = "1.4.0"
 kvdb-memorydb = "0.13.0"
 test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../../primitives/test-helpers" }
+log = "0.4.17"
+env_logger = "0.9.0"