mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2024-11-19 18:11:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove taproot activation code

Browse Source
This commit is contained in:
nicolas.dorier 2021-11-15 23:03:10 +09:00
parent b196bad75f
commit 2f5f397d33
No known key found for this signature in database
GPG Key ID: 6618763EF09186FE
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BTCPayServer/Controllers/StoresController.Onchain.cs
View File

@ -58,7 +58,6 @@ namespace BTCPayServer.Controllers
vm.CanUseRPCImport = rpcImport;
vm.SupportTaproot = network.NBitcoinNetwork.Consensus.SupportTaproot;
vm.SupportSegwit = network.NBitcoinNetwork.Consensus.SupportSegwit;
vm.IsTaprootActivated = TaprootActivated(vm.CryptoCode);
if (vm.Method == null)
{
@ -213,7 +212,6 @@ namespace BTCPayServer.Controllers
vm.CanUseRPCImport = rpcImport;
vm.SupportTaproot = network.NBitcoinNetwork.Consensus.SupportTaproot;
vm.SupportSegwit = network.NBitcoinNetwork.Consensus.SupportSegwit;
vm.IsTaprootActivated = TaprootActivated(vm.CryptoCode);
vm.Network = network;
if (vm.Method == null)
@ -264,7 +262,6 @@ namespace BTCPayServer.Controllers
DerivationSchemeFormat = "BTCPay",
CanUseHotWallet = hotWallet,
CanUseRPCImport = rpcImport,
IsTaprootActivated = TaprootActivated(cryptoCode),
SupportTaproot = network.NBitcoinNetwork.Consensus.SupportTaproot,
SupportSegwit = network.NBitcoinNetwork.Consensus.SupportSegwit
};

1
BTCPayServer/Views/Stores/GenerateWallet.cshtml
View File

@ -7,7 +7,6 @@
ViewData.SetActivePageAndTitle(StoreNavPages.PaymentMethods, $"Create {Model.CryptoCode} {type} Wallet", Context.GetStoreData().StoreName);
ViewData.Add(nameof(Model.CanUseHotWallet), Model.CanUseHotWallet);
ViewData.Add(nameof(Model.CanUseRPCImport), Model.CanUseRPCImport);
ViewData.Add(nameof(Model.IsTaprootActivated), Model.IsTaprootActivated);
ViewData.Add(nameof(Model.SupportSegwit), Model.SupportSegwit);
ViewData.Add(nameof(Model.SupportTaproot), Model.SupportTaproot);
ViewData.Add(nameof(Model.Method), Model.Method);

9
BTCPayServer/Views/Stores/_GenerateWalletForm.cshtml
View File

@ -47,14 +47,7 @@
@if (ViewData["SupportTaproot"] is true)
{
@if (isTaprootActivated)
{
<option value="@ScriptPubKeyType.TaprootBIP86">Taproot (For advanced users)</option>
}
else
{
<option value="@ScriptPubKeyType.TaprootBIP86" disabled>Taproot (Available from block 709632)</option>
}
<option value="@ScriptPubKeyType.TaprootBIP86">Taproot (For advanced users)</option>
}
</select>
<span asp-validation-for="ScriptPubKeyType" class="text-danger"></span>