implement per-parentchain extrinsic factory and metadata

Cargo.lock

@@ -2875,6 +2875,7 @@ dependencies = [
  "hex",
  "integritee-node-runtime",
  "ipfs-api",
+ "ita-parentchain-interface",
  "itc-parentchain",
  "itc-parentchain-test",
  "itc-rest-client",
@@ -3010,6 +3011,7 @@ dependencies = [
  "bs58",
  "env_logger",
  "frame-support",
+ "frame-system",
  "futures 0.3.28",
  "futures 0.3.8",
  "ita-sgx-runtime",
@@ -3029,6 +3031,7 @@ dependencies = [
  "itp-utils",
  "log 0.4.19",
  "parity-scale-codec",
+ "scale-info",
  "sgx_tstd",
  "sgx_types",
  "sp-core",
@@ -3424,6 +3427,7 @@ version = "0.9.0"
 dependencies = [
  "integritee-node-runtime",
  "itp-types",
+ "parity-scale-codec",
  "sp-core",
  "sp-runtime",
  "substrate-api-client",
@@ -3536,6 +3540,7 @@ dependencies = [
  "itp-node-api",
  "itp-nonce-cache",
  "itp-types",
+ "itp-utils",
  "log 0.4.19",
  "parity-scale-codec",
  "sgx_tstd",
@@ -3586,6 +3591,7 @@ dependencies = [
 name = "itp-node-api-factory"
 version = "0.9.0"
 dependencies = [
+ "itp-api-client-extensions",
  "itp-api-client-types",
  "sp-core",
  "thiserror 1.0.40",

app-libs/parentchain-interface/Cargo.toml

@@ -40,8 +40,10 @@ log = { version = "0.4", default-features = false }
 # substrate dep
 binary-merkle-tree = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
 frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
+frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
 sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
+scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
 
 [dev-dependencies]
 env_logger = "0.9.0"
@@ -75,9 +77,11 @@ std = [
     "log/std",
     #substrate
     "binary-merkle-tree/std",
+    "scale-info/std",
     "sp-core/std",
     "sp-runtime/std",
     "frame-support/std",
+    "frame-system/std",
     "thiserror",
 ]
 sgx = [

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

@@ -14,12 +14,141 @@
 	limitations under the License.
 
 */
-
 use codec::{Decode, Encode};
 use core::marker::PhantomData;
+use itp_api_client_types::traits::ExtrinsicParamsAdjustments;
 use itp_node_api::api_client::{
-	Address, CallIndex, PairSignature, ParentchainSignedExtra, Signature, UncheckedExtrinsicV4,
+	Address, CallIndex, DefaultRuntimeConfig, ExtrinsicParams, GenericAdditionalSigned,
+	GenericExtrinsicParams, PairSignature, Signature, UncheckedExtrinsicV4,
 };
+use itp_types::parentchain::{Balance, Hash, Index};
+use sp_runtime::generic::Era;
+
+// re-export integritee network types
+pub use itp_node_api::api_client::{ParentchainTip, Signature as ParentchainSignature};
+
+#[derive(Decode, Encode, Clone, Eq, PartialEq, Debug)]
+pub struct ParentchainExtrinsicParams {
+	era: Era,
+	nonce: Index,
+	tip: ParentchainTip,
+	spec_version: u32,
+	transaction_version: u32,
+	genesis_hash: Hash,
+	mortality_checkpoint: Hash,
+}
+
+#[derive(Decode, Encode, Copy, Clone, Eq, PartialEq, Debug)]
+pub struct ParentchainAdditionalParams {
+	era: Era,
+	mortality_checkpoint: Option<Hash>,
+	tip: ParentchainTip,
+}
+impl Default for ParentchainAdditionalParams {
+	fn default() -> Self {
+		Self { era: Era::Immortal, mortality_checkpoint: None, tip: ParentchainTip::default() }
+	}
+}
+
+#[derive(Decode, Encode, Copy, Clone, Eq, PartialEq, Debug)]
+pub struct ParentchainSignedExtra {
+	pub era: Era,
+	#[codec(compact)]
+	pub nonce: Index,
+	pub tip: ParentchainTip,
+}
+
+pub type ParentchainAdditionalSigned = ((), u32, u32, Hash, Hash, (), (), ());
+
+impl ExtrinsicParams<Index, Hash> for ParentchainExtrinsicParams {
+	type AdditionalParams = ParentchainAdditionalParams;
+	type SignedExtra = ParentchainSignedExtra;
+	type AdditionalSigned = ParentchainAdditionalSigned;
+
+	fn new(
+		spec_version: u32,
+		transaction_version: u32,
+		nonce: Index,
+		genesis_hash: Hash,
+		additional_params: Self::AdditionalParams,
+	) -> Self {
+		Self {
+			era: additional_params.era,
+			tip: additional_params.tip,
+			spec_version,
+			transaction_version,
+			genesis_hash,
+			mortality_checkpoint: additional_params.mortality_checkpoint.unwrap_or(genesis_hash),
+			nonce,
+		}
+	}
+
+	fn signed_extra(&self) -> Self::SignedExtra {
+		Self::SignedExtra { era: self.era, nonce: self.nonce, tip: self.tip }
+	}
+
+	fn additional_signed(&self) -> Self::AdditionalSigned {
+		(
+			(),
+			self.spec_version,
+			self.transaction_version,
+			self.genesis_hash,
+			self.mortality_checkpoint,
+			(),
+			(),
+			(),
+		)
+	}
+}
+
+impl ExtrinsicParamsAdjustments<ParentchainAdditionalParams> for ParentchainExtrinsicParams {
+	fn with_nonce(&self, nonce: Index) -> Self {
+		Self {
+			era: self.era,
+			tip: self.tip,
+			spec_version: self.spec_version,
+			transaction_version: self.transaction_version,
+			genesis_hash: self.genesis_hash,
+			mortality_checkpoint: self.mortality_checkpoint,
+			nonce,
+		}
+	}
+	fn with_additional_params(&self, additional_params: ParentchainAdditionalParams) -> Self {
+		Self {
+			era: additional_params.era,
+			tip: additional_params.tip,
+			spec_version: self.spec_version,
+			transaction_version: self.transaction_version,
+			genesis_hash: self.genesis_hash,
+			mortality_checkpoint: additional_params
+				.mortality_checkpoint
+				.unwrap_or(self.genesis_hash),
+			nonce: self.nonce,
+		}
+	}
+	fn with_spec_version(&self, spec_version: u32) -> Self {
+		Self {
+			era: self.era,
+			tip: self.tip,
+			spec_version,
+			transaction_version: self.transaction_version,
+			genesis_hash: self.genesis_hash,
+			mortality_checkpoint: self.mortality_checkpoint,
+			nonce: self.nonce,
+		}
+	}
+	fn with_transaction_version(&self, transaction_version: u32) -> Self {
+		Self {
+			era: self.era,
+			tip: self.tip,
+			spec_version: self.spec_version,
+			transaction_version,
+			genesis_hash: self.genesis_hash,
+			mortality_checkpoint: self.mortality_checkpoint,
+			nonce: self.nonce,
+		}
+	}
+}
 
 pub struct ExtrinsicParser<SignedExtra> {
 	_phantom: PhantomData<SignedExtra>,

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

@@ -27,7 +27,10 @@ use codec::{Decode, Encode};
 use core::marker::PhantomData;
 pub use event_filter::FilterableEvents;
 pub use event_handler::ParentchainEventHandler;
-pub use extrinsic_parser::ParentchainExtrinsicParser;
+pub use extrinsic_parser::{
+	ParentchainAdditionalParams, ParentchainAdditionalSigned, ParentchainExtrinsicParams,
+	ParentchainExtrinsicParser, ParentchainSignedExtra,
+};
 use ita_stf::TrustedCallSigned;
 use itc_parentchain_indirect_calls_executor::{
 	error::{Error, Result},

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

@@ -17,10 +17,153 @@
 
 use codec::{Decode, Encode};
 use core::marker::PhantomData;
+use frame_support::{
+	pallet_prelude::TypeInfo,
+	traits::{CrateVersion, PalletInfo},
+	weights::constants::RocksDbWeight,
+	RuntimeDebug,
+};
+use ita_sgx_runtime::{BlockHashCount, RuntimeCall, RuntimeEvent, RuntimeOrigin, Version};
 use itp_node_api::api_client::{
-	Address, CallIndex, PairSignature, ParentchainSignedExtra, Signature, UncheckedExtrinsicV4,
+	traits::ExtrinsicParamsAdjustments, Address, AssetTip, CallIndex, ExtrinsicParams,
+	GenericExtrinsicParams, PairSignature, Signature, UncheckedExtrinsicV4,
+};
+use sp_runtime::{
+	generic::Era,
+	traits::{AccountIdLookup, BlakeTwo256},
 };
 
+use itp_types::parentchain::{AccountId, Balance, BlockNumber, Hash, Header, Index};
+
+// re-export integritee network types
+pub use itp_node_api::api_client::Signature as ParentchainSignature;
+
+// define custom properties for Asset Hub
+pub type ParentchainTip = AssetTip<Balance>;
+
+#[derive(Decode, Encode, Clone, Eq, PartialEq, Debug)]
+pub struct ParentchainExtrinsicParams {
+	era: Era,
+	nonce: Index,
+	tip: ParentchainTip,
+	spec_version: u32,
+	transaction_version: u32,
+	genesis_hash: Hash,
+	mortality_checkpoint: Hash,
+}
+
+#[derive(Decode, Encode, Copy, Clone, Eq, PartialEq, Debug)]
+pub struct ParentchainAdditionalParams {
+	era: Era,
+	mortality_checkpoint: Option<Hash>,
+	tip: ParentchainTip,
+}
+impl Default for ParentchainAdditionalParams {
+	fn default() -> Self {
+		Self { era: Era::Immortal, mortality_checkpoint: None, tip: ParentchainTip::default() }
+	}
+}
+
+#[derive(Decode, Encode, Copy, Clone, Eq, PartialEq, Debug)]
+pub struct ParentchainSignedExtra {
+	pub era: Era,
+	#[codec(compact)]
+	pub nonce: Index,
+	pub tip: ParentchainTip,
+}
+
+pub type ParentchainAdditionalSigned = ((), u32, u32, Hash, Hash, (), (), ());
+
+impl ExtrinsicParams<Index, Hash> for ParentchainExtrinsicParams {
+	type AdditionalParams = ParentchainAdditionalParams;
+	type SignedExtra = ParentchainSignedExtra;
+	type AdditionalSigned = ParentchainAdditionalSigned;
+
+	fn new(
+		spec_version: u32,
+		transaction_version: u32,
+		nonce: Index,
+		genesis_hash: Hash,
+		additional_params: Self::AdditionalParams,
+	) -> Self {
+		Self {
+			era: additional_params.era,
+			tip: additional_params.tip,
+			spec_version,
+			transaction_version,
+			genesis_hash,
+			mortality_checkpoint: additional_params.mortality_checkpoint.unwrap_or(genesis_hash),
+			nonce,
+		}
+	}
+
+	fn signed_extra(&self) -> Self::SignedExtra {
+		Self::SignedExtra { era: self.era, nonce: self.nonce, tip: self.tip }
+	}
+
+	fn additional_signed(&self) -> Self::AdditionalSigned {
+		(
+			(),
+			self.spec_version,
+			self.transaction_version,
+			self.genesis_hash,
+			self.mortality_checkpoint,
+			(),
+			(),
+			(),
+		)
+	}
+}
+
+impl ExtrinsicParamsAdjustments<ParentchainAdditionalParams> for ParentchainExtrinsicParams {
+	fn with_nonce(&self, nonce: Index) -> Self {
+		Self {
+			era: self.era,
+			tip: self.tip,
+			spec_version: self.spec_version,
+			transaction_version: self.transaction_version,
+			genesis_hash: self.genesis_hash,
+			mortality_checkpoint: self.mortality_checkpoint,
+			nonce,
+		}
+	}
+	fn with_additional_params(&self, additional_params: ParentchainAdditionalParams) -> Self {
+		Self {
+			era: additional_params.era,
+			tip: additional_params.tip,
+			spec_version: self.spec_version,
+			transaction_version: self.transaction_version,
+			genesis_hash: self.genesis_hash,
+			mortality_checkpoint: additional_params
+				.mortality_checkpoint
+				.unwrap_or(self.genesis_hash),
+			nonce: self.nonce,
+		}
+	}
+	fn with_spec_version(&self, spec_version: u32) -> Self {
+		Self {
+			era: self.era,
+			tip: self.tip,
+			spec_version,
+			transaction_version: self.transaction_version,
+			genesis_hash: self.genesis_hash,
+			mortality_checkpoint: self.mortality_checkpoint,
+			nonce: self.nonce,
+		}
+	}
+	fn with_transaction_version(&self, transaction_version: u32) -> Self {
+		Self {
+			era: self.era,
+			tip: self.tip,
+			spec_version: self.spec_version,
+			transaction_version,
+			genesis_hash: self.genesis_hash,
+			mortality_checkpoint: self.mortality_checkpoint,
+			nonce: self.nonce,
+		}
+	}
+}
+
 pub struct ExtrinsicParser<SignedExtra> {
 	_phantom: PhantomData<SignedExtra>,
 }

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

@@ -27,8 +27,11 @@ use codec::{Decode, Encode};
 use core::marker::PhantomData;
 pub use event_filter::FilterableEvents;
 pub use event_handler::ParentchainEventHandler;
-pub use extrinsic_parser::ParentchainExtrinsicParser;
 use extrinsic_parser::ParseExtrinsic;
+pub use extrinsic_parser::{
+	ParentchainAdditionalParams, ParentchainAdditionalSigned, ParentchainExtrinsicParams,
+	ParentchainExtrinsicParser, ParentchainSignedExtra,
+};
 use ita_stf::TrustedCallSigned;
 use itc_parentchain_indirect_calls_executor::{
 	error::{Error, Result},