mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-03-04 09:58:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove replace hardcoded BTC string to default network (#3654)

Browse source
This commit is contained in:
Nicolas Dorier 2022-04-20 10:20:39 +09:00 • committed by GitHub
parent 75afd30008
commit 2e08c29c64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
BTCPayServer/Components/StoreNumbers/StoreNumbers.cs
View file

@ -17,7 +17,7 @@ namespace BTCPayServer.Components.StoreNumbers;
public class StoreNumbers : ViewComponent public class StoreNumbers : ViewComponent
{ {
private const string CryptoCode = "BTC"; private string CryptoCode;
private const int TransactionDays = 7; private const int TransactionDays = 7;
private readonly StoreRepository _storeRepo; private readonly StoreRepository _storeRepo;
@ -35,6 +35,7 @@ public class StoreNumbers : ViewComponent
_walletProvider = walletProvider; _walletProvider = walletProvider;
_networkProvider = networkProvider; _networkProvider = networkProvider;
_dbContextFactory = dbContextFactory; _dbContextFactory = dbContextFactory;
CryptoCode = networkProvider.DefaultNetwork.CryptoCode;
} }
public async Task<IViewComponentResult> InvokeAsync(StoreData store) public async Task<IViewComponentResult> InvokeAsync(StoreData store)

3
BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactions.cs
View file

@ -21,7 +21,7 @@ namespace BTCPayServer.Components.StoreRecentTransactions;
public class StoreRecentTransactions : ViewComponent public class StoreRecentTransactions : ViewComponent
{ {
private const string CryptoCode = "BTC"; private string CryptoCode;
private readonly StoreRepository _storeRepo; private readonly StoreRepository _storeRepo;
private readonly ApplicationDbContextFactory _dbContextFactory; private readonly ApplicationDbContextFactory _dbContextFactory;
private readonly BTCPayWalletProvider _walletProvider; private readonly BTCPayWalletProvider _walletProvider;
@ -41,6 +41,7 @@ public class StoreRecentTransactions : ViewComponent
ConnectionFactory = connectionFactory; ConnectionFactory = connectionFactory;
_walletProvider = walletProvider; _walletProvider = walletProvider;
_dbContextFactory = dbContextFactory; _dbContextFactory = dbContextFactory;
CryptoCode = networkProvider.DefaultNetwork.CryptoCode;
} }

5
BTCPayServer/Components/StoreWalletBalance/StoreWalletBalance.cs
View file

@ -18,16 +18,17 @@ namespace BTCPayServer.Components.StoreWalletBalance;
public class StoreWalletBalance : ViewComponent public class StoreWalletBalance : ViewComponent
{ {
private const string CryptoCode = "BTC"; private string CryptoCode;
private const WalletHistogramType DefaultType = WalletHistogramType.Week; private const WalletHistogramType DefaultType = WalletHistogramType.Week;
private readonly StoreRepository _storeRepo; private readonly StoreRepository _storeRepo;
private readonly WalletHistogramService _walletHistogramService; private readonly WalletHistogramService _walletHistogramService;
public StoreWalletBalance(StoreRepository storeRepo, WalletHistogramService walletHistogramService) public StoreWalletBalance(StoreRepository storeRepo, WalletHistogramService walletHistogramService, BTCPayNetworkProvider networkProvider)
{ {
_storeRepo = storeRepo; _storeRepo = storeRepo;
_walletHistogramService = walletHistogramService; _walletHistogramService = walletHistogramService;
CryptoCode = networkProvider.DefaultNetwork.CryptoCode;
} }
public async Task<IViewComponentResult> InvokeAsync(StoreData store) public async Task<IViewComponentResult> InvokeAsync(StoreData store)

6
BTCPayServer/Controllers/UIInvoiceController.UI.cs
View file

@ -568,8 +568,8 @@ namespace BTCPayServer.Controllers
} }
if (paymentMethodId is null) if (paymentMethodId is null)
{ {
paymentMethodId = enabledPaymentIds.FirstOrDefault(e => e.CryptoCode == "BTC" && e.PaymentType == PaymentTypes.BTCLike) ?? paymentMethodId = enabledPaymentIds.FirstOrDefault(e => e.CryptoCode == _NetworkProvider.DefaultNetwork.CryptoCode && e.PaymentType == PaymentTypes.BTCLike) ??
enabledPaymentIds.FirstOrDefault(e => e.CryptoCode == "BTC" && e.PaymentType == PaymentTypes.LightningLike) ?? enabledPaymentIds.FirstOrDefault(e => e.CryptoCode == _NetworkProvider.DefaultNetwork.CryptoCode && e.PaymentType == PaymentTypes.LightningLike) ??
enabledPaymentIds.FirstOrDefault(); enabledPaymentIds.FirstOrDefault();
} }
isDefaultPaymentId = true; isDefaultPaymentId = true;
@ -689,7 +689,7 @@ namespace BTCPayServer.Controllers
}) })
}; };
}).Where(c => c.CryptoImage != "/") }).Where(c => c.CryptoImage != "/")
.OrderByDescending(a => a.CryptoCode == "BTC").ThenBy(a => a.PaymentMethodName).ThenBy(a => a.IsLightning ? 1 : 0) .OrderByDescending(a => a.CryptoCode == _NetworkProvider.DefaultNetwork.CryptoCode).ThenBy(a => a.PaymentMethodName).ThenBy(a => a.IsLightning ? 1 : 0)
.ToList() .ToList()
}; };
paymentMethodHandler.PreparePaymentModel(model, dto, storeBlob, paymentMethod); paymentMethodHandler.PreparePaymentModel(model, dto, storeBlob, paymentMethod);

4
BTCPayServer/Controllers/UIStoresController.cs
View file

@ -464,8 +464,8 @@ namespace BTCPayServer.Controllers
var defaultChoice = defaultPaymentId is not null ? defaultPaymentId.FindNearest(enabled) : null; var defaultChoice = defaultPaymentId is not null ? defaultPaymentId.FindNearest(enabled) : null;
if (defaultChoice is null) if (defaultChoice is null)
{ {
defaultChoice = enabled.FirstOrDefault(e => e.CryptoCode == "BTC" && e.PaymentType == PaymentTypes.BTCLike) ?? defaultChoice = enabled.FirstOrDefault(e => e.CryptoCode == _NetworkProvider.DefaultNetwork.CryptoCode && e.PaymentType == PaymentTypes.BTCLike) ??
enabled.FirstOrDefault(e => e.CryptoCode == "BTC" && e.PaymentType == PaymentTypes.LightningLike) ?? enabled.FirstOrDefault(e => e.CryptoCode == _NetworkProvider.DefaultNetwork.CryptoCode && e.PaymentType == PaymentTypes.LightningLike) ??
enabled.FirstOrDefault(); enabled.FirstOrDefault();
} }
var choices = GetEnabledPaymentMethodChoices(storeData); var choices = GetEnabledPaymentMethodChoices(storeData);

2
BTCPayServer/ModelBinders/DerivationSchemeModelBinder.cs
View file

@ -32,7 +32,7 @@ namespace BTCPayServer.ModelBinders
var networkProvider = (BTCPayNetworkProvider)bindingContext.HttpContext.RequestServices.GetService(typeof(BTCPayNetworkProvider)); var networkProvider = (BTCPayNetworkProvider)bindingContext.HttpContext.RequestServices.GetService(typeof(BTCPayNetworkProvider));
var cryptoCode = bindingContext.ValueProvider.GetValue("cryptoCode").FirstValue; var cryptoCode = bindingContext.ValueProvider.GetValue("cryptoCode").FirstValue;
var network = networkProvider.GetNetwork<BTCPayNetwork>(cryptoCode ?? "BTC"); var network = networkProvider.GetNetwork<BTCPayNetwork>(cryptoCode ?? networkProvider.DefaultNetwork.CryptoCode);
try try
{ {
var data = network.NBXplorerNetwork.DerivationStrategyFactory.Parse(key); var data = network.NBXplorerNetwork.DerivationStrategyFactory.Parse(key);