From c1f8c60ee73e0c21f38a18c32192257381ae5224 Mon Sep 17 00:00:00 2001
From: has5aan <50018215+has5aan@users.noreply.github.com>
Date: Wed, 1 Nov 2023 18:37:38 +0100
Subject: [PATCH] ValidatorsMethod.setValidatorBLSKey (#9128)

:recycle: ValidatorsMethod.setValidatorBLSKey updates the BLS key if validator already has valid BLS key.
---
 framework/src/modules/validators/method.ts    |  3 --
 .../unit/modules/validators/method.spec.ts    | 41 +++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/framework/src/modules/validators/method.ts b/framework/src/modules/validators/method.ts
index 0fa0cc242c..dad2006d0a 100644
--- a/framework/src/modules/validators/method.ts
+++ b/framework/src/modules/validators/method.ts
@@ -208,9 +208,6 @@ export class ValidatorsMethod extends BaseMethod {
 		}
 
 		const validatorAccount = await validatorsSubStore.get(methodContext, validatorAddress);
-		if (!validatorAccount.blsKey.equals(INVALID_BLS_KEY)) {
-			return false;
-		}
 
 		if (!bls.popVerify(blsKey, proofOfPossession)) {
 			this.events.get(BlsKeyRegistrationEvent).log(methodContext, validatorAddress, {
diff --git a/framework/test/unit/modules/validators/method.spec.ts b/framework/test/unit/modules/validators/method.spec.ts
index 0c34961381..888076ffd2 100644
--- a/framework/test/unit/modules/validators/method.spec.ts
+++ b/framework/test/unit/modules/validators/method.spec.ts
@@ -74,6 +74,14 @@ describe('ValidatorsModuleMethod', () => {
 		'88bb31b27eae23038e14f9d9d1b628a39f5881b5278c3c6f0249f81ba0deb1f68aa5f8847854d6554051aa810fdf1cdb02df4af7a5647b1aa4afb60ec6d446ee17af24a8a50876ffdaf9bf475038ec5f8ebeda1c1c6a3220293e23b13a9a5d27',
 		'hex',
 	);
+	const anotherProofOfPossession = Buffer.from(
+		'b92b11d66348e197c62d14af1453620d550c21d59ce572d95a03f0eaa0d0d195efbb2f2fd1577dc1a04ecdb453065d9d168ce7648bc5328e5ea47bb07d3ce6fd75f35ee51064a9903da8b90f7dc8ab4f2549b834cb5911b883097133f66b9ab9',
+		'hex',
+	);
+	const anotherBLSKey = Buffer.from(
+		'92f020ce5e37befb86493a82686b0eedddb264350b0873cf1eeaa1fefe39d938f05f272452c1ef5e6ceb4d9b23687e31',
+		'hex',
+	);
 	const invalidAddressShort = utils.getRandomBytes(ADDRESS_LENGTH - 1);
 	const invalidAddressLong = utils.getRandomBytes(ADDRESS_LENGTH + 1);
 	const invalidGeneratorKeyShort = utils.getRandomBytes(ED25519_PUBLIC_KEY_LENGTH - 1);
@@ -351,6 +359,39 @@ describe('ValidatorsModuleMethod', () => {
 			);
 		});
 
+		it('should be able to correctly set bls key for validator if address exists with valid blsKey, key is not registered and proof of possession is valid', async () => {
+			const blsEventData = codec.encode(blsKeyRegDataSchema, {
+				blsKey: anotherBLSKey,
+				proofOfPossession: anotherProofOfPossession,
+				result: KeyRegResult.SUCCESS,
+			});
+			const validatorAccount = {
+				generatorKey,
+				blsKey,
+			};
+			await validatorsSubStore.set(methodContext, address, validatorAccount);
+			const isSet = await validatorsModule.method.setValidatorBLSKey(
+				methodContext,
+				address,
+				anotherBLSKey,
+				anotherProofOfPossession,
+			);
+
+			const setValidatorAccount = await validatorsSubStore.get(methodContext, address);
+			const hasKey = await blsKeysSubStore.has(methodContext, anotherBLSKey);
+
+			expect(isSet).toBe(true);
+			expect(setValidatorAccount.blsKey).toEqual(anotherBLSKey);
+			expect(hasKey).toBe(true);
+			expect(methodContext.eventQueue.add).toHaveBeenCalledWith(
+				MODULE_NAME_VALIDATORS,
+				validatorsModule.events.get(BlsKeyRegistrationEvent).name,
+				blsEventData,
+				[address],
+				false,
+			);
+		});
+
 		it('should not be able to set bls key for validator if address does not exist', async () => {
 			const blsEventData = codec.encode(blsKeyRegDataSchema, {
 				blsKey,