Merge branch 'master' into bernhard-malus-fx

* master:
  Raised nits on #3813 (#3844)
  Don't try to connect to ourselves. (#3855)
  add dispute metrics, some chores (#3842)
  add type info derive to senderror (#3860)
  Companion for #8615: enrich metadata with type information (#3336)
  approval-voting: processed wakeups can also update approval state (#3848)
  Add build with docker info to README (#3843)
  improve approval tracing (#3846)
  UMP: Support Overweight messages (#3575)
  Companion for substrate#9115 (#3265)
  Better error messages. (#3835)
  Put all authorities of a session into `SessionInfo`. (#3813)

.gitlab-ci.yml

@@ -298,22 +298,6 @@ build-malus:
 
 #### stage:                        build
 
-check-transaction-versions:
-  image:                           node:15
-  stage:                           build
-  <<:                              *rules-test
-  <<:                              *docker-env
-  <<:                              *vault-secrets
-  needs:
-    - job:                         test-build-linux-stable
-      artifacts:                   true
-  before_script:
-    - apt-get -y update; apt-get -y install jq lsof
-    - npm install --ignore-scripts -g @polkadot/metadata-cmp
-    - git fetch origin release
-  script:
-    - scripts/gitlab/check_extrinsics_ordering.sh
-
 generate-impl-guide:
   stage:                           build
   <<:                              *rules-test

README.md

@@ -108,6 +108,22 @@ cargo build --release
 
 Note that compilation is a memory intensive process. We recommend having 4 GiB of physical RAM or swap available (keep in mind that if a build hits swap it tends to be very slow).
 
+#### Build from Source with Docker
+
+You can also build from source using 
+[Parity CI docker image](https://github.com/paritytech/scripts/tree/master/dockerfiles/ci-linux):
+
+```bash
+git checkout <latest tagged release>
+docker run --rm -it -w /shellhere/polkadot \
+                    -v $(pwd):/shellhere/polkadot \
+                    paritytech/ci-linux:production cargo build --release
+sudo chown -R $(id -u):$(id -g) target/
+```
+
+If you want to reproduce other steps of CI process you can use the following 
+[guide](https://github.com/paritytech/scripts#gitlab-ci-for-building-docker-images).
+
 ## Networks
 
 This repo supports runtimes for Polkadot, Kusama, and Westend.

bridges/bin/millau/runtime/src/lib.rs

@@ -465,7 +465,7 @@ impl_runtime_apis! {
 
 	impl sp_api::Metadata<Block> for Runtime {
 		fn metadata() -> OpaqueMetadata {
-			Runtime::metadata().into()
+			OpaqueMetadata::new(Runtime::metadata().into())
 		}
 	}
 

bridges/bin/rialto/runtime/src/lib.rs

@@ -590,7 +590,7 @@ impl_runtime_apis! {
 
 	impl sp_api::Metadata<Block> for Runtime {
 		fn metadata() -> OpaqueMetadata {
-			Runtime::metadata().into()
+			OpaqueMetadata::new(Runtime::metadata().into())
 		}
 	}
 

bridges/bin/runtime-common/Cargo.toml

@@ -11,6 +11,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 ed25519-dalek = { version = "1.0", default-features = false, optional = true }
 hash-db = { version = "0.15.2", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 
 # Bridge dependencies
 
@@ -40,10 +41,12 @@ std = [
 	"codec/std",
 	"frame-support/std",
 	"hash-db/std",
+	"scale-info/std",
 	"pallet-bridge-dispatch/std",
 	"pallet-bridge-grandpa/std",
 	"pallet-bridge-messages/std",
 	"pallet-transaction-payment/std",
+	"scale-info/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-state-machine/std",

bridges/bin/runtime-common/src/messages.rs

@@ -37,6 +37,7 @@ use frame_support::{
 	RuntimeDebug,
 };
 use hash_db::Hasher;
+use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{AtLeast32BitUnsigned, CheckedAdd, CheckedDiv, CheckedMul},
 	FixedPointNumber, FixedPointOperand, FixedU128,
@@ -200,7 +201,7 @@ pub mod source {
 	/// - hash of finalized header;
 	/// - storage proof of inbound lane state;
 	/// - lane id.
-	#[derive(Clone, Decode, Encode, Eq, PartialEq, RuntimeDebug)]
+	#[derive(Clone, Decode, Encode, Eq, PartialEq, RuntimeDebug, TypeInfo)]
 	pub struct FromBridgedChainMessagesDeliveryProof<BridgedHeaderHash> {
 		/// Hash of the bridge header the proof is for.
 		pub bridged_header_hash: BridgedHeaderHash,
@@ -431,7 +432,7 @@ pub mod target {
 	/// - storage proof of messages and (optionally) outbound lane state;
 	/// - lane id;
 	/// - nonces (inclusive range) of messages which are included in this proof.
-	#[derive(Clone, Decode, Encode, Eq, PartialEq, RuntimeDebug)]
+	#[derive(Clone, Decode, Encode, Eq, PartialEq, RuntimeDebug, TypeInfo)]
 	pub struct FromBridgedChainMessagesProof<BridgedHeaderHash> {
 		/// Hash of the finalized bridged header the proof is for.
 		pub bridged_header_hash: BridgedHeaderHash,

bridges/fuzz/storage-proof/Cargo.toml

@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
-finality-grandpa = "0.14.0"
+finality-grandpa = "0.14.4"
 hash-db = "0.15.2"
 honggfuzz = "0.5.54"
 log = "0.4.0"

bridges/modules/dispatch/Cargo.toml

@@ -8,6 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
 log = { version = "0.4.14", default-features = false }
 
 # Bridge dependencies
@@ -32,9 +33,11 @@ default = ["std"]
 std = [
 	"bp-message-dispatch/std",
 	"bp-runtime/std",
+	"codec/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
+	"scale-info/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",