prep for 1.10.2

Fix stale invoice api for settle invoice
fixes #5049
2023-06-07 18:02:51 +02:00 · 2023-06-07 17:57:03 +02:00 · 2023-06-07 10:20:39 +02:00 · 2023-06-05 12:35:06 +02:00 · 2023-06-05 12:34:54 +02:00 · 2023-06-02 18:21:57 +09:00
23 changed files with 80 additions and 47 deletions
--- a/BTCPayServer.Client/BTCPayServer.Client.csproj
+++ b/BTCPayServer.Client/BTCPayServer.Client.csproj
@ -12,6 +12,8 @@
        <PackageLicenseExpression>MIT</PackageLicenseExpression>
        <RepositoryUrl>https://github.com/btcpayserver/btcpayserver</RepositoryUrl>
        <RepositoryType>git</RepositoryType>
+        <Configurations>Debug;Release;Altcoins-Debug;Altcoins-Release</Configurations>
+        <Platforms>AnyCPU</Platforms>
    </PropertyGroup>
  <PropertyGroup>
    <Version Condition=" '$(Version)' == '' ">1.7.2</Version>
--- a/BTCPayServer.Common/BTCPayServer.Common.csproj
+++ b/BTCPayServer.Common/BTCPayServer.Common.csproj
@ -4,7 +4,7 @@

  <ItemGroup>
    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="NBXplorer.Client" Version="4.2.3" />
+    <PackageReference Include="NBXplorer.Client" Version="4.2.5" />
    <PackageReference Include="NicolasDorier.StandardConfiguration" Version="2.0.1" />
  </ItemGroup>
  <ItemGroup Condition="'$(Altcoins)' != 'true'">
--- a/BTCPayServer.Tests/ThirdPartyTests.cs
+++ b/BTCPayServer.Tests/ThirdPartyTests.cs
@ -306,6 +306,8 @@ retry:
            foreach ((CurrencyPair key, Task<RateResult> value) in result)
            {
                var rateResult = value.GetAwaiter().GetResult();
+                if (key.ToString() == "BTG_USD")
+                    continue; // shitcoin not supported by bitfinex anymore
                TestLogs.LogInformation($"Testing {key}");
                if (brokenShitcoins.Contains(key.ToString()))
                    continue;
--- a/BTCPayServer.Tests/docker-compose.altcoins.yml
+++ b/BTCPayServer.Tests/docker-compose.altcoins.yml
@ -73,7 +73,7 @@ services:
        - "sshd_datadir:/root/.ssh"

  devlnd:
-    image: btcpayserver/bitcoin:24.1-1
+    image: btcpayserver/bitcoin:25.0
    environment:
      BITCOIN_NETWORK: regtest
      BITCOIN_WALLETDIR: "/data/wallets"
@ -135,7 +135,7 @@ services:

  bitcoind:
    restart: unless-stopped
-    image: btcpayserver/bitcoin:24.1-1
+    image: btcpayserver/bitcoin:25.0
    environment:
      BITCOIN_NETWORK: regtest
      BITCOIN_WALLETDIR: "/data/wallets"
--- a/BTCPayServer.Tests/docker-compose.yml
+++ b/BTCPayServer.Tests/docker-compose.yml
@ -70,7 +70,7 @@ services:
        - "sshd_datadir:/root/.ssh"

  devlnd:
-    image: btcpayserver/bitcoin:24.1-1
+    image: btcpayserver/bitcoin:25.0
    environment:
      BITCOIN_NETWORK: regtest
      BITCOIN_WALLETDIR: "/data/wallets"
@ -121,7 +121,7 @@ services:

  bitcoind:
    restart: unless-stopped
-    image: btcpayserver/bitcoin:24.1-1
+    image: btcpayserver/bitcoin:25.0
    environment:
      BITCOIN_NETWORK: regtest
      BITCOIN_WALLETDIR: "/data/wallets"
--- a/BTCPayServer/Controllers/UIStoresController.Onchain.cs
+++ b/BTCPayServer/Controllers/UIStoresController.Onchain.cs
@ -1,4 +1,5 @@
 using System;
+using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using System.Text;
@ -250,7 +251,7 @@ namespace BTCPayServer.Controllers
                CryptoCode = cryptoCode,
                Method = method,
                SetupRequest = request,
-                Confirmation = string.IsNullOrEmpty(request.ExistingMnemonic),
+                Confirmation = !isImport,
                Network = network,
                Source = isImport ? "SeedImported" : "NBXplorerGenerated",
                IsHotWallet = isImport ? request.SavePrivateKeys : method == WalletSetupMethod.HotWallet,
@ -311,7 +312,7 @@ namespace BTCPayServer.Controllers

            var result = await UpdateWallet(vm);

-            if (!ModelState.IsValid || !(result is RedirectToActionResult))
+            if (!ModelState.IsValid || result is not RedirectToActionResult)
                return result;

            if (!isImport)
--- a/BTCPayServer/Controllers/UIStoresController.Roles.cs
+++ b/BTCPayServer/Controllers/UIStoresController.Roles.cs
@ -141,7 +141,7 @@ namespace BTCPayServer.Controllers
                        "Delete"));
        }

-        [HttpPost("{storeId}/roles/{roleId}/delete")]
+        [HttpPost("{storeId}/roles/{role}/delete")]
        public async Task<IActionResult> DeleteRolePost(
            string storeId,
            [FromServices] StoreRepository storeRepository,
--- a/BTCPayServer/Hosting/MigrationStartupTask.cs
+++ b/BTCPayServer/Hosting/MigrationStartupTask.cs
@ -651,13 +651,6 @@ WHERE cte.""Id""=p.""Id""
                            settings1.TargetCurrency = app.StoreData.GetStoreBlob().DefaultCurrency;
                            app.SetSettings(settings1);
                        }
-                        items = AppService.Parse(settings1.PerksTemplate);
-                        newTemplate = AppService.SerializeTemplate(items);
-                        if (settings1.PerksTemplate != newTemplate)
-                        {
-                            settings1.PerksTemplate = newTemplate;
-                            app.SetSettings(settings1);
-                        };
                        break;

                    case PointOfSaleAppType.AppType:
@ -668,13 +661,6 @@ WHERE cte.""Id""=p.""Id""
                            settings2.Currency = app.StoreData.GetStoreBlob().DefaultCurrency;
                            app.SetSettings(settings2);
                        }
-                        items = AppService.Parse(settings2.Template);
-                        newTemplate = AppService.SerializeTemplate(items);
-                        if (settings2.Template != newTemplate)
-                        {
-                            settings2.Template = newTemplate;
-                            app.SetSettings(settings2);
-                        };
                        break;
                }
            }
--- a/BTCPayServer/Models/StoreViewModels/WalletSetupRequest.cs
+++ b/BTCPayServer/Models/StoreViewModels/WalletSetupRequest.cs
@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using NBXplorer.Models;

 namespace BTCPayServer.Models.StoreViewModels
--- a/BTCPayServer/Plugins/PayButton/Controllers/UIPayButtonController.cs
+++ b/BTCPayServer/Plugins/PayButton/Controllers/UIPayButtonController.cs
@ -60,6 +60,11 @@ namespace BTCPayServer.Plugins.PayButton.Controllers
            }

            var apps = await _appService.GetAllApps(_userManager.GetUserId(User), false, store.Id);
+            // unset app store data, because we don't need it and inclusion leads to circular references when serializing to JSON
+            foreach (var app in apps)
+            {
+                app.App.StoreData = null;
+            }
            var appUrl = HttpContext.Request.GetAbsoluteRoot().WithTrailingSlash();
            var model = new PayButtonViewModel
            {
--- a/BTCPayServer/Services/Apps/AppService.cs
+++ b/BTCPayServer/Services/Apps/AppService.cs
@ -176,7 +176,7 @@ namespace BTCPayServer.Services.Apps
                            res.Add(new InvoiceStatsItem
                            {
                                ItemCode = item.Id,
-                                FiatPrice = lineItem.Price.Value,
+                                FiatPrice = lineItem.Price,
                                Date = e.InvoiceTime.Date
                            });
                        }
--- a/BTCPayServer/Services/Invoices/InvoiceRepository.cs
+++ b/BTCPayServer/Services/Invoices/InvoiceRepository.cs
@ -521,8 +521,14 @@ namespace BTCPayServer.Services.Invoices

                invoiceData.Status = legacyStatus.ToLowerInvariant();
                invoiceData.ExceptionStatus = InvoiceExceptionStatus.Marked.ToString().ToLowerInvariant();
-                _eventAggregator.Publish(new InvoiceEvent(ToEntity(invoiceData), eventName));
-                await context.SaveChangesAsync();
+                try
+                {
+                    await context.SaveChangesAsync();
+                }
+                finally
+                {
+                    _eventAggregator.Publish(new InvoiceEvent(ToEntity(invoiceData), eventName));
+                }
            }

            return true;
--- a/BTCPayServer/Services/Invoices/PosAppData.cs
+++ b/BTCPayServer/Services/Invoices/PosAppData.cs
@ -34,7 +34,7 @@ public class PosAppCartItem
    public string Id { get; set; }

    [JsonProperty(PropertyName = "price")]
-    public PosAppCartItemPrice Price { get; set; }
+    public decimal Price { get; set; }

    [JsonProperty(PropertyName = "title")]
    public string Title { get; set; }
@ -54,8 +54,6 @@ public class PosAppCartItemPrice
    [JsonProperty(PropertyName = "formatted")]
    public string Formatted { get; set; }

-    [JsonProperty(PropertyName = "value")]
-    public decimal Value { get; set; }

    [JsonProperty(PropertyName = "type")]
    public ViewPointOfSaleViewModel.ItemPriceType Type { get; set; }
--- a/BTCPayServer/Views/Shared/CreateOrEditRole.cshtml
+++ b/BTCPayServer/Views/Shared/CreateOrEditRole.cshtml
@ -41,7 +41,8 @@
 				}
 				else
 				{
-					<input asp-for="Role" required="required" class="form-control" readonly />					
+				    <input type="hidden" asp-for="Role"/>
+					<input  required="required" class="form-control" disabled value="@Model.Role" />					
 				}
 				<span asp-validation-for="Role" class="text-danger"></span>
            </div>
--- a/BTCPayServer/Views/Shared/LayoutHeadTheme.cshtml
+++ b/BTCPayServer/Views/Shared/LayoutHeadTheme.cshtml
@ -5,6 +5,7 @@
@inject ThemeSettings Theme
@inject IFileService FileService

+<script>if (window.localStorage.getItem('btcpay-hide-sensitive-info') === 'true') { document.documentElement.setAttribute('data-hide-sensitive-info', 'true')}</script>
@if (Theme.CustomTheme && !string.IsNullOrEmpty(Theme.CssUri))
 {   // legacy customization with CSS URI - keep it for backwards-compatibility
    <link href="@Context.Request.GetRelativePathOrAbsolute(Theme.CssUri)" rel="stylesheet" asp-append-version="true" />
@ -25,7 +26,6 @@ else
 {
    <link href="~/main/themes/default.css" asp-append-version="true" rel="stylesheet" />
    <link href="~/main/themes/default-dark.css" asp-append-version="true" rel="stylesheet" id="DarkThemeLinkTag" />
-    <script>if (window.localStorage.getItem('btcpay-hide-sensitive-info') === 'true') { document.documentElement.setAttribute('data-hide-sensitive-info', 'true')}</script>
    <script src="~/js/theme-switch.js" asp-append-version="true"></script>
    <noscript><style>.btcpay-theme-switch { display: none !important; }</style></noscript>
 }
--- a/BTCPayServer/Views/Shared/PointOfSale/Public/Cart.cshtml
+++ b/BTCPayServer/Views/Shared/PointOfSale/Public/Cart.cshtml
@ -236,6 +236,10 @@
                @for (var index = 0; index < Model.Items.Length; index++)
                {
                    var item = Model.Items[index];
+                    if (item.PriceType == ViewPointOfSaleViewModel.ItemPriceType.Topup)
+                    {
+                        continue;
+                    }
                    var image = item.Image;
                    var description = item.Description;

--- a/BTCPayServer/Views/UIForms/Modify.cshtml
+++ b/BTCPayServer/Views/UIForms/Modify.cshtml
@ -116,7 +116,7 @@
            </div>
            <button type="button" class="btn btn-link py-0 px-2 mt-2 mb-2 gap-1 add fw-semibold d-inline-flex align-items-center" v-on:click.stop="$emit('add-field', $event, path)">
                <vc:icon symbol="new" />
-                Add Form Element
+                Add Form Field
            </button>
        </div>
    </template>
--- a/BTCPayServer/Views/UIStores/_GenerateWalletForm.cshtml
+++ b/BTCPayServer/Views/UIStores/_GenerateWalletForm.cshtml
@ -140,7 +140,13 @@
            </div>
        </div>
    </div>
-
+    @if (Model.AdditionalOptions is not null)
+    {
+        @foreach (var dictKeys in Model.AdditionalOptions)
+        {
+            <input type="hidden" asp-for="AdditionalOptions[dictKeys.Key]" />
+        }
+    }
    <button type="submit" class="btn btn-primary" id="Continue">@(isImport ? "Continue" : "Create")</button>
 </form>

--- a/BTCPayServer/Views/UIStores/_LayoutWalletSetup.cshtml
+++ b/BTCPayServer/Views/UIStores/_LayoutWalletSetup.cshtml
@ -19,3 +19,5 @@
 }

@RenderBody()
+
+<vc:ui-extension-point location="onchain-wallet-setup-post-body" model="@Model"/>
--- a/BTCPayServer/wwwroot/locales/checkout/el-GR.json
+++ b/BTCPayServer/wwwroot/locales/checkout/el-GR.json
@ -11,20 +11,20 @@
  "pay_in_wallet": "Πληρωμή στο πορτοφόλι",
  "pay_by_nfc": "Πληρωμή μέσω NFC",
  "pay_by_lnurl": "Πληρωμή με LNURL-Withdraw",
-  "invoice_id": "ID Παραστατικού Πληρωμής",
-  "order_id": "ID Παραγγελίας",
+  "invoice_id": "ID παραστατικού πληρωμής",
+  "order_id": "ID παραγγελίας",
  "total_price": "Συνολική τιμή",
  "total_fiat": "Συνολική τιμή σε νόμισμα",
  "exchange_rate": "Ισοτιμία",
  "amount_paid": "Πληρωθέν ποσό",
  "amount_due": "Οφειλόμενο ποσό",
-  "recommended_fee": "Συνιστώμενη Αμοιβή",
+  "recommended_fee": "Συνιστώμενη αμοιβή",
  "fee_rate": "{{feeRate}} sat/byte",
-  "network_cost": "Κόστος Δικτύου",
+  "network_cost": "Κόστος δικτύου",
  "tx_count": "{{count}} συναλλαγή",
  "qr_text": "Σαρώστε τον κωδικό QR ή πατήστε για να αντιγράψετε τη διεύθυνση.",
  "address": "Διεύθυνση",
-  "lightning": "Αστραπή (Lightning)",
+  "lightning": "Lightning",
  "payment_link": "Σύνδεσμος πληρωμής",
  "invoice_paid": "Εξοφλημένο τιμολόγιο",
  "invoice_expired": "Η τιμολόγηση έληξε",
--- a/BTCPayServer/wwwroot/locales/el-GR.json
+++ b/BTCPayServer/wwwroot/locales/el-GR.json
@ -3,16 +3,16 @@
  "code": "el-GR",
  "currentLanguage": "Ελληνικά",
  "lang": "Γλώσσα",
-  "Awaiting Payment...": "Αναμονή Πληρωμής...",
+  "Awaiting Payment...": "Αναμονή πληρωμής...",
  "Pay with": "Πληρώστε με",
-  "Contact and Refund Email": "Email Επικοινωνίας & Επιστροφής Πληρωμής",
-  "Contact_Body": "Παρακαλούμε εισάγετε το email σας παρακάτω. Θα επικοινωνήσουμε μαζί σας σε αυτή τη διεύθυνση ηλεκτρονικής αλληλογραφίας εαν προκύψει κάποιο θέμα με την πληρωμή σας.",
+  "Contact and Refund Email": "Email επικοινωνίας & επιστροφής πληρωμής",
+  "Contact_Body": "Παρακαλούμε εισάγετε το email σας παρακάτω. Θα επικοινωνήσουμε μαζί σας σε αυτή τη διεύθυνση ηλεκτρονικής αλληλογραφίας εάν προκύψει κάποιο θέμα με την πληρωμή σας.",
  "Your email": "Το email σας",
  "Continue": "Συνέχεια",
  "Please enter a valid email address": "Παρακαλούμε εισάγετε μια έγκυρη διεύθυνση email",
-  "Order Amount": "Ποσό Παραγγελίας",
-  "Network Cost": "Κόστος Δικτύου",
-  "Already Paid": "Πληρώθηκαν Ήδη",
+  "Order Amount": "Ποσό παραγγελίας",
+  "Network Cost": "Κόστος δικτύου",
+  "Already Paid": "Πληρώθηκαν ήδη",
  "Due": "Οφειλόμενα",
  "Scan": "Σάρωση",
  "Copy": "Αντιγραφή",
@ -34,14 +34,14 @@
  "InvoiceExpired_Body_1": "Το παρών παραστατικό πληρωμής έχει λήξει. Ένα παραστατικό πληρωμής ισχύει μόνο για {{maxTimeMinutes}} λεπτά.\nΜπορείτε να επιστρέψετε στο {{storeName}} εάν θα θέλατε να υποβάλετε ξανά την πληρωμή σας.",
  "InvoiceExpired_Body_2": "Εάν επιχειρήσατε να στείλετε την πληρωμή σας, αυτή ακόμη δεν έχει γίνει αποδεκτή απο το δίκτυο. Δέν έχουμε λάβει ακόμη την πληρωμή σας.",
  "InvoiceExpired_Body_3": "Εάν την λάβουμε αργότερα, είτε θα εκτέλεσουμε την παραγγελία σας ή θα επικοινωνήσουμε μαζί σας για να οργανώσουμε την επιστροφή των χρημάτων σας...",
-  "Invoice ID": "ID Παραστατικού Πληρωμής",
-  "Order ID": "ID Παραγγελίας",
+  "Invoice ID": "ID παραστατικού πληρωμής",
+  "Order ID": "ID παραγγελίας",
  "Return to StoreName": "Επιστροφή στο {{storeName}}",
  "This invoice has been paid": "Αυτό το παραστατικό έχει πληρωθεί",
  "This invoice has been archived": "Αυτό το παραστατικό έχει αρχειοθετηθεί",
  "Archived_Body": "Παρακαλούμε επικοινωνήστε με το κατάστημα για πληροφορίες σχετικά με την παραγγελία ή εάν χρειάζεστε βοήθεια",
  "BOLT 11 Invoice": "Παραστατικό BOLT 11",
-  "Node Info": "Πληροφορίες Κόμβου",
+  "Node Info": "Πληροφορίες κόμβου",
  "txCount": "{{count}} συναλλαγή",
  "txCount_plural": "{{count}} συναλλαγών",
  "Pay with CoinSwitch": "Πληρώστε με CoinSwitch",
--- a/Build/Version.csproj
+++ b/Build/Version.csproj
@ -1,5 +1,5 @@
 <Project>
  <PropertyGroup>
-		<Version>1.10.0</Version>
+		<Version>1.10.2</Version>
  </PropertyGroup>
 </Project>
--- a/Changelog.md
+++ b/Changelog.md
@ -1,5 +1,24 @@
 # Changelog

+## 1.10.2
+
+### Bug fixes
+
+* Fix: Stale data when fetching invoice after webhook (#5049) @Kukks
+* Fix: Crash on migation of old instances (#5051) @NicolasDorier
+* Fix: Hide sensitive info feature not working with custom theme (#5044) @dennisreimann
+* Fix: Pay button not rendering on the invoice page (#5043) @dennisreimann
+
+## 1.10.1
+
+### Bug fixes
+
+* Point of Sale bug after filling out form Shop + cart (#5031) @Kukks
+
+### Improvements
+
+* Language translation update for el-GR
+
 ## 1.10.0

 Notice: Due to the substantial disk space consumption, we are removing all data pertaining to past webhook deliveries (#5005).
Author	SHA1	Message	Date
Kukks	6d0f9120b8	prep for 1.10.2	2023-06-07 18:02:51 +02:00
Kukks	aafb4a7f2a	Fix stale invoice api for settle invoice fixes #5049	2023-06-07 17:57:03 +02:00
nicolas.dorier	ae432ff237	Fix: Crash on migation of old instances (Fix #5051 )	2023-06-07 10:20:39 +02:00
Dennis Reimann	cdc318c71a	Pay Button: Fix circular reference when serializing JSON When apps were set, the `GetAllApps` included the store data, which led to a circular reference when serializing the JSON. That data isn't necessary here, so we can just drop it before rendering. Fixes #5038.	2023-06-05 12:35:06 +02:00
Dennis Reimann	94d1cec8a9	Hide Sensitive Info: Fix script location The script snippet needs to be located outside of the theme if-conditions, otherwise it only works if no custom theme is applied.	2023-06-05 12:34:54 +02:00
nicolas.dorier	c0bc19ea59	Update Changelog	2023-06-02 18:21:57 +09:00
nicolas.dorier	6f07714cd9	Language update	2023-06-02 18:18:10 +09:00
nicolas.dorier	a9d2cac23c	bump 1.10.1	2023-06-02 18:15:56 +09:00
Nicolas Dorier	693b46126b	Bump Bitcoin core to 25.0 (#5032 )	2023-06-02 16:41:35 +09:00
Kukks	bbff9710bf	fix cart + form combination bug fixes #5031	2023-06-02 09:34:55 +02:00
nicolas.dorier	358e122775	Fix tests	2023-06-01 22:17:42 +09:00
Andrew Camilleri	3818468932	Pluginify on chain wallet setup (#4999 ) * Pluginify on chain wallet setup This PR fixes a few logical points in the wallet setup flow to allow more extensive plugin flexibility; It also fixes an issue when building plugins that requires an Altcoin config profile. Here is an example showcasing the Liquid+ plugin using this to enforce that it is a hot wallet (a requirement it has) and that import to RPC is always set, and a new option that is used to configure the wallet further https://i.imgur.com/pDPQ73v.gif * Update BTCPayServer/Controllers/UIStoresController.Onchain.cs * update nbx	2023-06-01 21:18:28 +09:00
Kukks	3d2554fbe1	Make role name show uneditable when not creating	2023-05-31 15:49:34 +02:00
Kukks	4309603317	Hide topup items from cart	2023-05-31 15:49:34 +02:00
Dennis Reimann	f733c9ea77	Form Builder: Improve wording Element -> Field. Something bas and I came across while reviewing the blog post.	2023-05-31 14:57:11 +02:00
Kukks	775ee01171	fix store role deletion fixes #5027	2023-05-31 13:42:38 +02:00