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

bump

Browse Source
This commit is contained in:
nicolas.dorier
2019-05-13 08:55:26 +09:00
parent a7edbfe5e9
commit d1556eb6cd
6 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,6 +64,7 @@ namespace BTCPayServer.Controllers
if (command == null)
{
vm.Decoded = psbt.ToString();
vm.FileName = string.Empty;
return View(vm);
}
else if (command == "ledger")
@@ -96,11 +97,11 @@ namespace BTCPayServer.Controllers
ModelState.Remove(nameof(vm.PSBT));
return View(nameof(WalletPSBTCombine), new WalletPSBTCombineViewModel() { OtherPSBT = psbt.ToBase64() });
}
else
else if (command == "save-psbt")
{
(await GetDerivationSchemeSettings(walletId)).RebaseKeyPaths(psbt);
return FilePSBT(psbt, "psbt-export.psbt");
return FilePSBT(psbt, vm.FileName);
}
return View(vm);
}
[HttpGet]
@@ -171,13 +172,18 @@ namespace BTCPayServer.Controllers
private IActionResult ViewPSBT<T>(PSBT psbt, IEnumerable<T> errors = null)
{
return ViewPSBT(psbt, errors?.Select(e => e.ToString()).ToList());
return ViewPSBT(psbt, null, errors?.Select(e => e.ToString()).ToList());
}
private IActionResult ViewPSBT(PSBT psbt, IEnumerable<string> errors = null)
{
return ViewPSBT(psbt, null, errors);
}
private IActionResult ViewPSBT(PSBT psbt, string fileName, IEnumerable<string> errors = null)
{
return View(nameof(WalletPSBT), new WalletPSBTViewModel()
{
Decoded = psbt.ToString(),
FileName = fileName ?? string.Empty,
PSBT = psbt.ToBase64(),
Errors = errors?.ToList()
});