Merge remote-tracking branch 'upstream/master'

.circleci/config.yml

@@ -2,31 +2,31 @@ version: 2
 jobs:
   fast_tests:
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:2024.11.1
     steps:
       - checkout
       - run:
           command: |
             cd .circleci && ./run-tests.sh "Fast=Fast|ThirdParty=ThirdParty" && ./can-build.sh
   selenium_tests:
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:2024.11.1
     steps:
       - checkout
       - run:
           command: |
             cd .circleci && ./run-tests.sh "Selenium=Selenium"
   integration_tests:
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:2024.11.1
     steps:
       - checkout
       - run:
           command: |
             cd .circleci && ./run-tests.sh "Integration=Integration"
   trigger_docs_build:
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:2024.11.1
     steps:
       - run:
           command: |

.circleci/run-tests.sh

@@ -2,8 +2,8 @@
 set -e
 
 cd ../BTCPayServer.Tests
-docker-compose -v
-docker-compose -f "docker-compose.altcoins.yml" down --v
+docker-compose --version
+docker-compose -f "docker-compose.altcoins.yml" down -v
 
 # For some reason, docker-compose pull fails time to time, so we try several times
 n=0

BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj

@@ -32,8 +32,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="HtmlSanitizer" Version="8.0.838" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BTCPayServer.Client\BTCPayServer.Client.csproj" />

BTCPayServer.Client/App/IBTCPayAppHubClient.cs

@@ -0,0 +1,139 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using BTCPayServer.Client.Models;
+using BTCPayServer.Lightning;
+using NBitcoin;
+
+namespace BTCPayServer.Client.App;
+
+//methods available on the hub in the client
+public interface IBTCPayAppHubClient
+{
+    Task NotifyServerEvent(ServerEvent ev);
+    Task NotifyNetwork(string network);
+    Task NotifyServerNode(string nodeInfo);
+    Task TransactionDetected(TransactionDetectedRequest request);
+    Task NewBlock(string block);
+    Task StartListen(string key);
+
+    Task<LightningInvoice> CreateInvoice(string key, CreateLightningInvoiceRequest createLightningInvoiceRequest);
+    Task<LightningInvoice?> GetLightningInvoice(string key, uint256 paymentHash);
+    Task<LightningPayment?> GetLightningPayment(string key, uint256 paymentHash);
+    Task CancelInvoice(string key, uint256 paymentHash);
+    Task<List<LightningPayment>> GetLightningPayments(string key, ListPaymentsParams request);
+    Task<List<LightningInvoice>> GetLightningInvoices(string key, ListInvoicesParams request);
+    Task<PayResponse> PayInvoice(string key, string bolt11, long? amountMilliSatoshi);
+    Task MasterUpdated(long? deviceIdentifier);
+    Task<LightningNodeInformation> GetLightningNodeInfo(string key);
+    Task<LightningNodeBalance> GetLightningBalance(string key);
+}
+
+//methods available on the hub in the server
+public interface IBTCPayAppHubServer
+{
+    Task<bool> DeviceMasterSignal(long deviceIdentifier, bool active);
+
+    Task<Dictionary<string,string>> Pair(PairRequest request);
+    Task<AppHandshakeResponse> Handshake(AppHandshake request);
+    Task<bool> BroadcastTransaction(string tx);
+    Task<decimal> GetFeeRate(int blockTarget);
+    Task<BestBlockResponse> GetBestBlock();
+    Task<TxInfoResponse> FetchTxsAndTheirBlockHeads(string identifier, string[] txIds, string[] outpoints);
+    Task<string> DeriveScript(string identifier);
+    Task TrackScripts(string identifier, string[] scripts);
+    Task<string> UpdatePsbt(string[] identifiers, string psbt);
+    Task<CoinResponse[]> GetUTXOs(string[] identifiers);
+    Task<Dictionary<string, TxResp[]>> GetTransactions(string[] identifiers);
+    Task SendInvoiceUpdate(LightningInvoice lightningInvoice);
+    Task<long?> GetCurrentMaster();
+}
+
+public class ServerEvent
+{
+    public string? Type { get; set; }
+    public string? StoreId { get; set; }
+    public string? UserId { get; set; }
+    public string? AppId { get; set; }
+    public string? InvoiceId { get; set; }
+    public string? Detail { get; set; }
+}
+
+public record TxResp
+{
+    public TxResp(long confirmations, long? height, decimal balanceChange, DateTimeOffset timestamp, string transactionId)
+    {
+        Confirmations = confirmations;
+        Height = height;
+        BalanceChange = balanceChange;
+        Timestamp = timestamp;
+        TransactionId = transactionId;
+    }
+
+    public long Confirmations { get; set; }
+    public long? Height { get; set; }
+    public decimal BalanceChange { get; set; }
+    public DateTimeOffset Timestamp { get; set; }
+    public string TransactionId { get; set; }
+
+    public override string ToString()
+    {
+        return $"{{ Confirmations = {Confirmations}, Height = {Height}, BalanceChange = {BalanceChange}, Timestamp = {Timestamp}, TransactionId = {TransactionId} }}";
+    }
+}
+
+public class TransactionDetectedRequest
+{
+    public string? Identifier { get; set; }
+    public string? TxId { get; set; }
+    public string[]? SpentScripts { get; set; }
+    public string[]? ReceivedScripts { get; set; }
+    public bool Confirmed { get; set; }
+}
+
+public class CoinResponse
+{
+    public string? Identifier{ get; set; }
+    public bool Confirmed { get; set; }
+    public string? Script { get; set; }
+    public string? Outpoint { get; set; }
+    public decimal Value { get; set; }
+    public string? Path { get; set; }
+}
+
+public class TxInfoResponse
+{
+    public Dictionary<string,TransactionResponse>? Txs { get; set; }
+    public Dictionary<string,string>? BlockHeaders { get; set; }
+    public Dictionary<string,int>? BlockHeghts { get; set; }
+}
+
+public class TransactionResponse
+{
+    public string? BlockHash { get; set; }
+    public string? Transaction { get; set; }
+}
+
+public class BestBlockResponse
+{
+    public string? BlockHash { get; set; }
+    public int BlockHeight { get; set; }
+    public string? BlockHeader { get; set; }
+}
+
+public class AppHandshake
+{
+    public string[]? Identifiers { get; set; }
+}
+
+public class AppHandshakeResponse
+{
+    //response about identifiers being tracked successfully
+    public string[]? IdentifiersAcknowledged { get; set; }
+}
+
+public class PairRequest
+{
+    public Dictionary<string, string?> Derivations { get; set; } = new();
+}

BTCPayServer.Client/App/Models/AcceptInviteRequest.cs

@@ -0,0 +1,8 @@
+#nullable enable
+namespace BTCPayServer.Client.App.Models;
+
+public class AcceptInviteRequest
+{
+    public string? UserId { get; set; }
+    public string? Code { get; set; }
+}

BTCPayServer.Client/App/Models/AcceptInviteResult.cs

@@ -0,0 +1,10 @@
+#nullable enable
+namespace BTCPayServer.Client.App.Models;
+
+public class AcceptInviteResult
+{
+    public string? Email { get; set; }
+    public bool? RequiresUserApproval { get; set; }
+    public bool? EmailHasBeenConfirmed { get; set; }
+    public string? PasswordSetCode { get; set; }
+}

BTCPayServer.Client/App/Models/AccessTokenResult.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace BTCPayServer.Client.App.Models;
+
+public class AccessTokenResult
+{
+    public string AccessToken { get; set; }
+    public string RefreshToken { get; set; }
+    public DateTimeOffset Expiry { get; set; }
+}

BTCPayServer.Client/App/Models/AppInstanceInfo.cs

@@ -0,0 +1,13 @@
+#nullable enable
+namespace BTCPayServer.Client.App.Models;
+
+public class AppInstanceInfo
+{
+    public string BaseUrl { get; set; } = null!;
+    public string ServerName { get; set; } = null!;
+    public string? ContactUrl { get; set; }
+    public string? LogoUrl { get; set; }
+    public string? CustomThemeCssUrl { get; set; }
+    public string? CustomThemeExtension { get; set; }
+    public bool RegistrationEnabled { get; set; }
+}

BTCPayServer.Client/App/Models/AppUserInfo.cs

@@ -0,0 +1,44 @@
+#nullable enable
+using System.Collections.Generic;
+
+namespace BTCPayServer.Client.App.Models;
+
+public class AppUserInfo
+{
+    public string? UserId { get; set; }
+    public string? Email { get; set; }
+    public string? Name { get; set; }
+    public string? ImageUrl { get; set; }
+    public IEnumerable<string>? Roles { get; set; }
+    public IEnumerable<AppUserStoreInfo>? Stores { get; set; }
+
+    public void SetInfo(string email, string? name, string? imageUrl)
+    {
+        Email = email;
+        Name = name;
+        ImageUrl = imageUrl;
+    }
+
+    public static bool Equals(AppUserInfo? x, AppUserInfo? y)
+    {
+        if (ReferenceEquals(x, y)) return true;
+        if (ReferenceEquals(x, null)) return false;
+        if (ReferenceEquals(y, null)) return false;
+        if (x.GetType() != y.GetType()) return false;
+        return x.UserId == y.UserId && x.Email == y.Email &&
+               x.Name == y.Name && x.ImageUrl == y.ImageUrl &&
+               Equals(x.Roles, y.Roles) && Equals(x.Stores, y.Stores);
+    }
+}
+
+public class AppUserStoreInfo
+{
+    public string Id { get; set; } = null!;
+    public string? Name { get; set; }
+    public string? LogoUrl { get; set; }
+    public string? RoleId { get; set; }
+    public string? PosAppId { get; set; }
+    public string? DefaultCurrency { get; set; }
+    public bool Archived { get; set; }
+    public IEnumerable<string>? Permissions { get; set; }
+}

BTCPayServer.Client/App/Models/CreateStoreData.cs

@@ -0,0 +1,11 @@
+#nullable enable
+using System.Collections.Generic;
+
+namespace BTCPayServer.Client.App.Models;
+
+public class CreateStoreData
+{
+    public string? DefaultCurrency { get; set; }
+    public string? RecommendedExchangeId { get; set; }
+    public Dictionary<string, string>? Exchanges { get; set; }
+}

BTCPayServer.Client/BTCPayServer.Client.csproj

@@ -30,8 +30,8 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.5.1" />
-      <PackageReference Include="NBitcoin" Version="7.0.45" />
+      <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.5.2" />
+      <PackageReference Include="NBitcoin" Version="7.0.46" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
   <ItemGroup>

BTCPayServer.Client/BTCPayServerClient.StoreUsers.cs

@@ -29,4 +29,10 @@ public virtual async Task AddStoreUser(string storeId, StoreUserData request, Ca
         if (request == null) throw new ArgumentNullException(nameof(request));
         await SendHttpRequest<StoreUserData>($"api/v1/stores/{storeId}/users", request, HttpMethod.Post, token);
     }
+
+    public virtual async Task UpdateStoreUser(string storeId, string userId, StoreUserData request, CancellationToken token = default)
+    {
+        if (request == null) throw new ArgumentNullException(nameof(request));
+        await SendHttpRequest<StoreUserData>($"api/v1/stores/{storeId}/users/{userId}", request, HttpMethod.Put, token);
+    }
 }

BTCPayServer.Client/Models/AppCartItem.cs

@@ -0,0 +1,13 @@
+using BTCPayServer.JsonConverters;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Client.Models;
+
+public class AppCartItem
+{
+    public string Id { get; set; }
+    public string Title { get; set; }
+    public int Count { get; set; }
+    [JsonConverter(typeof(NumericStringJsonConverter))]
+    public decimal Price { get; set; }
+}

BTCPayServer.Client/Models/CreatePosInvoiceRequest.cs

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using BTCPayServer.JsonConverters;
+using Newtonsoft.Json;
+
+namespace BTCPayServer.Client.Models;
+
+public class CreatePosInvoiceRequest
+{
+    public string AppId { get; set; }
+    public List<AppCartItem> Cart { get; set; }
+    [JsonProperty(ItemConverterType = typeof(NumericStringJsonConverter))]
+    public List<decimal> Amounts { get; set; }
+    public int? DiscountPercent { get; set; }
+    public int? TipPercent { get; set; }
+    [JsonConverter(typeof(NumericStringJsonConverter))]
+    public decimal? DiscountAmount { get; set; }
+    [JsonConverter(typeof(NumericStringJsonConverter))]
+    public decimal? Tip { get; set; }
+    [JsonConverter(typeof(NumericStringJsonConverter))]
+    public decimal? Subtotal { get; set; }
+    [JsonConverter(typeof(NumericStringJsonConverter))]
+    public decimal? Total { get; set; }
+    public string PosData { get; set; }
+}
+

BTCPayServer.Client/Models/PermissionMetadata.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace BTCPayServer.Client.Models
@@ -11,17 +10,17 @@ public class PermissionMetadata
         static PermissionMetadata()
         {
             Dictionary<string, PermissionMetadata> nodes = new Dictionary<string, PermissionMetadata>();
-            foreach (var policy in Client.Policies.AllPolicies)
+            foreach (var policy in Policies.AllPolicies)
             {
                 nodes.Add(policy, new PermissionMetadata() { PermissionName = policy });
             }
             foreach (var n in nodes)
             {
-                foreach (var policy in Client.Policies.AllPolicies)
+                foreach (var policy in Policies.AllPolicies)
                 {
                     if (policy.Equals(n.Key, StringComparison.OrdinalIgnoreCase))
                         continue;
-                    if (Client.Permission.Create(n.Key).Contains(Client.Permission.Create(policy)))
+                    if (Permission.Create(n.Key).Contains(Permission.Create(policy)))
                         n.Value.SubPermissions.Add(policy);
                 }
             }