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

Remove useless code (#2852)

Browse Source
This commit is contained in:
Nicolas Dorier 2021-09-07 19:18:56 +09:00 committed by GitHub
parent 180be49824
commit 14a10eeef8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
BTCPayServer.Common/BTCPayNetwork.cs
View File

@ -70,40 +70,6 @@ namespace BTCPayServer
public bool SupportPayJoin { get; set; } = false; public bool SupportPayJoin { get; set; } = false;
public bool SupportLightning { get; set; } = true; public bool SupportLightning { get; set; } = true;
public KeyPath GetRootKeyPath(DerivationType type)
{
KeyPath baseKey;
if (!NBitcoinNetwork.Consensus.SupportSegwit)
{
baseKey = new KeyPath("44'");
}
else
{
switch (type)
{
case DerivationType.Legacy:
baseKey = new KeyPath("44'");
break;
case DerivationType.SegwitP2SH:
baseKey = new KeyPath("49'");
break;
case DerivationType.Segwit:
baseKey = new KeyPath("84'");
break;
default:
throw new ArgumentOutOfRangeException(nameof(type), type, null);
}
}
return baseKey
.Derive(CoinType);
}
public KeyPath GetRootKeyPath()
{
return new KeyPath(NBitcoinNetwork.Consensus.SupportSegwit ? "49'" : "44'")
.Derive(CoinType);
}
public override T ToObject<T>(string json) public override T ToObject<T>(string json)
{ {
return NBXplorerNetwork.Serializer.ToObject<T>(json); return NBXplorerNetwork.Serializer.ToObject<T>(json);

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

@ -52,7 +52,6 @@ namespace BTCPayServer.Controllers
var (hotWallet, rpcImport) = await CanUseHotWallet(); var (hotWallet, rpcImport) = await CanUseHotWallet();
vm.Network = network; vm.Network = network;
vm.RootKeyPath = network.GetRootKeyPath();
vm.CanUseHotWallet = hotWallet; vm.CanUseHotWallet = hotWallet;
vm.CanUseRPCImport = rpcImport; vm.CanUseRPCImport = rpcImport;
vm.SupportTaproot = network.NBitcoinNetwork.Consensus.SupportTaproot; vm.SupportTaproot = network.NBitcoinNetwork.Consensus.SupportTaproot;
@ -82,7 +81,6 @@ namespace BTCPayServer.Controllers
} }
vm.Network = network; vm.Network = network;
vm.RootKeyPath = network.GetRootKeyPath();
DerivationSchemeSettings strategy = null; DerivationSchemeSettings strategy = null;
var wallet = _WalletProvider.GetWallet(network); var wallet = _WalletProvider.GetWallet(network);
@ -214,7 +212,6 @@ namespace BTCPayServer.Controllers
vm.SupportTaproot = network.NBitcoinNetwork.Consensus.SupportTaproot; vm.SupportTaproot = network.NBitcoinNetwork.Consensus.SupportTaproot;
vm.SupportSegwit = network.NBitcoinNetwork.Consensus.SupportSegwit; vm.SupportSegwit = network.NBitcoinNetwork.Consensus.SupportSegwit;
vm.IsTaprootActivated = TaprootActivated(vm.CryptoCode); vm.IsTaprootActivated = TaprootActivated(vm.CryptoCode);
vm.RootKeyPath = network.GetRootKeyPath();
vm.Network = network; vm.Network = network;
if (vm.Method == null) if (vm.Method == null)
@ -260,7 +257,6 @@ namespace BTCPayServer.Controllers
SetupRequest = request, SetupRequest = request,
Confirmation = string.IsNullOrEmpty(request.ExistingMnemonic), Confirmation = string.IsNullOrEmpty(request.ExistingMnemonic),
Network = network, Network = network,
RootKeyPath = network.GetRootKeyPath(),
Source = isImport ? "SeedImported" : "NBXplorerGenerated", Source = isImport ? "SeedImported" : "NBXplorerGenerated",
IsHotWallet = isImport ? request.SavePrivateKeys : method == WalletSetupMethod.HotWallet, IsHotWallet = isImport ? request.SavePrivateKeys : method == WalletSetupMethod.HotWallet,
DerivationSchemeFormat = "BTCPay", DerivationSchemeFormat = "BTCPay",
@ -389,7 +385,6 @@ namespace BTCPayServer.Controllers
vm.CanUseHotWallet = hotWallet; vm.CanUseHotWallet = hotWallet;
vm.CanUseRPCImport = rpcImport; vm.CanUseRPCImport = rpcImport;
vm.RootKeyPath = network.GetRootKeyPath();
vm.Network = network; vm.Network = network;
vm.Source = derivation.Source; vm.Source = derivation.Source;
vm.RootFingerprint = derivation.GetSigningAccountKeySettings().RootFingerprint.ToString(); vm.RootFingerprint = derivation.GetSigningAccountKeySettings().RootFingerprint.ToString();

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

@ -22,8 +22,6 @@ namespace BTCPayServer.Models.StoreViewModels
public string RootFingerprint { get; set; } public string RootFingerprint { get; set; }
public bool Confirmation { get; set; } public bool Confirmation { get; set; }
public KeyPath RootKeyPath { get; set; }
[Display(Name = "Wallet file")] [Display(Name = "Wallet file")]
public IFormFile WalletFile { get; set; } public IFormFile WalletFile { get; set; }
[Display(Name = "Wallet file content")] [Display(Name = "Wallet file content")]