Skip to content
This repository was archived by the owner on Mar 30, 2023. It is now read-only.

Commit ead3449

Browse files
Guantongaurexav
Guantong
and
aurexav
authored
To polkadot-v0.9.36 (#213)
* Anchor polkadot-v0.9.36 * Companion for paritytech/cumulus#1860 * Companion for paritytech/cumulus#1876 * Companion for paritytech/cumulus#1904 * Companion for paritytech/substrate#12310 * Companion for paritytech/substrate#12740 * Bump array-bytes to 6.0.0 * Companion for paritytech/substrate#12868 * Companion for paritytech/cumulus#1930 * Companion for paritytech/cumulus#1905 * Companion for paritytech/cumulus#1880 * Companion for paritytech/cumulus#1997 * Companion for paritytech/cumulus#1559 * Prepare messages-substrate * Companion for paritytech/substrate#12684 * Companion for paritytech/substrate#12740 * Fix compile paritytech/substrate#12740 * Compile done * Format * Add call index * Compile done * Fix CI * Bump moonbeam * Fix CI * Try fix tests * Use into instead of `Compact` * Patch substrate & Fix compile * Fix try-runtime * Remove parity-util-mem * Format * Format * Opt * Format * Use `codec::Compact<AssetId>` * Format --------- Co-authored-by: Xavier Lau <[email protected]>
1 parent 60d19da commit ead3449

Some content is hidden

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

61 files changed

+1770
-1342
lines changed

‎Cargo.lock

Lines changed: 663 additions & 648 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 168 additions & 0 deletions
Large diffs are not rendered by default.

‎core/inflation/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dc-types = { path = "../types" }
2020
substrate-fixed = { default-features = false, git = "https://github.com/encointer/substrate-fixed" }
2121

2222
[dev-dependencies]
23-
sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
23+
sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
2424

2525
[features]
2626
default = ["std"]

‎core/primitives/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ version = "6.0.0"
1414
dc-types = { path = "../types" }
1515

1616
# moonbeam
17-
account = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.33" }
17+
account = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.36" }
1818

1919
# substrate
20-
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
21-
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
20+
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
21+
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
2222

2323
[features]
2424
default = ["std"]

‎node/Cargo.toml

Lines changed: 64 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repository = "https://github.com/darwinia-network/darwinia"
1010
version = "6.0.0"
1111

1212
[build-dependencies]
13-
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
13+
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
1414

1515
[dependencies]
1616
# crates.io
@@ -19,21 +19,20 @@ async-trait = { version = "0.1" }
1919
clap = { version = "4.0", features = ["derive"] }
2020
codec = { package = "parity-scale-codec", version = "3.3" }
2121
futures = { version = "0.3" }
22-
jsonrpsee = { version = "0.15", features = ["server"] }
22+
jsonrpsee = { version = "0.16", features = ["server"] }
2323
log = { version = "0.4" }
2424
serde = { version = "1.0", features = ["derive"] }
2525

2626
# cumulus
27-
cumulus-client-cli = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" }
28-
cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" }
29-
cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" }
30-
cumulus-client-network = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" }
31-
cumulus-client-service = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" }
32-
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" }
33-
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" }
34-
cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" }
35-
cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" }
36-
cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.33" }
27+
cumulus-client-cli = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" }
28+
cumulus-client-collator = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" }
29+
cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" }
30+
cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" }
31+
cumulus-client-network = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" }
32+
cumulus-client-service = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" }
33+
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" }
34+
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" }
35+
cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" }
3736

3837
# darwinia
3938
crab-runtime = { path = "../runtime/crab" }
@@ -42,57 +41,63 @@ dc-primitives = { path = "../core/primitives" }
4241
pangolin-runtime = { path = "../runtime/pangolin" }
4342

4443
# frontier
45-
fc-cli = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" }
46-
fc-db = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" }
47-
fc-mapping-sync = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" }
48-
fc-rpc = { features = ["rpc_binary_search_estimate"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" }
49-
fc-rpc-core = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" }
50-
fp-evm = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" }
51-
fp-rpc = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" }
52-
fp-storage = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.33" }
44+
fc-cli = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" }
45+
fc-consensus = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" }
46+
fc-db = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" }
47+
fc-mapping-sync = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" }
48+
fc-rpc = { features = ["rpc_binary_search_estimate"], git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" }
49+
fc-rpc-core = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" }
50+
fp-evm = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" }
51+
fp-rpc = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" }
52+
fp-storage = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v0.9.36" }
5353

5454
# polkadot
55-
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" }
56-
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" }
57-
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" }
58-
xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" }
55+
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" }
56+
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" }
57+
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" }
58+
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" }
59+
xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36" }
5960

6061
# substrate
61-
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
62-
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
63-
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
64-
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
65-
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
66-
sc-cli = { features = ["wasmtime"], git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
67-
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
68-
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
69-
sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
70-
sc-executor = { features = ["wasmtime"], git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
71-
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
72-
sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
73-
sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
74-
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
75-
sc-service = { features = ["wasmtime"], git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
76-
sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
77-
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
78-
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
79-
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
80-
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
81-
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
82-
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
83-
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
84-
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
85-
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
86-
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
87-
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
88-
sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
89-
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
90-
sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
91-
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
92-
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
93-
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
94-
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" }
95-
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", optional = true}
62+
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
63+
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
64+
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
65+
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
66+
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
67+
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
68+
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
69+
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
70+
sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
71+
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
72+
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
73+
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
74+
sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
75+
sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
76+
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
77+
sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
78+
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
79+
sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
80+
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
81+
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
82+
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
83+
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
84+
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
85+
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
86+
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
87+
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
88+
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
89+
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
90+
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
91+
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
92+
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
93+
sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
94+
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
95+
sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
96+
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
97+
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
98+
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
99+
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
100+
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", optional = true}
96101

97102
[features]
98103
default = []

‎node/src/cli.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pub enum Subcommand {
5555
/// Sub-commands concerned with benchmarking.
5656
/// The pallet benchmarking moved to the `pallet` sub-command.
5757
#[command(subcommand)]
58-
Benchmark(frame_benchmarking_cli::BenchmarkCmd),
58+
Benchmark(Box<frame_benchmarking_cli::BenchmarkCmd>),
5959

6060
/// Try some testing command against a specified runtime state.
6161
#[cfg(feature = "try-runtime")]

‎node/src/command.rs

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -450,10 +450,10 @@ pub fn run() -> Result<()> {
450450
})
451451
},
452452
Some(Subcommand::Benchmark(cmd)) => {
453-
let runner = cli.create_runner(cmd)?;
453+
let runner = cli.create_runner(&**cmd)?;
454454

455455
// Switch on the concrete benchmark sub-command-
456-
match cmd {
456+
match &**cmd {
457457
BenchmarkCmd::Pallet(cmd) =>
458458
if cfg!(feature = "runtime-benchmarks") {
459459
runner.sync_run(|config| {
@@ -504,22 +504,29 @@ pub fn run() -> Result<()> {
504504
let chain_spec = &runner.config().chain_spec;
505505

506506
set_default_ss58_version(chain_spec);
507+
508+
use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
509+
type HostFunctionsOf<E> = ExtendedHostFunctions<
510+
sp_io::SubstrateHostFunctions,
511+
<E as NativeExecutionDispatch>::ExtendHostFunctions,
512+
>;
513+
507514
// grab the task manager.
508515
let registry = &runner.config().prometheus_config.as_ref().map(|cfg| &cfg.registry);
509516
let task_manager = TaskManager::new(runner.config().tokio_handle.clone(), *registry)
510517
.map_err(|e| format!("Error: {:?}", e))?;
511518

512519
if chain_spec.is_crab() {
513-
runner.async_run(|config| {
514-
Ok((cmd.run::<Block, CrabRuntimeExecutor>(config), task_manager))
520+
runner.async_run(|_| {
521+
Ok((cmd.run::<Block, HostFunctionsOf<CrabRuntimeExecutor>>(), task_manager))
515522
})
516523
} else if chain_spec.is_pangolin() {
517-
runner.async_run(|config| {
518-
Ok((cmd.run::<Block, PangolinRuntimeExecutor>(config), task_manager))
524+
runner.async_run(|_| {
525+
Ok((cmd.run::<Block, HostFunctionsOf<PangolinRuntimeExecutor>>(), task_manager))
519526
})
520527
} else {
521-
runner.async_run(|config| {
522-
Ok((cmd.run::<Block, DarwiniaRuntimeExecutor>(config), task_manager))
528+
runner.async_run(|_| {
529+
Ok((cmd.run::<Block, HostFunctionsOf<DarwiniaRuntimeExecutor>>(), task_manager))
523530
})
524531
}
525532
},
@@ -570,7 +577,7 @@ pub fn run() -> Result<()> {
570577
if config.role.is_authority() { "yes" } else { "no" }
571578
);
572579

573-
if collator_options.relay_chain_rpc_url.is_some() && !cli.relay_chain_args.is_empty() {
580+
if !collator_options.relay_chain_rpc_urls.is_empty() && !cli.relay_chain_args.is_empty() {
574581
log::warn!("Detected relay chain node arguments together with --relay-chain-rpc-url. This command starts a minimal Polkadot node that only uses a network-related subset of all relay chain CLI options.");
575582
}
576583

0 commit comments

Comments
 (0)