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

Pass the hint change address to hardware wallet (useful in care of send-to-self where the underlying wallet support only output belonging to self)

Browse Source
This commit is contained in:
nicolas.dorier
2019-05-07 08:21:34 +09:00
parent e2b2cf0175
commit 08bf4faeee
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
BTCPayServer/Controllers/WalletsController.cs
View File

@@ -504,17 +504,17 @@ namespace BTCPayServer.Controllers
{ {
psbtRequest.ExplicitChangeAddress = destinationPSBT.Destination; psbtRequest.ExplicitChangeAddress = destinationPSBT.Destination;
} }
var psbt = (await nbx.CreatePSBTAsync(derivationScheme, psbtRequest, normalOperationTimeout.Token))?.PSBT; var psbt = (await nbx.CreatePSBTAsync(derivationScheme, psbtRequest, normalOperationTimeout.Token));
if (psbt == null) if (psbt == null)
throw new Exception("You need to update your version of NBXplorer"); throw new Exception("You need to update your version of NBXplorer");
if (network.MinFee != null) if (network.MinFee != null)
{ {
psbt.TryGetFee(out var fee); psbt.PSBT.TryGetFee(out var fee);
if (fee < network.MinFee) if (fee < network.MinFee)
{ {
psbtRequest.FeePreference = new FeePreference() { ExplicitFee = network.MinFee }; psbtRequest.FeePreference = new FeePreference() { ExplicitFee = network.MinFee };
psbt = (await nbx.CreatePSBTAsync(derivationScheme, psbtRequest, normalOperationTimeout.Token)).PSBT; psbt = (await nbx.CreatePSBTAsync(derivationScheme, psbtRequest, normalOperationTimeout.Token));
} }
} }
@@ -538,7 +538,7 @@ namespace BTCPayServer.Controllers
// Here we rebase the hd_keys in the PSBT to have a keypath relative to the root HD so the wallet can sign // Here we rebase the hd_keys in the PSBT to have a keypath relative to the root HD so the wallet can sign
// Note that the fingerprint of the hd keys are now 0, which is wrong // Note that the fingerprint of the hd keys are now 0, which is wrong
// However, hardware wallets does not give a damn, and sometimes does not even allow us to get this fingerprint anyway. // However, hardware wallets does not give a damn, and sometimes does not even allow us to get this fingerprint anyway.
foreach (var o in psbt.Inputs.OfType<PSBTCoin>().Concat(psbt.Outputs)) foreach (var o in psbt.PSBT.Inputs.OfType<PSBTCoin>().Concat(psbt.PSBT.Outputs))
{ {
foreach (var keypath in o.HDKeyPaths.ToList()) foreach (var keypath in o.HDKeyPaths.ToList())
{ {
@@ -549,12 +549,12 @@ namespace BTCPayServer.Controllers
} }
signTimeout.CancelAfter(TimeSpan.FromMinutes(5)); signTimeout.CancelAfter(TimeSpan.FromMinutes(5));
psbt = await hw.SignTransactionAsync(psbt, signTimeout.Token); psbt.PSBT = await hw.SignTransactionAsync(psbt.PSBT, psbt.ChangeAddress?.ScriptPubKey, signTimeout.Token);
if(!psbt.TryFinalize(out var errors)) if(!psbt.PSBT.TryFinalize(out var errors))
{ {
throw new Exception($"Error while finalizing the transaction ({new PSBTException(errors).ToString()})"); throw new Exception($"Error while finalizing the transaction ({new PSBTException(errors).ToString()})");
} }
var transaction = psbt.ExtractTransaction(); var transaction = psbt.PSBT.ExtractTransaction();
try try
{ {
var broadcastResult = await nbx.BroadcastAsync(transaction); var broadcastResult = await nbx.BroadcastAsync(transaction);

6
BTCPayServer/Services/HardwareWalletService.cs
View File

@@ -164,13 +164,15 @@ namespace BTCPayServer.Services
return foundKeyPath; return foundKeyPath;
} }
public async Task<PSBT> SignTransactionAsync(PSBT psbt, public async Task<PSBT> SignTransactionAsync(PSBT psbt, Script changeHint,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
try try
{ {
var unsigned = psbt.GetGlobalTransaction(); var unsigned = psbt.GetGlobalTransaction();
var changeKeyPath = psbt.Outputs.Where(o => o.HDKeyPaths.Any()) var changeKeyPath = psbt.Outputs
.Where(o => changeHint == null ? true : changeHint == o.ScriptPubKey)
.Where(o => o.HDKeyPaths.Any())
.Select(o => o.HDKeyPaths.First().Value.Item2) .Select(o => o.HDKeyPaths.First().Value.Item2)
.FirstOrDefault(); .FirstOrDefault();
var signatureRequests = psbt var signatureRequests = psbt