pimp logs and try to get shard for confirm_processed_parentchain_block

core/parentchain/indirect-calls-executor/src/executor.rs

@@ -128,7 +128,7 @@ impl<
 		let block_number = *block.header().number();
 		let block_hash = block.hash();
 
-		debug!("Scanning block {:?} for relevant xt", block_number);
+		trace!("Scanning block {:?} for relevant xt", block_number);
 		let mut executed_calls = Vec::<H256>::new();
 
 		let events = self
@@ -139,7 +139,7 @@ impl<
 			.ok_or_else(|| Error::Other("Could not create events from metadata".into()))?;
 
 		let xt_statuses = events.get_extrinsic_statuses()?;
-		debug!("xt_statuses:: {:?}", xt_statuses);
+		trace!("xt_statuses:: {:?}", xt_statuses);
 
 		// This would be catastrophic but should never happen
 		if xt_statuses.len() != block.extrinsics().len() {
@@ -169,7 +169,7 @@ impl<
 				executed_calls.push(hash_of(&call));
 			}
 		}
-
+		debug!("successfully processed {} indirect invocations", executed_calls.len());
 		// Include a processed parentchain block confirmation for each block.
 		self.create_processed_parentchain_block_call::<ParentchainBlock>(
 			block_hash,
@@ -190,9 +190,17 @@ impl<
 		let call = self.node_meta_data_provider.get_from_metadata(|meta_data| {
 			meta_data.confirm_processed_parentchain_block_call_indexes()
 		})??;
-
 		let root: H256 = merkle_root::<Keccak256, _>(extrinsics);
-		Ok(OpaqueCall::from_tuple(&(call, block_hash, block_number, root)))
+		let mrenclave = self.stf_enclave_signer.ocall_api.get_mr
+		let shard = self.top_pool_author.get_shards().get(0).unwrap_or(),
+		trace!("prepared confirm_processed_parentchain_block() call for block {:?} with index {:?} and merkle root {}", block_number, call, root);
+		Ok(OpaqueCall::from_tuple(&(
+			call,
+			shard,
+			block_hash,
+			block_number,
+			root,
+		)))
 	}
 }
 
@@ -257,7 +265,7 @@ pub(crate) fn hash_of<T: Encode>(xt: &T) -> H256 {
 mod test {
 	use super::*;
 	use crate::{
-		filter_metadata::{ShieldFundsAndCallWorkerFilter, TestEventCreator},
+		filter_metadata::{ShieldFundsAndInvokeFilter, TestEventCreator},
 		parentchain_parser::ParentchainExtrinsicParser,
 	};
 	use codec::{Decode, Encode};
@@ -291,7 +299,7 @@ mod test {
 		TestStfEnclaveSigner,
 		TestTopPoolAuthor,
 		TestNodeMetadataRepository,
-		ShieldFundsAndCallWorkerFilter<ParentchainExtrinsicParser>,
+		ShieldFundsAndInvokeFilter<ParentchainExtrinsicParser>,
 		TestEventCreator,
 	>;
 

core/parentchain/indirect-calls-executor/src/filter_metadata.rs

@@ -96,12 +96,12 @@ impl FilterIntoDataFrom<NodeMetadata> for DenyAll {
 }
 
 /// Default filter we use for the Integritee-Parachain.
-pub struct ShieldFundsAndCallWorkerFilter<ExtrinsicParser> {
+pub struct ShieldFundsAndInvokeFilter<ExtrinsicParser> {
 	_phantom: PhantomData<ExtrinsicParser>,
 }
 
 impl<ExtrinsicParser, NodeMetadata: NodeMetadataTrait> FilterIntoDataFrom<NodeMetadata>
-	for ShieldFundsAndCallWorkerFilter<ExtrinsicParser>
+	for ShieldFundsAndInvokeFilter<ExtrinsicParser>
 where
 	ExtrinsicParser: ParseExtrinsic,
 {
@@ -123,14 +123,15 @@ where
 				return None
 			},
 		};
-
 		let index = xt.call_index;
 		let call_args = &mut &xt.call_args[..];
-
+		log::trace!("attempting to execute indirect call with index {:?}", index);
 		if index == metadata.shield_funds_call_indexes().ok()? {
+			log::trace!("executing shield funds call");
 			let args = decode_and_log_error::<ShieldFundsArgs>(call_args)?;
 			Some(IndirectCall::ShieldFunds(args))
 		} else if index == metadata.invoke_call_indexes().ok()? {
+			log::trace!("executing invoke call");
 			let args = decode_and_log_error::<InvokeArgs>(call_args)?;
 			Some(IndirectCall::Invoke(args))
 		} else {

core/parentchain/indirect-calls-executor/src/indirect_calls/mod.rs

@@ -15,8 +15,8 @@
 
 */
 
-mod call_worker;
+mod invoke;
 mod shield_funds;
 
-pub use call_worker::InvokeArgs;
+pub use invoke::InvokeArgs;
 pub use shield_funds::ShieldFundsArgs;

enclave-runtime/src/attestation.rs

@@ -199,7 +199,7 @@ pub fn generate_dcap_ra_extrinsic_internal(
 		skip_ra,
 	)?;
 
-	if skip_ra {
+	if !skip_ra {
 		generate_dcap_ra_extrinsic_from_quote_internal(url, &dcap_quote)
 	} else {
 		generate_dcap_skip_ra_extrinsic_from_quote_internal(url, &dcap_quote)
@@ -333,7 +333,7 @@ fn generate_ias_ra_extrinsic_internal(
 	let attestation_handler = GLOBAL_ATTESTATION_HANDLER_COMPONENT.get()?;
 	let cert_der = attestation_handler.generate_ias_ra_cert(skip_ra)?;
 
-	if skip_ra {
+	if !skip_ra {
 		generate_ias_ra_extrinsic_from_der_cert_internal(url, &cert_der)
 	} else {
 		generate_ias_skip_ra_extrinsic_from_der_cert_internal(url, &cert_der)

enclave-runtime/src/initialization/global_components.rs

@@ -41,7 +41,7 @@ use itc_parentchain::{
 	},
 	block_importer::ParentchainBlockImporter,
 	indirect_calls_executor::{
-		filter_metadata::{EventCreator, ShieldFundsAndCallWorkerFilter},
+		filter_metadata::{EventCreator, ShieldFundsAndInvokeFilter},
 		parentchain_parser::ParentchainExtrinsicParser,
 		IndirectCallsExecutor,
 	},
@@ -140,7 +140,7 @@ pub type EnclaveIndirectCallsExecutor = IndirectCallsExecutor<
 	EnclaveStfEnclaveSigner,
 	EnclaveTopPoolAuthor,
 	EnclaveNodeMetadataRepository,
-	ShieldFundsAndCallWorkerFilter<ParentchainExtrinsicParser>,
+	ShieldFundsAndInvokeFilter<ParentchainExtrinsicParser>,
 	EventCreator,
 >;
 pub type EnclaveValidatorAccessor = ValidatorAccessor<

enclave-runtime/src/test/top_pool_tests.rs

@@ -34,7 +34,7 @@ use ita_stf::{
 	TrustedCall, TrustedOperation,
 };
 use itc_parentchain::indirect_calls_executor::{
-	filter_metadata::{ShieldFundsAndCallWorkerFilter, TestEventCreator},
+	filter_metadata::{ShieldFundsAndInvokeFilter, TestEventCreator},
 	parentchain_parser::ParentchainExtrinsicParser,
 	ExecuteIndirectCalls, IndirectCallsExecutor,
 };
@@ -134,7 +134,7 @@ pub fn submit_shielding_call_to_top_pool() {
 			_,
 			_,
 			_,
-			ShieldFundsAndCallWorkerFilter<ParentchainExtrinsicParser>,
+			ShieldFundsAndInvokeFilter<ParentchainExtrinsicParser>,
 			TestEventCreator,
 		>::new(
 			shielding_key_repo, enclave_signer, top_pool_author.clone(), node_meta_data_repository

service/src/account_funding.rs

@@ -135,14 +135,12 @@ fn bootstrap_funds_from_alice(
 	funding_amount: u128,
 ) -> Result<(), Error> {
 	let alice = AccountKeyring::Alice.pair();
-	info!("encoding Alice's public 	= {:?}", alice.public().0.encode());
 	let alice_acc = AccountId32::from(*alice.public().as_array_ref());
-	info!("encoding Alice's AccountId = {:?}", alice_acc.encode());
 
 	let alice_free = api.get_free_balance(&alice_acc)?;
-	info!("    Alice's free balance = {:?}", alice_free);
+	trace!("    Alice's free balance = {:?}", alice_free);
 	let nonce = api.get_nonce_of(&alice_acc)?;
-	info!("    Alice's Account Nonce is {}", nonce);
+	trace!("    Alice's Account Nonce is {}", nonce);
 
 	if funding_amount > alice_free {
 		println!(
@@ -165,7 +163,7 @@ fn bootstrap_funds_from_alice(
 	);
 	// Verify funds have arrived.
 	let free_balance = alice_signer_api.get_free_balance(accountid);
-	info!("TEE's NEW free balance = {:?}", free_balance);
+	trace!("TEE's NEW free balance = {:?}", free_balance);
 
 	Ok(())
 }

service/src/setup.rs

@@ -54,10 +54,10 @@ pub(crate) fn initialize_shard_and_keys(
 pub(crate) fn init_shard(enclave: &Enclave, shard_identifier: &ShardIdentifier) {
 	match enclave.init_shard(shard_identifier.encode()) {
 		Err(e) => {
-			println!("Failed to initialize shard {:?}: {:?}", shard_identifier, e);
+			println!("Failed to initialize shard {:?}: {:?}", shard_identifier.to_base58(), e);
 		},
 		Ok(_) => {
-			println!("Successfully initialized shard {:?}", shard_identifier);
+			println!("Successfully initialized shard {:?}", shard_identifier.to_base58());
 		},
 	}
 }