Merge commit d0703258 (no conflict)

.gitlab-ci.yml

@@ -4,6 +4,10 @@
 #
 # pipelines can be triggered manually in the web
 # setting DEPLOY_TAG will only deploy the tagged image
+#
+# please do not add new jobs without "rules:" and "*-env". There are &rules-test for everything,
+# &rules-pr-only and &rules-build presets. And "kubernetes-env" with "docker-env" to set a runner
+# which executes the job.
 
 stages:
   - test
@@ -25,6 +29,9 @@ variables:
   DOCKER_OS:                       "debian:stretch"
   ARCH:                            "x86_64"
 
+default:
+  cache:                           {}
+
 .collect-artifacts:                &collect-artifacts
   artifacts:
     name:                          "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
@@ -36,8 +43,7 @@ variables:
 .kubernetes-env:                   &kubernetes-env
   tags:
     - kubernetes-parity-build
-  environment:
-    name: parity-build
+  interruptible:                   true
 
 .docker-env:                       &docker-env
   retry:
@@ -47,30 +53,46 @@ variables:
       - unknown_failure
       - api_failure
   interruptible:                   true
-  dependencies:                    []
   tags:
     - linux-docker
 
-.compiler_info:                    &compiler_info
+.compiler-info:                    &compiler-info
   before_script:
     - rustup show
     - cargo --version
     - sccache -s
 
-.build-refs:                       &build-refs
+.rules-build:                      &rules-build
   rules:
+    # Due to https://gitlab.com/gitlab-org/gitlab/-/issues/31264 there's no way to setup a manual
+    # build job so that publish-docker-rococo would "needs" build-linux-rococo job. This leads
+    # either to blocked or to forever running pipeline. It was decided to run these jobs from UI
+    # and on schedule.
+    #
+    # $PIPELINE should be passed in https://gitlab.parity.io/parity/polkadot/-/pipeline_schedules
+    # or other trigger to avoid running these jobs and run just those allowing this variable.
+    - if: $PIPELINE == "rococo"
+      when: never
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
 
-.test-refs:                        &test-refs
+.rules-test:                       &rules-test
+  # these jobs run always*
   rules:
-    - if: $CI_PIPELINE_SOURCE == "web"
+    - if: $PIPELINE == "rococo"
+      when: never
+    - when: always
+
+.pr-only:                          &rules-pr-only
+  # these jobs run only on PRs
+  rules:
+    - if: $PIPELINE == "rococo"
+      when: never
     - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
+      when: never
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
 
 #### stage:                        test
 
@@ -78,38 +100,36 @@ check-runtime:
   stage:                           test
   image:                           paritytech/tools:latest
   <<:                              *kubernetes-env
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+  <<:                              *rules-pr-only
   variables:
     GITLAB_API:                    "https://gitlab.parity.io/api/v4"
     GITHUB_API_PROJECT:            "parity%2Finfrastructure%2Fgithub-api"
   script:
     - ./scripts/gitlab/check_runtime.sh
-  interruptible:                   true
   allow_failure:                   true
 
 check-line-width:
   stage:                           test
   image:                           paritytech/tools:latest
   <<:                              *kubernetes-env
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+  <<:                              *rules-pr-only
   script:
     - ./scripts/gitlab/check_line_width.sh
-  interruptible:                   true
   allow_failure:                   true
 
 test-deterministic-wasm:
   stage:                           test
+  <<:                              *rules-test
   <<:                              *docker-env
+  <<:                              *compiler-info
   script:
     - ./scripts/gitlab/test_deterministic_wasm.sh
 
-test-linux-stable:                 &test
+test-linux-stable:
   stage:                           test
-  <<:                              *test-refs
+  <<:                              *rules-test
   <<:                              *docker-env
-  <<:                              *compiler_info
+  <<:                              *compiler-info
   variables:
     RUST_TOOLCHAIN: stable
     # Enable debug assertions since we are running optimized builds for testing
@@ -123,125 +143,115 @@ test-linux-stable:                 &test
     - ./scripts/gitlab/test_linux_stable.sh
     - sccache -s
 
-check-web-wasm:                    &test
+check-web-wasm:
   stage:                           test
-  <<:                              *test-refs
+  <<:                              *rules-test
   <<:                              *docker-env
-  <<:                              *compiler_info
+  <<:                              *compiler-info
   script:
-    # WASM support is in progress. As more and more crates support WASM, we
-    # should add entries here. See https://github.com/paritytech/polkadot/issues/625
+    # WASM support is in progress. As more and more crates support WASM, we should
+    # add entries here. See https://github.com/paritytech/polkadot/issues/625
     - ./scripts/gitlab/check_web_wasm.sh
     - sccache -s
 
-check-runtime-benchmarks:          &test
+check-runtime-benchmarks:
   stage:                           test
-  <<:                              *test-refs
+  <<:                              *rules-test
   <<:                              *docker-env
-  <<:                              *compiler_info
+  <<:                              *compiler-info
   script:
     # Check that the node will compile with `runtime-benchmarks` feature flag.
     - ./scripts/gitlab/check_runtime_benchmarks.sh
     - sccache -s
 
+#### stage:                        build
+
 check-transaction-versions:
-  image:                          node:15
-  stage:                          build
+  image:                           node:15
+  stage:                           build
+  <<:                              *rules-test
+  <<:                              *docker-env
   needs:
-    - job:                        test-linux-stable
+    - job:                         test-linux-stable
+      artifacts:                   false
   before_script:
-    - npm install -g @polkadot/metadata-cmp
+    - npm install --ignore-scripts -g @polkadot/metadata-cmp
     - git fetch origin release
-  script: "scripts/gitlab/check_extrinsics_ordering.sh"
-
-build-wasm-release:
-  stage:                          build
-  <<:                             *collect-artifacts
-  <<:                             *docker-env
-  <<:                             *compiler_info
-  # Note: We likely only want to do this for tagged releases, hence the 'rules:'
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
   script:
-    - time wasm-pack build --target web --out-dir wasm --release cli -- --no-default-features --features browser
-    - mkdir -p ./artifacts/wasm
-    - cd ./cli/wasm/
-    - for f in polkadot_cli*; do sha256sum "${f}" > "${f}.sha256"; done
-    - mv ./polkadot_cli* ../../artifacts/wasm/.
+    - scripts/gitlab/check_extrinsics_ordering.sh
+
+.pack-artifacts:                   &pack-artifacts
+  - mkdir -p ./artifacts
+  - VERSION="${CI_COMMIT_REF_NAME}" # will be tag or branch name
+  - mv ./target/release/polkadot ./artifacts/.
+  - sha256sum ./artifacts/polkadot | tee ./artifacts/polkadot.sha256
+  - if [ "${CI_COMMIT_TAG}" ]; then
+      EXTRATAG="latest";
+    else
+      EXTRATAG="$(./artifacts/polkadot --version |
+        sed -n -r 's/^polkadot ([0-9.]+.*-[0-9a-f]{7,13})-.*$/\1/p')";
+      EXTRATAG="${CI_COMMIT_REF_NAME}-${EXTRATAG}-$(cut -c 1-8 ./artifacts/polkadot.sha256)";
+    fi
+  - echo "Polkadot version = ${VERSION} (EXTRATAG ${EXTRATAG})"
+  - echo -n ${VERSION} > ./artifacts/VERSION
+  - echo -n ${EXTRATAG} > ./artifacts/EXTRATAG
+  - cp -r scripts/docker/* ./artifacts
 
-build-linux-release:               &build
+build-linux-release:
   stage:                           build
   <<:                              *collect-artifacts
   <<:                              *docker-env
-  <<:                              *compiler_info
+  <<:                              *compiler-info
   rules:
-    # .build-refs with manual on PRs
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
+    # .rules-test with manual on PRs
+    - if: $PIPELINE == "rococo"
+      when: never
     - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
       when: manual
       allow_failure: true
+    - when: always
   script:
     - time cargo build --release --verbose
-    - mkdir -p ./artifacts
-    - mv ./target/release/polkadot ./artifacts/.
-    - sha256sum ./artifacts/polkadot | tee ./artifacts/polkadot.sha256
-    - VERSION="${CI_COMMIT_REF_NAME}" # will be tag or branch name
-    - if [ "${CI_COMMIT_TAG}" ]; then
-        EXTRATAG="latest";
-      else
-        EXTRATAG="$(./artifacts/polkadot --version |
-          sed -n -r 's/^polkadot ([0-9.]+.*-[0-9a-f]{7,13})-.*$/\1/p')";
-        EXTRATAG="${CI_COMMIT_REF_NAME}-${EXTRATAG}-$(cut -c 1-8 ./artifacts/polkadot.sha256)";
-      fi
-    - echo "Polkadot version = ${VERSION} (EXTRATAG ${EXTRATAG})"
-    - echo -n ${VERSION} > ./artifacts/VERSION
-    - echo -n ${EXTRATAG} > ./artifacts/EXTRATAG
-    - cp -r scripts/docker/* ./artifacts
     - sccache -s
+    - *pack-artifacts
+
+build-linux-rococo:
+  stage:                           build
+  <<:                              *collect-artifacts
+  <<:                              *docker-env
+  <<:                              *compiler-info
+  rules:
+    - if: $PIPELINE == "rococo"
+  script:
+    - time cargo build --release --verbose --features=real-overseer
+    - sccache -s
+    - *pack-artifacts
 
 generate-impl-guide:
-  stage:                          build
+  stage:                           build
+  <<:                              *rules-test
+  <<:                              *docker-env
   image:
     name: michaelfbryan/mdbook-docker-image:latest
     entrypoint: [""]
   script:
     - mdbook build roadmap/implementers-guide
 
-.publish-build:                    &publish-build
-  stage:                           publish
-  dependencies:
-    - build-linux-release
-    - build-wasm-release
-  cache:                           {}
-  <<:                              *build-refs
+#### stage:                        publish
+
+.build-push-docker-image:          &build-push-docker-image
   <<:                              *kubernetes-env
-  before_script:
+  <<:                              *collect-artifacts
+  image:                           quay.io/buildah/stable
+  before_script:                   &check-versions
     - test -s ./artifacts/VERSION || exit 1
     - test -s ./artifacts/EXTRATAG || exit 1
     - VERSION="$(cat ./artifacts/VERSION)"
     - EXTRATAG="$(cat ./artifacts/EXTRATAG)"
     - echo "Polkadot version = ${VERSION} (EXTRATAG ${EXTRATAG})"
-
-publish-docker:
-  <<:                              *publish-build
-  image:                           quay.io/buildah/stable
-  <<:                              *collect-artifacts
-  # Don't run on releases - this is handled by the Github Action here:
-  # .github/workflows/publish-docker-release.yml
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "web"
-    - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_COMMIT_REF_NAME == "master"
-  variables:
-    GIT_STRATEGY:                  none
-    # DOCKERFILE:                  scripts/docker/Dockerfile
-    IMAGE_NAME:                    docker.io/parity/polkadot
   script:
     - test "$Docker_Hub_User_Parity" -a "$Docker_Hub_Pass_Parity" ||
-      ( echo "no docker credentials provided"; exit 1 )
+        ( echo "no docker credentials provided"; exit 1 )
     - cd ./artifacts
     - buildah bud
         --format=docker
@@ -249,8 +259,9 @@ publish-docker:
         --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
         --tag "$IMAGE_NAME:$VERSION"
         --tag "$IMAGE_NAME:$EXTRATAG" .
+    # The job will success only on the protected branch
     - echo "$Docker_Hub_Pass_Parity" |
-      buildah login --username "$Docker_Hub_User_Parity" --password-stdin docker.io
+        buildah login --username "$Docker_Hub_User_Parity" --password-stdin docker.io
     - buildah info
     - buildah push --format=v2s2 "$IMAGE_NAME:$VERSION"
     - buildah push --format=v2s2 "$IMAGE_NAME:$EXTRATAG"
@@ -259,13 +270,52 @@ publish-docker:
     # only VERSION information is needed for the deployment
     - find ./artifacts/ -depth -not -name VERSION -not -name artifacts -delete
 
+publish-docker-polkadot:
+  stage:                           publish
+  <<:                              *build-push-docker-image
+  # Don't run on releases - this is handled by the Github Action here:
+  # .github/workflows/publish-docker-release.yml
+  rules:
+    - if: $PIPELINE == "rococo"
+      when: never
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_PIPELINE_SOURCE == "web"
+    - if: $CI_COMMIT_REF_NAME == "master"
+  needs:
+    - job:                         build-linux-release
+      artifacts:                   true
+  variables:
+    GIT_STRATEGY:                  none
+    # DOCKERFILE:                  scripts/docker/Dockerfile
+    IMAGE_NAME:                    docker.io/parity/polkadot
+
+publish-docker-rococo:
+  stage:                           publish
+  <<:                              *build-push-docker-image
+  rules:
+    - if: $PIPELINE == "rococo"
+  needs:
+    - job:                         build-linux-rococo
+      artifacts:                   true
+  variables:
+    GIT_STRATEGY:                  none
+    # DOCKERFILE:                  scripts/docker/Dockerfile
+    IMAGE_NAME:                    docker.io/parity/rococo
+
 publish-s3-release:
-  <<:                              *publish-build
+  stage:                           publish
+  <<:                              *rules-build
+  needs:
+    - job:                         build-linux-release
+      artifacts:                   true
+  <<:                              *kubernetes-env
   image:                           paritytech/awscli:latest
   variables:
     GIT_STRATEGY:                  none
     BUCKET:                        "releases.parity.io"
     PREFIX:                        "polkadot/${ARCH}-${DOCKER_OS}"
+  before_script:
+    - *check-versions
   script:
     - echo "uploading objects to https://${BUCKET}/${PREFIX}/${VERSION}"
     - aws s3 sync ./artifacts/ s3://${BUCKET}/${PREFIX}/${VERSION}/
@@ -289,22 +339,23 @@ publish-s3-release:
     - aws s3 ls s3://${BUCKET}/${PREFIX}/${EXTRATAG}/
         --recursive --human-readable --summarize
 
+#### stage:                        deploy
+
 deploy-polkasync-kusama:
   stage:                           deploy
-  <<:                              *build-refs
+  <<:                              *rules-build
   variables:
     POLKADOT_CI_COMMIT_NAME:       "${CI_COMMIT_REF_NAME}"
     POLKADOT_CI_COMMIT_REF:        "${CI_COMMIT_REF}"
   allow_failure:                   true
   trigger:                         "parity/infrastructure/parity-testnet"
 
-#### stage:                       .post
+#### stage:                        .post
 
 check-labels:
-  stage:                          .post
-  image:                          paritytech/tools:latest
-  <<:                             *kubernetes-env
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+  stage:                           .post
+  image:                           paritytech/tools:latest
+  <<:                              *rules-pr-only
+  <<:                              *kubernetes-env
   script:
     - ./scripts/gitlab/check_labels.sh

Cargo.toml

@@ -22,7 +22,7 @@ parity-util-mem = { version = "*", default-features = false, features = ["jemall
 [dev-dependencies]
 assert_cmd = "1.0.2"
 nix = "0.19.1"
-tempfile = "3.1.0"
+tempfile = "3.2.0"
 
 [workspace]
 members = [

cli/Cargo.toml

@@ -14,7 +14,7 @@ wasm-opt = false
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-log = "0.4.11"
+log = "0.4.13"
 thiserror = "1.0.23"
 structopt = { version = "0.3.21", optional = true }
 wasm-bindgen = { version = "0.2.69", optional = true }

core-primitives/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-parity-scale-codec = { version = "1.3.5", default-features = false, features = [ "derive" ] }
+parity-scale-codec = { version = "1.3.6", default-features = false, features = [ "derive" ] }
 
 [features]
 default = [ "std" ]

docker/Dockerfile

@@ -16,9 +16,10 @@ ARG PROFILE=release
 COPY --from=builder /polkadot/target/$PROFILE/polkadot /usr/local/bin
 
 RUN useradd -m -u 1000 -U -s /bin/sh -d /polkadot polkadot && \
-	mkdir -p /polkadot/.local/share/polkadot && \
-	chown -R polkadot:polkadot /polkadot/.local && \
-	ln -s /polkadot/.local/share/polkadot /data && \
+	mkdir -p /polkadot/.local/share && \
+	mkdir /data && \
+	chown -R polkadot:polkadot /data && \
+	ln -s /data /polkadot/.local/share/polkadot && \
 	rm -rf /usr/bin /usr/sbin
 
 USER polkadot

erasure-coding/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 primitives = { package = "polkadot-primitives", path = "../primitives" }
 reed_solomon = { package = "reed-solomon-erasure", version = "4.0.2" }
-parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"] }
+parity-scale-codec = { version = "1.3.6", default-features = false, features = ["derive"] }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" }
 thiserror = "1.0.23"

node/core/av-store/Cargo.toml

@@ -12,8 +12,9 @@ kvdb-rocksdb = "0.10.0"
 thiserror = "1.0.23"
 tracing = "0.1.22"
 tracing-futures = "0.2.4"
+bitvec = "0.17.4"
 
-parity-scale-codec = { version = "1.3.5", features = ["derive"] }
+parity-scale-codec = { version = "1.3.6", features = ["derive"] }
 erasure = { package = "polkadot-erasure-coding", path = "../../../erasure-coding" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
@@ -23,7 +24,7 @@ polkadot-primitives = { path = "../../../primitives" }
 sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 
 [dev-dependencies]
-log = "0.4.11"
+log = "0.4.13"
 env_logger = "0.8.2"
 assert_matches = "1.4.0"
 kvdb-memorydb = "0.8.0"
@@ -31,3 +32,5 @@ kvdb-memorydb = "0.8.0"
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 polkadot-node-subsystem-util = { path = "../../subsystem-util" }
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
+parking_lot = "0.11.1"

node/core/bitfield-signing/src/lib.rs

@@ -78,7 +78,7 @@ async fn get_core_availability(
 	span: &jaeger::JaegerSpan,
 ) -> Result<bool, Error> {
 	if let CoreState::Occupied(core) = core {
-		let _span = span.child("query chunk availability");
+		let _span = span.child("query-chunk-availability");
 
 		let (tx, rx) = oneshot::channel();
 		sender
@@ -246,12 +246,12 @@ impl JobTrait for BitfieldSigningJob {
 			let _timer = metrics.time_run();
 
 			drop(_span);
-			let _span = span.child("availablity");
+			let span_availability = span.child("availability");
 
 			let bitfield =
 				match construct_availability_bitfield(
 					relay_parent,
-					&span,
+					&span_availability,
 					validator.index(),
 					&mut sender,
 				).await
@@ -265,7 +265,7 @@ impl JobTrait for BitfieldSigningJob {
 				Ok(bitfield) => bitfield,
 			};
 
-			drop(_span);
+			drop(span_availability);
 			let _span = span.child("signing");
 
 			let signed_bitfield = validator

node/core/candidate-validation/Cargo.toml

@@ -10,7 +10,7 @@ tracing = "0.1.22"
 tracing-futures = "0.2.4"
 
 sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" }
-parity-scale-codec = { version = "1.3.5", default-features = false, features = ["bit-vec", "derive"] }
+parity-scale-codec = { version = "1.3.6", default-features = false, features = ["bit-vec", "derive"] }
 
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-parachain = { path = "../../../parachain" }

node/core/candidate-validation/src/lib.rs

@@ -439,6 +439,7 @@ fn validate_candidate_exhaustive<B: ValidationBackend, S: SpawnNamed + 'static>(
 		parent_head: persisted_validation_data.parent_head.clone(),
 		block_data: pov.block_data.clone(),
 		relay_chain_height: persisted_validation_data.block_number,
+		relay_storage_root: persisted_validation_data.relay_storage_root,
 		dmq_mqc_head: persisted_validation_data.dmq_mqc_head,
 		hrmp_mqc_heads: persisted_validation_data.hrmp_mqc_heads.clone(),
 	};

node/jaeger/Cargo.toml

@@ -7,11 +7,11 @@ description = "Polkadot Jaeger primitives"
 
 [dependencies]
 async-std = "1.8.0"
-mick-jaeger = "0.1.2"
+mick-jaeger = "0.1.4"
 lazy_static = "1.4"
 parking_lot = "0.11.1"
 polkadot-primitives = { path = "../../primitives" }
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 thiserror = "1.0.23"
-log = "0.4.11"
+log = "0.4.13"

node/jaeger/src/lib.rs

@@ -183,6 +183,14 @@ impl JaegerSpan {
 			Self::Disabled => {},
 		}
 	}
+
+	/// Adds the `FollowsFrom` relationship to this span with respect to the given one.
+	pub fn add_follows_from(&mut self, other: &Self) {
+		match (self, other) {
+			(Self::Enabled(ref mut inner), Self::Enabled(ref other_inner)) => inner.add_follows_from(&other_inner),
+			_ => {},
+		}
+	}
 }
 
 impl std::fmt::Debug for JaegerSpan {

node/network/availability-distribution/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 futures = "0.3.8"
 tracing = "0.1.22"
 tracing-futures = "0.2.4"
-parity-scale-codec = { version = "1.3.5", features = ["std"]  }
+parity-scale-codec = { version = "1.3.6", features = ["std"]  }
 polkadot-primitives = { path = "../../../primitives" }
 polkadot-erasure-coding = { path = "../../../erasure-coding" }
 polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }

node/network/availability-distribution/src/lib.rs

@@ -45,7 +45,7 @@ use polkadot_subsystem::messages::{
 	NetworkBridgeMessage, RuntimeApiMessage, RuntimeApiRequest,
 };
 use polkadot_subsystem::{
-	jaeger, errors::{ChainApiError, RuntimeApiError},
+	jaeger, errors::{ChainApiError, RuntimeApiError}, PerLeafSpan,
 	ActiveLeavesUpdate, FromOverseer, OverseerSignal, SpawnedSubsystem, Subsystem, SubsystemContext, SubsystemError,
 };
 use std::collections::{HashMap, HashSet};
@@ -191,12 +191,14 @@ impl PerCandidate {
 	}
 }
 
-#[derive(Debug, Clone, Default)]
+#[derive(Debug)]
 struct PerRelayParent {
 	/// Set of `K` ancestors for this relay parent.
 	ancestors: Vec<Hash>,
 	/// Live candidates, according to this relay parent.
 	live_candidates: HashSet<CandidateHash>,
+	/// The span that belongs to this relay parent.
+	span: PerLeafSpan,
 }
 
 impl ProtocolState {
@@ -216,7 +218,7 @@ impl ProtocolState {
 		)
 	}
 
-	#[tracing::instrument(level = "trace", skip(candidates), fields(subsystem = LOG_TARGET))]
+	#[tracing::instrument(level = "trace", skip(candidates, span), fields(subsystem = LOG_TARGET))]
 	fn add_relay_parent(
 		&mut self,
 		relay_parent: Hash,
@@ -224,10 +226,13 @@ impl ProtocolState {