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

Can update PSBT, fix the PSBT review page

Browse Source
This commit is contained in:
nicolas.dorier
2019-05-30 23:16:05 +09:00
parent 916323bb3b
commit 19bc511f39
4 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,6 +86,20 @@ namespace BTCPayServer.Controllers
return View(vm);
case "ledger":
return ViewWalletSendLedger(psbt);
case "update":
var derivationSchemeSettings = await GetDerivationSchemeSettings(walletId);
psbt = await UpdatePSBT(derivationSchemeSettings, psbt, network);
if (psbt == null)
{
StatusMessage = "Error: You need to update NBXplorer";
return View(vm);
}
ModelState.Remove(nameof(vm.PSBT));
ModelState.Remove(nameof(vm.UploadedPSBTFile));
vm.PSBT = psbt.ToBase64();
vm.Decoded = psbt.ToString();
StatusMessage = "PSBT updated!";
return View(vm);
case "seed":
return SignWithSeed(walletId, psbt.ToBase64());
case "broadcast":
@@ -102,6 +116,19 @@ namespace BTCPayServer.Controllers
}
}
private async Task<PSBT> UpdatePSBT(DerivationSchemeSettings derivationSchemeSettings, PSBT psbt, BTCPayNetwork network)
{
var result = await ExplorerClientProvider.GetExplorerClient(network).UpdatePSBTAsync(new UpdatePSBTRequest()
{
PSBT = psbt,
DerivationScheme = derivationSchemeSettings.AccountDerivation,
});
if (result == null)
return null;
derivationSchemeSettings.RebaseKeyPaths(result.PSBT);
return result.PSBT;
}
[HttpGet]
[Route("{walletId}/psbt/ready")]
public async Task<IActionResult> WalletPSBTReady(
@@ -122,12 +149,12 @@ namespace BTCPayServer.Controllers
return View(nameof(WalletPSBTReady), vm);
}
private Task FetchTransactionDetails(DerivationSchemeSettings derivationSchemeSettings, WalletPSBTReadyViewModel vm, BTCPayNetwork network)
private async Task FetchTransactionDetails(DerivationSchemeSettings derivationSchemeSettings, WalletPSBTReadyViewModel vm, BTCPayNetwork network)
{
var psbtObject = PSBT.Parse(vm.PSBT, network.NBitcoinNetwork);
psbtObject = await UpdatePSBT(derivationSchemeSettings, psbtObject, network) ?? psbtObject;
IHDKey signingKey = null;
RootedKeyPath signingKeyPath = null;
try
{
signingKey = new BitcoinExtPubKey(vm.SigningKey, network.NBitcoinNetwork);
@@ -203,7 +230,6 @@ namespace BTCPayServer.Controllers
{
vm.SetErrors(errors);
}
return Task.CompletedTask;
}
[HttpPost]