From 2fa77458860704bc4a00f0bc66a8b43feff6b26c Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 19 Dec 2023 12:23:20 +0900 Subject: [PATCH] Select 1 hour as default fee rate --- BTCPayServer/Controllers/UIWalletsController.cs | 4 ++-- BTCPayServer/Services/Fees/FallbackFeeProvider.cs | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/BTCPayServer/Controllers/UIWalletsController.cs b/BTCPayServer/Controllers/UIWalletsController.cs index afae515a0..644056ce2 100644 --- a/BTCPayServer/Controllers/UIWalletsController.cs +++ b/BTCPayServer/Controllers/UIWalletsController.cs @@ -512,9 +512,9 @@ namespace BTCPayServer.Controllers await Task.WhenAll(recommendedFees); model.RecommendedSatoshiPerByte = - recommendedFees.Select(tuple => tuple.Result).Where(option => option != null).ToList(); + recommendedFees.Select(tuple => tuple.GetAwaiter().GetResult()).Where(option => option != null).ToList(); - model.FeeSatoshiPerByte = model.RecommendedSatoshiPerByte.LastOrDefault()?.FeeRate; + model.FeeSatoshiPerByte = recommendedFees[1].GetAwaiter().GetResult()?.FeeRate; model.SupportRBF = network.SupportRBF; model.CryptoDivisibility = network.Divisibility; diff --git a/BTCPayServer/Services/Fees/FallbackFeeProvider.cs b/BTCPayServer/Services/Fees/FallbackFeeProvider.cs index ccf78c28a..186e0ffac 100644 --- a/BTCPayServer/Services/Fees/FallbackFeeProvider.cs +++ b/BTCPayServer/Services/Fees/FallbackFeeProvider.cs @@ -8,8 +8,15 @@ using NBitcoin; namespace BTCPayServer.Services.Fees { - public class FallbackFeeProvider(IFeeProvider[] Providers) : IFeeProvider + public class FallbackFeeProvider : IFeeProvider { + public FallbackFeeProvider(IFeeProvider[] providers) + { + Providers = providers; + } + + public IFeeProvider[] Providers { get; } + public async Task GetFeeRateAsync(int blockTarget = 20) { for (int i = 0; i < Providers.Length; i++)