Set a longer timeout for the cache for /rates, update NBXPlorer, bump

Merge pull request #42 from Eskyee/patch-2
bootstrap.min.css deleted last line
2018-02-01 21:24:13 +01:00 · 2018-01-26 07:02:35 +01:00 · 2018-01-26 07:02:22 +01:00 · 2018-01-26 01:19:58 +00:00 · 2018-01-26 01:12:52 +00:00 · 2018-01-24 10:37:23 +01:00
11 changed files with 15 additions and 22 deletions
--- a/BTCPayServer.Tests/docker-compose.yml
+++ b/BTCPayServer.Tests/docker-compose.yml
@ -37,7 +37,7 @@ services:
      - postgres

  nbxplorer:
-    image: nicolasdorier/nbxplorer:1.0.1.3
+    image: nicolasdorier/nbxplorer:1.0.1.10
    ports:
      - "32838:32838"
    expose: 
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@ -2,7 +2,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.1.17</Version>
+		<Version>1.0.1.19</Version>
  </PropertyGroup>
  <ItemGroup>
    <Compile Remove="Build\dockerfiles\**" />
@ -21,10 +21,10 @@
    <PackageReference Include="Hangfire.MemoryStorage" Version="1.5.2" />
    <PackageReference Include="Hangfire.PostgreSql" Version="1.4.8.1" />
    <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
-    <PackageReference Include="NBitcoin" Version="4.0.0.52" />
+    <PackageReference Include="NBitcoin" Version="4.0.0.54" />
    <PackageReference Include="NBitpayClient" Version="1.0.0.16" />	  
    <PackageReference Include="DBreeze" Version="1.87.0" />
-    <PackageReference Include="NBXplorer.Client" Version="1.0.1.2" />
+    <PackageReference Include="NBXplorer.Client" Version="1.0.1.8" />
    <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.1" />
    <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.2" />
    <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.13" />
--- a/BTCPayServer/Controllers/InvoiceController.cs
+++ b/BTCPayServer/Controllers/InvoiceController.cs
@ -119,7 +119,7 @@ namespace BTCPayServer.Controllers
                    .Select(derivationStrategy => (Wallet: _WalletProvider.GetWallet(derivationStrategy.Network),
                                                    DerivationStrategy: derivationStrategy.DerivationStrategyBase,
                                                    Network: derivationStrategy.Network,
-                                                    RateProvider: _RateProviders.GetRateProvider(derivationStrategy.Network),
+                                                    RateProvider: _RateProviders.GetRateProvider(derivationStrategy.Network, false),
                                                    FeeRateProvider: _FeeProviderFactory.CreateFeeProvider(derivationStrategy.Network)))
                    .Where(_ => _.Wallet != null &&
                                _.FeeRateProvider != null &&
@ -164,7 +164,7 @@ namespace BTCPayServer.Controllers
 #pragma warning disable CS0618
                var btc = _NetworkProvider.BTC;
                var feeProvider = _FeeProviderFactory.CreateFeeProvider(btc);
-                var rateProvider = storeBlob.ApplyRateRules(btc, _RateProviders.GetRateProvider(btc));
+                var rateProvider = storeBlob.ApplyRateRules(btc, _RateProviders.GetRateProvider(btc, false));
                if (feeProvider != null && rateProvider != null)
                {
                    var gettingFee = feeProvider.GetFeeRateAsync();
--- a/BTCPayServer/Controllers/RateController.cs
+++ b/BTCPayServer/Controllers/RateController.cs
@ -49,7 +49,7 @@ namespace BTCPayServer.Controllers
            var network = _NetworkProvider.GetNetwork(cryptoCode);
            if (network == null)
                return NotFound();
-            var rateProvider = _RateProviderFactory.GetRateProvider(network);
+            var rateProvider = _RateProviderFactory.GetRateProvider(network, true);
            if (rateProvider == null)
                return NotFound();

--- a/BTCPayServer/Controllers/StoresController.cs
+++ b/BTCPayServer/Controllers/StoresController.cs
@ -258,7 +258,7 @@ namespace BTCPayServer.Controllers
                        for (int i = 0; i < 10; i++)
                        {
                            var address = line.Derive((uint)i);
-                            vm.AddressSamples.Add((line.Path.Derive((uint)i).ToString(), address.ScriptPubKey.GetDestinationAddress(network.NBitcoinNetwork).ToString()));
+                            vm.AddressSamples.Add((DerivationStrategyBase.GetKeyPath(DerivationFeature.Deposit).Derive((uint)i).ToString(), address.ScriptPubKey.GetDestinationAddress(network.NBitcoinNetwork).ToString()));
                        }
                    }
                    catch
--- a/BTCPayServer/HostedServices/InvoiceWatcher.cs
+++ b/BTCPayServer/HostedServices/InvoiceWatcher.cs
@ -197,7 +197,7 @@ namespace BTCPayServer.HostedServices
                        {
                            context.Events.Add(new InvoiceEvent(invoice, 1003, "invoice_paidInFull"));
                            invoice.Status = "paid";
-                            invoice.ExceptionStatus = null;
+                            invoice.ExceptionStatus = totalPaid > accounting.TotalDue ? "paidOver" : null;
                            await _InvoiceRepository.UnaffectAddress(invoice.Id);
                            context.MarkDirty();
                        }
@ -209,13 +209,6 @@ namespace BTCPayServer.HostedServices
                        }
                    }

-                    if (totalPaid > accounting.TotalDue && invoice.ExceptionStatus != "paidOver")
-                    {
-                        invoice.ExceptionStatus = "paidOver";
-                        await _InvoiceRepository.UnaffectAddress(invoice.Id);
-                        context.MarkDirty();
-                    }
-
                    if (totalPaid < accounting.TotalDue && invoice.GetPayments().Count != 0 && invoice.ExceptionStatus != "paidPartial")
                    {
                        invoice.ExceptionStatus = "paidPartial";
--- a/BTCPayServer/Services/Rates/CachedDefaultRateProviderFactory.cs
+++ b/BTCPayServer/Services/Rates/CachedDefaultRateProviderFactory.cs
@ -11,6 +11,7 @@ namespace BTCPayServer.Services.Rates
    {
        IMemoryCache _Cache;
        ConcurrentDictionary<string, IRateProvider> _Providers = new ConcurrentDictionary<string, IRateProvider>();
+        ConcurrentDictionary<string, IRateProvider> _LongCacheProviders = new ConcurrentDictionary<string, IRateProvider>();

        public IMemoryCache Cache
        {
@ -30,9 +31,10 @@ namespace BTCPayServer.Services.Rates
        public IRateProvider RateProvider { get; set; }

        public TimeSpan CacheSpan { get; set; } = TimeSpan.FromMinutes(1.0);
-        public IRateProvider GetRateProvider(BTCPayNetwork network)
+        public TimeSpan LongCacheSpan { get; set; } = TimeSpan.FromMinutes(15.0);
+        public IRateProvider GetRateProvider(BTCPayNetwork network, bool longCache)
        {
-            return _Providers.GetOrAdd(network.CryptoCode, new CachedRateProvider(network.CryptoCode, RateProvider ?? network.DefaultRateProvider, _Cache) { CacheSpan = CacheSpan });
+            return (longCache ? _LongCacheProviders : _Providers).GetOrAdd(network.CryptoCode, new CachedRateProvider(network.CryptoCode, RateProvider ?? network.DefaultRateProvider, _Cache) { CacheSpan = longCache ? LongCacheSpan : CacheSpan });
        }
    }
 }
--- a/BTCPayServer/Services/Rates/IRateProviderFactory.cs
+++ b/BTCPayServer/Services/Rates/IRateProviderFactory.cs
@ -7,6 +7,6 @@ namespace BTCPayServer.Services.Rates
 {
    public interface IRateProviderFactory
    {
-        IRateProvider GetRateProvider(BTCPayNetwork network);
+        IRateProvider GetRateProvider(BTCPayNetwork network, bool longCache);
    }
 }
--- a/BTCPayServer/Services/Rates/MockRateProvider.cs
+++ b/BTCPayServer/Services/Rates/MockRateProvider.cs
@ -18,7 +18,7 @@ namespace BTCPayServer.Services.Rates
        {
            _Mocks.Add(mock);
        }
-        public IRateProvider GetRateProvider(BTCPayNetwork network)
+        public IRateProvider GetRateProvider(BTCPayNetwork network, bool longCache)
        {
            return _Mocks.FirstOrDefault(m => m.CryptoCode == network.CryptoCode);
        }
--- a/BTCPayServer/wwwroot/vendor/bootstrap/css/bootstrap.css
+++ b/BTCPayServer/wwwroot/vendor/bootstrap/css/bootstrap.css
@ -9890,4 +9890,3 @@ a.text-dark:focus, a.text-dark:hover {
 .invisible {
    visibility: hidden !important;
 }
-/*# sourceMappingURL=bootstrap.css.map */
--- a/BTCPayServer/wwwroot/vendor/bootstrap/css/bootstrap.min.css
+++ b/BTCPayServer/wwwroot/vendor/bootstrap/css/bootstrap.min.css
@ -8593,4 +8593,3 @@ a.text-dark:focus, a.text-dark:hover {
 .invisible {
    visibility: hidden !important
 }
-/*# sourceMappingURL=bootstrap.min.css.map */
Author	SHA1	Message	Date
nicolas.dorier	d873a1a545	Set a longer timeout for the cache for /rates, update NBXPlorer, bump	2018-02-01 21:24:13 +01:00
Nicolas Dorier	a464a8702b	Merge pull request #42 from Eskyee/patch-2 bootstrap.min.css deleted last line	2018-01-26 07:02:35 +01:00
Nicolas Dorier	63722b932a	Merge pull request #41 from Eskyee/patch-1 bootstrap.css deleted last line	2018-01-26 07:02:22 +01:00
Esky33	698b3c46cd	bootstrap.min.css deleted last line deleted this line /# sourceMappingURL=bootstrap.min.css.map / because of a debug error in browser's [Error] Failed to load resource: the server responded with a status of 404 (Not Found) (bootstrap.min.css.map, line 0) https://btcpay-server-testnet.azurewebsites.net/vendor/bootstrap/css/bootstrap.min.css.map	2018-01-26 01:19:58 +00:00
Esky33	df81051d07	bootstrap.css deleted last line deleted this line /# sourceMappingURL=bootstrap.css.map / because of a debug error in browser's [Error] Failed to load resource: the server responded with a status of 404 (Not Found) (bootstrap.css.map, line 0) https://btcpay-server-testnet.azurewebsites.net/vendor/bootstrap/css/bootstrap.css.map	2018-01-26 01:12:52 +00:00
nicolas.dorier	ac70a77361	Fix #38 with paidOver + paidLate	2018-01-24 10:37:23 +01:00