Skip to content

Commit

Permalink
Upgrade to polkadot-v0.9.26 (#850)
Browse files Browse the repository at this point in the history 
* Upgrade Cargo.toml for pallets for polkadot-v0.9.26

* Update runtime and node to version 0.9.26

* Use bounded_vec!

* Pin tracing-core version

* Align node folder to parachain-template

* Remove unnecessary dependency

Co-authored-by: Chralt98 <chralt98@gmail.com>
  • Loading branch information
@vivekvpandya @Chralt98
vivekvpandya and Chralt98 committed Nov 24, 2022
1 parent 7bddaf3 commit 8de3b3a
Show file tree
Hide file tree
Showing 42 changed files with 1,594 additions and 1,654 deletions.
2,343 changes: 1,169 additions & 1,174 deletions Cargo.lock
View file

Large diffs are not rendered by default.

20 changes: 9 additions & 11 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,28 +52,26 @@ resolver = "2"
# If it is not used, the Zeitgeist runtimes will contain duplicate crates from
# different repositories which results in bigger WASM-blobs, binary and the inability
# to compile with the "runtime-benchmarks" feature.
pallet-crowdloan-rewards = { git = "https://github.com/zeitgeistpm/crowdloan-rewards", branch = "use-cumulus-from-parity" }
pallet-crowdloan-rewards = { git = "https://github.com/zeitgeistpm/crowdloan-rewards", branch = "polkadot-v0.9.26" }

[patch."https://github.com/purestake/moonbeam"]
# Use dependencies from Paritytech
moonbeam-vrf = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "v0.25.0-paritytech" }
moonbeam-vrf = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "polkadot-v0.9.26" }
# Fix author-mapping migration
pallet-author-mapping = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "v0.25.0-paritytech" }
# Fix benchmark verification logic
# See https://github.com/zeitgeistpm/moonbeam/commit/42fdf1a90294c49ddbf8d0204ef002b2914a886f
pallet-parachain-staking = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "v0.25.0-paritytech" }
pallet-author-mapping = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "polkadot-v0.9.26" }
# Use dependencies from Paritytech
session-keys-primitives = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "v0.25.0-paritytech" }
pallet-parachain-staking = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "polkadot-v0.9.26" }
session-keys-primitives = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "polkadot-v0.9.26" }

[patch."https://github.com/purestake/nimbus"]
# Use dependencies from Paritytech
nimbus-consensus = { git = "https://github.com/zeitgeistpm/nimbus", branch = "use-paritytech-dependencies" }
nimbus-consensus = { git = "https://github.com/zeitgeistpm/nimbus", branch = "polkadot-v0.9.26" }
# Use dependencies from Paritytech
nimbus-primitives = { git = "https://github.com/zeitgeistpm/nimbus", branch = "use-paritytech-dependencies" }
nimbus-primitives = { git = "https://github.com/zeitgeistpm/nimbus", branch = "polkadot-v0.9.26" }
# Use dependencies from Paritytech
pallet-author-inherent = { git = "https://github.com/zeitgeistpm/nimbus", branch = "use-paritytech-dependencies" }
pallet-author-inherent = { git = "https://github.com/zeitgeistpm/nimbus", branch = "polkadot-v0.9.26" }
# Use dependencies from Paritytech
pallet-author-slot-filter = { git = "https://github.com/zeitgeistpm/nimbus", branch = "use-paritytech-dependencies" }
pallet-author-slot-filter = { git = "https://github.com/zeitgeistpm/nimbus", branch = "polkadot-v0.9.26" }

# The list of dependencies below (which can be both direct and indirect dependencies) are crates
# that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of
Expand Down
138 changes: 70 additions & 68 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,101 +3,103 @@ name = "zeitgeist"
path = "./src/main.rs"

[build-dependencies]
substrate-build-script-utils = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
substrate-build-script-utils = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }

[dependencies]
pallet-transaction-payment = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
pallet-transaction-payment-rpc = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sc-basic-authorship = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sc-cli = { branch = "polkadot-v0.9.23", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
sc-client-api = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sc-consensus = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sc-executor = { branch = "polkadot-v0.9.23", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
sc-keystore = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sc-rpc = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sc-rpc-api = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sc-service = { branch = "polkadot-v0.9.23", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
sc-sysinfo = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sc-telemetry = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sc-transaction-pool = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sc-transaction-pool-api = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-api = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-block-builder = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-blockchain = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-consensus = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-core = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-inherents = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-keyring = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-offchain = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-runtime = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-session = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-storage = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-timestamp = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-transaction-pool = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-trie = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
substrate-frame-rpc-system = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
pallet-transaction-payment = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
pallet-transaction-payment-rpc = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sc-basic-authorship = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sc-cli = { branch = "polkadot-v0.9.26", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
sc-client-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sc-consensus = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sc-executor = { branch = "polkadot-v0.9.26", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
sc-keystore = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sc-rpc = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sc-rpc-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sc-service = { branch = "polkadot-v0.9.26", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" }
sc-sysinfo = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sc-telemetry = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sc-transaction-pool = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sc-transaction-pool-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-api = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-block-builder = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-blockchain = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-consensus = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-core = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-inherents = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-keyring = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-offchain = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-runtime = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-session = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-storage = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-timestamp = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-transaction-pool = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-trie = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
substrate-frame-rpc-system = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }

# Try-Runtime

try-runtime-cli = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate", optional = true }
try-runtime-cli = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }

# Benchmark

frame-benchmarking = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate", optional = true }
frame-benchmarking-cli = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
frame-benchmarking = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
frame-benchmarking-cli = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }

# Cumulus

cumulus-client-cli = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-collator = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-consensus-common = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-consensus-relay-chain = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-network = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-service = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-primitives-core = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-primitives-parachain-inherent = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-relay-chain-inprocess-interface = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-relay-chain-interface = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-relay-chain-rpc-interface = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-cli = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-collator = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-consensus-common = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-consensus-relay-chain = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-network = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-client-service = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-primitives-core = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-primitives-parachain-inherent = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-relay-chain-inprocess-interface = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-relay-chain-interface = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }
cumulus-relay-chain-rpc-interface = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/cumulus", optional = true }

# Parachain

moonbeam-vrf = { tag = "v0.25.0", git = "https://github.com/purestake/moonbeam", optional = true }
nimbus-consensus = { branch = "moonbeam-polkadot-v0.9.23", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
nimbus-primitives = { branch = "moonbeam-polkadot-v0.9.23", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.23", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
pallet-parachain-staking = { tag = "v0.25.0", git = "https://github.com/purestake/moonbeam", optional = true }
moonbeam-vrf = { tag = "v0.26.1", git = "https://github.com/purestake/moonbeam", optional = true }
nimbus-consensus = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
nimbus-primitives = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.26", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
pallet-parachain-staking = { tag = "v0.26.1", git = "https://github.com/purestake/moonbeam", optional = true }
parity-scale-codec = { optional = true, version = "3.0.0" }
sc-chain-spec = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate", optional = true }
sc-network = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate", optional = true }
sc-tracing = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate", optional = true }
sc-chain-spec = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
sc-network = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
sc-tracing = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
serde = { features = ["derive"], optional = true, version = "1.0.137" }
session-keys-primitives = { tag = "v0.25.0", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
sp-keystore = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate", optional = true }
substrate-prometheus-endpoint = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate", optional = true }
session-keys-primitives = { tag = "v0.26.1", default-features = false, git = "https://github.com/purestake/moonbeam", optional = true }
sp-keystore = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }
substrate-prometheus-endpoint = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate", optional = true }

# Polkadot

polkadot-cli = { branch = "release-v0.9.23", git = "https://github.com/paritytech/polkadot", optional = true }
polkadot-parachain = { branch = "release-v0.9.23", git = "https://github.com/paritytech/polkadot", optional = true }
polkadot-primitives = { branch = "release-v0.9.23", git = "https://github.com/paritytech/polkadot", optional = true }
polkadot-service = { branch = "release-v0.9.23", git = "https://github.com/paritytech/polkadot", optional = true }
polkadot-test-service = { branch = "release-v0.9.23", git = "https://github.com/paritytech/polkadot", optional = true }
polkadot-cli = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true }
polkadot-parachain = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true }
polkadot-primitives = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true }
polkadot-service = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true }
polkadot-test-service = { branch = "release-v0.9.26", git = "https://github.com/paritytech/polkadot", optional = true }

# Standalone

sc-consensus-aura = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sc-finality-grandpa = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-consensus-aura = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sp-finality-grandpa = { branch = "polkadot-v0.9.23", git = "https://github.com/paritytech/substrate" }
sc-consensus-aura = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sc-finality-grandpa = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-consensus-aura = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }
sp-finality-grandpa = { branch = "polkadot-v0.9.26", git = "https://github.com/paritytech/substrate" }

# Utility
cfg-if = { version = "1.0.0" }
clap = { version = "3.1.18", features = ["derive"] }
clap = { version = "3.2.6", features = ["derive"] }
hex-literal = { version = "0.3.4" }
jsonrpsee = { version = "0.13.0", features = ["server"] }
jsonrpsee = { version = "0.14.0", features = ["server"] }
log = { optional = true, version = "0.4.17" }
# TODO(#865): Remove in future Polkadot release
tracing-core = "=0.1.26"

# Zeitgeist

Expand Down
8 changes: 3 additions & 5 deletions node/src/chain_spec/battery_station.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,7 @@ generate_generic_genesis_function!(
sudo: battery_station_runtime::SudoConfig { key: Some(root_key_staging_battery_station()) },
);

pub fn battery_station_staging_config(
#[cfg(feature = "parachain")] parachain_id: cumulus_primitives_core::ParaId,
) -> Result<BatteryStationChainSpec, String> {
pub fn battery_station_staging_config() -> Result<BatteryStationChainSpec, String> {
let wasm = get_wasm()?;

Ok(BatteryStationChainSpec::from_genesis(
Expand All @@ -131,7 +129,7 @@ pub fn battery_station_staging_config(
generic_genesis(
additional_chain_spec_staging_battery_station(
#[cfg(feature = "parachain")]
parachain_id,
crate::BATTERY_STATION_PARACHAIN_ID.into(),
),
endowed_accounts_staging_battery_station(),
wasm,
Expand All @@ -145,7 +143,7 @@ pub fn battery_station_staging_config(
#[cfg(feature = "parachain")]
crate::chain_spec::Extensions {
relay_chain: "rococo".into(),
parachain_id: parachain_id.into(),
parachain_id: crate::BATTERY_STATION_PARACHAIN_ID,
},
#[cfg(not(feature = "parachain"))]
Default::default(),
Expand Down
Loading

0 comments on commit 8de3b3a

Please sign in to comment.