mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-03-03 17:36:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add AlwaysIncludeNonWitnessUTXO to Wallet Send

Browse source
This commit is contained in:
Kukks 2020-06-12 13:58:55 +02:00
parent 1889c33d80
commit b7c65b2ba6
4 changed files with 12 additions and 1 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> <ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" /> <FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="NBXplorer.Client" Version="3.0.15" /> <PackageReference Include="NBXplorer.Client" Version="3.0.16" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@ -46,6 +46,8 @@ namespace BTCPayServer.Controllers
psbtRequest.RBF = false; psbtRequest.RBF = false;
} }
psbtRequest.AlwaysIncludeNonWitnessUTXO = sendModel.AlwaysIncludeNonWitnessUTXO;
psbtRequest.FeePreference = new FeePreference(); psbtRequest.FeePreference = new FeePreference();
if (sendModel.FeeSatoshiPerByte is decimal v && if (sendModel.FeeSatoshiPerByte is decimal v &&
v > decimal.Zero) v > decimal.Zero)

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

@ -51,6 +51,8 @@ namespace BTCPayServer.Models.WalletViewModels
public string Fiat { get; set; } public string Fiat { get; set; }
public string RateError { get; set; } public string RateError { get; set; }
public bool SupportRBF { 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)")] [Display(Name = "Allow fee increase (RBF)")]
public ThreeStateBool AllowFeeBump { get; set; } public ThreeStateBool AllowFeeBump { get; set; }

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

@ -180,6 +180,13 @@
</a> </a>
</div> </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>
</div>
</div>
@if (Model.SupportRBF) @if (Model.SupportRBF)
{ {
<div class="form-group"> <div class="form-group">