aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-18 06:24:24 +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

4
BTCPayServer.Common/BTCPayServer.Common.csproj
View File

@@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" />
<PackageReference Include="NBitcoin" Version="4.1.2.32" />
<PackageReference Include="NBXplorer.Client" Version="2.0.0.16" />
<PackageReference Include="NBitcoin" Version="4.1.2.35" />
<PackageReference Include="NBXplorer.Client" Version="2.0.0.17" />
</ItemGroup>
</Project>

2
BTCPayServer.Tests/docker-compose.yml
View File

@@ -71,7 +71,7 @@ services:
nbxplorer:
image: nicolasdorier/nbxplorer:2.0.0.45
image: nicolasdorier/nbxplorer:2.0.0.48
restart: unless-stopped
ports:
- "32838:32838"

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]

15
BTCPayServer/Views/Wallets/WalletPSBT.cshtml
View File

@@ -27,19 +27,28 @@
<h3>Decoded PSBT</h3>
<div class="form-group">
<form method="post" asp-action="WalletPSBT">
<input type="hidden" asp-for="PSBT" />
<input type="hidden" asp-for="FileName" />
<div class="dropdown" style="margin-top:16px;">
<button class="btn btn-primary dropdown-toggle" type="button" id="SendMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Sign with...
</button>
<input type="hidden" asp-for="PSBT" />
<input type="hidden" asp-for="FileName" />
<div class="dropdown-menu" aria-labelledby="SendMenu">
<button name="command" type="submit" class="dropdown-item" value="ledger">... your Ledger Wallet device</button>
<button name="command" type="submit" class="dropdown-item" value="seed">... an HD private key or mnemonic seed</button>
<button name="command" type="submit" class="dropdown-item" value="save-psbt">... a wallet supporting PSBT (save as file)</button>
</div>
</div>
<div class="dropdown" style="margin-top:16px;">
<button class="btn btn-primary dropdown-toggle" type="button" id="OtherActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Other actions...
</button>
<div class="dropdown-menu" aria-labelledby="OtherActions">
<button name="command" type="submit" class="btn btn-secondary" value="broadcast">Review</button>
<button name="command" type="submit" class="btn btn-secondary" value="combine">Combine with another PSBT</button>
<button name="command" type="submit" class="btn btn-secondary" value="update">Update</button>
<button name="command" type="submit" class="btn btn-secondary" value="combine">Combine</button>
</div>
</div>
</form>
</div>