Skip to content

Commit

Permalink
Update codebase to polkadot-v0.9.12 (#430)
Browse files Browse the repository at this point in the history 
* Update dependencies

* Migrate standalone client

* Migrate parachain client & runtime

* Update weights

* Bump RuntimeVersion

Co-authored-by: Logan Saether <[email protected]>
  • Loading branch information
@sea212 @lsaether
sea212 and lsaether authored Feb 7, 2022
1 parent af40d95 commit 589f23f
Show file tree
Hide file tree
Showing 41 changed files with 1,072 additions and 1,080 deletions.
997 changes: 477 additions & 520 deletions Cargo.lock
View file

Large diffs are not rendered by default.

106 changes: 53 additions & 53 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,81 +3,81 @@ name = 'zeitgeist'
path = './src/main.rs'

[build-dependencies]
substrate-build-script-utils = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/substrate" }
substrate-build-script-utils = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/substrate" }

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

# Benchmark

frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/substrate", optional = true }
frame-benchmarking-cli = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/substrate", optional = true }
frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/substrate", optional = true }
frame-benchmarking-cli = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/substrate", optional = true }

# Cumulus

cumulus-client-cli = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/cumulus", optional = true }
cumulus-client-collator = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/cumulus", optional = true }
cumulus-client-consensus-relay-chain = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/cumulus", optional = true }
cumulus-client-network = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/cumulus", optional = true }
cumulus-client-service = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/cumulus", optional = true }
cumulus-primitives-core = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/cumulus", optional = true }
cumulus-primitives-parachain-inherent = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/cumulus", optional = true }
cumulus-client-cli = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/cumulus", optional = true }
cumulus-client-collator = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/cumulus", optional = true }
cumulus-client-consensus-relay-chain = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/cumulus", optional = true }
cumulus-client-network = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/cumulus", optional = true }
cumulus-client-service = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/cumulus", optional = true }
cumulus-primitives-core = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/cumulus", optional = true }
cumulus-primitives-parachain-inherent = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/cumulus", optional = true }

# Parachain

nimbus-consensus = { branch = "moonbeam-polkadot-v0.9.11", default-features = false, git = "https://github.com/purestake/cumulus", optional = true }
nimbus-primitives = { branch = "moonbeam-polkadot-v0.9.11", default-features = false, git = "https://github.com/purestake/cumulus", optional = true }
pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.11", default-features = false, git = "https://github.com/purestake/cumulus", optional = true }
parachain-staking = { rev = "663df3da47dba20dda167cb6401895224ab367ca", git = "https://github.com/PureStake/moonbeam", optional = true }
nimbus-consensus = { branch = "moonbeam-polkadot-v0.9.12", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
nimbus-primitives = { branch = "moonbeam-polkadot-v0.9.12", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.12", default-features = false, git = "https://github.com/purestake/nimbus", optional = true }
parachain-staking = { rev = "1733d8d60a38b9b1a9cad8a1dcf78e2362d68270", git = "https://github.com/PureStake/moonbeam", optional = true }
parity-scale-codec = { optional = true, version = "2.0" }
sc-chain-spec = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/substrate", optional = true }
sc-tracing = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/substrate", optional = true }
sc-chain-spec = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/substrate", optional = true }
sc-tracing = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/substrate", optional = true }
serde = { features = ["derive"], optional = true, version = "1.0" }
sp-trie = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/substrate", optional = true }
sp-trie = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/substrate", optional = true }

# Polkadot

polkadot-cli = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/polkadot", optional = true }
polkadot-parachain = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/polkadot", optional = true }
polkadot-primitives = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/polkadot", optional = true }
polkadot-service = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/polkadot", optional = true }
polkadot-test-service = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/polkadot", optional = true }
polkadot-cli = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/polkadot", optional = true }
polkadot-parachain = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/polkadot", optional = true }
polkadot-primitives = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/polkadot", optional = true }
polkadot-service = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/polkadot", optional = true }
polkadot-test-service = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/polkadot", optional = true }

# Standalone

sc-consensus-aura = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/substrate" }
sc-finality-grandpa = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/substrate" }
sp-consensus-aura = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/substrate" }
sp-finality-grandpa = { branch = "moonbeam-polkadot-v0.9.11", git = "https://github.com/purestake/substrate" }
sc-consensus-aura = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/substrate" }
sc-finality-grandpa = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/substrate" }
sp-consensus-aura = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/substrate" }
sp-finality-grandpa = { branch = "moonbeam-polkadot-v0.9.12", git = "https://github.com/purestake/substrate" }

# Utility
cfg-if = { version = "1.0.0" }
hex-literal = { version = "0.3.1" }
hex-literal = { version = "0.3.3" }
jsonrpc-core = { version = "18.0.0" }
log = { optional = true, version = "0.4.14" }
structopt = { version = "0.3.8" }
Expand Down
4 changes: 2 additions & 2 deletions node/src/service.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ cfg_if::cfg_if! {
/// Additional APIs for parachain runtimes
pub trait AdditionalRuntimeApiCollection:
sp_api::ApiExt<Block>
+ nimbus_primitives::AuthorFilterAPI<Block, nimbus_primitives::NimbusId>
+ nimbus_primitives::NimbusApi<Block, nimbus_primitives::NimbusId>
+ cumulus_primitives_core::CollectCollationInfo<Block>
where
<Self as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>,
Expand All @@ -75,7 +75,7 @@ cfg_if::cfg_if! {
impl<Api> AdditionalRuntimeApiCollection for Api
where
Api: sp_api::ApiExt<Block>
+ nimbus_primitives::AuthorFilterAPI<Block, nimbus_primitives::NimbusId>
+ nimbus_primitives::NimbusApi<Block, nimbus_primitives::NimbusId>
+ cumulus_primitives_core::CollectCollationInfo<Block>,
<Self as sp_api::ApiExt<Block>>::StateBackend: sp_api::StateBackend<BlakeTwo256>,
{
Expand Down
2 changes: 2 additions & 0 deletions node/src/service/service_standalone.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
let warp_sync = Arc::new(sc_finality_grandpa::warp_proof::NetworkProvider::new(
backend.clone(),
grandpa_link.shared_authority_set().clone(),
Vec::default(),
));

let (network, system_rpc_tx, network_starter) =
Expand Down Expand Up @@ -280,6 +281,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
let warp_sync = Arc::new(sc_finality_grandpa::warp_proof::NetworkProvider::new(
backend.clone(),
grandpa_link.shared_authority_set().clone(),
Vec::default(),
));

let (network, system_rpc_tx, network_starter) =
Expand Down
14 changes: 7 additions & 7 deletions primitives/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[dependencies]
arbitrary = { default-features = false, optional = true, version = "1.0" }
frame-support = { branch = "moonbeam-polkadot-v0.9.11", default-features = false, git = "https://github.com/purestake/substrate" }
frame-system = { branch = "moonbeam-polkadot-v0.9.11", default-features = false, git = "https://github.com/purestake/substrate" }
orml-currencies = { branch = "moonbeam-polkadot-v0.9.11", default-features = false, git = "https://github.com/PureStake/open-runtime-module-library" }
orml-tokens = { branch = "moonbeam-polkadot-v0.9.11", default-features = false, git = "https://github.com/PureStake/open-runtime-module-library" }
orml-traits = { branch = "moonbeam-polkadot-v0.9.11", default-features = false, git = "https://github.com/PureStake/open-runtime-module-library" }
frame-support = { branch = "moonbeam-polkadot-v0.9.12", default-features = false, git = "https://github.com/purestake/substrate" }
frame-system = { branch = "moonbeam-polkadot-v0.9.12", default-features = false, git = "https://github.com/purestake/substrate" }
orml-currencies = { branch = "moonbeam-polkadot-v0.9.12", default-features = false, git = "https://github.com/PureStake/open-runtime-module-library" }
orml-tokens = { branch = "moonbeam-polkadot-v0.9.12", default-features = false, git = "https://github.com/PureStake/open-runtime-module-library" }
orml-traits = { branch = "moonbeam-polkadot-v0.9.12", default-features = false, git = "https://github.com/PureStake/open-runtime-module-library" }
parity-scale-codec = { default-features = false, features = ["derive"], version = "2.0" }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
serde = { default-features = false, features = ["derive"], optional = true, version = "1.0" }
sp-core = { branch = "moonbeam-polkadot-v0.9.11", default-features = false, git = "https://github.com/purestake/substrate" }
sp-runtime = { branch = "moonbeam-polkadot-v0.9.11", default-features = false, git = "https://github.com/purestake/substrate" }
sp-core = { branch = "moonbeam-polkadot-v0.9.12", default-features = false, git = "https://github.com/purestake/substrate" }
sp-runtime = { branch = "moonbeam-polkadot-v0.9.12", default-features = false, git = "https://github.com/purestake/substrate" }


[features]
Expand Down
Loading

0 comments on commit 589f23f

Please sign in to comment.