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

Decouple taproot activation from support in generate wallet (#2837)

Browse Source
This commit is contained in:
Nicolas Dorier
2021-09-04 22:07:09 +09:00
committed by GitHub
parent 1422bd8540
commit e584ebe7de
7 changed files with 79 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,9 @@ namespace BTCPayServer.Controllers
vm.RootKeyPath = network.GetRootKeyPath();
vm.CanUseHotWallet = hotWallet;
vm.CanUseRPCImport = rpcImport;
vm.CanUseTaproot = TaprootSupported(vm.CryptoCode);
vm.SupportTaproot = network.NBitcoinNetwork.Consensus.SupportTaproot;
vm.SupportSegwit = network.NBitcoinNetwork.Consensus.SupportSegwit;
vm.IsTaprootActivated = TaprootActivated(vm.CryptoCode);
if (vm.Method == null)
{
@@ -110,11 +112,6 @@ namespace BTCPayServer.Controllers
try
{
strategy = ParseDerivationStrategy(vm.DerivationScheme, network);
if(strategy.AccountDerivation is TaprootDerivationStrategy && !TaprootSupported(vm.CryptoCode))
{
ModelState.AddModelError(nameof(vm.DerivationScheme), "Taproot is not supported");
return View(vm.ViewName, vm);
}
strategy.Source = "ManualDerivationScheme";
if (!string.IsNullOrEmpty(vm.AccountKey))
{
@@ -214,7 +211,9 @@ namespace BTCPayServer.Controllers
vm.CanUseHotWallet = hotWallet;
vm.CanUseRPCImport = rpcImport;
vm.CanUseTaproot = TaprootSupported(vm.CryptoCode);
vm.SupportTaproot = network.NBitcoinNetwork.Consensus.SupportTaproot;
vm.SupportSegwit = network.NBitcoinNetwork.Consensus.SupportSegwit;
vm.IsTaprootActivated = TaprootActivated(vm.CryptoCode);
vm.RootKeyPath = network.GetRootKeyPath();
vm.Network = network;
@@ -266,14 +265,11 @@ namespace BTCPayServer.Controllers
IsHotWallet = isImport ? request.SavePrivateKeys : method == WalletSetupMethod.HotWallet,
DerivationSchemeFormat = "BTCPay",
CanUseHotWallet = hotWallet,
CanUseRPCImport = rpcImport
CanUseRPCImport = rpcImport,
IsTaprootActivated = TaprootActivated(cryptoCode),
SupportTaproot = network.NBitcoinNetwork.Consensus.SupportTaproot,
SupportSegwit = network.NBitcoinNetwork.Consensus.SupportSegwit
};
if (request.ScriptPubKeyType == ScriptPubKeyType.TaprootBIP86 && !TaprootSupported(cryptoCode) )
{
ModelState.AddModelError(nameof(request.ScriptPubKeyType), $"Taproot not supported");
return View(vm.ViewName, vm);
}
if (isImport && string.IsNullOrEmpty(request.ExistingMnemonic))
{

11
BTCPayServer/Controllers/StoresController.cs
View File

@@ -146,11 +146,16 @@ namespace BTCPayServer.Controllers
}
}
public bool TaprootSupported(string crytoCode)
public bool TaprootActivated(string crytoCode)
{
var networkSupport = ((BTCPayNetwork)_NetworkProvider.GetNetwork(crytoCode))?.NBitcoinNetwork?.Consensus?.SupportTaproot is true;
var network = (BTCPayNetwork)_NetworkProvider.GetNetwork(crytoCode);
#pragma warning disable CS0618
if (!(network.IsBTC && network.NBitcoinNetwork.ChainName == ChainName.Mainnet))
// Consider it activated for everything that is not mainnet bitcoin
return true;
#pragma warning restore CS0618
var status = _Dashboard.Get(crytoCode).Status;
return networkSupport && !(status.NetworkType == ChainName.Mainnet && status.ChainHeight < 709632);
return status.ChainHeight >= 709632;
}

6
BTCPayServer/Models/StoreViewModels/DerivationSchemeViewModel.cs
View File

@@ -39,8 +39,10 @@ namespace BTCPayServer.Models.StoreViewModels
public bool CanUseHotWallet { get; set; }
[Display(Name = "Can use RPC import")]
public bool CanUseRPCImport { get; set; }
[Display(Name = "Can use Taproot")]
public bool CanUseTaproot { get; set; }
public bool SupportSegwit { get; set; }
public bool SupportTaproot { get; set; }
[Display(Name = "Is taproot activated")]
public bool IsTaprootActivated { get; set; }
public RootedKeyPath GetAccountKeypath()
{
if (KeyPath != null && RootFingerprint != null &&

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

@@ -7,7 +7,9 @@
ViewData.SetActivePageAndTitle(StoreNavPages.Wallet, $"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.CanUseTaproot), Model.CanUseTaproot);
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);
}

4
BTCPayServer/Views/Stores/ImportWallet/Seed.cshtml
View File

@@ -21,7 +21,9 @@
{
ViewData.Add(nameof(Model.CanUseHotWallet), Model.CanUseHotWallet);
ViewData.Add(nameof(Model.CanUseRPCImport), Model.CanUseRPCImport);
ViewData.Add(nameof(Model.CanUseTaproot), Model.CanUseTaproot);
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);
<partial name="_GenerateWalletForm" model="Model.SetupRequest" />

57
BTCPayServer/Views/Stores/ImportWallet/Xpub.cshtml
View File

@@ -47,32 +47,35 @@
</tr>
</thead>
<tbody>
<tr>
<td rowspan="4">P2WPKH</td>
<td class="font-monospace">xpub…</td>
</tr>
<tr>
<td class="font-monospace">zpub…</td>
</tr>
<tr>
<td class="font-monospace">wpkh(xpub…/0/*)</td>
</tr>
<tr>
<td class="font-monospace">wpkh([…/84'/0'/0']xpub…/0/*)</td>
</tr>
<tr>
<td rowspan="4">P2SH-P2WPKH</td>
<td class="font-monospace">xpub…-[p2sh]</td>
</tr>
<tr>
<td class="font-monospace">ypub…</td>
</tr>
<tr>
<td class="font-monospace">sh(wpkh(xpub…/0/*)</td>
</tr>
<tr>
<td class="font-monospace">sh(wpkh([…/49'/0'/0']xpub…/0/*)</td>
</tr>
@if (Model.SupportSegwit)
{
<tr>
<td rowspan="4">P2WPKH</td>
<td class="font-monospace">xpub…</td>
</tr>
<tr>
<td class="font-monospace">zpub…</td>
</tr>
<tr>
<td class="font-monospace">wpkh(xpub…/0/*)</td>
</tr>
<tr>
<td class="font-monospace">wpkh([…/84'/0'/0']xpub…/0/*)</td>
</tr>
<tr>
<td rowspan="4">P2SH-P2WPKH</td>
<td class="font-monospace">xpub…-[p2sh]</td>
</tr>
<tr>
<td class="font-monospace">ypub…</td>
</tr>
<tr>
<td class="font-monospace">sh(wpkh(xpub…/0/*)</td>
</tr>
<tr>
<td class="font-monospace">sh(wpkh([…/49'/0'/0']xpub…/0/*)</td>
</tr>
}
<tr>
<td rowspan="3">P2PKH</td>
<td class="font-monospace">xpub…-[legacy]</td>
@@ -83,7 +86,7 @@
<tr>
<td class="font-monospace">pkh(xpub…/0/*)</td>
</tr>
@if (Model.CanUseTaproot)
@if (Model.SupportTaproot && Model.IsTaprootActivated)
{
<tr>
<td rowspan="1">P2TR</td>

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

@@ -7,7 +7,7 @@
var isHotWallet = method is WalletSetupMethod.HotWallet;
var canUseHotWallet = ViewData["CanUseHotWallet"] is true;
var canUseRpcImport = ViewData["CanUseRPCImport"] is true;
var canUseTaproot = ViewData["CanUseTaproot"] is true;
var isTaprootActivated = ViewData["IsTaprootActivated"] is true;
}
@if (!User.IsInRole(Roles.ServerAdmin))
@@ -34,12 +34,27 @@
<div class="form-group">
<label asp-for="ScriptPubKeyType" class="form-label">Address type</label>
<select class="form-select w-auto" asp-for="ScriptPubKeyType">
<option value="@ScriptPubKeyType.Segwit">Segwit (Recommended, cheapest transaction fee)</option>
<option value="@ScriptPubKeyType.SegwitP2SH">Segwit wrapped (Compatible with old wallets)</option>
<option value="@ScriptPubKeyType.Legacy">Legacy (Not recommended)</option>
@if (canUseTaproot)
@if (ViewData["SupportSegwit"] is true)
{
<option value="@ScriptPubKeyType.TaprootBIP86">Taproot (ONLY FOR DEVELOPMENT)</option>
<option value="@ScriptPubKeyType.Segwit">Segwit (Recommended)</option>
<option value="@ScriptPubKeyType.SegwitP2SH">Segwit wrapped (Compatible with old wallets)</option>
<option value="@ScriptPubKeyType.Legacy">Legacy (Not recommended)</option>
}
else
{
<option value="@ScriptPubKeyType.Legacy">Legacy</option>
}
@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>
}
}
</select>
<span asp-validation-for="ScriptPubKeyType" class="text-danger"></span>