feat: Added failed transactions model

rsksmart · Jan 17, 2024 · 11227b3 · 11227b3
1 parent da51917
commit 11227b3
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 29 deletions.
diff --git a/src/lib/FederatorERC.ts b/src/lib/FederatorERC.ts
@@ -21,6 +21,11 @@ import {
 import {AppDataSource} from "../services/AppDataSource";
 import {FailedTransactions} from "../entities/FailedTransactions";
 import {Votes} from "../entities/Votes";
+import {
+    deleteFailedTransaction,
+    findFailedTransaction,
+    insertFailedTransaction, updateFailedTransaction
+} from "../models/failedTransactions.model";
 
 
 type ValidateAndVoteReturn = {
@@ -407,22 +412,19 @@ export default class FederatorERC extends Federator {
     }
 
     async verifyIfwasRevertedAndRetry(params, txAbi) {
-        const revertedTx = await AppDataSource.getRepository(FailedTransactions)
-          .findOne({
-              where: {
-                  mainChain: params.mainChainId,
-                  sideChain: params.sideChainId,
-                  transactionId: params.transactionId
-              }
-          });
+        const revertedTx = await findFailedTransaction({
+            mainChain: params.mainChainId,
+            sideChain: params.sideChainId,
+            transactionId: params.transactionId
+        });
 
         const result = await this.validateAndVote(params, txAbi);
 
         if (revertedTx && (result.voteSuccess || result.wasVotedBefore || result.wasProcessed)) {
-            await AppDataSource.getRepository(FailedTransactions).delete({
-                    mainChain: params.mainChainId,
-                    sideChain: params.sideChainId,
-                    transactionId: params.transactionId
+            await deleteFailedTransaction({
+                mainChain: params.mainChainId,
+                sideChain: params.sideChainId,
+                transactionId: params.transactionId
             });
         }
     }
@@ -443,14 +445,10 @@ export default class FederatorERC extends Federator {
         const hasVotedDb = await AppDataSource.getRepository(Votes).findOne({
             where: {transactionId: params.transactionId}});
 
-        const failedRetry = await AppDataSource.getRepository(FailedTransactions).findOne(
-          {
-              where: {
-                  transactionId: params.transactionId,
-                  timesRetried: this.config.maxFailedTxRetry
-              }
-          }
-        );
+        const failedRetry = await findFailedTransaction({
+            transactionId: params.transactionId,
+            timesRetried: this.config.maxFailedTxRetry
+        });
 
         const wasProcessed = await params.sideFedContract
           .transactionWasProcessed(params.transactionId);
@@ -505,15 +503,12 @@ export default class FederatorERC extends Federator {
               receipt,
             );
 
-            const hasFailedBefore = await AppDataSource.getRepository(FailedTransactions)
-              .findOne({
-                  where: {
-                      transactionId: params.transactionId
-                  }
-              });
+            const hasFailedBefore = await findFailedTransaction({
+                transactionId: params.transactionId
+            });
 
             if(!hasFailedBefore) {
-                await AppDataSource.getRepository(FailedTransactions).insert({
+                const dataToInsert: Partial<FailedTransactions> = {
                     mainChain: params.mainChainId,
                     sideChain: params.sideChainId,
                     transactionId: params.transactionId,
@@ -530,9 +525,10 @@ export default class FederatorERC extends Federator {
                         status: receipt.status,
                         receipt: {...receipt},
                     })
-                });
+                };
+                await insertFailedTransaction(dataToInsert);
             } else {
-                await AppDataSource.getRepository(FailedTransactions).update(hasFailedBefore.id, {
+                await updateFailedTransaction(hasFailedBefore.id, {
                     timesRetried: hasFailedBefore.timesRetried + 1 > this.config.maxFailedTxRetry ?
                       this.config.maxFailedTxRetry : hasFailedBefore.timesRetried + 1
                 });

diff --git a/src/models/failedTransactions.model.ts b/src/models/failedTransactions.model.ts
@@ -0,0 +1,23 @@
+import {FailedTransactions} from "../entities/FailedTransactions";
+import {AppDataSource} from "../services/AppDataSource";
+
+const findFailedTransaction = async (data: Partial<FailedTransactions>) => {
+  return await AppDataSource.getRepository(FailedTransactions)
+    .findOne({
+      where: { ...data }
+    });
+}
+
+const deleteFailedTransaction = async (criteria: Partial<FailedTransactions>) => {
+  await AppDataSource.getRepository(FailedTransactions).delete({ ...criteria });
+}
+
+const insertFailedTransaction = async (data: Partial<FailedTransactions>) => {
+  await AppDataSource.getRepository(FailedTransactions).insert({...data});
+}
+
+const updateFailedTransaction = async (id: number, data: Partial<FailedTransactions>) => {
+  await AppDataSource.getRepository(FailedTransactions).update({ id }, { ...data });
+}
+
+export { findFailedTransaction, deleteFailedTransaction, insertFailedTransaction, updateFailedTransaction };