add more multisig confirmation conditions

Giveth · Sep 23, 2023 · 38f1ecb · 38f1ecb
1 parent 3f8a48d
commit 38f1ecb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/migrations/1694633909572-AddMultisigSessionEntity.ts b/migrations/1694633909572-AddMultisigSessionEntity.ts
@@ -56,16 +56,9 @@ export class AddMultisigSessionEntity1694633909572
           },
         ],
         indices: [
-          {
-            columnNames: ['safeTransactionHash', 'network'],
-            isUnique: true,
-          },
           {
             columnNames: ['multisigAddress'],
           },
-          {
-            columnNames: ['safeTransactionHash'],
-          },
           {
             columnNames: ['network'],
           },

diff --git a/src/entities/multisigSession.ts b/src/entities/multisigSession.ts
@@ -66,7 +66,11 @@ export class MultisigSession extends BaseEntity {
 
     if (this.isExpired()) this.status = MultisigStatuses.Failed;
 
-    if (safeMessageData.status === 'CONFIRMED')
+    if (
+      safeMessageData.status === 'CONFIRMED' &&
+      safeMessageData.confirmationsSubmitted >=
+        safeMessageData.confirmationsRequired
+    )
       this.status = MultisigStatuses.Successful;
 
     await this.save();

diff --git a/src/routes/v1/multisigAuthenticationRouter.ts b/src/routes/v1/multisigAuthenticationRouter.ts
@@ -9,8 +9,9 @@ multisigAuthenticationRouter.post(
   '/multisigAuthentication',
   async (req: Request, res: Response, next) => {
     try {
-      const { safeMessageTimestamp, safeAddress, network, jwt } = req.body;
-      if (!safeMessageTimestamp || !safeAddress || !jwt || !network) {
+      const { safeAddress, network, jwt } = req.body;
+      const safeMessageTimestamp = req.body?.safeMessageTimestamp;
+      if (!safeAddress || !jwt || !network) {
         res.status(422).json({ message: errorMessagesEnum.MISSING_LOGIN_DATA });
         return;
       }