From 0cf6d39f02190c3ca4898c3b374aec9fdd0e6f81 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Fri, 6 Oct 2023 09:06:17 +0200 Subject: [PATCH] If shitcoins are removed, dont try to hash its cryptocode for nbx (#5373) --- BTCPayServer/Data/AddressInvoiceDataExtensions.cs | 2 +- BTCPayServer/Services/Invoices/InvoiceRepository.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BTCPayServer/Data/AddressInvoiceDataExtensions.cs b/BTCPayServer/Data/AddressInvoiceDataExtensions.cs index 4d2a52942..b5615ad6b 100644 --- a/BTCPayServer/Data/AddressInvoiceDataExtensions.cs +++ b/BTCPayServer/Data/AddressInvoiceDataExtensions.cs @@ -29,7 +29,7 @@ namespace BTCPayServer.Data if (index == -1) return PaymentMethodId.Parse("BTC"); ///////////////////////// - return PaymentMethodId.Parse(addressInvoiceData.Address.Substring(index + 1)); + return PaymentMethodId.TryParse(addressInvoiceData.Address.Substring(index + 1)); } #pragma warning restore CS0618 } diff --git a/BTCPayServer/Services/Invoices/InvoiceRepository.cs b/BTCPayServer/Services/Invoices/InvoiceRepository.cs index d76cfee16..0253658ce 100644 --- a/BTCPayServer/Services/Invoices/InvoiceRepository.cs +++ b/BTCPayServer/Services/Invoices/InvoiceRepository.cs @@ -584,7 +584,7 @@ namespace BTCPayServer.Services.Invoices entity.RefundMail = invoice.CustomerEmail; if (invoice.AddressInvoices != null) { - entity.AvailableAddressHashes = invoice.AddressInvoices.Select(a => a.GetAddress() + a.GetPaymentMethodId().ToString()).ToHashSet(); + entity.AvailableAddressHashes = invoice.AddressInvoices.Select(a => a.GetAddress() + a.GetPaymentMethodId()).ToHashSet(); } if (invoice.Events != null) {