fix: added additional validation, fixed validation for reshare

src/app/routes/reshare-dkg/reshare.tsx

@@ -23,10 +23,6 @@ const Reshare = () => {
     ? health.data?.every(
         ({ isHealthy, isEthClientConnected, isOutdated, isMismatchId }) =>
           isHealthy && isEthClientConnected && !isOutdated && !isMismatchId,
-      ) ||
-      health.data?.every(
-        ({ isHealthy, isOutdated, isMismatchId }) =>
-          isHealthy && isOutdated && !isMismatchId,
       )
     : health.data?.every(
         ({ isHealthy, isMismatchId }) => isHealthy && !isMismatchId,

src/hooks/operator/use-reshare-signature-payload.ts

@@ -25,20 +25,25 @@ export const useReshareSignaturePayload = ({
     const nonce = await getOwnerNonce(ownerAddress);
     const chainId = FORKS[getChainId(config)];
     const payload = (proofsQuery.data?.validators || []).map(
-      ({ publicKey, proofs }) => ({
-        messageData: {
+      ({ publicKey, proofs }, index: number) => {
+        const messageData: MessageData = {
           publicKey,
           oldOperators: context.dkgReshareState.operators,
           chainId,
           withdrawalCredentials: withdrawAddress,
           ownerAddress,
-          nonce,
+          nonce: nonce + index,
           amount: DEFAULT_AMOUNT,
-        } as MessageData,
-        proofs: proofs,
-      }),
+        };
+        if (context.dkgReshareState.newOperators.length) {
+          messageData.newOperators = context.dkgReshareState.newOperators;
+        }
+        return {
+          messageData,
+          proofs,
+        };
+      },
     );
-
     return sign.signMessageAsync({
       message: getSignaturePayload(payload),
     });

src/hooks/use-validate-proofs.ts

@@ -122,7 +122,14 @@ export const useValidateProofs = (files: File[]) => {
           );
         }
         state.dkgReshareState.selectedValidatorsCount = validators.length;
-
+        if (
+          json.every((proof: Proof | Proof[]) => Array.isArray(proof)) &&
+          json.length > validators.length
+        ) {
+          throw new Error(
+            "proofs.json must only contain validators that are registered.",
+          );
+        }
         return {
           proofs: json,
           validators,

src/lib/utils/dkg.ts

@@ -118,8 +118,8 @@ const serializedResignMessage = (message: {
 const serializedReshareMessage = (message: {
   messageData: MessageData;
   proofs: ProofType[];
-}) =>
-  ReshareMessageType.serialize({
+}) => {
+  return ReshareMessageType.serialize({
     Reshare: {
       ValidatorPubKey: parseHexToBuffer(message.messageData.publicKey),
       OldOperators: message.messageData.oldOperators.map(
@@ -134,8 +134,8 @@ const serializedReshareMessage = (message: {
           PubKey: Buffer.from(op.public_key),
         }),
       ),
-      OldT: message.messageData.oldOperators.length % 3,
-      NewT: (message.messageData.newOperators || []).length % 3,
+      OldT: Number(message.messageData.oldOperators.length % 3),
+      NewT: Number((message.messageData.newOperators || []).length % 3),
       Fork: parseHexToBuffer(message.messageData.chainId).slice(0, 4),
       WithdrawalCredentials: parseHexToBuffer(
         message.messageData.withdrawalCredentials,
@@ -154,6 +154,7 @@ const serializedReshareMessage = (message: {
       Signature: parseHexToBuffer(proof.signature),
     })),
   });
+};
 
 export const getSignaturePayload = (
   data: {