Added support for Uncompressed Key

pallets/thea/Cargo.toml

@@ -22,6 +22,7 @@ thea-primitives = { path = "../../primitives/thea", default-features = false }
 sp-application-crypto = { workspace = true, default-features = false }
 sp-io = { workspace = true, default-features = false }
 hex = { workspace = true, default-features = false, features = ["alloc"] }
+libsecp256k1 = { version = "0.7.1", default-features = false}
 
 [dev-dependencies]
 pallet-assets = { workspace = true, features = ["std"] }
@@ -53,6 +54,7 @@ std = [
   "pallet-balances/std",
   "sp-core/std",
   "frame-benchmarking?/std",
+  "libsecp256k1/std"
 ]
 runtime-benchmarks = [
   "pallet-balances/runtime-benchmarks",

pallets/thea/src/benchmarking.rs

@@ -91,7 +91,7 @@ benchmarks! {
 
 	add_thea_network {
 		let network: u8 = 2;
-	}: _(RawOrigin::Root, network, 20, 100*UNIT_BALANCE, 1000*UNIT_BALANCE)
+	}: _(RawOrigin::Root, network, false, 20, 100*UNIT_BALANCE, 1000*UNIT_BALANCE)
 	verify {
 		let active_list = <ActiveNetworks<T>>::get();
 		assert!(active_list.contains(&network));

pallets/thea/src/lib.rs

@@ -42,6 +42,7 @@ use thea_primitives::{
 	types::{Message, PayloadType},
 	Network, ValidatorSet, GENESIS_AUTHORITY_SET_ID,
 };
+use thea_primitives::types::KeyType;
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
@@ -479,14 +480,15 @@ pub mod pallet {
 		pub fn add_thea_network(
 			origin: OriginFor<T>,
 			network: Network,
+			requires_uncompressed_key: bool,
 			fork_period: u32,
 			min_stake: u128,
 			fisherman_stake: u128,
 		) -> DispatchResult {
 			ensure_root(origin)?;
 			<NetworkConfig<T>>::insert(
 				network,
-				thea_primitives::types::NetworkConfig { fork_period, min_stake, fisherman_stake },
+				thea_primitives::types::NetworkConfig::new(fork_period, min_stake, fisherman_stake, requires_uncompressed_key),
 			);
 			<ActiveNetworks<T>>::mutate(|list| {
 				list.insert(network);
@@ -746,19 +748,47 @@ impl<T: Config> Pallet<T> {
 		// This last message should be signed by the outgoing set
 		// Similar to how Grandpa's session change works.
 		if incoming != queued {
-			// This should happen at the beginning of the last epoch
-			if let Some(validator_set) = ValidatorSet::new(queued.clone(), new_id) {
-				let payload = validator_set.encode();
-				for network in &active_networks {
-					let message = Self::generate_payload(
-						PayloadType::ScheduledRotateValidators,
-						*network,
-						payload.clone(),
-					);
-					// Update nonce
-					<OutgoingNonce<T>>::insert(message.network, message.nonce);
-					<OutgoingMessages<T>>::insert(message.network, message.nonce, message);
+			let mut uncompressed_keys = vec![];
+			for public_key in queued.clone().into_iter() {
+				let public_key: sp_core::ecdsa::Public = public_key.into();
+				if let Ok(compressed_key) = libsecp256k1::PublicKey::parse_compressed(&public_key.0) {
+					uncompressed_keys.push(compressed_key.serialize());
+				} else {
+					log::error!(target: "thea", "Unable to parse compressed key");
+				    return;
+				}
+			}
+            for network in &active_networks {
+				let network_config = <NetworkConfig<T>>::get(*network);
+				let message = match network_config.key_type {
+					KeyType::Uncompressed => {
+						if let Some(payload) = ValidatorSet::new(uncompressed_keys.clone(), new_id) {
+							let message = Self::generate_payload(
+								PayloadType::ScheduledRotateValidators,
+								*network,
+								payload.encode(),
+							);
+							message
+						} else {
+							continue;
+						}
+
 				}
+					KeyType::Compressed => {
+						if let Some(payload) = ValidatorSet::new(queued.clone(), new_id) {
+							let message = Self::generate_payload(
+								PayloadType::ScheduledRotateValidators,
+								*network,
+								payload.encode(),
+							);
+							message
+						} else {
+							continue;
+						}
+					}
+				};
+				<OutgoingNonce<T>>::insert(message.network, message.nonce);
+				<OutgoingMessages<T>>::insert(message.network, message.nonce, message);
 			}
 			<NextAuthorities<T>>::put(queued);
 		}

pallets/thea/src/tests.rs

@@ -194,6 +194,7 @@ fn test_add_thea_network_full() {
 			Thea::add_thea_network(
 				RuntimeOrigin::none(),
 				1,
+				false,
 				20,
 				100 * UNIT_BALANCE,
 				1000 * UNIT_BALANCE
@@ -204,6 +205,7 @@ fn test_add_thea_network_full() {
 			Thea::add_thea_network(
 				RuntimeOrigin::signed(1),
 				1,
+				false,
 				20,
 				100 * UNIT_BALANCE,
 				1000 * UNIT_BALANCE
@@ -215,6 +217,7 @@ fn test_add_thea_network_full() {
 			assert_ok!(Thea::add_thea_network(
 				RuntimeOrigin::root(),
 				net,
+				false,
 				20,
 				100 * UNIT_BALANCE,
 				1000 * UNIT_BALANCE
@@ -228,6 +231,7 @@ fn test_add_thea_network_full() {
 			assert_ok!(Thea::add_thea_network(
 				RuntimeOrigin::root(),
 				net,
+				false,
 				20,
 				100 * UNIT_BALANCE,
 				1000 * UNIT_BALANCE
@@ -251,6 +255,7 @@ fn test_remove_thea_network_full() {
 			assert_ok!(Thea::add_thea_network(
 				RuntimeOrigin::root(),
 				net,
+				false,
 				20,
 				100 * UNIT_BALANCE,
 				1000 * UNIT_BALANCE
@@ -264,6 +269,7 @@ fn test_remove_thea_network_full() {
 			assert_ok!(Thea::add_thea_network(
 				RuntimeOrigin::root(),
 				net,
+				false,
 				20,
 				100 * UNIT_BALANCE,
 				1000 * UNIT_BALANCE
@@ -298,6 +304,7 @@ fn test_report_misbehaviour_happy_path() {
 			fork_period: 0,
 			min_stake: 1_000_000,
 			fisherman_stake: 1_000_000,
+			key_type: KeyType::Compressed,
 		};
 		<NetworkConfig<Test>>::insert(network, config);
 		let relayer = 1u64;
@@ -336,6 +343,7 @@ fn test_report_misbehaviour_not_enough_stake() {
 			fork_period: 0,
 			min_stake: 1_000_000_000_000_000_000_000_000_000,
 			fisherman_stake: 1_000_000_000_000_000_000_000_000,
+			key_type: KeyType::Compressed,
 		};
 		<NetworkConfig<Test>>::insert(network, config);
 		let relayer = 1u64;
@@ -370,6 +378,7 @@ fn test_handle_misbehaviour_happy_path_valid_proposal() {
 			fork_period: 0,
 			min_stake: 1_000_000,
 			fisherman_stake: 1_000_000,
+			key_type: KeyType::Compressed,
 		};
 		<NetworkConfig<Test>>::insert(network, config);
 		let relayer = 1u64;
@@ -405,6 +414,7 @@ fn test_handle_misbehaviour_happy_path_invalid_proposal() {
 			fork_period: 0,
 			min_stake: 1_000_000,
 			fisherman_stake: 1_000_000,
+			key_type: KeyType::Compressed,
 		};
 		<NetworkConfig<Test>>::insert(network, config);
 		let relayer = 1u64;
@@ -665,6 +675,7 @@ fn test_submit_incoming_message_happy_path_first_message() {
 			fork_period: 0,
 			min_stake: 1 * UNIT_BALANCE,
 			fisherman_stake: 1 * UNIT_BALANCE,
+			key_type: KeyType::Compressed,
 		};
 		<NetworkConfig<Test>>::insert(network_id, network_config);
 		assert_ok!(Thea::submit_incoming_message(

primitives/thea/src/types.rs

@@ -125,11 +125,18 @@ impl<Signature> SignedMessage<Signature> {
 
 pub const THEA_HOLD_REASON: [u8; 8] = *b"theaRela";
 
+#[derive(Clone, Encode, Decode, TypeInfo, Debug, Eq, PartialEq, Ord, PartialOrd)]
+pub enum KeyType {
+	Compressed,
+	Uncompressed,
+}
+
 #[derive(Clone, Encode, Decode, TypeInfo, Debug, Eq, PartialEq, Ord, PartialOrd)]
 pub struct NetworkConfig {
 	pub fork_period: u32,
 	pub min_stake: u128,
 	pub fisherman_stake: u128,
+	pub key_type: KeyType,
 }
 
 impl Default for NetworkConfig {
@@ -138,10 +145,22 @@ impl Default for NetworkConfig {
 			fork_period: 20,
 			min_stake: 1000 * UNIT_BALANCE,
 			fisherman_stake: 100 * UNIT_BALANCE,
+			key_type: KeyType::Compressed,
 		}
 	}
 }
 
+impl NetworkConfig {
+	pub fn new(fork_period: u32, min_stake: u128, fisherman_stake: u128, is_uncompressed_key_req: bool) -> Self {
+		let key_type = if is_uncompressed_key_req {
+			KeyType::Uncompressed
+		} else {
+			KeyType::Compressed
+		};
+		Self { fork_period, min_stake, fisherman_stake, key_type }
+	}
+}
+
 #[derive(
 	Clone, Encode, Decode, TypeInfo, Debug, Eq, PartialEq, Ord, PartialOrd, Deserialize, Serialize,
 )]