Rename access tokens to Bitpay in stores

* Fix modal overlay

fixes #1941

* fix speed

.circleci/can-build.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+echo "Checking if it is possible to build Bitcoin only..."
+cd ../BTCPayServer.Tests
+docker-compose -f "docker-compose.yml" build

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
       - checkout
       - run:
           command: |
-            cd .circleci && ./run-tests.sh "Fast=Fast"
+            cd .circleci && ./run-tests.sh "Fast=Fast" && ./can-build.sh
   selenium_tests:
     machine:
         enabled: true
@@ -49,8 +49,10 @@ jobs:
             LATEST_TAG=${CIRCLE_TAG:1} #trim v from tag
             #
             sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-amd64 -f amd64.Dockerfile .
+            sudo docker build --pull --build-arg CONFIGURATION_NAME=Altcoins-Release -t $DOCKERHUB_REPO:$LATEST_TAG-altcoins-amd64 -f amd64.Dockerfile .
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-amd64
+            sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-altcoins-amd64
 
   arm32v7:
     machine:
@@ -63,8 +65,10 @@ jobs:
             LATEST_TAG=${CIRCLE_TAG:1} #trim v from tag
             #
             sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm32v7 -f arm32v7.Dockerfile .
+            sudo docker build --pull --build-arg CONFIGURATION_NAME=Altcoins-Release -t $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm32v7 -f arm32v7.Dockerfile .
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-arm32v7
+            sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm32v7
 
   arm64v8:
     machine:
@@ -77,8 +81,10 @@ jobs:
             LATEST_TAG=${CIRCLE_TAG:1} #trim v from tag
             #
             sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm64v8 -f arm64v8.Dockerfile .
+            sudo docker build --build-arg CONFIGURATION_NAME=Altcoins-Release --pull -t $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm64v8 -f arm64v8.Dockerfile .
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-arm64v8
+            sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm64v8
 
   multiarch:
     machine:
@@ -99,6 +105,13 @@ jobs:
             sudo docker manifest annotate $DOCKERHUB_REPO:$LATEST_TAG $DOCKERHUB_REPO:$LATEST_TAG-arm32v7 --os linux --arch arm --variant v7
             sudo docker manifest annotate $DOCKERHUB_REPO:$LATEST_TAG $DOCKERHUB_REPO:$LATEST_TAG-arm64v8 --os linux --arch arm64 --variant v8
             sudo docker manifest push $DOCKERHUB_REPO:$LATEST_TAG -p
+            
+            
+            sudo docker manifest create --amend $DOCKERHUB_REPO:$LATEST_TAG-altcoins $DOCKERHUB_REPO:$LATEST_TAG-altcoins-amd64 $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm32v7 $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm64v8
+            sudo docker manifest annotate $DOCKERHUB_REPO:$LATEST_TAG-altcoins $DOCKERHUB_REPO:$LATEST_TAG-altcoins-amd64 --os linux --arch amd64
+            sudo docker manifest annotate $DOCKERHUB_REPO:$LATEST_TAG-altcoins $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm32v7 --os linux --arch arm --variant v7
+            sudo docker manifest annotate $DOCKERHUB_REPO:$LATEST_TAG-altcoins $DOCKERHUB_REPO:$LATEST_TAG-altcoins-arm64v8 --os linux --arch arm64 --variant v8
+            sudo docker manifest push $DOCKERHUB_REPO:$LATEST_TAG-altcoins -p
 
 workflows:
   version: 2
@@ -111,7 +124,6 @@ workflows:
           filters:
             branches:
                 only: master
-
   publish:
     jobs:
       - amd64:
@@ -121,21 +133,22 @@ workflows:
               ignore: /.*/
             # only act on version tags v1.0.0.88 or v1.0.2-1
             # OR feature tags like vlndseedbackup
+            # OR features on specific versions like v1.0.0.88-lndseedbackup-1
             tags:
-                
-              only: /(v[1-9]+(\.[0-9]+)*(-[0-9]+)?)|(v[a-z]+)/
+
+              only: /(v[1-9]+(\.[0-9]+)*(-[a-z0-9-]+)?)|(v[a-z0-9-]+)/
       - arm32v7:
           filters:
             branches:
               ignore: /.*/
             tags:
-              only: /(v[1-9]+(\.[0-9]+)*(-[0-9]+)?)|(v[a-z]+)/
+              only: /(v[1-9]+(\.[0-9]+)*(-[a-z0-9-]+)?)|(v[a-z0-9-]+)/
       - arm64v8:
           filters:
             branches:
               ignore: /.*/
             tags:
-              only: /(v[1-9]+(\.[0-9]+)*(-[0-9]+)?)|(v[a-z]+)/
+              only: /(v[1-9]+(\.[0-9]+)*(-[a-z0-9-]+)?)|(v[a-z0-9-]+)/
       - multiarch:
           requires:
             - amd64
@@ -145,4 +158,4 @@ workflows:
             branches:
               ignore: /.*/
             tags:
-              only: /(v[1-9]+(\.[0-9]+)*(-[0-9]+)?)|(v[a-z]+)/
+              only: /(v[1-9]+(\.[0-9]+)*(-[a-z0-9-]+)?)|(v[a-z0-9-]+)/

.circleci/run-tests.sh

@@ -3,7 +3,7 @@ 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
+docker-compose -f "docker-compose.altcoins.yml" down --v
+docker-compose -f "docker-compose.altcoins.yml" pull
+docker-compose -f "docker-compose.altcoins.yml" build
+docker-compose -f "docker-compose.altcoins.yml" run -e "TEST_FILTERS=$1" tests

.editorconfig

@@ -10,8 +10,9 @@ root = true
 insert_final_newline = true
 indent_style = space
 indent_size = 4
+charset = utf-8
 
-[project.json]
+[launchSettings.json]
 indent_size = 2
 
 # C# files
@@ -146,4 +147,4 @@ indent_size = 2
 [*.sh]
 end_of_line = lf
 [*.{cmd, bat}]
-end_of_line = crlf
+end_of_line = crlf

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: File a bug report
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Your BTCPay Environment (please complete the following information):**
+- BTCPay Server Version [available in the right bottom corner of footer] 
+- Deployment Method: [e.g. Docker, Manual, Third-Party-hoist]
+ - Browser [e.g. chrome, safari]
+
+**Logs (if applicable)**
+Basic logs can be found in Server Settings > Logs. More logs https://docs.btcpayserver.org/Troubleshooting/#2-looking-through-the-logs
+
+**Setup Parameters**
+If you're reporting a deployment issue run `. btcpay-setup.sh -i` and paste your the parameters by obscuring private information.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,37 +0,0 @@
----
-name: Report a problem
-about: File a technical problem or report a bug
----
-
-**Describe the problem/bug**
-A clear and concise description of what the bug is.
-
-**Your environment**
-* Version of BTCPay Server:
-* Deployment method: 
-* Other relevant environment details:
-
-**Logs (if applicable)**
-Basic logs can be found in Server Settings > Logs.
-
-**Setup Parameters**
-If you're reporting a deployment issue run `. btcpay-setup.sh -i` and paste your the paremeters by obscuring private information.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Actual behavior**
-Tell us what happens instead
-
-**Screenshots/Links**
-If applicable, add screenshots or links to help explain your problem.
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Community Support Chat 
+    url: https://chat.btcpayserver.org/
+    about: Ask general questions and get community support in real-time.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,9 @@
 ---
 name: Feature request
-about: Ideas and feature requests
+about: Suggest a new feature or enhancement
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
@@ -10,11 +13,11 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 
+**Sketch/Image/Wireframe/Mockup**
+ If applicable provide examples, wireframes, sketches or images to better explain your idea.
+
 **Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Provide examples**
-If applicable provide examples, wireframes, sketches or images to better explain your idea.
-
 **Additional context**
 Add any other context or screenshots about the feature request here.

.gitignore

@@ -292,5 +292,9 @@ __pycache__/
 BTCPayServer/wwwroot/bundles/*
 !BTCPayServer/wwwroot/bundles/.gitignore
 
-.vscode
+.vscode/*
+!.vscode/launch.json
+!.vscode/tasks.json
+!.vscode/extensions.json
 BTCPayServer/testpwd
+.DS_Store

.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+    "recommendations": ["ms-dotnettools.csharp"]
+}

.vscode/launch.json

@@ -0,0 +1,33 @@
+{
+    // Use IntelliSense to find out which attributes exist for C# debugging
+    // Use hover for the description of the existing attributes
+    // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": ".NET Core Launch (web)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/BTCPayServer/bin/Debug/netcoreapp3.1/BTCPayServer.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/BTCPayServer",
+            "stopAtEntry": false,
+            // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "\\bListening on\\s+(https?://\\S+)"
+            },
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "sourceFileMap": {
+                "/Views": "${workspaceFolder}/Views"
+            },
+            "logging": {
+                "moduleLoad": false
+            }
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,42 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/BTCPayServer/BTCPayServer.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/BTCPayServer/BTCPayServer.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "${workspaceFolder}/BTCPayServer/BTCPayServer.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

BTCPayServer.Client/BTCPayServer.Client.csproj

@@ -1,13 +1,37 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
+        <Company>BTCPay Server</Company>
+        <Copyright>Copyright © BTCPay Server 2020</Copyright>
+        <Description>A client library for BTCPay Server Greenfield API</Description>
+        <PackageIcon>icon.png</PackageIcon>
+        <PackageTags>btcpay,btcpayserver</PackageTags>
+        <PackageProjectUrl>https://github.com/btcpayserver/btcpayserver/tree/master/BTCPayServer.Client</PackageProjectUrl>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <RepositoryUrl>https://github.com/btcpayserver/btcpayserver</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
     </PropertyGroup>
-
+  <PropertyGroup>
+    <Version Condition=" '$(Version)' == '' ">1.1.0</Version>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <DebugType>portable</DebugType>
+    <Optimize>true</Optimize>
+    <NoWarn>1591;1573;1572;1584;1570;3021</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(Configuration)' == 'Release' ">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="NBitcoin" Version="5.0.43" />
+      <PackageReference Include="NBitcoin" Version="5.0.51" />
       <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.2.0" />
       <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     </ItemGroup>
-
+  <ItemGroup>
+    <None Include="icon.png" Pack="true" PackagePath="\" />
+  </ItemGroup>
 </Project>

BTCPayServer.Client/BTCPayServerClient.Authorization.cs

@@ -1,16 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using BTCPayServer.Client.Models;
 
 namespace BTCPayServer.Client
 {
     public partial class BTCPayServerClient
     {
-    
+
         public static Uri GenerateAuthorizeUri(Uri btcpayHost, string[] permissions, bool strict = true,
-            bool selectiveStores = false)
+            bool selectiveStores = false, (string ApplicationIdentifier, Uri Redirect) applicationDetails = default)
         {
             var result = new UriBuilder(btcpayHost);
             result.Path = "api-keys/authorize";
@@ -21,6 +18,15 @@ namespace BTCPayServer.Client
                     {"strict", strict}, {"selectiveStores", selectiveStores}, {"permissions", permissions}
                 });
 
+            if (applicationDetails.Redirect != null)
+            {
+                AppendPayloadToQuery(result, new KeyValuePair<string, object>("redirect", applicationDetails.Redirect));
+                if (!string.IsNullOrEmpty(applicationDetails.ApplicationIdentifier))
+                {
+                    AppendPayloadToQuery(result, new KeyValuePair<string, object>("applicationIdentifier", applicationDetails.ApplicationIdentifier));
+                }
+            }
+
             return result.Uri;
         }
     }

BTCPayServer.Client/BTCPayServerClient.Health.cs

@@ -1,4 +1,3 @@
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;

BTCPayServer.Client/BTCPayServerClient.Invoices.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Client.Models;
+
+namespace BTCPayServer.Client
+{
+    public partial class BTCPayServerClient
+    {
+        public virtual async Task<IEnumerable<InvoiceData>> GetInvoices(string storeId, bool includeArchived = false,
+            CancellationToken token = default)
+        {
+            var response =
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/invoices",
+                        new Dictionary<string, object>() {{nameof(includeArchived), includeArchived}}), token);
+            return await HandleResponse<IEnumerable<InvoiceData>>(response);
+        }
+
+        public virtual async Task<InvoiceData> GetInvoice(string storeId, string invoiceId,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}"), token);
+            return await HandleResponse<InvoiceData>(response);
+        }
+
+        public virtual async Task ArchiveInvoice(string storeId, string invoiceId,
+            CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}",
+                    method: HttpMethod.Delete), token);
+            await HandleResponse(response);
+        }
+
+        public virtual async Task<InvoiceData> CreateInvoice(string storeId,
+            CreateInvoiceRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<InvoiceData>(response);
+        }
+
+        public virtual async Task<InvoiceData> MarkInvoiceStatus(string storeId, string invoiceId,
+            MarkInvoiceStatusRequest request, CancellationToken token = default)
+        {
+            if (request == null)
+                throw new ArgumentNullException(nameof(request));
+            if (request.Status!= InvoiceStatus.Complete && request.Status!= InvoiceStatus.Invalid)
+                throw new ArgumentOutOfRangeException(nameof(request.Status), "Status can only be Invalid or Complete");
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}/status", bodyPayload: request,
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<InvoiceData>(response);
+        }
+
+        public virtual async Task<InvoiceData> UnarchiveInvoice(string storeId, string invoiceId, CancellationToken token = default)
+        {
+            var response = await _httpClient.SendAsync(
+                CreateHttpRequest($"api/v1/stores/{storeId}/invoices/{invoiceId}/unarchive", 
+                    method: HttpMethod.Post), token);
+            return await HandleResponse<InvoiceData>(response);
+        }
+    }
+}

BTCPayServer.Client/BTCPayServerClient.Lightning.Store.cs

@@ -4,7 +4,6 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
-using BTCPayServer.Lightning;
 
 namespace BTCPayServer.Client
 {

BTCPayServer.Client/BTCPayServerClient.PaymentRequests.cs

@@ -10,10 +10,13 @@ namespace BTCPayServer.Client
     public partial class BTCPayServerClient
     {
         public virtual async Task<IEnumerable<PaymentRequestData>> GetPaymentRequests(string storeId,
+            bool includeArchived = false,
             CancellationToken token = default)
         {
             var response =
-                await _httpClient.SendAsync(CreateHttpRequest($"api/v1/stores/{storeId}/payment-requests"), token);
+                await _httpClient.SendAsync(
+                    CreateHttpRequest($"api/v1/stores/{storeId}/payment-requests",
+                        new Dictionary<string, object>() {{nameof(includeArchived), includeArchived}}), token);
             return await HandleResponse<IEnumerable<PaymentRequestData>>(response);
         }
 

BTCPayServer.Client/BTCPayServerClient.PullPayments.cs

@@ -1,7 +1,5 @@
-using System;
 using System.Collections.Generic;
 using System.Net.Http;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web;

BTCPayServer.Client/BTCPayServerClient.ServerInfo.cs

@@ -1,4 +1,3 @@
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;

BTCPayServer.Client/BTCPayServerClient.Stores.cs

@@ -21,14 +21,14 @@ namespace BTCPayServer.Client
                 CreateHttpRequest($"api/v1/stores/{storeId}"), token);
             return await HandleResponse<StoreData>(response);
         }
-        
+
         public virtual async Task RemoveStore(string storeId, CancellationToken token = default)
         {
             var response = await _httpClient.SendAsync(
                 CreateHttpRequest($"api/v1/stores/{storeId}", method: HttpMethod.Delete), token);
             await HandleResponse(response);
         }
-        
+
         public virtual async Task<StoreData> CreateStore(CreateStoreRequest request, CancellationToken token = default)
         {
             if (request == null)
@@ -36,7 +36,7 @@ namespace BTCPayServer.Client
             var response = await _httpClient.SendAsync(CreateHttpRequest("api/v1/stores", bodyPayload: request, method: HttpMethod.Post), token);
             return await HandleResponse<StoreData>(response);
         }
-        
+
         public virtual async Task<StoreData> UpdateStore(string storeId, UpdateStoreRequest request, CancellationToken token = default)
         {
             if (request == null)

BTCPayServer.Client/BTCPayServerClient.cs

@@ -18,6 +18,8 @@ namespace BTCPayServer.Client
         private readonly string _password;
         private readonly HttpClient _httpClient;
 
+        public Uri Host => _btcpayHost;
+
         public string APIKey => _apiKey;
 
         public BTCPayServerClient(Uri btcpayHost, HttpClient httpClient = null)
@@ -33,7 +35,7 @@ namespace BTCPayServer.Client
             _btcpayHost = btcpayHost;
             _httpClient = httpClient ?? new HttpClient();
         }
-        
+
         public BTCPayServerClient(Uri btcpayHost, string username, string password, HttpClient httpClient = null)
         {
             _apiKey = APIKey;
@@ -47,7 +49,8 @@ namespace BTCPayServer.Client
         {
             if (message.StatusCode == System.Net.HttpStatusCode.UnprocessableEntity)
             {
-                var err = JsonConvert.DeserializeObject<Models.GreenfieldValidationError[]>(await message.Content.ReadAsStringAsync()); ;
+                var err = JsonConvert.DeserializeObject<Models.GreenfieldValidationError[]>(await message.Content.ReadAsStringAsync());
+                ;
                 throw new GreenFieldValidationException(err);
             }
             else if (message.StatusCode == System.Net.HttpStatusCode.BadRequest)
@@ -55,7 +58,7 @@ namespace BTCPayServer.Client
                 var err = JsonConvert.DeserializeObject<Models.GreenfieldAPIError>(await message.Content.ReadAsStringAsync());
                 throw new GreenFieldAPIException(err);
             }
-                
+
             message.EnsureSuccessStatusCode();
         }
 
@@ -69,7 +72,7 @@ namespace BTCPayServer.Client
             Dictionary<string, object> queryPayload = null,
             HttpMethod method = null)
         {
-            UriBuilder uriBuilder = new UriBuilder(_btcpayHost) {Path = path};
+            UriBuilder uriBuilder = new UriBuilder(_btcpayHost) { Path = path };
             if (queryPayload != null && queryPayload.Any())
             {
                 AppendPayloadToQuery(uriBuilder, queryPayload);
@@ -100,29 +103,37 @@ namespace BTCPayServer.Client
             return request;
         }
 
-        private static void AppendPayloadToQuery(UriBuilder uri, Dictionary<string, object> payload)
+        public static void AppendPayloadToQuery(UriBuilder uri, KeyValuePair<string, object> keyValuePair)
+        {
+            if (uri.Query.Length > 1)
+                uri.Query += "&";
+
+            UriBuilder uriBuilder = uri;
+            if (!(keyValuePair.Value is string) &&
+                keyValuePair.Value.GetType().GetInterfaces().Contains((typeof(IEnumerable))))
+            {
+                foreach (var item in (IEnumerable)keyValuePair.Value)
+                {
+                    uriBuilder.Query = uriBuilder.Query + Uri.EscapeDataString(keyValuePair.Key) + "=" +
+                                       Uri.EscapeDataString(item.ToString()) + "&";
+                }
+            }
+            else
+            {
+                uriBuilder.Query = uriBuilder.Query + Uri.EscapeDataString(keyValuePair.Key) + "=" +
+                                   Uri.EscapeDataString(keyValuePair.Value.ToString()) + "&";
+            }
+            uri.Query = uri.Query.Trim('&');
+        }
+
+        public static void AppendPayloadToQuery(UriBuilder uri, Dictionary<string, object> payload)
         {
             if (uri.Query.Length > 1)
                 uri.Query += "&";
             foreach (KeyValuePair<string, object> keyValuePair in payload)
             {
-                UriBuilder uriBuilder = uri;
-                if (!(keyValuePair.Value is string) && keyValuePair.Value.GetType().GetInterfaces().Contains((typeof(IEnumerable))))
-                {
-                    foreach (var item in (IEnumerable)keyValuePair.Value)
-                    {
-                        uriBuilder.Query = uriBuilder.Query + Uri.EscapeDataString(keyValuePair.Key) + "=" +
-                                           Uri.EscapeDataString(item.ToString()) + "&";
-                    }
-                }
-                else
-                {
-                    uriBuilder.Query = uriBuilder.Query + Uri.EscapeDataString(keyValuePair.Key) + "=" +
-                                       Uri.EscapeDataString(keyValuePair.Value.ToString()) + "&";
-                }
+                AppendPayloadToQuery(uri, keyValuePair);
             }
-
-            uri.Query = uri.Query.Trim('&');
         }
     }
 }

BTCPayServer.Client/GreenFieldAPIException.cs

@@ -1,13 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml.Linq;
+using System;
 
 namespace BTCPayServer.Client
 {
     public class GreenFieldAPIException : Exception
     {
-        public GreenFieldAPIException(Models.GreenfieldAPIError error):base(error.Message)
+        public GreenFieldAPIException(Models.GreenfieldAPIError error) : base(error.Message)
         {
             if (error == null)
                 throw new ArgumentNullException(nameof(error));

BTCPayServer.Client/GreenFieldValidationException.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
+using System;
 using System.Text;
 using BTCPayServer.Client.Models;
 

BTCPayServer.Client/JsonConverters/DecimalStringJsonConverter.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Globalization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace BTCPayServer.JsonConverters
-{
-    public class DecimalStringJsonConverter : JsonConverter
-    {
-        public override bool CanConvert(Type objectType)
-        {
-            return (objectType == typeof(decimal) || objectType == typeof(decimal?));
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
-            JsonSerializer serializer)
-        {
-            JToken token = JToken.Load(reader);
-            switch (token.Type)
-            {
-                case JTokenType.Float:
-                case JTokenType.Integer:
-                case JTokenType.String:
-                    return decimal.Parse(token.ToString(), CultureInfo.InvariantCulture);
-                case JTokenType.Null when objectType == typeof(decimal?):
-                    return null;
-                default:
-                    throw new JsonSerializationException("Unexpected token type: " +
-                                                         token.Type);
-            }
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            if (value != null)
-                writer.WriteValue(((decimal)value).ToString(CultureInfo.InvariantCulture));
-        }
-    }
-}

BTCPayServer.Client/JsonConverters/MoneyJsonConverter.cs

@@ -11,7 +11,7 @@ namespace BTCPayServer.Client.JsonConverters
         {
             if (reader.TokenType == JsonToken.String)
             {
-                return new Money( long.Parse((string) reader.Value));
+                return new Money(long.Parse((string)reader.Value));
             }
             return base.ReadJson(reader, objectType, existingValue, serializer);
         }

BTCPayServer.Client/JsonConverters/NodeUriJsonConverter.cs

@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Text;
-using BTCPayServer.Client.Models;
 using BTCPayServer.Lightning;
 using NBitcoin.JsonConverters;
 using Newtonsoft.Json;

BTCPayServer.Client/JsonConverters/NumericStringJsonConverter.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Globalization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.JsonConverters
+{
+    public class NumericStringJsonConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return (objectType == typeof(decimal) ||
+                    objectType == typeof(decimal?) ||
+                    objectType == typeof(double) ||
+                    objectType == typeof(double?));
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
+            JsonSerializer serializer)
+        {
+            JToken token = JToken.Load(reader);
+            switch (token.Type)
+            {
+                case JTokenType.Float:
+                case JTokenType.Integer:
+                case JTokenType.String:
+                    if (objectType == typeof(decimal) || objectType == typeof(decimal?) )
+                        return decimal.Parse(token.ToString(), CultureInfo.InvariantCulture);
+                    if (objectType == typeof(double) || objectType == typeof(double?))
+                        return double.Parse(token.ToString(), CultureInfo.InvariantCulture);
+
+                    throw new JsonSerializationException("Unexpected object type: " + objectType);
+                case JTokenType.Null when objectType == typeof(decimal?) || objectType == typeof(double?):
+                    return null;
+                default:
+                    throw new JsonSerializationException("Unexpected token type: " +
+                                                         token.Type);
+            }
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            switch (value)
+            {
+                case null:
+                    break;
+                case decimal x:
+                    writer.WriteValue(x.ToString(CultureInfo.InvariantCulture));
+                    break;
+                case double x:
+                    writer.WriteValue(x.ToString(CultureInfo.InvariantCulture));
+                    break;
+            }
+        }
+    }
+}

BTCPayServer.Client/JsonConverters/PermissionJsonConverter.cs

@@ -1,9 +1,7 @@
-using System;
+using System;
 using System.Reflection;
-using System.Collections.Generic;
-using System.Text;
-using Newtonsoft.Json;
 using NBitcoin.JsonConverters;
+using Newtonsoft.Json;
 
 namespace BTCPayServer.Client.JsonConverters
 {

BTCPayServer.Client/JsonConverters/TimeSpanJsonConverter.cs

@@ -1,18 +1,41 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System;
 using NBitcoin.JsonConverters;
 using Newtonsoft.Json;
 
 namespace BTCPayServer.Client.JsonConverters
 {
-    public class TimeSpanJsonConverter : JsonConverter
+    public abstract class TimeSpanJsonConverter : JsonConverter
     {
+        public class Seconds : TimeSpanJsonConverter
+        {
+            protected override long ToLong(TimeSpan value)
+            {
+                return (long)value.TotalSeconds;
+            }
+
+            protected override TimeSpan ToTimespan(long value)
+            {
+                return TimeSpan.FromSeconds(value);
+            }
+        }
+        public class Minutes : TimeSpanJsonConverter
+        {
+            protected override long ToLong(TimeSpan value)
+            {
+                return (long)value.TotalMinutes;
+            }
+            protected override TimeSpan ToTimespan(long value)
+            {
+                return TimeSpan.FromMinutes(value);
+            }
+        }
         public override bool CanConvert(Type objectType)
         {
             return objectType == typeof(TimeSpan) || objectType == typeof(TimeSpan?);
         }
 
+        protected abstract TimeSpan ToTimespan(long value);
+        protected abstract long ToLong(TimeSpan value);
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
             try
@@ -26,11 +49,11 @@ namespace BTCPayServer.Client.JsonConverters
                 }
                 if (reader.TokenType != JsonToken.Integer)
                     throw new JsonObjectException("Invalid timespan, expected integer", reader);
-                return TimeSpan.FromSeconds((long)reader.Value);
+                return ToTimespan((long)reader.Value);
             }
             catch
             {
-                throw new JsonObjectException("Invalid locktime", reader);
+                throw new JsonObjectException("Invalid timespan", reader);
             }
         }
 
@@ -38,7 +61,7 @@ namespace BTCPayServer.Client.JsonConverters
         {
             if (value is TimeSpan s)
             {
-                writer.WriteValue((long)s.TotalSeconds);
+                writer.WriteValue(ToLong(s));
             }
         }
     }

BTCPayServer.Client/Models/AddCustomerEmailRequest.cs

@@ -0,0 +1,7 @@
+namespace BTCPayServer.Client.Models
+{
+    public class AddCustomerEmailRequest
+    {
+        public string Email { get; set; }
+    }
+}

BTCPayServer.Client/Models/ApplicationUserData.cs

@@ -21,5 +21,10 @@ namespace BTCPayServer.Client.Models
         /// whether the user needed to verify their email on account creation
         /// </summary>
         public bool RequiresEmailConfirmation { get; set; }
+
+        /// <summary>
+        /// the roles of the user
+        /// </summary>
+        public string[] Roles { get; set; }
     }
 }

BTCPayServer.Client/Models/ApprovePayoutRequest.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace BTCPayServer.Client.Models
 {
     public class ApprovePayoutRequest

BTCPayServer.Client/Models/ConnectToNodeRequest.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using BTCPayServer.Client.JsonConverters;
 using BTCPayServer.Lightning;
 using Newtonsoft.Json;

BTCPayServer.Client/Models/CreateApiKeyRequest.cs

@@ -1,4 +1,4 @@
-using BTCPayServer.Client.JsonConverters;
+using BTCPayServer.Client.JsonConverters;
 using Newtonsoft.Json;
 
 namespace BTCPayServer.Client.Models

BTCPayServer.Client/Models/CreateInvoiceRequest.cs

@@ -0,0 +1,35 @@
+using System;
+using BTCPayServer.Client.JsonConverters;
+using BTCPayServer.JsonConverters;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Client.Models
+{
+    public class CreateInvoiceRequest
+    {
+        [JsonProperty(ItemConverterType = typeof(NumericStringJsonConverter))]
+        public decimal Amount { get; set; }
+        public string Currency { get; set; }
+        public JObject Metadata { get; set; }
+        public CheckoutOptions Checkout { get; set; } = new CheckoutOptions();
+
+        public class CheckoutOptions
+        {
+            [JsonConverter(typeof(StringEnumConverter))]
+            public SpeedPolicy? SpeedPolicy { get; set; }
+
+            public string[] PaymentMethods { get; set; }
+
+            [JsonConverter(typeof(TimeSpanJsonConverter.Minutes))]
+            [JsonProperty("expirationMinutes")]
+            public TimeSpan? Expiration { get; set; }
+            [JsonConverter(typeof(TimeSpanJsonConverter.Minutes))]
+            [JsonProperty("monitoringMinutes")]
+            public TimeSpan? Monitoring { get; set; }
+
+            public double? PaymentTolerance { get; set; }
+        }
+    }
+}

BTCPayServer.Client/Models/CreateLightningInvoiceRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Security.Cryptography;
 using BTCPayServer.Lightning;
 using BTCPayServer.Lightning.JsonConverters;
 using Newtonsoft.Json;
@@ -21,9 +20,9 @@ namespace BTCPayServer.Client.Models
         [JsonConverter(typeof(LightMoneyJsonConverter))]
         public LightMoney Amount { get; set; }
         public string Description { get; set; }
-        [JsonConverter(typeof(JsonConverters.TimeSpanJsonConverter))]
+        [JsonConverter(typeof(JsonConverters.TimeSpanJsonConverter.Seconds))]
         public TimeSpan Expiry { get; set; }
         public bool PrivateRouteHints { get; set; }
-        
+
     }
 }

BTCPayServer.Client/Models/CreatePaymentRequestRequest.cs

@@ -3,4 +3,4 @@ namespace BTCPayServer.Client.Models
     public class CreatePaymentRequestRequest : PaymentRequestBaseData
     {
     }
-}
+}

BTCPayServer.Client/Models/CreatePayoutRequest.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using BTCPayServer.JsonConverters;
 using Newtonsoft.Json;
 
@@ -9,7 +6,7 @@ namespace BTCPayServer.Client.Models
     public class CreatePayoutRequest
     {
         public string Destination { get; set; }
-        [JsonConverter(typeof(DecimalStringJsonConverter))]
+        [JsonConverter(typeof(NumericStringJsonConverter))]
         public decimal? Amount { get; set; }
         public string PaymentMethod { get; set; }
     }

BTCPayServer.Client/Models/CreatePullPaymentRequest.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System;
 using BTCPayServer.Client.JsonConverters;
 using BTCPayServer.JsonConverters;
 using Newtonsoft.Json;
@@ -10,10 +8,10 @@ namespace BTCPayServer.Client.Models
     public class CreatePullPaymentRequest
     {
         public string Name { get; set; }
-        [JsonProperty(ItemConverterType = typeof(DecimalStringJsonConverter))]
+        [JsonProperty(ItemConverterType = typeof(NumericStringJsonConverter))]
         public decimal Amount { get; set; }
         public string Currency { get; set; }
-        [JsonConverter(typeof(TimeSpanJsonConverter))]
+        [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
         public TimeSpan? Period { get; set; }
         [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
         public DateTimeOffset? ExpiresAt { get; set; }

BTCPayServer.Client/Models/CreateStoreRequest.cs

@@ -1,6 +1,6 @@
 namespace BTCPayServer.Client.Models
 {
-    public class CreateStoreRequest: StoreBaseData
+    public class CreateStoreRequest : StoreBaseData
     {
     }
 }

BTCPayServer.Client/Models/GreenfieldAPIError.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System;
 
 namespace BTCPayServer.Client.Models
 {

BTCPayServer.Client/Models/GreenfieldValidationError.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System;
 
 namespace BTCPayServer.Client.Models
 {

BTCPayServer.Client/Models/InvoiceData.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using BTCPayServer.JsonConverters;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace BTCPayServer.Client.Models
+{
+    public class InvoiceData : CreateInvoiceRequest
+    {
+        public string Id { get; set; }
+        [JsonConverter(typeof(StringEnumConverter))]
+        public InvoiceStatus Status { get; set; }
+        [JsonConverter(typeof(StringEnumConverter))]
+        public InvoiceExceptionStatus AdditionalStatus { get; set; }
+        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+        public DateTimeOffset MonitoringExpiration { get; set; }
+        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+        public DateTimeOffset ExpirationTime { get; set; }
+        [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+        public DateTimeOffset CreatedTime { get; set; }
+    }
+}

BTCPayServer.Client/Models/InvoiceExceptionStatus.cs

@@ -0,0 +1,12 @@
+namespace BTCPayServer.Client.Models
+{
+    public enum InvoiceExceptionStatus
+    {
+        None,
+        PaidLate,
+        PaidPartial,
+        Marked,
+        Invalid,
+        PaidOver
+    }
+}

BTCPayServer.Client/Models/InvoiceStatus.cs

@@ -0,0 +1,12 @@
+namespace BTCPayServer.Client.Models
+{
+    public enum InvoiceStatus
+    {
+        New,
+        Paid,
+        Expired,
+        Invalid,
+        Complete,
+        Confirmed
+    }
+}

BTCPayServer.Client/Models/LightningNodeInformationData.cs

@@ -1,8 +1,5 @@
-using System.Collections.Generic;
 using BTCPayServer.Client.JsonConverters;
 using BTCPayServer.Lightning;
-using NBitcoin;
-using NBitcoin.JsonConverters;
 using Newtonsoft.Json;
 
 namespace BTCPayServer.Client.Models

BTCPayServer.Client/Models/MarkInvoiceStatusRequest.cs

@@ -0,0 +1,11 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace BTCPayServer.Client.Models
+{
+    public class MarkInvoiceStatusRequest
+    {
+        [JsonConverter(typeof(StringEnumConverter))]
+        public InvoiceStatus Status { get; set; }
+    }
+}

BTCPayServer.Client/Models/PaymentRequestBaseData.cs

@@ -8,7 +8,7 @@ namespace BTCPayServer.Client.Models
 {
     public class PaymentRequestBaseData
     {
-        [JsonProperty(ItemConverterType = typeof(DecimalStringJsonConverter))]
+        [JsonProperty(ItemConverterType = typeof(NumericStringJsonConverter))]
         public decimal Amount { get; set; }
         public string Currency { get; set; }
         public DateTime? ExpiryDate { get; set; }

BTCPayServer.Client/Models/PaymentRequestData.cs

@@ -5,7 +5,7 @@ using Newtonsoft.Json.Converters;
 namespace BTCPayServer.Client.Models
 {
     public class PaymentRequestData : PaymentRequestBaseData
-    {        
+    {
         [JsonConverter(typeof(StringEnumConverter))]
         public PaymentRequestData.PaymentRequestStatus Status { get; set; }
         public DateTimeOffset Created { get; set; }

BTCPayServer.Client/Models/PayoutData.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System;
 using BTCPayServer.JsonConverters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -23,9 +21,9 @@ namespace BTCPayServer.Client.Models
         public string PullPaymentId { get; set; }
         public string Destination { get; set; }
         public string PaymentMethod { get; set; }
-        [JsonConverter(typeof(DecimalStringJsonConverter))]
+        [JsonConverter(typeof(NumericStringJsonConverter))]
         public decimal Amount { get; set; }
-        [JsonConverter(typeof(DecimalStringJsonConverter))]
+        [JsonConverter(typeof(NumericStringJsonConverter))]
         public decimal? PaymentMethodAmount { get; set; }
         [JsonConverter(typeof(StringEnumConverter))]
         public PayoutState State { get; set; }

BTCPayServer.Client/Models/PullPaymentBaseData.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System;
 using BTCPayServer.Client.JsonConverters;
 using BTCPayServer.JsonConverters;
 using Newtonsoft.Json;
@@ -16,9 +14,9 @@ namespace BTCPayServer.Client.Models
         public string Id { get; set; }
         public string Name { get; set; }
         public string Currency { get; set; }
-        [JsonConverter(typeof(DecimalStringJsonConverter))]
+        [JsonConverter(typeof(NumericStringJsonConverter))]
         public decimal Amount { get; set; }
-        [JsonConverter(typeof(TimeSpanJsonConverter))]
+        [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
         public TimeSpan? Period { get; set; }
         public bool Archived { get; set; }
         public string ViewLink { get; set; }

BTCPayServer.Client/Models/ServerInfoData.cs

@@ -8,12 +8,12 @@ namespace BTCPayServer.Client.Models
         /// the BTCPay Server version
         /// </summary>
         public string Version { get; set; }
-        
+
         /// <summary>
         /// the Tor hostname
         /// </summary>
         public string Onion { get; set; }
-        
+
         /// <summary>
         /// the payment methods this server supports
         /// </summary>

BTCPayServer.Client/Models/StoreBaseData.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using BTCPayServer.Client.JsonConverters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -17,11 +16,11 @@ namespace BTCPayServer.Client.Models
 
         public string Website { get; set; }
 
-        [JsonConverter(typeof(TimeSpanJsonConverter))]
+        [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public TimeSpan InvoiceExpiration { get; set; } = TimeSpan.FromMinutes(15);
 
-        [JsonConverter(typeof(TimeSpanJsonConverter))]
+        [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public TimeSpan MonitoringExpiration { get; set; } = TimeSpan.FromMinutes(60);
 
@@ -61,14 +60,14 @@ namespace BTCPayServer.Client.Models
         [JsonExtensionData]
         public IDictionary<string, JToken> AdditionalData { get; set; }
     }
-    
+
     public enum NetworkFeeMode
     {
         MultiplePaymentsOnly,
         Always,
         Never
     }
-    
+
     public enum SpeedPolicy
     {
         HighSpeed = 0,

BTCPayServer.Client/Models/UpdatePaymentRequestRequest.cs

@@ -3,4 +3,4 @@ namespace BTCPayServer.Client.Models
     public class UpdatePaymentRequestRequest : PaymentRequestBaseData
     {
     }
-}
+}

BTCPayServer.Client/Permissions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -12,7 +12,9 @@ namespace BTCPayServer.Client
         public const string CanUseLightningNodeInStore = "btcpay.store.canuselightningnode";
         public const string CanModifyServerSettings = "btcpay.server.canmodifyserversettings";
         public const string CanModifyStoreSettings = "btcpay.store.canmodifystoresettings";
+        public const string CanModifyStoreSettingsUnscoped = "btcpay.store.canmodifystoresettings:";
         public const string CanViewStoreSettings = "btcpay.store.canviewstoresettings";
+        public const string CanViewInvoices = "btcpay.store.canviewinvoices";
         public const string CanCreateInvoice = "btcpay.store.cancreateinvoice";
         public const string CanViewPaymentRequests = "btcpay.store.canviewpaymentrequests";
         public const string CanModifyPaymentRequests = "btcpay.store.canmodifypaymentrequests";
@@ -25,6 +27,7 @@ namespace BTCPayServer.Client
         {
             get
             {
+                yield return CanViewInvoices;
                 yield return CanCreateInvoice;
                 yield return CanModifyServerSettings;
                 yield return CanModifyStoreSettings;
@@ -151,7 +154,9 @@ namespace BTCPayServer.Client
             if (this.Policy == subpolicy)
                 return true;
             switch (subpolicy)
-            {   
+            {
+                case Policies.CanViewInvoices when this.Policy == Policies.CanModifyStoreSettings:
+                case Policies.CanViewInvoices when this.Policy == Policies.CanViewStoreSettings:
                 case Policies.CanViewStoreSettings when this.Policy == Policies.CanModifyStoreSettings:
                 case Policies.CanCreateInvoice when this.Policy == Policies.CanModifyStoreSettings:
                 case Policies.CanViewProfile when this.Policy == Policies.CanModifyProfile:

BTCPayServer.Client/PushNuget.ps1

@@ -0,0 +1,7 @@
+rm "bin\release\" -Recurse -Force
+dotnet pack --configuration Release --include-symbols -p:SymbolPackageFormat=snupkg
+$package=(ls .\bin\Release\*.nupkg).FullName
+dotnet nuget push $package --source "https://api.nuget.org/v3/index.json"
+$ver = ((ls .\bin\release\*.nupkg)[0].Name -replace '.*(\d+\.\d+\.\d+)\.nupkg','$1')
+git tag -a "BTCPayServer.Client/v$ver" -m "BTCPayServer.Client/$ver"
+git push origin "BTCPayServer.Client/v$ver"

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Argoneum.cs

@@ -0,0 +1,31 @@
+using NBitcoin;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        public void InitArgoneum()
+        {
+            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("AGM");
+            Add(new BTCPayNetwork()
+            {
+                CryptoCode = nbxplorerNetwork.CryptoCode,
+                DisplayName = "Argoneum",
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet
+                    ? "https://chainz.cryptoid.info/agm/tx.dws?{0}"
+                    : "https://chainz.cryptoid.info/agm-test/tx.dws?{0}",
+                NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "argoneum",
+                DefaultRateRules = new[]
+                    {
+                        "AGM_X = AGM_BTC * BTC_X",
+                        "AGM_BTC = argoneum(AGM_BTC)"
+                    },
+                CryptoImagePath = "imlegacy/argoneum.png",
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("421'")
+                    : new KeyPath("1'")
+            });
+        }
+    }
+}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.BitcoinGold.cs

@@ -1,4 +1,4 @@
-using NBitcoin;
+using NBitcoin;
 
 namespace BTCPayServer
 {

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcoinplus.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcore.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Chaincoin.cs

@@ -1,4 +1,4 @@
-using NBitcoin;
+using NBitcoin;
 
 namespace BTCPayServer
 {

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Dash.cs

@@ -1,4 +1,4 @@
-using NBitcoin;
+using NBitcoin;
 
 namespace BTCPayServer
 {

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Dogecoin.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 
@@ -19,7 +15,7 @@ namespace BTCPayServer
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://dogechain.info/tx/{0}" : "https://dogechain.info/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "dogecoin",
-                DefaultRateRules = new[] 
+                DefaultRateRules = new[]
                 {
                                 "DOGE_X = DOGE_BTC * BTC_X",
                                 "DOGE_BTC = bittrex(DOGE_BTC)"

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Feathercoin.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 
@@ -19,7 +15,7 @@ namespace BTCPayServer
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://explorer.feathercoin.com/tx/{0}" : "https://explorer.feathercoin.com/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "feathercoin",
-                DefaultRateRules = new[] 
+                DefaultRateRules = new[]
                 {
                                 "FTC_X = FTC_BTC * BTC_X",
                                 "FTC_BTC = bittrex(FTC_BTC)"

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Groestlcoin.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 
 namespace BTCPayServer

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Litecoin.cs

@@ -1,7 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Monacoin.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 
@@ -19,7 +15,7 @@ namespace BTCPayServer
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://mona.insight.monaco-ex.org/insight/tx/{0}" : "https://testnet-mona.insight.monaco-ex.org/insight/tx/{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "monacoin",
-                DefaultRateRules = new[] 
+                DefaultRateRules = new[]
                 {
                                 "MONA_X = MONA_BTC * BTC_X",
                                 "MONA_BTC = bittrex(MONA_BTC)"

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.MonetaryUnit.cs

@@ -0,0 +1,29 @@
+using NBitcoin;
+using NBXplorer;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        public void InitMonetaryUnit()
+        {
+            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("MUE");
+            Add(new BTCPayNetwork()
+            {
+                CryptoCode = nbxplorerNetwork.CryptoCode,
+                DisplayName = "MonetaryUnit",
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://explorer.monetaryunit.org/#/MUE/mainnet/tx/{0}" : "https://explorer.monetaryunit.org/#/MUE/mainnet/tx/{0}",
+                NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "monetaryunit",
+                DefaultRateRules = new[]
+                {
+                                "MUE_X = MUE_BTC * BTC_X",
+                                "MUE_BTC = bittrex(MUE_BTC)"
+                },
+                CryptoImagePath = "imlegacy/monetaryunit.png",
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("31'") : new KeyPath("1'")
+            });
+        }
+    }
+}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Polis.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Ufo.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 
@@ -19,7 +15,7 @@ namespace BTCPayServer
                 BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://chainz.cryptoid.info/ufo/tx.dws?{0}" : "https://chainz.cryptoid.info/ufo/tx.dws?{0}",
                 NBXplorerNetwork = nbxplorerNetwork,
                 UriScheme = "ufo",
-                DefaultRateRules = new[] 
+                DefaultRateRules = new[]
                 {
                                 "UFO_X = UFO_BTC * BTC_X",
                                 "UFO_BTC = coinexchange(UFO_BTC)"

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Viacoin.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/Ethereum/BTCPayNetworkProvider.Ethereum.cs

@@ -0,0 +1,78 @@
+#if ALTCOINS
+using NBitcoin;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        public void InitEthereum()
+        {
+            Add(new EthereumBTCPayNetwork()
+            {
+                CryptoCode = "ETH",
+                DisplayName = "Ethereum",
+                DefaultRateRules = new[] {"ETH_X = ETH_BTC * BTC_X", "ETH_BTC = kraken(ETH_BTC)"},
+                BlockExplorerLink =
+                    NetworkType == NetworkType.Mainnet
+                        ? "https://etherscan.io/address/{0}"
+                        : "https://ropsten.etherscan.io/address/{0}",
+                CryptoImagePath = "/imlegacy/eth.png",
+                ShowSyncSummary = true,
+                CoinType = NetworkType == NetworkType.Mainnet? 60 : 1,
+                ChainId = NetworkType == NetworkType.Mainnet ? 1 : 3,
+                Divisibility = 18,
+            });
+        }
+        
+        public void InitERC20()
+        {
+            if (NetworkType != NetworkType.Mainnet)
+            {
+                Add(new ERC20BTCPayNetwork()
+                {
+                    CryptoCode = "FAU",
+                    DisplayName = "Faucet Token",
+                    DefaultRateRules = new[]
+                    {
+                        "FAU_X = FAU_BTC * BTC_X",
+                        "FAU_BTC = 0.01",
+                    },
+                    BlockExplorerLink = "https://ropsten.etherscan.io/address/{0}#tokentxns",
+                    ShowSyncSummary = false,
+                    CoinType =  1,
+                    ChainId =  3,
+                    //use https://erc20faucet.com for testnet
+                    SmartContractAddress = "0xFab46E002BbF0b4509813474841E0716E6730136",
+                    Divisibility = 18,
+                    CryptoImagePath = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=",
+                });
+            }
+            else
+            {
+                Add(new ERC20BTCPayNetwork()
+                {
+                    CryptoCode = "USDT20",
+                    DisplayName = "Tether USD (ERC20)",
+                    DefaultRateRules = new[]
+                    {
+                        "USDT20_UST = 1",
+                        "USDT20_X = USDT20_BTC * BTC_X",
+                        "USDT20_BTC = bitfinex(UST_BTC)",
+                    },
+                    BlockExplorerLink =
+                        NetworkType == NetworkType.Mainnet
+                            ? "https://etherscan.io/address/{0}#tokentxns"
+                            : "https://ropsten.etherscan.io/address/{0}#tokentxns",
+                    CryptoImagePath = "/imlegacy/liquid-tether.svg",
+                    ShowSyncSummary = false,
+                    CoinType = NetworkType == NetworkType.Mainnet? 60 : 1,
+                    ChainId = NetworkType == NetworkType.Mainnet ? 1 : 3,
+                    SmartContractAddress = "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+                    Divisibility = 6
+                });
+            }
+            
+        }
+    }
+}
+#endif

BTCPayServer.Common/Altcoins/Ethereum/EthereumBTCPayNetwork.cs

@@ -0,0 +1,20 @@
+#if ALTCOINS
+namespace BTCPayServer
+{
+    public class EthereumBTCPayNetwork : BTCPayNetworkBase
+    {
+        public int ChainId { get; set; }
+        public int CoinType { get; set; }
+
+        public string GetDefaultKeyPath()
+        {
+            return $"m/44'/{CoinType}'/0'/0/x";
+        }
+    }
+
+    public class ERC20BTCPayNetwork : EthereumBTCPayNetwork
+    {
+        public string SmartContractAddress { get; set; }
+    }
+}
+#endif

BTCPayServer.Common/Altcoins/Ethereum/EthereumExtensions.cs

@@ -0,0 +1,20 @@
+#if ALTCOINS
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BTCPayServer
+{
+    public static class EthereumExtensions
+    {
+        
+        public static IEnumerable<string> GetAllEthereumSubChains(this BTCPayNetworkProvider networkProvider, BTCPayNetworkProvider unfiltered)
+        {
+            var ethBased = networkProvider.GetAll().OfType<EthereumBTCPayNetwork>();
+            var chainId = ethBased.Select(network => network.ChainId).Distinct();
+            return unfiltered.GetAll().OfType<EthereumBTCPayNetwork>()
+                .Where(network => chainId.Contains(network.ChainId))
+                .Select(network => network.CryptoCode.ToUpperInvariant());
+        }
+    }
+}
+#endif

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

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+#if ALTCOINS
 using NBitcoin;
 using NBitcoin.Altcoins;
 using NBitcoin.Altcoins.Elements;
@@ -16,7 +13,7 @@ namespace BTCPayServer
             var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("LBTC");
             Add(new ElementsBTCPayNetwork()
             {
-                AssetId = NetworkType == NetworkType.Mainnet ? ElementsParams<Liquid>.PeggedAssetId: ElementsParams<Liquid.LiquidRegtest>.PeggedAssetId,
+                AssetId = NetworkType == NetworkType.Mainnet ? ElementsParams<Liquid>.PeggedAssetId : ElementsParams<Liquid.LiquidRegtest>.PeggedAssetId,
                 CryptoCode = "LBTC",
                 NetworkCryptoCode = "LBTC",
                 DisplayName = "Liquid Bitcoin",
@@ -38,3 +35,4 @@ namespace BTCPayServer
 
 
 }
+#endif

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

@@ -1,4 +1,5 @@
-using NBitcoin;
+#if ALTCOINS
+using NBitcoin;
 
 namespace BTCPayServer
 {
@@ -29,7 +30,7 @@ namespace BTCPayServer
                 SupportRBF = true,
                 SupportLightning = false
             });
-            
+
             Add(new ElementsBTCPayNetwork()
             {
                 CryptoCode = "ETB",
@@ -37,7 +38,7 @@ namespace BTCPayServer
                 ShowSyncSummary = false,
                 DefaultRateRules = new[]
                 {
-                    
+
                     "ETB_X = ETB_BTC * BTC_X",
                     "ETB_BTC = bitpay(ETB_BTC)"
                 },
@@ -53,14 +54,14 @@ namespace BTCPayServer
                 SupportRBF = true,
                 SupportLightning = false
             });
-            
-              Add(new ElementsBTCPayNetwork()
+
+            Add(new ElementsBTCPayNetwork()
             {
                 CryptoCode = "LCAD",
                 NetworkCryptoCode = "LBTC",
                 ShowSyncSummary = false,
                 DefaultRateRules = new[]
-                {
+              {
                     "LCAD_CAD = 1",
                     "LCAD_X = CAD_BTC * BTC_X",
                     "LCAD_BTC = bylls(CAD_BTC)",
@@ -81,3 +82,4 @@ namespace BTCPayServer
 
 
 }
+#endif

BTCPayServer.Common/Altcoins/Liquid/ElementsLikeBtcPayNetwork.cs

@@ -1,3 +1,4 @@
+#if ALTCOINS
 using System.Collections.Generic;
 using System.Linq;
 using NBitcoin;
@@ -58,3 +59,4 @@ namespace BTCPayServer
         }
     }
 }
+#endif

BTCPayServer.Common/Altcoins/Liquid/LiquidExtensions.cs

@@ -0,0 +1,18 @@
+#if ALTCOINS
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BTCPayServer
+{
+    public static class LiquidExtensions
+    {
+        public static IEnumerable<string> GetAllElementsSubChains(this BTCPayNetworkProvider networkProvider, BTCPayNetworkProvider unfiltered)
+        {
+            var elementsBased = networkProvider.GetAll().OfType<ElementsBTCPayNetwork>();
+            var parentChains = elementsBased.Select(network => network.NetworkCryptoCode.ToUpperInvariant()).Distinct();
+            return unfiltered.GetAll().OfType<ElementsBTCPayNetwork>()
+                .Where(network => parentChains.Contains(network.NetworkCryptoCode)).Select(network => network.CryptoCode.ToUpperInvariant());
+        }
+    }
+}
+#endif

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

@@ -20,7 +20,8 @@ namespace BTCPayServer
                     "XMR_X = XMR_BTC * BTC_X",
                     "XMR_BTC = kraken(XMR_BTC)"
                 },
-                CryptoImagePath = "/imlegacy/monero.svg"
+                CryptoImagePath = "/imlegacy/monero.svg",
+                UriScheme = "monero"
             });
         }
     }

BTCPayServer.Common/Altcoins/Monero/MoneroLikeSpecificBtcPayNetwork.cs

@@ -3,5 +3,6 @@ namespace BTCPayServer
     public class MoneroLikeSpecificBtcPayNetwork : BTCPayNetworkBase
     {
         public int MaxTrackedConfirmation = 10;
+        public string UriScheme { get; set; }
     }
 }

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

@@ -46,7 +46,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.RPC
                 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;
@@ -68,7 +68,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.RPC
                     Error = response.Error
                 };
             }
-            
+
             return response.Result;
         }
 
@@ -92,7 +92,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.RPC
         }
         internal class JsonRpcResult<T>
         {
-            
+
 
             [JsonProperty("result")] public T Result { get; set; }
             [JsonProperty("error")] public JsonRpcResultError Error { get; set; }

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

@@ -10,7 +10,8 @@ namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 
         public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer)
         {
-            if (reader.TokenType == JsonToken.Null) return null;
+            if (reader.TokenType == JsonToken.Null)
+                return null;
             var value = serializer.Deserialize<string>(reader);
             long l;
             if (Int64.TryParse(value, out l))

BTCPayServer.Common/BTCPayNetwork.cs

@@ -1,12 +1,10 @@
-using System;
-using System.Collections;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using NBitcoin;
 using NBXplorer;
 using NBXplorer.Models;
-using Newtonsoft.Json;
 
 namespace BTCPayServer
 {
@@ -33,7 +31,7 @@ namespace BTCPayServer
             }
         }
 
-        static Dictionary<NetworkType, BTCPayDefaultSettings> _Settings;
+        static readonly Dictionary<NetworkType, BTCPayDefaultSettings> _Settings;
 
         public static BTCPayDefaultSettings GetDefaultSettings(NetworkType chainType)
         {
@@ -45,20 +43,20 @@ namespace BTCPayServer
         public int DefaultPort { get; set; }
     }
 
-    public class BTCPayNetwork:BTCPayNetworkBase
+    public class BTCPayNetwork : BTCPayNetworkBase
     {
-        public Network NBitcoinNetwork { get { return  NBXplorerNetwork?.NBitcoinNetwork; } }
+        public Network NBitcoinNetwork { get { return NBXplorerNetwork?.NBitcoinNetwork; } }
         public NBXplorer.NBXplorerNetwork NBXplorerNetwork { get; set; }
         public bool SupportRBF { get; internal set; }
         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 virtual bool WalletSupported { get; set; } = true;
-        public virtual bool ReadonlyWallet{ get; set; } = false;
-        
+        public virtual bool ReadonlyWallet { get; set; } = false;
+
         public int MaxTrackedConfirmation { get; internal set; } = 6;
         public string UriScheme { get; internal set; }
         public bool SupportPayJoin { get; set; } = false;

BTCPayServer.Common/BTCPayNetworkProvider.Bitcoin.cs

@@ -1,7 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/BTCPayNetworkProvider.cs

@@ -1,8 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 
@@ -10,7 +8,7 @@ namespace BTCPayServer
 {
     public partial class BTCPayNetworkProvider
     {
-        Dictionary<string, BTCPayNetworkBase> _Networks = new Dictionary<string, BTCPayNetworkBase>();
+        readonly Dictionary<string, BTCPayNetworkBase> _Networks = new Dictionary<string, BTCPayNetworkBase>();
 
 
         private readonly NBXplorerNetworkProvider _NBXplorerNetworkProvider;
@@ -24,29 +22,27 @@ namespace BTCPayServer
 
         BTCPayNetworkProvider(BTCPayNetworkProvider unfiltered, string[] cryptoCodes)
         {
-            UnfilteredNetworks = unfiltered.UnfilteredNetworks ?? unfiltered;
             NetworkType = unfiltered.NetworkType;
             _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(unfiltered.NetworkType);
             _Networks = new Dictionary<string, BTCPayNetworkBase>();
             cryptoCodes = cryptoCodes.Select(c => c.ToUpperInvariant()).ToArray();
             foreach (var network in unfiltered._Networks)
             {
-                if(cryptoCodes.Contains(network.Key))
+                if (cryptoCodes.Contains(network.Key))
                 {
                     _Networks.Add(network.Key, network.Value);
                 }
             }
         }
 
-        public BTCPayNetworkProvider UnfilteredNetworks { get; }
 
         public NetworkType NetworkType { get; private set; }
         public BTCPayNetworkProvider(NetworkType networkType)
         {
-            UnfilteredNetworks = this;
             _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(networkType);
             NetworkType = networkType;
             InitBitcoin();
+#if ALTCOINS
             InitLiquid();
             InitLiquidAssets();
             InitLitecoin();
@@ -61,11 +57,15 @@ namespace BTCPayServer
             InitMonero();
             InitPolis();
             InitChaincoin();
+            // InitArgoneum();//their rate source is down 9/15/20.
+            InitMonetaryUnit();
+            InitEthereum();
+            InitERC20();
 
             // Assume that electrum mappings are same as BTC if not specified
             foreach (var network in _Networks.Values.OfType<BTCPayNetwork>())
             {
-                if(network.ElectrumMapping.Count == 0)
+                if (network.ElectrumMapping.Count == 0)
                 {
                     network.ElectrumMapping = GetNetwork<BTCPayNetwork>("BTC").ElectrumMapping;
                     if (!network.NBitcoinNetwork.Consensus.SupportSegwit)
@@ -81,6 +81,7 @@ namespace BTCPayServer
             // Disabled because of https://twitter.com/Cryptopia_NZ/status/1085084168852291586
             //InitBitcoinplus();
             //InitUfo();
+#endif
         }
 
         /// <summary>
@@ -120,11 +121,11 @@ namespace BTCPayServer
         {
             return GetNetwork<BTCPayNetworkBase>(cryptoCode.ToUpperInvariant());
         }
-        public T GetNetwork<T>(string cryptoCode) where T: BTCPayNetworkBase
+        public T GetNetwork<T>(string cryptoCode) where T : BTCPayNetworkBase
         {
             if (cryptoCode == null)
                 throw new ArgumentNullException(nameof(cryptoCode));
-            if(!_Networks.TryGetValue(cryptoCode.ToUpperInvariant(), out BTCPayNetworkBase network))
+            if (!_Networks.TryGetValue(cryptoCode.ToUpperInvariant(), out BTCPayNetworkBase network))
             {
                 if (cryptoCode == "XBT")
                     return GetNetwork<T>("BTC");
@@ -132,4 +133,4 @@ namespace BTCPayServer
             return network as T;
         }
     }
-}
+}

BTCPayServer.Common/BTCPayServer.Common.csproj

@@ -1,9 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../Build/Version.csproj" Condition="Exists('../Build/Version.csproj')" />
   <Import Project="../Build/Common.csproj" />
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="NBXplorer.Client" Version="3.0.16" />
+    <PackageReference Include="NBXplorer.Client" Version="3.0.18" />
   </ItemGroup>
-</Project>
+  <ItemGroup Condition="'$(Altcoins)' != 'true'">
+    <Compile Remove="Altcoins\**\*.cs"></Compile>
+  </ItemGroup>
+</Project>

BTCPayServer.Common/CustomThreadPool.cs

@@ -1,6 +1,5 @@
-using System;
+using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -9,12 +8,12 @@ namespace BTCPayServer
 {
     public class CustomThreadPool : IDisposable
     {
-        CancellationTokenSource _Cancel = new CancellationTokenSource();
-        TaskCompletionSource<bool> _Exited;
+        readonly CancellationTokenSource _Cancel = new CancellationTokenSource();
+        readonly TaskCompletionSource<bool> _Exited;
         int _ExitedCount = 0;
-        Thread[] _Threads;
+        readonly Thread[] _Threads;
         Exception _UnhandledException;
-        BlockingCollection<(Action, TaskCompletionSource<object>)> _Actions = new BlockingCollection<(Action, TaskCompletionSource<object>)>(new ConcurrentQueue<(Action, TaskCompletionSource<object>)>());
+        readonly BlockingCollection<(Action, TaskCompletionSource<object>)> _Actions = new BlockingCollection<(Action, TaskCompletionSource<object>)>(new ConcurrentQueue<(Action, TaskCompletionSource<object>)>());
 
         public CustomThreadPool(int threadCount, string threadName)
         {

BTCPayServer.Common/Extensions.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace BTCPayServer
 {

BTCPayServer.Common/Logging/ConsoleLogger.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -13,7 +13,7 @@ namespace BTCPayServer.Logging
 {
     public class CustomConsoleLogProvider : ILoggerProvider
     {
-        ConsoleLoggerProcessor _Processor;
+        readonly ConsoleLoggerProcessor _Processor;
         public CustomConsoleLogProvider(ConsoleLoggerProcessor processor)
         {
             _Processor = processor;

BTCPayServer.Common/Logging/Logs.cs

@@ -1,9 +1,6 @@
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 
 namespace BTCPayServer.Logging
 {
@@ -43,7 +40,7 @@ namespace BTCPayServer.Logging
 
     public class FuncLoggerFactory : ILoggerFactory
     {
-        private Func<string, ILogger> createLogger;
+        private readonly Func<string, ILogger> createLogger;
         public FuncLoggerFactory(Func<string, ILogger> createLogger)
         {
             this.createLogger = createLogger;

BTCPayServer.Common/Shims.cs

@@ -4,9 +4,6 @@
 using System;
 using System.IO;
 using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-using Newtonsoft.Json;
 
 
 namespace Microsoft.Extensions.Logging.Console.Internal
@@ -128,7 +125,7 @@ namespace Microsoft.Extensions.Logging.Console.Internal
         }
     }
 
-	internal class AnsiSystemConsole : IAnsiSystemConsole
+    internal class AnsiSystemConsole : IAnsiSystemConsole
     {
         private readonly TextWriter _textWriter;
 
@@ -151,13 +148,13 @@ namespace Microsoft.Extensions.Logging.Console
     {
         void Write(string message);
     }
-	public interface IConsole
+    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
+    internal class WindowsLogConsole : IConsole
     {
         private readonly TextWriter _textWriter;
 

BTCPayServer.Common/SynchronizationContextRemover.cs

@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace BTCPayServer
 {

BTCPayServer.Common/ZipUtils.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Text;

BTCPayServer.Data/BTCPayServer.Data.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../Build/Version.csproj" Condition="Exists('../Build/Version.csproj')" />
   <Import Project="../Build/Common.csproj" />
   <ItemGroup>

BTCPayServer.Data/Data/APIKeyData.cs

@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data
 {
@@ -22,17 +17,35 @@ namespace BTCPayServer.Data
         [MaxLength(50)] public string UserId { get; set; }
 
         public APIKeyType Type { get; set; } = APIKeyType.Legacy;
-        
+
         public byte[] Blob { get; set; }
         public StoreData StoreData { get; set; }
         public ApplicationUser User { get; set; }
         public string Label { get; set; }
+
+        internal static void OnModelCreating(ModelBuilder builder)
+        {
+            builder.Entity<APIKeyData>()
+                   .HasOne(o => o.StoreData)
+                   .WithMany(i => i.APIKeys)
+                   .HasForeignKey(i => i.StoreId).OnDelete(DeleteBehavior.Cascade);
+
+            builder.Entity<APIKeyData>()
+                .HasOne(o => o.User)
+                .WithMany(i => i.APIKeys)
+                .HasForeignKey(i => i.UserId).OnDelete(DeleteBehavior.Cascade);
+
+            builder.Entity<APIKeyData>()
+                .HasIndex(o => o.StoreId);
+        }
     }
 
     public class APIKeyBlob
     {
         public string[] Permissions { get; set; }
-        
+        public string ApplicationIdentifier { get; set; }
+        public string ApplicationAuthority { get; set; }
+
     }
 
     public enum APIKeyType

BTCPayServer.Data/Data/AddressInvoiceData.cs

@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System;
+using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data
 {
@@ -32,5 +30,15 @@ namespace BTCPayServer.Data
             get; set;
         }
 
+        internal static void OnModelCreating(ModelBuilder builder)
+        {
+            builder.Entity<AddressInvoiceData>()
+                   .HasOne(o => o.InvoiceData)
+                   .WithMany(i => i.AddressInvoices).OnDelete(DeleteBehavior.Cascade);
+            builder.Entity<AddressInvoiceData>()
+#pragma warning disable CS0618
+                .HasKey(o => o.Address);
+#pragma warning restore CS0618
+        }
     }
 }

BTCPayServer.Data/Data/AppData.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 
 namespace BTCPayServer.Data
@@ -37,5 +35,14 @@ namespace BTCPayServer.Data
         {
             Settings = value == null ? null : JsonConvert.SerializeObject(value);
         }
+
+        internal static void OnModelCreating(ModelBuilder builder)
+        {
+            builder.Entity<AppData>()
+                       .HasOne(o => o.StoreData)
+                       .WithMany(i => i.Apps).OnDelete(DeleteBehavior.Cascade);
+            builder.Entity<AppData>()
+                    .HasOne(a => a.StoreData);
+        }
     }
 }

BTCPayServer.Data/Data/ApplicationDbContext.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
@@ -74,135 +74,19 @@ namespace BTCPayServer.Data
         {
             base.OnModelCreating(builder);
             NotificationData.OnModelCreating(builder);
-
-
-            builder.Entity<InvoiceData>()
-                .HasOne(o => o.StoreData)
-                .WithMany(a => a.Invoices).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<InvoiceData>().HasIndex(o => o.StoreDataId);
-
-
-            builder.Entity<PaymentData>()
-                   .HasOne(o => o.InvoiceData)
-                   .WithMany(i => i.Payments).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<PaymentData>()
-                   .HasIndex(o => o.InvoiceDataId);
-
-            builder.Entity<UserStore>()
-                   .HasOne(o => o.StoreData)
-                   .WithMany(i => i.UserStores).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<UserStore>()
-                   .HasKey(t => new
-                   {
-                       t.ApplicationUserId,
-                       t.StoreDataId
-                   });
-
-            builder.Entity<APIKeyData>()
-                   .HasOne(o => o.StoreData)
-                   .WithMany(i => i.APIKeys)
-                   .HasForeignKey(i => i.StoreId).OnDelete(DeleteBehavior.Cascade);
-
-            builder.Entity<APIKeyData>()
-                .HasOne(o => o.User)
-                .WithMany(i => i.APIKeys)
-                .HasForeignKey(i => i.UserId).OnDelete(DeleteBehavior.Cascade);
-
-            builder.Entity<APIKeyData>()
-                .HasIndex(o => o.StoreId);
-
-            builder.Entity<AppData>()
-                   .HasOne(o => o.StoreData)
-                   .WithMany(i => i.Apps).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<AppData>()
-                    .HasOne(a => a.StoreData);
-
-            builder.Entity<UserStore>()
-                 .HasOne(pt => pt.ApplicationUser)
-                 .WithMany(p => p.UserStores)
-                 .HasForeignKey(pt => pt.ApplicationUserId);
-
-            builder.Entity<UserStore>()
-                .HasOne(pt => pt.StoreData)
-                .WithMany(t => t.UserStores)
-                .HasForeignKey(pt => pt.StoreDataId);
-
-
-            builder.Entity<AddressInvoiceData>()
-                   .HasOne(o => o.InvoiceData)
-                   .WithMany(i => i.AddressInvoices).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<AddressInvoiceData>()
-#pragma warning disable CS0618
-                .HasKey(o => o.Address);
-#pragma warning restore CS0618
-
-            builder.Entity<PairingCodeData>()
-                .HasKey(o => o.Id);
-
-            builder.Entity<PendingInvoiceData>()
-                .HasOne(o => o.InvoiceData)
-                .WithMany(o => o.PendingInvoices)
-                .HasForeignKey(o => o.Id).OnDelete(DeleteBehavior.Cascade);
-
-
-            builder.Entity<PairedSINData>()
-                   .HasOne(o => o.StoreData)
-                   .WithMany(i => i.PairedSINs).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<PairedSINData>(b =>
-            {
-                b.HasIndex(o => o.SIN);
-                b.HasIndex(o => o.StoreDataId);
-            });
-
-            builder.Entity<HistoricalAddressInvoiceData>()
-                   .HasOne(o => o.InvoiceData)
-                   .WithMany(i => i.HistoricalAddressInvoices).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<HistoricalAddressInvoiceData>()
-                .HasKey(o => new
-                {
-                    o.InvoiceDataId,
-#pragma warning disable CS0618
-                    o.Address
-#pragma warning restore CS0618
-                });
-
-
-            builder.Entity<InvoiceEventData>()
-                   .HasOne(o => o.InvoiceData)
-                   .WithMany(i => i.Events).OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<InvoiceEventData>()
-                .HasKey(o => new
-                {
-                    o.InvoiceDataId,
-#pragma warning disable CS0618
-                    o.UniqueId
-#pragma warning restore CS0618
-                });
-
-
-            builder.Entity<PaymentRequestData>()
-                .HasOne(o => o.StoreData)
-                .WithMany(i => i.PaymentRequests)
-                .OnDelete(DeleteBehavior.Cascade);
-            builder.Entity<PaymentRequestData>()
-                .Property(e => e.Created)
-                .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);
-
+            InvoiceData.OnModelCreating(builder);
+            PaymentData.OnModelCreating(builder);
+            Data.UserStore.OnModelCreating(builder);
+            APIKeyData.OnModelCreating(builder);
+            AppData.OnModelCreating(builder);
+            AddressInvoiceData.OnModelCreating(builder);
+            PairingCodeData.OnModelCreating(builder);
+            PendingInvoiceData.OnModelCreating(builder);
+            Data.PairedSINData.OnModelCreating(builder);
+            HistoricalAddressInvoiceData.OnModelCreating(builder);
+            InvoiceEventData.OnModelCreating(builder);
+            PaymentRequestData.OnModelCreating(builder);
+            WalletTransactionData.OnModelCreating(builder);
             PullPaymentData.OnModelCreating(builder);
             PayoutData.OnModelCreating(builder);
             RefundData.OnModelCreating(builder);