Compare commits

...

3 Commits

Author SHA1 Message Date
e6a609a1a4 bump and changelog for 1.6.7 2022-08-10 10:06:06 +02:00
892ea2fd7b Fix Kraken rate provider 2022-08-10 09:55:15 +02:00
746a0600bf Upgrade Lightning library 2022-08-10 09:55:01 +02:00
5 changed files with 26 additions and 11 deletions

View File

@ -177,9 +177,15 @@ namespace BTCPayServer.Services.Rates
var result = JsonConvert.DeserializeObject<T>(stringResult);
if (result is JToken json)
{
if (!(json is JArray) && json["result"] is JObject {Count: > 0} pairResult)
{
return (T)(object)(pairResult);
}
if (!(json is JArray) && json["error"] is JArray error && error.Count != 0)
{
throw new APIException(error[0].ToStringInvariant());
throw new APIException(string.Join("\n",
error.Select(token => token.ToStringInvariant()).Distinct()));
}
result = (T)(object)(json["result"] ?? json);
}

View File

@ -72,10 +72,10 @@ namespace BTCPayServer.Tests
}
[Fact]
public void CanQueryDirectProviders()
public async Task CanQueryDirectProviders()
{
// TODO: Check once in a while whether or not they are working again
string[] brokenShitcoinCasinos = { "okex" };
string[] brokenShitcoinCasinos = { };
var factory = FastTests.CreateBTCPayRateFactory();
var directlySupported = factory.GetSupportedExchanges().Where(s => s.Source == RateSource.Direct)
.Select(s => s.Id).ToHashSet();
@ -154,12 +154,11 @@ namespace BTCPayServer.Tests
// Kraken emit one request only after first GetRates
factory.Providers["kraken"].GetRatesAsync(default).GetAwaiter().GetResult();
using (var c = new HttpClient())
{
var p = new ExchangeSharpRateProvider<ExchangeSharp.ExchangeKrakenAPI>(c);
var rates = p.GetRatesAsync(default).GetAwaiter().GetResult();
Assert.Contains(rates, e => e.CurrencyPair == new CurrencyPair("XXMR", "XXBT") && e.BidAsk.Bid < 1.0m);
}
var p = new KrakenExchangeRateProvider();
var rates = await p.GetRatesAsync(default);
Assert.Contains(rates, e => e.CurrencyPair == new CurrencyPair("XMR", "BTC") && e.BidAsk.Bid < 1.0m);
}
[Fact]

View File

@ -48,7 +48,7 @@
<ItemGroup>
<PackageReference Include="BIP78.Sender" Version="0.2.2" />
<PackageReference Include="BTCPayServer.Hwi" Version="2.0.2" />
<PackageReference Include="BTCPayServer.Lightning.All" Version="1.3.12" />
<PackageReference Include="BTCPayServer.Lightning.All" Version="1.3.13" />
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
<PackageReference Include="BundlerMinifier.Core" Version="3.2.435" />
<PackageReference Include="BundlerMinifier.TagHelpers" Version="3.2.435" />

View File

@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<Version>1.6.6</Version>
<Version>1.6.7</Version>
</PropertyGroup>
</Project>

View File

@ -1,5 +1,15 @@
# Changelog
## 1.6.7
### Improvement:
* Improve LNDHub support @dennisreimann
### Bug fixes:
* Fix Kraken rate source (#4027) @Kukks
## 1.6.6
### Bug fixes: