diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml
index 0ea276438..549501959 100644
--- a/BTCPayServer.Tests/docker-compose.yml
+++ b/BTCPayServer.Tests/docker-compose.yml
@@ -46,7 +46,7 @@ services:
- lightning-charged
nbxplorer:
- image: nicolasdorier/nbxplorer:1.0.2.2
+ image: nicolasdorier/nbxplorer:1.0.2.3
ports:
- "32838:32838"
expose:
@@ -89,7 +89,7 @@ services:
- "bitcoin_datadir:/data"
customer_lightningd:
- image: nicolasdorier/clightning:0.0.0.11-dev
+ image: nicolasdorier/clightning:0.0.0.12-dev
environment:
EXPOSE_TCP: "true"
LIGHTNINGD_OPT: |
diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj
index ce03eb9b7..558d120bc 100644
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@@ -43,7 +43,7 @@
-
+
diff --git a/BTCPayServer/Rating/CurrencyPair.cs b/BTCPayServer/Rating/CurrencyPair.cs
index c9a6c6e9e..adeacd603 100644
--- a/BTCPayServer/Rating/CurrencyPair.cs
+++ b/BTCPayServer/Rating/CurrencyPair.cs
@@ -45,6 +45,11 @@ namespace BTCPayServer.Rating
var currencyPair = splitted[0];
if (currencyPair.Length < 6 || currencyPair.Length > 10)
return false;
+ if (currencyPair.Length == 6)
+ {
+ value = new CurrencyPair(currencyPair.Substring(0,3), currencyPair.Substring(3, 3));
+ return true;
+ }
for (int i = 3; i < 5; i++)
{
var potentialCryptoName = currencyPair.Substring(0, i);
diff --git a/BTCPayServer/Services/Fees/NBxplorerFeeProvider.cs b/BTCPayServer/Services/Fees/NBxplorerFeeProvider.cs
index f5f1f8d3b..7a55d51d5 100644
--- a/BTCPayServer/Services/Fees/NBxplorerFeeProvider.cs
+++ b/BTCPayServer/Services/Fees/NBxplorerFeeProvider.cs
@@ -39,6 +39,8 @@ namespace BTCPayServer.Services.Fees
ExplorerClient _ExplorerClient;
public async Task GetFeeRateAsync()
{
+ if (!_ExplorerClient.Network.SupportEstimatesSmartFee)
+ return _Factory.Fallback;
try
{
return (await _ExplorerClient.GetFeeRateAsync(_Factory.BlockTarget).ConfigureAwait(false)).FeeRate;