-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migration runtime upgrade and bump to polkadot v0.9.18 (#83)
* add a whole lot of pallets * cargo fmt * beauty changes only * add some further solo chain infos * add missing pallets * cargo fmt * add restrictive BaseFilter * cargo fmt * add better description * fix build * revert xcm pallet numbers * increaes tx version * remove FIXME - we should keep parachain weights here * remove obsolete comment * remove obsolete FIXME * relax basefilter a little * unbrick runtime upgrade * unbrick runtime upgrade * cargo fmt * add new pallets to benchmark script * fix migration naming * Benchmarking results (#88) * Bump polkadot 0.9.18 (#89) * Bump tp polkadot 0.9.18 : compile * Bump tp polkadot 0.9.18 : push forgotten cargo.lock Co-authored-by: echevrier <[email protected]> * hand-fixing remark weight * bump 1.5.16 Co-authored-by: mosonyi <[email protected]> Co-authored-by: echevrier <[email protected]> Co-authored-by: echevrier <[email protected]> Co-authored-by: Alain Brenzikofer <[email protected]>
- Loading branch information
5 people
authored
Apr 6, 2022
1 parent
c26d793
commit f123120
Showing
35 changed files
with
3,491 additions
and
1,682 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
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
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
2 changes: 1 addition & 1 deletion
2
polkadot-launch/launch-rococo-local-with-shell-rococo-1.4.12.json
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
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
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
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
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 |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
| name = "integritee-collator" | ||
| description = "The Integritee parachain collator binary" | ||
| # align major.minor revision with the runtimes. bump patch revision ad lib. make this the github release tag | ||
| version = "1.5.15" | ||
| version = "1.5.16" | ||
| authors = ["Integritee AG <[email protected]>"] | ||
| homepage = "https://integritee.network/" | ||
| repository = "https://github.com/integritee-network/parachain" | ||
|
|
@@ -14,84 +14,85 @@ name = "integritee-collator" | |
| path = "src/main.rs" | ||
|
|
||
| [dependencies] | ||
| async-trait = "0.1.42" | ||
| codec = { package = "parity-scale-codec", version = "3.0.0" } | ||
| clap = { version = "3.0", features = ["derive"] } | ||
| derive_more = "0.15.0" | ||
| exit-future = "0.1.4" | ||
| futures = { version = "0.3.1", features = ["compat"] } | ||
| hex-literal = "0.3.4" | ||
| log = "0.4.8" | ||
| parking_lot = "0.10.2" | ||
| trie-root = "0.15.2" | ||
| codec = { package = "parity-scale-codec", version = "2.3.1" } | ||
| structopt = "0.3.3" | ||
| parking_lot = "0.12.0" | ||
| serde = { version = "1.0.132", features = ["derive"] } | ||
| hex-literal = "0.2.1" | ||
| async-trait = "0.1.42" | ||
| serde_json = "1.0.64" | ||
| trie-root = "0.15.2" | ||
|
|
||
| # Parachain runtimes | ||
| parachain-runtime = { package = "integritee-runtime", path = "integritee-runtime" } | ||
| shell-runtime = { package = "shell-runtime", path = "shell-runtime" } | ||
| parachains-common = { path = "parachains-common" } | ||
| shell-runtime = { package = "shell-runtime", path = "shell-runtime" } | ||
|
|
||
| # 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" } | ||
| sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sp-io = { 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-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sp-session = { 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-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-service = { git = "https://github.com/paritytech/substrate", 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" } | ||
| sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-basic-authorship = { 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-blockchain = { 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-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-finality-grandpa = { 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-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| sc-tracing = { 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-api = { 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-keyring = { 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" } | ||
| frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.18" } | ||
| frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate', branch = "polkadot-v0.9.18" } | ||
| sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
|
|
||
| # RPC related dependencies | ||
| jsonrpc-core = "18.0.0" | ||
| sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| frame-rpc-system = { package = "substrate-frame-rpc-system", 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" } | ||
| frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
|
|
||
| # Cumulus dependencies | ||
| cumulus-client-cli = { 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-relay-chain = { 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-service = { 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-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" } | ||
| cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } | ||
| cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } | ||
| cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } | ||
| cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } | ||
| cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } | ||
| cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } | ||
| cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } | ||
| cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } | ||
| cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } | ||
| cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } | ||
| cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } | ||
|
|
||
| # Polkadot dependencies | ||
| 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" } | ||
| 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" } | ||
| xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } | ||
| xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } | ||
| polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } | ||
| polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } | ||
| polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } | ||
| polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } | ||
|
|
||
| [build-dependencies] | ||
| substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
|
|
||
| [dev-dependencies] | ||
| assert_cmd = "0.12" | ||
|
|
@@ -101,9 +102,9 @@ tempfile = "3.2.0" | |
| tokio = { version = "0.2.13", features = ["macros"] } | ||
|
|
||
| # Substrate dependencies | ||
| pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } | ||
| pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
| substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } | ||
|
|
||
| [features] | ||
| default = [] | ||
|
|
||
Oops, something went wrong.