mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-22 14:22:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove some legacy code

Browse source
This commit is contained in:
nicolas.dorier 2024-04-24 17:23:25 +09:00
parent 56d57bbd84
commit 22cf253183
No known key found for this signature in database
GPG key ID: 6618763EF09186FE
9 changed files with 21 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs
View file

@ -80,7 +80,7 @@ public partial class AltcoinsPlugin
foreach (var ZcashLikeSpecificBtcPayNetwork in supportedNetworks) foreach (var ZcashLikeSpecificBtcPayNetwork in supportedNetworks)
{ {
var daemonUri = var daemonUri =
configuration.GetOrDefault<Uri>($"{ZcashLikeSpecificBtcPayNetwork.CryptoCode}_daemon_uri", configuration.GetOrDefault<Uri?>($"{ZcashLikeSpecificBtcPayNetwork.CryptoCode}_daemon_uri",
null); null);
var walletDaemonUri = var walletDaemonUri =
configuration.GetOrDefault<Uri?>( configuration.GetOrDefault<Uri?>(

3
BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs
View file

@ -28,7 +28,6 @@ namespace BTCPayServer.Services.Altcoins.Monero.Payments
{ {
public class MoneroLikePaymentMethodHandler : IPaymentMethodHandler public class MoneroLikePaymentMethodHandler : IPaymentMethodHandler
{ {
internal static PaymentType MoneroLike => MoneroPaymentType.Instance;
private readonly MoneroLikeSpecificBtcPayNetwork _network; private readonly MoneroLikeSpecificBtcPayNetwork _network;
public MoneroLikeSpecificBtcPayNetwork Network => _network; public MoneroLikeSpecificBtcPayNetwork Network => _network;
public JsonSerializer Serializer { get; } public JsonSerializer Serializer { get; }
@ -38,7 +37,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.Payments
public MoneroLikePaymentMethodHandler(MoneroLikeSpecificBtcPayNetwork network, MoneroRPCProvider moneroRpcProvider) public MoneroLikePaymentMethodHandler(MoneroLikeSpecificBtcPayNetwork network, MoneroRPCProvider moneroRpcProvider)
{ {
PaymentMethodId = MoneroLike.GetPaymentMethodId(network.CryptoCode); PaymentMethodId = PaymentTypes.CHAIN.GetPaymentMethodId(network.CryptoCode);
_network = network; _network = network;
Serializer = BlobSerializer.CreateSerializer().Serializer; Serializer = BlobSerializer.CreateSerializer().Serializer;
_moneroRpcProvider = moneroRpcProvider; _moneroRpcProvider = moneroRpcProvider;

17
BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentType.cs
View file

@ -1,17 +0,0 @@
#if ALTCOINS
using System.Globalization;
using BTCPayServer.Payments;
using BTCPayServer.Plugins.Altcoins;
using BTCPayServer.Services.Invoices;
using NBitcoin;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace BTCPayServer.Services.Altcoins.Monero.Payments
{
internal class MoneroPaymentType
{
internal static readonly PaymentType Instance = new("MoneroLike");
}
}
#endif

10
BTCPayServer/Services/Altcoins/Monero/Services/MoneroListener.cs
View file

@ -157,7 +157,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.Services
var moneroWalletRpcClient = _moneroRpcProvider.WalletRpcClients[cryptoCode]; var moneroWalletRpcClient = _moneroRpcProvider.WalletRpcClients[cryptoCode];
var network = _networkProvider.GetNetwork(cryptoCode); var network = _networkProvider.GetNetwork(cryptoCode);
var paymentId = MoneroPaymentType.Instance.GetPaymentMethodId(network.CryptoCode); var paymentId = PaymentTypes.CHAIN.GetPaymentMethodId(network.CryptoCode);
var handler = (MoneroLikePaymentMethodHandler)_handlers[paymentId]; var handler = (MoneroLikePaymentMethodHandler)_handlers[paymentId];
//get all the required data in one list (invoice, its existing payments and the current payment method details) //get all the required data in one list (invoice, its existing payments and the current payment method details)
@ -273,7 +273,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.Services
private async Task OnTransactionUpdated(string cryptoCode, string transactionHash) private async Task OnTransactionUpdated(string cryptoCode, string transactionHash)
{ {
var paymentMethodId = MoneroPaymentType.Instance.GetPaymentMethodId(cryptoCode); var paymentMethodId = PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode);
var transfer = await _moneroRpcProvider.WalletRpcClients[cryptoCode] var transfer = await _moneroRpcProvider.WalletRpcClients[cryptoCode]
.SendCommandAsync<GetTransferByTransactionIdRequest, GetTransferByTransactionIdResponse>( .SendCommandAsync<GetTransferByTransactionIdRequest, GetTransferByTransactionIdResponse>(
"get_transfer_by_txid", "get_transfer_by_txid",
@ -324,7 +324,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.Services
BlockingCollection<(PaymentEntity Payment, InvoiceEntity invoice)> paymentsToUpdate) BlockingCollection<(PaymentEntity Payment, InvoiceEntity invoice)> paymentsToUpdate)
{ {
var network = _networkProvider.GetNetwork(cryptoCode); var network = _networkProvider.GetNetwork(cryptoCode);
var pmi = MoneroPaymentType.Instance.GetPaymentMethodId(network.CryptoCode); var pmi = PaymentTypes.CHAIN.GetPaymentMethodId(network.CryptoCode);
var handler = (MoneroLikePaymentMethodHandler)_handlers[pmi]; var handler = (MoneroLikePaymentMethodHandler)_handlers[pmi];
var promptDetails = handler.ParsePaymentPromptDetails(invoice.GetPaymentPrompt(pmi).Details); var promptDetails = handler.ParsePaymentPromptDetails(invoice.GetPaymentPrompt(pmi).Details);
var details = new MoneroLikePaymentData() var details = new MoneroLikePaymentData()
@ -397,7 +397,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.Services
var invoices = await _invoiceRepository.GetPendingInvoices(); var invoices = await _invoiceRepository.GetPendingInvoices();
if (!invoices.Any()) if (!invoices.Any())
return; return;
var paymentMethodId = MoneroPaymentType.Instance.GetPaymentMethodId(cryptoCode); var paymentMethodId = PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode);
invoices = invoices.Where(entity => entity.GetPaymentPrompt(paymentMethodId)?.Activated is true).ToArray(); invoices = invoices.Where(entity => entity.GetPaymentPrompt(paymentMethodId)?.Activated is true).ToArray();
await UpdatePaymentStates(cryptoCode, invoices); await UpdatePaymentStates(cryptoCode, invoices);
} }
@ -405,7 +405,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.Services
private IEnumerable<PaymentEntity> GetAllMoneroLikePayments(InvoiceEntity invoice, string cryptoCode) private IEnumerable<PaymentEntity> GetAllMoneroLikePayments(InvoiceEntity invoice, string cryptoCode)
{ {
return invoice.GetPayments(false) return invoice.GetPayments(false)
.Where(p => p.PaymentMethodId == MoneroPaymentType.Instance.GetPaymentMethodId(cryptoCode)); .Where(p => p.PaymentMethodId == PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode));
} }
} }
} }

10
BTCPayServer/Services/Altcoins/Monero/UI/MoneroLikeStoreController.cs
View file

@ -99,7 +99,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.UI
var monero = storeData.GetPaymentMethodConfigs(_handlers) var monero = storeData.GetPaymentMethodConfigs(_handlers)
.Where(s => s.Value is MoneroPaymentPromptDetails) .Where(s => s.Value is MoneroPaymentPromptDetails)
.Select(s => (PaymentMethodId: s.Key, Details: (MoneroPaymentPromptDetails)s.Value)); .Select(s => (PaymentMethodId: s.Key, Details: (MoneroPaymentPromptDetails)s.Value));
var pmi = MoneroPaymentType.Instance.GetPaymentMethodId(cryptoCode); var pmi = PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode);
var settings = monero.Where(method => method.PaymentMethodId == pmi).Select(m => m.Details).SingleOrDefault(); var settings = monero.Where(method => method.PaymentMethodId == pmi).Select(m => m.Details).SingleOrDefault();
_MoneroRpcProvider.Summaries.TryGetValue(cryptoCode, out var summary); _MoneroRpcProvider.Summaries.TryGetValue(cryptoCode, out var summary);
_MoneroLikeConfiguration.MoneroLikeConfigurationItems.TryGetValue(cryptoCode, _MoneroLikeConfiguration.MoneroLikeConfigurationItems.TryGetValue(cryptoCode,
@ -127,7 +127,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.UI
WalletFileFound = System.IO.File.Exists(fileAddress), WalletFileFound = System.IO.File.Exists(fileAddress),
Enabled = Enabled =
settings != null && settings != null &&
!excludeFilters.Match(MoneroPaymentType.Instance.GetPaymentMethodId(cryptoCode)), !excludeFilters.Match(PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode)),
Summary = summary, Summary = summary,
CryptoCode = cryptoCode, CryptoCode = cryptoCode,
AccountIndex = settings?.AccountIndex ?? accountsResponse?.SubaddressAccounts?.FirstOrDefault()?.AccountIndex ?? 0, AccountIndex = settings?.AccountIndex ?? accountsResponse?.SubaddressAccounts?.FirstOrDefault()?.AccountIndex ?? 0,
@ -278,7 +278,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.UI
var storeData = StoreData; var storeData = StoreData;
var blob = storeData.GetStoreBlob(); var blob = storeData.GetStoreBlob();
storeData.SetPaymentMethodConfig(_handlers[MoneroPaymentType.Instance.GetPaymentMethodId(cryptoCode)], new MoneroPaymentPromptDetails() storeData.SetPaymentMethodConfig(_handlers[PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode)], new MoneroPaymentPromptDetails()
{ {
AccountIndex = viewModel.AccountIndex, AccountIndex = viewModel.AccountIndex,
InvoiceSettledConfirmationThreshold = viewModel.SettlementConfirmationThresholdChoice switch InvoiceSettledConfirmationThreshold = viewModel.SettlementConfirmationThresholdChoice switch
@ -291,7 +291,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.UI
} }
}); });
blob.SetExcluded(MoneroPaymentType.Instance.GetPaymentMethodId(viewModel.CryptoCode), !viewModel.Enabled); blob.SetExcluded(PaymentTypes.CHAIN.GetPaymentMethodId(viewModel.CryptoCode), !viewModel.Enabled);
storeData.SetStoreBlob(blob); storeData.SetStoreBlob(blob);
await _StoreRepository.UpdateStore(storeData); await _StoreRepository.UpdateStore(storeData);
return RedirectToAction("GetStoreMoneroLikePaymentMethods", return RedirectToAction("GetStoreMoneroLikePaymentMethods",
@ -343,7 +343,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.UI
public IFormFile WalletKeysFile { get; set; } public IFormFile WalletKeysFile { get; set; }
[Display(Name = "Wallet Password")] [Display(Name = "Wallet Password")]
public string WalletPassword { get; set; } public string WalletPassword { get; set; }
[Display(Name = "Consider the invoice settled when the payment transaction <EFBFBD>")] [Display(Name = "Consider the invoice settled when the payment transaction �")]
public MoneroLikeSettlementThresholdChoice SettlementConfirmationThresholdChoice { get; set; } public MoneroLikeSettlementThresholdChoice SettlementConfirmationThresholdChoice { get; set; }
[Display(Name = "Required Confirmations"), Range(0, 100)] [Display(Name = "Required Confirmations"), Range(0, 100)]
public long? CustomSettlementConfirmationThreshold { get; set; } public long? CustomSettlementConfirmationThreshold { get; set; }

3
BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs
View file

@ -26,7 +26,6 @@ namespace BTCPayServer.Services.Altcoins.Zcash.Payments
{ {
public class ZcashLikePaymentMethodHandler : IPaymentMethodHandler public class ZcashLikePaymentMethodHandler : IPaymentMethodHandler
{ {
internal static PaymentType ZcashLike => ZcashPaymentType.Instance;
private readonly ZcashLikeSpecificBtcPayNetwork _network; private readonly ZcashLikeSpecificBtcPayNetwork _network;
public ZcashLikeSpecificBtcPayNetwork Network => _network; public ZcashLikeSpecificBtcPayNetwork Network => _network;
public JsonSerializer Serializer { get; } public JsonSerializer Serializer { get; }
@ -35,7 +34,7 @@ namespace BTCPayServer.Services.Altcoins.Zcash.Payments
public ZcashLikePaymentMethodHandler(BTCPayNetworkBase network, ZcashRPCProvider ZcashRpcProvider) public ZcashLikePaymentMethodHandler(BTCPayNetworkBase network, ZcashRPCProvider ZcashRpcProvider)
{ {
_network = (ZcashLikeSpecificBtcPayNetwork)network; _network = (ZcashLikeSpecificBtcPayNetwork)network;
PaymentMethodId = ZcashLike.GetPaymentMethodId(_network.CryptoCode); PaymentMethodId = PaymentTypes.CHAIN.GetPaymentMethodId(_network.CryptoCode);
Serializer = BlobSerializer.CreateSerializer().Serializer; Serializer = BlobSerializer.CreateSerializer().Serializer;
_ZcashRpcProvider = ZcashRpcProvider; _ZcashRpcProvider = ZcashRpcProvider;
} }

17
BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentType.cs
View file

@ -1,17 +0,0 @@
#if ALTCOINS
using System.Globalization;
using BTCPayServer.Payments;
using BTCPayServer.Plugins.Altcoins;
using BTCPayServer.Services.Invoices;
using NBitcoin;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace BTCPayServer.Services.Altcoins.Zcash.Payments
{
internal class ZcashPaymentType
{
internal static readonly PaymentType Instance = new("ZcashLike");
}
}
#endif

10
BTCPayServer/Services/Altcoins/Zcash/Services/ZcashListener.cs
View file

@ -155,7 +155,7 @@ namespace BTCPayServer.Services.Altcoins.Zcash.Services
var ZcashWalletRpcClient = _ZcashRpcProvider.WalletRpcClients[cryptoCode]; var ZcashWalletRpcClient = _ZcashRpcProvider.WalletRpcClients[cryptoCode];
var network = _networkProvider.GetNetwork(cryptoCode); var network = _networkProvider.GetNetwork(cryptoCode);
var paymentId = ZcashPaymentType.Instance.GetPaymentMethodId(network.CryptoCode); var paymentId = PaymentTypes.CHAIN.GetPaymentMethodId(network.CryptoCode);
var handler = (ZcashLikePaymentMethodHandler)_handlers[paymentId]; var handler = (ZcashLikePaymentMethodHandler)_handlers[paymentId];
//get all the required data in one list (invoice, its existing payments and the current payment method details) //get all the required data in one list (invoice, its existing payments and the current payment method details)
@ -271,7 +271,7 @@ namespace BTCPayServer.Services.Altcoins.Zcash.Services
private async Task OnTransactionUpdated(string cryptoCode, string transactionHash) private async Task OnTransactionUpdated(string cryptoCode, string transactionHash)
{ {
var paymentMethodId = ZcashPaymentType.Instance.GetPaymentMethodId(cryptoCode); var paymentMethodId = PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode);
var transfer = await _ZcashRpcProvider.WalletRpcClients[cryptoCode] var transfer = await _ZcashRpcProvider.WalletRpcClients[cryptoCode]
.SendCommandAsync<GetTransferByTransactionIdRequest, GetTransferByTransactionIdResponse>( .SendCommandAsync<GetTransferByTransactionIdRequest, GetTransferByTransactionIdResponse>(
"get_transfer_by_txid", "get_transfer_by_txid",
@ -322,7 +322,7 @@ namespace BTCPayServer.Services.Altcoins.Zcash.Services
BlockingCollection<(PaymentEntity Payment, InvoiceEntity invoice)> paymentsToUpdate) BlockingCollection<(PaymentEntity Payment, InvoiceEntity invoice)> paymentsToUpdate)
{ {
var network = _networkProvider.GetNetwork(cryptoCode); var network = _networkProvider.GetNetwork(cryptoCode);
var pmi = ZcashPaymentType.Instance.GetPaymentMethodId(network.CryptoCode); var pmi = PaymentTypes.CHAIN.GetPaymentMethodId(network.CryptoCode);
var handler = (ZcashLikePaymentMethodHandler)_handlers[pmi]; var handler = (ZcashLikePaymentMethodHandler)_handlers[pmi];
var details = new ZcashLikePaymentData() var details = new ZcashLikePaymentData()
@ -385,7 +385,7 @@ namespace BTCPayServer.Services.Altcoins.Zcash.Services
var invoices = await _invoiceRepository.GetPendingInvoices(); var invoices = await _invoiceRepository.GetPendingInvoices();
if (!invoices.Any()) if (!invoices.Any())
return; return;
var paymentMethodId = ZcashPaymentType.Instance.GetPaymentMethodId(cryptoCode); var paymentMethodId = PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode);
invoices = invoices.Where(entity => entity.GetPaymentPrompt(paymentMethodId).Activated).ToArray(); invoices = invoices.Where(entity => entity.GetPaymentPrompt(paymentMethodId).Activated).ToArray();
await UpdatePaymentStates(cryptoCode, invoices); await UpdatePaymentStates(cryptoCode, invoices);
} }
@ -393,7 +393,7 @@ namespace BTCPayServer.Services.Altcoins.Zcash.Services
private IEnumerable<PaymentEntity> GetAllZcashLikePayments(InvoiceEntity invoice, string cryptoCode) private IEnumerable<PaymentEntity> GetAllZcashLikePayments(InvoiceEntity invoice, string cryptoCode)
{ {
return invoice.GetPayments(false) return invoice.GetPayments(false)
.Where(p => p.PaymentMethodId == ZcashPaymentType.Instance.GetPaymentMethodId(cryptoCode)); .Where(p => p.PaymentMethodId == PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode));
} }
} }
} }

6
BTCPayServer/Services/Altcoins/Zcash/UI/ZcashLikeStoreController.cs
View file

@ -106,7 +106,7 @@ namespace BTCPayServer.Services.Altcoins.Zcash.UI
WalletFileFound = System.IO.File.Exists(fileAddress), WalletFileFound = System.IO.File.Exists(fileAddress),
Enabled = Enabled =
settings != null && settings != null &&
!excludeFilters.Match(ZcashPaymentType.Instance.GetPaymentMethodId(cryptoCode)), !excludeFilters.Match(PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode)),
Summary = summary, Summary = summary,
CryptoCode = cryptoCode, CryptoCode = cryptoCode,
AccountIndex = settings?.AccountIndex ?? accountsResponse?.SubaddressAccounts?.FirstOrDefault()?.AccountIndex ?? 0, AccountIndex = settings?.AccountIndex ?? accountsResponse?.SubaddressAccounts?.FirstOrDefault()?.AccountIndex ?? 0,
@ -249,13 +249,13 @@ namespace BTCPayServer.Services.Altcoins.Zcash.UI
var storeData = StoreData; var storeData = StoreData;
var blob = storeData.GetStoreBlob(); var blob = storeData.GetStoreBlob();
var pmi = ZcashPaymentType.Instance.GetPaymentMethodId(cryptoCode); var pmi = PaymentTypes.CHAIN.GetPaymentMethodId(cryptoCode);
storeData.SetPaymentMethodConfig(_handlers[pmi], new ZcashPaymentMethodConfig() storeData.SetPaymentMethodConfig(_handlers[pmi], new ZcashPaymentMethodConfig()
{ {
AccountIndex = viewModel.AccountIndex AccountIndex = viewModel.AccountIndex
}); });
blob.SetExcluded(ZcashPaymentType.Instance.GetPaymentMethodId(viewModel.CryptoCode), !viewModel.Enabled); blob.SetExcluded(PaymentTypes.CHAIN.GetPaymentMethodId(viewModel.CryptoCode), !viewModel.Enabled);
storeData.SetStoreBlob(blob); storeData.SetStoreBlob(blob);
await _StoreRepository.UpdateStore(storeData); await _StoreRepository.UpdateStore(storeData);
return RedirectToAction("GetStoreZcashLikePaymentMethods", return RedirectToAction("GetStoreZcashLikePaymentMethods",