Unify StatusMessage handling

Make recommended fee confirmation target configurable

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   fast_tests:
     machine:
-        docker_layer_caching: true
+        enabled: true
     steps:
       - checkout
       - run:
@@ -10,7 +10,7 @@ jobs:
             cd .circleci && ./run-tests.sh "Fast=Fast"
   selenium_tests:
     machine:
-        docker_layer_caching: true
+        enabled: true
     steps:
       - checkout
       - run:
@@ -18,7 +18,7 @@ jobs:
             cd .circleci && ./run-tests.sh "Selenium=Selenium"
   integration_tests:
     machine:
-        docker_layer_caching: true
+        enabled: true
     steps:
       - checkout
       - run:
@@ -26,18 +26,22 @@ jobs:
             cd .circleci && ./run-tests.sh "Integration=Integration"
   external_tests:
     machine:
-        docker_layer_caching: true
+        enabled: true
     steps:
       - checkout
       - run:
           command: |
-            cd .circleci && ./run-tests.sh "ExternalIntegration=ExternalIntegration"
+            if [ "$CIRCLE_PROJECT_USERNAME" == "btcpayserver" ] && [ "$CIRCLE_PROJECT_REPONAME" == "btcpayserver" ]; then
+                cd .circleci && ./run-tests.sh "ExternalIntegration=ExternalIntegration"
+            else
+              echo "Skipping running ExternalIntegration tests outside of context of main user and repository that have access to secrets"
+            fi
 
 
   # publish jobs require $DOCKERHUB_REPO, $DOCKERHUB_USER, $DOCKERHUB_PASS defined
   amd64:
     machine:
-      docker_layer_caching: true
+        enabled: true
     steps:
       - checkout  
       - run:
@@ -50,7 +54,7 @@ jobs:
 
   arm32v7:
     machine:
-      docker_layer_caching: true
+        enabled: true
     steps:
       - checkout  
       - run:

.circleci/run-tests.sh

@@ -4,5 +4,6 @@ set -e
 cd ../BTCPayServer.Tests
 docker-compose -v
 docker-compose down --v
+docker-compose pull
 docker-compose build
 docker-compose run -e "TEST_FILTERS=$1" tests

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+# These are supported funding model platforms
+custom: https://foundation.btcpayserver.org

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcoinplus.cs

@@ -20,7 +20,7 @@ namespace BTCPayServer
                 NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "bitcoinplus",
-                DefaultRateRules = new[] 
+                DefaultRateRules = new[]
                 {
                                 "XBC_X = XBC_BTC * BTC_X",
                                 "XBC_BTC = cryptopia(XBC_BTC)"

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.cs

@@ -56,7 +56,8 @@ namespace BTCPayServer
             InitFeathercoin();
             InitGroestlcoin();
             InitViacoin();
-
+            InitMonero();
+            
             // Assume that electrum mappings are same as BTC if not specified
             foreach (var network in _Networks.Values.OfType<BTCPayNetwork>())
             {

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

@@ -0,0 +1,21 @@
+using NBitcoin;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        public void InitMonero()
+        {
+            Add(new MoneroLikeSpecificBtcPayNetwork()
+            {
+                CryptoCode = "XMR",
+                DisplayName = "Monero",
+                BlockExplorerLink =
+                    NetworkType == NetworkType.Mainnet
+                        ? "https://www.exploremonero.com/transaction/{0}"
+                        : "https://testnet.xmrchain.net/tx/{0}",
+                CryptoImagePath = "/imlegacy/monero.svg"
+            });
+        }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/MoneroLikeSpecificBtcPayNetwork.cs

@@ -0,0 +1,7 @@
+namespace BTCPayServer
+{
+    public class MoneroLikeSpecificBtcPayNetwork : BTCPayNetworkBase
+    {
+        public int MaxTrackedConfirmation = 10;
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/JsonRpcClient.cs

@@ -0,0 +1,121 @@
+using System;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC
+{
+    public class JsonRpcClient
+    {
+        private readonly Uri _address;
+        private readonly string _username;
+        private readonly string _password;
+        private readonly HttpClient _httpClient;
+
+        public JsonRpcClient(Uri address, string username, string password, HttpClient client = null)
+        {
+            _address = address;
+            _username = username;
+            _password = password;
+            _httpClient = client ?? new HttpClient();
+        }
+
+
+        public async Task<TResponse> SendCommandAsync<TRequest, TResponse>(string method, TRequest data,
+            CancellationToken cts = default(CancellationToken))
+        {
+            var jsonSerializer = new JsonSerializerSettings
+            {
+                ContractResolver = new CamelCasePropertyNamesContractResolver()
+            };
+            var httpRequest = new HttpRequestMessage()
+            {
+                Method = HttpMethod.Post,
+                RequestUri = new Uri(_address, "json_rpc"),
+                Content = new StringContent(
+                    JsonConvert.SerializeObject(new JsonRpcCommand<TRequest>(method, data), jsonSerializer),
+                    Encoding.UTF8, "application/json")
+            };
+            httpRequest.Headers.Accept.Clear();
+            httpRequest.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+            httpRequest.Headers.Authorization = new AuthenticationHeaderValue("Basic",
+                Convert.ToBase64String(Encoding.Default.GetBytes($"{_username}:{_password}")));
+
+            var rawResult = await _httpClient.SendAsync(httpRequest, cts);
+            
+            var rawJson = await rawResult.Content.ReadAsStringAsync();
+            rawResult.EnsureSuccessStatusCode();
+            JsonRpcResult<TResponse> response;
+            try
+            {
+                response = JsonConvert.DeserializeObject<JsonRpcResult<TResponse>>(rawJson, jsonSerializer);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.Message);
+                Console.WriteLine(rawJson);
+                throw;
+            }
+
+            if (response.Error != null)
+            {
+                throw new JsonRpcApiException()
+                {
+                    Error = response.Error
+                };
+            }
+            
+            return response.Result;
+        }
+
+        public class NoRequestModel
+        {
+            public static NoRequestModel Instance = new NoRequestModel();
+        }
+
+        internal class JsonRpcApiException : Exception
+        {
+            public JsonRpcResultError Error { get; set; }
+
+            public override string Message => Error?.Message;
+        }
+
+        public class JsonRpcResultError
+        {
+            [JsonProperty("code")] public int Code { get; set; }
+            [JsonProperty("message")] public string Message { get; set; }
+            [JsonProperty("data")] dynamic Data { get; set; }
+        }
+        internal class JsonRpcResult<T>
+        {
+            
+
+            [JsonProperty("result")] public T Result { get; set; }
+            [JsonProperty("error")] public JsonRpcResultError Error { get; set; }
+            [JsonProperty("id")] public string Id { get; set; }
+        }
+
+        internal class JsonRpcCommand<T>
+        {
+            [JsonProperty("jsonRpc")] public string JsonRpc { get; set; } = "2.0";
+            [JsonProperty("id")] public string Id { get; set; } = Guid.NewGuid().ToString();
+            [JsonProperty("method")] public string Method { get; set; }
+
+            [JsonProperty("params")] public T Parameters { get; set; }
+
+            public JsonRpcCommand()
+            {
+            }
+
+            public JsonRpcCommand(string method, T parameters)
+            {
+                Method = method;
+                Parameters = parameters;
+            }
+        }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/CreateAccountRequest.cs

@@ -0,0 +1,9 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class CreateAccountRequest
+    {
+        [JsonProperty("label")] public string Label { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/CreateAccountResponse.cs

@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class CreateAccountResponse
+    {
+        [JsonProperty("account_index")] public long AccountIndex { get; set; }
+        [JsonProperty("address")] public string Address { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/CreateAddressRequest.cs

@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class CreateAddressRequest
+    {
+        [JsonProperty("account_index")] public long AccountIndex { get; set; }
+        [JsonProperty("label")] public string Label { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/CreateAddressResponse.cs

@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class CreateAddressResponse
+    {
+        [JsonProperty("address")] public string Address { get; set; }
+        [JsonProperty("address_index")] public long AddressIndex { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetAccountsRequest.cs

@@ -0,0 +1,9 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class GetAccountsRequest
+    {
+        [JsonProperty("tag")] public string Tag { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetAccountsResponse.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class GetAccountsResponse
+    {
+        [JsonProperty("subaddress_accounts")] public List<SubaddressAccount> SubaddressAccounts { get; set; }
+        [JsonProperty("total_balance")] public decimal TotalBalance { get; set; }
+
+        [JsonProperty("total_unlocked_balance")]
+        public decimal TotalUnlockedBalance { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetFeeEstimateRequest.cs

@@ -0,0 +1,9 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public class GetFeeEstimateRequest
+    {
+        [JsonProperty("grace_blocks")] public int? GraceBlocks { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetFeeEstimateResponse.cs

@@ -0,0 +1,11 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public class GetFeeEstimateResponse
+    {
+        [JsonProperty("fee")] public long Fee { get; set; }
+        [JsonProperty("status")] public string Status { get; set; }
+        [JsonProperty("untrusted")] public bool Untrusted { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetHeightResponse.cs

@@ -0,0 +1,9 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class GetHeightResponse
+    {
+        [JsonProperty("height")] public long Height { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetTransferByTransactionIdRequest.cs

@@ -0,0 +1,11 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public class GetTransferByTransactionIdRequest
+    {
+        [JsonProperty("txid")] public string TransactionId { get; set; }
+
+        [JsonProperty("account_index")] public long AccountIndex { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetTransferByTransactionIdResponse.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class GetTransferByTransactionIdResponse
+    {
+        [JsonProperty("transfer")] public TransferItem Transfer { get; set; }
+        [JsonProperty("transfers")] public IEnumerable<TransferItem> Transfers { get; set; }
+
+        public partial class TransferItem
+        {
+            [JsonProperty("address")] public string Address { get; set; }
+            [JsonProperty("amount")] public long Amount { get; set; }
+            [JsonProperty("confirmations")] public long Confirmations { get; set; }
+            [JsonProperty("double_spend_seen")] public bool DoubleSpendSeen { get; set; }
+            [JsonProperty("fee")] public long Fee { get; set; }
+            [JsonProperty("height")] public long Height { get; set; }
+            [JsonProperty("note")] public string Note { get; set; }
+            [JsonProperty("payment_id")] public string PaymentId { get; set; }
+            [JsonProperty("subaddr_index")] public SubaddrIndex SubaddrIndex { get; set; }
+
+            [JsonProperty("suggested_confirmations_threshold")]
+            public long SuggestedConfirmationsThreshold { get; set; }
+
+            [JsonProperty("timestamp")] public long Timestamp { get; set; }
+            [JsonProperty("txid")] public string Txid { get; set; }
+            [JsonProperty("type")] public string Type { get; set; }
+            [JsonProperty("unlock_time")] public long UnlockTime { get; set; }
+        }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetTransfersRequest.cs

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class GetTransfersRequest
+    {
+        [JsonProperty("in")] public bool In { get; set; }
+        [JsonProperty("out")] public bool Out { get; set; }
+        [JsonProperty("pending")] public bool Pending { get; set; }
+        [JsonProperty("failed")] public bool Failed { get; set; }
+        [JsonProperty("pool")] public bool Pool { get; set; }
+        [JsonProperty("filter_by_height ")] public bool FilterByHeight { get; set; }
+        [JsonProperty("min_height")] public long MinHeight { get; set; }
+        [JsonProperty("max_height")] public long MaxHeight { get; set; }
+        [JsonProperty("account_index")] public long AccountIndex { get; set; }
+        [JsonProperty("subaddr_indices")] public List<long> SubaddrIndices { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetTransfersResponse.cs

@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class GetTransfersResponse
+    {
+        [JsonProperty("in")] public List<GetTransfersResponseItem> In { get; set; }
+        [JsonProperty("out")] public List<GetTransfersResponseItem> Out { get; set; }
+        [JsonProperty("pending")] public List<GetTransfersResponseItem> Pending { get; set; }
+        [JsonProperty("failed")] public List<GetTransfersResponseItem> Failed { get; set; }
+        [JsonProperty("pool")] public List<GetTransfersResponseItem> Pool { get; set; }
+
+        public partial class GetTransfersResponseItem
+
+        {
+            [JsonProperty("address")] public string Address { get; set; }
+            [JsonProperty("amount")] public long Amount { get; set; }
+            [JsonProperty("confirmations")] public long Confirmations { get; set; }
+            [JsonProperty("double_spend_seen")] public bool DoubleSpendSeen { get; set; }
+            [JsonProperty("fee")] public long Fee { get; set; }
+            [JsonProperty("height")] public long Height { get; set; }
+            [JsonProperty("note")] public string Note { get; set; }
+            [JsonProperty("payment_id")] public string PaymentId { get; set; }
+            [JsonProperty("subaddr_index")] public SubaddrIndex SubaddrIndex { get; set; }
+
+            [JsonProperty("suggested_confirmations_threshold")]
+            public long SuggestedConfirmationsThreshold { get; set; }
+
+            [JsonProperty("timestamp")] public long Timestamp { get; set; }
+            [JsonProperty("txid")] public string Txid { get; set; }
+            [JsonProperty("type")] public string Type { get; set; }
+            [JsonProperty("unlock_time")] public long UnlockTime { get; set; }
+        }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/Info.cs

@@ -0,0 +1,33 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class Info
+    {
+        [JsonProperty("address")] public string Address { get; set; }
+        [JsonProperty("avg_download")] public long AvgDownload { get; set; }
+        [JsonProperty("avg_upload")] public long AvgUpload { get; set; }
+        [JsonProperty("connection_id")] public string ConnectionId { get; set; }
+        [JsonProperty("current_download")] public long CurrentDownload { get; set; }
+        [JsonProperty("current_upload")] public long CurrentUpload { get; set; }
+        [JsonProperty("height")] public long Height { get; set; }
+        [JsonProperty("host")] public string Host { get; set; }
+        [JsonProperty("incoming")] public bool Incoming { get; set; }
+        [JsonProperty("ip")] public string Ip { get; set; }
+        [JsonProperty("live_time")] public long LiveTime { get; set; }
+        [JsonProperty("local_ip")] public bool LocalIp { get; set; }
+        [JsonProperty("localhost")] public bool Localhost { get; set; }
+        [JsonProperty("peer_id")] public string PeerId { get; set; }
+
+        [JsonProperty("port")]
+        [JsonConverter(typeof(ParseStringConverter))]
+        public long Port { get; set; }
+
+        [JsonProperty("recv_count")] public long RecvCount { get; set; }
+        [JsonProperty("recv_idle_time")] public long RecvIdleTime { get; set; }
+        [JsonProperty("send_count")] public long SendCount { get; set; }
+        [JsonProperty("send_idle_time")] public long SendIdleTime { get; set; }
+        [JsonProperty("state")] public string State { get; set; }
+        [JsonProperty("support_flags")] public long SupportFlags { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/MakeUriRequest.cs

@@ -0,0 +1,13 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class MakeUriRequest
+    {
+        [JsonProperty("address")] public string Address { get; set; }
+        [JsonProperty("amount")] public long Amount { get; set; }
+        [JsonProperty("payment_id")] public string PaymentId { get; set; }
+        [JsonProperty("tx_description")] public string TxDescription { get; set; }
+        [JsonProperty("recipient_name")] public string RecipientName { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/MakeUriResponse.cs

@@ -0,0 +1,9 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class MakeUriResponse
+    {
+        [JsonProperty("uri")] public string Uri { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/ParseStringConverter.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Globalization;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    internal class ParseStringConverter : JsonConverter
+    {
+        public override bool CanConvert(Type t) => t == typeof(long) || t == typeof(long?);
+
+        public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer)
+        {
+            if (reader.TokenType == JsonToken.Null) return null;
+            var value = serializer.Deserialize<string>(reader);
+            long l;
+            if (Int64.TryParse(value, out l))
+            {
+                return l;
+            }
+
+            throw new Exception("Cannot unmarshal type long");
+        }
+
+        public override void WriteJson(JsonWriter writer, object untypedValue, JsonSerializer serializer)
+        {
+            if (untypedValue == null)
+            {
+                serializer.Serialize(writer, null);
+                return;
+            }
+
+            var value = (long)untypedValue;
+            serializer.Serialize(writer, value.ToString(CultureInfo.InvariantCulture));
+            return;
+        }
+
+        public static readonly ParseStringConverter Singleton = new ParseStringConverter();
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/Peer.cs

@@ -0,0 +1,9 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class Peer
+    {
+        [JsonProperty("info")] public Info Info { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/SubaddrIndex.cs

@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class SubaddrIndex
+    {
+        [JsonProperty("major")] public long Major { get; set; }
+        [JsonProperty("minor")] public long Minor { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/SubaddressAccount.cs

@@ -0,0 +1,14 @@
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class SubaddressAccount
+    {
+        [JsonProperty("account_index")] public long AccountIndex { get; set; }
+        [JsonProperty("balance")] public decimal Balance { get; set; }
+        [JsonProperty("base_address")] public string BaseAddress { get; set; }
+        [JsonProperty("label")] public string Label { get; set; }
+        [JsonProperty("tag")] public string Tag { get; set; }
+        [JsonProperty("unlocked_balance")] public decimal UnlockedBalance { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/RPC/Models/SyncInfoResponse.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
+{
+    public partial class SyncInfoResponse
+    {
+        [JsonProperty("height")] public long Height { get; set; }
+        [JsonProperty("peers")] public List<Peer> Peers { get; set; }
+        [JsonProperty("status")] public string Status { get; set; }
+        [JsonProperty("target_height")] public long? TargetHeight { get; set; }
+    }
+}

BTCPayServer.Common/Altcoins/Monero/Utils/MoneroMoney.cs

@@ -0,0 +1,20 @@
+using System.Globalization;
+
+namespace BTCPayServer.Services.Altcoins.Monero.Utils
+{
+    public class MoneroMoney
+    {
+        public static decimal Convert(long atoms)
+        {
+            var amt = atoms.ToString(CultureInfo.InvariantCulture).PadLeft(12, '0');
+            amt = amt.Length == 12 ? $"0.{amt}" : amt.Insert(amt.Length - 12, ".");
+
+            return decimal.Parse(amt, CultureInfo.InvariantCulture);
+        }
+
+        public static long Convert(decimal monero)
+        {
+            return System.Convert.ToInt64(monero);
+        }
+    }
+}

BTCPayServer.Common/BTCPayNetwork.cs

@@ -52,9 +52,11 @@ namespace BTCPayServer
         public string LightningImagePath { get; set; }
         public BTCPayDefaultSettings DefaultSettings { get; set; }
         public KeyPath CoinType { get; internal set; }
+        
         public Dictionary<uint, DerivationType> ElectrumMapping = new Dictionary<uint, DerivationType>();
 
-
+        public int MaxTrackedConfirmation { get; internal set; } = 6;
+        public string UriScheme { get; internal set; }
         public KeyPath GetRootKeyPath(DerivationType type)
         {
             KeyPath baseKey;
@@ -102,10 +104,8 @@ namespace BTCPayServer
 
     public abstract class BTCPayNetworkBase
     {
-        
         public string CryptoCode { get; internal set; }
         public string BlockExplorerLink { get; internal set; }
-        public string UriScheme { get; internal set; }
         public string DisplayName { get; set; }
 
         [Obsolete("Should not be needed")]
@@ -118,8 +118,6 @@ namespace BTCPayServer
         }
 
         public string CryptoImagePath { get; set; }
-
-        public int MaxTrackedConfirmation { get; internal set; } = 6;
         public string[] DefaultRateRules { get; internal set; } = Array.Empty<string>();
         public override string ToString()
         {
@@ -133,7 +131,7 @@ namespace BTCPayServer
 
         public virtual string ToString<T>(T obj)
         {
-            return JsonConvert.SerializeObject(obj);
+            return NBitcoin.JsonConverters.Serializer.ToString(obj, null);
         }
     }
 }

BTCPayServer.Common/BTCPayServer.Common.csproj

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

BTCPayServer.Common/Logging/ConsoleLogger.cs

@@ -4,7 +4,6 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions.Internal;
 using Microsoft.Extensions.Logging.Console;

BTCPayServer.Common/Shims.cs

@@ -0,0 +1,259 @@
+#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.
+
+using System;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+
+namespace Microsoft.Extensions.Logging.Console.Internal
+{
+    /// <summary>
+    /// For non-Windows platform consoles which understand the ANSI escape code sequences to represent color
+    /// </summary>
+    internal class AnsiLogConsole : IConsole
+    {
+        private readonly StringBuilder _outputBuilder;
+        private readonly IAnsiSystemConsole _systemConsole;
+
+        public AnsiLogConsole(IAnsiSystemConsole systemConsole)
+        {
+            _outputBuilder = new StringBuilder();
+            _systemConsole = systemConsole;
+        }
+
+        public void Write(string message, ConsoleColor? background, ConsoleColor? foreground)
+        {
+            // Order: backgroundcolor, foregroundcolor, Message, reset foregroundcolor, reset backgroundcolor
+            if (background.HasValue)
+            {
+                _outputBuilder.Append(GetBackgroundColorEscapeCode(background.Value));
+            }
+
+            if (foreground.HasValue)
+            {
+                _outputBuilder.Append(GetForegroundColorEscapeCode(foreground.Value));
+            }
+
+            _outputBuilder.Append(message);
+
+            if (foreground.HasValue)
+            {
+                _outputBuilder.Append("\x1B[39m\x1B[22m"); // reset to default foreground color
+            }
+
+            if (background.HasValue)
+            {
+                _outputBuilder.Append("\x1B[49m"); // reset to the background color
+            }
+        }
+
+        public void WriteLine(string message, ConsoleColor? background, ConsoleColor? foreground)
+        {
+            Write(message, background, foreground);
+            _outputBuilder.AppendLine();
+        }
+
+        public void Flush()
+        {
+            _systemConsole.Write(_outputBuilder.ToString());
+            _outputBuilder.Clear();
+        }
+
+        private static string GetForegroundColorEscapeCode(ConsoleColor color)
+        {
+            switch (color)
+            {
+                case ConsoleColor.Black:
+                    return "\x1B[30m";
+                case ConsoleColor.DarkRed:
+                    return "\x1B[31m";
+                case ConsoleColor.DarkGreen:
+                    return "\x1B[32m";
+                case ConsoleColor.DarkYellow:
+                    return "\x1B[33m";
+                case ConsoleColor.DarkBlue:
+                    return "\x1B[34m";
+                case ConsoleColor.DarkMagenta:
+                    return "\x1B[35m";
+                case ConsoleColor.DarkCyan:
+                    return "\x1B[36m";
+                case ConsoleColor.Gray:
+                    return "\x1B[37m";
+                case ConsoleColor.Red:
+                    return "\x1B[1m\x1B[31m";
+                case ConsoleColor.Green:
+                    return "\x1B[1m\x1B[32m";
+                case ConsoleColor.Yellow:
+                    return "\x1B[1m\x1B[33m";
+                case ConsoleColor.Blue:
+                    return "\x1B[1m\x1B[34m";
+                case ConsoleColor.Magenta:
+                    return "\x1B[1m\x1B[35m";
+                case ConsoleColor.Cyan:
+                    return "\x1B[1m\x1B[36m";
+                case ConsoleColor.White:
+                    return "\x1B[1m\x1B[37m";
+                default:
+                    return "\x1B[39m\x1B[22m"; // default foreground color
+            }
+        }
+
+        private static string GetBackgroundColorEscapeCode(ConsoleColor color)
+        {
+            switch (color)
+            {
+                case ConsoleColor.Black:
+                    return "\x1B[40m";
+                case ConsoleColor.Red:
+                    return "\x1B[41m";
+                case ConsoleColor.Green:
+                    return "\x1B[42m";
+                case ConsoleColor.Yellow:
+                    return "\x1B[43m";
+                case ConsoleColor.Blue:
+                    return "\x1B[44m";
+                case ConsoleColor.Magenta:
+                    return "\x1B[45m";
+                case ConsoleColor.Cyan:
+                    return "\x1B[46m";
+                case ConsoleColor.White:
+                    return "\x1B[47m";
+                default:
+                    return "\x1B[49m"; // Use default background color
+            }
+        }
+    }
+
+	internal class AnsiSystemConsole : IAnsiSystemConsole
+    {
+        private readonly TextWriter _textWriter;
+
+        /// <inheritdoc />
+        public AnsiSystemConsole(bool stdErr = false)
+        {
+            _textWriter = stdErr ? System.Console.Error : System.Console.Out;
+        }
+
+        public void Write(string message)
+        {
+            _textWriter.Write(message);
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Logging.Console
+{
+    internal interface IAnsiSystemConsole
+    {
+        void Write(string message);
+    }
+	public interface IConsole
+    {
+        void Write(string message, ConsoleColor? background, ConsoleColor? foreground);
+        void WriteLine(string message, ConsoleColor? background, ConsoleColor? foreground);
+        void Flush();
+    }
+	internal class WindowsLogConsole : IConsole
+    {
+        private readonly TextWriter _textWriter;
+
+        /// <inheritdoc />
+        public WindowsLogConsole(bool stdErr = false)
+        {
+            _textWriter = stdErr ? System.Console.Error : System.Console.Out;
+        }
+
+        private bool SetColor(ConsoleColor? background, ConsoleColor? foreground)
+        {
+            if (background.HasValue)
+            {
+                System.Console.BackgroundColor = background.Value;
+            }
+
+            if (foreground.HasValue)
+            {
+                System.Console.ForegroundColor = foreground.Value;
+            }
+
+            return background.HasValue || foreground.HasValue;
+        }
+
+        private void ResetColor()
+        {
+            System.Console.ResetColor();
+        }
+
+        public void Write(string message, ConsoleColor? background, ConsoleColor? foreground)
+        {
+            var colorChanged = SetColor(background, foreground);
+            _textWriter.Write(message);
+            if (colorChanged)
+            {
+                ResetColor();
+            }
+        }
+
+        public void WriteLine(string message, ConsoleColor? background, ConsoleColor? foreground)
+        {
+            var colorChanged = SetColor(background, foreground);
+            _textWriter.WriteLine(message);
+            if (colorChanged)
+            {
+                ResetColor();
+            }
+        }
+
+        public void Flush()
+        {
+            // No action required as for every write, data is sent directly to the console
+            // output stream
+        }
+    }
+}
+
+namespace Microsoft.Extensions.Logging.Abstractions.Internal
+{
+    /// <summary>
+    /// An empty scope without any logic
+    /// </summary>
+    internal class NullScope : IDisposable
+    {
+        public static NullScope Instance { get; } = new NullScope();
+
+        private NullScope()
+        {
+        }
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+        }
+    }
+}
+
+
+#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

@@ -0,0 +1,19 @@
+<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" Version="2.1.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.2" />
+    <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'">
+    <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" />
+  </ItemGroup>
+</Project>

BTCPayServer.Data/Data/AddressInvoiceData.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Data
+{
+    public class AddressInvoiceData
+    {
+        /// <summary>
+        /// Some crypto currencies share same address prefix
+        /// For not having exceptions thrown by two address on different network, we suffix by "#CRYPTOCODE" 
+        /// </summary>
+        [Obsolete("Use GetHash instead")]
+        public string Address
+        {
+            get; set;
+        }
+
+        public InvoiceData InvoiceData
+        {
+            get; set;
+        }
+
+        public string InvoiceDataId
+        {
+            get; set;
+        }
+
+        public DateTimeOffset? CreatedTime
+        {
+            get; set;
+        }
+
+    }
+}

BTCPayServer.Data/Data/ApplicationDbContext.cs

@@ -1,11 +1,7 @@
-using System.Linq;
-using BTCPayServer.Authentication.OpenId.Models;
+using System;
+using System.Linq;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using BTCPayServer.Models;
-using BTCPayServer.Services.PaymentRequests;
-using BTCPayServer.Services.U2F.Models;
-using BTCPayServer.Storage.Models;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using OpenIddict.EntityFrameworkCore.Models;
 
@@ -61,6 +57,9 @@ namespace BTCPayServer.Data
             get; set;
         }
 
+        public DbSet<WalletData> Wallets { get; set; }
+        public DbSet<WalletTransactionData> WalletTransactions { get; set; }
+
         public DbSet<StoreData> Stores
         {
             get; set;
@@ -226,11 +225,23 @@ namespace BTCPayServer.Data
                 .OnDelete(DeleteBehavior.Cascade);
             builder.Entity<PaymentRequestData>()
                 .Property(e => e.Created)
-                .HasDefaultValue(NBitcoin.Utils.UnixTimeToDateTime(0));
+                .HasDefaultValue(new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero));
 
             builder.Entity<PaymentRequestData>()
                 .HasIndex(o => o.Status);
 
+            builder.Entity<WalletTransactionData>()
+                .HasKey(o => new
+                {
+                    o.WalletDataId,
+#pragma warning disable CS0618
+                    o.TransactionId
+#pragma warning restore CS0618
+                });
+            builder.Entity<WalletTransactionData>()
+                .HasOne(o => o.WalletData)
+                .WithMany(w => w.WalletTransactions).OnDelete(DeleteBehavior.Cascade);
+
             builder.UseOpenIddict<BTCPayOpenIdClient, BTCPayOpenIdAuthorization, OpenIddictScope<string>, BTCPayOpenIdToken, string>();
 
         }

BTCPayServer.Data/Data/ApplicationDbContextFactory.cs

@@ -45,7 +45,11 @@ 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
             {
             }
 
@@ -88,13 +92,13 @@ namespace BTCPayServer.Data
         public void ConfigureBuilder(DbContextOptionsBuilder builder)
         {
             if (_Type == DatabaseType.Sqlite)
-                builder.UseSqlite(_ConnectionString);
+                builder.UseSqlite(_ConnectionString, o => o.MigrationsAssembly("BTCPayServer.Data"));
             else if (_Type == DatabaseType.Postgres)
                 builder
-                    .UseNpgsql(_ConnectionString)
+                    .UseNpgsql(_ConnectionString, o => o.MigrationsAssembly("BTCPayServer.Data").EnableRetryOnFailure(10))
                     .ReplaceService<IMigrationsSqlGenerator, CustomNpgsqlMigrationsSqlGenerator>();
             else if (_Type == DatabaseType.MySQL)
-                builder.UseMySql(_ConnectionString);
+                builder.UseMySql(_ConnectionString, o => o.MigrationsAssembly("BTCPayServer.Data").EnableRetryOnFailure(10));
         }
     }
 }

BTCPayServer.Data/Data/ApplicationUser.cs

@@ -2,13 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using BTCPayServer.Authentication.OpenId.Models;
 using Microsoft.AspNetCore.Identity;
 using BTCPayServer.Data;
-using BTCPayServer.Services.U2F.Models;
-using BTCPayServer.Storage.Models;
 
-namespace BTCPayServer.Models
+namespace BTCPayServer.Data
 {
     // Add profile data for application users by adding properties to the ApplicationUser class
     public class ApplicationUser : IdentityUser

BTCPayServer.Data/Data/BTCPayOpenIdAuthorization.cs

@@ -1,6 +1,6 @@
 using OpenIddict.EntityFrameworkCore.Models;
 
-namespace BTCPayServer.Authentication.OpenId.Models
+namespace BTCPayServer.Data
 {
     public class BTCPayOpenIdAuthorization : OpenIddictAuthorization<string, BTCPayOpenIdClient, BTCPayOpenIdToken> { }
-}
+}

BTCPayServer.Data/Data/BTCPayOpenIdClient.cs

@@ -1,7 +1,6 @@
-using BTCPayServer.Models;
 using OpenIddict.EntityFrameworkCore.Models;
 
-namespace BTCPayServer.Authentication.OpenId.Models
+namespace BTCPayServer.Data
 {
     public class BTCPayOpenIdClient: OpenIddictApplication<string, BTCPayOpenIdAuthorization, BTCPayOpenIdToken>
     {

BTCPayServer.Data/Data/BTCPayOpenIdToken.cs

@@ -1,6 +1,6 @@
 using OpenIddict.EntityFrameworkCore.Models;
 
-namespace BTCPayServer.Authentication.OpenId.Models
+namespace BTCPayServer.Data
 {
     public class BTCPayOpenIdToken : OpenIddictToken<string, BTCPayOpenIdClient, BTCPayOpenIdAuthorization> { }
-}
+}

BTCPayServer.Data/Data/HistoricalAddressInvoiceData.cs

@@ -31,29 +31,6 @@ namespace BTCPayServer.Data
         [Obsolete("Use GetCryptoCode instead")]
         public string CryptoCode { get; set; }
 
-#pragma warning disable CS0618
-        public Payments.PaymentMethodId GetPaymentMethodId()
-        {
-            return string.IsNullOrEmpty(CryptoCode) ? new Payments.PaymentMethodId("BTC", Payments.PaymentTypes.BTCLike)
-                                                    : Payments.PaymentMethodId.Parse(CryptoCode);
-        }
-        public string GetAddress()
-        {
-            if (Address == null)
-                return null;
-            var index = Address.IndexOf("#", StringComparison.InvariantCulture);
-            if (index == -1)
-                return Address;
-            return Address.Substring(0, index);
-        }
-        public HistoricalAddressInvoiceData SetAddress(string depositAddress, string cryptoCode)
-        {
-            Address = depositAddress + "#" + cryptoCode;
-            CryptoCode = cryptoCode;
-            return this;
-        }
-#pragma warning restore CS0618
-
         public DateTimeOffset Assigned
         {
             get; set;

BTCPayServer.Data/Data/InvoiceData.cs

@@ -1,5 +1,4 @@
-using BTCPayServer.Models;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -81,10 +80,5 @@ namespace BTCPayServer.Data
             get; set;
         }
         public List<PendingInvoiceData> PendingInvoices { get; set; }
-
-        public Services.Invoices.InvoiceState GetInvoiceState()
-        {
-            return new Services.Invoices.InvoiceState(Status, ExceptionStatus);
-        }
     }
 }

BTCPayServer.Data/Data/InvoiceEventData.cs

@@ -15,7 +15,7 @@ namespace BTCPayServer.Data
         {
             get; set;
         }
-        public string UniqueId { get; internal set; }
+        public string UniqueId { get; set; }
         public DateTimeOffset Timestamp
         {
             get; set;

BTCPayServer.Data/Data/PaymentRequestData.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BTCPayServer.Data
+{
+    public class PaymentRequestData
+    {
+        public string Id { get; set; }
+        public DateTimeOffset Created
+        {
+            get; set;
+        }
+        public string StoreDataId { get; set; }
+
+        public StoreData StoreData { get; set; }
+
+        public PaymentRequestStatus Status { get; set; }
+
+        public byte[] Blob { get; set; }
+
+        public class PaymentRequestBlob
+        {
+            public decimal Amount { get; set; }
+            public string Currency { get; set; }
+
+            public DateTime? ExpiryDate { get; set; }
+
+            public string Title { get; set; }
+            public string Description { get; set; }
+            public string Email { get; set; }
+
+            public string EmbeddedCSS { get; set; }
+            public string CustomCSSLink { get; set; }
+            public bool AllowCustomPaymentAmounts { get; set; }
+        }
+
+        public enum PaymentRequestStatus
+        {
+            Pending = 0,
+            Completed = 1,
+            Expired = 2
+        }
+    }
+}

BTCPayServer.Data/Data/StoreData.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using Newtonsoft.Json.Linq;
+using System.Security.Claims;
+
+namespace BTCPayServer.Data
+{
+    public enum SpeedPolicy
+    {
+        HighSpeed = 0,
+        MediumSpeed = 1,
+        LowSpeed = 2,
+        LowMediumSpeed = 3
+    }
+    public class StoreData
+    {
+        public string Id
+        {
+            get;
+            set;
+        }
+
+        public List<UserStore> UserStores
+        {
+            get; set;
+        }
+        public List<AppData> Apps
+        {
+            get; set;
+        }
+        
+        public List<PaymentRequestData> PaymentRequests
+        {
+            get; set;
+        }
+
+        public List<InvoiceData> Invoices { get; set; }
+
+        [Obsolete("Use GetDerivationStrategies instead")]
+        public string DerivationStrategy
+        {
+            get; set;
+        }
+
+        [Obsolete("Use GetDerivationStrategies instead")]
+        public string DerivationStrategies
+        {
+            get;
+            set;
+        }
+
+        public string StoreName
+        {
+            get; set;
+        }
+
+        public SpeedPolicy SpeedPolicy
+        {
+            get; set;
+        }
+
+        public string StoreWebsite
+        {
+            get; set;
+        }
+
+        public byte[] StoreCertificate
+        {
+            get; set;
+        }
+
+        [NotMapped]
+        public string Role
+        {
+            get; set;
+        }
+
+        public byte[] StoreBlob
+        {
+            get;
+            set;
+        }
+        [Obsolete("Use GetDefaultPaymentId instead")]
+        public string DefaultCrypto { get; set; }
+        public List<PairedSINData> PairedSINs { get; set; }
+        public IEnumerable<APIKeyData> APIKeys { get; set; }
+    }
+
+    public enum NetworkFeeMode
+    {
+        MultiplePaymentsOnly,
+        Always,
+        Never
+    }
+}

BTCPayServer.Data/Data/StoredFile.cs

@@ -1,8 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
-using BTCPayServer.Models;
 
-namespace BTCPayServer.Storage.Models
+namespace BTCPayServer.Data
 {
     public class StoredFile
     {

BTCPayServer.Data/Data/U2FDevice.cs

@@ -1,8 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using BTCPayServer.Models;
 
-namespace BTCPayServer.Services.U2F.Models
+namespace BTCPayServer.Data
 {
     public class U2FDevice
     {

BTCPayServer.Data/Data/UserStore.cs

@@ -1,5 +1,4 @@
-using BTCPayServer.Models;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

BTCPayServer.Data/Data/WalletData.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Data
+{
+    public class WalletData
+    {
+        [System.ComponentModel.DataAnnotations.Key]
+        public string Id { get; set; }
+
+        public List<WalletTransactionData> WalletTransactions { get; set; }
+
+        public byte[] Blob { get; set; }
+    }
+
+    public class Label
+    {
+        public Label(string value, string color)
+        {
+            if (value == null)
+                throw new ArgumentNullException(nameof(value));
+            if (color == null)
+                throw new ArgumentNullException(nameof(color));
+            Value = value;
+            Color = color;
+        }
+
+        public string Value { get; }
+        public string Color { get; }
+
+        public override bool Equals(object obj)
+        {
+            Label item = obj as Label;
+            if (item == null)
+                return false;
+            return Value.Equals(item.Value, StringComparison.OrdinalIgnoreCase);
+        }
+        public static bool operator ==(Label a, Label b)
+        {
+            if (System.Object.ReferenceEquals(a, b))
+                return true;
+            if (((object)a == null) || ((object)b == null))
+                return false;
+            return a.Value == b.Value;
+        }
+
+        public static bool operator !=(Label a, Label b)
+        {
+            return !(a == b);
+        }
+
+        public override int GetHashCode()
+        {
+            return Value.GetHashCode(StringComparison.OrdinalIgnoreCase);
+        }
+    }
+
+    public class WalletBlobInfo
+    {
+        public Dictionary<string, string> LabelColors { get; set; } = new Dictionary<string, string>();
+
+        public IEnumerable<Label> GetLabels(WalletTransactionInfo transactionInfo)
+        {
+            foreach (var label in transactionInfo.Labels)
+            {
+                if (LabelColors.TryGetValue(label, out var color))
+                {
+                    yield return new Label(label, color);
+                }
+            }
+        }
+
+        public IEnumerable<Label> GetLabels()
+        {
+            foreach (var kv in LabelColors)
+            {
+                yield return new Label(kv.Key, kv.Value);
+            }
+        }
+    }
+}

BTCPayServer.Data/Data/WalletTransactionData.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Data
+{
+    public class WalletTransactionData
+    {
+        public string WalletDataId { get; set; }
+        public WalletData WalletData { get; set; }
+        public string TransactionId { get; set; }
+        public string Labels { get; set; }
+        public byte[] Blob { get; set; }
+    }
+
+    public class WalletTransactionInfo
+    {
+        public string Comment { get; set; } = string.Empty;
+        [JsonIgnore]
+        public HashSet<string> Labels { get; set; } = new HashSet<string>();
+    }
+}

BTCPayServer.Data/Migrations/20170913143004_Init.cs

@@ -1,9 +1,13 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20170913143004_Init")]
     public partial class Init : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20170926073744_Settings.cs

@@ -1,9 +1,13 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20170926073744_Settings")]
     public partial class Settings : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20170926084408_RequiresEmailConfirmation.cs

@@ -1,9 +1,13 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20170926084408_RequiresEmailConfirmation")]
     public partial class RequiresEmailConfirmation : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20171006013443_AddressMapping.cs

@@ -1,9 +1,13 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20171006013443_AddressMapping")]
     public partial class AddressMapping : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20171010082424_Tokens.cs

@@ -1,9 +1,13 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20171010082424_Tokens")]
     public partial class Tokens : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20171012020112_PendingInvoices.cs

@@ -1,9 +1,13 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20171012020112_PendingInvoices")]
     public partial class PendingInvoices : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20171023101754_StoreBlob.cs

@@ -1,9 +1,13 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20171023101754_StoreBlob")]
     public partial class StoreBlob : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20171024163354_RenewUsedAddresses.cs

@@ -1,9 +1,13 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20171024163354_RenewUsedAddresses")]
     public partial class RenewUsedAddresses : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20171105235734_PaymentAccounted.cs

@@ -1,9 +1,13 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20171105235734_PaymentAccounted")]
     public partial class PaymentAccounted : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20171221054550_AltcoinSupport.cs

@@ -1,9 +1,13 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20171221054550_AltcoinSupport")]
     public partial class AltcoinSupport : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20180106095215_DerivationStrategies.cs

@@ -1,9 +1,13 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20180106095215_DerivationStrategies")]
     public partial class DerivationStrategies : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20180109021122_defaultcrypto.cs

@@ -1,9 +1,13 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20180109021122_defaultcrypto")]
     public partial class defaultcrypto : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20180114123253_events.cs

@@ -1,9 +1,13 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20180114123253_events")]
     public partial class events : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20180402095640_appdata.cs

@@ -1,9 +1,13 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20180402095640_appdata")]
     public partial class appdata : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20180429083930_legacyapikey.cs

@@ -1,9 +1,13 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 using System;
 using System.Collections.Generic;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20180429083930_legacyapikey")]
     public partial class legacyapikey : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20180719095626_CanDeleteStores.cs

@@ -1,7 +1,11 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20180719095626_CanDeleteStores")]
     public partial class CanDeleteStores : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20190121133309_AddPaymentRequests.cs

@@ -1,8 +1,12 @@
 using System;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20190121133309_AddPaymentRequests")]
     public partial class AddPaymentRequests : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20190219032533_AppsTagging.cs

@@ -1,7 +1,11 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20190219032533_AppsTagging")]
     public partial class AppsTagging : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20190225091644_AddOpenIddict.cs

@@ -1,8 +1,12 @@
 using System;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20190225091644_AddOpenIddict")]
     public partial class AddOpenIddict : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20190324141717_AddFiles.cs

@@ -1,8 +1,12 @@
 using System;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20190324141717_AddFiles")]
     public partial class AddFiles : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20190425081749_AddU2fDevices.cs

@@ -1,8 +1,12 @@
 using System;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20190425081749_AddU2fDevices")]
     public partial class AddU2fDevices : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20190701082105_sort_paymentrequests.cs

@@ -1,8 +1,12 @@
 using System;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace BTCPayServer.Migrations
 {
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20190701082105_sort_paymentrequests")]
     public partial class sort_paymentrequests : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)

BTCPayServer.Data/Migrations/20190802142637_WalletData.cs

@@ -0,0 +1,56 @@
+using System;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20190802142637_WalletData")]
+    public partial class WalletData : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Wallets",
+                columns: table => new
+                {
+                    Id = table.Column<string>(nullable: false),
+                    Blob = table.Column<byte[]>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Wallets", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "WalletTransactions",
+                columns: table => new
+                {
+                    WalletDataId = table.Column<string>(nullable: false),
+                    TransactionId = table.Column<string>(nullable: false),
+                    Labels = table.Column<string>(nullable: true),
+                    Blob = table.Column<byte[]>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WalletTransactions", x => new { x.WalletDataId, x.TransactionId });
+                    table.ForeignKey(
+                        name: "FK_WalletTransactions_Wallets_WalletDataId",
+                        column: x => x.WalletDataId,
+                        principalTable: "Wallets",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "WalletTransactions");
+
+            migrationBuilder.DropTable(
+                name: "Wallets");
+        }
+    }
+}

BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -0,0 +1,883 @@
+// <auto-generated />
+using System;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    partial class ApplicationDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.1.11-servicing-32099");
+
+            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
+            {
+                b.Property<string>("Address")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<DateTimeOffset?>("CreatedTime");
+
+                b.Property<string>("InvoiceDataId");
+
+                b.HasKey("Address");
+
+                b.HasIndex("InvoiceDataId");
+
+                b.ToTable("AddressInvoices");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd()
+                    .HasMaxLength(50);
+
+                b.Property<string>("StoreId")
+                    .HasMaxLength(50);
+
+                b.HasKey("Id");
+
+                b.HasIndex("StoreId");
+
+                b.ToTable("ApiKeys");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<string>("AppType");
+
+                b.Property<DateTimeOffset>("Created");
+
+                b.Property<string>("Name");
+
+                b.Property<string>("Settings");
+
+                b.Property<string>("StoreDataId");
+
+                b.Property<bool>("TagAllInvoices");
+
+                b.HasKey("Id");
+
+                b.HasIndex("StoreDataId");
+
+                b.ToTable("Apps");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.ApplicationUser", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<int>("AccessFailedCount");
+
+                b.Property<string>("ConcurrencyStamp")
+                    .IsConcurrencyToken();
+
+                b.Property<string>("Email")
+                    .HasMaxLength(256);
+
+                b.Property<bool>("EmailConfirmed");
+
+                b.Property<bool>("LockoutEnabled");
+
+                b.Property<DateTimeOffset?>("LockoutEnd");
+
+                b.Property<string>("NormalizedEmail")
+                    .HasMaxLength(256);
+
+                b.Property<string>("NormalizedUserName")
+                    .HasMaxLength(256);
+
+                b.Property<string>("PasswordHash");
+
+                b.Property<string>("PhoneNumber");
+
+                b.Property<bool>("PhoneNumberConfirmed");
+
+                b.Property<bool>("RequiresEmailConfirmation");
+
+                b.Property<string>("SecurityStamp");
+
+                b.Property<bool>("TwoFactorEnabled");
+
+                b.Property<string>("UserName")
+                    .HasMaxLength(256);
+
+                b.HasKey("Id");
+
+                b.HasIndex("NormalizedEmail")
+                    .HasName("EmailIndex");
+
+                b.HasIndex("NormalizedUserName")
+                    .IsUnique()
+                    .HasName("UserNameIndex");
+
+                b.ToTable("AspNetUsers");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.BTCPayOpenIdAuthorization", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<string>("ApplicationId");
+
+                b.Property<string>("ConcurrencyToken")
+                    .IsConcurrencyToken()
+                    .HasMaxLength(50);
+
+                b.Property<string>("Properties");
+
+                b.Property<string>("Scopes");
+
+                b.Property<string>("Status")
+                    .IsRequired()
+                    .HasMaxLength(25);
+
+                b.Property<string>("Subject")
+                    .IsRequired()
+                    .HasMaxLength(450);
+
+                b.Property<string>("Type")
+                    .IsRequired()
+                    .HasMaxLength(25);
+
+                b.HasKey("Id");
+
+                b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                b.ToTable("OpenIddictAuthorizations");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.BTCPayOpenIdClient", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<string>("ApplicationUserId");
+
+                b.Property<string>("ClientId")
+                    .IsRequired()
+                    .HasMaxLength(100);
+
+                b.Property<string>("ClientSecret");
+
+                b.Property<string>("ConcurrencyToken")
+                    .IsConcurrencyToken()
+                    .HasMaxLength(50);
+
+                b.Property<string>("ConsentType");
+
+                b.Property<string>("DisplayName");
+
+                b.Property<string>("Permissions");
+
+                b.Property<string>("PostLogoutRedirectUris");
+
+                b.Property<string>("Properties");
+
+                b.Property<string>("RedirectUris");
+
+                b.Property<string>("Type")
+                    .IsRequired()
+                    .HasMaxLength(25);
+
+                b.HasKey("Id");
+
+                b.HasIndex("ApplicationUserId");
+
+                b.HasIndex("ClientId")
+                    .IsUnique();
+
+                b.ToTable("OpenIddictApplications");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.BTCPayOpenIdToken", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<string>("ApplicationId");
+
+                b.Property<string>("AuthorizationId");
+
+                b.Property<string>("ConcurrencyToken")
+                    .IsConcurrencyToken()
+                    .HasMaxLength(50);
+
+                b.Property<DateTimeOffset?>("CreationDate");
+
+                b.Property<DateTimeOffset?>("ExpirationDate");
+
+                b.Property<string>("Payload");
+
+                b.Property<string>("Properties");
+
+                b.Property<string>("ReferenceId")
+                    .HasMaxLength(100);
+
+                b.Property<string>("Status")
+                    .IsRequired()
+                    .HasMaxLength(25);
+
+                b.Property<string>("Subject")
+                    .IsRequired()
+                    .HasMaxLength(450);
+
+                b.Property<string>("Type")
+                    .IsRequired()
+                    .HasMaxLength(25);
+
+                b.HasKey("Id");
+
+                b.HasIndex("AuthorizationId");
+
+                b.HasIndex("ReferenceId")
+                    .IsUnique();
+
+                b.HasIndex("ApplicationId", "Status", "Subject", "Type");
+
+                b.ToTable("OpenIddictTokens");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.HistoricalAddressInvoiceData", b =>
+            {
+                b.Property<string>("InvoiceDataId");
+
+                b.Property<string>("Address");
+
+                b.Property<DateTimeOffset>("Assigned");
+
+                b.Property<string>("CryptoCode");
+
+                b.Property<DateTimeOffset?>("UnAssigned");
+
+                b.HasKey("InvoiceDataId", "Address");
+
+                b.ToTable("HistoricalAddressInvoices");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.InvoiceData", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<byte[]>("Blob");
+
+                b.Property<DateTimeOffset>("Created");
+
+                b.Property<string>("CustomerEmail");
+
+                b.Property<string>("ExceptionStatus");
+
+                b.Property<string>("ItemCode");
+
+                b.Property<string>("OrderId");
+
+                b.Property<string>("Status");
+
+                b.Property<string>("StoreDataId");
+
+                b.HasKey("Id");
+
+                b.HasIndex("StoreDataId");
+
+                b.ToTable("Invoices");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.InvoiceEventData", b =>
+            {
+                b.Property<string>("InvoiceDataId");
+
+                b.Property<string>("UniqueId");
+
+                b.Property<string>("Message");
+
+                b.Property<DateTimeOffset>("Timestamp");
+
+                b.HasKey("InvoiceDataId", "UniqueId");
+
+                b.ToTable("InvoiceEvents");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.PairedSINData", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<string>("Label");
+
+                b.Property<DateTimeOffset>("PairingTime");
+
+                b.Property<string>("SIN");
+
+                b.Property<string>("StoreDataId");
+
+                b.HasKey("Id");
+
+                b.HasIndex("SIN");
+
+                b.HasIndex("StoreDataId");
+
+                b.ToTable("PairedSINData");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.PairingCodeData", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<DateTime>("DateCreated");
+
+                b.Property<DateTimeOffset>("Expiration");
+
+                b.Property<string>("Facade");
+
+                b.Property<string>("Label");
+
+                b.Property<string>("SIN");
+
+                b.Property<string>("StoreDataId");
+
+                b.Property<string>("TokenValue");
+
+                b.HasKey("Id");
+
+                b.ToTable("PairingCodes");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.PaymentData", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<bool>("Accounted");
+
+                b.Property<byte[]>("Blob");
+
+                b.Property<string>("InvoiceDataId");
+
+                b.HasKey("Id");
+
+                b.HasIndex("InvoiceDataId");
+
+                b.ToTable("Payments");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.PaymentRequestData", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<byte[]>("Blob");
+
+                b.Property<DateTimeOffset>("Created")
+                    .ValueGeneratedOnAdd()
+                    .HasDefaultValue(new DateTimeOffset(new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)));
+
+                b.Property<int>("Status");
+
+                b.Property<string>("StoreDataId");
+
+                b.HasKey("Id");
+
+                b.HasIndex("Status");
+
+                b.HasIndex("StoreDataId");
+
+                b.ToTable("PaymentRequests");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
+            {
+                b.Property<string>("Id");
+
+                b.HasKey("Id");
+
+                b.ToTable("PendingInvoices");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.RefundAddressesData", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<byte[]>("Blob");
+
+                b.Property<string>("InvoiceDataId");
+
+                b.HasKey("Id");
+
+                b.HasIndex("InvoiceDataId");
+
+                b.ToTable("RefundAddresses");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.SettingData", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<string>("Value");
+
+                b.HasKey("Id");
+
+                b.ToTable("Settings");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.StoreData", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<string>("DefaultCrypto");
+
+                b.Property<string>("DerivationStrategies");
+
+                b.Property<string>("DerivationStrategy");
+
+                b.Property<int>("SpeedPolicy");
+
+                b.Property<byte[]>("StoreBlob");
+
+                b.Property<byte[]>("StoreCertificate");
+
+                b.Property<string>("StoreName");
+
+                b.Property<string>("StoreWebsite");
+
+                b.HasKey("Id");
+
+                b.ToTable("Stores");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.StoredFile", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<string>("ApplicationUserId");
+
+                b.Property<string>("FileName");
+
+                b.Property<string>("StorageFileName");
+
+                b.Property<DateTime>("Timestamp");
+
+                b.HasKey("Id");
+
+                b.HasIndex("ApplicationUserId");
+
+                b.ToTable("Files");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.U2FDevice", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<string>("ApplicationUserId");
+
+                b.Property<byte[]>("AttestationCert")
+                    .IsRequired();
+
+                b.Property<int>("Counter");
+
+                b.Property<byte[]>("KeyHandle")
+                    .IsRequired();
+
+                b.Property<string>("Name");
+
+                b.Property<byte[]>("PublicKey")
+                    .IsRequired();
+
+                b.HasKey("Id");
+
+                b.HasIndex("ApplicationUserId");
+
+                b.ToTable("U2FDevices");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.UserStore", b =>
+            {
+                b.Property<string>("ApplicationUserId");
+
+                b.Property<string>("StoreDataId");
+
+                b.Property<string>("Role");
+
+                b.HasKey("ApplicationUserId", "StoreDataId");
+
+                b.HasIndex("StoreDataId");
+
+                b.ToTable("UserStore");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.WalletData", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<byte[]>("Blob");
+
+                b.HasKey("Id");
+
+                b.ToTable("Wallets");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.WalletTransactionData", b =>
+            {
+                b.Property<string>("WalletDataId");
+
+                b.Property<string>("TransactionId");
+
+                b.Property<byte[]>("Blob");
+
+                b.Property<string>("Labels");
+
+                b.HasKey("WalletDataId", "TransactionId");
+
+                b.ToTable("WalletTransactions");
+            });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<string>("ConcurrencyStamp")
+                    .IsConcurrencyToken();
+
+                b.Property<string>("Name")
+                    .HasMaxLength(256);
+
+                b.Property<string>("NormalizedName")
+                    .HasMaxLength(256);
+
+                b.HasKey("Id");
+
+                b.HasIndex("NormalizedName")
+                    .IsUnique()
+                    .HasName("RoleNameIndex");
+
+                b.ToTable("AspNetRoles");
+            });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+            {
+                b.Property<int>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<string>("ClaimType");
+
+                b.Property<string>("ClaimValue");
+
+                b.Property<string>("RoleId")
+                    .IsRequired();
+
+                b.HasKey("Id");
+
+                b.HasIndex("RoleId");
+
+                b.ToTable("AspNetRoleClaims");
+            });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+            {
+                b.Property<int>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<string>("ClaimType");
+
+                b.Property<string>("ClaimValue");
+
+                b.Property<string>("UserId")
+                    .IsRequired();
+
+                b.HasKey("Id");
+
+                b.HasIndex("UserId");
+
+                b.ToTable("AspNetUserClaims");
+            });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+            {
+                b.Property<string>("LoginProvider");
+
+                b.Property<string>("ProviderKey");
+
+                b.Property<string>("ProviderDisplayName");
+
+                b.Property<string>("UserId")
+                    .IsRequired();
+
+                b.HasKey("LoginProvider", "ProviderKey");
+
+                b.HasIndex("UserId");
+
+                b.ToTable("AspNetUserLogins");
+            });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+            {
+                b.Property<string>("UserId");
+
+                b.Property<string>("RoleId");
+
+                b.HasKey("UserId", "RoleId");
+
+                b.HasIndex("RoleId");
+
+                b.ToTable("AspNetUserRoles");
+            });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+            {
+                b.Property<string>("UserId");
+
+                b.Property<string>("LoginProvider");
+
+                b.Property<string>("Name");
+
+                b.Property<string>("Value");
+
+                b.HasKey("UserId", "LoginProvider", "Name");
+
+                b.ToTable("AspNetUserTokens");
+            });
+
+            modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictScope<string>", b =>
+            {
+                b.Property<string>("Id")
+                    .ValueGeneratedOnAdd();
+
+                b.Property<string>("ConcurrencyToken")
+                    .IsConcurrencyToken()
+                    .HasMaxLength(50);
+
+                b.Property<string>("Description");
+
+                b.Property<string>("DisplayName");
+
+                b.Property<string>("Name")
+                    .IsRequired()
+                    .HasMaxLength(200);
+
+                b.Property<string>("Properties");
+
+                b.Property<string>("Resources");
+
+                b.HasKey("Id");
+
+                b.HasIndex("Name")
+                    .IsUnique();
+
+                b.ToTable("OpenIddictScopes");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.AddressInvoiceData", b =>
+            {
+                b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                    .WithMany("AddressInvoices")
+                    .HasForeignKey("InvoiceDataId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.APIKeyData", b =>
+            {
+                b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
+                    .WithMany("APIKeys")
+                    .HasForeignKey("StoreId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.AppData", b =>
+            {
+                b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
+                    .WithMany("Apps")
+                    .HasForeignKey("StoreDataId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.BTCPayOpenIdAuthorization", b =>
+            {
+                b.HasOne("BTCPayServer.Data.BTCPayOpenIdClient", "Application")
+                    .WithMany("Authorizations")
+                    .HasForeignKey("ApplicationId");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.BTCPayOpenIdClient", b =>
+            {
+                b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")
+                    .WithMany("OpenIdClients")
+                    .HasForeignKey("ApplicationUserId");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.BTCPayOpenIdToken", b =>
+            {
+                b.HasOne("BTCPayServer.Data.BTCPayOpenIdClient", "Application")
+                    .WithMany("Tokens")
+                    .HasForeignKey("ApplicationId");
+
+                b.HasOne("BTCPayServer.Data.BTCPayOpenIdAuthorization", "Authorization")
+                    .WithMany("Tokens")
+                    .HasForeignKey("AuthorizationId");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.HistoricalAddressInvoiceData", b =>
+            {
+                b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                    .WithMany("HistoricalAddressInvoices")
+                    .HasForeignKey("InvoiceDataId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.InvoiceData", b =>
+            {
+                b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
+                    .WithMany("Invoices")
+                    .HasForeignKey("StoreDataId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.InvoiceEventData", b =>
+            {
+                b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                    .WithMany("Events")
+                    .HasForeignKey("InvoiceDataId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.PairedSINData", b =>
+            {
+                b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
+                    .WithMany("PairedSINs")
+                    .HasForeignKey("StoreDataId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.PaymentData", b =>
+            {
+                b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                    .WithMany("Payments")
+                    .HasForeignKey("InvoiceDataId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.PaymentRequestData", b =>
+            {
+                b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
+                    .WithMany("PaymentRequests")
+                    .HasForeignKey("StoreDataId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.PendingInvoiceData", b =>
+            {
+                b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                    .WithMany("PendingInvoices")
+                    .HasForeignKey("Id")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.RefundAddressesData", b =>
+            {
+                b.HasOne("BTCPayServer.Data.InvoiceData", "InvoiceData")
+                    .WithMany("RefundAddresses")
+                    .HasForeignKey("InvoiceDataId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.StoredFile", b =>
+            {
+                b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")
+                    .WithMany("StoredFiles")
+                    .HasForeignKey("ApplicationUserId");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.U2FDevice", b =>
+            {
+                b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")
+                    .WithMany("U2FDevices")
+                    .HasForeignKey("ApplicationUserId");
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.UserStore", b =>
+            {
+                b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")
+                    .WithMany("UserStores")
+                    .HasForeignKey("ApplicationUserId")
+                    .OnDelete(DeleteBehavior.Cascade);
+
+                b.HasOne("BTCPayServer.Data.StoreData", "StoreData")
+                    .WithMany("UserStores")
+                    .HasForeignKey("StoreDataId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("BTCPayServer.Data.WalletTransactionData", b =>
+            {
+                b.HasOne("BTCPayServer.Data.WalletData", "WalletData")
+                    .WithMany("WalletTransactions")
+                    .HasForeignKey("WalletDataId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+            {
+                b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                    .WithMany()
+                    .HasForeignKey("RoleId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+            {
+                b.HasOne("BTCPayServer.Data.ApplicationUser")
+                    .WithMany()
+                    .HasForeignKey("UserId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+            {
+                b.HasOne("BTCPayServer.Data.ApplicationUser")
+                    .WithMany()
+                    .HasForeignKey("UserId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+            {
+                b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                    .WithMany()
+                    .HasForeignKey("RoleId")
+                    .OnDelete(DeleteBehavior.Cascade);
+
+                b.HasOne("BTCPayServer.Data.ApplicationUser")
+                    .WithMany()
+                    .HasForeignKey("UserId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+            {
+                b.HasOne("BTCPayServer.Data.ApplicationUser")
+                    .WithMany()
+                    .HasForeignKey("UserId")
+                    .OnDelete(DeleteBehavior.Cascade);
+            });
+#pragma warning restore 612, 618
+        }
+    }
+}

BTCPayServer.Data/MigrationsExtensions.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+
+namespace BTCPayServer.Migrations
+{
+    public static class MigrationsExtensions
+    {
+        public static bool SupportDropColumn(this Microsoft.EntityFrameworkCore.Migrations.Migration migration, string activeProvider)
+        {
+            return activeProvider != "Microsoft.EntityFrameworkCore.Sqlite";
+        }
+
+        public static bool SupportDropForeignKey(this Microsoft.EntityFrameworkCore.Migrations.Migration migration, string activeProvider)
+        {
+            return activeProvider != "Microsoft.EntityFrameworkCore.Sqlite";
+        }
+        public static bool SupportDropForeignKey(this DatabaseFacade facade)
+        {
+            return facade.ProviderName != "Microsoft.EntityFrameworkCore.Sqlite";
+        }
+    }
+}

BTCPayServer.Rating/BTCPayServer.Rating.csproj

@@ -1,20 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../Build/Version.csproj" Condition="Exists('../Build/Version.csproj')" />
   <Import Project="../Build/Common.csproj" />
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-  </PropertyGroup>
 
   <ItemGroup>
     <Folder Include="Providers\" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" 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" />
     <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
-    <PackageReference Include="NBitpayClient" Version="1.0.0.34" />
   </ItemGroup>
 
   <ItemGroup>

BTCPayServer.Rating/Providers/BitpayRateProvider.cs

@@ -1,33 +1,35 @@
-using NBitpayClient;
-using System.Linq;
+using System.Linq;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
 using System.Threading;
+using System.Net.Http;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Services.Rates
 {
     public class BitpayRateProvider : IRateProvider, IHasExchangeName
     {
         public const string BitpayName = "bitpay";
-        Bitpay _Bitpay;
-        public BitpayRateProvider(Bitpay bitpay)
+        private readonly HttpClient _httpClient;
+        public BitpayRateProvider(HttpClient httpClient)
         {
-            if (bitpay == null)
-                throw new ArgumentNullException(nameof(bitpay));
-            _Bitpay = bitpay;
+            _httpClient = httpClient ?? new HttpClient();
         }
 
         public string ExchangeName => BitpayName;
 
         public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
         {
-            return new ExchangeRates((await _Bitpay.GetRatesAsync().ConfigureAwait(false))
-                .AllRates
-                .Select(r => new ExchangeRate() { Exchange = BitpayName, CurrencyPair = new CurrencyPair("BTC", r.Code), BidAsk = new BidAsk(r.Value) })
-                .ToList());
+            var response = await _httpClient.GetAsync("https://bitpay.com/rates", cancellationToken);
+            var jarray = (JArray)(await response.Content.ReadAsAsync<JObject>(cancellationToken))["data"];
+            return new ExchangeRates(jarray
+                .Children<JObject>()
+                .Select(jobj => new ExchangeRate(ExchangeName, new CurrencyPair("BTC", jobj["code"].Value<string>()), new BidAsk(jobj["rate"].Value<decimal>())))
+                .Where(o => o.CurrencyPair.Right != "BTC")
+                .ToArray());
         }
     }
 }

BTCPayServer.Rating/Providers/ByllsRateProvider.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;