Do not crash if can't load rate cache

* Wallet prep work for BPU

This PR prepares the wallet for #1321. It makes transfers from the vault and ledger to go to their own post actions for processing (not particularly useful in this PR but is needed in BPU to propose a new tx)  It also makes the Sign with seed consistent with redirect to /psbt/ready after signing which it did not do (it stayed on the seed route)

* fix test

* add assert

.circleci/config.yml

@@ -66,6 +66,20 @@ jobs:
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-arm32v7
 
+  arm64v8:
+    machine:
+        enabled: true
+    steps:
+      - checkout  
+      - run:
+          command: |
+            sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset
+            LATEST_TAG=${CIRCLE_TAG:1} #trim v from tag
+            #
+            sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm64v8 -f arm64v8.Dockerfile .
+            sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
+            sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-arm64v8
+
   multiarch:
     machine:
       enabled: true
@@ -80,9 +94,10 @@ jobs:
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             #
             LATEST_TAG=${CIRCLE_TAG:1} #trim v from tag
-            sudo docker manifest create --amend $DOCKERHUB_REPO:$LATEST_TAG $DOCKERHUB_REPO:$LATEST_TAG-amd64 $DOCKERHUB_REPO:$LATEST_TAG-arm32v7
+            sudo docker manifest create --amend $DOCKERHUB_REPO:$LATEST_TAG $DOCKERHUB_REPO:$LATEST_TAG-amd64 $DOCKERHUB_REPO:$LATEST_TAG-arm32v7 $DOCKERHUB_REPO:$LATEST_TAG-arm64v8
             sudo docker manifest annotate $DOCKERHUB_REPO:$LATEST_TAG $DOCKERHUB_REPO:$LATEST_TAG-amd64 --os linux --arch amd64
             sudo docker manifest annotate $DOCKERHUB_REPO:$LATEST_TAG $DOCKERHUB_REPO:$LATEST_TAG-arm32v7 --os linux --arch arm --variant v7
+            sudo docker manifest annotate $DOCKERHUB_REPO:$LATEST_TAG $DOCKERHUB_REPO:$LATEST_TAG-arm64v8 --os linux --arch arm64 --variant v8
             sudo docker manifest push $DOCKERHUB_REPO:$LATEST_TAG -p
 
 workflows:
@@ -114,10 +129,17 @@ workflows:
               ignore: /.*/
             tags:
               only: /(v[1-9]+(\.[0-9]+)*)|(v[a-z]+)/
-      - multiarch:
-          requires:
-            - amd64
-            - arm32v7
+      - arm64v8:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /(v[1-9]+(\.[0-9]+)*)|(v[a-z]+)/
+      - multiarch:
+          requires:
+            - amd64
+            - arm32v7
+            - arm64v8
           filters:
             branches:
               ignore: /.*/

.gitignore

@@ -293,3 +293,4 @@ BTCPayServer/wwwroot/bundles/*
 !BTCPayServer/wwwroot/bundles/.gitignore
 
 .vscode
+BTCPayServer/testpwd

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcoin.cs

@@ -17,7 +17,6 @@ namespace BTCPayServer
                 CryptoCode = nbxplorerNetwork.CryptoCode,
                 DisplayName = "Bitcoin",
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://blockstream.info/tx/{0}" : "https://blockstream.info/testnet/tx/{0}",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "bitcoin",
                 CryptoImagePath = "imlegacy/bitcoin.svg",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.BitcoinGold.cs

@@ -12,7 +12,6 @@ namespace BTCPayServer
                 CryptoCode = nbxplorerNetwork.CryptoCode,
                 DisplayName = "BGold",
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://explorer.bitcoingold.org/insight/tx/{0}/" : "https://test-explorer.bitcoingold.org/insight/tx/{0}",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "bitcoingold",
                 DefaultRateRules = new[]

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcoinplus.cs

@@ -17,7 +17,6 @@ namespace BTCPayServer
                 CryptoCode = nbxplorerNetwork.CryptoCode,
                 DisplayName = "Bitcoinplus",
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://chainz.cryptoid.info/xbc/tx.dws?{0}" : "https://chainz.cryptoid.info/xbc/tx.dws?{0}",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "bitcoinplus",
                 DefaultRateRules = new[]

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcore.cs

@@ -17,7 +17,6 @@ namespace BTCPayServer
                 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[]

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Dash.cs

@@ -15,7 +15,6 @@ namespace BTCPayServer
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet
                     ? "https://insight.dash.org/insight/tx/{0}"
                     : "https://testnet-insight.dashevo.org/insight/tx/{0}",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "dash",
                 DefaultRateRules = new[]

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Dogecoin.cs

@@ -17,7 +17,6 @@ namespace BTCPayServer
                 CryptoCode = nbxplorerNetwork.CryptoCode,
                 DisplayName = "Dogecoin",
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://dogechain.info/tx/{0}" : "https://dogechain.info/tx/{0}",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "dogecoin",
                 DefaultRateRules = new[] 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Feathercoin.cs

@@ -17,7 +17,6 @@ namespace BTCPayServer
                 CryptoCode = nbxplorerNetwork.CryptoCode,
                 DisplayName = "Feathercoin",
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://explorer.feathercoin.com/tx/{0}" : "https://explorer.feathercoin.com/tx/{0}",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "feathercoin",
                 DefaultRateRules = new[] 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Groestlcoin.cs

@@ -18,7 +18,6 @@ namespace BTCPayServer
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet
                     ? "https://chainz.cryptoid.info/grs/tx.dws?{0}.htm"
                     : "https://chainz.cryptoid.info/grs-test/tx.dws?{0}.htm",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "groestlcoin",
                 DefaultRateRules = new[]

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Litecoin.cs

@@ -19,9 +19,13 @@ namespace BTCPayServer
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet
                     ? "https://live.blockcypher.com/ltc/tx/{0}/"
                     : "http://explorer.litecointools.com/tx/{0}",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "litecoin",
+                DefaultRateRules = new[]
+                {
+                    "LTC_X = LTC_BTC * BTC_X",
+                    "LTC_BTC = coingecko(LTC_BTC)"
+                },
                 CryptoImagePath = "imlegacy/litecoin.svg",
                 LightningImagePath = "imlegacy/litecoin-lightning.svg",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Monacoin.cs

@@ -17,7 +17,6 @@ namespace BTCPayServer
                 CryptoCode = nbxplorerNetwork.CryptoCode,
                 DisplayName = "Monacoin",
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://mona.insight.monaco-ex.org/insight/tx/{0}" : "https://testnet-mona.insight.monaco-ex.org/insight/tx/{0}",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "monacoin",
                 DefaultRateRules = new[] 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Polis.cs

@@ -16,14 +16,13 @@ namespace BTCPayServer
             {
                 CryptoCode = nbxplorerNetwork.CryptoCode,
                 DisplayName = "Polis",
-                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://insight.polispay.org/tx/{0}" : "https://insight.polispay.org/tx/{0}",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://blockbook.polispay.org/tx/{0}" : "https://blockbook.polispay.org/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "polis",
                 DefaultRateRules = new[]
                 {
                                 "POLIS_X = POLIS_BTC * BTC_X",
-                                "POLIS_BTC = cryptopia(POLIS_BTC)"
+                                "POLIS_BTC = polispay(POLIS_BTC)"
                 },
                 CryptoImagePath = "imlegacy/polis.png",
                 DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Ufo.cs

@@ -17,7 +17,6 @@ namespace BTCPayServer
                 CryptoCode = nbxplorerNetwork.CryptoCode,
                 DisplayName = "Ufo",
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://chainz.cryptoid.info/ufo/tx.dws?{0}" : "https://chainz.cryptoid.info/ufo/tx.dws?{0}",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "ufo",
                 DefaultRateRules = new[] 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Viacoin.cs

@@ -17,7 +17,6 @@ namespace BTCPayServer
                 CryptoCode = nbxplorerNetwork.CryptoCode,
                 DisplayName = "Viacoin",
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://explorer.viacoin.org/tx/{0}" : "https://explorer.viacoin.org/tx/{0}",
-                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "viacoin",
                 DefaultRateRules = new[]

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.cs

@@ -47,6 +47,8 @@ namespace BTCPayServer
             _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(networkType);
             NetworkType = networkType;
             InitBitcoin();
+            InitLiquid();
+            InitLiquidAssets();
             InitLitecoin();
             InitBitcore();
             InitDogecoin();
@@ -57,7 +59,8 @@ namespace BTCPayServer
             InitGroestlcoin();
             InitViacoin();
             InitMonero();
-            
+            InitPolis();
+
             // Assume that electrum mappings are same as BTC if not specified
             foreach (var network in _Networks.Values.OfType<BTCPayNetwork>())
             {
@@ -75,7 +78,6 @@ namespace BTCPayServer
             }
 
             // Disabled because of https://twitter.com/Cryptopia_NZ/status/1085084168852291586
-            //InitPolis();
             //InitBitcoinplus();
             //InitUfo();
         }
@@ -93,6 +95,12 @@ namespace BTCPayServer
         [Obsolete("To use only for legacy stuff")]
         public BTCPayNetwork BTC => GetNetwork<BTCPayNetwork>("BTC");
 
+        public void Add(BTCPayNetwork network)
+        {
+            if (network.NBitcoinNetwork == null)
+                return;
+            Add(network as BTCPayNetworkBase);
+        }
         public void Add(BTCPayNetworkBase network)
         {
             _Networks.Add(network.CryptoCode.ToUpperInvariant(), network);
@@ -109,7 +117,7 @@ namespace BTCPayServer
         }
         public BTCPayNetworkBase GetNetwork(string cryptoCode)
         {
-            return GetNetwork<BTCPayNetworkBase>(cryptoCode);
+            return GetNetwork<BTCPayNetworkBase>(cryptoCode.ToUpperInvariant());
         }
         public T GetNetwork<T>(string cryptoCode) where T: BTCPayNetworkBase
         {

BTCPayServer.Common/Altcoins/Liquid/BTCPayNetworkProvider.Liquid.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using NBitcoin;
+using NBitcoin.Altcoins;
+using NBitcoin.Altcoins.Elements;
+using NBXplorer;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        public void InitLiquid()
+        {
+            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("LBTC");
+            Add(new ElementsBTCPayNetwork()
+            {
+                AssetId = NetworkType == NetworkType.Mainnet ? ElementsParams<Liquid>.PeggedAssetId: ElementsParams<Liquid.LiquidRegtest>.PeggedAssetId,
+                CryptoCode = "LBTC",
+                NetworkCryptoCode = "LBTC",
+                DisplayName = "Liquid Bitcoin",
+                DefaultRateRules = new[]
+                {
+                    "LBTC_X = LBTC_BTC * BTC_X",
+                    "LBTC_BTC = 1",
+                },
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://blockstream.info/liquid/tx/{0}" : "https://blockstream.info/testnet/liquid/tx/{0}",
+                NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "liquidnetwork",
+                CryptoImagePath = "imlegacy/liquid.png",
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("1776'") : new KeyPath("1'"),
+                SupportRBF = true
+            });
+        }
+    }
+
+
+}

BTCPayServer.Common/Altcoins/Liquid/BTCPayNetworkProvider.LiquidAssets.cs

@@ -0,0 +1,58 @@
+using NBitcoin;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        public void InitLiquidAssets()
+        {
+            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("LBTC");
+            Add(new ElementsBTCPayNetwork()
+            {
+                CryptoCode = "USDt",
+                NetworkCryptoCode = "LBTC",
+                ShowSyncSummary = false,
+                DefaultRateRules = new[]
+                {
+                    "USDT_UST = 1",
+                    "USDT_X = USDT_BTC * BTC_X",
+                    "USDT_BTC = bitfinex(UST_BTC)",
+                },
+                AssetId = new uint256("ce091c998b83c78bb71a632313ba3760f1763d9cfcffae02258ffa9865a37bd2"),
+                DisplayName = "Liquid Tether",
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://blockstream.info/liquid/tx/{0}" : "https://blockstream.info/testnet/liquid/tx/{0}",
+                NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "liquidnetwork",
+                CryptoImagePath = "imlegacy/liquid-tether.svg",
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("1776'") : new KeyPath("1'"),
+                SupportRBF = true
+            });
+            
+            Add(new ElementsBTCPayNetwork()
+            {
+                CryptoCode = "ETB",
+                NetworkCryptoCode = "LBTC",
+                ShowSyncSummary = false,
+                DefaultRateRules = new[]
+                {
+                    
+                    "ETB_X = ETB_BTC * BTC_X",
+                    "ETB_BTC = bitpay(ETB_BTC)"
+                },
+                Divisibility = 2,
+                AssetId = new uint256("aa775044c32a7df391902b3659f46dfe004ccb2644ce2ddc7dba31e889391caf"),
+                DisplayName = "Ethiopian Birr",
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://blockstream.info/liquid/tx/{0}" : "https://blockstream.info/testnet/liquid/tx/{0}",
+                NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "liquidnetwork",
+                CryptoImagePath = "imlegacy/etb.png",
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("1776'") : new KeyPath("1'"),
+                SupportRBF = true
+            });
+        }
+    }
+
+
+}

BTCPayServer.Common/Altcoins/Liquid/ElementsLikeBtcPayNetwork.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using System.Linq;
+using NBitcoin;
+using NBXplorer;
+using NBXplorer.Models;
+
+namespace BTCPayServer
+{
+    public class ElementsBTCPayNetwork : BTCPayNetwork
+    {
+        public string NetworkCryptoCode { get; set; }
+        public uint256 AssetId { get; set; }
+        public override bool ReadonlyWallet { get; set; } = true;
+
+        public override IEnumerable<(MatchedOutput matchedOutput, OutPoint outPoint)> GetValidOutputs(
+            NewTransactionEvent evtOutputs)
+        {
+            return evtOutputs.Outputs.Where(output =>
+                output.Value is AssetMoney assetMoney && assetMoney.AssetId == AssetId).Select(output =>
+            {
+                var outpoint = new OutPoint(evtOutputs.TransactionData.TransactionHash, output.Index);
+                return (output, outpoint);
+            });
+        }
+
+        public override string GenerateBIP21(string cryptoInfoAddress, Money cryptoInfoDue)
+        {
+            return $"{base.GenerateBIP21(cryptoInfoAddress, cryptoInfoDue)}&assetid={AssetId}";
+        }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/BTCPayNetworkProvider.Monero.cs

@@ -10,10 +10,16 @@ namespace BTCPayServer
             {
                 CryptoCode = "XMR",
                 DisplayName = "Monero",
+                Divisibility = 12,
                 BlockExplorerLink =
                     NetworkType == NetworkType.Mainnet
                         ? "https://www.exploremonero.com/transaction/{0}"
                         : "https://testnet.xmrchain.net/tx/{0}",
+                DefaultRateRules = new[]
+                {
+                    "XMR_X = XMR_BTC * BTC_X",
+                    "XMR_BTC = kraken(XMR_BTC)"
+                },
                 CryptoImagePath = "/imlegacy/monero.svg"
             });
         }

BTCPayServer.Common/BTCPayNetwork.cs

@@ -1,10 +1,11 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
+using NBXplorer.Models;
 using Newtonsoft.Json;
 
 namespace BTCPayServer
@@ -46,7 +47,7 @@ namespace BTCPayServer
 
     public class BTCPayNetwork:BTCPayNetworkBase
     {
-        public Network NBitcoinNetwork { get; set; }
+        public Network NBitcoinNetwork { get { return  NBXplorerNetwork?.NBitcoinNetwork; } }
         public NBXplorer.NBXplorerNetwork NBXplorerNetwork { get; set; }
         public bool SupportRBF { get; internal set; }
         public string LightningImagePath { get; set; }
@@ -55,6 +56,9 @@ namespace BTCPayServer
         
         public Dictionary<uint, DerivationType> ElectrumMapping = new Dictionary<uint, DerivationType>();
 
+        public virtual bool WalletSupported { get; set; } = true;
+        public virtual bool ReadonlyWallet{ get; set; } = false;
+        
         public int MaxTrackedConfirmation { get; internal set; } = 6;
         public string UriScheme { get; internal set; }
         public KeyPath GetRootKeyPath(DerivationType type)
@@ -100,14 +104,28 @@ namespace BTCPayServer
         {
             return NBXplorerNetwork.Serializer.ToString(obj);
         }
+        public virtual IEnumerable<(MatchedOutput matchedOutput, OutPoint outPoint)> GetValidOutputs(NewTransactionEvent evtOutputs)
+        {
+            return evtOutputs.Outputs.Select(output =>
+            {
+                var outpoint = new OutPoint(evtOutputs.TransactionData.TransactionHash, output.Index);
+                return (output, outpoint);
+            });
+        }
+
+        public virtual string GenerateBIP21(string cryptoInfoAddress, Money cryptoInfoDue)
+        {
+            return $"{UriScheme}:{cryptoInfoAddress}?amount={cryptoInfoDue.ToString(false, true)}";
+        }
     }
 
     public abstract class BTCPayNetworkBase
     {
+        public bool ShowSyncSummary { get; set; } = true;
         public string CryptoCode { get; internal set; }
         public string BlockExplorerLink { get; internal set; }
         public string DisplayName { get; set; }
-
+        public int Divisibility { get; set; } = 8;
         [Obsolete("Should not be needed")]
         public bool IsBTC
         {

BTCPayServer.Common/BTCPayServer.Common.csproj

@@ -3,8 +3,7 @@
   <Import Project="../Build/Common.csproj" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.14" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
-    <FrameworkReference Include="Microsoft.AspNetCore.App" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
-    <PackageReference Include="NBXplorer.Client" Version="3.0.1" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="NBXplorer.Client" Version="3.0.2" />
   </ItemGroup>
 </Project>

BTCPayServer.Common/Shims.cs

@@ -1,4 +1,3 @@
-#if !NETCOREAPP21
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
@@ -235,25 +234,3 @@ namespace Microsoft.Extensions.Logging.Abstractions.Internal
         }
     }
 }
-
-
-#else
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-
-namespace Microsoft.AspNetCore.Mvc
-{
-    /// <summary>
-    /// Provides programmatic configuration for JSON formatters using Newtonsoft.JSON.
-    /// </summary>
-    public class MvcNewtonsoftJsonOptions
-    {
-		IOptions<MvcJsonOptions> jsonOptions;
-		public MvcNewtonsoftJsonOptions(IOptions<MvcJsonOptions> jsonOptions)
-		{
-			this.jsonOptions = jsonOptions;
-		}
-		public JsonSerializerSettings SerializerSettings => this.jsonOptions.Value.SerializerSettings;
-	}
-}
-#endif

BTCPayServer.Data/BTCPayServer.Data.csproj

@@ -1,19 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../Build/Version.csproj" Condition="Exists('../Build/Version.csproj')" />
   <Import Project="../Build/Common.csproj" />
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="Microsoft.AspNetCore.App" AllowExplicitVersion="true" Version="2.1.14" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.14" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.4" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.2" />
-    <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="3.0.0-alpha1.19515.63" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
+  <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.0.1" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.0.0-rc1.final" />
-    <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="3.0.0-alpha1.19515.63" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.1" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.0" />
+    <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="3.0.0-alpha1.20058.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.1" />
   </ItemGroup>
 </Project>

BTCPayServer.Data/Data/ApplicationDbContext.cs

@@ -2,20 +2,33 @@
 using System.Linq;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using OpenIddict.EntityFrameworkCore.Models;
 
 namespace BTCPayServer.Data
 {
+    public class DesignTimeDbContextFactory : IDesignTimeDbContextFactory<ApplicationDbContext>
+    {
+        public ApplicationDbContext CreateDbContext(string[] args)
+        {
+            
+            var builder = new DbContextOptionsBuilder<ApplicationDbContext>();
+ 
+            builder.UseSqlite("Data Source=temp.db");
+ 
+            return new ApplicationDbContext(builder.Options, true);
+        }
+    }
+    
     public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
     {
-        public ApplicationDbContext()
-        {
+        private readonly bool _designTime;
 
-        }
-        public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options)
+        public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options, bool designTime = false)
             : base(options)
         {
+            _designTime = designTime;
         }
 
         public DbSet<InvoiceData> Invoices
@@ -244,6 +257,26 @@ namespace BTCPayServer.Data
 
             builder.UseOpenIddict<BTCPayOpenIdClient, BTCPayOpenIdAuthorization, OpenIddictScope<string>, BTCPayOpenIdToken, string>();
 
+            if (Database.IsSqlite() && !_designTime)
+            {
+                // SQLite does not have proper support for DateTimeOffset via Entity Framework Core, see the limitations
+                // here: https://docs.microsoft.com/en-us/ef/core/providers/sqlite/limitations#query-limitations
+                // To work around this, when the Sqlite database provider is used, all model properties of type DateTimeOffset
+                // use the DateTimeOffsetToBinaryConverter
+                // Based on: https://github.com/aspnet/EntityFrameworkCore/issues/10784#issuecomment-415769754
+                // This only supports millisecond precision, but should be sufficient for most use cases.
+                foreach (var entityType in builder.Model.GetEntityTypes())
+                {
+                    var properties = entityType.ClrType.GetProperties().Where(p => p.PropertyType == typeof(DateTimeOffset));
+                    foreach (var property in properties)
+                    {
+                        builder
+                            .Entity(entityType.Name)
+                            .Property(property.Name)
+                            .HasConversion(new Microsoft.EntityFrameworkCore.Storage.ValueConversion.DateTimeOffsetToBinaryConverter());
+                    }
+                }
+            }
         }
     }
 

BTCPayServer.Data/Data/ApplicationDbContextFactory.cs

@@ -45,11 +45,7 @@ namespace BTCPayServer.Data
 
         class CustomNpgsqlMigrationsSqlGenerator : NpgsqlMigrationsSqlGenerator
         {
-#if NETCOREAPP21
-            public CustomNpgsqlMigrationsSqlGenerator(MigrationsSqlGeneratorDependencies dependencies) : base(dependencies)
-#else
             public CustomNpgsqlMigrationsSqlGenerator(MigrationsSqlGeneratorDependencies dependencies,  IMigrationsAnnotationProvider annotations, Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal.INpgsqlOptions opts) : base(dependencies, annotations, opts)
-#endif
             {
             }
 

BTCPayServer.Data/Migrations/20170913143004_Init.cs

@@ -12,11 +12,12 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.CreateTable(
                 name: "AspNetRoles",
                 columns: table => new
                 {
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     ConcurrencyStamp = table.Column<string>(nullable: true),
                     Name = table.Column<string>(maxLength: 256, nullable: true),
                     NormalizedName = table.Column<string>(maxLength: 256, nullable: true)
@@ -30,7 +31,7 @@ namespace BTCPayServer.Migrations
                 name: "AspNetUsers",
                 columns: table => new
                 {
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     AccessFailedCount = table.Column<int>(nullable: false),
                     ConcurrencyStamp = table.Column<string>(nullable: true),
                     Email = table.Column<string>(maxLength: 256, nullable: true),
@@ -55,7 +56,7 @@ namespace BTCPayServer.Migrations
                 name: "Stores",
                 columns: table => new
                 {
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     DerivationStrategy = table.Column<string>(nullable: true),
                     SpeedPolicy = table.Column<int>(nullable: false),
                     StoreCertificate = table.Column<byte[]>(nullable: true),
@@ -75,7 +76,7 @@ namespace BTCPayServer.Migrations
                         .Annotation("Sqlite:Autoincrement", true),
                     ClaimType = table.Column<string>(nullable: true),
                     ClaimValue = table.Column<string>(nullable: true),
-                    RoleId = table.Column<string>(nullable: false)
+                    RoleId = table.Column<string>(nullable: false, maxLength: maxLength)
                 },
                 constraints: table =>
                 {
@@ -96,7 +97,7 @@ namespace BTCPayServer.Migrations
                         .Annotation("Sqlite:Autoincrement", true),
                     ClaimType = table.Column<string>(nullable: true),
                     ClaimValue = table.Column<string>(nullable: true),
-                    UserId = table.Column<string>(nullable: false)
+                    UserId = table.Column<string>(nullable: false, maxLength: maxLength)
                 },
                 constraints: table =>
                 {
@@ -116,7 +117,7 @@ namespace BTCPayServer.Migrations
                     LoginProvider = table.Column<string>(nullable: false),
                     ProviderKey = table.Column<string>(nullable: false),
                     ProviderDisplayName = table.Column<string>(nullable: true),
-                    UserId = table.Column<string>(nullable: false)
+                    UserId = table.Column<string>(nullable: false, maxLength: maxLength)
                 },
                 constraints: table =>
                 {
@@ -133,8 +134,8 @@ namespace BTCPayServer.Migrations
                 name: "AspNetUserRoles",
                 columns: table => new
                 {
-                    UserId = table.Column<string>(nullable: false),
-                    RoleId = table.Column<string>(nullable: false)
+                    UserId = table.Column<string>(nullable: false, maxLength: maxLength),
+                    RoleId = table.Column<string>(nullable: false, maxLength: maxLength)
                 },
                 constraints: table =>
                 {
@@ -157,7 +158,7 @@ namespace BTCPayServer.Migrations
                 name: "AspNetUserTokens",
                 columns: table => new
                 {
-                    UserId = table.Column<string>(nullable: false),
+                    UserId = table.Column<string>(nullable: false, maxLength: maxLength),
                     LoginProvider = table.Column<string>(nullable: false),
                     Name = table.Column<string>(nullable: false),
                     Value = table.Column<string>(nullable: true)
@@ -177,7 +178,7 @@ namespace BTCPayServer.Migrations
                 name: "Invoices",
                 columns: table => new
                 {
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     Blob = table.Column<byte[]>(nullable: true),
                     Created = table.Column<DateTimeOffset>(nullable: false),
                     CustomerEmail = table.Column<string>(nullable: true),
@@ -185,7 +186,7 @@ namespace BTCPayServer.Migrations
                     ItemCode = table.Column<string>(nullable: true),
                     OrderId = table.Column<string>(nullable: true),
                     Status = table.Column<string>(nullable: true),
-                    StoreDataId = table.Column<string>(nullable: true)
+                    StoreDataId = table.Column<string>(nullable: true, maxLength: maxLength)
                 },
                 constraints: table =>
                 {
@@ -202,8 +203,8 @@ namespace BTCPayServer.Migrations
                 name: "UserStore",
                 columns: table => new
                 {
-                    ApplicationUserId = table.Column<string>(nullable: false),
-                    StoreDataId = table.Column<string>(nullable: false),
+                    ApplicationUserId = table.Column<string>(nullable: false, maxLength: maxLength),
+                    StoreDataId = table.Column<string>(nullable: false, maxLength: maxLength),
                     Role = table.Column<string>(nullable: true)
                 },
                 constraints: table =>
@@ -227,9 +228,9 @@ namespace BTCPayServer.Migrations
                 name: "Payments",
                 columns: table => new
                 {
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     Blob = table.Column<byte[]>(nullable: true),
-                    InvoiceDataId = table.Column<string>(nullable: true)
+                    InvoiceDataId = table.Column<string>(nullable: true, maxLength: maxLength)
                 },
                 constraints: table =>
                 {
@@ -246,9 +247,9 @@ namespace BTCPayServer.Migrations
                 name: "RefundAddresses",
                 columns: table => new
                 {
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     Blob = table.Column<byte[]>(nullable: true),
-                    InvoiceDataId = table.Column<string>(nullable: true)
+                    InvoiceDataId = table.Column<string>(nullable: true, maxLength: maxLength)
                 },
                 constraints: table =>
                 {

BTCPayServer.Data/Migrations/20170926073744_Settings.cs

@@ -12,11 +12,12 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.CreateTable(
                 name: "Settings",
                 columns: table => new
                 {
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     Value = table.Column<string>(nullable: true)
                 },
                 constraints: table =>

BTCPayServer.Data/Migrations/20170926084408_RequiresEmailConfirmation.cs

@@ -12,6 +12,7 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.AddColumn<bool>(
                 name: "RequiresEmailConfirmation",
                 table: "AspNetUsers",

BTCPayServer.Data/Migrations/20171006013443_AddressMapping.cs

@@ -12,12 +12,13 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.CreateTable(
                 name: "AddressInvoices",
                 columns: table => new
                 {
-                    Address = table.Column<string>(nullable: false),
-                    InvoiceDataId = table.Column<string>(nullable: true)
+                    Address = table.Column<string>(nullable: false, maxLength: this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)512 : null),
+                    InvoiceDataId = table.Column<string>(nullable: true, maxLength: maxLength)
                 },
                 constraints: table =>
                 {

BTCPayServer.Data/Migrations/20171010082424_Tokens.cs

@@ -12,17 +12,18 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.CreateTable(
                 name: "PairedSINData",
                 columns: table => new
                 {
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     Facade = table.Column<string>(nullable: true),
                     Label = table.Column<string>(nullable: true),
                     Name = table.Column<string>(nullable: true),
                     PairingTime = table.Column<DateTimeOffset>(nullable: false),
                     SIN = table.Column<string>(nullable: true),
-                    StoreDataId = table.Column<string>(nullable: true)
+                    StoreDataId = table.Column<string>(nullable: true, maxLength: maxLength)
                 },
                 constraints: table =>
                 {
@@ -33,14 +34,14 @@ namespace BTCPayServer.Migrations
                 name: "PairingCodes",
                 columns: table => new
                 {
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     DateCreated = table.Column<DateTime>(nullable: false),
                     Expiration = table.Column<DateTimeOffset>(nullable: false),
                     Facade = table.Column<string>(nullable: true),
                     Label = table.Column<string>(nullable: true),
                     Name = table.Column<string>(nullable: true),
                     SIN = table.Column<string>(nullable: true),
-                    StoreDataId = table.Column<string>(nullable: true),
+                    StoreDataId = table.Column<string>(nullable: true, maxLength: maxLength),
                     TokenValue = table.Column<string>(nullable: true)
                 },
                 constraints: table =>

BTCPayServer.Data/Migrations/20171012020112_PendingInvoices.cs

@@ -12,6 +12,7 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             if (this.SupportDropColumn(migrationBuilder.ActiveProvider))
             {
                 migrationBuilder.DropColumn(
@@ -26,7 +27,7 @@ namespace BTCPayServer.Migrations
                 name: "PendingInvoices",
                 columns: table => new
                 {
-                    Id = table.Column<string>(nullable: false)
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength)
                 },
                 constraints: table =>
                 {

BTCPayServer.Data/Migrations/20171023101754_StoreBlob.cs

@@ -12,6 +12,7 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.AddColumn<byte[]>(
                 name: "StoreBlob",
                 table: "Stores",

BTCPayServer.Data/Migrations/20171024163354_RenewUsedAddresses.cs

@@ -12,6 +12,7 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.AddColumn<DateTimeOffset>(
                 name: "CreatedTime",
                 table: "AddressInvoices",
@@ -21,7 +22,7 @@ namespace BTCPayServer.Migrations
                 name: "HistoricalAddressInvoices",
                 columns: table => new
                 {
-                    InvoiceDataId = table.Column<string>(nullable: false),
+                    InvoiceDataId = table.Column<string>(nullable: false, maxLength: maxLength),
                     Address = table.Column<string>(nullable: false),
                     Assigned = table.Column<DateTimeOffset>(nullable: false),
                     UnAssigned = table.Column<DateTimeOffset>(nullable: true)

BTCPayServer.Data/Migrations/20171105235734_PaymentAccounted.cs

@@ -12,6 +12,7 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.AddColumn<bool>(
                 name: "Accounted",
                 table: "Payments",

BTCPayServer.Data/Migrations/20171221054550_AltcoinSupport.cs

@@ -12,6 +12,7 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.AddColumn<string>(
                 name: "CryptoCode",
                 table: "HistoricalAddressInvoices",

BTCPayServer.Data/Migrations/20180106095215_DerivationStrategies.cs

@@ -12,6 +12,7 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.AddColumn<string>(
                 name: "DerivationStrategies",
                 table: "Stores",

BTCPayServer.Data/Migrations/20180109021122_defaultcrypto.cs

@@ -12,6 +12,7 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.AddColumn<string>(
                 name: "DefaultCrypto",
                 table: "Stores",

BTCPayServer.Data/Migrations/20180114123253_events.cs

@@ -12,12 +12,13 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.CreateTable(
                 name: "InvoiceEvents",
                 columns: table => new
                 {
-                    InvoiceDataId = table.Column<string>(nullable: false),
-                    UniqueId = table.Column<string>(nullable: false),
+                    InvoiceDataId = table.Column<string>(nullable: false, maxLength: maxLength),
+                    UniqueId = table.Column<string>(nullable: false, maxLength: maxLength),
                     Message = table.Column<string>(nullable: true),
                     Timestamp = table.Column<DateTimeOffset>(nullable: false)
                 },

BTCPayServer.Data/Migrations/20180402095640_appdata.cs

@@ -12,16 +12,17 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.CreateTable(
                 name: "Apps",
                 columns: table => new
                 {
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     AppType = table.Column<string>(nullable: true),
                     Created = table.Column<DateTimeOffset>(nullable: false),
                     Name = table.Column<string>(nullable: true),
                     Settings = table.Column<string>(nullable: true),
-                    StoreDataId = table.Column<string>(nullable: true)
+                    StoreDataId = table.Column<string>(nullable: true, maxLength: maxLength)
                 },
                 constraints: table =>
                 {

BTCPayServer.Data/Migrations/20180429083930_legacyapikey.cs

@@ -12,6 +12,7 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.CreateTable(
                 name: "ApiKeys",
                 columns: table => new

BTCPayServer.Data/Migrations/20180719095626_CanDeleteStores.cs

@@ -10,6 +10,7 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             if (this.SupportDropForeignKey(migrationBuilder.ActiveProvider))
             {
                 migrationBuilder.DropForeignKey(

BTCPayServer.Data/Migrations/20190121133309_AddPaymentRequests.cs

@@ -11,12 +11,13 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.CreateTable(
                 name: "PaymentRequests",
                 columns: table => new
                 {
-                    Id = table.Column<string>(nullable: false),
-                    StoreDataId = table.Column<string>(nullable: true),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
+                    StoreDataId = table.Column<string>(nullable: true, maxLength: maxLength),
                     Status = table.Column<int>(nullable: false),
                     Blob = table.Column<byte[]>(nullable: true)
                 },

BTCPayServer.Data/Migrations/20190219032533_AppsTagging.cs

@@ -10,6 +10,7 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.AddColumn<bool>(
                 name: "TagAllInvoices",
                 table: "Apps",

BTCPayServer.Data/Migrations/20190225091644_AddOpenIddict.cs

@@ -11,6 +11,7 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.CreateTable(
                 name: "OpenIddictApplications",
                 columns: table => new
@@ -20,13 +21,13 @@ namespace BTCPayServer.Migrations
                     ConcurrencyToken = table.Column<string>(maxLength: 50, nullable: true),
                     ConsentType = table.Column<string>(nullable: true),
                     DisplayName = table.Column<string>(nullable: true),
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     Permissions = table.Column<string>(nullable: true),
                     PostLogoutRedirectUris = table.Column<string>(nullable: true),
                     Properties = table.Column<string>(nullable: true),
                     RedirectUris = table.Column<string>(nullable: true),
                     Type = table.Column<string>(maxLength: 25, nullable: false),
-                    ApplicationUserId = table.Column<string>(nullable: true)
+                    ApplicationUserId = table.Column<string>(nullable: true, maxLength: maxLength)
                 },
                 constraints: table =>
                 {
@@ -46,7 +47,7 @@ namespace BTCPayServer.Migrations
                     ConcurrencyToken = table.Column<string>(maxLength: 50, nullable: true),
                     Description = table.Column<string>(nullable: true),
                     DisplayName = table.Column<string>(nullable: true),
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     Name = table.Column<string>(maxLength: 200, nullable: false),
                     Properties = table.Column<string>(nullable: true),
                     Resources = table.Column<string>(nullable: true)
@@ -60,9 +61,9 @@ namespace BTCPayServer.Migrations
                 name: "OpenIddictAuthorizations",
                 columns: table => new
                 {
-                    ApplicationId = table.Column<string>(nullable: true),
+                    ApplicationId = table.Column<string>(nullable: true, maxLength: maxLength),
                     ConcurrencyToken = table.Column<string>(maxLength: 50, nullable: true),
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     Properties = table.Column<string>(nullable: true),
                     Scopes = table.Column<string>(nullable: true),
                     Status = table.Column<string>(maxLength: 25, nullable: false),
@@ -84,12 +85,12 @@ namespace BTCPayServer.Migrations
                 name: "OpenIddictTokens",
                 columns: table => new
                 {
-                    ApplicationId = table.Column<string>(nullable: true),
-                    AuthorizationId = table.Column<string>(nullable: true),
+                    ApplicationId = table.Column<string>(nullable: true, maxLength: maxLength),
+                    AuthorizationId = table.Column<string>(nullable: true, maxLength: maxLength),
                     ConcurrencyToken = table.Column<string>(maxLength: 50, nullable: true),
                     CreationDate = table.Column<DateTimeOffset>(nullable: true),
                     ExpirationDate = table.Column<DateTimeOffset>(nullable: true),
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     Payload = table.Column<string>(nullable: true),
                     Properties = table.Column<string>(nullable: true),
                     ReferenceId = table.Column<string>(maxLength: 100, nullable: true),

BTCPayServer.Data/Migrations/20190324141717_AddFiles.cs

@@ -11,15 +11,16 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.CreateTable(
                 name: "Files",
                 columns: table => new
                 {
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     FileName = table.Column<string>(nullable: true),
                     StorageFileName = table.Column<string>(nullable: true),
                     Timestamp = table.Column<DateTime>(nullable: false),
-                    ApplicationUserId = table.Column<string>(nullable: true)
+                    ApplicationUserId = table.Column<string>(nullable: true, maxLength: maxLength)
                 },
                 constraints: table =>
                 {

BTCPayServer.Data/Migrations/20190425081749_AddU2fDevices.cs

@@ -11,6 +11,7 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             if (this.SupportDropColumn(migrationBuilder.ActiveProvider))
             {
                 migrationBuilder.DropColumn(
@@ -22,13 +23,13 @@ namespace BTCPayServer.Migrations
                 name: "U2FDevices",
                 columns: table => new
                 {
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     Name = table.Column<string>(nullable: true),
                     KeyHandle = table.Column<byte[]>(nullable: false),
                     PublicKey = table.Column<byte[]>(nullable: false),
                     AttestationCert = table.Column<byte[]>(nullable: false),
                     Counter = table.Column<int>(nullable: false),
-                    ApplicationUserId = table.Column<string>(nullable: true)
+                    ApplicationUserId = table.Column<string>(nullable: true, maxLength: maxLength)
                 },
                 constraints: table =>
                 {

BTCPayServer.Data/Migrations/20190701082105_sort_paymentrequests.cs

@@ -11,6 +11,7 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.AddColumn<DateTimeOffset>(
                 name: "Created",
                 table: "PaymentRequests",

BTCPayServer.Data/Migrations/20190802142637_WalletData.cs

@@ -11,11 +11,12 @@ namespace BTCPayServer.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            int? maxLength = this.IsMySql(migrationBuilder.ActiveProvider) ? (int?)255 : null;
             migrationBuilder.CreateTable(
                 name: "Wallets",
                 columns: table => new
                 {
-                    Id = table.Column<string>(nullable: false),
+                    Id = table.Column<string>(nullable: false, maxLength: maxLength),
                     Blob = table.Column<byte[]>(nullable: true)
                 },
                 constraints: table =>
@@ -27,8 +28,8 @@ namespace BTCPayServer.Migrations
                 name: "WalletTransactions",
                 columns: table => new
                 {
-                    WalletDataId = table.Column<string>(nullable: false),
-                    TransactionId = table.Column<string>(nullable: false),
+                    WalletDataId = table.Column<string>(nullable: false, maxLength: maxLength),
+                    TransactionId = table.Column<string>(nullable: false, maxLength: maxLength),
                     Labels = table.Column<string>(nullable: true),
                     Blob = table.Column<byte[]>(nullable: true)
                 },

BTCPayServer.Data/Migrations/20200110064617_OpenIddictUpdate.cs

@@ -0,0 +1,244 @@
+using System;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20200110064617_OpenIddictUpdate")]
+    public partial class OpenIddictUpdate : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            if (!migrationBuilder.IsSqlite())
+            {
+                migrationBuilder.AlterColumn<string>(
+                    name: "Subject",
+                    table: "OpenIddictTokens",
+                    maxLength: 450,
+                    nullable: true,
+                    oldClrType: typeof(string),
+                    oldMaxLength: 450);
+
+                migrationBuilder.AlterColumn<string>(
+                    name: "Subject",
+                    table: "OpenIddictAuthorizations",
+                    maxLength: 450,
+                    nullable: true,
+                    oldClrType: typeof(string),
+                    oldMaxLength: 450);
+            }
+
+            else
+            {
+                ReplaceOldTable(migrationBuilder, s =>
+                {
+                    migrationBuilder.CreateTable(
+                        name: s,
+                        columns: table => new
+                        {
+                            ApplicationId = table.Column<string>(nullable: true, maxLength: null),
+                            AuthorizationId = table.Column<string>(nullable: true, maxLength: null),
+                            ConcurrencyToken = table.Column<string>(maxLength: 50, nullable: true),
+                            CreationDate = table.Column<DateTimeOffset>(nullable: true),
+                            ExpirationDate = table.Column<DateTimeOffset>(nullable: true),
+                            Id = table.Column<string>(nullable: false, maxLength: null),
+                            Payload = table.Column<string>(nullable: true),
+                            Properties = table.Column<string>(nullable: true),
+                            ReferenceId = table.Column<string>(maxLength: 100, nullable: true),
+                            Status = table.Column<string>(maxLength: 25, nullable: false),
+                            Subject = table.Column<string>(maxLength: 450, nullable: true),
+                            Type = table.Column<string>(maxLength: 25, nullable: false)
+                        },
+                        constraints: table =>
+                        {
+                            table.PrimaryKey("PK_OpenIddictTokens", x => x.Id);
+                            table.ForeignKey(
+                                name: "FK_OpenIddictTokens_OpenIddictApplications_ApplicationId",
+                                column: x => x.ApplicationId,
+                                principalTable: "OpenIddictApplications",
+                                principalColumn: "Id",
+                                onDelete: ReferentialAction.Restrict);
+                            table.ForeignKey(
+                                name: "FK_OpenIddictTokens_OpenIddictAuthorizations_AuthorizationId",
+                                column: x => x.AuthorizationId,
+                                principalTable: "OpenIddictAuthorizations",
+                                principalColumn: "Id",
+                                onDelete: ReferentialAction.Restrict);
+                        });
+                }, "OpenIddictTokens");
+
+                ReplaceOldTable(migrationBuilder, s =>
+                {
+                    migrationBuilder.CreateTable(
+                        name: s,
+                        columns: table => new
+                        {
+                            ApplicationId = table.Column<string>(nullable: true, maxLength: null),
+                            ConcurrencyToken = table.Column<string>(maxLength: 50, nullable: true),
+                            Id = table.Column<string>(nullable: false, maxLength: null),
+                            Properties = table.Column<string>(nullable: true),
+                            Scopes = table.Column<string>(nullable: true),
+                            Status = table.Column<string>(maxLength: 25, nullable: false),
+                            Subject = table.Column<string>(maxLength: 450, nullable: true),
+                            Type = table.Column<string>(maxLength: 25, nullable: false)
+                        },
+                        constraints: table =>
+                        {
+                            table.PrimaryKey("PK_OpenIddictAuthorizations", x => x.Id);
+                            table.ForeignKey(
+                                name: "FK_OpenIddictAuthorizations_OpenIddictApplications_ApplicationId",
+                                column: x => x.ApplicationId,
+                                principalTable: "OpenIddictApplications",
+                                principalColumn: "Id",
+                                onDelete: ReferentialAction.Restrict);
+                        });
+                }, "OpenIddictAuthorizations");
+            }
+
+            migrationBuilder.AddColumn<string>(
+                name: "Requirements",
+                table: "OpenIddictApplications",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            if (!migrationBuilder.IsSqlite())
+            {
+                migrationBuilder.DropColumn(
+                    name: "Requirements",
+                    table: "OpenIddictApplications");
+
+                migrationBuilder.AlterColumn<string>(
+                    name: "Subject",
+                    table: "OpenIddictTokens",
+                    maxLength: 450,
+                    nullable: false,
+                    oldClrType: typeof(string),
+                    oldMaxLength: 450,
+                    oldNullable: true);
+
+                migrationBuilder.AlterColumn<string>(
+                    name: "Subject",
+                    table: "OpenIddictAuthorizations",
+                    maxLength: 450,
+                    nullable: false,
+                    oldClrType: typeof(string),
+                    oldMaxLength: 450,
+                    oldNullable: true);
+            }
+            else
+            {
+                ReplaceOldTable(migrationBuilder, s =>
+                {
+                    migrationBuilder.CreateTable(
+                        name: s,
+                        columns: table => new
+                        {
+                            ApplicationId = table.Column<string>(nullable: true, maxLength: null),
+                            AuthorizationId = table.Column<string>(nullable: true, maxLength: null),
+                            ConcurrencyToken = table.Column<string>(maxLength: 50, nullable: true),
+                            CreationDate = table.Column<DateTimeOffset>(nullable: true),
+                            ExpirationDate = table.Column<DateTimeOffset>(nullable: true),
+                            Id = table.Column<string>(nullable: false, maxLength: null),
+                            Payload = table.Column<string>(nullable: true),
+                            Properties = table.Column<string>(nullable: true),
+                            ReferenceId = table.Column<string>(maxLength: 100, nullable: true),
+                            Status = table.Column<string>(maxLength: 25, nullable: false),
+                            Subject = table.Column<string>(maxLength: 450, nullable: false),
+                            Type = table.Column<string>(maxLength: 25, nullable: false)
+                        },
+                        constraints: table =>
+                        {
+                            table.PrimaryKey("PK_OpenIddictTokens", x => x.Id);
+                            table.ForeignKey(
+                                name: "FK_OpenIddictTokens_OpenIddictApplications_ApplicationId",
+                                column: x => x.ApplicationId,
+                                principalTable: "OpenIddictApplications",
+                                principalColumn: "Id",
+                                onDelete: ReferentialAction.Restrict);
+                            table.ForeignKey(
+                                name: "FK_OpenIddictTokens_OpenIddictAuthorizations_AuthorizationId",
+                                column: x => x.AuthorizationId,
+                                principalTable: "OpenIddictAuthorizations",
+                                principalColumn: "Id",
+                                onDelete: ReferentialAction.Restrict);
+                        });
+                }, "OpenIddictTokens", "WHERE Subject IS NOT NULL");
+
+                ReplaceOldTable(migrationBuilder, s =>
+                {
+                    migrationBuilder.CreateTable(
+                        name: s,
+                        columns: table => new
+                        {
+                            ApplicationId = table.Column<string>(nullable: true, maxLength: null),
+                            ConcurrencyToken = table.Column<string>(maxLength: 50, nullable: true),
+                            Id = table.Column<string>(nullable: false, maxLength: null),
+                            Properties = table.Column<string>(nullable: true),
+                            Scopes = table.Column<string>(nullable: true),
+                            Status = table.Column<string>(maxLength: 25, nullable: false),
+                            Subject = table.Column<string>(maxLength: 450, nullable: false),
+                            Type = table.Column<string>(maxLength: 25, nullable: false)
+                        },
+                        constraints: table =>
+                        {
+                            table.PrimaryKey("PK_OpenIddictAuthorizations", x => x.Id);
+                            table.ForeignKey(
+                                name: "FK_OpenIddictAuthorizations_OpenIddictApplications_ApplicationId",
+                                column: x => x.ApplicationId,
+                                principalTable: "OpenIddictApplications",
+                                principalColumn: "Id",
+                                onDelete: ReferentialAction.Restrict);
+                        });
+                }, "OpenIddictAuthorizations", "WHERE Subject IS NOT NULL");
+
+                ReplaceOldTable(migrationBuilder, s =>
+                    {
+                        migrationBuilder.CreateTable(
+                            name: s,
+                            columns: table => new
+                            {
+                                ClientId = table.Column<string>(maxLength: 100, nullable: false),
+                                ClientSecret = table.Column<string>(nullable: true),
+                                ConcurrencyToken = table.Column<string>(maxLength: 50, nullable: true),
+                                ConsentType = table.Column<string>(nullable: true),
+                                DisplayName = table.Column<string>(nullable: true),
+                                Id = table.Column<string>(nullable: false, maxLength: null),
+                                Permissions = table.Column<string>(nullable: true),
+                                PostLogoutRedirectUris = table.Column<string>(nullable: true),
+                                Properties = table.Column<string>(nullable: true),
+                                RedirectUris = table.Column<string>(nullable: true),
+                                Type = table.Column<string>(maxLength: 25, nullable: false),
+                                ApplicationUserId = table.Column<string>(nullable: true, maxLength: null)
+                            },
+                            constraints: table =>
+                            {
+                                table.PrimaryKey("PK_OpenIddictApplications", x => x.Id);
+                                table.ForeignKey(
+                                    name: "FK_OpenIddictApplications_AspNetUsers_ApplicationUserId",
+                                    column: x => x.ApplicationUserId,
+                                    principalTable: "AspNetUsers",
+                                    principalColumn: "Id",
+                                    onDelete: ReferentialAction.Restrict);
+                            });
+                    }, "OpenIddictApplications", "",
+                    "ClientId, ClientSecret, ConcurrencyToken, ConsentType, DisplayName, Id, Permissions, PostLogoutRedirectUris, Properties, RedirectUris, Type, ApplicationUserId");
+            }
+        }
+
+        private void ReplaceOldTable(MigrationBuilder migrationBuilder, Action<string> createTable, string tableName,
+            string whereClause = "", string columns = "*")
+        {
+            createTable.Invoke($"New_{tableName}");
+            migrationBuilder.Sql(
+                $"INSERT INTO New_{tableName} {(columns == "*" ? string.Empty : $"({columns})")}SELECT {columns} FROM {tableName} {whereClause};");
+            migrationBuilder.Sql("PRAGMA foreign_keys=\"0\"", true);
+            migrationBuilder.Sql($"DROP TABLE {tableName}", true);
+            migrationBuilder.Sql($"ALTER TABLE New_{tableName} RENAME TO {tableName}", true);
+            migrationBuilder.Sql("PRAGMA foreign_keys=\"1\"", true);
+        }
+    }
+}

BTCPayServer.Data/MigrationsExtensions.cs

@@ -20,5 +20,9 @@ namespace BTCPayServer.Migrations
         {
             return facade.ProviderName != "Microsoft.EntityFrameworkCore.Sqlite";
         }
+        public static bool IsMySql(this Microsoft.EntityFrameworkCore.Migrations.Migration migration, string activeProvider)
+        {
+            return activeProvider == "Pomelo.EntityFrameworkCore.MySql";
+        }
     }
 }

BTCPayServer.Rating/AvailableRateProvider.cs

@@ -0,0 +1,29 @@
+namespace BTCPayServer.Rating
+{
+    public enum RateSource
+    {
+        Coingecko,
+        Direct
+    }
+    public class AvailableRateProvider
+    {
+        public string Name { get; }
+        public string Url { get; }
+        public string Id { get; }
+        public string SourceId { get; }
+        public RateSource Source { get; }
+
+        public AvailableRateProvider(string id, string name, string url) : this(id, id, name, url, RateSource.Direct)
+        {
+
+        }
+        public AvailableRateProvider(string id, string sourceId, string name, string url, RateSource source)
+        {
+            Id = id;
+            SourceId = sourceId;
+            Name = name;
+            Url = url;
+            Source = source;
+        }
+    }
+}

BTCPayServer.Rating/BTCPayServer.Rating.csproj

@@ -3,15 +3,10 @@
   <Import Project="../Build/Common.csproj" />
 
   <ItemGroup>
-    <Folder Include="Providers\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.14" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
-    <FrameworkReference Include="Microsoft.AspNetCore.App" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.3.1" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.6.3" />
   </ItemGroup>
 

BTCPayServer.Rating/CurrencyPair.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace BTCPayServer.Rating
 {

BTCPayServer.Rating/ExchangeRates.cs

@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace BTCPayServer.Rating
 {
@@ -12,7 +11,15 @@ namespace BTCPayServer.Rating
         Dictionary<string, ExchangeRate> _AllRates = new Dictionary<string, ExchangeRate>();
         public ExchangeRates()
         {
+            
+        }
 
+        public ExchangeRates(string exchangeName, IEnumerable<PairRate> rates)
+        {
+            foreach (var rate in rates)
+            {
+                Add(new ExchangeRate(exchangeName, rate.CurrencyPair, rate.BidAsk));
+            }
         }
         public ExchangeRates(IEnumerable<ExchangeRate> rates)
         {
@@ -219,6 +226,26 @@ namespace BTCPayServer.Rating
             return $"({Bid.ToString(CultureInfo.InvariantCulture)} , {Ask.ToString(CultureInfo.InvariantCulture)})";
         }
     }
+
+    public class PairRate
+    {
+        public PairRate(CurrencyPair currencyPair, BidAsk bidAsk)
+        {
+            if (currencyPair == null)
+                throw new ArgumentNullException(nameof(currencyPair));
+            if (bidAsk == null)
+                throw new ArgumentNullException(nameof(bidAsk));
+            this.CurrencyPair = currencyPair;
+            this.BidAsk = bidAsk;
+        }
+        public CurrencyPair CurrencyPair { get; }
+        public BidAsk BidAsk { get; }
+
+        public override string ToString()
+        {
+            return $"{CurrencyPair} == {BidAsk}";
+        }
+    }
     public class ExchangeRate
     {
         public ExchangeRate()

BTCPayServer.Rating/Providers/BackgroundFetcherRateProvider.cs

@@ -8,20 +8,65 @@ using BTCPayServer.Rating;
 using System.Threading;
 using Microsoft.Extensions.Logging.Abstractions;
 using BTCPayServer.Logging;
+using Newtonsoft.Json;
+using System.Reflection;
+using System.Globalization;
 
 namespace BTCPayServer.Services.Rates
 {
+    public class BackgroundFetcherState
+    {
+        public string ExchangeName { get; set; }
+        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+        public DateTimeOffset? LastRequested { get; set; }
+        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+        public DateTimeOffset? LastUpdated { get; set; }
+        [JsonProperty(ItemConverterType = typeof(BackgroundFetcherRateJsonConverter))]
+        public List<BackgroundFetcherRate> Rates { get; set; }
+    }
+    public class BackgroundFetcherRate
+    {
+        public CurrencyPair Pair { get; set; }
+        public BidAsk BidAsk { get; set; }
+    }
+    //This make the json more compact
+    class BackgroundFetcherRateJsonConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return typeof(BackgroundFetcherRate).GetTypeInfo().IsAssignableFrom(objectType.GetTypeInfo());
+        }
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            var value = (string)reader.Value;
+            var parts = value.Split('|');
+            return new BackgroundFetcherRate()
+            {
+                Pair = CurrencyPair.Parse(parts[0]),
+                BidAsk = new BidAsk(decimal.Parse(parts[1], CultureInfo.InvariantCulture), decimal.Parse(parts[2], CultureInfo.InvariantCulture))
+            };
+        }
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var rate = (BackgroundFetcherRate)value;
+            writer.WriteValue($"{rate.Pair}|{rate.BidAsk.Bid.ToString(CultureInfo.InvariantCulture)}|{rate.BidAsk.Ask.ToString(CultureInfo.InvariantCulture)}");
+        }
+    }
+
+    /// <summary>
+    /// This class is a decorator which handle caching and pre-emptive query to the underlying rate provider
+    /// </summary>
     public class BackgroundFetcherRateProvider : IRateProvider
     {
         public class LatestFetch
         {
-            public ExchangeRates Latest;
+            public PairRate[] Latest;
             public DateTimeOffset NextRefresh;
-            public TimeSpan Backoff = TimeSpan.FromSeconds(5.0); 
+            public TimeSpan Backoff = TimeSpan.FromSeconds(5.0);
+            public DateTimeOffset Updated;
             public DateTimeOffset Expiration;
             public Exception Exception;
-            public string ExchangeName;
-            internal ExchangeRates GetResult()
+            internal PairRate[] GetResult()
             {
                 if (Expiration <= DateTimeOffset.UtcNow)
                 {
@@ -31,7 +76,7 @@ namespace BTCPayServer.Services.Rates
                     }
                     else
                     {
-                        throw new InvalidOperationException($"The rate has expired ({ExchangeName})");
+                        throw new InvalidOperationException($"The rate has expired");
                     }
                 }
                 return Latest;
@@ -39,6 +84,7 @@ namespace BTCPayServer.Services.Rates
         }
 
         IRateProvider _Inner;
+        public IRateProvider Inner => _Inner;
 
         public BackgroundFetcherRateProvider(IRateProvider inner)
         {
@@ -47,7 +93,46 @@ namespace BTCPayServer.Services.Rates
             _Inner = inner;
         }
 
+        public BackgroundFetcherState GetState()
+        {
+            var state = new BackgroundFetcherState()
+            {
+                LastRequested = LastRequested
+            };
+            if (_Latest is LatestFetch fetch)
+            {
+                state.LastUpdated = fetch.Updated;
+                state.Rates = fetch.Latest
+                            .Select(r => new BackgroundFetcherRate()
+                            {
+                                Pair = r.CurrencyPair,
+                                BidAsk = r.BidAsk
+                            }).ToList();
+            }
+            return state;
+        }
+
+        public void LoadState(BackgroundFetcherState state)
+        {
+            if (state.LastRequested is DateTimeOffset lastRequested)
+                this.LastRequested = state.LastRequested;
+            if (state.LastUpdated is DateTimeOffset updated && state.Rates is List<BackgroundFetcherRate> rates)
+            {
+                var fetch = new LatestFetch()
+                {
+                    Latest = rates.Select(r => new PairRate(r.Pair, r.BidAsk)).ToArray(),
+                    Updated = updated,
+                    NextRefresh = updated + RefreshRate,
+                    Expiration = updated + ValidatyTime
+                };
+                _Latest = fetch;
+            }
+        }
+
         TimeSpan _RefreshRate = TimeSpan.FromSeconds(30);
+        /// <summary>
+        /// The timespan after which <see cref="UpdateIfNecessary(CancellationToken)"/> will get the rates from the underlying rate provider
+        /// </summary>
         public TimeSpan RefreshRate
         {
             get
@@ -65,6 +150,9 @@ namespace BTCPayServer.Services.Rates
         }
 
         TimeSpan _ValidatyTime = TimeSpan.FromMinutes(10);
+        /// <summary>
+        /// The timespan after which calls to <see cref="GetRatesAsync(CancellationToken)"/> will query underlying provider if the rate has not been updated
+        /// </summary>
         public TimeSpan ValidatyTime
         {
             get
@@ -110,35 +198,46 @@ namespace BTCPayServer.Services.Rates
         }
 
         LatestFetch _Latest;
-        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
+        public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
+            LastRequested = DateTimeOffset.UtcNow;
             var latest = _Latest;
             if (!DoNotAutoFetchIfExpired && latest != null && latest.Expiration <= DateTimeOffset.UtcNow + TimeSpan.FromSeconds(1.0))
             {
-                Logs.PayServer.LogWarning($"GetRatesAsync was called on {GetExchangeName()} when the rate is outdated. It should never happen, let BTCPayServer developers know about this.");
                 latest = null;
             }
             return (latest ?? (await Fetch(cancellationToken))).GetResult();
         }
 
-        private string GetExchangeName()
+        /// <summary>
+        /// The last time this rate provider has been used
+        /// </summary>
+        public DateTimeOffset? LastRequested { get; set; }
+
+        public DateTimeOffset? Expiration
         {
-            if (_Inner is IHasExchangeName exchangeName)
-                return exchangeName.ExchangeName ?? "???";
-            return "???";
+            get
+            {
+                if (_Latest is LatestFetch f)
+                {
+                    return f.Expiration;
+                }
+                return null;
+            }
         }
 
         private async Task<LatestFetch> Fetch(CancellationToken cancellationToken)
         {
+            cancellationToken.ThrowIfCancellationRequested();
             var previous = _Latest;
             var fetch = new LatestFetch();
-            fetch.ExchangeName = GetExchangeName();
             try
             {
                 var rates = await _Inner.GetRatesAsync(cancellationToken);
                 fetch.Latest = rates;
-                fetch.Expiration = DateTimeOffset.UtcNow + ValidatyTime;
-                fetch.NextRefresh = DateTimeOffset.UtcNow + RefreshRate;
+                fetch.Updated = DateTimeOffset.UtcNow;
+                fetch.Expiration = fetch.Updated + ValidatyTime;
+                fetch.NextRefresh = fetch.Updated + RefreshRate;
             }
             catch (Exception ex)
             {

BTCPayServer.Rating/Providers/BitbankRateProvider.cs

@@ -9,24 +9,22 @@ using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Services.Rates
 {
-    public class BitbankRateProvider : IRateProvider, IHasExchangeName
+    public class BitbankRateProvider : IRateProvider
     {
         private readonly HttpClient _httpClient;
         public BitbankRateProvider(HttpClient httpClient)
         {
             _httpClient = httpClient ?? new HttpClient();
         }
-        public string ExchangeName => "bitbank";
 
-        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
+        public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
             var response = await _httpClient.GetAsync("https://public.bitbank.cc/prices", cancellationToken);
             var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
-            return new ExchangeRates(((jobj["data"] as JObject) ?? new JObject())
+            return ((jobj["data"] as JObject) ?? new JObject())
                 .Properties()
-                .Select(p => new ExchangeRate(ExchangeName, CurrencyPair.Parse(p.Name), CreateBidAsk(p)))
-                .ToArray());
-
+                .Select(p => new PairRate(CurrencyPair.Parse(p.Name), CreateBidAsk(p)))
+                .ToArray();
         }
 
         private static BidAsk CreateBidAsk(JProperty p)

BTCPayServer.Rating/Providers/BitpayRateProvider.cs

@@ -10,26 +10,23 @@ using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Services.Rates
 {
-    public class BitpayRateProvider : IRateProvider, IHasExchangeName
+    public class BitpayRateProvider : IRateProvider
     {
-        public const string BitpayName = "bitpay";
         private readonly HttpClient _httpClient;
         public BitpayRateProvider(HttpClient httpClient)
         {
             _httpClient = httpClient ?? new HttpClient();
         }
 
-        public string ExchangeName => BitpayName;
-
-        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
+        public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
             var response = await _httpClient.GetAsync("https://bitpay.com/rates", cancellationToken);
             var jarray = (JArray)(await response.Content.ReadAsAsync<JObject>(cancellationToken))["data"];
-            return new ExchangeRates(jarray
+            return jarray
                 .Children<JObject>()
-                .Select(jobj => new ExchangeRate(ExchangeName, new CurrencyPair("BTC", jobj["code"].Value<string>()), new BidAsk(jobj["rate"].Value<decimal>())))
+                .Select(jobj => new PairRate(new CurrencyPair("BTC", jobj["code"].Value<string>()), new BidAsk(jobj["rate"].Value<decimal>())))
                 .Where(o => o.CurrencyPair.Right != "BTC")
-                .ToArray());
+                .ToArray();
         }
     }
 }

BTCPayServer.Rating/Providers/ByllsRateProvider.cs

@@ -7,21 +7,20 @@ using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Services.Rates
 {
-    public class ByllsRateProvider : IRateProvider, IHasExchangeName
+    public class ByllsRateProvider : IRateProvider
     {
         private readonly HttpClient _httpClient;
         public ByllsRateProvider(HttpClient httpClient)
         {
             _httpClient = httpClient ?? new HttpClient();
         }
-        public string ExchangeName => "bylls";
 
-        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
+        public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
             var response = await _httpClient.GetAsync("https://bylls.com/api/price?from_currency=BTC&to_currency=CAD", cancellationToken);
             var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
             var value = jobj["public_price"]["to_price"].Value<decimal>();
-            return new ExchangeRates(new[] { new ExchangeRate(ExchangeName, new CurrencyPair("BTC", "CAD"), new BidAsk(value)) });
+            return new[] { new PairRate(new CurrencyPair("BTC", "CAD"), new BidAsk(value)) };
         }
     }
 }

BTCPayServer.Rating/Providers/CachedRateProvider.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using BTCPayServer.Rating;
-using BTCPayServer.Services.Rates;
-using Microsoft.Extensions.Caching.Memory;
-
-namespace BTCPayServer.Services.Rates
-{
-    public class CachedRateProvider : IRateProvider, IHasExchangeName
-    {
-        private IRateProvider _Inner;
-        private IMemoryCache _MemoryCache;
-
-        public CachedRateProvider(string exchangeName, IRateProvider inner, IMemoryCache memoryCache)
-        {
-            if (inner == null)
-                throw new ArgumentNullException(nameof(inner));
-            if (memoryCache == null)
-                throw new ArgumentNullException(nameof(memoryCache));
-            this._Inner = inner;
-            this.MemoryCache = memoryCache;
-            this.ExchangeName = exchangeName;
-        }
-
-        public IRateProvider Inner
-        {
-            get
-            {
-                return _Inner;
-            }
-        }
-
-        public string ExchangeName { get; }
-
-        public TimeSpan CacheSpan
-        {
-            get;
-            set;
-        } = TimeSpan.FromMinutes(1.0);
-        public IMemoryCache MemoryCache { get => _MemoryCache; set => _MemoryCache = value; }
-        
-        public Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
-        {
-            return MemoryCache.GetOrCreateAsync("EXCHANGE_RATES_" + ExchangeName, (ICacheEntry entry) =>
-            {
-                entry.AbsoluteExpiration = DateTimeOffset.UtcNow + CacheSpan;
-                return _Inner.GetRatesAsync(cancellationToken);
-            });
-        }
-    }
-}

BTCPayServer.Rating/Providers/CoinAverageRateProvider.cs

@@ -1,238 +0,0 @@
-using Newtonsoft.Json;
-using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Net.Http;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
-using System.ComponentModel;
-using BTCPayServer.Rating;
-using System.Threading;
-
-namespace BTCPayServer.Services.Rates
-{
-    public class CoinAverageException : Exception
-    {
-        public CoinAverageException(string message) : base(message)
-        {
-
-        }
-    }
-
-    public class GetExchangeTickersResponse
-    {
-        public class Exchange
-        {
-            public string Name { get; set; }
-            [JsonProperty("display_name")]
-            public string DisplayName { get; set; }
-            public string[] Symbols { get; set; }
-        }
-        public bool Success { get; set; }
-        public Exchange[] Exchanges { get; set; }
-    }
-
-    public class RatesSetting
-    {
-        public string PublicKey { get; set; }
-        public string PrivateKey { get; set; }
-        [DefaultValue(15)]
-        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
-        public int CacheInMinutes { get; set; } = 15;
-    }
-
-    public interface ICoinAverageAuthenticator
-    {
-        Task AddHeader(HttpRequestMessage message);
-    }
-
-    public class CoinAverageRateProvider : IRateProvider, IHasExchangeName
-    {
-        public const string CoinAverageName = "coinaverage";
-        public CoinAverageRateProvider()
-        {
-
-        }
-
-        public HttpClient HttpClient
-        {
-            get
-            {
-                return _LocalClient ?? _Client;
-            }
-            set
-            {
-                _LocalClient = value;
-            }
-        }
-        HttpClient _LocalClient;
-        static HttpClient _Client = new HttpClient();
-
-        public string Exchange { get; set; } = CoinAverageName;
-
-        public string CryptoCode { get; set; }
-
-        public string Market
-        {
-            get; set;
-        } = "global";
-
-        public ICoinAverageAuthenticator Authenticator { get; set; }
-
-        public string ExchangeName => Exchange ?? CoinAverageName;
-
-        private bool TryToBidAsk(JProperty p, out BidAsk bidAsk)
-        {
-            bidAsk = null;
-            if (Exchange == CoinAverageName)
-            {
-                JToken last = p.Value["last"];
-                if (!decimal.TryParse(last.Value<string>(), System.Globalization.NumberStyles.AllowExponent | System.Globalization.NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var v) ||
-                    v <= 0)
-                    return false;
-                bidAsk = new BidAsk(v);
-                return true;
-            }
-            else
-            {
-                JToken bid = p.Value["bid"];
-                JToken ask = p.Value["ask"];
-                if (bid == null || ask == null ||
-                    !decimal.TryParse(bid.Value<string>(), System.Globalization.NumberStyles.AllowExponent | System.Globalization.NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var v1) ||
-                    !decimal.TryParse(ask.Value<string>(), System.Globalization.NumberStyles.AllowExponent | System.Globalization.NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var v2) ||
-                    v1 > v2 ||
-                    v1 <= 0 || v2 <= 0)
-                    return false;
-                bidAsk = new BidAsk(v1, v2);
-                return true;
-            }
-        }
-
-        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
-        {
-            string url = Exchange == CoinAverageName ? $"https://apiv2.bitcoinaverage.com/indices/{Market}/ticker/short"
-                                         : $"https://apiv2.bitcoinaverage.com/exchanges/{Exchange}";
-
-            var request = new HttpRequestMessage(HttpMethod.Get, url);
-            var auth = Authenticator;
-            if (auth != null)
-            {
-                await auth.AddHeader(request);
-            }
-            var resp = await HttpClient.SendAsync(request, cancellationToken);
-            using (resp)
-            {
-
-                if ((int)resp.StatusCode == 401)
-                    throw new CoinAverageException("Unauthorized access to the API");
-                if ((int)resp.StatusCode == 429)
-                    throw new CoinAverageException("Exceed API limits");
-                if ((int)resp.StatusCode == 403)
-                    throw new CoinAverageException("Unauthorized access to the API, premium plan needed");
-                resp.EnsureSuccessStatusCode();
-                var rates = JObject.Parse(await resp.Content.ReadAsStringAsync());
-                if (Exchange != CoinAverageName)
-                {
-                    rates = (JObject)rates["symbols"];
-                }
-
-                var exchangeRates = new ExchangeRates();
-                foreach (var prop in rates.Properties())
-                {
-                    ExchangeRate exchangeRate = new ExchangeRate();
-                    exchangeRate.Exchange = Exchange;
-                    if (!TryToBidAsk(prop, out var value))
-                        continue;
-                    exchangeRate.BidAsk = value;
-                    if (CurrencyPair.TryParse(prop.Name, out var pair))
-                    {
-                        exchangeRate.CurrencyPair = pair;
-                        exchangeRates.Add(exchangeRate);
-                    }
-                }
-                return exchangeRates;
-            }
-        }
-
-        public async Task TestAuthAsync()
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, "https://apiv2.bitcoinaverage.com/blockchain/tx_price/BTCUSD/8a3b4394ba811a9e2b0bbf3cc56888d053ea21909299b2703cdc35e156c860ff");
-            var auth = Authenticator;
-            if (auth != null)
-            {
-                await auth.AddHeader(request);
-            }
-            var resp = await HttpClient.SendAsync(request);
-            resp.EnsureSuccessStatusCode();
-        }
-
-        public async Task<GetRateLimitsResponse> GetRateLimitsAsync()
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, "https://apiv2.bitcoinaverage.com/info/ratelimits");
-            var auth = Authenticator;
-            if (auth != null)
-            {
-                await auth.AddHeader(request);
-            }
-            var resp = await HttpClient.SendAsync(request);
-            resp.EnsureSuccessStatusCode();
-            var jobj = JObject.Parse(await resp.Content.ReadAsStringAsync());
-            var response = new GetRateLimitsResponse();
-            response.CounterReset = TimeSpan.FromSeconds(jobj["counter_reset"].Value<int>());
-            var totalPeriod = jobj["total_period"].Value<string>();
-            if (totalPeriod == "24h")
-            {
-                response.TotalPeriod = TimeSpan.FromHours(24);
-            }
-            else if (totalPeriod == "30d")
-            {
-                response.TotalPeriod = TimeSpan.FromDays(30);
-            }
-            else
-            {
-                response.TotalPeriod = TimeSpan.FromSeconds(jobj["total_period"].Value<int>());
-            }
-            response.RequestsLeft = jobj["requests_left"].Value<int>();
-            response.RequestsPerPeriod = jobj["requests_per_period"].Value<int>();
-            return response;
-        }
-
-        public async Task<GetExchangeTickersResponse> GetExchangeTickersAsync()
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, "https://apiv2.bitcoinaverage.com/symbols/exchanges/ticker");
-            var auth = Authenticator;
-            if (auth != null)
-            {
-                await auth.AddHeader(request);
-            }
-            var resp = await HttpClient.SendAsync(request);
-            resp.EnsureSuccessStatusCode();
-            var jobj = JObject.Parse(await resp.Content.ReadAsStringAsync());
-            var response = new GetExchangeTickersResponse();
-            response.Success = jobj["success"].Value<bool>();
-            var exchanges = (JObject)jobj["exchanges"];
-            response.Exchanges = exchanges
-                .Properties()
-                .Select(p =>
-                {
-                    var exchange = JsonConvert.DeserializeObject<GetExchangeTickersResponse.Exchange>(p.Value.ToString());
-                    exchange.Name = p.Name;
-                    return exchange;
-                })
-                .ToArray();
-            return response;
-        }
-    }
-
-    public class GetRateLimitsResponse
-    {
-        public TimeSpan CounterReset { get; set; }
-        public int RequestsLeft { get; set; }
-        public int RequestsPerPeriod { get; set; }
-        public TimeSpan TotalPeriod { get; set; }
-    }
-}

BTCPayServer.Rating/Providers/CoinAverageSettings.cs

@@ -1,166 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BTCPayServer.Services.Rates
-{
-    public class CoinAverageSettingsAuthenticator : ICoinAverageAuthenticator
-    {
-        CoinAverageSettings _Settings;
-        public CoinAverageSettingsAuthenticator(CoinAverageSettings settings)
-        {
-            _Settings = settings;
-        }
-        public Task AddHeader(HttpRequestMessage message)
-        {
-            return _Settings.AddHeader(message);
-        }
-    }
-
-    public class CoinAverageExchange
-    {
-        public CoinAverageExchange(string name, string display, string url)
-        {
-            Name = name;
-            Display = display;
-            Url = url;
-        }
-        public string Name { get; set; }
-        public string Display { get; set; }
-        public string Url
-        {
-            get;
-            set;
-        }
-    }
-    public class CoinAverageExchanges : Dictionary<string, CoinAverageExchange>
-    {
-        public CoinAverageExchanges()
-        {
-        }
-
-        public void Add(CoinAverageExchange exchange)
-        {
-            if (!TryAdd(exchange.Name, exchange))
-            {
-                this.Remove(exchange.Name);
-                this.Add(exchange.Name, exchange);
-            }
-        }
-    }
-    public class CoinAverageSettings : ICoinAverageAuthenticator
-    {
-        private static readonly DateTime _epochUtc = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
-
-        public (String PublicKey, String PrivateKey)? KeyPair { get; set; }
-        public CoinAverageExchanges AvailableExchanges { get; set; } = new CoinAverageExchanges();
-
-        public CoinAverageSettings()
-        {
-            //GENERATED BY:
-            //StringBuilder b = new StringBuilder();
-            //b.AppendLine("_coinAverageSettings.AvailableExchanges = new[] {");
-            //foreach (var availableExchange in _coinAverageSettings.AvailableExchanges)
-            //{
-            //    b.AppendLine($"(DisplayName: \"{availableExchange.DisplayName}\", Name: \"{availableExchange.Name}\"),");
-            //}
-            //b.AppendLine("}.ToArray()");
-            AvailableExchanges = new CoinAverageExchanges();
-            foreach (var item in
-             new[] {
-                (DisplayName: "Idex", Name: "idex"),
-                (DisplayName: "Coinfloor", Name: "coinfloor"),
-                (DisplayName: "Okex", Name: "okex"),
-                (DisplayName: "Bitfinex", Name: "bitfinex"),
-                (DisplayName: "Bittylicious", Name: "bittylicious"),
-                (DisplayName: "BTC Markets", Name: "btcmarkets"),
-                (DisplayName: "Kucoin", Name: "kucoin"),
-                (DisplayName: "IDAX", Name: "idax"),
-                (DisplayName: "Kraken", Name: "kraken"),
-                (DisplayName: "Bit2C", Name: "bit2c"),
-                (DisplayName: "Mercado Bitcoin", Name: "mercado"),
-                (DisplayName: "CEX.IO", Name: "cex"),
-                (DisplayName: "Bitex.la", Name: "bitex"),
-                (DisplayName: "Quoine", Name: "quoine"),
-                (DisplayName: "Stex", Name: "stex"),
-                (DisplayName: "CoinTiger", Name: "cointiger"),
-                (DisplayName: "Poloniex", Name: "poloniex"),
-                (DisplayName: "Zaif", Name: "zaif"),
-                (DisplayName: "Huobi", Name: "huobi"),
-                (DisplayName: "QuickBitcoin", Name: "quickbitcoin"),
-                (DisplayName: "Tidex", Name: "tidex"),
-                (DisplayName: "Tokenomy", Name: "tokenomy"),
-                (DisplayName: "Bitcoin.co.id", Name: "bitcoin_co_id"),
-                (DisplayName: "Kryptono", Name: "kryptono"),
-                (DisplayName: "Bitso", Name: "bitso"),
-                (DisplayName: "Korbit", Name: "korbit"),
-                (DisplayName: "Yobit", Name: "yobit"),
-                (DisplayName: "BitBargain", Name: "bitbargain"),
-                (DisplayName: "Livecoin", Name: "livecoin"),
-                (DisplayName: "Hotbit", Name: "hotbit"),
-                (DisplayName: "Coincheck", Name: "coincheck"),
-                (DisplayName: "Binance", Name: "binance"),
-                (DisplayName: "Bit-Z", Name: "bitz"),
-                (DisplayName: "Coinbase Pro", Name: "coinbasepro"),
-                (DisplayName: "Rock Trading", Name: "rocktrading"),
-                (DisplayName: "Bittrex", Name: "bittrex"),
-                (DisplayName: "BitBay", Name: "bitbay"),
-                (DisplayName: "Tokenize", Name: "tokenize"),
-                (DisplayName: "Hitbtc", Name: "hitbtc"),
-                (DisplayName: "Upbit", Name: "upbit"),
-                (DisplayName: "Bitstamp", Name: "bitstamp"),
-                (DisplayName: "Luno", Name: "luno"),
-                (DisplayName: "Trade.io", Name: "tradeio"),
-                (DisplayName: "LocalBitcoins", Name: "localbitcoins"),
-                (DisplayName: "Independent Reserve", Name: "independentreserve"),
-                (DisplayName: "Coinsquare", Name: "coinsquare"),
-                (DisplayName: "Exmoney", Name: "exmoney"),
-                (DisplayName: "Coinegg", Name: "coinegg"),
-                (DisplayName: "FYB-SG", Name: "fybsg"),
-                (DisplayName: "Cryptonit", Name: "cryptonit"),
-                (DisplayName: "BTCTurk", Name: "btcturk"),
-                (DisplayName: "bitFlyer", Name: "bitflyer"),
-                (DisplayName: "Negocie Coins", Name: "negociecoins"),
-                (DisplayName: "OasisDEX", Name: "oasisdex"),
-                (DisplayName: "CoinMate", Name: "coinmate"),
-                (DisplayName: "BitForex", Name: "bitforex"),
-                (DisplayName: "Bitsquare", Name: "bitsquare"),
-                (DisplayName: "FYB-SE", Name: "fybse"),
-                (DisplayName: "itBit", Name: "itbit"),
-                })
-            {
-                AvailableExchanges.TryAdd(item.Name, new CoinAverageExchange(item.Name, item.DisplayName, $"https://apiv2.bitcoinaverage.com/exchanges/{item.Name}"));
-            }
-            // Keep back-compat
-            AvailableExchanges.Add(new CoinAverageExchange("gdax", string.Empty, $"https://apiv2.bitcoinaverage.com/exchanges/coinbasepro"));
-        }
-
-        public Task AddHeader(HttpRequestMessage message)
-        {
-            var signature = GetCoinAverageSignature();
-            if (signature != null)
-            {
-                message.Headers.Add("X-signature", signature);
-            }
-            return Task.CompletedTask;
-        }
-
-        public string GetCoinAverageSignature()
-        {
-            var keyPair = KeyPair;
-            if (!keyPair.HasValue)
-                return null;
-            if (string.IsNullOrEmpty(keyPair.Value.PublicKey) || string.IsNullOrEmpty(keyPair.Value.PrivateKey))
-                return null;
-            var timestamp = (int)((DateTime.UtcNow - _epochUtc).TotalSeconds);
-            var payload = timestamp + "." + keyPair.Value.PublicKey;
-            var digestValueBytes = new HMACSHA256(Encoding.ASCII.GetBytes(keyPair.Value.PrivateKey)).ComputeHash(Encoding.ASCII.GetBytes(payload));
-            var digestValueHex = NBitcoin.DataEncoders.Encoders.Hex.EncodeData(digestValueBytes);
-            return payload + "." + digestValueHex;
-        }
-    }
-}

BTCPayServer.Rating/Providers/ExchangeSharpRateProvider.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
@@ -11,18 +12,15 @@ using ExchangeSharp;
 
 namespace BTCPayServer.Services.Rates
 {
-    public class ExchangeSharpRateProvider : IRateProvider, IHasExchangeName
+    public class ExchangeSharpRateProvider<T> : IRateProvider where T : ExchangeAPI, new()
     {
-        readonly ExchangeAPI _ExchangeAPI;
-        readonly string _ExchangeName;
-        public ExchangeSharpRateProvider(string exchangeName, ExchangeAPI exchangeAPI, bool reverseCurrencyPair = false)
+        HttpClient _httpClient;
+        public ExchangeSharpRateProvider(HttpClient httpClient, bool reverseCurrencyPair = false)
         {
-            if (exchangeAPI == null)
-                throw new ArgumentNullException(nameof(exchangeAPI));
-            exchangeAPI.RequestTimeout = TimeSpan.FromSeconds(5.0);
-            _ExchangeAPI = exchangeAPI;
-            _ExchangeName = exchangeName;
+            if (httpClient == null)
+                throw new ArgumentNullException(nameof(httpClient));
             ReverseCurrencyPair = reverseCurrencyPair;
+            _httpClient = httpClient;
         }
 
         public bool ReverseCurrencyPair
@@ -30,45 +28,42 @@ namespace BTCPayServer.Services.Rates
             get; set;
         }
 
-        public string ExchangeName => _ExchangeName;
-
-        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
+        public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
             await new SynchronizationContextRemover();
-            var rates = await _ExchangeAPI.GetTickersAsync();
 
-                var exchangeRateTasks = rates
-                    .Where(t => t.Value.Ask != 0m && t.Value.Bid != 0m)
-                    .Select(t => CreateExchangeRate(t));
+            var exchangeAPI = new T();
+            exchangeAPI.RequestMaker = new HttpClientRequestMaker(exchangeAPI, _httpClient, cancellationToken);
+            var rates = await exchangeAPI.GetTickersAsync();
 
-                var exchangeRates = await Task.WhenAll(exchangeRateTasks);
-                
-            return new ExchangeRates(exchangeRates
+            var exchangeRateTasks = rates
+                .Where(t => t.Value.Ask != 0m && t.Value.Bid != 0m)
+                .Select(t => CreateExchangeRate(exchangeAPI, t));
+
+            var exchangeRates = await Task.WhenAll(exchangeRateTasks);
+
+            return exchangeRates
                 .Where(t => t != null)
-                .ToArray());
+                .ToArray();
         }
 
         // ExchangeSymbolToGlobalSymbol throws exception which would kill perf
         ConcurrentDictionary<string, string> notFoundSymbols = new ConcurrentDictionary<string, string>();
-        private async Task<ExchangeRate> CreateExchangeRate(KeyValuePair<string, ExchangeTicker> ticker)
+        private async Task<PairRate> CreateExchangeRate(T exchangeAPI, KeyValuePair<string, ExchangeTicker> ticker)
         {
             if (notFoundSymbols.TryGetValue(ticker.Key, out _))
                 return null;
             try
             {
-                var tickerName = await _ExchangeAPI.ExchangeMarketSymbolToGlobalMarketSymbolAsync(ticker.Key);
+                var tickerName = await exchangeAPI.ExchangeMarketSymbolToGlobalMarketSymbolAsync(ticker.Key);
                 if (!CurrencyPair.TryParse(tickerName, out var pair))
                 {
                     notFoundSymbols.TryAdd(ticker.Key, ticker.Key);
                     return null;
                 }
-                if(ReverseCurrencyPair)
+                if (ReverseCurrencyPair)
                     pair = new CurrencyPair(pair.Right, pair.Left);
-                var rate = new ExchangeRate();
-                rate.CurrencyPair = pair;
-                rate.Exchange = _ExchangeName;
-                rate.BidAsk = new BidAsk(ticker.Value.Bid, ticker.Value.Ask);
-                return rate;
+                return new PairRate(pair, new BidAsk(ticker.Value.Bid, ticker.Value.Ask));
             }
             catch (ArgumentException)
             {

BTCPayServer.Rating/Providers/FallbackRateProvider.cs

@@ -17,7 +17,7 @@ namespace BTCPayServer.Services.Rates
             _Providers = providers;
         }
 
-        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
+        public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
             foreach (var p in _Providers)
             {
@@ -31,7 +31,7 @@ namespace BTCPayServer.Services.Rates
                 }
                 catch(Exception ex) { Exceptions.Add(ex); }
             }
-            return new ExchangeRates();
+            return Array.Empty<PairRate>();
         }
 
         public List<Exception> Exceptions { get; set; } = new List<Exception>();

BTCPayServer.Rating/Providers/HttpClientRequestMaker.cs

@@ -0,0 +1,216 @@
+using System;
+using Microsoft.Extensions.Logging;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using ExchangeSharp;
+using System.Threading;
+
+namespace BTCPayServer.Services.Rates
+{
+    internal class HttpClientRequestMaker : IAPIRequestMaker
+    {
+        class InternalHttpWebRequest : IHttpWebRequest
+        {
+            internal readonly HttpWebRequest Request;
+
+            public Uri RequestUri => Request.RequestUri;
+
+            public string Method
+            {
+                get
+                {
+                    return Request.Method;
+                }
+                set
+                {
+                    Request.Method = value;
+                }
+            }
+
+            public int Timeout
+            {
+                get
+                {
+                    return Request.Timeout;
+                }
+                set
+                {
+                    Request.Timeout = value;
+                }
+            }
+
+            public int ReadWriteTimeout
+            {
+                get
+                {
+                    return Request.ReadWriteTimeout;
+                }
+                set
+                {
+                    Request.ReadWriteTimeout = value;
+                }
+            }
+
+            public InternalHttpWebRequest(Uri fullUri)
+            {
+                Request = ((WebRequest.Create(fullUri) as HttpWebRequest) ?? throw new NullReferenceException("Failed to create HttpWebRequest"));
+                Request.KeepAlive = false;
+            }
+
+            public void AddHeader(string header, string value)
+            {
+                switch (header.ToStringLowerInvariant())
+                {
+                    case "content-type":
+                        Request.ContentType = value;
+                        break;
+                    case "content-length":
+                        Request.ContentLength = value.ConvertInvariant<long>(0L);
+                        break;
+                    case "user-agent":
+                        Request.UserAgent = value;
+                        break;
+                    case "accept":
+                        Request.Accept = value;
+                        break;
+                    case "connection":
+                        Request.Connection = value;
+                        break;
+                    default:
+                        Request.Headers[header] = value;
+                        break;
+                }
+            }
+
+            public Task WriteAllAsync(byte[] data, int index, int length)
+            {
+                throw new NotImplementedException();
+            }
+
+            public HttpRequestMessage ToHttpRequestMessage()
+            {
+                var httpRequest = new HttpRequestMessage(HttpMethod.Get, Request.RequestUri);
+                CopyHeadersFrom(httpRequest, Request);
+                return httpRequest;
+            }
+
+            internal void CopyHeadersFrom(HttpRequestMessage message, HttpWebRequest request)
+            {
+                foreach (string headerName in request.Headers)
+                {
+                    string[] headerValues = request.Headers.GetValues(headerName);
+                    if (!message.Headers.TryAddWithoutValidation(headerName, headerValues))
+                    {
+                        if (message.Content != null)
+                            message.Content.Headers.TryAddWithoutValidation(headerName, headerValues);
+                    }
+                }
+            }
+        }
+        class InternalHttpWebResponse : IHttpWebResponse
+        {
+            public InternalHttpWebResponse(HttpResponseMessage httpResponseMessage)
+            {
+                var headers = new Dictionary<string, List<string>>();
+                foreach (var h in httpResponseMessage.Headers)
+                {
+                    if (!headers.TryGetValue(h.Key, out var list))
+                    {
+                        list = new List<string>();
+                        headers.Add(h.Key, list);
+                    }
+                    list.AddRange(h.Value);
+                }
+                Headers = new Dictionary<string, IReadOnlyList<string>>(headers.Count);
+                foreach (var item in headers)
+                {
+                    Headers.Add(item.Key, item.Value.AsReadOnly());
+                }
+            }
+            public Dictionary<string, IReadOnlyList<string>> Headers { get; }
+            static IReadOnlyList<string> Empty = new List<string>().AsReadOnly();
+            public IReadOnlyList<string> GetHeader(string name)
+            {
+                Headers.TryGetValue(name, out var list);
+                return list ?? Empty;
+            }
+        }
+        private readonly IAPIRequestHandler api;
+        private readonly HttpClient _httpClient;
+        private readonly CancellationToken _cancellationToken;
+
+        public HttpClientRequestMaker(IAPIRequestHandler api, HttpClient httpClient, CancellationToken cancellationToken)
+        {
+            if (api == null)
+                throw new ArgumentNullException(nameof(api));
+            if (httpClient == null)
+                throw new ArgumentNullException(nameof(httpClient));
+            this.api = api;
+            _httpClient = httpClient;
+            _cancellationToken = cancellationToken;
+        }
+        public Action<IAPIRequestMaker, RequestMakerState, object> RequestStateChanged
+        {
+            get;
+            set;
+        }
+
+        public async Task<string> MakeRequestAsync(string url, string baseUrl = null, Dictionary<string, object> payload = null, string method = null)
+        {
+            await default(SynchronizationContextRemover);
+            await api.RateLimit.WaitToProceedAsync();
+            if (url[0] != '/')
+            {
+                url = "/" + url;
+            }
+            string uri2 = (baseUrl ?? api.BaseUrl) + url;
+            if (method == null)
+            {
+                method = api.RequestMethod;
+            }
+            Uri uri = api.ProcessRequestUrl(new UriBuilder(uri2), payload, method);
+            InternalHttpWebRequest request = new InternalHttpWebRequest(uri)
+            {
+                Method = method
+            };
+            request.AddHeader("content-type", api.RequestContentType);
+            request.AddHeader("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36");
+            int num3 = request.Timeout = (request.ReadWriteTimeout = (int)api.RequestTimeout.TotalMilliseconds);
+            await api.ProcessRequestAsync(request, payload);
+            try
+            {
+                RequestStateChanged?.Invoke(this, RequestMakerState.Begin, uri.AbsoluteUri);
+                using var webHttpRequest = request.ToHttpRequestMessage();
+                using var webHttpResponse = await _httpClient.SendAsync(webHttpRequest, _cancellationToken);
+                string text = await webHttpResponse.Content.ReadAsStringAsync();
+                if (!webHttpResponse.IsSuccessStatusCode)
+                {
+                    if (string.IsNullOrWhiteSpace(text))
+                    {
+                        throw new APIException($"{webHttpResponse.StatusCode.ConvertInvariant<int>(0)} - {webHttpResponse.StatusCode}");
+                    }
+                    throw new APIException(text);
+                }
+                api.ProcessResponse(new InternalHttpWebResponse(webHttpResponse));
+                // local reference to handle delegate becoming null, extended discussion here:
+                // https://github.com/btcpayserver/btcpayserver/commit/00747906849f093712c3907c99404c55b3defa66#r37022103
+                var requestStateChanged = RequestStateChanged;
+                if (requestStateChanged != null)
+                {
+                    requestStateChanged(this, RequestMakerState.Finished, text);
+                    return text;
+                }
+                return text;
+            }
+            catch (Exception arg)
+            {
+                RequestStateChanged?.Invoke(this, RequestMakerState.Error, arg);
+                throw;
+            }
+        }
+    }
+}

BTCPayServer.Rating/Providers/IHasExchangeName.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace BTCPayServer.Services.Rates
-{
-    public interface IHasExchangeName
-    {
-        string ExchangeName { get; }
-    }
-}

BTCPayServer.Rating/Providers/IRateProvider.cs

@@ -9,6 +9,6 @@ namespace BTCPayServer.Services.Rates
 {
     public interface IRateProvider
     {
-        Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken);
+        Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken);
     }
 }

BTCPayServer.Rating/Providers/KrakenExchangeRateProvider.cs

@@ -14,7 +14,7 @@ using Newtonsoft.Json.Linq;
 namespace BTCPayServer.Services.Rates
 {
     // Make sure that only one request is sent to kraken in general
-    public class KrakenExchangeRateProvider : IRateProvider, IHasExchangeName
+    public class KrakenExchangeRateProvider : IRateProvider
     {
         public KrakenExchangeRateProvider()
         {
@@ -33,8 +33,6 @@ namespace BTCPayServer.Services.Rates
             }
         }
 
-        public string ExchangeName => "kraken";
-
         HttpClient _LocalClient;
         static HttpClient _Client = new HttpClient();
 
@@ -87,9 +85,9 @@ namespace BTCPayServer.Services.Rates
             { "ZGBP", "GBP" }
         };
 
-        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
+        public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var result = new ExchangeRates();
+            var result = new List<PairRate>();
             var symbols = await GetSymbolsAsync(cancellationToken);
             var normalizedPairsList = symbols.Where(s => !notFoundSymbols.ContainsKey(s)).Select(s => _Helper.NormalizeMarketSymbol(s)).ToList();
             var csvPairsList = string.Join(",", normalizedPairsList);
@@ -117,7 +115,7 @@ namespace BTCPayServer.Services.Rates
                             global = await _Helper.ExchangeMarketSymbolToGlobalMarketSymbolAsync(symbol);
                         }
                         if (CurrencyPair.TryParse(global, out var pair))
-                            result.Add(new ExchangeRate("kraken", pair.Inverse(), new BidAsk(ticker.Bid, ticker.Ask)));
+                            result.Add(new PairRate(pair.Inverse(), new BidAsk(ticker.Bid, ticker.Ask)));
                         else
                             notFoundSymbols.TryAdd(symbol, symbol);
                     }
@@ -127,7 +125,7 @@ namespace BTCPayServer.Services.Rates
                     }
                 }
             }
-            return result;
+            return result.ToArray();
         }
 
         private static ExchangeTicker ConvertToExchangeTicker(string symbol, JToken ticker)

BTCPayServer.Rating/Providers/NullRateProvider.cs

@@ -21,9 +21,9 @@ namespace BTCPayServer.Services.Rates
                 return _Instance;
             }
         }
-        public Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
+        public Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
         {
-            return Task.FromResult(new ExchangeRates());
+            return Task.FromResult(Array.Empty<PairRate>());
         }
     }
 }

BTCPayServer.Rating/Providers/PolisRateProvider.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Rating;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Services.Rates
+{
+    public class PolisRateProvider : IRateProvider
+    {
+        private readonly HttpClient _httpClient;
+        public PolisRateProvider(HttpClient httpClient)
+        {
+            _httpClient = httpClient ?? new HttpClient();
+        }
+
+        public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
+        {
+            var response = await _httpClient.GetAsync("https://obol.polispay.com/complex/btc/polis", cancellationToken);  //Returns complex rate from BTC to POLIS
+            var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
+            var value = jobj["data"].Value<decimal>();
+            return new[] { new PairRate(new CurrencyPair("BTC", "POLIS"), new BidAsk(value)) };
+        }
+    }
+}

BTCPayServer.Rating/RateRules.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -100,6 +99,8 @@ namespace BTCPayServer.Rating
         RuleList ruleList;
 
         decimal _Spread;
+        private const string ImplicitSatsRule = "SATS_X = SATS_BTC * BTC_X;\nSATS_BTC = 0.00000001;\n";
+
         public decimal Spread
         {
             get
@@ -127,6 +128,7 @@ namespace BTCPayServer.Rating
         }
         public static bool TryParse(string str, out RateRules rules, out List<RateRulesErrors> errors)
         {
+            str = ImplicitSatsRule + str;
             rules = null;
             errors = null;
             var expression = CSharpSyntaxTree.ParseText(str, new CSharpParseOptions(LanguageVersion.Default).WithKind(SourceCodeKind.Script));
@@ -196,6 +198,7 @@ namespace BTCPayServer.Rating
         {
             return root.NormalizeWhitespace("", "\n")
                 .ToFullString()
+                .Replace(ImplicitSatsRule, string.Empty, StringComparison.OrdinalIgnoreCase)
                 .Replace("{\n", string.Empty, StringComparison.OrdinalIgnoreCase)
                             .Replace("\n}", string.Empty, StringComparison.OrdinalIgnoreCase);
         }

BTCPayServer.Rating/Services/RateFetcher.cs

@@ -79,9 +79,9 @@ namespace BTCPayServer.Services.Rates
                 result.Latency = query.Latency;
                 if (query.Exception != null)
                     result.ExchangeExceptions.Add(query.Exception);
-                foreach (var rule in query.ExchangeRates)
+                foreach (var rule in query.PairRates)
                 {
-                    rateRule.ExchangeRates.SetRate(rule.Exchange, rule.CurrencyPair, rule.BidAsk);
+                    rateRule.ExchangeRates.SetRate(query.Exchange, rule.CurrencyPair, rule.BidAsk);
                 }
             }
             rateRule.Reevaluate();

BTCPayServer.Rating/Services/RateProviderFactory.cs

@@ -9,6 +9,7 @@ using ExchangeSharp;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Newtonsoft.Json.Linq;
 using MemoryCache = Microsoft.Extensions.Caching.Memory.MemoryCache;
 
 namespace BTCPayServer.Services.Rates
@@ -24,7 +25,7 @@ namespace BTCPayServer.Services.Rates
             {
                 _inner = inner;
             }
-            public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
+            public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
             {
                 DateTimeOffset now = DateTimeOffset.UtcNow;
                 try
@@ -34,7 +35,7 @@ namespace BTCPayServer.Services.Rates
                 catch (Exception ex)
                 {
                     Exception = ex;
-                    return new ExchangeRates();
+                    return Array.Empty<PairRate>();
                 }
                 finally
                 {
@@ -45,49 +46,15 @@ namespace BTCPayServer.Services.Rates
         public class QueryRateResult
         {
             public TimeSpan Latency { get; set; }
-            public ExchangeRates ExchangeRates { get; set; }
+            public PairRate[] PairRates { get; set; }
             public ExchangeException Exception { get; internal set; }
+            public string Exchange { get; internal set; }
         }
-        public RateProviderFactory(IOptions<MemoryCacheOptions> cacheOptions,
-                                   IHttpClientFactory httpClientFactory,
-                                   CoinAverageSettings coinAverageSettings)
+        public RateProviderFactory(IHttpClientFactory httpClientFactory)
         {
             _httpClientFactory = httpClientFactory;
-            _CoinAverageSettings = coinAverageSettings;
-            _CacheOptions = cacheOptions;
-            // We use 15 min because of limits with free version of bitcoinaverage
-            CacheSpan = TimeSpan.FromMinutes(15.0);
             InitExchanges();
         }
-        private IOptions<MemoryCacheOptions> _CacheOptions;
-        TimeSpan _CacheSpan;
-        public TimeSpan CacheSpan
-        {
-            get
-            {
-                return _CacheSpan;
-            }
-            set
-            {
-                _CacheSpan = value;
-                InvalidateCache();
-            }
-        }
-        public void InvalidateCache()
-        {
-            var cache = new MemoryCache(_CacheOptions);
-            foreach (var provider in Providers.Select(p => p.Value as CachedRateProvider).Where(p => p != null))
-            {
-                provider.CacheSpan = CacheSpan;
-                provider.MemoryCache = cache;
-            }
-            if (Providers.TryGetValue(CoinAverageRateProvider.CoinAverageName, out var coinAverage) && coinAverage is BackgroundFetcherRateProvider c)
-            {
-                c.RefreshRate = CacheSpan;
-                c.ValidatyTime = CacheSpan + TimeSpan.FromMinutes(1.0);
-            }
-        }
-        CoinAverageSettings _CoinAverageSettings;
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly Dictionary<string, IRateProvider> _DirectProviders = new Dictionary<string, IRateProvider>();
         public Dictionary<string, IRateProvider> Providers
@@ -98,85 +65,120 @@ namespace BTCPayServer.Services.Rates
             }
         }
 
-        private void InitExchanges()
+        internal IEnumerable<AvailableRateProvider> GetDirectlySupportedExchanges()
+        {
+            yield return new AvailableRateProvider("binance", "Binance", "https://api.binance.com/api/v1/ticker/24hr");
+            yield return new AvailableRateProvider("bittrex", "Bittrex", "https://bittrex.com/api/v1.1/public/getmarketsummaries");
+            yield return new AvailableRateProvider("poloniex", "Poloniex", "https://poloniex.com/public?command=returnTicker");
+            yield return new AvailableRateProvider("hitbtc", "HitBTC", "https://api.hitbtc.com/api/2/public/ticker");
+            yield return new AvailableRateProvider("ndax", "NDAX", "https://ndax.io/api/returnTicker");
+
+            yield return new AvailableRateProvider("coingecko", "CoinGecko", "https://api.coingecko.com/api/v3/exchange_rates");
+            yield return new AvailableRateProvider("kraken", "Kraken", "https://api.kraken.com/0/public/Ticker?pair=ATOMETH,ATOMEUR,ATOMUSD,ATOMXBT,BATETH,BATEUR,BATUSD,BATXBT,BCHEUR,BCHUSD,BCHXBT,DAIEUR,DAIUSD,DAIUSDT,DASHEUR,DASHUSD,DASHXBT,EOSETH,EOSXBT,ETHCHF,ETHDAI,ETHUSDC,ETHUSDT,GNOETH,GNOXBT,ICXETH,ICXEUR,ICXUSD,ICXXBT,LINKETH,LINKEUR,LINKUSD,LINKXBT,LSKETH,LSKEUR,LSKUSD,LSKXBT,NANOETH,NANOEUR,NANOUSD,NANOXBT,OMGETH,OMGEUR,OMGUSD,OMGXBT,PAXGETH,PAXGEUR,PAXGUSD,PAXGXBT,SCETH,SCEUR,SCUSD,SCXBT,USDCEUR,USDCUSD,USDCUSDT,USDTCAD,USDTEUR,USDTGBP,USDTZUSD,WAVESETH,WAVESEUR,WAVESUSD,WAVESXBT,XBTCHF,XBTDAI,XBTUSDC,XBTUSDT,XDGEUR,XDGUSD,XETCXETH,XETCXXBT,XETCZEUR,XETCZUSD,XETHXXBT,XETHZCAD,XETHZEUR,XETHZGBP,XETHZJPY,XETHZUSD,XLTCXXBT,XLTCZEUR,XLTCZUSD,XMLNXETH,XMLNXXBT,XMLNZEUR,XMLNZUSD,XREPXETH,XREPXXBT,XREPZEUR,XXBTZCAD,XXBTZEUR,XXBTZGBP,XXBTZJPY,XXBTZUSD,XXDGXXBT,XXLMXXBT,XXMRXXBT,XXMRZEUR,XXMRZUSD,XXRPXXBT,XXRPZEUR,XXRPZUSD,XZECXXBT,XZECZEUR,XZECZUSD");
+            yield return new AvailableRateProvider("bylls", "Bylls", "https://bylls.com/api/price?from_currency=BTC&to_currency=CAD");
+            yield return new AvailableRateProvider("bitbank", "Bitbank", "https://public.bitbank.cc/prices");
+            yield return new AvailableRateProvider("bitpay", "Bitpay", "https://bitpay.com/rates");
+
+            yield return new AvailableRateProvider("polispay", "PolisPay", "https://obol.polispay.com/complex/btc/polis");
+
+            yield return new AvailableRateProvider("bitfinex", "Bitfinex", "https://api.bitfinex.com/v2/tickers?symbols=tBTCUSD,tLTCUSD,tLTCBTC,tETHUSD,tETHBTC,tETCBTC,tETCUSD,tRRTUSD,tRRTBTC,tZECUSD,tZECBTC,tXMRUSD,tXMRBTC,tDSHUSD,tDSHBTC,tBTCEUR,tBTCJPY,tXRPUSD,tXRPBTC,tIOTUSD,tIOTBTC,tIOTETH,tEOSUSD,tEOSBTC,tEOSETH,tSANUSD,tSANBTC,tSANETH,tOMGUSD,tOMGBTC,tOMGETH,tNEOUSD,tNEOBTC,tNEOETH,tETPUSD,tETPBTC,tETPETH,tQTMUSD,tQTMBTC,tQTMETH,tAVTUSD,tAVTBTC,tAVTETH,tEDOUSD,tEDOBTC,tEDOETH,tBTGUSD,tBTGBTC,tDATUSD,tDATBTC,tDATETH,tQSHUSD,tQSHBTC,tQSHETH,tYYWUSD,tYYWBTC,tYYWETH,tGNTUSD,tGNTBTC,tGNTETH,tSNTUSD,tSNTBTC,tSNTETH,tIOTEUR,tBATUSD,tBATBTC,tBATETH,tMNAUSD,tMNABTC,tMNAETH,tFUNUSD,tFUNBTC,tFUNETH,tZRXUSD,tZRXBTC,tZRXETH,tTNBUSD,tTNBBTC,tTNBETH,tSPKUSD,tSPKBTC,tSPKETH,tTRXUSD,tTRXBTC,tTRXETH,tRCNUSD,tRCNBTC,tRCNETH,tRLCUSD,tRLCBTC,tRLCETH,tAIDUSD,tAIDBTC,tAIDETH,tSNGUSD,tSNGBTC,tSNGETH,tREPUSD,tREPBTC,tREPETH,tELFUSD,tELFBTC,tELFETH,tNECUSD,tNECBTC,tNECETH,tBTCGBP,tETHEUR,tETHJPY,tETHGBP,tNEOEUR,tNEOJPY,tNEOGBP,tEOSEUR,tEOSJPY,tEOSGBP,tIOTJPY,tIOTGBP,tIOSUSD,tIOSBTC,tIOSETH,tAIOUSD,tAIOBTC,tAIOETH,tREQUSD,tREQBTC,tREQETH,tRDNUSD,tRDNBTC,tRDNETH,tLRCUSD,tLRCBTC,tLRCETH,tWAXUSD,tWAXBTC,tWAXETH,tDAIUSD,tDAIBTC,tDAIETH,tAGIUSD,tAGIBTC,tAGIETH,tBFTUSD,tBFTBTC,tBFTETH,tMTNUSD,tMTNBTC,tMTNETH,tODEUSD,tODEBTC,tODEETH,tANTUSD,tANTBTC,tANTETH,tDTHUSD,tDTHBTC,tDTHETH,tMITUSD,tMITBTC,tMITETH,tSTJUSD,tSTJBTC,tSTJETH,tXLMUSD,tXLMEUR,tXLMJPY,tXLMGBP,tXLMBTC,tXLMETH,tXVGUSD,tXVGEUR,tXVGJPY,tXVGGBP,tXVGBTC,tXVGETH,tBCIUSD,tBCIBTC,tMKRUSD,tMKRBTC,tMKRETH,tKNCUSD,tKNCBTC,tKNCETH,tPOAUSD,tPOABTC,tPOAETH,tEVTUSD,tLYMUSD,tLYMBTC,tLYMETH,tUTKUSD,tUTKBTC,tUTKETH,tVEEUSD,tVEEBTC,tVEEETH,tDADUSD,tDADBTC,tDADETH,tORSUSD,tORSBTC,tORSETH,tAUCUSD,tAUCBTC,tAUCETH,tPOYUSD,tPOYBTC,tPOYETH,tFSNUSD,tFSNBTC,tFSNETH,tCBTUSD,tCBTBTC,tCBTETH,tZCNUSD,tZCNBTC,tZCNETH,tSENUSD,tSENBTC,tSENETH,tNCAUSD,tNCABTC,tNCAETH,tCNDUSD,tCNDBTC,tCNDETH,tCTXUSD,tCTXBTC,tCTXETH,tPAIUSD,tPAIBTC,tSEEUSD,tSEEBTC,tSEEETH,tESSUSD,tESSBTC,tESSETH,tATMUSD,tATMBTC,tATMETH,tHOTUSD,tHOTBTC,tHOTETH,tDTAUSD,tDTABTC,tDTAETH,tIQXUSD,tIQXBTC,tIQXEOS,tWPRUSD,tWPRBTC,tWPRETH,tZILUSD,tZILBTC,tZILETH,tBNTUSD,tBNTBTC,tBNTETH,tABSUSD,tABSETH,tXRAUSD,tXRAETH,tMANUSD,tMANETH,tBBNUSD,tBBNETH,tNIOUSD,tNIOETH,tDGXUSD,tDGXETH,tVETUSD,tVETBTC,tVETETH,tUTNUSD,tUTNETH,tTKNUSD,tTKNETH,tGOTUSD,tGOTEUR,tGOTETH,tXTZUSD,tXTZBTC,tCNNUSD,tCNNETH,tBOXUSD,tBOXETH,tTRXEUR,tTRXGBP,tTRXJPY,tMGOUSD,tMGOETH,tRTEUSD,tRTEETH,tYGGUSD,tYGGETH,tMLNUSD,tMLNETH,tWTCUSD,tWTCETH,tCSXUSD,tCSXETH,tOMNUSD,tOMNBTC,tINTUSD,tINTETH,tDRNUSD,tDRNETH,tPNKUSD,tPNKETH,tDGBUSD,tDGBBTC,tBSVUSD,tBSVBTC,tBABUSD,tBABBTC,tWLOUSD,tWLOXLM,tVLDUSD,tVLDETH,tENJUSD,tENJETH,tONLUSD,tONLETH,tRBTUSD,tRBTBTC,tUSTUSD,tEUTEUR,tEUTUSD,tGSDUSD,tUDCUSD,tTSDUSD,tPAXUSD,tRIFUSD,tRIFBTC,tPASUSD,tPASETH,tVSYUSD,tVSYBTC,tZRXDAI,tMKRDAI,tOMGDAI,tBTTUSD,tBTTBTC,tBTCUST,tETHUST,tCLOUSD,tCLOBTC,tIMPUSD,tIMPETH,tLTCUST,tEOSUST,tBABUST,tSCRUSD,tSCRETH,tGNOUSD,tGNOETH,tGENUSD,tGENETH,tATOUSD,tATOBTC,tATOETH,tWBTUSD,tXCHUSD,tEUSUSD,tWBTETH,tXCHETH,tEUSETH,tLEOUSD,tLEOBTC,tLEOUST,tLEOEOS,tLEOETH,tASTUSD,tASTETH,tFOAUSD,tFOAETH,tUFRUSD,tUFRETH,tZBTUSD,tZBTUST,tOKBUSD,tUSKUSD,tGTXUSD,tKANUSD,tOKBUST,tOKBETH,tOKBBTC,tUSKUST,tUSKETH,tUSKBTC,tUSKEOS,tGTXUST,tKANUST,tAMPUSD,tALGUSD,tALGBTC,tALGUST,tBTCXCH,tSWMUSD,tSWMETH,tTRIUSD,tTRIETH,tLOOUSD,tLOOETH,tAMPUST,tDUSK:USD,tDUSK:BTC,tUOSUSD,tUOSBTC,tRRBUSD,tRRBUST,tDTXUSD,tDTXUST,tAMPBTC,tFTTUSD,tFTTUST,tPAXUST,tUDCUST,tTSDUST,tBTC:CNHT,tUST:CNHT,tCNH:CNHT,tCHZUSD,tCHZUST,tBTCF0:USTF0,tETHF0:USTF0");
+            yield return new AvailableRateProvider("okex", "OKEx", "https://www.okex.com/api/futures/v3/instruments/ticker");
+            yield return new AvailableRateProvider("coinbasepro", "Coinbase Pro", "https://api.pro.coinbase.com/products");
+        }
+        void InitExchanges()
         {
             // We need to be careful to only add exchanges which OnGetTickers implementation make only 1 request
-            Providers.Add("binance", new ExchangeSharpRateProvider("binance", new ExchangeBinanceAPI(), true));
-            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(), true));
-            Providers.Add("ndax", new ExchangeSharpRateProvider("ndax", new ExchangeNDAXAPI(), true));
-
-            // Cryptopia is often not available
-            // Disabled because of https://twitter.com/Cryptopia_NZ/status/1085084168852291586
-            // Providers.Add("cryptopia", new ExchangeSharpRateProvider("cryptopia", new ExchangeCryptopiaAPI(), false));
+            AddExchangeSharpProviders<ExchangeBinanceAPI>("binance");
+            AddExchangeSharpProviders<ExchangeBittrexAPI>("bittrex");
+            AddExchangeSharpProviders<ExchangePoloniexAPI>("poloniex");
+            AddExchangeSharpProviders<ExchangeHitBTCAPI>("hitbtc");
+            AddExchangeSharpProviders<ExchangeNDAXAPI>("ndax");
 
             // Handmade providers
-            Providers.Add(CoinAverageRateProvider.CoinAverageName, new CoinAverageRateProvider() { Exchange = CoinAverageRateProvider.CoinAverageName, HttpClient = _httpClientFactory?.CreateClient("EXCHANGE_COINAVERAGE"), Authenticator = _CoinAverageSettings });
+            Providers.Add("coingecko", new CoinGeckoRateProvider(_httpClientFactory));
             Providers.Add("kraken", new KrakenExchangeRateProvider() { HttpClient = _httpClientFactory?.CreateClient("EXCHANGE_KRAKEN") });
             Providers.Add("bylls", new ByllsRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_BYLLS")));
             Providers.Add("bitbank", new BitbankRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_BITBANK")));
             Providers.Add("bitpay", new BitpayRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_BITPAY")));
+            Providers.Add("polispay", new PolisRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_POLIS")));
 
-            // Those exchanges make multiple requests when calling GetTickers so we remove them
-            //DirectProviders.Add("gemini", new ExchangeSharpRateProvider("gemini", new ExchangeGeminiAPI()));
-            //DirectProviders.Add("bitfinex", new ExchangeSharpRateProvider("bitfinex", new ExchangeBitfinexAPI()));
-            //DirectProviders.Add("okex", new ExchangeSharpRateProvider("okex", new ExchangeOkexAPI()));
-            //DirectProviders.Add("bitstamp", new ExchangeSharpRateProvider("bitstamp", new ExchangeBitstampAPI()));
+
+            // Backward compatibility: coinaverage should be using coingecko to prevent stores from breaking
+            Providers.Add("coinaverage", new CoinGeckoRateProvider(_httpClientFactory));
+
+            AddExchangeSharpProviders<ExchangeBitfinexAPI>("bitfinex");
+            AddExchangeSharpProviders<ExchangeOKExAPI>("okex");
+            AddExchangeSharpProviders<ExchangeCoinbaseAPI>("coinbasepro");
+            // Those exchanges make too many requests, exchange sharp do not parallelize so it is too slow...
+            //AddExchangeSharpProviders<ExchangeGeminiAPI>("gemini");
+            //AddExchangeSharpProviders<ExchangeBitstampAPI>("bitstamp");
+            //AddExchangeSharpProviders<ExchangeBitMEXAPI>("bitmex");
 
             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)
-                {
-                    prov.RefreshRate = CacheSpan;
-                    prov.ValidatyTime = CacheSpan + TimeSpan.FromMinutes(1.0);
-                }
-                else
-                {
-                    prov.RefreshRate = TimeSpan.FromMinutes(1.0);
-                    prov.ValidatyTime = TimeSpan.FromMinutes(5.0);
-                }
+                prov.RefreshRate = TimeSpan.FromMinutes(1.0);
+                prov.ValidatyTime = TimeSpan.FromMinutes(5.0);
                 Providers[provider.Key] = prov;
             }
+            Providers["gdax"] = Providers["coinbasepro"];
 
-            var cache = new MemoryCache(_CacheOptions);
-            foreach (var supportedExchange in GetSupportedExchanges())
+            foreach (var supportedExchange in GetCoinGeckoSupportedExchanges())
             {
-                if (!Providers.ContainsKey(supportedExchange.Key))
+                if (!Providers.ContainsKey(supportedExchange.Id) && supportedExchange.Id != CoinGeckoRateProvider.CoinGeckoName)
                 {
-                    var coinAverage = new CoinAverageRateProvider()
+                    var coingecko = new CoinGeckoRateProvider(_httpClientFactory)
                     {
-                        Exchange = supportedExchange.Key,
-                        HttpClient = _httpClientFactory?.CreateClient(),
-                        Authenticator = _CoinAverageSettings
+                        UnderlyingExchange = supportedExchange.SourceId
                     };
-                    var cached = new CachedRateProvider(supportedExchange.Key, coinAverage, cache)
-                    {
-                        CacheSpan = CacheSpan
-                    };
-                    Providers.Add(supportedExchange.Key, cached);
+                    var bgFetcher = new BackgroundFetcherRateProvider(coingecko);
+                    bgFetcher.RefreshRate = TimeSpan.FromMinutes(1.0);
+                    bgFetcher.ValidatyTime = TimeSpan.FromMinutes(5.0);
+                    Providers.Add(supportedExchange.Id, bgFetcher);
                 }
             }
         }
 
-        public CoinAverageExchanges GetSupportedExchanges()
+        private IRateProvider AddExchangeSharpProviders<T>(string providerName) where T: ExchangeAPI, new()
         {
-            CoinAverageExchanges exchanges = new CoinAverageExchanges();
-            foreach (var exchange in _CoinAverageSettings.AvailableExchanges)
+            var provider = new ExchangeSharpRateProvider<T>(_httpClientFactory.CreateClient($"EXCHANGE_{providerName}".ToUpperInvariant()), true);
+            Providers.Add(providerName, provider);
+            return provider;
+        }
+
+        IEnumerable<AvailableRateProvider> _AvailableRateProviders = null;
+        public IEnumerable<AvailableRateProvider> GetSupportedExchanges()
+        {
+            if (_AvailableRateProviders == null)
             {
-                exchanges.Add(exchange.Value);
+                var availableProviders = new Dictionary<string, AvailableRateProvider>();
+                foreach (var exchange in GetDirectlySupportedExchanges())
+                {
+                    availableProviders.Add(exchange.Id, exchange);
+                }
+                foreach (var exchange in GetCoinGeckoSupportedExchanges())
+                {
+                    availableProviders.TryAdd(exchange.Id, exchange);
+                }
+                _AvailableRateProviders = availableProviders.Values.OrderBy(o => o.Name).ToArray();
             }
+            return _AvailableRateProviders;
+        }
 
-            // Add other exchanges supported here
-            exchanges.Add(new CoinAverageExchange(CoinAverageRateProvider.CoinAverageName, "Coin Average", $"https://apiv2.bitcoinaverage.com/indices/global/ticker/short"));
-            exchanges.Add(new CoinAverageExchange("bylls", "Bylls", "https://bylls.com/api/price?from_currency=BTC&to_currency=CAD"));
-            exchanges.Add(new CoinAverageExchange("ndax", "NDAX", "https://ndax.io/api/returnTicker"));
-            exchanges.Add(new CoinAverageExchange("bitbank", "Bitbank", "https://public.bitbank.cc/prices"));
+        internal IEnumerable<AvailableRateProvider> GetCoinGeckoSupportedExchanges()
+        {
+            return JArray.Parse(CoinGeckoRateProvider.SupportedExchanges).Select(token =>
+                    new AvailableRateProvider(Normalize(token["id"].ToString().ToLowerInvariant()), token["id"].ToString().ToLowerInvariant(), token["name"].ToString(),
+                        $"https://api.coingecko.com/api/v3/exchanges/{token["id"]}/tickers", RateSource.Coingecko));
+        }
 
-            return exchanges;
+        private string Normalize(string name)
+        {
+            if (name == "oasis_trade")
+                return "oasisdex";
+            if (name == "gdax")
+                return "coinbasepro";
+            return name;
         }
 
         public async Task<QueryRateResult> QueryRates(string exchangeName, CancellationToken cancellationToken)
@@ -188,8 +190,9 @@ namespace BTCPayServer.Services.Rates
             var value = await wrapper.GetRatesAsync(cancellationToken);
             return new QueryRateResult()
             {
+                Exchange = exchangeName,
                 Latency = wrapper.Latency,
-                ExchangeRates = value,
+                PairRates = value,
                 Exception = wrapper.Exception != null ? new ExchangeException() { Exception = wrapper.Exception, ExchangeName = exchangeName } : null
             };
         }

BTCPayServer.Tests/AuthenticationTests.cs

@@ -6,8 +6,6 @@ using System.Net;
 using System.Threading.Tasks;
 using System.Security.Claims;
 using BTCPayServer.Tests.Logging;
-using Microsoft.AspNetCore.Authentication.OpenIdConnect;
-using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Xunit;
 using Xunit.Abstractions;
 using System.Net.Http;
@@ -66,8 +64,7 @@ namespace BTCPayServer.Tests
                     {
                         var json = await streamToReadFrom.ReadToEndAsync();
                         Assert.NotNull(json);
-                        var configuration = OpenIdConnectConfiguration.Create(json);
-                        Assert.NotNull(configuration);
+                        JObject.Parse(json); // Should do more tests but good enough
                     }
                 }
             }
@@ -249,7 +246,7 @@ namespace BTCPayServer.Tests
                 Assert.True(response.IsSuccessStatusCode);
 
                 string content = await response.Content.ReadAsStringAsync();
-                var result = JObject.Parse(content).ToObject<OpenIddictResponse>();
+                var result = System.Text.Json.JsonSerializer.Deserialize<OpenIddictResponse>(content);
 
                 await TestApiAgainstAccessToken(result.AccessToken, tester, user);
 
@@ -289,7 +286,7 @@ namespace BTCPayServer.Tests
             Assert.True(response.IsSuccessStatusCode);
 
             string content = await response.Content.ReadAsStringAsync();
-            var result = JObject.Parse(content).ToObject<OpenIddictResponse>();
+            var result = System.Text.Json.JsonSerializer.Deserialize<OpenIddictResponse>(content);
             Assert.NotEmpty(result.AccessToken);
             Assert.Null(result.Error);
             return result.AccessToken;
@@ -330,7 +327,7 @@ namespace BTCPayServer.Tests
             Assert.True(response.IsSuccessStatusCode);
 
             string content = await response.Content.ReadAsStringAsync();
-            var result = JObject.Parse(content).ToObject<OpenIddictResponse>();
+            var result = System.Text.Json.JsonSerializer.Deserialize<OpenIddictResponse>(content);
             Assert.NotEmpty(result.AccessToken);
             Assert.Null(result.Error);
             return result.AccessToken;
@@ -371,7 +368,7 @@ namespace BTCPayServer.Tests
             Assert.True(response.IsSuccessStatusCode);
 
             string content = await response.Content.ReadAsStringAsync();
-            var result = JObject.Parse(content).ToObject<OpenIddictResponse>();
+            var result = System.Text.Json.JsonSerializer.Deserialize<OpenIddictResponse>(content);
             Assert.NotEmpty(result.AccessToken);
             Assert.Null(result.Error);
             return result.AccessToken;

BTCPayServer.Tests/BTCPayServer.Tests.csproj

@@ -1,26 +1,31 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">$(TargetFrameworkOverride)</TargetFramework>
     <IsPackable>false</IsPackable>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
-    <LangVersion>7.2</LangVersion>
+    <LangVersion>8.0</LangVersion>
     <UserSecretsId>AB0AC1DD-9D26-485B-9416-56A33F268117</UserSecretsId>
+    <!--https://devblogs.microsoft.com/aspnet/testing-asp-net-core-mvc-web-apps-in-memory/-->
+    <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
+  <!--https://devblogs.microsoft.com/aspnet/testing-asp-net-core-mvc-web-apps-in-memory/-->
+  <Target Name="CopyAditionalFiles" AfterTargets="Build" Condition="'$(TargetFramework)'!=''">
+    <ItemGroup>
+      <DepsFilePaths Include="$([System.IO.Path]::ChangeExtension('%(_ResolvedProjectReferencePaths.FullPath)', '.deps.json'))" />
+    </ItemGroup>
+    <Copy SourceFiles="%(DepsFilePaths.FullPath)" DestinationFolder="$(OutputPath)" Condition="Exists('%(DepsFilePaths.FullPath)')" />
+  </Target>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <DefineConstants>$(DefineConstants);NETCOREAPP21</DefineConstants>
-  </PropertyGroup>
-  
   <PropertyGroup Condition="'$(CI_TESTS)' == 'true'">
     <DefineConstants>$(DefineConstants);SHORT_TIMEOUT</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="78.0.3904.7000" />
+    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="79.0.3945.3600" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

BTCPayServer.Tests/BTCPayServerTester.cs

@@ -63,6 +63,7 @@ namespace BTCPayServer.Tests
         }
 
         public Uri LTCNBXplorerUri { get; set; }
+        public Uri LBTCNBXplorerUri { get; set; }
 
         public Uri ServerUri
         {
@@ -93,6 +94,9 @@ namespace BTCPayServer.Tests
 
         public bool MockRates { get; set; } = true;
 
+        public HashSet<string> Chains { get; set; } = new HashSet<string>(){"BTC"};
+        public bool UseLightning { get; set; }
+
         public async Task StartAsync()
         {
             if (!Directory.Exists(_Directory))
@@ -109,20 +113,37 @@ namespace BTCPayServer.Tests
                 config.AppendLine($"bind=0.0.0.0");
             }
             config.AppendLine($"port={Port}");
-            config.AppendLine($"chains=btc,ltc");
+            config.AppendLine($"chains={string.Join(',', Chains)}");
+            if (Chains.Contains("BTC", StringComparer.OrdinalIgnoreCase))
+            {
+                config.AppendLine($"btc.explorer.url={NBXplorerUri.AbsoluteUri}");
+                config.AppendLine($"btc.explorer.cookiefile=0");
+            }
 
-            config.AppendLine($"btc.explorer.url={NBXplorerUri.AbsoluteUri}");
-            config.AppendLine($"btc.explorer.cookiefile=0");
+            if (UseLightning)
+            {
+                config.AppendLine($"btc.lightning={IntegratedLightning.AbsoluteUri}");
+                var localLndBackupFile = Path.Combine(_Directory, "walletunlock.json");
+                File.Copy(TestUtils.GetTestDataFullPath("LndSeedBackup/walletunlock.json"), localLndBackupFile, true);
+                config.AppendLine($"btc.external.lndseedbackup={localLndBackupFile}");
+            }
+
+            if (Chains.Contains("LTC", StringComparer.OrdinalIgnoreCase))
+            {
+                config.AppendLine($"ltc.explorer.url={LTCNBXplorerUri.AbsoluteUri}");
+                config.AppendLine($"ltc.explorer.cookiefile=0");
+            }
+            if (Chains.Contains("LBTC", StringComparer.OrdinalIgnoreCase))
+            {
+                config.AppendLine($"lbtc.explorer.url={LBTCNBXplorerUri.AbsoluteUri}");
+                config.AppendLine($"lbtc.explorer.cookiefile=0");
+            }
             config.AppendLine("allow-admin-registration=1");
-            config.AppendLine($"ltc.explorer.url={LTCNBXplorerUri.AbsoluteUri}");
-            config.AppendLine($"ltc.explorer.cookiefile=0");
-            config.AppendLine($"btc.lightning={IntegratedLightning.AbsoluteUri}");
+           
             config.AppendLine($"torrcfile={TestUtils.GetTestDataFullPath("Tor/torrc")}");
             config.AppendLine($"debuglog=debug.log");
 
-            var localLndBackupFile = Path.Combine(_Directory, "walletunlock.json");
-            File.Copy(TestUtils.GetTestDataFullPath("LndSeedBackup/walletunlock.json"), localLndBackupFile, true);
-            config.AppendLine($"btc.external.lndseedbackup={localLndBackupFile}");
+
             if (!string.IsNullOrEmpty(SSHPassword) && string.IsNullOrEmpty(SSHKeyFile))
                 config.AppendLine($"sshpassword={SSHPassword}");
             if (!string.IsNullOrEmpty(SSHKeyFile))
@@ -179,58 +200,28 @@ namespace BTCPayServer.Tests
                 rateProvider.Providers.Clear();
 
                 var coinAverageMock = new MockRateProvider();
-                coinAverageMock.ExchangeRates.Add(new Rating.ExchangeRate()
-                {
-                    Exchange = "coinaverage",
-                    CurrencyPair = CurrencyPair.Parse("BTC_USD"),
-                    BidAsk = new BidAsk(5000m)
-                });
-                coinAverageMock.ExchangeRates.Add(new Rating.ExchangeRate()
-                {
-                    Exchange = "coinaverage",
-                    CurrencyPair = CurrencyPair.Parse("BTC_CAD"),
-                    BidAsk = new BidAsk(4500m)
-                });
-                coinAverageMock.ExchangeRates.Add(new Rating.ExchangeRate()
-                {
-                    Exchange = "coinaverage",
-                    CurrencyPair = CurrencyPair.Parse("LTC_BTC"),
-                    BidAsk = new BidAsk(0.001m)
-                });
-                coinAverageMock.ExchangeRates.Add(new Rating.ExchangeRate()
-                {
-                    Exchange = "coinaverage",
-                    CurrencyPair = CurrencyPair.Parse("LTC_USD"),
-                    BidAsk = new BidAsk(500m)
-                });
-                rateProvider.Providers.Add("coinaverage", coinAverageMock);
+                coinAverageMock.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("BTC_USD"), new BidAsk(5000m)));
+                coinAverageMock.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("BTC_CAD"), new BidAsk(4500m)));
+                coinAverageMock.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("BTC_LTC"), new BidAsk(162m)));
+                coinAverageMock.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("LTC_USD"), new BidAsk(500m)));
+                rateProvider.Providers.Add("coingecko", coinAverageMock);
 
                 var bitflyerMock = new MockRateProvider();
-                bitflyerMock.ExchangeRates.Add(new Rating.ExchangeRate()
-                {
-                    Exchange = "bitflyer",
-                    CurrencyPair = CurrencyPair.Parse("BTC_JPY"),
-                    BidAsk = new BidAsk(700000m)
-                });
+                bitflyerMock.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("BTC_JPY"), new BidAsk(700000m)));
                 rateProvider.Providers.Add("bitflyer", bitflyerMock);
 
                 var quadrigacx = new MockRateProvider();
-                quadrigacx.ExchangeRates.Add(new Rating.ExchangeRate()
-                {
-                    Exchange = "quadrigacx",
-                    CurrencyPair = CurrencyPair.Parse("BTC_CAD"),
-                    BidAsk = new BidAsk(6000m)
-                });
+                quadrigacx.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("BTC_CAD"), new BidAsk(6000m)));
                 rateProvider.Providers.Add("quadrigacx", quadrigacx);
 
                 var bittrex = new MockRateProvider();
-                bittrex.ExchangeRates.Add(new Rating.ExchangeRate()
-                {
-                    Exchange = "bittrex",
-                    CurrencyPair = CurrencyPair.Parse("DOGE_BTC"),
-                    BidAsk = new BidAsk(0.004m)
-                });
+                bittrex.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("DOGE_BTC"), new BidAsk(0.004m)));
                 rateProvider.Providers.Add("bittrex", bittrex);
+                
+                
+                var bitfinex = new MockRateProvider();
+                bitfinex.ExchangeRates.Add(new PairRate(CurrencyPair.Parse("UST_BTC"), new BidAsk(0.000136m)));
+                rateProvider.Providers.Add("bitfinex", bitfinex);
             }
 
 

BTCPayServer.Tests/ChangellyTests.cs

@@ -182,7 +182,7 @@ namespace BTCPayServer.Tests
 
                 var factory = UnitTest1.CreateBTCPayRateFactory();
                 var fetcher = new RateFetcher(factory);
-                var httpClientFactory = new MockHttpClientFactory();
+                var httpClientFactory = TestUtils.CreateHttpFactory();
                 var changellyController = new ChangellyController(
                     new ChangellyClientProvider(tester.PayTester.StoreRepository, httpClientFactory),
                     tester.NetworkProvider, fetcher);
@@ -213,7 +213,7 @@ namespace BTCPayServer.Tests
 
                 var factory = UnitTest1.CreateBTCPayRateFactory();
                 var fetcher = new RateFetcher(factory);
-                var httpClientFactory = new MockHttpClientFactory();
+                var httpClientFactory = TestUtils.CreateHttpFactory();
                 var changellyController = new ChangellyController(
                     new ChangellyClientProvider(tester.PayTester.StoreRepository, httpClientFactory),
                     tester.NetworkProvider, fetcher);
@@ -243,12 +243,4 @@ namespace BTCPayServer.Tests
             Assert.Equal(20, ChangellyCalculationHelper.ComputeCorrectAmount(10, 1, 2));
         }
     }
-
-    public class MockHttpClientFactory : IHttpClientFactory
-    {
-        public HttpClient CreateClient(string name)
-        {
-            return new HttpClient();
-        }
-    }
 }

BTCPayServer.Tests/CheckoutUITests.cs

@@ -106,10 +106,14 @@ namespace BTCPayServer.Tests
         }
         
         [Fact(Timeout = TestTimeout)]
+        [Trait("Altcoins", "Altcoins")]
+        [Trait("Lightning", "Lightning")]
         public async Task CanUsePaymentMethodDropdown()
         {
             using (var s = SeleniumTester.Create())
             {
+                s.Server.ActivateLTC();
+                s.Server.ActivateLightning();
                 await s.StartAsync();
                 s.GoToRegister();
                 s.RegisterNewUser();
@@ -141,6 +145,7 @@ namespace BTCPayServer.Tests
 
                 elements = s.Driver.FindElement(By.ClassName("vex-content")).FindElements(By.ClassName("vexmenuitem"));
                 elements.Single(element => element.Text.Contains("Lightning")).Click();
+                Thread.Sleep(1000);
                 currencyDropdownButton = s.Driver.FindElement(By.ClassName("payment__currencies"));
 
                 Assert.Contains("Lightning", currencyDropdownButton.Text);
@@ -150,10 +155,12 @@ namespace BTCPayServer.Tests
         }
         
         [Fact(Timeout = TestTimeout)]
+        [Trait("Lightning", "Lightning")]
         public async Task CanUseLightningSatsFeature()
         {
             using (var s = SeleniumTester.Create())
             {
+                s.Server.ActivateLightning();
                 await s.StartAsync();
                 s.GoToRegister();
                 s.RegisterNewUser();

BTCPayServer.Tests/Dockerfile

@@ -1,8 +1,7 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:2.1.607-alpine3.9 AS builder
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false
-RUN apk add --no-cache icu-libs
-ENV LC_ALL en_US.UTF-8
-ENV LANG en_US.UTF-8
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1.101 AS builder
+
+RUN apt-get update && apt-get install -y --no-install-recommends chromium-driver \
+    && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /source
 COPY nuget.config nuget.config
@@ -11,20 +10,17 @@ COPY BTCPayServer/BTCPayServer.csproj BTCPayServer/BTCPayServer.csproj
 COPY BTCPayServer.Common/BTCPayServer.Common.csproj BTCPayServer.Common/BTCPayServer.Common.csproj
 COPY BTCPayServer.Rating/BTCPayServer.Rating.csproj BTCPayServer.Rating/BTCPayServer.Rating.csproj
 COPY BTCPayServer.Data/BTCPayServer.Data.csproj BTCPayServer.Data/BTCPayServer.Data.csproj
-COPY BTCPayServer.Tests/BTCPayServer.Tests.csproj BTCPayServer.Tests/BTCPayServer.Tests.csproj
-RUN dotnet restore BTCPayServer.Tests/BTCPayServer.Tests.csproj
-
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false
-
-ENV LC_ALL en_US.UTF-8
-ENV LANG en_US.UTF-8
-
-RUN apk add --no-cache chromium chromium-chromedriver icu-libs
+RUN cd BTCPayServer && dotnet restore
+COPY BTCPayServer.Common/. BTCPayServer.Common/.
+COPY BTCPayServer.Rating/. BTCPayServer.Rating/.
+COPY BTCPayServer.Data/. BTCPayServer.Data/.
+COPY BTCPayServer/. BTCPayServer/.
+COPY Build/Version.csproj Build/Version.csproj
 
 ENV SCREEN_HEIGHT 600 \
     SCREEN_WIDTH 1200
 
 COPY . .
-RUN cd BTCPayServer.Tests && dotnet build /p:CI_TESTS=true
+RUN cd BTCPayServer.Tests && dotnet build /p:CI_TESTS=true /p:RazorCompileOnBuild=true
 WORKDIR /source/BTCPayServer.Tests
 ENTRYPOINT ["./docker-entrypoint.sh"]

BTCPayServer.Tests/ElementsTests.cs

@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Configuration;
+using BTCPayServer.Controllers;
+using BTCPayServer.Models.WalletViewModels;
+using BTCPayServer.Services.Wallets;
+using BTCPayServer.Tests.Logging;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.Memory;
+using NBitcoin;
+using NBitcoin.RPC;
+using NBitpayClient;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace BTCPayServer.Tests
+{
+    public class ElementsTests
+    {
+        
+        public const int TestTimeout = 60_000;
+        public ElementsTests(ITestOutputHelper helper)
+        {
+            Logs.Tester = new XUnitLog(helper) { Name = "Tests" };
+            Logs.LogProvider = new XUnitLogProvider(helper);
+        }
+        
+        [Fact]
+        [Trait("Altcoins", "Altcoins")]
+        public async Task OnlyShowSupportedWallets()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.ActivateLBTC();
+                await tester.StartAsync();
+                await tester.EnsureChannelsSetup();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+                user.RegisterDerivationScheme("LBTC");
+                user.RegisterDerivationScheme("BTC");
+                user.RegisterDerivationScheme("USDT");
+                
+                Assert.Single(Assert.IsType<ListWalletsViewModel>(Assert.IsType<ViewResult>(await user.GetController<WalletsController>().ListWallets()).Model).Wallets);
+            }
+        }
+
+        [Fact]
+        [Trait("Fast", "Fast")]
+        public void LoadSubChainsAlways()
+        {
+            var options = new BTCPayServerOptions();
+            options.LoadArgs(new ConfigurationRoot(new List<IConfigurationProvider>()
+            {
+                new MemoryConfigurationProvider(new MemoryConfigurationSource()
+                {
+                    InitialData = new[]
+                    {
+                        new KeyValuePair<string, string>("chains", "usdt"), 
+                    }
+                })
+            }));
+            
+            Assert.NotNull(options.NetworkProvider.GetNetwork("LBTC"));
+            Assert.NotNull(options.NetworkProvider.GetNetwork("USDT"));
+        }
+
+        [Fact]
+        [Trait("Altcoins", "Altcoins")]
+        public async Task ElementsAssetsAreHandledCorrectly()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.ActivateLBTC();
+                await tester.StartAsync();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+                user.RegisterDerivationScheme("LBTC");
+                user.RegisterDerivationScheme("USDT");
+                
+                //no tether on our regtest, lets create it and set it
+                var tether = tester.NetworkProvider.GetNetwork<ElementsBTCPayNetwork>("USDT");
+                var lbtc = tester.NetworkProvider.GetNetwork<ElementsBTCPayNetwork>("LBTC");
+                var issueAssetResult = await tester.LBTCExplorerNode.SendCommandAsync("issueasset", 100000, 0);
+                tether.AssetId = uint256.Parse(issueAssetResult.Result["asset"].ToString());
+                ((ElementsBTCPayNetwork)tester.PayTester.GetService<BTCPayWalletProvider>().GetWallet("USDT").Network)
+                    .AssetId = tether.AssetId;
+                Logs.Tester.LogInformation($"Asset is {tether.AssetId}");
+                Assert.Equal(tether.AssetId,  tester.NetworkProvider.GetNetwork<ElementsBTCPayNetwork>("USDT").AssetId);
+                Assert.Equal(tether.AssetId,  ((ElementsBTCPayNetwork)tester.PayTester.GetService<BTCPayWalletProvider>().GetWallet("USDT").Network).AssetId);
+                //test: register 2 assets on the same elements network and make sure paying an invoice on one does not affect the other in any way
+                var invoice = await user.BitPay.CreateInvoiceAsync(new Invoice(0.1m, "BTC"));
+                Assert.Equal(2, invoice.SupportedTransactionCurrencies.Count);
+                var ci = invoice.CryptoInfo.Single(info => info.CryptoCode.Equals("LBTC"));
+                //1 lbtc = 1 btc
+                Assert.Equal(1, ci.Rate);
+                var star = await tester.LBTCExplorerNode.SendCommandAsync("sendtoaddress", ci.Address,ci.Due, "", "", false, true,
+                    1, "UNSET", lbtc.AssetId);
+                
+                TestUtils.Eventually(() =>
+                {
+                    var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant);
+                    Assert.Equal("paid", localInvoice.Status);
+                    Assert.Single(localInvoice.CryptoInfo.Single(info => info.CryptoCode.Equals("LBTC")).Payments);
+                });
+                
+                invoice = await user.BitPay.CreateInvoiceAsync(new Invoice(0.1m, "BTC"));
+                
+                ci = invoice.CryptoInfo.Single(info => info.CryptoCode.Equals("USDT"));
+                Assert.Equal(2, invoice.SupportedTransactionCurrencies.Count);
+                star = await tester.LBTCExplorerNode.SendCommandAsync("sendtoaddress", ci.Address, ci.Due, "", "", false, true,
+                    1, "UNSET", tether.AssetId);
+                
+                TestUtils.Eventually(() =>
+                {
+                    var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant);
+                    Assert.Equal("paid", localInvoice.Status);
+                    Assert.Single(localInvoice.CryptoInfo.Single(info => info.CryptoCode.Equals("USDT", StringComparison.InvariantCultureIgnoreCase)).Payments);
+                });
+
+            }
+        }
+    }
+}

BTCPayServer.Tests/Mocks/MockRateProvider.cs

@@ -10,10 +10,15 @@ namespace BTCPayServer.Tests.Mocks
 {
     public class MockRateProvider : IRateProvider
     {
-        public ExchangeRates ExchangeRates { get; set; } = new ExchangeRates();
-        public Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
+        public List<PairRate> ExchangeRates { get; set; } = new List<PairRate>();
+
+        public MockRateProvider()
         {
-            return Task.FromResult(ExchangeRates);
+            
+        }
+        public Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
+        {
+            return Task.FromResult(ExchangeRates.ToArray());
         }
     }
 }

BTCPayServer.Tests/PSBTTests.cs

@@ -71,7 +71,7 @@ namespace BTCPayServer.Tests
                 BitcoinAddress.Create(vmLedger.HintChange, user.SupportedNetwork.NBitcoinNetwork);
                 Assert.NotNull(vmLedger.WebsocketPath);
 
-                string redirectedPSBT = AssertRedirectedPSBT(await walletController.WalletSend(walletId, sendModel, command: "analyze-psbt"));
+                string redirectedPSBT = AssertRedirectedPSBT(await walletController.WalletSend(walletId, sendModel, command: "analyze-psbt"), nameof(walletController.WalletPSBT));
                 var vmPSBT = await walletController.WalletPSBT(walletId, new WalletPSBTViewModel() { PSBT = redirectedPSBT }).AssertViewModelAsync<WalletPSBTViewModel>();
                 var unsignedPSBT = PSBT.Parse(vmPSBT.PSBT, user.SupportedNetwork.NBitcoinNetwork);
                 Assert.NotNull(vmPSBT.Decoded);
@@ -80,14 +80,20 @@ namespace BTCPayServer.Tests
                 PSBT.Load(filePSBT.FileContents, user.SupportedNetwork.NBitcoinNetwork);
 
                 await walletController.WalletPSBT(walletId, vmPSBT, "ledger").AssertViewModelAsync<WalletSendLedgerModel>();
-                var vmPSBT2 = await walletController.WalletPSBT(walletId, vmPSBT, "broadcast").AssertViewModelAsync<WalletPSBTReadyViewModel>();
+                var vmPSBT2 = await walletController.WalletPSBTReady(walletId, new WalletPSBTReadyViewModel()
+                {
+                    PSBT = AssertRedirectedPSBT( await walletController.WalletPSBT(walletId, vmPSBT, "broadcast"), nameof(walletController.WalletPSBTReady))
+                } ).AssertViewModelAsync<WalletPSBTReadyViewModel>();
                 Assert.NotEmpty(vmPSBT2.Inputs.Where(i => i.Error != null));
                 Assert.Equal(vmPSBT.PSBT, vmPSBT2.PSBT);
 
                 var signedPSBT = unsignedPSBT.Clone();
                 signedPSBT.SignAll(user.DerivationScheme, user.ExtKey);
                 vmPSBT.PSBT = signedPSBT.ToBase64();
-                var psbtReady = await walletController.WalletPSBT(walletId, vmPSBT, "broadcast").AssertViewModelAsync<WalletPSBTReadyViewModel>();
+                var psbtReady = await walletController.WalletPSBTReady(walletId, new WalletPSBTReadyViewModel()
+                {
+                    PSBT = AssertRedirectedPSBT( await walletController.WalletPSBT(walletId, vmPSBT, "broadcast"), nameof(walletController.WalletPSBTReady))
+                } ).AssertViewModelAsync<WalletPSBTReadyViewModel>();
                 Assert.Equal(2 + 1, psbtReady.Destinations.Count); // The fee is a destination
                 Assert.Contains(psbtReady.Destinations, d => d.Destination == sendDestination && !d.Positive);
                 Assert.Contains(psbtReady.Destinations, d => d.Positive);
@@ -98,7 +104,7 @@ namespace BTCPayServer.Tests
                 var combineVM = await walletController.WalletPSBT(walletId, vmPSBT, "combine").AssertViewModelAsync<WalletPSBTCombineViewModel>();
                 Assert.Equal(vmPSBT.PSBT, combineVM.OtherPSBT);
                 combineVM.PSBT = signedPSBT.ToBase64();
-                var psbt = AssertRedirectedPSBT(await walletController.WalletPSBTCombine(walletId, combineVM));
+                var psbt = AssertRedirectedPSBT(await walletController.WalletPSBTCombine(walletId, combineVM), nameof(walletController.WalletPSBT));
 
                 var signedPSBT2 = PSBT.Parse(psbt, user.SupportedNetwork.NBitcoinNetwork);
                 Assert.True(signedPSBT.TryFinalize(out _));
@@ -108,7 +114,7 @@ namespace BTCPayServer.Tests
                 // Can use uploaded file?
                 combineVM.PSBT = null;
                 combineVM.UploadedPSBTFile = TestUtils.GetFormFile("signedPSBT", signedPSBT.ToBytes());
-                psbt = AssertRedirectedPSBT(await walletController.WalletPSBTCombine(walletId, combineVM));
+                psbt = AssertRedirectedPSBT(await walletController.WalletPSBTCombine(walletId, combineVM), nameof(walletController.WalletPSBT));
                 signedPSBT2 = PSBT.Parse(psbt, user.SupportedNetwork.NBitcoinNetwork);
                 Assert.True(signedPSBT.TryFinalize(out _));
                 Assert.True(signedPSBT2.TryFinalize(out _));
@@ -116,17 +122,18 @@ namespace BTCPayServer.Tests
 
                 var ready = (await walletController.WalletPSBTReady(walletId, signedPSBT.ToBase64())).AssertViewModel<WalletPSBTReadyViewModel>();
                 Assert.Equal(signedPSBT.ToBase64(), ready.PSBT);
-                psbt = AssertRedirectedPSBT(await walletController.WalletPSBTReady(walletId, ready, command: "analyze-psbt"));
+                psbt = AssertRedirectedPSBT(await walletController.WalletPSBTReady(walletId, ready, command: "analyze-psbt"), nameof(walletController.WalletPSBT));
                 Assert.Equal(signedPSBT.ToBase64(), psbt);
                 redirect = Assert.IsType<RedirectToActionResult>(await walletController.WalletPSBTReady(walletId, ready, command: "broadcast"));
                 Assert.Equal(nameof(walletController.WalletTransactions), redirect.ActionName);
             }
         }
 
-        private static string AssertRedirectedPSBT(IActionResult view)
+        private static string AssertRedirectedPSBT(IActionResult view, string actionName)
         {
             var postRedirectView = Assert.IsType<ViewResult>(view);
             var postRedirectViewModel = Assert.IsType<PostRedirectViewModel>(postRedirectView.Model);
+            Assert.Equal(actionName, postRedirectViewModel.AspAction);
             var redirectedPSBT = postRedirectViewModel.Parameters.Single(p => p.Key == "psbt").Value;
             return redirectedPSBT;
         }

BTCPayServer.Tests/PaymentHandlerTest.cs

@@ -13,6 +13,7 @@ using BTCPayServer.Rating;
 
 namespace BTCPayServer.Tests
 {
+    [Trait("Fast", "Fast")]
     public class PaymentHandlerTest
     {
         private BitcoinLikePaymentHandler handlerBTC;

BTCPayServer.Tests/RateRulesTest.cs

@@ -56,6 +56,8 @@ namespace BTCPayServer.Tests
                 (Pair: "BTC_CAD", Expected: "coinbase(BTC_CAD)"),
                 (Pair: "DOGE_CAD", Expected: "bittrex(DOGE_BTC) * coinbase(BTC_CAD) * 1.1"),
                 (Pair: "LTC_CAD", Expected: "coinaverage(LTC_CAD) * 1.02"),
+                (Pair: "SATS_CAD", Expected: "0.00000001 * coinbase(BTC_CAD)"),
+                (Pair: "Sats_USD", Expected: "0.00000001 * kraken(BTC_USD)")
             };
             foreach (var test in tests)
             {
@@ -102,6 +104,8 @@ namespace BTCPayServer.Tests
                 (Pair: "BTC_CAD", Expected: "coinbase(BTC_CAD)", ExpectedExchangeRates: "coinbase(BTC_CAD)"),
                 (Pair: "DOGE_CAD", Expected: "bittrex(DOGE_BTC) * coinbase(BTC_CAD) * 1.1", ExpectedExchangeRates: "bittrex(DOGE_BTC),coinbase(BTC_CAD)"),
                 (Pair: "LTC_CAD", Expected: "coinaverage(LTC_CAD) * 1.02", ExpectedExchangeRates: "coinaverage(LTC_CAD)"),
+                (Pair: "SATS_USD", Expected: "0.00000001 * kraken(BTC_USD)", ExpectedExchangeRates: "kraken(BTC_USD)"),
+                (Pair: "SATS_EUR", Expected: "0.00000001 * coinbase(BTC_EUR)", ExpectedExchangeRates: "coinbase(BTC_EUR)")
             };
             foreach (var test in tests2)
             {
@@ -189,6 +193,37 @@ namespace BTCPayServer.Tests
             rule2.ExchangeRates.SetRate("coinaverage", CurrencyPair.Parse("BTC_USD"), new BidAsk(6000m, 6100m));
             Assert.True(rule2.Reevaluate());
             Assert.Equal($"({(1m / 6100m).ToString(CultureInfo.InvariantCulture)}, {(1m / 6000m).ToString(CultureInfo.InvariantCulture)})", rule2.ToString(true));
+
+            // Make sure defining value in sats works
+            builder = new StringBuilder();
+            builder.AppendLine("BTC_USD = kraken(BTC_USD)");
+            builder.AppendLine("BTC_X = coinbase(BTC_X)");
+            Assert.True(RateRules.TryParse(builder.ToString(), out rules));
+            rule2 = rules.GetRuleFor(CurrencyPair.Parse("SATS_USD"));
+            rule2.ExchangeRates.SetRate("kraken", CurrencyPair.Parse("BTC_USD"), new BidAsk(6000m, 6100m));
+            Assert.True(rule2.Reevaluate());
+            Assert.Equal("0.00000001 * (6000, 6100)", rule2.ToString(true));
+            Assert.Equal(0.00006m, rule2.BidAsk.Bid);
+            rule2 = rules.GetRuleFor(CurrencyPair.Parse("USD_SATS"));
+            rule2.ExchangeRates.SetRate("kraken", CurrencyPair.Parse("BTC_USD"), new BidAsk(6000m, 6100m));
+            Assert.True(rule2.Reevaluate());
+            Assert.Equal("1 / (0.00000001 * (6000, 6100))", rule2.ToString(true));
+            Assert.Equal(1m / 0.000061m, rule2.BidAsk.Bid);
+
+            // testing rounding 
+            rule2 = rules.GetRuleFor(CurrencyPair.Parse("Sats_EUR"));
+            rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_EUR"), new BidAsk(1.23m, 2.34m));
+            Assert.True(rule2.Reevaluate());
+            Assert.Equal("0.00000001 * (1.23, 2.34)", rule2.ToString(true));
+            Assert.Equal(0.0000000234m, rule2.BidAsk.Ask);
+            Assert.Equal(0.0000000123m, rule2.BidAsk.Bid);
+
+            rule2 = rules.GetRuleFor(CurrencyPair.Parse("EUR_Sats"));
+            rule2.ExchangeRates.SetRate("coinbase", CurrencyPair.Parse("BTC_EUR"), new BidAsk(1.23m, 2.34m));
+            Assert.True(rule2.Reevaluate());
+            Assert.Equal("1 / (0.00000001 * (1.23, 2.34))", rule2.ToString(true));
+            Assert.Equal(1m / 0.0000000123m, rule2.BidAsk.Ask);
+            Assert.Equal(1m / 0.0000000234m, rule2.BidAsk.Bid);
         }
     }
 }

BTCPayServer.Tests/SeleniumTester.cs

@@ -18,6 +18,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Lightning;
 using BTCPayServer.Lightning.CLightning;
+using BTCPayServer.Models;
 using BTCPayServer.Views.Stores;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -39,18 +40,18 @@ namespace BTCPayServer.Tests
             };
         }
 
-      
+
         public async Task StartAsync()
         {
             await Server.StartAsync();
             ChromeOptions options = new ChromeOptions();
             var isDebug = !Server.PayTester.InContainer;
-        
+
             if (!isDebug)
             {
                 options.AddArguments("headless"); // Comment to view browser
                 options.AddArguments("window-size=1200x1000"); // Comment to view browser
-            }  
+            }
             options.AddArgument("shm-size=2g");
             if (Server.PayTester.InContainer)
             {
@@ -70,9 +71,18 @@ namespace BTCPayServer.Tests
             Driver.AssertNoError();
         }
 
-        internal void AssertHappyMessage()
+        internal void AssertHappyMessage(StatusMessageModel.StatusSeverity severity = StatusMessageModel.StatusSeverity.Success)
         {
-            Assert.Single(Driver.FindElements(By.ClassName("alert-success")).Where(el => el.Displayed));
+            using var cts = new CancellationTokenSource(20_000);
+            while (!cts.IsCancellationRequested)
+            {
+                var success = Driver.FindElements(By.ClassName($"alert-{StatusMessageModel.ToString(severity)}")).Any(el => el.Displayed);
+                if (success)
+                    return;
+                Thread.Sleep(100);
+            }
+            Logs.Tester.LogInformation(this.Driver.PageSource);
+            Assert.True(false, $"Should have shown {severity} message");
         }
 
         public static readonly TimeSpan ImplicitWait = TimeSpan.FromSeconds(10);
@@ -105,10 +115,29 @@ namespace BTCPayServer.Tests
             Driver.FindElement(By.Id("CreateStore")).Click();
             Driver.FindElement(By.Id("Name")).SendKeys(usr);
             Driver.FindElement(By.Id("Create")).Click();
-            
+
             return (usr, Driver.FindElement(By.Id("Id")).GetAttribute("value"));
         }
 
+        public string GenerateWallet(string cryptoCode = "BTC", string seed = "", bool importkeys = false, bool privkeys = false)
+        {
+            Driver.FindElement(By.Id($"Modify{cryptoCode}")).ForceClick();
+            Driver.FindElement(By.Id("import-from-btn")).ForceClick();
+            Driver.FindElement(By.Id("nbxplorergeneratewalletbtn")).ForceClick();
+            Driver.FindElement(By.Id("ExistingMnemonic")).SendKeys(seed);
+            SetCheckbox(Driver.FindElement(By.Id("SavePrivateKeys")), privkeys);
+            SetCheckbox(Driver.FindElement(By.Id("ImportKeysToRPC")), importkeys);
+            Driver.FindElement(By.Id("btn-generate")).ForceClick();
+            AssertHappyMessage();
+            if (string.IsNullOrEmpty(seed))
+            {
+                seed = Driver.FindElements(By.ClassName("alert-success")).First().FindElement(By.TagName("code")).Text;
+            }
+            Driver.FindElement(By.Id("Confirm")).ForceClick();
+            AssertHappyMessage();
+            return seed;
+        }
+
         public void AddDerivationScheme(string cryptoCode = "BTC", string derivationScheme = "xpub661MyMwAqRbcGABgHMUXDzPzH1tU7eZaAaJQXhDXsSxsqyQzQeU6kznNfSuAyqAK9UaWSaZaMFdNiY5BCF4zBPAzSnwfUAwUhwttuAKwfRX-[legacy]")
         {
             Driver.FindElement(By.Id($"Modify{cryptoCode}")).ForceClick();
@@ -117,7 +146,7 @@ namespace BTCPayServer.Tests
             Driver.FindElement(By.Id("Confirm")).ForceClick();
             AssertHappyMessage();
         }
-        
+
         public void AddLightningNode(string cryptoCode, LightningConnectionType connectionType)
         {
             string connectionString = null;
@@ -129,12 +158,12 @@ namespace BTCPayServer.Tests
                 connectionString = $"type=lnd-rest;server={Server.MerchantLnd.Swagger.BaseUrl};allowinsecure=true";
             else
                 throw new NotSupportedException(connectionType.ToString());
-            
+
             Driver.FindElement(By.Id($"Modify-Lightning{cryptoCode}")).ForceClick();
             Driver.FindElement(By.Name($"ConnectionString")).SendKeys(connectionString);
             Driver.FindElement(By.Id($"save")).ForceClick();
         }
-        
+
         public void AddInternalLightningNode(string cryptoCode)
         {
             Driver.FindElement(By.Id($"Modify-Lightning{cryptoCode}")).ForceClick();
@@ -155,7 +184,7 @@ namespace BTCPayServer.Tests
             }
         }
 
-       
+
 
         public void Dispose()
         {
@@ -174,7 +203,7 @@ namespace BTCPayServer.Tests
 
         internal void AssertNotFound()
         {
-            Assert.Contains("Status Code: 404; Not Found", Driver.PageSource);
+            Assert.Contains("404 - Page not found</h1>", Driver.PageSource);
         }
 
         public void GoToHome()
@@ -204,21 +233,26 @@ namespace BTCPayServer.Tests
                 Driver.FindElement(By.Id(storeNavPage.ToString())).Click();
             }
         }
-        
+
         public void GoToInvoiceCheckout(string invoiceId)
         {
             Driver.FindElement(By.Id("Invoices")).Click();
             Driver.FindElement(By.Id($"invoice-checkout-{invoiceId}")).Click();
             CheckForJSErrors();
         }
-        
-        
+
+
         public void SetCheckbox(IWebElement element, bool value)
         {
             if ((value && !element.Selected) || (!value && element.Selected))
             {
                 element.Click();
             }
+
+            if (value != element.Selected)
+            {
+                SetCheckbox(element, value);
+            }
         }
 
         public void SetCheckbox(SeleniumTester s, string inputName, bool value)
@@ -263,30 +297,30 @@ namespace BTCPayServer.Tests
         }
 
 
-        
+
         private void CheckForJSErrors()
         {
             //wait for seleniun update: https://stackoverflow.com/questions/57520296/selenium-webdriver-3-141-0-driver-manage-logs-availablelogtypes-throwing-syste
-//            var errorStrings = new List<string> 
-//            { 
-//                "SyntaxError", 
-//                "EvalError", 
-//                "ReferenceError", 
-//                "RangeError", 
-//                "TypeError", 
-//                "URIError" 
-//            };
-//
-//            var jsErrors = Driver.Manage().Logs.GetLog(LogType.Browser).Where(x => errorStrings.Any(e => x.Message.Contains(e)));
-//
-//            if (jsErrors.Any())
-//            {
-//                Logs.Tester.LogInformation("JavaScript error(s):" + Environment.NewLine + jsErrors.Aggregate("", (s, entry) => s + entry.Message + Environment.NewLine));
-//            }
-//            Assert.Empty(jsErrors);
+            //            var errorStrings = new List<string> 
+            //            { 
+            //                "SyntaxError", 
+            //                "EvalError", 
+            //                "ReferenceError", 
+            //                "RangeError", 
+            //                "TypeError", 
+            //                "URIError" 
+            //            };
+            //
+            //            var jsErrors = Driver.Manage().Logs.GetLog(LogType.Browser).Where(x => errorStrings.Any(e => x.Message.Contains(e)));
+            //
+            //            if (jsErrors.Any())
+            //            {
+            //                Logs.Tester.LogInformation("JavaScript error(s):" + Environment.NewLine + jsErrors.Aggregate("", (s, entry) => s + entry.Message + Environment.NewLine));
+            //            }
+            //            Assert.Empty(jsErrors);
 
         }
 
-      
+
     }
 }

BTCPayServer.Tests/SeleniumTests.cs

@@ -9,6 +9,8 @@ using System.Linq;
 using NBitcoin;
 using System.Threading.Tasks;
 using System.Text.RegularExpressions;
+using BTCPayServer.Models;
+using NBitcoin.Payment;
 
 namespace BTCPayServer.Tests
 {
@@ -34,6 +36,27 @@ namespace BTCPayServer.Tests
                 s.ClickOnAllSideMenus();
                 s.Driver.FindElement(By.LinkText("Services")).Click();
 
+                Logs.Tester.LogInformation("Let's check if we can access the logs");
+                s.Driver.FindElement(By.LinkText("Logs")).Click();
+                s.Driver.FindElement(By.PartialLinkText(".log")).Click();
+                Assert.Contains("Starting listening NBXplorer", s.Driver.PageSource);
+                s.Driver.Quit();
+            }
+        }
+
+        [Fact(Timeout = TestTimeout)]
+        [Trait("Lightning", "Lightning")]
+        public async Task CanUseLndSeedBackup()
+        {
+            using (var s = SeleniumTester.Create())
+            {
+                s.Server.ActivateLightning();
+                await s.StartAsync();
+                s.RegisterNewUser(true);
+                s.Driver.FindElement(By.Id("ServerSettings")).Click();
+                s.Driver.AssertNoError();
+                s.Driver.FindElement(By.LinkText("Services")).Click();
+
                 Logs.Tester.LogInformation("Let's if we can access LND's seed");
                 Assert.Contains("server/services/lndseedbackup/BTC", s.Driver.PageSource);
                 s.Driver.Navigate().GoToUrl(s.Link("/server/services/lndseedbackup/BTC"));
@@ -49,12 +72,6 @@ namespace BTCPayServer.Tests
                 s.AssertHappyMessage();
                 seedEl = s.Driver.FindElement(By.Id("SeedTextArea"));
                 Assert.Contains("Seed removed", seedEl.Text, StringComparison.OrdinalIgnoreCase);
-
-                Logs.Tester.LogInformation("Let's check if we can access the logs");
-                s.Driver.FindElement(By.LinkText("Logs")).Click();
-                s.Driver.FindElement(By.PartialLinkText(".log")).Click();
-                Assert.Contains("Starting listening NBXplorer", s.Driver.PageSource);
-                s.Driver.Quit();
             }
         }
 
@@ -400,7 +417,7 @@ namespace BTCPayServer.Tests
                 s.Driver.Quit();
             }
         }
-
+        
         [Fact(Timeout = TestTimeout)]
         public async Task CanManageWallet()
         {
@@ -408,14 +425,77 @@ namespace BTCPayServer.Tests
             {
                 await s.StartAsync();
                 s.RegisterNewUser(true);
-                s.CreateNewStore();
+               var storeId =  s.CreateNewStore();
 
                 // In this test, we try to spend from a manual seed. We import the xpub 49'/0'/0', then try to use the seed 
                 // to sign the transaction
-                var mnemonic = "usage fever hen zero slide mammal silent heavy donate budget pulse say brain thank sausage brand craft about save attract muffin advance illegal cabbage";
+                s.GenerateWallet("BTC", "", true, false);
+               
+                //let's test quickly the receive wallet page
+                s.Driver.FindElement(By.Id("Wallets")).Click();
+                s.Driver.FindElement(By.LinkText("Manage")).Click();
+                
+                s.Driver.FindElement(By.Id("WalletSend")).Click();
+                s.Driver.ScrollTo(By.Id("SendMenu"));
+                s.Driver.FindElement(By.Id("SendMenu")).ForceClick();
+                //you cant use the Sign with NBX option without saving private keys when generating the wallet.
+                Assert.DoesNotContain("nbx-seed", s.Driver.PageSource);
+                
+                s.Driver.FindElement(By.Id("WalletReceive")).Click();
+                //generate a receiving address
+                s.Driver.FindElement(By.CssSelector("button[value=generate-new-address]")).Click();
+                Assert.True(s.Driver.FindElement(By.ClassName("qr-container")).Displayed);
+                var receiveAddr = s.Driver.FindElement(By.Id("vue-address")).GetAttribute("value");
+                //unreserve
+                s.Driver.FindElement(By.CssSelector("button[value=unreserve-current-address]")).Click();
+                //generate it again, should be the same one as before as nothign got used in the meantime
+                s.Driver.FindElement(By.CssSelector("button[value=generate-new-address]")).Click();
+                Assert.True(s.Driver.FindElement(By.ClassName("qr-container")).Displayed);
+                Assert.Equal( receiveAddr, s.Driver.FindElement(By.Id("vue-address")).GetAttribute("value"));
+                
+                //send money to addr and ensure it changed
+                
+                var sess = await s.Server.ExplorerClient.CreateWebsocketNotificationSessionAsync();
+                sess.ListenAllTrackedSource();
+                var nextEvent = sess.NextEventAsync();
+                s.Server.ExplorerNode.SendToAddress(BitcoinAddress.Create(receiveAddr, Network.RegTest),
+                    Money.Parse("0.1"));
+                await nextEvent;
+                await Task.Delay(200);
+                s.Driver.Navigate().Refresh();
+                s.Driver.FindElement(By.CssSelector("button[value=generate-new-address]")).Click();
+                Assert.NotEqual( receiveAddr, s.Driver.FindElement(By.Id("vue-address")).GetAttribute("value"));
+                receiveAddr = s.Driver.FindElement(By.Id("vue-address")).GetAttribute("value");
+                //change the wallet and ensure old address is not there and generating a new one does not result in the prev one
+                s.GoToStore(storeId.storeId);
+                s.GenerateWallet("BTC", "", true, false);
+                s.Driver.FindElement(By.Id("Wallets")).Click();
+                s.Driver.FindElement(By.LinkText("Manage")).Click();
+                s.Driver.FindElement(By.Id("WalletReceive")).Click();
+                s.Driver.FindElement(By.CssSelector("button[value=generate-new-address]")).Click();
+                Assert.NotEqual( receiveAddr, s.Driver.FindElement(By.Id("vue-address")).GetAttribute("value"));
+                
+                
+                var invoiceId = s.CreateInvoice(storeId.storeId);
+                var invoice = await s.Server.PayTester.InvoiceRepository.GetInvoice(invoiceId);
+                var address = invoice.EntityToDTO().Addresses["BTC"];
+                
+
+                //wallet should have been imported to bitcoin core wallet in watch only mode.
+                var result = await s.Server.ExplorerNode.GetAddressInfoAsync(BitcoinAddress.Create(address, Network.RegTest));
+                Assert.True(result.IsWatchOnly);
+                s.GoToStore(storeId.storeId);
+                var mnemonic = s.GenerateWallet("BTC", "", true, true);
+                
+                //lets import and save private keys
                 var root = new Mnemonic(mnemonic).DeriveExtKey();
-                s.AddDerivationScheme("BTC", "ypub6WWc2gWwHbdnAAyJDnR4SPL1phRh7REqrPBfZeizaQ1EmTshieRXJC3Z5YoU4wkcdKHEjQGkh6AYEzCQC1Kz3DNaWSwdc1pc8416hAjzqyD");
-                var tx = s.Server.ExplorerNode.SendToAddress(BitcoinAddress.Create("bcrt1qmxg8fgnmkp354vhe78j6sr4ut64tyz2xyejel4", Network.RegTest), Money.Coins(3.0m));
+                 invoiceId = s.CreateInvoice(storeId.storeId);
+                 invoice = await s.Server.PayTester.InvoiceRepository.GetInvoice( invoiceId);
+                 address = invoice.EntityToDTO().Addresses["BTC"];
+                 result = await s.Server.ExplorerNode.GetAddressInfoAsync(BitcoinAddress.Create(address, Network.RegTest));
+                 //spendable from bitcoin core wallet!
+                 Assert.False(result.IsWatchOnly);
+                var tx = s.Server.ExplorerNode.SendToAddress(BitcoinAddress.Create(address, Network.RegTest), Money.Coins(3.0m));
                 s.Server.ExplorerNode.Generate(1);
 
                 s.Driver.FindElement(By.Id("Wallets")).Click();
@@ -429,8 +509,8 @@ namespace BTCPayServer.Tests
 
                 // We setup the fingerprint and the account key path
                 s.Driver.FindElement(By.Id("WalletSettings")).ForceClick();
-                s.Driver.FindElement(By.Id("AccountKeys_0__MasterFingerprint")).SendKeys("8bafd160");
-                s.Driver.FindElement(By.Id("AccountKeys_0__AccountKeyPath")).SendKeys("m/49'/0'/0'" + Keys.Enter);
+//                s.Driver.FindElement(By.Id("AccountKeys_0__MasterFingerprint")).SendKeys("8bafd160");
+//                s.Driver.FindElement(By.Id("AccountKeys_0__AccountKeyPath")).SendKeys("m/49'/0'/0'" + Keys.Enter);
 
                 // Check the tx sent earlier arrived
                 s.Driver.FindElement(By.Id("WalletTransactions")).ForceClick();
@@ -470,9 +550,43 @@ namespace BTCPayServer.Tests
                         checkboxElement.Click();
                     }
                 }
+                
                 SignWith(mnemonic);
-                var accountKey = root.Derive(new KeyPath("m/49'/0'/0'")).GetWif(Network.RegTest).ToString();
-                SignWith(accountKey);
+                
+                s.Driver.FindElement(By.Id("Wallets")).Click();
+                s.Driver.FindElement(By.LinkText("Manage")).Click();
+                s.Driver.FindElement(By.Id("WalletSend")).Click();
+                
+                var jack = new Key().PubKey.Hash.GetAddress(Network.RegTest);
+                SetTransactionOutput(0, jack, 0.01m);
+                s.Driver.ScrollTo(By.Id("SendMenu"));
+                s.Driver.FindElement(By.Id("SendMenu")).ForceClick();
+                
+                s.Driver.FindElement(By.CssSelector("button[value=nbx-seed]")).Click();
+                Assert.Contains(jack.ToString(), s.Driver.PageSource);
+                Assert.Contains("0.01000000", s.Driver.PageSource);
+                s.Driver.FindElement(By.CssSelector("button[value=analyze-psbt]")).ForceClick();
+                Assert.EndsWith("psbt", s.Driver.Url);
+                s.Driver.FindElement(By.CssSelector("#OtherActions")).ForceClick();
+                s.Driver.FindElement(By.CssSelector("button[value=broadcast]")).ForceClick();
+                Assert.EndsWith("psbt/ready", s.Driver.Url);
+                s.Driver.FindElement(By.CssSelector("button[value=broadcast]")).ForceClick();
+                Assert.Equal(walletTransactionLink, s.Driver.Url);
+                
+                var bip21 = invoice.EntityToDTO().CryptoInfo.First().PaymentUrls.BIP21;
+                //let's make bip21 more interesting
+                bip21 += "&label=Solid Snake&message=Snake? Snake? SNAAAAKE!";
+                var parsedBip21 = new BitcoinUrlBuilder(bip21, Network.RegTest);
+                s.Driver.FindElement(By.Id("Wallets")).Click();
+                s.Driver.FindElement(By.LinkText("Manage")).Click();
+                s.Driver.FindElement(By.Id("WalletSend")).Click();
+                s.Driver.FindElement(By.Id("bip21parse")).Click();
+                s.Driver.SwitchTo().Alert().SendKeys(bip21);
+                s.Driver.SwitchTo().Alert().Accept();
+                s.AssertHappyMessage(StatusMessageModel.StatusSeverity.Info);
+                Assert.Equal(parsedBip21.Amount.ToString(false), s.Driver.FindElement(By.Id($"Outputs_0__Amount")).GetAttribute("value"));
+                Assert.Equal(parsedBip21.Address.ToString(), s.Driver.FindElement(By.Id($"Outputs_0__DestinationAddress")).GetAttribute("value"));
+                
             }
         }
     }

BTCPayServer.Tests/ServerTester.cs

@@ -46,27 +46,15 @@ namespace BTCPayServer.Tests
             NetworkProvider = new BTCPayNetworkProvider(NetworkType.Regtest);
             ExplorerNode = new RPCClient(RPCCredentialString.Parse(GetEnvironment("TESTS_BTCRPCCONNECTION", "server=http://127.0.0.1:43782;ceiwHEbqWI83:DwubwWsoo3")), NetworkProvider.GetNetwork<BTCPayNetwork>("BTC").NBitcoinNetwork);
             ExplorerNode.ScanRPCCapabilities();
-            LTCExplorerNode = new RPCClient(RPCCredentialString.Parse(GetEnvironment("TESTS_LTCRPCCONNECTION", "server=http://127.0.0.1:43783;ceiwHEbqWI83:DwubwWsoo3")), NetworkProvider.GetNetwork<BTCPayNetwork>("LTC").NBitcoinNetwork);
 
             ExplorerClient = new ExplorerClient(NetworkProvider.GetNetwork<BTCPayNetwork>("BTC").NBXplorerNetwork, new Uri(GetEnvironment("TESTS_BTCNBXPLORERURL", "http://127.0.0.1:32838/")));
-            LTCExplorerClient = new ExplorerClient(NetworkProvider.GetNetwork<BTCPayNetwork>("LTC").NBXplorerNetwork, new Uri(GetEnvironment("TESTS_LTCNBXPLORERURL", "http://127.0.0.1:32838/")));
-
-            var btc = NetworkProvider.GetNetwork<BTCPayNetwork>("BTC").NBitcoinNetwork;
-            CustomerLightningD = LightningClientFactory.CreateClient(GetEnvironment("TEST_CUSTOMERLIGHTNINGD", "type=clightning;server=tcp://127.0.0.1:30992/"), btc);
-            MerchantLightningD = LightningClientFactory.CreateClient(GetEnvironment("TEST_MERCHANTLIGHTNINGD", "type=clightning;server=tcp://127.0.0.1:30993/"), btc);
-
-            MerchantCharge = new ChargeTester(this, "TEST_MERCHANTCHARGE", "type=charge;server=http://127.0.0.1:54938/;api-token=foiewnccewuify", "merchant_lightningd", btc);
-
-            MerchantLnd = new LndMockTester(this, "TEST_MERCHANTLND", "https://lnd:lnd@127.0.0.1:53280/", "merchant_lnd", btc);
 
             PayTester = new BTCPayServerTester(Path.Combine(_Directory, "pay"))
             {
                 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
+                MySQL = GetEnvironment("TESTS_MYSQL", "User ID=root;Host=127.0.0.1;Port=33036;Database=btcpayserver")
             };
             PayTester.Port = int.Parse(GetEnvironment("TESTS_PORT", Utils.FreeTcpPort().ToString(CultureInfo.InvariantCulture)), CultureInfo.InvariantCulture);
             PayTester.HostName = GetEnvironment("TESTS_HOSTNAME", "127.0.0.1");
@@ -77,6 +65,32 @@ namespace BTCPayServer.Tests
             PayTester.SSHConnection = GetEnvironment("TESTS_SSHCONNECTION", "root@127.0.0.1:21622");
         }
 
+        public void ActivateLTC()
+        {
+            LTCExplorerNode = new RPCClient(RPCCredentialString.Parse(GetEnvironment("TESTS_LTCRPCCONNECTION", "server=http://127.0.0.1:43783;ceiwHEbqWI83:DwubwWsoo3")), NetworkProvider.GetNetwork<BTCPayNetwork>("LTC").NBitcoinNetwork);
+            LTCExplorerClient = new ExplorerClient(NetworkProvider.GetNetwork<BTCPayNetwork>("LTC").NBXplorerNetwork, new Uri(GetEnvironment("TESTS_LTCNBXPLORERURL", "http://127.0.0.1:32838/")));
+            PayTester.Chains.Add("LTC");
+            PayTester.LTCNBXplorerUri = LTCExplorerClient.Address;
+        }
+        public void ActivateLBTC()
+        {
+            LBTCExplorerNode = new RPCClient(RPCCredentialString.Parse(GetEnvironment("TESTS_LBTCRPCCONNECTION", "server=http://127.0.0.1:19332;liquid:liquid")), NetworkProvider.GetNetwork<BTCPayNetwork>("LBTC").NBitcoinNetwork);
+            LBTCExplorerClient = new ExplorerClient(NetworkProvider.GetNetwork<BTCPayNetwork>("LBTC").NBXplorerNetwork, new Uri(GetEnvironment("TESTS_LBTCNBXPLORERURL", "http://127.0.0.1:32838/")));
+            PayTester.Chains.Add("LBTC");
+            PayTester.LBTCNBXplorerUri = LBTCExplorerClient.Address;
+        }
+
+        public void ActivateLightning()
+        {
+            var btc = NetworkProvider.GetNetwork<BTCPayNetwork>("BTC").NBitcoinNetwork;
+            CustomerLightningD = LightningClientFactory.CreateClient(GetEnvironment("TEST_CUSTOMERLIGHTNINGD", "type=clightning;server=tcp://127.0.0.1:30992/"), btc);
+            MerchantLightningD = LightningClientFactory.CreateClient(GetEnvironment("TEST_MERCHANTLIGHTNINGD", "type=clightning;server=tcp://127.0.0.1:30993/"), btc);
+            MerchantCharge = new ChargeTester(this, "TEST_MERCHANTCHARGE", "type=charge;server=http://127.0.0.1:54938/;api-token=foiewnccewuify", "merchant_lightningd", btc);
+            MerchantLnd = new LndMockTester(this, "TEST_MERCHANTLND", "https://lnd:lnd@127.0.0.1:53280/", "merchant_lnd", btc);
+            PayTester.UseLightning = true;
+            PayTester.IntegratedLightning = MerchantCharge.Client.Uri;
+        }
+
         public bool Dockerized
         {
             get; set;
@@ -148,12 +162,15 @@ namespace BTCPayServer.Tests
         {
             get; set;
         }
+        
+        public RPCClient LBTCExplorerNode { get; set; }
 
         public ExplorerClient ExplorerClient
         {
             get; set;
         }
         public ExplorerClient LTCExplorerClient { get; set; }
+        public ExplorerClient LBTCExplorerClient { get; set; }
 
         HttpClient _Http = new HttpClient();
 

BTCPayServer.Tests/TestAccount.cs

@@ -109,7 +109,7 @@ namespace BTCPayServer.Tests
             SupportedNetwork = parent.NetworkProvider.GetNetwork<BTCPayNetwork>(cryptoCode);
             var store = parent.PayTester.GetController<StoresController>(UserId, StoreId);
             ExtKey = new ExtKey().GetWif(SupportedNetwork.NBitcoinNetwork);
-            DerivationScheme = new DerivationStrategyFactory(SupportedNetwork.NBitcoinNetwork).Parse(ExtKey.Neuter().ToString() + (segwit ? "" : "-[legacy]"));
+            DerivationScheme = SupportedNetwork.NBXplorerNetwork.DerivationStrategyFactory.Parse(ExtKey.Neuter().ToString() + (segwit ? "" : "-[legacy]"));
             await store.AddDerivationScheme(StoreId, new DerivationSchemeViewModel()
             {
                 DerivationScheme = DerivationScheme.ToString(),

BTCPayServer.Tests/TestUtils.cs

@@ -5,11 +5,10 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-#if NETCOREAPP21
-using Microsoft.AspNetCore.Http.Internal;
-#endif
 using Xunit.Sdk;
 using System.Linq;
+using System.Net.Http;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace BTCPayServer.Tests
 {
@@ -107,5 +106,12 @@ namespace BTCPayServer.Tests
                 }
             }
         }
+
+        internal static IHttpClientFactory CreateHttpFactory()
+        {
+            var services = new ServiceCollection();
+            services.AddHttpClient();
+            return services.BuildServiceProvider().GetRequiredService<IHttpClientFactory>();
+        }
     }
 }

BTCPayServer.Tests/U2FTests.cs

@@ -0,0 +1,130 @@
+using System;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BTCPayServer.Controllers;
+using BTCPayServer.Data;
+using BTCPayServer.Models.AccountViewModels;
+using BTCPayServer.Tests.Logging;
+using BTCPayServer.U2F;
+using BTCPayServer.U2F.Models;
+using Microsoft.AspNetCore.Mvc;
+using U2F.Core.Models;
+using U2F.Core.Utils;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace BTCPayServer.Tests
+{
+    public class U2FTests
+    {
+        public const int TestTimeout = 60_000;
+
+        public U2FTests(ITestOutputHelper helper)
+        {
+            Logs.Tester = new XUnitLog(helper) {Name = "Tests"};
+            Logs.LogProvider = new XUnitLogProvider(helper);
+        }
+
+
+        [Fact(Timeout = TestTimeout)]
+        [Trait("Integration", "Integration")]
+        public async Task U2ftest()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                await tester.StartAsync();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+                user.RegisterDerivationScheme("BTC");
+
+                var accountController = tester.PayTester.GetController<AccountController>();
+                var manageController = user.GetController<ManageController>();
+                var mock = new MockU2FService(tester.PayTester.GetService<ApplicationDbContextFactory>());
+                manageController._u2FService = mock;
+                accountController._u2FService = mock;
+
+                Assert
+                    .IsType<RedirectToActionResult>(await accountController.Login(new LoginViewModel()
+                    {
+                        Email = user.RegisterDetails.Email, Password = user.RegisterDetails.Password
+                    }));
+
+                Assert.Empty(Assert.IsType<U2FAuthenticationViewModel>(Assert
+                    .IsType<ViewResult>(await manageController.U2FAuthentication()).Model).Devices);
+
+                var addDeviceVM = Assert.IsType<AddU2FDeviceViewModel>(Assert
+                    .IsType<ViewResult>(manageController.AddU2FDevice("testdevice")).Model);
+
+                Assert.NotEmpty(addDeviceVM.Challenge);
+                Assert.Equal("testdevice", addDeviceVM.Name);
+                Assert.NotEmpty(addDeviceVM.Version);
+                Assert.Null(addDeviceVM.DeviceResponse);
+
+                var devReg = new DeviceRegistration(Guid.NewGuid().ToByteArray(), Guid.NewGuid().ToByteArray(),
+                    Guid.NewGuid().ToByteArray(), 1);
+
+                mock.GetDevReg = () => devReg;
+                mock.StartedAuthentication = () =>
+                    new StartedAuthentication("chocolate", addDeviceVM.AppId,
+                        devReg.KeyHandle.ByteArrayToBase64String());
+                addDeviceVM.DeviceResponse = new RegisterResponse("ss",
+                    Convert.ToBase64String(Encoding.UTF8.GetBytes("{typ:'x', challenge: 'fff'}"))).ToJson();
+                Assert
+                    .IsType<RedirectToActionResult>(await manageController.AddU2FDevice(addDeviceVM));
+
+                Assert.Single(Assert.IsType<U2FAuthenticationViewModel>(Assert
+                    .IsType<ViewResult>(await manageController.U2FAuthentication()).Model).Devices);
+
+                var secondaryLoginViewModel = Assert.IsType<SecondaryLoginViewModel>(Assert
+                    .IsType<ViewResult>(await accountController.Login(new LoginViewModel()
+                    {
+                        Email = user.RegisterDetails.Email, Password = user.RegisterDetails.Password
+                    })).Model);
+                Assert.NotNull(secondaryLoginViewModel.LoginWithU2FViewModel);
+                Assert.Single(secondaryLoginViewModel.LoginWithU2FViewModel.Challenges);
+                Assert.Equal(secondaryLoginViewModel.LoginWithU2FViewModel.Challenge,
+                    secondaryLoginViewModel.LoginWithU2FViewModel.Challenges.First().challenge);
+
+                secondaryLoginViewModel.LoginWithU2FViewModel.DeviceResponse = new AuthenticateResponse(
+                    Convert.ToBase64String(Encoding.UTF8.GetBytes(
+                        "{typ:'x', challenge: '" + secondaryLoginViewModel.LoginWithU2FViewModel.Challenge + "'}")),
+                    "dd", devReg.KeyHandle.ByteArrayToBase64String()).ToJson();
+                Assert
+                    .IsType<RedirectToActionResult>(
+                        await accountController.LoginWithU2F(secondaryLoginViewModel.LoginWithU2FViewModel));
+            }
+        }
+
+        public class MockU2FService : U2FService
+        {
+            public Func<DeviceRegistration> GetDevReg;
+            public Func<StartedAuthentication> StartedAuthentication;
+
+            public MockU2FService(ApplicationDbContextFactory contextFactory) : base(contextFactory)
+            {
+            }
+
+            protected override StartedRegistration StartDeviceRegistrationCore(string appId)
+            {
+                return global::U2F.Core.Crypto.U2F.StartRegistration(appId);
+            }
+
+            protected override DeviceRegistration FinishRegistrationCore(StartedRegistration startedRegistration,
+                RegisterResponse registerResponse)
+            {
+                return GetDevReg();
+            }
+
+            protected override StartedAuthentication StartAuthenticationCore(string appId, U2FDevice registeredDevice)
+            {
+                return StartedAuthentication();
+            }
+
+            protected override void FinishAuthenticationCore(StartedAuthentication authentication,
+                AuthenticateResponse authenticateResponse, DeviceRegistration registration)
+            {
+            }
+        }
+    }
+}

BTCPayServer.Tests/UnitTest1.cs

@@ -151,6 +151,7 @@ namespace BTCPayServer.Tests
                 new LightningLikePaymentHandler(null, null, networkProvider, null),
             });
             InvoiceEntity invoiceEntity = new InvoiceEntity();
+            invoiceEntity.Networks = networkProvider;
             invoiceEntity.Payments = new System.Collections.Generic.List<PaymentEntity>();
             invoiceEntity.ProductInformation = new ProductInformation() {Price = 100};
             PaymentMethodDictionary paymentMethods = new PaymentMethodDictionary();
@@ -172,12 +173,15 @@ namespace BTCPayServer.Tests
             invoiceEntity.Payments.Add(
                 new PaymentEntity()
                     {
+
                         Accounted = true,
                         CryptoCode = "BTC",
-                        NetworkFee = 0.00000100m
+                        NetworkFee = 0.00000100m,
+                        Network = networkProvider.GetNetwork("BTC"),
                     }
                     .SetCryptoPaymentData(new BitcoinLikePaymentData()
                     {
+                        Network = networkProvider.GetNetwork("BTC"),
                         Output = new TxOut() {Value = Money.Coins(0.00151263m)}
                     }));
             accounting = btc.Calculate();
@@ -186,10 +190,12 @@ namespace BTCPayServer.Tests
                     {
                         Accounted = true,
                         CryptoCode = "BTC",
-                        NetworkFee = 0.00000100m
+                        NetworkFee = 0.00000100m,
+                        Network = networkProvider.GetNetwork("BTC")
                     }
                     .SetCryptoPaymentData(new BitcoinLikePaymentData()
                     {
+                        Network = networkProvider.GetNetwork("BTC"),
                         Output = new TxOut() {Value = accounting.Due}
                     }));
             accounting = btc.Calculate();
@@ -258,6 +264,7 @@ namespace BTCPayServer.Tests
                 new LightningLikePaymentHandler(null, null, networkProvider, null),
             });
             var entity = new InvoiceEntity();
+            entity.Networks = networkProvider;
 #pragma warning disable CS0618
             entity.Payments = new System.Collections.Generic.List<PaymentEntity>();
             entity.SetPaymentMethod(new PaymentMethod()
@@ -308,7 +315,7 @@ namespace BTCPayServer.Tests
             entity.Payments.Add(
                 new PaymentEntity()
                 {
-                    Output = new TxOut(Money.Coins(0.2m), new Key()), 
+                    Output = new TxOut(Money.Coins(0.2m), new Key()),
                     Accounted = true
                 });
 
@@ -317,20 +324,21 @@ namespace BTCPayServer.Tests
             Assert.Equal(Money.Coins(1.3m), accounting.TotalDue);
 
             entity = new InvoiceEntity();
+            entity.Networks = networkProvider;
             entity.ProductInformation = new ProductInformation() {Price = 5000};
             PaymentMethodDictionary paymentMethods = new PaymentMethodDictionary();
             paymentMethods.Add(
                 new PaymentMethod()
                 {
-                    CryptoCode = "BTC", 
-                    Rate = 1000, 
+                    CryptoCode = "BTC",
+                    Rate = 1000,
                     NextNetworkFee = Money.Coins(0.1m)
                 });
             paymentMethods.Add(
                 new PaymentMethod()
                 {
-                    CryptoCode = "LTC", 
-                    Rate = 500, 
+                    CryptoCode = "LTC",
+                    Rate = 500,
                     NextNetworkFee = Money.Coins(0.01m)
                 });
             entity.SetPaymentMethods(paymentMethods);
@@ -445,6 +453,7 @@ namespace BTCPayServer.Tests
                 new LightningLikePaymentHandler(null, null, networkProvider, null),
             });
             var entity = new InvoiceEntity();
+            entity.Networks = networkProvider;
 #pragma warning disable CS0618
             entity.Payments = new List<PaymentEntity>();
             entity.SetPaymentMethod(new PaymentMethod()
@@ -512,6 +521,39 @@ namespace BTCPayServer.Tests
             }
         }
 
+        [Fact]
+        [Trait("Integration", "Integration")]
+        public async Task CanThrowBitpay404Error()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                await tester.StartAsync();
+                var user = tester.NewAccount();
+                user.GrantAccess();
+                user.RegisterDerivationScheme("BTC");
+
+                var invoice = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Buyer = new Buyer() { email = "test@fwf.com" },
+                    Price = 5000.0m,
+                    Currency = "USD",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description",
+                    FullNotifications = true
+                }, Facade.Merchant);
+
+                try
+                {
+                    var throwsBitpay404Error = user.BitPay.GetInvoice(invoice.Id + "123");
+                }
+                catch (BitPayException ex)
+                {
+                    Assert.Equal("Object not found", ex.Errors.First());
+                }
+            }
+        }
+
         [Fact]
         [Trait("Fast", "Fast")]
         public void RoundupCurrenciesCorrectly()
@@ -551,10 +593,12 @@ namespace BTCPayServer.Tests
 
         [Fact(Timeout = 60 * 2 * 1000)]
         [Trait("Integration", "Integration")]
+        [Trait("Lightning", "Lightning")]
         public async Task CanSetLightningServer()
         {
             using (var tester = ServerTester.Create())
             {
+                tester.ActivateLightning();
                 await tester.StartAsync();
                 await tester.EnsureChannelsSetup();
                 var user = tester.NewAccount();
@@ -590,6 +634,7 @@ namespace BTCPayServer.Tests
 
         [Fact(Timeout = 60 * 2 * 1000)]
         [Trait("Integration", "Integration")]
+        [Trait("Lightning", "Lightning")]
         public async Task CanSendLightningPaymentCLightning()
         {
             await ProcessLightningPayment(LightningConnectionType.CLightning);
@@ -597,6 +642,7 @@ namespace BTCPayServer.Tests
 
         [Fact(Timeout = 60 * 2 * 1000)]
         [Trait("Integration", "Integration")]
+        [Trait("Lightning", "Lightning")]
         public async Task CanSendLightningPaymentCharge()
         {
             await ProcessLightningPayment(LightningConnectionType.Charge);
@@ -604,6 +650,7 @@ namespace BTCPayServer.Tests
 
         [Fact(Timeout = 60 * 2 * 1000)]
         [Trait("Integration", "Integration")]
+        [Trait("Lightning", "Lightning")]
         public async Task CanSendLightningPaymentLnd()
         {
             await ProcessLightningPayment(LightningConnectionType.LndREST);
@@ -616,6 +663,7 @@ namespace BTCPayServer.Tests
 
             using (var tester = ServerTester.Create())
             {
+                tester.ActivateLightning();
                 await tester.StartAsync();
                 await tester.EnsureChannelsSetup();
                 var user = tester.NewAccount();
@@ -649,7 +697,8 @@ namespace BTCPayServer.Tests
             {
                 var localInvoice = await user.BitPay.GetInvoiceAsync(invoice.Id);
                 Assert.Equal("complete", localInvoice.Status);
-                Assert.Equal("False", localInvoice.ExceptionStatus.ToString());
+                // C-Lightning may overpay for privacy
+                Assert.Contains(localInvoice.ExceptionStatus.ToString(), new[] { "False", "paidOver" });
             });
         }
 
@@ -797,21 +846,14 @@ namespace BTCPayServer.Tests
                 acc.GrantAccess();
                 acc.RegisterDerivationScheme("BTC", true);
                 var btcDerivationScheme = acc.DerivationScheme;
-                acc.RegisterDerivationScheme("LTC", true);
 
                 var walletController = acc.GetController<WalletsController>();
-                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.False(rescan.IsSupportedByCurrency);
-                Assert.False(rescan.IsServerAdmin);
 
-                walletId = new WalletId(acc.StoreId, "BTC");
+                var walletId = new WalletId(acc.StoreId, "BTC");
                 acc.IsAdmin = true;
                 walletController = acc.GetController<WalletsController>();
-                
-                rescan = Assert.IsType<RescanWalletModel>(Assert.IsType<ViewResult>(walletController.WalletRescan(walletId).Result).Model);
+
+                var rescan = Assert.IsType<RescanWalletModel>(Assert.IsType<ViewResult>(walletController.WalletRescan(walletId).Result).Model);
                 Assert.True(rescan.Ok);
                 Assert.True(rescan.IsFullySync);
                 Assert.True(rescan.IsSupportedByCurrency);
@@ -853,6 +895,7 @@ namespace BTCPayServer.Tests
                 Assert.Equal(tx.Id, txId.ToString());
 
                 // Hijack the test to see if we can add label and comments
+                Assert.IsType<RedirectToActionResult>(await walletController.ModifyTransaction(walletId, tx.Id, addcomment: "hello-pouet"));
                 Assert.IsType<RedirectToActionResult>(await walletController.ModifyTransaction(walletId, tx.Id, addlabel: "test"));
                 Assert.IsType<RedirectToActionResult>(await walletController.ModifyTransaction(walletId, tx.Id, addlabelclick: "test2"));
                 Assert.IsType<RedirectToActionResult>(await walletController.ModifyTransaction(walletId, tx.Id, addcomment: "hello"));
@@ -938,15 +981,14 @@ namespace BTCPayServer.Tests
                 var acc = tester.NewAccount();
                 acc.GrantAccess();
                 acc.RegisterDerivationScheme("BTC");
-                acc.RegisterDerivationScheme("LTC");
 
                 var rateController = acc.GetController<RateController>();
                 var GetBaseCurrencyRatesResult = JObject.Parse(((JsonResult)rateController.GetBaseCurrencyRates("BTC", default)
                     .GetAwaiter().GetResult()).Value.ToJson()).ToObject<DataWrapper<Rate[]>>();
                 Assert.NotNull(GetBaseCurrencyRatesResult);
                 Assert.NotNull(GetBaseCurrencyRatesResult.Data);
-                Assert.Equal(2, GetBaseCurrencyRatesResult.Data.Length);
-                Assert.Single(GetBaseCurrencyRatesResult.Data.Where(o => o.Code == "LTC"));
+                var rate = Assert.Single(GetBaseCurrencyRatesResult.Data);
+                Assert.Equal("BTC", rate.Code);
 
                 var GetRatesResult = JObject.Parse(((JsonResult)rateController.GetRates(null, default)
                     .GetAwaiter().GetResult()).Value.ToJson()).ToObject<DataWrapper<Rate[]>>();
@@ -956,7 +998,7 @@ namespace BTCPayServer.Tests
                 var store = acc.GetController<StoresController>();
                 var ratesVM = (RatesViewModel)(Assert.IsType<ViewResult>(store.Rates()).Model);
                 ratesVM.DefaultCurrencyPairs = "BTC_USD,LTC_USD";
-                store.Rates(ratesVM).Wait();
+                await store.Rates(ratesVM);
                 store = acc.GetController<StoresController>();
                 rateController = acc.GetController<RateController>();
                 GetRatesResult = JObject.Parse(((JsonResult)rateController.GetRates(null, default)
@@ -1180,13 +1222,13 @@ namespace BTCPayServer.Tests
                 // Can generate API Key
                 var repo = tester.PayTester.GetService<TokenRepository>();
                 Assert.Empty(repo.GetLegacyAPIKeys(user.StoreId).GetAwaiter().GetResult());
-                Assert.IsType<RedirectToActionResult>(user.GetController<StoresController>().GenerateAPIKey().GetAwaiter().GetResult());
+                Assert.IsType<RedirectToActionResult>(user.GetController<StoresController>().GenerateAPIKey(user.StoreId).GetAwaiter().GetResult());
 
                 var apiKey = Assert.Single(repo.GetLegacyAPIKeys(user.StoreId).GetAwaiter().GetResult());
                 ///////
 
                 // Generating a new one remove the previous
-                Assert.IsType<RedirectToActionResult>(user.GetController<StoresController>().GenerateAPIKey().GetAwaiter().GetResult());
+                Assert.IsType<RedirectToActionResult>(user.GetController<StoresController>().GenerateAPIKey(user.StoreId).GetAwaiter().GetResult());
                 var apiKey2 = Assert.Single(repo.GetLegacyAPIKeys(user.StoreId).GetAwaiter().GetResult());
                 Assert.NotEqual(apiKey, apiKey2);
                 ////////
@@ -1232,9 +1274,9 @@ namespace BTCPayServer.Tests
                 user.GrantAccess();
                 user.RegisterDerivationScheme("BTC");
                 List<decimal> rates = new List<decimal>();
-                rates.Add(CreateInvoice(tester, user, "coinaverage"));
-                var bitflyer = CreateInvoice(tester, user, "bitflyer", "JPY");
-                var bitflyer2 = CreateInvoice(tester, user, "bitflyer", "JPY");
+                rates.Add(await CreateInvoice(tester, user, "coingecko"));
+                var bitflyer = await CreateInvoice(tester, user, "bitflyer", "JPY");
+                var bitflyer2 = await CreateInvoice(tester, user, "bitflyer", "JPY");
                 Assert.Equal(bitflyer, bitflyer2); // Should be equal because cache
                 rates.Add(bitflyer);
 
@@ -1245,13 +1287,13 @@ namespace BTCPayServer.Tests
             }
         }
 
-        private static decimal CreateInvoice(ServerTester tester, TestAccount user, string exchange, string currency = "USD")
+        private static async Task<decimal> CreateInvoice(ServerTester tester, TestAccount user, string exchange, string currency = "USD")
         {
             var storeController = user.GetController<StoresController>();
             var vm = (RatesViewModel)((ViewResult)storeController.Rates()).Model;
             vm.PreferredExchange = exchange;
-            storeController.Rates(vm).Wait();
-            var invoice2 = user.BitPay.CreateInvoice(new Invoice()
+            await storeController.Rates(vm);
+            var invoice2 = await user.BitPay.CreateInvoiceAsync(new Invoice()
             {
                 Price = 5000.0m,
                 Currency = currency,
@@ -1332,7 +1374,7 @@ namespace BTCPayServer.Tests
                 var vm = (RatesViewModel)((ViewResult)storeController.Rates()).Model;
                 Assert.Equal(0.0, vm.Spread);
                 vm.Spread = 40;
-                storeController.Rates(vm).Wait();
+                await storeController.Rates(vm);
 
 
                 var invoice2 = user.BitPay.CreateInvoice(new Invoice()
@@ -1353,10 +1395,12 @@ namespace BTCPayServer.Tests
 
         [Fact(Timeout = TestTimeout)]
         [Trait("Integration", "Integration")]
+        [Trait("Altcoins", "Altcoins")]
         public async Task CanHaveLTCOnlyStore()
         {
             using (var tester = ServerTester.Create())
             {
+                tester.ActivateLTC();
                 await tester.StartAsync();
                 var user = tester.NewAccount();
                 user.GrantAccess();
@@ -1430,46 +1474,46 @@ namespace BTCPayServer.Tests
                 var store = user.GetController<StoresController>();
                 var rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates()).Model);
                 Assert.False(rateVm.ShowScripting);
-                Assert.Equal("coinaverage", rateVm.PreferredExchange);
+                Assert.Equal(CoinGeckoRateProvider.CoinGeckoName, rateVm.PreferredExchange);
                 Assert.Equal(0.0, rateVm.Spread);
                 Assert.Null(rateVm.TestRateRules);
 
                 rateVm.PreferredExchange = "bitflyer";
-                Assert.IsType<RedirectToActionResult>(store.Rates(rateVm, "Save").Result);
+                Assert.IsType<RedirectToActionResult>(await store.Rates(rateVm, "Save"));
                 rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates()).Model);
                 Assert.Equal("bitflyer", rateVm.PreferredExchange);
 
                 rateVm.ScriptTest = "BTC_JPY,BTC_CAD";
                 rateVm.Spread = 10;
                 store = user.GetController<StoresController>();
-                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates(rateVm, "Test").Result).Model);
+                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(await store.Rates(rateVm, "Test")).Model);
                 Assert.NotNull(rateVm.TestRateRules);
                 Assert.Equal(2, rateVm.TestRateRules.Count);
                 Assert.False(rateVm.TestRateRules[0].Error);
                 Assert.StartsWith("(bitflyer(BTC_JPY)) * (0.9, 1.1) =", rateVm.TestRateRules[0].Rule, StringComparison.OrdinalIgnoreCase);
                 Assert.True(rateVm.TestRateRules[1].Error);
-                Assert.IsType<RedirectToActionResult>(store.Rates(rateVm, "Save").Result);
+                Assert.IsType<RedirectToActionResult>(await store.Rates(rateVm, "Save"));
 
                 Assert.IsType<RedirectToActionResult>(store.ShowRateRulesPost(true).Result);
-                Assert.IsType<RedirectToActionResult>(store.Rates(rateVm, "Save").Result);
+                Assert.IsType<RedirectToActionResult>(await store.Rates(rateVm, "Save"));
                 store = user.GetController<StoresController>();
                 rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates()).Model);
                 Assert.Equal(rateVm.StoreId, user.StoreId);
                 Assert.Equal(rateVm.DefaultScript, rateVm.Script);
                 Assert.True(rateVm.ShowScripting);
                 rateVm.ScriptTest = "BTC_JPY";
-                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates(rateVm, "Test").Result).Model);
+                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(await store.Rates(rateVm, "Test")).Model);
                 Assert.True(rateVm.ShowScripting);
                 Assert.Contains("(bitflyer(BTC_JPY)) * (0.9, 1.1) = ", rateVm.TestRateRules[0].Rule, StringComparison.OrdinalIgnoreCase);
 
                 rateVm.ScriptTest = "BTC_USD,BTC_CAD,DOGE_USD,DOGE_CAD";
                 rateVm.Script = "DOGE_X = bittrex(DOGE_BTC) * BTC_X;\n" +
                                 "X_CAD = quadrigacx(X_CAD);\n" +
-                                 "X_X = coinaverage(X_X);";
+                                 "X_X = coingecko(X_X);";
                 rateVm.Spread = 50;
-                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates(rateVm, "Test").Result).Model);
+                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(await store.Rates(rateVm, "Test")).Model);
                 Assert.True(rateVm.TestRateRules.All(t => !t.Error));
-                Assert.IsType<RedirectToActionResult>(store.Rates(rateVm, "Save").Result);
+                Assert.IsType<RedirectToActionResult>(await store.Rates(rateVm, "Save"));
                 store = user.GetController<StoresController>();
                 rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates()).Model);
                 Assert.Equal(50, rateVm.Spread);
@@ -1480,10 +1524,12 @@ namespace BTCPayServer.Tests
 
         [Fact(Timeout = TestTimeout)]
         [Trait("Integration", "Integration")]
+        [Trait("Altcoins", "Altcoins")]
         public async Task CanPayWithTwoCurrencies()
         {
             using (var tester = ServerTester.Create())
             {
+                tester.ActivateLTC();
                 await tester.StartAsync();
                 var user = tester.NewAccount();
                 user.GrantAccess();
@@ -1557,7 +1603,7 @@ namespace BTCPayServer.Tests
                 Assert.NotNull(ltcCryptoInfo);
                 invoiceAddress = BitcoinAddress.Create(ltcCryptoInfo.Address, cashCow.Network);
                 var secondPayment = Money.Coins(decimal.Parse(ltcCryptoInfo.Due, CultureInfo.InvariantCulture));
-                cashCow.Generate(2); // LTC is not worth a lot, so just to make sure we have money...
+                cashCow.Generate(4); // LTC is not worth a lot, so just to make sure we have money...
                 cashCow.SendToAddress(invoiceAddress, secondPayment);
                 Logs.Tester.LogInformation("Second payment sent to " + invoiceAddress);
                 TestUtils.Eventually(() =>
@@ -1697,10 +1743,14 @@ namespace BTCPayServer.Tests
 
         [Fact]
         [Trait("Integration", "Integration")]
+        [Trait("Altcoins", "Altcoins")]
+        [Trait("Lightning", "Lightning")]
         public async Task CanAddDerivationSchemes()
         {
             using (var tester = ServerTester.Create())
             {
+                tester.ActivateLTC();
+                tester.ActivateLightning();
                 await tester.StartAsync();
                 var user = tester.NewAccount();
                 user.GrantAccess();
@@ -1729,15 +1779,15 @@ namespace BTCPayServer.Tests
                 Assert.False(lightningVM.Enabled);
 
                 // Only Enabling/Disabling the payment method must redirect to store page
-                var derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
+                var derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(await controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
                 Assert.True(derivationVM.Enabled);
                 derivationVM.Enabled = false;
                 Assert.IsType<RedirectToActionResult>(controller.AddDerivationScheme(user.StoreId, derivationVM, "BTC").GetAwaiter().GetResult());
-                derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
+                derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(await controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
                 Assert.False(derivationVM.Enabled);
 
                 // Clicking next without changing anything should send to the confirmation screen
-                derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
+                derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(await controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
                 derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(controller.AddDerivationScheme(user.StoreId, derivationVM, "BTC").GetAwaiter().GetResult()).Model;
                 Assert.True(derivationVM.Confirmation);
 
@@ -1756,26 +1806,26 @@ namespace BTCPayServer.Tests
 
                 // Removing the derivation scheme, should redirect to store page
                 var oldScheme = derivationVM.DerivationScheme;
-                derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
+                derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(await controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
                 derivationVM.DerivationScheme = null;
                 Assert.IsType<RedirectToActionResult>(controller.AddDerivationScheme(user.StoreId, derivationVM, "BTC").GetAwaiter().GetResult());
 
                 // Setting it again should redirect to the confirmation page
-                derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
+                derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(await controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
                 derivationVM.DerivationScheme = oldScheme;
                 derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(controller.AddDerivationScheme(user.StoreId, derivationVM, "BTC").GetAwaiter().GetResult()).Model;
                 Assert.True(derivationVM.Confirmation);
 
                 // Can we upload coldcard settings? (Should fail, we are giving a mainnet file to a testnet network)
-                derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
+                derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(await controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
                 string content = "{\"keystore\": {\"ckcc_xpub\": \"xpub661MyMwAqRbcGVBsTGeNZN6QGVHmMHLdSA4FteGsRrEriu4pnVZMZWnruFFFXkMnyoBjyHndD3Qwcfz4MPzBUxjSevweNFQx7SAYZATtcDw\", \"xpub\": \"ypub6WWc2gWwHbdnAAyJDnR4SPL1phRh7REqrPBfZeizaQ1EmTshieRXJC3Z5YoU4wkcdKHEjQGkh6AYEzCQC1Kz3DNaWSwdc1pc8416hAjzqyD\", \"label\": \"Coldcard Import 0x60d1af8b\", \"ckcc_xfp\": 1624354699, \"type\": \"hardware\", \"hw_type\": \"coldcard\", \"derivation\": \"m/49'/0'/0'\"}, \"wallet_type\": \"standard\", \"use_encryption\": false, \"seed_version\": 17}";
                 derivationVM.ColdcardPublicFile = TestUtils.GetFormFile("wallet.json", content);
                 derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(controller.AddDerivationScheme(user.StoreId, derivationVM, "BTC").GetAwaiter().GetResult()).Model;
-                Assert.False(derivationVM.Confirmation); // Should fail, we are giving a mainnet file to a testnet network 
+                Assert.False(derivationVM.Confirmation); // Should fail, we are giving a mainnet file to a testnet network
 
                 // And with a good file? (upub)
                 content = "{\"keystore\": {\"ckcc_xpub\": \"tpubD6NzVbkrYhZ4YHNiuTdTmHRmbcPRLfqgyneZFCL1mkzkUBjXriQShxTh9HL34FK2mhieasJVk9EzJrUfkFqRNQBjiXgx3n5BhPkxKBoFmaS\", \"xpub\": \"upub5DBYp1qGgsTrkzCptMGZc2x18pquLwGrBw6nS59T4NViZ4cni1mGowQzziy85K8vzkp1jVtWrSkLhqk9KDfvrGeB369wGNYf39kX8rQfiLn\", \"label\": \"Coldcard Import 0x60d1af8b\", \"ckcc_xfp\": 1624354699, \"type\": \"hardware\", \"hw_type\": \"coldcard\", \"derivation\": \"m/49'/0'/0'\"}, \"wallet_type\": \"standard\", \"use_encryption\": false, \"seed_version\": 17}";
-                derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
+                derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(await controller.AddDerivationScheme(user.StoreId, "BTC")).Model;
                 derivationVM.ColdcardPublicFile = TestUtils.GetFormFile("wallet2.json", content);
                 derivationVM.Enabled = true;
                 derivationVM = (DerivationSchemeViewModel)Assert.IsType<ViewResult>(controller.AddDerivationScheme(user.StoreId, derivationVM, "BTC").GetAwaiter().GetResult()).Model;
@@ -1835,21 +1885,50 @@ namespace BTCPayServer.Tests
             }
         }
 
-        [Fact(Timeout = 60 * 2 * 1000)]
+        [Fact]
         [Trait("Integration", "Integration")]
         public async Task CanSetPaymentMethodLimits()
         {
             using (var tester = ServerTester.Create())
             {
                 await tester.StartAsync();
-                await tester.EnsureChannelsSetup();
                 var user = tester.NewAccount();
                 user.GrantAccess();
                 user.RegisterDerivationScheme("BTC");
+                var vm = Assert.IsType<CheckoutExperienceViewModel>(Assert.IsType<ViewResult>(user.GetController<StoresController>().CheckoutExperience()).Model);
+                vm.OnChainMinValue = "5 USD";
+                Assert.IsType<RedirectToActionResult>(user.GetController<StoresController>().CheckoutExperience(vm).Result);
+
+                var invoice = user.BitPay.CreateInvoice(new Invoice()
+                {
+                    Price = 5.5m,
+                    Currency = "USD",
+                    PosData = "posData",
+                    OrderId = "orderId",
+                    ItemDesc = "Some description",
+                    FullNotifications = true
+                }, Facade.Merchant);
+
+                Assert.Single(invoice.CryptoInfo);
+                Assert.Equal(PaymentTypes.BTCLike.ToString(), invoice.CryptoInfo[0].PaymentType);
+            }
+        }
+
+        [Fact(Timeout = 60 * 2 * 1000)]
+        [Trait("Integration", "Integration")]
+        [Trait("Lightning", "Lightning")]
+        public async Task CanSetPaymentMethodLimitsLightning()
+        {
+            using (var tester = ServerTester.Create())
+            {
+                tester.ActivateLightning();
+                await tester.StartAsync();
+                await tester.EnsureChannelsSetup();
+                var user = tester.NewAccount();
+                user.GrantAccess();
                 user.RegisterLightningNode("BTC", LightningConnectionType.Charge);
                 var vm = Assert.IsType<CheckoutExperienceViewModel>(Assert.IsType<ViewResult>(user.GetController<StoresController>().CheckoutExperience()).Model);
                 vm.LightningMaxValue = "2 USD";
-                vm.OnChainMinValue = "5 USD";
                 Assert.IsType<RedirectToActionResult>(user.GetController<StoresController>().CheckoutExperience(vm).Result);
 
                 var invoice = user.BitPay.CreateInvoice(new Invoice()
@@ -1864,19 +1943,6 @@ namespace BTCPayServer.Tests
 
                 Assert.Single(invoice.CryptoInfo);
                 Assert.Equal(PaymentTypes.LightningLike.ToString(), invoice.CryptoInfo[0].PaymentType);
-
-                invoice = user.BitPay.CreateInvoice(new Invoice()
-                {
-                    Price = 5.5m,
-                    Currency = "USD",
-                    PosData = "posData",
-                    OrderId = "orderId",
-                    ItemDesc = "Some description",
-                    FullNotifications = true
-                }, Facade.Merchant);
-
-                Assert.Single(invoice.CryptoInfo);
-                Assert.Equal(PaymentTypes.BTCLike.ToString(), invoice.CryptoInfo[0].PaymentType);
             }
         }
 
@@ -1937,15 +2003,15 @@ donation:
                 Assert.Equal(10.00m, orangeInvoice.Price);
                 Assert.Equal("CAD", orangeInvoice.Currency);
                 Assert.Equal("orange", orangeInvoice.ItemDesc);
-                
-                
+
+
                 Assert.IsType<RedirectToActionResult>(publicApps.ViewPointOfSale(appId, 0, null, null, null, null, "apple").Result);
 
                 invoices = user.BitPay.GetInvoices();
                 var appleInvoice = invoices.SingleOrDefault(invoice => invoice.ItemCode.Equals("apple"));
                 Assert.NotNull(appleInvoice);
                 Assert.Equal("good apple", appleInvoice.ItemDesc);
-                
+
 
                 // testing custom amount
                 var action = Assert.IsType<RedirectToActionResult>(publicApps.ViewPointOfSale(appId, 6.6m, null, null, null, null, "donation").Result);
@@ -1993,8 +2059,8 @@ donation:
                     Assert.Equal(test.ExpectedDivisibility, vmview.CurrencyInfo.Divisibility);
                     Assert.Equal(test.ExpectedSymbolSpace, vmview.CurrencyInfo.SymbolSpace);
                 }
-                
-                
+
+
                 //test inventory related features
                 vmpos = Assert.IsType<UpdatePointOfSaleViewModel>(Assert.IsType<ViewResult>(apps.UpdatePointOfSale(appId).Result).Model);
                 vmpos.Title = "hello";
@@ -2007,13 +2073,13 @@ inventoryitem:
 noninventoryitem:
   price: 10.0";
                 Assert.IsType<RedirectToActionResult>(apps.UpdatePointOfSale(appId, vmpos).Result);
-                
+
                 //inventoryitem has 1 item available
                 Assert.IsType<RedirectToActionResult>(publicApps.ViewPointOfSale(appId, 1, null, null, null, null, "inventoryitem").Result);
                 //we already bought all available stock so this should fail
                 await Task.Delay(100);
                 Assert.IsType<RedirectToActionResult>(publicApps.ViewPointOfSale(appId, 1, null, null, null, null, "inventoryitem").Result);
-                
+
                 //inventoryitem has unlimited items available
                 Assert.IsType<RedirectToActionResult>(publicApps.ViewPointOfSale(appId, 1, null, null, null, null, "noninventoryitem").Result);
                 Assert.IsType<RedirectToActionResult>(publicApps.ViewPointOfSale(appId, 1, null, null, null, null, "noninventoryitem").Result);
@@ -2023,7 +2089,7 @@ noninventoryitem:
                 Assert.Equal(2, invoices.Count(invoice => invoice.ItemCode.Equals("noninventoryitem")));
                 var inventoryItemInvoice = Assert.Single(invoices.Where(invoice => invoice.ItemCode.Equals("inventoryitem")));
                 Assert.NotNull(inventoryItemInvoice);
-                
+
                 //let's mark the inventoryitem invoice as invalid, thsi should return the item to back in stock
                 var controller = tester.PayTester.GetController<InvoiceController>(user.UserId, user.StoreId);
                 var appService = tester.PayTester.GetService<AppService>();
@@ -2035,7 +2101,7 @@ noninventoryitem:
                     vmpos = Assert.IsType<UpdatePointOfSaleViewModel>(Assert.IsType<ViewResult>(apps.UpdatePointOfSale(appId).Result).Model);
                     Assert.Equal(1, appService.Parse(vmpos.Template, "BTC").Single(item => item.Id == "inventoryitem").Inventory);
                 }, 10000);
-                
+
             }
         }
 
@@ -2218,7 +2284,7 @@ noninventoryitem:
 
                 var cashCow = tester.ExplorerNode;
                 var invoiceAddress = BitcoinAddress.Create(invoice.CryptoInfo[0].Address, cashCow.Network);
-                // 
+                //
                 var firstPayment = invoice.CryptoInfo[0].TotalDue - 3 * networkFee;
                 cashCow.SendToAddress(invoiceAddress, firstPayment);
                 Thread.Sleep(1000); // prevent race conditions, ordering payments
@@ -2648,18 +2714,18 @@ noninventoryitem:
         public void CanQueryDirectProviders()
         {
             var factory = CreateBTCPayRateFactory();
-
+            var directlySupported = factory.GetSupportedExchanges().Where(s => s.Source == RateSource.Direct).Select(s => s.Id).ToHashSet();
+            var all = string.Join("\r\n", factory.GetSupportedExchanges().Select(e => e.Id).ToArray());
             foreach (var result in factory
                 .Providers
-                .Where(p => p.Value is BackgroundFetcherRateProvider)
+                .Where(p => p.Value is BackgroundFetcherRateProvider bf && !(bf.Inner is CoinGeckoRateProvider cg && cg.UnderlyingExchange != null))
                 .Select(p => (ExpectedName: p.Key, ResultAsync: p.Value.GetRatesAsync(default), Fetcher: (BackgroundFetcherRateProvider)p.Value))
                 .ToList())
             {
+
                 Logs.Tester.LogInformation($"Testing {result.ExpectedName}");
-                if (result.ExpectedName == "quadrigacx")
-                    continue; // 29 january, the exchange is down
                 result.Fetcher.InvalidateCache();
-                var exchangeRates = result.ResultAsync.Result;
+                var exchangeRates = new ExchangeRates(result.ExpectedName, result.ResultAsync.Result);
                 result.Fetcher.InvalidateCache();
                 Assert.NotNull(exchangeRates);
                 Assert.NotEmpty(exchangeRates);
@@ -2669,6 +2735,11 @@ noninventoryitem:
                     Assert.Contains(exchangeRates.ByExchange[result.ExpectedName],
                         e => e.CurrencyPair == new CurrencyPair("BTC", "JPY") && e.BidAsk.Bid > 100m); // 1BTC will always be more than 100JPY
                 }
+                else if (result.ExpectedName == "polispay")
+                {
+                    Assert.Contains(exchangeRates.ByExchange[result.ExpectedName],
+                        e => e.CurrencyPair == new CurrencyPair("BTC", "POLIS") && e.BidAsk.Bid > 1.0m); // 1BTC will always be more than 1 POLIS
+                }
                 else
                 {
                     // This check if the currency pair is using right currency pair
@@ -2680,11 +2751,57 @@ noninventoryitem:
                                && e.BidAsk.Bid > 1.0m // 1BTC will always be more than 1USD
                                );
                 }
+                // We are not showing a directly implemented exchange as directly implemented in the UI
+                // we need to modify the AvailableRateProvider
+
+                // There are some exception we stopped supporting but don't want to break backward compat
+                if (result.ExpectedName != "coinaverage" && result.ExpectedName != "gdax")
+                    Assert.Contains(result.ExpectedName, directlySupported);
             }
             // Kraken emit one request only after first GetRates
             factory.Providers["kraken"].GetRatesAsync(default).GetAwaiter().GetResult();
         }
 
+
+        [Fact(Timeout = TestTimeout)]
+        [Trait("Integration", "Integration")]
+        public async Task CanExportBackgroundFetcherState()
+        {
+            var factory = CreateBTCPayRateFactory();
+            var provider = (BackgroundFetcherRateProvider)factory.Providers["kraken"];
+            await provider.GetRatesAsync(default);
+            var state = provider.GetState();
+            Assert.Single(state.Rates, r => r.Pair == new CurrencyPair("BTC", "EUR"));
+            var provider2 = new BackgroundFetcherRateProvider(provider.Inner)
+            {
+                RefreshRate = provider.RefreshRate,
+                ValidatyTime = provider.ValidatyTime
+            };
+            using (var cts = new CancellationTokenSource())
+            {
+                cts.Cancel();
+                // Should throw
+                await Assert.ThrowsAsync<OperationCanceledException>(async () => await provider2.GetRatesAsync(cts.Token));
+            }
+            provider2.LoadState(state);
+            Assert.Equal(provider.LastRequested, provider2.LastRequested);
+            using (var cts = new CancellationTokenSource())
+            {
+                cts.Cancel();
+                // Should not throw, as things should be cached
+                await provider2.GetRatesAsync(cts.Token);
+            }
+            Assert.Equal(provider.NextUpdate, provider2.NextUpdate);
+            Assert.NotEqual(provider.LastRequested, provider2.LastRequested);
+            Assert.Equal(provider.Expiration, provider2.Expiration);
+
+            var str = JsonConvert.SerializeObject(state);
+            var state2 = JsonConvert.DeserializeObject<BackgroundFetcherState>(str);
+            var str2 = JsonConvert.SerializeObject(state2);
+            Assert.Equal(str, str2);
+        }
+
+
         [Fact(Timeout = TestTimeout)]
         [Trait("Integration", "Integration")]
         public void CanGetRateCryptoCurrenciesByDefault()
@@ -2709,23 +2826,18 @@ noninventoryitem:
 
         public static RateProviderFactory CreateBTCPayRateFactory()
         {
-            return new RateProviderFactory(CreateMemoryCache(), null, new CoinAverageSettings());
-        }
-
-        private static MemoryCacheOptions CreateMemoryCache()
-        {
-            return new MemoryCacheOptions() { ExpirationScanFrequency = TimeSpan.FromSeconds(1.0) };
+            return new RateProviderFactory(TestUtils.CreateHttpFactory());
         }
 
         class SpyRateProvider : IRateProvider
         {
             public bool Hit { get; set; }
-            public Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
+            public Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
             {
                 Hit = true;
-                var rates = new ExchangeRates();
-                rates.Add(new ExchangeRate("coinaverage", CurrencyPair.Parse("BTC_USD"), new BidAsk(5000)));
-                return Task.FromResult(rates);
+                var rates = new List<PairRate>();
+                rates.Add(new PairRate(CurrencyPair.Parse("BTC_USD"), new BidAsk(5000)));
+                return Task.FromResult(rates.ToArray());
             }
 
             public void AssertHit()
@@ -2813,47 +2925,33 @@ noninventoryitem:
             return name;
         }
 
+        [Fact(Timeout = TestTimeout)]
+        [Trait("Fast", "Fast")]
+        public async Task CanCreateSqlitedb()
+        {
+            if (File.Exists("temp.db"))
+                File.Delete("temp.db");
+            // This test sqlite can migrate
+            var builder = new DbContextOptionsBuilder<ApplicationDbContext>();
+            builder.UseSqlite("Data Source=temp.db");
+            await new ApplicationDbContext(builder.Options).Database.MigrateAsync();
+        }
+
         [Fact(Timeout = TestTimeout)]
         [Trait("Fast", "Fast")]
         public void CheckRatesProvider()
         {
             var spy = new SpyRateProvider();
-            RateRules.TryParse("X_X = coinaverage(X_X);", out var rateRules);
+            RateRules.TryParse("X_X = bittrex(X_X);", out var rateRules);
 
             var factory = CreateBTCPayRateFactory();
             factory.Providers.Clear();
-            factory.Providers.Add("coinaverage", new CachedRateProvider("coinaverage", spy, new MemoryCache(CreateMemoryCache())));
-            factory.Providers.Add("bittrex", new CachedRateProvider("bittrex", spy, new MemoryCache(CreateMemoryCache())));
-            factory.CacheSpan = TimeSpan.FromSeconds(1);
-
             var fetcher = new RateFetcher(factory);
-
-            var fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
-            spy.AssertHit();
-            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
-            spy.AssertNotHit();
-
-            Thread.Sleep(3000);
-            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
-            spy.AssertHit();
-            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
-            spy.AssertNotHit();
-            // Should cache at exchange level so this should hit the cache
-            var fetchedRate2 = fetcher.FetchRate(CurrencyPair.Parse("LTC_USD"), rateRules, default).GetAwaiter().GetResult();
-            spy.AssertNotHit();
-            Assert.Null(fetchedRate2.BidAsk);
-            Assert.Equal(RateRulesErrors.RateUnavailable, fetchedRate2.Errors.First());
-
-            // Should cache at exchange level this should not hit the cache as it is different exchange
-            RateRules.TryParse("X_X = bittrex(X_X);", out rateRules);
-            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
-            spy.AssertHit();
-
             factory.Providers.Clear();
             var fetch = new BackgroundFetcherRateProvider(spy);
             fetch.DoNotAutoFetchIfExpired = true;
             factory.Providers.Add("bittrex", fetch);
-            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
+            var fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
             spy.AssertHit();
             fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
             spy.AssertNotHit();
@@ -2899,13 +2997,17 @@ noninventoryitem:
             Assert.True(DerivationSchemeSettings.TryParseFromColdcard("{\"keystore\": {\"ckcc_xpub\": \"tpubD6NzVbkrYhZ4YHNiuTdTmHRmbcPRLfqgyneZFCL1mkzkUBjXriQShxTh9HL34FK2mhieasJVk9EzJrUfkFqRNQBjiXgx3n5BhPkxKBoFmaS\", \"xpub\": \"vpub5YjYxTemJ39tFRnuAhwduyxG2tKGjoEpmvqVQRPqdYrqa6YGoeSzBtHXaJUYB19zDbXs3JjbEcVWERjQBPf9bEfUUMZNMv1QnMyHV8JPqyf\", \"label\": \"Coldcard Import 0x60d1af8b\", \"ckcc_xfp\": 1624354699, \"type\": \"hardware\", \"hw_type\": \"coldcard\", \"derivation\": \"m/84'/1'/0'\"}, \"wallet_type\": \"standard\", \"use_encryption\": false, \"seed_version\": 17}", testnet, out settings));
             Assert.True(settings.AccountDerivation is DirectDerivationStrategy s3 && s3.Segwit);
         }
-        
+
         [Fact(Timeout = TestTimeout)]
         [Trait("Integration", "Integration")]
-       public  async Task CanCreateInvoiceWithSpecificPaymentMethods()
+        [Trait("Altcoins", "Altcoins")]
+        [Trait("Lightning", "Lightning")]
+        public  async Task CanCreateInvoiceWithSpecificPaymentMethods()
         {
             using (var tester = ServerTester.Create())
             {
+                tester.ActivateLightning();
+                tester.ActivateLTC();
                 await tester.StartAsync();
                 await tester.EnsureChannelsSetup();
                 var user = tester.NewAccount();
@@ -2916,8 +3018,8 @@ noninventoryitem:
 
                 var invoice = await user.BitPay.CreateInvoiceAsync(new Invoice(100, "BTC"));
                 Assert.Equal(2, invoice.SupportedTransactionCurrencies.Count);
-               
-                
+
+
                 invoice = await user.BitPay.CreateInvoiceAsync(new Invoice(100, "BTC")
                 {
                     SupportedTransactionCurrencies = new Dictionary<string, InvoiceSupportedTransactionCurrency>()
@@ -2928,13 +3030,13 @@ noninventoryitem:
                         }}
                     }
                 });
-                
+
                 Assert.Single(invoice.SupportedTransactionCurrencies);
             }
         }
-        
 
-        
+
+
         [Fact(Timeout = TestTimeout)]
         [Trait("Integration", "Integration")]
         public async Task CanLoginWithNoSecondaryAuthSystemsOrRequestItWhenAdded()
@@ -2955,7 +3057,7 @@ noninventoryitem:
                })).ActionName);
 
                var manageController = user.GetController<ManageController>();
-               
+
                //by default no u2f devices available
                Assert.Empty(Assert.IsType<U2FAuthenticationViewModel>(Assert.IsType<ViewResult>(await manageController.U2FAuthentication()).Model).Devices);
                var addRequest = Assert.IsType<AddU2FDeviceViewModel>(Assert.IsType<ViewResult>(manageController.AddU2FDevice("label")).Model);
@@ -2984,10 +3086,10 @@ noninventoryitem:
                    };
                    await context.U2FDevices.AddAsync(newDevice);
                    await context.SaveChangesAsync();
-                   
+
                    Assert.NotNull(newDevice.Id);
                    Assert.NotEmpty(Assert.IsType<U2FAuthenticationViewModel>(Assert.IsType<ViewResult>(await manageController.U2FAuthentication()).Model).Devices);
-                   
+
                }
 
                //check if we are showing the u2f login screen now
@@ -3001,10 +3103,10 @@ noninventoryitem:
                var vm = Assert.IsType<SecondaryLoginViewModel>(secondLoginResult.Model);
                //2fa was never enabled for user so this should be empty
                Assert.Null(vm.LoginWith2FaViewModel);
-               Assert.NotNull(vm.LoginWithU2FViewModel);               
+               Assert.NotNull(vm.LoginWithU2FViewModel);
             }
         }
-        
+
         private static bool IsMapped(Invoice invoice, ApplicationDbContext ctx)
         {
             var h = BitcoinAddress.Create(invoice.BitcoinAddress, Network.RegTest).ScriptPubKey.Hash.ToString();

BTCPayServer.Tests/Utils.cs

@@ -10,13 +10,34 @@ namespace BTCPayServer.Tests
 {
     public class Utils
     {
+        public static int _nextPort = 8001;
+        public static object _portLock = new object();
+
         public static int FreeTcpPort()
         {
-            TcpListener l = new TcpListener(IPAddress.Loopback, 0);
-            l.Start();
-            int port = ((IPEndPoint)l.LocalEndpoint).Port;
-            l.Stop();
-            return port;
+            lock (_portLock)
+            {
+                using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
+                {
+                    while (true)
+                    {
+                        try
+                        {
+                            var port = _nextPort++;
+                            socket.Bind(new IPEndPoint(IPAddress.Loopback, port));
+                            return port;
+                        }
+                        catch (SocketException)
+                        {
+                            // Retry unless exhausted
+                            if (_nextPort == 65536)
+                            {
+                                throw;
+                            }
+                        }
+                    }
+                }
+            }
         }
 
         // http://stackoverflow.com/a/14933880/2061103

BTCPayServer.Tests/docker-compose.yml

@@ -64,7 +64,7 @@ services:
         - "sshd_datadir:/root/.ssh"
 
   devlnd: 
-    image: btcpayserver/bitcoin:0.18.0
+    image: btcpayserver/bitcoin:0.19.0.1
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_EXTRA_ARGS: |
@@ -76,7 +76,7 @@ services:
       - customer_lnd
       - merchant_lnd
   nbxplorer:
-    image: nicolasdorier/nbxplorer:2.1.2
+    image: nicolasdorier/nbxplorer:2.1.8
     restart: unless-stopped
     ports:
       - "32838:32838"
@@ -84,7 +84,7 @@ services:
       - "32838"
     environment:
       NBXPLORER_NETWORK: regtest
-      NBXPLORER_CHAINS: "btc,ltc"
+      NBXPLORER_CHAINS: "btc,ltc,lbtc"
       NBXPLORER_BTCRPCURL: http://bitcoind:43782/
       NBXPLORER_BTCNODEENDPOINT: bitcoind:39388
       NBXPLORER_BTCRPCUSER: ceiwHEbqWI83
@@ -93,17 +93,24 @@ services:
       NBXPLORER_LTCNODEENDPOINT: litecoind:39388
       NBXPLORER_LTCRPCUSER: ceiwHEbqWI83
       NBXPLORER_LTCRPCPASSWORD: DwubwWsoo3
+      NBXPLORER_LBTCRPCURL: "http://elementsd-liquid:19332/"
+      NBXPLORER_LBTCNODEENDPOINT: "elementsd-liquid:19444"
+      NBXPLORER_LBTCRPCUSER: "liquid"
+      NBXPLORER_LBTCRPCPASSWORD: "liquid"
       NBXPLORER_BIND: 0.0.0.0:32838
+      NBXPLORER_MINGAPSIZE: 5
+      NBXPLORER_MAXGAPSIZE: 10
       NBXPLORER_VERBOSE: 1
       NBXPLORER_NOAUTH: 1
     links:
       - bitcoind
       - litecoind
+      - elementsd-liquid
 
 
   bitcoind:
     restart: unless-stopped
-    image: btcpayserver/bitcoin:0.18.0
+    image: btcpayserver/bitcoin:0.19.0.1
     environment:
       BITCOIN_NETWORK: regtest
       BITCOIN_EXTRA_ARGS: |-
@@ -127,7 +134,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: btcpayserver/lightning:v0.7.3-dev
+    image: btcpayserver/lightning:v0.8.0-dev
     stop_signal: SIGKILL
     restart: unless-stopped
     environment: 
@@ -174,7 +181,7 @@ services:
       - merchant_lightningd
 
   merchant_lightningd:
-    image: btcpayserver/lightning:v0.7.3-dev
+    image: btcpayserver/lightning:v0.8.0-dev
     stop_signal: SIGKILL
     environment: 
       EXPOSE_TCP: "true"
@@ -215,6 +222,34 @@ services:
     expose:
       - "43782" # RPC
       - "39388" # P2P
+          
+  elementsd-liquid:
+      restart: always
+      container_name: btcpayserver_elementsd_liquid
+      image: btcpayserver/elements:0.18.1.1-1
+      environment:
+          ELEMENTS_CHAIN: elementsregtest
+          ELEMENTS_EXTRA_ARGS: |
+              mainchainrpcport=43782
+              mainchainrpchost=bitcoind
+              mainchainrpcuser=liquid
+              mainchainrpcpassword=liquid
+              rpcport=19332
+              rpcbind=0.0.0.0:19332
+              rpcauth=liquid:c8bf1a8961d97f224cb21224aaa8235d$$402f4a8907683d057b8c58a42940b6e54d1638322a42986ae28ebb844e603ae6
+              port=19444
+              whitelist=0.0.0.0/0
+              validatepegin=0
+              initialfreecoins=210000000000000
+              con_dyna_deploy_start=99999999999
+      expose:
+          - "19332"
+          - "19444"
+      ports:
+          - "19332:19332"
+          - "19444:19444"
+      volumes:
+          - "elementsd_liquid_datadir:/data"
 
   postgres:
     image:  postgres:9.6.5
@@ -224,7 +259,7 @@ services:
       - "5432"
 
   merchant_lnd:
-    image: btcpayserver/lnd:v0.7.1-beta-withseed
+    image: btcpayserver/lnd:v0.8.2-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -254,7 +289,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:v0.7.1-beta-withseed
+    image: btcpayserver/lnd:v0.8.2-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -287,6 +322,7 @@ services:
 volumes:
     sshd_datadir:
     bitcoin_datadir:
+    elementsd_liquid_datadir:
     customer_lightningd_datadir:
     merchant_lightningd_datadir:
     lightning_charge_datadir:

BTCPayServer.Tests/docker-entrypoint.sh

@@ -2,8 +2,8 @@
 set -e
 
 FILTERS=" "
-if [[ "$TEST_FILTERS" ]]; then
+if [ ! -z "$TEST_FILTERS" ]; then
 FILTERS="--filter $TEST_FILTERS"
 fi
 
-dotnet test $FILTERS --no-build -v n
+dotnet test $FILTERS --no-build -v n < /dev/null

BTCPayServer/BTCPayServer.csproj

@@ -1,12 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <Import Project="../Build/Version.csproj" Condition="Exists('../Build/Version.csproj')" />
   <Import Project="../Build/Common.csproj" />
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <RazorCompileOnBuild>false</RazorCompileOnBuild>
+  </PropertyGroup>
   <PropertyGroup>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Build\**" />
-    <Compile Remove="Storage\Services\Providers\GoogleCloudStorage\**" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
     <Compile Remove="wwwroot\bundles\jqueryvalidate\**" />
     <Compile Remove="wwwroot\vendor\jquery-nice-select\**" />
     <Content Remove="Build\**" />
@@ -28,52 +30,47 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BTCPayServer.Hwi" Version="1.1.3" />
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.5" />
-    <PackageReference Include="BuildBundlerMinifier" Version="3.1.430" />
-    <PackageReference Include="BundlerMinifier.Core" Version="3.1.430" />
-    <PackageReference Include="BundlerMinifier.TagHelpers" Version="3.1.430" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.8" />
+    <PackageReference Include="BuildBundlerMinifier" Version="3.2.435" />
+    <PackageReference Include="BundlerMinifier.Core" Version="3.2.435" />
+    <PackageReference Include="BundlerMinifier.TagHelpers" Version="3.2.435" />
     <PackageReference Include="HtmlSanitizer" Version="4.0.217" />
     <PackageReference Include="LedgerWallet" Version="2.0.0.5" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
-    <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.6.2">
+    <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.9.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NBitpayClient" Version="1.0.0.34" />	  
+    <PackageReference Include="NBitpayClient" Version="1.0.0.35" />	  
     <PackageReference Include="DBriize" Version="1.0.1.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <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.9" />
+    <PackageReference Include="NicolasDorier.RateLimits" Version="1.1.0" />
     <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.18" />
-    <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="Serilog" Version="2.9.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="SSH.NET" Version="2016.1.0" />
-    <PackageReference Include="Text.Analyzers" Version="2.6.2">
+    <PackageReference Include="Text.Analyzers" Version="2.6.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
 	<ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.14" AllowExplicitVersion="true" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
-    <PackageReference Include="TwentyTwenty.Storage" Version="2.11.2" />
-    <PackageReference Include="TwentyTwenty.Storage.Amazon" Version="2.11.2" />
-    <PackageReference Include="TwentyTwenty.Storage.Azure" Version="2.11.2" />
-    <PackageReference Include="TwentyTwenty.Storage.Google" Version="2.11.2" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
-    <PackageReference Include="TwentyTwenty.Storage.Local" Version="2.11.2" />
+    <PackageReference Include="TwentyTwenty.Storage" Version="2.12.1" />
+    <PackageReference Include="TwentyTwenty.Storage.Amazon" Version="2.12.1" />
+    <PackageReference Include="TwentyTwenty.Storage.Azure" Version="2.12.1" />
+    <PackageReference Include="TwentyTwenty.Storage.Google" Version="2.12.1" />
+    <PackageReference Include="TwentyTwenty.Storage.Local" Version="2.12.1" />
     <PackageReference Include="U2F.Core" Version="1.0.4" />
-		<PackageReference Include="YamlDotNet" Version="5.2.1" />
-    <PackageReference Include="OpenIddict" Version="3.0.0-alpha1.19515.63" />
-    <PackageReference Include="OpenIddict.Server.AspNetCore" Version="3.0.0-alpha1.19515.63"></PackageReference>
-    <PackageReference Include="OpenIddict.Validation.AspNetCore" Version="3.0.0-alpha1.19515.63"></PackageReference>
-	</ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.0.0"></PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.0.0" />
+		<PackageReference Include="YamlDotNet" Version="8.0.0" />
+    <PackageReference Include="OpenIddict" Version="3.0.0-alpha1.20058.15" />
+    <PackageReference Include="OpenIddict.Server.AspNetCore" Version="3.0.0-alpha1.20058.15"></PackageReference>
+    <PackageReference Include="OpenIddict.Validation.AspNetCore" Version="3.0.0-alpha1.20058.15"></PackageReference>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.1" Condition="'$(Configuration)' == 'Debug'" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
   </ItemGroup>
 
 	<ItemGroup>
@@ -211,7 +208,7 @@
 	  <Content Update="Views\Wallets\WalletTransactions.cshtml">
 	    <Pack>$(IncludeRazorContentInPack)</Pack>
 	  </Content>
-    <Content Remove="Views\Server\EditGoogleCloudStorageStorageProvider.cshtml" Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
+    <Content Remove="Views\Server\EditGoogleCloudStorageStorageProvider.cshtml">
     </Content>
 	  <Content Update="Views\Wallets\_Nav.cshtml">
 	    <Pack>$(IncludeRazorContentInPack)</Pack>

BTCPayServer/Configuration/BTCPayServerOptions.cs

@@ -85,9 +85,17 @@ namespace BTCPayServer.Configuration
                 throw new ConfigException($"You need to run BTCPayServer with the run.sh or run.ps1 script");
 
             var supportedChains = conf.GetOrDefault<string>("chains", "btc")
-                                      .Split(',', StringSplitOptions.RemoveEmptyEntries)
-                                      .Select(t => t.ToUpperInvariant());
-            NetworkProvider = new BTCPayNetworkProvider(NetworkType).Filter(supportedChains.ToArray());
+                .Split(',', StringSplitOptions.RemoveEmptyEntries)
+                .Select(t => t.ToUpperInvariant()).ToHashSet();
+
+            var networkProvider = new BTCPayNetworkProvider(NetworkType);
+            var filtered = networkProvider.Filter(supportedChains.ToArray());
+            var elementsBased = filtered.GetAll().OfType<ElementsBTCPayNetwork>();
+            var parentChains = elementsBased.Select(network => network.NetworkCryptoCode.ToUpperInvariant()).Distinct();
+            var allSubChains = networkProvider.GetAll().OfType<ElementsBTCPayNetwork>()
+                .Where(network => parentChains.Contains(network.NetworkCryptoCode)).Select(network => network.CryptoCode.ToUpperInvariant());
+            supportedChains.AddRange(allSubChains);
+            NetworkProvider = networkProvider.Filter(supportedChains.ToArray());
             foreach (var chain in supportedChains)
             {
                 if (NetworkProvider.GetNetwork<BTCPayNetworkBase>(chain) == null)
@@ -133,6 +141,7 @@ namespace BTCPayServer.Configuration
                 ExternalServices.Load(net.CryptoCode, conf);
             }
 
+            ExternalServices.LoadNonCryptoServices(conf);
             Logs.Configuration.LogInformation("Supported chains: " + String.Join(',', supportedChains.ToArray()));
 
             var services = conf.GetOrDefault<string>("externalservices", null);

BTCPayServer/Configuration/ExternalConnectionString.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Controllers;
@@ -46,7 +47,7 @@ namespace BTCPayServer.Configuration
             }
             connectionString.Server = serviceUri;
 
-            if (serviceType == ExternalServiceTypes.LNDGRPC || serviceType == ExternalServiceTypes.LNDRest)
+            if (serviceType == ExternalServiceTypes.LNDGRPC || serviceType == ExternalServiceTypes.LNDRest || serviceType == ExternalServiceTypes.CLightningRest)
             {
                 // Read the MacaroonDirectory
                 if (connectionString.MacaroonDirectoryPath != null)
@@ -77,7 +78,7 @@ namespace BTCPayServer.Configuration
                 }
             }
 
-            if (serviceType == ExternalServiceTypes.Charge || serviceType == ExternalServiceTypes.RTL || serviceType == ExternalServiceTypes.Spark)
+            if (new []{ExternalServiceTypes.Charge, ExternalServiceTypes.RTL,  ExternalServiceTypes.Spark, ExternalServiceTypes.Configurator}.Contains(serviceType))
             {
                 // Read access key from cookie file
                 if (connectionString.CookieFilePath != null)
@@ -94,7 +95,7 @@ namespace BTCPayServer.Configuration
                     {
                         throw new System.IO.FileNotFoundException("Cookie file path not found", ex);
                     }
-                    if (serviceType == ExternalServiceTypes.RTL)
+                    if (serviceType == ExternalServiceTypes.RTL || serviceType == ExternalServiceTypes.Configurator)
                     {
                         connectionString.AccessKey = cookieFileContent;
                     }

BTCPayServer/Configuration/ExternalService.cs

@@ -35,17 +35,30 @@ namespace BTCPayServer.Configuration
             Load(configuration, cryptoCode, "rtl", ExternalServiceTypes.RTL, "Invalid setting {0}, " + Environment.NewLine +
                                 $"Valid example: 'server=https://btcpay.example.com/rtl/btc/;cookiefile=/etc/clightning_bitcoin_rtl/.cookie'" + Environment.NewLine +
                                 "Error: {1}",
-                                "LND (Ride the Lightning server)");
+                                "Ride the Lightning server");
+            Load(configuration, cryptoCode, "clightningrest", ExternalServiceTypes.CLightningRest, "Invalid setting {0}, " + Environment.NewLine +
+                                $"Valid example: 'server=https://btcpay.example.com/clightning-rest/btc/;cookiefile=/etc/clightning_bitcoin_rtl/.cookie'" + Environment.NewLine +
+                                "Error: {1}",
+                                "C-Lightning REST");
             Load(configuration, cryptoCode, "charge", ExternalServiceTypes.Charge, "Invalid setting {0}, " + Environment.NewLine +
                                 $"lightning charge server: 'type=charge;server=https://charge.example.com;api-token=2abdf302...'" + Environment.NewLine +
                                 $"lightning charge server: 'type=charge;server=https://charge.example.com;cookiefilepath=/root/.charge/.cookie'" + Environment.NewLine +
                                 "Error: {1}",
                                 "C-Lightning (Charge server)");
+            
+        }
+
+        public void LoadNonCryptoServices(IConfiguration configuration)
+        {
+            Load(configuration, null, "configurator", ExternalServiceTypes.Configurator, "Invalid setting {0}, " + Environment.NewLine +
+                                                                                   $"configurator: 'cookiefilepathfile=/etc/configurator/cookie'" + Environment.NewLine +
+                                                                                   "Error: {1}",
+                "Configurator");
         }
 
         void Load(IConfiguration configuration, string cryptoCode, string serviceName, ExternalServiceTypes type, string errorMessage, string displayName)
         {
-            var setting = $"{cryptoCode}.external.{serviceName}";
+            var setting = $"{(!string.IsNullOrEmpty(cryptoCode)? $"{cryptoCode}.": string.Empty)}external.{serviceName}";
             var connStr = configuration.GetOrDefault<string>(setting, string.Empty);
             if (connStr.Length != 0)
             {
@@ -65,8 +78,11 @@ namespace BTCPayServer.Configuration
 
         public ExternalService GetService(string serviceName, string cryptoCode)
         {
-            return this.FirstOrDefault(o => o.CryptoCode.Equals(cryptoCode, StringComparison.OrdinalIgnoreCase) &&
-                                                                                    o.ServiceName.Equals(serviceName, StringComparison.OrdinalIgnoreCase));
+            return this.FirstOrDefault(o =>
+                (cryptoCode == null && o.CryptoCode == null) ||
+                (o.CryptoCode != null && o.CryptoCode.Equals(cryptoCode, StringComparison.OrdinalIgnoreCase))
+                &&
+                o.ServiceName.Equals(serviceName, StringComparison.OrdinalIgnoreCase));
         }
     }
 
@@ -88,6 +104,8 @@ namespace BTCPayServer.Configuration
         RTL,
         Charge,
         P2P,
-        RPC
+        RPC,
+        Configurator,
+        CLightningRest
     }
 }