Merge branch 'dev' into 'master'

Dev

See merge request ergo/rosen-bridge/watcher!316

CHANGELOG.md

@@ -1,5 +1,11 @@
 # @rosen-bridge/watcher
 
+## 4.0.2
+
+### Patch Changes
+
+- Fix redeem job to redeem the invalid commitment after the reward transaction
+
 ## 4.0.1
 
 ### Patch Changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rosen-bridge/watcher",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Rosen bridge Watcher service",
   "main": "index.js",
   "type": "module",

src/utils/watcherUtils.ts

@@ -395,6 +395,7 @@ class WatcherUtils {
    *    1 - Not triggered after the specified period
    *    2 - Created after the related trigger
    *    3 - It's a duplicate commitment and a valid one merged to create the trigger (WID exists in trigger)
+   *    4 - It's information is not valid and trigger was spent without rewarding the commitment
    * @param commitment
    * @returns true if the commitment is still valid and false otherwise
    */
@@ -405,7 +406,7 @@ class WatcherUtils {
       commitment.eventId
     );
 
-    if (eventTrigger == null) {
+    if (eventTrigger == null || eventTrigger.spendBlock !== undefined) {
       return false;
     }
 

tests/ergoUtils/watcherUtils.ts

@@ -3,6 +3,7 @@ import { TxStatus } from '../../src/database/entities/observationStatusEntity';
 import {
   commitmentEntity,
   eventTriggerEntity,
+  newEventTriggerEntity,
   observationEntity1,
   observationEntity3,
   observationStatusCommitted,
@@ -572,4 +573,23 @@ describe('Testing the WatcherUtils & TransactionUtils', () => {
       chai.spy.restore(ErgoNetwork);
     });
   });
+
+  describe('isCommitmentValid', () => {
+    /**
+     * @target isCommitmentValid should return false if related trigger is spent
+     * @dependencies
+     * - DataBase
+     * @scenario
+     * - mock eventTriggerByEventId to return a spent trigger object
+     * @expected
+     * - to return false when spendBlock is set for the trigger
+     */
+    it('should return false if related trigger is spent', async () => {
+      chai.spy.on(dataBase, 'eventTriggerByEventId', () => ({
+        spendBlock: 'spendBlock',
+      }));
+      const result = await watcherUtils.isCommitmentValid(commitmentEntity);
+      expect(result).to.be.false;
+    });
+  });
 });