mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-22 22:25:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1659 from Kukks/psbt-fullprev

Browse source 
Add AlwaysIncludeNonWitnessUTXO to Wallet Send
This commit is contained in:
Nicolas Dorier 2020-06-14 22:47:57 +09:00 • committed by GitHub
commit 0000257dcc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BTCPayServer.Common/BTCPayServer.Common.csproj
View file

@ -4,6 +4,6 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="NBXplorer.Client" Version="3.0.15" />
<PackageReference Include="NBXplorer.Client" Version="3.0.16" />
</ItemGroup>
</Project>

2
BTCPayServer/Controllers/WalletsController.PSBT.cs
View file

@ -45,6 +45,8 @@ namespace BTCPayServer.Controllers
if (sendModel.AllowFeeBump is WalletSendModel.ThreeStateBool.No)
psbtRequest.RBF = false;
}
psbtRequest.AlwaysIncludeNonWitnessUTXO = sendModel.AlwaysIncludeNonWitnessUTXO;
psbtRequest.FeePreference = new FeePreference();
if (sendModel.FeeSatoshiPerByte is decimal v &&

2
BTCPayServer/Models/WalletViewModels/WalletSendModel.cs
View file

@ -51,6 +51,8 @@ namespace BTCPayServer.Models.WalletViewModels
public string Fiat { get; set; }
public string RateError { get; set; }
public bool SupportRBF { get; set; }
[Display(Name = "Always include non-witness UTXO if available")]
public bool AlwaysIncludeNonWitnessUTXO { get; set; }
[Display(Name = "Allow fee increase (RBF)")]
public ThreeStateBool AllowFeeBump { get; set; }

11
BTCPayServer/Views/Wallets/WalletSend.cshtml
View file

@ -179,7 +179,16 @@
<span class="fa fa-question-circle-o" title="More information..."></span>
</a>
</div>
</div>
</div>
<div class="form-group">
<div class="form-check">
<input asp-for="AlwaysIncludeNonWitnessUTXO" class="form-check-input"/>
<label asp-for="AlwaysIncludeNonWitnessUTXO" class="form-check-label"></label>
<a href="https://medium.com/@jmacato/wasabi-wallets-advisory-for-trezor-users-7d942c727f92" target="_blank">
<span class="fa fa-question-circle-o" title="More information..."></span>
</a>
</div>
</div>
@if (Model.SupportRBF)
{
<div class="form-group">