fix: handle proto generator default values issue

GaloyMoney · Nov 30, 2024 · 2e2f06e · 2e2f06e
1 parent 3322841
commit 2e2f06e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/core/api/src/debug/settle-pending-onchain-payments.ts b/core/api/src/debug/settle-pending-onchain-payments.ts
@@ -21,7 +21,7 @@ const processPayment = async (payment: LedgerTransaction<WalletCurrency>) => {
   if (payout instanceof Error) {
     return new Error(`Failed to get payout: ${payout.name} - ${payout.message}`)
   }
-  if (!payout.batchId || !payout.txId || !payout.vout) {
+  if (!payout.batchId || !payout.txId || payout.vout === undefined) {
     return new Error("Missing required payout details")
   }
 

diff --git a/core/api/src/services/bria/index.ts b/core/api/src/services/bria/index.ts
@@ -235,13 +235,15 @@ export const OnChainService = (): IOnChainService => {
       const foundPayout = response.getPayout()
       if (foundPayout === undefined) return new PayoutNotFoundError()
 
+      //fix issue with proto gen default values
+      const txId = (foundPayout.getTxId() as OnChainTxHash) || undefined
       return {
         id: foundPayout.getId() as PayoutId,
         journalId: foundPayout.getExternalId() as LedgerJournalId,
         batchInclusionEstimatedAt: foundPayout.getBatchInclusionEstimatedAt(),
         batchId: foundPayout.getBatchId() as BatchId,
-        txId: foundPayout.getTxId() as OnChainTxHash,
-        vout: foundPayout.getVout() as OnChainTxVout,
+        txId,
+        vout: txId ? (foundPayout.getVout() as OnChainTxVout) : undefined,
       }
     } catch (err) {
       if (

diff --git a/core/api/src/services/ledger/index.ts b/core/api/src/services/ledger/index.ts
@@ -497,10 +497,21 @@ export const LedgerService = (): ILedgerService => {
     | AsyncGenerator<LedgerTransaction<WalletCurrency>>
     | LedgerServiceError {
     try {
+      const bankOwnerWalletId = await caching.getBankOwnerWalletId()
+      const dealerUsdWalletId = await caching.getDealerUsdWalletId()
+      const dealerBtcWalletId = await caching.getDealerBtcWalletId()
+
+      const excludedAccounts = [
+        toLiabilitiesWalletId(bankOwnerWalletId),
+        toLiabilitiesWalletId(dealerUsdWalletId),
+        toLiabilitiesWalletId(dealerBtcWalletId),
+      ]
+
       const transactions = Transaction.find({
         type: LedgerTransactionType.OnchainPayment,
         pending: true,
         account_path: liabilitiesMainAccount,
+        accounts: { $nin: excludedAccounts },
       }).cursor({ batchSize: 100 })
 
       for await (const tx of transactions) {