Remove service, migrate all to service-new (#1630)

* import rococo into chain-spec * make a few stabs at moving forward * wip: rococo readme * remove /service crate - Move the chain-spec files to node-service - update sufficient cargo files that polkadot-service-new builds - not everything else builds yet * wip: chase down some build errors in polkadot-cli There's a lot more to go, but some progress has happened. * make more progress getting polkadot-cli to build * don't ignore polkadot.json within the res directory * don't recreate pathbufs * Prepare Polkadot to be used by Cumulus This begins to make Polkadot usable from Cumulus. * Remove old test * migrate new_chain_ops fix from /service * partially remove node/test-service * Reset some changes * Revert "partially remove node/test-service" This reverts commit 7b8f9ba5bfc286a309df89853ae11facf3277ffb. * WIP: replace v0 ParachainHost impl with v1 for test runtime This is necessary because one of the current errors when building the test service boils down to: the trait bound `polkadot_test_runtime::RuntimeApiImpl<...>`: `polkadot_primitives::v1::ParachainHost<...>` is not satisfied This is WIP because it appears to be causing some std leakage into the wasm environment, or something; the compiler is currently complaining about duplicate definitions of `panic_handler` and `oom`. Presumably I have to identify all std types (Vec etc) and replace them with sp_std equivalents. * fix test runtime build it wasn't std leakage, after all * bump westend spec version * use service-new as service within cli * to revert: demo that forwarding the test runtime to the real impl blows up * Revert "to revert: demo that forwarding the test runtime to the real impl blows up" This reverts commit 68d2f385f378721c7433e3e39133434610cd2a51. * Revert "Revert "to revert: demo that forwarding the test runtime to the real impl blows up"" This reverts commit 04cb1cbf8873b4429cb9c9fdccb7f4bb137dc720. Might have just forgotten to disable default features * More reverts * MOARE * plug in the runtime as the generic instantiation This feels closer to a solution, but it still has problems: in particular, it's assumed that Runtime implements all appropriate Trait traits, which this one apparently does not. * implement necessary traits to get the test runtime compiling This is almost certainly not correct in some way; it really looks like I need to mess with the construct_runtime! macro somehow, to inject the inclusion trait's event type as a Event variant. Still, better lock down this changeset while it all compiles. * add inclusion::Event as variant into Event enum * implement unimplemented bits in kusama * implement unimplemented bits in polkadot runtime * implement unimplemented bits in westend runtime * migrate client upgrades from master * update test service with new node changes * package metadata--that wasn't intended to be removed * add parachains v1 modules to each runtime It's not clear what precisely this does, but it's probably the right thing to do. * enable cli to opt out of full node features * adjust rococo chainspec per example https://github.com/paritytech/polkadot/blob/26f1fa47f7836ab4bee5d4aad127ebce748320dd/service/src/chain_spec.rs#L362 * try to fix Cargo.lock Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: Andronik Ordian <write@reusable.software>
2026-06-14 05:11:09 +00:00 · 2020-09-18 10:27:54 +02:00
parent 23c1760b48
commit d531ba561c
31 changed files with 1293 additions and 3145 deletions
@@ -24,7 +24,7 @@ use sp_runtime::{
 };
 use sc_client_api::{Backend as BackendT, BlockchainEvents, KeyIterator};
 use sp_storage::{StorageData, StorageKey, ChildInfo, PrefixedStorageKey};
-use polkadot_primitives::v1::{Block, ParachainHost, AccountId, Nonce, Balance};
+use polkadot_primitives::v1::{Block, ParachainHost, AccountId, Nonce, Balance, Header, BlockNumber, Hash};
 use consensus_common::BlockStatus;

 /// A set of APIs that polkadot-like runtimes must implement.
@@ -142,6 +142,7 @@ pub enum Client {
 	Polkadot(Arc<crate::FullClient<polkadot_runtime::RuntimeApi, crate::PolkadotExecutor>>),
 	Westend(Arc<crate::FullClient<westend_runtime::RuntimeApi, crate::WestendExecutor>>),
 	Kusama(Arc<crate::FullClient<kusama_runtime::RuntimeApi, crate::KusamaExecutor>>),
+	Rococo(Arc<crate::FullClient<rococo_runtime::RuntimeApi, crate::RococoExecutor>>),
 }

 impl ClientHandle for Client {
@@ -156,6 +157,9 @@ impl ClientHandle for Client {
 			Self::Kusama(client) => {
 				T::execute_with_client::<_, _, crate::FullBackend>(t, client.clone())
 			},
+			Self::Rococo(client) => {
+				T::execute_with_client::<_, _, crate::FullBackend>(t, client.clone())
+			}
 		}
 	}
 }
@@ -166,6 +170,7 @@ impl sc_client_api::UsageProvider<Block> for Client {
 			Self::Polkadot(client) => client.usage_info(),
 			Self::Westend(client) => client.usage_info(),
 			Self::Kusama(client) => client.usage_info(),
+			Self::Rococo(client) => client.usage_info(),
 		}
 	}
 }
@@ -179,6 +184,7 @@ impl sc_client_api::BlockBackend<Block> for Client {
 			Self::Polkadot(client) => client.block_body(id),
 			Self::Westend(client) => client.block_body(id),
 			Self::Kusama(client) => client.block_body(id),
+			Self::Rococo(client) => client.block_body(id),
 		}
 	}

@@ -187,6 +193,7 @@ impl sc_client_api::BlockBackend<Block> for Client {
 			Self::Polkadot(client) => client.block(id),
 			Self::Westend(client) => client.block(id),
 			Self::Kusama(client) => client.block(id),
+			Self::Rococo(client) => client.block(id),
 		}
 	}

@@ -195,6 +202,7 @@ impl sc_client_api::BlockBackend<Block> for Client {
 			Self::Polkadot(client) => client.block_status(id),
 			Self::Westend(client) => client.block_status(id),
 			Self::Kusama(client) => client.block_status(id),
+			Self::Rococo(client) => client.block_status(id),
 		}
 	}

@@ -206,6 +214,7 @@ impl sc_client_api::BlockBackend<Block> for Client {
 			Self::Polkadot(client) => client.justification(id),
 			Self::Westend(client) => client.justification(id),
 			Self::Kusama(client) => client.justification(id),
+			Self::Rococo(client) => client.justification(id),
 		}
 	}

@@ -217,6 +226,7 @@ impl sc_client_api::BlockBackend<Block> for Client {
 			Self::Polkadot(client) => client.block_hash(number),
 			Self::Westend(client) => client.block_hash(number),
 			Self::Kusama(client) => client.block_hash(number),
+			Self::Rococo(client) => client.block_hash(number),
 		}
 	}
 }
@@ -231,6 +241,7 @@ impl sc_client_api::StorageProvider<Block, crate::FullBackend> for Client {
 			Self::Polkadot(client) => client.storage(id, key),
 			Self::Westend(client) => client.storage(id, key),
 			Self::Kusama(client) => client.storage(id, key),
+			Self::Rococo(client) => client.storage(id, key),
 		}
 	}

@@ -243,6 +254,7 @@ impl sc_client_api::StorageProvider<Block, crate::FullBackend> for Client {
 			Self::Polkadot(client) => client.storage_keys(id, key_prefix),
 			Self::Westend(client) => client.storage_keys(id, key_prefix),
 			Self::Kusama(client) => client.storage_keys(id, key_prefix),
+			Self::Rococo(client) => client.storage_keys(id, key_prefix),
 		}
 	}

@@ -255,6 +267,7 @@ impl sc_client_api::StorageProvider<Block, crate::FullBackend> for Client {
 			Self::Polkadot(client) => client.storage_hash(id, key),
 			Self::Westend(client) => client.storage_hash(id, key),
 			Self::Kusama(client) => client.storage_hash(id, key),
+			Self::Rococo(client) => client.storage_hash(id, key),
 		}
 	}

@@ -267,6 +280,7 @@ impl sc_client_api::StorageProvider<Block, crate::FullBackend> for Client {
 			Self::Polkadot(client) => client.storage_pairs(id, key_prefix),
 			Self::Westend(client) => client.storage_pairs(id, key_prefix),
 			Self::Kusama(client) => client.storage_pairs(id, key_prefix),
+			Self::Rococo(client) => client.storage_pairs(id, key_prefix),
 		}
 	}

@@ -280,6 +294,7 @@ impl sc_client_api::StorageProvider<Block, crate::FullBackend> for Client {
 			Self::Polkadot(client) => client.storage_keys_iter(id, prefix, start_key),
 			Self::Westend(client) => client.storage_keys_iter(id, prefix, start_key),
 			Self::Kusama(client) => client.storage_keys_iter(id, prefix, start_key),
+			Self::Rococo(client) => client.storage_keys_iter(id, prefix, start_key),
 		}
 	}

@@ -293,6 +308,7 @@ impl sc_client_api::StorageProvider<Block, crate::FullBackend> for Client {
 			Self::Polkadot(client) => client.child_storage(id, child_info, key),
 			Self::Westend(client) => client.child_storage(id, child_info, key),
 			Self::Kusama(client) => client.child_storage(id, child_info, key),
+			Self::Rococo(client) => client.child_storage(id, child_info, key),
 		}
 	}

@@ -306,6 +322,7 @@ impl sc_client_api::StorageProvider<Block, crate::FullBackend> for Client {
 			Self::Polkadot(client) => client.child_storage_keys(id, child_info, key_prefix),
 			Self::Westend(client) => client.child_storage_keys(id, child_info, key_prefix),
 			Self::Kusama(client) => client.child_storage_keys(id, child_info, key_prefix),
+			Self::Rococo(client) => client.child_storage_keys(id, child_info, key_prefix),
 		}
 	}

@@ -319,6 +336,7 @@ impl sc_client_api::StorageProvider<Block, crate::FullBackend> for Client {
 			Self::Polkadot(client) => client.child_storage_hash(id, child_info, key),
 			Self::Westend(client) => client.child_storage_hash(id, child_info, key),
 			Self::Kusama(client) => client.child_storage_hash(id, child_info, key),
+			Self::Rococo(client) => client.child_storage_hash(id, child_info, key),
 		}
 	}

@@ -331,6 +349,7 @@ impl sc_client_api::StorageProvider<Block, crate::FullBackend> for Client {
 			Self::Polkadot(client) => client.max_key_changes_range(first, last),
 			Self::Westend(client) => client.max_key_changes_range(first, last),
 			Self::Kusama(client) => client.max_key_changes_range(first, last),
+			Self::Rococo(client) => client.max_key_changes_range(first, last),
 		}
 	}

@@ -345,6 +364,54 @@ impl sc_client_api::StorageProvider<Block, crate::FullBackend> for Client {
 			Self::Polkadot(client) => client.key_changes(first, last, storage_key, key),
 			Self::Westend(client) => client.key_changes(first, last, storage_key, key),
 			Self::Kusama(client) => client.key_changes(first, last, storage_key, key),
+			Self::Rococo(client) => client.key_changes(first, last, storage_key, key),
+		}
+	}
+}
+
+impl sp_blockchain::HeaderBackend<Block> for Client {
+	fn header(&self, id: BlockId<Block>) -> sp_blockchain::Result<Option<Header>> {
+		match self {
+			Self::Polkadot(client) => client.header(&id),
+			Self::Westend(client) => client.header(&id),
+			Self::Kusama(client) => client.header(&id),
+			Self::Rococo(client) => client.header(&id),
+		}
+	}
+
+	fn info(&self) -> sp_blockchain::Info<Block> {
+		match self {
+			Self::Polkadot(client) => client.info(),
+			Self::Westend(client) => client.info(),
+			Self::Kusama(client) => client.info(),
+			Self::Rococo(client) => client.info(),
+		}
+	}
+
+	fn status(&self, id: BlockId<Block>) -> sp_blockchain::Result<sp_blockchain::BlockStatus> {
+		match self {
+			Self::Polkadot(client) => client.status(id),
+			Self::Westend(client) => client.status(id),
+			Self::Kusama(client) => client.status(id),
+			Self::Rococo(client) => client.status(id),
+		}
+	}
+
+	fn number(&self, hash: Hash) -> sp_blockchain::Result<Option<BlockNumber>> {
+		match self {
+			Self::Polkadot(client) => client.number(hash),
+			Self::Westend(client) => client.number(hash),
+			Self::Kusama(client) => client.number(hash),
+			Self::Rococo(client) => client.number(hash),
+		}
+	}
+
+	fn hash(&self, number: BlockNumber) -> sp_blockchain::Result<Option<Hash>> {
+		match self {
+			Self::Polkadot(client) => client.hash(number),
+			Self::Westend(client) => client.hash(number),
+			Self::Kusama(client) => client.hash(number),
+			Self::Rococo(client) => client.hash(number),
 		}
 	}
 }