aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 22:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

broadcast hww payjopin immediately

Browse Source
This commit is contained in:
Kukks
2020-07-13 15:02:51 +02:00
parent 572c7ebbd8
commit eb14635a53
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
BTCPayServer/Controllers/WalletsController.PSBT.cs
View File

@@ -314,13 +314,6 @@ namespace BTCPayServer.Controllers
string error = null;
try
{
if (!string.IsNullOrEmpty(vm.SigningContext.OriginalPSBT) &&
!string.IsNullOrEmpty(vm.SigningContext.PSBT))
{
//if a hw device signed, we are sent back to the ready page with updated psbt data for final verification. If they are happy, they will click to broadcast with payjoin which brings us here.
return await WalletPSBTReady(walletId, vm, "broadcast");
}
var proposedPayjoin = await GetPayjoinProposedTX(new BitcoinUrlBuilder(vm.SigningContext.PayJoinBIP21, network.NBitcoinNetwork), psbt,
derivationSchemeSettings, network, cancellationToken);
try

6
BTCPayServer/Controllers/WalletsController.cs
View File

@@ -782,6 +782,12 @@ namespace BTCPayServer.Controllers
}
};
AddSigningContext(redirectVm, vm.SigningContext);
if (!string.IsNullOrEmpty(vm.SigningContext.OriginalPSBT) &&
!string.IsNullOrEmpty(vm.SigningContext.PSBT))
{
//if a hw device signed a payjoin, we want it broadcast instantly
redirectVm.Parameters.Add(new KeyValuePair<string, string>("command", "broadcast"));
}
return View("PostRedirect", redirectVm);
}