fix: scale types for pending ceremonies

state-chain/pallets/cf-threshold-signature/src/lib.rs

@@ -18,9 +18,9 @@ mod response_status;
 use response_status::ResponseStatus;
 
 use codec::{Decode, Encode, MaxEncodedLen};
-use scale_info::TypeInfo;
+use scale_info::{build::Fields, Path, Type, TypeInfo};
 
-use cf_chains::ChainCrypto;
+use cf_chains::{Chain, ChainCrypto};
 use cf_primitives::{
 	AuthorityCount, CeremonyId, EpochIndex, ThresholdSignatureRequestId as RequestId,
 };
@@ -222,6 +222,7 @@ macro_rules! handle_key_ceremony_report {
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
+	use cf_chains::Chain;
 	use cf_primitives::FlipBalance;
 	use cf_traits::{
 		AccountRoleRegistry, AsyncResult, CfeMultisigRequest, ThresholdSignerNomination,
@@ -234,8 +235,7 @@ pub mod pallet {
 	};
 	use frame_system::ensure_none;
 	/// Context for tracking the progress of a threshold signature ceremony.
-	#[derive(Clone, RuntimeDebug, PartialEq, Eq, Encode, Decode, TypeInfo)]
-	#[scale_info(skip_type_params(T, I))]
+	#[derive(Clone, RuntimeDebug, PartialEq, Eq, Encode, Decode)]
 	pub struct CeremonyContext<T: Config<I>, I: 'static> {
 		pub request_context: RequestContext<T, I>,
 		/// The respondents that have yet to reply.
@@ -252,8 +252,7 @@ pub mod pallet {
 		pub threshold_ceremony_type: ThresholdCeremonyType,
 	}
 
-	#[derive(Clone, RuntimeDebug, PartialEq, Eq, Encode, Decode, TypeInfo)]
-	#[scale_info(skip_type_params(T, I))]
+	#[derive(Clone, RuntimeDebug, PartialEq, Eq, Encode, Decode)]
 	pub struct RequestContext<T: Config<I>, I: 'static> {
 		pub request_id: RequestId,
 		/// The number of ceremonies attempted so far, excluding the current one.
@@ -364,6 +363,8 @@ pub mod pallet {
 		/// A marker trait identifying the chain that we are signing for.
 		type TargetChainCrypto: ChainCrypto;
 
+		type TargetChain: Chain;
+
 		/// trait to activate chains that use this pallet's key
 		type VaultActivator: VaultActivator<Self::TargetChainCrypto>;
 
@@ -1199,6 +1200,66 @@ pub mod pallet {
 	}
 }
 
+macro_rules! append_chain_to_name {
+	($name:ident) => {
+		match T::TargetChain::NAME {
+			"Ethereum" => concat!(stringify!($name), "Ethereum"),
+			"Polkadot" => concat!(stringify!($name), "Polkadot"),
+			"Bitcoin" => concat!(stringify!($name), "Bitcoin"),
+			"Arbitrum" => concat!(stringify!($name), "Arbitrum"),
+			"Solana" => concat!(stringify!($name), "Solana"),
+			_ => concat!(stringify!($name), "Other"),
+		}
+	};
+}
+
+impl<T, I> TypeInfo for pallet::CeremonyContext<T, I>
+where
+	T: Config<I>,
+	I: 'static,
+{
+	type Identity = Self;
+	fn type_info() -> Type {
+		Type::builder()
+			.path(Path::new(append_chain_to_name!(CeremonyContext), module_path!()))
+			.composite(
+				Fields::named()
+					.field(|f| {
+						f.ty::<RequestContext<T, I>>().name(append_chain_to_name!(RequestContext))
+					})
+					.field(|f| f.ty::<BTreeSet<T::ValidatorId>>().name("remaining_respondents"))
+					.field(|f| {
+						f.ty::<BTreeMap<T::ValidatorId, AuthorityCount>>().name("blame_counts")
+					})
+					.field(|f| f.ty::<BTreeSet<T::ValidatorId>>().name("candidates"))
+					.field(|f| f.ty::<EpochIndex>().name("epoch"))
+					.field(|f| {
+						f.ty::<<T::TargetChainCrypto as ChainCrypto>::AggKey>()
+							.name(append_chain_to_name!(Key))
+					})
+					.field(|f| f.ty::<ThresholdCeremonyType>().name("threshold_ceremony_type")),
+			)
+	}
+}
+
+impl<T, I> TypeInfo for pallet::RequestContext<T, I>
+where
+	T: Config<I>,
+	I: 'static,
+{
+	type Identity = Self;
+	fn type_info() -> Type {
+		Type::builder()
+			.path(Path::new(append_chain_to_name!(RequestContext), module_path!()))
+			.composite(
+				Fields::named()
+					.field(|f| f.ty::<RequestId>().name("request_id"))
+					.field(|f| f.ty::<AttemptCount>().name("attempt_count"))
+					.field(|f| f.ty::<PayloadFor<T, I>>().name(append_chain_to_name!(PayloadFor))),
+			)
+	}
+}
+
 impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	/// Initiate a new signature request, returning the request id.
 	fn inner_request_signature(

state-chain/pallets/cf-threshold-signature/src/mock.rs

@@ -6,7 +6,7 @@ use crate::{
 };
 use cf_chains::{
 	mocks::{MockAggKey, MockEthereumChainCrypto, MockThresholdSignature},
-	ChainCrypto,
+	ChainCrypto, Ethereum,
 };
 use cf_primitives::{AuthorityCount, CeremonyId, FlipBalance, FLIPPERINOS_PER_FLIP, GENESIS_EPOCH};
 use cf_traits::{
@@ -174,6 +174,7 @@ impl pallet_cf_threshold_signature::Config<Instance1> for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type ThresholdCallable = MockCallback<MockEthereumChainCrypto>;
 	type TargetChainCrypto = MockEthereumChainCrypto;
+	type TargetChain = Ethereum;
 	type ThresholdSignerNomination = MockNominator;
 	type VaultActivator = MockVaultActivator;
 	type OffenceReporter = MockOffenceReporter;

state-chain/runtime/src/lib.rs

@@ -788,6 +788,7 @@ impl pallet_cf_threshold_signature::Config<Instance16> for Runtime {
 	type ThresholdCallable = RuntimeCall;
 	type ThresholdSignerNomination = chainflip::RandomSignerNomination;
 	type TargetChainCrypto = EvmCrypto;
+	type TargetChain = Arbitrum;
 	type VaultActivator = EvmVaultActivator<EthereumVault, ArbitrumVault>;
 	type OffenceReporter = Reputation;
 	type CeremonyRetryDelay = ConstU32<1>;
@@ -804,6 +805,7 @@ impl pallet_cf_threshold_signature::Config<Instance2> for Runtime {
 	type ThresholdCallable = RuntimeCall;
 	type ThresholdSignerNomination = chainflip::RandomSignerNomination;
 	type TargetChainCrypto = PolkadotCrypto;
+	type TargetChain = Polkadot;
 	type VaultActivator = PolkadotVault;
 	type OffenceReporter = Reputation;
 	type CeremonyRetryDelay = ConstU32<1>;
@@ -820,6 +822,7 @@ impl pallet_cf_threshold_signature::Config<Instance3> for Runtime {
 	type ThresholdCallable = RuntimeCall;
 	type ThresholdSignerNomination = chainflip::RandomSignerNomination;
 	type TargetChainCrypto = BitcoinCrypto;
+	type TargetChain = Bitcoin;
 	type VaultActivator = BitcoinVault;
 	type OffenceReporter = Reputation;
 	type CeremonyRetryDelay = ConstU32<1>;
@@ -836,6 +839,7 @@ impl pallet_cf_threshold_signature::Config<Instance5> for Runtime {
 	type ThresholdCallable = RuntimeCall;
 	type ThresholdSignerNomination = chainflip::RandomSignerNomination;
 	type TargetChainCrypto = SolanaCrypto;
+	type TargetChain = Solana;
 	type VaultActivator = SolanaVault;
 	type OffenceReporter = Reputation;
 	type CeremonyRetryDelay = ConstU32<1>;