From 0444e6d5944d8179c3a5c5ba5448cc26a0583b11 Mon Sep 17 00:00:00 2001
From: boufni95 <boufni95@gmail.com>
Date: Tue, 26 Mar 2024 20:46:10 +0100
Subject: [PATCH] fix merge err

---
 src/services/lnd/watchdog.ts | 6 ++++++
 src/services/main/init.ts    | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/services/lnd/watchdog.ts b/src/services/lnd/watchdog.ts
index c054e4c7..da52eaa4 100644
--- a/src/services/lnd/watchdog.ts
+++ b/src/services/lnd/watchdog.ts
@@ -15,6 +15,7 @@ export class Watchdog {
     lnd: LightningHandler;
     settings: WatchdogSettings;
     log = getLogger({ appName: "watchdog" })
+    enabled = false
     constructor(settings: WatchdogSettings, lnd: LightningHandler) {
         this.lnd = lnd;
         this.settings = settings;
@@ -23,6 +24,7 @@ export class Watchdog {
     SeedLndBalance = async (totalUsersBalance: number) => {
         this.initialLndBalance = await this.getTotalLndBalance()
         this.initialUsersBalance = totalUsersBalance
+        this.enabled = true
     }
 
     getTotalLndBalance = async () => {
@@ -77,6 +79,10 @@ export class Watchdog {
 
     PaymentRequested = async (totalUsersBalance: number) => {
         this.log("Payment requested, checking balance")
+        if (!this.enabled) {
+            this.log("WARNING! Watchdog not enabled, skipping balance check")
+            return
+        }
         const totalLndBalance = await this.getTotalLndBalance()
         const deltaLnd = totalLndBalance - this.initialLndBalance
         const deltaUsers = totalUsersBalance - this.initialUsersBalance
diff --git a/src/services/main/init.ts b/src/services/main/init.ts
index d7d53102..f680fa3c 100644
--- a/src/services/main/init.ts
+++ b/src/services/main/init.ts
@@ -18,7 +18,8 @@ export const initMainHandler = async (log: PubLogger, mainSettings: MainSettings
     const mainHandler = new Main(mainSettings, storageManager)
     await mainHandler.lnd.Warmup()
     if (!mainSettings.skipSanityCheck) {
-        await mainHandler.VerifyEventsLog()
+        const totalUsersBalance = await mainHandler.VerifyEventsLog()
+        await mainHandler.paymentManager.watchDog.SeedLndBalance(totalUsersBalance)
     }
     const appsData = await mainHandler.storage.applicationStorage.GetApplications()
     const existingWalletApp = await appsData.find(app => app.name === 'wallet' || app.name === 'wallet-test')