Refactor indirect executor: make interpetation of parentchain extrinsics configurable

core-primitives/node-api/api-client-types/Cargo.toml

@@ -10,13 +10,13 @@ edition = "2021"
 substrate-api-client = { default-features = false, git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.37-tag-v0.7.0" }
 
 # substrate
-sp-core = { optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" }
+sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" }
 
 
 [features]
 default = ["std"]
 std = [
     "substrate-api-client/std",
     "substrate-api-client/ws-client",
-    "sp-core",
+    "sp-core/std",
 ]

core-primitives/node-api/api-client-types/src/lib.rs

@@ -22,9 +22,11 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+use sp_core::{Decode, Encode};
+
 pub use substrate_api_client::{
-	PlainTip, PlainTipExtrinsicParams, PlainTipExtrinsicParamsBuilder, SubstrateDefaultSignedExtra,
-	UncheckedExtrinsicV4,
+	CallIndex, PlainTip, PlainTipExtrinsicParams, PlainTipExtrinsicParamsBuilder,
+	SubstrateDefaultSignedExtra, UncheckedExtrinsicV4,
 };
 
 /// Configuration for the ExtrinsicParams.
@@ -42,6 +44,30 @@ pub type ParentchainExtrinsicParamsBuilder = PlainTipExtrinsicParamsBuilder;
 pub type ParentchainUncheckedExtrinsic<Call> =
 	UncheckedExtrinsicV4<Call, SubstrateDefaultSignedExtra<PlainTip>>;
 
+/// Trait to extract call indexes of an encoded [UncheckedExtrinsicV4].
+///
+/// This needs an extra trait as the call indexes are not always in the same
+/// position because the multisignature enum variants have different encoded
+/// lengths.
+pub trait ExtractCallIndex {
+	fn extract_call_index(encode_call: &mut &[u8]) -> Option<CallIndex>;
+}
+
+impl<Call, SignedExtra> ExtractCallIndex for UncheckedExtrinsicV4<Call, SignedExtra>
+where
+	Call: Decode + Encode,
+	SignedExtra: Decode + Encode,
+{
+	/// Extract a call index of an encoded call.
+	///
+	/// Note: This mutates the slice. It will prune the `signature` field and the call
+	/// index of the `encoded_call`. Only the dispatchable's arguments are remaining.
+	fn extract_call_index(encoded_call: &mut &[u8]) -> Option<[u8; 2]> {
+		let xt = UncheckedExtrinsicV4::<(CallIndex, ()), SignedExtra>::decode(encoded_call).ok()?;
+		Some(xt.function.0)
+	}
+}
+
 #[cfg(feature = "std")]
 pub use api::*;
 

core/parentchain/indirect-calls-executor/Cargo.toml

@@ -42,6 +42,7 @@ substrate-api-client = { git = "https://github.com/scs/substrate-api-client.git"
 
 [dev-dependencies]
 env_logger = "0.9.0"
+itp-node-api = { path = "../../../core-primitives/node-api", features = ["mocks"] }
 itp-sgx-crypto = { path = "../../../core-primitives/sgx/crypto", features = ["mocks"] }
 itp-stf-executor = { path = "../../../core-primitives/stf-executor", features = ["mocks"] }
 itp-test = { path = "../../../core-primitives/test" }