No retries on withdrawals

Elenpay · Sep 9, 2024 · f386544 · f386544
1 parent a220b26
commit f386544
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/src/.vscode/launch.json b/src/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "${workspaceFolder}/bin/Debug/net8.0/NodeGuard.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "stopAtEntry": false,
+            "console": "internalConsole"
+        },
+    ]
+}
diff --git a/src/Jobs/PerformWithdrawalJob.cs b/src/Jobs/PerformWithdrawalJob.cs
@@ -52,20 +52,18 @@ public async Task Execute(IJobExecutionContext context)
         var withdrawalRequestId = data.GetInt("withdrawalRequestId");
         try
         {
-            await RetriableJob.Execute(context, async () =>
-            {
-                var withdrawalRequest = await _walletWithdrawalRequestRepository.GetById(withdrawalRequestId);
-                await _bitcoinService.PerformWithdrawal(withdrawalRequest);
-            });
+            var withdrawalRequest = await _walletWithdrawalRequestRepository.GetById(withdrawalRequestId);
+            await _bitcoinService.PerformWithdrawal(withdrawalRequest!);
         }
         catch (Exception e)
         {
-            await RetriableJob.OnFail(context, async () =>
+            var request = await _walletWithdrawalRequestRepository.GetById(withdrawalRequestId);
+            request!.Status = WalletWithdrawalRequestStatus.Failed;
+            var (updated, _) = _walletWithdrawalRequestRepository.Update(request);
+            if (!updated)
             {
-                var request = await _walletWithdrawalRequestRepository.GetById(withdrawalRequestId);
-                request.Status = WalletWithdrawalRequestStatus.Failed;
-                _walletWithdrawalRequestRepository.Update(request);
-            });
+                _logger.LogError("Failed to update withdrawal request status to failed");
+            }
 
             _logger.LogError(e, "Error on {JobName}", nameof(PerformWithdrawalJob));
             throw new JobExecutionException(e, false);

diff --git a/src/Services/BitcoinService.cs b/src/Services/BitcoinService.cs
@@ -404,6 +404,7 @@ public async Task PerformWithdrawal(WalletWithdrawalRequest walletWithdrawalRequ
                 if (transactionCheckResult != TransactionCheckResult.Success)
                 {
                     _logger.LogError("Invalid tx check reason: {Reason}", transactionCheckResult.Humanize());
+                    throw new InvalidOperationException($"Invalid tx check reason: {transactionCheckResult.Humanize()}");
                 }
 
                 var node = (await _nodeRepository.GetAllManagedByNodeGuard()).FirstOrDefault();