bump

BTCPayServer.Tests/UnitTest1.cs

@@ -265,7 +265,7 @@ namespace BTCPayServer.Tests
                 var user = tester.NewAccount();
                 user.GrantAccess();
                 user.RegisterDerivationScheme("BTC");
-                
+
                 // Set tolerance to 50%
                 var stores = user.GetController<StoresController>();
                 var vm = Assert.IsType<StoreViewModel>(Assert.IsType<ViewResult>(stores.UpdateStore()).Model);
@@ -296,6 +296,22 @@ namespace BTCPayServer.Tests
             }
         }
 
+        [Fact]
+        public void RoundupCurrenciesCorrectly()
+        {
+            foreach(var test in new[] 
+            {
+                (0.0005m, "$0.0005 (USD)"),
+                (0.001m, "$0.001 (USD)"),
+                (0.01m, "$0.01 (USD)"),
+                (0.1m, "$0.10 (USD)"),
+            })
+            {
+                var actual = InvoiceController.FormatCurrency(test.Item1, "USD", new CurrencyNameTable());
+                Assert.Equal(test.Item2, actual);
+            }
+        }
+
         [Fact]
         public void CanPayUsingBIP70()
         {
@@ -617,7 +633,7 @@ namespace BTCPayServer.Tests
                     ItemDesc = "Some description",
                     FullNotifications = true
                 }, Facade.Merchant);
-                
+
                 var cashCow = tester.ExplorerNode;
                 var invoiceAddress = BitcoinAddress.Create(invoice.CryptoInfo[0].Address, cashCow.Network);
                 var firstPayment = invoice.CryptoInfo[0].TotalDue - Money.Satoshis(10);
@@ -1411,7 +1427,7 @@ namespace BTCPayServer.Tests
         {
             var provider = new BTCPayNetworkProvider(NetworkType.Mainnet);
             var factory = CreateBTCPayRateFactory(provider);
-            
+
             foreach (var result in factory
                 .DirectProviders
                 .Select(p => (ExpectedName: p.Key, ResultAsync: p.Value.GetRatesAsync()))
@@ -1423,8 +1439,8 @@ namespace BTCPayServer.Tests
                 Assert.NotEmpty(exchangeRates.ByExchange[result.ExpectedName]);
 
                 // This check if the currency pair is using right currency pair
-                Assert.Contains(exchangeRates.ByExchange[result.ExpectedName], 
-                        e => ( e.CurrencyPair == new CurrencyPair("BTC", "USD") ||
+                Assert.Contains(exchangeRates.ByExchange[result.ExpectedName],
+                        e => (e.CurrencyPair == new CurrencyPair("BTC", "USD") ||
                                e.CurrencyPair == new CurrencyPair("BTC", "EUR") ||
                                e.CurrencyPair == new CurrencyPair("BTC", "USDT"))
                                && e.Value > 1.0m // 1BTC will always be more than 1USD
@@ -1454,7 +1470,7 @@ namespace BTCPayServer.Tests
 
         private static BTCPayRateProviderFactory CreateBTCPayRateFactory(BTCPayNetworkProvider provider)
         {
-            return new BTCPayRateProviderFactory(new MemoryCacheOptions() { ExpirationScanFrequency = TimeSpan.FromSeconds(1.0) }, provider, null, new CoinAverageSettings());
+            return new BTCPayRateProviderFactory(new MemoryCacheOptions() { ExpirationScanFrequency = TimeSpan.FromSeconds(1.0) }, provider, new CoinAverageSettings());
         }
 
         [Fact]
@@ -1470,7 +1486,6 @@ namespace BTCPayServer.Tests
             RateRules.TryParse("X_X = coinaverage(X_X);", out var rateRules);
 
             var factory = CreateBTCPayRateFactory(provider);
-            factory.DirectProviders.Clear();
             factory.CacheSpan = TimeSpan.FromSeconds(10);
 
             var fetchedRate = factory.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.2.16</Version>
+		<Version>1.0.2.18</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>
@@ -41,7 +41,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
     <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.6.0" />
     <PackageReference Include="NBitcoin" Version="4.1.1.7" />
-    <PackageReference Include="NBitpayClient" Version="1.0.0.20" />	  
+    <PackageReference Include="NBitpayClient" Version="1.0.0.21" />	  
     <PackageReference Include="DBreeze" Version="1.87.0" />
     <PackageReference Include="NBXplorer.Client" Version="1.0.2.8" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.1" />

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -51,7 +51,7 @@ namespace BTCPayServer.Controllers
                 StoreLink = Url.Action(nameof(StoresController.UpdateStore), "Stores", new { storeId = store.Id }),
                 Id = invoice.Id,
                 Status = invoice.Status,
-                TransactionSpeed = invoice.SpeedPolicy == SpeedPolicy.HighSpeed ? "high" : 
+                TransactionSpeed = invoice.SpeedPolicy == SpeedPolicy.HighSpeed ? "high" :
                                    invoice.SpeedPolicy == SpeedPolicy.MediumSpeed ? "medium" :
                                    invoice.SpeedPolicy == SpeedPolicy.LowMediumSpeed ? "low-medium" :
                                    "low",
@@ -61,7 +61,7 @@ namespace BTCPayServer.Controllers
                 MonitoringDate = invoice.MonitoringExpiration,
                 OrderId = invoice.OrderId,
                 BuyerInformation = invoice.BuyerInformation,
-                Fiat = FormatCurrency((decimal)dto.Price, dto.Currency),
+                Fiat = FormatCurrency((decimal)dto.Price, dto.Currency, _CurrencyNameTable),
                 NotificationUrl = invoice.NotificationURL,
                 RedirectUrl = invoice.RedirectURL,
                 ProductInformation = invoice.ProductInformation,
@@ -291,11 +291,29 @@ namespace BTCPayServer.Controllers
         private string FormatCurrency(PaymentMethod paymentMethod)
         {
             string currency = paymentMethod.ParentEntity.ProductInformation.Currency;
-            return FormatCurrency(paymentMethod.Rate, currency);
+            return FormatCurrency(paymentMethod.Rate, currency, _CurrencyNameTable);
         }
-        public string FormatCurrency(decimal price, string currency)
+        public static string FormatCurrency(decimal price, string currency, CurrencyNameTable currencies)
         {
-            return price.ToString("C", _CurrencyNameTable.GetCurrencyProvider(currency)) + $" ({currency})";
+            var provider = ((CultureInfo)currencies.GetCurrencyProvider(currency)).NumberFormat;
+            var currencyData = currencies.GetCurrencyData(currency);
+            var divisibility = currencyData.Divisibility;
+            while (true)
+            {
+                var rounded = decimal.Round(price, divisibility, MidpointRounding.AwayFromZero);
+                if ((Math.Abs(rounded - price) / price) < 0.001m)
+                {
+                    price = rounded;
+                    break;
+                }
+                divisibility++;
+            }
+            if(divisibility != provider.CurrencyDecimalDigits)
+            {
+                provider = (NumberFormatInfo)provider.Clone();
+                provider.CurrencyDecimalDigits = divisibility;
+            }
+            return price.ToString("C", provider) + $" ({currency})";
         }
 
         [HttpGet]
@@ -430,7 +448,7 @@ namespace BTCPayServer.Controllers
             var stores = await _StoreRepository.GetStoresByUserId(GetUserId());
             model.Stores = new SelectList(stores, nameof(StoreData.Id), nameof(StoreData.StoreName), model.StoreId);
             var store = stores.FirstOrDefault(s => s.Id == model.StoreId);
-            if(store == null)
+            if (store == null)
             {
                 ModelState.AddModelError(nameof(model.StoreId), "Store not found");
             }

BTCPayServer/Controllers/StoresController.cs

@@ -53,8 +53,7 @@ namespace BTCPayServer.Controllers
             ExplorerClientProvider explorerProvider,
             IFeeProviderFactory feeRateProvider,
             LanguageService langService,
-            IHostingEnvironment env,
-            CoinAverageSettings coinAverage)
+            IHostingEnvironment env)
         {
             _RateFactory = rateFactory;
             _Dashboard = dashboard;
@@ -72,9 +71,7 @@ namespace BTCPayServer.Controllers
             _ServiceProvider = serviceProvider;
             _BtcpayServerOptions = btcpayServerOptions;
             _BTCPayEnv = btcpayEnv;
-            _CoinAverage = coinAverage;
         }
-        CoinAverageSettings _CoinAverage;
         NBXplorerDashboard _Dashboard;
         BTCPayServerOptions _BtcpayServerOptions;
         BTCPayServerEnvironment _BTCPayEnv;
@@ -518,7 +515,7 @@ namespace BTCPayServer.Controllers
 
         private CoinAverageExchange[] GetSupportedExchanges()
         {
-            return _CoinAverage.AvailableExchanges
+            return _RateFactory.GetSupportedExchanges()
                     .Select(c => c.Value)
                     .OrderBy(s => s.Name, StringComparer.OrdinalIgnoreCase)
                     .ToArray();

BTCPayServer/Payments/Lightning/Charge/ChargeClient.cs

@@ -156,7 +156,7 @@ namespace BTCPayServer.Payments.Lightning.Charge
 
         async Task<LightningInvoice> ILightningInvoiceClient.CreateInvoice(LightMoney amount, string description, TimeSpan expiry, CancellationToken cancellation)
         {
-            var invoice = await CreateInvoiceAsync(new CreateInvoiceRequest() { Amount = amount, Expiry = expiry, Description = description ?? "" });
+            var invoice = await CreateInvoiceAsync(new CreateInvoiceRequest() { Amount = amount, Expiry = expiry, Description = description ?? "" }, cancellation);
             return new LightningInvoice() { Id = invoice.Id, Amount = amount, BOLT11 = invoice.PayReq, Status = "unpaid" };
         }
 

BTCPayServer/Services/Rates/BTCPayRateProviderFactory.cs

@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
 using ExchangeSharp;
@@ -35,7 +36,6 @@ namespace BTCPayServer.Services.Rates
         }
         IMemoryCache _Cache;
         private IOptions<MemoryCacheOptions> _CacheOptions;
-        CurrencyNameTable _CurrencyTable;
         public IMemoryCache Cache
         {
             get
@@ -46,12 +46,10 @@ namespace BTCPayServer.Services.Rates
         CoinAverageSettings _CoinAverageSettings;
         public BTCPayRateProviderFactory(IOptions<MemoryCacheOptions> cacheOptions,
                                          BTCPayNetworkProvider btcpayNetworkProvider,
-                                         CurrencyNameTable currencyTable,
                                          CoinAverageSettings coinAverageSettings)
         {
             if (cacheOptions == null)
                 throw new ArgumentNullException(nameof(cacheOptions));
-            _CurrencyTable = currencyTable;
             _CoinAverageSettings = coinAverageSettings;
             _Cache = new MemoryCache(cacheOptions);
             _CacheOptions = cacheOptions;
@@ -70,10 +68,12 @@ namespace BTCPayServer.Services.Rates
             DirectProviders.Add("bittrex", new ExchangeSharpRateProvider("bittrex", new ExchangeBittrexAPI(), true));
             DirectProviders.Add("poloniex", new ExchangeSharpRateProvider("poloniex", new ExchangePoloniexAPI(), false));
             DirectProviders.Add("hitbtc", new ExchangeSharpRateProvider("hitbtc", new ExchangeHitbtcAPI(), false));
+            DirectProviders.Add("cryptopia", new ExchangeSharpRateProvider("cryptopia", new ExchangeCryptopiaAPI(), false));
 
             // Handmade providers
             DirectProviders.Add("bitpay", new BitpayRateProvider(new NBitpayClient.Bitpay(new NBitcoin.Key(), new Uri("https://bitpay.com/"))));
             DirectProviders.Add(QuadrigacxRateProvider.QuadrigacxName, new QuadrigacxRateProvider());
+            DirectProviders.Add(CoinAverageRateProvider.CoinAverageName, new CoinAverageRateProvider() { Exchange = CoinAverageRateProvider.CoinAverageName, Authenticator = _CoinAverageSettings });
 
             // Those exchanges make multiple requests when calling GetTickers so we remove them
             //DirectProviders.Add("kraken", new ExchangeSharpRateProvider("kraken", new ExchangeKrakenAPI(), true));
@@ -84,6 +84,20 @@ namespace BTCPayServer.Services.Rates
             //DirectProviders.Add("bitstamp", new ExchangeSharpRateProvider("bitstamp", new ExchangeBitstampAPI()));
         }
 
+        public CoinAverageExchanges GetSupportedExchanges()
+        {
+            CoinAverageExchanges exchanges = new CoinAverageExchanges();
+            foreach (var exchange in _CoinAverageSettings.AvailableExchanges)
+            {
+                exchanges.Add(exchange.Value);
+            }
+
+            // Add other exchanges supported here
+            exchanges.Add(new CoinAverageExchange(CoinAverageRateProvider.CoinAverageName, "Coin Average"));
+            exchanges.Add(new CoinAverageExchange("cryptopia", "Cryptopia"));
+
+            return exchanges;
+        }
 
         private readonly Dictionary<string, IRateProvider> _DirectProviders = new Dictionary<string, IRateProvider>();
         public Dictionary<string, IRateProvider> DirectProviders
@@ -163,13 +177,6 @@ namespace BTCPayServer.Services.Rates
             }
             rateRule.Reevaluate();
             result.Value = rateRule.Value;
-
-            var currencyData = _CurrencyTable?.GetCurrencyData(rateRule.CurrencyPair.Right);
-            if(currencyData != null && result.Value.HasValue)
-            {
-                result.Value = decimal.Round(result.Value.Value, currencyData.Divisibility, MidpointRounding.AwayFromZero);
-            }
-
             result.Errors = rateRule.Errors;
             result.EvaluatedRule = rateRule.ToString(true);
             result.Rule = rateRule.ToString(false);

BTCPayServer/Services/Rates/CoinAverageSettings.cs

@@ -43,12 +43,11 @@ namespace BTCPayServer.Services.Rates
     {
         public CoinAverageExchanges()
         {
-            Add(new CoinAverageExchange(CoinAverageRateProvider.CoinAverageName, "Coin Average"));
         }
 
         public void Add(CoinAverageExchange exchange)
         {
-            Add(exchange.Name, exchange);
+            TryAdd(exchange.Name, exchange);
         }
     }
     public class CoinAverageSettings : ICoinAverageAuthenticator

BTCPayServer/Views/Account/ConfirmEmail.cshtml

@@ -7,7 +7,7 @@
 
         <div class="row">
             <div class="col-lg-12 text-center">
-                <partial name="_StatusMessage" for="@("Thank you for confirming your email.")" />
+                <partial name="_StatusMessage" model="@("Thank you for confirming your email.")" />
             </div>
         </div>
     </div>