Add extended notifications

fix typos

BTCPayServer.Tests/Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.0.0-sdk
+FROM microsoft/dotnet:2.0.5-sdk-2.1.4
 WORKDIR /app
  # caches restore result by copying csproj file separately
 COPY BTCPayServer.Tests/BTCPayServer.Tests.csproj BTCPayServer.Tests/BTCPayServer.Tests.csproj

BTCPayServer.Tests/TestAccount.cs

@@ -61,10 +61,9 @@ namespace BTCPayServer.Tests
             await store.CreateStore(new CreateStoreViewModel() { Name = "Test Store" });
             StoreId = store.CreatedStoreId;
             DerivationScheme = new DerivationStrategyFactory(SupportedNetwork.NBitcoinNetwork).Parse(ExtKey.Neuter().ToString() + "-[legacy]");
-            await store.UpdateStore(StoreId, new StoreViewModel()
-            {
-                SpeedPolicy = SpeedPolicy.MediumSpeed
-            });
+            var vm = (StoreViewModel)((ViewResult)await store.UpdateStore(StoreId)).Model;
+            vm.SpeedPolicy = SpeedPolicy.MediumSpeed;
+            await store.UpdateStore(StoreId, vm);
 
             await store.AddDerivationScheme(StoreId, new DerivationSchemeViewModel()
             {

BTCPayServer.Tests/UnitTest1.cs

@@ -24,6 +24,8 @@ using BTCPayServer.Services.Rates;
 using Microsoft.Extensions.Caching.Memory;
 using BTCPayServer.Eclair;
 using System.Collections.Generic;
+using BTCPayServer.Models.StoreViewModels;
+using System.Threading.Tasks;
 
 namespace BTCPayServer.Tests
 {
@@ -49,7 +51,7 @@ namespace BTCPayServer.Tests
             // Some check that handling legacy stuff does not break things
             var cryptoData = entity.GetCryptoData("BTC", null, true);
             cryptoData.Calculate();
-            Assert.NotNull(cryptoData); 
+            Assert.NotNull(cryptoData);
             Assert.Null(entity.GetCryptoData("BTC", null, false));
             entity.SetCryptoData(new CryptoData() { ParentEntity = entity, Rate = entity.Rate, CryptoCode = "BTC", TxFee = entity.TxFee });
             Assert.NotNull(entity.GetCryptoData("BTC", null, false));
@@ -278,7 +280,8 @@ namespace BTCPayServer.Tests
                         OrderId = "orderId",
                         NotificationURL = callbackServer.GetUri().AbsoluteUri,
                         ItemDesc = "Some description",
-                        FullNotifications = true
+                        FullNotifications = true,
+                        ExtendedNotifications = true
                     });
                     BitcoinUrlBuilder url = new BitcoinUrlBuilder(invoice.PaymentUrls.BIP21);
                     tester.ExplorerNode.SendToAddress(url.Address, url.Amount);
@@ -359,7 +362,7 @@ namespace BTCPayServer.Tests
                 change.Value -= (payment2 - payment1) * 2; //Add more fees
                 var replaced = tester.ExplorerNode.SignRawTransaction(tx);
                 tester.ExplorerNode.SendRawTransaction(replaced);
-                var test = tester.ExplorerClient.Sync(user.DerivationScheme, null);
+                var test = tester.ExplorerClient.GetUTXOs(user.DerivationScheme, null);
                 Eventually(() =>
                 {
                     invoice = user.BitPay.GetInvoice(invoice.Id);
@@ -392,6 +395,50 @@ namespace BTCPayServer.Tests
             }
         }
 
+
+        [Fact]
+        public void CanTweakRate()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+
+
+                // First we try payment with a merchant having only BTC
+                var invoice1 = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Price = 5000.0,
+                    Currency = "USD",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description",
+                    FullNotifications = true
+                }, Facade.Merchant);
+
+
+                var storeController = tester.PayTester.GetController<StoresController>(user.UserId);
+                var vm = (StoreViewModel)((ViewResult)storeController.UpdateStore(user.StoreId).Result).Model;
+                Assert.Equal(1.0, vm.RateMultiplier);
+                vm.RateMultiplier = 0.5;
+                storeController.UpdateStore(user.StoreId, vm).Wait();
+
+
+                var invoice2 = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Price = 5000.0,
+                    Currency = "USD",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description",
+                    FullNotifications = true
+                }, Facade.Merchant);
+
+                Assert.True(invoice2.BtcPrice.Almost(invoice1.BtcPrice * 2, 0.00001m));
+            }
+        }
+
         [Fact]
         public void CanHaveLTCOnlyStore()
         {

BTCPayServer.Tests/docker-compose.yml

@@ -37,7 +37,7 @@ services:
       - postgres
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:1.0.0.71
+    image: nicolasdorier/nbxplorer:1.0.1.3
     ports:
       - "32838:32838"
     expose: 

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.0.83</Version>
+		<Version>1.0.1.8</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Build\dockerfiles\**" />
@@ -21,22 +21,22 @@
     <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.51" />
+    <PackageReference Include="NBitcoin" Version="4.0.0.52" />
     <PackageReference Include="NBitpayClient" Version="1.0.0.16" />	  
     <PackageReference Include="DBreeze" Version="1.87.0" />
-    <PackageReference Include="NBXplorer.Client" Version="1.0.0.33" />
+    <PackageReference Include="NBXplorer.Client" Version="1.0.1.2" />
     <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" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.0.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.0.1" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.0.11" />
   </ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
+		<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.1" PrivateAssets="All" />
-		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.1" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.2" PrivateAssets="All" />
 	</ItemGroup>
 
 	<ItemGroup>

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -237,8 +237,7 @@ namespace BTCPayServer.Controllers
             try
             {
                 leases.Add(_EventAggregator.Subscribe<Events.InvoiceDataChangedEvent>(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId)));
-                leases.Add(_EventAggregator.Subscribe<Events.InvoicePaymentEvent>(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId)));
-                leases.Add(_EventAggregator.Subscribe<Events.InvoiceStatusChangedEvent>(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId)));
+                leases.Add(_EventAggregator.Subscribe<Events.InvoiceEvent>(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId)));
                 while (true)
                 {
                     var message = await webSocket.ReceiveAsync(DummyBuffer, default(CancellationToken));
@@ -414,6 +413,7 @@ namespace BTCPayServer.Controllers
         public async Task<IActionResult> InvalidatePaidInvoice(string invoiceId)
         {
             await _InvoiceRepository.UpdatePaidInvoiceToInvalid(invoiceId);
+            _EventAggregator.Publish(new InvoiceEvent(invoiceId, 1008, "invoice_markedInvalid"));
             return RedirectToAction(nameof(ListInvoices));
         }
 

BTCPayServer/Controllers/InvoiceController.cs

@@ -78,7 +78,7 @@ namespace BTCPayServer.Controllers
         }
 
 
-        internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(Invoice invoice, StoreData store, string serverUrl, double expiryMinutes = 15)
+        internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(Invoice invoice, StoreData store, string serverUrl)
         {
             var derivationStrategies = store.GetDerivationStrategies(_NetworkProvider).ToList();
             if (derivationStrategies.Count == 0)
@@ -94,7 +94,7 @@ namespace BTCPayServer.Controllers
             if (notificationUri == null || (notificationUri.Scheme != "http" && notificationUri.Scheme != "https")) //TODO: Filer non routable addresses ?
                 notificationUri = null;
             EmailAddressAttribute emailValidator = new EmailAddressAttribute();
-            entity.ExpirationTime = entity.InvoiceTime.AddMinutes(expiryMinutes);
+            entity.ExpirationTime = entity.InvoiceTime.AddMinutes(storeBlob.InvoiceExpiration);
             entity.MonitoringExpiration = entity.ExpirationTime + TimeSpan.FromMinutes(storeBlob.MonitoringExpiration);
             entity.OrderId = invoice.OrderId;
             entity.ServerUrl = serverUrl;
@@ -130,7 +130,7 @@ namespace BTCPayServer.Controllers
                         {
                             network = _.Network,
                             getFeeRate = _.FeeRateProvider.GetFeeRateAsync(),
-                            getRate = _.RateProvider.GetRateAsync(invoice.Currency),
+                            getRate = storeBlob.ApplyRateRules(_.Network, _.RateProvider).GetRateAsync(invoice.Currency),
                             getAddress = _.Wallet.ReserveAddressAsync(_.DerivationStrategy)
                         };
                     });
@@ -164,7 +164,7 @@ namespace BTCPayServer.Controllers
 #pragma warning disable CS0618
                 var btc = _NetworkProvider.BTC;
                 var feeProvider = _FeeProviderFactory.CreateFeeProvider(btc);
-                var rateProvider = _RateProviders.GetRateProvider(btc);
+                var rateProvider = storeBlob.ApplyRateRules(btc, _RateProviders.GetRateProvider(btc));
                 if (feeProvider != null && rateProvider != null)
                 {
                     var gettingFee = feeProvider.GetFeeRateAsync();
@@ -178,7 +178,7 @@ namespace BTCPayServer.Controllers
             entity.SetCryptoData(cryptoDatas);
             entity.PosData = invoice.PosData;
             entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, _NetworkProvider);
-            _EventAggregator.Publish(new Events.InvoiceCreatedEvent(entity.Id));
+            _EventAggregator.Publish(new Events.InvoiceEvent(entity, 1001, "invoice_created"));
             var resp = entity.EntityToDTO(_NetworkProvider);
             return new DataWrapper<InvoiceResponse>(resp) { Facade = "pos/invoice" };
         }

BTCPayServer/Controllers/StoresController.cs

@@ -163,6 +163,8 @@ namespace BTCPayServer.Controllers
             AddDerivationSchemes(store, vm);
             vm.StatusMessage = StatusMessage;
             vm.MonitoringExpiration = storeBlob.MonitoringExpiration;
+            vm.InvoiceExpiration = storeBlob.InvoiceExpiration;
+            vm.RateMultiplier = (double)storeBlob.GetRateMultiplier();
             return View(vm);
         }
 
@@ -306,6 +308,8 @@ namespace BTCPayServer.Controllers
             var blob = store.GetStoreBlob();
             blob.NetworkFeeDisabled = !model.NetworkFee;
             blob.MonitoringExpiration = model.MonitoringExpiration;
+            blob.InvoiceExpiration = model.InvoiceExpiration;
+            blob.SetRateMultiplier(model.RateMultiplier);
 
             if (store.SetStoreBlob(blob))
             {
@@ -346,7 +350,7 @@ namespace BTCPayServer.Controllers
                 var prefix = Utils.ToUInt32(data, false);
                 if (!electrumMapping.TryGetValue(prefix, out string[] labels))
                     throw new FormatException("!electrumMapping.TryGetValue(prefix, out string[] labels)");
-                var standardPrefix = Utils.ToBytes(network.NBitcoinNetwork == Network.Main ? 0x0488b21eU : 0x043587cf, false);
+                var standardPrefix = Utils.ToBytes(network.NBXplorerNetwork.DefaultSettings.ChainType == NBXplorer.ChainType.Main ? 0x0488b21eU : 0x043587cf, false);
 
                 for (int i = 0; i < 4; i++)
                     data[i] = standardPrefix[i];

BTCPayServer/Data/StoreData.cs

@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using System.ComponentModel;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using BTCPayServer.Services.Rates;
 
 namespace BTCPayServer.Data
 {
@@ -99,10 +100,10 @@ namespace BTCPayServer.Data
 
             if (!existing && string.IsNullOrEmpty(derivationScheme))
             {
-                if(network.IsBTC)
+                if (network.IsBTC)
                     DerivationStrategy = null;
             }
-            else if(!existing)
+            else if (!existing)
                 strategies.Add(new JProperty(network.CryptoCode, new JValue(derivationScheme)));
             // This is deprecated so we don't have to set anymore
             //if (network.IsBTC)
@@ -173,10 +174,27 @@ namespace BTCPayServer.Data
         }
     }
 
+    public class RateRule
+    {
+        public RateRule()
+        {
+            RuleName = "Multiplier";
+        }
+        public string RuleName { get; set; }
+
+        public double Multiplier { get; set; }
+
+        public decimal Apply(BTCPayNetwork network, decimal rate)
+        {
+            return rate * (decimal)Multiplier;
+        }
+    }
+
     public class StoreBlob
     {
         public StoreBlob()
         {
+            InvoiceExpiration = 15;
             MonitoringExpiration = 60;
         }
         public bool NetworkFeeDisabled
@@ -190,5 +208,39 @@ namespace BTCPayServer.Data
             get;
             set;
         }
+
+        [DefaultValue(15)]
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        public int InvoiceExpiration
+        {
+            get;
+            set;
+        }
+
+        public void SetRateMultiplier(double rate)
+        {
+            RateRules = new List<RateRule>();
+            RateRules.Add(new RateRule() { Multiplier = rate });
+        }
+        public decimal GetRateMultiplier()
+        {
+            decimal rate = 1.0m;
+            if (RateRules == null || RateRules.Count == 0)
+                return rate;
+            foreach (var rule in RateRules)
+            {
+                rate = rule.Apply(null, rate);
+            }
+            return rate;
+        }
+
+        public List<RateRule> RateRules { get; set; } = new List<RateRule>();
+
+        public IRateProvider ApplyRateRules(BTCPayNetwork network, IRateProvider rateProvider)
+        {
+            if (RateRules == null || RateRules.Count == 0)
+                return rateProvider;
+            return new TweakRateProvider(network, rateProvider, RateRules.ToList());
+        }
     }
 }

BTCPayServer/Events/InvoiceCreatedEvent.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace BTCPayServer.Events
-{
-    public class InvoiceCreatedEvent
-    {
-        public InvoiceCreatedEvent(string id)
-        {
-            InvoiceId = id;
-        }
-
-        public string InvoiceId { get; set; }
-
-        public override string ToString()
-        {
-            return $"Invoice {InvoiceId} created";
-        }
-    }
-}

BTCPayServer/Events/InvoiceEvent.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Invoices;
+
+namespace BTCPayServer.Events
+{
+    public class InvoiceEvent
+    {
+        public InvoiceEvent(InvoiceEntity invoice, int code, string name) : this(invoice.Id, code, name)
+        {
+
+        }
+        public InvoiceEvent(string invoiceId, int code, string name)
+        {
+            InvoiceId = invoiceId;
+            EventCode = code;
+            Name = name;
+        }
+
+        public string InvoiceId { get; set; }
+        public int EventCode { get; set; }
+        public string Name { get; set; }
+
+        public override string ToString()
+        {
+            return $"Invoice {InvoiceId} new event: {Name} ({EventCode})";
+        }
+    }
+}

BTCPayServer/Events/InvoiceIPNEvent.cs

@@ -7,19 +7,29 @@ namespace BTCPayServer.Events
 {
     public class InvoiceIPNEvent
     {
-        public InvoiceIPNEvent(string invoiceId)
+        public InvoiceIPNEvent(string invoiceId, int? eventCode, string name)
         {
             InvoiceId = invoiceId;
+            EventCode = eventCode;
+            Name = name;
         }
 
+        public int? EventCode { get; set; }
+        public string Name { get; set; }
+
         public string InvoiceId { get; set; }
         public string Error { get; set; }
 
         public override string ToString()
         {
+            string ipnType = "IPN";
+            if(EventCode.HasValue)
+            {
+                ipnType = $"IPN ({EventCode.Value} {Name})";
+            }
             if (Error == null)
-                return $"IPN sent for invoice {InvoiceId}";
-            return $"Error while sending IPN: {Error}";
+                return $"{ipnType} sent for invoice {InvoiceId}";
+            return $"Error while sending {ipnType}: {Error}";
         }
     }
 }

BTCPayServer/Events/InvoicePaymentEvent.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Services.Invoices;
-
-namespace BTCPayServer.Events
-{
-    public class InvoicePaymentEvent
-    {
-        
-        public InvoicePaymentEvent(string invoiceId, string cryptoCode, string address)
-        {
-            InvoiceId = invoiceId;
-            Address = address;
-            CryptoCode = cryptoCode;
-        }
-
-        public string Address { get; set; }
-        public string CryptoCode { get; private set; }
-        public string InvoiceId { get; set; }
-
-        public override string ToString()
-        {
-            return $"{CryptoCode}: Invoice {InvoiceId} received a payment on {Address}";
-        }
-    }
-}

BTCPayServer/Events/InvoiceStatusChangedEvent.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Services.Invoices;
-
-namespace BTCPayServer.Events
-{
-    public class InvoiceStatusChangedEvent
-    {
-        public InvoiceStatusChangedEvent()
-        {
-
-        }
-        public InvoiceStatusChangedEvent(InvoiceEntity invoice, string newState)
-        {
-            OldState = invoice.Status;
-            InvoiceId = invoice.Id;
-            NewState = newState;
-        }
-        public string InvoiceId { get; set; }
-        public string OldState { get; set; }
-        public string NewState { get; set; }
-
-        public override string ToString()
-        {
-            return $"Invoice {InvoiceId} changed status: {OldState} => {NewState}";
-        }
-    }
-}

BTCPayServer/ExplorerClientProvider.cs

@@ -38,11 +38,15 @@ namespace BTCPayServer
         private static ExplorerClient CreateExplorerClient(BTCPayNetwork n, Uri uri, string cookieFile)
         {
             var explorer = new ExplorerClient(n.NBXplorerNetwork, uri);
-            if (cookieFile == null || !explorer.SetCookieAuth(cookieFile))
+            if (cookieFile == null)
             {
                 Logs.Configuration.LogWarning($"{n.CryptoCode}: Not using cookie authentication");
                 explorer.SetNoAuth();
             }
+            if(!explorer.SetCookieAuth(cookieFile))
+            {
+                Logs.Configuration.LogWarning($"{n.CryptoCode}: Using cookie auth against NBXplorer, but {cookieFile} is not found");
+            }
             return explorer;
         }
 

BTCPayServer/Extensions.cs

@@ -19,6 +19,8 @@ using System.Linq;
 using System.Threading;
 using BTCPayServer.Services.Wallets;
 using System.IO;
+using BTCPayServer.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace BTCPayServer
 {

BTCPayServer/HostedServices/InvoiceNotificationManager.cs

@@ -37,6 +37,9 @@ namespace BTCPayServer.HostedServices
             {
                 get; set;
             }
+
+            public int? EventCode { get; set; }
+            public string Message { get; set; }
         }
 
         public ILogger Logger
@@ -63,32 +66,32 @@ namespace BTCPayServer.HostedServices
             _NetworkProvider = networkProvider;
         }
 
-        async Task Notify(InvoiceEntity invoice)
+        async Task Notify(InvoiceEntity invoice, int? eventCode = null, string name = null)
         {
             CancellationTokenSource cts = new CancellationTokenSource(10000);
             try
             {
                 if (string.IsNullOrEmpty(invoice.NotificationURL))
                     return;
-                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(invoice.Id));
-                await SendNotification(invoice, cts.Token);
+                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(invoice.Id, eventCode, name));
+                await SendNotification(invoice, eventCode, name, cts.Token);
                 return;
             }
-            catch(OperationCanceledException) when(cts.IsCancellationRequested)
+            catch (OperationCanceledException) when (cts.IsCancellationRequested)
             {
-                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(invoice.Id)
+                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(invoice.Id, eventCode, name)
                 {
                     Error = "Timeout"
                 });
             }
-            catch(Exception ex) // It fails, it is OK because we try with hangfire after
+            catch (Exception ex) // It fails, it is OK because we try with hangfire after
             {
-                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(invoice.Id)
+                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(invoice.Id, eventCode, name)
                 {
                     Error = ex.Message
                 });
             }
-            var invoiceStr = NBitcoin.JsonConverters.Serializer.ToString(new ScheduledJob() { TryCount = 0, Invoice = invoice });
+            var invoiceStr = NBitcoin.JsonConverters.Serializer.ToString(new ScheduledJob() { TryCount = 0, Invoice = invoice, EventCode = eventCode, Message = name });
             if (!string.IsNullOrEmpty(invoice.NotificationURL))
                 _JobClient.Schedule(() => NotifyHttp(invoiceStr), TimeSpan.Zero);
         }
@@ -107,14 +110,18 @@ namespace BTCPayServer.HostedServices
             CancellationTokenSource cts = new CancellationTokenSource(10000);
             try
             {
-                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id));
-                HttpResponseMessage response = await SendNotification(job.Invoice, cts.Token);
+                HttpResponseMessage response = await SendNotification(job.Invoice, job.EventCode, job.Message, cts.Token);
                 reschedule = response.StatusCode != System.Net.HttpStatusCode.OK;
                 Logger.LogInformation("Job " + jobId + " returned " + response.StatusCode);
+
+                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)
+                {
+                    Error = reschedule ? $"Unexpected return code: {(int)response.StatusCode}" : null
+                });
             }
             catch (OperationCanceledException) when (cts.IsCancellationRequested)
             {
-                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id)
+                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)
                 {
                     Error = "Timeout"
                 });
@@ -123,12 +130,25 @@ namespace BTCPayServer.HostedServices
             }
             catch (Exception ex) // It fails, it is OK because we try with hangfire after
             {
-                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id)
+                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)
                 {
                     Error = ex.Message
                 });
                 reschedule = true;
-                Logger.LogInformation("Job " + jobId + " threw exception " + ex.Message);
+
+                List<string> messages = new List<string>();
+                while(ex != null)
+                {
+                    messages.Add(ex.Message);
+                    ex = ex.InnerException;
+                }
+                string message = String.Join(',', messages.ToArray());
+                Logger.LogInformation("Job " + jobId + " threw exception " + message);
+
+                _EventAggregator.Publish<InvoiceIPNEvent>(new InvoiceIPNEvent(job.Invoice.Id, job.EventCode, job.Message)
+                {
+                    Error = $"Unexpected error: {message}"
+                });
             }
             finally { cts.Dispose(); _Executing.TryRemove(jobId, out jobId); }
 
@@ -143,8 +163,23 @@ namespace BTCPayServer.HostedServices
             }
         }
 
+        public class InvoicePaymentNotificationEvent
+        {
+            [JsonProperty("code")]
+            public int Code { get; set; }
+            [JsonProperty("name")]
+            public string Name { get; set; }
+        }
+        public class InvoicePaymentNotificationEventWrapper
+        {
+            [JsonProperty("event")]
+            public InvoicePaymentNotificationEvent Event { get; set; }
+            [JsonProperty("data")]
+            public InvoicePaymentNotification Data { get; set; }
+        }
+
         Encoding UTF8 = new UTF8Encoding(false);
-        private async Task<HttpResponseMessage> SendNotification(InvoiceEntity invoice, CancellationToken cancellation)
+        private async Task<HttpResponseMessage> SendNotification(InvoiceEntity invoice, int? eventCode, string name, CancellationToken cancellation)
         {
             var request = new HttpRequestMessage();
             request.Method = HttpMethod.Post;
@@ -167,7 +202,7 @@ namespace BTCPayServer.HostedServices
             // We keep backward compatibility with bitpay by passing BTC info to the notification
             // we don't pass other info, as it is a bad idea to use IPN data for logic processing (can be faked)
             var btcCryptoInfo = dto.CryptoInfo.FirstOrDefault(c => c.CryptoCode == "BTC");
-            if(btcCryptoInfo != null)
+            if (btcCryptoInfo != null)
             {
 #pragma warning disable CS0618
                 notification.Rate = (double)dto.Rate;
@@ -177,8 +212,22 @@ namespace BTCPayServer.HostedServices
                 notification.BTCPrice = dto.BTCPrice;
 #pragma warning restore CS0618
             }
+
+            string notificationString = null;
+            if (eventCode.HasValue)
+            {
+                var wrapper = new InvoicePaymentNotificationEventWrapper();
+                wrapper.Data = notification;
+                wrapper.Event = new InvoicePaymentNotificationEvent() { Code = eventCode.Value, Name = name };
+                notificationString = JsonConvert.SerializeObject(wrapper);
+            }
+            else
+            {
+                notificationString = JsonConvert.SerializeObject(notification);
+            }
+
             request.RequestUri = new Uri(invoice.NotificationURL, UriKind.Absolute);
-            request.Content = new StringContent(JsonConvert.SerializeObject(notification), UTF8, "application/json");
+            request.Content = new StringContent(notificationString, UTF8, "application/json");
             var response = await _Client.SendAsync(request, cancellation);
             return response;
         }
@@ -193,42 +242,41 @@ namespace BTCPayServer.HostedServices
         CompositeDisposable leases = new CompositeDisposable();
         public Task StartAsync(CancellationToken cancellationToken)
         {
-            leases.Add(_EventAggregator.Subscribe<InvoiceStatusChangedEvent>(async e => 
+            leases.Add(_EventAggregator.Subscribe<InvoiceEvent>(async e =>
             {
                 var invoice = await _InvoiceRepository.GetInvoice(null, e.InvoiceId);
+                await SaveEvent(invoice.Id, e);
 
                 // we need to use the status in the event and not in the invoice. The invoice might now be in another status.
                 if (invoice.FullNotifications)
                 {
-                    if (e.NewState == "expired" ||
-                       e.NewState == "paid" ||
-                       e.NewState == "invalid" ||
-                       e.NewState == "complete"
+                    if (e.Name == "invoice_expired" ||
+                       e.Name == "invoice_paidInFull" ||
+                       e.Name == "invoice_failedToConfirm" ||
+                       e.Name == "invoice_markedInvalid" ||
+                       e.Name == "invoice_failedToConfirm" ||
+                       e.Name == "invoice_completed"
                      )
                         await Notify(invoice);
                 }
-                
-                if(e.NewState == "confirmed")
+
+                if (e.Name == "invoice_confirmed")
                 {
                     await Notify(invoice);
                 }
-                await SaveEvent(invoice.Id, e);
+
+                if (invoice.ExtendedNotifications)
+                {
+                    await Notify(invoice, e.EventCode, e.Name);
+                }
             }));
 
-            leases.Add(_EventAggregator.Subscribe<InvoiceCreatedEvent>(async e =>
+
+            leases.Add(_EventAggregator.Subscribe<InvoiceDataChangedEvent>(async e =>
             {
                 await SaveEvent(e.InvoiceId, e);
             }));
 
-            leases.Add(_EventAggregator.Subscribe<InvoiceDataChangedEvent>(async e => 
-            {
-                await SaveEvent(e.InvoiceId, e);
-            }));
-
-            leases.Add(_EventAggregator.Subscribe<InvoicePaymentEvent>(async e =>
-            {
-                await SaveEvent(e.InvoiceId, e);
-            }));
 
             leases.Add(_EventAggregator.Subscribe<InvoiceStopWatchedEvent>(async e =>
             {

BTCPayServer/HostedServices/InvoiceWatcher.cs

@@ -146,7 +146,7 @@ namespace BTCPayServer.HostedServices
                 context.MarkDirty();
                 await _InvoiceRepository.UnaffectAddress(invoice.Id);
 
-                context.Events.Add(new InvoiceStatusChangedEvent(invoice, "expired"));
+                context.Events.Add(new InvoiceEvent(invoice, 1004, "invoice_expired"));
                 invoice.Status = "expired";
             }
 
@@ -169,7 +169,7 @@ namespace BTCPayServer.HostedServices
                     invoice.Payments.Add(payment);
 #pragma warning restore CS0618
                     alreadyAccounted.Add(coin.Coin.Outpoint);
-                    context.Events.Add(new InvoicePaymentEvent(invoice.Id, coins.Wallet.Network.CryptoCode, coin.Coin.ScriptPubKey.GetDestinationAddress(coins.Wallet.Network.NBitcoinNetwork).ToString()));
+                    context.Events.Add(new InvoiceEvent(invoice, 1002, "invoice_receivedPayment"));
                     dirtyAddress = true;
                 }
                 if (dirtyAddress)
@@ -188,7 +188,7 @@ namespace BTCPayServer.HostedServices
                     {
                         if (invoice.Status == "new")
                         {
-                            context.Events.Add(new InvoiceStatusChangedEvent(invoice, "paid"));
+                            context.Events.Add(new InvoiceEvent(invoice, 1003, "invoice_paidInFull"));
                             invoice.Status = "paid";
                             invoice.ExceptionStatus = null;
                             await _InvoiceRepository.UnaffectAddress(invoice.Id);
@@ -197,6 +197,7 @@ namespace BTCPayServer.HostedServices
                         else if (invoice.Status == "expired")
                         {
                             invoice.ExceptionStatus = "paidLate";
+                            context.Events.Add(new InvoiceEvent(invoice, 1009, "invoice_paidAfterExpiration"));
                             context.MarkDirty();
                         }
                     }
@@ -246,14 +247,14 @@ namespace BTCPayServer.HostedServices
                        (totalConfirmed < accounting.TotalDue))
                     {
                         await _InvoiceRepository.UnaffectAddress(invoice.Id);
-                        context.Events.Add(new InvoiceStatusChangedEvent(invoice, "invalid"));
+                        context.Events.Add(new InvoiceEvent(invoice, 1013, "invoice_failedToConfirm"));
                         invoice.Status = "invalid";
                         context.MarkDirty();
                     }
                     else if (totalConfirmed >= accounting.TotalDue)
                     {
                         await _InvoiceRepository.UnaffectAddress(invoice.Id);
-                        context.Events.Add(new InvoiceStatusChangedEvent(invoice, "confirmed"));
+                        context.Events.Add(new InvoiceEvent(invoice, 1005, "invoice_confirmed"));
                         invoice.Status = "confirmed";
                         context.MarkDirty();
                     }
@@ -266,7 +267,7 @@ namespace BTCPayServer.HostedServices
                     var totalConfirmed = transactions.Select(t => t.Payment.GetValue(cryptoDataAll, cryptoData.CryptoCode)).Sum();
                     if (totalConfirmed >= accounting.TotalDue)
                     {
-                        context.Events.Add(new InvoiceStatusChangedEvent(invoice, "complete"));
+                        context.Events.Add(new InvoiceEvent(invoice, 1006, "invoice_completed"));
                         invoice.Status = "complete";
                         context.MarkDirty();
                     }
@@ -408,11 +409,23 @@ namespace BTCPayServer.HostedServices
             }
         }
 
-        private void Watch(string invoiceId)
+        private async Task Watch(string invoiceId)
         {
             if (invoiceId == null)
                 throw new ArgumentNullException(nameof(invoiceId));
             _WatchRequests.Add(invoiceId);
+            var invoice = await _InvoiceRepository.GetInvoice(null, invoiceId);
+            try
+            {
+                var now = DateTimeOffset.UtcNow;
+                if (invoice.ExpirationTime > now)
+                {
+                    await Task.Delay(invoice.ExpirationTime - now, _Cts.Token);
+                    _WatchRequests.Add(invoiceId);
+                }
+            }
+            catch when (_Cts.IsCancellationRequested)
+            { }
         }
 
         BlockingCollection<string> _WatchRequests = new BlockingCollection<string>(new ConcurrentQueue<string>());
@@ -430,7 +443,13 @@ namespace BTCPayServer.HostedServices
 
             leases.Add(_EventAggregator.Subscribe<Events.NewBlockEvent>(async b => { await NotifyBlock(); }));
             leases.Add(_EventAggregator.Subscribe<Events.TxOutReceivedEvent>(async b => { await NotifyReceived(b.ScriptPubKey, b.Network); }));
-            leases.Add(_EventAggregator.Subscribe<Events.InvoiceCreatedEvent>(b => { Watch(b.InvoiceId); }));
+            leases.Add(_EventAggregator.Subscribe<Events.InvoiceEvent>(async b =>
+            {
+                if(b.Name == "invoice_created")
+                { 
+                    await Watch(b.InvoiceId);
+                }
+            }));
 
             return Task.CompletedTask;
         }
@@ -469,19 +488,25 @@ namespace BTCPayServer.HostedServices
             {
                 foreach (var item in _WatchRequests.GetConsumingEnumerable(cancellation))
                 {
+                    bool added = false;
                     var task = executing.GetOrAdd(item, async i =>
                     {
                         try
                         {
+                            added = true;
                             await UpdateInvoice(i, cancellation);
                         }
                         catch (Exception ex) when (!cancellation.IsCancellationRequested)
                         {
-                            Logs.PayServer.LogCritical(ex, $"Error in the InvoiceWatcher loop (Invoice {item})");
-                            await Task.Delay(2000, cancellation);
+                            Logs.PayServer.LogCritical(ex, $"Error in the InvoiceWatcher loop (Invoice {i})");
                         }
-                        finally { executing.TryRemove(item, out Task useless); }
                     });
+
+                    if (!added && task.Status == TaskStatus.RanToCompletion)
+                    {
+                        executing.TryRemove(item, out Task t);
+                        _WatchRequests.Add(item);
+                    }
                 }
             }
             catch when (cancellation.IsCancellationRequested)

BTCPayServer/HostedServices/NBXplorerListener.cs

@@ -87,19 +87,22 @@ namespace BTCPayServer.HostedServices
             }, null, 0, (int)PollInterval.TotalMilliseconds);
             leases.Add(_ListenPoller);
 
-            leases.Add(_Aggregator.Subscribe<Events.InvoiceCreatedEvent>(async inv =>
+            leases.Add(_Aggregator.Subscribe<Events.InvoiceEvent>(async inv =>
             {
-                var invoice = await _InvoiceRepository.GetInvoice(null, inv.InvoiceId);
-                List<Task> listeningDerivations = new List<Task>();
-                foreach (var notificationSessions in _Sessions)
+                if (inv.Name == "invoice_created")
                 {
-                    var derivationStrategy = GetStrategy(notificationSessions.Key, invoice);
-                    if (derivationStrategy != null)
+                    var invoice = await _InvoiceRepository.GetInvoice(null, inv.InvoiceId);
+                    List<Task> listeningDerivations = new List<Task>();
+                    foreach (var notificationSessions in _Sessions)
                     {
-                        listeningDerivations.Add(notificationSessions.Value.ListenDerivationSchemesAsync(new[] { derivationStrategy }, _Cts.Token));
+                        var derivationStrategy = GetStrategy(notificationSessions.Key, invoice);
+                        if (derivationStrategy != null)
+                        {
+                            listeningDerivations.Add(notificationSessions.Value.ListenDerivationSchemesAsync(new[] { derivationStrategy }, _Cts.Token));
+                        }
                     }
+                    await Task.WhenAll(listeningDerivations.ToArray()).ConfigureAwait(false);
                 }
-                await Task.WhenAll(listeningDerivations.ToArray()).ConfigureAwait(false);
             }));
             return Task.CompletedTask;
         }

BTCPayServer/Models/StoreViewModels/StoreViewModel.cs

@@ -47,7 +47,23 @@ namespace BTCPayServer.Models.StoreViewModels
 
         public List<StoreViewModel.DerivationScheme> DerivationSchemes { get; set; } = new List<StoreViewModel.DerivationScheme>();
 
-        [Display(Name = "Payment invalid if transactions fails to confirm after ... minutes")]
+        [Display(Name = "Multiply the original rate by ...")]
+        [Range(0.01, 10.0)]
+        public double RateMultiplier
+        {
+            get;
+            set;
+        }
+
+        [Display(Name = "Invoice expires if the full amount has not been paid after ... minutes")]
+        [Range(1, 60 * 24 * 31)]
+        public int InvoiceExpiration
+        {
+            get;
+            set;
+        }
+
+        [Display(Name = "Payment invalid if transactions fails to confirm ... minutes after invoice expiration")]
         [Range(10, 60 * 24 * 31)]
         public int MonitoringExpiration
         {

BTCPayServer/Program.cs

@@ -45,6 +45,7 @@ namespace BTCPayServer
                     .ConfigureLogging(l =>
                     {
                         l.AddFilter("Microsoft", LogLevel.Error);
+                        l.AddFilter("Microsoft.AspNetCore.Antiforgery.Internal", LogLevel.Critical);
                         l.AddProvider(new CustomConsoleLogProvider(processor));
                     })
                     .UseStartup<Startup>()

BTCPayServer/Services/BTCPayServerEnvironment.cs

@@ -5,12 +5,13 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using System.Text;
+using NBXplorer;
 
 namespace BTCPayServer.Services
 {
     public class BTCPayServerEnvironment
     {
-        public BTCPayServerEnvironment(IHostingEnvironment env)
+        public BTCPayServerEnvironment(IHostingEnvironment env, BTCPayNetworkProvider provider)
         {
             Version = typeof(BTCPayServerEnvironment).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
 #if DEBUG
@@ -19,11 +20,13 @@ namespace BTCPayServer.Services
 			Build = "Release";
 #endif
             Environment = env;
+            ChainType = provider.NBXplorerNetworkProvider.ChainType;
         }
         public IHostingEnvironment Environment
         {
             get; set;
         }
+        public ChainType ChainType { get; set; }
         public string Version
         {
             get; set;

BTCPayServer/Services/Invoices/InvoiceRepository.cs

@@ -1,4 +1,5 @@
 using DBreeze;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -16,6 +17,7 @@ using System.Threading.Tasks;
 using BTCPayServer.Data;
 using System.Globalization;
 using BTCPayServer.Models.InvoicingModels;
+using BTCPayServer.Logging;
 
 namespace BTCPayServer.Services.Invoices
 {
@@ -43,6 +45,7 @@ namespace BTCPayServer.Services.Invoices
 
         public async Task<bool> RemovePendingInvoice(string invoiceId)
         {
+            Logs.PayServer.LogInformation($"Remove pending invoice {invoiceId}");
             using (var ctx = _ContextFactory.CreateContext())
             {
                 ctx.PendingInvoices.Remove(new PendingInvoiceData() { Id = invoiceId });

BTCPayServer/Services/Rates/TweakRateProvider.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Data;
+
+namespace BTCPayServer.Services.Rates
+{
+    public class TweakRateProvider : IRateProvider
+    {
+        private BTCPayNetwork network;
+        private IRateProvider rateProvider;
+        private List<RateRule> rateRules;
+
+        public TweakRateProvider(BTCPayNetwork network, IRateProvider rateProvider, List<RateRule> rateRules)
+        {
+            if (network == null)
+                throw new ArgumentNullException(nameof(network));
+            if (rateProvider == null)
+                throw new ArgumentNullException(nameof(rateProvider));
+            if (rateRules == null)
+                throw new ArgumentNullException(nameof(rateRules));
+            this.network = network;
+            this.rateProvider = rateProvider;
+            this.rateRules = rateRules;
+        }
+
+        public async Task<decimal> GetRateAsync(string currency)
+        {
+            var rate = await rateProvider.GetRateAsync(currency);
+            foreach(var rule in rateRules)
+            {
+                rate = rule.Apply(network, rate);
+            }
+            return rate;
+        }
+
+        public async Task<ICollection<Rate>> GetRatesAsync()
+        {
+            List<Rate> rates = new List<Rate>();
+            foreach (var rate in await rateProvider.GetRatesAsync())
+            {
+                var localRate = rate.Value;
+                foreach (var rule in rateRules)
+                {
+                    localRate = rule.Apply(network, localRate);
+                }
+                rates.Add(new Rate(rate.Currency, localRate));
+            }
+            return rates;
+        }
+    }
+}

BTCPayServer/Services/TransactionCache.cs

@@ -1,4 +1,5 @@
 using System;
+using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
@@ -29,33 +30,33 @@ namespace BTCPayServer.Services
     }
     public class TransactionCache : IDisposable
     {
-        IOptions<MemoryCacheOptions> _Options;
+        //IOptions<MemoryCacheOptions> _Options;
         public TransactionCache(IOptions<MemoryCacheOptions> options, BTCPayNetwork network)
         {
-            if (network == null)
-                throw new ArgumentNullException(nameof(network));
-            _Options = options;
-            _MemoryCache = new MemoryCache(_Options);
-            Network = network;
+            //if (network == null)
+            //    throw new ArgumentNullException(nameof(network));
+            //_Options = options;
+            //_MemoryCache = new MemoryCache(_Options);
+            //Network = network;
         }
 
-        uint256 _LastHash;
-        int _ConfOffset;
-        IMemoryCache _MemoryCache;
+        //uint256 _LastHash;
+        //int _ConfOffset;
+        //IMemoryCache _MemoryCache;
         
         public void NewBlock(uint256 newHash, uint256 previousHash)
         {
-            if (_LastHash != previousHash)
-            {
-                var old = _MemoryCache;
-                _ConfOffset = 0;
-                _MemoryCache = new MemoryCache(_Options);
-                Thread.MemoryBarrier();
-                old.Dispose();
-            }
-            else
-                _ConfOffset++;
-            _LastHash = newHash;
+            //if (_LastHash != previousHash)
+            //{
+            //    var old = _MemoryCache;
+            //    _ConfOffset = 0;
+            //    _MemoryCache = new MemoryCache(_Options);
+            //    Thread.MemoryBarrier();
+            //    old.Dispose();
+            //}
+            //else
+            //    _ConfOffset++;
+            //_LastHash = newHash;
         }
 
         public TimeSpan CacheSpan { get; private set; } = TimeSpan.FromMinutes(60);
@@ -64,29 +65,32 @@ namespace BTCPayServer.Services
 
         public void AddToCache(TransactionResult tx)
         {
-            _MemoryCache.Set(tx.Transaction.GetHash(), tx, DateTimeOffset.UtcNow + CacheSpan);
+            //Logging.Logs.PayServer.LogInformation($"ADD CACHE: {tx.Transaction.GetHash()} ({tx.Confirmations} conf)");
+            //_MemoryCache.Set(tx.Transaction.GetHash(), tx, DateTimeOffset.UtcNow + CacheSpan);
         }
 
 
         public TransactionResult GetTransaction(uint256 txId)
         {
-            _MemoryCache.TryGetValue(txId.ToString(), out object tx);
+            //var ok = _MemoryCache.TryGetValue(txId.ToString(), out object tx);
+            //Logging.Logs.PayServer.LogInformation($"GET CACHE: {txId} ({ok} plus {_ConfOffset})");
 
-            var result = tx as TransactionResult;
-            var confOffset = _ConfOffset;
-            if (result != null && result.Confirmations > 0 && confOffset > 0)
-            {
-                var serializer = new NBXplorer.Serializer(Network.NBitcoinNetwork);
-                result = serializer.ToObject<TransactionResult>(serializer.ToString(result));
-                result.Confirmations += confOffset;
-                result.Height += confOffset;
-            }
-            return result;
+            //var result = tx as TransactionResult;
+            //var confOffset = _ConfOffset;
+            //if (result != null && result.Confirmations > 0 && confOffset > 0)
+            //{
+            //    var serializer = new NBXplorer.Serializer(Network.NBitcoinNetwork);
+            //    result = serializer.ToObject<TransactionResult>(serializer.ToString(result));
+            //    result.Confirmations += confOffset;
+            //    result.Height += confOffset;
+            //}
+            //return result;
+            return null; // Does not work correctly yet
         }
 
         public void Dispose()
         {
-            _MemoryCache.Dispose();
+            //_MemoryCache.Dispose();
         }
     }
 }

BTCPayServer/Services/Wallets/BTCPayWallet.cs

@@ -15,8 +15,7 @@ namespace BTCPayServer.Services.Wallets
 {
     public class KnownState
     {
-        public uint256 UnconfirmedHash { get; set; }
-        public uint256 ConfirmedHash { get; set; }
+        public UTXOChanges PreviousCall { get; set; }
     }
     public class NetworkCoins
     {
@@ -88,11 +87,11 @@ namespace BTCPayServer.Services.Wallets
 
         public async Task<NetworkCoins> GetCoins(DerivationStrategyBase strategy, KnownState state, CancellationToken cancellation = default(CancellationToken))
         {
-            var changes = await _Client.SyncAsync(strategy, state?.ConfirmedHash, state?.UnconfirmedHash, true, cancellation).ConfigureAwait(false);
+            var changes = await _Client.GetUTXOsAsync(strategy, state?.PreviousCall, false, cancellation).ConfigureAwait(false);
             return new NetworkCoins()
             {
                 TimestampedCoins = changes.Confirmed.UTXOs.Concat(changes.Unconfirmed.UTXOs).Select(c => new NetworkCoins.TimestampedCoin() { Coin = c.AsCoin(), DateTime = c.Timestamp }).ToArray(),
-                State = new KnownState() { ConfirmedHash = changes.Confirmed.Hash, UnconfirmedHash = changes.Unconfirmed.Hash },
+                State = new KnownState() { PreviousCall = changes },
                 Strategy = strategy,
                 Wallet = this
             };
@@ -107,7 +106,7 @@ namespace BTCPayServer.Services.Wallets
 
         public async Task<Money> GetBalance(DerivationStrategyBase derivationStrategy)
         {
-            var result = await _Client.SyncAsync(derivationStrategy, null, true);
+            var result = await _Client.GetUTXOsAsync(derivationStrategy, null, true);
 
             Dictionary<OutPoint, UTXO> received = new Dictionary<OutPoint, UTXO>();
             foreach(var utxo in result.Confirmed.UTXOs.Concat(result.Unconfirmed.UTXOs))

BTCPayServer/Views/Home/Home.cshtml

@@ -57,10 +57,10 @@
         <h2>Video tutorials</h2>
         <div class="row">
             <div class="col-md-6 text-center">
-                <iframe width="560" height="315" src="https://www.youtube.com/embed/xh3Eac66qc4" frameborder="0" allowfullscreen></iframe>
+                <iframe width="400" height="225" src="https://www.youtube.com/embed/xh3Eac66qc4" frameborder="0" allowfullscreen></iframe>
             </div>
             <div class="col-md-6 text-center">
-                <iframe width="560" height="315" src="https://www.youtube.com/embed/Xo_vApXTZBU" frameborder="0" allowfullscreen></iframe>
+                <iframe width="400" height="225" src="https://www.youtube.com/embed/Xo_vApXTZBU" frameborder="0" allowfullscreen></iframe>
             </div>
         </div>
     </div>

BTCPayServer/Views/Shared/SyncModal.cshtml

@@ -0,0 +1,94 @@
+@inject BTCPayServer.HostedServices.NBXplorerDashboard dashboard
+<!-- Modal -->
+<div id="modalDialog" class="modal-dialog animated bounceInRight">
+
+    <!-- Modal content-->
+    <div class="modal-content">
+        <div class="modal-header">
+            <h4 class="modal-title">Your nodes are synching...</h4>
+            <button type="button" class="close" onclick="dismissSyncModal()">&times;</button>
+        </div>
+        <div class="modal-body">
+            <p>
+                Some of your nodes are still synching...<br />
+                BTCPay Server will not work correctly until it is over.
+            </p>
+            @foreach (var line in dashboard.GetAll())
+            {
+                <h4>@line.Network.CryptoCode</h4>
+                @if (line.Status == null)
+                {
+                    <ul>
+                        <li>The node is offline</li>
+                        @if (line.Error != null)
+                        {
+                            <li>Last error: @line.Error</li>
+                        }
+                    </ul>
+                }
+                else
+                {
+                    <ul>
+                        <li>NBXplorer headers height: @line.Status.ChainHeight</li>
+                        @if (line.Status.BitcoinStatus == null)
+                        {
+                            if (line.State == BTCPayServer.HostedServices.NBXplorerState.Synching)
+                            {
+                                <li>The node is starting...</li>
+                            }
+                            else
+                            {
+                                <li>The node is offline</li>
+                                @if (line.Error != null)
+                                {
+                                    <li>Last error: @line.Error</li>
+                                }
+                            }
+                        }
+                        else if (line.Status.BitcoinStatus.IsSynched)
+                        {
+                            <li>The node is synched (Height: @line.Status.BitcoinStatus.Headers)</li>
+                            @if (line.Status.BitcoinStatus.IsSynched &&
+                                line.Status.SyncHeight.HasValue &&
+                                line.Status.SyncHeight.Value < line.Status.BitcoinStatus.Headers)
+                            {
+                                <li>NBXplorer is synching... (Height: @line.Status.SyncHeight.Value)</li>
+                            }
+                        }
+                        else
+                        {
+                            <li>Node headers height: @line.Status.BitcoinStatus.Headers</li>
+                            <li>Validated blocks: @line.Status.BitcoinStatus.Blocks</li>
+                        }
+                    </ul>
+                    @if (!line.Status.IsFullySynched && line.Status.BitcoinStatus != null)
+                    {
+                        <div class="progress">
+                            <div class="progress-bar" role="progressbar" aria-valuenow="@((int)(line.Status.BitcoinStatus.VerificationProgress * 100))"
+                                 aria-valuemin="0" aria-valuemax="100" style="width:@((int)(line.Status.BitcoinStatus.VerificationProgress * 100))%">
+                                @((int)(line.Status.BitcoinStatus.VerificationProgress * 100))%
+                            </div>
+                        </div>
+                    }
+                }
+            }
+        </div>
+    </div>
+
+</div>
+
+<link href="~/vendor/animatecss/animate.css" rel="stylesheet" />
+<script type="text/javascript">
+    function dismissSyncModal() {
+        $("#modalDialog").addClass('animated bounceOutRight')
+    }
+</script>
+
+<style type="text/css">
+    #modalDialog {
+        position: fixed;
+        bottom: 20px;
+        right: 20px;
+        margin: 0px;
+    }
+</style>

BTCPayServer/Views/Shared/_Layout.cshtml

@@ -38,7 +38,7 @@
 <body id="page-top">
 
     @{
-        if(ViewBag.AlwaysShrinkNavBar == null)
+        if (ViewBag.AlwaysShrinkNavBar == null)
         {
             ViewBag.AlwaysShrinkNavBar = true;
         }
@@ -48,30 +48,36 @@
     <!-- Navigation -->
     <nav class='navbar navbar-expand-lg navbar-light fixed-top @additionalStyle' id="mainNav">
         <div class="container">
-            <a class="navbar-brand js-scroll-trigger" href="~/"><img src="~/img/logo.png" height="45"></a>
+            <a class="navbar-brand js-scroll-trigger" href="~/">
+                <img src="~/img/logo.png" height="45">
+                @if(env.ChainType != NBXplorer.ChainType.Main)
+                {
+                <span class="badge badge-warning" style="font-size:10px;">@env.ChainType.ToString()</span>
+                }
+            </a>
             <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
             </button>
             <div class="collapse navbar-collapse" id="navbarResponsive">
                 <ul class="navbar-nav ml-auto">
                     @if(SignInManager.IsSignedIn(User))
-                    {
-                        @if(User.IsInRole(Roles.ServerAdmin))
-                        {
-                            <li class="nav-item"><a asp-area="" asp-controller="Server" asp-action="ListUsers" class="nav-link js-scroll-trigger">Server settings</a></li>
-                        }
-                        <li class="nav-item"><a asp-area="" asp-controller="Stores" asp-action="ListStores" class="nav-link js-scroll-trigger">Stores</a></li>
-                        <li class="nav-item"><a asp-area="" asp-controller="Invoice" asp-action="ListInvoices" class="nav-link js-scroll-trigger">Invoices</a></li>
-                        <li class="nav-item">
-                            <a asp-area="" asp-controller="Manage" asp-action="Index" title="Manage" class="nav-link js-scroll-trigger">My settings</a>
-                        </li>
-                        <li class="nav-item">
-                            <a asp-area="" asp-controller="Account" asp- asp-action="Logout" title="Manage" class="nav-link js-scroll-trigger">Log out</a>
-                        </li>}
-                    else
-                    {
-                        <li class="nav-item"><a asp-area="" asp-controller="Account" asp-action="Register" class="nav-link js-scroll-trigger">Register</a></li>
-                        <li class="nav-item"><a asp-area="" asp-controller="Account" asp-action="Login" class="nav-link js-scroll-trigger">Log in</a></li>}
+            {
+                @if(User.IsInRole(Roles.ServerAdmin))
+        {
+            <li class="nav-item"><a asp-area="" asp-controller="Server" asp-action="ListUsers" class="nav-link js-scroll-trigger">Server settings</a></li>
+}
+                <li class="nav-item"><a asp-area="" asp-controller="Stores" asp-action="ListStores" class="nav-link js-scroll-trigger">Stores</a></li>
+                <li class="nav-item"><a asp-area="" asp-controller="Invoice" asp-action="ListInvoices" class="nav-link js-scroll-trigger">Invoices</a></li>
+                <li class="nav-item">
+                    <a asp-area="" asp-controller="Manage" asp-action="Index" title="Manage" class="nav-link js-scroll-trigger">My settings</a>
+                </li>
+                <li class="nav-item">
+                    <a asp-area="" asp-controller="Account" asp- asp-action="Logout" title="Manage" class="nav-link js-scroll-trigger">Log out</a>
+                </li>}
+    else
+    {
+        <li class="nav-item"><a asp-area="" asp-controller="Account" asp-action="Register" class="nav-link js-scroll-trigger">Register</a></li>
+        <li class="nav-item"><a asp-area="" asp-controller="Account" asp-action="Login" class="nav-link js-scroll-trigger">Log in</a></li>}
 
                 </ul>
             </div>
@@ -80,93 +86,6 @@
 
     @RenderBody()
 
-
-    @if(!dashboard.IsFullySynched())
-    {
-        <!-- Modal -->
-        <div id="synching-modal" class="modal fade" role="dialog">
-            <div class="modal-dialog">
-
-                <!-- Modal content-->
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h4 class="modal-title">Your nodes are synching...</h4>
-                        <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    </div>
-                    <div class="modal-body">
-                        <p>
-                            Some of your nodes are still synching...<br />
-                            BTCPay Server will not work correctly until it is over.
-                        </p>
-                        @foreach(var line in dashboard.GetAll())
-                        {
-                            <h4>@line.Network.CryptoCode</h4>
-                            @if(line.Status == null)
-                            {
-                                <ul>
-                                <li>The node is offline</li>
-                                @if(line.Error != null)
-                                {
-                                    <li>Last error: @line.Error</li>
-                                }
-                                </ul>
-                            }
-                            else
-                            {
-                                <ul>
-                                    <li>NBXplorer headers height: @line.Status.ChainHeight</li>
-                                    @if(line.Status.BitcoinStatus == null)
-                                    {
-                                        if(line.State == BTCPayServer.HostedServices.NBXplorerState.Synching)
-                                        {
-                                            <li>The node is starting...</li>
-                                        }
-                                        else
-                                        {
-                                            <li>The node is offline</li>
-                                            @if(line.Error != null)
-                                            {
-                                                <li>Last error: @line.Error</li>
-                                            }
-                                        }
-                                    }
-                                    else if(line.Status.BitcoinStatus.IsSynched)
-                                    {
-                                        <li>The node is synched (Height: @line.Status.BitcoinStatus.Headers)</li>
-                                        @if(line.Status.BitcoinStatus.IsSynched &&
-                                            line.Status.SyncHeight.HasValue &&
-                                            line.Status.SyncHeight.Value < line.Status.BitcoinStatus.Headers)
-                                        {
-                                            <li>NBXplorer is synching... (Height: @line.Status.SyncHeight.Value)</li>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <li>Node headers height: @line.Status.BitcoinStatus.Headers</li>
-                                        <li>Validated blocks: @line.Status.BitcoinStatus.Blocks</li>
-                                    }
-                                </ul>
-                                @if(!line.Status.IsFullySynched && line.Status.BitcoinStatus != null)
-                                {
-                                    <div class="progress">
-                                        <div class="progress-bar" role="progressbar" aria-valuenow="@((int)(line.Status.BitcoinStatus.VerificationProgress * 100))"
-                                             aria-valuemin="0" aria-valuemax="100" style="width:@((int)(line.Status.BitcoinStatus.VerificationProgress * 100))%">
-                                            @((int)(line.Status.BitcoinStatus.VerificationProgress * 100))%
-                                        </div>
-                                    </div>
-                                }
-                            }
-                        }
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    }
-
     <footer class="bg-dark">
         <div class="container text-right"><span style="font-size:8px;">@env.ToString()</span></div>
     </footer>
@@ -184,13 +103,10 @@
     <!-- Custom scripts for this template -->
     <script src="~/js/creative.js"></script>
 
-    @if(!dashboard.IsFullySynched())
+
+    @if (!dashboard.IsFullySynched())
     {
-        <script type="text/javascript">
-            $(function () {
-                $("#synching-modal").modal();
-            });
-        </script>
+        @Html.Partial("SyncModal")
     }
 
     @RenderSection("Scripts", required: false)

BTCPayServer/Views/Stores/UpdateStore.cshtml

@@ -38,6 +38,16 @@
                 <label asp-for="NetworkFee"></label>
                 <input asp-for="NetworkFee" type="checkbox" class="form-check" />
             </div>
+            <div class="form-group">
+                <label asp-for="RateMultiplier"></label>
+                <input asp-for="RateMultiplier" class="form-control" />
+                <span asp-validation-for="RateMultiplier" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="InvoiceExpiration"></label>
+                <input asp-for="InvoiceExpiration" class="form-control" />
+                <span asp-validation-for="InvoiceExpiration" class="text-danger"></span>
+            </div>
             <div class="form-group">
                 <label asp-for="MonitoringExpiration"></label>
                 <input asp-for="MonitoringExpiration" class="form-control" />

Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/aspnetcore-build AS builder
+FROM microsoft/aspnetcore-build:2.0.5-2.1.4-stretch AS builder
 WORKDIR /source
 COPY BTCPayServer/BTCPayServer.csproj BTCPayServer.csproj
 # Cache some dependencies
@@ -6,7 +6,7 @@ RUN dotnet restore
 COPY BTCPayServer/. .
 RUN dotnet publish --output /app/ --configuration Release
 
-FROM microsoft/aspnetcore:2.0.3
+FROM microsoft/aspnetcore:2.0.5-stretch
 WORKDIR /app
 
 RUN mkdir /datadir

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 btcpayserver
+Copyright (c) 2017-2018 btcpayserver
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -8,17 +8,17 @@
 
 ## Introduction 
 
-BTCPay Server is an Open Source payment processor conforms to the invoice API of Bitpay.
+BTCPay Server is an Open Source payment processor, written in C#, that conforms to the invoice API of [Bitpay](https://bitpay.com/).
 This allows easy migration of your code base to your own, self-hosted payment processor.
 
 This solution is for you if:
 
-* You currently use Bitpay as a payment processor but are worry about their commitment to Bitcoin in the future
+* You are currently using Bitpay as a payment processor but are worried about their commitment to Bitcoin in the future
 * You want to be in control of your own funds
 * Bitpay compliance team decided to reject your application
-* You want lower fee (we support Segwit)
-* You want to become a payment processor yourself and offer BTCPay hosted solution to merchants
-* You want to a way support other currency than those offered by Bitpay
+* You want lower fees (we support Segwit)
+* You want to become a payment processor yourself and offer a BTCPay hosted solution to merchants
+* You want a way to support currencies other than those offered by Bitpay
 
 ## Documentation
 

global.json

@@ -1 +0,0 @@
-{ "sdk": { "version": "2.0.0" } }