From ff3f706336b8a6e1f5c115181f0ef5f34b9096dd Mon Sep 17 00:00:00 2001 From: firke Date: Fri, 3 Dec 2021 11:23:09 +0000 Subject: [PATCH] Enable features for dependecies to fix individual runtime build. --- Cargo.lock | 137 +++++++++++++++++---------------- runtime/opportunity/Cargo.toml | 11 ++- runtime/opportunity/src/lib.rs | 41 ++++++---- 3 files changed, 100 insertions(+), 89 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 978bc2de..f935f1f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -699,7 +699,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "finality-grandpa", "frame-support", @@ -715,7 +715,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bp-runtime", "frame-support", @@ -727,7 +727,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bitvec 0.20.4", "bp-runtime", @@ -743,7 +743,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bp-messages", "bp-runtime", @@ -761,7 +761,7 @@ dependencies = [ [[package]] name = "bp-rialto" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bp-messages", "bp-runtime", @@ -776,7 +776,7 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -793,7 +793,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "frame-support", "hash-db", @@ -811,7 +811,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -826,7 +826,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -841,7 +841,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -3332,7 +3332,7 @@ dependencies = [ [[package]] name = "kusama-runtime" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -4346,7 +4346,7 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "derive_more", "futures 0.3.18", @@ -4793,6 +4793,7 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" name = "opportunity-runtime" version = "0.9.12" dependencies = [ + "beefy-primitives", "frame-benchmarking", "frame-election-provider-support", "frame-executive", @@ -5144,7 +5145,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -5161,7 +5162,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bp-header-chain", "bp-runtime", @@ -5183,7 +5184,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bitvec 0.20.4", "bp-message-dispatch", @@ -5826,7 +5827,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "frame-support", "frame-system", @@ -6222,7 +6223,7 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "polkadot-approval-distribution" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "futures 0.3.18", "polkadot-node-network-protocol", @@ -6236,7 +6237,7 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "futures 0.3.18", "polkadot-node-network-protocol", @@ -6249,7 +6250,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "derive_more", "futures 0.3.18", @@ -6271,7 +6272,7 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "futures 0.3.18", "lru 0.7.0", @@ -6291,7 +6292,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "frame-benchmarking-cli", "futures 0.3.18", @@ -6311,7 +6312,7 @@ dependencies = [ [[package]] name = "polkadot-client" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -6344,7 +6345,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "always-assert", "derive_more", @@ -6365,7 +6366,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -6378,7 +6379,7 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "derive_more", "futures 0.3.18", @@ -6400,7 +6401,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -6414,7 +6415,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "futures 0.3.18", "futures-timer 3.0.2", @@ -6434,7 +6435,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "async-trait", "futures 0.3.18", @@ -6453,7 +6454,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "futures 0.3.18", "parity-scale-codec", @@ -6471,7 +6472,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bitvec 0.20.4", "derive_more", @@ -6499,7 +6500,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bitvec 0.20.4", "futures 0.3.18", @@ -6519,7 +6520,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bitvec 0.20.4", "futures 0.3.18", @@ -6537,7 +6538,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "futures 0.3.18", "polkadot-node-subsystem", @@ -6552,7 +6553,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "async-trait", "futures 0.3.18", @@ -6570,7 +6571,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "futures 0.3.18", "polkadot-node-subsystem", @@ -6585,7 +6586,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "futures 0.3.18", "futures-timer 3.0.2", @@ -6602,7 +6603,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bitvec 0.20.4", "derive_more", @@ -6621,7 +6622,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-participation" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "futures 0.3.18", "polkadot-node-primitives", @@ -6634,7 +6635,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "async-trait", "futures 0.3.18", @@ -6651,7 +6652,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bitvec 0.20.4", "futures 0.3.18", @@ -6666,7 +6667,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "always-assert", "assert_matches", @@ -6697,7 +6698,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "futures 0.3.18", "memory-lru", @@ -6715,7 +6716,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "async-std", "lazy_static", @@ -6733,7 +6734,7 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "futures 0.3.18", "futures-timer 3.0.2", @@ -6744,7 +6745,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "async-trait", "derive_more", @@ -6762,7 +6763,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bounded-vec", "futures 0.3.18", @@ -6784,7 +6785,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -6794,7 +6795,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "derive_more", "futures 0.3.18", @@ -6813,7 +6814,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "async-trait", "derive_more", @@ -6840,7 +6841,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "futures 0.3.18", "futures-timer 3.0.2", @@ -6861,7 +6862,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "async-trait", "futures 0.3.18", @@ -6878,7 +6879,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -6889,7 +6890,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "derive_more", "frame-support", @@ -6906,7 +6907,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bitvec 0.20.4", "frame-system", @@ -6936,7 +6937,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -6967,7 +6968,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -7039,7 +7040,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -7084,7 +7085,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "bitflags", "bitvec 0.20.4", @@ -7122,7 +7123,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "async-trait", "beefy-gadget", @@ -7220,7 +7221,7 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "arrayvec 0.5.2", "derive_more", @@ -7241,7 +7242,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -7890,7 +7891,7 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "beefy-primitives", "bp-messages", @@ -9345,7 +9346,7 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "slot-range-helper" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "enumn", "parity-scale-codec", @@ -11563,7 +11564,7 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -11737,7 +11738,7 @@ dependencies = [ [[package]] name = "xcm" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -11750,7 +11751,7 @@ dependencies = [ [[package]] name = "xcm-builder" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "frame-support", "frame-system", @@ -11770,7 +11771,7 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.9.12" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -11787,7 +11788,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot.git?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.12#5feed981cf0fe671447eabaa9c0d235a8dd0003e" dependencies = [ "proc-macro2", "quote", diff --git a/runtime/opportunity/Cargo.toml b/runtime/opportunity/Cargo.toml index bcdd40aa..0e00c992 100644 --- a/runtime/opportunity/Cargo.toml +++ b/runtime/opportunity/Cargo.toml @@ -44,7 +44,8 @@ frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate" frame-try-runtime = { version = "0.10.0-dev", git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.12", optional = true, default-features = false } ## Substrate Primitive Dependencies -sp-consensus-babe = { version = '0.10.0-dev', git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.12", default-features = false } +babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.12" } +beefy-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.12" } sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false } @@ -109,10 +110,12 @@ std = [ 'sp-block-builder/std', 'sp-transaction-pool/std', 'sp-inherents/std', + 'sp-authority-discovery/std', 'frame-support/std', 'frame-executive/std', 'frame-system/std', 'frame-system-rpc-runtime-api/std', + 'frame-election-provider-support/std', 'pallet-balances/std', 'pallet-timestamp/std', 'pallet-sudo/std', @@ -123,7 +126,6 @@ std = [ 'pallet-offences/std', 'pallet-staking/std', 'pallet-authorship/std', - 'sp-authority-discovery/std', 'pallet-grandpa/std', 'pallet-session/std', 'pallet-scheduler/std', @@ -132,7 +134,6 @@ std = [ 'pallet-collective/std', 'pallet-democracy/std', 'pallet-im-online/std', - 'frame-election-provider-support/std', 'pallet-elections-phragmen/std', "pallet-transaction-payment/std", "pallet-transaction-payment-rpc-runtime-api/std", @@ -140,11 +141,13 @@ std = [ 'pallet-standard-oracle/std', 'pallet-standard-market/std', 'pallet-standard-vault/std', - 'sp-consensus-babe/std', 'pallet-indices/std', 'pallet-babe/std', 'pallet-authority-discovery/std', 'pallet-standard-chainbridge/std', + 'beefy-primitives/std', + 'babe-primitives/std', + 'runtime-common/std', ] runtime-benchmarks = [ diff --git a/runtime/opportunity/src/lib.rs b/runtime/opportunity/src/lib.rs index cd7637cd..12f8b06d 100644 --- a/runtime/opportunity/src/lib.rs +++ b/runtime/opportunity/src/lib.rs @@ -8,7 +8,7 @@ use sp_core::{ u32_trait::{_1, _2, _3, _4, _5}, OpaqueMetadata, }; - +use beefy_primitives::crypto::AuthorityId as BeefyId; use pallet_grandpa::{ fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList, }; @@ -137,10 +137,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); /// The BABE epoch configuration at genesis. -pub const BABE_GENESIS_EPOCH_CONFIG: sp_consensus_babe::BabeEpochConfiguration = - sp_consensus_babe::BabeEpochConfiguration { +pub const BABE_GENESIS_EPOCH_CONFIG: babe_primitives::BabeEpochConfiguration = + babe_primitives::BabeEpochConfiguration { c: PRIMARY_PROBABILITY, - allowed_slots: sp_consensus_babe::AllowedSlots::PrimaryAndSecondaryPlainSlots, + allowed_slots: babe_primitives::AllowedSlots::PrimaryAndSecondaryPlainSlots, }; /// The version information used to identify this runtime when compiled natively. @@ -1009,14 +1009,21 @@ sp_api::impl_runtime_apis! { } } - impl sp_consensus_babe::BabeApi for Runtime { - fn configuration() -> sp_consensus_babe::BabeGenesisConfiguration { + impl beefy_primitives::BeefyApi for Runtime { + fn validator_set() -> beefy_primitives::ValidatorSet { + // dummy implementation due to lack of BEEFY pallet. + beefy_primitives::ValidatorSet { validators: Vec::new(), id: 0 } + } + } + + impl babe_primitives::BabeApi for Runtime { + fn configuration() -> babe_primitives::BabeGenesisConfiguration { // The choice of `c` parameter (where `1 - c` represents the // probability of a slot being empty), is done in accordance to the // slot duration and expected target block time, for safely // resisting network delays of maximum two seconds. // - sp_consensus_babe::BabeGenesisConfiguration { + babe_primitives::BabeGenesisConfiguration { slot_duration: Babe::slot_duration(), epoch_length: EpochDuration::get(), c: BABE_GENESIS_EPOCH_CONFIG.c, @@ -1026,32 +1033,32 @@ sp_api::impl_runtime_apis! { } } - fn current_epoch_start() -> sp_consensus_babe::Slot { + fn current_epoch_start() -> babe_primitives::Slot { Babe::current_epoch_start() } - fn current_epoch() -> sp_consensus_babe::Epoch { + fn current_epoch() -> babe_primitives::Epoch { Babe::current_epoch() } - fn next_epoch() -> sp_consensus_babe::Epoch { + fn next_epoch() -> babe_primitives::Epoch { Babe::next_epoch() } fn generate_key_ownership_proof( - _slot_number: sp_consensus_babe::Slot, - authority_id: sp_consensus_babe::AuthorityId, - ) -> Option { + _slot_number: babe_primitives::Slot, + authority_id: babe_primitives::AuthorityId, + ) -> Option { use parity_scale_codec::Encode; - Historical::prove((sp_consensus_babe::KEY_TYPE, authority_id)) + Historical::prove((babe_primitives::KEY_TYPE, authority_id)) .map(|p| p.encode()) - .map(sp_consensus_babe::OpaqueKeyOwnershipProof::new) + .map(babe_primitives::OpaqueKeyOwnershipProof::new) } fn submit_report_equivocation_unsigned_extrinsic( - equivocation_proof: sp_consensus_babe::EquivocationProof<::Header>, - key_owner_proof: sp_consensus_babe::OpaqueKeyOwnershipProof, + equivocation_proof: babe_primitives::EquivocationProof<::Header>, + key_owner_proof: babe_primitives::OpaqueKeyOwnershipProof, ) -> Option<()> { let key_owner_proof = key_owner_proof.decode()?;