init parentchain genesis hash (#1621)

app-libs/stf/src/stf_sgx.rs

@@ -38,7 +38,7 @@ use itp_stf_interface::{
 };
 use itp_stf_primitives::{error::StfError, traits::TrustedCallVerification};
 use itp_storage::storage_value_key;
-use itp_types::parentchain::{AccountId, ParentchainCall, ParentchainId};
+use itp_types::parentchain::{AccountId, Hash, ParentchainCall, ParentchainId};
 use itp_utils::stringify::account_id_to_string;
 use log::*;
 use sp_runtime::traits::StaticLookup;
@@ -280,7 +280,7 @@ impl<TCS, G, State, Runtime, ParentchainHeader>
 	ParentchainPalletInstancesInterface<State, ParentchainHeader> for Stf<TCS, G, State, Runtime>
 where
 	State: SgxExternalitiesTrait,
-	Runtime: frame_system::Config<Header = ParentchainHeader, AccountId = AccountId>
+	Runtime: frame_system::Config<Header = ParentchainHeader, AccountId = AccountId, Hash = Hash>
 		+ pallet_parentchain::Config<ParentchainInstanceIntegritee>
 		+ pallet_parentchain::Config<ParentchainInstanceTargetA>
 		+ pallet_parentchain::Config<ParentchainInstanceTargetB>,
@@ -431,6 +431,40 @@ where
 		Ok(())
 	}
 
+	fn set_genesis_hash(
+		state: &mut State,
+		genesis_hash: Hash,
+		parentchain_id: ParentchainId,
+	) -> Result<(), Self::Error> {
+		state.execute_with(|| match parentchain_id {
+			ParentchainId::Integritee => pallet_parentchain::Call::<
+				Runtime,
+				ParentchainInstanceIntegritee,
+			>::init_parentchain_genesis_hash {
+				genesis: genesis_hash,
+			}
+			.dispatch_bypass_filter(Runtime::RuntimeOrigin::root())
+			.map_err(|e| Self::Error::Dispatch(format!("Init genesis hash error: {:?}", e.error))),
+			ParentchainId::TargetA => pallet_parentchain::Call::<
+				Runtime,
+				ParentchainInstanceTargetA,
+			>::init_parentchain_genesis_hash {
+				genesis: genesis_hash,
+			}
+			.dispatch_bypass_filter(Runtime::RuntimeOrigin::root())
+			.map_err(|e| Self::Error::Dispatch(format!("Init genesis hash error: {:?}", e.error))),
+			ParentchainId::TargetB => pallet_parentchain::Call::<
+				Runtime,
+				ParentchainInstanceTargetB,
+			>::init_parentchain_genesis_hash {
+				genesis: genesis_hash,
+			}
+			.dispatch_bypass_filter(Runtime::RuntimeOrigin::root())
+			.map_err(|e| Self::Error::Dispatch(format!("Init genesis hash error: {:?}", e.error))),
+		})?;
+		Ok(())
+	}
+
 	fn get_shard_vault_ensure_single_parentchain(
 		state: &mut State,
 	) -> Result<Option<(AccountId, ParentchainId)>, Self::Error> {

core-primitives/stf-interface/src/parentchain_pallet.rs

@@ -15,7 +15,7 @@
 
 */
 
-use itp_types::parentchain::{AccountId, ParentchainId};
+use itp_types::parentchain::{AccountId, Hash, ParentchainId};
 
 /// Interface trait of the parentchain pallet.
 pub trait ParentchainPalletInstancesInterface<State, ParentchainHeader> {
@@ -51,6 +51,12 @@ pub trait ParentchainPalletInstancesInterface<State, ParentchainHeader> {
 		parentchain_id: ParentchainId,
 	) -> Result<(), Self::Error>;
 
+	fn set_genesis_hash(
+		state: &mut State,
+		genesis_hash: Hash,
+		parentchain_id: ParentchainId,
+	) -> Result<(), Self::Error>;
+
 	fn get_shard_vault_ensure_single_parentchain(
 		state: &mut State,
 	) -> Result<Option<(AccountId, ParentchainId)>, Self::Error>;

core-primitives/types/src/parentchain.rs

@@ -91,6 +91,7 @@ impl std::fmt::Display for ParentchainId {
 
 pub trait IdentifyParentchain {
 	fn parentchain_id(&self) -> ParentchainId;
+	fn genesis_hash(&self) -> Option<Hash>;
 }
 
 pub trait FilterEvents {

core/parentchain/light-client/src/concurrent_access.rs

@@ -30,7 +30,7 @@ use crate::{
 	LightValidationState, Validator as ValidatorTrait,
 };
 use finality_grandpa::BlockNumberOps;
-use itp_types::parentchain::{IdentifyParentchain, ParentchainId};
+use itp_types::parentchain::{Hash, IdentifyParentchain, ParentchainId};
 use sp_runtime::traits::{Block as ParentchainBlockTrait, NumberFor};
 use std::{marker::PhantomData, sync::Arc};
 
@@ -80,12 +80,18 @@ impl<Validator, ParentchainBlock, LightClientSeal>
 	}
 }
 
-impl<Validator, ParentchainBlock, LightClientSeal: IdentifyParentchain> IdentifyParentchain
-	for ValidatorAccessor<Validator, ParentchainBlock, LightClientSeal>
+impl<
+		Validator: IdentifyParentchain,
+		ParentchainBlock,
+		LightClientSeal: IdentifyParentchain + LightClientSealing,
+	> IdentifyParentchain for ValidatorAccessor<Validator, ParentchainBlock, LightClientSeal>
 {
 	fn parentchain_id(&self) -> ParentchainId {
 		(*self.seal).parentchain_id()
 	}
+	fn genesis_hash(&self) -> Option<Hash> {
+		self.light_validation.read().unwrap().genesis_hash()
+	}
 }
 
 impl<Validator, ParentchainBlock, Seal> ValidatorAccess<ParentchainBlock>

core/parentchain/light-client/src/io.rs

@@ -27,7 +27,7 @@ use codec::{Decode, Encode};
 use core::{fmt::Debug, marker::PhantomData};
 use itp_ocall_api::EnclaveOnChainOCallApi;
 use itp_sgx_io::{seal, unseal};
-use itp_types::parentchain::{IdentifyParentchain, ParentchainId};
+use itp_types::parentchain::{Hash, IdentifyParentchain, ParentchainId};
 use log::*;
 use sp_runtime::traits::{Block, Header};
 use std::{
@@ -93,6 +93,9 @@ impl<B, L> IdentifyParentchain for LightClientStateSeal<B, L> {
 	fn parentchain_id(&self) -> ParentchainId {
 		self.parentchain_id
 	}
+	fn genesis_hash(&self) -> Option<Hash> {
+		None
+	}
 }
 
 impl<B: Block, LightClientState: Decode + Encode + Debug> LightClientSealing
@@ -194,6 +197,9 @@ impl<B, LightClientState> IdentifyParentchain for LightClientStateSealSync<B, Li
 	fn parentchain_id(&self) -> ParentchainId {
 		self.seal.parentchain_id
 	}
+	fn genesis_hash(&self) -> Option<Hash> {
+		None
+	}
 }
 
 impl<B: Block, LightClientState: Decode + Encode + Debug> LightClientSealing

core/parentchain/light-client/src/light_validation.rs

@@ -25,11 +25,11 @@ use codec::Encode;
 use core::iter::Iterator;
 use itp_ocall_api::EnclaveOnChainOCallApi;
 use itp_storage::{Error as StorageError, StorageProof, StorageProofChecker};
-use itp_types::parentchain::{IdentifyParentchain, ParentchainId};
+use itp_types::parentchain::{Hash, IdentifyParentchain, ParentchainId};
 use log::error;
 use sp_runtime::{
 	generic::SignedBlock,
-	traits::{Block as ParentchainBlockTrait, Header as HeaderTrait},
+	traits::{Block as ParentchainBlockTrait, Block as BlockT, Header as HeaderTrait},
 	Justifications, OpaqueExtrinsic,
 };
 use std::{boxed::Box, fmt, sync::Arc, vec::Vec};
@@ -42,12 +42,16 @@ pub struct LightValidation<Block: ParentchainBlockTrait, OcallApi> {
 	finality: Arc<Box<dyn Finality<Block> + Sync + Send + 'static>>,
 }
 
-impl<Block: ParentchainBlockTrait, OcallApi> IdentifyParentchain
-	for LightValidation<Block, OcallApi>
+impl<Block, OcallApi> IdentifyParentchain for LightValidation<Block, OcallApi>
+where
+	Block: BlockT<Hash = Hash> + ParentchainBlockTrait,
 {
 	fn parentchain_id(&self) -> ParentchainId {
 		self.parentchain_id
 	}
+	fn genesis_hash(&self) -> Option<Hash> {
+		self.light_validation_state.genesis_hash().ok()
+	}
 }
 
 impl<Block: ParentchainBlockTrait, OcallApi: EnclaveOnChainOCallApi>

core/parentchain/light-client/src/mocks/validator_access_mock.rs

@@ -27,7 +27,7 @@ use crate::{
 	mocks::validator_mock::ValidatorMock,
 };
 use itp_types::{
-	parentchain::{IdentifyParentchain, ParentchainId},
+	parentchain::{Hash, IdentifyParentchain, ParentchainId},
 	Block,
 };
 
@@ -63,4 +63,7 @@ impl IdentifyParentchain for ValidatorAccessMock {
 	fn parentchain_id(&self) -> ParentchainId {
 		ParentchainId::Integritee
 	}
+	fn genesis_hash(&self) -> Option<Hash> {
+		Some(Hash::default())
+	}
 }

enclave-runtime/src/shard_creation_info.rs

@@ -23,12 +23,17 @@ use crate::{
 use codec::{Decode, Encode};
 use itp_component_container::ComponentGetter;
 
+use crate::utils::{
+	get_validator_accessor_from_integritee_solo_or_parachain,
+	get_validator_accessor_from_target_a_solo_or_parachain,
+	get_validator_accessor_from_target_b_solo_or_parachain,
+};
 use itp_stf_interface::{
 	parentchain_pallet::ParentchainPalletInstancesInterface, ShardCreationInfo, ShardCreationQuery,
 };
 use itp_stf_state_handler::{handle_state::HandleState, query_shard_state::QueryShardState};
 use itp_types::{
-	parentchain::{Header, ParentchainId},
+	parentchain::{Hash, Header, IdentifyParentchain, ParentchainId},
 	ShardIdentifier,
 };
 use itp_utils::write_slice_and_whitespace_pad;
@@ -100,14 +105,29 @@ fn init_shard_creation_parentchain_header_internal(
 	};
 
 	let (state_lock, mut state) = state_handler.load_for_mutation(&shard)?;
+
 	EnclaveStf::set_creation_block(&mut state, header, parentchain_id)
 		.map_err(|e| Error::Stf(e.to_string()))?;
+
+	let genesis_hash = get_genesis_hash(parentchain_id)?;
+	EnclaveStf::set_genesis_hash(&mut state, genesis_hash, parentchain_id)
+		.map_err(|e| Error::Stf(e.to_string()))?;
+
 	state_handler.write_after_mutation(state, state_lock, &shard)?;
 
 	shard_config::init_shard_config(shard)?;
 	Ok(())
 }
 
+fn get_genesis_hash(parentchain_id: ParentchainId) -> EnclaveResult<Hash> {
+	let va = match parentchain_id {
+		ParentchainId::Integritee => get_validator_accessor_from_integritee_solo_or_parachain(),
+		ParentchainId::TargetA => get_validator_accessor_from_target_a_solo_or_parachain(),
+		ParentchainId::TargetB => get_validator_accessor_from_target_b_solo_or_parachain(),
+	}?;
+	va.genesis_hash()
+		.ok_or_else(|| Error::Other("genesis hash missing for parentchain".into()))
+}
 /// reads the shard vault account id form state if it has been initialized previously
 pub(crate) fn get_shard_creation_info_internal(
 	shard: ShardIdentifier,

service/src/main_impl.rs

@@ -778,12 +778,13 @@ where
 	// TODO: #1451: Fix api-client type hacks
 	let head = Header::decode(&mut api_head.encode().as_slice())
 		.expect("Can decode previously encoded header; qed");
-	// we ignore failure
-	let _ = enclave.init_shard_creation_parentchain_header(shard, &parentchain_id, &head);
 
 	let (parentchain_handler, last_synched_header) =
 		init_parentchain(enclave, &node_api, tee_account_id, parentchain_id, shard);
 
+	// we ignore failure
+	let _ = enclave.init_shard_creation_parentchain_header(shard, &parentchain_id, &head);
+
 	if WorkerModeProvider::worker_mode() != WorkerMode::Teeracle {
 		println!(
 			"[{:?}] Finished initializing light client, syncing parentchain...",