Skip to content

Commit 2c26640

Browse files
serban300bkchr
serban300
authored and
bkchr
committed
polkadot-staging branch: Use polkadot-sdk dependencies (#2524)
* Use polkadot-sdk dependencies * Fix ring-proof ref * Fix Beefy * Fix imports * Simple runtimes fixes * Fix substrate-relay * Add ParaAssignmentProvider for Rialto * Rialto chain_spec fix * Fix Rialto build * Fix Rialto pvf workers * Allow rialto-parachain deprecated features warnings
1 parent 98ee19c commit 2c26640

File tree

87 files changed

+622
-592
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+622
-592
lines changed

‎bridges/bin/millau/node/Cargo.toml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,41 @@ millau-runtime = { path = "../runtime" }
2020

2121
# Substrate Dependencies
2222

23-
sc-consensus-beefy = { git = "https://github.com/paritytech/substrate", branch = "master" }
24-
sc-consensus-beefy-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
25-
sp-consensus-beefy = { git = "https://github.com/paritytech/substrate", branch = "master" }
26-
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" }
27-
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
28-
node-inspect = { git = "https://github.com/paritytech/substrate", branch = "master" }
29-
mmr-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
30-
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
31-
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" }
32-
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master"}
33-
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
34-
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
35-
sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
36-
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
37-
sc-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
38-
sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
39-
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
40-
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
41-
sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
42-
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
43-
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
44-
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
45-
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
46-
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
47-
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
48-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
49-
sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
50-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
51-
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" }
52-
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
53-
sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "master" }
23+
sc-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
24+
sc-consensus-beefy-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
25+
sp-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
26+
frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
27+
frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
28+
node-inspect = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
29+
mmr-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
30+
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
31+
sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
32+
sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master"}
33+
sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
34+
sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
35+
sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
36+
sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
37+
sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
38+
sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
39+
sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
40+
sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
41+
sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
42+
sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
43+
sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
44+
sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
45+
sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
46+
sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
47+
sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
48+
sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
49+
sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
50+
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
51+
sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
52+
substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
53+
sc-network-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
5454

5555
[build-dependencies]
56-
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
57-
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
56+
substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
57+
frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
5858

5959
[features]
6060
default = []

‎bridges/bin/millau/node/src/chain_spec.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use millau_runtime::{
2121
WASM_BINARY,
2222
};
2323
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
24-
use sp_consensus_beefy::crypto::AuthorityId as BeefyId;
24+
use sp_consensus_beefy::ecdsa_crypto::AuthorityId as BeefyId;
2525
use sp_consensus_grandpa::AuthorityId as GrandpaId;
2626
use sp_core::{sr25519, Pair, Public};
2727
use sp_runtime::traits::{IdentifyAccount, Verify};

‎bridges/bin/millau/node/src/service.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ pub fn new_partial(
6262
FullClient,
6363
FullBackend,
6464
FullSelectChain,
65-
sc_consensus::DefaultImportQueue<Block, FullClient>,
65+
sc_consensus::DefaultImportQueue<Block>,
6666
sc_transaction_pool::FullPool<Block, FullClient>,
6767
(
6868
sc_consensus_grandpa::GrandpaBlockImport<

‎bridges/bin/millau/runtime/Cargo.toml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -34,50 +34,50 @@ pallet-xcm-bridge-hub-router = { path = "../../../modules/xcm-bridge-hub-router"
3434

3535
# Substrate Dependencies
3636

37-
sp-consensus-beefy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
38-
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
39-
frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
40-
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
41-
frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
42-
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
43-
pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
44-
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
45-
pallet-beefy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
46-
pallet-beefy-mmr = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
47-
pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
48-
pallet-mmr = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
49-
pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = ["historical"]}
50-
pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
51-
pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
52-
pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
53-
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
54-
pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
55-
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
56-
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
57-
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
58-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
59-
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
60-
sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
61-
sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
62-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
63-
sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
64-
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
65-
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
66-
sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
37+
sp-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
38+
frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false, optional = true }
39+
frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
40+
frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
41+
frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
42+
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
43+
pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
44+
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
45+
pallet-beefy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
46+
pallet-beefy-mmr = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
47+
pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
48+
pallet-mmr = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
49+
pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false, features = ["historical"]}
50+
pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
51+
pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
52+
pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
53+
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
54+
pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
55+
sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
56+
sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
57+
sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
58+
sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
59+
sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
60+
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
61+
sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
62+
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
63+
sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
64+
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
65+
sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
66+
sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
6767

6868
# Polkadot Dependencies
69-
pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
70-
xcm = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
71-
xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
72-
xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
69+
pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
70+
xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
71+
xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
72+
xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
7373

7474
[dev-dependencies]
7575
bridge-runtime-common = { path = "../../runtime-common", features = ["integrity-test", "std"] }
7676
env_logger = "0.10"
7777
static_assertions = "1.1"
7878

7979
[build-dependencies]
80-
substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
80+
substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
8181

8282
[features]
8383
default = ["std"]

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ use pallet_grandpa::{
4343
use pallet_transaction_payment::{FeeDetails, Multiplier, RuntimeDispatchInfo};
4444
use sp_api::impl_runtime_apis;
4545
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
46-
use sp_consensus_beefy::{crypto::AuthorityId as BeefyId, mmr::MmrLeafVersion, ValidatorSet};
46+
use sp_consensus_beefy::{ecdsa_crypto::AuthorityId as BeefyId, mmr::MmrLeafVersion, ValidatorSet};
4747
use sp_core::OpaqueMetadata;
4848
use sp_runtime::{
4949
create_runtime_str, generic, impl_opaque_keys,
@@ -73,7 +73,7 @@ pub use frame_support::{
7373
constants::WEIGHT_REF_TIME_PER_SECOND, ConstantMultiplier, IdentityFee, RuntimeDbWeight,
7474
Weight,
7575
},
76-
RuntimeDebug, StorageValue,
76+
StorageValue,
7777
};
7878

7979
pub use frame_system::Call as SystemCall;
@@ -797,7 +797,7 @@ impl_runtime_apis! {
797797
}
798798
}
799799

800-
impl sp_consensus_beefy::BeefyApi<Block> for Runtime {
800+
impl sp_consensus_beefy::BeefyApi<Block, BeefyId> for Runtime {
801801
fn beefy_genesis() -> Option<BlockNumber> {
802802
Beefy::genesis_block()
803803
}
@@ -809,15 +809,15 @@ impl_runtime_apis! {
809809
fn submit_report_equivocation_unsigned_extrinsic(
810810
_equivocation_proof: sp_consensus_beefy::EquivocationProof<
811811
NumberFor<Block>,
812-
sp_consensus_beefy::crypto::AuthorityId,
813-
sp_consensus_beefy::crypto::Signature
812+
sp_consensus_beefy::ecdsa_crypto::AuthorityId,
813+
sp_consensus_beefy::ecdsa_crypto::Signature
814814
>,
815815
_key_owner_proof: sp_consensus_beefy::OpaqueKeyOwnershipProof,
816816
) -> Option<()> { None }
817817

818818
fn generate_key_ownership_proof(
819819
_set_id: sp_consensus_beefy::ValidatorSetId,
820-
_authority_id: sp_consensus_beefy::crypto::AuthorityId,
820+
_authority_id: sp_consensus_beefy::ecdsa_crypto::AuthorityId,
821821
) -> Option<sp_consensus_beefy::OpaqueKeyOwnershipProof> { None }
822822
}
823823

@@ -1020,7 +1020,8 @@ impl_runtime_apis! {
10201020
fn dispatch_benchmark(
10211021
config: frame_benchmarking::BenchmarkConfig,
10221022
) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
1023-
use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey};
1023+
use frame_benchmarking::{Benchmarking, BenchmarkBatch};
1024+
use frame_support::traits::TrackedStorageKey;
10241025

10251026
let whitelist: Vec<TrackedStorageKey> = vec![
10261027
// Block Number

‎bridges/bin/millau/runtime/src/rialto_messages.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ use bridge_runtime_common::{
2525
},
2626
messages_xcm_extension::{SenderAndLane, XcmBlobHauler, XcmBlobHaulerAdapter},
2727
};
28-
use frame_support::{parameter_types, weights::Weight, RuntimeDebug};
28+
use frame_support::{parameter_types, weights::Weight};
2929
use pallet_bridge_relayers::WeightInfoExt as _;
30+
use sp_runtime::RuntimeDebug;
3031
use xcm::latest::prelude::*;
3132
use xcm_builder::HaulBlobExporter;
3233

‎bridges/bin/millau/runtime/src/rialto_parachain_messages.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ use bridge_runtime_common::{
2727
},
2828
messages_xcm_extension::{SenderAndLane, XcmBlobHauler, XcmBlobHaulerAdapter},
2929
};
30-
use frame_support::{parameter_types, weights::Weight, RuntimeDebug};
30+
use frame_support::{parameter_types, weights::Weight};
3131
use pallet_bridge_relayers::WeightInfoExt as _;
32+
use sp_runtime::RuntimeDebug;
3233
use xcm::latest::prelude::*;
3334
use xcm_builder::HaulBlobExporter;
3435

0 commit comments

Comments
 (0)