Merge remote-tracking branch 'origin/master' into anton/12024-wss-sup…

…port-2

.gitlab-ci.yml

@@ -48,7 +48,7 @@ variables:
   CARGO_INCREMENTAL:               0
   DOCKER_OS:                       "debian:stretch"
   ARCH:                            "x86_64"
-  CI_IMAGE:                        "paritytech/ci-linux@sha256:9140bc3c843a8b12a3bcf6f5886346536092795bbadfd7f1836362cb28dfcc71"
+  CI_IMAGE:                        "paritytech/ci-linux:production"
   BUILDAH_IMAGE:                   "quay.io/buildah/stable:v1.27"
   RUSTY_CACHIER_SINGLE_BRANCH:     master
   RUSTY_CACHIER_DONT_OPERATE_ON_MAIN_BRANCH: "true"
@@ -229,19 +229,21 @@ variables:
     # this job runs only on nightly pipeline with the mentioned variable, against `master` branch
     - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE == "nightly"
 
-.crate-publishing-pipeline:
-  rules:
-    - if: $CI_COMMIT_REF_NAME != "master"
-      when: never
+.crates-publishing-variables:
+  variables:
+    CRATESIO_CRATES_OWNER:         parity-crate-owner
+    REPO:                          substrate
+    REPO_OWNER:                    paritytech
 
-.scheduled-crate-publishing-pipeline:
+.crates-publishing-pipeline:
+  extends:                         .crates-publishing-variables
   rules:
-    - !reference [.crate-publishing-pipeline, rules]
-    - if: $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE == "automatic-crate-publishing"
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_REF_NAME == "master" && $PIPELINE == "automatic-crate-publishing"
 
 .crates-publishing-template:
-  stage:                           test
-  extends:                         .docker-env
+  extends:
+    - .docker-env
+    - .crates-publishing-variables
   # collect artifacts even on failure so that we know how the crates were generated (they'll be
   # generated to the artifacts folder according to SPUB_TMP further down)
   artifacts:
@@ -251,12 +253,7 @@ variables:
     paths:
       - artifacts/
   variables:
-    CRATESIO_API: https://crates.io/api
-    CRATESIO_CRATES_OWNER: parity-crate-owner
-    GH_API: https://api.github.com
-    REPO: substrate
-    REPO_OWNER: paritytech
-    SPUB_TMP: artifacts
+    SPUB_TMP:                      artifacts
 
 #### stage:                       .pre
 
@@ -274,6 +271,18 @@ skip-if-draft:
      - ./scripts/ci/gitlab/skip_if_draft.sh
   allow_failure:                   true
 
+check-crates-publishing-pipeline:
+  stage:                           .pre
+  extends:
+    - .kubernetes-env
+    - .crates-publishing-pipeline
+  script:
+    - git clone
+        --depth 1
+        --branch "$RELENG_SCRIPTS_BRANCH"
+        https://github.com/paritytech/releng-scripts.git
+    - ONLY_CHECK_PIPELINE=true ./releng-scripts/publish-crates
+
 include:
   # check jobs
   - scripts/ci/gitlab/pipeline/check.yml

client/beefy/src/keystore.rs

@@ -25,7 +25,7 @@ use log::warn;
 
 use beefy_primitives::{
 	crypto::{Public, Signature},
-	BeefyVerify, KEY_TYPE,
+	BeefyAuthorityId, KEY_TYPE,
 };
 
 use crate::error;
@@ -99,7 +99,7 @@ impl BeefyKeystore {
 	///
 	/// Return `true` if the signature is authentic, `false` otherwise.
 	pub fn verify(public: &Public, sig: &Signature, message: &[u8]) -> bool {
-		BeefyVerify::<Keccak256>::verify(sig, message, public)
+		BeefyAuthorityId::<Keccak256>::verify(public, sig, message)
 	}
 }
 

client/transaction-pool/Cargo.toml

@@ -19,6 +19,7 @@ futures = "0.3.21"
 futures-timer = "3.0.2"
 linked-hash-map = "0.5.4"
 log = "0.4.17"
+num-traits = "0.2.8"
 parking_lot = "0.12.1"
 serde = { version = "1.0.136", features = ["derive"] }
 thiserror = "1.0.30"