Unnecesary psbt addition fix (#167)

* refactor(ChannelRequests.razor): remove redundant code and simplify signature collection process style(ChannelRequests.razor): replace IScheduler with var for consistency and readability * fix(ChannelOperationRequest.cs): check if Wallet is not null before accessing IsHotWallet to prevent null reference exception feat(ChannelRequests.razor): add validation for required human signatures before creating a job fix(LightningService.cs): update signedPsbts condition to include hot wallet check for better filtering * feat(LightningServiceTests.cs): add Wallet property to ChannelOperationRequest in test to support SingleSig wallets --------- Co-authored-by: Marcos <[email protected]>
Elenpay · May 11, 2023 · 035ca2c · 035ca2c
1 parent 2b6bd51
commit 035ca2c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 28 deletions.
diff --git a/src/Data/Models/ChannelOperationRequest.cs b/src/Data/Models/ChannelOperationRequest.cs
@@ -150,7 +150,8 @@ private bool CheckSignatures()
                 var userPSBTsCount = NumberOfSignaturesCollected;
 
                 //We add the internal Wallet signature
-                if(!Wallet.IsHotWallet) userPSBTsCount++;
+                if (Wallet != null && Wallet.IsHotWallet) return ChannelOperationRequestPsbts.Count(x=> x.IsTemplatePSBT) == 1;
+                userPSBTsCount++;
 
                 if (userPSBTsCount == Wallet.MofN)
                 {

diff --git a/src/Pages/ChannelRequests.razor b/src/Pages/ChannelRequests.razor
@@ -744,38 +744,22 @@
                 return;
             }
 
-            var channelOperationRequestPSBT = new ChannelOperationRequestPSBT()
-            {
-                ChannelOperationRequestId = _selectedRequest.Id,
-                PSBT = templatePsbt.ToBase64(),
-                UserSignerId = null,
-            };
-            var addResult = await ChannelOperationRequestPsbtRepository.AddAsync(channelOperationRequestPSBT);
-            if (addResult.Item1)
-            {
-                ToastService.ShowSuccess("Signature collected");
 
-                _selectedRequest = await ChannelOperationRequestRepository.GetById(_selectedRequest.Id);
+            _selectedRequest = await ChannelOperationRequestRepository.GetById(_selectedRequest.Id);
 
-                if (_selectedRequest != null
-                    && _selectedRequest.AreAllRequiredHumanSignaturesCollected)
-                {
-                    await CreateJob();
-                }
-                else
-                {
-                    ToastService.ShowError("Invalid PSBT");
-                }
+            if (_selectedRequest != null
+                && _selectedRequest.AreAllRequiredHumanSignaturesCollected)
+            {
+                await CreateJob();
             }
             else
             {
-                ToastService.ShowError("Error while saving the signature");
+                ToastService.ShowError("Invalid PSBT");
             }
+
 
             await FetchRequests();
-            _allRequestsDatagrid.Dispose();
-            StateHasChanged();
-            _approveOperationConfirmationModal.CloseModal();
+            await _approveOperationConfirmationModal.CloseModal();
         }
     }
 
@@ -784,7 +768,7 @@
         try
         {
             //TODO Async notifications when the channel has opened -> event / notifications system
-            IScheduler scheduler = await SchedulerFactory.GetScheduler();
+            var scheduler = await SchedulerFactory.GetScheduler();
 
             var map = new JobDataMap();
             map.Put("openRequestId", _selectedRequest.Id);

diff --git a/src/Services/LightningService.cs b/src/Services/LightningService.cs
@@ -575,7 +575,7 @@ public static PSBT GetCombinedPsbt(ChannelOperationRequest channelOperationReque
         {
             //PSBT Combine
             var signedPsbts = channelOperationRequest.ChannelOperationRequestPsbts.Where(x =>
-                    !x.IsFinalisedPSBT && !x.IsInternalWalletPSBT && !x.IsTemplatePSBT);
+                    channelOperationRequest.Wallet != null && !x.IsFinalisedPSBT && !x.IsInternalWalletPSBT && (channelOperationRequest.Wallet.IsHotWallet || !x.IsTemplatePSBT));
             var signedPsbts2 = signedPsbts.Select(x => x.PSBT);
 
             var combinedPSBT = LightningHelper.CombinePSBTs(signedPsbts2, _logger);

diff --git a/test/FundsManager.Tests/Services/LightningServiceTests.cs b/test/FundsManager.Tests/Services/LightningServiceTests.cs
@@ -343,7 +343,8 @@ public void GetCombinedPsbt_CombinedPSBTExists()
             };
             var operationRequest = new ChannelOperationRequest()
             {
-                ChannelOperationRequestPsbts = channelOpReqPsbts
+                ChannelOperationRequestPsbts = channelOpReqPsbts,
+                Wallet = CreateWallet.SingleSig(_internalWallet)
             };
 
             // Act