bump

NBXplorer.Client Version 1.0.3.5 is available: da7df86019

.circleci/config.yml

@@ -0,0 +1,29 @@
+version: 2
+jobs:
+  build:
+    machine: 
+      docker_layer_caching: true
+    steps: 
+      - checkout
+  test:
+    machine: true
+    steps:
+      - checkout
+      - run:
+          command: |
+            lsb_release -a
+            wget -q https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb
+            sudo dpkg -i packages-microsoft-prod.deb
+            sudo apt-get install apt-transport-https
+            sudo apt-get update
+            sudo apt-get install dotnet-sdk-2.1
+            dotnet build /p:TreatWarningsAsErrors=true
+            cd BTCPayServer.Tests
+            dotnet test --filter Fast=Fast
+            docker-compose up -d dev
+            dotnet test --filter Integration=Integration
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - test

BTCPayServer.Tests/BTCPayServer.Tests.csproj

@@ -9,18 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\BTCPayServer\BTCPayServer.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Update=".dockerignore">
       <DependentUpon>Dockerfile</DependentUpon>
@@ -28,6 +24,12 @@
     <None Update="docker-compose.yml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="xunit.runner.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\BTCPayServer\BTCPayServer.csproj" />
+  </ItemGroup>
 </Project>

BTCPayServer.Tests/BTCPayServerTester.cs

@@ -1,4 +1,6 @@
 using BTCPayServer.Configuration;
+using System.Linq;
+using BTCPayServer.HostedServices;
 using BTCPayServer.Hosting;
 using BTCPayServer.Payments;
 using BTCPayServer.Payments.Lightning;
@@ -35,6 +37,12 @@ using Xunit;
 
 namespace BTCPayServer.Tests
 {
+    public enum TestDatabases
+    {
+        Postgres,
+        MySQL,
+    }
+
     public class BTCPayServerTester : IDisposable
     {
         private string _Directory;
@@ -57,6 +65,11 @@ namespace BTCPayServer.Tests
             set;
         }
 
+        public string MySQL
+        {
+            get; set;
+        }
+
         public string Postgres
         {
             get; set;
@@ -68,6 +81,10 @@ namespace BTCPayServer.Tests
             get; set;
         }
 
+        public TestDatabases TestDatabase
+        {
+            get; set;
+        }
 
         public bool MockRates { get; set; } = true;
 
@@ -94,7 +111,9 @@ namespace BTCPayServer.Tests
 
             config.AppendLine($"btc.lightning={IntegratedLightning.AbsoluteUri}");
 
-            if (Postgres != null)
+            if (TestDatabase == TestDatabases.MySQL && !String.IsNullOrEmpty(MySQL))
+                config.AppendLine($"mysql=" + MySQL);
+            else if (!String.IsNullOrEmpty(Postgres))
                 config.AppendLine($"postgres=" + Postgres);
             var confPath = Path.Combine(chainDirectory, "settings.config");
             File.WriteAllText(confPath, config.ToString());
@@ -121,6 +140,11 @@ namespace BTCPayServer.Tests
             _Host.Start();
             InvoiceRepository = (InvoiceRepository)_Host.Services.GetService(typeof(InvoiceRepository));
             StoreRepository = (StoreRepository)_Host.Services.GetService(typeof(StoreRepository));
+            var dashBoard = (NBXplorerDashboard)_Host.Services.GetService(typeof(NBXplorerDashboard));
+            while(!dashBoard.IsFullySynched())
+            {
+                Thread.Sleep(10);
+            }
 
             if (MockRates)
             {
@@ -198,7 +222,7 @@ namespace BTCPayServer.Tests
             return _Host.Services.GetRequiredService<T>();
         }
 
-        public T GetController<T>(string userId = null, string storeId = null) where T : Controller
+        public T GetController<T>(string userId = null, string storeId = null, Claim[] additionalClaims = null) where T : Controller
         {
             var context = new DefaultHttpContext();
             context.Request.Host = new HostString("127.0.0.1", Port);
@@ -206,7 +230,11 @@ namespace BTCPayServer.Tests
             context.Request.Protocol = "http";
             if (userId != null)
             {
-                context.User = new ClaimsPrincipal(new ClaimsIdentity(new[] { new Claim(ClaimTypes.NameIdentifier, userId) }, Policies.CookieAuthentication));
+                List<Claim> claims = new List<Claim>();
+                claims.Add(new Claim(ClaimTypes.NameIdentifier, userId));
+                if (additionalClaims != null)
+                    claims.AddRange(additionalClaims);
+                context.User = new ClaimsPrincipal(new ClaimsIdentity(claims.ToArray(), Policies.CookieAuthentication));
             }
             if (storeId != null)
             {

BTCPayServer.Tests/ChangellyTests.cs

@@ -0,0 +1,253 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using BTCPayServer.Controllers;
+using BTCPayServer.Data;
+using BTCPayServer.Models;
+using BTCPayServer.Models.StoreViewModels;
+using BTCPayServer.Payments.Changelly;
+using BTCPayServer.Payments.Changelly.Models;
+using BTCPayServer.Services.Rates;
+using BTCPayServer.Services.Stores;
+using BTCPayServer.Tests.Logging;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace BTCPayServer.Tests
+{
+    public class ChangellyTests
+    {
+        public ChangellyTests(ITestOutputHelper helper)
+        {
+            Logs.Tester = new XUnitLog(helper) {Name = "Tests"};
+            Logs.LogProvider = new XUnitLogProvider(helper);
+        }
+
+        [Fact]
+        [Trait("Integration", "Integration")]
+        public async void CanSetChangellyPaymentMethod()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+                var controller = tester.PayTester.GetController<StoresController>(user.UserId, user.StoreId);
+
+
+                var storeBlob = controller.StoreData.GetStoreBlob();
+                Assert.Null(storeBlob.ChangellySettings);
+
+                var updateModel = new UpdateChangellySettingsViewModel()
+                {
+                    ApiSecret = "secret",
+                    ApiKey = "key",
+                    ApiUrl = "http://gozo.com",
+                    ChangellyMerchantId = "aaa",
+                };
+
+                Assert.Equal("UpdateStore", Assert.IsType<RedirectToActionResult>(
+                    await controller.UpdateChangellySettings(user.StoreId, updateModel, "save")).ActionName);
+
+                var store = await tester.PayTester.StoreRepository.FindStore(user.StoreId);
+                storeBlob = controller.StoreData.GetStoreBlob();
+                Assert.NotNull(storeBlob.ChangellySettings);
+                Assert.NotNull(storeBlob.ChangellySettings);
+                Assert.IsType<ChangellySettings>(storeBlob.ChangellySettings);
+                Assert.Equal(storeBlob.ChangellySettings.ApiKey, updateModel.ApiKey);
+                Assert.Equal(storeBlob.ChangellySettings.ApiSecret,
+                    updateModel.ApiSecret);
+                Assert.Equal(storeBlob.ChangellySettings.ApiUrl, updateModel.ApiUrl);
+                Assert.Equal(storeBlob.ChangellySettings.ChangellyMerchantId,
+                    updateModel.ChangellyMerchantId);
+            }
+        }
+
+
+        [Fact]
+        [Trait("Integration", "Integration")]
+        public async void CanToggleChangellyPaymentMethod()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+                var controller = tester.PayTester.GetController<StoresController>(user.UserId, user.StoreId);
+
+                var updateModel = new UpdateChangellySettingsViewModel()
+                {
+                    ApiSecret = "secret",
+                    ApiKey = "key",
+                    ApiUrl = "http://gozo.com",
+                    ChangellyMerchantId = "aaa",
+                    Enabled = true
+                };
+                Assert.Equal("UpdateStore", Assert.IsType<RedirectToActionResult>(
+                    await controller.UpdateChangellySettings(user.StoreId, updateModel, "save")).ActionName);
+
+
+                var store = await tester.PayTester.StoreRepository.FindStore(user.StoreId);
+
+                Assert.True(store.GetStoreBlob().ChangellySettings.Enabled);
+
+                updateModel.Enabled = false;
+
+                Assert.Equal("UpdateStore", Assert.IsType<RedirectToActionResult>(
+                    await controller.UpdateChangellySettings(user.StoreId, updateModel, "save")).ActionName);
+
+                store = await tester.PayTester.StoreRepository.FindStore(user.StoreId);
+
+                Assert.False(store.GetStoreBlob().ChangellySettings.Enabled);
+            }
+        }
+
+        [Fact]
+        [Trait("Integration", "Integration")]
+        public async void CannotUseChangellyApiWithoutChangellyPaymentMethodSet()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+                var changellyController =
+                    tester.PayTester.GetController<ChangellyController>(user.UserId, user.StoreId);
+                changellyController.IsTest = true;
+
+                //test non existing payment method
+                Assert.IsType<BitpayErrorModel>(Assert
+                    .IsType<BadRequestObjectResult>(await changellyController.GetCurrencyList(user.StoreId))
+                    .Value);
+
+                var updateModel = CreateDefaultChangellyParams(false);
+                var storesController = tester.PayTester.GetController<StoresController>(user.UserId, user.StoreId);
+                //set payment method but disabled
+
+
+                Assert.Equal("UpdateStore", Assert.IsType<RedirectToActionResult>(
+                    await storesController.UpdateChangellySettings(user.StoreId, updateModel, "save")).ActionName);
+
+
+                Assert.IsType<BitpayErrorModel>(Assert
+                    .IsType<BadRequestObjectResult>(await changellyController.GetCurrencyList(user.StoreId))
+                    .Value);
+
+                updateModel.Enabled = true;
+                //test with enabled method
+
+                Assert.Equal("UpdateStore", Assert.IsType<RedirectToActionResult>(
+                    await storesController.UpdateChangellySettings(user.StoreId, updateModel, "save")).ActionName);
+
+
+                Assert.IsNotType<BitpayErrorModel>(Assert
+                    .IsType<OkObjectResult>(await changellyController.GetCurrencyList(user.StoreId))
+                    .Value);
+            }
+        }
+
+        UpdateChangellySettingsViewModel CreateDefaultChangellyParams(bool enabled)
+        {
+            return new UpdateChangellySettingsViewModel()
+            {
+                ApiKey = "6ed02cdf1b614d89a8c0ceb170eebb61",
+                ApiSecret = "8fbd66a2af5fd15a6b5f8ed0159c5842e32a18538521ffa145bd6c9e124d3483",
+                ChangellyMerchantId = "804298eb5753",
+                Enabled = enabled
+            };
+        }
+
+        [Fact]
+        [Trait("Integration", "Integration")]
+        public async void CanGetCurrencyListFromChangelly()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+
+                //save changelly settings
+                var updateModel = CreateDefaultChangellyParams(true);
+                var storesController = tester.PayTester.GetController<StoresController>(user.UserId, user.StoreId);
+
+                //confirm saved
+                Assert.Equal("UpdateStore", Assert.IsType<RedirectToActionResult>(
+                    await storesController.UpdateChangellySettings(user.StoreId, updateModel, "save")).ActionName);
+
+                var factory = UnitTest1.CreateBTCPayRateFactory();
+                var fetcher = new RateFetcher(factory);
+                var httpClientFactory = new MockHttpClientFactory();
+                var changellyController = new ChangellyController(
+                    new ChangellyClientProvider(tester.PayTester.StoreRepository, httpClientFactory),
+                    tester.NetworkProvider, fetcher);
+                changellyController.IsTest = true;
+                var result = Assert
+                    .IsType<OkObjectResult>(await changellyController.GetCurrencyList(user.StoreId))
+                    .Value as IEnumerable<CurrencyFull>;
+                Assert.True(result.Any());
+            }
+        }
+
+
+        [Fact]
+        [Trait("Integration", "Integration")]
+        public async void CanCalculateToAmountForChangelly()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+
+                var updateModel = CreateDefaultChangellyParams(true);
+                var storesController = tester.PayTester.GetController<StoresController>(user.UserId, user.StoreId);
+
+                Assert.Equal("UpdateStore", Assert.IsType<RedirectToActionResult>(
+                    await storesController.UpdateChangellySettings(user.StoreId, updateModel, "save")).ActionName);
+
+                var factory = UnitTest1.CreateBTCPayRateFactory();
+                var fetcher = new RateFetcher(factory);
+                var httpClientFactory = new MockHttpClientFactory();
+                var changellyController = new ChangellyController(
+                    new ChangellyClientProvider(tester.PayTester.StoreRepository, httpClientFactory),
+                    tester.NetworkProvider, fetcher);
+                changellyController.IsTest = true;
+                Assert.IsType<decimal>(Assert
+                    .IsType<OkObjectResult>(await changellyController.CalculateAmount(user.StoreId, "ltc", "btc", 1.0m))
+                    .Value);
+            }
+        }
+
+        [Fact]
+        [Trait("Integration", "Integration")]
+        public void CanComputeBaseAmount()
+        {
+            Assert.Equal(1, ChangellyCalculationHelper.ComputeBaseAmount(1, 1));
+            Assert.Equal(0.5m, ChangellyCalculationHelper.ComputeBaseAmount(1, 0.5m));
+            Assert.Equal(2, ChangellyCalculationHelper.ComputeBaseAmount(0.5m, 1));
+            Assert.Equal(4m, ChangellyCalculationHelper.ComputeBaseAmount(1, 4));
+        }
+
+        [Fact]
+        [Trait("Integration", "Integration")]
+        public void CanComputeCorrectAmount()
+        {
+            Assert.Equal(1, ChangellyCalculationHelper.ComputeCorrectAmount(0.5m, 1, 2));
+            Assert.Equal(0.25m, ChangellyCalculationHelper.ComputeCorrectAmount(0.5m, 1, 0.5m));
+            Assert.Equal(20, ChangellyCalculationHelper.ComputeCorrectAmount(10, 1, 2));
+        }
+    }
+
+    public class MockHttpClientFactory : IHttpClientFactory
+    {
+        public HttpClient CreateClient(string name)
+        {
+            return new HttpClient();
+        }
+    }
+}

BTCPayServer.Tests/Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.1.300-sdk-alpine3.7
+FROM microsoft/dotnet:2.1.403-sdk-alpine3.7
 WORKDIR /app
  # caches restore result by copying csproj file separately
 COPY BTCPayServer.Tests/BTCPayServer.Tests.csproj BTCPayServer.Tests/BTCPayServer.Tests.csproj

BTCPayServer.Tests/README.md

@@ -29,11 +29,7 @@ If you want to stop, and remove all existing data
 docker-compose down --v
 ```
 
-You can run the tests inside a container by running
-
-```
-docker-compose run --rm tests
-```
+You can run tests on `MySql` database instead of `Postgres` by setting environnement variable `TESTS_DB` equals to `MySql`.
 
 ## How to manually test payments
 

BTCPayServer.Tests/RateRulesTest.cs

@@ -11,6 +11,7 @@ namespace BTCPayServer.Tests
     public class RateRulesTest
     {
         [Fact]
+        [Trait("Fast", "Fast")]
         public void SecondDuplicatedRuleIsIgnored()
         {
             StringBuilder builder = new StringBuilder();
@@ -24,6 +25,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Fast", "Fast")]
         public void CanParseRateRules()
         {
             // Check happy path

BTCPayServer.Tests/ServerTester.cs

@@ -60,7 +60,9 @@ namespace BTCPayServer.Tests
             {
                 NBXplorerUri = ExplorerClient.Address,
                 LTCNBXplorerUri = LTCExplorerClient.Address,
+                TestDatabase = Enum.Parse<TestDatabases>(GetEnvironment("TESTS_DB", TestDatabases.Postgres.ToString()), true),
                 Postgres = GetEnvironment("TESTS_POSTGRES", "User ID=postgres;Host=127.0.0.1;Port=39372;Database=btcpayserver"),
+                MySQL = GetEnvironment("TESTS_MYSQL", "User ID=root;Host=127.0.0.1;Port=33036;Database=btcpayserver"),
                 IntegratedLightning = MerchantCharge.Client.Uri
             };
             PayTester.Port = int.Parse(GetEnvironment("TESTS_PORT", Utils.FreeTcpPort().ToString(CultureInfo.InvariantCulture)), CultureInfo.InvariantCulture);
@@ -82,7 +84,7 @@ namespace BTCPayServer.Tests
         /// Connect a customer LN node to the merchant LN node
         /// </summary>
         /// <returns></returns>
-        public Task EnsureConnectedToDestinations()
+        public Task EnsureChannelsSetup()
         {
             return BTCPayServer.Lightning.Tests.ConnectChannels.ConnectAll(ExplorerNode, GetLightningSenderClients(), GetLightningDestClients());
         }

BTCPayServer.Tests/TestAccount.cs

@@ -73,16 +73,16 @@ namespace BTCPayServer.Tests
 
         public BTCPayNetwork SupportedNetwork { get; set; }
 
-        public WalletId RegisterDerivationScheme(string crytoCode)
+        public WalletId RegisterDerivationScheme(string crytoCode, bool segwit = false)
         {
-            return RegisterDerivationSchemeAsync(crytoCode).GetAwaiter().GetResult();
+            return RegisterDerivationSchemeAsync(crytoCode, segwit).GetAwaiter().GetResult();
         }
-        public async Task<WalletId> RegisterDerivationSchemeAsync(string cryptoCode)
+        public async Task<WalletId> RegisterDerivationSchemeAsync(string cryptoCode, bool segwit = false)
         {
             SupportedNetwork = parent.NetworkProvider.GetNetwork(cryptoCode);
             var store = parent.PayTester.GetController<StoresController>(UserId, StoreId);
             ExtKey = new ExtKey().GetWif(SupportedNetwork.NBitcoinNetwork);
-            DerivationScheme = new DerivationStrategyFactory(SupportedNetwork.NBitcoinNetwork).Parse(ExtKey.Neuter().ToString() + "-[legacy]");
+            DerivationScheme = new DerivationStrategyFactory(SupportedNetwork.NBitcoinNetwork).Parse(ExtKey.Neuter().ToString() + (segwit ? "" : "-[legacy]"));
             var vm = (StoreViewModel)((ViewResult)store.UpdateStore()).Model;
             vm.SpeedPolicy = SpeedPolicy.MediumSpeed;
             await store.UpdateStore(vm);

BTCPayServer.Tests/UnitTest1.cs

@@ -41,6 +41,10 @@ using BTCPayServer.Validation;
 using ExchangeSharp;
 using System.Security.Cryptography.X509Certificates;
 using BTCPayServer.Lightning;
+using BTCPayServer.Models.WalletViewModels;
+using System.Security.Claims;
+using BTCPayServer.Security;
+using NBXplorer.Models;
 
 namespace BTCPayServer.Tests
 {
@@ -53,6 +57,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Fast", "Fast")]
         public void CanHandleUriValidation()
         {
             var attribute = new UriAttribute();
@@ -74,6 +79,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Fast", "Fast")]
         public void CanCalculateCryptoDue2()
         {
             var dummy = new Key().PubKey.GetAddress(Network.RegTest).ToString();
@@ -131,6 +137,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Fast", "Fast")]
         public void CanCalculateCryptoDue()
         {
             var entity = new InvoiceEntity();
@@ -255,6 +262,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanAcceptInvoiceWithTolerance()
         {
             var entity = new InvoiceEntity();
@@ -282,6 +290,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanAcceptInvoiceWithTolerance2()
         {
             using (var tester = ServerTester.Create())
@@ -322,6 +331,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Fast", "Fast")]
         public void RoundupCurrenciesCorrectly()
         {
             foreach (var test in new[]
@@ -338,6 +348,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanPayUsingBIP70()
         {
             using (var tester = ServerTester.Create())
@@ -388,11 +399,13 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        public void CanSetLightningServer()
+        [Trait("Integration", "Integration")]
+        public async Task CanSetLightningServer()
         {
             using (var tester = ServerTester.Create())
             {
                 tester.Start();
+                await tester.EnsureChannelsSetup();
                 var user = tester.NewAccount();
                 user.GrantAccess();
                 var storeController = user.GetController<StoresController>();
@@ -424,18 +437,21 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public async Task CanSendLightningPaymentCLightning()
         {
             await ProcessLightningPayment(LightningConnectionType.CLightning);
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public async Task CanSendLightningPaymentCharge()
         {
             await ProcessLightningPayment(LightningConnectionType.Charge);
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public async Task CanSendLightningPaymentLnd()
         {
             await ProcessLightningPayment(LightningConnectionType.LndREST);
@@ -449,13 +465,12 @@ namespace BTCPayServer.Tests
             using (var tester = ServerTester.Create())
             {
                 tester.Start();
+                await tester.EnsureChannelsSetup();
                 var user = tester.NewAccount();
                 user.GrantAccess();
                 user.RegisterLightningNode("BTC", type);
                 user.RegisterDerivationScheme("BTC");
 
-                await tester.EnsureConnectedToDestinations();
-
                 await CanSendLightningPaymentCore(tester, user);
 
                 await Task.WhenAll(Enumerable.Range(0, 5)
@@ -466,10 +481,6 @@ namespace BTCPayServer.Tests
 
         async Task CanSendLightningPaymentCore(ServerTester tester, TestAccount user)
         {
-            // TODO: If this parameter is less than 1 second we start having concurrency problems
-            await Task.Delay(TimeSpan.FromMilliseconds(1000));
-            //
-
             var invoice = await user.BitPay.CreateInvoiceAsync(new Invoice()
             {
                 Price = 0.01m,
@@ -478,6 +489,7 @@ namespace BTCPayServer.Tests
                 OrderId = "orderId",
                 ItemDesc = "Some description"
             });
+            await Task.Delay(TimeSpan.FromMilliseconds(1000)); // Give time to listen the new invoices
             await tester.SendLightningPaymentAsync(invoice);
             await EventuallyAsync(async () =>
             {
@@ -488,6 +500,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanUseServerInitiatedPairingCode()
         {
             using (var tester = ServerTester.Create())
@@ -513,6 +526,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanSendIPN()
         {
             using (var callbackServer = new CustomServer())
@@ -549,6 +563,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CantPairTwiceWithSamePubkey()
         {
             using (var tester = ServerTester.Create())
@@ -570,6 +585,92 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
+        public void CanSolveTheDogesRatesOnKraken()
+        {
+            var provider = new BTCPayNetworkProvider(NetworkType.Mainnet);
+            var factory = CreateBTCPayRateFactory();
+            var fetcher = new RateFetcher(factory);
+
+            Assert.True(RateRules.TryParse("X_X=kraken(X_BTC) * kraken(BTC_X)", out var rule));
+            foreach(var pair in new[] { "DOGE_USD", "DOGE_CAD", "DASH_CAD", "DASH_USD", "DASH_EUR" })
+            {
+                var result = fetcher.FetchRate(CurrencyPair.Parse(pair), rule).GetAwaiter().GetResult();
+                Assert.NotNull(result.BidAsk);
+                Assert.Empty(result.Errors);
+            }
+        }
+
+        [Fact]
+        [Trait("Integration", "Integration")]
+        public void CanRescanWallet()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.Start();
+                var acc = tester.NewAccount();
+                acc.GrantAccess();
+                acc.RegisterDerivationScheme("BTC", true);
+                var btcDerivationScheme = acc.DerivationScheme;
+                acc.RegisterDerivationScheme("LTC", true);
+
+                var walletController = tester.PayTester.GetController<WalletsController>(acc.UserId);
+                WalletId walletId = new WalletId(acc.StoreId, "LTC");
+                var rescan = Assert.IsType<RescanWalletModel>(Assert.IsType<ViewResult>(walletController.WalletRescan(walletId).Result).Model);
+                Assert.False(rescan.Ok);
+                Assert.True(rescan.IsFullySync);
+                Assert.True(rescan.IsSegwit);
+                Assert.False(rescan.IsSupportedByCurrency);
+                Assert.False(rescan.IsServerAdmin);
+
+                walletId = new WalletId(acc.StoreId, "BTC");
+                var serverAdminClaim = new[] { new Claim(Policies.CanModifyServerSettings.Key, "true") };
+                walletController = tester.PayTester.GetController<WalletsController>(acc.UserId, additionalClaims: serverAdminClaim);
+                rescan = Assert.IsType<RescanWalletModel>(Assert.IsType<ViewResult>(walletController.WalletRescan(walletId).Result).Model);
+                Assert.True(rescan.Ok);
+                Assert.True(rescan.IsFullySync);
+                Assert.True(rescan.IsSupportedByCurrency);
+                Assert.True(rescan.IsServerAdmin);
+
+                rescan.GapLimit = 100;
+
+                // Sending a coin
+                var txId = tester.ExplorerNode.SendToAddress(btcDerivationScheme.Derive(new KeyPath("0/90")).ScriptPubKey, Money.Coins(1.0m));
+                tester.ExplorerNode.Generate(1);
+                var transactions = Assert.IsType<ListTransactionsViewModel>(Assert.IsType<ViewResult>(walletController.WalletTransactions(walletId).Result).Model);
+                Assert.Empty(transactions.Transactions);
+
+                Assert.IsType<RedirectToActionResult>(walletController.WalletRescan(walletId, rescan).Result);
+
+                while (true)
+                {
+                    rescan = Assert.IsType<RescanWalletModel>(Assert.IsType<ViewResult>(walletController.WalletRescan(walletId).Result).Model);
+                    if (rescan.Progress == null && rescan.LastSuccess != null)
+                    {
+                        if (rescan.LastSuccess.Found == 0)
+                            continue;
+                        // Scan over
+                        break;
+                    }
+                    else
+                    {
+                        Assert.Null(rescan.TimeOfScan);
+                        Assert.NotNull(rescan.RemainingTime);
+                        Assert.NotNull(rescan.Progress);
+                        Thread.Sleep(100);
+                    }
+                }
+                Assert.Null(rescan.PreviousError);
+                Assert.NotNull(rescan.TimeOfScan);
+                Assert.Equal(1, rescan.LastSuccess.Found);
+                transactions = Assert.IsType<ListTransactionsViewModel>(Assert.IsType<ViewResult>(walletController.WalletTransactions(walletId).Result).Model);
+                var tx = Assert.Single(transactions.Transactions);
+                Assert.Equal(tx.Id, txId.ToString());
+            }
+        }
+
+        [Fact]
+        [Trait("Integration", "Integration")]
         public void CanListInvoices()
         {
             using (var tester = ServerTester.Create())
@@ -611,6 +712,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanGetRates()
         {
             using (var tester = ServerTester.Create())
@@ -658,6 +760,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanRBFPayment()
         {
             using (var tester = ServerTester.Create())
@@ -673,6 +776,7 @@ namespace BTCPayServer.Tests
                 }, Facade.Merchant);
                 var payment1 = invoice.BtcDue + Money.Coins(0.0001m);
                 var payment2 = invoice.BtcDue;
+
                 var tx1 = new uint256(tester.ExplorerNode.SendCommand("sendtoaddress", new object[]
                 {
                     invoice.BitcoinAddress,
@@ -682,8 +786,10 @@ namespace BTCPayServer.Tests
                     false, //subtractfeefromamount
                     true, //replaceable
                 }).ResultString);
+                Logs.Tester.LogInformation($"Let's send a first payment of {payment1} for the {invoice.BtcDue} invoice ({tx1})");
                 var invoiceAddress = BitcoinAddress.Create(invoice.BitcoinAddress, user.SupportedNetwork.NBitcoinNetwork);
 
+                Logs.Tester.LogInformation($"The invoice should be paidOver");
                 Eventually(() =>
                 {
                     invoice = user.BitPay.GetInvoice(invoice.Id);
@@ -701,9 +807,18 @@ namespace BTCPayServer.Tests
                 var output = tx.Outputs.First(o => o.Value == payment1);
                 output.Value = payment2;
                 output.ScriptPubKey = invoiceAddress.ScriptPubKey;
-                var replaced = tester.ExplorerNode.SignRawTransaction(tx);
-                tester.ExplorerNode.SendRawTransaction(replaced);
-                var test = tester.ExplorerClient.GetUTXOs(user.DerivationScheme, null);
+
+                using (var cts = new CancellationTokenSource(10000))
+                using (var listener = tester.ExplorerClient.CreateNotificationSession())
+                {
+                    listener.ListenAllDerivationSchemes();
+                    var replaced = tester.ExplorerNode.SignRawTransaction(tx);
+                    Thread.Sleep(1000); // Make sure the replacement has a different timestamp
+                    var tx2 = tester.ExplorerNode.SendRawTransaction(replaced);
+                    Logs.Tester.LogInformation($"Let's RBF with a payment of {payment2} ({tx2}), waiting for NBXplorer to pick it up");
+                    Assert.Equal(tx2, ((NewTransactionEvent)listener.NextEvent(cts.Token)).TransactionData.TransactionHash);
+                }
+                Logs.Tester.LogInformation($"The invoice should now not be paidOver anymore");
                 Eventually(() =>
                 {
                     invoice = user.BitPay.GetInvoice(invoice.Id);
@@ -714,6 +829,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Fast", "Fast")]
         public void CanParseFilter()
         {
             var filter = "storeid:abc status:abed blabhbalh ";
@@ -735,6 +851,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Fast", "Fast")]
         public void CanParseFingerprint()
         {
             Assert.True(SSH.SSHFingerprint.TryParse("4e343c6fc6cfbf9339c02d06a151e1dd", out var unused));
@@ -751,6 +868,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void TestAccessBitpayAPI()
         {
             using (var tester = ServerTester.Create())
@@ -817,6 +935,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanUseExchangeSpecificRate()
         {
             using (var tester = ServerTester.Create())
@@ -859,6 +978,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanTweakRate()
         {
             using (var tester = ServerTester.Create())
@@ -903,6 +1023,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanHaveLTCOnlyStore()
         {
             using (var tester = ServerTester.Create())
@@ -967,6 +1088,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanModifyRates()
         {
             using (var tester = ServerTester.Create())
@@ -1027,6 +1149,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanPayWithTwoCurrencies()
         {
             using (var tester = ServerTester.Create())
@@ -1138,6 +1261,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Fast", "Fast")]
         public void CanParseCurrencyValue()
         {
             Assert.True(CurrencyValue.TryParse("1.50USD", out var result));
@@ -1158,6 +1282,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Fast", "Fast")]
         public void CanParseDerivationScheme()
         {
             var parser = new DerivationSchemeParser(Network.TestNet);
@@ -1198,6 +1323,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanDisablePaymentMethods()
         {
             using (var tester = ServerTester.Create())
@@ -1256,11 +1382,13 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        public void CanSetPaymentMethodLimits()
+        [Trait("Integration", "Integration")]
+        public async Task CanSetPaymentMethodLimits()
         {
             using (var tester = ServerTester.Create())
             {
                 tester.Start();
+                await tester.EnsureChannelsSetup();
                 var user = tester.NewAccount();
                 user.GrantAccess();
                 user.RegisterDerivationScheme("BTC");
@@ -1299,6 +1427,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanUsePoSApp()
         {
             using (var tester = ServerTester.Create())
@@ -1343,6 +1472,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanCreateAndDeleteApps()
         {
             using (var tester = ServerTester.Create())
@@ -1379,6 +1509,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void InvoiceFlowThroughDifferentStatesCorrectly()
         {
             using (var tester = ServerTester.Create())
@@ -1400,7 +1531,7 @@ namespace BTCPayServer.Tests
                 var ctx = tester.PayTester.GetService<ApplicationDbContextFactory>().CreateContext();
                 Assert.Equal(0, invoice.CryptoInfo[0].TxCount);
                 Assert.True(invoice.MinerFees.ContainsKey("BTC"));
-                Assert.Equal(100m, invoice.MinerFees["BTC"].SatoshiPerBytes);
+                Assert.Contains(invoice.MinerFees["BTC"].SatoshiPerBytes, new[] { 100.0m, 20.0m });
                 Eventually(() =>
                 {
                     var textSearchResult = tester.PayTester.InvoiceRepository.GetInvoices(new InvoiceQuery()
@@ -1512,7 +1643,7 @@ namespace BTCPayServer.Tests
                 }, Facade.Merchant);
                 invoiceAddress = BitcoinAddress.Create(invoice.BitcoinAddress, cashCow.Network);
 
-                cashCow.SendToAddress(invoiceAddress, invoice.BtcDue + Money.Coins(1));
+                var txId = cashCow.SendToAddress(invoiceAddress, invoice.BtcDue + Money.Coins(1));
 
                 Eventually(() =>
                 {
@@ -1520,6 +1651,13 @@ namespace BTCPayServer.Tests
                     Assert.Equal("paid", localInvoice.Status);
                     Assert.Equal(Money.Zero, localInvoice.BtcDue);
                     Assert.Equal("paidOver", (string)((JValue)localInvoice.ExceptionStatus).Value);
+
+                    var textSearchResult = tester.PayTester.InvoiceRepository.GetInvoices(new InvoiceQuery()
+                    {
+                        StoreId = new[] { user.StoreId },
+                        TextSearch = txId.ToString()
+                    }).GetAwaiter().GetResult();
+                    Assert.Single(textSearchResult);
                 });
 
                 cashCow.Generate(1);
@@ -1535,6 +1673,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CheckQuadrigacxRateProvider()
         {
             var quadri = new QuadrigacxRateProvider();
@@ -1548,6 +1687,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanQueryDirectProviders()
         {
             var factory = CreateBTCPayRateFactory();
@@ -1578,6 +1718,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Integration", "Integration")]
         public void CanGetRateCryptoCurrenciesByDefault()
         {
             var provider = new BTCPayNetworkProvider(NetworkType.Mainnet);
@@ -1593,11 +1734,12 @@ namespace BTCPayServer.Tests
             foreach (var value in result)
             {
                 var rateResult = value.Value.GetAwaiter().GetResult();
-                Assert.NotNull(rateResult.BidAsk);
+                Logs.Tester.LogInformation($"Testing {value.Key.ToString()}");
+                Assert.True(rateResult.BidAsk != null, $"Impossible to get the rate {rateResult.EvaluatedRule}");
             }
         }
 
-        private static RateProviderFactory CreateBTCPayRateFactory()
+        public static RateProviderFactory CreateBTCPayRateFactory()
         {
             return new RateProviderFactory(CreateMemoryCache(), null, new CoinAverageSettings());
         }
@@ -1631,6 +1773,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
+        [Trait("Fast", "Fast")]
         public void CheckRatesProvider()
         {
             var spy = new SpyRateProvider();

BTCPayServer.Tests/UnitTestPeusa.cs

@@ -1,48 +0,0 @@
-using System;
-using NBitcoin;
-using Xunit;
-
-namespace BTCPayServer.Tests
-{
-    // Helper class for testing functionality and generating data needed during coding/debuging
-    public class UnitTestPeusa
-    {
-        // Unit test that generates temorary checkout Bitpay page
-        // https://forkbitpay.slack.com/archives/C7M093Z55/p1508293682000217
-
-        // Testnet of Bitpay down
-        //[Fact]
-        //public void BitpayCheckout()
-        //{
-        //    var key = new Key(Encoders.Hex.DecodeData("7b70a06f35562873e3dcb46005ed0fe78e1991ad906e56adaaafa40ba861e056"));
-        //    var url = new Uri("https://test.bitpay.com/");
-        //    var btcpay = new Bitpay(key, url);
-        //    var invoice = btcpay.CreateInvoice(new Invoice()
-        //    {
-
-        //        Price = 5.0,
-        //        Currency = "USD",
-        //        PosData = "posData",
-        //        OrderId = "cdfd8a5f-6928-4c3b-ba9b-ddf438029e73",
-        //        ItemDesc = "Hello from the otherside"
-        //    }, Facade.Merchant);
-
-        //    // go to invoice.Url
-        //    Console.WriteLine(invoice.Url);
-        //}
-
-        // Generating Extended public key to use on http://localhost:14142/stores/{storeId}
-        [Fact]
-        public void GeneratePubkey()
-        {
-            var network = Network.RegTest;
-
-            ExtKey masterKey = new ExtKey();
-            Console.WriteLine("Master key : " + masterKey.ToString(network));
-            ExtPubKey masterPubKey = masterKey.Neuter();
-
-            ExtPubKey pubkey = masterPubKey.Derive(0);
-            Console.WriteLine("PubKey " + 0 + " : " + pubkey.ToString(network));
-        }
-    }
-}

BTCPayServer.Tests/docker-compose.yml

@@ -14,7 +14,9 @@ services:
       TESTS_LTCRPCCONNECTION: server=http://litecoind:43782;ceiwHEbqWI83:DwubwWsoo3
       TESTS_BTCNBXPLORERURL: http://nbxplorer:32838/
       TESTS_LTCNBXPLORERURL: http://nbxplorer:32838/
+      TESTS_DB: "Postgres"
       TESTS_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver
+      TESTS_MYSQL: User ID=root;Host=mysql;Port=3306;Database=btcpayserver
       TESTS_PORT: 80
       TESTS_HOSTNAME: tests
       TEST_MERCHANTLIGHTNINGD: "type=clightning;server=/etc/merchant_lightningd_datadir/lightning-rpc"
@@ -34,14 +36,16 @@ services:
 
   # The dev container is not actually used, it is just handy to run `docker-compose up dev` to start all services
   dev: 
-    image: nicolasdorier/docker-bitcoin:0.16.3
+    image: nicolasdorier/docker-bitcoin:0.17.0
     environment:
+      BITCOIN_NETWORK: regtest
       BITCOIN_EXTRA_ARGS: |
-        regtest=1
+        deprecatedrpc=signrawtransaction
         connect=bitcoind:39388
     links:
       - nbxplorer
       - postgres
+      - mysql
       - customer_lightningd
       - merchant_lightningd
       - lightning-charged
@@ -49,21 +53,24 @@ services:
       - merchant_lnd
 
   devlnd: 
-    image: nicolasdorier/docker-bitcoin:0.16.3
+    image: nicolasdorier/docker-bitcoin:0.17.0
     environment:
+      BITCOIN_NETWORK: regtest
       BITCOIN_EXTRA_ARGS: |
-        regtest=1
+        deprecatedrpc=signrawtransaction
         connect=bitcoind:39388
     links:
       - nbxplorer
       - postgres
+      - mysql
       - customer_lnd
       - merchant_lnd
 
 
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:1.0.3.3
+    image: nicolasdorier/nbxplorer:1.1.0.9
+    restart: unless-stopped
     ports:
       - "32838:32838"
     expose: 
@@ -87,13 +94,13 @@ services:
       - litecoind
 
   bitcoind:
-    image: nicolasdorier/docker-bitcoin:0.16.3
+    image: nicolasdorier/docker-bitcoin:0.17.0
     environment:
+      BITCOIN_NETWORK: regtest
       BITCOIN_EXTRA_ARGS: |
+        deprecatedrpc=signrawtransaction
         rpcuser=ceiwHEbqWI83
         rpcpassword=DwubwWsoo3
-        regtest=1
-        server=1
         rpcport=43782
         port=39388
         whitelist=0.0.0.0/0
@@ -111,7 +118,8 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: nicolasdorier/clightning:v0.6.1-dev
+    image: nicolasdorier/clightning:v0.6.2-3-dev
+    restart: unless-stopped
     environment: 
       EXPOSE_TCP: "true"
       LIGHTNINGD_OPT: |
@@ -136,6 +144,7 @@ services:
 
   lightning-charged:
     image: shesek/lightning-charge:0.4.3
+    restart: unless-stopped
     environment:
       NETWORK: regtest
       API_TOKEN: foiewnccewuify
@@ -154,7 +163,7 @@ services:
       - merchant_lightningd
 
   merchant_lightningd:
-    image: nicolasdorier/clightning:v0.6.1-dev
+    image: nicolasdorier/clightning:v0.6.2-3-dev
     environment: 
       EXPOSE_TCP: "true"
       LIGHTNINGD_OPT: |
@@ -199,9 +208,19 @@ services:
       - "39372:5432"
     expose:
       - "5432"
+      
+  mysql:
+    image:  mysql:8.0.12
+    expose:
+      - "3306"
+    ports:
+      - "33036:3306"
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
 
   merchant_lnd:
-    image: btcpayserver/lnd:0.5-beta
+    image: btcpayserver/lnd:0.5-beta-2
+    restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
       LND_ENVIRONMENT: "regtest"
@@ -227,7 +246,8 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:0.5-beta
+    image: btcpayserver/lnd:0.5-beta-2
+    restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
       LND_ENVIRONMENT: "regtest"

BTCPayServer.Tests/xunit.runner.json

@@ -0,0 +1,3 @@
+{
+    "parallelizeTestCollections": false
+}

BTCPayServer/BTCPayNetworkProvider.Bitcore.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
+using NBitcoin;
+using NBXplorer;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        public void InitBitcore()
+        {
+            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("BTX");
+            Add(new BTCPayNetwork()
+            {
+                CryptoCode = nbxplorerNetwork.CryptoCode,
+                DisplayName = "Bitcore",
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://insight.bitcore.cc/tx/{0}" : "https://insight.bitcore.cc/tx/{0}",
+                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
+                NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "bitcore",
+                DefaultRateRules = new[]
+                {
+                                "BTX_X = BTX_BTC * BTC_X",
+                                "BTX_BTC = cryptopia(BTX_BTC)"
+                },
+                CryptoImagePath = "imlegacy/bitcore.svg",
+                LightningImagePath = "imlegacy/bitcore-lightning.svg",
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("160'") : new KeyPath("1'")
+            });
+        }
+    }
+}

BTCPayServer/BTCPayNetworkProvider.cs

@@ -47,6 +47,7 @@ namespace BTCPayServer
             NetworkType = networkType;
             InitBitcoin();
             InitLitecoin();
+            InitBitcore();
             InitDogecoin();
             InitBitcoinGold();
             InitMonacoin();

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.2.112</Version>
+		<Version>1.0.3.6</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -36,31 +36,40 @@
     <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.1" />
     <PackageReference Include="BuildBundlerMinifier" Version="2.7.385" />
     <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
-    <PackageReference Include="Hangfire" Version="1.6.19" />
+    <PackageReference Include="Hangfire" Version="1.6.20" />
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.5.2" />
-    <PackageReference Include="Hangfire.PostgreSql" Version="1.4.8.2" />
-    <PackageReference Include="LedgerWallet" Version="2.0.0.2" />
+    <PackageReference Include="LedgerWallet" Version="2.0.0.3" />
     <PackageReference Include="Meziantou.AspNetCore.BundleTagHelpers" Version="2.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
-    <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.6.0" />
-    <PackageReference Include="NBitcoin" Version="4.1.1.48" />
+    <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.6.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="NBitcoin" Version="4.1.1.66" />
     <PackageReference Include="NBitpayClient" Version="1.0.0.30" />	  
-    <PackageReference Include="DBreeze" Version="1.87.0" />
-    <PackageReference Include="NBXplorer.Client" Version="1.0.3" />
+    <PackageReference Include="DBreeze" Version="1.92.0" />
+    <PackageReference Include="NBXplorer.Client" Version="1.0.3.5" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" />
     <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.3" />
     <PackageReference Include="NicolasDorier.RateLimits" Version="1.0.0.3" />
     <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.18" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.2" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.2" />
+    <PackageReference Include="Serilog" Version="2.7.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
     <PackageReference Include="SSH.NET" Version="2016.1.0" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
-    <PackageReference Include="Text.Analyzers" Version="2.6.0" />
+    <PackageReference Include="Text.Analyzers" Version="2.6.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
 	<ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
-		<PackageReference Include="YamlDotNet" Version="4.3.1" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.5" />
+		<PackageReference Include="YamlDotNet" Version="5.2.1" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -124,9 +133,15 @@
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <Pack>$(IncludeRazorContentInPack)</Pack>
     </Content>
+    <Content Update="Views\Server\LndRestServices.cshtml">
+      <Pack>$(IncludeRazorContentInPack)</Pack>
+    </Content>
     <Content Update="Views\Server\SSHService.cshtml">
       <Pack>$(IncludeRazorContentInPack)</Pack>
     </Content>
+    <Content Update="Views\Stores\ShowToken.cshtml">
+      <Pack>$(IncludeRazorContentInPack)</Pack>
+    </Content>
     <Content Update="Views\Stores\PayButtonEnable.cshtml">
       <Pack>$(IncludeRazorContentInPack)</Pack>
     </Content>
@@ -136,7 +151,7 @@
 	  <Content Update="Views\Public\PayButtonHandle.cshtml">
 	    <Pack>$(IncludeRazorContentInPack)</Pack>
 	  </Content>
-	  <Content Update="Views\Server\LNDGRPCServices.cshtml">
+	  <Content Update="Views\Server\LndGrpcServices.cshtml">
 	    <Pack>$(IncludeRazorContentInPack)</Pack>
 	  </Content>
 	  <Content Update="Views\Server\Maintenance.cshtml">
@@ -148,6 +163,12 @@
 	  <Content Update="Views\Wallets\ListWallets.cshtml">
 	    <Pack>$(IncludeRazorContentInPack)</Pack>
 	  </Content>
+	  <Content Update="Views\Wallets\WalletRescan.cshtml">
+	    <Pack>$(IncludeRazorContentInPack)</Pack>
+	  </Content>
+	  <Content Update="Views\Wallets\WalletSendLedger.cshtml">
+	    <Pack>$(IncludeRazorContentInPack)</Pack>
+	  </Content>
 	  <Content Update="Views\Wallets\WalletTransactions.cshtml">
 	    <Pack>$(IncludeRazorContentInPack)</Pack>
 	  </Content>
@@ -161,10 +182,4 @@
 	    <Pack>$(IncludeRazorContentInPack)</Pack>
 	  </Content>
 	</ItemGroup>
-
-	<ItemGroup>
-	  <None Update="devtest.pfx">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </None>
-	</ItemGroup>
 </Project>

BTCPayServer/Configuration/BTCPayServerOptions.cs

@@ -15,6 +15,7 @@ using Renci.SshNet;
 using NBitcoin.DataEncoders;
 using BTCPayServer.SSH;
 using BTCPayServer.Lightning;
+using BTCPayServer.Configuration.External;
 
 namespace BTCPayServer.Configuration
 {
@@ -78,6 +79,7 @@ namespace BTCPayServer.Configuration
                 setting.ExplorerUri = conf.GetOrDefault<Uri>($"{net.CryptoCode}.explorer.url", net.NBXplorerNetwork.DefaultSettings.DefaultUrl);
                 setting.CookieFile = conf.GetOrDefault<string>($"{net.CryptoCode}.explorer.cookiefile", net.NBXplorerNetwork.DefaultSettings.DefaultCookieFile);
                 NBXplorerConnectionSettings.Add(setting);
+
                 {
                     var lightning = conf.GetOrDefault<string>($"{net.CryptoCode}.lightning", string.Empty);
                     if (lightning.Length != 0)
@@ -99,25 +101,31 @@ namespace BTCPayServer.Configuration
                     }
                 }
 
+                void externalLnd<T>(string code, string lndType)
                 {
-                    var lightning = conf.GetOrDefault<string>($"{net.CryptoCode}.external.lnd.grpc", string.Empty);
+                    var lightning = conf.GetOrDefault<string>(code, string.Empty);
                     if (lightning.Length != 0)
                     {
                         if (!LightningConnectionString.TryParse(lightning, false, out var connectionString, out var error))
                         {
-                            throw new ConfigException($"Invalid setting {net.CryptoCode}.external.lnd.grpc, " + Environment.NewLine +
-                                $"lnd server: 'type=lnd-grpc;server=https://lnd.example.com;macaroon=abf239...;certthumbprint=2abdf302...'" + Environment.NewLine +
-                                $"lnd server: 'type=lnd-grpc;server=https://lnd.example.com;macaroonfilepath=/root/.lnd/admin.macaroon;certthumbprint=2abdf302...'" + Environment.NewLine +
+                            throw new ConfigException($"Invalid setting {code}, " + Environment.NewLine +
+                                $"lnd server: 'type={lndType};server=https://lnd.example.com;macaroon=abf239...;certthumbprint=2abdf302...'" + Environment.NewLine +
+                                $"lnd server: 'type={lndType};server=https://lnd.example.com;macaroonfilepath=/root/.lnd/admin.macaroon;certthumbprint=2abdf302...'" + Environment.NewLine +
                                 error);
                         }
-                        ExternalServicesByCryptoCode.Add(net.CryptoCode, new ExternalLNDGRPC(connectionString));
+                        var instanceType = typeof(T);
+                        ExternalServicesByCryptoCode.Add(net.CryptoCode, (ExternalService)Activator.CreateInstance(instanceType, connectionString));
                     }
-                }
+                };
+
+                externalLnd<ExternalLndGrpc>($"{net.CryptoCode}.external.lnd.grpc", "lnd-grpc");
+                externalLnd<ExternalLndRest>($"{net.CryptoCode}.external.lnd.rest", "lnd-rest");
             }
 
             Logs.Configuration.LogInformation("Supported chains: " + String.Join(',', supportedChains.ToArray()));
 
             PostgresConnectionString = conf.GetOrDefault<string>("postgres", null);
+            MySQLConnectionString = conf.GetOrDefault<string>("mysql", null);
             BundleJsCss = conf.GetOrDefault<bool>("bundlejscss", true);
             ExternalUrl = conf.GetOrDefault<Uri>("externalurl", null);
 
@@ -127,12 +135,12 @@ namespace BTCPayServer.Configuration
                 int waitTime = 0;
                 while (!string.IsNullOrEmpty(sshSettings.KeyFile) && !File.Exists(sshSettings.KeyFile))
                 {
-                    if(waitTime++ < 5)
+                    if (waitTime++ < 5)
                         System.Threading.Thread.Sleep(1000);
                     else
                         throw new ConfigException($"sshkeyfile does not exist");
                 }
-                    
+
                 if (sshSettings.Port > ushort.MaxValue ||
                    sshSettings.Port < ushort.MinValue)
                     throw new ConfigException($"ssh port is invalid");
@@ -224,6 +232,11 @@ namespace BTCPayServer.Configuration
             get;
             set;
         }
+        public string MySQLConnectionString
+        {
+            get;
+            set;
+        }
         public Uri ExternalUrl
         {
             get;
@@ -250,29 +263,4 @@ namespace BTCPayServer.Configuration
             return builder.ToString();
         }
     }
-
-    public class ExternalServices : MultiValueDictionary<string, ExternalService>
-    {
-        public IEnumerable<T> GetServices<T>(string cryptoCode) where T : ExternalService
-        {
-            if (!this.TryGetValue(cryptoCode.ToUpperInvariant(), out var services))
-                return Array.Empty<T>();
-            return services.OfType<T>();
-        }
-    }
-
-    public class ExternalService
-    {
-
-    }
-
-    public class ExternalLNDGRPC : ExternalService
-    {
-        public ExternalLNDGRPC(LightningConnectionString connectionString)
-        {
-            ConnectionString = connectionString;
-        }
-
-        public LightningConnectionString ConnectionString { get; set; }
-    }
 }

BTCPayServer/Configuration/ConfigurationExtensions.cs

@@ -37,6 +37,8 @@ namespace BTCPayServer.Configuration
                 }
             else if (typeof(T) == typeof(string))
                 return (T)(object)str;
+            else if (typeof(T) == typeof(IPAddress))
+                return (T)(object)IPAddress.Parse(str);
             else if (typeof(T) == typeof(IPEndPoint))
             {
                 var separator = str.LastIndexOf(":", StringComparison.InvariantCulture);

BTCPayServer/Configuration/DefaultConfiguration.cs

@@ -31,6 +31,7 @@ namespace BTCPayServer.Configuration
             app.Option("--regtest | -regtest", $"Use regtest (deprecated, use --network instead)", CommandOptionType.BoolValue);
             app.Option("--chains | -c", $"Chains to support as a comma separated (default: btc; available: {chains})", CommandOptionType.SingleValue);
             app.Option("--postgres", $"Connection string to a PostgreSQL database (default: SQLite)", CommandOptionType.SingleValue);
+            app.Option("--mysql", $"Connection string to a MySQL database (default: SQLite)", CommandOptionType.SingleValue);
             app.Option("--externalurl", $"The expected external URL of this service, to use if BTCPay is behind a reverse proxy (default: empty, use the incoming HTTP request to figure out)", CommandOptionType.SingleValue);
             app.Option("--bundlejscss", $"Bundle JavaScript and CSS files for better performance (default: true)", CommandOptionType.SingleValue);
             app.Option("--rootpath", "The root path in the URL to access BTCPay (default: /)", CommandOptionType.SingleValue);
@@ -39,6 +40,7 @@ namespace BTCPayServer.Configuration
             app.Option("--sshkeyfile", "SSH private key file to manage BTCPay (default: empty)", CommandOptionType.SingleValue);
             app.Option("--sshkeyfilepassword", "Password of the SSH keyfile (default: empty)", CommandOptionType.SingleValue);
             app.Option("--sshtrustedfingerprints", "SSH Host public key fingerprint or sha256 (default: empty, it will allow untrusted connections)", CommandOptionType.SingleValue);
+            app.Option("--debuglog", "A rolling log file for debug messages.", CommandOptionType.SingleValue);
             foreach (var network in provider.GetAll())
             {
                 var crypto = network.CryptoCode.ToLowerInvariant();
@@ -104,9 +106,12 @@ namespace BTCPayServer.Configuration
             builder.AppendLine("### Server settings ###");
             builder.AppendLine("#port=" + defaultSettings.DefaultPort);
             builder.AppendLine("#bind=127.0.0.1");
+            builder.AppendLine("#httpscertificatefilepath=devtest.pfx");
+            builder.AppendLine("#httpscertificatefilepassword=toto");
             builder.AppendLine();
             builder.AppendLine("### Database ###");
             builder.AppendLine("#postgres=User ID=root;Password=myPassword;Host=localhost;Port=5432;Database=myDataBase;");
+            builder.AppendLine("#mysql=User ID=root;Password=myPassword;Host=localhost;Port=3306;Database=myDataBase;");
             builder.AppendLine();
             builder.AppendLine("### NBXplorer settings ###");
             foreach (var n in new BTCPayNetworkProvider(networkType).GetAll())

BTCPayServer/Configuration/External/ExternalLnd.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Lightning;
+
+namespace BTCPayServer.Configuration.External
+{
+    public abstract class ExternalLnd : ExternalService
+    {
+        public ExternalLnd(LightningConnectionString connectionString, LndTypes type)
+        {
+            ConnectionString = connectionString;
+            Type = type;
+        }
+
+        public LndTypes Type { get; set; }
+        public LightningConnectionString ConnectionString { get; set; }
+    }
+
+    public enum LndTypes
+    {
+        gRPC, Rest
+    }
+
+    public class ExternalLndGrpc : ExternalLnd
+    {
+        public ExternalLndGrpc(LightningConnectionString connectionString) : base(connectionString, LndTypes.gRPC) { }
+    }
+
+    public class ExternalLndRest : ExternalLnd
+    {
+        public ExternalLndRest(LightningConnectionString connectionString) : base(connectionString, LndTypes.Rest) { }
+    }
+}

BTCPayServer/Configuration/External/ExternalService.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Lightning;
+
+namespace BTCPayServer.Configuration.External
+{
+    public class ExternalServices : MultiValueDictionary<string, ExternalService>
+    {
+        public IEnumerable<T> GetServices<T>(string cryptoCode) where T : ExternalService
+        {
+            if (!this.TryGetValue(cryptoCode.ToUpperInvariant(), out var services))
+                return Array.Empty<T>();
+            return services.OfType<T>();
+        }
+    }
+
+    public class ExternalService
+    {
+    }
+}

BTCPayServer/Controllers/ChangellyController.cs

@@ -0,0 +1,119 @@
+using System;
+using System.Threading.Tasks;
+using BTCPayServer.Models;
+using BTCPayServer.Payments.Changelly;
+using BTCPayServer.Rating;
+using BTCPayServer.Services.Rates;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BTCPayServer.Controllers
+{
+    [Route("[controller]/{storeId}")]
+    public class ChangellyController : Controller
+    {
+        private readonly ChangellyClientProvider _changellyClientProvider;
+        private readonly BTCPayNetworkProvider _btcPayNetworkProvider;
+        private readonly RateFetcher _RateProviderFactory;
+
+        public ChangellyController(ChangellyClientProvider changellyClientProvider,
+            BTCPayNetworkProvider btcPayNetworkProvider,
+            RateFetcher rateProviderFactory)
+        {
+            _RateProviderFactory = rateProviderFactory ?? throw new ArgumentNullException(nameof(rateProviderFactory));
+
+            _changellyClientProvider = changellyClientProvider;
+            _btcPayNetworkProvider = btcPayNetworkProvider;
+        }
+
+        [HttpGet]
+        [Route("currencies")]
+        public async Task<IActionResult> GetCurrencyList(string storeId)
+        {
+            try
+            {
+                
+                var client = await TryGetChangellyClient(storeId);
+                
+                return Ok(await client.GetCurrenciesFull());
+            }
+            catch (Exception e)
+            {
+                return BadRequest(new BitpayErrorModel()
+                {
+                    Error = e.Message
+                });
+            }
+        }
+
+        [HttpGet]
+        [Route("calculate")]
+        public async Task<IActionResult> CalculateAmount(string storeId, string fromCurrency, string toCurrency,
+            decimal toCurrencyAmount)
+        {
+            try
+            {
+                var client = await TryGetChangellyClient(storeId);
+
+                if (fromCurrency.Equals("usd", StringComparison.InvariantCultureIgnoreCase)
+                    || fromCurrency.Equals("eur", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    return await HandleCalculateFiatAmount(fromCurrency, toCurrency, toCurrencyAmount);
+                }
+                
+                var callCounter = 0;
+                var baseRate = await client.GetExchangeAmount(fromCurrency, toCurrency, 1);
+                var currentAmount = ChangellyCalculationHelper.ComputeBaseAmount(baseRate, toCurrencyAmount);
+                while (true)
+                {
+                    if (callCounter > 10)
+                    {
+                        BadRequest();
+                    }
+
+                    var computedAmount = await client.GetExchangeAmount(fromCurrency, toCurrency, currentAmount);
+                    callCounter++;
+                    if (computedAmount < toCurrencyAmount)
+                    {
+                        currentAmount =
+                            ChangellyCalculationHelper.ComputeCorrectAmount(currentAmount, computedAmount,
+                                toCurrencyAmount);
+                    }
+                    else
+                    {
+                        return Ok(currentAmount);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                return BadRequest(new BitpayErrorModel()
+                {
+                    Error = e.Message
+                });
+            }
+        }
+
+        private async Task<Changelly> TryGetChangellyClient(string storeId)
+        {
+            var store = IsTest? null: HttpContext.GetStoreData();
+            storeId = storeId ?? store?.Id;
+
+            return await _changellyClientProvider.TryGetChangellyClient(storeId, store);
+        }
+
+        private async Task<IActionResult> HandleCalculateFiatAmount(string fromCurrency, string toCurrency,
+            decimal toCurrencyAmount)
+        {
+            var store = HttpContext.GetStoreData();
+            var rules = store.GetStoreBlob().GetRateRules(_btcPayNetworkProvider);
+            var rate = await _RateProviderFactory.FetchRate(new CurrencyPair(toCurrency, fromCurrency), rules);
+            if (rate.BidAsk == null) return BadRequest();
+            var flatRate = rate.BidAsk.Center;
+            return Ok(flatRate * toCurrencyAmount);
+        }
+
+        public bool IsTest { get; set; } = false;
+    }
+    
+    
+}

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -10,6 +10,7 @@ using BTCPayServer.Events;
 using BTCPayServer.Filters;
 using BTCPayServer.Models.InvoicingModels;
 using BTCPayServer.Payments;
+using BTCPayServer.Payments.Changelly;
 using BTCPayServer.Payments.Lightning;
 using BTCPayServer.Security;
 using BTCPayServer.Services.Invoices;
@@ -213,7 +214,6 @@ namespace BTCPayServer.Controllers
                 paymentMethodIdStr = store.GetDefaultCrypto(_NetworkProvider);
                 isDefaultCrypto = true;
             }
-
             var paymentMethodId = PaymentMethodId.Parse(paymentMethodIdStr);
             var network = _NetworkProvider.GetNetwork(paymentMethodId.CryptoCode);
             if (network == null && isDefaultCrypto)
@@ -245,6 +245,18 @@ namespace BTCPayServer.Controllers
             var storeBlob = store.GetStoreBlob();
             var currency = invoice.ProductInformation.Currency;
             var accounting = paymentMethod.Calculate();
+
+            ChangellySettings changelly = (storeBlob.ChangellySettings != null && storeBlob.ChangellySettings.Enabled &&
+                                           storeBlob.ChangellySettings.IsConfigured())
+                ? storeBlob.ChangellySettings
+                : null;
+
+
+            var changellyAmountDue = changelly != null
+                ? (accounting.Due.ToDecimal(MoneyUnit.BTC) *
+                   (1m + (changelly.AmountMarkupPercentage / 100m)))
+                : (decimal?)null;
+
             var model = new PaymentModel()
             {
                 CryptoCode = network.CryptoCode,
@@ -284,7 +296,10 @@ namespace BTCPayServer.Controllers
                 Status = invoice.Status,
                 NetworkFee = paymentMethodDetails.GetTxFee(),
                 IsMultiCurrency = invoice.GetPayments().Select(p => p.GetPaymentMethodId()).Concat(new[] { paymentMethod.GetId() }).Distinct().Count() > 1,
-                AllowCoinConversion = storeBlob.AllowCoinConversion,
+                ChangellyEnabled = changelly != null,
+                ChangellyMerchantId = changelly?.ChangellyMerchantId,
+                ChangellyAmountDue = changellyAmountDue,
+                StoreId = store.Id,
                 AvailableCryptos = invoice.GetPaymentMethods(_NetworkProvider)
                                           .Where(i => i.Network != null)
                                           .Select(kv => new PaymentModel.AvailableCrypto()

BTCPayServer/Controllers/ServerController.cs

@@ -25,6 +25,7 @@ using System.Threading.Tasks;
 using Renci.SshNet;
 using BTCPayServer.Logging;
 using BTCPayServer.Lightning;
+using BTCPayServer.Configuration.External;
 
 namespace BTCPayServer.Controllers
 {
@@ -277,7 +278,7 @@ namespace BTCPayServer.Controllers
                     else
                     {
                         e.CanTrust = _Options.IsTrustedFingerprint(e.FingerPrint, e.HostKey);
-                        if(!e.CanTrust)
+                        if (!e.CanTrust)
                             Logs.Configuration.LogError($"SSH host fingerprint for {e.HostKeyName} is untrusted, start BTCPay with -sshtrustedfingerprints \"{Encoders.Hex.EncodeData(e.FingerPrint)}\"");
                     }
                 };
@@ -421,17 +422,15 @@ namespace BTCPayServer.Controllers
             var result = new ServicesViewModel();
             foreach (var cryptoCode in _Options.ExternalServicesByCryptoCode.Keys)
             {
+                int i = 0;
+                foreach (var grpcService in _Options.ExternalServicesByCryptoCode.GetServices<ExternalLnd>(cryptoCode))
                 {
-                    int i = 0;
-                    foreach (var grpcService in _Options.ExternalServicesByCryptoCode.GetServices<ExternalLNDGRPC>(cryptoCode))
+                    result.LNDServices.Add(new ServicesViewModel.LNDServiceViewModel()
                     {
-                        result.LNDServices.Add(new ServicesViewModel.LNDServiceViewModel()
-                        {
-                            Crypto = cryptoCode,
-                            Type = "gRPC",
-                            Index = i++,
-                        });
-                    }
+                        Crypto = cryptoCode,
+                        Type = grpcService.Type,
+                        Index = i++,
+                    });
                 }
             }
             result.HasSSH = _Options.SSHSettings != null;
@@ -439,17 +438,17 @@ namespace BTCPayServer.Controllers
         }
 
         [Route("server/services/lnd-grpc/{cryptoCode}/{index}")]
-        public IActionResult LNDGRPCServices(string cryptoCode, int index, uint? nonce)
+        public IActionResult LndGrpcServices(string cryptoCode, int index, uint? nonce)
         {
             if (!_dashBoard.IsFullySynched(cryptoCode, out var unusud))
             {
                 StatusMessage = $"Error: {cryptoCode} is not fully synched";
                 return RedirectToAction(nameof(Services));
             }
-            var external = GetExternalLNDConnectionString(cryptoCode, index);
+            var external = GetExternalLndConnectionString(cryptoCode, index);
             if (external == null)
                 return NotFound();
-            var model = new LNDGRPCServicesViewModel();
+            var model = new LndGrpcServicesViewModel();
 
             model.Host = $"{external.BaseUri.DnsSafeHost}:{external.BaseUri.Port}";
             model.SSL = external.BaseUri.Scheme == "https";
@@ -493,9 +492,9 @@ namespace BTCPayServer.Controllers
 
         [Route("server/services/lnd-grpc/{cryptoCode}/{index}")]
         [HttpPost]
-        public IActionResult LNDGRPCServicesPOST(string cryptoCode, int index)
+        public IActionResult LndGrpcServicesPost(string cryptoCode, int index)
         {
-            var external = GetExternalLNDConnectionString(cryptoCode, index);
+            var external = GetExternalLndConnectionString(cryptoCode, index);
             if (external == null)
                 return NotFound();
             LightningConfigurations confs = new LightningConfigurations();
@@ -513,12 +512,12 @@ namespace BTCPayServer.Controllers
             var nonce = RandomUtils.GetUInt32();
             var configKey = GetConfigKey("lnd-grpc", cryptoCode, index, nonce);
             _LnConfigProvider.KeepConfig(configKey, confs);
-            return RedirectToAction(nameof(LNDGRPCServices), new { cryptoCode = cryptoCode, nonce = nonce });
+            return RedirectToAction(nameof(LndGrpcServices), new { cryptoCode = cryptoCode, nonce = nonce });
         }
 
-        private LightningConnectionString GetExternalLNDConnectionString(string cryptoCode, int index)
+        private LightningConnectionString GetExternalLndConnectionString(string cryptoCode, int index)
         {
-            var connectionString = _Options.ExternalServicesByCryptoCode.GetServices<ExternalLNDGRPC>(cryptoCode).Skip(index).Select(c => c.ConnectionString).FirstOrDefault();
+            var connectionString = _Options.ExternalServicesByCryptoCode.GetServices<ExternalLnd>(cryptoCode).Skip(index).Select(c => c.ConnectionString).FirstOrDefault();
             if (connectionString == null)
                 return null;
             connectionString = connectionString.Clone();
@@ -531,13 +530,35 @@ namespace BTCPayServer.Controllers
                 }
                 catch
                 {
-                    Logging.Logs.Configuration.LogWarning($"{cryptoCode}: The macaroon file path of the external LND grpc config was not found ({connectionString.MacaroonFilePath})");
+                    Logs.Configuration.LogWarning($"{cryptoCode}: The macaroon file path of the external LND grpc config was not found ({connectionString.MacaroonFilePath})");
                     return null;
                 }
             }
             return connectionString;
         }
 
+        [Route("server/services/lnd-rest/{cryptoCode}/{index}")]
+        public IActionResult LndRestServices(string cryptoCode, int index, uint? nonce)
+        {
+            if (!_dashBoard.IsFullySynched(cryptoCode, out var unusud))
+            {
+                StatusMessage = $"Error: {cryptoCode} is not fully synched";
+                return RedirectToAction(nameof(Services));
+            }
+            var external = GetExternalLndConnectionString(cryptoCode, index);
+            if (external == null)
+                return NotFound();
+            var model = new LndRestServicesViewModel();
+
+            model.BaseApiUrl = external.BaseUri.ToString();
+            if (external.CertificateThumbprint != null)
+                model.CertificateThumbprint = Encoders.Hex.EncodeData(external.CertificateThumbprint);
+            if (external.Macaroon != null)
+                model.Macaroon = Encoders.Hex.EncodeData(external.Macaroon);
+
+            return View(model);
+        }
+
         [Route("server/services/ssh")]
         public IActionResult SSHService(bool downloadKeyFile = false)
         {

BTCPayServer/Controllers/StoresController.BTCLike.cs

@@ -34,13 +34,66 @@ namespace BTCPayServer.Controllers
             }
 
             DerivationSchemeViewModel vm = new DerivationSchemeViewModel();
-            vm.ServerUrl = WalletsController.GetLedgerWebsocketUrl(this.HttpContext, cryptoCode, null);
             vm.CryptoCode = cryptoCode;
             vm.RootKeyPath = network.GetRootKeyPath();
             SetExistingValues(store, vm);
             return View(vm);
         }
 
+        [HttpGet]
+        [Route("{storeId}/derivations/{cryptoCode}/ledger/ws")]
+        public async Task<IActionResult> AddDerivationSchemeLedger(
+            string storeId,
+            string cryptoCode,
+            string command,
+            int account = 0)
+        {
+            if (!HttpContext.WebSockets.IsWebSocketRequest)
+                return NotFound();
+
+            var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
+            var hw = new HardwareWalletService(webSocket);
+            object result = null;
+            var network = _NetworkProvider.GetNetwork(cryptoCode);
+
+            using (var normalOperationTimeout = new CancellationTokenSource())
+            {
+                normalOperationTimeout.CancelAfter(TimeSpan.FromMinutes(30));
+                try
+                {
+                    if (command == "test")
+                    {
+                        result = await hw.Test(normalOperationTimeout.Token);
+                    }
+                    if (command == "getxpub")
+                    {
+                        var getxpubResult = await hw.GetExtPubKey(network, account, normalOperationTimeout.Token);
+                        result = getxpubResult;
+                    }
+                }
+                catch (OperationCanceledException)
+                { result = new LedgerTestResult() { Success = false, Error = "Timeout" }; }
+                catch (Exception ex)
+                { result = new LedgerTestResult() { Success = false, Error = ex.Message }; }
+                finally { hw.Dispose(); }
+                try
+                {
+                    if (result != null)
+                    {
+                        UTF8Encoding UTF8NOBOM = new UTF8Encoding(false);
+                        var bytes = UTF8NOBOM.GetBytes(JsonConvert.SerializeObject(result, MvcJsonOptions.Value.SerializerSettings));
+                        await webSocket.SendAsync(new ArraySegment<byte>(bytes), WebSocketMessageType.Text, true, new CancellationTokenSource(2000).Token);
+                    }
+                }
+                catch { }
+                finally
+                {
+                    await webSocket.CloseSocket();
+                }
+            }
+            return new EmptyResult();
+        }
+
         private void SetExistingValues(StoreData store, DerivationSchemeViewModel vm)
         {
             vm.DerivationScheme = GetExistingDerivationStrategy(vm.CryptoCode, store)?.DerivationStrategyBase.ToString();
@@ -60,7 +113,6 @@ namespace BTCPayServer.Controllers
         [Route("{storeId}/derivations/{cryptoCode}")]
         public async Task<IActionResult> AddDerivationScheme(string storeId, DerivationSchemeViewModel vm, string cryptoCode)
         {
-            vm.ServerUrl = WalletsController.GetLedgerWebsocketUrl(this.HttpContext, cryptoCode, null);
             vm.CryptoCode = cryptoCode;
             var store = HttpContext.GetStoreData();
             if (store == null)
@@ -109,7 +161,7 @@ namespace BTCPayServer.Controllers
                               // - The user is setting a new derivation scheme
                               (!vm.Confirmation && strategy != null && exisingStrategy != strategy.DerivationStrategyBase.ToString()) ||
                               // - The user is clicking on continue without changing anything   
-                              (!vm.Confirmation && willBeExcluded == wasExcluded);  
+                              (!vm.Confirmation && willBeExcluded == wasExcluded);
 
             if (!showAddress)
             {

BTCPayServer/Controllers/StoresController.Changelly.cs

@@ -0,0 +1,96 @@
+using System;
+using System.Threading.Tasks;
+using BTCPayServer.Data;
+using BTCPayServer.Models.StoreViewModels;
+using BTCPayServer.Payments.Changelly;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BTCPayServer.Controllers
+{
+    public partial class StoresController
+    {
+        [HttpGet]
+        [Route("{storeId}/changelly")]
+        public IActionResult UpdateChangellySettings(string storeId)
+        {
+            var store = HttpContext.GetStoreData();
+            if (store == null)
+                return NotFound();
+            UpdateChangellySettingsViewModel vm = new UpdateChangellySettingsViewModel();
+            SetExistingValues(store, vm);
+            return View(vm);
+        }
+
+        private void SetExistingValues(StoreData store, UpdateChangellySettingsViewModel vm)
+        {
+
+            var existing = store.GetStoreBlob().ChangellySettings;
+            if (existing == null) return;
+            vm.ApiKey = existing.ApiKey;
+            vm.ApiSecret = existing.ApiSecret;
+            vm.ApiUrl = existing.ApiUrl;
+            vm.ChangellyMerchantId = existing.ChangellyMerchantId;
+            vm.Enabled = existing.Enabled;
+            vm.AmountMarkupPercentage = existing.AmountMarkupPercentage;
+            vm.ShowFiat = existing.ShowFiat;
+
+        }
+
+        [HttpPost]
+        [Route("{storeId}/changelly")]
+        public async Task<IActionResult> UpdateChangellySettings(string storeId, UpdateChangellySettingsViewModel vm,
+            string command)
+        {
+            var store = HttpContext.GetStoreData();
+            if (store == null)
+                return NotFound();
+            if (vm.Enabled)
+            {
+                if (!ModelState.IsValid)
+                {
+                    return View(vm);
+                }
+            }
+
+            var changellySettings = new ChangellySettings()
+            {
+                ApiKey = vm.ApiKey,
+                ApiSecret = vm.ApiSecret,
+                ApiUrl = vm.ApiUrl,
+                ChangellyMerchantId = vm.ChangellyMerchantId,
+                Enabled = vm.Enabled,
+                AmountMarkupPercentage = vm.AmountMarkupPercentage,
+                ShowFiat = vm.ShowFiat
+            };
+            
+            switch (command)
+            {
+                case "save":
+                    var storeBlob = store.GetStoreBlob();
+                    storeBlob.ChangellySettings = changellySettings;
+                    store.SetStoreBlob(storeBlob);
+                    await _Repo.UpdateStore(store);
+                    StatusMessage = "Changelly settings modified";
+                    _changellyClientProvider.InvalidateClient(storeId);
+                    return RedirectToAction(nameof(UpdateStore), new {
+                        storeId});
+                case "test":
+                    try
+                    {
+                        var client = new Changelly(_httpClientFactory, changellySettings.ApiKey, changellySettings.ApiSecret,
+                            changellySettings.ApiUrl);
+                        var result = await client.GetCurrenciesFull();
+                        vm.StatusMessage = "Test Successful";
+                        return View(vm);
+                    }
+                    catch (Exception ex)
+                    {
+                        vm.StatusMessage = $"Error: {ex.Message}";
+                        return View(vm);
+                    }
+                default:
+                    return View(vm);
+            }
+        }
+    }
+}

BTCPayServer/Controllers/StoresController.LightningLike.cs

@@ -114,7 +114,7 @@ namespace BTCPayServer.Controllers
                     }
                     if(!System.IO.File.Exists(connectionString.MacaroonFilePath))
                     {
-                        ModelState.AddModelError(nameof(vm.ConnectionString), "The macaroonfilepath file does exist");
+                        ModelState.AddModelError(nameof(vm.ConnectionString), "The macaroonfilepath file does not exist");
                         return View(vm);
                     }
                     if(!System.IO.Path.IsPathRooted(connectionString.MacaroonFilePath))

BTCPayServer/Controllers/StoresController.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Net.Http;
 using System.Threading.Tasks;
 using BTCPayServer.Authentication;
 using BTCPayServer.Configuration;
@@ -9,6 +10,7 @@ using BTCPayServer.Data;
 using BTCPayServer.Models;
 using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Models.StoreViewModels;
+using BTCPayServer.Payments.Changelly;
 using BTCPayServer.Rating;
 using BTCPayServer.Security;
 using BTCPayServer.Services;
@@ -21,6 +23,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.Extensions.Options;
 using NBitcoin;
 using NBitcoin.DataEncoders;
 
@@ -48,16 +51,21 @@ namespace BTCPayServer.Controllers
             ExplorerClientProvider explorerProvider,
             IFeeProviderFactory feeRateProvider,
             LanguageService langService,
-            IHostingEnvironment env)
+            ChangellyClientProvider changellyClientProvider,
+            IOptions<MvcJsonOptions> mvcJsonOptions,
+            IHostingEnvironment env, IHttpClientFactory httpClientFactory)
         {
             _RateFactory = rateFactory;
             _Repo = repo;
             _TokenRepository = tokenRepo;
             _UserManager = userManager;
             _LangService = langService;
+            _changellyClientProvider = changellyClientProvider;
+            MvcJsonOptions = mvcJsonOptions;
             _TokenController = tokenController;
             _WalletProvider = walletProvider;
             _Env = env;
+            _httpClientFactory = httpClientFactory;
             _NetworkProvider = networkProvider;
             _ExplorerProvider = explorerProvider;
             _FeeRateProvider = feeRateProvider;
@@ -77,7 +85,9 @@ namespace BTCPayServer.Controllers
         TokenRepository _TokenRepository;
         UserManager<ApplicationUser> _UserManager;
         private LanguageService _LangService;
+        private readonly ChangellyClientProvider _changellyClientProvider;
         IHostingEnvironment _Env;
+        private IHttpClientFactory _httpClientFactory;
 
         [TempData]
         public string StatusMessage
@@ -318,7 +328,6 @@ namespace BTCPayServer.Controllers
             vm.SetLanguages(_LangService, storeBlob.DefaultLang);
             vm.LightningMaxValue = storeBlob.LightningMaxValue?.ToString() ?? "";
             vm.OnChainMinValue = storeBlob.OnChainMinValue?.ToString() ?? "";
-            vm.AllowCoinConversion = storeBlob.AllowCoinConversion;
             vm.RequiresRefundEmail = storeBlob.RequiresRefundEmail;
             vm.CustomCSS = storeBlob.CustomCSS?.AbsoluteUri;
             vm.CustomLogo = storeBlob.CustomLogo?.AbsoluteUri;
@@ -362,7 +371,6 @@ namespace BTCPayServer.Controllers
                 return View(model);
             }
             blob.DefaultLang = model.DefaultLang;
-            blob.AllowCoinConversion = model.AllowCoinConversion;
             blob.RequiresRefundEmail = model.RequiresRefundEmail;
             blob.LightningMaxValue = lightningMaxValue;
             blob.OnChainMinValue = onchainMinValue;
@@ -447,6 +455,15 @@ namespace BTCPayServer.Controllers
                     Enabled = !excludeFilters.Match(paymentId)
                 });
             }
+
+
+            var changellyEnabled = storeBlob.ChangellySettings != null && storeBlob.ChangellySettings.Enabled;
+            vm.ThirdPartyPaymentMethods.Add(new StoreViewModel.ThirdPartyPaymentMethod()
+            {
+                Enabled = changellyEnabled,
+                Action = nameof(UpdateChangellySettings),
+                Provider = "Changelly"
+            });
         }
 
         [HttpPost]
@@ -556,6 +573,45 @@ namespace BTCPayServer.Controllers
             return View(model);
         }
 
+        [HttpGet]
+        [Route("{storeId}/tokens/{tokenId}/revoke")]
+        public async Task<IActionResult> RevokeToken(string tokenId)
+        {
+            var token = await _TokenRepository.GetToken(tokenId);
+            if (token == null || token.StoreId != StoreData.Id)
+                return NotFound();
+            return View("Confirm", new ConfirmModel()
+            {
+                Action = "Revoke the token",
+                Title = "Revoke the token",
+                Description = $"The access token with the label \"{token.Label}\" will be revoked, do you wish to continue?",
+                ButtonClass = "btn-danger"
+            });
+        }
+        [HttpPost]
+        [Route("{storeId}/tokens/{tokenId}/revoke")]
+        public async Task<IActionResult> RevokeTokenConfirm(string tokenId)
+        {
+            var token = await _TokenRepository.GetToken(tokenId);
+            if (token == null ||
+                token.StoreId != StoreData.Id ||
+               !await _TokenRepository.DeleteToken(tokenId))
+                StatusMessage = "Failure to revoke this token";
+            else
+                StatusMessage = "Token revoked";
+            return RedirectToAction(nameof(ListTokens));
+        }
+
+        [HttpGet]
+        [Route("{storeId}/tokens/{tokenId}")]
+        public async Task<IActionResult> ShowToken(string tokenId)
+        {
+            var token = await _TokenRepository.GetToken(tokenId);
+            if (token == null || token.StoreId != StoreData.Id)
+                return NotFound();
+            return View(token);
+        }
+
         [HttpPost]
         [Route("/api-tokens")]
         [Route("{storeId}/Tokens/Create")]
@@ -620,6 +676,7 @@ namespace BTCPayServer.Controllers
         }
 
         public string GeneratedPairingCode { get; set; }
+        public IOptions<MvcJsonOptions> MvcJsonOptions { get; }
 
         [HttpGet]
         [Route("/api-tokens")]
@@ -657,21 +714,6 @@ namespace BTCPayServer.Controllers
             return View(model);
         }
 
-
-        [HttpPost]
-        [Route("{storeId}/Tokens/Delete")]
-        public async Task<IActionResult> DeleteToken(string tokenId)
-        {
-            var token = await _TokenRepository.GetToken(tokenId);
-            if (token == null ||
-                token.StoreId != StoreData.Id ||
-               !await _TokenRepository.DeleteToken(tokenId))
-                StatusMessage = "Failure to revoke this token";
-            else
-                StatusMessage = "Token revoked";
-            return RedirectToAction(nameof(ListTokens));
-        }
-
         [HttpPost]
         [Route("{storeId}/tokens/apikey")]
         public async Task<IActionResult> GenerateAPIKey()

BTCPayServer/Controllers/WalletsController.cs

@@ -24,6 +24,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using NBitcoin;
 using NBXplorer.DerivationStrategy;
+using NBXplorer.Models;
 using Newtonsoft.Json;
 using static BTCPayServer.Controllers.StoresController;
 
@@ -45,6 +46,9 @@ namespace BTCPayServer.Controllers
         private readonly IFeeProviderFactory _feeRateProvider;
         private readonly BTCPayWalletProvider _walletProvider;
         public RateFetcher RateFetcher { get; }
+        [TempData]
+        public string StatusMessage { get; set; }
+
         CurrencyNameTable _currencyTable;
         public WalletsController(StoreRepository repo,
                                  CurrencyNameTable currencyTable,
@@ -149,18 +153,27 @@ namespace BTCPayServer.Controllers
             DerivationStrategy paymentMethod = GetPaymentMethod(walletId, store);
             if (paymentMethod == null)
                 return NotFound();
-
+            var network = this.NetworkProvider.GetNetwork(walletId?.CryptoCode);
+            if (network == null)
+                return NotFound();
             var storeData = store.GetStoreBlob();
             var rateRules = store.GetStoreBlob().GetRateRules(NetworkProvider);
             rateRules.Spread = 0.0m;
             var currencyPair = new Rating.CurrencyPair(paymentMethod.PaymentId.CryptoCode, GetCurrencyCode(storeData.DefaultLang) ?? "USD");
-            WalletModel model = new WalletModel()
+            WalletSendModel model = new WalletSendModel()
             {
-                DefaultAddress = defaultDestination,
-                DefaultAmount = defaultAmount,
-                ServerUrl = GetLedgerWebsocketUrl(this.HttpContext, walletId.CryptoCode, paymentMethod.DerivationStrategyBase),
-                CryptoCurrency = walletId.CryptoCode
+                Destination = defaultDestination,
+                CryptoCode = walletId.CryptoCode
             };
+            if (double.TryParse(defaultAmount, out var amount))
+                model.Amount = (decimal)amount;
+
+            var feeProvider = _feeRateProvider.CreateFeeProvider(network);
+            var recommendedFees = feeProvider.GetFeeRateAsync();
+            var balance = _walletProvider.GetWallet(network).GetBalance(paymentMethod.DerivationStrategyBase);
+            model.CurrentBalance = (await balance).ToDecimal(MoneyUnit.BTC);
+            model.RecommendedSatoshiPerByte = (int)(await recommendedFees).GetFee(1).Satoshi;
+            model.FeeSatoshiPerByte = model.RecommendedSatoshiPerByte;
 
             using (CancellationTokenSource cts = new CancellationTokenSource())
             {
@@ -184,6 +197,145 @@ namespace BTCPayServer.Controllers
             return View(model);
         }
 
+        [HttpPost]
+        [Route("{walletId}/send")]
+        public async Task<IActionResult> WalletSend(
+            [ModelBinder(typeof(WalletIdModelBinder))]
+            WalletId walletId, WalletSendModel vm)
+        {
+            if (walletId?.StoreId == null)
+                return NotFound();
+            var store = await Repository.FindStore(walletId.StoreId, GetUserId());
+            if (store == null)
+                return NotFound();
+            var network = this.NetworkProvider.GetNetwork(walletId?.CryptoCode);
+            if (network == null)
+                return NotFound();
+            var destination = ParseDestination(vm.Destination, network.NBitcoinNetwork);
+            if (destination == null)
+                ModelState.AddModelError(nameof(vm.Destination), "Invalid address");
+
+            if (vm.Amount.HasValue)
+            {
+                if (vm.CurrentBalance == vm.Amount.Value && !vm.SubstractFees)
+                    ModelState.AddModelError(nameof(vm.Amount), "You are sending all your balance to the same destination, you should substract the fees");
+                if (vm.CurrentBalance < vm.Amount.Value)
+                    ModelState.AddModelError(nameof(vm.Amount), "You are sending more than what you own");
+            }
+            if (!ModelState.IsValid)
+                return View(vm);
+
+            return RedirectToAction(nameof(WalletSendLedger), new WalletSendLedgerModel()
+            {
+                Destination = vm.Destination,
+                Amount = vm.Amount.Value,
+                SubstractFees = vm.SubstractFees,
+                FeeSatoshiPerByte = vm.FeeSatoshiPerByte
+            });
+        }
+
+        [HttpGet]
+        [Route("{walletId}/send/ledger")]
+        public async Task<IActionResult> WalletSendLedger(
+            [ModelBinder(typeof(WalletIdModelBinder))]
+            WalletId walletId, WalletSendLedgerModel vm)
+        {
+            if (walletId?.StoreId == null)
+                return NotFound();
+            var store = await Repository.FindStore(walletId.StoreId, GetUserId());
+            DerivationStrategy paymentMethod = GetPaymentMethod(walletId, store);
+            if (paymentMethod == null)
+                return NotFound();
+            var network = this.NetworkProvider.GetNetwork(walletId?.CryptoCode);
+            if (network == null)
+                return NotFound();
+            return View(vm);
+        }
+
+        private IDestination[] ParseDestination(string destination, Network network)
+        {
+            try
+            {
+                destination = destination?.Trim();
+                return new IDestination[] { BitcoinAddress.Create(destination, network) };
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        [HttpGet]
+        [Route("{walletId}/rescan")]
+        public async Task<IActionResult> WalletRescan(
+            [ModelBinder(typeof(WalletIdModelBinder))]
+            WalletId walletId)
+        {
+            if (walletId?.StoreId == null)
+                return NotFound();
+            var store = await Repository.FindStore(walletId.StoreId, GetUserId());
+            DerivationStrategy paymentMethod = GetPaymentMethod(walletId, store);
+            if (paymentMethod == null)
+                return NotFound();
+
+            var vm = new RescanWalletModel();
+            vm.IsFullySync = _dashboard.IsFullySynched(walletId.CryptoCode, out var unused);
+            // We need to ensure it is segwit, 
+            // because hardware wallet support need the parent transactions to sign, which NBXplorer don't have. (Nor does a pruned node)
+            vm.IsSegwit = paymentMethod.DerivationStrategyBase.IsSegwit();
+            vm.IsServerAdmin = User.Claims.Any(c => c.Type == Policies.CanModifyServerSettings.Key && c.Value == "true");
+            vm.IsSupportedByCurrency = _dashboard.Get(walletId.CryptoCode)?.Status?.BitcoinStatus?.Capabilities?.CanScanTxoutSet == true;
+            var explorer = ExplorerClientProvider.GetExplorerClient(walletId.CryptoCode);
+            var scanProgress = await explorer.GetScanUTXOSetInformationAsync(paymentMethod.DerivationStrategyBase);
+            if (scanProgress != null)
+            {
+                vm.PreviousError = scanProgress.Error;
+                if (scanProgress.Status == ScanUTXOStatus.Queued || scanProgress.Status == ScanUTXOStatus.Pending)
+                {
+                    if (scanProgress.Progress == null)
+                    {
+                        vm.Progress = 0;
+                    }
+                    else
+                    {
+                        vm.Progress = scanProgress.Progress.OverallProgress;
+                        vm.RemainingTime = TimeSpan.FromSeconds(scanProgress.Progress.RemainingSeconds).PrettyPrint();
+                    }
+                }
+                if (scanProgress.Status == ScanUTXOStatus.Complete)
+                {
+                    vm.LastSuccess = scanProgress.Progress;
+                    vm.TimeOfScan = (scanProgress.Progress.CompletedAt.Value - scanProgress.Progress.StartedAt).PrettyPrint();
+                }
+            }
+            return View(vm);
+        }
+
+        [HttpPost]
+        [Route("{walletId}/rescan")]
+        [Authorize(Policy = Policies.CanModifyServerSettings.Key)]
+        public async Task<IActionResult> WalletRescan(
+            [ModelBinder(typeof(WalletIdModelBinder))]
+            WalletId walletId, RescanWalletModel vm)
+        {
+            if (walletId?.StoreId == null)
+                return NotFound();
+            var store = await Repository.FindStore(walletId.StoreId, GetUserId());
+            DerivationStrategy paymentMethod = GetPaymentMethod(walletId, store);
+            if (paymentMethod == null)
+                return NotFound();
+            var explorer = ExplorerClientProvider.GetExplorerClient(walletId.CryptoCode);
+            try
+            {
+                await explorer.ScanUTXOSetAsync(paymentMethod.DerivationStrategyBase, vm.BatchSize, vm.GapLimit, vm.StartingIndex);
+            }
+            catch (NBXplorerException ex) when (ex.Error.Code == "scanutxoset-in-progress")
+            {
+
+            }
+            return RedirectToAction();
+        }
+
         private string GetCurrencyCode(string defaultLang)
         {
             if (defaultLang == null)
@@ -229,20 +381,25 @@ namespace BTCPayServer.Controllers
             return _userManager.GetUserId(User);
         }
 
-        public static string GetLedgerWebsocketUrl(HttpContext httpContext, string cryptoCode, DerivationStrategyBase derivationStrategy)
+        [HttpGet]
+        [Route("{walletId}/send/ledger/success")]
+        public IActionResult WalletSendLedgerSuccess(
+            [ModelBinder(typeof(WalletIdModelBinder))]
+            WalletId walletId,
+            string txid)
         {
-            return $"{httpContext.Request.GetAbsoluteRoot().WithTrailingSlash()}ws/ledger/{cryptoCode}/{derivationStrategy?.ToString() ?? string.Empty}";
+            StatusMessage = $"Transaction broadcasted ({txid})";
+            return RedirectToAction(nameof(this.WalletTransactions), new { walletId = walletId.ToString() });
         }
 
         [HttpGet]
-        [Route("/ws/ledger/{cryptoCode}/{derivationScheme?}")]
+        [Route("{walletId}/send/ledger/ws")]
         public async Task<IActionResult> LedgerConnection(
+            [ModelBinder(typeof(WalletIdModelBinder))]
+            WalletId walletId,
             string command,
             // getinfo
-            string cryptoCode = null,
             // getxpub
-            [ModelBinder(typeof(ModelBinders.DerivationSchemeModelBinder))]
-            DerivationStrategyBase derivationScheme = null,
             int account = 0,
             // sendtoaddress
             string destination = null, string amount = null, string feeRate = null, string substractFees = null
@@ -250,6 +407,11 @@ namespace BTCPayServer.Controllers
         {
             if (!HttpContext.WebSockets.IsWebSocketRequest)
                 return NotFound();
+
+            var cryptoCode = walletId.CryptoCode;
+            var storeBlob = (await Repository.FindStore(walletId.StoreId, GetUserId()));
+            var derivationScheme = GetPaymentMethod(walletId, storeBlob).DerivationStrategyBase;
+
             var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
 
             using (var normalOperationTimeout = new CancellationTokenSource())
@@ -313,15 +475,6 @@ namespace BTCPayServer.Controllers
                         }
                         catch { throw new FormatException("Invalid value for subtract fees"); }
                     }
-                    if (command == "test")
-                    {
-                        result = await hw.Test(normalOperationTimeout.Token);
-                    }
-                    if (command == "getxpub")
-                    {
-                        var getxpubResult = await hw.GetExtPubKey(network, account, normalOperationTimeout.Token);
-                        result = getxpubResult;
-                    }
                     if (command == "getinfo")
                     {
                         var strategy = GetDirectDerivationStrategy(derivationScheme);
@@ -329,13 +482,12 @@ namespace BTCPayServer.Controllers
                         {
                             throw new Exception($"This store is not configured to use this ledger");
                         }
-
-                        var feeProvider = _feeRateProvider.CreateFeeProvider(network);
-                        var recommendedFees = feeProvider.GetFeeRateAsync();
-                        var balance = _walletProvider.GetWallet(network).GetBalance(derivationScheme);
-                        result = new GetInfoResult() { Balance = (double)(await balance).ToDecimal(MoneyUnit.BTC), RecommendedSatoshiPerByte = (int)(await recommendedFees).GetFee(1).Satoshi };
+                        result = new GetInfoResult();
+                    }
+                    if (command == "test")
+                    {
+                        result = await hw.Test(normalOperationTimeout.Token);
                     }
-
                     if (command == "sendtoaddress")
                     {
                         if (!_dashboard.IsFullySynched(network.CryptoCode, out var summary))
@@ -367,9 +519,8 @@ namespace BTCPayServer.Controllers
                             throw new HardwareWalletException($"This store is not configured to use this ledger");
                         }
 
-                        TransactionBuilder builder = new TransactionBuilder();
+                        TransactionBuilder builder = network.NBitcoinNetwork.CreateTransactionBuilder();
                         builder.StandardTransactionPolicy.MinRelayTxFee = summary.Status.BitcoinStatus.MinRelayTxFee;
-                        builder.SetConsensusFactory(network.NBitcoinNetwork);
                         builder.AddCoins(unspentCoins.Select(c => c.Coin).ToArray());
 
                         foreach (var element in send)
@@ -392,7 +543,6 @@ namespace BTCPayServer.Controllers
                             else
                                 builder.SendEstimatedFees(feeRateValue);
                         }
-                        builder.Shuffle();
                         var unsigned = builder.BuildTransaction(false);
 
                         var keypaths = new Dictionary<Script, KeyPath>();
@@ -482,8 +632,6 @@ namespace BTCPayServer.Controllers
 
     public class GetInfoResult
     {
-        public int RecommendedSatoshiPerByte { get; set; }
-        public double Balance { get; set; }
     }
 
     public class SendToAddressResult

BTCPayServer/Data/ApplicationDbContextFactory.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using Hangfire;
 using Hangfire.MemoryStorage;
-using Hangfire.PostgreSql;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations;
 using JetBrains.Annotations;
@@ -17,7 +16,8 @@ namespace BTCPayServer.Data
     public enum DatabaseType
     {
         Sqlite,
-        Postgres
+        Postgres,
+        MySQL,
     }
     public class ApplicationDbContextFactory
     {
@@ -95,6 +95,8 @@ namespace BTCPayServer.Data
                 builder
                     .UseNpgsql(_ConnectionString)
                     .ReplaceService<IMigrationsSqlGenerator, CustomNpgsqlMigrationsSqlGenerator>();
+            else if (_Type == DatabaseType.MySQL)
+                builder.UseMySql(_ConnectionString);
         }
 
         public void ConfigureHangfireBuilder(IGlobalConfiguration builder)

BTCPayServer/Data/StoreData.cs

@@ -17,6 +17,7 @@ using BTCPayServer.JsonConverters;
 using System.ComponentModel.DataAnnotations;
 using BTCPayServer.Services;
 using System.Security.Claims;
+using BTCPayServer.Payments.Changelly;
 using BTCPayServer.Security;
 using BTCPayServer.Rating;
 
@@ -261,11 +262,6 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
-        public bool AllowCoinConversion
-        {
-            get; set;
-        }
-
         public bool RequiresRefundEmail { get; set; }
 
         public string DefaultLang { get; set; }
@@ -307,6 +303,8 @@ namespace BTCPayServer.Data
         public string RateScript { get; set; }
 
         public bool AnyoneCanInvoice { get; set; }
+        
+        public ChangellySettings ChangellySettings { get; set; }
 
 
         string _LightningDescriptionTemplate;

BTCPayServer/Extensions.cs

@@ -32,6 +32,7 @@ using System.Globalization;
 using BTCPayServer.Services;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using NBXplorer.DerivationStrategy;
 
 namespace BTCPayServer
 {
@@ -128,6 +129,19 @@ namespace BTCPayServer
                 resp.Headers[name] = value;
         }
 
+        public static bool IsSegwit(this DerivationStrategyBase derivationStrategyBase)
+        {
+            if (IsSegwitCore(derivationStrategyBase))
+                return true;
+            return (derivationStrategyBase is P2SHDerivationStrategy p2shStrat && IsSegwitCore(p2shStrat.Inner));
+        }
+
+        private static bool IsSegwitCore(DerivationStrategyBase derivationStrategyBase)
+        {
+            return (derivationStrategyBase is P2WSHDerivationStrategy) ||
+                            (derivationStrategyBase is DirectDerivationStrategy direct) && direct.Segwit;
+        }
+
         public static string GetAbsoluteRoot(this HttpRequest request)
         {
             return string.Concat(

BTCPayServer/HostedServices/NBXplorerWaiter.cs

@@ -47,7 +47,11 @@ namespace BTCPayServer.HostedServices
                    summary.Status != null && 
                    summary.Status.IsFullySynched;
         }
-
+        public NBXplorerSummary Get(string cryptoCode)
+        {
+            _Summaries.TryGetValue(cryptoCode, out var summary);
+            return summary;
+        }
         public IEnumerable<NBXplorerSummary> GetAll()
         {
             return _Summaries.Values;

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -38,10 +38,12 @@ using BTCPayServer.Logging;
 using BTCPayServer.HostedServices;
 using Meziantou.AspNetCore.BundleTagHelpers;
 using System.Security.Claims;
+using BTCPayServer.Payments.Changelly;
 using BTCPayServer.Security;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using NBXplorer.DerivationStrategy;
 using NicolasDorier.RateLimits;
+using Npgsql;
 
 namespace BTCPayServer.Hosting
 {
@@ -75,17 +77,23 @@ namespace BTCPayServer.Hosting
             {
                 var opts = o.GetRequiredService<BTCPayServerOptions>();
                 ApplicationDbContextFactory dbContext = null;
-                if (opts.PostgresConnectionString == null)
+                if (!String.IsNullOrEmpty(opts.PostgresConnectionString))
+                {
+                    Logs.Configuration.LogInformation($"Postgres DB used ({opts.PostgresConnectionString})");
+                    dbContext = new ApplicationDbContextFactory(DatabaseType.Postgres, opts.PostgresConnectionString);
+                }
+                else if(!String.IsNullOrEmpty(opts.MySQLConnectionString))
+                {
+                    Logs.Configuration.LogInformation($"MySQL DB used ({opts.MySQLConnectionString})");
+                    dbContext = new ApplicationDbContextFactory(DatabaseType.MySQL, opts.MySQLConnectionString);
+                }
+                else
                 {
                     var connStr = "Data Source=" + Path.Combine(opts.DataDir, "sqllite.db");
                     Logs.Configuration.LogInformation($"SQLite DB used ({connStr})");
                     dbContext = new ApplicationDbContextFactory(DatabaseType.Sqlite, connStr);
                 }
-                else
-                {
-                    Logs.Configuration.LogInformation($"Postgres DB used ({opts.PostgresConnectionString})");
-                    dbContext = new ApplicationDbContextFactory(DatabaseType.Postgres, opts.PostgresConnectionString);
-                }
+                 
                 return dbContext;
             });
 
@@ -125,6 +133,8 @@ namespace BTCPayServer.Hosting
 
             services.AddSingleton<Payments.IPaymentMethodHandler<Payments.Lightning.LightningSupportedPaymentMethod>, Payments.Lightning.LightningLikePaymentHandler>();
             services.AddSingleton<IHostedService, Payments.Lightning.LightningListener>();
+            
+            services.AddSingleton<ChangellyClientProvider>();
 
             services.AddSingleton<IHostedService, NBXplorerWaiters>();
             services.AddSingleton<IHostedService, InvoiceNotificationManager>();
@@ -191,7 +201,7 @@ namespace BTCPayServer.Hosting
 
         static void Retry(Action act)
         {
-            CancellationTokenSource cts = new CancellationTokenSource(10000);
+            CancellationTokenSource cts = new CancellationTokenSource(1000);
             while (true)
             {
                 try
@@ -199,7 +209,9 @@ namespace BTCPayServer.Hosting
                     act();
                     return;
                 }
-                catch when(!cts.IsCancellationRequested)
+                // Starting up
+                catch (PostgresException ex) when (ex.SqlState == "57P03") { Thread.Sleep(1000); }
+                catch when (!cts.IsCancellationRequested)
                 {
                     Thread.Sleep(100);
                 }

BTCPayServer/Hosting/Startup.cs

@@ -57,19 +57,22 @@ namespace BTCPayServer.Hosting
                 return context.GetHttpContext().User.IsInRole(_Role);
             }
         }
-        public Startup(IConfiguration conf, IHostingEnvironment env)
+        public Startup(IConfiguration conf, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {
             Configuration = conf;
             _Env = env;
+            LoggerFactory = loggerFactory;
         }
         IHostingEnvironment _Env;
         public IConfiguration Configuration
         {
             get; set;
         }
+        public ILoggerFactory LoggerFactory { get; }
 
         public void ConfigureServices(IServiceCollection services)
         {
+            Logs.Configure(LoggerFactory);
             services.ConfigureBTCPayServer(Configuration);
             services.AddMemoryCache();
             services.AddIdentity<ApplicationUser, IdentityRole>()
@@ -119,14 +122,42 @@ namespace BTCPayServer.Hosting
                 });
             });
 
-            // Needed to debug U2F for ledger support
-            //services.Configure<KestrelServerOptions>(kestrel =>
-            //{
-            //    kestrel.Listen(IPAddress.Loopback, 5012, l =>
-            //    {
-            //        l.UseHttps("devtest.pfx", "toto");
-            //    });
-            //});
+            // If the HTTPS certificate path is not set this logic will NOT be used and the default Kestrel binding logic will be.
+            string httpsCertificateFilePath = Configuration.GetOrDefault<string>("HttpsCertificateFilePath", null);
+            bool useDefaultCertificate = Configuration.GetOrDefault<bool>("HttpsUseDefaultCertificate", false);
+            bool hasCertPath = !String.IsNullOrEmpty(httpsCertificateFilePath);
+            if (hasCertPath || useDefaultCertificate)
+            {
+                var bindAddress = Configuration.GetOrDefault<IPAddress>("bind", IPAddress.Any);
+                int bindPort = Configuration.GetOrDefault<int>("port", 443);
+
+                services.Configure<KestrelServerOptions>(kestrel =>
+                {
+                    if (hasCertPath && !File.Exists(httpsCertificateFilePath))
+                    {
+                        // Note that by design this is a fatal error condition that will cause the process to exit.
+                        throw new ConfigException($"The https certificate file could not be found at {httpsCertificateFilePath}.");
+                    }
+                    if(hasCertPath && useDefaultCertificate)
+                    {
+                        throw new ConfigException($"Conflicting settings: if HttpsUseDefaultCertificate is true, HttpsCertificateFilePath should not be used");
+                    }
+
+                    kestrel.Listen(bindAddress, bindPort, l =>
+                    {
+                        if (hasCertPath)
+                        {
+                            Logs.Configuration.LogInformation($"Using HTTPS with the certificate located in {httpsCertificateFilePath}.");
+                            l.UseHttps(httpsCertificateFilePath, Configuration.GetOrDefault<string>("HttpsCertificateFilePassword", null));
+                        }
+                        else
+                        {
+                            Logs.Configuration.LogInformation($"Using HTTPS with the default certificate");
+                            l.UseHttps();
+                        }
+                    });
+                });
+            }
         }
 
         public void Configure(
@@ -136,7 +167,6 @@ namespace BTCPayServer.Hosting
             BTCPayServerOptions options,
             ILoggerFactory loggerFactory)
         {
-            Logs.Configure(loggerFactory);
             Logs.Configuration.LogInformation($"Root Path: {options.RootPath}");
             if (options.RootPath.Equals("/", StringComparison.OrdinalIgnoreCase))
             {

BTCPayServer/Models/InvoicingModels/PaymentModel.cs

@@ -55,7 +55,10 @@ namespace BTCPayServer.Models.InvoicingModels
         public string PaymentMethodName { get; set; }
         public string CryptoImage { get; set; }
 
-        public bool AllowCoinConversion { get; set; }
+        public bool ChangellyEnabled { get; set; }
+        public string StoreId { get; set; }
         public string PeerInfo { get; set; }
+        public string ChangellyMerchantId { get; set; }
+        public decimal? ChangellyAmountDue { get; set; }
     }
 }

BTCPayServer/Models/ServerViewModels/LndGrpcServicesViewModel.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 
 namespace BTCPayServer.Models.ServerViewModels
 {
-    public class LNDGRPCServicesViewModel
+    public class LndGrpcServicesViewModel
     {
         public string Host { get; set; }
         public bool SSL { get; set; }

BTCPayServer/Models/ServerViewModels/LndRestServicesViewModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Models.ServerViewModels
+{
+    public class LndRestServicesViewModel
+    {
+        public string BaseApiUrl { get; set; }
+        public string Macaroon { get; set; }
+        public string CertificateThumbprint { get; set; }
+    }
+}

BTCPayServer/Models/ServerViewModels/ServicesViewModel.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Configuration.External;
 
 namespace BTCPayServer.Models.ServerViewModels
 {
@@ -10,7 +11,7 @@ namespace BTCPayServer.Models.ServerViewModels
         public class LNDServiceViewModel
         {
             public string Crypto { get; set; }
-            public string Type { get; set; }
+            public LndTypes Type { get; set; }
             public int Index { get; set; }
         }
         public List<LNDServiceViewModel> LNDServices { get; set; } = new List<LNDServiceViewModel>();

BTCPayServer/Models/StoreViewModels/CheckoutExperienceViewModel.cs

@@ -23,11 +23,6 @@ namespace BTCPayServer.Models.StoreViewModels
         public string DefaultCryptoCurrency { get; set; }
         [Display(Name = "Default language on checkout")]
         public string DefaultLang { get; set; }
-        [Display(Name = "Allow conversion through third party (Shapeshift, Changelly...)")]
-        public bool AllowCoinConversion
-        {
-            get; set;
-        }
         [Display(Name = "Do not propose lightning payment if value of the invoice is above...")]
         [MaxLength(20)]
         public string LightningMaxValue { get; set; }

BTCPayServer/Models/StoreViewModels/DerivationSchemeViewModel.cs

@@ -29,7 +29,6 @@ namespace BTCPayServer.Models.StoreViewModels
         public bool Confirmation { get; set; }
         public bool Enabled { get; set; } = true;
 
-        public string ServerUrl { get; set; }
         public string StatusMessage { get; internal set; }
         public KeyPath RootKeyPath { get; set; }
     }

BTCPayServer/Models/StoreViewModels/StoreViewModel.cs

@@ -21,7 +21,13 @@ namespace BTCPayServer.Models.StoreViewModels
             public WalletId WalletId { get; set; }
             public bool Enabled { get; set; }
         }
-
+        
+        public class ThirdPartyPaymentMethod
+        {
+            public string Provider { get; set; }
+            public bool Enabled { get; set; }
+            public string Action { get; set; }
+        }
         public StoreViewModel()
         {
 
@@ -52,6 +58,9 @@ namespace BTCPayServer.Models.StoreViewModels
 
         public List<StoreViewModel.DerivationScheme> DerivationSchemes { get; set; } = new List<StoreViewModel.DerivationScheme>();
 
+        public List<ThirdPartyPaymentMethod> ThirdPartyPaymentMethods { get; set; } =
+            new List<ThirdPartyPaymentMethod>();
+
         [Display(Name = "Invoice expires if the full amount has not been paid after ... minutes")]
         [Range(1, 60 * 24 * 24)]
         public int InvoiceExpiration

BTCPayServer/Models/StoreViewModels/UpdateChangellySettingsViewModel.cs

@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Runtime.InteropServices;
+using BTCPayServer.Payments;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace BTCPayServer.Models.StoreViewModels
+{
+    public class UpdateChangellySettingsViewModel
+    {
+        [Required] public string ApiKey { get; set; }
+
+        [Required] public string ApiSecret { get; set; }
+
+        [Required] public string ApiUrl { get; set; } = "https://api.changelly.com";
+
+        [Display(Name = "Optional, Changelly Merchant Id")]
+        public string ChangellyMerchantId { get; set; }
+
+        [Display(Name = "Show Fiat Currencies as option in conversion")]
+        public bool ShowFiat { get; set; } = true;
+
+        [Required]
+        [Range(0, 100)]
+        [Display(Name =
+            "Percentage to multiply amount requested at Changelly to avoid underpaid situations due to Changelly not guaranteeing rates. ")]
+        public decimal AmountMarkupPercentage { get; set; } = new decimal(2);
+
+        public bool Enabled { get; set; }
+
+        public string StatusMessage { get; set; }
+    }
+}

BTCPayServer/Models/WalletViewModels/RescanWalletModel.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+using NBXplorer.Models;
+
+namespace BTCPayServer.Models.WalletViewModels
+{
+    public class RescanWalletModel
+    {
+        public bool IsServerAdmin { get; set; }
+        public bool IsSupportedByCurrency { get; set; }
+        public bool IsFullySync { get; set; }
+        public bool IsSegwit { get; set; }
+        public bool Ok => IsServerAdmin && IsSupportedByCurrency && IsFullySync && IsSegwit;
+
+        [Range(1000, 10_000)]
+        public int BatchSize { get; set; } = 3000;
+        [Range(0, 10_000_000)]
+        public int StartingIndex { get; set; } = 0;
+
+        [Range(100, 100000)]
+        public int GapLimit { get; set; } = 10000;
+
+        public int? Progress { get; set; }
+        public string PreviousError { get; set; }
+        public ScanUTXOProgress LastSuccess { get; internal set; }
+        public string TimeOfScan { get; internal set; }
+        public string RemainingTime { get; internal set; }
+    }
+}

BTCPayServer/Models/WalletViewModels/WalletSendLedgerModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Models.WalletViewModels
+{
+    public class WalletSendLedgerModel
+    {
+        public int FeeSatoshiPerByte { get; set; }
+        public bool SubstractFees { get; set; }
+        public decimal Amount { get; set; }
+        public string Destination { get; set; }
+    }
+}

BTCPayServer/Models/WalletViewModels/WalletSendModel.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Models.WalletViewModels
+{
+    public class WalletSendModel
+    {
+        [Required]
+        public string Destination { get; set; }
+
+        [Range(0.0, double.MaxValue)]
+        [Required]
+        public decimal? Amount { get; set; }
+
+        public decimal CurrentBalance { get; set; }
+
+        public string CryptoCode { get; set; }
+
+        public int RecommendedSatoshiPerByte { get; set; }
+
+        [Display(Name = "Subtract fees from amount")]
+        public bool SubstractFees { get; set; }
+
+        [Range(1, int.MaxValue)]
+        [Display(Name = "Fee rate (satoshi per byte)")]
+        [Required]
+        public int FeeSatoshiPerByte { get; set; }
+        public decimal? Rate { get; set; }
+        public int Divisibility { get; set; }
+        public string Fiat { get; set; }
+        public string RateError { get; set; }
+    }
+}

BTCPayServer/Payments/Bitcoin/NBXplorerListener.cs

@@ -149,8 +149,7 @@ namespace BTCPayServer.Payments.Bitcoin
                                 foreach (var output in evt.Outputs)
                                 {
                                     foreach (var txCoin in evt.TransactionData.Transaction.Outputs.AsCoins()
-                                                                                .Where(o => o.ScriptPubKey == output.ScriptPubKey)
-                                                                                .Select(o => output.Redeem == null ? o : o.ToScriptCoin(output.Redeem)))
+                                                                                .Where(o => o.ScriptPubKey == output.ScriptPubKey))
                                     {
                                         var invoice = await _InvoiceRepository.GetInvoiceFromScriptPubKey(output.ScriptPubKey, network.CryptoCode);
                                         if (invoice != null)

BTCPayServer/Payments/Changelly/Changelly.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using BTCPayServer.Payments.Changelly.Models;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using SshNet.Security.Cryptography;
+
+namespace BTCPayServer.Payments.Changelly
+{
+    public class Changelly
+    {
+        private readonly string _apisecret;
+        private readonly bool _showFiat;
+        private readonly HttpClient _httpClient;
+
+        public Changelly(IHttpClientFactory httpClientFactory,  string apiKey, string apiSecret, string apiUrl, bool showFiat = true)
+        {
+            _apisecret = apiSecret;
+            _showFiat = showFiat;
+            _httpClient = httpClientFactory.CreateClient();
+            _httpClient.BaseAddress = new Uri(apiUrl);
+            _httpClient.DefaultRequestHeaders.Add("api-key", apiKey);
+        }
+
+
+        private static string ToHexString(byte[] array)
+        {
+            var hex = new StringBuilder(array.Length * 2);
+            foreach (var b in array)
+            {
+                hex.AppendFormat(CultureInfo.InvariantCulture, "{0:x2}", b);
+            }
+
+            return hex.ToString();
+        }
+
+        private async Task<ChangellyResponse<T>> PostToApi<T>(string message)
+        {
+                var hmac = new HMACSHA512(Encoding.UTF8.GetBytes(_apisecret));
+                var hashMessage = hmac.ComputeHash(Encoding.UTF8.GetBytes(message));
+                var sign = ToHexString(hashMessage);
+
+                var request = new HttpRequestMessage(HttpMethod.Post, "");
+                request.Headers.Add("sign", sign);
+                request.Content = new StringContent(message, Encoding.UTF8, "application/json");
+
+                var result = await _httpClient.SendAsync(request);
+
+                if (!result.IsSuccessStatusCode)
+                    throw new ChangellyException(result.ReasonPhrase);
+                var content =
+                    await result.Content.ReadAsStringAsync();
+                return JObject.Parse(content).ToObject<ChangellyResponse<T>>();
+            
+        }
+
+        public virtual async Task<IEnumerable<CurrencyFull>> GetCurrenciesFull()
+        {
+                const string message = @"{
+		            ""jsonrpc"": ""2.0"",
+		            ""id"": 1,
+		            ""method"": ""getCurrenciesFull"",
+		            ""params"": []
+			    }";
+
+                var result = await PostToApi<IEnumerable<CurrencyFull>>(message);
+                var appendedResult = _showFiat
+                    ? result.Result.Concat(new[]
+                    {
+                        new CurrencyFull()
+                        {
+                            Enable = true,
+                            Name = "EUR",
+                            FullName = "Euro",
+                            PayInConfirmations = 0,
+                            ImageLink = "https://changelly.com/api/coins/eur.png"
+                        },
+                        new CurrencyFull()
+                        {
+                            Enable = true,
+                            Name = "USD",
+                            FullName = "US Dollar",
+                            PayInConfirmations = 0,
+                            ImageLink = "https://changelly.com/api/coins/usd.png"
+                        }
+                    })
+                    : result.Result;
+            return appendedResult;
+        }
+
+        public virtual async Task<decimal> GetExchangeAmount(string fromCurrency,
+            string toCurrency,
+            decimal amount)
+        {
+                var message =
+                    $"{{\"id\": \"test\",\"jsonrpc\": \"2.0\",\"method\": \"getExchangeAmount\",\"params\":{{\"from\": \"{fromCurrency}\",\"to\": \"{toCurrency}\",\"amount\": \"{amount}\"}}}}";
+
+                var result = await PostToApi<string>(message);
+
+            return Convert.ToDecimal(result.Result, CultureInfo.InvariantCulture);
+        }
+    }
+}

BTCPayServer/Payments/Changelly/ChangellyCalculationHelper.cs

@@ -0,0 +1,16 @@
+namespace BTCPayServer.Payments.Changelly
+{
+    public static class ChangellyCalculationHelper
+    {
+        public static decimal ComputeBaseAmount(decimal baseRate, decimal toAmount)
+        {
+            return (1m / baseRate) * toAmount;
+        }
+
+        public static decimal ComputeCorrectAmount(decimal currentFromAmount, decimal currentAmount,
+            decimal expectedAmount)
+        {
+            return (currentFromAmount / currentAmount) * expectedAmount;
+        }
+    }
+}

BTCPayServer/Payments/Changelly/ChangellyClientProvider.cs

@@ -0,0 +1,70 @@
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading.Tasks;
+using BTCPayServer.Data;
+using BTCPayServer.Services.Stores;
+using NBitcoin;
+
+namespace BTCPayServer.Payments.Changelly
+{
+    public class ChangellyClientProvider
+    {
+        private readonly StoreRepository _storeRepository;
+        private readonly IHttpClientFactory _httpClientFactory;
+
+        private readonly ConcurrentDictionary<string, Changelly> _clientCache =
+            new ConcurrentDictionary<string, Changelly>();
+
+        public ChangellyClientProvider(StoreRepository storeRepository, IHttpClientFactory httpClientFactory)
+        {
+            _storeRepository = storeRepository;
+            _httpClientFactory = httpClientFactory;
+        }
+
+        public void InvalidateClient(string storeId)
+        {
+            if (_clientCache.ContainsKey(storeId))
+            {
+                _clientCache.Remove(storeId, out var value);
+            }
+        }
+
+
+        public virtual async Task<Changelly> TryGetChangellyClient(string storeId, StoreData storeData = null)
+        {
+            if (_clientCache.ContainsKey(storeId))
+            {
+                return _clientCache[storeId];
+            }
+
+            if (storeData == null)
+            {
+                storeData = await _storeRepository.FindStore(storeId);
+                if (storeData == null)
+                {
+                    throw new ChangellyException("Store not found");
+                }
+            }
+
+            var blob = storeData.GetStoreBlob();
+            var changellySettings = blob.ChangellySettings;
+
+
+            if (changellySettings == null || !changellySettings.IsConfigured())
+            {
+                throw new ChangellyException("Changelly not configured for this store");
+            }
+
+            if (!changellySettings.Enabled)
+            {
+                throw new ChangellyException("Changelly not enabled for this store");
+            }
+
+            var changelly = new Changelly(_httpClientFactory, changellySettings.ApiKey, changellySettings.ApiSecret,
+                changellySettings.ApiUrl, changellySettings.ShowFiat);
+            _clientCache.AddOrReplace(storeId, changelly);
+            return changelly;
+        }
+    }
+}

BTCPayServer/Payments/Changelly/ChangellyException.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace BTCPayServer.Payments.Changelly
+{
+    public class ChangellyException : Exception
+    {
+        public ChangellyException(string message) : base(message)
+        {
+        }
+    }
+}

BTCPayServer/Payments/Changelly/ChangellySettings.cs

@@ -0,0 +1,21 @@
+namespace BTCPayServer.Payments.Changelly
+{
+    public class ChangellySettings
+    {
+        public string ApiKey { get; set; }
+        public string ApiSecret { get; set; }
+        public string ApiUrl { get; set; }
+        public bool Enabled { get; set; }
+        public string ChangellyMerchantId { get; set; }
+        public decimal AmountMarkupPercentage { get; set; }
+        public bool ShowFiat { get; set; }
+
+        public bool IsConfigured()
+        {
+            return
+                !string.IsNullOrEmpty(ApiKey) ||
+                !string.IsNullOrEmpty(ApiSecret) ||
+                !string.IsNullOrEmpty(ApiUrl);
+        }
+    }
+}

BTCPayServer/Payments/Changelly/Models/ChangellyResponse.cs

@@ -0,0 +1,17 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Payments.Changelly.Models
+{
+    
+    public class ChangellyResponse<T>
+    {
+        [JsonProperty("jsonrpc")]
+        public string JsonRPC { get; set; }
+        [JsonProperty("id")]
+        public object Id { get; set; }
+        [JsonProperty("result")]
+        public T Result { get; set; }
+        [JsonProperty("error")]
+        public Error Error { get; set; }
+    }
+}

BTCPayServer/Payments/Changelly/Models/CurrencyFull.cs

@@ -0,0 +1,18 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Payments.Changelly.Models
+{
+    public class CurrencyFull
+    {
+        [JsonProperty("name")]
+        public string Name { get; set; }
+        [JsonProperty("fullName")]
+        public string FullName { get; set; }
+        [JsonProperty("enabled")]
+        public bool Enable { get; set; }
+        [JsonProperty("payinConfirmations")]
+        public int PayInConfirmations { get; set; }
+        [JsonProperty("image")]
+        public string ImageLink { get; set; }
+    }
+}

BTCPayServer/Payments/Changelly/Models/Error.cs

@@ -0,0 +1,13 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Payments.Changelly.Models
+{
+    public class Error
+    {
+        [JsonProperty("code")]
+        public int Code { get; set; }
+
+        [JsonProperty("message")]
+        public string Message { get; set; } 
+    }
+}

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -90,10 +90,10 @@ namespace BTCPayServer.Payments.Lightning
                     throw new PaymentMethodUnavailableException($"No lightning node public address has been configured");
                 }
 
-                var blocksGap = Math.Abs(info.BlockHeight - summary.Status.ChainHeight);
+                var blocksGap = summary.Status.ChainHeight - info.BlockHeight;
                 if (blocksGap > 10)
                 {
-                    throw new PaymentMethodUnavailableException($"The lightning is not synched ({blocksGap} blocks)");
+                    throw new PaymentMethodUnavailableException($"The lightning node is not synched ({blocksGap} blocks left)");
                 }
 
                 return info.NodeInfo;

BTCPayServer/Payments/PaymentMethodExtensions.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.Payments.Changelly;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 

BTCPayServer/Program.cs

@@ -15,11 +15,14 @@ using System.Collections.Generic;
 using System.Collections;
 using Microsoft.AspNetCore.Hosting.Server.Features;
 using System.Threading;
+using Serilog;
 
 namespace BTCPayServer
 {
     class Program
     {
+        private const long MAX_DEBUG_LOG_FILE_SIZE = 2000000; // If debug log is in use roll it every N MB.
+
         static void Main(string[] args)
         {
             ServicePointManager.DefaultConnectionLimit = 100;
@@ -31,7 +34,7 @@ namespace BTCPayServer
             var logger = loggerFactory.CreateLogger("Configuration");
             try
             {
-                // This is the only way toat LoadArgs can print to console. Because LoadArgs is called by the HostBuilder before Logs.Configure is called
+                // This is the only way that LoadArgs can print to console. Because LoadArgs is called by the HostBuilder before Logs.Configure is called
                 var conf = new DefaultConfiguration() { Logger = logger }.CreateConfiguration(args);
                 if (conf == null)
                     return;
@@ -50,6 +53,20 @@ namespace BTCPayServer
                         l.AddFilter("Microsoft", LogLevel.Error);
                         l.AddFilter("Microsoft.AspNetCore.Antiforgery.Internal", LogLevel.Critical);
                         l.AddProvider(new CustomConsoleLogProvider(processor));
+
+                        // Use Serilog for debug log file.
+                        string debugLogFile = conf.GetOrDefault<string>("debuglog", null);
+                        if (String.IsNullOrEmpty(debugLogFile) == false)
+                        {
+                            Serilog.Log.Logger = new LoggerConfiguration()
+                            .Enrich.FromLogContext()
+                            .MinimumLevel.Debug()
+                            .WriteTo.File(debugLogFile, rollingInterval: RollingInterval.Day, fileSizeLimitBytes: MAX_DEBUG_LOG_FILE_SIZE, rollOnFileSizeLimit: true, retainedFileCountLimit: 1)
+                            .CreateLogger();
+
+                            l.AddSerilog(Serilog.Log.Logger);
+                            logger.LogDebug($"Debug log file configured for {debugLogFile}.");
+                        }                           
                     })
                     .UseStartup<Startup>()
                     .Build();
@@ -73,6 +90,7 @@ namespace BTCPayServer
                     Logs.Configuration.LogError("Configuration error");
                 if (host != null)
                     host.Dispose();
+                Serilog.Log.CloseAndFlush();
                 loggerProvider.Dispose();
             }
         }

BTCPayServer/Properties/launchSettings.json

@@ -1,20 +1,40 @@
 {
-  "profiles": {
-    "Docker-Regtest": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "BTCPAY_NETWORK": "regtest",
-        "BTCPAY_BUNDLEJSCSS": "true",
-        "BTCPAY_LTCEXPLORERURL": "http://127.0.0.1:32838/",
-        "BTCPAY_BTCLIGHTNING": "type=charge;server=http://127.0.0.1:54938/;api-token=foiewnccewuify",
-        "BTCPAY_BTCEXTERNALLNDGRPC": "type=lnd-grpc;server=https://lnd:lnd@127.0.0.1:53280/;allowinsecure=true",
-        "BTCPAY_BTCEXPLORERURL": "http://127.0.0.1:32838/",
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "BTCPAY_CHAINS": "btc,ltc",
-        "BTCPAY_POSTGRES": "User ID=postgres;Host=127.0.0.1;Port=39372;Database=btcpayserver"
-      },
-      "applicationUrl": "http://127.0.0.1:14142/"
+    "profiles": {
+        "Docker-Regtest": {
+            "commandName": "Project",
+            "launchBrowser": true,
+            "environmentVariables": {
+                "BTCPAY_NETWORK": "regtest",
+                "BTCPAY_BUNDLEJSCSS": "true",
+                "BTCPAY_LTCEXPLORERURL": "http://127.0.0.1:32838/",
+                "BTCPAY_BTCLIGHTNING": "type=charge;server=http://127.0.0.1:54938/;api-token=foiewnccewuify",
+                "BTCPAY_BTCEXTERNALLNDGRPC": "type=lnd-grpc;server=https://lnd:lnd@127.0.0.1:53280/;allowinsecure=true",
+                "BTCPAY_BTCEXTERNALLNDREST": "type=lnd-rest;server=https://lnd:lnd@127.0.0.1:53280/lnd-rest/btc/;allowinsecure=true;macaroonfilepath=D:\\admin.macaroon",
+                "BTCPAY_BTCEXPLORERURL": "http://127.0.0.1:32838/",
+                "ASPNETCORE_ENVIRONMENT": "Development",
+                "BTCPAY_CHAINS": "btc,ltc",
+                "BTCPAY_POSTGRES": "User ID=postgres;Host=127.0.0.1;Port=39372;Database=btcpayserver"
+            },
+            "applicationUrl": "http://127.0.0.1:14142/"
+        },
+        "Docker-Regtest-https": {
+            "commandName": "Project",
+            "launchBrowser": true,
+            "environmentVariables": {
+                "BTCPAY_NETWORK": "regtest",
+                "BTCPAY_PORT": "14142",
+                "BTCPAY_HttpsUseDefaultCertificate": "true",
+                "BTCPAY_BUNDLEJSCSS": "true",
+                "BTCPAY_LTCEXPLORERURL": "http://127.0.0.1:32838/",
+                "BTCPAY_BTCLIGHTNING": "type=charge;server=http://127.0.0.1:54938/;api-token=foiewnccewuify",
+                "BTCPAY_BTCEXTERNALLNDGRPC": "type=lnd-grpc;server=https://lnd:lnd@127.0.0.1:53280/;allowinsecure=true",
+                "BTCPAY_BTCEXTERNALLNDREST": "type=lnd-rest;server=https://lnd:lnd@127.0.0.1:53280/lnd-rest/btc/;allowinsecure=true;macaroonfilepath=D:\\admin.macaroon",
+                "BTCPAY_BTCEXPLORERURL": "http://127.0.0.1:32838/",
+                "ASPNETCORE_ENVIRONMENT": "Development",
+                "BTCPAY_CHAINS": "btc,ltc",
+                "BTCPAY_POSTGRES": "User ID=postgres;Host=127.0.0.1;Port=39372;Database=btcpayserver"
+            },
+            "applicationUrl": "https://localhost:14142/"
+        }
     }
-  }
 }

BTCPayServer/Services/Fees/NBxplorerFeeProvider.cs

@@ -39,8 +39,6 @@ namespace BTCPayServer.Services.Fees
         ExplorerClient _ExplorerClient;
         public async Task<FeeRate> GetFeeRateAsync()
         {
-            if (!_ExplorerClient.Network.SupportEstimatesSmartFee)
-                return _Factory.Fallback;
             try
             {
                 return (await _ExplorerClient.GetFeeRateAsync(_Factory.BlockTarget).ConfigureAwait(false)).FeeRate;

BTCPayServer/Services/HardwareWalletService.cs

@@ -80,6 +80,7 @@ namespace BTCPayServer.Services
                 throw new ArgumentNullException(nameof(ledgerWallet));
             _Transport = new WebSocketTransport(ledgerWallet);
             _Ledger = new LedgerClient(_Transport);
+            _Ledger.MaxAPDUSize = 90;
         }
 
         public async Task<LedgerTestResult> Test(CancellationToken cancellation)

BTCPayServer/Services/Invoices/InvoiceRepository.cs

@@ -40,7 +40,13 @@ namespace BTCPayServer.Services.Invoices
         private CustomThreadPool _IndexerThread;
         public InvoiceRepository(ApplicationDbContextFactory contextFactory, string dbreezePath)
         {
-            _Engine = new DBreezeEngine(dbreezePath);
+            int retryCount = 0;
+            retry:
+            try
+            {
+                _Engine = new DBreezeEngine(dbreezePath);
+            }
+            catch when (retryCount++ < 5) { goto retry; }
             _IndexerThread = new CustomThreadPool(1, "Invoice Indexer");
             _ContextFactory = contextFactory;
         }
@@ -289,6 +295,8 @@ namespace BTCPayServer.Services.Invoices
         {
             using (var tx = _Engine.GetTransaction())
             {
+                var terms = searchTerms.Split(null);
+                searchTerms = string.Join(' ', terms.Select(t => t.Length > 50 ? t.Substring(0, 50) : t).ToArray());
                 return tx.TextSearch("InvoiceSearch").Block(searchTerms)
                     .GetDocumentIDs()
                     .Select(id => Encoders.Base58.EncodeData(id))

BTCPayServer/Services/LanguageService.cs

@@ -34,7 +34,10 @@ namespace BTCPayServer.Services
                 new Language("is-IS", "Íslenska"),
                 new Language("hr-HR", "Croatian"),
                 new Language("it-IT", "Italiano"),
+                new Language("kk-KZ", "Қазақша"),
                 new Language("ru-RU", "русский"),
+                new Language("uk-UA", "Українська"),
+                new Language("vi-VN", "Tiếng Việt"),
                 new Language("zh-SP", "中文（简体）"),
             };
         }

BTCPayServer/Services/Rates/KrakenExchangeRateProvider.cs

@@ -42,6 +42,19 @@ namespace BTCPayServer.Services.Rates
         string[] _Symbols = Array.Empty<string>();
         DateTimeOffset? _LastSymbolUpdate = null;
 
+
+        Dictionary<string, string> _TickerMapping = new Dictionary<string, string>()
+        {
+            { "XXDG", "DOGE" },
+            { "XXBT", "BTC" },
+            { "XBT", "BTC" },
+            { "DASH", "DASH" },
+            { "ZUSD", "USD" },
+            { "ZEUR", "EUR" },
+            { "ZJPY", "JPY" },
+            { "ZCAD", "CAD" },
+        };
+
         public async Task<ExchangeRates> GetRatesAsync()
         {
             var result = new ExchangeRates();
@@ -57,7 +70,20 @@ namespace BTCPayServer.Services.Rates
                 {
                     try
                     {
-                        var global = _Helper.ExchangeSymbolToGlobalSymbol(symbol);
+                        string global = null;
+                        var mapped1 = _TickerMapping.Where(t => symbol.StartsWith(t.Key, StringComparison.OrdinalIgnoreCase))
+                                                   .Select(t => new { KrakenTicker = t.Key, PayTicker = t.Value }).SingleOrDefault();
+                        if (mapped1 != null)
+                        {
+                            var p2 = symbol.Substring(mapped1.KrakenTicker.Length);
+                            if (_TickerMapping.TryGetValue(p2, out var mapped2))
+                                p2 = mapped2;
+                            global = $"{p2}_{mapped1.PayTicker}";
+                        }
+                        else
+                        {
+                            global = _Helper.ExchangeSymbolToGlobalSymbol(symbol);
+                        }
                         if (CurrencyPair.TryParse(global, out var pair))
                             result.Add(new ExchangeRate("kraken", pair.Inverse(), new BidAsk(ticker.Bid, ticker.Ask)));
                         else

BTCPayServer/Services/Rates/RateProviderFactory.cs

@@ -102,6 +102,8 @@ namespace BTCPayServer.Services.Rates
             Providers.Add("bittrex", new ExchangeSharpRateProvider("bittrex", new ExchangeBittrexAPI(), true));
             Providers.Add("poloniex", new ExchangeSharpRateProvider("poloniex", new ExchangePoloniexAPI(), true));
             Providers.Add("hitbtc", new ExchangeSharpRateProvider("hitbtc", new ExchangeHitbtcAPI(), false));
+
+            // Cryptopia is often not available
             Providers.Add("cryptopia", new ExchangeSharpRateProvider("cryptopia", new ExchangeCryptopiaAPI(), false));
 
             // Handmade providers
@@ -118,6 +120,8 @@ namespace BTCPayServer.Services.Rates
 
             foreach (var provider in Providers.ToArray())
             {
+                if (provider.Key == "cryptopia") // Shitty exchange, rate often unavailable, it spams the logs
+                    continue;
                 var prov = new BackgroundFetcherRateProvider(Providers[provider.Key]);
                 if(provider.Key == CoinAverageRateProvider.CoinAverageName)
                 {

BTCPayServer/Views/Invoice/Checkout-Body.cshtml

@@ -148,7 +148,7 @@
         <div class="payment-tabs__tab" id="copy-tab">
             <span>{{$t("Copy")}}</span>
         </div>
-        @if (Model.AllowCoinConversion)
+        @if (Model.ChangellyEnabled)
         {
             <div class="payment-tabs__tab" id="altcoins-tab">
                 <span>{{$t("Conversion")}}</span>
@@ -253,7 +253,7 @@
             </div>
         </nav>
     </div>
-    @if (Model.AllowCoinConversion)
+    @if (Model.ChangellyEnabled)
     {
         <div id="altcoins" class="bp-view payment manual-flow">
             <nav v-if="srvModel.isLightning">
@@ -271,17 +271,42 @@
                         {{$t("ConversionTab_BodyDesc", srvModel)}}
                     </span>
                 </div>
-                <center>
-                    <script>function shapeshift_click(a, e) { e.preventDefault(); var link = a.href; var shapeshiftWindow = window.open(link, '1418115287605', 'width=700,height=500,toolbar=0,menubar=0,location=0,status=1,scrollbars=1,resizable=0,left=0,top=0'); shapeshiftWindow.focus(); return false; }</script>
-                    <a onclick="shapeshift_click(this, event);" v-bind:href="srvModel.shapeshiftUrl">
-                        <img src="https://shapeshift.io/images/shifty/xs_light_altcoins.png" class="ss-button">
-                    </a>
-
-                    @*Changelly doesn't have TO_AMOUNT support so we can't include it
-                            <script type="text/javascript">function open_widget(a, e) { e.preventDefault(); var link = a.href; var changellyWindow = window.open(link, 'Changelly', 'width=600,height=470,toolbar=0,menubar=0,location=0,status=1,scrollbars=1,resizable=0,left=0,top=0'); changellyWindow.focus(); return false; }</script>
-                        <a onclick="open_widget(this, event);" href="https://changelly.com/widget/v1?auth=email&from=DASH&to=BTC&address=&amount=1&merchant_id=&ref_id=">
-                            <img src="https://changelly.com/pay_button_pay_with.png" alt="Changelly" />
-                        </a>*@
+                <center>             
+                    <changelly inline-template
+                               :merchant-id="srvModel.changellyMerchantId"
+                               :store-id="srvModel.storeId"
+                               :to-currency="srvModel.paymentMethodId"
+                               :to-currency-due="srvModel.changellyAmountDue"
+                               :to-currency-address="srvModel.btcAddress">
+                        <div class="changelly-component">
+                            <div class="changelly-component-dropdown-holder" v-show="prettyDropdownInstance">
+                                <select 
+                                        v-model="selectedFromCurrency"
+                                        :disabled="isLoading"
+                                        v-on:change="onCurrencyChange($event)"
+                                        ref="changellyCurrenciesDropdown">
+                                    <option value="">Select a currency to convert from</option>
+                                    <option v-for="currency of currencies" 
+                                            :data-prefix="'<img src=\''+currency.image+'\'/>'"
+                                            :value="currency.name">
+                                       {{currency.fullName}}
+                                    </option>
+                                </select>
+                            </div>
+                            <a  v-on:click="openDialog($event)" :href="url" class="changelly-component-button">
+                                <img src="https://changelly.com/pay_button.png" alt="Changelly" v-show="url"/>
+                            </a>
+                            <button class="retry-button" v-if="calculateError" v-on:click="retry('calculateAmount')">
+                                {{$t("ConversionTab_CalculateAmount_Error")}}
+                            </button>
+                            <button class="retry-button" v-if="currenciesError" v-on:click="retry('loadCurrencies')">
+                                {{$t("ConversionTab_LoadCurrencies_Error")}}
+                            </button>
+                            <div v-show="isLoading" class="general__spinner">
+                                <partial name="Checkout-Spinner"/>
+                            </div>
+                        </div>
+                    </changelly>
                 </center>
             </nav>
         </div>

BTCPayServer/Views/Invoice/Checkout.cshtml

@@ -53,49 +53,53 @@
     </center>
     <![endif]-->
 
-    <invoice>
-        <div class="no-bounce" id="checkoutCtrl" v-cloak>
-            <div class="modal page">
-                <div class="modal-dialog open opened enter-purchaser-email" role="document">
-                    <div class="modal-content long">
-                        <div class="content">
-                            <div class="invoice">
-                                <partial name="Checkout-Body" />
-                            </div>
+<invoice>
+    <div class="no-bounce" id="checkoutCtrl" v-cloak>
+        <div class="modal page">
+            <div class="modal-dialog open opened enter-purchaser-email" role="document">
+                <div class="modal-content long">
+                    <div class="content">
+                        <div class="invoice">
+                            <partial name="Checkout-Body" />
                         </div>
                     </div>
+                </div>
 
-                    <div style="margin-top: 10px; text-align: center;">
-                        @* Not working because of nsSeparator: false, keySeparator: false,
+                <div style="margin-top: 10px; text-align: center;">
+                    @* Not working because of nsSeparator: false, keySeparator: false,
                             {{$t("nested.lang")}} >>
                         *@
-                        <select class="cmblang reverse invisible" onchange="changeLanguage($(this).val())">
-                            @foreach (var lang in langService.GetLanguages())
-                            {
-                                <option value="@lang.Code">@lang.DisplayName</option>
+                    <select class="cmblang reverse invisible" onchange="changeLanguage($(this).val())">
+                        @foreach (var lang in langService.GetLanguages())
+                        {
+                            <option value="@lang.Code">@lang.DisplayName</option>
+                        }
+                    </select>
+                    <script>
+                        $(function() {
+                            var storeDefaultLang = '@Model.DefaultLang';
+                            if (urlParams.lang) {
+                                $(".cmblang").val(urlParams.lang);
+                            } else if (storeDefaultLang) {
+                                $(".cmblang").val(storeDefaultLang);
                             }
-                        </select>
-                        <script>
-                            $(function () {
-                                var storeDefaultLang = '@Model.DefaultLang';
-                                if (urlParams.lang) {
-                                    $(".cmblang").val(urlParams.lang);
-                                } else if (storeDefaultLang) {
-                                    $(".cmblang").val(storeDefaultLang);
-                                }
 
-                                $('select').prettyDropdown({
-                                    classic: false,
-                                    height: 32,
-                                    reverse: true,
-                                    hoverIntent: 5000
-                                });
+                            // REVIEW: don't use initDropdown method but rather directly initialize select whenever you are using it
+                            initDropdown(".cmblang");
+                        });
+
+                        function initDropdown(selector) {
+                            return $(selector).prettyDropdown({
+                                classic: false,
+                                height: 32,
+                                reverse: true,
+                                hoverIntent: 5000
                             });
-                        </script>
-                    </div>
-                    <div style="margin-top: 10px; text-align: center;" class="form-text small text-muted">
-                        <span>Powered by <a target="_blank" href="https://github.com/btcpayserver/btcpayserver">BTCPay Server</a></span>
-                    </div>
+                        }
+                    </script>
+                </div>
+                <div style="margin-top: 10px; text-align: center;" class="form-text small text-muted">
+                    <span>Powered by <a target="_blank" href="https://github.com/btcpayserver/btcpayserver">BTCPay Server</a></span>
                 </div>
             </div>
         </div>
@@ -122,44 +126,48 @@
                 'is-IS': { translation: locales_is },
                 'it-IT': { translation: locales_it },
                 'hr-HR': { translation: locales_hr },
+                'kk-KZ': { translation: locales_kk },
                 'ru-RU': { translation: locales_ru },
+                'uk-UA': { translation: locales_uk },
+                'vi-VN': { translation: locales_vi },
                 'zh-SP': { translation: locales_zh_sp }
             },
         });
 
-        function changeLanguage(lang) {
-            i18next.changeLanguage(lang);
-        }
+    function changeLanguage(lang) {
+        i18next.changeLanguage(lang);
+    }
 
-        if (urlParams.lang) {
-            changeLanguage(urlParams.lang);
-        }
-        else if (storeDefaultLang) {
-            changeLanguage(storeDefaultLang);
-        }
+    if (urlParams.lang) {
+        changeLanguage(urlParams.lang);
+    } else if (storeDefaultLang) {
+        changeLanguage(storeDefaultLang);
+    }
 
-        const i18n = new VueI18next(i18next);
+    const i18n = new VueI18next(i18next);
 
-        // TODO: Move all logic from core.js to Vue controller
-        Vue.config.ignoredElements = [
-            'line-items',
-            'low-fee-timeline',
-            // Ignoring custom HTML5 elements, eg: bp-spinner
-            /^bp-/
-        ];
-        var checkoutCtrl = new Vue({
-            i18n: i18n,
-            el: '#checkoutCtrl',
-            components: {
-                qrcode: VueQr
-            },
-            data: {
+    // TODO: Move all logic from core.js to Vue controller
+    Vue.config.ignoredElements = [
+        'line-items',
+        'low-fee-timeline',
+        // Ignoring custom HTML5 elements, eg: bp-spinner
+        /^bp-/
+    ];
+    
+    var checkoutCtrl = new Vue({
+        i18n: i18n,
+        el: '#checkoutCtrl',
+        components: {
+            qrcode: VueQr,
+            changelly: ChangellyComponent
+        },
+        data: {
                 srvModel: srvModel,
                 lndModel: null,
                 scanDisplayQr: "",
                 expiringSoon: false
-            }
-        });
-    </script>
+        }
+    });
+</script>
 </body>
 </html>

BTCPayServer/Views/Server/LndGrpcServices.cshtml

@@ -1,10 +1,10 @@
-@model BTCPayServer.Models.ServerViewModels.LNDGRPCServicesViewModel
+@model LndGrpcServicesViewModel
 @{
     ViewData.SetActivePageAndTitle(ServerNavPages.Services);
 }
 
 
-<h4>GRPC settings</h4>
+<h4>LND GRPC</h4>
 <partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
 <div class="row">
     <div class="col-md-6">

BTCPayServer/Views/Server/LndRestServices.cshtml

@@ -0,0 +1,41 @@
+@model LndRestServicesViewModel
+@{
+    ViewData.SetActivePageAndTitle(ServerNavPages.Services);
+}
+
+
+<h4>LND REST</h4>
+<partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
+<div class="row">
+    <div class="col-md-6">
+        <div asp-validation-summary="All" class="text-danger"></div>
+    </div>
+</div>
+
+<div class="row">
+
+    <div class="col-md-8">
+        <div class="form-group">
+            <p>BTCPay exposes LND Rest services for outside consumption. See connection information below</p>
+        </div>
+
+        <div class="form-group">
+            <label asp-for="BaseApiUrl">Base API Url</label>
+            <input asp-for="BaseApiUrl" readonly class="form-control" />
+        </div>
+        @if (Model.Macaroon != null)
+        {
+            <div class="form-group">
+                <label asp-for="Macaroon"></label>
+                <input asp-for="Macaroon" readonly class="form-control" />
+            </div>
+        }
+        @if (Model.CertificateThumbprint != null)
+        {
+            <div class="form-group">
+                <label asp-for="CertificateThumbprint"></label>
+                <input asp-for="CertificateThumbprint" readonly class="form-control" />
+            </div>
+        }
+    </div>
+</div>

BTCPayServer/Views/Server/Services.cshtml

@@ -16,7 +16,7 @@
 
     <div class="col-md-8">
         <div class="form-group">
-            <span>You can get access here to LND-gRPC or SSH services exposed by your server</span>
+            <span>You can get access here to LND (gRPC, Rest) or SSH services exposed by your server</span>
         </div>
 
         <div class="form-group">
@@ -29,17 +29,24 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach(var lnd in Model.LNDServices)
+                    @foreach (var lnd in Model.LNDServices)
                     {
                         <tr>
                             <td>@lnd.Crypto</td>
-                            <td>@lnd.Type</td>
+                            <td>LND @lnd.Type.ToString()</td>
                             <td style="text-align:right">
-                                <a asp-action="LNDGRPCServices" asp-route-cryptoCode="@lnd.Crypto" asp-route-index="@lnd.Index">See information</a>
+                                @if (lnd.Type == BTCPayServer.Configuration.External.LndTypes.gRPC)
+                                {
+                                    <a asp-action="LNDGRPCServices" asp-route-cryptoCode="@lnd.Crypto" asp-route-index="@lnd.Index">See information</a>
+                                }
+                                else if (lnd.Type == BTCPayServer.Configuration.External.LndTypes.Rest)
+                                {
+                                    <a asp-action="LndRestServices" asp-route-cryptoCode="@lnd.Crypto" asp-route-index="@lnd.Index">See information</a>
+                                }
                             </td>
                         </tr>
                     }
-                    @if(Model.HasSSH)
+                    @if (Model.HasSSH)
                     {
                         <tr>
                             <td>None</td>

BTCPayServer/Views/Stores/AddDerivationScheme.cshtml

@@ -128,9 +128,6 @@
 
 @section Scripts {
     @await Html.PartialAsync("_ValidationScriptsPartial")
-    <script type="text/javascript">
-		var srvModel = @Html.Raw(Json.Serialize(Model.ServerUrl));
-    </script>
     <script src="~/js/ledgerwebsocket.js" type="text/javascript" defer="defer"></script>
     <script src="~/js/StoreAddDerivationScheme.js" type="text/javascript" defer="defer"></script>
 }

BTCPayServer/Views/Stores/CheckoutExperience.cshtml

@@ -38,10 +38,6 @@
                 <label asp-for="DefaultLang"></label>
                 <select asp-for="DefaultLang" asp-items="Model.Languages" class="form-control"></select>
             </div>
-            <div class="form-group">
-                <label asp-for="AllowCoinConversion"></label>
-                <input asp-for="AllowCoinConversion" type="checkbox" class="form-check" />
-            </div>
             <div class="form-group">
                 <label asp-for="RequiresRefundEmail"></label>
                 <input asp-for="RequiresRefundEmail" type="checkbox" class="form-check" />

BTCPayServer/Views/Stores/ListTokens.cshtml

@@ -18,9 +18,8 @@
             <thead>
                 <tr>
                     <th>Label</th>
-                    <th>SIN</th>
                     <th>Facade</th>
-                    <th>Actions</th>
+                    <th class="text-right">Actions</th>
                 </tr>
             </thead>
             <tbody>
@@ -28,13 +27,9 @@
                 {
                     <tr>
                         <td>@token.Label</td>
-                        <td>@token.SIN</td>
                         <td>@token.Facade</td>
-                        <td>
-                            <form asp-action="DeleteToken" method="post">
-                                <input type="hidden" name="tokenId" value="@token.Id">
-                                <button type="submit" class="btn btn-danger" role="button">Revoke</button>
-                            </form>
+                        <td class="text-right">
+                            <a asp-action="ShowToken" asp-route-tokenId="@token.Id">See information</a> - <a asp-action="RevokeToken" asp-route-tokenId="@token.Id">Revoke</a>
                         </td>
                     </tr>
                 }

BTCPayServer/Views/Stores/ShowToken.cshtml

@@ -0,0 +1,29 @@
+@model BTCPayServer.Authentication.BitTokenEntity
+@{
+    Layout = "../Shared/_NavLayout.cshtml";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Tokens, "Access Tokens");
+}
+
+<div class="row">
+    <div class="col-md-8">
+        <h5>Token information</h5>
+        <table class="table table-sm">
+            <tr>
+                <th>Label</th>
+                <td>@Model.Label</td>
+            </tr>
+            <tr>
+                <th>SIN</th>
+                <td>@Model.SIN</td>
+            </tr>
+            <tr>
+                <th>Token</th>
+                <td>@Model.Value</td>
+            </tr>
+            <tr>
+                <th>Facade</th>
+                <td>@Model.Facade</td>
+            </tr>
+        </table>
+    </div>
+</div>

BTCPayServer/Views/Stores/UpdateChangellySettings.cshtml

@@ -0,0 +1,62 @@
+@using Microsoft.AspNetCore.Mvc.Rendering
+@model UpdateChangellySettingsViewModel
+@{
+    Layout = "../Shared/_NavLayout.cshtml";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Index, "Update Store Changelly Settings");
+}
+
+<h4>@ViewData["Title"]</h4>
+<partial name="_StatusMessage" for="StatusMessage"/>
+
+<div class="row">
+    <div class="col-md-10">
+        <form method="post">
+            <p>
+                You can obtain API keys at
+                <a href="https://changelly.com/?ref_id=804298eb5753" target="_blank">
+                    Changelly.com
+                </a>
+            </p>
+            <div class="form-group">
+                <label asp-for="ApiUrl"></label>
+                <input asp-for="ApiUrl" class="form-control"/>
+                <span asp-validation-for="ApiUrl" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="ApiKey"></label>
+                <input asp-for="ApiKey" class="form-control"/>
+                <span asp-validation-for="ApiKey" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="ApiSecret"></label>
+                <input asp-for="ApiSecret" class="form-control"/>
+                <span asp-validation-for="ApiSecret" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="ChangellyMerchantId"></label>
+                <input asp-for="ChangellyMerchantId" class="form-control"/>
+                <span asp-validation-for="ChangellyMerchantId" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="AmountMarkupPercentage"></label>
+                <input asp-for="AmountMarkupPercentage" class="form-control"/>
+                <span asp-validation-for="AmountMarkupPercentage" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="ShowFiat"></label>
+                <input asp-for="ShowFiat" class="form-check"/>
+                <span asp-validation-for="ShowFiat" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="Enabled"></label>
+                <input asp-for="Enabled" type="checkbox" class="form-check"/>
+            </div>
+            <button name="command" type="submit" value="save" class="btn btn-primary">Submit</button>
+            <button name="command" type="submit" value="test" class="btn btn-primary">Test Settings</button>
+        </form>
+    </div>
+</div>
+
+@section Scripts {
+    @await Html.PartialAsync("_ValidationScriptsPartial")
+}

BTCPayServer/Views/Stores/UpdateStore.cshtml

@@ -168,6 +168,43 @@
                     Available placeholders are: {StoreName}, {ItemDescription} and {OrderId}
                 </p>
             </div>
+            
+             <div class="form-group">
+                <div class="form-group">
+                    <h5>Third party Payment methods</h5>
+                </div>
+                <div class="form-group">
+                    <table class="table table-sm table-responsive-md">
+                        <thead>
+                            <tr>
+                                <th>Provider</th>
+                                <th style="text-align:center;">Enabled</th>
+                                <th style="text-align:right">Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        @foreach(var scheme in Model.ThirdPartyPaymentMethods)
+                        {
+                            <tr>
+                                <td>@scheme.Provider</td>
+                                <td style="text-align:center;">
+                                    @if(scheme.Enabled)
+                                    {
+                                        <span class="fa fa-check"></span>
+                                    }
+                                    else
+                                    {
+                                        <span class="fa fa-times"></span>
+                                    }
+                                </td>
+                                <td style="text-align:right"><a asp-action="@scheme.Action" >Modify</a></td>
+                            </tr>
+                        }
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+            
             @if(Model.CanDelete)
             {
                 <div class="form-group">

BTCPayServer/Views/UserStores/ListStores.cshtml

@@ -42,6 +42,7 @@
                                 }
                             </td>
                             <td style="text-align:right">
+                                <a asp-action="ListInvoices" asp-controller="Invoice" asp-route-searchTerm="storeid:@store.Id">Invoices</a><span> - </span>
                                 @if (store.IsOwner)
                                 {
                                     <a asp-action="UpdateStore" asp-controller="Stores" asp-route-storeId="@store.Id">Settings</a><span> - </span>

BTCPayServer/Views/Wallets/WalletRescan.cshtml

@@ -0,0 +1,112 @@
+@model RescanWalletModel
+@{
+    Layout = "../Shared/_NavLayout.cshtml";
+    ViewData["Title"] = "Rescan wallet";
+    ViewData.SetActivePageAndTitle(WalletsNavPages.Rescan);
+}
+
+<h4>@ViewData["Title"]</h4>
+
+@if (!Model.Ok)
+{
+    <div class="row">
+        <div class="col-md-10">
+            <p>This feature is disabled</p>
+            @if (Model.IsFullySync)
+            {
+                <p><span class="fa fa-check-circle" style="color:green;"></span> <span>The full node is synched</span></p>
+            }
+            else
+            {
+                <p><span class="fa fa-times-circle" style="color:red;"></span> <span>The full node is not synched</span></p>
+            }
+            @if (Model.IsServerAdmin)
+            {
+                <p><span class="fa fa-check-circle" style="color:green;"></span> <span>You are server administrator</span></p>
+            }
+            else
+            {
+                <p><span class="fa fa-times-circle" style="color:red;"></span> <span>You are not server administrator</span></p>
+            }
+            @if (Model.IsSupportedByCurrency)
+            {
+                <p><span class="fa fa-check-circle" style="color:green;"></span> <span>This full node support rescan of the UTXO set</span></p>
+            }
+            else
+            {
+                <p><span class="fa fa-times-circle" style="color:red;"></span> <span>This full node do not support rescan of the UTXO set</span></p>
+            }
+            @if (Model.IsSegwit)
+            {
+                <p><span class="fa fa-check-circle" style="color:green;"></span> <span>This wallet is compatible with segwit</span></p>
+            }
+            else
+            {
+                <p><span class="fa fa-times-circle" style="color:red;"></span> <span>This wallet is not compatible with segwit</span></p>
+            }
+        </div>
+    </div>
+}
+else if (!Model.Progress.HasValue)
+{
+    <div class="row">
+        @if (Model.PreviousError != null)
+        {
+            <div class="alert alert-danger alert-dismissible" role="alert">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <span>The previous scan stopped with an error: @Model.PreviousError</span>
+            </div>
+        }
+        else if (Model.LastSuccess != null)
+        {
+            <div class="alert alert-success alert-dismissible" role="alert">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <span>The previous scan completed and found <b>@Model.LastSuccess.Found</b> UTXOs in <b>@Model.TimeOfScan</b> (The total UTXO set size is @Model.LastSuccess.TotalSizeOfUTXOSet.Value)</span>
+            </div>
+        }
+        <div class="col-md-10">
+            <p>
+                Scanning the UTXO set allow you to restore the balance of your wallet, but not all the transaction history.
+            </p>
+            <p>
+                This operation will scan the HD Path <b>0/*</b>, <b>1/*</b> and <b>*</b> from a starting index, until no UTXO are found in a whole gap limit.
+            </p>
+            <p>The batch size make sure the scan do not consume too much RAM at once by rescanning several time with smaller subset of addresses.</p>
+            <p>If you do not understand above, just keep the default values and click on <b>Start Scan</b></p>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-10">
+            <form method="post">
+                <div class="form-group">
+                    <label asp-for="StartingIndex"></label>
+                    <input asp-for="StartingIndex" class="form-control" type="number" />
+                </div>
+                <div class="form-group">
+                    <label asp-for="GapLimit"></label>
+                    <input asp-for="GapLimit" class="form-control" type="number" />
+                </div>
+                <div class="form-group">
+                    <label asp-for="BatchSize"></label>
+                    <input asp-for="BatchSize" class="form-control" type="number" />
+                </div>
+                <button type="submit" class="btn btn-primary">Start scan</button>
+            </form>
+        </div>
+    </div>
+}
+else
+{
+    <div class="row">
+        <div class="col-md-10">
+            <p>Scanning in progress, refresh the page to see the progress... (Estimated time: @Model.RemainingTime)</p>
+            <div class="progress">
+                <div class="progress-bar" role="progressbar" aria-valuenow="@(Model.Progress.Value)"
+                     aria-valuemin="0" aria-valuemax="100" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; width:@(Model.Progress.Value)%;">
+                    @(Model.Progress.Value)% (estimated time: @Model.RemainingTime)
+                </div>
+            </div>
+        </div>
+    </div>
+}

BTCPayServer/Views/Wallets/WalletSend.cshtml

@@ -1,4 +1,4 @@
-@model WalletModel
+@model WalletSendModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
     ViewData["Title"] = "Manage wallet";
@@ -6,75 +6,60 @@
 }
 
 <h4>@ViewData["Title"]</h4>
-<div id="walletAlert" class="alert alert-danger alert-dismissible" style="display:none;" role="alert">
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-    <span id="alertMessage"></span>
-</div>
+
 <div class="row">
     <div class="col-md-10">
         <p>
-            You can send money received by this store to an address with the help of your Ledger Wallet. <br />
-            If you don't have a Ledger Wallet, use Electrum with your favorite hardware wallet to transfer crypto. <br />
-            If your Ledger wallet is not detected:
+            Send funds to a destination address.
         </p>
-        <ul>
-            <li>Make sure you are running the Ledger app with version superior or equal to 1.2.4</li>
-            <li>Use a browser supporting the <a href="https://www.yubico.com/support/knowledge-base/categories/articles/browsers-support-u2f/">U2F protocol</a></li>
-        </ul>
-        <p id="hw-loading"><span class="fa fa-question-circle" style="color:orange"></span> <span>Detecting hardware wallet...</span></p>
-        <p id="hw-error" style="display:none;"><span class="fa fa-times-circle" style="color:red;"></span> <span class="hw-label">An error happened</span></p>
-        <p id="hw-success" style="display:none;"><span class="fa fa-check-circle" style="color:green;"></span> <span class="hw-label">Detecting hardware wallet...</span></p>
-
-        <p id="check-loading" style="display:none;"><span class="fa fa-question-circle" style="color:orange"></span> <span class="check-label">Detecting hardware wallet...</span></p>
-        <p id="check-error" style="display:none;"><span class="fa fa-times-circle" style="color:red;"></span> <span class="check-label">An error happened</span></p>
-        <p id="check-success" style="display:none;"><span class="fa fa-check-circle" style="color:green;"></span> <span class="check-label">Detecting hardware wallet...</span></p>
     </div>
 </div>
+
 <div class="row">
     <div class="col-md-6">
-        <form id="sendform" style="display:none;">
-            <input type="hidden" id="cryptoCode" asp-for="CryptoCurrency" />
+        <form method="post">
+            <input type="hidden" asp-for="Divisibility" />
+            <input type="hidden" asp-for="Fiat" />
+            <input type="hidden" asp-for="Rate" />
+            <input type="hidden" asp-for="CurrentBalance" />
+            <input type="hidden" asp-for="RecommendedSatoshiPerByte" />
+            <input type="hidden" asp-for="CryptoCode" />
+
             <div class="form-group">
-                <label>Destination</label>
-                <input id="destination-textbox" name="Destination" class="form-control" type="text" />
-                <span id="Destination-Error" class="text-danger"></span>
+                <label asp-for="Destination"></label>
+                <input asp-for="Destination" class="form-control" />
+                <span asp-validation-for="Destination" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <label>Amount</label>
+                <label asp-for="Amount"></label>
                 <div class="input-group">
-                    <input id="amount-textbox" name="Amount" class="form-control" type="text" onkeyup='updateFiatValue();' />
+                    <input asp-for="Amount" class="form-control" onkeyup='updateFiatValue();' />
                     <div class="input-group-prepend">
                         <span class="input-group-text text-muted" style="display:none;" id="fiatValue"></span>
                     </div>
                 </div>
-
-                @*<span class="text-muted" id="fiatValue"></span>*@
-                <span id="Amount-Error" class="text-danger"></span>
-                <p class="form-text text-muted crypto-info" style="display: none;">
-                    Your current balance is <a id="crypto-balance-link" href="#"><span id="crypto-balance"></span></a> <span id="crypto-code"></span>.
+                <span asp-validation-for="Amount" class="text-danger"></span>
+                <p class="form-text text-muted crypto-info">
+                    Your current balance is <a id="crypto-balance-link" href="#"><span>@Model.CurrentBalance</span></a> <span>@Model.CryptoCode</span>.
                 </p>
             </div>
             <div class="form-group">
-                <label>Fee rate (satoshi per byte)</label>
-                <input id="fee-textbox" name="FeeRate" class="form-control" type="text" />
+                <label asp-for="FeeSatoshiPerByte"></label>
+                <input asp-for="FeeSatoshiPerByte" class="form-control" />
                 <span id="FeeRate-Error" class="text-danger"></span>
-                <p class="form-text text-muted crypto-info" style="display: none;">
-                    The recommended value is <a id="crypto-fee-link" href="#"><span id="crypto-fee"></span></a> satoshi per byte.
+                <p class="form-text text-muted crypto-info">
+                    The recommended value is <a id="crypto-fee-link" href="#"><span>@Model.RecommendedSatoshiPerByte</span></a> satoshi per byte.
                 </p>
             </div>
             <div class="form-group">
-                <label>Subtract fees from amount</label>
-                <input id="substract-checkbox" name="SubstractFees" class="form-check" type="checkbox" />
+                <label asp-for="SubstractFees"></label>
+                <input asp-for="SubstractFees" class="form-check" />
             </div>
-            <button id="confirm-button" name="command" type="submit" class="btn btn-primary">Confirm</button>
+            <button type="submit" class="btn btn-primary">Confirm</button>
         </form>
     </div>
 </div>
 @section Scripts
-    {
-    <script type="text/javascript">
-		    var srvModel = @Html.Raw(Json.Serialize(Model));
-    </script>
-    <script src="~/js/ledgerwebsocket.js" type="text/javascript" defer="defer"></script>
-    <script src="~/js/StoreWallet.js" type="text/javascript" defer="defer"></script>
+{
+    <script src="~/js/WalletSend.js" type="text/javascript" defer="defer"></script>
 }

BTCPayServer/Views/Wallets/WalletSendLedger.cshtml

@@ -0,0 +1,43 @@
+@model WalletSendLedgerModel
+@{
+    Layout = "../Shared/_NavLayout.cshtml";
+    ViewData["Title"] = "Manage wallet";
+    ViewData.SetActivePageAndTitle(WalletsNavPages.Send);
+}
+
+<h4>Sign the transaction with Ledger</h4>
+<div id="walletAlert" class="alert alert-danger alert-dismissible" style="display:none;" role="alert">
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <span id="alertMessage"></span>
+</div>
+<div class="row">
+    <div class="col-md-10">
+        <input type="hidden" asp-for="Destination" />
+        <input type="hidden" asp-for="Amount" />
+        <input type="hidden" asp-for="FeeSatoshiPerByte" />
+        <input type="hidden" asp-for="SubstractFees" />
+        <p>
+            You can send money received by this store to an address with the help of your Ledger Wallet. <br />
+            If you don't have a Ledger Wallet, use Electrum with your favorite hardware wallet to transfer crypto. <br />
+            If your Ledger wallet is not detected:
+        </p>
+        <ul>
+            <li>Make sure you are running the Ledger app with version superior or equal to 1.2.4</li>
+            <li>Use Google Chrome browser and open the coin app on your Ledger</li>
+        </ul>
+        <p id="hw-loading"><span class="fa fa-question-circle" style="color:orange"></span> <span>Detecting hardware wallet...</span></p>
+        <p id="hw-error" style="display:none;"><span class="fa fa-times-circle" style="color:red;"></span> <span class="hw-label">An error happened</span></p>
+        <p id="hw-success" style="display:none;"><span class="fa fa-check-circle" style="color:green;"></span> <span class="hw-label">Detecting hardware wallet...</span></p>
+
+        <p id="check-loading" style="display:none;"><span class="fa fa-question-circle" style="color:orange"></span> <span class="check-label">Detecting hardware wallet...</span></p>
+        <p id="check-error" style="display:none;"><span class="fa fa-times-circle" style="color:red;"></span> <span class="check-label">An error happened</span></p>
+        <p id="check-success" style="display:none;"><span class="fa fa-check-circle" style="color:green;"></span> <span class="check-label">Detecting hardware wallet...</span></p>
+    </div>
+</div>
+
+
+@section Scripts
+{
+    <script src="~/js/ledgerwebsocket.js" type="text/javascript" defer="defer"></script>
+    <script src="~/js/WalletSendLedger.js" type="text/javascript" defer="defer"></script>
+}

BTCPayServer/Views/Wallets/WalletTransactions.cshtml

@@ -17,7 +17,17 @@
     }
 </style>
 
+<div class="row">
+    <div class="col-md-10 text-center">
+        <partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
+    </div>
+</div>
 <h4>@ViewData["Title"]</h4>
+<div class="row">
+    <div class="col-md-10">
+        If this wallet got restored, should have received money but nothing is showing up, please <a asp-action="WalletRescan">Rescan it</a>.
+    </div>
+</div>
 <div class="row">
     <div class="col-md-10">
         <table class="table table-sm table-responsive-lg">
@@ -29,7 +39,7 @@
                 </tr>
             </thead>
             <tbody>
-                @foreach(var transaction in Model.Transactions)
+                @foreach (var transaction in Model.Transactions)
                 {
                     <tr>
                         <td>@transaction.Timestamp.ToBrowserDate()</td>
@@ -38,7 +48,7 @@
                                 @transaction.Id
                             </a>
                         </td>
-                        @if(transaction.Positive)
+                        @if (transaction.Positive)
                         {
                             <td style="text-align:right; color:green;">@transaction.Balance</td>
                         }

BTCPayServer/Views/Wallets/WalletsNavPages.cs

@@ -8,6 +8,7 @@ namespace BTCPayServer.Views.Wallets
     public enum WalletsNavPages
     {
         Send,
-        Transactions
+        Transactions,
+        Rescan
     }
 }

BTCPayServer/Views/Wallets/_Nav.cshtml

@@ -3,5 +3,6 @@
 <div class="nav flex-column nav-pills">
     <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.Transactions)" asp-action="WalletTransactions">Transactions</a>
     <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.Send)" asp-action="WalletSend">Send</a>
+    <a class="nav-link @ViewData.IsActivePage(WalletsNavPages.Rescan)" asp-action="WalletRescan">Rescan</a>
 </div>
 

BTCPayServer/wwwroot/checkout/css/normalizer.css

@@ -9390,7 +9390,7 @@ strong {
     background-color: #fff;
     color: #000;
     font-size: 0px;
-    width:100%;
+    width: 100%;
 }
 
     .btnGroupLnd button:first-child {
@@ -10995,6 +10995,15 @@ bp-spinner {
         opacity: .85;
     }
 
+.general__spinner > bp-spinner > svg {
+    margin: auto 0px 0px auto;
+    height: 32px;
+    width: 32px;
+    fill: gray;
+    animation: spin 0.55s linear infinite;
+    opacity: .85;
+}
+
 bp-refund-address.ng-valid .bitcoin-logo {
     opacity: 1;
     margin-left: 0;
@@ -11459,3 +11468,45 @@ low-fee-timeline {
         opacity: 1;
         transition: opacity 1s ease;
     }
+
+.changelly-component {
+    position: relative;
+}
+
+.changelly-component-dropdown-holder {
+    height: 32px;
+    margin-bottom: 10px;
+}
+.changelly-component .general__spinner bp-spinner {
+    width: 50px;
+    height: 50px;
+    
+}
+
+.changelly-component .general__spinner bp-spinner svg {
+    margin: 0;
+}
+
+.changelly-component .retry-button {
+    border-radius: 5px;
+    border: 1px solid #a9a9a9;
+    background: #fff;
+    color: #000;
+    min-width:100px;  
+    padding-left: 0.8rem;
+    padding-right: 0.8rem;
+    min-height: 30px;
+    word-break: break-all;
+}
+
+.changelly-component .retry-button :hover{
+    border-color: #7f7f7f;
+}
+
+.changelly-component .prettydropdown li img {
+    width:20px; 
+    margin-right: 5px;
+}
+
+
+

BTCPayServer/wwwroot/checkout/js/changellyComponent.js

@@ -0,0 +1,131 @@
+var ChangellyComponent =
+    {
+        props: ["storeId", "toCurrency", "toCurrencyDue", "toCurrencyAddress", "merchantId"],
+        data: function () {
+            return {
+                currencies: [],
+                isLoading: true,
+                calculatedAmount: 0,
+                selectedFromCurrency: "",
+                prettyDropdownInstance: null,
+                calculateError: false,
+                currenciesError: false
+            };
+        },
+        computed: {
+            url: function () {
+                if (this.calculatedAmount && this.selectedFromCurrency && !this.isLoading) {
+                    return "https://changelly.com/widget/v1?auth=email" +
+                        "&from=" +
+                        this.selectedFromCurrency +
+                        "&to=" +
+                        this.toCurrency +
+                        "&address=" +
+                        this.toCurrencyAddress +
+                        "&amount=" +
+                        this.calculatedAmount +
+                        (this.merchantId ? "&merchant_id=" + this.merchantId + "&ref_id=" + this.merchantId : "");
+                }
+                return null;
+            }
+        },
+        watch: {
+            selectedFromCurrency: function (val) {
+                if (val) {
+                    this.calculateAmount();
+                } else {
+                    this.calculateAmount = 0;
+                }
+            }
+        },
+        mounted: function () {
+            this.prettyDropdownInstance = initDropdown(this.$refs.changellyCurrenciesDropdown);
+            this.loadCurrencies();
+        },
+        methods: {
+            getUrl: function () {
+                return window.location.origin + "/changelly/" + this.storeId;
+            },
+            loadCurrencies: function () {
+                this.isLoading = true;
+                this.currenciesError = false;
+                $.ajax(
+                    {
+                        context: this,
+                        url: this.getUrl() + "/currencies",
+                        dataType: "json",
+                        success: function (result) {
+
+                                for (i = 0; i < result.length; i++) {
+                                    if (result[i].enabled &&
+                                        result[i].name.toLowerCase() !== this.toCurrency.toLowerCase()) {
+                                        this.currencies.push(result[i]);
+                                    }
+                                }
+                                var self = this;
+                                Vue.nextTick(function () {
+                                    self.prettyDropdownInstance
+                                        .refresh()
+                                        .on("change",
+                                            function (event) {
+                                                self.onCurrencyChange(self.$refs.changellyCurrenciesDropdown.value);
+                                            });
+                                });
+                            
+                        },
+                        error: function(){
+                            this.currenciesError = true;
+                        },
+                        complete: function () {
+                            this.isLoading = false;
+                        }
+                    });
+            },
+            calculateAmount: function () {
+                this.isLoading = true;
+                this.calculateError = false;
+                $.ajax(
+                    {
+                        url: this.getUrl() + "/calculate",
+                        dataType: "json",
+                        data: {
+                            fromCurrency: this.selectedFromCurrency,
+                            toCurrency: this.toCurrency,
+                            toCurrencyAmount: this.toCurrencyDue
+                        },
+                        context: this,
+                        success: function (result) {
+                            this.calculatedAmount = result;
+                        },
+                        error: function(){
+                            this.calculateError = true;
+                        },
+                        complete: function () {
+                            this.isLoading = false;
+                        }
+                    });
+            },
+            retry: function(type){
+                if(type=="loadCurrencies"){
+                    this.loadCurrencies();
+                }else if(type=="calculateAmount"){
+                    this.calculateAmount();
+                }
+            },
+            onCurrencyChange: function (value) {
+                this.selectedFromCurrency = value;
+                this.calculatedAmount = 0;
+            },
+            openDialog: function (e) {
+                if (e && e.preventDefault) {
+                    e.preventDefault();
+                }
+
+                var changellyWindow = window.open(
+                    this.url,
+                    'Changelly',
+                    'width=600,height=470,toolbar=0,menubar=0,location=0,status=1,scrollbars=1,resizable=0,left=0,top=0');
+                changellyWindow.focus();
+            }
+        }
+    };

BTCPayServer/wwwroot/checkout/js/core.js

@@ -32,9 +32,6 @@ function changeCurrency(currency) {
 }
 
 function onDataCallback(jsonData) {
-    // extender properties used 
-    jsonData.shapeshiftUrl = "https://shapeshift.io/shifty.html?destination=" + jsonData.btcAddress + "&output=" + jsonData.paymentMethodId + "&amount=" + jsonData.btcDue;
-    //
 
     var newStatus = jsonData.status;
 
@@ -72,15 +69,16 @@ function onDataCallback(jsonData) {
     }
 
     // restoring qr code view only when currency is switched
+    if (jsonData.paymentMethodId === srvModel.paymentMethodId &&
+        checkoutCtrl.scanDisplayQr === "") {
+        checkoutCtrl.scanDisplayQr = jsonData.invoiceBitcoinUrlQR;
+    }
+
     if (jsonData.paymentMethodId === srvModel.paymentMethodId) {
         $(".payment__currencies").show();
         $(".payment__spinner").hide();
     }
 
-    if (checkoutCtrl.scanDisplayQr === "") {
-        checkoutCtrl.scanDisplayQr = jsonData.invoiceBitcoinUrlQR;
-    }
-
     if (jsonData.isLightning && checkoutCtrl.lndModel === null) {
         var lndModel = {
             toggle: 0

BTCPayServer/wwwroot/checkout/js/langs/en.js

@@ -27,7 +27,8 @@ const locales_en = {
     // Conversion tab
     "ConversionTab_BodyTop": "You can pay {{btcDue}} {{cryptoCode}} using altcoins other than the ones merchant directly supports.",
     "ConversionTab_BodyDesc": "This service is provided by 3rd party. Please keep in mind that we have no control over how providers will forward your funds. Invoice will only be marked paid once funds are received on {{cryptoCode}} Blockchain.",
-    "Shapeshift_Button_Text": "Pay with Altcoins",
+    "ConversionTab_CalculateAmount_Error": "Retry",
+    "ConversionTab_LoadCurrencies_Error": "Retry",
     "ConversionTab_Lightning": "No conversion providers available for Lightning Network payments.",
     // Invoice expired
     "Invoice expiring soon...": "Invoice expiring soon...",

BTCPayServer/wwwroot/checkout/js/langs/kk.js

@@ -0,0 +1,54 @@
+const locales_kk = {
+    nested: {
+        lang: 'Тіл'
+    },
+    "Awaiting Payment...": "Күтіп тұрған төлем…",
+    "Pay with": "Төлеу",
+    "Contact and Refund Email": "Байланыс және ақша қайтару үшін арналған электрондық пошта",
+    "Contact_Body": "Электрондық пошта мекенжайыңызды төменде көрсетуіңізді сұраймыз. Төлеміңіз туралы мәселе болса, біз сізге осы мекенжайыңыз арқылы хабарласамыз.",
+    "Your email": "Сіздің электрондық пошта мекенжайыңыз",
+    "Continue": "Жалғастыру",
+    "Please enter a valid email address": "Қолданыстағы электрондық пошта мекенжайыңызды еңгізуін сұраймыз",
+    "Order Amount": "Тапсырыс саны",
+    "Network Cost": "Желі бағасы",
+    "Already Paid": "Төленген",
+    "Due": "Жалпы сома",
+    // Tabs
+    "Scan": "Сканерлеу",
+    "Copy": "Көшіру",
+    "Conversion": "Айырбастау",
+    // Scan tab
+    "Open in wallet": "Әмиянда ашу",
+    // Copy tab
+    "CompletePay_Body": "Төлеміңізді аяқтау үшін төмендегі мекенжайға {{btcDue}} {{cryptoCode}} жіберуіңізді сұраймыз",
+    "Amount": "Сан",
+    "Address": "Мекенжай",
+    "Copied": "Көшірілді",
+    // Conversion tab
+    "ConversionTab_BodyTop": "Сатушы тікелей қолдау көрсетуден тыс кезде сіз altcoins көмегімен {{btcDue}} {{cryptoCode}} төлеуіңізге болады.",
+    "ConversionTab_BodyDesc": "Бұл қызмет үшінші тараптан қамтамасыз етіледі. Сіздің ақшаңызды провайдерлер сізге қалай жеткізетінін біз бақылауға алмайтынымызды есте сақтауыңызды сұраймыз. Шот тек қана {{cryptoCode}} Blockchain жүйесі қаражаттырылған соң көрсетіледі.",
+    "Shapeshift_Button_Text": "Төлеу Altcoins",
+    "ConversionTab_Lightning": "Lightning Төлемдерді айырбастау жеткізушілер байланыстан тыс жерде",
+    // Invoice expired
+    "Invoice expiring soon...": "Шот-фактура жақын арада аяқталады…",
+    "Invoice expired": "Шот-фактураның мерзімі аяқталды",
+    "What happened?": "Не жағдай болды?",
+    "InvoiceExpired_Body_1": "Бұл шот-фактураның мерзімі аяқталды. Шот-фактура {{maxTimeMinutes}} минуттарға жарамды.  \
+Төлеміңізді қайтадан жібергіңіз келсе {{storeName}} ға оралуға болады.",
+    "InvoiceExpired_Body_2": "Егер сіз төлемді жіберуге тырыссқан болсаңыз, ол әлі желімен қабылданған жоқ. Біз сіздің қаражатыңызды әлі алған жоқпыз.",
+    "InvoiceExpired_Body_3": "Егер транзакция желі арқылы қабылданбаса, қаражат әмияныңызға қайтадан қайтарылады. Бұл сіздің әмияныңызға байланысты 48-72 сағат алуы мүмкін.",
+    "Invoice ID": "Шот анықтамасы",
+    "Order ID": "Тапсырыс нөмірі",
+    "Return to StoreName": "{{storeName}} оралу",
+    // Invoice paid
+    "This invoice has been paid": "Бұл шот төленген",
+    // Invoice archived
+    "This invoice has been archived": "Бұл шот мұрағатталған",
+    "Archived_Body": "Тапсырыс туралы ақпарат немесе көмек үшін дүкенге хабарласуыңызды сұраймыз",
+    // Lightning
+    "BOLT 11 Invoice": "BOLT 11 Шот-фактура",
+    "Node Info": "Node анықтамасы",
+    //
+    "txCount": "{{count}} Транзакция",
+    "txCount_plural": "{{count}} Транзакциялар"
+};

BTCPayServer/wwwroot/checkout/js/langs/uk.js

@@ -0,0 +1,54 @@
+const locales_uk = {
+    nested: {
+        lang: 'Мова'
+    },
+    "Awaiting Payment...": "Очікування платежу…",
+    "Pay with": "Оплатити",
+    "Contact and Refund Email": "Електронна адреса для зв’язку та повернення коштів",
+    "Contact_Body": "Будь ласка, надайте електронну адресу нижче. Ми зв’яжемось з вами за цією адресою, якщо з вашим платежем виникнуть проблеми.",
+    "Your email": "Ваша адреса",
+    "Continue": "Продовжити",
+    "Please enter a valid email address": "Будь ласка, введіть дійсну електронну адресу",
+    "Order Amount": "Обсяг замовлення",
+    "Network Cost": "Мережева вартість",
+    "Already Paid": "Вже сплачено",
+    "Due": "До сплати",
+    // Tabs
+    "Scan": "Сканувати",
+    "Copy": "Копіювати",
+    "Conversion": "Конверсія",
+    // Scan tab
+    "Open in wallet": "Відкрити гаманець",
+    // Copy tab
+    "CompletePay_Body": "Для завершення платежу, будь ласка, надішліть {{btcDue}} {{cryptoCode}} на адресу нижче.",
+    "Amount": "Сума",
+    "Address": "Адреса",
+    "Copied": "Скопійовано",
+    // Conversion tab
+    "ConversionTab_BodyTop": "Ви можете сплатити {{btcDue}} {{cryptoCode}} використовуючи альткоїни, що відрізняються від тих, що підтримує продавець.",
+    "ConversionTab_BodyDesc": "Послуга надається третьою особою. Будь ласка, майте на увазі, що ми не контролюємо те, як провайдери пересилатимуть ваші кошти. Рахунок буде позначений як сплачений тільки після надходження коштів на блокчейн {{cryptoCode}}.",
+    "Shapeshift_Button_Text": "Заплатити альткоїнами",
+    "ConversionTab_Lightning": "Для платежів з використанням Lightning Network немає провайдерів конверсії.",
+    // Invoice expired
+    "Invoice expiring soon...": "Строк дії рахунку скоро закінчується...",
+    "Invoice expired": "Строк дії рахунку закінчився",
+    "What happened?": "Що сталось?",
+    "InvoiceExpired_Body_1": "Строк дії цього рахунку закінчився. Рахунок дійсний лише {{maxTimeMinutes}} хвилин.  \
+Ви можете повернутись до {{storeName}} якщо ви хочете ще раз надіслати ваш платіж.",
+    "InvoiceExpired_Body_2": "Якщо ви пробували надіслати платіж, він ще не був прийнятий мережею. Ми ще не отримали ваші кошти.",
+    "InvoiceExpired_Body_3": "Якщо транзакція не прийнята мережею, кошти будуть знову доступними у вашому гаманці. Залежно від вашого гаманця, це може зайняти приблизно 48-72 годин.",
+    "Invoice ID": "ID рахунку",
+    "Order ID": "ID замовлення",
+    "Return to StoreName": "Повернутись до {{storeName}}",
+    // Invoice paid
+    "This invoice has been paid": "Цей рахунок вже оплачений",
+    // Invoice archived
+    "This invoice has been archived": "Цей рахунок заархівований",
+    "Archived_Body": "Будь ласка, зв’яжіться з магазином для отримання інформації щодо замовлення або допомоги",
+    // Lightning
+    "BOLT 11 Invoice": "Рахунок BOLT 11",
+    "Node Info": "Інформація щодо вузла",
+    //
+    "txCount": "транзакція {{count}}",
+    "txCount_plural": "транзакції {{count}}"
+};

BTCPayServer/wwwroot/checkout/js/langs/vi.js

@@ -0,0 +1,54 @@
+const locales_vi = {
+    nested: {
+        lang: 'Ngôn ngữ'
+    },
+    "Awaiting Payment...": "Đang chờ Thanh toán...",
+    "Pay with": "Thanh toán bằng",
+    "Contact and Refund Email": "Email để Liên lạc và Hoàn Tiền",
+    "Contact_Body": "Hãy cung cấp một địa chỉ email dưới đây. Chúng tôi sẽ liên lạc với bạn tại địa chỉ email này nếu có trục trặc trong thanh toán.",
+    "Your email": "Email của bạn",
+    "Continue": "Tiếp tục",
+    "Please enter a valid email address": "Hãy nhập một địa chỉ email hợp lệ",
+    "Order Amount": "Tổng giá trị Đơn hàng",
+    "Network Cost": "Chi phí Mạng lưới",
+    "Already Paid": "Số Tiền Đã Thanh toán",
+    "Due": "Số tiền chưa thanh toán",
+    // Tabs
+    "Scan": "Quét mã",
+    "Copy": "Sao chép",
+    "Conversion": "Chuyển đổi",
+    // Scan tab
+    "Open in wallet": "Mở ví",
+    // Copy tab
+    "CompletePay_Body": "Để hoàn tất việc thanh toán của bạn, hãy gửi {{btcDue}} {{cryptoCode}}tới địa chỉ sau.",
+    "Amount": "Số tiền",
+    "Address": "Địa chỉ",
+    "Copied": "Đã sao chép",
+    // Conversion tab
+    "ConversionTab_BodyTop": "Bạn có thể dùng Altcoin để trả cho {{btcDue}} {{cryptoCode}} chứ không phải dùng những loại tiền người bán chấp nhận trực tiếp.",
+    "ConversionTab_BodyDesc": "Dịch vụ này được cung cấp bởi một bên thứ ba. Xin vui lòng ghi nhớ, chúng tôi không kiểm soát phương thức các nhà cung cấp chuyển tiếp các nguồn tiền của bạn. Hóa đơn sẽ chỉ được đánh dấu đã thanh toán khi nào các nguồn tiền đã được nhận bởi Chuỗi khối Blockchain {{cryptoCode}}.",
+    "Shapeshift_Button_Text": "Thanh toán bằng Altcoins",
+    "ConversionTab_Lightning": "Không có nhà cung cấp nào có dịch vụ chuyển đổi cho các phương thức thanh toán Lightning Network.",
+    // Invoice expired
+    "Invoice expiring soon...": "Hóa đơn sắp quá hạn...",
+    "Invoice expired": "Hóa đơn đã quá hạn",
+    "What happened?": "Đã xảy ra chuyện gì?",
+    "InvoiceExpired_Body_1": "Hóa đơn này đã quá hạn. Một hóa đơn chỉ có giá trị trong {{maxTimeMinutes}} phút.  \
+Nếu muốn đệ trình việc thanh toán một lần nữa, bạn có thể quay lại {{storeName}}.",
+    "InvoiceExpired_Body_2": "Nếu bạn vừa định gửi thanh toán, thì hệ thống vẫn chưa chấp nhận thanh toán của bạn. Chúng tôi vẫn chưa nhận được tiền của bạn.",
+    "InvoiceExpired_Body_3": "Nếu giao dịch không được hệ thống chấp nhận, các khoản tiền của bạn sẽ được phân bổ trở lại ví của bạn để bạn tiêu dùng. Tuỳ thuộc vào ví của bạn, việc này có thể mất 48-72 giờ.",
+    "Invoice ID": "Số Hóa đơn",
+    "Order ID": "Số Đơn hàng",
+    "Return to StoreName": "Quay lại {{storeName}}",
+    // Invoice paid
+    "This invoice has been paid": "Hóa đơn này đã được thanh toán",
+    // Invoice archived
+    "This invoice has been archived": "Hóa đơn này đã được lưu trữ",
+    "Archived_Body": "Hãy liên lạc với cửa hàng để biết thông tin về đơn hàng hoặc nếu cần trợ giúp",
+    // Lightning
+    "BOLT 11 Invoice": "Hóa đơn BOLT 11",
+    "Node Info": "Nút Thông tin",
+    //
+    "txCount": "{{count}} giao dịch",
+    "txCount_plural": "{{count}} các giao dịch"
+};

BTCPayServer/wwwroot/imlegacy/bitcore-lightning.svg

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#ED3483;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st2{fill:#FFFFFF;}
+</style>
+<g id="XMLID_16_">
+	<g id="Ellipse_1_copy_2_1_">
+		<g id="XMLID_215_">
+			<circle id="XMLID_216_" class="st0" cx="513.2" cy="512" r="496.8"/>
+		</g>
+	</g>
+	<g id="Ellipse_1_copy_4_1_">
+		<g id="XMLID_213_">
+			<circle id="XMLID_214_" class="st1" cx="513.2" cy="512" r="457.7"/>
+		</g>
+	</g>
+	<g id="Ellipse_1_copy_3_1_">
+		<g id="XMLID_211_">
+			<circle id="XMLID_212_" class="st0" cx="513.2" cy="512" r="414.6"/>
+		</g>
+	</g>
+	<g id="XMLID_190_">
+		<g id="XMLID_204_">
+			<path id="XMLID_227_" class="st2" d="M268,517.9c-5.9,6-12.8,9.8-20.8,11.5c-8,1.7-16.5,1.4-25.4-0.9c-8.8-2.2-16.3-6-22.5-11.3
+				c-6.2-5.3-10.5-11.9-12.9-20c-2.4-8-2.3-17.1,0.2-27.1c2.5-9.8,6.7-17.7,12.7-23.7c5.9-5.9,12.9-9.8,20.9-11.5
+				c8-1.7,16.4-1.5,25.1,0.7c9,2.3,16.6,6.1,22.8,11.4c6.2,5.3,10.5,12,12.8,20c2.3,8,2.2,16.9-0.3,26.9
+				C278,504,273.8,512,268,517.9z M258.9,469.4c-4.3-5.7-10.8-9.6-19.6-11.8c-5.5-1.4-10.6-1.7-15.4-0.9c-4.8,0.8-8.9,2.8-12.2,5.8
+				c-3.4,3.1-5.7,7.1-7,12.2c-2,7.9-0.9,14.6,3.4,20.2c4.2,5.6,10.7,9.5,19.2,11.7c8.7,2.2,16.3,1.9,22.6-1
+				c6.3-2.9,10.5-8.3,12.5-16.2C264.4,481.7,263.2,475,258.9,469.4z"/>
+		</g>
+		<g id="XMLID_197_">
+			<path id="XMLID_223_" class="st2" d="M267.9,398.3l-2.5,10l32.6,8.3l-5.4,21.4l-90.3-22.9l9.3-36.6c5.8-22.9,18.4-32,37.7-27.1
+				c13.7,3.5,21,11.7,21.9,24.7l40.4-12.7l-6,23.8L267.9,398.3z M247.3,403.7l3.8-15.1c2.2-8.5-0.3-13.6-7.4-15.4
+				c-3.7-0.9-6.7-0.6-9,1c-2.3,1.6-4,4.6-5.1,9l-3.8,15.1L247.3,403.7z"/>
+		</g>
+		<g id="XMLID_192_">
+			<path id="XMLID_201_" class="st2" d="M311.9,289.8l17.1,4.3l-15.3,60.3l-90.3-22.9l15.1-59.7l17.1,4.3l-9.7,38.2l19.2,4.9
+				l8.2-32.3l17.1,4.3l-8.2,32.3l19.6,5L311.9,289.8z"/>
+		</g>
+		<path id="XMLID_191_" class="st2" d="M248,542.6c-1.5,0.3-2.9,0.6-4.4,0.8c0.6,3.1,1,6,1.1,8.7c0.2,3.9-0.1,7.8-1.1,11.6
+			c-2.1,8.1-6.3,13.8-12.7,17c-6.4,3.2-14,3.7-22.8,1.5c-5.5-1.4-10.1-3.7-13.9-7.1c-3.8-3.3-6.4-7.3-7.9-12
+			c-1.5-4.6-1.6-9.5-0.3-14.7c1.7-6.6,4.6-12.6,8.7-18c-0.8-0.6-1.6-1.3-2.4-2c-3.7-3.2-6.8-6.7-9.3-10.7c-3.3,3.2-5.2,6-5.2,6
+			c-2.6,3.4-4.6,6.7-6.1,9.8c-1.5,3.1-2.8,6.8-3.9,11c-2.6,10.2-2.7,19.5-0.4,27.6c2.3,8.2,6.6,15,12.8,20.3
+			c6.2,5.4,13.7,9.2,22.6,11.4c14.6,3.7,27.1,2.7,37.4-3.1c10.3-5.8,17.5-16.6,21.5-32.5c1.2-4.6,1.8-9.6,1.8-15
+			c0.1-5.4-0.5-10.7-1.7-15.9l-0.1,0C257.5,539.8,252.9,541.5,248,542.6z"/>
+	</g>
+	<path id="XMLID_186_" class="st2" d="M767.2,621.7c-10.3-60.3-63.9-82.2-63.9-82.2l1-2.9c52.2-3.2,71.5-56.4,74.5-64.5
+		c3-8.1,22.3-61.3-16.5-107.1c-33.4-39.5-83.7-56.2-96.9-60l27.4-107.9l-64.5-16.4l-26.4,104l-0.1,0l-48.5-12l26.4-104.3l-64.5-16.4
+		L489,255.5l-123.8-35l-17.7,68.6c0,0,26.7,6.8,50.9,13.5c24.3,6.7,21.8,32.2,20.4,38c-1.5,5.8-59.2,234.9-67.1,266
+		c-7.9,31.1-43.7,20-43.7,20l-35.2-11.7l-34,69.7l125.1,37l6.4,1.7L344.2,827l64.5,16.4l26.1-102.9l39.8,9.7l8.9,2.1l-26.2,103.4
+		l64.5,16.4l26.4-104.3c7.3,1.6,19.4,4.3,39.7,8.7c50.5,11.1,108.8-0.5,145.2-37.7C758.4,712.9,774.5,664.3,767.2,621.7z
+		 M663.1,436.8c-16.8,72.9-129.3,39.6-158.8,29.5l31.4-123.7C535.6,342.6,679.9,363.9,663.1,436.8z M554.8,688.1
+		c-62.1-6.1-101.1-22.3-101.1-22.3L488.1,530c0,0,55.8,9.1,102.2,33c46.4,23.9,51,57,47.3,73.7C634,653.4,616.9,694.2,554.8,688.1z"
+		/>
+</g>
+</svg>

BTCPayServer/wwwroot/imlegacy/bitcore.svg

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#ED3483;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st2{fill:#FFFFFF;}
+</style>
+<g id="XMLID_16_">
+	<g id="Ellipse_1_copy_2_1_">
+		<g id="XMLID_215_">
+			<circle id="XMLID_216_" class="st0" cx="513.2" cy="512" r="496.8"/>
+		</g>
+	</g>
+	<g id="Ellipse_1_copy_4_1_">
+		<g id="XMLID_213_">
+			<circle id="XMLID_214_" class="st1" cx="513.2" cy="512" r="457.7"/>
+		</g>
+	</g>
+	<g id="Ellipse_1_copy_3_1_">
+		<g id="XMLID_211_">
+			<circle id="XMLID_212_" class="st0" cx="513.2" cy="512" r="414.6"/>
+		</g>
+	</g>
+	<g id="XMLID_190_">
+		<g id="XMLID_204_">
+			<path id="XMLID_227_" class="st2" d="M268,517.9c-5.9,6-12.8,9.8-20.8,11.5c-8,1.7-16.5,1.4-25.4-0.9c-8.8-2.2-16.3-6-22.5-11.3
+				c-6.2-5.3-10.5-11.9-12.9-20c-2.4-8-2.3-17.1,0.2-27.1c2.5-9.8,6.7-17.7,12.7-23.7c5.9-5.9,12.9-9.8,20.9-11.5
+				c8-1.7,16.4-1.5,25.1,0.7c9,2.3,16.6,6.1,22.8,11.4c6.2,5.3,10.5,12,12.8,20c2.3,8,2.2,16.9-0.3,26.9
+				C278,504,273.8,512,268,517.9z M258.9,469.4c-4.3-5.7-10.8-9.6-19.6-11.8c-5.5-1.4-10.6-1.7-15.4-0.9c-4.8,0.8-8.9,2.8-12.2,5.8
+				c-3.4,3.1-5.7,7.1-7,12.2c-2,7.9-0.9,14.6,3.4,20.2c4.2,5.6,10.7,9.5,19.2,11.7c8.7,2.2,16.3,1.9,22.6-1
+				c6.3-2.9,10.5-8.3,12.5-16.2C264.4,481.7,263.2,475,258.9,469.4z"/>
+		</g>
+		<g id="XMLID_197_">
+			<path id="XMLID_223_" class="st2" d="M267.9,398.3l-2.5,10l32.6,8.3l-5.4,21.4l-90.3-22.9l9.3-36.6c5.8-22.9,18.4-32,37.7-27.1
+				c13.7,3.5,21,11.7,21.9,24.7l40.4-12.7l-6,23.8L267.9,398.3z M247.3,403.7l3.8-15.1c2.2-8.5-0.3-13.6-7.4-15.4
+				c-3.7-0.9-6.7-0.6-9,1c-2.3,1.6-4,4.6-5.1,9l-3.8,15.1L247.3,403.7z"/>
+		</g>
+		<g id="XMLID_192_">
+			<path id="XMLID_201_" class="st2" d="M311.9,289.8l17.1,4.3l-15.3,60.3l-90.3-22.9l15.1-59.7l17.1,4.3l-9.7,38.2l19.2,4.9
+				l8.2-32.3l17.1,4.3l-8.2,32.3l19.6,5L311.9,289.8z"/>
+		</g>
+		<path id="XMLID_191_" class="st2" d="M248,542.6c-1.5,0.3-2.9,0.6-4.4,0.8c0.6,3.1,1,6,1.1,8.7c0.2,3.9-0.1,7.8-1.1,11.6
+			c-2.1,8.1-6.3,13.8-12.7,17c-6.4,3.2-14,3.7-22.8,1.5c-5.5-1.4-10.1-3.7-13.9-7.1c-3.8-3.3-6.4-7.3-7.9-12
+			c-1.5-4.6-1.6-9.5-0.3-14.7c1.7-6.6,4.6-12.6,8.7-18c-0.8-0.6-1.6-1.3-2.4-2c-3.7-3.2-6.8-6.7-9.3-10.7c-3.3,3.2-5.2,6-5.2,6
+			c-2.6,3.4-4.6,6.7-6.1,9.8c-1.5,3.1-2.8,6.8-3.9,11c-2.6,10.2-2.7,19.5-0.4,27.6c2.3,8.2,6.6,15,12.8,20.3
+			c6.2,5.4,13.7,9.2,22.6,11.4c14.6,3.7,27.1,2.7,37.4-3.1c10.3-5.8,17.5-16.6,21.5-32.5c1.2-4.6,1.8-9.6,1.8-15
+			c0.1-5.4-0.5-10.7-1.7-15.9l-0.1,0C257.5,539.8,252.9,541.5,248,542.6z"/>
+	</g>
+	<path id="XMLID_186_" class="st2" d="M767.2,621.7c-10.3-60.3-63.9-82.2-63.9-82.2l1-2.9c52.2-3.2,71.5-56.4,74.5-64.5
+		c3-8.1,22.3-61.3-16.5-107.1c-33.4-39.5-83.7-56.2-96.9-60l27.4-107.9l-64.5-16.4l-26.4,104l-0.1,0l-48.5-12l26.4-104.3l-64.5-16.4
+		L489,255.5l-123.8-35l-17.7,68.6c0,0,26.7,6.8,50.9,13.5c24.3,6.7,21.8,32.2,20.4,38c-1.5,5.8-59.2,234.9-67.1,266
+		c-7.9,31.1-43.7,20-43.7,20l-35.2-11.7l-34,69.7l125.1,37l6.4,1.7L344.2,827l64.5,16.4l26.1-102.9l39.8,9.7l8.9,2.1l-26.2,103.4
+		l64.5,16.4l26.4-104.3c7.3,1.6,19.4,4.3,39.7,8.7c50.5,11.1,108.8-0.5,145.2-37.7C758.4,712.9,774.5,664.3,767.2,621.7z
+		 M663.1,436.8c-16.8,72.9-129.3,39.6-158.8,29.5l31.4-123.7C535.6,342.6,679.9,363.9,663.1,436.8z M554.8,688.1
+		c-62.1-6.1-101.1-22.3-101.1-22.3L488.1,530c0,0,55.8,9.1,102.2,33c46.4,23.9,51,57,47.3,73.7C634,653.4,616.9,694.2,554.8,688.1z"
+		/>
+</g>
+</svg>

BTCPayServer/wwwroot/js/StoreAddDerivationScheme.js

@@ -1,6 +1,16 @@
 $(function () {
     var ledgerDetected = false;
-    var bridge = new ledgerwebsocket.LedgerWebSocketBridge(srvModel);
+
+    var loc = window.location, new_uri;
+    if (loc.protocol === "https:") {
+        new_uri = "wss:";
+    } else {
+        new_uri = "ws:";
+    }
+    new_uri += "//" + loc.host;
+    new_uri += loc.pathname + "/ledger/ws";
+
+    var bridge = new ledgerwebsocket.LedgerWebSocketBridge(new_uri);
 
     var cryptoSelector = $("#CryptoCurrency");
     function GetSelectedCryptoCode() {

BTCPayServer/wwwroot/js/StoreWallet.js

@@ -1,160 +0,0 @@
-
-function updateFiatValue() {
-    if (srvModel.rate !== null) {
-        var fiatValue = $("#fiatValue");
-        fiatValue.css("display", "inline");
-        var amountValue = parseFloat($("#amount-textbox").val());
-        if (!isNaN(amountValue)) {
-            fiatValue.text("= " + (srvModel.rate * amountValue).toFixed(srvModel.divisibility) + " " + srvModel.fiat);
-        }
-    }
-}
-$(function () {
-    var ledgerDetected = false;
-    var bridge = new ledgerwebsocket.LedgerWebSocketBridge(srvModel.serverUrl);
-    var recommendedFees = "";
-    var recommendedBalance = "";
-    var cryptoCode = $("#cryptoCode").val();
-    if (srvModel.defaultAddress !== null) {
-        $("#destination-textbox").val(srvModel.defaultAddress);
-    }
-    if (srvModel.defaultAmount !== null) {
-        $("#amount-textbox").val(srvModel.defaultAmount);
-    }
-    function WriteAlert(type, message) {
-        $("#walletAlert").removeClass("alert-danger");
-        $("#walletAlert").removeClass("alert-warning");
-        $("#walletAlert").removeClass("alert-success");
-        $("#walletAlert").addClass("alert-" + type);
-        $("#walletAlert").css("display", "block");
-        $("#alertMessage").text(message);
-    }
-
-    function Write(prefix, type, message) {
-
-        $("#" + prefix + "-loading").css("display", "none");
-        $("#" + prefix + "-error").css("display", "none");
-        $("#" + prefix + "-success").css("display", "none");
-
-        $("#" + prefix + "-" + type).css("display", "block");
-
-        $("." + prefix + "-label").text(message);
-    }
-
-    $("#sendform").on("submit", function (elem) {
-        elem.preventDefault();
-
-        if ($("#amount-textbox").val() === "") {
-            $("#amount-textbox").val(recommendedBalance);
-            $("#substract-checkbox").prop("checked", true);
-        }
-
-        if ($("#fee-textbox").val() === "") {
-            $("#fee-textbox").val(recommendedFees);
-        }
-
-        var args = "";
-        args += "cryptoCode=" + cryptoCode;
-        args += "&destination=" + $("#destination-textbox").val();
-        args += "&amount=" + $("#amount-textbox").val();
-        args += "&feeRate=" + $("#fee-textbox").val();
-        args += "&substractFees=" + $("#substract-checkbox").prop("checked");
-
-        WriteAlert("warning", 'Please validate the transaction on your ledger');
-
-        var confirmButton = $("#confirm-button");
-        confirmButton.prop("disabled", true);
-        confirmButton.addClass("disabled");
-
-        bridge.sendCommand('sendtoaddress', args, 60 * 10 /* timeout */)
-            .catch(function (reason) {
-                WriteAlert("danger", reason);
-                confirmButton.prop("disabled", false);
-                confirmButton.removeClass("disabled");
-            })
-            .then(function (result) {
-                if (!result)
-                    return;
-                confirmButton.prop("disabled", false);
-                confirmButton.removeClass("disabled");
-                if (result.error) {
-                    WriteAlert("danger", result.error);
-                } else {
-                    WriteAlert("success", 'Transaction broadcasted (' + result.transactionId + ')');
-                    $("#fee-textbox").val("");
-                    $("#amount-textbox").val("");
-                    $("#destination-textbox").val("");
-                    $("#substract-checkbox").prop("checked", false);
-                    updateInfo();
-                }
-            });
-        return false;
-    });
-
-    $("#crypto-balance-link").on("click", function (elem) {
-        elem.preventDefault();
-        var val = $("#crypto-balance-link").text();
-        $("#amount-textbox").val(val);
-        $("#substract-checkbox").prop('checked', true);
-        return false;
-    });
-
-    $("#crypto-fee-link").on("click", function (elem) {
-        elem.preventDefault();
-        var val = $("#crypto-fee-link").text();
-        $("#fee-textbox").val(val);
-        return false;
-    });
-
-    var updateInfo = function () {
-        if (!ledgerDetected)
-            return false;
-        $(".crypto-info").css("display", "none");
-        bridge.sendCommand("getinfo", "cryptoCode=" + cryptoCode)
-            .catch(function (reason) { Write('check', 'error', reason); })
-            .then(function (result) {
-                if (!result)
-                    return;
-                if (result.error) {
-                    Write('check', 'error', result.error);
-                    return;
-                }
-                else {
-                    Write('check', 'success', 'This store is configured to use your ledger');
-                    $(".crypto-info").css("display", "block");
-                    recommendedFees = result.recommendedSatoshiPerByte;
-                    recommendedBalance = result.balance;
-                    $("#crypto-fee").text(result.recommendedSatoshiPerByte);
-                    $("#crypto-balance").text(result.balance);
-                    $("#crypto-code").text(cryptoCode);
-                }
-            });
-    };
-
-    bridge.isSupported()
-        .then(function (supported) {
-            if (!supported) {
-                Write('hw', 'error', 'U2F or Websocket are not supported by this browser');
-            }
-            else {
-                bridge.sendCommand('test', null, 5)
-                    .catch(function (reason) {
-                        if (reason.name === "TransportError")
-                            reason = "Are you running the ledger app with version equals or above 1.2.4?";
-                        Write('hw', 'error', reason);
-                    })
-                    .then(function (result) {
-                        if (!result)
-                            return;
-                        if (result.error) {
-                            Write('hw', 'error', result.error);
-                        } else {
-                            Write('hw', 'success', 'Ledger detected');
-                            $("#sendform").css("display", "block");
-                            ledgerDetected = true;
-                            updateInfo();
-                        }
-                    });
-            }
-        });
-});

BTCPayServer/wwwroot/js/WalletSend.js

@@ -0,0 +1,32 @@
+function updateFiatValue() {
+    var rateStr = $("#Rate").val();
+    var divisibilityStr = $("#Divisibility").val();
+    var fiat = $("#Fiat").val();
+    var rate = parseFloat(rateStr);
+    var divisibility = parseInt(divisibilityStr);
+    if (!isNaN(rate) && !isNaN(divisibility)) {
+        var fiatValue = $("#fiatValue");
+        var amountValue = parseFloat($("#Amount").val());
+        if (!isNaN(amountValue)) {
+            fiatValue.css("display", "inline");
+            fiatValue.text("= " + (rate * amountValue).toFixed(divisibility) + " " + fiat);
+        }
+    }
+}
+$(function () {
+    updateFiatValue();
+    $("#crypto-fee-link").on("click", function (elem) {
+        elem.preventDefault();
+        var val = $("#crypto-fee-link").text();
+        $("#FeeSatoshiPerByte").val(val);
+        return false;
+    });
+
+    $("#crypto-balance-link").on("click", function (elem) {
+        elem.preventDefault();
+        var val = $("#crypto-balance-link").text();
+        $("#Amount").val(val);
+        $("#SubstractFees").prop('checked', true);
+        return false;
+    });
+});

BTCPayServer/wwwroot/js/WalletSendLedger.js

@@ -0,0 +1,120 @@
+$(function () {
+    var destination = $("#Destination").val();
+    var amount = $("#Amount").val();
+    var fee = $("#FeeSatoshiPerByte").val();
+    var substractFee = $("#SubstractFees").val();
+
+    var loc = window.location, ws_uri;
+    if (loc.protocol === "https:") {
+        ws_uri = "wss:";
+    } else {
+        ws_uri = "ws:";
+    }
+    ws_uri += "//" + loc.host;
+    ws_uri += loc.pathname + "/ws";
+
+    var successCallback = loc.protocol + "//" + loc.host + loc.pathname + "/success";
+
+    var ledgerDetected = false;
+    var bridge = new ledgerwebsocket.LedgerWebSocketBridge(ws_uri);
+    var cryptoCode = $("#cryptoCode").val();
+    function WriteAlert(type, message) {
+        $("#walletAlert").removeClass("alert-danger");
+        $("#walletAlert").removeClass("alert-warning");
+        $("#walletAlert").removeClass("alert-success");
+        $("#walletAlert").addClass("alert-" + type);
+        $("#walletAlert").css("display", "block");
+        $("#alertMessage").text(message);
+    }
+
+    function Write(prefix, type, message) {
+
+        $("#" + prefix + "-loading").css("display", "none");
+        $("#" + prefix + "-error").css("display", "none");
+        $("#" + prefix + "-success").css("display", "none");
+
+        $("#" + prefix + "-" + type).css("display", "block");
+
+        $("." + prefix + "-label").text(message);
+    }
+
+    var updateInfo = function () {
+        if (!ledgerDetected)
+            return false;
+        $(".crypto-info").css("display", "none");
+        bridge.sendCommand("getinfo", "cryptoCode=" + cryptoCode)
+            .catch(function (reason) { Write('check', 'error', reason); })
+            .then(function (result) {
+                if (!result)
+                    return;
+                if (result.error) {
+                    Write('check', 'error', result.error);
+                    return;
+                }
+                else {
+                    Write('check', 'success', 'This store is configured to use your ledger');
+                    $(".crypto-info").css("display", "block");
+
+
+                    var args = "";
+                    args += "cryptoCode=" + cryptoCode;
+                    args += "&destination=" + destination;
+                    args += "&amount=" + amount;
+                    args += "&feeRate=" + fee;
+                    args += "&substractFees=" + substractFee;
+
+                    WriteAlert("warning", 'Please validate the transaction on your ledger');
+
+                    var confirmButton = $("#confirm-button");
+                    confirmButton.prop("disabled", true);
+                    confirmButton.addClass("disabled");
+
+                    bridge.sendCommand('sendtoaddress', args, 60 * 10 /* timeout */)
+                        .catch(function (reason) {
+                            WriteAlert("danger", reason);
+                            confirmButton.prop("disabled", false);
+                            confirmButton.removeClass("disabled");
+                        })
+                        .then(function (result) {
+                            if (!result)
+                                return;
+                            confirmButton.prop("disabled", false);
+                            confirmButton.removeClass("disabled");
+                            if (result.error) {
+                                WriteAlert("danger", result.error);
+                            } else {
+                                WriteAlert("success", 'Transaction broadcasted (' + result.transactionId + ')');
+                                window.location.replace(successCallback + "?txid=" + result.transactionId);
+                            }
+                        });
+                }
+            });
+    };
+
+    bridge.isSupported()
+        .then(function (supported) {
+            if (!supported) {
+                Write('hw', 'error', 'U2F or Websocket are not supported by this browser');
+            }
+            else {
+                bridge.sendCommand('test', null, 5)
+                    .catch(function (reason) {
+                        if (reason.name === "TransportError")
+                            reason = "Are you running the ledger app with version equals or above 1.2.4?";
+                        Write('hw', 'error', reason);
+                    })
+                    .then(function (result) {
+                        if (!result)
+                            return;
+                        if (result.error) {
+                            Write('hw', 'error', result.error);
+                        } else {
+                            Write('hw', 'success', 'Ledger detected');
+                            $("#sendform").css("display", "block");
+                            ledgerDetected = true;
+                            updateInfo();
+                        }
+                    });
+            }
+        });
+});

Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.1.402-sdk-alpine3.7 AS builder
+FROM microsoft/dotnet:2.1.403-sdk-alpine3.7 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/dotnet:2.1.4-aspnetcore-runtime-alpine3.7
+FROM microsoft/dotnet:2.1.5-aspnetcore-runtime-alpine3.7
 
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false
 RUN apk add --no-cache icu-libs

README.md

@@ -3,6 +3,7 @@
 
 [![Docker Automated build](https://img.shields.io/docker/automated/jrottenberg/ffmpeg.svg)](https://hub.docker.com/r/nicolasdorier/btcpayserver/)
 [![Deploy to Azure](https://azuredeploy.net/deploybutton.svg)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fbtcpayserver%2Fbtcpayserver-azure%2Fmaster%2Fazuredeploy.json)
+[![CircleCI](https://circleci.com/gh/btcpayserver/btcpayserver.svg?style=svg)](https://circleci.com/gh/btcpayserver/btcpayserver)
 
 # BTCPay Server
 
@@ -42,6 +43,7 @@ Thanks to the apps built on top of it, you can use BTCPay to receive donations o
 In addition to Bitcoin, BTCPay supports the following cryptocurrencies:
 
 * BGold
+* Bitcore
 * Dash
 * Dogecoin
 * Feathercoin
@@ -62,7 +64,7 @@ You can also read the [BTCPay Merchants Guide](https://www.reddit.com/r/Bitcoin/
 
 While the documentation advises to use docker-compose, you may want to build BTCPay yourself.
 
-First install .NET Core SDK v2.1.4 (with patch version >= 402) as specified by [Microsoft website](https://www.microsoft.com/net/download/dotnet-core/2.1).
+First install .NET Core SDK v2.1.4 (with patch version >= 403) as specified by [Microsoft website](https://www.microsoft.com/net/download/dotnet-core/2.1).
 
 On Powershell:
 ```
@@ -88,6 +90,25 @@ On linux:
 ./run.sh --help
 ```
 
+## How to debug
+
+If you want to debug, use Visual Studio Code or Visual studio 2017.
+
+You need to run the development time docker-compose as described [in the test guide](BTCPayServer.Tests/README.md).
+
+You can then run the debugger by using the Launch Profile `Docker-Regtest` on either Visual Studio Code or Visual studio 2017.
+
+If you need to debug ledger wallet interaction, install the development time certificate with:
+
+```bash
+# Install development time certificate in the trust store
+dotnet dev-certs https --trust
+```
+
+Then use the `Docker-Regtest-https` debug profile.
+
+
+
 ## Other dependencies
 
 For more information, see the documentation: [How to deploy a BTCPay server instance](https://github.com/btcpayserver/btcpayserver-doc/#deployment).

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.1.402"
+    "version": "2.1.403"
   }
-}
+}