Use NBitcoin's Network.UriScheme rather than our own (#3005)

This commit is contained in:
Nicolas Dorier
2021-10-23 14:47:15 +09:00
committed by GitHub
parent c46a69e1bd
commit 86e528e5df
28 changed files with 16 additions and 39 deletions

View File

@@ -753,11 +753,6 @@ namespace BTCPayServer.Controllers
vm.Outputs ??= new List<WalletSendModel.TransactionOutput>();
try
{
if (bip21.StartsWith(network.UriScheme, StringComparison.InvariantCultureIgnoreCase))
{
bip21 = $"bitcoin{bip21.Substring(network.UriScheme.Length)}";
}
var uriBuilder = new NBitcoin.Payment.BitcoinUrlBuilder(bip21, network.NBitcoinNetwork);
vm.Outputs.Add(new WalletSendModel.TransactionOutput()
@@ -1096,7 +1091,7 @@ namespace BTCPayServer.Controllers
var vm = new WalletSettingsViewModel()
{
StoreName = store.StoreName,
UriScheme = derivationSchemeSettings.Network.UriScheme,
UriScheme = derivationSchemeSettings.Network.NBitcoinNetwork.UriScheme,
Label = derivationSchemeSettings.Label,
DerivationScheme = derivationSchemeSettings.AccountDerivation.ToString(),
DerivationSchemeInput = derivationSchemeSettings.AccountOriginal,