wip

Cargo.toml

@@ -13,7 +13,7 @@ rust-version = "1.57.0" # custom profiles
 readme = "README.md"
 
 [dependencies]
-polkadot-cli = { path = "cli", features = [ "kusama-native", "westend-native", "rococo-native" ]  }
+polkadot-cli = { path = "cli", features = [ "rococo-native" ]  }
 color-eyre = { version = "0.6.1", default-features = false }
 parity-util-mem = { version = "0.11.0", default-features = false, features = ["jemalloc-global"] }
 

cli/Cargo.toml

@@ -40,7 +40,7 @@ sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master",
 substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [features]
-default = ["wasmtime", "db", "cli", "full-node", "trie-memory-tracker", "polkadot-native"]
+default = ["wasmtime", "db", "cli", "full-node", "trie-memory-tracker"]
 wasmtime = ["sc-cli/wasmtime"]
 db = ["service/db"]
 cli = [

node/core/runtime-api/src/lib.rs

@@ -23,7 +23,7 @@
 #![warn(missing_docs)]
 
 use polkadot_node_subsystem_util::metrics::{self, prometheus};
-use polkadot_primitives::v2::{Block, BlockId, Hash, ParachainHost};
+use polkadot_primitives::vstaging::{Block, BlockId, Hash, ParachainHost};
 use polkadot_subsystem::{
 	errors::RuntimeApiError,
 	messages::{RuntimeApiMessage, RuntimeApiRequest as Request},

node/overseer/src/lib.rs

@@ -71,7 +71,7 @@ use futures::{channel::oneshot, future::BoxFuture, select, Future, FutureExt, St
 use lru::LruCache;
 
 use client::{BlockImportNotification, BlockchainEvents, FinalityNotification};
-use polkadot_primitives::v2::{Block, BlockId, BlockNumber, Hash, ParachainHost};
+use polkadot_primitives::vstaging::{Block, BlockId, BlockNumber, Hash, ParachainHost};
 use sp_api::{ApiExt, ProvideRuntimeApi};
 
 use polkadot_node_network_protocol::v1 as protocol_v1;

node/service/src/chain_spec.rs

@@ -1447,8 +1447,8 @@ pub fn westend_testnet_genesis(
 ) -> westend::GenesisConfig {
 	let endowed_accounts: Vec<AccountId> = endowed_accounts.unwrap_or_else(testnet_accounts);
 
-	const ENDOWMENT: u128 = 1_000_000 * DOT;
-	const STASH: u128 = 100 * DOT;
+	const ENDOWMENT: u128 = 1_000_000 * WND;
+	const STASH: u128 = 100 * WND;
 
 	westend::GenesisConfig {
 		system: westend::SystemConfig { code: wasm_binary.to_vec() },
@@ -1528,7 +1528,7 @@ pub fn rococo_testnet_genesis(
 ) -> rococo_runtime::GenesisConfig {
 	let endowed_accounts: Vec<AccountId> = endowed_accounts.unwrap_or_else(testnet_accounts);
 
-	const ENDOWMENT: u128 = 1_000_000 * DOT;
+	const ENDOWMENT: u128 = 1_000_000 * ROC;
 
 	rococo_runtime::GenesisConfig {
 		system: rococo_runtime::SystemConfig { code: wasm_binary.to_vec() },

node/service/src/overseer.rs

@@ -34,7 +34,7 @@ use polkadot_overseer::{
 	Overseer, OverseerConnector, OverseerHandle,
 };
 
-use polkadot_primitives::v2::ParachainHost;
+use polkadot_primitives::vstaging::ParachainHost;
 use sc_authority_discovery::Service as AuthorityDiscoveryService;
 use sc_client_api::AuxStore;
 use sc_keystore::LocalKeystore;