-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6 from DataHighway-DHX/luke/upgrade_polkadot_0.9.16
fix upgrade to 0.9.16. add para id for rococo. add para block time
- Loading branch information
Showing
45 changed files
with
3,931 additions
and
6,935 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,240 +1,99 @@ | ||
| [dependencies] | ||
| derive_more = '0.99.2' | ||
| log = '0.4.14' | ||
| codec = { package = 'parity-scale-codec', version = '2.0.0' } | ||
| structopt = "0.3.8" | ||
| serde = { version = "1.0.119", features = ["derive"] } | ||
| hex-literal = "0.3.1" | ||
| # RPC related dependencies | ||
| jsonrpc-core = "18.0.0" | ||
|
|
||
| [dependencies.frame-benchmarking] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.frame-benchmarking-cli] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.datahighway-parachain-runtime] | ||
| path = '../runtime' | ||
| version = '1.1.0' | ||
|
|
||
| [dependencies.pallet-transaction-payment-rpc] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.substrate-prometheus-endpoint] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sc-basic-authorship] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sc-chain-spec] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sc-cli] | ||
| features = ['wasmtime'] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sc-client-api] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sc-consensus] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sc-executor] | ||
| features = ['wasmtime'] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sc-network] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sc-keystore] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sc-rpc] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sc-rpc-api] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sc-service] | ||
| features = ['wasmtime'] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sc-transaction-pool] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sc-transaction-pool-api] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sc-tracing] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sp-api] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sp-block-builder] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sp-blockchain] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sp-consensus] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sp-consensus-aura] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sp-core] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sp-inherents] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sp-keystore] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
|
|
||
| [dependencies.sp-offchain] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
| [package] | ||
| name = "datahighway-collator" | ||
| version = "3.0.0" | ||
| authors = ["Anonymous"] | ||
| description = "DataHighway parachain collator FRAME-based Substrate Node based upon the Cumulus." | ||
| license = "Unlicense" | ||
| homepage = "https://substrate.dev" | ||
| repository = "https://github.com/substrate-developer-hub/substrate-parachain-template" | ||
| edition = "2021" | ||
| build = "build.rs" | ||
|
|
||
| [dependencies.sp-runtime] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
| [package.metadata.docs.rs] | ||
| targets = ["x86_64-unknown-linux-gnu"] | ||
|
|
||
| [dependencies.sp-session] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
| [build-dependencies] | ||
| substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
|
|
||
| [dependencies.sp-timestamp] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
| [[bin]] | ||
| name = "datahighway-collator" | ||
| path = "src/main.rs" | ||
|
|
||
| [dependencies.sp-transaction-pool] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
| [features] | ||
| runtime-benchmarks = ["datahighway-parachain-runtime/runtime-benchmarks"] | ||
| try-runtime = [ "datahighway-parachain-runtime/try-runtime" ] | ||
|
|
||
| [dependencies.sp-trie] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
| [dependencies] | ||
| derive_more = "0.99.2" | ||
| log = "0.4.14" | ||
| codec = { package = "parity-scale-codec", version = "2.0.0" } | ||
| structopt = "0.3.8" | ||
| serde = { version = "1.0.132", features = ["derive"] } | ||
| hex-literal = "0.3.1" | ||
|
|
||
| [dependencies.substrate-frame-rpc-system] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
| # RPC related dependencies | ||
| jsonrpc-core = "18.0.0" | ||
|
|
||
| [build-dependencies.substrate-build-script-utils] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
| # Local Dependencies | ||
| datahighway-parachain-runtime = { path = "../runtime", version = "1.1.0" } | ||
|
|
||
| # Substrate Dependencies | ||
| frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
|
|
||
| pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
|
|
||
| substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
|
|
||
| ## Substrate Client Dependencies | ||
| sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", features = ["wasmtime"] } | ||
| sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", features = ["wasmtime"] } | ||
| sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-service = { git = "https://github.com/paritytech/substrate", features = ["wasmtime"], branch = "polkadot-v0.9.16" } | ||
| sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
|
|
||
| ## Substrate Primitive Dependencies | ||
| sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
|
|
||
| # Cumulus dependencies | ||
| [dependencies.cumulus-client-consensus-aura] | ||
| git = 'https://github.com/paritytech/cumulus.git' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.cumulus-client-consensus-common] | ||
| git = 'https://github.com/paritytech/cumulus.git' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.cumulus-client-collator] | ||
| git = 'https://github.com/paritytech/cumulus.git' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.cumulus-client-cli] | ||
| git = 'https://github.com/paritytech/cumulus.git' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.cumulus-client-network] | ||
| git = 'https://github.com/paritytech/cumulus.git' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.cumulus-primitives-core] | ||
| git = 'https://github.com/paritytech/cumulus.git' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.cumulus-client-service] | ||
| git = 'https://github.com/paritytech/cumulus.git' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.cumulus-primitives-parachain-inherent] | ||
| git = 'https://github.com/paritytech/cumulus.git' | ||
| branch = "polkadot-v0.9.16" | ||
| cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } | ||
| cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } | ||
| cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } | ||
| cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } | ||
| cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } | ||
| cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } | ||
| cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } | ||
| cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } | ||
| cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } | ||
| cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } | ||
|
|
||
| # Polkadot dependencies | ||
| [dependencies.polkadot-primitives] | ||
| git = "https://github.com/paritytech/polkadot" | ||
| branch = "release-v0.9.16" | ||
|
|
||
| [dependencies.polkadot-service] | ||
| git = "https://github.com/paritytech/polkadot" | ||
| branch = "release-v0.9.16" | ||
|
|
||
| [dependencies.polkadot-cli] | ||
| git = "https://github.com/paritytech/polkadot" | ||
| branch = "release-v0.9.16" | ||
|
|
||
| [dependencies.polkadot-test-service] | ||
| git = "https://github.com/paritytech/polkadot" | ||
| branch = "release-v0.9.16" | ||
|
|
||
| [dependencies.polkadot-parachain] | ||
| git = "https://github.com/paritytech/polkadot" | ||
| branch = "release-v0.9.16" | ||
|
|
||
| [dependencies.sc-consensus-epochs] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [dependencies.sc-consensus-aura] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| # # | ||
|
|
||
| [dependencies.sc-telemetry] | ||
| git = 'https://github.com/paritytech/substrate' | ||
| branch = "polkadot-v0.9.16" | ||
|
|
||
| [[bin]] | ||
| name = 'datahighway-collator' | ||
|
|
||
| [package] | ||
| authors = ['Anonymous'] | ||
| build = 'build.rs' | ||
| edition = '2018' | ||
| homepage = 'https://substrate.dev' | ||
| license = 'Unlicense' | ||
| name = 'datahighway-collator' | ||
| repository = 'https://github.com/substrate-developer-hub/substrate-parachain-template' | ||
| version = '3.0.0' | ||
| [package.metadata.docs.rs] | ||
| targets = ['x86_64-unknown-linux-gnu'] | ||
|
|
||
| [features] | ||
| default = [] | ||
| runtime-benchmarks = ['datahighway-parachain-runtime/runtime-benchmarks'] | ||
| polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } | ||
| polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } | ||
| polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } | ||
| polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } | ||
| xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.16" } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,7 @@ | ||
| use substrate_build_script_utils::{ | ||
| generate_cargo_keys, | ||
| rerun_if_git_head_changed, | ||
| }; | ||
| use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed}; | ||
|
|
||
| fn main() { | ||
| generate_cargo_keys(); | ||
| rerun_if_git_head_changed(); | ||
| generate_cargo_keys(); | ||
|
|
||
| rerun_if_git_head_changed(); | ||
| } |
Oops, something went wrong.