custom dependencies on parentchain runtimes to decode L1 Events

Cargo.toml

@@ -70,6 +70,7 @@ members = [
     "sidechain/state",
     "sidechain/validateer-fetch",
 ]
+resolver = "2"
 
 [patch."https://github.com/apache/teaclave-sgx-sdk.git"]
 sgx_alloc = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "master" }

app-libs/parentchain-interface/Cargo.toml

@@ -11,6 +11,7 @@ sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sd
 # local dependencies
 ita-sgx-runtime = { path = "../sgx-runtime", default-features = false }
 ita-stf = { path = "../stf", default-features = false }
+itc-parentchain = { path = "../../core/parentchain/parentchain-crate", default-features = false }
 itc-parentchain-indirect-calls-executor = { path = "../../core/parentchain/indirect-calls-executor", default-features = false }
 itp-api-client-types = { path = "../../core-primitives/node-api/api-client-types", default-features = false }
 itp-node-api = { path = "../../core-primitives/node-api", default-features = false }
@@ -22,6 +23,13 @@ itp-utils = { path = "../../core-primitives/utils", default-features = false }
 bs58 = { version = "0.4.0", default-features = false, features = ["alloc"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 log = { version = "0.4", default-features = false }
+regex = { optional = true, version = "1.9.5" }
+
+integritee-parachain-runtime = { package = "integritee-runtime", git = "https://github.com/integritee-network/parachain", branch = "sdk-v0.12.6-polkadot-v0.9.42", default-features = false, optional = true }
+integritee-solochain-runtime = { package = "integritee-node-runtime", git = "https://github.com/integritee-network/integritee-node.git/", branch = "sdk-v0.12.6-polkadot-v0.9.42", default-features = false, optional = true }
+
+substrate-api-client = { optional = true, default-features = false, features = ["std", "sync-api"], git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.42-tag-v0.14.0" }
+
 
 # substrate dep
 sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
@@ -44,6 +52,7 @@ std = [
     "codec/std",
     "ita-sgx-runtime/std",
     "ita-stf/std",
+    "itc-parentchain/std",
     "itc-parentchain-indirect-calls-executor/std",
     "itp-api-client-types/std",
     "itp-node-api/std",
@@ -54,9 +63,12 @@ std = [
     "itp-types/std",
     "itp-utils/std",
     "log/std",
-    #substrate
+    "regex",
     "sp-core/std",
     "sp-runtime/std",
+    "substrate-api-client",
+    "integritee-parachain-runtime/std",
+    "integritee-solochain-runtime/std",
 ]
 sgx = [
     "sgx_tstd",

app-libs/parentchain-interface/src/integritee/event_subscriber.rs

@@ -0,0 +1,32 @@
+use crate::print_events;
+use itc_parentchain::primitives::ParentchainInitParams;
+use itp_api_client_types::ParentchainApi;
+use substrate_api_client::SubscribeEvents;
+
+const PARENTCHAIN_NAME: &str = "Integritee";
+pub fn subscribe_to_parentchain_events(
+	api: &ParentchainApi,
+	parentchain_init_params: ParentchainInitParams,
+) {
+	println!("[L1Event:{}] Subscribing to events", PARENTCHAIN_NAME);
+	let mut subscription = api.subscribe_events().unwrap();
+	loop {
+		if parentchain_init_params.is_parachain() {
+			if let Some(Ok(events)) =
+				subscription.next_events::<super::parachain::RuntimeEvent, super::parachain::Hash>()
+			{
+				print_events::<super::parachain::RuntimeEvent, super::parachain::Hash>(
+					events,
+					format!("[L1Event:{}Para]", PARENTCHAIN_NAME),
+				)
+			}
+		} else if let Some(Ok(events)) =
+			subscription.next_events::<super::solochain::RuntimeEvent, super::solochain::Hash>()
+		{
+			print_events::<super::solochain::RuntimeEvent, super::solochain::Hash>(
+				events,
+				format!("[L1Event:{}Solo]", PARENTCHAIN_NAME),
+			)
+		}
+	}
+}

app-libs/parentchain-interface/src/integritee/mod.rs

@@ -17,7 +17,10 @@
 
 mod event_filter;
 mod event_handler;
+#[cfg(feature = "std")]
+pub mod event_subscriber;
 mod extrinsic_parser;
+
 use crate::{
 	decode_and_log_error,
 	indirect_calls::{invoke::InvokeArgs, shield_funds::ShieldFundsArgs},
@@ -37,6 +40,22 @@ use itc_parentchain_indirect_calls_executor::{
 use itp_node_api::metadata::NodeMetadataTrait;
 use itp_stf_primitives::traits::IndirectExecutor;
 use log::trace;
+
+#[cfg(feature = "std")]
+pub mod parachain {
+	pub use integritee_parachain_runtime::{
+		pallet_teeracle, AccountId, Balance, BalancesCall, Block, Hash, Header, Runtime,
+		RuntimeCall, RuntimeEvent, Signature, UncheckedExtrinsic,
+	};
+}
+#[cfg(feature = "std")]
+pub mod solochain {
+	pub use integritee_solochain_runtime::{
+		pallet_teeracle, AccountId, Balance, BalancesCall, Block, Hash, Header, Runtime,
+		RuntimeCall, RuntimeEvent, Signature, UncheckedExtrinsic,
+	};
+}
+
 /// The default indirect call (extrinsic-triggered) of the Integritee-Parachain.
 #[derive(Debug, Clone, Encode, Decode, Eq, PartialEq)]
 pub enum IndirectCall {

app-libs/parentchain-interface/src/lib.rs

@@ -22,6 +22,10 @@
 extern crate sgx_tstd as std;
 
 use codec::Decode;
+#[cfg(feature = "std")]
+use regex::Regex;
+#[cfg(feature = "std")]
+use substrate_api_client::ac_node_api::{EventRecord, Phase::ApplyExtrinsic};
 
 pub mod indirect_calls;
 pub mod integritee;
@@ -37,3 +41,23 @@ pub fn decode_and_log_error<V: Decode>(encoded: &mut &[u8]) -> Option<V> {
 		},
 	}
 }
+
+#[cfg(feature = "std")]
+/// trims Debug fmt output for events to be easily readable on logs
+pub fn trim_event(event: String) -> String {
+	let re = Regex::new(r"\s[0-9a-f]*\s\(").unwrap();
+	re.replace_all(&event, "(").replace("RuntimeEvent::", "").replace("Event::", "")
+}
+#[cfg(feature = "std")]
+fn print_events<R, H>(events: Vec<EventRecord<R, H>>, prefix: String)
+where
+	R: core::fmt::Debug,
+{
+	for evr in &events {
+		if evr.phase == ApplyExtrinsic(0) {
+			// not interested in intrinsics
+			continue
+		}
+		println!("{} {}", prefix, trim_event(format!("{:?}", evr.event)));
+	}
+}

app-libs/parentchain-interface/src/target_a/event_subscriber.rs

@@ -0,0 +1,32 @@
+use crate::print_events;
+use itc_parentchain::primitives::ParentchainInitParams;
+use itp_api_client_types::ParentchainApi;
+use substrate_api_client::SubscribeEvents;
+
+const PARENTCHAIN_NAME: &str = "TargetA";
+pub fn subscribe_to_parentchain_events(
+	api: &ParentchainApi,
+	parentchain_init_params: ParentchainInitParams,
+) {
+	println!("[L1Event:{}] Subscribing to events", PARENTCHAIN_NAME);
+	let mut subscription = api.subscribe_events().unwrap();
+	loop {
+		if parentchain_init_params.is_parachain() {
+			if let Some(Ok(events)) =
+				subscription.next_events::<super::parachain::RuntimeEvent, super::parachain::Hash>()
+			{
+				print_events::<super::parachain::RuntimeEvent, super::parachain::Hash>(
+					events,
+					format!("[L1Event:{}Para]", PARENTCHAIN_NAME),
+				)
+			}
+		} else if let Some(Ok(events)) =
+			subscription.next_events::<super::solochain::RuntimeEvent, super::solochain::Hash>()
+		{
+			print_events::<super::solochain::RuntimeEvent, super::solochain::Hash>(
+				events,
+				format!("[L1Event:{}Solo]", PARENTCHAIN_NAME),
+			)
+		}
+	}
+}

app-libs/parentchain-interface/src/target_a/mod.rs

@@ -17,6 +17,10 @@
 mod event_filter;
 mod event_handler;
 mod extrinsic_parser;
+
+#[cfg(feature = "std")]
+pub mod event_subscriber;
+
 use crate::{
 	decode_and_log_error,
 	indirect_calls::{
@@ -29,6 +33,10 @@ pub use event_filter::FilterableEvents;
 pub use event_handler::ParentchainEventHandler;
 pub use extrinsic_parser::ParentchainExtrinsicParser;
 use extrinsic_parser::ParseExtrinsic;
+#[cfg(feature = "std")]
+pub use integritee_parachain_runtime::{
+	Block, Hash, Header, Runtime, RuntimeCall, RuntimeEvent, UncheckedExtrinsic,
+};
 use ita_stf::TrustedCallSigned;
 use itc_parentchain_indirect_calls_executor::{
 	error::{Error, Result},
@@ -39,6 +47,21 @@ use itp_node_api::metadata::pallet_balances::BalancesCallIndexes;
 use itp_stf_primitives::traits::IndirectExecutor;
 use log::{debug, trace};
 
+#[cfg(feature = "std")]
+pub mod parachain {
+	pub use integritee_parachain_runtime::{
+		AccountId, Balance, BalancesCall, Block, Hash, Header, Runtime, RuntimeCall, RuntimeEvent,
+		Signature, UncheckedExtrinsic,
+	};
+}
+#[cfg(feature = "std")]
+pub mod solochain {
+	pub use integritee_solochain_runtime::{
+		AccountId, Balance, BalancesCall, Block, Hash, Header, Runtime, RuntimeCall, RuntimeEvent,
+		Signature, UncheckedExtrinsic,
+	};
+}
+
 /// The default indirect call (extrinsic-triggered) of the Target-A-Parachain.
 #[derive(Debug, Clone, Encode, Decode, Eq, PartialEq)]
 pub enum IndirectCall {

app-libs/parentchain-interface/src/target_b/event_subscriber.rs

@@ -0,0 +1,32 @@
+use crate::print_events;
+use itc_parentchain::primitives::ParentchainInitParams;
+use itp_api_client_types::ParentchainApi;
+use substrate_api_client::SubscribeEvents;
+
+const PARENTCHAIN_NAME: &str = "TargetB";
+pub fn subscribe_to_parentchain_events(
+	api: &ParentchainApi,
+	parentchain_init_params: ParentchainInitParams,
+) {
+	println!("[L1Event:{}] Subscribing to events", PARENTCHAIN_NAME);
+	let mut subscription = api.subscribe_events().unwrap();
+	loop {
+		if parentchain_init_params.is_parachain() {
+			if let Some(Ok(events)) =
+				subscription.next_events::<super::parachain::RuntimeEvent, super::parachain::Hash>()
+			{
+				print_events::<super::parachain::RuntimeEvent, super::parachain::Hash>(
+					events,
+					format!("[L1Event:{}Para]", PARENTCHAIN_NAME),
+				)
+			}
+		} else if let Some(Ok(events)) =
+			subscription.next_events::<super::solochain::RuntimeEvent, super::solochain::Hash>()
+		{
+			print_events::<super::solochain::RuntimeEvent, super::solochain::Hash>(
+				events,
+				format!("[L1Event:{}Solo]", PARENTCHAIN_NAME),
+			)
+		}
+	}
+}

app-libs/parentchain-interface/src/target_b/mod.rs

@@ -15,26 +15,13 @@
 
 */
 
-/*
-	Copyright 2021 Integritee AG
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-
-*/
 mod event_filter;
 mod event_handler;
 mod extrinsic_parser;
 
+#[cfg(feature = "std")]
+pub mod event_subscriber;
+
 use codec::{Decode, Encode};
 use core::marker::PhantomData;
 pub use event_filter::FilterableEvents;
@@ -51,6 +38,21 @@ use itp_node_api::metadata::pallet_balances::BalancesCallIndexes;
 use itp_stf_primitives::traits::IndirectExecutor;
 use log::error;
 
+#[cfg(feature = "std")]
+pub mod parachain {
+	pub use integritee_parachain_runtime::{
+		AccountId, Balance, BalancesCall, Block, Hash, Header, Runtime, RuntimeCall, RuntimeEvent,
+		Signature, UncheckedExtrinsic,
+	};
+}
+#[cfg(feature = "std")]
+pub mod solochain {
+	pub use integritee_solochain_runtime::{
+		AccountId, Balance, BalancesCall, Block, Hash, Header, Runtime, RuntimeCall, RuntimeEvent,
+		Signature, UncheckedExtrinsic,
+	};
+}
+
 /// The default indirect call (extrinsic-triggered) of the Target-A-Parachain.
 #[derive(Debug, Clone, Encode, Decode, Eq, PartialEq)]
 pub enum IndirectCall {}

app-libs/sgx-runtime/Cargo.toml

@@ -23,7 +23,6 @@ frame-system-benchmarking = { optional = true, default-features = false, git = "
 frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
 pallet-aura = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
 pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
-pallet-grandpa = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
 pallet-insecure-randomness-collective-flip = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
 pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
 pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }

cli/Cargo.toml

@@ -25,12 +25,14 @@ thiserror = "1.0"
 urlencoding = "2.1.3"
 
 # scs / integritee
-my-node-runtime = { package = "integritee-node-runtime", git = "https://github.com/integritee-network/integritee-node.git", branch = "sdk-v0.12.6-polkadot-v0.9.42" }
+enclave-bridge-primitives = { git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.6-polkadot-v0.9.42" }
+ita-parentchain-interface = { path = "../app-libs/parentchain-interface" }
 pallet-enclave-bridge = { git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.6-polkadot-v0.9.42" }
 pallet-evm = { optional = true, git = "https://github.com/integritee-network/frontier.git", branch = "bar/polkadot-v0.9.42" }
+pallet-sidechain = { git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.6-polkadot-v0.9.42" }
 pallet-teerex = { git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.6-polkadot-v0.9.42" }
+
 # `default-features = false` to remove the jsonrpsee dependency.
-enclave-bridge-primitives = { git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.6-polkadot-v0.9.42" }
 # disable unsupported jsonrpcsee
 substrate-api-client = { default-features = false, features = ["std", "sync-api"], git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.42-tag-v0.14.0" }
 substrate-client-keystore = { git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.42-tag-v0.14.0" }

cli/src/base_cli/commands/faucet.rs

@@ -19,7 +19,7 @@ use crate::{
 	command_utils::{get_accountid_from_str, get_chain_api},
 	Cli, CliResult, CliResultOk,
 };
-use my_node_runtime::{BalancesCall, RuntimeCall};
+use ita_parentchain_interface::integritee::parachain::{BalancesCall, RuntimeCall};
 use sp_keyring::AccountKeyring;
 use sp_runtime::MultiAddress;
 use std::vec::Vec;