up

proto/service/structs.proto

@@ -302,7 +302,6 @@ message PayInvoiceResponse{
     string operation_id = 3;
     int64 service_fee = 4;
     int64 network_fee = 5;
-    int64 latest_balance = 6;
 }
 
 message OpenChannelRequest{
@@ -417,7 +416,6 @@ message GetProductBuyLinkResponse {
 
 message LiveUserOperation {
     UserOperation operation  = 1;
-    int64 latest_balance = 2;
 }
 message MigrationUpdate {
     optional ClosureMigration closure = 1;

src/services/main/index.ts

@@ -227,7 +227,7 @@ export default class {
             getLogger({ appName: app.name })("cannot notify user, not a nostr user")
             return
         }
-        const message: Types.LiveUserOperation & { requestId: string, status: 'OK' } = { operation: op, latest_balance: user.user.balance_sats, requestId: "GetLiveUserOperations", status: 'OK' }
+        const message: Types.LiveUserOperation & { requestId: string, status: 'OK' } = { operation: op, requestId: "GetLiveUserOperations", status: 'OK' }
         this.nostrSend({ type: 'app', appId: app.app_id }, { type: 'content', content: JSON.stringify(message), pub: user.nostr_public_key })
     }
 

src/services/main/liquidityProvider.ts

@@ -28,9 +28,9 @@ export class LiquidityProvider {
     queue: ((state: 'ready') => void)[] = []
     utils: Utils
     pendingPayments: Record<string, number> = {}
-    updateProviderBalance: (balance: number) => Promise<void>
+    incrementProviderBalance: (balance: number) => Promise<void>
     // make the sub process accept client
-    constructor(pubDestination: string, utils: Utils, invoicePaidCb: InvoicePaidCb, updateProviderBalance: (balance: number) => Promise<any>) {
+    constructor(pubDestination: string, utils: Utils, invoicePaidCb: InvoicePaidCb, incrementProviderBalance: (balance: number) => Promise<any>) {
         this.utils = utils
         if (!pubDestination) {
             this.log("No pub provider to liquidity provider, will not be initialized")
@@ -39,7 +39,7 @@ export class LiquidityProvider {
         this.log("connecting to liquidity provider:", pubDestination)
         this.pubDestination = pubDestination
         this.invoicePaidCb = invoicePaidCb
-        this.updateProviderBalance = updateProviderBalance
+        this.incrementProviderBalance = incrementProviderBalance
         this.client = newNostrClient({
             pubDestination: this.pubDestination,
             retrieveNostrUserAuth: async () => this.myPub,
@@ -84,6 +84,7 @@ export class LiquidityProvider {
         if (res.status === 'ERROR') {
             return
         }
+        this.incrementProviderBalance(res.balance)
         this.ready = true
         this.queue.forEach(q => q('ready'))
         this.log("subbing to user operations")
@@ -94,7 +95,7 @@ export class LiquidityProvider {
             }
             //this.log("got user operation", res.operation)
             if (res.operation.type === Types.UserOperationType.INCOMING_INVOICE) {
-                this.updateProviderBalance(res.latest_balance)
+                this.incrementProviderBalance(res.operation.amount)
                 this.invoicePaidCb(res.operation.identifier, res.operation.amount, 'provider')
             }
         })
@@ -192,8 +193,8 @@ export class LiquidityProvider {
                 this.log("error paying invoice", res.reason)
                 throw new Error(res.reason)
             }
-
-            this.updateProviderBalance(userInfo.balance).then(() => { delete this.pendingPayments[invoice] })
+            const totalPaid = res.amount_paid + res.network_fee + res.service_fee
+            this.incrementProviderBalance(-totalPaid).then(() => { delete this.pendingPayments[invoice] })
             this.utils.stateBundler.AddTxPoint('paidAnInvoice', decodedAmount, { used: 'provider', from, timeDiscount: true })
             return res
         } catch (err) {

src/services/main/paymentManager.ts

@@ -195,7 +195,6 @@ export default class {
             operation_id: `${Types.UserOperationType.OUTGOING_INVOICE}-${paymentInfo.serialId}`,
             network_fee: paymentInfo.networkFee,
             service_fee: serviceFee,
-            latest_balance: user.balance_sats
         }
     }
 

src/services/main/rugPullTracker.ts

@@ -57,7 +57,7 @@ export class RugPullTracker {
             this.rugPulled = false
             if (providerTracker.latest_distruption_at_unix !== 0) {
                 await this.storage.liquidityStorage.UpdateTrackedProviderDisruption('lnPub', pubDst, 0)
-                getLogger({ component: 'rugPull' })("rugpull from: ", pubDst, "cleared after: ", (Date.now() / 1000) - providerTracker.latest_distruption_at_unix, "seconds")
+                getLogger({ component: 'rugPull' })("rugpull from: ", pubDst, "cleared after: ", Math.floor(Date.now() / 1000) - providerTracker.latest_distruption_at_unix, "seconds")
             }
             if (diff > 0) {
                 this.log("detected excees from: ", pubDst, "provider balance changed from", providerTracker.latest_balance, "to", trackedBalance, "gaining", diff)

src/services/main/watchdog.ts

@@ -74,7 +74,7 @@ export class Watchdog {
         this.accumulatedHtlcFees = 0
 
         this.interval = setInterval(() => {
-            if (this.latestCheckStart + (1000 * 60) < Date.now()) {
+            if (this.latestCheckStart + (1000 * 58) < Date.now()) {
                 this.PaymentRequested()
             }
         }, 1000 * 60)
@@ -160,7 +160,7 @@ export class Watchdog {
         } else {
             if (tracker.latest_distruption_at_unix !== 0) {
                 await this.storage.liquidityStorage.UpdateTrackedProviderDisruption('lnd', this.lndPubKey, 0)
-                getLogger({ component: 'bark' })("loss cleared after: ", (Date.now() / 1000) - tracker.latest_distruption_at_unix, "seconds")
+                getLogger({ component: 'bark' })("loss cleared after: ", Math.floor(Date.now() / 1000) - tracker.latest_distruption_at_unix, "seconds")
             } else if (absoluteDiff > 0) {
                 this.log("lnd balance increased more than users balance by", absoluteDiff)
             }

src/services/storage/liquidityStorage.ts

@@ -50,6 +50,14 @@ export class LiquidityStorage {
         console.log("updating tracked balance:", latestBalance)
         return this.DB.getRepository(TrackedProvider).update({ provider_pubkey: pub, provider_type: providerType }, { latest_balance: latestBalance })
     }
+    async IncrementTrackedProviderBalance(providerType: 'lnd' | 'lnPub', pub: string, amount: number) {
+        if (amount < 0) {
+            return this.DB.getRepository(TrackedProvider).increment({ provider_pubkey: pub, provider_type: providerType }, "latest_balance", amount)
+        } else {
+            return this.DB.getRepository(TrackedProvider).decrement({ provider_pubkey: pub, provider_type: providerType }, "latest_balance", -amount)
+        }
+
+    }
     async UpdateTrackedProviderDisruption(providerType: 'lnd' | 'lnPub', pub: string, latestDisruptionAtUnix: number) {
         return this.DB.getRepository(TrackedProvider).update({ provider_pubkey: pub, provider_type: providerType }, { latest_distruption_at_unix: latestDisruptionAtUnix })
     }