Merge branch 'refactor-feb' into 'dev'

Fix collateral box creation See merge request ergo/rosen-bridge/watcher!255
rosen-bridge · Mar 15, 2024 · 4244066 · 4244066
2 parents e3cdbb4 + 3b3c674
commit 4244066
Show file tree

Hide file tree

Showing 47 changed files with 1,346 additions and 1,858 deletions.
diff --git a/config/dataSource.ts b/config/dataSource.ts
@@ -15,6 +15,7 @@ import {
   EventTriggerEntity,
   migrations as watcherDataExtractorMigrations,
   PermitEntity,
+  CollateralEntity,
 } from '@rosen-bridge/watcher-data-extractor';
 import { DataSource } from 'typeorm';
 import { getConfig } from '../src/config/config';
@@ -35,6 +36,7 @@ const dbConfigs = {
     CommitmentEntity,
     EventTriggerEntity,
     PermitEntity,
+    CollateralEntity,
     ObservationEntity,
     TokenEntity,
     TxEntity,

diff --git a/config/default.yaml b/config/default.yaml
@@ -48,6 +48,8 @@ ergo:
       creation: 120 # commitment creation interval (in seconds)
       reveal: 180 # commitment reveal interval (in seconds)
       redeem: 120 # commitment reveal interval (in seconds)
+    wid:
+      status: 120 # wid status check interval (in seconds)
 path:
   addresses: config/rosen # addresses path
   # tokens: config/rosen/tokens.json # default tokens path.