Merge branch 'bugfix/deadlock' into 'dev'

Bugfix/deadlock See merge request ergo/rosen-bridge/watcher!219
rosen-bridge · Dec 31, 2023 · 6f834de · 6f834de
2 parents 4a643da + 1463922
commit 6f834de
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/services/watcher/config/default.yaml b/services/watcher/config/default.yaml
@@ -2,7 +2,7 @@
 network: '' # which scanner network used in this watcher ergo/cardano
 observation:
   confirmation: 60 # number of required block confirmations to create the commitment after observing an event
-  validThreshold: 4320 # observations that have not been triggered won't be processed after this period (in blocks)
+  validThreshold: 12960 # observations that have not been triggered won't be processed after this period (in blocks)
 cardano:
   type: '' # options: koios, ogmios, blockfrost
   initial:
@@ -42,10 +42,10 @@ ergo:
   interval:
     scanner: 180 # scanner update interval (in seconds)
     revenue: 120 # revenue update interval (in seconds)
-    transaction: 180 # processing transaction interval (in seconds)
+    transaction: 120 # processing transaction interval (in seconds)
     tokenName: 180 # token name check interval (in seconds)
     commitment:
-      creation: 180 # commitment creation interval (in seconds)
+      creation: 20 # commitment creation interval (in seconds)
       reveal: 180 # commitment reveal interval (in seconds)
       redeem: 3600 # commitment reveal interval (in seconds)
 path:

diff --git a/services/watcher/src/transactions/commitmentCreation.ts b/services/watcher/src/transactions/commitmentCreation.ts
@@ -152,8 +152,8 @@ export class CommitmentCreation {
     }
     const WID = Transaction.watcherWID;
     logger.info(`Starting commitment creation job`);
-    for (const observation of observations) {
-      try {
+    try {
+      for (const observation of observations) {
         const commitment = ErgoUtils.commitmentFromObservation(
           observation,
           WID
@@ -203,11 +203,11 @@ export class CommitmentCreation {
           feeBoxes,
           requiredValue - BigInt(getConfig().general.minBoxValue)
         );
-      } catch (e) {
-        logger.warn(
-          `Skipping the commitment creation due to occurred error: ${e.message} - ${e.stack}`
-        );
       }
+    } catch (e) {
+      logger.warn(
+        `Skipping the commitment creation due to occurred error: ${e.message} - ${e.stack}`
+      );
     }
     logger.info(`Commitment creation job is done`, {
       count: observations.length,