Can lock down registrations

BTCPayServer.Tests/UnitTest1.cs

@@ -251,6 +251,17 @@ namespace BTCPayServer.Tests
             }
         }
 
+        [Fact]
+        public void CanParseFilter()
+        {
+            var filter = "storeid:abc status:abed blabhbalh ";
+            var search = new SearchString(filter);
+            Assert.Equal("storeid:abc status:abed blabhbalh", search.ToString());
+            Assert.Equal("blabhbalh", search.TextSearch);
+            Assert.Equal("abc", search.Filters["storeid"]);
+            Assert.Equal("abed", search.Filters["status"]);
+        }
+
         [Fact]
         public void InvoiceFlowThroughDifferentStatesCorrectly()
         {

BTCPayServer.Tests/docker-compose.yml

@@ -21,7 +21,7 @@ services:
       - "tests:127.0.0.1"
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:1.0.0.28
+    image: nicolasdorier/nbxplorer:1.0.0.29
     ports:
       - "32838:32838"
     expose: 
@@ -39,6 +39,9 @@ services:
       - bitcoind
       - postgres
 
+  eclair:
+    image: nicolasdorier/docker-bitcoin:0.15.0.1
+
   bitcoind:
     container_name: btcpayserver_dev_bitcoind
     image: nicolasdorier/docker-bitcoin:0.15.0.1

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.0.31</Version>
+		<Version>1.0.0.36</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Build\dockerfiles\**" />
@@ -21,8 +21,8 @@
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.5.1" />
     <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.41" />
-    <PackageReference Include="NBitpayClient" Version="1.0.0.12" />	  
+    <PackageReference Include="NBitcoin" Version="4.0.0.48" />
+    <PackageReference Include="NBitpayClient" Version="1.0.0.13" />	  
     <PackageReference Include="DBreeze" Version="1.87.0" />
     <PackageReference Include="NBXplorer.Client" Version="1.0.0.18" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.1" />

BTCPayServer/Controllers/AccountController.cs

@@ -235,8 +235,11 @@ namespace BTCPayServer.Controllers
 
         [HttpGet]
         [AllowAnonymous]
-        public IActionResult Register(string returnUrl = null)
+        public async Task<IActionResult> Register(string returnUrl = null)
         {
+            var policies = await _SettingsRepository.GetSettingAsync<PoliciesSettings>() ?? new PoliciesSettings();
+            if (policies.LockSubscription)
+                return RedirectToAction(nameof(HomeController.Index), "Home");
             ViewData["ReturnUrl"] = returnUrl;
             return View();
         }
@@ -247,9 +250,11 @@ namespace BTCPayServer.Controllers
         public async Task<IActionResult> Register(RegisterViewModel model, string returnUrl = null)
         {
             ViewData["ReturnUrl"] = returnUrl;
+            var policies = await _SettingsRepository.GetSettingAsync<PoliciesSettings>() ?? new PoliciesSettings();
+            if (policies.LockSubscription)
+                return RedirectToAction(nameof(HomeController.Index), "Home");
             if (ModelState.IsValid)
             {
-                var policies = await _SettingsRepository.GetSettingAsync<PoliciesSettings>() ?? new PoliciesSettings();
                 var user = new ApplicationUser { UserName = model.Email, Email = model.Email, RequiresEmailConfirmation = policies.RequiresConfirmedEmail };
                 var result = await _userManager.CreateAsync(user, model.Password);
                 if (result.Succeeded)

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -15,6 +15,7 @@ using System.Linq;
 using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
 
 namespace BTCPayServer.Controllers
 {
@@ -118,8 +119,7 @@ namespace BTCPayServer.Controllers
                 return null;
             var store = await _StoreRepository.FindStore(invoice.StoreId);
             var dto = invoice.EntityToDTO();
-
-            var cryptoFormat = _CurrencyNameTable.GetCurrencyProvider("BTC");
+            var currency = invoice.ProductInformation.Currency;
             var model = new PaymentModel()
             {
                 ServerUrl = HttpContext.Request.GetAbsoluteRoot(),
@@ -133,7 +133,7 @@ namespace BTCPayServer.Controllers
                 ExpirationSeconds = Math.Max(0, (int)(invoice.ExpirationTime - DateTimeOffset.UtcNow).TotalSeconds),
                 MaxTimeSeconds = (int)(invoice.ExpirationTime - invoice.InvoiceTime).TotalSeconds,
                 ItemDesc = invoice.ProductInformation.ItemDesc,
-                Rate = invoice.Rate.ToString("C", _CurrencyNameTable.GetCurrencyProvider(invoice.ProductInformation.Currency)),
+                Rate = invoice.Rate.ToString("C", _CurrencyNameTable.GetCurrencyProvider(currency)) + $" ({currency})",
                 MerchantRefLink = invoice.RedirectURL ?? "/",
                 StoreName = store.StoreName,
                 TxFees = invoice.TxFee.ToString(),
@@ -188,12 +188,15 @@ namespace BTCPayServer.Controllers
         public async Task<IActionResult> ListInvoices(string searchTerm = null, int skip = 0, int count = 20)
         {
             var model = new InvoicesModel();
+            var filterString = new SearchString(searchTerm);
             foreach (var invoice in await _InvoiceRepository.GetInvoices(new InvoiceQuery()
             {
-                TextSearch = searchTerm,
+                TextSearch = filterString.TextSearch,
                 Count = count,
                 Skip = skip,
-                UserId = GetUserId()
+                UserId = GetUserId(),
+                Status = filterString.Filters.TryGet("status"),
+                StoreId = filterString.Filters.TryGet("storeid")
             }))
             {
                 model.SearchTerm = searchTerm;
@@ -246,21 +249,30 @@ namespace BTCPayServer.Controllers
                     storeId = store.Id
                 });
             }
-            var result = await CreateInvoiceCore(new Invoice()
-            {
-                Price = model.Amount.Value,
-                Currency = "USD",
-                PosData = model.PosData,
-                OrderId = model.OrderId,
-                //RedirectURL = redirect + "redirect",
-                NotificationURL = model.NotificationUrl,
-                ItemDesc = model.ItemDesc,
-                FullNotifications = true,
-                BuyerEmail = model.BuyerEmail,
-            }, store, HttpContext.Request.GetAbsoluteRoot());
 
-            StatusMessage = $"Invoice {result.Data.Id} just created!";
-            return RedirectToAction(nameof(ListInvoices));
+            try
+            {
+                var result = await CreateInvoiceCore(new Invoice()
+                {
+                    Price = model.Amount.Value,
+                    Currency = model.Currency,
+                    PosData = model.PosData,
+                    OrderId = model.OrderId,
+                    //RedirectURL = redirect + "redirect",
+                    NotificationURL = model.NotificationUrl,
+                    ItemDesc = model.ItemDesc,
+                    FullNotifications = true,
+                    BuyerEmail = model.BuyerEmail,
+                }, store, HttpContext.Request.GetAbsoluteRoot());
+
+                StatusMessage = $"Invoice {result.Data.Id} just created!";
+                return RedirectToAction(nameof(ListInvoices));
+            }
+            catch (RateUnavailableException)
+            {
+                ModelState.TryAddModelError(nameof(model.Currency), "Unsupported currency");
+                return View(model);
+            }
         }
 
         private async Task<SelectList> GetStores(string userId, string storeId = null)

BTCPayServer/Controllers/InvoiceController.cs

@@ -78,7 +78,7 @@ namespace BTCPayServer.Controllers
             _FeeProvider = feeProvider ?? throw new ArgumentNullException(nameof(feeProvider));
         }
 
-        internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(Invoice invoice, StoreData store, string serverUrl, double expiryMinutes = 15, double monitoringMinutes = 60)
+        internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(Invoice invoice, StoreData store, string serverUrl, double expiryMinutes = 15)
         {
             //TODO: expiryMinutes (time before a new invoice can become paid) and monitoringMinutes (time before a paid invoice becomes invalid)  should be configurable at store level
             var derivationStrategy = store.DerivationStrategy;
@@ -87,12 +87,13 @@ namespace BTCPayServer.Controllers
                 InvoiceTime = DateTimeOffset.UtcNow,
                 DerivationStrategy = derivationStrategy ?? throw new BitpayHttpException(400, "This store has not configured the derivation strategy")
             };
+            var storeBlob = store.GetStoreBlob(_Network);
             Uri notificationUri = Uri.IsWellFormedUriString(invoice.NotificationURL, UriKind.Absolute) ? new Uri(invoice.NotificationURL, UriKind.Absolute) : null;
             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.MonitoringExpiration = entity.InvoiceTime.AddMinutes(monitoringMinutes);
+            entity.MonitoringExpiration = entity.ExpirationTime + TimeSpan.FromMinutes(storeBlob.MonitoringExpiration);
             entity.OrderId = invoice.OrderId;
             entity.ServerUrl = serverUrl;
             entity.FullNotifications = invoice.FullNotifications;
@@ -114,7 +115,7 @@ namespace BTCPayServer.Controllers
             var getFeeRate = _FeeProvider.GetFeeRateAsync();
             var getRate = _RateProvider.GetRateAsync(invoice.Currency);
             var getAddress = _Wallet.ReserveAddressAsync(ParseDerivationStrategy(derivationStrategy));
-            entity.TxFee = store.GetStoreBlob(_Network).NetworkFeeDisabled ? Money.Zero : (await getFeeRate).GetFee(100); // assume price for 100 bytes
+            entity.TxFee = storeBlob.NetworkFeeDisabled ? Money.Zero : (await getFeeRate).GetFee(100); // assume price for 100 bytes
             entity.Rate = (double)await getRate;
             entity.PosData = invoice.PosData;
             entity.DepositAddress = await getAddress;

BTCPayServer/Controllers/StoresController.cs

@@ -144,13 +144,16 @@ namespace BTCPayServer.Controllers
             if (store == null)
                 return NotFound();
 
+            var storeBlob = store.GetStoreBlob(_Network);
             var vm = new StoreViewModel();
+            vm.Id = store.Id;
             vm.StoreName = store.StoreName;
             vm.StoreWebsite = store.StoreWebsite;
-            vm.NetworkFee = !store.GetStoreBlob(_Network).NetworkFeeDisabled;
+            vm.NetworkFee = !storeBlob.NetworkFeeDisabled;
             vm.SpeedPolicy = store.SpeedPolicy;
             vm.DerivationScheme = store.DerivationStrategy;
             vm.StatusMessage = StatusMessage;
+            vm.MonitoringExpiration = storeBlob.MonitoringExpiration;
             return View(vm);
         }
 
@@ -205,11 +208,12 @@ namespace BTCPayServer.Controllers
                     }
                 }
 
-                if (store.GetStoreBlob(_Network).NetworkFeeDisabled != !model.NetworkFee)
+                var blob = store.GetStoreBlob(_Network);
+                blob.NetworkFeeDisabled = !model.NetworkFee;
+                blob.MonitoringExpiration = model.MonitoringExpiration;
+
+                if (store.SetStoreBlob(blob, _Network))
                 {
-                    var blob = store.GetStoreBlob(_Network);
-                    blob.NetworkFeeDisabled = !model.NetworkFee;
-                    store.SetStoreBlob(blob, _Network);
                     needUpdate = true;
                 }
 

BTCPayServer/Data/StoreData.cs

@@ -8,6 +8,8 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.ComponentModel;
+using Newtonsoft.Json;
 
 namespace BTCPayServer.Data
 {
@@ -65,17 +67,33 @@ namespace BTCPayServer.Data
             return StoreBlob == null ? new StoreBlob() : new Serializer(network).ToObject<StoreBlob>(Encoding.UTF8.GetString(StoreBlob));
         }
 
-        public void SetStoreBlob(StoreBlob storeBlob, Network network)
+        public bool SetStoreBlob(StoreBlob storeBlob, Network network)
         {
-            StoreBlob = Encoding.UTF8.GetBytes(new Serializer(network).ToString(storeBlob));
+            var original = new Serializer(network).ToString(GetStoreBlob(network));
+            var newBlob = new Serializer(network).ToString(storeBlob);
+            if (original == newBlob)
+                return false;
+            StoreBlob = Encoding.UTF8.GetBytes(newBlob);
+            return true;
         }
     }
 
     public class StoreBlob
     {
+        public StoreBlob()
+        {
+            MonitoringExpiration = 60;
+        }
         public bool NetworkFeeDisabled
         {
             get; set;
         }
+        [DefaultValue(60)]
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        public int MonitoringExpiration
+        {
+            get;
+            set;
+        }
     }
 }

BTCPayServer/Models/InvoicingModels/CreateInvoiceModel.cs

@@ -9,12 +9,22 @@ namespace BTCPayServer.Models.InvoicingModels
 {
     public class CreateInvoiceModel
     {
+        public CreateInvoiceModel()
+        {
+            Currency = "USD";
+        }
         [Required]
         public double? Amount
         {
             get; set;
         }
 
+        [Required]
+        public string Currency
+        {
+            get; set;
+        }
+
         [Required]
         public string StoreId
         {

BTCPayServer/Models/StoreViewModels/StoreViewModel.cs

@@ -10,6 +10,7 @@ namespace BTCPayServer.Models.StoreViewModels
 {
     public class StoreViewModel
     {
+        public string Id { get; set; }
         [Display(Name = "Store Name")]
         [Required]
         [MaxLength(50)]
@@ -34,6 +35,14 @@ namespace BTCPayServer.Models.StoreViewModels
             get; set;
         }
 
+        [Display(Name = "Payment invalid if transactions fails to confirm after ... minutes")]
+        [Range(10, 60 * 24 * 31)]
+        public int MonitoringExpiration
+        {
+            get;
+            set;
+        }
+
         [Display(Name = "Consider the invoice confirmed when the payment transaction...")]
         public SpeedPolicy SpeedPolicy
         {

BTCPayServer/SearchString.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace BTCPayServer
+{
+    public class SearchString
+    {
+        string _OriginalString;
+        public SearchString(string str)
+        {
+            str = str ?? string.Empty;
+            str = str.Trim();
+            _OriginalString = str.Trim();
+            TextSearch = _OriginalString;
+            var splitted = str.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+            Filters
+                = splitted
+                    .Select(t => t.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries))
+                    .Where(kv => kv.Length == 2)
+                    .Select(kv => new KeyValuePair<string, string>(kv[0].ToLowerInvariant(), kv[1]))
+                    .ToDictionary(o => o.Key, o => o.Value);
+
+            foreach(var filter in splitted)
+            {
+                if(filter.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Length == 2)
+                { 
+                    TextSearch = TextSearch.Replace(filter, string.Empty);
+                }
+            }
+            TextSearch = TextSearch.Trim();
+        }
+
+        public string TextSearch
+        {
+            get;
+            private set;
+        }
+
+        public Dictionary<string, string> Filters { get; private set; }
+
+        public override string ToString()
+        {
+            return _OriginalString;
+        }
+    }
+}

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -251,7 +251,8 @@ namespace BTCPayServer.Services.Invoices
             get;
             set;
         }
-        public DateTimeOffset? MonitoringExpiration
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        public DateTimeOffset MonitoringExpiration
         {
             get;
             set;

BTCPayServer/Services/Invoices/InvoiceWatcher.cs

@@ -80,9 +80,8 @@ namespace BTCPayServer.Services.Invoices
                         Logs.PayServer.LogInformation($"Invoice {invoice.Id}: {stateBefore} => {invoice.Status}");
                     }
 
-                    var expirationMonitoring = invoice.MonitoringExpiration.HasValue ? invoice.MonitoringExpiration.Value : invoice.InvoiceTime + TimeSpan.FromMinutes(60);
                     if (invoice.Status == "complete" ||
-                       ((invoice.Status == "invalid" || invoice.Status == "expired") && expirationMonitoring < DateTimeOffset.UtcNow))
+                       ((invoice.Status == "invalid" || invoice.Status == "expired") && invoice.MonitoringExpiration < DateTimeOffset.UtcNow))
                     {
                         if (await _InvoiceRepository.RemovePendingInvoice(invoice.Id).ConfigureAwait(false))
                             Logs.PayServer.LogInformation("Stopped watching invoice " + invoiceId);
@@ -133,6 +132,10 @@ namespace BTCPayServer.Services.Invoices
                 needSave = true;
                 await _InvoiceRepository.UnaffectAddress(invoice.Id);
                 invoice.Status = "expired";
+                if (invoice.FullNotifications)
+                {
+                    _NotificationManager.Notify(invoice);
+                }
             }
 
             if (invoice.Status == "new" || invoice.Status == "expired")
@@ -181,22 +184,39 @@ namespace BTCPayServer.Services.Invoices
 
             if (invoice.Status == "paid")
             {
-                if (!invoice.MonitoringExpiration.HasValue || invoice.MonitoringExpiration > DateTimeOffset.UtcNow)
+                var transactions = await GetPaymentsWithTransaction(invoice);
+                var chainConfirmedTransactions = transactions.Where(t => t.Confirmations >= 1);
+                if (invoice.SpeedPolicy == SpeedPolicy.HighSpeed)
                 {
-                    var transactions = await GetPaymentsWithTransaction(invoice);
-                    if (invoice.SpeedPolicy == SpeedPolicy.HighSpeed)
-                    {
-                        transactions = transactions.Where(t => !t.Transaction.RBF);
-                    }
-                    else if (invoice.SpeedPolicy == SpeedPolicy.MediumSpeed)
-                    {
-                        transactions = transactions.Where(t => t.Confirmations >= 1);
-                    }
-                    else if (invoice.SpeedPolicy == SpeedPolicy.LowSpeed)
-                    {
-                        transactions = transactions.Where(t => t.Confirmations >= 6);
-                    }
+                    transactions = transactions.Where(t => !t.Transaction.RBF);
+                }
+                else if (invoice.SpeedPolicy == SpeedPolicy.MediumSpeed)
+                {
+                    transactions = transactions.Where(t => t.Confirmations >= 1);
+                }
+                else if (invoice.SpeedPolicy == SpeedPolicy.LowSpeed)
+                {
+                    transactions = transactions.Where(t => t.Confirmations >= 6);
+                }
 
+                var chainTotalConfirmed = chainConfirmedTransactions.Select(t => t.Payment.Output.Value).Sum();
+
+                if (// Is after the monitoring deadline
+                   (invoice.MonitoringExpiration < DateTimeOffset.UtcNow)
+                   &&
+                   // And not enough amount confirmed
+                   (chainTotalConfirmed < invoice.GetTotalCryptoDue()))
+                {
+                    await _InvoiceRepository.UnaffectAddress(invoice.Id);
+                    invoice.Status = "invalid";
+                    needSave = true;
+                    if (invoice.FullNotifications)
+                    {
+                        _NotificationManager.Notify(invoice);
+                    }
+                }
+                else
+                {
                     var totalConfirmed = transactions.Select(t => t.Payment.Output.Value).Sum();
                     if (totalConfirmed >= invoice.GetTotalCryptoDue())
                     {
@@ -206,12 +226,6 @@ namespace BTCPayServer.Services.Invoices
                         needSave = true;
                     }
                 }
-                else
-                {
-                    await _InvoiceRepository.UnaffectAddress(invoice.Id);
-                    invoice.Status = "invalid";
-                    needSave = true;
-                }
             }
 
             if (invoice.Status == "confirmed")

BTCPayServer/Services/PoliciesSettings.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace BTCPayServer.Services
 {
@@ -11,5 +12,8 @@ namespace BTCPayServer.Services
         {
             get; set;
         }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        public bool LockSubscription { get; set; }
     }
 }

BTCPayServer/Views/Invoice/CreateInvoice.cshtml

@@ -19,6 +19,11 @@
                         <input asp-for="Amount" class="form-control" />
                         <span asp-validation-for="Amount" class="text-danger"></span>
                     </div>
+                    <div class="form-group">
+                        <label asp-for="Currency" class="control-label"></label>*
+                        <input asp-for="Currency" class="form-control" />
+                        <span asp-validation-for="Currency" class="text-danger"></span>
+                    </div>
                     <div class="form-group">
                         <label asp-for="OrderId" class="control-label"></label>
                         <input asp-for="OrderId" class="form-control" />

BTCPayServer/Views/Invoice/ListInvoices.cshtml

@@ -16,7 +16,15 @@
             <div class="col-lg-12 text-center">
                 <h2 class="section-heading">@ViewData["Title"]</h2>
                 <hr class="primary">
-                <p>Create, search or pay an invoice.</p>
+                <p>Create, search or pay an invoice. (<a href="#help" data-toggle="collapse">Help</a>)</p>
+                <div id="help" class="collapse text-left">
+                    <p>You can search for invoice Id, deposit address, price, order id, store id, any buyer information and any product information.</br>
+                    You can also apply filters to your search by searching for `filtername:value`, here is a list of supported filters</p>
+                    <ul>
+                        <li><b>storeid:id</b> for filtering a specific store</li>
+                        <li><b>status:(expired|invalid|complete|confirmed|paid|new)</b> for filtering a specific status</li>
+                    </ul>
+                </div>
                 <div class="form-group">
                     <form asp-action="SearchInvoice" method="post">
                         <input asp-for="SearchTerm" class="form-control" />
@@ -43,12 +51,12 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach (var invoice in Model.Invoices)
+                    @foreach(var invoice in Model.Invoices)
                     {
                         <tr>
                             <td>@invoice.Date</td>
                             <td>@invoice.InvoiceId</td>
-                            @if (invoice.Status == "paid")
+                            @if(invoice.Status == "paid")
                             {
                                 <td>
                                     <div class="btn-group">
@@ -72,7 +80,7 @@
                 </tbody>
             </table>
             <span>
-                @if (Model.Skip != 0)
+                @if(Model.Skip != 0)
                 {
                     <a href="@Url.Action("ListInvoices", new
                         {

BTCPayServer/Views/Server/Policies.cshtml

@@ -19,6 +19,10 @@
                 <label asp-for="RequiresConfirmedEmail"></label>
                 <input asp-for="RequiresConfirmedEmail" type="checkbox" class="form-check-inline" />
             </div>
+            <div class="form-group">
+                <label asp-for="LockSubscription"></label>
+                <input asp-for="LockSubscription" type="checkbox" class="form-check-inline" />
+            </div>
             <button type="submit" class="btn btn-success" name="command" value="Save">Save</button>
         </form>
     </div>

BTCPayServer/Views/Stores/UpdateStore.cshtml

@@ -16,6 +16,15 @@
 <div class="row">
     <div class="col-md-6">
         <form method="post">
+            <div class="form-group">
+                <label asp-for="Id"></label>
+                <input asp-for="Id" readonly class="form-control" />
+            </div>
+            <div class="form-group">
+                <label asp-for="StoreName"></label>
+                <input asp-for="StoreName" class="form-control" />
+                <span asp-validation-for="StoreName" class="text-danger"></span>
+            </div>
             <div class="form-group">
                 <label asp-for="StoreName"></label>
                 <input asp-for="StoreName" class="form-control" />
@@ -30,6 +39,11 @@
                 <label asp-for="NetworkFee"></label>
                 <input asp-for="NetworkFee" type="checkbox" class="form-check" />
             </div>
+            <div class="form-group">
+                <label asp-for="MonitoringExpiration"></label>
+                <input asp-for="MonitoringExpiration" class="form-control" />
+                <span asp-validation-for="MonitoringExpiration" class="text-danger"></span>
+            </div>
             <div class="form-group">
                 <label asp-for="SpeedPolicy"></label>
                 <select asp-for="SpeedPolicy" class="form-control">

btcpayserver.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.16
+VisualStudioVersion = 15.0.27004.2005
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BTCPayServer", "BTCPayServer\BTCPayServer.csproj", "{949A0870-8D8C-4DE5-8845-DDD560489177}"
 EndProject