Update polkadot and substrate (#71)

2026-11-02 17:01:07 +00:00 · 2020-03-11 17:45:44 +01:00
1 parent f29b94816c
commit dd5b344274
@@ -31,7 +31,7 @@ use polkadot_collator::{
 	PolkadotClient,
 };
 use polkadot_primitives::{
-	parachain::{self, BlockData, Status as ParachainStatus, Id as ParaId}, Block as PBlock,
+	parachain::{self, BlockData, LocalValidationData, Id as ParaId}, Block as PBlock,
 	Hash as PHash,
 };

@@ -65,14 +65,14 @@ impl<Block, PF, BI> Collator<Block, PF, BI> {
 	fn new(
 		proposer_factory: PF,
 		inherent_data_providers: InherentDataProviders,
-		collator_network: Arc<dyn CollatorNetwork>,
+		collator_network: impl CollatorNetwork + Clone + 'static,
 		block_import: BI,
 	) -> Self {
 		Self {
 			proposer_factory: Arc::new(Mutex::new(proposer_factory)),
 			inherent_data_providers,
 			_phantom: PhantomData,
-			collator_network,
+			collator_network: Arc::new(collator_network),
 			block_import: Arc::new(Mutex::new(block_import)),
 		}
 	}
@@ -111,7 +111,7 @@ where
 	fn produce_candidate(
 		&mut self,
 		_relay_chain_parent: PHash,
-		status: ParachainStatus,
+		status: LocalValidationData,
 	) -> Self::ProduceCandidate {
 		let factory = self.proposer_factory.clone();
 		let inherent_providers = self.inherent_data_providers.clone();
@@ -119,7 +119,7 @@ where

 		trace!(target: "cumulus-collator", "Producing candidate");

-		let last_head = match HeadData::<Block>::decode(&mut &status.head_data.0[..]) {
+		let last_head = match HeadData::<Block>::decode(&mut &status.parent_head.0[..]) {
 			Ok(x) => x,
 			Err(e) => {
 				error!(target: "cumulus-collator", "Could not decode the head data: {:?}", e);
@@ -285,7 +285,7 @@ where
 		self,
 		polkadot_client: Arc<PolkadotClient<B, E, R>>,
 		spawner: Spawner,
-		network: Arc<dyn CollatorNetwork>,
+		network: impl CollatorNetwork + Clone + 'static,
 	) -> Result<Self::ParachainContext, ()>
 	where
 		PolkadotClient<B, E, R>: sp_api::ProvideRuntimeApi<PBlock>,
@@ -296,11 +296,11 @@ where
 		Extrinsic: codec::Codec + Send + Sync + 'static,
 		<<PolkadotClient<B, E, R> as sp_api::ProvideRuntimeApi<PBlock>>::Api as sp_api::ApiExt<
 			PBlock,
-		>>::StateBackend: sp_api::StateBackend<sp_core::Blake2Hasher>,
+		>>::StateBackend: sp_api::StateBackend<sp_runtime::traits::BlakeTwo256>,
 		R: Send + Sync + 'static,
 		B: sc_client_api::Backend<PBlock> + 'static,
 		// Rust bug: https://github.com/rust-lang/rust/issues/24159
-		B::State: sp_api::StateBackend<sp_core::Blake2Hasher>,
+		B::State: sp_api::StateBackend<sp_runtime::traits::BlakeTwo256>,
 	{
 		let follow =
 			match cumulus_consensus::follow_polkadot(self.para_id, self.client, polkadot_client) {
@@ -333,8 +333,8 @@ mod tests {
 	use super::*;
 	use std::time::Duration;

-	use polkadot_collator::{collate, CollatorId, PeerId, SignedStatement};
-	use polkadot_primitives::parachain::{FeeSchedule, HeadData, Id as ParaId};
+	use polkadot_collator::{collate, SignedStatement};
+	use polkadot_primitives::parachain::{HeadData, Id as ParaId};

 	use sp_blockchain::Result as ClientResult;
 	use sp_inherents::InherentData;
@@ -406,17 +406,11 @@ mod tests {
 		}
 	}

+	#[derive(Clone)]
 	struct DummyCollatorNetwork;

 	impl CollatorNetwork for DummyCollatorNetwork {
-		fn collator_id_to_peer_id(
-			&self,
-			_: CollatorId,
-		) -> Box<dyn Future<Output = Option<PeerId>> + Send> {
-			unimplemented!("Not required in tests")
-		}
-
-		fn checked_statements(&self, _: PHash) -> Box<dyn Stream<Item = SignedStatement>> {
+		fn checked_statements(&self, _: PHash) -> Pin<Box<dyn Stream<Item = SignedStatement>>> {
 			unimplemented!("Not required in tests")
 		}
 	}
@@ -455,16 +449,21 @@ mod tests {
 			Arc::new(TestClientBuilder::new().build()),
 		);
 		let context = builder
-			.build::<_, _, polkadot_service::polkadot_runtime::RuntimeApi, _, _>(
+			.build(
 				Arc::new(
 					substrate_test_client::TestClientBuilder::<_, _, _, ()>::default()
-						.build_with_native_executor(Some(NativeExecutor::<
-							polkadot_service::PolkadotExecutor,
-						>::new(Interpreted, None)))
+						.build_with_native_executor::<polkadot_service::polkadot_runtime::RuntimeApi, _>(
+							Some(
+								NativeExecutor::<polkadot_service::PolkadotExecutor>::new(
+									Interpreted,
+									None,
+								)
+							)
+						)
 						.0,
 				),
 				spawner,
-				Arc::new(DummyCollatorNetwork),
+				DummyCollatorNetwork,
 			)
 			.expect("Creates parachain context");

@@ -479,13 +478,9 @@ mod tests {
 		let collation = collate(
 			Default::default(),
 			id,
-			ParachainStatus {
-				head_data: HeadData(header.encode()),
+			LocalValidationData {
+				parent_head: HeadData(header.encode()),
 				balance: 10,
-				fee_schedule: FeeSchedule {
-					base: 0,
-					per_byte: 1,
-				},
 			},
 			context,
 			Arc::new(Sr25519Keyring::Alice.pair().into()),
@@ -154,7 +154,7 @@ where
 	<Client<B, E, PBlock, RA> as ProvideRuntimeApi<PBlock>>::Api:
 		ParachainHost<PBlock, Error = ClientError>,
 	// Rust bug: https://github.com/rust-lang/rust/issues/24159
-	StateBackendFor<B, PBlock>: StateBackend<sp_core::Blake2Hasher>,
+	StateBackendFor<B, PBlock>: StateBackend<sp_runtime::traits::BlakeTwo256>,
 {
 	type Error = ClientError;

@@ -181,8 +181,8 @@ where
 		para_id: ParaId,
 	) -> ClientResult<Option<Vec<u8>>> {
 		self.runtime_api()
-			.parachain_status(at, para_id)
-			.map(|s| s.map(|s| s.head_data.0))
+			.local_validation_data(at, para_id)
+			.map(|s| s.map(|s| s.parent_head.0))
 	}
 }

@@ -24,6 +24,7 @@ sp-trie = { git = "https://github.com/paritytech/substrate", default-features =
 parachain = { package = "polkadot-parachain", git = "https://github.com/paritytech/polkadot", branch = "cumulus-branch", default-features = false, features = [ "wasm-api" ] }

 [dev-dependencies]
+sc-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "cumulus-branch" }
 sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
@@ -18,7 +18,7 @@

 use crate::WitnessData;
 use frame_executive::ExecuteBlock;
-use sp_runtime::traits::{Block as BlockT, HasherFor, Header as HeaderT};
+use sp_runtime::traits::{Block as BlockT, HashFor, Header as HeaderT};

 use sp_trie::{delta_trie_root, read_trie_value, Layout, MemoryDB};

@@ -116,7 +116,7 @@ pub fn validate_block<B: BlockT, E: ExecuteBlock<B>>(params: ValidationParams) -
 /// The storage implementation used when validating a block that is using the
 /// witness data as source.
 struct WitnessStorage<B: BlockT> {
-	witness_data: MemoryDB<HasherFor<B>>,
+	witness_data: MemoryDB<HashFor<B>>,
 	overlay: hashbrown::HashMap<Vec<u8>, Option<Vec<u8>>>,
 	storage_root: B::Hash,
 }
@@ -149,7 +149,7 @@ impl<B: BlockT> Storage for WitnessStorage<B> {
 			.get(key)
 			.cloned()
 			.or_else(|| {
-				read_trie_value::<Layout<HasherFor<B>>, _>(
+				read_trie_value::<Layout<HashFor<B>>, _>(
 					&self.witness_data,
 					&self.storage_root,
 					key,
@@ -168,7 +168,7 @@ impl<B: BlockT> Storage for WitnessStorage<B> {
 	}

 	fn storage_root(&mut self) -> Vec<u8> {
-		let root = delta_trie_root::<Layout<HasherFor<B>>, _, _, _, _>(
+		let root = delta_trie_root::<Layout<HashFor<B>>, _, _, _, _>(
 			&mut self.witness_data,
 			self.storage_root.clone(),
 			self.overlay.drain(),
@@ -184,7 +184,7 @@ impl<B: BlockT> Storage for WitnessStorage<B> {
 			}
 		});

-		let trie = match TrieDB::<Layout<HasherFor<B>>>::new(&self.witness_data, &self.storage_root)
+		let trie = match TrieDB::<Layout<HashFor<B>>>::new(&self.witness_data, &self.storage_root)
 		{
 			Ok(r) => r,
 			Err(_) => panic!(),
@@ -17,9 +17,13 @@
 use crate::{ParachainBlockData, WitnessData};

 use parachain::{ValidationParams, ValidationResult};
-use sc_executor::{call_in_wasm, error::Result, WasmExecutionMethod};
+use sc_executor::{
+	error::Result, WasmExecutionMethod, WasmExecutor, sp_wasm_interface::HostFunctions,
+};
+use sc_block_builder::BlockBuilderProvider;
 use sp_blockchain::HeaderBackend;
 use sp_consensus::SelectChain;
+use sp_core::traits::CallInWasm;
 use sp_io::TestExternalities;
 use sp_keyring::AccountKeyring;
 use sp_runtime::{
@@ -45,22 +49,22 @@ fn call_validate_block(
 	}
 	.encode();

-	call_in_wasm::<
-		(
-			sp_io::SubstrateHostFunctions,
-			sc_executor::deprecated_host_interface::SubstrateExternals,
-		),
-	>(
+	let executor = WasmExecutor::new(
+		WasmExecutionMethod::Interpreted,
+		Some(1024),
+		sp_io::SubstrateHostFunctions::host_functions(),
+		false,
+	);
+
+	executor.call_in_wasm(
+		&WASM_BINARY,
 		"validate_block",
 		&params,
-		WasmExecutionMethod::Interpreted,
 		&mut ext_ext,
-		&WASM_BINARY,
-		1024,
-		false,
 	)
 	.map(|v| ValidationResult::decode(&mut &v[..]).expect("Decode `ValidationResult`."))
 	.map(|v| Header::decode(&mut &v.head_data[..]).expect("Decode `Header`."))
+	.map_err(|err| err.into())
 }

 fn create_extrinsics() -> Vec<<Block as BlockT>::Extrinsic> {
@@ -37,6 +37,7 @@ sc-network = { git = "https://github.com/paritytech/substrate", branch = "cumulu
 sc-client = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }

 # Cumulus dependencies
 cumulus-consensus = { path = "../../consensus" }
@@ -11,80 +11,79 @@
  "genesis": {
    "raw": {
      "top": {
-        "0x1a736d37504c2e3fb73dad160c55b2917ac6a308d645671864cda07d358e751211da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9": "0x30d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a4890b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20e659a7a1628cdd93febc04a4e0646ea20e9f5f0ce097d9a05290d4a9e054df4e1cbd2d43530a44705ad088af313e18f80b53ef16b36177cd4b77b846f2a5f07cbe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25ffe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e1e07379407fecc4b89eb7dbd287c2c781cfb1907a96947a3eb18e4f8e7198625e860f1b1c7227f7c22602f53f15af80747814dffd839719731ee3bba6edc126c8ac59e11963af19174d0b94d5d78041c233f55d2e19324665bafdfb62925af2d101191192fc877c24d725b337120fa3edc63d227bbc92705db1e2cb65f56981a",
-        "0x5f3e4907f716ac89b6347d15ececedcaea07de2b8f010516dca3f7ef52f7ac5a": "0x040000000000000000",
-        "0x5f3e4907f716ac89b6347d15ececedcaf7dad0317324aecae8744b87fc95f2f3": "0x00",
-        "0x26aa394eea5630e07c48ae0c9558cef78a42f33323cb5ced3b44dd825fda9fcc": "0x4545454545454545454545454545454545454545454545454545454545454545",
-        "0x5f3e4907f716ac89b6347d15ececedca83e585bbc5fdcec57219c0dc81ef5ff49a9304efeee429067b2e8dfbcfd8a22d96f9d996a5d6daa02899b96bd7a667b1": "0x0b00407a10f35a0b00407a10f35a00",
-        "0x5f3e4907f716ac89b6347d15ececedca138e71612491192d68deab7e6f563fe1": "0x02000000",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2fb99d880ec681799c0cf30e8886371da977d14a2289dda9bbb32dd9313db096ef628101ac5bbb3b19301ede2c61915b89": "0x000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "0xf2794c22e353e9a839f12faab03a911b7f17cdfbfa73331856cca0acddd7842e": "0x00000000",
-        "0xcec5070d609dd3497f72bde07fc96ba04c014e6bf8b8c2c011e7290b85696bb39fe6329cc0b39e09343a73657373696f6e3a6b6579734724e5390fcf0d08afc9608ff4c45df257266ae599ac7a32baba26155dcf4402": "0x88dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0eed43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27dd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27dd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27dd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d",
-        "0x5f3e4907f716ac89b6347d15ececedca9220e172bed316605f73f1ff7b4ade989a9304efeee429067b2e8dfbcfd8a22d96f9d996a5d6daa02899b96bd7a667b1": "0x00",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2fb99d880ec681799c0cf30e8886371da92e3fb4c297a84c5cebc0e78257d213d0927ccc7596044c6ba013dd05522aacba": "0x000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "0x5f3e4907f716ac89b6347d15ececedca5579297f4dfb9609e7e4c2ebab9ce40a": "0x08be5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25ffe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e",
-        "0x26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac": "0x01000000",
-        "0x3fba98689ebed1138735e0e7a5a790ab0b76934f4cc08dee01012d059e1b83ee": "0x00",
-        "0x5f3e4907f716ac89b6347d15ececedca28dccb559b95c40168a1b2696581b5a7": "0x00000000000000000000000000000000",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2f218f26c73add634897550b4003b26bc64724e5390fcf0d08afc9608ff4c45df257266ae599ac7a32baba26155dcf4402": "0x047374616b696e672000407a10f35a0000000000000000000002",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2fb99d880ec681799c0cf30e8886371da94724e5390fcf0d08afc9608ff4c45df257266ae599ac7a32baba26155dcf4402": "0x000064a7b3b6e00d00000000000000000000000000000000000000000000000000407a10f35a0000000000000000000000407a10f35a00000000000000000000",
-        "0x5f3e4907f716ac89b6347d15ececedcac29a0310e1bb45d20cace77ccb62c97d": "0x00e1f505",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2fb99d880ec681799c0cf30e8886371da99ea52149af6b15f4d523ad4342f63089646e29232a1777737159c7bc84173597": "0x000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b65797303ab9ef4e6c4b0eea2939ffa571bac1fde2ed0137bd64339758ce9a753a4af0c": "0xfe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2f218f26c73add634897550b4003b26bc69a9304efeee429067b2e8dfbcfd8a22d96f9d996a5d6daa02899b96bd7a667b1": "0x047374616b696e672000407a10f35a0000000000000000000002",
-        "0x5f3e4907f716ac89b6347d15ececedca9220e172bed316605f73f1ff7b4ade984724e5390fcf0d08afc9608ff4c45df257266ae599ac7a32baba26155dcf4402": "0x00",
-        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b65797342a1d578558b434ecac1371dde376dca0109923708bad2f9b39a39fe726cba7e": "0xfe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e",
-        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b65797379b1148d2eef14114c422e7d0647dde06e73c1ab283dce7d8a383ae6f948faf1": "0xfe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e",
-        "0x26aa394eea5630e07c48ae0c9558cef7a44704b568d21667356a5a050c11874611da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9": "0x4545454545454545454545454545454545454545454545454545454545454545",
-        "0x5f3e4907f716ac89b6347d15ececedca83e585bbc5fdcec57219c0dc81ef5ff44724e5390fcf0d08afc9608ff4c45df257266ae599ac7a32baba26155dcf4402": "0x0b00407a10f35a0b00407a10f35a00",
-        "0x492a52699edf49c972c21db794cfcf57ba7fb8745735dc3be2a2c61a72c39e78": "0x00",
-        "0x5f3e4907f716ac89b6347d15ececedca88dcde934c658227ee1dfafcd6e169034724e5390fcf0d08afc9608ff4c45df257266ae599ac7a32baba26155dcf4402": "0x0001fe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e00",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2fb99d880ec681799c0cf30e8886371da994772f97f5f6b539aac74e798bc395119f39603402d0c85bc9eda5dfc5ae2160": "0x000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2fb99d880ec681799c0cf30e8886371da965d0de2c1f75d898c078307a00486016783280c8f3407db41dc9547d3e3d651e": "0x000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "0xcec5070d609dd3497f72bde07fc96ba0e0cdd062e6eaf24295ad4ccfc41d4609": "0x08fe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860ed17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae698eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a488eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a488eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a488eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48be5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f88dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0eed43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27dd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27dd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27dd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d",
-        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b657973538a5b67f2b6e2a4e04e3a0121d75f4d0efb5bd14689ab4a07cbff45b88e7f7d": "0xbe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f",
        "0xf2794c22e353e9a839f12faab03a911bbdcb0c5143a8617ed38ae3810dd45bc6": "0x00000000",
-        "0x3a6772616e6470615f617574686f726974696573": "0x0108d17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae69010000000000000088dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee0100000000000000",
-        "0x0b76934f4cc08dee01012d059e1b83ee5e0621c4869aa60c02be9adcc98a0d1d": "0x088eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d",
-        "0x5f3e4907f716ac89b6347d15ececedca6a93112633bb3354e67952fcdd740cd5": "0xfe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e",
-        "0x3a65787472696e7369635f696e646578": "0x00000000",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80": "0x0000b0d86b9088a60000000000000000",
-        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b6579733b07ae43d4d18b2f6a5ce4eabef01ad3860523243fb4bb3a6a4922750c1d7e4b": "0xbe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f",
-        "0x5f3e4907f716ac89b6347d15ececedca3ed14b45ed20d054f05e37e2542cfe709a9304efeee429067b2e8dfbcfd8a22d96f9d996a5d6daa02899b96bd7a667b1": "0x8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48",
        "0x1cb6f36e027abb2091cfb5110ab5087f66e8f035c8adbe7f1547b43c51e6f8a4": "0x00000000",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2fb99d880ec681799c0cf30e8886371da99a9304efeee429067b2e8dfbcfd8a22d96f9d996a5d6daa02899b96bd7a667b1": "0x000064a7b3b6e00d00000000000000000000000000000000000000000000000000407a10f35a0000000000000000000000407a10f35a00000000000000000000",
-        "0x5f3e4907f716ac89b6347d15ececedca422adb579f1dbf4f3886c5cfa3bb8cc42e3fb4c297a84c5cebc0e78257d213d0927ccc7596044c6ba013dd05522aacba": "0xbe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f0b00407a10f35a0b00407a10f35a00",
-        "0x5f3e4907f716ac89b6347d15ececedca0ea0ecac76457d0f9b39b981dd107012": "0x08fe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860ebe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f",
-        "0x2099d7f109d6e535fb000bba623fd4409f99a2ce711f3a31b2fc05604c93f179": "0x088eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d",
-        "0xcec5070d609dd3497f72bde07fc96ba04c014e6bf8b8c2c011e7290b85696bb39fe6329cc0b39e09343a73657373696f6e3a6b6579739a9304efeee429067b2e8dfbcfd8a22d96f9d996a5d6daa02899b96bd7a667b1": "0xd17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae698eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a488eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a488eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a488eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48",
-        "0xcec5070d609dd3497f72bde07fc96ba088dcde934c658227ee1dfafcd6e16903": "0x08fe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860ebe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2fb99d880ec681799c0cf30e8886371da9927407fbcfe5afa14bcfb44714a843c532f291a9c33612677cb9e0ae5e2bd5de": "0x000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "0x1cb6f36e027abb2091cfb5110ab5087f5e0621c4869aa60c02be9adcc98a0d1d": "0x088eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a480100000000000000d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d0100000000000000",
-        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b6579739b94324fd570688c7f3c5e3d0b90af7ae011ebcfe3e4d92e027ffbdf0db62684": "0xfe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e",
-        "0x1a736d37504c2e3fb73dad160c55b291b35b5a09b938edfd10fcbacc615abb0c": "0x00000000",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2fb99d880ec681799c0cf30e8886371da9024cd62ab7726e039438193d4bbd915427f2d7de85afbcf00bd16fadbcad6aed": "0x000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2fb99d880ec681799c0cf30e8886371da9c4a80eb5e32005323fb878ca749473d7e5f40d60ed5e74e887bc125a3659f258": "0x000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b6579734d2dcad73929f2afb5515ffc71c2142294a1e3f04d440e4a8de86030a47b0093": "0xbe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2fb99d880ec681799c0cf30e8886371da954b75224d766c852ac60eb44e1329aec5058574ae8daf703d43bc2fbd9f33d6c": "0x000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "0x2b06af9719ac64d755623cda8ddd9b949f99a2ce711f3a31b2fc05604c93f179": "0x088eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d",
-        "0x5c0d1176a568c1f92944340dbfed9e9c530ebca703c85910e7164cb7d1c9e47b": "0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d",
-        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b65797308219184be6a65e5100ee2c171c4c477d68940c58d3253a46259bf1014f484d9": "0xfe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e",
-        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b657973bac7529970f762c176f48cd3fbb3ba96612765c95390df59eaf282193664c85e": "0xbe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f",
-        "0xf2794c22e353e9a839f12faab03a911be2f6cb0456905c189bcb0458f9440f13": "0x00000000",
-        "0x9c5d795d0297be56027a4b2464e33397f43d6436dec51f09c3b71287a8fc9d48": "0x00000000000000000000000000000000",
-        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b657973cd9a09d6a67c0c3940e99786404c36c6d220e3bb8003f1ac1dda3a49b72ebc90": "0xbe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f",
-        "0x5f3e4907f716ac89b6347d15ececedca0b6a45321efae92aea15e0740ec7afe7": "0x00000000",
-        "0x3a636f6465": "0x0061736d0100000001ac022c60037f7f7f017f60027f7f017f60027f7f0060017f0060017f017e60037f7e7e0060017e017f60027e7e0060037f7e7f017f60027f7e017e60047f7e7e7e017f60017e017e60017e006000017f60027f7e017f6000017e60017f017f60037f7f7e017e60027f7f017e60037e7e7f017e60000060037f7f7f0060057f7f7f7f7f0060027e7f017f60057f7f7f7f7f017f60047f7f7f7f017f60047f7f7f7f0060067f7f7f7f7f7f0060027f7e0060057f7e7e7f7f0060057f7f7f7e7e0060047f7f7e7e0060057f7f7e7e7f0060027e7f0060067f7f7f7e7e7f0060067f7f7e7e7f7f0060067f7e7e7f7f7f0060077f7e7e7e7e7e7e0060087e7e7e7e7e7e7e7e017f60047f7e7e7e0060077f7f7f7f7f7e7e0060047f7e7e7f0060057f7e7e7e7e0060067f7e7e7e7e7f0002a60b2403656e76066d656d6f727902001203656e76196578745f6c6f6767696e675f6c6f675f76657273696f6e5f31000503656e761d6578745f68617368696e675f74776f785f36345f76657273696f6e5f31000603656e76206578745f68617368696e675f626c616b65325f3235365f76657273696f6e5f31000603656e76196578745f73746f726167655f7365745f76657273696f6e5f31000703656e761e6578745f68617368696e675f74776f785f3132385f76657273696f6e5f31000603656e76236578745f63727970746f5f737232353531395f7665726966795f76657273696f6e5f31000803656e76286578745f6f6666636861696e5f6c6f63616c5f73746f726167655f6765745f76657273696f6e5f31000903656e76346578745f6f6666636861696e5f6c6f63616c5f73746f726167655f636f6d706172655f616e645f7365745f76657273696f6e5f31000a03656e76286578745f6f6666636861696e5f6c6f63616c5f73746f726167655f7365745f76657273696f6e5f31000503656e76196578745f73746f726167655f6765745f76657273696f6e5f31000b03656e761d6578745f6d6973635f7072696e745f757466385f76657273696f6e5f31000c03656e761b6578745f73746f726167655f636c6561725f76657273696f6e5f31000c03656e76226578745f73746f726167655f636c6561725f7072656669785f76657273696f6e5f31000c03656e76206578745f68617368696e675f626c616b65325f3132385f76657273696f6e5f31000603656e76236578745f63727970746f5f656432353531395f7665726966795f76657273696f6e5f31000803656e76206578745f68617368696e675f6b656363616b5f3235365f76657273696f6e5f31000603656e761e6578745f73746f726167655f6e6578745f6b65795f76657273696f6e5f31000b03656e761c6578745f6d6973635f7072696e745f6865785f76657273696f6e5f31000c03656e76236578745f6f6666636861696e5f69735f76616c696461746f725f76657273696f6e5f31000d03656e76256578745f63727970746f5f656432353531395f67656e65726174655f76657273696f6e5f31000e03656e76256578745f63727970746f5f737232353531395f67656e65726174655f76657273696f6e5f31000e03656e76226578745f6d6973635f72756e74696d655f76657273696f6e5f76657273696f6e5f31000b03656e761a6578745f73746f726167655f726f6f745f76657273696f6e5f31000f03656e76226578745f73746f726167655f6368616e6765735f726f6f745f76657273696f6e5f31000b03656e762a6578745f747269655f626c616b65325f3235365f6f7264657265645f726f6f745f76657273696f6e5f31000603656e76296578745f6f6666636861696e5f7375626d69745f7472616e73616374696f6e5f76657273696f6e5f31000b03656e76246578745f6f6666636861696e5f6e6574776f726b5f73746174655f76657273696f6e5f31000f03656e761e6578745f616c6c6f6361746f725f6d616c6c6f635f76657273696f6e5f31001003656e761c6578745f616c6c6f6361746f725f667265655f76657273696f6e5f31000303656e76286578745f63727970746f5f737232353531395f7075626c69635f6b6579735f76657273696f6e5f31000403656e76216578745f63727970746f5f737232353531395f7369676e5f76657273696f6e5f31001103656e762c6578745f63727970746f5f736563703235366b315f65636473615f7265636f7665725f76657273696f6e5f31001203656e76376578745f63727970746f5f736563703235366b315f65636473615f7265636f7665725f636f6d707265737365645f76657273696f6e5f31001203656e761a6578745f73746f726167655f726561645f76657273696f6e5f31001303656e761c6578745f6d6973635f7072696e745f6e756d5f76657273696f6e5f31000c03f604f404101003030000101012141414150215001416000101020117030418190202001a0101011001010101150101001a0301010001010000010003010115020202010201000115010203021a150202020202020210030302150102020302020203020202020210011002021502030101140302150115021b020203021c0203160101020001010101150705151d020215150203151e0201030303020202030302150202150203030302030302021a0202021f02020216021502020310150202151f0703020302020202030202020202151f151602020203150202021e022002021502030202020215021502150203030203021002020f02021503030303020202162115160202020202150201010101021915020303150202050202020303030303020202020202021515021a150202020215151002030222020303150315020d16100202151a1a03022315021503030203151f031402020215020215140215030302021515150215030314021503030203021003020202020202021603030203030202020215160202011a02020103030202021a0202152402252601161a1502020202020202020202020202150210020302020303030203030302020203030210020203271503031502150202120212021603021a020312121202121212121202151202121212121212120312121212121212030202021002031a1a020303030202020303020202151503280103020303030303030303030303030303030303030315030203020302020d0303030203030303020303030302151502021f031f0203140302150202020203020202020303020303030202020215030302020302030303151510010205010116010000000029292a2a2a2b0407017001cc01cc010619037f01418080c0000b7f0041b8acc7000b7f0041b8acc7000b07ca061d195f5f696e6469726563745f66756e6374696f6e5f7461626c6501000a5f5f646174615f656e6403010b5f5f686561705f62617365Line truncated
-        "0x5f3e4907f716ac89b6347d15ececedca308ce9615de0775a82f8a94dc3d285a1": "0x02000000",
-        "0x5f3e4907f716ac89b6347d15ececedca422adb579f1dbf4f3886c5cfa3bb8cc494772f97f5f6b539aac74e798bc395119f39603402d0c85bc9eda5dfc5ae2160": "0xfe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e0b00407a10f35a0b00407a10f35a00",
-        "0x2371e21684d2fae99bcb4d579242f74a8a2d09463effcc78a22d75b9cb87dffc": "0x0000000000000000",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2fb99d880ec681799c0cf30e8886371da9a315ee9e56d2f3bb24992a1cff6617b0f7510628a15722b680c42c2be8bb7452": "0x000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "0xc2261276cc9d1f8598ea4b6a74b15c2fe3fd8df72970bc82e5267ea01eddd949": "0x01",
-        "0x5f3e4907f716ac89b6347d15ececedca509a9b6efa93f5bb83f858f0babfd30b": "0x00000000",
-        "0x5f3e4907f716ac89b6347d15ececedca9cbd2f0b29a008a36009ac44cca0c969": "0x00407a10f35a00000000000000000000",
+        "0x26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7": "0x3000000000000003d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d00000000000000038eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48000000000000000390b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe220000000000000003306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc200000000000000003e659a7a1628cdd93febc04a4e0646ea20e9f5f0ce097d9a05290d4a9e054df4e00000000000000031cbd2d43530a44705ad088af313e18f80b53ef16b36177cd4b77b846f2a5f07c0000000000000003be5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f0000000000000003fe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e00000000000000031e07379407fecc4b89eb7dbd287c2c781cfb1907a96947a3eb18e4f8e71986250000000000000003e860f1b1c7227f7c22602f53f15af80747814dffd839719731ee3bba6edc126c00000000000000038ac59e11963af19174d0b94d5d78041c233f55d2e19324665bafdfb62925af2d0000000000000003101191192fc877c24d725b337120fa3edc63d227bbc92705db1e2cb65f56981a00",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da99ea52149af6b15f4d523ad4342f63089646e29232a1777737159c7bc84173597": "0x00000000000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
        "0x5f3e4907f716ac89b6347d15ececedca88dcde934c658227ee1dfafcd6e169039a9304efeee429067b2e8dfbcfd8a22d96f9d996a5d6daa02899b96bd7a667b1": "0x000001be5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f",
+        "0xc2261276cc9d1f8598ea4b6a74b15c2f218f26c73add634897550b4003b26bc64724e5390fcf0d08afc9608ff4c45df257266ae599ac7a32baba26155dcf4402": "0x047374616b696e672000407a10f35a0000000000000000000002",
+        "0x3a65787472696e7369635f696e646578": "0x00000000",
+        "0x1cb6f36e027abb2091cfb5110ab5087f5e0621c4869aa60c02be9adcc98a0d1d": "0x088eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a480100000000000000d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d0100000000000000",
+        "0x2099d7f109d6e535fb000bba623fd4409f99a2ce711f3a31b2fc05604c93f179": "0x088eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d",
+        "0x5f3e4907f716ac89b6347d15ececedca5579297f4dfb9609e7e4c2ebab9ce40a": "0x08be5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25ffe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e",
+        "0x5f3e4907f716ac89b6347d15ececedca83e585bbc5fdcec57219c0dc81ef5ff44724e5390fcf0d08afc9608ff4c45df257266ae599ac7a32baba26155dcf4402": "0x0b00407a10f35a0b00407a10f35a00",
+        "0x5f3e4907f716ac89b6347d15ececedca9220e172bed316605f73f1ff7b4ade984724e5390fcf0d08afc9608ff4c45df257266ae599ac7a32baba26155dcf4402": "0x00",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9024cd62ab7726e039438193d4bbd915427f2d7de85afbcf00bd16fadbcad6aed": "0x00000000000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "0x5f3e4907f716ac89b6347d15ececedcab49a2738eeb30896aacb8b3fb46471bd": "0x01000000",
+        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b65797379b1148d2eef14114c422e7d0647dde06e73c1ab283dce7d8a383ae6f948faf1": "0xfe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e",
+        "0xf2794c22e353e9a839f12faab03a911b7f17cdfbfa73331856cca0acddd7842e": "0x00000000",
+        "0x5f3e4907f716ac89b6347d15ececedca88dcde934c658227ee1dfafcd6e169034724e5390fcf0d08afc9608ff4c45df257266ae599ac7a32baba26155dcf4402": "0x0001fe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e00",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da965d0de2c1f75d898c078307a00486016783280c8f3407db41dc9547d3e3d651e": "0x00000000000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9927407fbcfe5afa14bcfb44714a843c532f291a9c33612677cb9e0ae5e2bd5de": "0x00000000000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "0x5f3e4907f716ac89b6347d15ececedca83e585bbc5fdcec57219c0dc81ef5ff49a9304efeee429067b2e8dfbcfd8a22d96f9d996a5d6daa02899b96bd7a667b1": "0x0b00407a10f35a0b00407a10f35a00",
+        "0xc2261276cc9d1f8598ea4b6a74b15c2f218f26c73add634897550b4003b26bc69a9304efeee429067b2e8dfbcfd8a22d96f9d996a5d6daa02899b96bd7a667b1": "0x047374616b696e672000407a10f35a0000000000000000000002",
+        "0x3fba98689ebed1138735e0e7a5a790ab0b76934f4cc08dee01012d059e1b83ee": "0x00",
        "0x5f3e4907f716ac89b6347d15ececedca3ed14b45ed20d054f05e37e2542cfe704724e5390fcf0d08afc9608ff4c45df257266ae599ac7a32baba26155dcf4402": "0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d",
-        "0x5f3e4907f716ac89b6347d15ececedcab49a2738eeb30896aacb8b3fb46471bd": "0x01000000"
+        "0xcec5070d609dd3497f72bde07fc96ba088dcde934c658227ee1dfafcd6e16903": "0x08fe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860ebe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f",
+        "0xc2261276cc9d1f8598ea4b6a74b15c2fe3fd8df72970bc82e5267ea01eddd949": "0x01",
+        "0x5f3e4907f716ac89b6347d15ececedca3ed14b45ed20d054f05e37e2542cfe709a9304efeee429067b2e8dfbcfd8a22d96f9d996a5d6daa02899b96bd7a667b1": "0x8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da977d14a2289dda9bbb32dd9313db096ef628101ac5bbb3b19301ede2c61915b89": "0x00000000000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b65797303ab9ef4e6c4b0eea2939ffa571bac1fde2ed0137bd64339758ce9a753a4af0c": "0xfe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e",
+        "0xcec5070d609dd3497f72bde07fc96ba0e0cdd062e6eaf24295ad4ccfc41d4609": "0x08fe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860ed17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae698eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a488eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a488eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a488eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48be5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f88dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0eed43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27dd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27dd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27dd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d",
+        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b6579734d2dcad73929f2afb5515ffc71c2142294a1e3f04d440e4a8de86030a47b0093": "0xbe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f",
+        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b65797342a1d578558b434ecac1371dde376dca0109923708bad2f9b39a39fe726cba7e": "0xfe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e",
+        "0x9c5d795d0297be56027a4b2464e33397f43d6436dec51f09c3b71287a8fc9d48": "0x00000000000000000000000000000000",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9a315ee9e56d2f3bb24992a1cff6617b0f7510628a15722b680c42c2be8bb7452": "0x00000000000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b6579733b07ae43d4d18b2f6a5ce4eabef01ad3860523243fb4bb3a6a4922750c1d7e4b": "0xbe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9c4a80eb5e32005323fb878ca749473d7e5f40d60ed5e74e887bc125a3659f258": "0x00000000000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "0x26aa394eea5630e07c48ae0c9558cef7a44704b568d21667356a5a050c11874611da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9": "0x4545454545454545454545454545454545454545454545454545454545454545",
+        "0x5f3e4907f716ac89b6347d15ececedcaea07de2b8f010516dca3f7ef52f7ac5a": "0x040000000000000000",
+        "0x3a6772616e6470615f617574686f726974696573": "0x0108d17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae69010000000000000088dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee0100000000000000",
+        "0x5f3e4907f716ac89b6347d15ececedcaf7dad0317324aecae8744b87fc95f2f3": "0x00",
+        "0x5f3e4907f716ac89b6347d15ececedca138e71612491192d68deab7e6f563fe1": "0x02000000",
+        "0x5f3e4907f716ac89b6347d15ececedca28dccb559b95c40168a1b2696581b5a7": "0x00000000000000000000000000000000",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da94724e5390fcf0d08afc9608ff4c45df257266ae599ac7a32baba26155dcf4402": "0x00000000000064a7b3b6e00d00000000000000000000000000000000000000000000000000407a10f35a0000000000000000000000407a10f35a00000000000000000000",
+        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b657973538a5b67f2b6e2a4e04e3a0121d75f4d0efb5bd14689ab4a07cbff45b88e7f7d": "0xbe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f",
+        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b657973bac7529970f762c176f48cd3fbb3ba96612765c95390df59eaf282193664c85e": "0xbe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f",
+        "0x5f3e4907f716ac89b6347d15ececedca509a9b6efa93f5bb83f858f0babfd30b": "0x00000000",
+        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b65797308219184be6a65e5100ee2c171c4c477d68940c58d3253a46259bf1014f484d9": "0xfe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e",
+        "0x26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850": "0x0c000000",
+        "0x2b06af9719ac64d755623cda8ddd9b949f99a2ce711f3a31b2fc05604c93f179": "0x088eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d",
+        "0x3a636f6465": "0x0061736d0100000001ad022c60037f7f7f017f60027f7f017f60027f7f0060017f0060017f017e60037f7e7e0060027e7e0060017e017f60017e017e60017e0060037f7e7f017f6000017f60027f7e017f6000017e60027f7e017e60047f7e7e7e017f60017f017f60037f7f7e017e60027f7f017e60037e7e7f017e60000060037f7f7f0060057f7f7f7f7f0060027e7f017f60057f7f7f7f7f017f60047f7f7f7f017f60047f7f7f7f0060027f7e0060077f7f7f7f7f7f7f0060067f7f7f7e7e7f0060057f7f7e7e7f0060067f7f7f7f7f7f0060027e7f0060067f7e7e7f7f7f0060077f7e7e7e7e7e7e0060087e7e7e7e7e7e7e7e017f60047f7e7e7e0060077f7f7f7f7f7e7e0060047f7f7e7e0060057f7e7e7f7f0060057f7f7f7e7e0060047f7e7e7f0060057f7e7e7e7e0060067f7e7e7e7e7f0002a60b2403656e76066d656d6f727902001203656e76196578745f6c6f6767696e675f6c6f675f76657273696f6e5f31000503656e76196578745f73746f726167655f7365745f76657273696f6e5f31000603656e76206578745f68617368696e675f626c616b65325f3235365f76657273696f6e5f31000703656e761e6578745f68617368696e675f74776f785f3132385f76657273696f6e5f31000703656e76196578745f73746f726167655f6765745f76657273696f6e5f31000803656e761d6578745f6d6973635f7072696e745f757466385f76657273696f6e5f31000903656e761b6578745f73746f726167655f636c6561725f76657273696f6e5f31000903656e76226578745f73746f726167655f636c6561725f7072656669785f76657273696f6e5f31000903656e76206578745f68617368696e675f626c616b65325f3132385f76657273696f6e5f31000703656e761e6578745f73746f726167655f6e6578745f6b65795f76657273696f6e5f31000803656e76236578745f63727970746f5f656432353531395f7665726966795f76657273696f6e5f31000a03656e76236578745f63727970746f5f737232353531395f7665726966795f76657273696f6e5f31000a03656e76206578745f68617368696e675f6b656363616b5f3235365f76657273696f6e5f31000703656e761d6578745f68617368696e675f74776f785f36345f76657273696f6e5f31000703656e761c6578745f6d6973635f7072696e745f6865785f76657273696f6e5f31000903656e76236578745f6f6666636861696e5f69735f76616c696461746f725f76657273696f6e5f31000b03656e76256578745f63727970746f5f656432353531395f67656e65726174655f76657273696f6e5f31000c03656e76256578745f63727970746f5f737232353531395f67656e65726174655f76657273696f6e5f31000c03656e761a6578745f73746f726167655f726f6f745f76657273696f6e5f31000d03656e76226578745f73746f726167655f6368616e6765735f726f6f745f76657273696f6e5f31000803656e76226578745f6d6973635f72756e74696d655f76657273696f6e5f76657273696f6e5f31000803656e76286578745f6f6666636861696e5f6c6f63616c5f73746f726167655f6765745f76657273696f6e5f31000e03656e76346578745f6f6666636861696e5f6c6f63616c5f73746f726167655f636f6d706172655f616e645f7365745f76657273696f6e5f31000f03656e76286578745f6f6666636861696e5f6c6f63616c5f73746f726167655f7365745f76657273696f6e5f31000503656e762a6578745f747269655f626c616b65325f3235365f6f7264657265645f726f6f745f76657273696f6e5f31000703656e76296578745f6f6666636861696e5f7375626d69745f7472616e73616374696f6e5f76657273696f6e5f31000803656e76246578745f6f6666636861696e5f6e6574776f726b5f73746174655f76657273696f6e5f31000d03656e761e6578745f616c6c6f6361746f725f6d616c6c6f635f76657273696f6e5f31001003656e761c6578745f616c6c6f6361746f725f667265655f76657273696f6e5f31000303656e76286578745f63727970746f5f737232353531395f7075626c69635f6b6579735f76657273696f6e5f31000403656e76216578745f63727970746f5f737232353531395f7369676e5f76657273696f6e5f31001103656e762c6578745f63727970746f5f736563703235366b315f65636473615f7265636f7665725f76657273696f6e5f31001203656e76376578745f63727970746f5f736563703235366b315f65636473615f7265636f7665725f636f6d707265737365645f76657273696f6e5f31001203656e761a6578745f73746f726167655f726561645f76657273696f6e5f31001303656e761c6578745f6d6973635f7072696e745f6e756d5f76657273696f6e5f31000903e804e604101003030000101012141414150215001416000101020117030418190202001a010101020101010115010101001a010100010100000100030101020202150201020103010203021a15020202020202100303021502010202030202030202020202021001100215020202030215030302151b0115020202020303020203021515151515151c1502020202020202020202051a0302021d020206020302021515021e1d1a0302150203030202030203150302030210021f020d020215030303030202162015160202020202021501020202010101021a150203020303030215030605020303030303020202020202020119151515021a02021515100203020203031516020b10020215151a03020202021a02021503020203151503140d0201020215020202021602020215030303150202150303140202020202160302151503030203021002020302020202030303020303020202021a020201160202010321020202222301161a020202020202020202020202020215100203030303030202020303021002020203151a0302151503240303150303020202120212021614021a02031212121212021212121202150212020102011212121212120212031212121212121212030b0202021002030303020202021a0303020202032501030203020302021a1a020303030203030303030202020215150303030303030303030303030303030303030303031403150215031515030302020203260327020202031403021502020202030202152802020300010103031601000103030203031a0210030302020203020202020202160302030315151001010205011601010000000029292a2a2a2b0407017001c901c9010619037f01418080c0000b7f004198afc7000b7f004198afc7000b07a9071f195f5f696e6469726563745f66756e6374696f6e5f7461626c65010009686173685f74657374002b0c436f72655f76657273696f6e00bb0312436f72655f65786563Line truncated
+        "0x0b76934f4cc08dee01012d059e1b83ee5e0621c4869aa60c02be9adcc98a0d1d": "0x088eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d",
+        "0x5f3e4907f716ac89b6347d15ececedcac29a0310e1bb45d20cace77ccb62c97d": "0x00e1f505",
+        "0x492a52699edf49c972c21db794cfcf57ba7fb8745735dc3be2a2c61a72c39e78": "0x00",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da99a9304efeee429067b2e8dfbcfd8a22d96f9d996a5d6daa02899b96bd7a667b1": "0x00000000000064a7b3b6e00d00000000000000000000000000000000000000000000000000407a10f35a0000000000000000000000407a10f35a00000000000000000000",
+        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b6579739b94324fd570688c7f3c5e3d0b90af7ae011ebcfe3e4d92e027ffbdf0db62684": "0xfe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da92e3fb4c297a84c5cebc0e78257d213d0927ccc7596044c6ba013dd05522aacba": "0x00000000000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "0x5f3e4907f716ac89b6347d15ececedca422adb579f1dbf4f3886c5cfa3bb8cc42e3fb4c297a84c5cebc0e78257d213d0927ccc7596044c6ba013dd05522aacba": "0xbe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f0b00407a10f35a0b00407a10f35a00",
+        "0x5f3e4907f716ac89b6347d15ececedca6a93112633bb3354e67952fcdd740cd5": "0xfe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e",
+        "0x5f3e4907f716ac89b6347d15ececedca9cbd2f0b29a008a36009ac44cca0c969": "0x00407a10f35a00000000000000000000",
+        "0xf2794c22e353e9a839f12faab03a911be2f6cb0456905c189bcb0458f9440f13": "0x00000000",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da954b75224d766c852ac60eb44e1329aec5058574ae8daf703d43bc2fbd9f33d6c": "0x00000000000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "0x26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac": "0x01000000",
+        "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da994772f97f5f6b539aac74e798bc395119f39603402d0c85bc9eda5dfc5ae2160": "0x00000000000064a7b3b6e00d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "0x5f3e4907f716ac89b6347d15ececedca422adb579f1dbf4f3886c5cfa3bb8cc494772f97f5f6b539aac74e798bc395119f39603402d0c85bc9eda5dfc5ae2160": "0xfe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e0b00407a10f35a0b00407a10f35a00",
+        "0x5f3e4907f716ac89b6347d15ececedca9220e172bed316605f73f1ff7b4ade989a9304efeee429067b2e8dfbcfd8a22d96f9d996a5d6daa02899b96bd7a667b1": "0x00",
+        "0x5f3e4907f716ac89b6347d15ececedca0ea0ecac76457d0f9b39b981dd107012": "0x08fe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860ebe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f",
+        "0xc2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80": "0x0000b0d86b9088a60000000000000000",
+        "0xcec5070d609dd3497f72bde07fc96ba04c014e6bf8b8c2c011e7290b85696bb39fe6329cc0b39e09343a73657373696f6e3a6b6579734724e5390fcf0d08afc9608ff4c45df257266ae599ac7a32baba26155dcf4402": "0x88dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0eed43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27dd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27dd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27dd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d",
+        "0x2371e21684d2fae99bcb4d579242f74a8a2d09463effcc78a22d75b9cb87dffc": "0x0000000000000000",
+        "0x26aa394eea5630e07c48ae0c9558cef78a42f33323cb5ced3b44dd825fda9fcc": "0x4545454545454545454545454545454545454545454545454545454545454545",
+        "0x5f3e4907f716ac89b6347d15ececedca0b6a45321efae92aea15e0740ec7afe7": "0x00000000",
+        "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509fe6329cc0b39e09343a73657373696f6e3a6b657973cd9a09d6a67c0c3940e99786404c36c6d220e3bb8003f1ac1dda3a49b72ebc90": "0xbe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f",
+        "0xcec5070d609dd3497f72bde07fc96ba04c014e6bf8b8c2c011e7290b85696bb39fe6329cc0b39e09343a73657373696f6e3a6b6579739a9304efeee429067b2e8dfbcfd8a22d96f9d996a5d6daa02899b96bd7a667b1": "0xd17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae698eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a488eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a488eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a488eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48",
+        "0x5c0d1176a568c1f92944340dbfed9e9c530ebca703c85910e7164cb7d1c9e47b": "0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d"
      },
      "children": {}
    }
@@ -171,7 +171,7 @@ impl frame_system::Trait for Runtime {
 	type ModuleToIndex = ModuleToIndex;
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
-	type OnReapAccount = Balances;
+	type OnKilledAccount = Balances;
 }

 parameter_types! {
@@ -303,10 +303,6 @@ impl_runtime_apis! {
 			Executive::apply_extrinsic(extrinsic)
 		}

-		fn apply_trusted_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
-			Executive::apply_trusted_extrinsic(extrinsic)
-		}
-
 		fn finalize_block() -> <Block as BlockT>::Header {
 			Executive::finalize_block()
 		}
@@ -21,9 +21,8 @@ use std::sync::Arc;

 use parachain_runtime::Block;

-use sc_cli::{error, VersionInfo};
 use sc_client::genesis;
-use sc_service::{Configuration, Roles as ServiceRoles};
+use sc_service::{Configuration, Roles as ServiceRoles, config::PrometheusConfig};
 use sp_core::hexdisplay::HexDisplay;
 use sp_runtime::{
 	traits::{Block as BlockT, Hash as HashT, Header as HeaderT},
@@ -37,23 +36,24 @@ use log::info;

 const DEFAULT_POLKADOT_RPC_HTTP: &'static str = "127.0.0.1:9934";
 const DEFAULT_POLKADOT_RPC_WS: &'static str = "127.0.0.1:9945";
-const DEFAULT_POLKADOT_GRAFANA_PORT: &'static str = "127.0.0.1:9956";
+const DEFAULT_POLKADOT_PROMETHEUS_PORT: &'static str = "127.0.0.1:9616";

 /// Parse command line arguments into service configuration.
-pub fn run(version: VersionInfo) -> error::Result<()> {
+pub fn run(version: sc_cli::VersionInfo) -> sc_cli::Result<()> {
 	let opt: Cli = sc_cli::from_args(&version);

-	let mut config = sc_service::Configuration::new(&version);
-	let mut polkadot_config = Configuration::new(&version);
+	let mut config = sc_service::Configuration::from_version(&version);
+	let mut polkadot_config = Configuration::from_version(&version);

 	match opt.subcommand {
-		Some(Subcommand::Base(subcommand)) => sc_cli::run_subcommand(
-			config,
-			subcommand,
-			load_spec,
-			|config: Configuration<_, _>| Ok(new_full_start!(config).0),
-			&version,
-		),
+		Some(Subcommand::Base(subcommand)) => {
+			subcommand.init(&version)?;
+			subcommand.update_config(&mut config, load_spec, &version)?;
+			subcommand.run(
+				config,
+				|config: Configuration<_, _>| Ok(new_full_start!(config).0),
+			)
+		},
 		Some(Subcommand::ExportGenesisState(params)) => {
 			sc_cli::init_logger("");

@@ -81,9 +81,8 @@ pub fn run(version: VersionInfo) -> error::Result<()> {
 			Ok(())
 		},
 		None => {
-			sc_cli::init(&opt.run.shared_params, &version)?;
-			sc_cli::init_config(&mut config, &opt.run.shared_params, &version, load_spec)?;
-			sc_cli::update_config_for_running_node(&mut config, opt.run)?;
+			opt.run.init(&version)?;
+			opt.run.update_config(&mut config, load_spec, &version)?;

 			info!("{}", version.name);
 			info!("  version {}", config.full_version());
@@ -106,15 +105,17 @@ pub fn run(version: VersionInfo) -> error::Result<()> {

 			polkadot_config.rpc_http = Some(DEFAULT_POLKADOT_RPC_HTTP.parse().unwrap());
 			polkadot_config.rpc_ws = Some(DEFAULT_POLKADOT_RPC_WS.parse().unwrap());
-			polkadot_config.grafana_port = Some(DEFAULT_POLKADOT_GRAFANA_PORT.parse().unwrap());
+			polkadot_config.prometheus_config = Some(
+				PrometheusConfig::new_with_default_registry(
+					DEFAULT_POLKADOT_PROMETHEUS_PORT.parse().unwrap(),
+				)
+			);

-			sc_cli::init_config(
+			polkadot_opt.run.update_config(
 				&mut polkadot_config,
-				&polkadot_opt.run.shared_params,
-				&version,
 				load_spec_polkadot,
+				&version,
 			)?;
-			sc_cli::update_config_for_running_node(&mut polkadot_config, polkadot_opt.run)?;

 			// TODO: we disable mdns for the polkadot node because it prevents the process to exit
 			//       properly. See https://github.com/paritytech/cumulus/issues/57
@@ -133,11 +134,11 @@ pub fn run(version: VersionInfo) -> error::Result<()> {
 	}
 }

-fn load_spec(_: &str) -> std::result::Result<Option<chain_spec::ChainSpec>, String> {
+fn load_spec(_: &str) -> Result<Option<chain_spec::ChainSpec>, String> {
 	Ok(Some(chain_spec::get_chain_spec()))
 }

-fn load_spec_polkadot(_: &str) -> std::result::Result<Option<ChainSpecPolkadot>, String> {
+fn load_spec_polkadot(_: &str) -> Result<Option<ChainSpecPolkadot>, String> {
 	Some(polkadot_service::ChainSpec::from_json_bytes(
 		&include_bytes!("../res/polkadot_chainspec.json")[..],
 	)).transpose()
@@ -27,8 +27,6 @@ mod service;
 mod cli;
 mod command;

-pub use sc_cli::{error, VersionInfo};
-
 /// The parachain id of this parachain.
 pub const PARA_ID: ParaId = ParaId::new(100);
 const EXECUTABLE_NAME: &'static str = "cumulus-test-parachain-collator";
@@ -38,8 +36,8 @@ const DESCRIPTION: &'static str =
 	to the relaychain node.\n\n\
 	cumulus-test-parachain-collator [parachain-args] -- [relaychain-args]";

-fn main() -> Result<(), error::Error> {
-	let version = VersionInfo {
+fn main() -> sc_cli::Result<()> {
+	let version = sc_cli::VersionInfo {
 		name: "Cumulus Test Parachain Collator",
 		commit: env!("VERGEN_SHA_SHORT"),
 		version: env!("CARGO_PKG_VERSION"),
@@ -16,11 +16,11 @@

 use std::sync::Arc;

-use parachain_runtime::{self, opaque::Block, GenesisConfig};
+use parachain_runtime::{self, GenesisConfig};

 use sc_executor::native_executor_instance;
-use sc_network::construct_simple_protocol;
 use sc_service::{AbstractService, Configuration};
+use sc_finality_grandpa::{FinalityProofProvider as GrandpaFinalityProofProvider, StorageAndProofProvider};

 use polkadot_primitives::parachain::CollatorPair;

@@ -37,11 +37,6 @@ native_executor_instance!(
 	parachain_runtime::native_version,
 );

-construct_simple_protocol! {
-	/// Demo protocol attachment for substrate.
-	pub struct NodeProtocol where Block = Block { }
-}
-
 /// Starts a `ServiceBuilder` for a full service.
 ///
 /// Use this macro if you don't actually need the full service, but just the builder in order to
@@ -82,7 +77,7 @@ pub fn run_collator<E: sc_service::ChainSpecExtension>(
 	parachain_config: Configuration<GenesisConfig, E>,
 	key: Arc<CollatorPair>,
 	mut polkadot_config: polkadot_collator::Configuration,
-) -> sc_cli::error::Result<()> {
+) -> sc_cli::Result<()> {
 	sc_cli::run_service_until_exit(parachain_config, move |parachain_config| {
 		polkadot_config.task_executor = parachain_config.task_executor.clone();

@@ -92,13 +87,17 @@ pub fn run_collator<E: sc_service::ChainSpecExtension>(
 			.unwrap();

 		let service = builder
-			.with_network_protocol(|_| Ok(NodeProtocol::new()))?
+			.with_finality_proof_provider(|client, backend| {
+				// GenesisAuthoritySetProvider is implemented for StorageAndProofProvider
+				let provider = client as Arc<dyn StorageAndProofProvider<_, _>>;
+				Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _)
+			})?
 			.build()?;

-		let proposer_factory = sc_basic_authorship::ProposerFactory {
-			client: service.client(),
-			transaction_pool: service.transaction_pool(),
-		};
+		let proposer_factory = sc_basic_authorship::ProposerFactory::new(
+			service.client(),
+			service.transaction_pool(),
+		);

 		let block_import = service.client();
 		let client = service.client();